diff --git a/client/Makefile b/client/Makefile
index e37c478..0030b54 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -3,7 +3,7 @@ CXXFLAGS = -std=c++20 -Wall -Wextra -O2 -I.
 LDFLAGS = -lraylib -lboost_system -lpthread -lGL -lm -ldl -lrt -lX11
 
 TARGET = game
-SOURCES = main.cpp PlayerController.cpp net/NetworkManager.cpp
+SOURCES = main.cpp entity/player/PlayerController.cpp net/NetworkManager.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 
 all: $(TARGET)
diff --git a/client/PlayerController.cpp b/client/entity/player/PlayerController.cpp
similarity index 100%
rename from client/PlayerController.cpp
rename to client/entity/player/PlayerController.cpp
diff --git a/client/PlayerController.hpp b/client/entity/player/PlayerController.hpp
similarity index 100%
rename from client/PlayerController.hpp
rename to client/entity/player/PlayerController.hpp
diff --git a/client/main.cpp b/client/main.cpp
index f7f6540..2ae10e6 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -12,7 +12,7 @@
 #include <cstring>
 #include <thread>
 #include <chrono>
-#include "PlayerController.hpp"
+#include "entity/player/PlayerController.hpp"
 #include "net/NetworkManager.hpp"
 
 constexpr int WORLD_SIZE = 100;
diff --git a/server/players.json b/server/players.json
deleted file mode 100644
index c5a26b5..0000000
--- a/server/players.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "foo": {
-    "username": "foo",
-    "color": "orange",
-    "position": {
-      "X": -25.698553,
-      "Y": 4.9015007,
-      "Z": 39.29553
-    }
-  },
-  "sky": {
-    "username": "sky",
-    "color": "purple",
-    "position": {
-      "X": 5.9400105,
-      "Y": -0.055064563,
-      "Z": -3.896852
-    }
-  },
-  "test": {
-    "username": "test",
-    "color": "red",
-    "position": {
-      "X": 2.1930797,
-      "Y": -0.08324346,
-      "Z": -1.550154
-    }
-  }
-}
\ No newline at end of file