diff --git a/core-writer/CMakeLists.txt b/core-writer/CMakeLists.txt
index 660c9a7..121e4be 100644
--- a/core-writer/CMakeLists.txt
+++ b/core-writer/CMakeLists.txt
@@ -3,7 +3,8 @@ add_subdirectory(external/)
 file(GLOB SOURCES
         src/*.cpp
         src/writer/*.cpp
-        src/receiver/*.cpp)
+        src/receiver/*.cpp
+        src/module/*.cpp)
 
 add_library(core-writer STATIC ${SOURCES})
 include_directories(core-writer external/)
diff --git a/core-writer/src/receiver/ZmqRecvModule.cpp b/core-writer/src/module/ZmqRecvModule.cpp
similarity index 100%
rename from core-writer/src/receiver/ZmqRecvModule.cpp
rename to core-writer/src/module/ZmqRecvModule.cpp