diff --git a/src/main/java/de/tobias/playpad/server/project/sync/SyncListener.java b/src/main/java/de/tobias/playpad/server/project/sync/SyncListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..f08a8ad41313e1a4f2a805a2807b04d10c3e5856
--- /dev/null
+++ b/src/main/java/de/tobias/playpad/server/project/sync/SyncListener.java
@@ -0,0 +1,5 @@
+package de.tobias.playpad.server.project.sync;
+
+public @interface SyncListener {
+	String value();
+}
diff --git a/src/main/java/de/tobias/playpad/server/server/project/sync/SyncListener.java b/src/main/java/de/tobias/playpad/server/server/project/sync/SyncListener.java
deleted file mode 100644
index 41fe379763d966791befc2b93323c7d021db8eba..0000000000000000000000000000000000000000
--- a/src/main/java/de/tobias/playpad/server/server/project/sync/SyncListener.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.tobias.playpad.server.server.project.sync;
-
-public @interface SyncListener {
-	String value();
-}
diff --git a/src/main/java/de/tobias/playpad/server/utils/json/JsonCollection.java b/src/main/java/de/tobias/playpad/utils/json/JsonCollection.java
similarity index 84%
rename from src/main/java/de/tobias/playpad/server/utils/json/JsonCollection.java
rename to src/main/java/de/tobias/playpad/utils/json/JsonCollection.java
index 6c39ec6fae05dc563e051bf3fa09a34109b48db6..28370c8f3a8978f4c3501811b08d20ba01e789d9 100644
--- a/src/main/java/de/tobias/playpad/server/utils/json/JsonCollection.java
+++ b/src/main/java/de/tobias/playpad/utils/json/JsonCollection.java
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.json;
+package de.tobias.playpad.utils.json;
 
 import java.lang.annotation.*;
 
diff --git a/src/main/java/de/tobias/playpad/server/utils/json/JsonName.java b/src/main/java/de/tobias/playpad/utils/json/JsonName.java
similarity index 87%
rename from src/main/java/de/tobias/playpad/server/utils/json/JsonName.java
rename to src/main/java/de/tobias/playpad/utils/json/JsonName.java
index bfe979f5c5cdc256ada48693c49ce7ee5fc2ea25..368a53dae633ef822a381994aea3844fb99c12a2 100644
--- a/src/main/java/de/tobias/playpad/server/utils/json/JsonName.java
+++ b/src/main/java/de/tobias/playpad/utils/json/JsonName.java
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.json;
+package de.tobias.playpad.utils.json;
 
 import java.lang.annotation.*;
 
diff --git a/src/main/java/de/tobias/playpad/server/utils/json/JsonObj.java b/src/main/java/de/tobias/playpad/utils/json/JsonObj.java
similarity index 83%
rename from src/main/java/de/tobias/playpad/server/utils/json/JsonObj.java
rename to src/main/java/de/tobias/playpad/utils/json/JsonObj.java
index 3fd0d7fbf7890c40402d4fcddf6893acf842f99f..32e10fbef4f0637de8610d389cf4104e149be4e5 100644
--- a/src/main/java/de/tobias/playpad/server/utils/json/JsonObj.java
+++ b/src/main/java/de/tobias/playpad/utils/json/JsonObj.java
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.json;
+package de.tobias.playpad.utils.json;
 
 import java.lang.annotation.*;
 
diff --git a/src/main/java/de/tobias/playpad/server/utils/json/JsonParent.java b/src/main/java/de/tobias/playpad/utils/json/JsonParent.java
similarity index 75%
rename from src/main/java/de/tobias/playpad/server/utils/json/JsonParent.java
rename to src/main/java/de/tobias/playpad/utils/json/JsonParent.java
index c7b8e82b2ebc96bf738b565ac60455b755559558..ae62d2453c48eb06e1dbbcb1c5217504a77b6f69 100644
--- a/src/main/java/de/tobias/playpad/server/utils/json/JsonParent.java
+++ b/src/main/java/de/tobias/playpad/utils/json/JsonParent.java
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.json;
+package de.tobias.playpad.utils.json;
 
 import java.lang.annotation.*;
 
diff --git a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala b/src/main/scala/de/tobias/playpad/PlayPadServer.scala
similarity index 86%
rename from src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
rename to src/main/scala/de/tobias/playpad/PlayPadServer.scala
index e4a6e7e263a088ab010b4078c95c55b1f917c0df..d5bf73b773196f2886a863490f418c62d8be1f9f 100644
--- a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
+++ b/src/main/scala/de/tobias/playpad/PlayPadServer.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server
+package de.tobias.playpad
 
 import java.nio.file.{Files, Path, Paths}
 import java.sql.{Connection, DriverManager}
@@ -9,16 +9,16 @@ import com.j256.ormlite.table.TableUtils
 import de.thecodelabs.logger.{FileOutputOption, LogLevelFilter, Logger, Slf4JLoggerAdapter}
 import de.thecodelabs.utils.application.ApplicationUtils
 import de.thecodelabs.utils.application.container.PathType
