diff --git a/src/test/scala/BaseServiceSpec.scala b/src/test/scala/de/thm/arsnova/BaseServiceSpec.scala
similarity index 88%
rename from src/test/scala/BaseServiceSpec.scala
rename to src/test/scala/de/thm/arsnova/BaseServiceSpec.scala
index fa6aa837040e7ad92e5d2106b32b48d0de5df0f5..e72046d989c329f4a77293d6434593c5ba371df9 100644
--- a/src/test/scala/BaseServiceSpec.scala
+++ b/src/test/scala/de/thm/arsnova/BaseServiceSpec.scala
@@ -1,16 +1,15 @@
-import services.BaseService
-import models.User
+package de.thm.arsnova
+
+import de.thm.arsnova.services.BaseService
+import de.thm.arsnova.models._
+import de.thm.arsnova.utils.{DatabaseConfig, MigrationConfig}
 
 import akka.event.{ NoLogging, LoggingAdapter }
-import utils.MigrationConfig
 import org.scalatest._
 import scala.concurrent.Await
 import scala.concurrent.duration._
-import services.BaseService
-import models._
 import scala.language.existentials
 import org.scalatest.BeforeAndAfterEach
-import utils.DatabaseConfig
 
 class BaseServiceSpec extends FunSpec with Matchers with MigrationConfig with BeforeAndAfterAll with DatabaseConfig
   with BaseService with HateoasSpec with SessionApiSpec with QuestionApiSpec with FreetextAnswerApiSpec with ChoiceAnswerApiSpec with CommentApiSpec
diff --git a/src/test/scala/ChoiceAnswerApiSpec.scala b/src/test/scala/de/thm/arsnova/ChoiceAnswerApiSpec.scala
similarity index 94%
rename from src/test/scala/ChoiceAnswerApiSpec.scala
rename to src/test/scala/de/thm/arsnova/ChoiceAnswerApiSpec.scala
index 18d0a1468238088eaac96a183dbc4be8abf7a8da..9a6c29ea9d3b6aa7c1f12648c2d2a4fd1ba48ef5 100644
--- a/src/test/scala/ChoiceAnswerApiSpec.scala
+++ b/src/test/scala/de/thm/arsnova/ChoiceAnswerApiSpec.scala
@@ -1,11 +1,13 @@
+package de.thm.arsnova
+
+import de.thm.arsnova.services.{BaseService, SessionService}
+import de.thm.arsnova.models._
+import de.thm.arsnova.api.ChoiceAnswerApi
+
 import akka.http.scaladsl.model.{HttpEntity, MediaTypes, StatusCode}
-import services.{BaseService, SessionService}
-import models._
 import org.scalatest.concurrent.ScalaFutures
 import spray.json._
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
-import models._
-import api.ChoiceAnswerApi
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.unmarshalling.Unmarshal
 
@@ -13,7 +15,6 @@ import scala.concurrent.Future
 import akka.http.scaladsl.model.StatusCodes._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import org.scalatest.Matchers
-import services.BaseService
 import org.scalatest._
 import scala.concurrent.Await
 import scala.concurrent.duration._
