diff --git a/src/main/scala/de/tobias/playpad/server/project/Design.scala b/src/main/scala/de/tobias/playpad/server/model/project/Design.scala
similarity index 90%
rename from src/main/scala/de/tobias/playpad/server/project/Design.scala
rename to src/main/scala/de/tobias/playpad/server/model/project/Design.scala
index 2e86b53a8a0246b4684e74667ac021c0b860fa76..ddbcefa38a18579549b445db18303eaa76389bde 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Design.scala
+++ b/src/main/scala/de/tobias/playpad/server/model/project/Design.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project
+package de.tobias.playpad.server.model.project
import java.util.UUID
diff --git a/src/main/scala/de/tobias/playpad/server/project/Pad.scala b/src/main/scala/de/tobias/playpad/server/model/project/Pad.scala
similarity index 86%
rename from src/main/scala/de/tobias/playpad/server/project/Pad.scala
rename to src/main/scala/de/tobias/playpad/server/model/project/Pad.scala
index c3ddd959a76a4333b72e66f8fff830ae68e47c2e..fef69408f89efb81b2c25664b045311c835461b2 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Pad.scala
+++ b/src/main/scala/de/tobias/playpad/server/model/project/Pad.scala
@@ -1,8 +1,8 @@
-package de.tobias.playpad.server.project
+package de.tobias.playpad.server.model.project
import java.util.UUID
-import de.tobias.playpad.server.project.settings.PadSettings
+import de.tobias.playpad.server.model.project.settings.PadSettings
import de.tobias.playpad.server.utils.json._
/**
diff --git a/src/main/scala/de/tobias/playpad/server/project/Page.scala b/src/main/scala/de/tobias/playpad/server/model/project/Page.scala
similarity index 91%
rename from src/main/scala/de/tobias/playpad/server/project/Page.scala
rename to src/main/scala/de/tobias/playpad/server/model/project/Page.scala
index 3a0755a9e99049c730739bcf80abfbe4c443793e..614db92deede1d44df13efaab1c881a548f9a183 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Page.scala
+++ b/src/main/scala/de/tobias/playpad/server/model/project/Page.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project
+package de.tobias.playpad.server.model.project
import java.util.UUID
diff --git a/src/main/scala/de/tobias/playpad/server/project/Path.scala b/src/main/scala/de/tobias/playpad/server/model/project/Path.scala
similarity index 88%
rename from src/main/scala/de/tobias/playpad/server/project/Path.scala
rename to src/main/scala/de/tobias/playpad/server/model/project/Path.scala
index 3e985743ce430bce480e811fd3c9a59acd2dd466..4a64485fc62724f40db53eff3d098ec212b9353e 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Path.scala
+++ b/src/main/scala/de/tobias/playpad/server/model/project/Path.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project
+package de.tobias.playpad.server.model.project
import java.util.UUID
diff --git a/src/main/scala/de/tobias/playpad/server/project/Project.scala b/src/main/scala/de/tobias/playpad/server/model/project/Project.scala
similarity index 91%
rename from src/main/scala/de/tobias/playpad/server/project/Project.scala
rename to src/main/scala/de/tobias/playpad/server/model/project/Project.scala
index d87fac8514ee6063ec6c2faf79894d5825ca6c92..d1de7806885732be30469575521ec5a279e48dca 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Project.scala
+++ b/src/main/scala/de/tobias/playpad/server/model/project/Project.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project
+package de.tobias.playpad.server.model.project
import java.util.UUID
diff --git a/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala b/src/main/scala/de/tobias/playpad/server/model/project/settings/Fade.scala
similarity index 94%
rename from src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
rename to src/main/scala/de/tobias/playpad/server/model/project/settings/Fade.scala
index ae609b957bc81f90cb724bf3e0c486deb882da3b..f0d16c177dc3ae4ad8eb69a9090507efdf513620 100644
--- a/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
+++ b/src/main/scala/de/tobias/playpad/server/model/project/settings/Fade.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project.settings
+package de.tobias.playpad.server.model.project.settings
import java.time.Duration
import java.util.UUID
diff --git a/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala b/src/main/scala/de/tobias/playpad/server/model/project/settings/PadSettings.scala
similarity index 85%
rename from src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
rename to src/main/scala/de/tobias/playpad/server/model/project/settings/PadSettings.scala
index e378a101a729e7ad3377d228d1e041a080e30dda..7f53b6f17dd2114a634833a00b2e40bbd60de83b 100644
--- a/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
+++ b/src/main/scala/de/tobias/playpad/server/model/project/settings/PadSettings.scala
@@ -1,9 +1,9 @@
-package de.tobias.playpad.server.project.settings
+package de.tobias.playpad.server.model.project.settings
import java.time.Duration
import java.util.UUID
-import de.tobias.playpad.server.project.{Design, Pad}
+import de.tobias.playpad.server.model.project.{Design, Pad}
import de.tobias.playpad.server.utils.json._
class PadSettings {
diff --git a/src/main/scala/de/tobias/playpad/server/project/utils/JsonDef.scala b/src/main/scala/de/tobias/playpad/server/project/utils/JsonDef.scala
deleted file mode 100644
index 6cf62d4766861a699f5a252345afe843893ac5c3..0000000000000000000000000000000000000000
--- a/src/main/scala/de/tobias/playpad/server/project/utils/JsonDef.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-package de.tobias.playpad.server.project.utils
-
-/**
- * Created by tobias on 17.02.17.
- */
-object JsonDef {
-
- val PROJECT_ID = "id"
- val PROJECT_NAME = "name"
- val PROJECT_PAGES = "pages"
-
- val PAGE_ID = "id"
- val PAGE_NAME = "name"
- val PAGE_POSITION = "position"
- val PAGE_PADS = "pads"
-
- val PAD_ID = "id"
- val PAD_NAME = "name"
- val PAD_POSITION = "position"
- val PAD_CONTENT_TYPE = "contentType"
- val PAD_PATHS = "paths"
- val PAD_DESIGN = "design"
-
- val PATH_ID = "id"
- val PATH_PATH = "filename"
-
- val DESIGN_ID = "id"
- val DESIGN_BACKGROUND_COLOR = "background_color"
- val DESIGN_PLAY_COLOR = "play_color"
-
-}
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala b/src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala
index 7a5d4739ff5799ef9b951c5db05934a4ba1db773..396e2fd3e1717038b9f35aa22f9446bf3b03c7fc 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala
@@ -5,9 +5,9 @@ import java.util.UUID
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.loader.sql.ProjectLoader
-import de.tobias.playpad.server.project.saver.sql.ProjectSaver
import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.server.sql.loader.ProjectLoader
+import de.tobias.playpad.server.sql.saver.ProjectSaver
import spark.{Request, Response, Route}
/**
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala b/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala
index 0196ecfa40e52d7ea68d7cd2484179a77355653d..070e51cab055f02d7f386ccc3d5cc39998ca8098 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala
@@ -5,8 +5,8 @@ import java.util.UUID
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.loader.sql.ProjectLoader
import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.server.sql.loader.ProjectLoader
import de.tobias.playpad.server.utils.json.JsonSerializer
import spark.{Request, Response, Route}
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectList.scala b/src/main/scala/de/tobias/playpad/server/server/project/ProjectList.scala
index b6ec86789149e392a69f02445b124a1e8155dded..addedaa9e15aa3ca1feb01afc18c0b67c991080b 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectList.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectList.scala
@@ -5,8 +5,8 @@ import java.sql.Connection
import com.google.gson.{JsonArray, JsonObject}
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.loader.sql.ProjectLoader
import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.server.sql.loader.ProjectLoader
import spark.{Request, Response, Route}
/**
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectModificationGet.scala b/src/main/scala/de/tobias/playpad/server/server/project/ProjectModificationGet.scala
index 3f9426a253f6a42f315e39503df7874e29e52b56..c34618c1fd1e94d1f8355d59799df70f1ff76fa5 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectModificationGet.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectModificationGet.scala
@@ -5,8 +5,8 @@ import java.sql.Connection
import com.google.gson.{JsonArray, JsonObject}
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.loader.sql.ProjectLoader
import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.server.sql.loader.ProjectLoader
import spark.{Request, Response, Route}
/**
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala b/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala
index 9c11cdcc0fa55de9d288424ddf0170d82ea59ef9..ad71984ca964995ffca550e5e42274e542bae91a 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala
@@ -5,9 +5,9 @@ import java.sql.Connection
import com.google.gson.JsonParser
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.Project
-import de.tobias.playpad.server.project.saver.sql.ProjectSaver
+import de.tobias.playpad.server.model.project.Project
import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.server.sql.saver.ProjectSaver
import de.tobias.playpad.server.utils.json.JsonSerializer
import spark.{Request, Response, Route}
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
index a653df8beec3ac72bccf4ab60b20a3191f80d2cf..a87c4577fcfa2ba4f6e790a7f2b0b558cb15eeb8 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
@@ -7,9 +7,9 @@ import com.google.gson.{JsonObject, JsonParser}
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account
import de.tobias.playpad.server.account.Account
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
import io.github.classgraph.ClassGraph
import org.eclipse.jetty.websocket.api.Session
import org.eclipse.jetty.websocket.api.annotations.{OnWebSocketClose, OnWebSocketConnect, OnWebSocketMessage, WebSocket}
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala
index cc38412a220024a06252523bff5dc4458b80b9c8..86cb7bc80617516eba21159a9248ea105a706e17 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala
index caf05f0eebb58c36f5b48f1e1c60c8fa143e22be..8167400af9bf2e1e5f01f8ddd0bb54656d0ac663 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef._
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala
index 79bbbd04c3c4afb3d5d20bdeec2a2ddeddcbd434..163528ac704892c0bcb5a417fca5c5a876e9ef56 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala
index 89d1ca4a3b882002c12e37648d2636d1328a9818..3c4d74f4bb9dcc3fc4219d58014eebbd01598cee 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala
index 8c6cf3fd6ee1ce49cb2782c70dd4575e3879cd78..9173e5e0c97e400af073d684730913e67b422c92 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala
index 860eac40eb83b7a8da7c2cafcabb75751bf1e312..ab528e1c5748f64a4873ad66b968645a94476e24 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsAddListener.scala
index 0e53a76a404cd81ce330cd279b84a5b97a7c0eb1..99ec1ea909c20c878d52ff0dcc05f80050484970 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsAddListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
@SyncListener("pad-settings-add")
class PadSettingsAddListener extends Listener {
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala
index d23f15af3c9f25c50b3b213c19441a1d1126f931..dc3585ff9e01c5386fb4b469401e2fa2239eb88d 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
@SyncListener("pad-settings-update")
class PadSettingsUpdateListener extends Listener {
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala
index f2fee8fc674cd01bcb234e19deb36e538d4d4cb3..f4df6a11e9626a6042a6f64d38bb39074fa82634 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala
index a4497db638203a8885e0b9bfee1d8bb8d4a9c42f..ca429004f311f1dd8d989e7fae364d9979e99585 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala
index 45699b6d8fe5c051e3c7f7bda5007ec2ead6f2af..6b067c1787ebd425da04a838ba8b2e31f1a487b1 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
index 60493fbed95c724f763bd02ee77a8859b60de1e1..fe85bbdaa7deb93e875cc728e644cbe8d1472b4b 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala
index 4bfe43f580b662afe37215b79349e2db439d3d8b..8a4d54a2b2f3d3a655a0d6eca50a25c3bdfb00fd 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala
index bc0b81a124fe8a0635be7e7abb059b0b72689f76..8ec793d01195f2052d204f6fc65a1f506778c402 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
index d11853b3ac1a91fe5c1afbbfb0a0a417bbfffbbd..133fdab3be6b0f5916af101754ddf1a9bd03eea1 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala
index 8db813322f8abe8d3413f12c205fcea92d145960..7b8957dd9ab6666e8fb4a3d5432654ed7abd5074 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/utils/SqlDef.scala b/src/main/scala/de/tobias/playpad/server/sql/SqlDef.scala
similarity index 95%
rename from src/main/scala/de/tobias/playpad/server/project/utils/SqlDef.scala
rename to src/main/scala/de/tobias/playpad/server/sql/SqlDef.scala
index bf19db595868a141bbac07be78229729ae00af6c..a33ce1042f536f19805baea253675ed34dab3741 100644
--- a/src/main/scala/de/tobias/playpad/server/project/utils/SqlDef.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/SqlDef.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project.utils
+package de.tobias.playpad.server.sql
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/DesignLoader.scala b/src/main/scala/de/tobias/playpad/server/sql/loader/DesignLoader.scala
similarity index 82%
rename from src/main/scala/de/tobias/playpad/server/project/loader/sql/DesignLoader.scala
rename to src/main/scala/de/tobias/playpad/server/sql/loader/DesignLoader.scala
index 20872ccc0e2a5b7f6568473da5d9eddd6ca9bbb6..076b56d4ee472cb56a82b6eb66e4a4b9a0d547d3 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/DesignLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/loader/DesignLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.loader.sql
+package de.tobias.playpad.server.sql.loader
import java.sql.Connection
import java.util.UUID
-import de.tobias.playpad.server.project.utils.SqlDef._
-import de.tobias.playpad.server.project.{Design, Pad}
+import de.tobias.playpad.server.model.project.{Design, Pad}
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 23.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PadLoader.scala b/src/main/scala/de/tobias/playpad/server/sql/loader/PadLoader.scala
similarity index 85%
rename from src/main/scala/de/tobias/playpad/server/project/loader/sql/PadLoader.scala
rename to src/main/scala/de/tobias/playpad/server/sql/loader/PadLoader.scala
index 4976e6ac7408452ae231af746e0fa3631a83880f..6ab9c22b229a64a32528a362e3ea356e11011213 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PadLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/loader/PadLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.loader.sql
+package de.tobias.playpad.server.sql.loader
import java.sql.Connection
import java.util.UUID
-import de.tobias.playpad.server.project.utils.SqlDef._
-import de.tobias.playpad.server.project.{Pad, Page}
+import de.tobias.playpad.server.model.project.{Pad, Page}
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PageLoader.scala b/src/main/scala/de/tobias/playpad/server/sql/loader/PageLoader.scala
similarity index 82%
rename from src/main/scala/de/tobias/playpad/server/project/loader/sql/PageLoader.scala
rename to src/main/scala/de/tobias/playpad/server/sql/loader/PageLoader.scala
index 2dab58e0bce4f03b029edf3e1e77675cf7d032aa..e7f96688f27aab17f5447ad28f081d7b91e50603 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PageLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/loader/PageLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.loader.sql
+package de.tobias.playpad.server.sql.loader
import java.sql.Connection
import java.util.UUID
-import de.tobias.playpad.server.project.utils.SqlDef._
-import de.tobias.playpad.server.project.{Page, Project}
+import de.tobias.playpad.server.model.project.{Page, Project}
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala b/src/main/scala/de/tobias/playpad/server/sql/loader/PathLoader.scala
similarity index 81%
rename from src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala
rename to src/main/scala/de/tobias/playpad/server/sql/loader/PathLoader.scala
index fd1278432f9432952e1db1a97d74e5b58f9e70aa..51866dec07a503290e2b930a7dc6fa590d793977 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/loader/PathLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.loader.sql
+package de.tobias.playpad.server.sql.loader
import java.sql.Connection
import java.util.UUID
-import de.tobias.playpad.server.project.utils.SqlDef._
-import de.tobias.playpad.server.project.{Pad, Path}
+import de.tobias.playpad.server.model.project.{Pad, Path}
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 20.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/ProjectLoader.scala b/src/main/scala/de/tobias/playpad/server/sql/loader/ProjectLoader.scala
similarity index 93%
rename from src/main/scala/de/tobias/playpad/server/project/loader/sql/ProjectLoader.scala
rename to src/main/scala/de/tobias/playpad/server/sql/loader/ProjectLoader.scala
index 920914a7488b7840cdaf078f95aa4308102a94fb..d82b49a900ef8c4b25a3f820dd2f0f6bea8477e3 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/ProjectLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/loader/ProjectLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.loader.sql
+package de.tobias.playpad.server.sql.loader
import java.sql.Connection
import java.util.UUID
-import de.tobias.playpad.server.project.Project
-import de.tobias.playpad.server.project.utils.SqlDef._
+import de.tobias.playpad.server.model.project.Project
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/DesignSaver.scala b/src/main/scala/de/tobias/playpad/server/sql/saver/DesignSaver.scala
similarity index 76%
rename from src/main/scala/de/tobias/playpad/server/project/saver/sql/DesignSaver.scala
rename to src/main/scala/de/tobias/playpad/server/sql/saver/DesignSaver.scala
index e23db0b4bc91974d0b44334acfbf203f35930d57..aa143573001a921567aced41b94d0fff18a61e3d 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/DesignSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/saver/DesignSaver.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.saver.sql
+package de.tobias.playpad.server.sql.saver
import java.sql.Connection
-import de.tobias.playpad.server.project.Design
-import de.tobias.playpad.server.project.utils.SqlDef._
+import de.tobias.playpad.server.model.project.Design
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 23.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PadSaver.scala b/src/main/scala/de/tobias/playpad/server/sql/saver/PadSaver.scala
similarity index 83%
rename from src/main/scala/de/tobias/playpad/server/project/saver/sql/PadSaver.scala
rename to src/main/scala/de/tobias/playpad/server/sql/saver/PadSaver.scala
index aea6cf82aefcd7ebe76fa4d06e9a20e068145963..8dcfa048173ef7147a0d832ad9513e892c9847e4 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PadSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/saver/PadSaver.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.saver.sql
+package de.tobias.playpad.server.sql.saver
import java.sql.Connection
-import de.tobias.playpad.server.project.Pad
-import de.tobias.playpad.server.project.utils.SqlDef._
+import de.tobias.playpad.server.model.project.Pad
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PageSaver.scala b/src/main/scala/de/tobias/playpad/server/sql/saver/PageSaver.scala
similarity index 77%
rename from src/main/scala/de/tobias/playpad/server/project/saver/sql/PageSaver.scala
rename to src/main/scala/de/tobias/playpad/server/sql/saver/PageSaver.scala
index 6e88cda1d0ccaab58dffdf156e5be039c39bd96f..4400703ca1d89fd025e9cfd4f0590b6a73eff17f 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PageSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/saver/PageSaver.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.saver.sql
+package de.tobias.playpad.server.sql.saver
import java.sql.Connection
-import de.tobias.playpad.server.project.Page
-import de.tobias.playpad.server.project.utils.SqlDef._
+import de.tobias.playpad.server.model.project.Page
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala b/src/main/scala/de/tobias/playpad/server/sql/saver/PathSaver.scala
similarity index 70%
rename from src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala
rename to src/main/scala/de/tobias/playpad/server/sql/saver/PathSaver.scala
index c7f209222ebd19216e6d1d79351997140883cd72..1ee0d9c59a8fa18716ffb64bc2886f2448d9f74c 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/saver/PathSaver.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.saver.sql
+package de.tobias.playpad.server.sql.saver
import java.sql.Connection
-import de.tobias.playpad.server.project.Path
-import de.tobias.playpad.server.project.utils.SqlDef._
+import de.tobias.playpad.server.model.project.Path
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 20.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/ProjectSaver.scala b/src/main/scala/de/tobias/playpad/server/sql/saver/ProjectSaver.scala
similarity index 79%
rename from src/main/scala/de/tobias/playpad/server/project/saver/sql/ProjectSaver.scala
rename to src/main/scala/de/tobias/playpad/server/sql/saver/ProjectSaver.scala
index 10e7cd6af13447dc98dad464bf6ff444088f765f..0415e41e5e0dbc839984842ca8d550e89635b8a0 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/ProjectSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/saver/ProjectSaver.scala
@@ -1,11 +1,11 @@
-package de.tobias.playpad.server.project.saver.sql
+package de.tobias.playpad.server.sql.saver
import java.sql.Connection
import java.util.UUID
-import de.tobias.playpad.server.project.Project
-import de.tobias.playpad.server.project.utils.SqlDef._
+import de.tobias.playpad.server.model.project.Project
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 17.02.17.