diff --git a/src/main/java/mops/gruppen2/Gruppen2Config.java b/src/main/java/mops/gruppen2/config/Gruppen2Config.java
similarity index 95%
rename from src/main/java/mops/gruppen2/Gruppen2Config.java
rename to src/main/java/mops/gruppen2/config/Gruppen2Config.java
index 0f6275c..1f8b305 100644
--- a/src/main/java/mops/gruppen2/Gruppen2Config.java
+++ b/src/main/java/mops/gruppen2/config/Gruppen2Config.java
@@ -1,4 +1,4 @@
-package mops.gruppen2;
+package mops.gruppen2.config;
 
 import mops.gruppen2.domain.Exceptions.EventException;
 import mops.gruppen2.domain.Group;
diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index 4fc083b..723395d 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -1,8 +1,6 @@
 package mops.gruppen2.controller;
 
-import mops.gruppen2.Gruppen2Application;
-import mops.gruppen2.Gruppen2Config;
-import mops.gruppen2.domain.Group;
+import mops.gruppen2.config.Gruppen2Config;
 import mops.gruppen2.domain.GroupType;
 import mops.gruppen2.domain.Visibility;
 import mops.gruppen2.domain.event.AddUserEvent;
@@ -18,7 +16,6 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.security.RolesAllowed;
-import javax.swing.*;
 
 @Controller
 @RequestMapping("/gruppen2")