6 files changed, 6 insertions, 23 deletions
diff --git a/server-v1/CMakeLists.txt b/server-v1/CMakeLists.txt
index d869f82..517de35 100644
--- a/server-v1/CMakeLists.txt
+++ b/server-v1/CMakeLists.txt
@@ -10,12 +10,12 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(Qt6 6.2 COMPONENTS Core Network Sql REQUIRED)
 find_package(doctest REQUIRED)
 
+file(GLOB_RECURSE EpistmoolServer_SRC_HPP_FILES source/*.hpp)
+file(GLOB_RECURSE EpistmoolServer_SRC_CPP_FILES source/*.cpp)
 qt_add_executable(EpistmoolServer
-    source/all_fwd.hpp
-    source/header_only.cpp
-    source/main.cpp
+    ${EpistmoolServer_SRC_HPP_FILES}
+    ${EpistmoolServer_SRC_CPP_FILES}
 )
-add_subdirectory(source/EpistmoolServer)
 
 target_include_directories(EpistmoolServer PRIVATE source)
 target_compile_definitions(EpistmoolServer PRIVATE
diff --git a/server-v1/conanfile.txt b/server-v1/conanfile.txt
index 71dbde4..78ea0d4 100644
--- a/server-v1/conanfile.txt
+++ b/server-v1/conanfile.txt
@@ -2,6 +2,7 @@
 doctest/2.4.8
 
 [generators]
+cmake
 cmake_find_package
 
 [options]
diff --git a/server-v1/source/EpistmoolServer/CMakeLists.txt b/server-v1/source/EpistmoolServer/CMakeLists.txt
deleted file mode 100644
index c98c901..0000000
--- a/server-v1/source/EpistmoolServer/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-target_sources(EpistmoolServer PRIVATE
-    fwd.hpp
-    Connection.hpp Connection.cpp
-    Session.hpp Session.cpp
-    Server.hpp Server.cpp
-    ServerProperties.hpp ServerProperties.cpp
-)
-
-add_subdirectory(Protocol)
-add_subdirectory(Workspace)
diff --git a/server-v1/source/EpistmoolServer/Protocol/CMakeLists.txt b/server-v1/source/EpistmoolServer/Protocol/CMakeLists.txt
deleted file mode 100644
index 54f1da7..0000000
--- a/server-v1/source/EpistmoolServer/Protocol/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-target_sources(EpistmoolServer PRIVATE
-    fwd.hpp
-    Command.hpp Command.cpp
-	Error.hpp Error.cpp
-	Version.hpp
-)
diff --git a/server-v1/source/EpistmoolServer/Workspace/CMakeLists.txt b/server-v1/source/EpistmoolServer/Workspace/CMakeLists.txt
deleted file mode 100644
index 6ef6d59..0000000
--- a/server-v1/source/EpistmoolServer/Workspace/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-target_sources(EpistmoolServer PRIVATE
-    fwd.hpp
-)
diff --git a/server-v1/source/header_only.c b/server-v1/source/header_only.c
new file mode 100644
index 0000000..6795f80
--- /dev/null
+++ b/server-v1/source/header_only.c
@@ -0,0 +1 @@
+// This file includes all header only libraries' implementation parts