diff --git a/core/include/aare/CircularFifo.hpp b/core/include/aare/core/CircularFifo.hpp
similarity index 98%
rename from core/include/aare/CircularFifo.hpp
rename to core/include/aare/core/CircularFifo.hpp
index 0684737..9d04883 100644
--- a/core/include/aare/CircularFifo.hpp
+++ b/core/include/aare/core/CircularFifo.hpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <thread>
 
-#include "aare/ProducerConsumerQueue.hpp"
+#include "aare/core/ProducerConsumerQueue.hpp"
 
 namespace aare {
 
diff --git a/core/include/aare/DType.hpp b/core/include/aare/core/DType.hpp
similarity index 100%
rename from core/include/aare/DType.hpp
rename to core/include/aare/core/DType.hpp
diff --git a/core/include/aare/Frame.hpp b/core/include/aare/core/Frame.hpp
similarity index 97%
rename from core/include/aare/Frame.hpp
rename to core/include/aare/core/Frame.hpp
index ea5ad2d..ed8a4de 100644
--- a/core/include/aare/Frame.hpp
+++ b/core/include/aare/core/Frame.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "aare/NDArray.hpp"
-#include "aare/defs.hpp"
+#include "aare/core/NDArray.hpp"
+#include "aare/core/defs.hpp"
 #include <cstddef>
 #include <cstdint>
 #include <memory>
diff --git a/core/include/aare/NDArray.hpp b/core/include/aare/core/NDArray.hpp
similarity index 99%
rename from core/include/aare/NDArray.hpp
rename to core/include/aare/core/NDArray.hpp
index b394763..14f0649 100644
--- a/core/include/aare/NDArray.hpp
+++ b/core/include/aare/core/NDArray.hpp
@@ -7,7 +7,7 @@ memory.
 TODO! Add expression templates for operators
 
 */
-#include "aare/NDView.hpp"
+#include "aare/core/NDView.hpp"
 
 #include <algorithm>
 #include <array>
diff --git a/core/include/aare/NDView.hpp b/core/include/aare/core/NDView.hpp
similarity index 100%
rename from core/include/aare/NDView.hpp
rename to core/include/aare/core/NDView.hpp
diff --git a/core/include/aare/ProducerConsumerQueue.hpp b/core/include/aare/core/ProducerConsumerQueue.hpp
similarity index 100%
rename from core/include/aare/ProducerConsumerQueue.hpp
rename to core/include/aare/core/ProducerConsumerQueue.hpp
diff --git a/core/include/aare/VariableSizeClusterFinder.hpp b/core/include/aare/core/VariableSizeClusterFinder.hpp
similarity index 99%
rename from core/include/aare/VariableSizeClusterFinder.hpp
rename to core/include/aare/core/VariableSizeClusterFinder.hpp
index 01b7c0c..2cedb0d 100644
--- a/core/include/aare/VariableSizeClusterFinder.hpp
+++ b/core/include/aare/core/VariableSizeClusterFinder.hpp
@@ -5,7 +5,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "aare/NDArray.hpp"
+#include "aare/core/NDArray.hpp"
 
 const int MAX_CLUSTER_SIZE = 200;
 namespace aare {
diff --git a/core/include/aare/defs.hpp b/core/include/aare/core/defs.hpp
similarity index 100%
rename from core/include/aare/defs.hpp
rename to core/include/aare/core/defs.hpp
diff --git a/core/src/DType.cpp b/core/src/DType.cpp
index 1a06085..560acbb 100644
--- a/core/src/DType.cpp
+++ b/core/src/DType.cpp
@@ -1,5 +1,5 @@
 
-#include "aare/DType.hpp"
+#include "aare/core/DType.hpp"
 #include <fmt/format.h>
 
 namespace aare {
diff --git a/core/src/Frame.cpp b/core/src/Frame.cpp
index e870510..609c329 100644
--- a/core/src/Frame.cpp
+++ b/core/src/Frame.cpp
@@ -1,4 +1,4 @@
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include "aare/utils/logger.hpp"
 #include <cassert>
 #include <iostream>
diff --git a/core/src/defs.cpp b/core/src/defs.cpp
index f7d06e5..8f77439 100644
--- a/core/src/defs.cpp
+++ b/core/src/defs.cpp
@@ -1,4 +1,4 @@
-#include "aare/defs.hpp"
+#include "aare/core/defs.hpp"
 
 namespace aare {
 
diff --git a/core/test/CircularFifo.test.cpp b/core/test/CircularFifo.test.cpp
index f17abba..cc18c38 100644
--- a/core/test/CircularFifo.test.cpp
+++ b/core/test/CircularFifo.test.cpp
@@ -1,6 +1,6 @@
 #include <catch2/catch_all.hpp>
 
-#include "aare/CircularFifo.hpp"
+#include "aare/core/CircularFifo.hpp"
 
 using aare::CircularFifo;
 
diff --git a/core/test/DType.test.cpp b/core/test/DType.test.cpp
index 1490344..98ec528 100644
--- a/core/test/DType.test.cpp
+++ b/core/test/DType.test.cpp
@@ -1,6 +1,6 @@
 
 
-#include "aare/DType.hpp"
+#include "aare/core/DType.hpp"
 #include <catch2/catch_test_macros.hpp>
 
 using aare::DType;
diff --git a/core/test/Frame.test.cpp b/core/test/Frame.test.cpp
index 31c0c9c..fdff8e9 100644
--- a/core/test/Frame.test.cpp
+++ b/core/test/Frame.test.cpp
@@ -1,4 +1,4 @@
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include <catch2/catch_test_macros.hpp>
 
 using aare::Frame;
diff --git a/core/test/NDArray.test.cpp b/core/test/NDArray.test.cpp
index 136a5b6..456cf08 100644
--- a/core/test/NDArray.test.cpp
+++ b/core/test/NDArray.test.cpp
@@ -1,4 +1,4 @@
-#include "aare/NDArray.hpp"
+#include "aare/core/NDArray.hpp"
 #include <array>
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/core/test/NDView.test.cpp b/core/test/NDView.test.cpp
index 35d20f3..fd6ddc5 100644
--- a/core/test/NDView.test.cpp
+++ b/core/test/NDView.test.cpp
@@ -1,4 +1,4 @@
-#include "aare/NDView.hpp"
+#include "aare/core/NDView.hpp"
 #include <catch2/catch_test_macros.hpp>
 
 #include <iostream>
diff --git a/core/test/ProducerConsumerQueue.test.cpp b/core/test/ProducerConsumerQueue.test.cpp
index baa960a..b1ba414 100644
--- a/core/test/ProducerConsumerQueue.test.cpp
+++ b/core/test/ProducerConsumerQueue.test.cpp
@@ -1,4 +1,4 @@
-#include "aare/ProducerConsumerQueue.hpp"
+#include "aare/core/ProducerConsumerQueue.hpp"
 #include <catch2/catch_all.hpp>
 
 // using arve::SimpleQueue;
diff --git a/core/test/defs.test.cpp b/core/test/defs.test.cpp
index a3163a4..25fdc2f 100644
--- a/core/test/defs.test.cpp
+++ b/core/test/defs.test.cpp
@@ -1,4 +1,4 @@
-#include "aare/defs.hpp"
+#include "aare/core/defs.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <string>
 TEST_CASE("Enum to string conversion") {
diff --git a/core/test/wrappers.test.cpp b/core/test/wrappers.test.cpp
index 2718795..64d4338 100644
--- a/core/test/wrappers.test.cpp
+++ b/core/test/wrappers.test.cpp
@@ -1,5 +1,5 @@
-#include <aare/Frame.hpp>
-#include <aare/NDView.hpp>
+#include <aare/core/Frame.hpp>
+#include <aare/core/NDView.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <cstdint>
 
diff --git a/examples/json_example.cpp b/examples/json_example.cpp
index 1f9ed2a..30f95cf 100644
--- a/examples/json_example.cpp
+++ b/examples/json_example.cpp
@@ -1,5 +1,5 @@
 // Your First C++ Program
-#include "aare/File.hpp"
+#include "aare/file_io/File.hpp"
 #include "aare/utils/logger.hpp"
 #include <iostream>
 
diff --git a/examples/multiport_example.cpp b/examples/multiport_example.cpp
index b250899..a697e1e 100644
--- a/examples/multiport_example.cpp
+++ b/examples/multiport_example.cpp
@@ -1,5 +1,5 @@
 // Your First C++ Program
-#include "aare/File.hpp"
+#include "aare/file_io/File.hpp"
 #include "aare/utils/logger.hpp"
 #include <iostream>
 
diff --git a/examples/mythen_example.cpp b/examples/mythen_example.cpp
index c7960bc..eee01f5 100644
--- a/examples/mythen_example.cpp
+++ b/examples/mythen_example.cpp
@@ -1,5 +1,5 @@
 // Your First C++ Program
-#include "aare/File.hpp"
+#include "aare/file_io/File.hpp"
 #include "aare/utils/logger.hpp"
 #include <iostream>
 
diff --git a/examples/numpy_read_example.cpp b/examples/numpy_read_example.cpp
index f9fc4bb..6ca3721 100644
--- a/examples/numpy_read_example.cpp
+++ b/examples/numpy_read_example.cpp
@@ -1,5 +1,5 @@
 // Your First C++ Program
-#include "aare/File.hpp"
+#include "aare/file_io/File.hpp"
 #include <iostream>
 
 #define AARE_ROOT_DIR_VAR "PROJECT_ROOT_DIR"
diff --git a/examples/numpy_write_example.cpp b/examples/numpy_write_example.cpp
index c999267..06c4424 100644
--- a/examples/numpy_write_example.cpp
+++ b/examples/numpy_write_example.cpp
@@ -1,6 +1,6 @@
 // Your First C++ Program
-#include "aare/File.hpp"
-#include "aare/Frame.hpp"
+#include "aare/file_io/File.hpp"
+#include "aare/core/Frame.hpp"
 #include <iostream>
 
 #define AARE_ROOT_DIR_VAR "PROJECT_ROOT_DIR"
diff --git a/examples/raw_example.cpp b/examples/raw_example.cpp
index c32840d..785f33c 100644
--- a/examples/raw_example.cpp
+++ b/examples/raw_example.cpp
@@ -1,5 +1,5 @@
 // Your First C++ Program
-#include "aare/File.hpp"
+#include "aare/file_io/File.hpp"
 #include "aare/utils/logger.hpp"
 #include <iostream>
 
diff --git a/examples/restream_example.cpp b/examples/restream_example.cpp
new file mode 100644
index 0000000..00c0276
--- /dev/null
+++ b/examples/restream_example.cpp
@@ -0,0 +1,10 @@
+#include "aare/network_io/ZmqSocketSender.hpp"
+#include "aare/
+
+using namespace aare;
+using namespace std;
+
+int main(){
+
+
+}
\ No newline at end of file
diff --git a/examples/zmq_sender_example.cpp b/examples/zmq_sender_example.cpp
index 48f5db0..5799130 100644
--- a/examples/zmq_sender_example.cpp
+++ b/examples/zmq_sender_example.cpp
@@ -1,4 +1,4 @@
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include "aare/network_io/ZmqHeader.hpp"
 #include "aare/network_io/ZmqSocketSender.hpp"
 #include "aare/network_io/defs.hpp"
diff --git a/file_io/include/aare/File.hpp b/file_io/include/aare/file_io/File.hpp
similarity index 95%
rename from file_io/include/aare/File.hpp
rename to file_io/include/aare/file_io/File.hpp
index 7399543..09a2dd2 100644
--- a/file_io/include/aare/File.hpp
+++ b/file_io/include/aare/file_io/File.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "aare/FileInterface.hpp"
+#include "aare/file_io/FileInterface.hpp"
 
 namespace aare {
 class File {
diff --git a/file_io/include/aare/FileFactory.hpp b/file_io/include/aare/file_io/FileFactory.hpp
similarity index 94%
rename from file_io/include/aare/FileFactory.hpp
rename to file_io/include/aare/file_io/FileFactory.hpp
index 4572e9c..a23b74e 100644
--- a/file_io/include/aare/FileFactory.hpp
+++ b/file_io/include/aare/file_io/FileFactory.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "aare/DType.hpp"
-#include "aare/FileInterface.hpp"
+#include "aare/core/DType.hpp"
+#include "aare/file_io/FileInterface.hpp"
 #include "aare/utils/logger.hpp"
 #include <filesystem>
 
diff --git a/file_io/include/aare/FileInterface.hpp b/file_io/include/aare/file_io/FileInterface.hpp
similarity index 96%
rename from file_io/include/aare/FileInterface.hpp
rename to file_io/include/aare/file_io/FileInterface.hpp
index f403f62..67075e5 100644
--- a/file_io/include/aare/FileInterface.hpp
+++ b/file_io/include/aare/file_io/FileInterface.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "aare/DType.hpp"
-#include "aare/Frame.hpp"
-#include "aare/defs.hpp"
+#include "aare/core/DType.hpp"
+#include "aare/core/Frame.hpp"
+#include "aare/core/defs.hpp"
 #include "aare/utils/logger.hpp"
 #include <filesystem>
 #include <vector>
diff --git a/file_io/include/aare/NumpyFile.hpp b/file_io/include/aare/file_io/NumpyFile.hpp
similarity index 93%
rename from file_io/include/aare/NumpyFile.hpp
rename to file_io/include/aare/file_io/NumpyFile.hpp
index 4a8276a..6784a0e 100644
--- a/file_io/include/aare/NumpyFile.hpp
+++ b/file_io/include/aare/file_io/NumpyFile.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "aare/DType.hpp"
-#include "aare/FileInterface.hpp"
-#include "aare/NumpyHelpers.hpp"
-#include "aare/defs.hpp"
+#include "aare/core/DType.hpp"
+#include "aare/file_io/FileInterface.hpp"
+#include "aare/file_io/NumpyHelpers.hpp"
+#include "aare/core/defs.hpp"
 #include <filesystem>
 #include <iostream>
 #include <numeric>
diff --git a/file_io/include/aare/NumpyFileFactory.hpp b/file_io/include/aare/file_io/NumpyFileFactory.hpp
similarity index 81%
rename from file_io/include/aare/NumpyFileFactory.hpp
rename to file_io/include/aare/file_io/NumpyFileFactory.hpp
index 3e27ed0..6c709c4 100644
--- a/file_io/include/aare/NumpyFileFactory.hpp
+++ b/file_io/include/aare/file_io/NumpyFileFactory.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "aare/FileFactory.hpp"
-#include "aare/NumpyFile.hpp"
-#include "aare/defs.hpp"
+#include "aare/file_io/FileFactory.hpp"
+#include "aare/file_io/NumpyFile.hpp"
+#include "aare/core/defs.hpp"
 #include <fstream>
 
 namespace aare {
diff --git a/file_io/include/aare/NumpyHelpers.hpp b/file_io/include/aare/file_io/NumpyHelpers.hpp
similarity index 95%
rename from file_io/include/aare/NumpyHelpers.hpp
rename to file_io/include/aare/file_io/NumpyHelpers.hpp
index b45fbbb..f00ba27 100644
--- a/file_io/include/aare/NumpyHelpers.hpp
+++ b/file_io/include/aare/file_io/NumpyHelpers.hpp
@@ -11,8 +11,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "aare/DType.hpp"
-#include "aare/defs.hpp"
+#include "aare/core/DType.hpp"
+#include "aare/core/defs.hpp"
 
 namespace aare {
 
diff --git a/file_io/include/aare/RawFile.hpp b/file_io/include/aare/file_io/RawFile.hpp
similarity index 94%
rename from file_io/include/aare/RawFile.hpp
rename to file_io/include/aare/file_io/RawFile.hpp
index f5bd4de..96e1d87 100644
--- a/file_io/include/aare/RawFile.hpp
+++ b/file_io/include/aare/file_io/RawFile.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "aare/FileInterface.hpp"
-#include "aare/Frame.hpp"
-#include "aare/SubFile.hpp"
-#include "aare/defs.hpp"
+#include "aare/file_io/FileInterface.hpp"
+#include "aare/core/Frame.hpp"
+#include "aare/file_io/SubFile.hpp"
+#include "aare/core/defs.hpp"
 
 namespace aare {
 
diff --git a/file_io/include/aare/RawFileFactory.hpp b/file_io/include/aare/file_io/RawFileFactory.hpp
similarity index 89%
rename from file_io/include/aare/RawFileFactory.hpp
rename to file_io/include/aare/file_io/RawFileFactory.hpp
index 901b5ff..569ad06 100644
--- a/file_io/include/aare/RawFileFactory.hpp
+++ b/file_io/include/aare/file_io/RawFileFactory.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "aare/FileFactory.hpp"
-#include "aare/RawFile.hpp"
+#include "aare/file_io/FileFactory.hpp"
+#include "aare/file_io/RawFile.hpp"
 
 namespace aare {
 
diff --git a/file_io/include/aare/SubFile.hpp b/file_io/include/aare/file_io/SubFile.hpp
similarity index 98%
rename from file_io/include/aare/SubFile.hpp
rename to file_io/include/aare/file_io/SubFile.hpp
index 4a8212a..eea343d 100644
--- a/file_io/include/aare/SubFile.hpp
+++ b/file_io/include/aare/file_io/SubFile.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "aare/defs.hpp"
+#include "aare/core/defs.hpp"
 #include <cstdint>
 #include <filesystem>
 #include <map>
diff --git a/file_io/include/aare/helpers.hpp b/file_io/include/aare/file_io/helpers.hpp
similarity index 75%
rename from file_io/include/aare/helpers.hpp
rename to file_io/include/aare/file_io/helpers.hpp
index f8d52fb..ac0d060 100644
--- a/file_io/include/aare/helpers.hpp
+++ b/file_io/include/aare/file_io/helpers.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "aare/FileInterface.hpp"
+#include "aare/file_io/FileInterface.hpp"
 #include <filesystem>
 #include <fmt/core.h>
 
diff --git a/file_io/src/File.cpp b/file_io/src/File.cpp
index 2c397d5..462d2e4 100644
--- a/file_io/src/File.cpp
+++ b/file_io/src/File.cpp
@@ -1,5 +1,5 @@
-#include "aare/File.hpp"
-#include "aare/FileFactory.hpp"
+#include "aare/file_io/File.hpp"
+#include "aare/file_io/FileFactory.hpp"
 #include "aare/utils/logger.hpp"
 
 namespace aare {
diff --git a/file_io/src/FileFactory.cpp b/file_io/src/FileFactory.cpp
index 4d1b047..bbe8ed3 100644
--- a/file_io/src/FileFactory.cpp
+++ b/file_io/src/FileFactory.cpp
@@ -1,7 +1,7 @@
-#include "aare/FileFactory.hpp"
-#include "aare/FileInterface.hpp"
-#include "aare/NumpyFileFactory.hpp"
-#include "aare/RawFileFactory.hpp"
+#include "aare/file_io/FileFactory.hpp"
+#include "aare/file_io/FileInterface.hpp"
+#include "aare/file_io/NumpyFileFactory.hpp"
+#include "aare/file_io/RawFileFactory.hpp"
 #include "aare/utils/logger.hpp"
 #include <iostream>
 
diff --git a/file_io/src/NumpyFile.cpp b/file_io/src/NumpyFile.cpp
index 50e925d..d18b5ac 100644
--- a/file_io/src/NumpyFile.cpp
+++ b/file_io/src/NumpyFile.cpp
@@ -1,5 +1,5 @@
 
-#include "aare/NumpyFile.hpp"
+#include "aare/file_io/NumpyFile.hpp"
 
 namespace aare {
 
diff --git a/file_io/src/NumpyFileFactory.cpp b/file_io/src/NumpyFileFactory.cpp
index 4c73be7..d29c753 100644
--- a/file_io/src/NumpyFileFactory.cpp
+++ b/file_io/src/NumpyFileFactory.cpp
@@ -1,5 +1,5 @@
-#include "aare/NumpyFileFactory.hpp"
-#include "aare/NumpyHelpers.hpp"
+#include "aare/file_io/NumpyFileFactory.hpp"
+#include "aare/file_io/NumpyHelpers.hpp"
 
 namespace aare {
 
diff --git a/file_io/src/NumpyHelpers.cpp b/file_io/src/NumpyHelpers.cpp
index dbfa9e6..f65100e 100644
--- a/file_io/src/NumpyHelpers.cpp
+++ b/file_io/src/NumpyHelpers.cpp
@@ -22,7 +22,7 @@
    SOFTWARE.
 */
 
-#include "aare/NumpyHelpers.hpp"
+#include "aare/file_io/NumpyHelpers.hpp"
 #include <iterator>
 
 namespace aare {
diff --git a/file_io/src/RawFile.cpp b/file_io/src/RawFile.cpp
index ee1d889..7094614 100644
--- a/file_io/src/RawFile.cpp
+++ b/file_io/src/RawFile.cpp
@@ -1,4 +1,4 @@
-#include "aare/RawFile.hpp"
+#include "aare/file_io/RawFile.hpp"
 #include "aare/utils/logger.hpp"
 
 namespace aare {
diff --git a/file_io/src/RawFileFactory.cpp b/file_io/src/RawFileFactory.cpp
index c11fa20..d28ca14 100644
--- a/file_io/src/RawFileFactory.cpp
+++ b/file_io/src/RawFileFactory.cpp
@@ -1,8 +1,8 @@
-#include "aare/RawFileFactory.hpp"
-#include "aare/RawFile.hpp"
-#include "aare/SubFile.hpp"
-#include "aare/defs.hpp"
-#include "aare/helpers.hpp"
+#include "aare/file_io/RawFileFactory.hpp"
+#include "aare/file_io/RawFile.hpp"
+#include "aare/file_io/SubFile.hpp"
+#include "aare/core/defs.hpp"
+#include "aare/file_io/helpers.hpp"
 #include "aare/utils/logger.hpp"
 
 #include <fstream>
diff --git a/file_io/src/SubFile.cpp b/file_io/src/SubFile.cpp
index f65e7d5..22823cf 100644
--- a/file_io/src/SubFile.cpp
+++ b/file_io/src/SubFile.cpp
@@ -1,4 +1,4 @@
-#include "aare/SubFile.hpp"
+#include "aare/file_io/SubFile.hpp"
 #include "aare/utils/logger.hpp"
 #include <cstring> // memcpy
 #include <fmt/core.h>
diff --git a/file_io/src/helpers.cpp b/file_io/src/helpers.cpp
index 52181d1..0819eb9 100644
--- a/file_io/src/helpers.cpp
+++ b/file_io/src/helpers.cpp
@@ -1,4 +1,4 @@
-#include "aare/helpers.hpp"
+#include "aare/file_io/helpers.hpp"
 
 namespace aare {
 
diff --git a/file_io/test/NumpyFile.test.cpp b/file_io/test/NumpyFile.test.cpp
index 4468b7d..62ec3b8 100644
--- a/file_io/test/NumpyFile.test.cpp
+++ b/file_io/test/NumpyFile.test.cpp
@@ -1,5 +1,5 @@
-#include "aare/NumpyFile.hpp"
-#include "aare/NDArray.hpp"
+#include "aare/file_io/NumpyFile.hpp"
+#include "aare/core/NDArray.hpp"
 #include <catch2/catch_test_macros.hpp>
 
 #include "test_config.hpp"
diff --git a/file_io/test/NumpyHelpers.test.cpp b/file_io/test/NumpyHelpers.test.cpp
index 2bfde86..dd44332 100644
--- a/file_io/test/NumpyHelpers.test.cpp
+++ b/file_io/test/NumpyHelpers.test.cpp
@@ -1,4 +1,4 @@
-#include "aare/NumpyHelpers.hpp" //Is this really a public header?
+#include "aare/file_io/NumpyHelpers.hpp" //Is this really a public header?
 #include <catch2/catch_test_macros.hpp>
 
 using namespace aare::NumpyHelpers;
diff --git a/file_io/test/RawFile.test.cpp b/file_io/test/RawFile.test.cpp
index a2d6e70..34f2f03 100644
--- a/file_io/test/RawFile.test.cpp
+++ b/file_io/test/RawFile.test.cpp
@@ -1,4 +1,4 @@
-#include "aare/File.hpp"
+#include "aare/file_io/File.hpp"
 #include "aare/utils/logger.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <filesystem>
diff --git a/network_io/include/aare/network_io/ZmqHeader.hpp b/network_io/include/aare/network_io/ZmqHeader.hpp
index 392bfc5..085f922 100644
--- a/network_io/include/aare/network_io/ZmqHeader.hpp
+++ b/network_io/include/aare/network_io/ZmqHeader.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include "aare/utils/logger.hpp"
 
 #include "simdjson.h"
diff --git a/network_io/include/aare/network_io/ZmqSocketReceiver.hpp b/network_io/include/aare/network_io/ZmqSocketReceiver.hpp
index 793d196..3d7daaf 100644
--- a/network_io/include/aare/network_io/ZmqSocketReceiver.hpp
+++ b/network_io/include/aare/network_io/ZmqSocketReceiver.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include "aare/network_io/ZmqHeader.hpp"
 #include "aare/network_io/ZmqSocket.hpp"
 #include "aare/network_io/defs.hpp"
diff --git a/network_io/include/aare/network_io/ZmqSocketSender.hpp b/network_io/include/aare/network_io/ZmqSocketSender.hpp
index cbba321..1a7f9fb 100644
--- a/network_io/include/aare/network_io/ZmqSocketSender.hpp
+++ b/network_io/include/aare/network_io/ZmqSocketSender.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include "aare/network_io/ZmqHeader.hpp"
 #include "aare/network_io/ZmqSocket.hpp"
 #include "aare/network_io/defs.hpp"
diff --git a/network_io/include/aare/network_io/defs.hpp b/network_io/include/aare/network_io/defs.hpp
index c97dcf8..2752750 100644
--- a/network_io/include/aare/network_io/defs.hpp
+++ b/network_io/include/aare/network_io/defs.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "aare/Frame.hpp"
+#include "aare/core/Frame.hpp"
 #include "aare/network_io/ZmqHeader.hpp"
 
 #include <stdexcept>
diff --git a/python/src/bindings.cpp b/python/src/bindings.cpp
index b73d4b2..2a0f50a 100644
--- a/python/src/bindings.cpp
+++ b/python/src/bindings.cpp
@@ -5,8 +5,8 @@
 #include <string>
 
 #include "aare/FileHandler.hpp"
-#include "aare/Frame.hpp"
-#include "aare/defs.hpp"
+#include "aare/core/Frame.hpp"
+#include "aare/core/defs.hpp"
 
 namespace py = pybind11;