diff --git a/README.md b/README.md
index 43a3495..946006d 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,8 @@
   * [Factrory](#-classe-factory-)
 * ### [Infrastructure](#infratructure-1)
   * [Persistenz](#-classe-persistenz-)
-* ### [safety](#robot-1)
-  * ### [safety](#exceptions-1)
+* ### [utility](#robot-1)
+  * ### [utility](#exceptions-1)
     * [RobotException](#-class-robotexception-)
     * [RobotIllegalStateException](#-class-robotillegalstateexception-)
     * [RobotMagicValueException](#-class-robotmagicvalueexception-)
@@ -45,15 +45,21 @@
 
 # TO-Dos:
 
-* Sortier Algorythem C3PO, R2D2 (mit Ausgabe)
+* Sortier Algorythem C3PO, R2D2 (mit Ausgabe) --[done]--
 
-* Bei Erstellung eines Roboters wird einne SerienNr erstellt
+* Bei Erstellung eines Roboters wird einne SerienNr erstellt --[done]--
 
-* Wichtige getter for Robots (getName)
+* Wichtige getter for Robots (getName) --[done]--
 
-* Exception Classes (Throwable einfügen)
+* Exception Classes (Throwable einfügen) --[done]--
 
-* RobotFactory, die mit enum(RobotType) Objekt von R2 und C3PO erstellen kann
+* RobotFactory, die mit enum(RobotType) Objekt von R2D2 und C3PO erstellen kann --[abgewandelt für Exceptions]--
+
+* Persistenz einrichten
+
+* funktionalitäten der UI zusammenfassen
+
+* funtkionalitäten der UI implementieren
 
 * Nexus6(Singleton) implementieren, kann nichts (Illegal-State)
 
@@ -199,9 +205,9 @@ ___
 
 `loadFactoryData():Object -> throws`
 
-## safety
+## utility
 
-### safety
+### utility
 
 <h2 align="center"> 
 Class RobotException 
diff --git a/domain/Robot.java b/domain/Robot.java
index a85404e..06b6c49 100644
--- a/domain/Robot.java
+++ b/domain/Robot.java
@@ -1,15 +1,15 @@
 package domain;
 
-import safety.robot_exceptions.ExceptionStorage;
-import safety.robot_exceptions.RobotException;
-import safety.robot_exceptions.robotExceptions;
+import utility.robot_exceptions.ExceptionStorage;
+import utility.robot_exceptions.RobotException;
+import utility.robot_exceptions.robotExceptions;
 
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
 
-public abstract class Robot implements safety.interfaces.Robot, Serializable {
+public abstract class Robot implements utility.interfaces.Robot, Serializable {
    protected ExceptionStorage exceptions;
    private int id;
    private String name;
@@ -26,7 +26,7 @@ public abstract class Robot implements safety.interfaces.Robot, Serializable {
    }
 
    /**
-    * @see safety.interfaces.RobotControl;
+    * @see utility.interfaces.RobotControl;
     */
    @Override
    public int getId() {
@@ -34,7 +34,7 @@ public abstract class Robot implements safety.interfaces.Robot, Serializable {
    }
 
    /**
-    * @see safety.interfaces.RobotControl;
+    * @see utility.interfaces.RobotControl;
     */
    @Override
    public String getName() {
@@ -42,7 +42,7 @@ public abstract class Robot implements safety.interfaces.Robot, Serializable {
    }
 
    /**
-    * @see safety.interfaces.RobotControl;
+    * @see utility.interfaces.RobotControl;
     */
    @Override
    public void triggerPowerSwitch() {
@@ -54,7 +54,7 @@ public abstract class Robot implements safety.interfaces.Robot, Serializable {
    }
 
    /**
-    * @see safety.interfaces.RobotControl;
+    * @see utility.interfaces.RobotControl;
     */
    @Override
    public boolean isPowerOn() {
@@ -62,7 +62,7 @@ public abstract class Robot implements safety.interfaces.Robot, Serializable {
    }
 
    /**
-    * @see safety.interfaces.RobotControl;
+    * @see utility.interfaces.RobotControl;
     */
    @Override
    public RobotException getLastException() {
@@ -157,10 +157,6 @@ public abstract class Robot implements safety.interfaces.Robot, Serializable {
             int temp = input[i];
             input[i] = input[small];
             input[small] = temp;
-            /*for(int n = 0; n < input.length; n++){
-               System.out.print( " " + input[n]);
-            }
-            System.out.println();*/
          }
          return input;
       }else{
diff --git a/safety/interfaces/Robot.java b/utility/interfaces/Robot.java
similarity index 100%
rename from safety/interfaces/Robot.java
rename to utility/interfaces/Robot.java
diff --git a/safety/interfaces/RobotControl.java b/utility/interfaces/RobotControl.java
similarity index 100%
rename from safety/interfaces/RobotControl.java
rename to utility/interfaces/RobotControl.java
diff --git a/safety/interfaces/RobotInstructions.java b/utility/interfaces/RobotInstructions.java
similarity index 100%
rename from safety/interfaces/RobotInstructions.java
rename to utility/interfaces/RobotInstructions.java
diff --git a/safety/robot_exceptions/ArrayEmptyException.java b/utility/robot_exceptions/ArrayEmptyException.java
similarity index 100%
rename from safety/robot_exceptions/ArrayEmptyException.java
rename to utility/robot_exceptions/ArrayEmptyException.java
diff --git a/safety/robot_exceptions/ExceptionStorage.java b/utility/robot_exceptions/ExceptionStorage.java
similarity index 100%
rename from safety/robot_exceptions/ExceptionStorage.java
rename to utility/robot_exceptions/ExceptionStorage.java
diff --git a/safety/robot_exceptions/RobotException.java b/utility/robot_exceptions/RobotException.java
similarity index 100%
rename from safety/robot_exceptions/RobotException.java
rename to utility/robot_exceptions/RobotException.java
diff --git a/safety/robot_exceptions/RobotIllegalStateException.java b/utility/robot_exceptions/RobotIllegalStateException.java
similarity index 100%
rename from safety/robot_exceptions/RobotIllegalStateException.java
rename to utility/robot_exceptions/RobotIllegalStateException.java
diff --git a/safety/robot_exceptions/RobotMagicValueException.java b/utility/robot_exceptions/RobotMagicValueException.java
similarity index 100%
rename from safety/robot_exceptions/RobotMagicValueException.java
rename to utility/robot_exceptions/RobotMagicValueException.java
diff --git a/safety/robot_exceptions/robotExceptions.java b/utility/robot_exceptions/robotExceptions.java
similarity index 100%
rename from safety/robot_exceptions/robotExceptions.java
rename to utility/robot_exceptions/robotExceptions.java