diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index bc503e5..5e9464a 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -9,14 +9,10 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 file(GLOB_RECURSE SOURCES "*.[hc]pp")
 file(GLOB_RECURSE UI_SOURCES "*.ui")
-file(GLOB_RECURSE SIM_SOURCES "simulators/*.[hc]pp")
-file(GLOB_RECURSE SIM_UI "simulators/*.ui")
 
 set(PROJECT_SOURCES
         ${SOURCES}
         ${UI_SOURCES}
-        ${SIM_SOURCES}
-        ${SIM_UI}
 )
 
 if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 66d28ee..6a61542 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -9,20 +9,10 @@ find_package(Qt6 REQUIRED COMPONENTS Core WebSockets SerialBus)
 qt_standard_project_setup()
 qt_add_executable(server)
 
-file(GLOB_RECURSE SIM_SOURCES "simulators/*.[hc]pp")
-file(GLOB_RECURSE CAN_SOURCES "CAN/*.[hc]pp")
+file(GLOB_RECURSE SOURCES "*.[hc]pp")
 
 target_sources(server PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}/main.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/message_parser.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/simulator_base.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/simulator_base.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/simulators.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/simulators.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/websocket.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/websocket.hpp
-    ${SIM_SOURCES}
-    ${CAN_SOURCES}
+    ${SOURCES}
 )
 
 target_compile_options(server PRIVATE $<$<CONFIG:Debug>: