diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..33515c0
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="Bank-Beispiel/src"/>
+	<classpathentry kind="src" path="Roboter"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Roboter/tpe/exceptions/RobotException.java b/Roboter/tpe/exceptions/RobotException.java
new file mode 100644
index 0000000..deee895
--- /dev/null
+++ b/Roboter/tpe/exceptions/RobotException.java
@@ -0,0 +1,20 @@
+package tpe.exceptions;
+import java.util.*;
+import java.lang.Thread;
+@SuppressWarnings("serial")
+public class RobotException extends Exception {
+	
+public class MagicValueException extends Throwable {
+	throw new Exception("Die Zahl 42 kann nicht verarbeitet werden");
+	}
+
+public RobotException(String string) {
+		// TODO Auto-generated constructor stub
+	}
+
+public RobotException MagicValueException() throws  {
+	
+	
+}
+	
+}
diff --git a/Roboter/tpe/exceptions/RobotIllegalStateException.java b/Roboter/tpe/exceptions/RobotIllegalStateException.java
new file mode 100644
index 0000000..917278b
--- /dev/null
+++ b/Roboter/tpe/exceptions/RobotIllegalStateException.java
@@ -0,0 +1,13 @@
+package tpe.exceptions;
+
+public class RobotIllegalStateException {
+	public boolean illegalState(boolean powerSwitch) {
+		if(powerSwitch=false)
+		{
+			return false;
+		}
+		else
+			return true;
+	}
+
+}
diff --git a/Roboter/tpe/exceptions/roboter/C3PO.java b/Roboter/tpe/exceptions/roboter/C3PO.java
index f031afc..70d5e5b 100644
--- a/Roboter/tpe/exceptions/roboter/C3PO.java
+++ b/Roboter/tpe/exceptions/roboter/C3PO.java
@@ -1,6 +1,6 @@
 package tpe.exceptions.roboter;
 
