diff --git a/src/main/scala/de/tobias/playpad/server/project/server/json/PadSaver.scala b/src/main/scala/de/tobias/playpad/server/project/saver/json/PadSaver.scala
similarity index 89%
rename from src/main/scala/de/tobias/playpad/server/project/server/json/PadSaver.scala
rename to src/main/scala/de/tobias/playpad/server/project/saver/json/PadSaver.scala
index eb94451f4036cf8a28bc454143a1863c48a63e97..e375c89f6ddf86deab7ca5e34053e8af3959922f 100644
--- a/src/main/scala/de/tobias/playpad/server/project/server/json/PadSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/json/PadSaver.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project.server.json
+package de.tobias.playpad.server.project.saver.json
 
 import com.google.gson.{JsonElement, JsonObject}
 import de.tobias.playpad.server.project.Pad
diff --git a/src/main/scala/de/tobias/playpad/server/project/server/json/PageSaver.scala b/src/main/scala/de/tobias/playpad/server/project/saver/json/PageSaver.scala
similarity index 90%
rename from src/main/scala/de/tobias/playpad/server/project/server/json/PageSaver.scala
rename to src/main/scala/de/tobias/playpad/server/project/saver/json/PageSaver.scala
index b97cc422788a7217053153b51827a9f58e89806c..8215b670d8679d38d6d1fb52caf6ef2c83fa15f2 100644
--- a/src/main/scala/de/tobias/playpad/server/project/server/json/PageSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/json/PageSaver.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project.server.json
+package de.tobias.playpad.server.project.saver.json
 
 import com.google.gson.{JsonArray, JsonElement, JsonObject}
 import de.tobias.playpad.server.project.Page
diff --git a/src/main/scala/de/tobias/playpad/server/project/server/json/ProjectSaver.scala b/src/main/scala/de/tobias/playpad/server/project/saver/json/ProjectSaver.scala
similarity index 90%
rename from src/main/scala/de/tobias/playpad/server/project/server/json/ProjectSaver.scala
rename to src/main/scala/de/tobias/playpad/server/project/saver/json/ProjectSaver.scala
index 18e88a5b293da174978b145213a50c5c5275bd36..32d37728dc68da98c10adeabd031a9e194c265ec 100644
--- a/src/main/scala/de/tobias/playpad/server/project/server/json/ProjectSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/json/ProjectSaver.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project.server.json
+package de.tobias.playpad.server.project.saver.json
 
 import com.google.gson.{JsonArray, JsonObject}
 import de.tobias.playpad.server.project.Project
diff --git a/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala b/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala
index 0078188ca036863f85b21c18746f533b2552a3c3..b3973d728171651f45c713337440f27de76d628a 100644
--- a/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala
@@ -23,8 +23,7 @@ object SqlHelper {
 	}
 
 	private def createQuery[T](connection: Connection, table: String, field: String, value: T): PreparedStatement = {
-		val sql = "INSERT INTO " + table + " (id, " + field + ") VALUES(?, ?) " +
-			"ON DUPLICATE KEY UPDATE " + field + "=?"
+		val sql = "INSERT INTO %s (id, %s) VALUES(?, ?) ON DUPLICATE KEY UPDATE %s=?".format(table, field, field)
 		val preparedStatement = connection.prepareStatement(sql)
 
 		value match {
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 abf3dcf795007bf127ee5ee8a42261c8223f6a55..ffb868475b84401a9e9c99e66ac12a40e9c8b3d2 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
@@ -6,7 +6,7 @@ import java.util.UUID
 import com.j256.ormlite.dao.Dao
 import de.tobias.playpad.server.account.Session
 import de.tobias.playpad.server.project.loader.ProjectLoader
-import de.tobias.playpad.server.project.server.json.ProjectSaver
+import de.tobias.playpad.server.project.saver.json.ProjectSaver
 import de.tobias.playpad.server.server.{Result, Status}
 import spark.{Request, Response, Route}