diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java
index d40ad22..ab5e800 100644
--- a/core/src/netwerkprog/game/client/MainGame.java
+++ b/core/src/netwerkprog/game/client/MainGame.java
@@ -1,6 +1,5 @@
 package netwerkprog.game.client;
 
-import com.badlogic.gdx.ApplicationAdapter;
 import com.badlogic.gdx.Files;
 import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
@@ -19,13 +18,12 @@ import netwerkprog.game.client.game.characters.Hacker;
 import netwerkprog.game.client.game.characters.Team;
 import netwerkprog.game.client.game.characters.abilities.BodySwap;
 import netwerkprog.game.client.game.connections.Client;
+import netwerkprog.game.client.game.connections.ClientCallback;
 import netwerkprog.game.client.game.map.GameInputProcessor;
 import netwerkprog.game.client.game.map.GameTile;
 import netwerkprog.game.client.game.map.Map;
 import netwerkprog.game.client.game.map.MapRenderer;
 import netwerkprog.game.util.data.Data;
-import netwerkprog.game.util.data.DataCallback;
-import netwerkprog.game.util.data.DataSource;
 import netwerkprog.game.util.data.NameData;
 import netwerkprog.game.util.data.TeamData;
 import netwerkprog.game.util.game.Faction;
@@ -35,7 +33,7 @@ import netwerkprog.game.util.graphics.TextRenderer;
 
 import java.awt.*;
 
-public class MainGame extends Game implements DataCallback {
+public class MainGame extends Game implements ClientCallback {
     SpriteBatch batch;
     float screenWidth;
     float screenHeight;
@@ -354,7 +352,7 @@ public class MainGame extends Game implements DataCallback {
     }
 
     @Override
-    public void onDataReceived(Data data, DataSource source) {
+    public void onDataReceived(Data data) {
         System.out.println("[MAINGAME CALLBACK] Got data: " + data.toString());
         if (data instanceof NameData) {
             System.out.println("[MAINGAME CALLBACK] got name data: " + data);
diff --git a/core/src/netwerkprog/game/client/game/connections/Client.java b/core/src/netwerkprog/game/client/game/connections/Client.java
index a6c6b94..e503266 100644
--- a/core/src/netwerkprog/game/client/game/connections/Client.java
+++ b/core/src/netwerkprog/game/client/game/connections/Client.java
@@ -3,8 +3,6 @@ package netwerkprog.game.client.game.connections;
 import netwerkprog.game.util.application.Controller;
 import netwerkprog.game.util.data.ConnectionData;
 import netwerkprog.game.util.data.Data;
-import netwerkprog.game.util.data.DataCallback;
-import netwerkprog.game.util.data.DataSource;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -12,17 +10,17 @@ import java.io.ObjectOutputStream;
 import java.net.Socket;
 import java.util.Arrays;
 
-public class Client extends Controller implements DataSource {
+public class Client extends Controller {
     private final int port;
     private final String hostname;
     private boolean isConnected;
     private Socket socket;
     private Thread receiveThread;
-    private DataCallback callback;
+    private ClientCallback callback;
     private ObjectOutputStream outputStream;
     private boolean connecting;
 
-    public Client(String hostname, DataCallback callback) {
+    public Client(String hostname, ClientCallback callback) {
         this.port = Data.port();
         this.hostname = hostname;
         this.callback = callback;
@@ -116,7 +114,7 @@ public class Client extends Controller implements DataSource {
                 Object object = in.readObject();
                 System.out.println("[CLIENT] got object " + object);
                 if (object instanceof Data) {
-                    callback.onDataReceived((Data) object, this);
+                    callback.onDataReceived((Data) object);
                 }
             } catch (IOException | ClassNotFoundException e) {
                 e.printStackTrace();
diff --git a/core/src/netwerkprog/game/client/game/connections/ClientCallback.java b/core/src/netwerkprog/game/client/game/connections/ClientCallback.java
new file mode 100644
index 0000000..4992eda
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/connections/ClientCallback.java
@@ -0,0 +1,7 @@
+package netwerkprog.game.client.game.connections;
+
+import netwerkprog.game.util.data.Data;
+
+public interface ClientCallback {
+    void onDataReceived(Data data);
+}
diff --git a/core/src/netwerkprog/game/util/data/DataCallback.java b/core/src/netwerkprog/game/server/DataCallback.java
similarity index 54%
rename from core/src/netwerkprog/game/util/data/DataCallback.java
rename to core/src/netwerkprog/game/server/DataCallback.java
index b16f58a..674eb92 100644
--- a/core/src/netwerkprog/game/util/data/DataCallback.java
+++ b/core/src/netwerkprog/game/server/DataCallback.java
@@ -1,4 +1,6 @@
-package netwerkprog.game.util.data;
+package netwerkprog.game.server;
+
+import netwerkprog.game.util.data.Data;
 
 public interface DataCallback {
     void onDataReceived(Data data, DataSource source);
diff --git a/core/src/netwerkprog/game/util/data/DataSource.java b/core/src/netwerkprog/game/server/DataSource.java
similarity index 53%
rename from core/src/netwerkprog/game/util/data/DataSource.java
rename to core/src/netwerkprog/game/server/DataSource.java
index 2a6bdb0..fc1c3a9 100644
--- a/core/src/netwerkprog/game/util/data/DataSource.java
+++ b/core/src/netwerkprog/game/server/DataSource.java
@@ -1,4 +1,6 @@
-package netwerkprog.game.util.data;
+package netwerkprog.game.server;
+
+import netwerkprog.game.util.data.Data;
 
 public interface DataSource {
     void writeData(Data data);
diff --git a/core/src/netwerkprog/game/server/ServerClient.java b/core/src/netwerkprog/game/server/ServerClient.java
index 0e06623..3fe92d2 100644
--- a/core/src/netwerkprog/game/server/ServerClient.java
+++ b/core/src/netwerkprog/game/server/ServerClient.java
@@ -2,8 +2,6 @@ package netwerkprog.game.server;
 
 import netwerkprog.game.util.data.ConnectionData;
 import netwerkprog.game.util.data.Data;
-import netwerkprog.game.util.data.DataCallback;
-import netwerkprog.game.util.data.DataSource;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;