diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseDispatcher.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/dispatcher/ResponseDispatcher.java
similarity index 85%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseDispatcher.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/dispatcher/ResponseDispatcher.java
index 57b9181..cb2172b 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseDispatcher.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/dispatcher/ResponseDispatcher.java
@@ -1,5 +1,7 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.response;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.response.dispatcher;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.response.PrimitiveResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.response.Response;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.Session;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionManager;
 
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseEncoder.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/dispatcher/ResponseEncoder.java
similarity index 93%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseEncoder.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/dispatcher/ResponseEncoder.java
index 4f228a5..f824d00 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseEncoder.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/dispatcher/ResponseEncoder.java
@@ -1,5 +1,7 @@
-package ch.unibas.dmi.dbis.cs108.casono.server.network.response;
+package ch.unibas.dmi.dbis.cs108.casono.server.network.response.dispatcher;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.response.PrimitiveResponse;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.response.Response;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder.ResponseBlock;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder.ResponseNode;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder.ResponseParameter;