diff --git a/.gitmodules b/.gitmodules
index 08ba65a..0d23bc7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,6 +13,3 @@
 [submodule "include/toml11"]
 	path = include/toml11
 	url = https://github.com/ToruNiina/toml11
-[submodule "lib/luasocket"]
-	path = lib/luasocket
-	url = https://github.com/diegonehab/luasocket
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a5a9f2..9c437fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,8 @@ include_directories("rapidjson/include")
 include_directories("websocketpp")
 add_subdirectory("socket.io-client-cpp")
 add_subdirectory("include/commandline")
+# builds all libraries that don't have cmakelists
+add_subdirectory("lib")
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -46,7 +48,6 @@ add_executable(BeamMP-Server
         include/TResourceManager.h src/TResourceManager.cpp
         include/THeartbeatThread.h src/THeartbeatThread.cpp
         include/Http.h src/Http.cpp
-        #include/SocketIO.h src/SocketIO.cpp
         include/TPPSMonitor.h src/TPPSMonitor.cpp
         include/TNetwork.h src/TNetwork.cpp)
 
@@ -58,11 +59,11 @@ target_include_directories(BeamMP-Server PUBLIC ${Boost_INCLUDE_DIRS} ${LUA_INCL
 find_package(OpenSSL REQUIRED)
 
 if (UNIX)
-    target_link_libraries(BeamMP-Server z pthread stdc++fs ${LUA_LIBRARIES} crypto ${OPENSSL_LIBRARIES} commandline sioclient_tls)
+    target_link_libraries(BeamMP-Server z pthread stdc++fs ${LUA_LIBRARIES} crypto ${OPENSSL_LIBRARIES} commandline sioclient_tls luasocket)
 elseif (WIN32)
     include(FindLua)
     find_package(ZLIB REQUIRED)
     find_package(RapidJSON CONFIG REQUIRED)
     target_include_directories(BeamMP-Server PRIVATE ${RAPIDJSON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
-    target_link_libraries(BeamMP-Server PRIVATE ws2_32 ZLIB::ZLIB ${LUA_LIBRARIES} ${OPENSSL_LIBRARIES} commandline sioclient_tls)
+    target_link_libraries(BeamMP-Server PRIVATE ws2_32 ZLIB::ZLIB ${LUA_LIBRARIES} ${OPENSSL_LIBRARIES} commandline sioclient_tls luasocket)
 endif ()
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index e69de29..ab2d18a 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+
+############# luasocket #############
+
+#####################################
\ No newline at end of file
diff --git a/lib/luasocket b/lib/luasocket
deleted file mode 160000
index 5b18e47..0000000
--- a/lib/luasocket
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5b18e475f38fcf28429b1cc4b17baee3b9793a62