diff --git a/src/main/java/de/tobias/playpad/server/json/JsonCollection.java b/src/main/java/de/tobias/playpad/server/utils/json/JsonCollection.java
similarity index 84%
rename from src/main/java/de/tobias/playpad/server/json/JsonCollection.java
rename to src/main/java/de/tobias/playpad/server/utils/json/JsonCollection.java
index bde150171834fd9782a2f382b2fecace3f47d2aa..6c39ec6fae05dc563e051bf3fa09a34109b48db6 100644
--- a/src/main/java/de/tobias/playpad/server/json/JsonCollection.java
+++ b/src/main/java/de/tobias/playpad/server/utils/json/JsonCollection.java
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.json;
+package de.tobias.playpad.server.utils.json;
import java.lang.annotation.*;
diff --git a/src/main/java/de/tobias/playpad/server/json/JsonName.java b/src/main/java/de/tobias/playpad/server/utils/json/JsonName.java
similarity index 87%
rename from src/main/java/de/tobias/playpad/server/json/JsonName.java
rename to src/main/java/de/tobias/playpad/server/utils/json/JsonName.java
index 67bf30c6dc3c12de575df18cbe4a48b91155ac99..bfe979f5c5cdc256ada48693c49ce7ee5fc2ea25 100644
--- a/src/main/java/de/tobias/playpad/server/json/JsonName.java
+++ b/src/main/java/de/tobias/playpad/server/utils/json/JsonName.java
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.json;
+package de.tobias.playpad.server.utils.json;
import java.lang.annotation.*;
diff --git a/src/main/java/de/tobias/playpad/server/json/JsonObj.java b/src/main/java/de/tobias/playpad/server/utils/json/JsonObj.java
similarity index 83%
rename from src/main/java/de/tobias/playpad/server/json/JsonObj.java
rename to src/main/java/de/tobias/playpad/server/utils/json/JsonObj.java
index f32e0555f9b3c6ee49674a394d7ceef059e472f1..3fd0d7fbf7890c40402d4fcddf6893acf842f99f 100644
--- a/src/main/java/de/tobias/playpad/server/json/JsonObj.java
+++ b/src/main/java/de/tobias/playpad/server/utils/json/JsonObj.java
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.json;
+package de.tobias.playpad.server.utils.json;
import java.lang.annotation.*;
diff --git a/src/main/java/de/tobias/playpad/server/json/JsonParent.java b/src/main/java/de/tobias/playpad/server/utils/json/JsonParent.java
similarity index 75%
rename from src/main/java/de/tobias/playpad/server/json/JsonParent.java
rename to src/main/java/de/tobias/playpad/server/utils/json/JsonParent.java
index 51819ef0b41b05bf4626c3ce36b618b9ae80ec46..c7b8e82b2ebc96bf738b565ac60455b755559558 100644
--- a/src/main/java/de/tobias/playpad/server/json/JsonParent.java
+++ b/src/main/java/de/tobias/playpad/server/utils/json/JsonParent.java
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.json;
+package de.tobias.playpad.server.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/server/PlayPadServer.scala
index e805cff9044737ea28144ab88bd1af34ead915cf..e4a6e7e263a088ab010b4078c95c55b1f917c0df 100644
--- a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
+++ b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
@@ -16,9 +16,9 @@ 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.settings.{Settings, SettingsHandler, SettingsLoader}
-import de.tobias.playpad.server.sql.SqlBackgroundRunner
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 spark.Spark._
/**
diff --git a/src/main/scala/de/tobias/playpad/server/project/Design.scala b/src/main/scala/de/tobias/playpad/server/project/Design.scala
index 6f372cdeed5c23fca4f805be7c8a586f56fa6384..41006b98d0d491fdf481ebad270da56321d3387f 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Design.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/Design.scala
@@ -2,7 +2,7 @@ package de.tobias.playpad.server.project
import java.util.UUID
-import de.tobias.playpad.server.json.{JsonName, JsonParent, UUIDSerializerHandler}
+import de.tobias.playpad.server.utils.json.UUIDSerializerHandler
/**
* Created by tobias on 23.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/Pad.scala b/src/main/scala/de/tobias/playpad/server/project/Pad.scala
index eb83840f8fa87cef7943f1bda100f249e38f2615..c3ddd959a76a4333b72e66f8fff830ae68e47c2e 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Pad.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/Pad.scala
@@ -2,8 +2,8 @@ package de.tobias.playpad.server.project
import java.util.UUID
-import de.tobias.playpad.server.json._
import de.tobias.playpad.server.project.settings.PadSettings
+import de.tobias.playpad.server.utils.json._
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/Page.scala b/src/main/scala/de/tobias/playpad/server/project/Page.scala
index fb9aeacac6f9d288811240c3c648ddf6789e8668..3a0755a9e99049c730739bcf80abfbe4c443793e 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Page.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/Page.scala
@@ -2,7 +2,7 @@ package de.tobias.playpad.server.project
import java.util.UUID
-import de.tobias.playpad.server.json._
+import de.tobias.playpad.server.utils.json._
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/Path.scala b/src/main/scala/de/tobias/playpad/server/project/Path.scala
index 4aaca1e070fca3e7cd8050d14e453e759cf95ecb..8a9e68785e1cf5b45b842845d4d9e0923d1f61cd 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Path.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/Path.scala
@@ -2,7 +2,7 @@ package de.tobias.playpad.server.project
import java.util.UUID
-import de.tobias.playpad.server.json.{JsonName, JsonParent, UUIDSerializerHandler}
+import de.tobias.playpad.server.utils.json.UUIDSerializerHandler
/**
* Created by tobias on 20.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/Project.scala b/src/main/scala/de/tobias/playpad/server/project/Project.scala
index e7fde48bfc0953215248a3788084cb2578685fd9..0457d3d5aacaafff38aaa9b918cee01fe456a4bf 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Project.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/Project.scala
@@ -2,7 +2,7 @@ package de.tobias.playpad.server.project
import java.util.UUID
-import de.tobias.playpad.server.json.{JsonCollection, JsonName, UUIDSerializerHandler}
+import de.tobias.playpad.server.utils.json.UUIDSerializerHandler
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala b/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
index ccc17bb20cb7d5da0bcb76acbf70b555a8412135..ae609b957bc81f90cb724bf3e0c486deb882da3b 100644
--- a/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
@@ -3,7 +3,7 @@ package de.tobias.playpad.server.project.settings
import java.time.Duration
import java.util.UUID
-import de.tobias.playpad.server.json._
+import de.tobias.playpad.server.utils.json._
class Fade {
diff --git a/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala b/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
index 639171ef20cd1011f093de6ae1903bd9cf0f3205..e378a101a729e7ad3377d228d1e041a080e30dda 100644
--- a/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
@@ -3,8 +3,8 @@ package de.tobias.playpad.server.project.settings
import java.time.Duration
import java.util.UUID
-import de.tobias.playpad.server.json._
import de.tobias.playpad.server.project.{Design, Pad}
+import de.tobias.playpad.server.utils.json._
class PadSettings {
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala b/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala
index 0c14a84f2791581bdf8165ab8084e60896bc3782..0196ecfa40e52d7ea68d7cd2484179a77355653d 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala
@@ -5,9 +5,9 @@ import java.util.UUID
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.json.JsonSerializer
import de.tobias.playpad.server.project.loader.sql.ProjectLoader
import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.server.utils.json.JsonSerializer
import spark.{Request, Response, Route}
/**
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala b/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala
index 71eff6b136cbb2dcfa8d7697c22735f7fd8dd35e..9c11cdcc0fa55de9d288424ddf0170d82ea59ef9 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala
@@ -5,10 +5,10 @@ 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.json.JsonSerializer
import de.tobias.playpad.server.project.Project
import de.tobias.playpad.server.project.saver.sql.ProjectSaver
import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.server.utils.json.JsonSerializer
import spark.{Request, Response, Route}
/**
diff --git a/src/main/scala/de/tobias/playpad/server/json/BooleanSerializerHandler.scala b/src/main/scala/de/tobias/playpad/server/utils/json/BooleanSerializerHandler.scala
similarity index 90%
rename from src/main/scala/de/tobias/playpad/server/json/BooleanSerializerHandler.scala
rename to src/main/scala/de/tobias/playpad/server/utils/json/BooleanSerializerHandler.scala
index 28f330e631dc95b4f38c1b16dad76cf81c596a88..c77efee4ffd4eabae25dc496d9e620467bad1d7b 100644
--- a/src/main/scala/de/tobias/playpad/server/json/BooleanSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/utils/json/BooleanSerializerHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.json
+package de.tobias.playpad.server.utils.json
import com.google.gson.{JsonElement, JsonPrimitive}
diff --git a/src/main/scala/de/tobias/playpad/server/json/DoubleSerializerHandler.scala b/src/main/scala/de/tobias/playpad/server/utils/json/DoubleSerializerHandler.scala
similarity index 90%
rename from src/main/scala/de/tobias/playpad/server/json/DoubleSerializerHandler.scala
rename to src/main/scala/de/tobias/playpad/server/utils/json/DoubleSerializerHandler.scala
index 08bd93bc677a14fc44f24d7bafd13c1f2ef4d766..86ab05173a08ca1bfc8e9b921a8130b9a0175b52 100644
--- a/src/main/scala/de/tobias/playpad/server/json/DoubleSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/utils/json/DoubleSerializerHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.json
+package de.tobias.playpad.server.utils.json
import com.google.gson.{JsonElement, JsonPrimitive}
diff --git a/src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala b/src/main/scala/de/tobias/playpad/server/utils/json/DurationSerializerHandler.scala
similarity index 91%
rename from src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala
rename to src/main/scala/de/tobias/playpad/server/utils/json/DurationSerializerHandler.scala
index 0c9c941286f441383405675a6f5cf313b5a77a80..3b4576ee367d8e15366d62ce93d3ec34a6fdfca8 100644
--- a/src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/utils/json/DurationSerializerHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.json
+package de.tobias.playpad.server.utils.json
import java.time.Duration
diff --git a/src/main/scala/de/tobias/playpad/server/json/IntSerializerHandler.scala b/src/main/scala/de/tobias/playpad/server/utils/json/IntSerializerHandler.scala
similarity index 90%
rename from src/main/scala/de/tobias/playpad/server/json/IntSerializerHandler.scala
rename to src/main/scala/de/tobias/playpad/server/utils/json/IntSerializerHandler.scala
index 38a9ea7eaf9a5a8834d64a48f1c904d409602b68..71b6ddc860647604a0a7dfb17701aaa5df018f40 100644
--- a/src/main/scala/de/tobias/playpad/server/json/IntSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/utils/json/IntSerializerHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.json
+package de.tobias.playpad.server.utils.json
import com.google.gson.{JsonElement, JsonPrimitive}
diff --git a/src/main/scala/de/tobias/playpad/server/json/JsonSerializer.scala b/src/main/scala/de/tobias/playpad/server/utils/json/JsonSerializer.scala
similarity index 98%
rename from src/main/scala/de/tobias/playpad/server/json/JsonSerializer.scala
rename to src/main/scala/de/tobias/playpad/server/utils/json/JsonSerializer.scala
index 13a3e9d5943a4c9ddc246361e1a13cc7ef8af89c..e39bc468f0e86eb63abaf79e41fafc43a6a58645 100644
--- a/src/main/scala/de/tobias/playpad/server/json/JsonSerializer.scala
+++ b/src/main/scala/de/tobias/playpad/server/utils/json/JsonSerializer.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.json
+package de.tobias.playpad.server.utils.json
import java.util
diff --git a/src/main/scala/de/tobias/playpad/server/json/SerializerHandler.scala b/src/main/scala/de/tobias/playpad/server/utils/json/SerializerHandler.scala
similarity index 79%
rename from src/main/scala/de/tobias/playpad/server/json/SerializerHandler.scala
rename to src/main/scala/de/tobias/playpad/server/utils/json/SerializerHandler.scala
index 1f4d1b2f0a985a58e2a1d26e5c3da035c5736ba8..5c06caed1a64f07bdd779bba7f3e01b15c95a32b 100644
--- a/src/main/scala/de/tobias/playpad/server/json/SerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/utils/json/SerializerHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.json
+package de.tobias.playpad.server.utils.json
import com.google.gson.{JsonElement, JsonPrimitive}
diff --git a/src/main/scala/de/tobias/playpad/server/json/StringSerializerHandler.scala b/src/main/scala/de/tobias/playpad/server/utils/json/StringSerializerHandler.scala
similarity index 90%
rename from src/main/scala/de/tobias/playpad/server/json/StringSerializerHandler.scala
rename to src/main/scala/de/tobias/playpad/server/utils/json/StringSerializerHandler.scala
index 6d99562e1132def2c8a96c27a465310f26216a96..7e222b49a41d88885ff361a41af6d2df5156cfaa 100644
--- a/src/main/scala/de/tobias/playpad/server/json/StringSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/utils/json/StringSerializerHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.json
+package de.tobias.playpad.server.utils.json
import com.google.gson.{JsonElement, JsonPrimitive}
diff --git a/src/main/scala/de/tobias/playpad/server/json/UUIDSerializerHandler.scala b/src/main/scala/de/tobias/playpad/server/utils/json/UUIDSerializerHandler.scala
similarity index 91%
rename from src/main/scala/de/tobias/playpad/server/json/UUIDSerializerHandler.scala
rename to src/main/scala/de/tobias/playpad/server/utils/json/UUIDSerializerHandler.scala
index 51afb490a9e08ab75e60dee6d38392bb15229fad..67ef859023f5606dc4ec465a10fb5200a0ef18d5 100644
--- a/src/main/scala/de/tobias/playpad/server/json/UUIDSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/utils/json/UUIDSerializerHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.json
+package de.tobias.playpad.server.utils.json
import java.util.UUID
diff --git a/src/main/scala/de/tobias/playpad/server/settings/PropertiesSettingsHandler.scala b/src/main/scala/de/tobias/playpad/server/utils/settings/PropertiesSettingsHandler.scala
similarity index 96%
rename from src/main/scala/de/tobias/playpad/server/settings/PropertiesSettingsHandler.scala
rename to src/main/scala/de/tobias/playpad/server/utils/settings/PropertiesSettingsHandler.scala
index 93454ee011cfa1bc252eed2a5451d8128e9b5b12..396a9b2519968bb547082247be6984d23abbdcce 100644
--- a/src/main/scala/de/tobias/playpad/server/settings/PropertiesSettingsHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/utils/settings/PropertiesSettingsHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.settings
+package de.tobias.playpad.server.utils.settings
import java.io.IOException
import java.lang.reflect.Modifier
diff --git a/src/main/scala/de/tobias/playpad/server/settings/Settings.scala b/src/main/scala/de/tobias/playpad/server/utils/settings/Settings.scala
similarity index 89%
rename from src/main/scala/de/tobias/playpad/server/settings/Settings.scala
rename to src/main/scala/de/tobias/playpad/server/utils/settings/Settings.scala
index c5b07f4a34b80c1a2f8fdcc8541e269e50b6b0e1..92064c3c897b08413c40bc142515254300092f52 100644
--- a/src/main/scala/de/tobias/playpad/server/settings/Settings.scala
+++ b/src/main/scala/de/tobias/playpad/server/utils/settings/Settings.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.settings
+package de.tobias.playpad.server.utils.settings
/**
* Created by tobias on 05.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/settings/SettingsHandler.scala b/src/main/scala/de/tobias/playpad/server/utils/settings/SettingsHandler.scala
similarity index 77%
rename from src/main/scala/de/tobias/playpad/server/settings/SettingsHandler.scala
rename to src/main/scala/de/tobias/playpad/server/utils/settings/SettingsHandler.scala
index 48be269dd31838f357c1bb4611fe2603d9172176..3ed59d84823b41c285b73bc16a102b8162d4a7ff 100644
--- a/src/main/scala/de/tobias/playpad/server/settings/SettingsHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/utils/settings/SettingsHandler.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.settings
+package de.tobias.playpad.server.utils.settings
/**
* Created by tobias on 05.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/settings/SettingsLoader.scala b/src/main/scala/de/tobias/playpad/server/utils/settings/SettingsLoader.scala
similarity index 78%
rename from src/main/scala/de/tobias/playpad/server/settings/SettingsLoader.scala
rename to src/main/scala/de/tobias/playpad/server/utils/settings/SettingsLoader.scala
index 36a4bdf1940a434f3f8504106f405a7a08a34884..214e7f6713f4b888a0f7f1f6f21d1a3586c92ead 100644
--- a/src/main/scala/de/tobias/playpad/server/settings/SettingsLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/utils/settings/SettingsLoader.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.settings
+package de.tobias.playpad.server.utils.settings
import java.io.IOException
import java.nio.file.Path
diff --git a/src/main/scala/de/tobias/playpad/server/settings/SettingsSaver.scala b/src/main/scala/de/tobias/playpad/server/utils/settings/SettingsSaver.scala
similarity index 84%
rename from src/main/scala/de/tobias/playpad/server/settings/SettingsSaver.scala
rename to src/main/scala/de/tobias/playpad/server/utils/settings/SettingsSaver.scala
index d631702baa497acb88ff9f4320119d997a03307c..940b11f824a234a78655efdd15b70beb35fcfbc7 100644
--- a/src/main/scala/de/tobias/playpad/server/settings/SettingsSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/utils/settings/SettingsSaver.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.settings
+package de.tobias.playpad.server.utils.settings
import java.io.IOException
import java.nio.file.Path
diff --git a/src/main/scala/de/tobias/playpad/server/sql/SqlBackgroundRunner.scala b/src/main/scala/de/tobias/playpad/server/utils/sql/SqlBackgroundRunner.scala
similarity index 91%
rename from src/main/scala/de/tobias/playpad/server/sql/SqlBackgroundRunner.scala
rename to src/main/scala/de/tobias/playpad/server/utils/sql/SqlBackgroundRunner.scala
index 0e5c75f36dd98545353752b26852c58491c00dad..1416a4646035e5fac57c5b4d0f757ad5b502a502 100644
--- a/src/main/scala/de/tobias/playpad/server/sql/SqlBackgroundRunner.scala
+++ b/src/main/scala/de/tobias/playpad/server/utils/sql/SqlBackgroundRunner.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.sql
+package de.tobias.playpad.server.utils.sql
import java.sql.Connection