diff --git a/src/main/java/de/thm/arsnova/LoginController.java b/src/main/java/de/thm/arsnova/controller/LoginController.java
similarity index 98%
rename from src/main/java/de/thm/arsnova/LoginController.java
rename to src/main/java/de/thm/arsnova/controller/LoginController.java
index 5f1ae033e6231bad25b763f39c292aae96ddc776..7a14b41948f31f1c12aba12c7070509a33b083b2 100644
--- a/src/main/java/de/thm/arsnova/LoginController.java
+++ b/src/main/java/de/thm/arsnova/controller/LoginController.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package de.thm.arsnova;
+package de.thm.arsnova.controller;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -47,7 +47,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.view.RedirectView;
 
diff --git a/src/main/java/de/thm/arsnova/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java
similarity index 99%
rename from src/main/java/de/thm/arsnova/SessionController.java
rename to src/main/java/de/thm/arsnova/controller/SessionController.java
index fa04681822f9c6740dad24b701f88a8a28361067..9b89a8cb20fcb055f786ed265e129f06357f00cc 100644
--- a/src/main/java/de/thm/arsnova/SessionController.java
+++ b/src/main/java/de/thm/arsnova/controller/SessionController.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package de.thm.arsnova;
+package de.thm.arsnova.controller;
 
 import java.util.UUID;
 
diff --git a/src/main/java/de/thm/arsnova/WelcomeController.java b/src/main/java/de/thm/arsnova/controller/WelcomeController.java
similarity index 97%
rename from src/main/java/de/thm/arsnova/WelcomeController.java
rename to src/main/java/de/thm/arsnova/controller/WelcomeController.java
index ab9a692673bcc555dfb887aa8f6d23abe0ed89a6..832751a5636c59ff5c88e882595bec87e42d03b6 100644
--- a/src/main/java/de/thm/arsnova/WelcomeController.java
+++ b/src/main/java/de/thm/arsnova/controller/WelcomeController.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package de.thm.arsnova;
+package de.thm.arsnova.controller;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/src/test/java/de/thm/arsnova/controller/LoginControllerTest.java b/src/test/java/de/thm/arsnova/controller/LoginControllerTest.java
index 03741d10e75b58c08368210a93a922496b7facf6..2eb8a76af57d5e96bd7581c5341f01357ee7f389 100644
--- a/src/test/java/de/thm/arsnova/controller/LoginControllerTest.java
+++ b/src/test/java/de/thm/arsnova/controller/LoginControllerTest.java
@@ -40,7 +40,6 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter;
 import org.springframework.web.servlet.view.RedirectView;
 
-import de.thm.arsnova.LoginController;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations={
diff --git a/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java b/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
index b1204794b29a65974d3f23155ec2d48270dd1637..eaddb5f30f49c47aaedc484d9beb75775ac8f5eb 100644
--- a/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
+++ b/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
@@ -19,8 +19,6 @@ import org.springframework.web.servlet.HandlerAdapter;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter;
 
-import de.thm.arsnova.SessionController;
-import de.thm.arsnova.exceptions.NotFoundException;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations={