From 9d4f07472f4e0d88cdbf5edee9c845eb49a137f4 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Fri, 2 Aug 2019 20:58:34 +0200
Subject: [PATCH] Reorganize package structure
---
.../server/project/sync/SyncListener.java | 5 +++++
.../server/project/sync/SyncListener.java | 5 -----
.../utils/json/JsonCollection.java | 2 +-
.../{server => }/utils/json/JsonName.java | 2 +-
.../{server => }/utils/json/JsonObj.java | 2 +-
.../{server => }/utils/json/JsonParent.java | 2 +-
.../playpad/{server => }/PlayPadServer.scala | 22 +++++++++----------
.../{server => model}/account/Account.scala | 2 +-
.../{server => model}/account/Session.scala | 2 +-
.../{server => model}/plugin/Plugin.scala | 2 +-
.../{server => }/model/project/Design.scala | 4 ++--
.../{server => }/model/project/Pad.scala | 6 ++---
.../{server => }/model/project/Page.scala | 4 ++--
.../{server => }/model/project/Path.scala | 4 ++--
.../{server => }/model/project/Project.scala | 4 ++--
.../model/project/settings/Fade.scala | 4 ++--
.../model/project/settings/PadSettings.scala | 6 ++---
.../playpad/server/{server => }/Result.scala | 2 +-
.../server/{server => }/SqlHelper.scala | 2 +-
.../playpad/server/{server => }/Status.scala | 2 +-
.../{server => }/account/AccountPost.scala | 6 ++---
.../{server => }/account/AccountPut.scala | 6 ++---
.../{server => }/account/SessionDelete.scala | 6 ++---
.../{server => }/account/SessionGet.scala | 6 ++---
.../{server => }/account/SessionPost.scala | 6 ++---
.../{server => }/plugin/PluginGet.scala | 6 ++---
.../{server => }/plugin/PluginList.scala | 4 ++--
.../{server => }/project/ProjectDelete.scala | 10 ++++-----
.../{server => }/project/ProjectGet.scala | 10 ++++-----
.../{server => }/project/ProjectList.scala | 8 +++----
.../project/ProjectModificationGet.scala | 8 +++----
.../{server => }/project/ProjectPost.scala | 12 +++++-----
.../project/sync/ProjectSyncHandler.scala | 12 +++++-----
.../project/sync/listener/Listener.scala | 4 ++--
.../listener/design/DesignAddListener.scala | 12 +++++-----
.../design/DesignUpdateListener.scala | 12 +++++-----
.../sync/listener/pad/PadAddListener.scala | 12 +++++-----
.../sync/listener/pad/PadClearListener.scala | 12 +++++-----
.../sync/listener/pad/PadRemoveListener.scala | 12 +++++-----
.../sync/listener/pad/PadUpdateListener.scala | 12 +++++-----
.../pad/settings/PadSettingsAddListener.scala | 12 +++++-----
.../settings/PadSettingsUpdateListener.scala | 12 +++++-----
.../sync/listener/page/PageAddListener.scala | 12 +++++-----
.../listener/page/PageRemoveListener.scala | 12 +++++-----
.../listener/page/PageUpdateListener.scala | 12 +++++-----
.../sync/listener/path/PathAddListener.scala | 12 +++++-----
.../listener/path/PathRemoveListener.scala | 12 +++++-----
.../listener/project/ProjectAddListener.scala | 12 +++++-----
.../project/ProjectRemoveListener.scala | 12 +++++-----
.../project/ProjectUpdateListener.scala | 12 +++++-----
.../playpad/{server => }/sql/SqlDef.scala | 2 +-
.../sql/loader/DesignLoader.scala | 6 ++---
.../{server => }/sql/loader/PadLoader.scala | 6 ++---
.../{server => }/sql/loader/PageLoader.scala | 6 ++---
.../{server => }/sql/loader/PathLoader.scala | 6 ++---
.../sql/loader/ProjectLoader.scala | 6 ++---
.../{server => }/sql/saver/DesignSaver.scala | 8 +++----
.../{server => }/sql/saver/PadSaver.scala | 8 +++----
.../{server => }/sql/saver/PageSaver.scala | 8 +++----
.../{server => }/sql/saver/PathSaver.scala | 8 +++----
.../{server => }/sql/saver/ProjectSaver.scala | 8 +++----
.../transformer/JsonTransformer.scala | 2 +-
.../utils/json/BooleanSerializerHandler.scala | 2 +-
.../utils/json/DoubleSerializerHandler.scala | 2 +-
.../json/DurationSerializerHandler.scala | 2 +-
.../utils/json/IntSerializerHandler.scala | 2 +-
.../utils/json/JsonSerializer.scala | 2 +-
.../utils/json/SerializerHandler.scala | 2 +-
.../utils/json/StringSerializerHandler.scala | 2 +-
.../utils/json/UUIDSerializerHandler.scala | 2 +-
.../settings/PropertiesSettingsHandler.scala | 2 +-
.../utils/settings/Settings.scala | 2 +-
.../utils/settings/SettingsHandler.scala | 2 +-
.../utils/settings/SettingsLoader.scala | 2 +-
.../utils/settings/SettingsSaver.scala | 2 +-
.../utils/sql/SqlBackgroundRunner.scala | 2 +-
76 files changed, 241 insertions(+), 241 deletions(-)
create mode 100644 src/main/java/de/tobias/playpad/server/project/sync/SyncListener.java
delete mode 100644 src/main/java/de/tobias/playpad/server/server/project/sync/SyncListener.java
rename src/main/java/de/tobias/playpad/{server => }/utils/json/JsonCollection.java (84%)
rename src/main/java/de/tobias/playpad/{server => }/utils/json/JsonName.java (87%)
rename src/main/java/de/tobias/playpad/{server => }/utils/json/JsonObj.java (83%)
rename src/main/java/de/tobias/playpad/{server => }/utils/json/JsonParent.java (75%)
rename src/main/scala/de/tobias/playpad/{server => }/PlayPadServer.scala (86%)
rename src/main/scala/de/tobias/playpad/{server => model}/account/Account.scala (96%)
rename src/main/scala/de/tobias/playpad/{server => model}/account/Session.scala (97%)
rename src/main/scala/de/tobias/playpad/{server => model}/plugin/Plugin.scala (95%)
rename src/main/scala/de/tobias/playpad/{server => }/model/project/Design.scala (71%)
rename src/main/scala/de/tobias/playpad/{server => }/model/project/Pad.scala (80%)
rename src/main/scala/de/tobias/playpad/{server => }/model/project/Page.scala (83%)
rename src/main/scala/de/tobias/playpad/{server => }/model/project/Path.scala (66%)
rename src/main/scala/de/tobias/playpad/{server => }/model/project/Project.scala (75%)
rename src/main/scala/de/tobias/playpad/{server => }/model/project/settings/Fade.scala (89%)
rename src/main/scala/de/tobias/playpad/{server => }/model/project/settings/PadSettings.scala (80%)
rename src/main/scala/de/tobias/playpad/server/{server => }/Result.scala (85%)
rename src/main/scala/de/tobias/playpad/server/{server => }/SqlHelper.scala (99%)
rename src/main/scala/de/tobias/playpad/server/{server => }/Status.scala (72%)
rename src/main/scala/de/tobias/playpad/server/{server => }/account/AccountPost.scala (79%)
rename src/main/scala/de/tobias/playpad/server/{server => }/account/AccountPut.scala (86%)
rename src/main/scala/de/tobias/playpad/server/{server => }/account/SessionDelete.scala (83%)
rename src/main/scala/de/tobias/playpad/server/{server => }/account/SessionGet.scala (85%)
rename src/main/scala/de/tobias/playpad/server/{server => }/account/SessionPost.scala (86%)
rename src/main/scala/de/tobias/playpad/server/{server => }/plugin/PluginGet.scala (74%)
rename src/main/scala/de/tobias/playpad/server/{server => }/plugin/PluginList.scala (78%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/ProjectDelete.scala (78%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/ProjectGet.scala (77%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/ProjectList.scala (81%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/ProjectModificationGet.scala (83%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/ProjectPost.scala (73%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/ProjectSyncHandler.scala (92%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/Listener.scala (65%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/design/DesignAddListener.scala (71%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/design/DesignUpdateListener.scala (71%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/pad/PadAddListener.scala (74%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/pad/PadClearListener.scala (54%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/pad/PadRemoveListener.scala (54%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/pad/PadUpdateListener.scala (76%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/pad/settings/PadSettingsAddListener.scala (77%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala (79%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/page/PageAddListener.scala (69%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/page/PageRemoveListener.scala (54%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/page/PageUpdateListener.scala (71%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/path/PathAddListener.scala (66%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/path/PathRemoveListener.scala (54%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/project/ProjectAddListener.scala (64%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/project/ProjectRemoveListener.scala (54%)
rename src/main/scala/de/tobias/playpad/server/{server => }/project/sync/listener/project/ProjectUpdateListener.scala (61%)
rename src/main/scala/de/tobias/playpad/{server => }/sql/SqlDef.scala (96%)
rename src/main/scala/de/tobias/playpad/{server => }/sql/loader/DesignLoader.scala (83%)
rename src/main/scala/de/tobias/playpad/{server => }/sql/loader/PadLoader.scala (86%)
rename src/main/scala/de/tobias/playpad/{server => }/sql/loader/PageLoader.scala (83%)
rename src/main/scala/de/tobias/playpad/{server => }/sql/loader/PathLoader.scala (82%)
rename src/main/scala/de/tobias/playpad/{server => }/sql/loader/ProjectLoader.scala (93%)
rename src/main/scala/de/tobias/playpad/{server => }/sql/saver/DesignSaver.scala (70%)
rename src/main/scala/de/tobias/playpad/{server => }/sql/saver/PadSaver.scala (78%)
rename src/main/scala/de/tobias/playpad/{server => }/sql/saver/PageSaver.scala (71%)
rename src/main/scala/de/tobias/playpad/{server => }/sql/saver/PathSaver.scala (62%)
rename src/main/scala/de/tobias/playpad/{server => }/sql/saver/ProjectSaver.scala (74%)
rename src/main/scala/de/tobias/playpad/{server => }/transformer/JsonTransformer.scala (88%)
rename src/main/scala/de/tobias/playpad/{server => }/utils/json/BooleanSerializerHandler.scala (90%)
rename src/main/scala/de/tobias/playpad/{server => }/utils/json/DoubleSerializerHandler.scala (90%)
rename src/main/scala/de/tobias/playpad/{server => }/utils/json/DurationSerializerHandler.scala (91%)
rename src/main/scala/de/tobias/playpad/{server => }/utils/json/IntSerializerHandler.scala (90%)
rename src/main/scala/de/tobias/playpad/{server => }/utils/json/JsonSerializer.scala (98%)
rename src/main/scala/de/tobias/playpad/{server => }/utils/json/SerializerHandler.scala (79%)
rename src/main/scala/de/tobias/playpad/{server => }/utils/json/StringSerializerHandler.scala (90%)
rename src/main/scala/de/tobias/playpad/{server => }/utils/json/UUIDSerializerHandler.scala (91%)
rename src/main/scala/de/tobias/playpad/{server => }/utils/settings/PropertiesSettingsHandler.scala (96%)
rename src/main/scala/de/tobias/playpad/{server => }/utils/settings/Settings.scala (89%)
rename src/main/scala/de/tobias/playpad/{server => }/utils/settings/SettingsHandler.scala (77%)
rename src/main/scala/de/tobias/playpad/{server => }/utils/settings/SettingsLoader.scala (78%)
rename src/main/scala/de/tobias/playpad/{server => }/utils/settings/SettingsSaver.scala (84%)
rename src/main/scala/de/tobias/playpad/{server => }/utils/sql/SqlBackgroundRunner.scala (91%)
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 0000000..f08a8ad
--- /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 41fe379..0000000
--- 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 6c39ec6..28370c8 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 bfe979f..368a53d 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 3fd0d7f..32e10fb 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 c7b8e82..ae62d24 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 e4a6e7e..d5bf73b 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 a12592a..c0a3a55 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 8fa36fb..f812e51 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 e08b431..853d630 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 ddbcefa..1e521eb 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 fef6940..7308410 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 614db92..5d98784 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 4a64485..3ea785f 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 d1de780..91d9573 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 f0d16c1..a1ca1fe 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 7f53b6f..f645c56 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 0d3a207..cdf9de7 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 6a397c4..366f568 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 3e75509..53e4c04 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 1334f04..ce2f661 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 92658be..e6be26d 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 e0d5c7b..c569de7 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 d9f0a24..12d73f5 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 98b759b..8e9e0a3 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 6f52805..5772d2d 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 54dce56..a071fc3 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 396e2fd..e7ad292 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 070e51c..f61efee 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 addedaa..bbc89a1 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 c34618c..112570b 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 ad71984..2c82068 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 a87c457..f808c7e 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 3693666..700907a 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 86cb7bc..a8bf327 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 8167400..6e212aa 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 163528a..4e4d9e8 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 3c4d74f..7e3eb0b 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 9173e5e..6710aef 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 ab528e1..9e94955 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 99ec1ea..6b0b29c 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 dc3585f..159c8fb 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 f4df6a1..6788aef 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 ca42900..ac7512f 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 6b067c1..26dba32 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 fe85bbd..1b14ce5 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 8a4d54a..43b91df 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 8ec793d..900217b 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 133fdab..72cf2ba 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 7b8957d..bbb7bbb 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 a33ce10..a0fe5d4 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 076b56d..f8ed41d 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 6ab9c22..9f41024 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 e7f9668..c7444ca 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 51866de..2f2a926 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 d82b49a..f64fa0b 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 aa14357..9eb0593 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 8dcfa04..78461a3 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 4400703..1b963a6 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 1ee0d9c..ef4192a 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 0415e41..351d807 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 89dc908..2563e09 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 c77efee..da4625a 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 86ab051..d2a12c0 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 3b4576e..b840a3e 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 71b6ddc..fe7d084 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 e39bc46..3031041 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 5c06cae..5357fe2 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 7e222b4..2dfa25f 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 67ef859..be1b8be 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 396a9b2..4a88b7b 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 92064c3..92cca29 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 3ed59d8..eaa6168 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 214e7f6..c0433f8 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 940b11f..8c7392b 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 1416a46..947d8ec 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
--
GitLab