diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84f04bd..58f2b23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,6 @@ set(CMAKE_CXX_STANDARD 23)
 # Ajouter le chemin de la bibliothèque SDL2
 if (WIN32)
     set(CMAKE_PREFIX_PATH "C:/SDL2")
-else()
-    set(CMAKE_PREFIX_PATH "/usr/local/lib/cmake/SDL2")
 endif()
 
 find_package(SDL2 REQUIRED)
@@ -18,13 +16,16 @@ find_package(SDL2_mixer REQUIRED)
 
 include_directories(${SDL2_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIRS} ${SDL2_TTF_INCLUDE_DIRS} ${SDL2_NET_INCLUDE_DIRS})
 
-add_executable(bloubloulespoissons main.cpp fish.cpp decors.cpp
+add_executable(bloubloulespoissons main.cpp
+        Entities/fish.cpp
+        Entities/fish.h
+        decors.cpp
         camera.cpp
         camera.h
         env.h
         env.cpp
-        player.h
-        player.cpp
+        Entities/player.h
+        Entities/player.cpp
         menu.h
         menu.cpp
         network/networking.cpp
@@ -33,8 +34,9 @@ add_executable(bloubloulespoissons main.cpp fish.cpp decors.cpp
         network/networking_client.h
         display.cpp
         display.h
-        shark.cpp
-        shark.h
+        Entities/shark.cpp
+        Entities/shark.h
+        Entities/fish.h
 )
 
 # Lier SDL2 et SDL2_image
diff --git a/fish.cpp b/Entities/fish.cpp
similarity index 100%
rename from fish.cpp
rename to Entities/fish.cpp
diff --git a/fish.h b/Entities/fish.h
similarity index 97%
rename from fish.h
rename to Entities/fish.h
index 5309998..6b9d03c 100644
--- a/fish.h
+++ b/Entities/fish.h
@@ -6,8 +6,8 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include "camera.h"
-#include "env.h"
+#include "../camera.h"
+#include "../Utility/env.h"
 
 class Fish {
 private:
diff --git a/player.cpp b/Entities/player.cpp
similarity index 98%
rename from player.cpp
rename to Entities/player.cpp
index bc6f99b..c6070fd 100644
--- a/player.cpp
+++ b/Entities/player.cpp
@@ -1,10 +1,5 @@
 #include "player.h"
 
-#include <syncstream>
-#include <tuple>
-#include "network/networking_client.h"
-#include "camera.h"
-
 void Player::updatePlayerPos(int x, int y) {
     this->x = x;
     this->y = y;
diff --git a/player.h b/Entities/player.h
similarity index 96%
rename from player.h
rename to Entities/player.h
index 03c9a97..1b21bcd 100644
--- a/player.h
+++ b/Entities/player.h
@@ -7,6 +7,10 @@
 #include <tuple>
 #include <vector>
 #include "fish.h"
+#include <syncstream>
+#include <tuple>
+#include "../network/networking_client.h"
+#include "../camera.h"
 
 
 enum playerData {
diff --git a/shark.cpp b/Entities/shark.cpp
similarity index 99%
rename from shark.cpp
rename to Entities/shark.cpp
index 1731be9..17f96a2 100644
--- a/shark.cpp
+++ b/Entities/shark.cpp
@@ -5,8 +5,6 @@
 #define sharkIMG "../img/shark.png"
 #include "shark.h"
 
-#include "network/networking.h"
-
 Shark::Shark(const int x, const int y, const float vx, const float vy, const int id, const int width, const int height, SDL_Renderer* renderer, std::vector<Player> &players_list)
     : x(x), y(y), vx(vx), vy(vy), id(id), width(width), height(height), players_list(players_list) {
     SDL_Surface* sharkSurface = IMG_Load(sharkIMG);
diff --git a/shark.h b/Entities/shark.h
similarity index 97%
rename from shark.h
rename to Entities/shark.h
index 0e8a1bf..b612809 100644
--- a/shark.h
+++ b/Entities/shark.h
@@ -10,6 +10,7 @@
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_mixer.h>
 #include <chrono>
+#include "../network/networking.h"
 
 class Shark {
 private: