diff --git a/core-writer/CMakeLists.txt b/core-writer/CMakeLists.txt
index f000ff5..660c9a7 100644
--- a/core-writer/CMakeLists.txt
+++ b/core-writer/CMakeLists.txt
@@ -1,6 +1,9 @@
 add_subdirectory(external/)
 
-file(GLOB SOURCES src/*.cpp)
+file(GLOB SOURCES
+        src/*.cpp
+        src/writer/*.cpp
+        src/receiver/*.cpp)
 
 add_library(core-writer STATIC ${SOURCES})
 include_directories(core-writer external/)
diff --git a/core-writer/src/ZmqReceiver.cpp b/core-writer/src/receiver/ZmqReceiver.cpp
similarity index 100%
rename from core-writer/src/ZmqReceiver.cpp
rename to core-writer/src/receiver/ZmqReceiver.cpp
diff --git a/core-writer/src/BufferedWriter.cpp b/core-writer/src/writer/BufferedWriter.cpp
similarity index 100%
rename from core-writer/src/BufferedWriter.cpp
rename to core-writer/src/writer/BufferedWriter.cpp
diff --git a/core-writer/src/H5Format.cpp b/core-writer/src/writer/H5Format.cpp
similarity index 100%
rename from core-writer/src/H5Format.cpp
rename to core-writer/src/writer/H5Format.cpp
diff --git a/core-writer/src/H5Writer.cpp b/core-writer/src/writer/H5Writer.cpp
similarity index 100%
rename from core-writer/src/H5Writer.cpp
rename to core-writer/src/writer/H5Writer.cpp
diff --git a/core-writer/src/MetadataBuffer.cpp b/core-writer/src/writer/MetadataBuffer.cpp
similarity index 100%
rename from core-writer/src/MetadataBuffer.cpp
rename to core-writer/src/writer/MetadataBuffer.cpp
diff --git a/core-writer/src/compression.cpp b/core-writer/src/writer/compression.cpp
similarity index 100%
rename from core-writer/src/compression.cpp
rename to core-writer/src/writer/compression.cpp