diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index d73bccb..ff419df 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -6,17 +6,15 @@ INCLUDE(GNUInstallDirs)
 
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} )
 
-set(Calyp_Lib_SRCS
-    LibMemory.h
-    CalypLib.h
-    CalypDefs.h
-    # Frame
-    CalypFrame.h
-    CalypFrame.cpp
+set(Calyp_Lib_Frame_SRCS
     CalypPixel.cpp
     PixelFormats.h
     PixelFormats.cpp
-    # Stream
+    CalypFrame.h
+    CalypFrame.cpp
+)
+
+set(Calyp_Lib_Stream_SRCS
     CalypStream.h
     CalypStream.cpp
     CalypStreamHandlerIf.h
@@ -24,12 +22,26 @@ set(Calyp_Lib_SRCS
     StreamHandlerRaw.cpp
     StreamHandlerPortableMap.h
     StreamHandlerPortableMap.cpp
-    # Options Parser
+)
+
+set(Calyp_Lib_OptionParser_SRCS
     CalypOptions.h
     CalypOptions.cpp
-    # Modules
-    CalypModuleIf.h
-    CalypOpenCVModuleIf.h
+)
+
+set(Calyp_Lib_Modules_SRCS
+    CalypOptions.h
+    CalypOptions.cpp
+)
+
+set(Calyp_Lib_SRCS
+    LibMemory.h
+    CalypLib.h
+    CalypDefs.h
+    ${Calyp_Lib_Frame_SRCS}
+    ${Calyp_Lib_Stream_SRCS}
+    ${Calyp_Lib_OptionParser_SRCS}
+    ${Calyp_Lib_Modules_SRCS}
 )
 
 LIST(APPEND CMAKE_CFG_LINKER_LIBSS ${PROJECT_LIBRARY} )