-import de.tobias.playpad.server.account.{Account, Session}
-import de.tobias.playpad.server.plugin.Plugin
-import de.tobias.playpad.server.server.SqlHelper
-import de.tobias.playpad.server.server.account._
-import de.tobias.playpad.server.server.plugin.{PluginGet, PluginList}
-import de.tobias.playpad.server.server.project._
-import de.tobias.playpad.server.server.project.sync.ProjectSyncHandler
-import de.tobias.playpad.server.transformer.JsonTransformer
-import de.tobias.playpad.server.utils.settings.{Settings, SettingsHandler, SettingsLoader}
-import de.tobias.playpad.server.utils.sql.SqlBackgroundRunner
+import de.tobias.playpad.model.account.{Account, Session}
+import de.tobias.playpad.model.plugin.Plugin
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.account._
+import de.tobias.playpad.server.plugin.{PluginGet, PluginList}
+import de.tobias.playpad.server.project.sync.ProjectSyncHandler
+import de.tobias.playpad.server.project.{ProjectDelete, ProjectGet, ProjectList, ProjectPost}
+import de.tobias.playpad.transformer.JsonTransformer
+import de.tobias.playpad.utils.settings.{Settings, SettingsHandler, SettingsLoader}
+import de.tobias.playpad.utils.sql.SqlBackgroundRunner
 import spark.Spark._
 
 /**
diff --git a/src/main/scala/de/tobias/playpad/server/account/Account.scala b/src/main/scala/de/tobias/playpad/model/account/Account.scala
similarity index 96%
rename from src/main/scala/de/tobias/playpad/server/account/Account.scala
rename to src/main/scala/de/tobias/playpad/model/account/Account.scala
index a12592ac9465cc13004fc456eb962402ffc5a4a7..c0a3a55de5e23521a8e5bf01650dec8a9a7b24c5 100644
--- a/src/main/scala/de/tobias/playpad/server/account/Account.scala
+++ b/src/main/scala/de/tobias/playpad/model/account/Account.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.account
+package de.tobias.playpad.model.account
 
 import com.j256.ormlite.dao.{Dao, ForeignCollection}
 import com.j256.ormlite.field.{DatabaseField, ForeignCollectionField}
diff --git a/src/main/scala/de/tobias/playpad/server/account/Session.scala b/src/main/scala/de/tobias/playpad/model/account/Session.scala
similarity index 97%
rename from src/main/scala/de/tobias/playpad/server/account/Session.scala
rename to src/main/scala/de/tobias/playpad/model/account/Session.scala
index 8fa36fb2284fd22b9049e127c52c69cc1ead828e..f812e5170337b5282fea82724d87afe10f74b857 100644
--- a/src/main/scala/de/tobias/playpad/server/account/Session.scala
+++ b/src/main/scala/de/tobias/playpad/model/account/Session.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.account
+package de.tobias.playpad.model.account
 
 import java.sql.Date
 
diff --git a/src/main/scala/de/tobias/playpad/server/plugin/Plugin.scala b/src/main/scala/de/tobias/playpad/model/plugin/Plugin.scala
similarity index 95%
rename from src/main/scala/de/tobias/playpad/server/plugin/Plugin.scala
rename to src/main/scala/de/tobias/playpad/model/plugin/Plugin.scala
index e08b431ab46441b8bfabf7d17bd756c32cb5b6a2..853d630ab9a13404fdad1b7868bb530cd507464e 100644
--- a/src/main/scala/de/tobias/playpad/server/plugin/Plugin.scala
+++ b/src/main/scala/de/tobias/playpad/model/plugin/Plugin.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.plugin
+package de.tobias.playpad.model.plugin
 
 import com.j256.ormlite.field.DatabaseField
 import com.j256.ormlite.table.DatabaseTable
diff --git a/src/main/scala/de/tobias/playpad/server/model/project/Design.scala b/src/main/scala/de/tobias/playpad/model/project/Design.scala
similarity index 71%
rename from src/main/scala/de/tobias/playpad/server/model/project/Design.scala
rename to src/main/scala/de/tobias/playpad/model/project/Design.scala
index ddbcefa38a18579549b445db18303eaa76389bde..1e521eb9a8279134a1f9ce001405c2ca32a83d3c 100644
--- a/src/main/scala/de/tobias/playpad/server/model/project/Design.scala
+++ b/src/main/scala/de/tobias/playpad/model/project/Design.scala
@@ -1,8 +1,8 @@
-package de.tobias.playpad.server.model.project
+package de.tobias.playpad.model.project
 
 import java.util.UUID
 
-import de.tobias.playpad.server.utils.json.{JsonName, JsonParent, UUIDSerializerHandler}
+import de.tobias.playpad.utils.json.{JsonName, JsonParent, UUIDSerializerHandler}
 
 /**
  * Created by tobias on 23.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/model/project/Pad.scala b/src/main/scala/de/tobias/playpad/model/project/Pad.scala
similarity index 80%
rename from src/main/scala/de/tobias/playpad/server/model/project/Pad.scala
rename to src/main/scala/de/tobias/playpad/model/project/Pad.scala
index fef69408f89efb81b2c25664b045311c835461b2..7308410551895a8582c8ee336a89c978bcff753e 100644
--- a/src/main/scala/de/tobias/playpad/server/model/project/Pad.scala
+++ b/src/main/scala/de/tobias/playpad/model/project/Pad.scala
@@ -1,9 +1,9 @@
-package de.tobias.playpad.server.model.project
+package de.tobias.playpad.model.project
 
 import java.util.UUID
 
-import de.tobias.playpad.server.model.project.settings.PadSettings
-import de.tobias.playpad.server.utils.json._
+import de.tobias.playpad.model.project.settings.PadSettings
+import de.tobias.playpad.utils.json._
 
 /**
  * Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/model/project/Page.scala b/src/main/scala/de/tobias/playpad/model/project/Page.scala
similarity index 83%
rename from src/main/scala/de/tobias/playpad/server/model/project/Page.scala
rename to src/main/scala/de/tobias/playpad/model/project/Page.scala
index 614db92deede1d44df13efaab1c881a548f9a183..5d98784a2fbcaeeaac03a88c99d58059295858b3 100644
--- a/src/main/scala/de/tobias/playpad/server/model/project/Page.scala
+++ b/src/main/scala/de/tobias/playpad/model/project/Page.scala
@@ -1,8 +1,8 @@
-package de.tobias.playpad.server.model.project
+package de.tobias.playpad.model.project
 
 import java.util.UUID
 
-import de.tobias.playpad.server.utils.json._
+import de.tobias.playpad.utils.json._
 
 /**
  * Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/model/project/Path.scala b/src/main/scala/de/tobias/playpad/model/project/Path.scala
similarity index 66%
rename from src/main/scala/de/tobias/playpad/server/model/project/Path.scala
rename to src/main/scala/de/tobias/playpad/model/project/Path.scala
index 4a64485fc62724f40db53eff3d098ec212b9353e..3ea785f3746e0ac9e8fbefdf5abda3cbfcf98c5e 100644
--- a/src/main/scala/de/tobias/playpad/server/model/project/Path.scala
+++ b/src/main/scala/de/tobias/playpad/model/project/Path.scala
@@ -1,8 +1,8 @@
-package de.tobias.playpad.server.model.project
+package de.tobias.playpad.model.project
 
 import java.util.UUID
 
-import de.tobias.playpad.server.utils.json.{JsonName, JsonParent, UUIDSerializerHandler}
+import de.tobias.playpad.utils.json.{JsonName, JsonParent, UUIDSerializerHandler}
 
 /**
  * Created by tobias on 20.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/model/project/Project.scala b/src/main/scala/de/tobias/playpad/model/project/Project.scala
similarity index 75%
rename from src/main/scala/de/tobias/playpad/server/model/project/Project.scala
rename to src/main/scala/de/tobias/playpad/model/project/Project.scala
index d1de7806885732be30469575521ec5a279e48dca..91d9573e6fbed9b37a5ab9c63db6f5288b4e972e 100644
--- a/src/main/scala/de/tobias/playpad/server/model/project/Project.scala
+++ b/src/main/scala/de/tobias/playpad/model/project/Project.scala
@@ -1,8 +1,8 @@
-package de.tobias.playpad.server.model.project
+package de.tobias.playpad.model.project
 
 import java.util.UUID
 
-import de.tobias.playpad.server.utils.json.{JsonCollection, JsonName, UUIDSerializerHandler}
+import de.tobias.playpad.utils.json.{JsonCollection, JsonName, UUIDSerializerHandler}
 
 /**
  * Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/model/project/settings/Fade.scala b/src/main/scala/de/tobias/playpad/model/project/settings/Fade.scala
similarity index 89%
rename from src/main/scala/de/tobias/playpad/server/model/project/settings/Fade.scala
rename to src/main/scala/de/tobias/playpad/model/project/settings/Fade.scala
index f0d16c177dc3ae4ad8eb69a9090507efdf513620..a1ca1fe5dd086038cd2c6f19494c528b722a9b8e 100644
--- a/src/main/scala/de/tobias/playpad/server/model/project/settings/Fade.scala
+++ b/src/main/scala/de/tobias/playpad/model/project/settings/Fade.scala
@@ -1,9 +1,9 @@
-package de.tobias.playpad.server.model.project.settings
+package de.tobias.playpad.model.project.settings
 
 import java.time.Duration
 import java.util.UUID
 
-import de.tobias.playpad.server.utils.json._
+import de.tobias.playpad.utils.json._
 
 class Fade {
 
diff --git a/src/main/scala/de/tobias/playpad/server/model/project/settings/PadSettings.scala b/src/main/scala/de/tobias/playpad/model/project/settings/PadSettings.scala
similarity index 80%
rename from src/main/scala/de/tobias/playpad/server/model/project/settings/PadSettings.scala
rename to src/main/scala/de/tobias/playpad/model/project/settings/PadSettings.scala
index 7f53b6f17dd2114a634833a00b2e40bbd60de83b..f645c562f4bb5f51b124e09ca790a46ed4b8797f 100644
--- a/src/main/scala/de/tobias/playpad/server/model/project/settings/PadSettings.scala
+++ b/src/main/scala/de/tobias/playpad/model/project/settings/PadSettings.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.model.project.settings
+package de.tobias.playpad.model.project.settings
 
 import java.time.Duration
 import java.util.UUID
 
-import de.tobias.playpad.server.model.project.{Design, Pad}
-import de.tobias.playpad.server.utils.json._
+import de.tobias.playpad.model.project.{Design, Pad}
+import de.tobias.playpad.utils.json._
 
 class PadSettings {
 
diff --git a/src/main/scala/de/tobias/playpad/server/server/Result.scala b/src/main/scala/de/tobias/playpad/server/Result.scala
similarity index 85%
rename from src/main/scala/de/tobias/playpad/server/server/Result.scala
rename to src/main/scala/de/tobias/playpad/server/Result.scala
index 0d3a207672cba3165dd98cd25eddf17bf4ce3a3f..cdf9de7beb921c249c2c66a5cf8026597d018bd5 100644
--- a/src/main/scala/de/tobias/playpad/server/server/Result.scala
+++ b/src/main/scala/de/tobias/playpad/server/Result.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.server
+package de.tobias.playpad.server
 
 /**
  * Created by tobias on 16.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala b/src/main/scala/de/tobias/playpad/server/SqlHelper.scala
similarity index 99%
rename from src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala
rename to src/main/scala/de/tobias/playpad/server/SqlHelper.scala
index 6a397c4e53a084bd51b2466f53efe96608f666ab..366f568915fc331607f286f34006ac78f115e002 100644
--- a/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala
+++ b/src/main/scala/de/tobias/playpad/server/SqlHelper.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.server
+package de.tobias.playpad.server
 
 import java.sql.Types.NULL
 import java.sql.{Connection, PreparedStatement}
diff --git a/src/main/scala/de/tobias/playpad/server/server/Status.scala b/src/main/scala/de/tobias/playpad/server/Status.scala
similarity index 72%
rename from src/main/scala/de/tobias/playpad/server/server/Status.scala
rename to src/main/scala/de/tobias/playpad/server/Status.scala
index 3e755093ff970f2bbb904fd7a433b1935a9e44c6..53e4c04fddb55b2cd193c6230b664564e442e2bd 100644
--- a/src/main/scala/de/tobias/playpad/server/server/Status.scala
+++ b/src/main/scala/de/tobias/playpad/server/Status.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.server
+package de.tobias.playpad.server
 
 /**
  * Created by tobias on 16.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/account/AccountPost.scala b/src/main/scala/de/tobias/playpad/server/account/AccountPost.scala
similarity index 79%
rename from src/main/scala/de/tobias/playpad/server/server/account/AccountPost.scala
rename to src/main/scala/de/tobias/playpad/server/account/AccountPost.scala
index 1334f045eb65207f198269cbd64e2a2cd554a8a4..ce2f66144e64e613dee35347c9ae2a210b0eb500 100644
--- a/src/main/scala/de/tobias/playpad/server/server/account/AccountPost.scala
+++ b/src/main/scala/de/tobias/playpad/server/account/AccountPost.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.server.account
+package de.tobias.playpad.server.account
 
 import java.sql.SQLException
 
 import com.j256.ormlite.dao.Dao
-import de.tobias.playpad.server.account.Account
-import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.model.account.Account
+import de.tobias.playpad.server.{Result, Status}
 import spark.{Request, Response, Route}
 
 /**
diff --git a/src/main/scala/de/tobias/playpad/server/server/account/AccountPut.scala b/src/main/scala/de/tobias/playpad/server/account/AccountPut.scala
similarity index 86%
rename from src/main/scala/de/tobias/playpad/server/server/account/AccountPut.scala
rename to src/main/scala/de/tobias/playpad/server/account/AccountPut.scala
index 92658be25fcae617562c790378e585a4534e580d..e6be26d699eef8d07bc74017ad3bac2ccd96f9f0 100644
--- a/src/main/scala/de/tobias/playpad/server/server/account/AccountPut.scala
+++ b/src/main/scala/de/tobias/playpad/server/account/AccountPut.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.server.account
+package de.tobias.playpad.server.account
 
 import java.sql.SQLException
 
 import com.j256.ormlite.dao.Dao
-import de.tobias.playpad.server.account.Account
-import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.model.account.Account
+import de.tobias.playpad.server.{Result, Status}
 import spark.{Request, Response, Route}
 
 /**
diff --git a/src/main/scala/de/tobias/playpad/server/server/account/SessionDelete.scala b/src/main/scala/de/tobias/playpad/server/account/SessionDelete.scala
similarity index 83%
rename from src/main/scala/de/tobias/playpad/server/server/account/SessionDelete.scala
rename to src/main/scala/de/tobias/playpad/server/account/SessionDelete.scala
index e0d5c7b4055d4646c451cba41accfd44c30820fb..c569de782867cdb1d393c6e239316bba5298e82d 100644
--- a/src/main/scala/de/tobias/playpad/server/server/account/SessionDelete.scala
+++ b/src/main/scala/de/tobias/playpad/server/account/SessionDelete.scala
@@ -1,8 +1,8 @@
-package de.tobias.playpad.server.server.account
+package de.tobias.playpad.server.account
 
 import com.j256.ormlite.dao.Dao
-import de.tobias.playpad.server.account.Account
-import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.model.account.Account
+import de.tobias.playpad.server.{Result, Status}
 import spark.{Request, Response, Route}
 
 /**
diff --git a/src/main/scala/de/tobias/playpad/server/server/account/SessionGet.scala b/src/main/scala/de/tobias/playpad/server/account/SessionGet.scala
similarity index 85%
rename from src/main/scala/de/tobias/playpad/server/server/account/SessionGet.scala
rename to src/main/scala/de/tobias/playpad/server/account/SessionGet.scala
index d9f0a24ad98ad57e850b6194e0e93f015cf76241..12d73f53ca2fa720df25a741010ea83bb014f184 100644
--- a/src/main/scala/de/tobias/playpad/server/server/account/SessionGet.scala
+++ b/src/main/scala/de/tobias/playpad/server/account/SessionGet.scala
@@ -1,9 +1,9 @@
-package de.tobias.playpad.server.server.account
+package de.tobias.playpad.server.account
 
 import com.google.gson.{JsonArray, JsonObject}
 import com.j256.ormlite.dao.Dao
-import de.tobias.playpad.server.account.Account
-import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.model.account.Account
+import de.tobias.playpad.server.{Result, Status}
 import spark.{Request, Response, Route}
 
 /**
diff --git a/src/main/scala/de/tobias/playpad/server/server/account/SessionPost.scala b/src/main/scala/de/tobias/playpad/server/account/SessionPost.scala
similarity index 86%
rename from src/main/scala/de/tobias/playpad/server/server/account/SessionPost.scala
rename to src/main/scala/de/tobias/playpad/server/account/SessionPost.scala
index 98b759bab1b962076ca6ecc6f7e9109b23faadc3..8e9e0a39b9d9d298e762ce172840decacf15183f 100644
--- a/src/main/scala/de/tobias/playpad/server/server/account/SessionPost.scala
+++ b/src/main/scala/de/tobias/playpad/server/account/SessionPost.scala
@@ -1,8 +1,8 @@
-package de.tobias.playpad.server.server.account
+package de.tobias.playpad.server.account
 
 import com.j256.ormlite.dao.Dao
-import de.tobias.playpad.server.account.{Account, Session}
-import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.model.account.{Account, Session}
+import de.tobias.playpad.server.{Result, Status}
 import spark.{Request, Response, Route}
 
 /**
diff --git a/src/main/scala/de/tobias/playpad/server/server/plugin/PluginGet.scala b/src/main/scala/de/tobias/playpad/server/plugin/PluginGet.scala
similarity index 74%
rename from src/main/scala/de/tobias/playpad/server/server/plugin/PluginGet.scala
rename to src/main/scala/de/tobias/playpad/server/plugin/PluginGet.scala
index 6f528056bf15955dc22650125611c317e412066f..5772d2da6bb79ce32eb3167ff79f0f2593b97c15 100644
--- a/src/main/scala/de/tobias/playpad/server/server/plugin/PluginGet.scala
+++ b/src/main/scala/de/tobias/playpad/server/plugin/PluginGet.scala
@@ -1,9 +1,9 @@
-package de.tobias.playpad.server.server.plugin
+package de.tobias.playpad.server.plugin
 
 import com.google.gson.Gson
 import com.j256.ormlite.dao.Dao
-import de.tobias.playpad.server.plugin.Plugin
-import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.model.plugin.Plugin
+import de.tobias.playpad.server.{Result, Status}
 import spark.{Request, Response, Route}
 
 /**
diff --git a/src/main/scala/de/tobias/playpad/server/server/plugin/PluginList.scala b/src/main/scala/de/tobias/playpad/server/plugin/PluginList.scala
similarity index 78%
rename from src/main/scala/de/tobias/playpad/server/server/plugin/PluginList.scala
rename to src/main/scala/de/tobias/playpad/server/plugin/PluginList.scala
index 54dce56a764e40a8d8470e19620391593405cf11..a071fc3b779ffcc29621a7576c9d9b72349e0422 100644
--- a/src/main/scala/de/tobias/playpad/server/server/plugin/PluginList.scala
+++ b/src/main/scala/de/tobias/playpad/server/plugin/PluginList.scala
@@ -1,8 +1,8 @@
-package de.tobias.playpad.server.server.plugin
+package de.tobias.playpad.server.plugin
 
 import com.google.gson.Gson
 import com.j256.ormlite.dao.Dao
-import de.tobias.playpad.server.plugin.Plugin
+import de.tobias.playpad.model.plugin.Plugin
 import spark.{Request, Response, Route}
 
 /**
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala b/src/main/scala/de/tobias/playpad/server/project/ProjectDelete.scala
similarity index 78%
rename from src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala
rename to src/main/scala/de/tobias/playpad/server/project/ProjectDelete.scala
index 396e2fd3e1717038b9f35aa22f9446bf3b03c7fc..e7ad292802e348e1b016725b527dce0c6dc726e5 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/ProjectDelete.scala
@@ -1,13 +1,13 @@
-package de.tobias.playpad.server.server.project
+package de.tobias.playpad.server.project
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.j256.ormlite.dao.Dao
-import de.tobias.playpad.server.account.Session
-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 de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.{Result, Status}
+import de.tobias.playpad.sql.loader.ProjectLoader
+import de.tobias.playpad.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/project/ProjectGet.scala
similarity index 77%
rename from src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala
rename to src/main/scala/de/tobias/playpad/server/project/ProjectGet.scala
index 070e51cab055f02d7f386ccc3d5cc39998ca8098..f61efee8fc1d94333c57c0c40974251a583e9e0e 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/ProjectGet.scala
@@ -1,13 +1,13 @@
-package de.tobias.playpad.server.server.project
+package de.tobias.playpad.server.project
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.j256.ormlite.dao.Dao
-import de.tobias.playpad.server.account.Session
-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 de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.{Result, Status}
+import de.tobias.playpad.sql.loader.ProjectLoader
+import de.tobias.playpad.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/project/ProjectList.scala
similarity index 81%
rename from src/main/scala/de/tobias/playpad/server/server/project/ProjectList.scala
rename to src/main/scala/de/tobias/playpad/server/project/ProjectList.scala
index addedaa9e15aa3ca1feb01afc18c0b67c991080b..bbc89a1c5a236554ab5b09af50d7ac6353a49a08 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectList.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/ProjectList.scala
@@ -1,12 +1,12 @@
-package de.tobias.playpad.server.server.project
+package de.tobias.playpad.server.project
 
 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.server.{Result, Status}
-import de.tobias.playpad.server.sql.loader.ProjectLoader
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.{Result, Status}
+import de.tobias.playpad.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/project/ProjectModificationGet.scala
similarity index 83%
rename from src/main/scala/de/tobias/playpad/server/server/project/ProjectModificationGet.scala
rename to src/main/scala/de/tobias/playpad/server/project/ProjectModificationGet.scala
index c34618c1fd1e94d1f8355d59799df70f1ff76fa5..112570b819b41eb660513ed0c0d8c7ca4076291f 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectModificationGet.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/ProjectModificationGet.scala
@@ -1,12 +1,12 @@
-package de.tobias.playpad.server.server.project
+package de.tobias.playpad.server.project
 
 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.server.{Result, Status}
-import de.tobias.playpad.server.sql.loader.ProjectLoader
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.{Result, Status}
+import de.tobias.playpad.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/project/ProjectPost.scala
similarity index 73%
rename from src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala
rename to src/main/scala/de/tobias/playpad/server/project/ProjectPost.scala
index ad71984ca964995ffca550e5e42274e542bae91a..2c82068f8276d95032b0e8dbf508f5b735a8b571 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/ProjectPost.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project
+package de.tobias.playpad.server.project
 
 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.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 de.tobias.playpad.model.account.Session
+import de.tobias.playpad.model.project.Project
+import de.tobias.playpad.server.{Result, Status}
+import de.tobias.playpad.sql.saver.ProjectSaver
+import de.tobias.playpad.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/project/sync/ProjectSyncHandler.scala
similarity index 92%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/ProjectSyncHandler.scala
index a87c4577fcfa2ba4f6e790a7f2b0b558cb15eeb8..f808c7e6a23f838a8fe86c24d2f7700e1b9b686c 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/ProjectSyncHandler.scala
@@ -1,15 +1,15 @@
-package de.tobias.playpad.server.server.project.sync
+package de.tobias.playpad.server.project.sync
 
 import java.sql.Connection
 import java.util.UUID
 
 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.server.SqlHelper
-import de.tobias.playpad.server.server.project.sync.listener.Listener
-import de.tobias.playpad.server.sql.SqlDef
+import de.tobias.playpad.model.account
+import de.tobias.playpad.model.account.Account
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/Listener.scala b/src/main/scala/de/tobias/playpad/server/project/sync/listener/Listener.scala
similarity index 65%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/Listener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/Listener.scala
index 3693666f3fad5d583db4da99ced9f0923b8d6ce6..700907abacabac765c22a693d72bc087b1ff3d12 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/Listener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/Listener.scala
@@ -1,9 +1,9 @@
-package de.tobias.playpad.server.server.project.sync.listener
+package de.tobias.playpad.server.project.sync.listener
 
 import java.sql.Connection
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
+import de.tobias.playpad.model.account.Session
 
 /**
  * Created by tobias on 18.02.17.
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/project/sync/listener/design/DesignAddListener.scala
similarity index 71%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/design/DesignAddListener.scala
index 86cb7bc80617516eba21159a9248ea105a706e17..a8bf32733c129af094a8e9da471477ba635452e7 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/design/DesignAddListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.design
+package de.tobias.playpad.server.project.sync.listener.design
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/design/DesignUpdateListener.scala
similarity index 71%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/design/DesignUpdateListener.scala
index 8167400af9bf2e1e5f01f8ddd0bb54656d0ac663..6e212aa00e7f23541cd12cdeaf6ea6fcecf7eb6f 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/design/DesignUpdateListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.design
+package de.tobias.playpad.server.project.sync.listener.design
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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._
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/pad/PadAddListener.scala
similarity index 74%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/pad/PadAddListener.scala
index 163528ac704892c0bcb5a417fca5c5a876e9ef56..4e4d9e8b32c0d562e859cf1c7f1507c6d6902963 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/pad/PadAddListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.pad
+package de.tobias.playpad.server.project.sync.listener.pad
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/pad/PadClearListener.scala
similarity index 54%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/pad/PadClearListener.scala
index 3c4d74f4bb9dcc3fc4219d58014eebbd01598cee..7e3eb0b20a399c248958f18f68348b98231c8211 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/pad/PadClearListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.pad
+package de.tobias.playpad.server.project.sync.listener.pad
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/pad/PadRemoveListener.scala
similarity index 54%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/pad/PadRemoveListener.scala
index 9173e5e0c97e400af073d684730913e67b422c92..6710aef2343b49cfc464ca5f299356fd80828f9e 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/pad/PadRemoveListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.pad
+package de.tobias.playpad.server.project.sync.listener.pad
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/pad/PadUpdateListener.scala
similarity index 76%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/pad/PadUpdateListener.scala
index ab528e1c5748f64a4873ad66b968645a94476e24..9e949555ed51dd34e0851076beddca88c7eddb1e 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/pad/PadUpdateListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.pad
+package de.tobias.playpad.server.project.sync.listener.pad
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/pad/settings/PadSettingsAddListener.scala
similarity index 77%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsAddListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/pad/settings/PadSettingsAddListener.scala
index 99ec1ea909c20c878d52ff0dcc05f80050484970..6b0b29c73292fd79222c325660836bb27b26c8d6 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/project/sync/listener/pad/settings/PadSettingsAddListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.pad.settings
+package de.tobias.playpad.server.project.sync.listener.pad.settings
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala
similarity index 79%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala
index dc3585ff9e01c5386fb4b469401e2fa2239eb88d..159c8fbdff40fb52fee28cd01dd3455c5544eada 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/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.pad.settings
+package de.tobias.playpad.server.project.sync.listener.pad.settings
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/page/PageAddListener.scala
similarity index 69%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/page/PageAddListener.scala
index f4df6a11e9626a6042a6f64d38bb39074fa82634..6788aef48a8dd302af8371045639b1d57cedfa09 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/page/PageAddListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.page
+package de.tobias.playpad.server.project.sync.listener.page
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/page/PageRemoveListener.scala
similarity index 54%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/page/PageRemoveListener.scala
index ca429004f311f1dd8d989e7fae364d9979e99585..ac7512fe67599001de0bced5b6ab577aac4b6c1f 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/page/PageRemoveListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.page
+package de.tobias.playpad.server.project.sync.listener.page
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/page/PageUpdateListener.scala
similarity index 71%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/page/PageUpdateListener.scala
index 6b067c1787ebd425da04a838ba8b2e31f1a487b1..26dba32e66af5693bb9f18818a526f6f1b8573fc 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/page/PageUpdateListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.page
+package de.tobias.playpad.server.project.sync.listener.page
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/path/PathAddListener.scala
similarity index 66%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/path/PathAddListener.scala
index fe85bbdaa7deb93e875cc728e644cbe8d1472b4b..1b14ce5cd84826886077c98c6cd6b34eb1429e90 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/path/PathAddListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.path
+package de.tobias.playpad.server.project.sync.listener.path
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/path/PathRemoveListener.scala
similarity index 54%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/path/PathRemoveListener.scala
index 8a4d54a2b2f3d3a655a0d6eca50a25c3bdfb00fd..43b91df0cb98bdb94dd9a70bc6c4b1a2075c4457 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/path/PathRemoveListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.path
+package de.tobias.playpad.server.project.sync.listener.path
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/project/ProjectAddListener.scala
similarity index 64%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/project/ProjectAddListener.scala
index 8ec793d01195f2052d204f6fc65a1f506778c402..900217b138113ecf0cf02ef3574fe9570b42778b 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/project/ProjectAddListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.project
+package de.tobias.playpad.server.project.sync.listener.project
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/project/ProjectRemoveListener.scala
similarity index 54%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/project/ProjectRemoveListener.scala
index 133fdab3be6b0f5916af101754ddf1a9bd03eea1..72cf2baa55b8b598aa54f2a42186ee6409ccfa85 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/project/ProjectRemoveListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.project
+package de.tobias.playpad.server.project.sync.listener.project
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.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/project/sync/listener/project/ProjectUpdateListener.scala
similarity index 61%
rename from src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala
rename to src/main/scala/de/tobias/playpad/server/project/sync/listener/project/ProjectUpdateListener.scala
index 7b8957dd9ab6666e8fb4a3d5432654ed7abd5074..bbb7bbbc04a7da3c890bc43b6a525d162ae18c96 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/sync/listener/project/ProjectUpdateListener.scala
@@ -1,14 +1,14 @@
-package de.tobias.playpad.server.server.project.sync.listener.project
+package de.tobias.playpad.server.project.sync.listener.project
 
 import java.sql.Connection
 import java.util.UUID
 
 import com.google.gson.JsonObject
-import de.tobias.playpad.server.account.Session
-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
+import de.tobias.playpad.model.account.Session
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.server.project.sync.SyncListener
+import de.tobias.playpad.server.project.sync.listener.Listener
+import de.tobias.playpad.sql.SqlDef
 
 /**
  * Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/sql/SqlDef.scala b/src/main/scala/de/tobias/playpad/sql/SqlDef.scala
similarity index 96%
rename from src/main/scala/de/tobias/playpad/server/sql/SqlDef.scala
rename to src/main/scala/de/tobias/playpad/sql/SqlDef.scala
index a33ce1042f536f19805baea253675ed34dab3741..a0fe5d4ac41a991be94513afa732d41c40d544ee 100644
--- a/src/main/scala/de/tobias/playpad/server/sql/SqlDef.scala
+++ b/src/main/scala/de/tobias/playpad/sql/SqlDef.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.sql
+package de.tobias.playpad.sql
 
 /**
  * Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/sql/loader/DesignLoader.scala b/src/main/scala/de/tobias/playpad/sql/loader/DesignLoader.scala
similarity index 83%
rename from src/main/scala/de/tobias/playpad/server/sql/loader/DesignLoader.scala
rename to src/main/scala/de/tobias/playpad/sql/loader/DesignLoader.scala
index 076b56d4ee472cb56a82b6eb66e4a4b9a0d547d3..f8ed41d5643e549e655061aa08f897176f03b986 100644
--- a/src/main/scala/de/tobias/playpad/server/sql/loader/DesignLoader.scala
+++ b/src/main/scala/de/tobias/playpad/sql/loader/DesignLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.sql.loader
+package de.tobias.playpad.sql.loader
 
 import java.sql.Connection
 import java.util.UUID
 
-import de.tobias.playpad.server.model.project.{Design, Pad}
-import de.tobias.playpad.server.sql.SqlDef._
+import de.tobias.playpad.model.project.{Design, Pad}
+import de.tobias.playpad.sql.SqlDef._
 
 /**
  * Created by tobias on 23.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/sql/loader/PadLoader.scala b/src/main/scala/de/tobias/playpad/sql/loader/PadLoader.scala
similarity index 86%
rename from src/main/scala/de/tobias/playpad/server/sql/loader/PadLoader.scala
rename to src/main/scala/de/tobias/playpad/sql/loader/PadLoader.scala
index 6ab9c22b229a64a32528a362e3ea356e11011213..9f41024f1b4f87184e0671e13122d634653c5a21 100644
--- a/src/main/scala/de/tobias/playpad/server/sql/loader/PadLoader.scala
+++ b/src/main/scala/de/tobias/playpad/sql/loader/PadLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.sql.loader
+package de.tobias.playpad.sql.loader
 
 import java.sql.Connection
 import java.util.UUID
 
-import de.tobias.playpad.server.model.project.{Pad, Page}
-import de.tobias.playpad.server.sql.SqlDef._
+import de.tobias.playpad.model.project.{Pad, Page}
+import de.tobias.playpad.sql.SqlDef._
 
 /**
  * Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/sql/loader/PageLoader.scala b/src/main/scala/de/tobias/playpad/sql/loader/PageLoader.scala
similarity index 83%
rename from src/main/scala/de/tobias/playpad/server/sql/loader/PageLoader.scala
rename to src/main/scala/de/tobias/playpad/sql/loader/PageLoader.scala
index e7f96688f27aab17f5447ad28f081d7b91e50603..c7444ca6b9e623735dda999c89cac0237ddab3ee 100644
--- a/src/main/scala/de/tobias/playpad/server/sql/loader/PageLoader.scala
+++ b/src/main/scala/de/tobias/playpad/sql/loader/PageLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.sql.loader
+package de.tobias.playpad.sql.loader
 
 import java.sql.Connection
 import java.util.UUID
 
-import de.tobias.playpad.server.model.project.{Page, Project}
-import de.tobias.playpad.server.sql.SqlDef._
+import de.tobias.playpad.model.project.{Page, Project}
+import de.tobias.playpad.sql.SqlDef._
 
 /**
  * Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/sql/loader/PathLoader.scala b/src/main/scala/de/tobias/playpad/sql/loader/PathLoader.scala
similarity index 82%
rename from src/main/scala/de/tobias/playpad/server/sql/loader/PathLoader.scala
rename to src/main/scala/de/tobias/playpad/sql/loader/PathLoader.scala
index 51866dec07a503290e2b930a7dc6fa590d793977..2f2a926a3f3840189b9d7ba7b2b5090043016835 100644
--- a/src/main/scala/de/tobias/playpad/server/sql/loader/PathLoader.scala
+++ b/src/main/scala/de/tobias/playpad/sql/loader/PathLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.sql.loader
+package de.tobias.playpad.sql.loader
 
 import java.sql.Connection
 import java.util.UUID
 
-import de.tobias.playpad.server.model.project.{Pad, Path}
-import de.tobias.playpad.server.sql.SqlDef._
+import de.tobias.playpad.model.project.{Pad, Path}
+import de.tobias.playpad.sql.SqlDef._
 
 /**
  * Created by tobias on 20.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/sql/loader/ProjectLoader.scala b/src/main/scala/de/tobias/playpad/sql/loader/ProjectLoader.scala
similarity index 93%
rename from src/main/scala/de/tobias/playpad/server/sql/loader/ProjectLoader.scala
rename to src/main/scala/de/tobias/playpad/sql/loader/ProjectLoader.scala
index d82b49a900ef8c4b25a3f820dd2f0f6bea8477e3..f64fa0b698f61c2f0121f38d96942af156ca6c81 100644
--- a/src/main/scala/de/tobias/playpad/server/sql/loader/ProjectLoader.scala
+++ b/src/main/scala/de/tobias/playpad/sql/loader/ProjectLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.sql.loader
+package de.tobias.playpad.sql.loader
 
 import java.sql.Connection
 import java.util.UUID
 
-import de.tobias.playpad.server.model.project.Project
-import de.tobias.playpad.server.sql.SqlDef._
+import de.tobias.playpad.model.project.Project
+import de.tobias.playpad.sql.SqlDef._
 
 /**
  * Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/sql/saver/DesignSaver.scala b/src/main/scala/de/tobias/playpad/sql/saver/DesignSaver.scala
similarity index 70%
rename from src/main/scala/de/tobias/playpad/server/sql/saver/DesignSaver.scala
rename to src/main/scala/de/tobias/playpad/sql/saver/DesignSaver.scala
index aa143573001a921567aced41b94d0fff18a61e3d..9eb0593d521f3b6c282036e1465810fefd5c6f46 100644
--- a/src/main/scala/de/tobias/playpad/server/sql/saver/DesignSaver.scala
+++ b/src/main/scala/de/tobias/playpad/sql/saver/DesignSaver.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.sql.saver
+package de.tobias.playpad.sql.saver
 
 import java.sql.Connection
 
-import de.tobias.playpad.server.model.project.Design
-import de.tobias.playpad.server.server.SqlHelper
-import de.tobias.playpad.server.sql.SqlDef._
+import de.tobias.playpad.model.project.Design
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.sql.SqlDef._
 
 /**
  * Created by tobias on 23.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/sql/saver/PadSaver.scala b/src/main/scala/de/tobias/playpad/sql/saver/PadSaver.scala
similarity index 78%
rename from src/main/scala/de/tobias/playpad/server/sql/saver/PadSaver.scala
rename to src/main/scala/de/tobias/playpad/sql/saver/PadSaver.scala
index 8dcfa048173ef7147a0d832ad9513e892c9847e4..78461a3fa0ddbef01fdc81bdb14d90bada848f16 100644
--- a/src/main/scala/de/tobias/playpad/server/sql/saver/PadSaver.scala
+++ b/src/main/scala/de/tobias/playpad/sql/saver/PadSaver.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.sql.saver
+package de.tobias.playpad.sql.saver
 
 import java.sql.Connection
 
-import de.tobias.playpad.server.model.project.Pad
-import de.tobias.playpad.server.server.SqlHelper
-import de.tobias.playpad.server.sql.SqlDef._
+import de.tobias.playpad.model.project.Pad
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.sql.SqlDef._
 
 /**
  * Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/sql/saver/PageSaver.scala b/src/main/scala/de/tobias/playpad/sql/saver/PageSaver.scala
similarity index 71%
rename from src/main/scala/de/tobias/playpad/server/sql/saver/PageSaver.scala
rename to src/main/scala/de/tobias/playpad/sql/saver/PageSaver.scala
index 4400703ca1d89fd025e9cfd4f0590b6a73eff17f..1b963a697414e575a22411d55243139001181c2b 100644
--- a/src/main/scala/de/tobias/playpad/server/sql/saver/PageSaver.scala
+++ b/src/main/scala/de/tobias/playpad/sql/saver/PageSaver.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.sql.saver
+package de.tobias.playpad.sql.saver
 
 import java.sql.Connection
 
-import de.tobias.playpad.server.model.project.Page
-import de.tobias.playpad.server.server.SqlHelper
-import de.tobias.playpad.server.sql.SqlDef._
+import de.tobias.playpad.model.project.Page
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.sql.SqlDef._
 
 /**
  * Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/sql/saver/PathSaver.scala b/src/main/scala/de/tobias/playpad/sql/saver/PathSaver.scala
similarity index 62%
rename from src/main/scala/de/tobias/playpad/server/sql/saver/PathSaver.scala
rename to src/main/scala/de/tobias/playpad/sql/saver/PathSaver.scala
index 1ee0d9c59a8fa18716ffb64bc2886f2448d9f74c..ef4192a7dfa6014abc7977156f1a569f15e27d21 100644
--- a/src/main/scala/de/tobias/playpad/server/sql/saver/PathSaver.scala
+++ b/src/main/scala/de/tobias/playpad/sql/saver/PathSaver.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.sql.saver
+package de.tobias.playpad.sql.saver
 
 import java.sql.Connection
 
-import de.tobias.playpad.server.model.project.Path
-import de.tobias.playpad.server.server.SqlHelper
-import de.tobias.playpad.server.sql.SqlDef._
+import de.tobias.playpad.model.project.Path
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.sql.SqlDef._
 
 /**
  * Created by tobias on 20.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/sql/saver/ProjectSaver.scala b/src/main/scala/de/tobias/playpad/sql/saver/ProjectSaver.scala
similarity index 74%
rename from src/main/scala/de/tobias/playpad/server/sql/saver/ProjectSaver.scala
rename to src/main/scala/de/tobias/playpad/sql/saver/ProjectSaver.scala
index 0415e41e5e0dbc839984842ca8d550e89635b8a0..351d807ac40d93045faf411e12654d4c5a46b4c9 100644
--- a/src/main/scala/de/tobias/playpad/server/sql/saver/ProjectSaver.scala
+++ b/src/main/scala/de/tobias/playpad/sql/saver/ProjectSaver.scala
@@ -1,11 +1,11 @@
-package de.tobias.playpad.server.sql.saver
+package de.tobias.playpad.sql.saver
 
 import java.sql.Connection
 import java.util.UUID
 
-import de.tobias.playpad.server.model.project.Project
-import de.tobias.playpad.server.server.SqlHelper
-import de.tobias.playpad.server.sql.SqlDef._
+import de.tobias.playpad.model.project.Project
+import de.tobias.playpad.server.SqlHelper
+import de.tobias.playpad.sql.SqlDef._
 
 /**
  * Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/transformer/JsonTransformer.scala b/src/main/scala/de/tobias/playpad/transformer/JsonTransformer.scala
similarity index 88%
rename from src/main/scala/de/tobias/playpad/server/transformer/JsonTransformer.scala
rename to src/main/scala/de/tobias/playpad/transformer/JsonTransformer.scala
index 89dc908f126553935c64aa7f8913b269cb90a686..2563e092311551c139892cd5015ca9ae3f686406 100644
--- a/src/main/scala/de/tobias/playpad/server/transformer/JsonTransformer.scala
+++ b/src/main/scala/de/tobias/playpad/transformer/JsonTransformer.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.transformer
+package de.tobias.playpad.transformer
 
 import com.google.gson.{Gson, JsonObject}
 import spark.ResponseTransformer
diff --git a/src/main/scala/de/tobias/playpad/server/utils/json/BooleanSerializerHandler.scala b/src/main/scala/de/tobias/playpad/utils/json/BooleanSerializerHandler.scala
similarity index 90%
rename from src/main/scala/de/tobias/playpad/server/utils/json/BooleanSerializerHandler.scala
rename to src/main/scala/de/tobias/playpad/utils/json/BooleanSerializerHandler.scala
index c77efee4ffd4eabae25dc496d9e620467bad1d7b..da4625a68a16ca05c6acd8489c1eddb9f6b0aa21 100644
--- a/src/main/scala/de/tobias/playpad/server/utils/json/BooleanSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/utils/json/BooleanSerializerHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.json
+package de.tobias.playpad.utils.json
 
 import com.google.gson.{JsonElement, JsonPrimitive}
 
diff --git a/src/main/scala/de/tobias/playpad/server/utils/json/DoubleSerializerHandler.scala b/src/main/scala/de/tobias/playpad/utils/json/DoubleSerializerHandler.scala
similarity index 90%
rename from src/main/scala/de/tobias/playpad/server/utils/json/DoubleSerializerHandler.scala
rename to src/main/scala/de/tobias/playpad/utils/json/DoubleSerializerHandler.scala
index 86ab05173a08ca1bfc8e9b921a8130b9a0175b52..d2a12c0c4762f5f38e68938e535609857240f6d9 100644
--- a/src/main/scala/de/tobias/playpad/server/utils/json/DoubleSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/utils/json/DoubleSerializerHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.json
+package de.tobias.playpad.utils.json
 
 import com.google.gson.{JsonElement, JsonPrimitive}
 
diff --git a/src/main/scala/de/tobias/playpad/server/utils/json/DurationSerializerHandler.scala b/src/main/scala/de/tobias/playpad/utils/json/DurationSerializerHandler.scala
similarity index 91%
rename from src/main/scala/de/tobias/playpad/server/utils/json/DurationSerializerHandler.scala
rename to src/main/scala/de/tobias/playpad/utils/json/DurationSerializerHandler.scala
index 3b4576ee367d8e15366d62ce93d3ec34a6fdfca8..b840a3eccec581cc600e5c9dc45579e3d42f60e4 100644
--- a/src/main/scala/de/tobias/playpad/server/utils/json/DurationSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/utils/json/DurationSerializerHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.json
+package de.tobias.playpad.utils.json
 
 import java.time.Duration
 
diff --git a/src/main/scala/de/tobias/playpad/server/utils/json/IntSerializerHandler.scala b/src/main/scala/de/tobias/playpad/utils/json/IntSerializerHandler.scala
similarity index 90%
rename from src/main/scala/de/tobias/playpad/server/utils/json/IntSerializerHandler.scala
rename to src/main/scala/de/tobias/playpad/utils/json/IntSerializerHandler.scala
index 71b6ddc860647604a0a7dfb17701aaa5df018f40..fe7d0846514350f28f946a48b83249799baa7803 100644
--- a/src/main/scala/de/tobias/playpad/server/utils/json/IntSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/utils/json/IntSerializerHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.json
+package de.tobias.playpad.utils.json
 
 import com.google.gson.{JsonElement, JsonPrimitive}
 
diff --git a/src/main/scala/de/tobias/playpad/server/utils/json/JsonSerializer.scala b/src/main/scala/de/tobias/playpad/utils/json/JsonSerializer.scala
similarity index 98%
rename from src/main/scala/de/tobias/playpad/server/utils/json/JsonSerializer.scala
rename to src/main/scala/de/tobias/playpad/utils/json/JsonSerializer.scala
index e39bc468f0e86eb63abaf79e41fafc43a6a58645..30310414eb1fd221c9df67194f830beb9b63de5b 100644
--- a/src/main/scala/de/tobias/playpad/server/utils/json/JsonSerializer.scala
+++ b/src/main/scala/de/tobias/playpad/utils/json/JsonSerializer.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.json
+package de.tobias.playpad.utils.json
 
 import java.util
 
diff --git a/src/main/scala/de/tobias/playpad/server/utils/json/SerializerHandler.scala b/src/main/scala/de/tobias/playpad/utils/json/SerializerHandler.scala
similarity index 79%
rename from src/main/scala/de/tobias/playpad/server/utils/json/SerializerHandler.scala
rename to src/main/scala/de/tobias/playpad/utils/json/SerializerHandler.scala
index 5c06caed1a64f07bdd779bba7f3e01b15c95a32b..5357fe23958ca41238b53bfa79a44208463a0131 100644
--- a/src/main/scala/de/tobias/playpad/server/utils/json/SerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/utils/json/SerializerHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.json
+package de.tobias.playpad.utils.json
 
 import com.google.gson.{JsonElement, JsonPrimitive}
 
diff --git a/src/main/scala/de/tobias/playpad/server/utils/json/StringSerializerHandler.scala b/src/main/scala/de/tobias/playpad/utils/json/StringSerializerHandler.scala
similarity index 90%
rename from src/main/scala/de/tobias/playpad/server/utils/json/StringSerializerHandler.scala
rename to src/main/scala/de/tobias/playpad/utils/json/StringSerializerHandler.scala
index 7e222b49a41d88885ff361a41af6d2df5156cfaa..2dfa25fb4467a571cdbabc718c732e0f5ba36655 100644
--- a/src/main/scala/de/tobias/playpad/server/utils/json/StringSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/utils/json/StringSerializerHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.json
+package de.tobias.playpad.utils.json
 
 import com.google.gson.{JsonElement, JsonPrimitive}
 
diff --git a/src/main/scala/de/tobias/playpad/server/utils/json/UUIDSerializerHandler.scala b/src/main/scala/de/tobias/playpad/utils/json/UUIDSerializerHandler.scala
similarity index 91%
rename from src/main/scala/de/tobias/playpad/server/utils/json/UUIDSerializerHandler.scala
rename to src/main/scala/de/tobias/playpad/utils/json/UUIDSerializerHandler.scala
index 67ef859023f5606dc4ec465a10fb5200a0ef18d5..be1b8be83cd048508dc6b998567a65b01857dbe7 100644
--- a/src/main/scala/de/tobias/playpad/server/utils/json/UUIDSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/utils/json/UUIDSerializerHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.json
+package de.tobias.playpad.utils.json
 
 import java.util.UUID
 
diff --git a/src/main/scala/de/tobias/playpad/server/utils/settings/PropertiesSettingsHandler.scala b/src/main/scala/de/tobias/playpad/utils/settings/PropertiesSettingsHandler.scala
similarity index 96%
rename from src/main/scala/de/tobias/playpad/server/utils/settings/PropertiesSettingsHandler.scala
rename to src/main/scala/de/tobias/playpad/utils/settings/PropertiesSettingsHandler.scala
index 396a9b2519968bb547082247be6984d23abbdcce..4a88b7bb2d363b82c0078ce2ed8b1854467d0bb7 100644
--- a/src/main/scala/de/tobias/playpad/server/utils/settings/PropertiesSettingsHandler.scala
+++ b/src/main/scala/de/tobias/playpad/utils/settings/PropertiesSettingsHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.settings
+package de.tobias.playpad.utils.settings
 
 import java.io.IOException
 import java.lang.reflect.Modifier
diff --git a/src/main/scala/de/tobias/playpad/server/utils/settings/Settings.scala b/src/main/scala/de/tobias/playpad/utils/settings/Settings.scala
similarity index 89%
rename from src/main/scala/de/tobias/playpad/server/utils/settings/Settings.scala
rename to src/main/scala/de/tobias/playpad/utils/settings/Settings.scala
index 92064c3c897b08413c40bc142515254300092f52..92cca291c70ba6a939c3fed9558b6e628e331e86 100644
--- a/src/main/scala/de/tobias/playpad/server/utils/settings/Settings.scala
+++ b/src/main/scala/de/tobias/playpad/utils/settings/Settings.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.settings
+package de.tobias.playpad.utils.settings
 
 /**
  * Created by tobias on 05.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/utils/settings/SettingsHandler.scala b/src/main/scala/de/tobias/playpad/utils/settings/SettingsHandler.scala
similarity index 77%
rename from src/main/scala/de/tobias/playpad/server/utils/settings/SettingsHandler.scala
rename to src/main/scala/de/tobias/playpad/utils/settings/SettingsHandler.scala
index 3ed59d84823b41c285b73bc16a102b8162d4a7ff..eaa6168cc98526ed385acb502b43c25fcb49933a 100644
--- a/src/main/scala/de/tobias/playpad/server/utils/settings/SettingsHandler.scala
+++ b/src/main/scala/de/tobias/playpad/utils/settings/SettingsHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.settings
+package de.tobias.playpad.utils.settings
 
 /**
  * Created by tobias on 05.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/utils/settings/SettingsLoader.scala b/src/main/scala/de/tobias/playpad/utils/settings/SettingsLoader.scala
similarity index 78%
rename from src/main/scala/de/tobias/playpad/server/utils/settings/SettingsLoader.scala
rename to src/main/scala/de/tobias/playpad/utils/settings/SettingsLoader.scala
index 214e7f6713f4b888a0f7f1f6f21d1a3586c92ead..c0433f8976f2a63f468faee6aeee5072a9c185af 100644
--- a/src/main/scala/de/tobias/playpad/server/utils/settings/SettingsLoader.scala
+++ b/src/main/scala/de/tobias/playpad/utils/settings/SettingsLoader.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.settings
+package de.tobias.playpad.utils.settings
 
 import java.io.IOException
 import java.nio.file.Path
diff --git a/src/main/scala/de/tobias/playpad/server/utils/settings/SettingsSaver.scala b/src/main/scala/de/tobias/playpad/utils/settings/SettingsSaver.scala
similarity index 84%
rename from src/main/scala/de/tobias/playpad/server/utils/settings/SettingsSaver.scala
rename to src/main/scala/de/tobias/playpad/utils/settings/SettingsSaver.scala
index 940b11f824a234a78655efdd15b70beb35fcfbc7..8c7392b9941338305a719b96c5b99f7d3cc1ce73 100644
--- a/src/main/scala/de/tobias/playpad/server/utils/settings/SettingsSaver.scala
+++ b/src/main/scala/de/tobias/playpad/utils/settings/SettingsSaver.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.settings
+package de.tobias.playpad.utils.settings
 
 import java.io.IOException
 import java.nio.file.Path
diff --git a/src/main/scala/de/tobias/playpad/server/utils/sql/SqlBackgroundRunner.scala b/src/main/scala/de/tobias/playpad/utils/sql/SqlBackgroundRunner.scala
similarity index 91%
rename from src/main/scala/de/tobias/playpad/server/utils/sql/SqlBackgroundRunner.scala
rename to src/main/scala/de/tobias/playpad/utils/sql/SqlBackgroundRunner.scala
index 1416a4646035e5fac57c5b4d0f757ad5b502a502..947d8ec040b8a5bd2074dec6f4d0e0f02ff6e8ba 100644
--- a/src/main/scala/de/tobias/playpad/server/utils/sql/SqlBackgroundRunner.scala
+++ b/src/main/scala/de/tobias/playpad/utils/sql/SqlBackgroundRunner.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.utils.sql
+package de.tobias.playpad.utils.sql
 
 import java.sql.Connection