5 files changed, 51 insertions, 49 deletions
diff --git a/source/app/CMakeLists.txt b/source/app/CMakeLists.txt
index 175a901..1ac7ab1 100644
--- a/source/app/CMakeLists.txt
+++ b/source/app/CMakeLists.txt
@@ -2,52 +2,5 @@ include("CheckIPOSupported")
 
 check_ipo_supported(RESULT "WANDA_IPO_SUPPORTED")
 
-find_package("lyra")
-find_package("spdlog")
-
-#[=====[ Client ]=====]
-
-add_executable("wandac"
-  "src/wandac.cpp"
-)
-
-target_link_libraries("${PROJECT_NAME}c" PRIVATE
-  "wanda::control"
-  "wanda::proto"
-  "wanda::system"
-
-  "bfg::lyra"
-  "spdlog::spdlog_header_only"
-)
-
-set_target_properties("wandac" PROPERTIES
-  CXX_STANDARD_REQUIRED YES
-  CXX_EXTENSIONS OFF
-  INTERPROCEDURAL_OPTIMIZATION ${WANDA_IPO_SUPPORTED}
-)
-
-install(TARGETS "wandac")
-
-#[=====[ Server ]=====]
-
-add_executable("wandad"
-  "src/wandad.cpp"
-)
-
-target_link_libraries("wandad" PRIVATE
-  "wanda::control"
-  "wanda::proto"
-  "wanda::std_ext"
-  "wanda::system"
-
-  "bfg::lyra"
-  "spdlog::spdlog_header_only"
-)
-
-set_target_properties("wandad" PROPERTIES
-  CXX_STANDARD_REQUIRED YES
-  CXX_EXTENSIONS OFF
-  INTERPROCEDURAL_OPTIMIZATION ${WANDA_IPO_SUPPORTED}
-)
-
-install(TARGETS "wandad")
+add_subdirectory("wandac")
+add_subdirectory("wandad")
+\ No newline at end of file
diff --git a/source/app/wandac/CMakeLists.txt b/source/app/wandac/CMakeLists.txt
new file mode 100644
index 0000000..a9b977c
--- /dev/null
+++ b/source/app/wandac/CMakeLists.txt
@@ -0,0 +1,25 @@
+find_package("lyra")
+find_package("spdlog")
+
+#[=====[ Client ]=====]
+
+add_executable("wandac"
+  "src/main.cpp"
+)
+
+target_link_libraries("${PROJECT_NAME}c" PRIVATE
+  "wanda::control"
+  "wanda::proto"
+  "wanda::system"
+
+  "bfg::lyra"
+  "spdlog::spdlog_header_only"
+)
+
+set_target_properties("wandac" PROPERTIES
+  CXX_STANDARD_REQUIRED YES
+  CXX_EXTENSIONS OFF
+  INTERPROCEDURAL_OPTIMIZATION ${WANDA_IPO_SUPPORTED}
+)
+
+install(TARGETS "wandac")
diff --git a/source/app/src/wandac.cpp b/source/app/wandac/src/main.cpp
index 65af1db..65af1db 100644
--- a/source/app/src/wandac.cpp
+++ b/source/app/wandac/src/main.cpp
diff --git a/source/app/wandad/CMakeLists.txt b/source/app/wandad/CMakeLists.txt
new file mode 100644
index 0000000..dfcaeb3
--- /dev/null
+++ b/source/app/wandad/CMakeLists.txt
@@ -0,0 +1,24 @@
+find_package("lyra")
+find_package("spdlog")
+
+add_executable("wandad"
+  "src/main.cpp"
+)
+
+target_link_libraries("wandad" PRIVATE
+  "wanda::control"
+  "wanda::proto"
+  "wanda::std_ext"
+  "wanda::system"
+
+  "bfg::lyra"
+  "spdlog::spdlog_header_only"
+)
+
+set_target_properties("wandad" PROPERTIES
+  CXX_STANDARD_REQUIRED YES
+  CXX_EXTENSIONS OFF
+  INTERPROCEDURAL_OPTIMIZATION ${WANDA_IPO_SUPPORTED}
+)
+
+install(TARGETS "wandad")
diff --git a/source/app/src/wandad.cpp b/source/app/wandad/src/main.cpp
index 8d16a7e..8d16a7e 100644
--- a/source/app/src/wandad.cpp
+++ b/source/app/wandad/src/main.cpp