@@ -21,7 +22,7 @@ import akka.http.scaladsl.server.MissingQueryParamRejection
 
 trait ChoiceAnswerApiSpec extends FunSpec with Matchers with ScalaFutures with BaseService with ScalatestRouteTest with Routes
     with TestData with ChoiceAnswerApi {
-  import mappings.ChoiceAnswerJsonProtocol._
+  import de.thm.arsnova.mappings.ChoiceAnswerJsonProtocol._
   describe("ChoiceAnswer api") {
     it("retrieve choice answers for question") {
       Get("/question/5/choiceAnswer") ~> choiceAnswerApi ~> check {
diff --git a/src/test/scala/CommentApiSpec.scala b/src/test/scala/de/thm/arsnova/CommentApiSpec.scala
similarity index 91%
rename from src/test/scala/CommentApiSpec.scala
rename to src/test/scala/de/thm/arsnova/CommentApiSpec.scala
index c6629abdeb50a83ce2f1f05e97d6d19221a0fd18..377a131d659aac70943ce9cae5d4300c3d8a34c3 100644
--- a/src/test/scala/CommentApiSpec.scala
+++ b/src/test/scala/de/thm/arsnova/CommentApiSpec.scala
@@ -1,28 +1,27 @@
+package de.thm.arsnova
+
+import de.thm.arsnova.services.{BaseService, SessionService}
+import de.thm.arsnova.models._
+import de.thm.arsnova.api.CommentApi
+
 import akka.http.scaladsl.model.{HttpEntity, MediaTypes, StatusCode}
-import services.{BaseService, SessionService}
-import models._
 import org.scalatest.concurrent.ScalaFutures
 import spray.json._
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
-import models._
-import api.CommentApi
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.unmarshalling.Unmarshal
 
-import scala.concurrent.Future
 import akka.http.scaladsl.model.StatusCodes._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import org.scalatest.Matchers
-import services.BaseService
 import org.scalatest._
-
-import scala.concurrent.Await
+import scala.concurrent.{Future, Await}
 import scala.concurrent.duration._
 import akka.http.scaladsl.server.MissingQueryParamRejection
 
 trait CommentApiSpec extends FunSpec with Matchers with ScalaFutures with BaseService with ScalatestRouteTest with Routes
     with TestData with CommentApi {
-  import mappings.CommentJsonProtocol._
+  import de.thm.arsnova.mappings.CommentJsonProtocol._
 
   describe("Comment api") {
     it("retrieve comment by id") {
diff --git a/src/test/scala/FeaturesApiSpec.scala b/src/test/scala/de/thm/arsnova/FeaturesApiSpec.scala
similarity index 90%
rename from src/test/scala/FeaturesApiSpec.scala
rename to src/test/scala/de/thm/arsnova/FeaturesApiSpec.scala
index 0145fe75c5b5be1242d4d4c80412c9dccce24a59..64e54dafb61fae2325f83d757df78f75c780882a 100644
--- a/src/test/scala/FeaturesApiSpec.scala
+++ b/src/test/scala/de/thm/arsnova/FeaturesApiSpec.scala
@@ -1,10 +1,12 @@
+package de.thm.arsnova
+
+import de.thm.arsnova.services.{BaseService, FeaturesService}
+import de.thm.arsnova.models._
+import de.thm.arsnova.api.FeaturesApi
+
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import org.scalatest.{FunSpec, Matchers}
 import org.scalatest.concurrent.ScalaFutures
-import services.BaseService
-import models._
-import api.FeaturesApi
-import services.FeaturesService
 import spray.json._
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
 import akka.http.scaladsl.model.{HttpEntity, MediaTypes}
@@ -12,7 +14,7 @@ import akka.http.scaladsl.model.StatusCodes._
 
 trait FeaturesApiSpec extends FunSpec with Matchers with ScalaFutures with BaseService with ScalatestRouteTest with Routes
     with TestData with FeaturesApi {
-  import mappings.FeatureJsonProtocol._
+  import de.thm.arsnova.mappings.FeatureJsonProtocol._
   describe("Features api") {
     it("retrieve features by id") {
       Get("/features/1") ~> featuresApi ~> check {
diff --git a/src/test/scala/FreetextAnswerApiSpec.scala b/src/test/scala/de/thm/arsnova/FreetextAnswerApiSpec.scala
similarity index 93%
rename from src/test/scala/FreetextAnswerApiSpec.scala
rename to src/test/scala/de/thm/arsnova/FreetextAnswerApiSpec.scala
index c3d678c5d67f6fd5de72b33d28186cf410c8015a..1b97255910c88d0366d08148dee17f927347f763 100644
--- a/src/test/scala/FreetextAnswerApiSpec.scala
+++ b/src/test/scala/de/thm/arsnova/FreetextAnswerApiSpec.scala
@@ -1,27 +1,26 @@
+package de.thm.arsnova
+
+import de.thm.arsnova.services.{BaseService, SessionService}
+import de.thm.arsnova.models._
+import de.thm.arsnova.api.FreetextAnswerApi
+
 import akka.http.scaladsl.model.{HttpEntity, MediaTypes, StatusCode}
-import services.{BaseService, SessionService}
-import models._
 import org.scalatest.concurrent.ScalaFutures
 import spray.json._
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
-import models._
-import api.FreetextAnswerApi
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.unmarshalling.Unmarshal
-
-import scala.concurrent.Future
 import akka.http.scaladsl.model.StatusCodes._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import org.scalatest.Matchers
-import services.BaseService
 import org.scalatest._
-import scala.concurrent.Await
+import scala.concurrent.{Future, Await}
 import scala.concurrent.duration._
 import akka.http.scaladsl.server.MissingQueryParamRejection
 
 trait FreetextAnswerApiSpec extends FunSpec with Matchers with ScalaFutures with BaseService with ScalatestRouteTest with Routes
     with TestData with FreetextAnswerApi {
-  import mappings.FreetextAnswerJsonProtocol._
+  import de.thm.arsnova.mappings.FreetextAnswerJsonProtocol._
   describe("FreetextAnswer api") {
     it("retrieve freetext answers for question") {
       Get("/question/1/freetextAnswer") ~> freetextAnswerApi ~> check {
diff --git a/src/test/scala/HateoasSpec.scala b/src/test/scala/de/thm/arsnova/HateoasSpec.scala
similarity index 93%
rename from src/test/scala/HateoasSpec.scala
rename to src/test/scala/de/thm/arsnova/HateoasSpec.scala
index 1f81f9ab16b8c932f81282e54511991d0f897392..e4a43da5ec52aca02e936b123dcba1566ca1e544 100644
--- a/src/test/scala/HateoasSpec.scala
+++ b/src/test/scala/de/thm/arsnova/HateoasSpec.scala
@@ -1,16 +1,18 @@
+package de.thm.arsnova
+
+import de.thm.arsnova.services.BaseService
+import de.thm.arsnova.hateoas._
+import de.thm.arsnova.api._
+
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import org.scalatest.{FunSpec, Matchers}
 import org.scalatest.concurrent.ScalaFutures
 import spray.json._
-import services.BaseService
-import scala.concurrent.Future
-import scala.concurrent.Await
+import scala.concurrent.{Future, Await}
 import scala.concurrent.duration._
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
 import akka.http.scaladsl.unmarshalling.Unmarshal
 import akka.http.scaladsl.server.Route
-import hateoas._
-import api._
 
 trait HateoasSpec extends FunSpec with Matchers with ScalaFutures with BaseService with ScalatestRouteTest with Routes {
   import hateoas.LinkJsonProtocol._
diff --git a/src/test/scala/QuestionApiSpec.scala b/src/test/scala/de/thm/arsnova/QuestionApiSpec.scala
similarity index 97%
rename from src/test/scala/QuestionApiSpec.scala
rename to src/test/scala/de/thm/arsnova/QuestionApiSpec.scala
index 3193e9b46d880d9bcd72907499dd0acc92b76f11..9ea1a7f7dbfe41b3d93ab8f821bc64fb76596e3a 100644
--- a/src/test/scala/QuestionApiSpec.scala
+++ b/src/test/scala/de/thm/arsnova/QuestionApiSpec.scala
@@ -1,13 +1,15 @@
+package de.thm.arsnova
+
+import de.thm.arsnova.services.{BaseService, SessionService}
+import de.thm.arsnova.models._
+import de.thm.arsnova.api.QuestionApi
+
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
 import akka.http.scaladsl.unmarshalling._
 import akka.http.scaladsl.model.{HttpEntity, MediaTypes, StatusCode}
-import services.{BaseService, SessionService}
-import models._
-import api.QuestionApi
 import org.scalatest.concurrent.ScalaFutures
 import spray.json._
 import akka.http.scaladsl.server.Directives._
-
 import scala.concurrent.Future
 import scala.util.{Failure, Success}
 import akka.http.scaladsl.model.StatusCodes._
@@ -16,7 +18,7 @@ import akka.http.scaladsl.server.MissingQueryParamRejection
 import org.scalatest.{FunSpec, Matchers}
 
 trait QuestionApiSpec extends FunSpec with Matchers with ScalaFutures with BaseService with ScalatestRouteTest with Routes with TestData with QuestionApi {
-  import mappings.QuestionJsonProtocol._
+  import de.thm.arsnova.mappings.QuestionJsonProtocol._
   // you need to call unmarshal because of the question trait
   describe("Question api") {
     it("retrieve question by id 1") {
diff --git a/src/test/scala/SessionApiSpec.scala b/src/test/scala/de/thm/arsnova/SessionApiSpec.scala
similarity index 94%
rename from src/test/scala/SessionApiSpec.scala
rename to src/test/scala/de/thm/arsnova/SessionApiSpec.scala
index 02d987de0fb708f345648af5b5af88ed86aa2526..2a16fb9654ab118684196eee8df987e8c8b436b1 100644
--- a/src/test/scala/SessionApiSpec.scala
+++ b/src/test/scala/de/thm/arsnova/SessionApiSpec.scala
@@ -1,11 +1,13 @@
+package de.thm.arsnova
+
+import de.thm.arsnova.services.{BaseService, SessionService}
+import de.thm.arsnova.models._
+import de.thm.arsnova.api.SessionApi
+
 import akka.http.scaladsl.model.{HttpEntity, MediaTypes, StatusCode}
-import services.{BaseService, SessionService}
-import models._
-import api.SessionApi
 import org.scalatest.concurrent.ScalaFutures
 import spray.json._
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
-import models._
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.unmarshalling.Unmarshal
 
@@ -13,12 +15,11 @@ import scala.concurrent.Future
 import akka.http.scaladsl.model.StatusCodes._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import org.scalatest.Matchers
-import services.BaseService
 import org.scalatest._
 import akka.http.scaladsl.server.MissingQueryParamRejection
 
 trait SessionApiSpec extends FunSpec with Matchers with ScalaFutures with BaseService with ScalatestRouteTest with Routes with TestData with SessionApi {
-  import mappings.SessionJsonProtocol._
+  import de.thm.arsnova.mappings.SessionJsonProtocol._
 
   describe("Session api") {
     it("retrieve sessions for user 1") {
diff --git a/src/test/scala/TestData.scala b/src/test/scala/de/thm/arsnova/TestData.scala
similarity index 98%
rename from src/test/scala/TestData.scala
rename to src/test/scala/de/thm/arsnova/TestData.scala
index a39ef5e75b29656046c8813d5b3bf2f847a65987..0194f2c9a6a44fe436bee6bdbb0cb6f5cb5c295c 100644
--- a/src/test/scala/TestData.scala
+++ b/src/test/scala/de/thm/arsnova/TestData.scala
@@ -1,4 +1,6 @@
-import models._
+package de.thm.arsnova
+
+import de.thm.arsnova.models._
 
 trait TestData {
   val FOUR = 4