diff --git a/core/src/netwerkprog/game/client/Client.java b/core/src/netwerkprog/game/client/Client.java
index 9e8bb1c..e227e8f 100644
--- a/core/src/netwerkprog/game/client/Client.java
+++ b/core/src/netwerkprog/game/client/Client.java
@@ -1,5 +1,7 @@
 package netwerkprog.game.client;
 
+import netwerkprog.game.util.Controller;
+
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -7,7 +9,7 @@ import java.net.Socket;
 import java.util.Arrays;
 import java.util.Scanner;
 
-public class Client extends Thread{
+public class Client extends Controller {
     private int port;
     private String hostname;
     private boolean isConnected = true;
diff --git a/core/src/netwerkprog/game/client/controllers/GraphicsController.java b/core/src/netwerkprog/game/client/controllers/GraphicsController.java
deleted file mode 100644
index ceabfc8..0000000
--- a/core/src/netwerkprog/game/client/controllers/GraphicsController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package netwerkprog.game.client.controllers;
-
-import netwerkprog.game.util.Controller;
-
-public class GraphicsController extends Controller {
-    public GraphicsController() {
-
-    }
-
-    @Override
-    public void run() {
-
-    }
-}
diff --git a/core/src/netwerkprog/game/client/controllers/LogicController.java b/core/src/netwerkprog/game/client/controllers/LogicController.java
deleted file mode 100644
index 79ad709..0000000
--- a/core/src/netwerkprog/game/client/controllers/LogicController.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package netwerkprog.game.client.controllers;
-
-import netwerkprog.game.util.Controller;
-
-public class LogicController extends Controller {
-
-    public LogicController() {
-
-    }
-
-    @Override
-    public void run() {
-
-    }
-}
diff --git a/core/src/netwerkprog/game/client/controllers/SessionController.java b/core/src/netwerkprog/game/client/controllers/SessionController.java
deleted file mode 100644
index 5e35d6d..0000000
--- a/core/src/netwerkprog/game/client/controllers/SessionController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package netwerkprog.game.client.controllers;
-
-import netwerkprog.game.util.Controller;
-
-public class SessionController extends Controller {
-    public SessionController() {
-
-    }
-
-    @Override
-    public void run() {
-
-    }
-}
diff --git a/core/src/netwerkprog/game/client/game/Game.java b/core/src/netwerkprog/game/client/game/Game.java
new file mode 100644
index 0000000..457cabc
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/Game.java
@@ -0,0 +1,15 @@
+package netwerkprog.game.client.game;
+
+import netwerkprog.game.util.Controller;
+
+public class Game extends Controller {
+
+
+    public Game() {
+    }
+
+    @Override
+    public void run() {
+
+    }
+}
diff --git a/core/src/netwerkprog/game/client/game/Graphics.java b/core/src/netwerkprog/game/client/game/Graphics.java
new file mode 100644
index 0000000..322f6c6
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/Graphics.java
@@ -0,0 +1,14 @@
+package netwerkprog.game.client.game;
+
+import netwerkprog.game.util.Controller;
+
+public class Graphics extends Controller {
+    public Graphics() {
+
+    }
+
+    @Override
+    public void run() {
+
+    }
+}
diff --git a/core/src/netwerkprog/game/client/game/characters/DevTest1.java b/core/src/netwerkprog/game/client/game/characters/DevTest1.java
new file mode 100644
index 0000000..8a6cb7c
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/characters/DevTest1.java
@@ -0,0 +1,4 @@
+package netwerkprog.game.client.game.characters;
+
+public class DevTest1 {
+}
diff --git a/core/src/netwerkprog/game/client/game/characters/DevTest2.java b/core/src/netwerkprog/game/client/game/characters/DevTest2.java
new file mode 100644
index 0000000..b4d78fa
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/characters/DevTest2.java
@@ -0,0 +1,4 @@
+package netwerkprog.game.client.game.characters;
+
+public class DevTest2 {
+}
diff --git a/core/src/netwerkprog/game/client/game/characters/abilities/BodySwap.java b/core/src/netwerkprog/game/client/game/characters/abilities/BodySwap.java
new file mode 100644
index 0000000..97514b0
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/characters/abilities/BodySwap.java
@@ -0,0 +1,4 @@
+package netwerkprog.game.client.game.characters.abilities;
+
+public class BodySwap {
+}
diff --git a/core/src/netwerkprog/game/client/game/characters/abilities/Implant.java b/core/src/netwerkprog/game/client/game/characters/abilities/Implant.java
new file mode 100644
index 0000000..1f86e28
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/characters/abilities/Implant.java
@@ -0,0 +1,4 @@
+package netwerkprog.game.client.game.characters.abilities;
+
+public class Implant {
+}
diff --git a/core/src/netwerkprog/game/client/game/characters/abilities/MindControl.java b/core/src/netwerkprog/game/client/game/characters/abilities/MindControl.java
new file mode 100644
index 0000000..12d39ea
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/characters/abilities/MindControl.java
@@ -0,0 +1,4 @@
+package netwerkprog.game.client.game.characters.abilities;
+
+public class MindControl {
+}
diff --git a/core/src/netwerkprog/game/client/game/characters/abilities/OverrideOrders.java b/core/src/netwerkprog/game/client/game/characters/abilities/OverrideOrders.java
new file mode 100644
index 0000000..3532bc6
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/characters/abilities/OverrideOrders.java
@@ -0,0 +1,4 @@
+package netwerkprog.game.client.game.characters.abilities;
+
+public class OverrideOrders {
+}
diff --git a/core/src/netwerkprog/game/client/game/characters/abilities/Scrambler.java b/core/src/netwerkprog/game/client/game/characters/abilities/Scrambler.java
new file mode 100644
index 0000000..d5bba08
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/characters/abilities/Scrambler.java
@@ -0,0 +1,4 @@
+package netwerkprog.game.client.game.characters.abilities;
+
+public class Scrambler {
+}
diff --git a/core/src/netwerkprog/game/client/game/characters/abilities/ServerHardening.java b/core/src/netwerkprog/game/client/game/characters/abilities/ServerHardening.java
new file mode 100644
index 0000000..387af72
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/characters/abilities/ServerHardening.java
@@ -0,0 +1,4 @@
+package netwerkprog.game.client.game.characters.abilities;
+
+public class ServerHardening {
+}
diff --git a/core/src/netwerkprog/game/client/game/characters/abilities/Spyware.java b/core/src/netwerkprog/game/client/game/characters/abilities/Spyware.java
new file mode 100644
index 0000000..33a37b4
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/characters/abilities/Spyware.java
@@ -0,0 +1,4 @@
+package netwerkprog.game.client.game.characters.abilities;
+
+public class Spyware {
+}
diff --git a/core/src/netwerkprog/game/client/game/characters/abilities/SystemicInfection.java b/core/src/netwerkprog/game/client/game/characters/abilities/SystemicInfection.java
new file mode 100644
index 0000000..6237dd0
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/characters/abilities/SystemicInfection.java
@@ -0,0 +1,4 @@
+package netwerkprog.game.client.game.characters.abilities;
+
+public class SystemicInfection {
+}
diff --git a/core/src/netwerkprog/game/client/game/logic/Logic.java b/core/src/netwerkprog/game/client/game/logic/Logic.java
new file mode 100644
index 0000000..98cb033
--- /dev/null
+++ b/core/src/netwerkprog/game/client/game/logic/Logic.java
@@ -0,0 +1,15 @@
+package netwerkprog.game.client.game.logic;
+
+import netwerkprog.game.util.Controller;
+
+public class Logic extends Controller {
+
+    public Logic() {
+
+    }
+
+    @Override
+    public void run() {
+
+    }
+}
diff --git a/core/src/netwerkprog/game/client/map/Map.java b/core/src/netwerkprog/game/client/game/map/Map.java
similarity index 97%
rename from core/src/netwerkprog/game/client/map/Map.java
rename to core/src/netwerkprog/game/client/game/map/Map.java
index c9da100..9fff0f7 100644
--- a/core/src/netwerkprog/game/client/map/Map.java
+++ b/core/src/netwerkprog/game/client/game/map/Map.java
@@ -1,4 +1,4 @@
-package netwerkprog.game.client.map;
+package netwerkprog.game.client.game.map;
 
 /**
  * Map class to hold a 2d array of tiles which will specify the map
diff --git a/core/src/netwerkprog/game/client/map/MapRenderer.java b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
similarity index 94%
rename from core/src/netwerkprog/game/client/map/MapRenderer.java
rename to core/src/netwerkprog/game/client/game/map/MapRenderer.java
index 38667aa..1bb0e10 100644
--- a/core/src/netwerkprog/game/client/map/MapRenderer.java
+++ b/core/src/netwerkprog/game/client/game/map/MapRenderer.java
@@ -1,4 +1,4 @@
-package netwerkprog.game.client.map;
+package netwerkprog.game.client.game.map;
 
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
diff --git a/core/src/netwerkprog/game/util/Ability.java b/core/src/netwerkprog/game/util/Ability.java
new file mode 100644
index 0000000..4fce97d
--- /dev/null
+++ b/core/src/netwerkprog/game/util/Ability.java
@@ -0,0 +1,4 @@
+package netwerkprog.game.util;
+
+public abstract class Ability {
+}
diff --git a/core/src/netwerkprog/game/util/Character.java b/core/src/netwerkprog/game/util/Character.java
new file mode 100644
index 0000000..9b170f9
--- /dev/null
+++ b/core/src/netwerkprog/game/util/Character.java
@@ -0,0 +1,30 @@
+package netwerkprog.game.util;
+
+import java.util.Arrays;
+import java.util.HashSet;
+
+public abstract class Character {
+    protected String name;
+    protected Faction faction;
+    protected HashSet<Ability> abilities;
+    protected boolean override;
+
+    Character(String name, Faction faction, Ability... abilities) {
+        this.name = name;
+        this.faction = faction;
+        this.abilities = new HashSet<>(Arrays.asList(abilities));
+        this.override = false;
+    }
+
+    public void addAbilities(Ability ability) {
+        this.abilities.add(ability);
+    }
+
+    public void removeAbility(Ability ability) {
+        this.abilities.remove(ability);
+    }
+
+    public void changeControl() {
+        this.override = !this.override;
+    }
+}
diff --git a/core/src/netwerkprog/game/util/Faction.java b/core/src/netwerkprog/game/util/Faction.java
new file mode 100644
index 0000000..609f778
--- /dev/null
+++ b/core/src/netwerkprog/game/util/Faction.java
@@ -0,0 +1,4 @@
+package netwerkprog.game.util;
+
+public enum Faction {
+}
diff --git a/core/src/test/java/MapTest.java b/core/src/test/java/MapTest.java
index 46ef0bd..946d9d8 100644
--- a/core/src/test/java/MapTest.java
+++ b/core/src/test/java/MapTest.java
@@ -1,4 +1,4 @@
-import netwerkprog.game.client.map.Map;
+import netwerkprog.game.client.game.map.Map;
 import org.junit.Assert;
 import org.junit.Test;