diff --git a/client/src/main/java/nl/andrewlalis/aos_client/Client.java b/client/src/main/java/nl/andrewlalis/aos_client/Client.java
index af5ccb6..954f91a 100644
--- a/client/src/main/java/nl/andrewlalis/aos_client/Client.java
+++ b/client/src/main/java/nl/andrewlalis/aos_client/Client.java
@@ -1,8 +1,11 @@
 package nl.andrewlalis.aos_client;
 
+import nl.andrewlalis.aos_client.net.ChatManager;
+import nl.andrewlalis.aos_client.net.MessageTransceiver;
 import nl.andrewlalis.aos_client.sound.SoundManager;
 import nl.andrewlalis.aos_client.view.GameFrame;
 import nl.andrewlalis.aos_client.view.GamePanel;
+import nl.andrewlalis.aos_client.view.GameRenderer;
 import nl.andrewlalis.aos_core.model.Player;
 import nl.andrewlalis.aos_core.model.Team;
 import nl.andrewlalis.aos_core.model.World;
diff --git a/client/src/main/java/nl/andrewlalis/aos_client/control/PlayerKeyListener.java b/client/src/main/java/nl/andrewlalis/aos_client/control/PlayerKeyListener.java
index edbe51d..af5e34b 100644
--- a/client/src/main/java/nl/andrewlalis/aos_client/control/PlayerKeyListener.java
+++ b/client/src/main/java/nl/andrewlalis/aos_client/control/PlayerKeyListener.java
@@ -1,6 +1,6 @@
 package nl.andrewlalis.aos_client.control;
 
-import nl.andrewlalis.aos_client.ChatManager;
+import nl.andrewlalis.aos_client.net.ChatManager;
 import nl.andrewlalis.aos_client.Client;
 
 import java.awt.event.KeyAdapter;
diff --git a/client/src/main/java/nl/andrewlalis/aos_client/ChatManager.java b/client/src/main/java/nl/andrewlalis/aos_client/net/ChatManager.java
similarity index 98%
rename from client/src/main/java/nl/andrewlalis/aos_client/ChatManager.java
rename to client/src/main/java/nl/andrewlalis/aos_client/net/ChatManager.java
index 9c2b105..357f051 100644
--- a/client/src/main/java/nl/andrewlalis/aos_client/ChatManager.java
+++ b/client/src/main/java/nl/andrewlalis/aos_client/net/ChatManager.java
@@ -1,4 +1,4 @@
-package nl.andrewlalis.aos_client;
+package nl.andrewlalis.aos_client.net;
 
 import nl.andrewlalis.aos_client.sound.SoundManager;
 import nl.andrewlalis.aos_core.net.chat.ChatMessage;
diff --git a/client/src/main/java/nl/andrewlalis/aos_client/DataTransceiver.java b/client/src/main/java/nl/andrewlalis/aos_client/net/DataTransceiver.java
similarity index 97%
rename from client/src/main/java/nl/andrewlalis/aos_client/DataTransceiver.java
rename to client/src/main/java/nl/andrewlalis/aos_client/net/DataTransceiver.java
index 6349c66..52d348b 100644
--- a/client/src/main/java/nl/andrewlalis/aos_client/DataTransceiver.java
+++ b/client/src/main/java/nl/andrewlalis/aos_client/net/DataTransceiver.java
@@ -1,5 +1,6 @@
-package nl.andrewlalis.aos_client;
+package nl.andrewlalis.aos_client.net;
 
+import nl.andrewlalis.aos_client.Client;
 import nl.andrewlalis.aos_core.net.data.DataTypes;
 import nl.andrewlalis.aos_core.net.data.PlayerDetailUpdate;
 import nl.andrewlalis.aos_core.net.data.WorldUpdate;
diff --git a/client/src/main/java/nl/andrewlalis/aos_client/MessageTransceiver.java b/client/src/main/java/nl/andrewlalis/aos_client/net/MessageTransceiver.java
similarity index 98%
rename from client/src/main/java/nl/andrewlalis/aos_client/MessageTransceiver.java
rename to client/src/main/java/nl/andrewlalis/aos_client/net/MessageTransceiver.java
index 41ae7f6..6bb6d50 100644
--- a/client/src/main/java/nl/andrewlalis/aos_client/MessageTransceiver.java
+++ b/client/src/main/java/nl/andrewlalis/aos_client/net/MessageTransceiver.java
@@ -1,5 +1,6 @@
-package nl.andrewlalis.aos_client;
+package nl.andrewlalis.aos_client.net;
 
+import nl.andrewlalis.aos_client.Client;
 import nl.andrewlalis.aos_core.net.*;
 import nl.andrewlalis.aos_core.net.chat.ChatMessage;
 
diff --git a/client/src/main/java/nl/andrewlalis/aos_client/view/GamePanel.java b/client/src/main/java/nl/andrewlalis/aos_client/view/GamePanel.java
index d633ca0..5f41dcb 100644
--- a/client/src/main/java/nl/andrewlalis/aos_client/view/GamePanel.java
+++ b/client/src/main/java/nl/andrewlalis/aos_client/view/GamePanel.java
@@ -1,6 +1,6 @@
 package nl.andrewlalis.aos_client.view;
 
-import nl.andrewlalis.aos_client.ChatManager;
+import nl.andrewlalis.aos_client.net.ChatManager;
 import nl.andrewlalis.aos_client.Client;
 import nl.andrewlalis.aos_core.model.*;
 import nl.andrewlalis.aos_core.model.tools.Gun;
diff --git a/client/src/main/java/nl/andrewlalis/aos_client/GameRenderer.java b/client/src/main/java/nl/andrewlalis/aos_client/view/GameRenderer.java
similarity index 95%
rename from client/src/main/java/nl/andrewlalis/aos_client/GameRenderer.java
rename to client/src/main/java/nl/andrewlalis/aos_client/view/GameRenderer.java
index 6773726..5503e49 100644
--- a/client/src/main/java/nl/andrewlalis/aos_client/GameRenderer.java
+++ b/client/src/main/java/nl/andrewlalis/aos_client/view/GameRenderer.java
@@ -1,6 +1,6 @@
-package nl.andrewlalis.aos_client;
+package nl.andrewlalis.aos_client.view;
 
-import nl.andrewlalis.aos_client.view.GamePanel;
+import nl.andrewlalis.aos_client.Client;
 import nl.andrewlalis.aos_core.model.Bullet;
 import nl.andrewlalis.aos_core.model.Player;
 import nl.andrewlalis.aos_core.model.World;