diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 73ac13c..31bab6a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,6 +3,13 @@
 # Ensure internal libs are available to dependents
 add_subdirectory(dal)
 
+# Add CLI
+add_subdirectory(cli)
+add_subdirectory(KI)
+add_subdirectory(mcp)
+
+include_directories(CMAKE_CURRENT_SOURCE_DIR)
+
 add_library(kompanion_mw SHARED
   middleware/kompanioncontroller.cpp
   middleware/libkiexecutor.cpp
diff --git a/src/KI/CMakeLists.txt b/src/KI/CMakeLists.txt
index c65c80f..b39335f 100644
--- a/src/KI/CMakeLists.txt
+++ b/src/KI/CMakeLists.txt
@@ -29,4 +29,4 @@ target_include_directories(kom_ki PUBLIC
 target_link_libraries(kom_ki PUBLIC
     Qt6::Core
     Qt6::Network
-)
\ No newline at end of file
+)