diff --git a/src/de/oszimt/ls/aliendefence/toDo/UserController.java b/src/de/oszimt/ls/aliendefence/controller/UserController.java
similarity index 90%
rename from src/de/oszimt/ls/aliendefence/toDo/UserController.java
rename to src/de/oszimt/ls/aliendefence/controller/UserController.java
index f5d6374..10f8c56 100644
--- a/src/de/oszimt/ls/aliendefence/toDo/UserController.java
+++ b/src/de/oszimt/ls/aliendefence/controller/UserController.java
@@ -1,5 +1,6 @@
-package de.oszimt.ls.aliendefence.toDo;
+package de.oszimt.ls.aliendefence.controller;
 
+import de.oszimt.ls.aliendefence.model.User;
 import de.oszimt.ls.aliendefence.model.persistence.IUserPersistance;
 
 /**
diff --git a/src/de/oszimt/ls/aliendefence/toDo/User.java b/src/de/oszimt/ls/aliendefence/model/User.java
similarity index 98%
rename from src/de/oszimt/ls/aliendefence/toDo/User.java
rename to src/de/oszimt/ls/aliendefence/model/User.java
index fcea8a2..14584fa 100644
--- a/src/de/oszimt/ls/aliendefence/toDo/User.java
+++ b/src/de/oszimt/ls/aliendefence/model/User.java
@@ -1,4 +1,4 @@
-package de.oszimt.ls.aliendefence.toDo;
+package de.oszimt.ls.aliendefence.model;
 
 import java.time.LocalDate;
 
diff --git a/src/de/oszimt/ls/aliendefence/model/persistence/IUserPersistance.java b/src/de/oszimt/ls/aliendefence/model/persistence/IUserPersistance.java
index ff57ac3..3fbc6ff 100644
--- a/src/de/oszimt/ls/aliendefence/model/persistence/IUserPersistance.java
+++ b/src/de/oszimt/ls/aliendefence/model/persistence/IUserPersistance.java
@@ -1,6 +1,6 @@
 package de.oszimt.ls.aliendefence.model.persistence;
 
-import de.oszimt.ls.aliendefence.toDo.User;
+import de.oszimt.ls.aliendefence.model.User;
 
 public interface IUserPersistance {
 
diff --git a/src/de/oszimt/ls/aliendefence/model/persistenceDB/PersistanceDB.java b/src/de/oszimt/ls/aliendefence/model/persistenceDB/PersistanceDB.java
index c3abe93..d093627 100644
--- a/src/de/oszimt/ls/aliendefence/model/persistenceDB/PersistanceDB.java
+++ b/src/de/oszimt/ls/aliendefence/model/persistenceDB/PersistanceDB.java
@@ -5,7 +5,7 @@ import de.oszimt.ls.aliendefence.model.persistence.ILevelPersistance;
 import de.oszimt.ls.aliendefence.model.persistence.IPersistance;
 import de.oszimt.ls.aliendefence.model.persistence.ITargetPersistance;
 import de.oszimt.ls.aliendefence.model.persistence.IUserPersistance;
-import de.oszimt.ls.aliendefence.toDo.UserDB;
+import de.oszimt.ls.aliendefence.model.persistenceDB.UserDB;
 
 public class PersistanceDB implements IPersistance{
 
diff --git a/src/de/oszimt/ls/aliendefence/toDo/UserDB.java b/src/de/oszimt/ls/aliendefence/model/persistenceDB/UserDB.java
similarity index 94%
rename from src/de/oszimt/ls/aliendefence/toDo/UserDB.java
rename to src/de/oszimt/ls/aliendefence/model/persistenceDB/UserDB.java
index da1b7df..ed7c014 100644
--- a/src/de/oszimt/ls/aliendefence/toDo/UserDB.java
+++ b/src/de/oszimt/ls/aliendefence/model/persistenceDB/UserDB.java
@@ -1,4 +1,4 @@
-package de.oszimt.ls.aliendefence.toDo;
+package de.oszimt.ls.aliendefence.model.persistenceDB;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -6,6 +6,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import de.oszimt.ls.aliendefence.model.User;
 import de.oszimt.ls.aliendefence.model.persistence.IUserPersistance;
 import de.oszimt.ls.aliendefence.model.persistenceDB.AccessDB;
 
diff --git a/src/de/oszimt/ls/aliendefence/model/persistenceDummy/UserDummy.java b/src/de/oszimt/ls/aliendefence/model/persistenceDummy/UserDummy.java
index 95850df..e23809a 100644
--- a/src/de/oszimt/ls/aliendefence/model/persistenceDummy/UserDummy.java
+++ b/src/de/oszimt/ls/aliendefence/model/persistenceDummy/UserDummy.java
@@ -3,7 +3,7 @@ package de.oszimt.ls.aliendefence.model.persistenceDummy;
 import java.time.LocalDate;
 
 import de.oszimt.ls.aliendefence.model.persistence.IUserPersistance;
-import de.oszimt.ls.aliendefence.toDo.User;
+import de.oszimt.ls.aliendefence.model.User;
 
 /**
  * Dummyklasse zum Testen
diff --git a/src/de/oszimt/ls/aliendefence/toDo/CreateUserWindow.java b/src/de/oszimt/ls/aliendefence/view/CreateUserWindow.java
similarity index 62%
rename from src/de/oszimt/ls/aliendefence/toDo/CreateUserWindow.java
rename to src/de/oszimt/ls/aliendefence/view/CreateUserWindow.java
index a54864f..933e8c5 100644
--- a/src/de/oszimt/ls/aliendefence/toDo/CreateUserWindow.java
+++ b/src/de/oszimt/ls/aliendefence/view/CreateUserWindow.java
@@ -1,4 +1,4 @@
-package de.oszimt.ls.aliendefence.toDo;
+package de.oszimt.ls.aliendefence.view;
 
 //TODO create a usermanagement
 public class CreateUserWindow {