-import tpe.exceptions.roboter.exceptions.RobotException;
+import tpe.exceptions.RobotException;
 
 public class C3PO implements Robot{
 
diff --git a/Roboter/tpe/exceptions/roboter/Nexus6.java b/Roboter/tpe/exceptions/roboter/Nexus6.java
index fb44f48..9dae737 100644
--- a/Roboter/tpe/exceptions/roboter/Nexus6.java
+++ b/Roboter/tpe/exceptions/roboter/Nexus6.java
@@ -1,6 +1,6 @@
 package tpe.exceptions.roboter;
 
-import tpe.exceptions.roboter.exceptions.RobotException;
+import tpe.exceptions.RobotException;
 
 public class Nexus6 implements RobotControl, RobotInstructions {
 	private static int id=19281982;
diff --git a/Roboter/tpe/exceptions/roboter/R2D2.java b/Roboter/tpe/exceptions/roboter/R2D2.java
index 392a7a2..73bd57e 100644
--- a/Roboter/tpe/exceptions/roboter/R2D2.java
+++ b/Roboter/tpe/exceptions/roboter/R2D2.java
@@ -1,7 +1,8 @@
 package tpe.exceptions.roboter;
 
 import java.util.*;
-import tpe.exceptions.roboter.exceptions.RobotException;
+
+import tpe.exceptions.RobotException;
 
 public class R2D2 implements Robot {
 	RobotException robotexception;
diff --git a/Roboter/tpe/exceptions/roboter/RobotControl.java b/Roboter/tpe/exceptions/roboter/RobotControl.java
index 814f272..d43f36b 100644
--- a/Roboter/tpe/exceptions/roboter/RobotControl.java
+++ b/Roboter/tpe/exceptions/roboter/RobotControl.java
@@ -1,6 +1,6 @@
 package tpe.exceptions.roboter;
 
-import tpe.exceptions.roboter.exceptions.RobotException;
+import tpe.exceptions.RobotException;
 
 /**
  * Das Interface repräsentiert einen einfachen Roboter mit seinen Funktionen.
diff --git a/Roboter/tpe/exceptions/roboter/RobotInstructions.java b/Roboter/tpe/exceptions/roboter/RobotInstructions.java
index dd3ccf6..ccc5abb 100644
--- a/Roboter/tpe/exceptions/roboter/RobotInstructions.java
+++ b/Roboter/tpe/exceptions/roboter/RobotInstructions.java
@@ -1,8 +1,8 @@
 package tpe.exceptions.roboter;
 
-import tpe.exceptions.roboter.exceptions.RobotException;
-import tpe.exceptions.roboter.exceptions.RobotIllegalStateException;
-import tpe.exceptions.roboter.exceptions.RobotMagicValueException;
+import tpe.exceptions.RobotException;
+import tpe.exceptions.RobotIllegalStateException;
+import tpe.exceptions.RobotMagicValueException;
 
 /**
  * Das Interface repräsentiert den Befehlssatz eines einfachen Roboters.
diff --git a/Roboter/tpe/exceptions/roboter/exceptions/RobotException.java b/Roboter/tpe/exceptions/roboter/exceptions/RobotException.java
deleted file mode 100644
index 6b7ae91..0000000
--- a/Roboter/tpe/exceptions/roboter/exceptions/RobotException.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package tpe.exceptions.roboter.exceptions;
-
-public class RobotException {
-	
-
-}
diff --git a/Roboter/tpe/exceptions/roboter/exceptions/RobotIllegalStateException.java b/Roboter/tpe/exceptions/roboter/exceptions/RobotIllegalStateException.java
deleted file mode 100644
index d837772..0000000
--- a/Roboter/tpe/exceptions/roboter/exceptions/RobotIllegalStateException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package tpe.exceptions.roboter.exceptions;
-
-public class RobotIllegalStateException {
-
-}
diff --git a/Roboter/tpe/exceptions/roboter/exceptions/RobotMagicValueException.java b/Roboter/tpe/exceptions/roboter/exceptions/RobotMagicValueException.java
deleted file mode 100644
index 84dae3d..0000000
--- a/Roboter/tpe/exceptions/roboter/exceptions/RobotMagicValueException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package tpe.exceptions.roboter.exceptions;
-
-
-public class RobotMagicValueException {
-	
-	public boolean invalidNumber(int[] zahlen) {
-		
-		boolean error=false;
-		for(int i =0; i<zahlen.length;i++)
-		{
-			if(zahlen[i]==42)
-				error=true ;
-		}
-		return error;
-	}
-}
diff --git a/Roboter/tpe/exceptions/roboter/ui/UI.java b/Roboter/tpe/exceptions/roboter/ui/UI.java
deleted file mode 100644
index e2ae7d8..0000000
--- a/Roboter/tpe/exceptions/roboter/ui/UI.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package tpe.exceptions.roboter.ui;
-
-public class UI {
-
-}
diff --git a/Roboter/tpe/exceptions/roboter/facade/RobotFactory.java b/Roboter/tpe/facade/RobotFactory.java
similarity index 73%
rename from Roboter/tpe/exceptions/roboter/facade/RobotFactory.java
rename to Roboter/tpe/facade/RobotFactory.java
index d47dcd3..080ed7a 100644
--- a/Roboter/tpe/exceptions/roboter/facade/RobotFactory.java
+++ b/Roboter/tpe/facade/RobotFactory.java
@@ -1,4 +1,4 @@
-package tpe.exceptions.roboter.facade;
+package tpe.facade;
 
 import tpe.exceptions.roboter.C3PO;
 import tpe.exceptions.roboter.R2D2;
@@ -6,6 +6,11 @@ import tpe.exceptions.roboter.R2D2;
 public class RobotFactory {
 	private R2D2 r2d2;
 	private C3PO c3po;
+	enum RobotType{
+		R2D2,
+		C3PO,
+		NEXUS6
+	}
 	public int constructRobot() {
 		
 	}
diff --git a/Roboter/tpe/infrastructure/Persistenz.java b/Roboter/tpe/infrastructure/Persistenz.java
new file mode 100644
index 0000000..276483b
--- /dev/null
+++ b/Roboter/tpe/infrastructure/Persistenz.java
@@ -0,0 +1,39 @@
+package tpe.infrastructure;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.PrintWriter;
+
+public class Persistenz {
+	private static final String Robot_DATEI = "-robot-data.ser";
+	
+	public static boolean checkDataSaved(String name) {
+		return new File(name + Robot_DATEI).exists();
+	}
+	
+	public static boolean deleteRobotData(String name) throws FileNotFoundException, IOException
+	{
+		File file = new File("C:\\Users\\Lukas Berens\\git\\RoboterFabrik\\"+name+"-robot-data.ser");
+		return file.delete();
+	}
+	
+	public static void saveRobotData(Object robot, String name) throws Exception {
+		ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(name + Robot_DATEI));
+		oos.writeObject(robot);
+		oos.close();
+	}
+	
+	public static Object loadRobotData(String name) throws Exception {
+		ObjectInputStream ois = new ObjectInputStream(new FileInputStream(name + Robot_DATEI));
+		Object robot = ois.readObject();
+		ois.close();
+		
+		return robot;
+	}
+
+}
\ No newline at end of file
diff --git a/Roboter/tpe/ui/UI.java b/Roboter/tpe/ui/UI.java
new file mode 100644
index 0000000..bf850d5
--- /dev/null
+++ b/Roboter/tpe/ui/UI.java
@@ -0,0 +1,5 @@
+package tpe.ui;
+
+public class UI {
+
+}