diff --git a/.gitmodules b/.gitmodules
index 0d23bc7..5155418 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
 [submodule "include/commandline"]
-    path = include/commandline
+	path = deps/commandline
     url = https://github.com/lionkor/commandline
 [submodule "socket.io-client-cpp"]
-	path = socket.io-client-cpp
+	path = deps/socket.io-client-cpp
 	url = https://github.com/socketio/socket.io-client-cpp
 [submodule "asio"]
-	path = asio
+	path = deps/asio
 	url = https://github.com/chriskohlhoff/asio
 [submodule "rapidjson"]
-	path = rapidjson
+	path = deps/rapidjson
 	url = https://github.com/Tencent/rapidjson
 [submodule "include/toml11"]
-	path = include/toml11
+	path = deps/toml11
 	url = https://github.com/ToruNiina/toml11
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd35ed1..9082d61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,11 +20,11 @@ elseif (UNIX)
 endif ()
 
 # this has to happen before -DDEBUG since it wont compile properly with -DDEBUG
-include_directories("asio/asio/include")
-include_directories("rapidjson/include")
-include_directories("websocketpp")
-add_subdirectory("socket.io-client-cpp")
-add_subdirectory("include/commandline")
+include_directories("deps/asio/asio/include")
+include_directories("deps/rapidjson/include")
+include_directories("deps/websocketpp")
+add_subdirectory("deps/socket.io-client-cpp")
+add_subdirectory("deps/commandline")
 
 
 set(CMAKE_CXX_STANDARD 17)
@@ -50,12 +50,10 @@ add_executable(BeamMP-Server
         include/TPPSMonitor.h src/TPPSMonitor.cpp
         include/TNetwork.h src/TNetwork.cpp)
 
-target_include_directories(BeamMP-Server PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/commandline")
+
+target_include_directories(BeamMP-Server PUBLIC ${Boost_INCLUDE_DIRS} ${LUA_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 find_package(Lua REQUIRED)
-
-target_include_directories(BeamMP-Server PUBLIC ${Boost_INCLUDE_DIRS} ${LUA_INCLUDE_DIR} "socket.io-client-cpp/src")
-
 find_package(OpenSSL REQUIRED)
 
 if (UNIX)
diff --git a/asio b/deps/asio
similarity index 100%
rename from asio
rename to deps/asio
diff --git a/include/commandline b/deps/commandline
similarity index 100%
rename from include/commandline
rename to deps/commandline
diff --git a/rapidjson b/deps/rapidjson
similarity index 100%
rename from rapidjson
rename to deps/rapidjson
diff --git a/socket.io-client-cpp b/deps/socket.io-client-cpp
similarity index 100%
rename from socket.io-client-cpp
rename to deps/socket.io-client-cpp
diff --git a/include/toml11 b/deps/toml11
similarity index 100%
rename from include/toml11
rename to deps/toml11