diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3f49b4..e8a00dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,25 +232,16 @@ include_directories(
 )
 
 # Core library
-add_library(core
-        src/core.cpp
-        src/query.cpp
-        src/query_execution.cpp
-        src/join.cpp
-        src/row.cpp
-        src/shard.cpp
-        src/storage.cpp
-        src/metadata.cpp
-
-        src/snapshot_manager.cpp
-        src/edge_store.cpp
-        src/table_info.cpp
-        src/utils.cpp
-        src/schema.cpp
-        src/arrow_utils.cpp
-        src/types.cpp
-        src/clock.cpp
-)
+add_library(core)
+
+# Per-domain source directories
+add_subdirectory(src/common)
+add_subdirectory(src/arrow)
+add_subdirectory(src/schema)
+add_subdirectory(src/core)
+add_subdirectory(src/storage)
+add_subdirectory(src/query)
+add_subdirectory(src/main)
 
 target_include_directories(core
     PUBLIC
@@ -384,7 +375,7 @@ if(TUNDRADB_BUILD_SHELL)
     endif()
 
     # Interactive shell executable
-    add_executable(tundra_shell src/tundra_shell.cpp libs/linenoise/linenoise.c)
+    add_executable(tundra_shell apps/tundra_shell.cpp libs/linenoise/linenoise.c)
 
     target_include_directories(tundra_shell
         PRIVATE
diff --git a/src/tundra_shell.cpp b/apps/tundra_shell.cpp
similarity index 99%
rename from src/tundra_shell.cpp
rename to apps/tundra_shell.cpp
index 743250b..a13de13 100644
--- a/src/tundra_shell.cpp
+++ b/apps/tundra_shell.cpp
@@ -26,13 +26,13 @@
 #include "TundraQLBaseVisitor.h"
 #include "TundraQLLexer.h"
 #include "TundraQLParser.h"
-#include "arrow_map_union_types.hpp"
-#include "constants.hpp"
-#include "core.hpp"
+#include "arrow/map_union_types.hpp"
+#include "common/constants.hpp"
+#include "main/database.hpp"
 #include "linenoise.h"
-#include "logger.hpp"
-#include "types.hpp"
-#include "utils.hpp"
+#include "common/logger.hpp"
+#include "common/types.hpp"
+#include "common/utils.hpp"
 
 // Tee stream class that outputs to both console and file
 class TeeStream : public std::ostream {
diff --git a/bench/tundra_runner.cpp b/bench/tundra_runner.cpp
index bb2a495..a52e002 100644
--- a/bench/tundra_runner.cpp
+++ b/bench/tundra_runner.cpp
@@ -6,9 +6,9 @@
 #include <memory>
 #include <string>
 
-#include "../include/core.hpp"
-#include "../include/query.hpp"
-#include "../include/types.hpp"
+#include "main/database.hpp"
+#include "query/query.hpp"
+#include "common/types.hpp"
 
 using namespace tundradb;
 
diff --git a/include/arrow_map_union_types.hpp b/include/arrow/map_union_types.hpp
similarity index 100%
rename from include/arrow_map_union_types.hpp
rename to include/arrow/map_union_types.hpp
diff --git a/include/table_info.hpp b/include/arrow/table_info.hpp
similarity index 100%
rename from include/table_info.hpp
rename to include/arrow/table_info.hpp
diff --git a/include/arrow_utils.hpp b/include/arrow/utils.hpp
similarity index 99%
rename from include/arrow_utils.hpp
rename to include/arrow/utils.hpp
index 50c2470..684a75b 100644
--- a/include/arrow_utils.hpp
+++ b/include/arrow/utils.hpp
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include "types.hpp"
+#include "common/types.hpp"
 
 namespace tundradb {
 
diff --git a/include/clock.hpp b/include/common/clock.hpp
similarity index 100%
rename from include/clock.hpp
rename to include/common/clock.hpp
diff --git a/include/concurrency.hpp b/include/common/concurrency.hpp
similarity index 100%
rename from include/concurrency.hpp
rename to include/common/concurrency.hpp
diff --git a/include/config.hpp b/include/common/config.hpp
similarity index 100%
rename from include/config.hpp
rename to include/common/config.hpp
diff --git a/include/constants.hpp b/include/common/constants.hpp
similarity index 100%
rename from include/constants.hpp
rename to include/common/constants.hpp
diff --git a/include/debug_utils.hpp b/include/common/debug_utils.hpp
similarity index 100%
rename from include/debug_utils.hpp
rename to include/common/debug_utils.hpp
diff --git a/include/logger.hpp b/include/common/logger.hpp
similarity index 100%
rename from include/logger.hpp
rename to include/common/logger.hpp
diff --git a/include/types.hpp b/include/common/types.hpp
similarity index 99%
rename from include/types.hpp
rename to include/common/types.hpp
index d993af2..1fc31bb 100644
--- a/include/types.hpp
+++ b/include/common/types.hpp
@@ -12,9 +12,9 @@
 // Arrow includes for type conversion functions
 #include <arrow/api.h>
 
-#include "array_ref.hpp"
-#include "map_ref.hpp"
-#include "string_arena.hpp"
+#include "memory/array_ref.hpp"
+#include "memory/map_ref.hpp"
+#include "memory/string_arena.hpp"
 
 namespace tundradb {
 
diff --git a/include/utils.hpp b/include/common/utils.hpp
similarity index 99%
rename from include/utils.hpp
rename to include/common/utils.hpp
index 2a8f9ea..adc43d3 100644
--- a/include/utils.hpp
+++ b/include/common/utils.hpp
@@ -15,12 +15,12 @@
 #include <string>
 #include <unordered_set>
 
-#include "arrow_utils.hpp"
-#include "constants.hpp"
-#include "logger.hpp"
-#include "node.hpp"
-#include "query.hpp"
-#include "types.hpp"
+#include "arrow/utils.hpp"
+#include "common/constants.hpp"
+#include "common/logger.hpp"
+#include "core/node.hpp"
+#include "query/query.hpp"
+#include "common/types.hpp"
 
 namespace tundradb {
 
diff --git a/include/value_type.hpp b/include/common/value_type.hpp
similarity index 100%
rename from include/value_type.hpp
rename to include/common/value_type.hpp
diff --git a/include/edge.hpp b/include/core/edge.hpp
similarity index 96%
rename from include/edge.hpp
rename to include/core/edge.hpp
index 425455f..92447ac 100644
--- a/include/edge.hpp
+++ b/include/core/edge.hpp
@@ -7,14 +7,14 @@
 #include <utility>
 #include <vector>
 
-#include "constants.hpp"
-#include "edge_view.hpp"
-#include "node_arena.hpp"
-#include "schema.hpp"
-#include "schema_layout.hpp"
-#include "temporal_context.hpp"
-#include "types.hpp"
-#include "update_type.hpp"
+#include "common/constants.hpp"
+#include "core/edge_view.hpp"
+#include "memory/node_arena.hpp"
+#include "schema/schema.hpp"
+#include "memory/schema_layout.hpp"
+#include "query/temporal_context.hpp"
+#include "common/types.hpp"
+#include "core/update_type.hpp"
 
 namespace tundradb {
 class Edge {
diff --git a/include/edge_store.hpp b/include/core/edge_store.hpp
similarity index 96%
rename from include/edge_store.hpp
rename to include/core/edge_store.hpp
index 96a8b24..8626fdf 100644
--- a/include/edge_store.hpp
+++ b/include/core/edge_store.hpp
@@ -11,12 +11,12 @@
 #include <unordered_map>
 #include <vector>
 
-#include "concurrency.hpp"
-#include "edge.hpp"
-#include "node_arena.hpp"
-#include "schema.hpp"
-#include "schema_layout.hpp"
-#include "utils.hpp"
+#include "common/concurrency.hpp"
+#include "core/edge.hpp"
+#include "memory/node_arena.hpp"
+#include "schema/schema.hpp"
+#include "memory/schema_layout.hpp"
+#include "common/utils.hpp"
 
 namespace tundradb {
 
diff --git a/include/edge_view.hpp b/include/core/edge_view.hpp
similarity index 91%
rename from include/edge_view.hpp
rename to include/core/edge_view.hpp
index e21b824..79b8f53 100644
--- a/include/edge_view.hpp
+++ b/include/core/edge_view.hpp
@@ -5,9 +5,9 @@
 
 #include <unordered_map>
 
-#include "node_arena.hpp"
-#include "schema.hpp"
-#include "types.hpp"
+#include "memory/node_arena.hpp"
+#include "schema/schema.hpp"
+#include "common/types.hpp"
 
 namespace tundradb {
 
diff --git a/include/field_update.hpp b/include/core/field_update.hpp
similarity index 88%
rename from include/field_update.hpp
rename to include/core/field_update.hpp
index bc13092..36c6714 100644
--- a/include/field_update.hpp
+++ b/include/core/field_update.hpp
@@ -6,9 +6,9 @@
 #include <string>
 #include <vector>
 
-#include "schema.hpp"
-#include "types.hpp"
-#include "update_type.hpp"
+#include "schema/schema.hpp"
+#include "common/types.hpp"
+#include "core/update_type.hpp"
 
 namespace tundradb {
 
diff --git a/include/node.hpp b/include/core/node.hpp
similarity index 97%
rename from include/node.hpp
rename to include/core/node.hpp
index de31098..33cfbf4 100644
--- a/include/node.hpp
+++ b/include/core/node.hpp
@@ -6,14 +6,14 @@
 #include <string>
 #include <unordered_map>
 
-#include "constants.hpp"
-#include "logger.hpp"
-#include "node_arena.hpp"
-#include "node_view.hpp"
-#include "schema.hpp"
-#include "temporal_context.hpp"
-#include "types.hpp"
-#include "update_type.hpp"
+#include "common/constants.hpp"
+#include "common/logger.hpp"
+#include "memory/node_arena.hpp"
+#include "core/node_view.hpp"
+#include "schema/schema.hpp"
+#include "query/temporal_context.hpp"
+#include "common/types.hpp"
+#include "core/update_type.hpp"
 
 namespace tundradb {
 
diff --git a/include/node_view.hpp b/include/core/node_view.hpp
similarity index 96%
rename from include/node_view.hpp
rename to include/core/node_view.hpp
index 890ba1d..ee9c903 100644
--- a/include/node_view.hpp
+++ b/include/core/node_view.hpp
@@ -5,10 +5,10 @@
 
 #include <unordered_map>
 
-#include "node_arena.hpp"
-#include "schema.hpp"
-#include "temporal_context.hpp"
-#include "types.hpp"
+#include "memory/node_arena.hpp"
+#include "schema/schema.hpp"
+#include "query/temporal_context.hpp"
+#include "common/types.hpp"
 
 namespace tundradb {
 
diff --git a/include/update_type.hpp b/include/core/update_type.hpp
similarity index 100%
rename from include/update_type.hpp
rename to include/core/update_type.hpp
diff --git a/include/core.hpp b/include/main/database.hpp
similarity index 96%
rename from include/core.hpp
rename to include/main/database.hpp
index 3ccf2f2..9ec7bb7 100644
--- a/include/core.hpp
+++ b/include/main/database.hpp
@@ -9,20 +9,20 @@
 #include <unordered_map>
 #include <vector>
 
-#include "arrow_utils.hpp"
-#include "config.hpp"
-#include "edge_store.hpp"
-#include "field_update.hpp"
-#include "logger.hpp"
-#include "metadata.hpp"
-#include "node.hpp"
-#include "query.hpp"
-#include "query_execution.hpp"
-#include "schema.hpp"
-#include "shard.hpp"
-#include "snapshot_manager.hpp"
-#include "storage.hpp"
-#include "utils.hpp"
+#include "arrow/utils.hpp"
+#include "common/config.hpp"
+#include "core/edge_store.hpp"
+#include "core/field_update.hpp"
+#include "common/logger.hpp"
+#include "storage/metadata.hpp"
+#include "core/node.hpp"
+#include "query/query.hpp"
+#include "query/execution.hpp"
+#include "schema/schema.hpp"
+#include "storage/shard.hpp"
+#include "storage/snapshot_manager.hpp"
+#include "storage/storage.hpp"
+#include "common/utils.hpp"
 
 namespace tundradb {
 
diff --git a/include/array_arena.hpp b/include/memory/array_arena.hpp
similarity index 99%
rename from include/array_arena.hpp
rename to include/memory/array_arena.hpp
index 7bd1330..dde43f9 100644
--- a/include/array_arena.hpp
+++ b/include/memory/array_arena.hpp
@@ -9,10 +9,10 @@
 #include <mutex>
 #include <new>
 
-#include "array_ref.hpp"
-#include "free_list_arena.hpp"
-#include "string_ref.hpp"
-#include "value_type.hpp"
+#include "memory/array_ref.hpp"
+#include "memory/free_list_arena.hpp"
+#include "memory/string_ref.hpp"
+#include "common/value_type.hpp"
 
 namespace tundradb {
 
diff --git a/include/array_ref.hpp b/include/memory/array_ref.hpp
similarity index 99%
rename from include/array_ref.hpp
rename to include/memory/array_ref.hpp
index 1c2e9dd..6b64899 100644
--- a/include/array_ref.hpp
+++ b/include/memory/array_ref.hpp
@@ -7,8 +7,8 @@
 #include <cstring>
 #include <type_traits>
 
-#include "constants.hpp"
-#include "value_type.hpp"
+#include "common/constants.hpp"
+#include "common/value_type.hpp"
 
 namespace tundradb {
 
diff --git a/include/free_list_arena.hpp b/include/memory/free_list_arena.hpp
similarity index 99%
rename from include/free_list_arena.hpp
rename to include/memory/free_list_arena.hpp
index f13af70..548f5d7 100644
--- a/include/free_list_arena.hpp
+++ b/include/memory/free_list_arena.hpp
@@ -10,9 +10,9 @@
 #include <set>
 #include <vector>
 
-#include "logger.hpp"
-#include "mem_arena.hpp"
-#include "mem_utils.hpp"
+#include "common/logger.hpp"
+#include "memory/mem_arena.hpp"
+#include "memory/mem_utils.hpp"
 
 namespace tundradb {
 
diff --git a/include/map_arena.hpp b/include/memory/map_arena.hpp
similarity index 98%
rename from include/map_arena.hpp
rename to include/memory/map_arena.hpp
index dddfccf..de75c95 100644
--- a/include/map_arena.hpp
+++ b/include/memory/map_arena.hpp
@@ -9,12 +9,12 @@
 #include <mutex>
 #include <new>
 
-#include "array_ref.hpp"
-#include "free_list_arena.hpp"
-#include "map_ref.hpp"
-#include "string_ref.hpp"
-#include "types.hpp"
-#include "value_type.hpp"
+#include "memory/array_ref.hpp"
+#include "memory/free_list_arena.hpp"
+#include "memory/map_ref.hpp"
+#include "memory/string_ref.hpp"
+#include "common/types.hpp"
+#include "common/value_type.hpp"
 
 namespace tundradb {
 
diff --git a/include/map_ref.hpp b/include/memory/map_ref.hpp
similarity index 98%
rename from include/map_ref.hpp
rename to include/memory/map_ref.hpp
index d0da34d..6354acd 100644
--- a/include/map_ref.hpp
+++ b/include/memory/map_ref.hpp
@@ -7,9 +7,9 @@
 #include <cstring>
 #include <type_traits>
 
-#include "constants.hpp"
-#include "string_ref.hpp"
-#include "value_type.hpp"
+#include "common/constants.hpp"
+#include "memory/string_ref.hpp"
+#include "common/value_type.hpp"
 
 namespace tundradb {
 
diff --git a/include/mem_arena.hpp b/include/memory/mem_arena.hpp
similarity index 100%
rename from include/mem_arena.hpp
rename to include/memory/mem_arena.hpp
diff --git a/include/mem_utils.hpp b/include/memory/mem_utils.hpp
similarity index 100%
rename from include/mem_utils.hpp
rename to include/memory/mem_utils.hpp
diff --git a/include/memory_arena.hpp b/include/memory/memory_arena.hpp
similarity index 98%
rename from include/memory_arena.hpp
rename to include/memory/memory_arena.hpp
index fe82772..56a12df 100644
--- a/include/memory_arena.hpp
+++ b/include/memory/memory_arena.hpp
@@ -4,8 +4,8 @@
 #include <memory>
 #include <vector>
 
-#include "mem_arena.hpp"
-#include "mem_utils.hpp"
+#include "memory/mem_arena.hpp"
+#include "memory/mem_utils.hpp"
 
 namespace tundradb {
 
diff --git a/include/node_arena.hpp b/include/memory/node_arena.hpp
similarity index 99%
rename from include/node_arena.hpp
rename to include/memory/node_arena.hpp
index 19d7f9d..48f8d78 100644
--- a/include/node_arena.hpp
+++ b/include/memory/node_arena.hpp
@@ -11,17 +11,17 @@
 #include <string>
 #include <unordered_map>
 
-#include "array_arena.hpp"
-#include "clock.hpp"
-#include "field_update.hpp"
-#include "free_list_arena.hpp"
-#include "map_arena.hpp"
-#include "mem_arena.hpp"
-#include "memory_arena.hpp"
-#include "schema_layout.hpp"
-#include "string_arena.hpp"
-#include "types.hpp"
-#include "update_type.hpp"
+#include "memory/array_arena.hpp"
+#include "common/clock.hpp"
+#include "core/field_update.hpp"
+#include "memory/free_list_arena.hpp"
+#include "memory/map_arena.hpp"
+#include "memory/mem_arena.hpp"
+#include "memory/memory_arena.hpp"
+#include "memory/schema_layout.hpp"
+#include "memory/string_arena.hpp"
+#include "common/types.hpp"
+#include "core/update_type.hpp"
 
 namespace tundradb {
 
diff --git a/include/schema_layout.hpp b/include/memory/schema_layout.hpp
similarity index 98%
rename from include/schema_layout.hpp
rename to include/memory/schema_layout.hpp
index be8cb0b..556df29 100644
--- a/include/schema_layout.hpp
+++ b/include/memory/schema_layout.hpp
@@ -9,13 +9,13 @@
 #include <unordered_map>
 #include <vector>
 
-#include "array_ref.hpp"
+#include "memory/array_ref.hpp"
 #include "llvm/ADT/StringMap.h"
-#include "map_ref.hpp"
-#include "mem_utils.hpp"
-#include "schema.hpp"
-#include "type_descriptor.hpp"
-#include "types.hpp"
+#include "memory/map_ref.hpp"
+#include "memory/mem_utils.hpp"
+#include "schema/schema.hpp"
+#include "schema/type_descriptor.hpp"
+#include "common/types.hpp"
 
 namespace tundradb {
 
diff --git a/include/string_arena.hpp b/include/memory/string_arena.hpp
similarity index 98%
rename from include/string_arena.hpp
rename to include/memory/string_arena.hpp
index e144206..27653d3 100644
--- a/include/string_arena.hpp
+++ b/include/memory/string_arena.hpp
@@ -13,10 +13,10 @@
 #include <string>
 #include <string_view>
 
-#include "free_list_arena.hpp"
-#include "memory_arena.hpp"
-#include "string_ref.hpp"  // StringRef class
-#include "value_type.hpp"  // ValueType enum and helpers
+#include "memory/free_list_arena.hpp"
+#include "memory/memory_arena.hpp"
+#include "memory/string_ref.hpp"  // StringRef class
+#include "common/value_type.hpp"  // ValueType enum and helpers
 
 namespace tundradb {
 
diff --git a/include/string_ref.hpp b/include/memory/string_ref.hpp
similarity index 99%
rename from include/string_ref.hpp
rename to include/memory/string_ref.hpp
index cd8f7c8..a554ecf 100644
--- a/include/string_ref.hpp
+++ b/include/memory/string_ref.hpp
@@ -7,7 +7,7 @@
 #include <string_view>
 #include <type_traits>
 
-#include "constants.hpp"
+#include "common/constants.hpp"
 
 namespace tundradb {
 
diff --git a/include/query_execution.hpp b/include/query/execution.hpp
similarity index 99%
rename from include/query_execution.hpp
rename to include/query/execution.hpp
index cffae8a..eeeaa54 100644
--- a/include/query_execution.hpp
+++ b/include/query/execution.hpp
@@ -18,8 +18,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "query.hpp"
-#include "schema.hpp"
+#include "query/query.hpp"
+#include "schema/schema.hpp"
 
 namespace tundradb {
 
diff --git a/include/join.hpp b/include/query/join.hpp
similarity index 99%
rename from include/join.hpp
rename to include/query/join.hpp
index 6f4aa1a..74553af 100644
--- a/include/join.hpp
+++ b/include/query/join.hpp
@@ -5,7 +5,7 @@
 
 #include <memory>
 
-#include "query.hpp"
+#include "query/query.hpp"
 
 namespace tundradb {
 
diff --git a/include/query.hpp b/include/query/query.hpp
similarity index 99%
rename from include/query.hpp
rename to include/query/query.hpp
index c86aa32..7fbb08d 100644
--- a/include/query.hpp
+++ b/include/query/query.hpp
@@ -18,10 +18,10 @@
 #include <utility>
 #include <vector>
 
-#include "node.hpp"
-#include "schema.hpp"
-#include "temporal_context.hpp"
-#include "types.hpp"
+#include "core/node.hpp"
+#include "schema/schema.hpp"
+#include "query/temporal_context.hpp"
+#include "common/types.hpp"
 
 namespace tundradb {
 
diff --git a/include/row.hpp b/include/query/row.hpp
similarity index 98%
rename from include/row.hpp
rename to include/query/row.hpp
index 5a27832..9bb6100 100644
--- a/include/row.hpp
+++ b/include/query/row.hpp
@@ -12,12 +12,12 @@
 #include <unordered_map>
 #include <vector>
 
-#include "constants.hpp"
-#include "edge.hpp"
-#include "logger.hpp"
-#include "node.hpp"
-#include "query.hpp"
-#include "types.hpp"
+#include "common/constants.hpp"
+#include "core/edge.hpp"
+#include "common/logger.hpp"
+#include "core/node.hpp"
+#include "query/query.hpp"
+#include "common/types.hpp"
 
 namespace tundradb {
 
diff --git a/include/temporal_context.hpp b/include/query/temporal_context.hpp
similarity index 99%
rename from include/temporal_context.hpp
rename to include/query/temporal_context.hpp
index 1492cbf..16c2946 100644
--- a/include/temporal_context.hpp
+++ b/include/query/temporal_context.hpp
@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <unordered_map>
 
-#include "node_arena.hpp"
+#include "memory/node_arena.hpp"
 
 namespace tundradb {
 
diff --git a/include/schema.hpp b/include/schema/schema.hpp
similarity index 97%
rename from include/schema.hpp
rename to include/schema/schema.hpp
index 5e16d22..ce01edd 100644
--- a/include/schema.hpp
+++ b/include/schema/schema.hpp
@@ -12,9 +12,9 @@
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallVector.h"
-#include "logger.hpp"
-#include "type_descriptor.hpp"
-#include "types.hpp"
+#include "common/logger.hpp"
+#include "schema/type_descriptor.hpp"
+#include "common/types.hpp"
 
 namespace tundradb {
 
diff --git a/include/type_descriptor.hpp b/include/schema/type_descriptor.hpp
similarity index 99%
rename from include/type_descriptor.hpp
rename to include/schema/type_descriptor.hpp
index abe79a4..2ef050a 100644
--- a/include/type_descriptor.hpp
+++ b/include/schema/type_descriptor.hpp
@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <string>
 
-#include "value_type.hpp"
+#include "common/value_type.hpp"
 
 namespace tundradb {
 
diff --git a/include/schema_utils.hpp b/include/schema/utils.hpp
similarity index 100%
rename from include/schema_utils.hpp
rename to include/schema/utils.hpp
diff --git a/include/file_utils.hpp b/include/storage/file_utils.hpp
similarity index 100%
rename from include/file_utils.hpp
rename to include/storage/file_utils.hpp
diff --git a/include/metadata.hpp b/include/storage/metadata.hpp
similarity index 98%
rename from include/metadata.hpp
rename to include/storage/metadata.hpp
index 3738ec3..d3d994d 100644
--- a/include/metadata.hpp
+++ b/include/storage/metadata.hpp
@@ -9,14 +9,14 @@
 #include <string>
 #include <vector>
 
-#include "arrow_map_union_types.hpp"
-#include "file_utils.hpp"
+#include "arrow/map_union_types.hpp"
+#include "storage/file_utils.hpp"
 #include "json.hpp"
 #include "llvm/ADT/SmallVector.h"
-#include "logger.hpp"
-#include "schema.hpp"
-#include "type_descriptor.hpp"
-#include "types.hpp"
+#include "common/logger.hpp"
+#include "schema/schema.hpp"
+#include "schema/type_descriptor.hpp"
+#include "common/types.hpp"
 
 using namespace std::string_literals;
 
diff --git a/include/shard.hpp b/include/storage/shard.hpp
similarity index 98%
rename from include/shard.hpp
rename to include/storage/shard.hpp
index f2411ff..83ccb4b 100644
--- a/include/shard.hpp
+++ b/include/storage/shard.hpp
@@ -13,10 +13,10 @@
 #include <unordered_map>
 #include <vector>
 
-#include "config.hpp"
-#include "field_update.hpp"
-#include "node.hpp"
-#include "schema.hpp"
+#include "common/config.hpp"
+#include "core/field_update.hpp"
+#include "core/node.hpp"
+#include "schema/schema.hpp"
 
 namespace tundradb {
 
diff --git a/include/snapshot_manager.hpp b/include/storage/snapshot_manager.hpp
similarity index 97%
rename from include/snapshot_manager.hpp
rename to include/storage/snapshot_manager.hpp
index a7b9ace..d52c874 100644
--- a/include/snapshot_manager.hpp
+++ b/include/storage/snapshot_manager.hpp
@@ -4,9 +4,9 @@
 
 #include <memory>
 
-#include "edge_store.hpp"
-#include "metadata.hpp"
-#include "schema.hpp"
+#include "core/edge_store.hpp"
+#include "storage/metadata.hpp"
+#include "schema/schema.hpp"
 
 namespace tundradb {
 
diff --git a/include/storage.hpp b/include/storage/storage.hpp
similarity index 93%
rename from include/storage.hpp
rename to include/storage/storage.hpp
index 932c549..d4fdb31 100644
--- a/include/storage.hpp
+++ b/include/storage/storage.hpp
@@ -6,9 +6,9 @@
 #include <filesystem>
 #include <string>
 
-#include "config.hpp"
-#include "edge.hpp"
-#include "metadata.hpp"
+#include "common/config.hpp"
+#include "core/edge.hpp"
+#include "storage/metadata.hpp"
 
 namespace tundradb {
 
diff --git a/src/arrow/CMakeLists.txt b/src/arrow/CMakeLists.txt
new file mode 100644
index 0000000..90c6f89
--- /dev/null
+++ b/src/arrow/CMakeLists.txt
@@ -0,0 +1,4 @@
+target_sources(core PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/utils.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/table_info.cpp
+)
diff --git a/src/table_info.cpp b/src/arrow/table_info.cpp
similarity index 97%
rename from src/table_info.cpp
rename to src/arrow/table_info.cpp
index 601fafc..2f4607d 100644
--- a/src/table_info.cpp
+++ b/src/arrow/table_info.cpp
@@ -1,4 +1,4 @@
-#include "table_info.hpp"
+#include "arrow/table_info.hpp"
 
 #include <algorithm>
 
diff --git a/src/arrow_utils.cpp b/src/arrow/utils.cpp
similarity index 99%
rename from src/arrow_utils.cpp
rename to src/arrow/utils.cpp
index d6b32e3..faf698e 100644
--- a/src/arrow_utils.cpp
+++ b/src/arrow/utils.cpp
@@ -1,4 +1,4 @@
-#include "arrow_utils.hpp"
+#include "arrow/utils.hpp"
 
 #include <arrow/compute/api.h>
 #include <arrow/dataset/dataset.h>
@@ -13,11 +13,11 @@
 #include <cstdint>
 #include <cstring>
 
-#include "arrow_map_union_types.hpp"
-#include "logger.hpp"
-#include "node.hpp"
-#include "query.hpp"
-#include "schema.hpp"
+#include "arrow/map_union_types.hpp"
+#include "common/logger.hpp"
+#include "core/node.hpp"
+#include "query/query.hpp"
+#include "schema/schema.hpp"
 
 namespace tundradb {
 
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
new file mode 100644
index 0000000..bcc110b
--- /dev/null
+++ b/src/common/CMakeLists.txt
@@ -0,0 +1,6 @@
+target_sources(core
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/clock.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/types.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/utils.cpp
+)
diff --git a/src/clock.cpp b/src/common/clock.cpp
similarity index 90%
rename from src/clock.cpp
rename to src/common/clock.cpp
index 0f4d9cc..7df68fa 100644
--- a/src/clock.cpp
+++ b/src/common/clock.cpp
@@ -1,4 +1,4 @@
-#include "clock.hpp"
+#include "common/clock.hpp"
 
 namespace tundradb {
 
diff --git a/src/types.cpp b/src/common/types.cpp
similarity index 91%
rename from src/types.cpp
rename to src/common/types.cpp
index 116dead..63510e4 100644
--- a/src/types.cpp
+++ b/src/common/types.cpp
@@ -1,6 +1,6 @@
-#include "types.hpp"
+#include "common/types.hpp"
 
-#include "string_arena.hpp"
+#include "memory/string_arena.hpp"
 
 namespace tundradb {
 
diff --git a/src/utils.cpp b/src/common/utils.cpp
similarity index 98%
rename from src/utils.cpp
rename to src/common/utils.cpp
index 17a283e..f57cd34 100644
--- a/src/utils.cpp
+++ b/src/common/utils.cpp
@@ -1,4 +1,4 @@
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <arrow/api.h>
 
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
new file mode 100644
index 0000000..a0ebfba
--- /dev/null
+++ b/src/core/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(core PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/edge_store.cpp
+)
diff --git a/src/edge_store.cpp b/src/core/edge_store.cpp
similarity index 99%
rename from src/edge_store.cpp
rename to src/core/edge_store.cpp
index 254e6c7..e70e6be 100644
--- a/src/edge_store.cpp
+++ b/src/core/edge_store.cpp
@@ -1,12 +1,12 @@
-#include "edge_store.hpp"
+#include "core/edge_store.hpp"
 
 #include <algorithm>
 #include <string>
 
-#include "constants.hpp"
+#include "common/constants.hpp"
 #include "json.hpp"
-#include "logger.hpp"
-#include "metadata.hpp"
+#include "common/logger.hpp"
+#include "storage/metadata.hpp"
 
 namespace tundradb {
 
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
new file mode 100644
index 0000000..5af71fa
--- /dev/null
+++ b/src/main/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(core PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/database.cpp
+)
diff --git a/src/core.cpp b/src/main/database.cpp
similarity index 99%
rename from src/core.cpp
rename to src/main/database.cpp
index 1d8f3e5..730dc53 100644
--- a/src/core.cpp
+++ b/src/main/database.cpp
@@ -1,4 +1,4 @@
-#include "core.hpp"
+#include "main/database.hpp"
 
 #include <arrow/compute/api.h>
 #include <llvm/ADT/DenseMap.h>
@@ -20,12 +20,12 @@
 #include <unordered_set>
 #include <vector>
 
-#include "arrow_utils.hpp"
-#include "join.hpp"
-#include "logger.hpp"
-#include "row.hpp"
-#include "temporal_context.hpp"
-#include "utils.hpp"
+#include "arrow/utils.hpp"
+#include "query/join.hpp"
+#include "common/logger.hpp"
+#include "query/row.hpp"
+#include "query/temporal_context.hpp"
+#include "common/utils.hpp"
 
 namespace fs = std::filesystem;
 
diff --git a/src/query/CMakeLists.txt b/src/query/CMakeLists.txt
new file mode 100644
index 0000000..15f84c3
--- /dev/null
+++ b/src/query/CMakeLists.txt
@@ -0,0 +1,6 @@
+target_sources(core PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/query.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/execution.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/row.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/join.cpp
+)
diff --git a/src/query_execution.cpp b/src/query/execution.cpp
similarity index 99%
rename from src/query_execution.cpp
rename to src/query/execution.cpp
index 5fa1d3e..0360b0a 100644
--- a/src/query_execution.cpp
+++ b/src/query/execution.cpp
@@ -1,14 +1,14 @@
-#include "query_execution.hpp"
+#include "query/execution.hpp"
 
 #include <ranges>
 #include <unordered_set>
 
-#include "arrow_map_union_types.hpp"
-#include "arrow_utils.hpp"
-#include "constants.hpp"
-#include "edge_store.hpp"
-#include "logger.hpp"
-#include "utils.hpp"
+#include "arrow/map_union_types.hpp"
+#include "arrow/utils.hpp"
+#include "common/constants.hpp"
+#include "core/edge_store.hpp"
+#include "common/logger.hpp"
+#include "common/utils.hpp"
 
 namespace tundradb {
 
diff --git a/src/join.cpp b/src/query/join.cpp
similarity index 99%
rename from src/join.cpp
rename to src/query/join.cpp
index e6fb207..ae8b8d5 100644
--- a/src/join.cpp
+++ b/src/query/join.cpp
@@ -1,7 +1,7 @@
-#include "join.hpp"
+#include "query/join.hpp"
 
-#include "logger.hpp"
-#include "utils.hpp"
+#include "common/logger.hpp"
+#include "common/utils.hpp"
 
 namespace tundradb {
 
diff --git a/src/query.cpp b/src/query/query.cpp
similarity index 99%
rename from src/query.cpp
rename to src/query/query.cpp
index 95067bc..d67537b 100644
--- a/src/query.cpp
+++ b/src/query/query.cpp
@@ -1,12 +1,12 @@
-#include "query.hpp"
+#include "query/query.hpp"
 
 #include <llvm/ADT/DenseMap.h>
 #include <llvm/ADT/DenseSet.h>
 #include <llvm/ADT/SmallVector.h>
 #include <llvm/ADT/StringMap.h>
 
-#include "edge.hpp"
-#include "logger.hpp"
+#include "core/edge.hpp"
+#include "common/logger.hpp"
 
 namespace tundradb {
 
diff --git a/src/row.cpp b/src/query/row.cpp
similarity index 99%
rename from src/row.cpp
rename to src/query/row.cpp
index df98663..0004c10 100644
--- a/src/row.cpp
+++ b/src/query/row.cpp
@@ -1,6 +1,6 @@
-#include "row.hpp"
+#include "query/row.hpp"
 
-#include "logger.hpp"
+#include "common/logger.hpp"
 
 namespace tundradb {
 
diff --git a/src/schema/CMakeLists.txt b/src/schema/CMakeLists.txt
new file mode 100644
index 0000000..c281d3a
--- /dev/null
+++ b/src/schema/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(core PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/schema.cpp
+)
diff --git a/src/schema.cpp b/src/schema/schema.cpp
similarity index 98%
rename from src/schema.cpp
rename to src/schema/schema.cpp
index 552dd66..75deb8b 100644
--- a/src/schema.cpp
+++ b/src/schema/schema.cpp
@@ -1,10 +1,10 @@
-#include "schema.hpp"
+#include "schema/schema.hpp"
 
 #include <iostream>
 
-#include "arrow_map_union_types.hpp"
-#include "arrow_utils.hpp"
-#include "metadata.hpp"
+#include "arrow/map_union_types.hpp"
+#include "arrow/utils.hpp"
+#include "storage/metadata.hpp"
 
 namespace tundradb {
 
diff --git a/src/storage/CMakeLists.txt b/src/storage/CMakeLists.txt
new file mode 100644
index 0000000..f4e4df6
--- /dev/null
+++ b/src/storage/CMakeLists.txt
@@ -0,0 +1,6 @@
+target_sources(core PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/storage.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/snapshot_manager.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/metadata.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/shard.cpp
+)
diff --git a/src/metadata.cpp b/src/storage/metadata.cpp
similarity index 98%
rename from src/metadata.cpp
rename to src/storage/metadata.cpp
index f49cc02..b972788 100644
--- a/src/metadata.cpp
+++ b/src/storage/metadata.cpp
@@ -1,4 +1,4 @@
-#include "metadata.hpp"
+#include "storage/metadata.hpp"
 
 #include <arrow/api.h>
 
@@ -7,8 +7,8 @@
 #include <string>
 
 #include "json.hpp"
-#include "logger.hpp"
-#include "utils.hpp"
+#include "common/logger.hpp"
+#include "common/utils.hpp"
 
 namespace tundradb {
 
diff --git a/src/shard.cpp b/src/storage/shard.cpp
similarity index 99%
rename from src/shard.cpp
rename to src/storage/shard.cpp
index b934ba1..ee954a4 100644
--- a/src/shard.cpp
+++ b/src/storage/shard.cpp
@@ -1,7 +1,7 @@
-#include "shard.hpp"
+#include "storage/shard.hpp"
 
-#include "logger.hpp"
-#include "utils.hpp"
+#include "common/logger.hpp"
+#include "common/utils.hpp"
 
 namespace tundradb {
 
diff --git a/src/snapshot_manager.cpp b/src/storage/snapshot_manager.cpp
similarity index 98%
rename from src/snapshot_manager.cpp
rename to src/storage/snapshot_manager.cpp
index cdee288..f302de7 100644
--- a/src/snapshot_manager.cpp
+++ b/src/storage/snapshot_manager.cpp
@@ -1,11 +1,11 @@
-#include "snapshot_manager.hpp"
-
-#include "edge.hpp"
-#include "logger.hpp"
-#include "node.hpp"
-#include "shard.hpp"
-#include "storage.hpp"
-#include "utils.hpp"
+#include "storage/snapshot_manager.hpp"
+
+#include "core/edge.hpp"
+#include "common/logger.hpp"
+#include "core/node.hpp"
+#include "storage/shard.hpp"
+#include "storage/storage.hpp"
+#include "common/utils.hpp"
 
 namespace tundradb {
 
diff --git a/src/storage.cpp b/src/storage/storage.cpp
similarity index 98%
rename from src/storage.cpp
rename to src/storage/storage.cpp
index b14ea78..1ac6781 100644
--- a/src/storage.cpp
+++ b/src/storage/storage.cpp
@@ -1,4 +1,4 @@
-#include "storage.hpp"
+#include "storage/storage.hpp"
 
 #include <arrow/api.h>
 #include <arrow/io/api.h>
@@ -19,15 +19,15 @@
 #include <utility>
 #include <vector>
 
-#include "arrow_utils.hpp"
-#include "constants.hpp"
-#include "edge_store.hpp"
+#include "arrow/utils.hpp"
+#include "common/constants.hpp"
+#include "core/edge_store.hpp"
 #include "json.hpp"
-#include "logger.hpp"
-#include "metadata.hpp"
-#include "node.hpp"
-#include "shard.hpp"
-#include "table_info.hpp"
+#include "common/logger.hpp"
+#include "storage/metadata.hpp"
+#include "core/node.hpp"
+#include "storage/shard.hpp"
+#include "arrow/table_info.hpp"
 
 namespace tundradb {
 
diff --git a/tests/arena_leak_test.cpp b/tests/arena_leak_test.cpp
index ab4a803..8114bcc 100644
--- a/tests/arena_leak_test.cpp
+++ b/tests/arena_leak_test.cpp
@@ -18,8 +18,8 @@
 #include <string>
 #include <vector>
 
-#include "../include/array_arena.hpp"
-#include "../include/string_arena.hpp"
+#include "memory/array_arena.hpp"
+#include "memory/string_arena.hpp"
 
 using namespace tundradb;
 
diff --git a/tests/array_arena_test.cpp b/tests/array_arena_test.cpp
index 5f85565..bd10940 100644
--- a/tests/array_arena_test.cpp
+++ b/tests/array_arena_test.cpp
@@ -1,10 +1,10 @@
-#include "../include/array_arena.hpp"
+#include "memory/array_arena.hpp"
 
 #include <gtest/gtest.h>
 
 #include <string>
 
-#include "../include/string_arena.hpp"
+#include "memory/string_arena.hpp"
 
 using namespace tundradb;
 
diff --git a/tests/array_query_test.cpp b/tests/array_query_test.cpp
index 99b4436..95ddf23 100644
--- a/tests/array_query_test.cpp
+++ b/tests/array_query_test.cpp
@@ -4,10 +4,10 @@
 #include <string>
 #include <vector>
 
-#include "../include/clock.hpp"
-#include "../include/core.hpp"
-#include "../include/query.hpp"
-#include "../include/utils.hpp"
+#include "common/clock.hpp"
+#include "main/database.hpp"
+#include "query/query.hpp"
+#include "common/utils.hpp"
 
 #define ASSERT_OK(expr) ASSERT_TRUE((expr).ok())
 
diff --git a/tests/benchmark_test.cpp b/tests/benchmark_test.cpp
index 6612148..ddc1560 100644
--- a/tests/benchmark_test.cpp
+++ b/tests/benchmark_test.cpp
@@ -9,11 +9,11 @@
 #include <string>
 #include <vector>
 
-#include "../include/core.hpp"
-#include "../include/logger.hpp"
-#include "../include/metadata.hpp"
-#include "../include/query.hpp"
-#include "../include/types.hpp"
+#include "main/database.hpp"
+#include "common/logger.hpp"
+#include "storage/metadata.hpp"
+#include "query/query.hpp"
+#include "common/types.hpp"
 
 // Helper macro for Arrow operations
 #define ASSERT_OK(expr) ASSERT_TRUE((expr).ok())
diff --git a/tests/concurrency_test.cpp b/tests/concurrency_test.cpp
index faa941a..cb7ce8a 100644
--- a/tests/concurrency_test.cpp
+++ b/tests/concurrency_test.cpp
@@ -1,4 +1,4 @@
-#include "concurrency.hpp"
+#include "common/concurrency.hpp"
 
 #include <gtest/gtest.h>
 #include <sys/resource.h>
diff --git a/tests/concurrent_set_stress_test.cpp b/tests/concurrent_set_stress_test.cpp
index 6823c25..3eb1aa1 100644
--- a/tests/concurrent_set_stress_test.cpp
+++ b/tests/concurrent_set_stress_test.cpp
@@ -15,7 +15,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include "concurrency.hpp"
+#include "common/concurrency.hpp"
 
 using namespace std::string_literals;
 using namespace tundradb;
diff --git a/tests/database_test.cpp b/tests/database_test.cpp
index 27144a1..ea6f285 100644
--- a/tests/database_test.cpp
+++ b/tests/database_test.cpp
@@ -6,8 +6,8 @@
 
 #include <filesystem>
 
-#include "core.hpp"
-#include "logger.hpp"
+#include "main/database.hpp"
+#include "common/logger.hpp"
 
 using namespace tundradb;
 
diff --git a/tests/edge_store_test.cpp b/tests/edge_store_test.cpp
index 59bcea4..db0b875 100644
--- a/tests/edge_store_test.cpp
+++ b/tests/edge_store_test.cpp
@@ -1,8 +1,8 @@
-#include "edge_store.hpp"
+#include "core/edge_store.hpp"
 
 #include <gtest/gtest.h>
 
-#include "edge.hpp"
+#include "core/edge.hpp"
 
 namespace tundradb {
 
diff --git a/tests/free_list_arena_test.cpp b/tests/free_list_arena_test.cpp
index cb23bf7..5935042 100644
--- a/tests/free_list_arena_test.cpp
+++ b/tests/free_list_arena_test.cpp
@@ -1,5 +1,5 @@
 #define TESTING_ENABLED
-#include "../include/free_list_arena.hpp"
+#include "memory/free_list_arena.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/tests/join_test.cpp b/tests/join_test.cpp
index 7f6c17c..1f6de37 100644
--- a/tests/join_test.cpp
+++ b/tests/join_test.cpp
@@ -4,11 +4,11 @@
 #include <memory>
 #include <string>
 
-#include "../include/core.hpp"
-#include "../include/debug_utils.hpp"
-#include "../include/logger.hpp"
-#include "../include/metadata.hpp"
-#include "../include/query.hpp"
+#include "main/database.hpp"
+#include "common/debug_utils.hpp"
+#include "common/logger.hpp"
+#include "storage/metadata.hpp"
+#include "query/query.hpp"
 
 // Helper macro for Arrow operations
 #define ASSERT_OK(expr) ASSERT_TRUE((expr).ok())
diff --git a/tests/map_arena_test.cpp b/tests/map_arena_test.cpp
index 052556e..1ed9716 100644
--- a/tests/map_arena_test.cpp
+++ b/tests/map_arena_test.cpp
@@ -1,19 +1,19 @@
-#include "../include/map_arena.hpp"
+#include "memory/map_arena.hpp"
 
 #include <gtest/gtest.h>
 
 #include <limits>
 #include <string>
 
-#include "../include/array_arena.hpp"
-#include "../include/clock.hpp"
-#include "../include/edge.hpp"
-#include "../include/node.hpp"
-#include "../include/node_arena.hpp"
-#include "../include/schema.hpp"
-#include "../include/schema_layout.hpp"
-#include "../include/types.hpp"
-#include "edge_store.hpp"
+#include "memory/array_arena.hpp"
+#include "common/clock.hpp"
+#include "core/edge.hpp"
+#include "core/node.hpp"
+#include "memory/node_arena.hpp"
+#include "schema/schema.hpp"
+#include "memory/schema_layout.hpp"
+#include "common/types.hpp"
+#include "core/edge_store.hpp"
 
 using namespace tundradb;
 
diff --git a/tests/memory_arena_test.cpp b/tests/memory_arena_test.cpp
index 739dc04..4d9903b 100644
--- a/tests/memory_arena_test.cpp
+++ b/tests/memory_arena_test.cpp
@@ -1,4 +1,4 @@
-#include "../include/memory_arena.hpp"
+#include "memory/memory_arena.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/tests/node_arena_test.cpp b/tests/node_arena_test.cpp
index da55b4b..e44fd96 100644
--- a/tests/node_arena_test.cpp
+++ b/tests/node_arena_test.cpp
@@ -1,4 +1,4 @@
-#include "../include/node_arena.hpp"
+#include "memory/node_arena.hpp"
 
 #include <arrow/api.h>
 #include <gtest/gtest.h>
@@ -7,12 +7,12 @@
 #include <memory>
 #include <vector>
 
-#include "../include/field_update.hpp"
-#include "../include/memory_arena.hpp"
-#include "../include/node.hpp"
-#include "../include/schema.hpp"
-#include "../include/schema_layout.hpp"
-#include "../include/types.hpp"
+#include "core/field_update.hpp"
+#include "memory/memory_arena.hpp"
+#include "core/node.hpp"
+#include "schema/schema.hpp"
+#include "memory/schema_layout.hpp"
+#include "common/types.hpp"
 
 using namespace tundradb;
 
diff --git a/tests/node_test.cpp b/tests/node_test.cpp
index b157b54..ba02739 100644
--- a/tests/node_test.cpp
+++ b/tests/node_test.cpp
@@ -1,4 +1,4 @@
-#include "../include/node.hpp"
+#include "core/node.hpp"
 
 #include <arrow/api.h>
 #include <gtest/gtest.h>
@@ -7,10 +7,10 @@
 #include <memory>
 #include <unordered_map>
 
-#include "../include/field_update.hpp"
-#include "../include/logger.hpp"
-#include "../include/schema.hpp"
-#include "../include/types.hpp"
+#include "core/field_update.hpp"
+#include "common/logger.hpp"
+#include "schema/schema.hpp"
+#include "common/types.hpp"
 
 using namespace tundradb;
 
diff --git a/tests/node_version_test.cpp b/tests/node_version_test.cpp
index 58c160f..9732455 100644
--- a/tests/node_version_test.cpp
+++ b/tests/node_version_test.cpp
@@ -3,10 +3,10 @@
 #include <memory>
 #include <thread>
 
-#include "../include/map_arena.hpp"
-#include "../include/node_arena.hpp"
-#include "../include/schema.hpp"
-#include "../include/schema_layout.hpp"
+#include "memory/map_arena.hpp"
+#include "memory/node_arena.hpp"
+#include "schema/schema.hpp"
+#include "memory/schema_layout.hpp"
 
 using namespace tundradb;
 
diff --git a/tests/node_view_test.cpp b/tests/node_view_test.cpp
index dfe928b..9384e60 100644
--- a/tests/node_view_test.cpp
+++ b/tests/node_view_test.cpp
@@ -1,15 +1,15 @@
-#include "../include/node_view.hpp"
+#include "core/node_view.hpp"
 
 #include <gtest/gtest.h>
 
 #include <memory>
 #include <thread>
 
-#include "../include/node.hpp"
-#include "../include/node_arena.hpp"
-#include "../include/schema.hpp"
-#include "../include/schema_layout.hpp"
-#include "../include/temporal_context.hpp"
+#include "core/node.hpp"
+#include "memory/node_arena.hpp"
+#include "schema/schema.hpp"
+#include "memory/schema_layout.hpp"
+#include "query/temporal_context.hpp"
 
 using namespace tundradb;
 
diff --git a/tests/schema_utils_test.cpp b/tests/schema_utils_test.cpp
index fd67772..66723dd 100644
--- a/tests/schema_utils_test.cpp
+++ b/tests/schema_utils_test.cpp
@@ -1,9 +1,9 @@
-#include "schema_utils.hpp"
+#include "schema/utils.hpp"
 
 #include <arrow/api.h>
 #include <gtest/gtest.h>
 
-#include "arrow_utils.hpp"
+#include "arrow/utils.hpp"
 
 namespace tundradb {
 
diff --git a/tests/sharding_test.cpp b/tests/sharding_test.cpp
index 212caae..417733d 100644
--- a/tests/sharding_test.cpp
+++ b/tests/sharding_test.cpp
@@ -4,9 +4,9 @@
 #include <tuple>
 #include <vector>
 
-#include "../include/arrow_utils.hpp"
-#include "../include/core.hpp"
-#include "../include/debug_utils.hpp"
+#include "arrow/utils.hpp"
+#include "main/database.hpp"
+#include "common/debug_utils.hpp"
 using namespace tundradb;
 
 class ShardingTest : public ::testing::Test {
diff --git a/tests/snapshot_test.cpp b/tests/snapshot_test.cpp
index a491b9d..ec26e96 100644
--- a/tests/snapshot_test.cpp
+++ b/tests/snapshot_test.cpp
@@ -6,10 +6,10 @@
 #include <string>
 #include <thread>
 
-#include "../include/arrow_map_union_types.hpp"
-#include "../include/core.hpp"
-#include "../include/field_update.hpp"
-#include "../include/logger.hpp"
+#include "arrow/map_union_types.hpp"
+#include "main/database.hpp"
+#include "core/field_update.hpp"
+#include "common/logger.hpp"
 
 using namespace std::string_literals;
 using namespace tundradb;
diff --git a/tests/string_arena_test.cpp b/tests/string_arena_test.cpp
index 28a9207..7b97da4 100644
--- a/tests/string_arena_test.cpp
+++ b/tests/string_arena_test.cpp
@@ -1,4 +1,4 @@
-#include "../include/string_arena.hpp"
+#include "memory/string_arena.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/tests/string_ref_concurrent_test.cpp b/tests/string_ref_concurrent_test.cpp
index bd296ec..57af26e 100644
--- a/tests/string_ref_concurrent_test.cpp
+++ b/tests/string_ref_concurrent_test.cpp
@@ -14,9 +14,9 @@
 #include <thread>
 #include <vector>
 
-#include "../include/string_arena.hpp"
-#include "../include/string_ref.hpp"
-#include "../include/types.hpp"
+#include "memory/string_arena.hpp"
+#include "memory/string_ref.hpp"
+#include "common/types.hpp"
 
 using namespace tundradb;
 
diff --git a/tests/table_info_test.cpp b/tests/table_info_test.cpp
index 0499123..27ab1e5 100644
--- a/tests/table_info_test.cpp
+++ b/tests/table_info_test.cpp
@@ -1,4 +1,4 @@
-#include "table_info.hpp"
+#include "arrow/table_info.hpp"
 
 #include <arrow/api.h>
 #include <arrow/table.h>
diff --git a/tests/temporal_query_test.cpp b/tests/temporal_query_test.cpp
index 4f43a33..44ecc11 100644
--- a/tests/temporal_query_test.cpp
+++ b/tests/temporal_query_test.cpp
@@ -2,12 +2,12 @@
 
 #include <memory>
 
-#include "../include/clock.hpp"
-#include "../include/core.hpp"
-#include "../include/logger.hpp"
-#include "../include/node_arena.hpp"
-#include "../include/query.hpp"
-#include "../include/temporal_context.hpp"
+#include "common/clock.hpp"
+#include "main/database.hpp"
+#include "common/logger.hpp"
+#include "memory/node_arena.hpp"
+#include "query/query.hpp"
+#include "query/temporal_context.hpp"
 
 using namespace tundradb;
 
diff --git a/tests/type_conversion_test.cpp b/tests/type_conversion_test.cpp
index 612a52d..6e0a439 100644
--- a/tests/type_conversion_test.cpp
+++ b/tests/type_conversion_test.cpp
@@ -1,8 +1,8 @@
 #include <arrow/api.h>
 #include <gtest/gtest.h>
 
-#include "../include/schema.hpp"
-#include "../include/types.hpp"
+#include "schema/schema.hpp"
+#include "common/types.hpp"
 
 using namespace tundradb;
 
diff --git a/tests/type_system_test.cpp b/tests/type_system_test.cpp
index 011759b..10cac29 100644
--- a/tests/type_system_test.cpp
+++ b/tests/type_system_test.cpp
@@ -2,8 +2,8 @@
 
 #include <climits>
 
-#include "../include/type_descriptor.hpp"
-#include "../include/value_type.hpp"
+#include "schema/type_descriptor.hpp"
+#include "common/value_type.hpp"
 
 using namespace tundradb;
 
diff --git a/tests/update_query_join_test.cpp b/tests/update_query_join_test.cpp
index 9682ca6..e075126 100644
--- a/tests/update_query_join_test.cpp
+++ b/tests/update_query_join_test.cpp
@@ -6,9 +6,9 @@
 #include <string>
 #include <vector>
 
-#include "../include/core.hpp"
-#include "../include/query.hpp"
-#include "../include/utils.hpp"
+#include "main/database.hpp"
+#include "query/query.hpp"
+#include "common/utils.hpp"
 
 #define ASSERT_OK(expr) ASSERT_TRUE((expr).ok())
 
diff --git a/tests/update_query_test.cpp b/tests/update_query_test.cpp
index 7bdf7db..5bbc907 100644
--- a/tests/update_query_test.cpp
+++ b/tests/update_query_test.cpp
@@ -4,10 +4,10 @@
 #include <string>
 #include <vector>
 
-#include "../include/arrow_map_union_types.hpp"
-#include "../include/core.hpp"
-#include "../include/query.hpp"
-#include "../include/utils.hpp"
+#include "arrow/map_union_types.hpp"
+#include "main/database.hpp"
+#include "query/query.hpp"
+#include "common/utils.hpp"
 
 #define ASSERT_OK(expr) ASSERT_TRUE((expr).ok())
 
diff --git a/tests/where_expression_test.cpp b/tests/where_expression_test.cpp
index 20d8044..7b0b1ae 100644
--- a/tests/where_expression_test.cpp
+++ b/tests/where_expression_test.cpp
@@ -5,13 +5,13 @@
 #include <string>
 #include <vector>
 
-#include "../include/arrow_map_union_types.hpp"
-#include "../include/core.hpp"
-#include "../include/field_update.hpp"
-#include "../include/logger.hpp"
-#include "../include/metadata.hpp"
-#include "../include/query.hpp"
-#include "../include/utils.hpp"
+#include "arrow/map_union_types.hpp"
+#include "main/database.hpp"
+#include "core/field_update.hpp"
+#include "common/logger.hpp"
+#include "storage/metadata.hpp"
+#include "query/query.hpp"
+#include "common/utils.hpp"
 
 // Helper macro for Arrow operations
 #define ASSERT_OK(expr) ASSERT_TRUE((expr).ok())
diff --git a/tests/where_pushdown_join_test.cpp b/tests/where_pushdown_join_test.cpp
index 64ea111..a3f876a 100644
--- a/tests/where_pushdown_join_test.cpp
+++ b/tests/where_pushdown_join_test.cpp
@@ -9,11 +9,11 @@
 #include <string>
 #include <vector>
 
-#include "../include/core.hpp"
-#include "../include/logger.hpp"
-#include "../include/metadata.hpp"
-#include "../include/query.hpp"
-#include "../include/utils.hpp"
+#include "main/database.hpp"
+#include "common/logger.hpp"
+#include "storage/metadata.hpp"
+#include "query/query.hpp"
+#include "common/utils.hpp"
 
 // Helper macro for Arrow operations
 #define ASSERT_OK(expr) ASSERT_TRUE((expr).ok())