diff --git a/include/cxxutil/demangle.hpp b/include/xo/cxxutil/demangle.hpp
similarity index 100%
rename from include/cxxutil/demangle.hpp
rename to include/xo/cxxutil/demangle.hpp
diff --git a/include/refcnt/Displayable.hpp b/include/xo/refcnt/Displayable.hpp
similarity index 95%
rename from include/refcnt/Displayable.hpp
rename to include/xo/refcnt/Displayable.hpp
index 74708573..5a184667 100644
--- a/include/refcnt/Displayable.hpp
+++ b/include/xo/refcnt/Displayable.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "refcnt/Refcounted.hpp"
+#include "Refcounted.hpp"
 
 namespace xo {
     namespace ref {
diff --git a/include/refcnt/Refcounted.hpp b/include/xo/refcnt/Refcounted.hpp
similarity index 100%
rename from include/refcnt/Refcounted.hpp
rename to include/xo/refcnt/Refcounted.hpp
diff --git a/include/refcnt/Unowned.hpp b/include/xo/refcnt/Unowned.hpp
similarity index 100%
rename from include/refcnt/Unowned.hpp
rename to include/xo/refcnt/Unowned.hpp
diff --git a/src/Displayable.cpp b/src/Displayable.cpp
index b8793ad3..ea839841 100644
--- a/src/Displayable.cpp
+++ b/src/Displayable.cpp
@@ -1,6 +1,6 @@
 /* @file Displayable.cpp */
 
-#include "refcnt/Displayable.hpp"
+#include "Displayable.hpp"
 
 namespace xo {
     using xo::tostr;
diff --git a/utest/intrusive_ptr.test.cpp b/utest/intrusive_ptr.test.cpp
index d8d756e2..f9d1f212 100644
--- a/utest/intrusive_ptr.test.cpp
+++ b/utest/intrusive_ptr.test.cpp
@@ -1,6 +1,6 @@
 /* @file intrusive_ptr.test.cpp */
 
-#include "refcnt/Refcounted.hpp"
+#include "Refcounted.hpp"
 #include "indentlog/scope.hpp"
 #include "catch2/catch.hpp"
 #include <string_view>