headers are now included with their library prefix

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 {

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>
 

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>

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>

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 {

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 {
 

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 {
 

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 {
 

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>

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>
 

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 {

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>
 

file_io/src/NumpyFile.cpp

@@ -1,5 +1,5 @@
 
-#include "aare/NumpyFile.hpp"
+#include "aare/file_io/NumpyFile.hpp"
 
 namespace aare {
 

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 {
 

file_io/src/NumpyHelpers.cpp

@@ -22,7 +22,7 @@
    SOFTWARE.
 */
 
-#include "aare/NumpyHelpers.hpp"
+#include "aare/file_io/NumpyHelpers.hpp"
 #include <iterator>
 
 namespace aare {

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 {

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>

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>

file_io/src/helpers.cpp

@@ -1,4 +1,4 @@
-#include "aare/helpers.hpp"
+#include "aare/file_io/helpers.hpp"
 
 namespace aare {
 

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"

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;

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>