diff --git a/core-writer/src/BufferedWriter.hpp b/core-writer/include/BufferedWriter.hpp
similarity index 100%
rename from core-writer/src/BufferedWriter.hpp
rename to core-writer/include/BufferedWriter.hpp
diff --git a/core-writer/src/H5Format.hpp b/core-writer/include/H5Format.hpp
similarity index 100%
rename from core-writer/src/H5Format.hpp
rename to core-writer/include/H5Format.hpp
diff --git a/core-writer/src/H5Writer.hpp b/core-writer/include/H5Writer.hpp
similarity index 100%
rename from core-writer/src/H5Writer.hpp
rename to core-writer/include/H5Writer.hpp
diff --git a/core-writer/src/MetadataBuffer.hpp b/core-writer/include/MetadataBuffer.hpp
similarity index 100%
rename from core-writer/src/MetadataBuffer.hpp
rename to core-writer/include/MetadataBuffer.hpp
diff --git a/core-writer/src/ProcessManager.hpp b/core-writer/include/ProcessManager.hpp
similarity index 100%
rename from core-writer/src/ProcessManager.hpp
rename to core-writer/include/ProcessManager.hpp
diff --git a/core-writer/src/RestApi.hpp b/core-writer/include/RestApi.hpp
similarity index 100%
rename from core-writer/src/RestApi.hpp
rename to core-writer/include/RestApi.hpp
diff --git a/core-writer/src/RingBuffer.hpp b/core-writer/include/RingBuffer.hpp
similarity index 100%
rename from core-writer/src/RingBuffer.hpp
rename to core-writer/include/RingBuffer.hpp
diff --git a/core-writer/src/WriterManager.hpp b/core-writer/include/WriterManager.hpp
similarity index 100%
rename from core-writer/src/WriterManager.hpp
rename to core-writer/include/WriterManager.hpp
diff --git a/core-writer/src/ZmqReceiver.hpp b/core-writer/include/ZmqReceiver.hpp
similarity index 100%
rename from core-writer/src/ZmqReceiver.hpp
rename to core-writer/include/ZmqReceiver.hpp
diff --git a/core-writer/src/compression.hpp b/core-writer/include/compression.hpp
similarity index 100%
rename from core-writer/src/compression.hpp
rename to core-writer/include/compression.hpp
diff --git a/core-writer/src/config.hpp b/core-writer/include/config.hpp
similarity index 100%
rename from core-writer/src/config.hpp
rename to core-writer/include/config.hpp
diff --git a/core-writer/test/test_BufferedWriter.cpp b/core-writer/test/test_BufferedWriter.cpp
index 336a64b..2f47e81 100644
--- a/core-writer/test/test_BufferedWriter.cpp
+++ b/core-writer/test/test_BufferedWriter.cpp
@@ -1,5 +1,5 @@
 #include "gtest/gtest.h"
-#include "../src/BufferedWriter.hpp"
+#include "BufferedWriter.hpp"
 using namespace std;
 
 TEST(BufferedWriter, get_buffered_writer)
diff --git a/core-writer/test/test_H5Writer.cpp b/core-writer/test/test_H5Writer.cpp
index 97436a7..fae4508 100644
--- a/core-writer/test/test_H5Writer.cpp
+++ b/core-writer/test/test_H5Writer.cpp
@@ -1,5 +1,5 @@
 #include "gtest/gtest.h"
-#include "../src/H5Writer.hpp"
+#include "H5Writer.hpp"
 using namespace std;
 
 TEST(H5Writer, get_h5_writer)
diff --git a/core-writer/test/test_MetadataBuffer.cpp b/core-writer/test/test_MetadataBuffer.cpp
index bb91e5f..d46463a 100644
--- a/core-writer/test/test_MetadataBuffer.cpp
+++ b/core-writer/test/test_MetadataBuffer.cpp
@@ -1,5 +1,5 @@
 #include "gtest/gtest.h"
-#include "../src/MetadataBuffer.hpp"
+#include "MetadataBuffer.hpp"
 
 using namespace std;
 
diff --git a/core-writer/test/test_ZmqReceiver.cpp b/core-writer/test/test_ZmqReceiver.cpp
index 0df1d79..7ed9aa9 100644
--- a/core-writer/test/test_ZmqReceiver.cpp
+++ b/core-writer/test/test_ZmqReceiver.cpp
@@ -1,5 +1,5 @@
 #include "gtest/gtest.h"
-#include "../src/ZmqReceiver.hpp"
+#include "ZmqReceiver.hpp"
 
 using namespace std;
 namespace pt = boost::property_tree;
diff --git a/core-writer/test/test_client.cpp b/core-writer/test/test_client.cpp
index 97436a7..fae4508 100644
--- a/core-writer/test/test_client.cpp
+++ b/core-writer/test/test_client.cpp
@@ -1,5 +1,5 @@
 #include "gtest/gtest.h"
-#include "../src/H5Writer.hpp"
+#include "H5Writer.hpp"
 using namespace std;
 
 TEST(H5Writer, get_h5_writer)