diff --git a/Bingoo/CMakeLists.txt b/Bingoo/CMakeLists.txt
index e89e87b..ebe36d3 100644
--- a/Bingoo/CMakeLists.txt
+++ b/Bingoo/CMakeLists.txt
@@ -49,17 +49,17 @@ function(add_module MOD_NAME MOD_PATH)
     
     if(${BUILD_${MOD_UPPER}})
         set(BUILD_${MOD_UPPER}_HAS_TEST ${HAS_TEST} CACHE INTERNAL "Has test support")
-            add_subdirectory(${MOD_PATH})
             list(APPEND GLOBAL_ENABLED_MODULES ${MOD_NAME})
             list(APPEND GLOBAL_ENABLED_MACROS BUILD_${MOD_UPPER})
             message(STATUS "[Root] Enabled module(TestSupport: ${HAS_TEST}): ${MOD_NAME} (Default: ${DEFAULT_STATE}) -> Macro: BUILD_${MOD_UPPER}")
             set(GLOBAL_ENABLED_MODULES ${GLOBAL_ENABLED_MODULES} PARENT_SCOPE)
             set(GLOBAL_ENABLED_MACROS ${GLOBAL_ENABLED_MACROS} PARENT_SCOPE)
+            add_subdirectory(${MOD_PATH})
     endif()
 endfunction()
 
 add_module(base base ON OFF)
-add_module(common common ON OFF)
+add_module(CANmotor CANmotor ON OFF)
 add_module(controller controller OFF ON)
 add_module(motor motor OFF ON)
 add_module(ctrl2 ctrl2 OFF ON)
diff --git a/Bingoo/main/CMakeLists.txt b/Bingoo/main/CMakeLists.txt
index 7127d47..4b98222 100644
--- a/Bingoo/main/CMakeLists.txt
+++ b/Bingoo/main/CMakeLists.txt
@@ -42,7 +42,7 @@ endif()
 
 if(DEFINED GLOBAL_ENABLED_MACROS AND NOT GLOBAL_ENABLED_MACROS STREQUAL "")
     message(STATUS "[Main] Defining macros: ${GLOBAL_ENABLED_MACROS}")
-    target_compile_definitions(${TARGET_NAME} PRIVATE ${GLOBAL_ENABLED_MACROS})
+    target_compile_definitions(${TARGET_NAME} PUBLIC ${GLOBAL_ENABLED_MACROS})
 endif()
 
 target_compile_options(${TARGET_NAME}