diff --git a/action/CMakeLists.txt b/action/CMakeLists.txt
new file mode 100644
index 000000000..a62d4044b
--- /dev/null
+++ b/action/CMakeLists.txt
@@ -0,0 +1,7 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		ActionHelper.cpp
+		ActionMessage.cpp
+		CommandActionHelper.cpp
+		SimpleActionHelper.cpp
+)
\ No newline at end of file
diff --git a/container/CMakeLists.txt b/container/CMakeLists.txt
new file mode 100644
index 000000000..904cde55b
--- /dev/null
+++ b/container/CMakeLists.txt
@@ -0,0 +1,5 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		SharedRingBuffer.cpp
+		SimpleRingBuffer.cpp
+)
\ No newline at end of file
diff --git a/datalinklayer/CMakeLists.txt b/datalinklayer/CMakeLists.txt
new file mode 100644
index 000000000..148e7c5de
--- /dev/null
+++ b/datalinklayer/CMakeLists.txt
@@ -0,0 +1,12 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		Clcw.cpp
+		DataLinkLayer.cpp
+		Farm1StateLockout.cpp
+		Farm1StateOpen.cpp
+		Farm1StateWait.cpp
+		MapPacketExtraction.cpp
+		TcTransferFrame.cpp
+		TcTransferFrameLocal.cpp
+		VirtualChannelReception.cpp
+)
\ No newline at end of file
diff --git a/datapool/CMakeLists.txt b/datapool/CMakeLists.txt
index e741f6a13..0d53e1ba1 100644
--- a/datapool/CMakeLists.txt
+++ b/datapool/CMakeLists.txt
@@ -1,11 +1,6 @@
 target_sources(${LIB_FSFW_NAME} 
 	PRIVATE 
-		ControllerSet.cpp
-		DataPool.cpp
-		DataPoolAdmin.cpp
-		DataPoolParameterWrapper.cpp
-		DataSet.cpp
 		HkSwitchHelper.cpp
+		PoolDataSetBase.cpp
 		PoolEntry.cpp
-		PoolRawAccess.cpp
 )
\ No newline at end of file
diff --git a/datapoollocal/CMakeLists.txt b/datapoollocal/CMakeLists.txt
new file mode 100644
index 000000000..c6b187cd2
--- /dev/null
+++ b/datapoollocal/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		LocalDataPoolManager.cpp
+		LocalDataSet.cpp
+		LocalPoolDataSetBase.cpp
+		LocalPoolObjectBase.cpp
+		SharedLocalDataSet.cpp
+)
\ No newline at end of file
diff --git a/doc/README-devicehandlers.md b/doc/README-devicehandlers.md
index e69de29bb..6e737cc5a 100644
--- a/doc/README-devicehandlers.md
+++ b/doc/README-devicehandlers.md
@@ -0,0 +1 @@
+## FSFW DeviceHandlers
\ No newline at end of file