diff --git a/cm_modules.cmake b/cm_modules.cmake
new file mode 100644
index 0000000..6844491
--- /dev/null
+++ b/cm_modules.cmake
@@ -0,0 +1,14 @@
+macro(add_cm_library module_name project_folder)
+    message("Create Module <" ${module_name} "> Project Folder <" ${project_folder} ">" )
+
+    set(SOURCE_FILES "${ARGN}")
+
+    IF(WIN32)
+        add_library(${module_name} STATIC ${SOURCE_FILES})
+    ELSE()
+        add_library(${module_name} SHARED ${SOURCE_FILES})
+    ENDIF(WIN32)
+
+    set_property(TARGET ${module_name} PROPERTY FOLDER ${project_folder})
+
+endmacro()
diff --git a/use_cm_module.cmake b/use_cm_module.cmake
index 44f4009..1bd8488 100644
--- a/use_cm_module.cmake
+++ b/use_cm_module.cmake
@@ -2,6 +2,7 @@ include(compiler)
 include(system_bit)
 include(version)
 include(output_path)
+include(cm_modules)
 
 macro(use_cm_module module)
     add_subdirectory(CM${module})