diff --git a/xo-alloc2/include/xo/alloc2/IAllocator_DArena.hpp b/xo-alloc2/include/xo/alloc2/IAllocator_DArena.hpp
index f845cf3e..7125b1df 100644
--- a/xo-alloc2/include/xo/alloc2/IAllocator_DArena.hpp
+++ b/xo-alloc2/include/xo/alloc2/IAllocator_DArena.hpp
@@ -5,7 +5,7 @@
 
 #include "AAllocator.hpp"
 #include "IAllocator_Xfer.hpp"
-#include "DArena.hpp"
+#include "arena/DArena.hpp"
 
 namespace xo {
     namespace mm {
diff --git a/xo-alloc2/include/xo/alloc2/ArenaConfig.hpp b/xo-alloc2/include/xo/alloc2/arena/ArenaConfig.hpp
similarity index 100%
rename from xo-alloc2/include/xo/alloc2/ArenaConfig.hpp
rename to xo-alloc2/include/xo/alloc2/arena/ArenaConfig.hpp
diff --git a/xo-alloc2/include/xo/alloc2/DArena.hpp b/xo-alloc2/include/xo/alloc2/arena/DArena.hpp
similarity index 100%
rename from xo-alloc2/include/xo/alloc2/DArena.hpp
rename to xo-alloc2/include/xo/alloc2/arena/DArena.hpp
diff --git a/xo-alloc2/include/xo/alloc2/gc/DX1Collector.hpp b/xo-alloc2/include/xo/alloc2/gc/DX1Collector.hpp
index 6cec8cdc..4fbb657e 100644
--- a/xo-alloc2/include/xo/alloc2/gc/DX1Collector.hpp
+++ b/xo-alloc2/include/xo/alloc2/gc/DX1Collector.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "ArenaConfig.hpp"
-#include "DArena.hpp"
+#include "arena/ArenaConfig.hpp"
+#include "arena/DArena.hpp"
 #include "gc/generation.hpp"
 #include "gc/role.hpp"
 #include <memory>
diff --git a/xo-alloc2/src/alloc2/DArena.cpp b/xo-alloc2/src/alloc2/DArena.cpp
index c3f515a4..8a54f592 100644
--- a/xo-alloc2/src/alloc2/DArena.cpp
+++ b/xo-alloc2/src/alloc2/DArena.cpp
@@ -4,7 +4,7 @@
  **/
 
 #include "xo/alloc2/AAllocator.hpp"
-#include "xo/alloc2/DArena.hpp"
+#include "arena/DArena.hpp"
 #include "xo/alloc2/padding.hpp"
 #include "xo/indentlog/print/tag.hpp"
 #include <cassert>