diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54d4dd85a..294655fa1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,18 +73,18 @@ cmake_dependent_option(ARBORX_ENABLE_GPU_AWARE_MPI
 
 target_include_directories(ArborX INTERFACE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/details>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/geometry>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/kokkos_ext>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/cluster>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/distributed>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/interpolation>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/interpolation/details>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/spatial>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
   $<INSTALL_INTERFACE:include/ArborX>
-  $<INSTALL_INTERFACE:include/ArborX/details>
   $<INSTALL_INTERFACE:include/ArborX/geometry>
-  $<INSTALL_INTERFACE:include/ArborX/kokkos_ext>
+  $<INSTALL_INTERFACE:include/ArborX/cluster>
+  $<INSTALL_INTERFACE:include/ArborX/distributed>
   $<INSTALL_INTERFACE:include/ArborX/interpolation>
-  $<INSTALL_INTERFACE:include/ArborX/interpolation/details>
+  $<INSTALL_INTERFACE:include/ArborX/spatial>
 )
 
 install(TARGETS ArborX
diff --git a/benchmarks/bvh_driver/benchmark_registration.hpp b/benchmarks/bvh_driver/benchmark_registration.hpp
index 0f48d38f4..264e7ae70 100644
--- a/benchmarks/bvh_driver/benchmark_registration.hpp
+++ b/benchmarks/bvh_driver/benchmark_registration.hpp
@@ -14,7 +14,7 @@
 
 #include <ArborXBenchmark_PointClouds.hpp>
 #include <ArborX_Point.hpp>
-#include <ArborX_Predicates.hpp>
+#include <detail/ArborX_Predicates.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/benchmarks/dbscan/ArborX_DBSCANVerification.hpp b/benchmarks/dbscan/ArborX_DBSCANVerification.hpp
index b63fd1dbc..78fa1eff9 100644
--- a/benchmarks/dbscan/ArborX_DBSCANVerification.hpp
+++ b/benchmarks/dbscan/ArborX_DBSCANVerification.hpp
@@ -12,8 +12,8 @@
 #ifndef ARBORX_DETAILSDBSCANVERIFICATION_HPP
 #define ARBORX_DETAILSDBSCANVERIFICATION_HPP
 
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
 #include <ArborX_LinearBVH.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/benchmarks/dbscan/data.hpp b/benchmarks/dbscan/data.hpp
index 2a444b5c4..0e30c8808 100644
--- a/benchmarks/dbscan/data.hpp
+++ b/benchmarks/dbscan/data.hpp
@@ -12,8 +12,8 @@
 #ifndef DATA_HPP
 #define DATA_HPP
 
-#include <ArborX_Exception.hpp>
 #include <ArborX_Point.hpp>
+#include <misc/ArborX_Exception.hpp>
 
 #include <iostream>
 #include <random>
diff --git a/benchmarks/dbscan/dbscan_timpl.hpp b/benchmarks/dbscan/dbscan_timpl.hpp
index d3d6f5678..0850cf123 100644
--- a/benchmarks/dbscan/dbscan_timpl.hpp
+++ b/benchmarks/dbscan/dbscan_timpl.hpp
@@ -11,10 +11,10 @@
 
 #include <ArborX_DBSCAN.hpp>
 #include <ArborX_DBSCANVerification.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
 #include <ArborX_HDBSCAN.hpp>
 #include <ArborX_MinimumSpanningTree.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/benchmarks/union_find/union_find.cpp b/benchmarks/union_find/union_find.cpp
index 6e3ae4a57..37ef5205d 100644
--- a/benchmarks/union_find/union_find.cpp
+++ b/benchmarks/union_find/union_find.cpp
@@ -9,12 +9,12 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtVersion.hpp>
-#include <ArborX_DetailsSortUtils.hpp>
-#include <ArborX_DetailsUnionFind.hpp>
-#include <ArborX_DetailsUtils.hpp>
 #include <ArborX_Version.hpp>
+#include <detail/ArborX_UnionFind.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtVersion.hpp>
+#include <misc/ArborX_SortUtils.hpp>
+#include <misc/ArborX_Utils.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Random.hpp>
diff --git a/examples/viz/tree_visualization.cpp b/examples/viz/tree_visualization.cpp
index 36b53537b..40bec673d 100644
--- a/examples/viz/tree_visualization.cpp
+++ b/examples/viz/tree_visualization.cpp
@@ -9,9 +9,9 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_DetailsTreeVisualization.hpp>
 #include <ArborX_LinearBVH.hpp>
+#include <detail/ArborX_TreeVisualization.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/ArborX.hpp b/src/ArborX.hpp
index f7bcee74c..28335e2a7 100644
--- a/src/ArborX.hpp
+++ b/src/ArborX.hpp
@@ -20,16 +20,16 @@
 #include <ArborX_DistributedTree.hpp>
 #endif
 #include <ArborX_CrsGraphWrapper.hpp>
-#include <ArborX_Exception.hpp>
 #include <ArborX_LinearBVH.hpp>
 #include <ArborX_Point.hpp>
-#include <ArborX_PredicateHelpers.hpp>
-#include <ArborX_Predicates.hpp>
 #include <ArborX_Sphere.hpp>
-// FIXME: we include ArborX_DetailsUtils.hpp only for backward compatibility for
+#include <detail/ArborX_PredicateHelpers.hpp>
+#include <detail/ArborX_Predicates.hpp>
+#include <misc/ArborX_Exception.hpp>
+// FIXME: we include ArborX_Utils.hpp only for backward compatibility for
 // users using deprecated functions in ArborX namespace (min, max,
 // adjacentDifference, ...). This header should be removed when we remove those
 // functions.
-#include <ArborX_DetailsUtils.hpp>
+#include <misc/ArborX_Utils.hpp>
 
 #endif
diff --git a/src/ArborX_Version.hpp.in b/src/ArborX_Version.hpp.in
index d8f81c642..04367b53e 100644
--- a/src/ArborX_Version.hpp.in
+++ b/src/ArborX_Version.hpp.in
@@ -14,7 +14,7 @@
 
 #include <ArborX_Config.hpp>
 
-#include <ArborX_DetailsKokkosExtVersion.hpp>
+#include <kokkos_ext/ArborX_KokkosExtVersion.hpp>
 
 #include <string>
 
diff --git a/src/ArborX_DBSCAN.hpp b/src/cluster/ArborX_DBSCAN.hpp
similarity index 97%
rename from src/ArborX_DBSCAN.hpp
rename to src/cluster/ArborX_DBSCAN.hpp
index c9dea6c3f..137f97301 100644
--- a/src/ArborX_DBSCAN.hpp
+++ b/src/cluster/ArborX_DBSCAN.hpp
@@ -12,19 +12,19 @@
 #ifndef ARBORX_DBSCAN_HPP
 #define ARBORX_DBSCAN_HPP
 
-#include <ArborX_AccessTraits.hpp>
 #include <ArborX_Box.hpp>
-#include <ArborX_DetailsCartesianGrid.hpp>
-#include <ArborX_DetailsFDBSCAN.hpp>
-#include <ArborX_DetailsFDBSCANDenseBox.hpp>
-#include <ArborX_DetailsHalfTraversal.hpp>
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_DetailsSortUtils.hpp>
-#include <ArborX_DetailsUtils.hpp> // sortObjects
 #include <ArborX_LinearBVH.hpp>
-#include <ArborX_PredicateHelpers.hpp>
 #include <ArborX_Sphere.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_CartesianGrid.hpp>
+#include <detail/ArborX_FDBSCAN.hpp>
+#include <detail/ArborX_FDBSCANDenseBox.hpp>
+#include <detail/ArborX_HalfTraversal.hpp>
+#include <detail/ArborX_PredicateHelpers.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <misc/ArborX_SortUtils.hpp>
+#include <misc/ArborX_Utils.hpp> // sortObjects
 
 namespace ArborX
 {
diff --git a/src/details/ArborX_Dendrogram.hpp b/src/cluster/ArborX_Dendrogram.hpp
similarity index 94%
rename from src/details/ArborX_Dendrogram.hpp
rename to src/cluster/ArborX_Dendrogram.hpp
index 34228691e..292553e01 100644
--- a/src/details/ArborX_Dendrogram.hpp
+++ b/src/cluster/ArborX_Dendrogram.hpp
@@ -11,10 +11,10 @@
 #ifndef ARBORX_DENDROGRAM_HPP
 #define ARBORX_DENDROGRAM_HPP
 
-#include <ArborX_DetailsDendrogram.hpp>
-#include <ArborX_DetailsKokkosExtSort.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
-#include <ArborX_DetailsWeightedEdge.hpp>
+#include <detail/ArborX_DendrogramHelpers.hpp>
+#include <detail/ArborX_WeightedEdge.hpp>
+#include <kokkos_ext/ArborX_KokkosExtSort.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/ArborX_HDBSCAN.hpp b/src/cluster/ArborX_HDBSCAN.hpp
similarity index 100%
rename from src/ArborX_HDBSCAN.hpp
rename to src/cluster/ArborX_HDBSCAN.hpp
diff --git a/src/details/ArborX_MinimumSpanningTree.hpp b/src/cluster/ArborX_MinimumSpanningTree.hpp
similarity index 96%
rename from src/details/ArborX_MinimumSpanningTree.hpp
rename to src/cluster/ArborX_MinimumSpanningTree.hpp
index 6795e0561..e25be7b74 100644
--- a/src/details/ArborX_MinimumSpanningTree.hpp
+++ b/src/cluster/ArborX_MinimumSpanningTree.hpp
@@ -12,15 +12,15 @@
 #ifndef ARBORX_MINIMUM_SPANNING_TREE_HPP
 #define ARBORX_MINIMUM_SPANNING_TREE_HPP
 
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
-#include <ArborX_DetailsMinimumSpanningTree.hpp>
-#include <ArborX_DetailsMutualReachabilityDistance.hpp>
-#include <ArborX_DetailsTreeNodeLabeling.hpp>
-#include <ArborX_DetailsWeightedEdge.hpp>
 #include <ArborX_LinearBVH.hpp>
-#include <ArborX_PredicateHelpers.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_BoruvkaHelpers.hpp>
+#include <detail/ArborX_MutualReachabilityDistance.hpp>
+#include <detail/ArborX_PredicateHelpers.hpp>
+#include <detail/ArborX_TreeNodeLabeling.hpp>
+#include <detail/ArborX_WeightedEdge.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/details/ArborX_DetailsMinimumSpanningTree.hpp b/src/cluster/detail/ArborX_BoruvkaHelpers.hpp
similarity index 98%
rename from src/details/ArborX_DetailsMinimumSpanningTree.hpp
rename to src/cluster/detail/ArborX_BoruvkaHelpers.hpp
index 1c14a36e4..95b118d49 100644
--- a/src/details/ArborX_DetailsMinimumSpanningTree.hpp
+++ b/src/cluster/detail/ArborX_BoruvkaHelpers.hpp
@@ -9,14 +9,14 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_MINIMUM_SPANNING_TREE_HPP
-#define ARBORX_DETAILS_MINIMUM_SPANNING_TREE_HPP
-
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_DetailsHappyTreeFriends.hpp>
-#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
-#include <ArborX_DetailsUtils.hpp>
-#include <ArborX_DetailsWeightedEdge.hpp>
+#ifndef ARBORX_BORUVKA_HELPERS_HPP
+#define ARBORX_BORUVKA_HELPERS_HPP
+
+#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <detail/ArborX_HappyTreeFriends.hpp>
+#include <detail/ArborX_WeightedEdge.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
+#include <misc/ArborX_Utils.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/details/ArborX_DetailsCartesianGrid.hpp b/src/cluster/detail/ArborX_CartesianGrid.hpp
similarity index 97%
rename from src/details/ArborX_DetailsCartesianGrid.hpp
rename to src/cluster/detail/ArborX_CartesianGrid.hpp
index 9f0603650..01b623acc 100644
--- a/src/details/ArborX_DetailsCartesianGrid.hpp
+++ b/src/cluster/detail/ArborX_CartesianGrid.hpp
@@ -9,12 +9,12 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_CARTESIAN_GRID_HPP
-#define ARBORX_DETAILS_CARTESIAN_GRID_HPP
+#ifndef ARBORX_CARTESIAN_GRID_HPP
+#define ARBORX_CARTESIAN_GRID_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_Exception.hpp>
 #include <ArborX_GeometryTraits.hpp>
+#include <misc/ArborX_Exception.hpp>
 
 #include <Kokkos_Assert.hpp> // KOKKOS_ASSERT
 #include <Kokkos_Macros.hpp>
diff --git a/src/details/ArborX_DetailsDendrogram.hpp b/src/cluster/detail/ArborX_DendrogramHelpers.hpp
similarity index 95%
rename from src/details/ArborX_DetailsDendrogram.hpp
rename to src/cluster/detail/ArborX_DendrogramHelpers.hpp
index a669e57c9..027c0dc04 100644
--- a/src/details/ArborX_DetailsDendrogram.hpp
+++ b/src/cluster/detail/ArborX_DendrogramHelpers.hpp
@@ -9,11 +9,11 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_DENDROGRAM_HPP
-#define ARBORX_DETAILS_DENDROGRAM_HPP
+#ifndef ARBORX_DENDROGRAM_HELPERS_HPP
+#define ARBORX_DENDROGRAM_HELPERS_HPP
 
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp> // iota
-#include <ArborX_DetailsUnionFind.hpp>
+#include <detail/ArborX_UnionFind.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp> // iota
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_DetailsFDBSCAN.hpp b/src/cluster/detail/ArborX_FDBSCAN.hpp
similarity index 95%
rename from src/details/ArborX_DetailsFDBSCAN.hpp
rename to src/cluster/detail/ArborX_FDBSCAN.hpp
index ef869fcdf..704685580 100644
--- a/src/details/ArborX_DetailsFDBSCAN.hpp
+++ b/src/cluster/detail/ArborX_FDBSCAN.hpp
@@ -12,10 +12,10 @@
 #ifndef ARBORX_DETAILSFDBSCAN_HPP
 #define ARBORX_DETAILSFDBSCAN_HPP
 
-#include <ArborX_Callbacks.hpp>
-#include <ArborX_DetailsUnionFind.hpp>
-#include <ArborX_PairValueIndex.hpp>
-#include <ArborX_Predicates.hpp>
+#include <detail/ArborX_Callbacks.hpp>
+#include <detail/ArborX_PairValueIndex.hpp>
+#include <detail/ArborX_Predicates.hpp>
+#include <detail/ArborX_UnionFind.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_DetailsFDBSCANDenseBox.hpp b/src/cluster/detail/ArborX_FDBSCANDenseBox.hpp
similarity index 97%
rename from src/details/ArborX_DetailsFDBSCANDenseBox.hpp
rename to src/cluster/detail/ArborX_FDBSCANDenseBox.hpp
index 54da9abd4..6915e2da8 100644
--- a/src/details/ArborX_DetailsFDBSCANDenseBox.hpp
+++ b/src/cluster/detail/ArborX_FDBSCANDenseBox.hpp
@@ -12,12 +12,12 @@
 #ifndef ARBORX_DETAILSFDBSCANDENSEBOX_HPP
 #define ARBORX_DETAILSFDBSCANDENSEBOX_HPP
 
-#include <ArborX_Callbacks.hpp>
-#include <ArborX_DetailsCartesianGrid.hpp>
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
-#include <ArborX_DetailsUnionFind.hpp>
-#include <ArborX_Predicates.hpp>
+#include <detail/ArborX_Callbacks.hpp>
+#include <detail/ArborX_CartesianGrid.hpp>
+#include <detail/ArborX_Predicates.hpp>
+#include <detail/ArborX_UnionFind.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_DetailsMutualReachabilityDistance.hpp b/src/cluster/detail/ArborX_MutualReachabilityDistance.hpp
similarity index 90%
rename from src/details/ArborX_DetailsMutualReachabilityDistance.hpp
rename to src/cluster/detail/ArborX_MutualReachabilityDistance.hpp
index edba7f38b..99d6cc2d5 100644
--- a/src/details/ArborX_DetailsMutualReachabilityDistance.hpp
+++ b/src/cluster/detail/ArborX_MutualReachabilityDistance.hpp
@@ -9,13 +9,13 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_MUTUAL_REACHABILITY_DISTANCE_HPP
-#define ARBORX_DETAILS_MUTUAL_REACHABILITY_DISTANCE_HPP
+#ifndef ARBORX_MUTUAL_REACHABILITY_DISTANCE_HPP
+#define ARBORX_MUTUAL_REACHABILITY_DISTANCE_HPP
 
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_DetailsHappyTreeFriends.hpp>
-#include <ArborX_Predicates.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <detail/ArborX_HappyTreeFriends.hpp>
+#include <detail/ArborX_Predicates.hpp>
 
 #include <Kokkos_Macros.hpp>
 #include <Kokkos_MinMax.hpp>
diff --git a/src/details/ArborX_DetailsUnionFind.hpp b/src/cluster/detail/ArborX_UnionFind.hpp
similarity index 100%
rename from src/details/ArborX_DetailsUnionFind.hpp
rename to src/cluster/detail/ArborX_UnionFind.hpp
diff --git a/src/details/ArborX_DetailsWeightedEdge.hpp b/src/cluster/detail/ArborX_WeightedEdge.hpp
similarity index 95%
rename from src/details/ArborX_DetailsWeightedEdge.hpp
rename to src/cluster/detail/ArborX_WeightedEdge.hpp
index 7b16c576b..515755882 100644
--- a/src/details/ArborX_DetailsWeightedEdge.hpp
+++ b/src/cluster/detail/ArborX_WeightedEdge.hpp
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_WEIGHTED_EDGE_HPP
-#define ARBORX_DETAILS_WEIGHTED_EDGE_HPP
+#ifndef ARBORX_WEIGHTED_EDGE_HPP
+#define ARBORX_WEIGHTED_EDGE_HPP
 
 #include <Kokkos_Macros.hpp>
 #include <Kokkos_MinMax.hpp>
diff --git a/src/ArborX_DistributedTree.hpp b/src/distributed/ArborX_DistributedTree.hpp
similarity index 97%
rename from src/ArborX_DistributedTree.hpp
rename to src/distributed/ArborX_DistributedTree.hpp
index a92689465..5d0431fee 100644
--- a/src/ArborX_DistributedTree.hpp
+++ b/src/distributed/ArborX_DistributedTree.hpp
@@ -12,13 +12,13 @@
 #ifndef ARBORX_DISTRIBUTED_TREE_HPP
 #define ARBORX_DISTRIBUTED_TREE_HPP
 
-#include <ArborX_AccessTraits.hpp>
 #include <ArborX_Box.hpp>
-#include <ArborX_DetailsDistributedTreeNearest.hpp>
-#include <ArborX_DetailsDistributedTreeSpatial.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
 #include <ArborX_LinearBVH.hpp>
-#include <ArborX_PairValueIndex.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_DistributedTreeNearest.hpp>
+#include <detail/ArborX_DistributedTreeSpatial.hpp>
+#include <detail/ArborX_PairValueIndex.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_DetailsDistributedTreeImpl.hpp b/src/distributed/detail/ArborX_DistributedTreeImpl.hpp
similarity index 97%
rename from src/details/ArborX_DetailsDistributedTreeImpl.hpp
rename to src/distributed/detail/ArborX_DistributedTreeImpl.hpp
index d79e92ba1..b1daa614b 100644
--- a/src/details/ArborX_DetailsDistributedTreeImpl.hpp
+++ b/src/distributed/detail/ArborX_DistributedTreeImpl.hpp
@@ -8,10 +8,10 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_DISTRIBUTED_TREE_IMPL_HPP
-#define ARBORX_DETAILS_DISTRIBUTED_TREE_IMPL_HPP
+#ifndef ARBORX_DISTRIBUTED_TREE_IMPL_HPP
+#define ARBORX_DISTRIBUTED_TREE_IMPL_HPP
 
-#include <ArborX_AccessTraits.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_DetailsDistributedTreeNearest.hpp b/src/distributed/detail/ArborX_DistributedTreeNearest.hpp
similarity index 95%
rename from src/details/ArborX_DetailsDistributedTreeNearest.hpp
rename to src/distributed/detail/ArborX_DistributedTreeNearest.hpp
index 241584376..c8c0d0a43 100644
--- a/src/details/ArborX_DetailsDistributedTreeNearest.hpp
+++ b/src/distributed/detail/ArborX_DistributedTreeNearest.hpp
@@ -8,16 +8,16 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_DISTRIBUTED_TREE_NEAREST_HPP
-#define ARBORX_DETAILS_DISTRIBUTED_TREE_NEAREST_HPP
-
-#include <ArborX_DetailsDistributedTreeImpl.hpp>
-#include <ArborX_DetailsDistributedTreeNearestHelpers.hpp>
-#include <ArborX_DetailsDistributedTreeUtils.hpp>
-#include <ArborX_DetailsKokkosExtKernelStdAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
-#include <ArborX_Predicates.hpp>
+#ifndef ARBORX_DISTRIBUTED_TREE_NEAREST_HPP
+#define ARBORX_DISTRIBUTED_TREE_NEAREST_HPP
+
+#include <detail/ArborX_DistributedTreeImpl.hpp>
+#include <detail/ArborX_DistributedTreeNearestHelpers.hpp>
+#include <detail/ArborX_DistributedTreeUtils.hpp>
+#include <detail/ArborX_Predicates.hpp>
+#include <kokkos_ext/ArborX_KokkosExtKernelStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/details/ArborX_DetailsDistributedTreeNearestHelpers.hpp b/src/distributed/detail/ArborX_DistributedTreeNearestHelpers.hpp
similarity index 97%
rename from src/details/ArborX_DetailsDistributedTreeNearestHelpers.hpp
rename to src/distributed/detail/ArborX_DistributedTreeNearestHelpers.hpp
index 2e0f1c576..f3fc73cc7 100644
--- a/src/details/ArborX_DetailsDistributedTreeNearestHelpers.hpp
+++ b/src/distributed/detail/ArborX_DistributedTreeNearestHelpers.hpp
@@ -8,13 +8,13 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_DISTRIBUTED_TREE_NEAREST_HELPERS_HPP
-#define ARBORX_DETAILS_DISTRIBUTED_TREE_NEAREST_HELPERS_HPP
+#ifndef ARBORX_DISTRIBUTED_TREE_NEAREST_HELPERS_HPP
+#define ARBORX_DISTRIBUTED_TREE_NEAREST_HELPERS_HPP
 
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_Callbacks.hpp>
 #include <ArborX_Point.hpp>
 #include <ArborX_Sphere.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_Callbacks.hpp>
 
 #include <Kokkos_BitManipulation.hpp>
 
diff --git a/src/details/ArborX_DetailsDistributedTreeSpatial.hpp b/src/distributed/detail/ArborX_DistributedTreeSpatial.hpp
similarity index 93%
rename from src/details/ArborX_DetailsDistributedTreeSpatial.hpp
rename to src/distributed/detail/ArborX_DistributedTreeSpatial.hpp
index b43e52cb6..74c4d099e 100644
--- a/src/details/ArborX_DetailsDistributedTreeSpatial.hpp
+++ b/src/distributed/detail/ArborX_DistributedTreeSpatial.hpp
@@ -8,13 +8,13 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_DISTRIBUTED_TREE_SPATIAL_HPP
-#define ARBORX_DETAILS_DISTRIBUTED_TREE_SPATIAL_HPP
+#ifndef ARBORX_DISTRIBUTED_TREE_SPATIAL_HPP
+#define ARBORX_DISTRIBUTED_TREE_SPATIAL_HPP
 
-#include <ArborX_Callbacks.hpp>
-#include <ArborX_DetailsDistributedTreeImpl.hpp>
-#include <ArborX_DetailsDistributedTreeUtils.hpp>
-#include <ArborX_Predicates.hpp>
+#include <detail/ArborX_Callbacks.hpp>
+#include <detail/ArborX_DistributedTreeImpl.hpp>
+#include <detail/ArborX_DistributedTreeUtils.hpp>
+#include <detail/ArborX_Predicates.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/details/ArborX_DetailsDistributedTreeUtils.hpp b/src/distributed/detail/ArborX_DistributedTreeUtils.hpp
similarity index 96%
rename from src/details/ArborX_DetailsDistributedTreeUtils.hpp
rename to src/distributed/detail/ArborX_DistributedTreeUtils.hpp
index 512d0333e..fe7f6c6af 100644
--- a/src/details/ArborX_DetailsDistributedTreeUtils.hpp
+++ b/src/distributed/detail/ArborX_DistributedTreeUtils.hpp
@@ -8,17 +8,17 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_DISTRIBUTED_TREE_UTILS_HPP
-#define ARBORX_DETAILS_DISTRIBUTED_TREE_UTILS_HPP
+#ifndef ARBORX_DISTRIBUTED_TREE_UTILS_HPP
+#define ARBORX_DISTRIBUTED_TREE_UTILS_HPP
 
 #include <ArborX_Config.hpp>
 
-#include <ArborX_DetailsContainers.hpp>
-#include <ArborX_DetailsDistributor.hpp>
-#include <ArborX_DetailsKokkosExtSort.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
-#include <ArborX_DetailsPriorityQueue.hpp>
+#include <detail/ArborX_Distributor.hpp>
+#include <kokkos_ext/ArborX_KokkosExtSort.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
+#include <misc/ArborX_Containers.hpp>
+#include <misc/ArborX_PriorityQueue.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
@@ -169,7 +169,7 @@ void communicateResultsBack(MPI_Comm comm, ExecutionSpace const &space,
   // FIXME Distributor::createFromSends takes two views of the same type by
   // a const reference.  There were two easy ways out, either take the views by
   // value or cast at the call site.  I went with the latter.  Proper fix
-  // involves more code cleanup in ArborX_DetailsDistributor.hpp than I am
+  // involves more code cleanup in ArborX_Distributor.hpp than I am
   // willing to do just now.
   int const n_imports =
       distributor.createFromSends(space, ranks, static_cast<Ranks>(offset));
diff --git a/src/details/ArborX_DetailsDistributor.hpp b/src/distributed/detail/ArborX_Distributor.hpp
similarity index 98%
rename from src/details/ArborX_DetailsDistributor.hpp
rename to src/distributed/detail/ArborX_Distributor.hpp
index c90685a12..f8e675109 100644
--- a/src/details/ArborX_DetailsDistributor.hpp
+++ b/src/distributed/detail/ArborX_Distributor.hpp
@@ -8,15 +8,15 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_DISTRIBUTOR_HPP
-#define ARBORX_DETAILS_DISTRIBUTOR_HPP
+#ifndef ARBORX_DISTRIBUTOR_HPP
+#define ARBORX_DISTRIBUTOR_HPP
 
 #include <ArborX_Config.hpp>
 
-#include <ArborX_DetailsKokkosExtMinMaxReduce.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
-#include <ArborX_DetailsSortUtils.hpp>
-#include <ArborX_Exception.hpp>
+#include <kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
+#include <misc/ArborX_Exception.hpp>
+#include <misc/ArborX_SortUtils.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/geometry/ArborX_Box.hpp b/src/geometry/ArborX_Box.hpp
index e35f130c9..076d6d149 100644
--- a/src/geometry/ArborX_Box.hpp
+++ b/src/geometry/ArborX_Box.hpp
@@ -12,9 +12,9 @@
 #ifndef ARBORX_BOX_HPP
 #define ARBORX_BOX_HPP
 
-#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
 #include <ArborX_GeometryTraits.hpp>
 #include <ArborX_Point.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <Kokkos_Macros.hpp>
 #include <Kokkos_ReductionIdentity.hpp>
diff --git a/src/geometry/ArborX_KDOP.hpp b/src/geometry/ArborX_KDOP.hpp
index 77250ed81..03581cb22 100644
--- a/src/geometry/ArborX_KDOP.hpp
+++ b/src/geometry/ArborX_KDOP.hpp
@@ -13,11 +13,11 @@
 #define ARBORX_KDOP_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
-#include <ArborX_DetailsVector.hpp>
 #include <ArborX_GeometryTraits.hpp>
 #include <ArborX_Point.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
+#include <misc/ArborX_Vector.hpp>
 
 #include <Kokkos_Array.hpp>
 #include <Kokkos_Macros.hpp>
diff --git a/src/geometry/ArborX_Ray.hpp b/src/geometry/ArborX_Ray.hpp
index a6eac0214..3aa8209e9 100644
--- a/src/geometry/ArborX_Ray.hpp
+++ b/src/geometry/ArborX_Ray.hpp
@@ -12,12 +12,12 @@
 #define ARBORX_RAY_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_DetailsAlgorithms.hpp> // equal
-#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
-#include <ArborX_DetailsVector.hpp>
 #include <ArborX_Point.hpp>
 #include <ArborX_Sphere.hpp>
 #include <ArborX_Triangle.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp> // equal
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
+#include <misc/ArborX_Vector.hpp>
 
 #include <Kokkos_Assert.hpp> // KOKKOS_ASSERT
 #include <Kokkos_Macros.hpp>
diff --git a/src/geometry/ArborX_Segment.hpp b/src/geometry/ArborX_Segment.hpp
index 464bd09c3..b5bcd5792 100644
--- a/src/geometry/ArborX_Segment.hpp
+++ b/src/geometry/ArborX_Segment.hpp
@@ -11,9 +11,9 @@
 #ifndef ARBORX_SEGMENT_HPP
 #define ARBORX_SEGMENT_HPP
 
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_DetailsVector.hpp>
 #include <ArborX_GeometryTraits.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <misc/ArborX_Vector.hpp>
 
 #include <Kokkos_Clamp.hpp>
 #include <Kokkos_Macros.hpp>
diff --git a/src/geometry/ArborX_Tetrahedron.hpp b/src/geometry/ArborX_Tetrahedron.hpp
index af35c867b..ff0e8a8c7 100644
--- a/src/geometry/ArborX_Tetrahedron.hpp
+++ b/src/geometry/ArborX_Tetrahedron.hpp
@@ -12,9 +12,9 @@
 #ifndef ARBORX_TETRAHEDRON_HPP
 #define ARBORX_TETRAHEDRON_HPP
 
-#include <ArborX_DetailsAlgorithms.hpp>
 #include <ArborX_GeometryTraits.hpp>
 #include <ArborX_Point.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
 
 #include <Kokkos_Array.hpp>
 
diff --git a/src/geometry/ArborX_DetailsAlgorithms.hpp b/src/geometry/detail/ArborX_GeometryAlgorithms.hpp
similarity index 99%
rename from src/geometry/ArborX_DetailsAlgorithms.hpp
rename to src/geometry/detail/ArborX_GeometryAlgorithms.hpp
index 971d8bbea..c24ef71f9 100644
--- a/src/geometry/ArborX_DetailsAlgorithms.hpp
+++ b/src/geometry/detail/ArborX_GeometryAlgorithms.hpp
@@ -8,13 +8,13 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_ALGORITHMS_HPP
-#define ARBORX_DETAILS_ALGORITHMS_HPP
+#ifndef ARBORX_ALGORITHMS_HPP
+#define ARBORX_ALGORITHMS_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
-#include <ArborX_DetailsVector.hpp>
 #include <ArborX_GeometryTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
+#include <misc/ArborX_Vector.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_MathematicalFunctions.hpp> // isfinite
diff --git a/src/interpolation/ArborX_InterpMovingLeastSquares.hpp b/src/interpolation/ArborX_InterpMovingLeastSquares.hpp
index cb0c3db76..cc4aa76f3 100644
--- a/src/interpolation/ArborX_InterpMovingLeastSquares.hpp
+++ b/src/interpolation/ArborX_InterpMovingLeastSquares.hpp
@@ -12,15 +12,15 @@
 #ifndef ARBORX_INTERP_MOVING_LEAST_SQUARES_HPP
 #define ARBORX_INTERP_MOVING_LEAST_SQUARES_HPP
 
-#include <ArborX_AccessTraits.hpp>
 #include <ArborX_Box.hpp>
 #include <ArborX_GeometryTraits.hpp>
-#include <ArborX_IndexableGetter.hpp>
-#include <ArborX_InterpDetailsCompactRadialBasisFunction.hpp>
-#include <ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp>
-#include <ArborX_InterpDetailsPolynomialBasis.hpp>
 #include <ArborX_LinearBVH.hpp>
-#include <ArborX_PredicateHelpers.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_IndexableGetter.hpp>
+#include <detail/ArborX_InterpDetailsCompactRadialBasisFunction.hpp>
+#include <detail/ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp>
+#include <detail/ArborX_InterpDetailsPolynomialBasis.hpp>
+#include <detail/ArborX_PredicateHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/interpolation/details/ArborX_InterpDetailsCompactRadialBasisFunction.hpp b/src/interpolation/detail/ArborX_InterpDetailsCompactRadialBasisFunction.hpp
similarity index 96%
rename from src/interpolation/details/ArborX_InterpDetailsCompactRadialBasisFunction.hpp
rename to src/interpolation/detail/ArborX_InterpDetailsCompactRadialBasisFunction.hpp
index 6e8690246..e4389b3cb 100644
--- a/src/interpolation/details/ArborX_InterpDetailsCompactRadialBasisFunction.hpp
+++ b/src/interpolation/detail/ArborX_InterpDetailsCompactRadialBasisFunction.hpp
@@ -9,11 +9,11 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_INTERP_DETAILS_COMPACT_RADIAL_BASIS_FUNCTION_HPP
-#define ARBORX_INTERP_DETAILS_COMPACT_RADIAL_BASIS_FUNCTION_HPP
+#ifndef ARBORX_INTERP_COMPACT_RADIAL_BASIS_FUNCTION_HPP
+#define ARBORX_INTERP_COMPACT_RADIAL_BASIS_FUNCTION_HPP
 
-#include <ArborX_DetailsAlgorithms.hpp>
 #include <ArborX_GeometryTraits.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/interpolation/details/ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp b/src/interpolation/detail/ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp
similarity index 96%
rename from src/interpolation/details/ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp
rename to src/interpolation/detail/ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp
index cf9c4fcf4..05722488e 100644
--- a/src/interpolation/details/ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp
+++ b/src/interpolation/detail/ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp
@@ -9,16 +9,16 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_INTERP_DETAILS_MOVING_LEAST_SQUARES_COEFFICIENTS_HPP
-#define ARBORX_INTERP_DETAILS_MOVING_LEAST_SQUARES_COEFFICIENTS_HPP
+#ifndef ARBORX_INTERP_MOVING_LEAST_SQUARES_COEFFICIENTS_HPP
+#define ARBORX_INTERP_MOVING_LEAST_SQUARES_COEFFICIENTS_HPP
 
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
 #include <ArborX_GeometryTraits.hpp>
-#include <ArborX_InterpDetailsCompactRadialBasisFunction.hpp>
-#include <ArborX_InterpDetailsPolynomialBasis.hpp>
-#include <ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp>
 #include <ArborX_Point.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_InterpDetailsCompactRadialBasisFunction.hpp>
+#include <detail/ArborX_InterpDetailsPolynomialBasis.hpp>
+#include <detail/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/interpolation/details/ArborX_InterpDetailsPolynomialBasis.hpp b/src/interpolation/detail/ArborX_InterpDetailsPolynomialBasis.hpp
similarity index 98%
rename from src/interpolation/details/ArborX_InterpDetailsPolynomialBasis.hpp
rename to src/interpolation/detail/ArborX_InterpDetailsPolynomialBasis.hpp
index fb1bf4107..cdda6affd 100644
--- a/src/interpolation/details/ArborX_InterpDetailsPolynomialBasis.hpp
+++ b/src/interpolation/detail/ArborX_InterpDetailsPolynomialBasis.hpp
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_INTERP_DETAILS_POLYNOMIAL_BASIS_HPP
-#define ARBORX_INTERP_DETAILS_POLYNOMIAL_BASIS_HPP
+#ifndef ARBORX_INTERP_POLYNOMIAL_BASIS_HPP
+#define ARBORX_INTERP_POLYNOMIAL_BASIS_HPP
 
 #include <ArborX_GeometryTraits.hpp>
 
diff --git a/src/interpolation/details/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp b/src/interpolation/detail/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp
similarity index 97%
rename from src/interpolation/details/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp
rename to src/interpolation/detail/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp
index e2d4d2808..19abe8faf 100644
--- a/src/interpolation/details/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp
+++ b/src/interpolation/detail/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp
@@ -9,11 +9,11 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_INTERP_DETAILS_SYMMETRIC_PSEUDO_INVERSE_SVD_HPP
-#define ARBORX_INTERP_DETAILS_SYMMETRIC_PSEUDO_INVERSE_SVD_HPP
+#ifndef ARBORX_INTERP_SYMMETRIC_PSEUDO_INVERSE_SVD_HPP
+#define ARBORX_INTERP_SYMMETRIC_PSEUDO_INVERSE_SVD_HPP
 
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_Exception.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <misc/ArborX_Exception.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/kokkos_ext/ArborX_DetailsKokkosExtAccessibilityTraits.hpp b/src/kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp
similarity index 93%
rename from src/kokkos_ext/ArborX_DetailsKokkosExtAccessibilityTraits.hpp
rename to src/kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp
index 748d8daf0..33d5da9ca 100644
--- a/src/kokkos_ext/ArborX_DetailsKokkosExtAccessibilityTraits.hpp
+++ b/src/kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_KOKKOS_EXT_ACCESSIBILITY_TRAITS_HPP
-#define ARBORX_DETAILS_KOKKOS_EXT_ACCESSIBILITY_TRAITS_HPP
+#ifndef ARBORX_KOKKOS_EXT_ACCESSIBILITY_TRAITS_HPP
+#define ARBORX_KOKKOS_EXT_ACCESSIBILITY_TRAITS_HPP
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/kokkos_ext/ArborX_DetailsKokkosExtArithmeticTraits.hpp b/src/kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp
similarity index 91%
rename from src/kokkos_ext/ArborX_DetailsKokkosExtArithmeticTraits.hpp
rename to src/kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp
index e7d99da10..95d58804d 100644
--- a/src/kokkos_ext/ArborX_DetailsKokkosExtArithmeticTraits.hpp
+++ b/src/kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_KOKKOS_EXT_ARITHMETIC_TRAITS_HPP
-#define ARBORX_DETAILS_KOKKOS_EXT_ARITHMETIC_TRAITS_HPP
+#ifndef ARBORX_KOKKOS_EXT_ARITHMETIC_TRAITS_HPP
+#define ARBORX_KOKKOS_EXT_ARITHMETIC_TRAITS_HPP
 
 #include <Kokkos_NumericTraits.hpp>
 
diff --git a/src/kokkos_ext/ArborX_DetailsKokkosExtKernelStdAlgorithms.hpp b/src/kokkos_ext/ArborX_KokkosExtKernelStdAlgorithms.hpp
similarity index 93%
rename from src/kokkos_ext/ArborX_DetailsKokkosExtKernelStdAlgorithms.hpp
rename to src/kokkos_ext/ArborX_KokkosExtKernelStdAlgorithms.hpp
index e99fee9fe..8930327e1 100644
--- a/src/kokkos_ext/ArborX_DetailsKokkosExtKernelStdAlgorithms.hpp
+++ b/src/kokkos_ext/ArborX_KokkosExtKernelStdAlgorithms.hpp
@@ -8,8 +8,8 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_KOKKOS_EXT_KERNEL_STD_ALGORITHMS_HPP
-#define ARBORX_DETAILS_KOKKOS_EXT_KERNEL_STD_ALGORITHMS_HPP
+#ifndef ARBORX_KOKKOS_EXT_KERNEL_STD_ALGORITHMS_HPP
+#define ARBORX_KOKKOS_EXT_KERNEL_STD_ALGORITHMS_HPP
 
 #include <Kokkos_Macros.hpp>
 #include <Kokkos_Swap.hpp>
diff --git a/src/kokkos_ext/ArborX_DetailsKokkosExtMinMaxReduce.hpp b/src/kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp
similarity index 95%
rename from src/kokkos_ext/ArborX_DetailsKokkosExtMinMaxReduce.hpp
rename to src/kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp
index aa891da5d..be5839d1b 100644
--- a/src/kokkos_ext/ArborX_DetailsKokkosExtMinMaxReduce.hpp
+++ b/src/kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp
@@ -9,11 +9,11 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_KOKKOS_EXT_MIN_MAX_REDUCTIONS_HPP
-#define ARBORX_DETAILS_KOKKOS_EXT_MIN_MAX_REDUCTIONS_HPP
+#ifndef ARBORX_KOKKOS_EXT_MIN_MAX_REDUCTIONS_HPP
+#define ARBORX_KOKKOS_EXT_MIN_MAX_REDUCTIONS_HPP
 
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_Exception.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <misc/ArborX_Exception.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/kokkos_ext/ArborX_DetailsKokkosExtSort.hpp b/src/kokkos_ext/ArborX_KokkosExtSort.hpp
similarity index 98%
rename from src/kokkos_ext/ArborX_DetailsKokkosExtSort.hpp
rename to src/kokkos_ext/ArborX_KokkosExtSort.hpp
index ca322c8a9..2f7f4341b 100644
--- a/src/kokkos_ext/ArborX_DetailsKokkosExtSort.hpp
+++ b/src/kokkos_ext/ArborX_KokkosExtSort.hpp
@@ -9,12 +9,12 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_KOKKOS_EXT_SORT_HPP
-#define ARBORX_DETAILS_KOKKOS_EXT_SORT_HPP
+#ifndef ARBORX_KOKKOS_EXT_SORT_HPP
+#define ARBORX_KOKKOS_EXT_SORT_HPP
 
 #include <ArborX_Config.hpp> // ARBORX_ENABLE_ROCTHRUST
 
-#include <ArborX_DetailsKokkosExtMinMaxReduce.hpp>
+#include <kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp>
 
 #include <Kokkos_Profiling_ScopedRegion.hpp>
 #include <Kokkos_Sort.hpp>
diff --git a/src/kokkos_ext/ArborX_DetailsKokkosExtStdAlgorithms.hpp b/src/kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp
similarity index 92%
rename from src/kokkos_ext/ArborX_DetailsKokkosExtStdAlgorithms.hpp
rename to src/kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp
index 9fd251afa..ceea6d7d3 100644
--- a/src/kokkos_ext/ArborX_DetailsKokkosExtStdAlgorithms.hpp
+++ b/src/kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp
@@ -9,10 +9,10 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_KOKKOS_EXT_STD_ALGORITHMS_HPP
-#define ARBORX_DETAILS_KOKKOS_EXT_STD_ALGORITHMS_HPP
+#ifndef ARBORX_KOKKOS_EXT_STD_ALGORITHMS_HPP
+#define ARBORX_KOKKOS_EXT_STD_ALGORITHMS_HPP
 
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_StdAlgorithms.hpp>
diff --git a/src/kokkos_ext/ArborX_DetailsKokkosExtUninitializedMemoryAlgorithms.hpp b/src/kokkos_ext/ArborX_KokkosExtUninitializedMemoryAlgorithms.hpp
similarity index 89%
rename from src/kokkos_ext/ArborX_DetailsKokkosExtUninitializedMemoryAlgorithms.hpp
rename to src/kokkos_ext/ArborX_KokkosExtUninitializedMemoryAlgorithms.hpp
index edf43c70a..a0ef8f046 100644
--- a/src/kokkos_ext/ArborX_DetailsKokkosExtUninitializedMemoryAlgorithms.hpp
+++ b/src/kokkos_ext/ArborX_KokkosExtUninitializedMemoryAlgorithms.hpp
@@ -8,8 +8,8 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_KOKKOS_EXT_UNINITIALIZED_MEMORY_ALGORITHMS_HPP
-#define ARBORX_DETAILS_KOKKOS_EXT_UNINITIALIZED_MEMORY_ALGORITHMS_HPP
+#ifndef ARBORX_KOKKOS_EXT_UNINITIALIZED_MEMORY_ALGORITHMS_HPP
+#define ARBORX_KOKKOS_EXT_UNINITIALIZED_MEMORY_ALGORITHMS_HPP
 
 #include <Kokkos_Assert.hpp>
 #include <Kokkos_Macros.hpp>
diff --git a/src/kokkos_ext/ArborX_DetailsKokkosExtVersion.hpp b/src/kokkos_ext/ArborX_KokkosExtVersion.hpp
similarity index 92%
rename from src/kokkos_ext/ArborX_DetailsKokkosExtVersion.hpp
rename to src/kokkos_ext/ArborX_KokkosExtVersion.hpp
index abaf7b627..539683e2f 100644
--- a/src/kokkos_ext/ArborX_DetailsKokkosExtVersion.hpp
+++ b/src/kokkos_ext/ArborX_KokkosExtVersion.hpp
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_KOKKOS_EXT_VERSION_HPP
-#define ARBORX_DETAILS_KOKKOS_EXT_VERSION_HPP
+#ifndef ARBORX_KOKKOS_EXT_VERSION_HPP
+#define ARBORX_KOKKOS_EXT_VERSION_HPP
 
 #include <Kokkos_Macros.hpp>
 
diff --git a/src/kokkos_ext/ArborX_DetailsKokkosExtViewHelpers.hpp b/src/kokkos_ext/ArborX_KokkosExtViewHelpers.hpp
similarity index 96%
rename from src/kokkos_ext/ArborX_DetailsKokkosExtViewHelpers.hpp
rename to src/kokkos_ext/ArborX_KokkosExtViewHelpers.hpp
index 5f6026f71..6ef835802 100644
--- a/src/kokkos_ext/ArborX_DetailsKokkosExtViewHelpers.hpp
+++ b/src/kokkos_ext/ArborX_KokkosExtViewHelpers.hpp
@@ -9,10 +9,10 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_KOKKOS_EXT_VIEW_HELPERS_HPP
-#define ARBORX_DETAILS_KOKKOS_EXT_VIEW_HELPERS_HPP
+#ifndef ARBORX_KOKKOS_EXT_VIEW_HELPERS_HPP
+#define ARBORX_KOKKOS_EXT_VIEW_HELPERS_HPP
 
-#include <ArborX_Exception.hpp>
+#include <misc/ArborX_Exception.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_DetailsContainers.hpp b/src/misc/ArborX_Containers.hpp
similarity index 98%
rename from src/details/ArborX_DetailsContainers.hpp
rename to src/misc/ArborX_Containers.hpp
index 2730ab0e5..552fde99b 100644
--- a/src/details/ArborX_DetailsContainers.hpp
+++ b/src/misc/ArborX_Containers.hpp
@@ -8,8 +8,8 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_CONTAINERS_HPP
-#define ARBORX_DETAILS_CONTAINERS_HPP
+#ifndef ARBORX_CONTAINERS_HPP
+#define ARBORX_CONTAINERS_HPP
 
 #include <Kokkos_Assert.hpp> // KOKKOS_ASSERT
 #include <Kokkos_Macros.hpp>
diff --git a/src/details/ArborX_Exception.hpp b/src/misc/ArborX_Exception.hpp
similarity index 100%
rename from src/details/ArborX_Exception.hpp
rename to src/misc/ArborX_Exception.hpp
diff --git a/src/details/ArborX_DetailsHeap.hpp b/src/misc/ArborX_Heap.hpp
similarity index 98%
rename from src/details/ArborX_DetailsHeap.hpp
rename to src/misc/ArborX_Heap.hpp
index c1a3cd1dc..1e327e324 100644
--- a/src/details/ArborX_DetailsHeap.hpp
+++ b/src/misc/ArborX_Heap.hpp
@@ -8,8 +8,8 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_HEAP_HPP
-#define ARBORX_DETAILS_HEAP_HPP
+#ifndef ARBORX_HEAP_HPP
+#define ARBORX_HEAP_HPP
 
 #include <Kokkos_Macros.hpp>
 
diff --git a/src/details/ArborX_DetailsOperatorFunctionObjects.hpp b/src/misc/ArborX_OperatorFunctionObjects.hpp
similarity index 92%
rename from src/details/ArborX_DetailsOperatorFunctionObjects.hpp
rename to src/misc/ArborX_OperatorFunctionObjects.hpp
index 084c549de..b3083cad3 100644
--- a/src/details/ArborX_DetailsOperatorFunctionObjects.hpp
+++ b/src/misc/ArborX_OperatorFunctionObjects.hpp
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_OPERATOR_FUNCTION_OBJECTS_HPP
-#define ARBORX_DETAILS_OPERATOR_FUNCTION_OBJECTS_HPP
+#ifndef ARBORX_OPERATOR_FUNCTION_OBJECTS_HPP
+#define ARBORX_OPERATOR_FUNCTION_OBJECTS_HPP
 
 #include <Kokkos_Macros.hpp>
 
diff --git a/src/details/ArborX_DetailsPriorityQueue.hpp b/src/misc/ArborX_PriorityQueue.hpp
similarity index 94%
rename from src/details/ArborX_DetailsPriorityQueue.hpp
rename to src/misc/ArborX_PriorityQueue.hpp
index 76e5085b0..c0c25505d 100644
--- a/src/details/ArborX_DetailsPriorityQueue.hpp
+++ b/src/misc/ArborX_PriorityQueue.hpp
@@ -8,12 +8,12 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_PRIORITY_QUEUE_HPP
-#define ARBORX_DETAILS_PRIORITY_QUEUE_HPP
+#ifndef ARBORX_PRIORITY_QUEUE_HPP
+#define ARBORX_PRIORITY_QUEUE_HPP
 
-#include <ArborX_DetailsContainers.hpp>
-#include <ArborX_DetailsHeap.hpp>
-#include <ArborX_DetailsOperatorFunctionObjects.hpp> // Less
+#include <misc/ArborX_Containers.hpp>
+#include <misc/ArborX_Heap.hpp>
+#include <misc/ArborX_OperatorFunctionObjects.hpp> // Less
 
 #include <Kokkos_Macros.hpp>
 
diff --git a/src/details/ArborX_DetailsSortUtils.hpp b/src/misc/ArborX_SortUtils.hpp
similarity index 94%
rename from src/details/ArborX_DetailsSortUtils.hpp
rename to src/misc/ArborX_SortUtils.hpp
index 059fb9fb9..82222062b 100644
--- a/src/details/ArborX_DetailsSortUtils.hpp
+++ b/src/misc/ArborX_SortUtils.hpp
@@ -9,13 +9,13 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_SORT_UTILS_HPP
-#define ARBORX_DETAILS_SORT_UTILS_HPP
+#ifndef ARBORX_SORT_UTILS_HPP
+#define ARBORX_SORT_UTILS_HPP
 
-#include <ArborX_DetailsKokkosExtSort.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp> // iota
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>   // clone
-#include <ArborX_Exception.hpp>
+#include <kokkos_ext/ArborX_KokkosExtSort.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp> // iota
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>   // clone
+#include <misc/ArborX_Exception.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_DetailsStack.hpp b/src/misc/ArborX_Stack.hpp
similarity index 95%
rename from src/details/ArborX_DetailsStack.hpp
rename to src/misc/ArborX_Stack.hpp
index d7475c9a6..075865818 100644
--- a/src/details/ArborX_DetailsStack.hpp
+++ b/src/misc/ArborX_Stack.hpp
@@ -8,10 +8,10 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_STACK_HPP
-#define ARBORX_DETAILS_STACK_HPP
+#ifndef ARBORX_STACK_HPP
+#define ARBORX_STACK_HPP
 
-#include <ArborX_DetailsContainers.hpp>
+#include <misc/ArborX_Containers.hpp>
 
 #include <Kokkos_Macros.hpp>
 
diff --git a/src/details/ArborX_DetailsUtils.hpp b/src/misc/ArborX_Utils.hpp
similarity index 90%
rename from src/details/ArborX_DetailsUtils.hpp
rename to src/misc/ArborX_Utils.hpp
index e0f83c2b6..ae30c9134 100644
--- a/src/details/ArborX_DetailsUtils.hpp
+++ b/src/misc/ArborX_Utils.hpp
@@ -9,12 +9,12 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_UTILS_HPP
-#define ARBORX_DETAILS_UTILS_HPP
+#ifndef ARBORX_UTILS_HPP
+#define ARBORX_UTILS_HPP
 
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
-#include <ArborX_Exception.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
+#include <misc/ArborX_Exception.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_DetailsVector.hpp b/src/misc/ArborX_Vector.hpp
similarity index 98%
rename from src/details/ArborX_DetailsVector.hpp
rename to src/misc/ArborX_Vector.hpp
index 07d6e2608..43b252ae1 100644
--- a/src/details/ArborX_DetailsVector.hpp
+++ b/src/misc/ArborX_Vector.hpp
@@ -8,8 +8,8 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_VECTOR_HPP
-#define ARBORX_DETAILS_VECTOR_HPP
+#ifndef ARBORX_VECTOR_HPP
+#define ARBORX_VECTOR_HPP
 
 #include <ArborX_GeometryTraits.hpp>
 #include <ArborX_Point.hpp>
diff --git a/src/ArborX_BruteForce.hpp b/src/spatial/ArborX_BruteForce.hpp
similarity index 94%
rename from src/ArborX_BruteForce.hpp
rename to src/spatial/ArborX_BruteForce.hpp
index 0f995915e..eefd8c4ea 100644
--- a/src/ArborX_BruteForce.hpp
+++ b/src/spatial/ArborX_BruteForce.hpp
@@ -12,17 +12,17 @@
 #ifndef ARBORX_BRUTE_FORCE_HPP
 #define ARBORX_BRUTE_FORCE_HPP
 
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_AttachIndices.hpp>
 #include <ArborX_Box.hpp>
-#include <ArborX_Callbacks.hpp>
 #include <ArborX_CrsGraphWrapper.hpp>
-#include <ArborX_DetailsBruteForceImpl.hpp>
-#include <ArborX_DetailsCrsGraphWrapperImpl.hpp>
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_IndexableGetter.hpp>
-#include <ArborX_PairValueIndex.hpp>
-#include <ArborX_PredicateHelpers.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_AttachIndices.hpp>
+#include <detail/ArborX_BruteForceImpl.hpp>
+#include <detail/ArborX_Callbacks.hpp>
+#include <detail/ArborX_CrsGraphWrapperImpl.hpp>
+#include <detail/ArborX_IndexableGetter.hpp>
+#include <detail/ArborX_PairValueIndex.hpp>
+#include <detail/ArborX_PredicateHelpers.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/ArborX_CrsGraphWrapper.hpp b/src/spatial/ArborX_CrsGraphWrapper.hpp
similarity index 100%
rename from src/ArborX_CrsGraphWrapper.hpp
rename to src/spatial/ArborX_CrsGraphWrapper.hpp
diff --git a/src/ArborX_LinearBVH.hpp b/src/spatial/ArborX_LinearBVH.hpp
similarity index 94%
rename from src/ArborX_LinearBVH.hpp
rename to src/spatial/ArborX_LinearBVH.hpp
index ba758774b..e6f2cafff 100644
--- a/src/ArborX_LinearBVH.hpp
+++ b/src/spatial/ArborX_LinearBVH.hpp
@@ -12,24 +12,24 @@
 #ifndef ARBORX_LINEAR_BVH_HPP
 #define ARBORX_LINEAR_BVH_HPP
 
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_AttachIndices.hpp>
 #include <ArborX_Box.hpp>
-#include <ArborX_Callbacks.hpp>
 #include <ArborX_CrsGraphWrapper.hpp>
-#include <ArborX_DetailsBatchedQueries.hpp>
-#include <ArborX_DetailsCrsGraphWrapperImpl.hpp>
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_DetailsNode.hpp>
-#include <ArborX_DetailsPermutedData.hpp>
-#include <ArborX_DetailsSortUtils.hpp>
-#include <ArborX_DetailsTreeConstruction.hpp>
-#include <ArborX_DetailsTreeTraversal.hpp>
-#include <ArborX_IndexableGetter.hpp>
-#include <ArborX_PairValueIndex.hpp>
-#include <ArborX_PredicateHelpers.hpp>
-#include <ArborX_SpaceFillingCurves.hpp>
-#include <ArborX_TraversalPolicy.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_AttachIndices.hpp>
+#include <detail/ArborX_BatchedQueries.hpp>
+#include <detail/ArborX_Callbacks.hpp>
+#include <detail/ArborX_CrsGraphWrapperImpl.hpp>
+#include <detail/ArborX_IndexableGetter.hpp>
+#include <detail/ArborX_Node.hpp>
+#include <detail/ArborX_PairValueIndex.hpp>
+#include <detail/ArborX_PermutedData.hpp>
+#include <detail/ArborX_PredicateHelpers.hpp>
+#include <detail/ArborX_SpaceFillingCurves.hpp>
+#include <detail/ArborX_TraversalPolicy.hpp>
+#include <detail/ArborX_TreeConstruction.hpp>
+#include <detail/ArborX_TreeTraversal.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <misc/ArborX_SortUtils.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/details/ArborX_AccessTraits.hpp b/src/spatial/detail/ArborX_AccessTraits.hpp
similarity index 99%
rename from src/details/ArborX_AccessTraits.hpp
rename to src/spatial/detail/ArborX_AccessTraits.hpp
index 0b96d9cff..7eed68bc6 100644
--- a/src/details/ArborX_AccessTraits.hpp
+++ b/src/spatial/detail/ArborX_AccessTraits.hpp
@@ -14,7 +14,7 @@
 
 #include <ArborX_GeometryTraits.hpp>
 #include <ArborX_Point.hpp>
-#include <ArborX_Predicates.hpp>
+#include <detail/ArborX_Predicates.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_AttachIndices.hpp b/src/spatial/detail/ArborX_AttachIndices.hpp
similarity index 93%
rename from src/details/ArborX_AttachIndices.hpp
rename to src/spatial/detail/ArborX_AttachIndices.hpp
index a6afe358e..bfb5ad668 100644
--- a/src/details/ArborX_AttachIndices.hpp
+++ b/src/spatial/detail/ArborX_AttachIndices.hpp
@@ -8,12 +8,12 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_ATTACH_INDICES_HPP
-#define ARBORX_DETAILS_ATTACH_INDICES_HPP
+#ifndef ARBORX_ATTACH_INDICES_HPP
+#define ARBORX_ATTACH_INDICES_HPP
 
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_PairValueIndex.hpp>
-#include <ArborX_Predicates.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_PairValueIndex.hpp>
+#include <detail/ArborX_Predicates.hpp>
 
 namespace ArborX
 {
diff --git a/src/details/ArborX_DetailsBatchedQueries.hpp b/src/spatial/detail/ArborX_BatchedQueries.hpp
similarity index 94%
rename from src/details/ArborX_DetailsBatchedQueries.hpp
rename to src/spatial/detail/ArborX_BatchedQueries.hpp
index 6c4b07f5d..539890937 100644
--- a/src/details/ArborX_DetailsBatchedQueries.hpp
+++ b/src/spatial/detail/ArborX_BatchedQueries.hpp
@@ -9,13 +9,13 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_BATCHED_QUERIES_HPP
-#define ARBORX_DETAILS_BATCHED_QUERIES_HPP
+#ifndef ARBORX_BATCHED_QUERIES_HPP
+#define ARBORX_BATCHED_QUERIES_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_DetailsAlgorithms.hpp> // returnCentroid, translateAndScale
-#include <ArborX_DetailsSortUtils.hpp>  // sortObjects
-#include <ArborX_SpaceFillingCurves.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp> // returnCentroid, translateAndScale
+#include <detail/ArborX_SpaceFillingCurves.hpp>
+#include <misc/ArborX_SortUtils.hpp> // sortObjects
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_DetailsBruteForceImpl.hpp b/src/spatial/detail/ArborX_BruteForceImpl.hpp
similarity index 95%
rename from src/details/ArborX_DetailsBruteForceImpl.hpp
rename to src/spatial/detail/ArborX_BruteForceImpl.hpp
index 5abcac0e0..e1d11fe98 100644
--- a/src/details/ArborX_DetailsBruteForceImpl.hpp
+++ b/src/spatial/detail/ArborX_BruteForceImpl.hpp
@@ -9,16 +9,16 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_BRUTE_FORCE_IMPL_HPP
-#define ARBORX_DETAILS_BRUTE_FORCE_IMPL_HPP
-
-#include <ArborX_DetailsAlgorithms.hpp> // expand
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
-#include <ArborX_DetailsNearestBufferProvider.hpp>
-#include <ArborX_DetailsPriorityQueue.hpp>
-#include <ArborX_Exception.hpp>
-#include <ArborX_Predicates.hpp>
+#ifndef ARBORX_BRUTE_FORCE_IMPL_HPP
+#define ARBORX_BRUTE_FORCE_IMPL_HPP
+
+#include <detail/ArborX_GeometryAlgorithms.hpp> // expand
+#include <detail/ArborX_NearestBufferProvider.hpp>
+#include <detail/ArborX_Predicates.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
+#include <misc/ArborX_Exception.hpp>
+#include <misc/ArborX_PriorityQueue.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/details/ArborX_Callbacks.hpp b/src/spatial/detail/ArborX_Callbacks.hpp
similarity index 97%
rename from src/details/ArborX_Callbacks.hpp
rename to src/spatial/detail/ArborX_Callbacks.hpp
index d17355381..d638fed35 100644
--- a/src/details/ArborX_Callbacks.hpp
+++ b/src/spatial/detail/ArborX_Callbacks.hpp
@@ -11,9 +11,9 @@
 #ifndef ARBORX_CALLBACKS_HPP
 #define ARBORX_CALLBACKS_HPP
 
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_PairValueIndex.hpp>
-#include <ArborX_Predicates.hpp> // is_valid_predicate_tag
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_PairValueIndex.hpp>
+#include <detail/ArborX_Predicates.hpp> // is_valid_predicate_tag
 
 #include <Kokkos_DetectionIdiom.hpp>
 #include <Kokkos_Macros.hpp>
diff --git a/src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp b/src/spatial/detail/ArborX_CrsGraphWrapperImpl.hpp
similarity index 98%
rename from src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp
rename to src/spatial/detail/ArborX_CrsGraphWrapperImpl.hpp
index 3281cf924..7f17f99b7 100644
--- a/src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp
+++ b/src/spatial/detail/ArborX_CrsGraphWrapperImpl.hpp
@@ -13,13 +13,13 @@
 #define ARBORX_DETAIL_CRS_GRAPH_WRAPPER_IMPL_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_Callbacks.hpp>
-#include <ArborX_DetailsBatchedQueries.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
-#include <ArborX_DetailsPermutedData.hpp>
-#include <ArborX_Predicates.hpp>
-#include <ArborX_TraversalPolicy.hpp>
+#include <detail/ArborX_BatchedQueries.hpp>
+#include <detail/ArborX_Callbacks.hpp>
+#include <detail/ArborX_PermutedData.hpp>
+#include <detail/ArborX_Predicates.hpp>
+#include <detail/ArborX_TraversalPolicy.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 namespace ArborX
 {
diff --git a/src/details/ArborX_DetailsExpandHalfToFull.hpp b/src/spatial/detail/ArborX_ExpandHalfToFull.hpp
similarity index 93%
rename from src/details/ArborX_DetailsExpandHalfToFull.hpp
rename to src/spatial/detail/ArborX_ExpandHalfToFull.hpp
index 2b945c477..f8d3de513 100644
--- a/src/details/ArborX_DetailsExpandHalfToFull.hpp
+++ b/src/spatial/detail/ArborX_ExpandHalfToFull.hpp
@@ -9,11 +9,11 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_EXPAND_HALF_TO_FULL_HPP
-#define ARBORX_DETAILS_EXPAND_HALF_TO_FULL_HPP
+#ifndef ARBORX_EXPAND_HALF_TO_FULL_HPP
+#define ARBORX_EXPAND_HALF_TO_FULL_HPP
 
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_DetailsHalfTraversal.hpp b/src/spatial/detail/ArborX_HalfTraversal.hpp
similarity index 92%
rename from src/details/ArborX_DetailsHalfTraversal.hpp
rename to src/spatial/detail/ArborX_HalfTraversal.hpp
index 5c0b6eca0..894a4f083 100644
--- a/src/details/ArborX_DetailsHalfTraversal.hpp
+++ b/src/spatial/detail/ArborX_HalfTraversal.hpp
@@ -9,11 +9,11 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_HALF_TRAVERSAL_HPP
-#define ARBORX_DETAILS_HALF_TRAVERSAL_HPP
+#ifndef ARBORX_HALF_TRAVERSAL_HPP
+#define ARBORX_HALF_TRAVERSAL_HPP
 
-#include <ArborX_DetailsHappyTreeFriends.hpp>
-#include <ArborX_DetailsNode.hpp> // ROPE_SENTINEL
+#include <detail/ArborX_HappyTreeFriends.hpp>
+#include <detail/ArborX_Node.hpp> // ROPE_SENTINEL
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_DetailsHappyTreeFriends.hpp b/src/spatial/detail/ArborX_HappyTreeFriends.hpp
similarity index 96%
rename from src/details/ArborX_DetailsHappyTreeFriends.hpp
rename to src/spatial/detail/ArborX_HappyTreeFriends.hpp
index ab6fdd59c..ee52480e4 100644
--- a/src/details/ArborX_DetailsHappyTreeFriends.hpp
+++ b/src/spatial/detail/ArborX_HappyTreeFriends.hpp
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_HAPPY_TREE_FRIENDS_HPP
-#define ARBORX_DETAILS_HAPPY_TREE_FRIENDS_HPP
+#ifndef ARBORX_HAPPY_TREE_FRIENDS_HPP
+#define ARBORX_HAPPY_TREE_FRIENDS_HPP
 
 #include <Kokkos_Assert.hpp> // KOKKOS_ASSERT
 #include <Kokkos_Macros.hpp>
diff --git a/src/details/ArborX_IndexableGetter.hpp b/src/spatial/detail/ArborX_IndexableGetter.hpp
similarity index 96%
rename from src/details/ArborX_IndexableGetter.hpp
rename to src/spatial/detail/ArborX_IndexableGetter.hpp
index 00a5e0df8..d11bca5fd 100644
--- a/src/details/ArborX_IndexableGetter.hpp
+++ b/src/spatial/detail/ArborX_IndexableGetter.hpp
@@ -12,9 +12,9 @@
 #ifndef ARBORX_INDEXABLE_GETTER_HPP
 #define ARBORX_INDEXABLE_GETTER_HPP
 
-#include <ArborX_AccessTraits.hpp>
 #include <ArborX_GeometryTraits.hpp>
-#include <ArborX_PairValueIndex.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_PairValueIndex.hpp>
 
 namespace ArborX::Details
 {
diff --git a/src/details/ArborX_DetailsMortonCode.hpp b/src/spatial/detail/ArborX_MortonCode.hpp
similarity index 99%
rename from src/details/ArborX_DetailsMortonCode.hpp
rename to src/spatial/detail/ArborX_MortonCode.hpp
index 7281ef678..8579fa106 100644
--- a/src/details/ArborX_DetailsMortonCode.hpp
+++ b/src/spatial/detail/ArborX_MortonCode.hpp
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_MORTON_CODE_UTILS_HPP
-#define ARBORX_DETAILS_MORTON_CODE_UTILS_HPP
+#ifndef ARBORX_MORTON_CODE_UTILS_HPP
+#define ARBORX_MORTON_CODE_UTILS_HPP
 
 #include <ArborX_GeometryTraits.hpp>
 
diff --git a/src/details/ArborX_DetailsNearestBufferProvider.hpp b/src/spatial/detail/ArborX_NearestBufferProvider.hpp
similarity index 93%
rename from src/details/ArborX_DetailsNearestBufferProvider.hpp
rename to src/spatial/detail/ArborX_NearestBufferProvider.hpp
index 6e18d9912..592d6b7ec 100644
--- a/src/details/ArborX_DetailsNearestBufferProvider.hpp
+++ b/src/spatial/detail/ArborX_NearestBufferProvider.hpp
@@ -8,11 +8,11 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_NEAREST_BUFFER_PROVIDER_HPP
-#define ARBORX_DETAILS_NEAREST_BUFFER_PROVIDER_HPP
+#ifndef ARBORX_NEAREST_BUFFER_PROVIDER_HPP
+#define ARBORX_NEAREST_BUFFER_PROVIDER_HPP
 
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_NeighborList.hpp b/src/spatial/detail/ArborX_NeighborList.hpp
similarity index 97%
rename from src/details/ArborX_NeighborList.hpp
rename to src/spatial/detail/ArborX_NeighborList.hpp
index 6559439ed..4ac7f2e40 100644
--- a/src/details/ArborX_NeighborList.hpp
+++ b/src/spatial/detail/ArborX_NeighborList.hpp
@@ -12,12 +12,12 @@
 #ifndef ARBORX_NEIGHBOR_LIST_HPP
 #define ARBORX_NEIGHBOR_LIST_HPP
 
-#include <ArborX_DetailsHalfTraversal.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp> // reallocWithoutInitializing
 #include <ArborX_GeometryTraits.hpp>
 #include <ArborX_LinearBVH.hpp>
 #include <ArborX_Sphere.hpp>
+#include <detail/ArborX_HalfTraversal.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp> // reallocWithoutInitializing
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_DetailsNode.hpp b/src/spatial/detail/ArborX_Node.hpp
similarity index 100%
rename from src/details/ArborX_DetailsNode.hpp
rename to src/spatial/detail/ArborX_Node.hpp
diff --git a/src/details/ArborX_PairValueIndex.hpp b/src/spatial/detail/ArborX_PairValueIndex.hpp
similarity index 97%
rename from src/details/ArborX_PairValueIndex.hpp
rename to src/spatial/detail/ArborX_PairValueIndex.hpp
index 68c2c9a65..28941c6fd 100644
--- a/src/details/ArborX_PairValueIndex.hpp
+++ b/src/spatial/detail/ArborX_PairValueIndex.hpp
@@ -12,7 +12,7 @@
 #ifndef ARBORX_PAIR_VALUE_INDEX_HPP
 #define ARBORX_PAIR_VALUE_INDEX_HPP
 
-#include <ArborX_AccessTraits.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
 
 #include <Kokkos_Macros.hpp>
 
diff --git a/src/details/ArborX_DetailsPermutedData.hpp b/src/spatial/detail/ArborX_PermutedData.hpp
similarity index 95%
rename from src/details/ArborX_DetailsPermutedData.hpp
rename to src/spatial/detail/ArborX_PermutedData.hpp
index 96dd04d5f..369c71b05 100644
--- a/src/details/ArborX_DetailsPermutedData.hpp
+++ b/src/spatial/detail/ArborX_PermutedData.hpp
@@ -9,10 +9,10 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_PERMUTED_DATA_HPP
-#define ARBORX_DETAILS_PERMUTED_DATA_HPP
+#ifndef ARBORX_PERMUTED_DATA_HPP
+#define ARBORX_PERMUTED_DATA_HPP
 
-#include <ArborX_AccessTraits.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
 
 namespace ArborX
 {
diff --git a/src/details/ArborX_PredicateHelpers.hpp b/src/spatial/detail/ArborX_PredicateHelpers.hpp
similarity index 98%
rename from src/details/ArborX_PredicateHelpers.hpp
rename to src/spatial/detail/ArborX_PredicateHelpers.hpp
index 3dee3082d..1390e1927 100644
--- a/src/details/ArborX_PredicateHelpers.hpp
+++ b/src/spatial/detail/ArborX_PredicateHelpers.hpp
@@ -11,10 +11,10 @@
 #ifndef ARBORX_PREDICATE_HELPERS_HPP
 #define ARBORX_PREDICATE_HELPERS_HPP
 
-#include <ArborX_AccessTraits.hpp>
 #include <ArborX_GeometryTraits.hpp>
-#include <ArborX_Predicates.hpp>
 #include <ArborX_Sphere.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_Predicates.hpp>
 
 namespace ArborX
 {
diff --git a/src/details/ArborX_Predicates.hpp b/src/spatial/detail/ArborX_Predicates.hpp
similarity index 99%
rename from src/details/ArborX_Predicates.hpp
rename to src/spatial/detail/ArborX_Predicates.hpp
index aa0bc8c90..702a575b8 100644
--- a/src/details/ArborX_Predicates.hpp
+++ b/src/spatial/detail/ArborX_Predicates.hpp
@@ -11,7 +11,7 @@
 #ifndef ARBORX_PREDICATE_HPP
 #define ARBORX_PREDICATE_HPP
 
-#include <ArborX_DetailsAlgorithms.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
 
 namespace ArborX
 {
diff --git a/src/details/ArborX_SpaceFillingCurves.hpp b/src/spatial/detail/ArborX_SpaceFillingCurves.hpp
similarity index 97%
rename from src/details/ArborX_SpaceFillingCurves.hpp
rename to src/spatial/detail/ArborX_SpaceFillingCurves.hpp
index 6755805fb..662274a93 100644
--- a/src/details/ArborX_SpaceFillingCurves.hpp
+++ b/src/spatial/detail/ArborX_SpaceFillingCurves.hpp
@@ -13,9 +13,9 @@
 #define ARBORX_SPACE_FILLING_CURVES_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_DetailsMortonCode.hpp>
 #include <ArborX_Point.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <detail/ArborX_MortonCode.hpp>
 
 #include <Kokkos_DetectionIdiom.hpp>
 #include <Kokkos_Macros.hpp>
diff --git a/src/details/ArborX_TraversalPolicy.hpp b/src/spatial/detail/ArborX_TraversalPolicy.hpp
similarity index 100%
rename from src/details/ArborX_TraversalPolicy.hpp
rename to src/spatial/detail/ArborX_TraversalPolicy.hpp
diff --git a/src/details/ArborX_DetailsTreeConstruction.hpp b/src/spatial/detail/ArborX_TreeConstruction.hpp
similarity index 97%
rename from src/details/ArborX_DetailsTreeConstruction.hpp
rename to src/spatial/detail/ArborX_TreeConstruction.hpp
index 83e394883..b93f2e403 100644
--- a/src/details/ArborX_DetailsTreeConstruction.hpp
+++ b/src/spatial/detail/ArborX_TreeConstruction.hpp
@@ -9,13 +9,14 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_TREE_CONSTRUCTION_HPP
-#define ARBORX_DETAILS_TREE_CONSTRUCTION_HPP
-
-#include <ArborX_DetailsAlgorithms.hpp> // expand
-#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
-#include <ArborX_DetailsNode.hpp> // makeLeafNode
-#include <ArborX_SpaceFillingCurves.hpp>
+#ifndef ARBORX_TREE_CONSTRUCTION_HPP
+#define ARBORX_TREE_CONSTRUCTION_HPP
+
+#include <detail/ArborX_GeometryAlgorithms.hpp> // expand
+#include <detail/ArborX_Node.hpp>               // makeLeafNode
+#include <detail/ArborX_SpaceFillingCurves.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
+#include <misc/ArborX_Exception.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_DetailsTreeNodeLabeling.hpp b/src/spatial/detail/ArborX_TreeNodeLabeling.hpp
similarity index 95%
rename from src/details/ArborX_DetailsTreeNodeLabeling.hpp
rename to src/spatial/detail/ArborX_TreeNodeLabeling.hpp
index 858db298f..b72c18023 100644
--- a/src/details/ArborX_DetailsTreeNodeLabeling.hpp
+++ b/src/spatial/detail/ArborX_TreeNodeLabeling.hpp
@@ -9,11 +9,11 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_DETAILS_TREE_NODE_LABELING_HPP
-#define ARBORX_DETAILS_TREE_NODE_LABELING_HPP
+#ifndef ARBORX_TREE_NODE_LABELING_HPP
+#define ARBORX_TREE_NODE_LABELING_HPP
 
-#include <ArborX_DetailsHappyTreeFriends.hpp>
-#include <ArborX_Exception.hpp>
+#include <detail/ArborX_HappyTreeFriends.hpp>
+#include <misc/ArborX_Exception.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/details/ArborX_DetailsTreeTraversal.hpp b/src/spatial/detail/ArborX_TreeTraversal.hpp
similarity index 96%
rename from src/details/ArborX_DetailsTreeTraversal.hpp
rename to src/spatial/detail/ArborX_TreeTraversal.hpp
index 19665a9fe..a97011985 100644
--- a/src/details/ArborX_DetailsTreeTraversal.hpp
+++ b/src/spatial/detail/ArborX_TreeTraversal.hpp
@@ -8,20 +8,20 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_TREE_TRAVERSAL_HPP
-#define ARBORX_DETAILS_TREE_TRAVERSAL_HPP
-
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_DetailsHappyTreeFriends.hpp>
-#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
-#include <ArborX_DetailsNearestBufferProvider.hpp>
-#include <ArborX_DetailsNode.hpp> // ROPE_SENTINEL
-#include <ArborX_DetailsPriorityQueue.hpp>
-#include <ArborX_DetailsStack.hpp>
-#include <ArborX_Exception.hpp>
-#include <ArborX_Predicates.hpp>
+#ifndef ARBORX_TREE_TRAVERSAL_HPP
+#define ARBORX_TREE_TRAVERSAL_HPP
+
+#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <detail/ArborX_HappyTreeFriends.hpp>
+#include <detail/ArborX_NearestBufferProvider.hpp>
+#include <detail/ArborX_Node.hpp> // ROPE_SENTINEL
+#include <detail/ArborX_Predicates.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
+#include <misc/ArborX_Exception.hpp>
+#include <misc/ArborX_PriorityQueue.hpp>
+#include <misc/ArborX_Stack.hpp>
 
 namespace ArborX
 {
diff --git a/src/details/ArborX_DetailsTreeVisualization.hpp b/src/spatial/detail/ArborX_TreeVisualization.hpp
similarity index 96%
rename from src/details/ArborX_DetailsTreeVisualization.hpp
rename to src/spatial/detail/ArborX_TreeVisualization.hpp
index 91c866d12..845667146 100644
--- a/src/details/ArborX_DetailsTreeVisualization.hpp
+++ b/src/spatial/detail/ArborX_TreeVisualization.hpp
@@ -8,13 +8,13 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_DETAILS_TREE_VISUALIZATION_HPP
-#define ARBORX_DETAILS_TREE_VISUALIZATION_HPP
+#ifndef ARBORX_TREE_VISUALIZATION_HPP
+#define ARBORX_TREE_VISUALIZATION_HPP
 
-#include <ArborX_DetailsHappyTreeFriends.hpp>
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_DetailsTreeTraversal.hpp>
 #include <ArborX_Point.hpp>
+#include <detail/ArborX_HappyTreeFriends.hpp>
+#include <detail/ArborX_TreeTraversal.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/ArborXTest_LegacyTree.hpp b/test/ArborXTest_LegacyTree.hpp
index ce674fcf3..64123bc95 100644
--- a/test/ArborXTest_LegacyTree.hpp
+++ b/test/ArborXTest_LegacyTree.hpp
@@ -12,10 +12,10 @@
 #ifndef ARBORX_TEST_LEGACY_TREE_HPP
 #define ARBORX_TEST_LEGACY_TREE_HPP
 
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_Callbacks.hpp>
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_PairValueIndex.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_Callbacks.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <detail/ArborX_PairValueIndex.hpp>
 
 #include <Kokkos_Macros.hpp>
 
diff --git a/test/ArborX_BoostRTreeHelpers.hpp b/test/ArborX_BoostRTreeHelpers.hpp
index 81715fc15..9f2d13f29 100644
--- a/test/ArborX_BoostRTreeHelpers.hpp
+++ b/test/ArborX_BoostRTreeHelpers.hpp
@@ -16,13 +16,13 @@
 
 #include "ArborX_BoostGeometryAdapters.hpp"
 #include "ArborX_BoostRangeAdapters.hpp"
-#include <ArborX_AccessTraits.hpp>
 #include <ArborX_Box.hpp>
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp> // is_accessible_from_host
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>       // exclusive_scan
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>         // lastElement
-#include <ArborX_Predicates.hpp>
 #include <ArborX_Sphere.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_Predicates.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp> // is_accessible_from_host
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp> // exclusive_scan
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>   // lastElement
 #ifdef ARBORX_ENABLE_MPI
 #include "ArborXTest_PairIndexRank.hpp"
 #endif
diff --git a/test/ArborX_BoostRangeAdapters.hpp b/test/ArborX_BoostRangeAdapters.hpp
index 9527601e9..381df64c1 100644
--- a/test/ArborX_BoostRangeAdapters.hpp
+++ b/test/ArborX_BoostRangeAdapters.hpp
@@ -12,8 +12,8 @@
 #ifndef ARBORX_BOOST_RANGE_ADAPTERS_HPP
 #define ARBORX_BOOST_RANGE_ADAPTERS_HPP
 
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_Exception.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <misc/ArborX_Exception.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/ArborX_EnableViewComparison.hpp b/test/ArborX_EnableViewComparison.hpp
index e239aa741..f391299ec 100644
--- a/test/ArborX_EnableViewComparison.hpp
+++ b/test/ArborX_EnableViewComparison.hpp
@@ -12,7 +12,7 @@
 #ifndef ARBORX_ENABLE_VIEW_COMPARISON_HPP
 #define ARBORX_ENABLE_VIEW_COMPARISON_HPP
 
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp> // is_accessible_from_host
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp> // is_accessible_from_host
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstAttachIndices.cpp b/test/tstAttachIndices.cpp
index 0a698a6c8..c77570bcf 100644
--- a/test/tstAttachIndices.cpp
+++ b/test/tstAttachIndices.cpp
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_AttachIndices.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_AttachIndices.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstBoostGeometryAdapters.cpp b/test/tstBoostGeometryAdapters.cpp
index aa07eeee0..a4cbd0c62 100644
--- a/test/tstBoostGeometryAdapters.cpp
+++ b/test/tstBoostGeometryAdapters.cpp
@@ -11,8 +11,8 @@
 
 #include "ArborX_BoostGeometryAdapters.hpp"
 #include <ArborX_Box.hpp>
-#include <ArborX_DetailsAlgorithms.hpp>
 #include <ArborX_Point.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstBoostRangeAdapters.cpp b/test/tstBoostRangeAdapters.cpp
index e06db7779..b1e10682e 100644
--- a/test/tstBoostRangeAdapters.cpp
+++ b/test/tstBoostRangeAdapters.cpp
@@ -12,8 +12,8 @@
 #include "ArborX_BoostRangeAdapters.hpp"
 #include "ArborX_EnableViewComparison.hpp"
 #include <ArborX_Box.hpp>
-#include <ArborX_DetailsAlgorithms.hpp>
 #include <ArborX_Point.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstCompileOnlyAccessTraits.cpp b/test/tstCompileOnlyAccessTraits.cpp
index 5a7f3a88e..46a76d414 100644
--- a/test/tstCompileOnlyAccessTraits.cpp
+++ b/test/tstCompileOnlyAccessTraits.cpp
@@ -9,9 +9,9 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_AttachIndices.hpp>
 #include <ArborX_Point.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_AttachIndices.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstCompileOnlyCallbacks.cpp b/test/tstCompileOnlyCallbacks.cpp
index f6be02746..62bab55ce 100644
--- a/test/tstCompileOnlyCallbacks.cpp
+++ b/test/tstCompileOnlyCallbacks.cpp
@@ -9,11 +9,11 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_AccessTraits.hpp>
 #include <ArborX_Box.hpp>
-#include <ArborX_Callbacks.hpp>
 #include <ArborX_Point.hpp>
-#include <ArborX_Predicates.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_Callbacks.hpp>
+#include <detail/ArborX_Predicates.hpp>
 
 // NOTE Let's not bother with __host__ __device__ annotations here
 
diff --git a/test/tstContainerAdaptors.cpp b/test/tstContainerAdaptors.cpp
index db069706a..838688d11 100644
--- a/test/tstContainerAdaptors.cpp
+++ b/test/tstContainerAdaptors.cpp
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_DetailsPriorityQueue.hpp>
-#include <ArborX_DetailsStack.hpp>
+#include <misc/ArborX_PriorityQueue.hpp>
+#include <misc/ArborX_Stack.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstDendrogram.cpp b/test/tstDendrogram.cpp
index 69013e137..136870f2b 100644
--- a/test/tstDendrogram.cpp
+++ b/test/tstDendrogram.cpp
@@ -14,10 +14,10 @@
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
 #include <ArborX_Dendrogram.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
-#include <ArborX_DetailsSortUtils.hpp>
-#include <ArborX_DetailsWeightedEdge.hpp>
 #include <ArborX_MinimumSpanningTree.hpp>
+#include <detail/ArborX_WeightedEdge.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
+#include <misc/ArborX_SortUtils.hpp>
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include "boost_ext/TupleComparison.hpp"
diff --git a/test/tstDetailsAlgorithms.cpp b/test/tstDetailsAlgorithms.cpp
index 588007e97..af771ed00 100644
--- a/test/tstDetailsAlgorithms.cpp
+++ b/test/tstDetailsAlgorithms.cpp
@@ -10,13 +10,13 @@
  ****************************************************************************/
 
 #include <ArborX_Box.hpp>
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
 #include <ArborX_Point.hpp>
 #include <ArborX_Segment.hpp>
 #include <ArborX_Sphere.hpp>
 #include <ArborX_Tetrahedron.hpp>
 #include <ArborX_Triangle.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <boost/mpl/list.hpp>
 
diff --git a/test/tstDetailsCrsGraphWrapperImpl.cpp b/test/tstDetailsCrsGraphWrapperImpl.cpp
index cca1af557..c7b00c217 100644
--- a/test/tstDetailsCrsGraphWrapperImpl.cpp
+++ b/test/tstDetailsCrsGraphWrapperImpl.cpp
@@ -11,11 +11,11 @@
 
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsCrsGraphWrapperImpl.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp> // exclusive_scan
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
-#include <ArborX_Predicates.hpp>
-#include <ArborX_TraversalPolicy.hpp>
+#include <detail/ArborX_CrsGraphWrapperImpl.hpp>
+#include <detail/ArborX_Predicates.hpp>
+#include <detail/ArborX_TraversalPolicy.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp> // exclusive_scan
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstDetailsDistributedTreeImpl.cpp b/test/tstDetailsDistributedTreeImpl.cpp
index 08b752572..6f1628bf5 100644
--- a/test/tstDetailsDistributedTreeImpl.cpp
+++ b/test/tstDetailsDistributedTreeImpl.cpp
@@ -11,8 +11,8 @@
 
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsDistributedTreeUtils.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
+#include <detail/ArborX_DistributedTreeUtils.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstDetailsDistributor.cpp b/test/tstDetailsDistributor.cpp
index b20adec94..3192c215b 100644
--- a/test/tstDetailsDistributor.cpp
+++ b/test/tstDetailsDistributor.cpp
@@ -10,8 +10,8 @@
  ****************************************************************************/
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsDistributedTreeUtils.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
+#include <detail/ArborX_DistributedTreeUtils.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstDetailsExpandHalfToFull.cpp b/test/tstDetailsExpandHalfToFull.cpp
index bcc0a0b72..3a8ed519c 100644
--- a/test/tstDetailsExpandHalfToFull.cpp
+++ b/test/tstDetailsExpandHalfToFull.cpp
@@ -16,7 +16,7 @@
 #include "ArborXTest_StdVectorToKokkosView.hpp"
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsExpandHalfToFull.hpp>
+#include <detail/ArborX_ExpandHalfToFull.hpp>
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include <boost/test/unit_test.hpp>
diff --git a/test/tstDetailsGeometryReducer.cpp b/test/tstDetailsGeometryReducer.cpp
index 694af7f33..d4b0ab0de 100644
--- a/test/tstDetailsGeometryReducer.cpp
+++ b/test/tstDetailsGeometryReducer.cpp
@@ -11,7 +11,7 @@
 
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include <ArborX_Box.hpp>
-#include <ArborX_DetailsAlgorithms.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstDetailsHalfTraversal.cpp b/test/tstDetailsHalfTraversal.cpp
index 2bff51683..167add989 100644
--- a/test/tstDetailsHalfTraversal.cpp
+++ b/test/tstDetailsHalfTraversal.cpp
@@ -12,8 +12,8 @@
 #include "ArborXTest_StdVectorToKokkosView.hpp"
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsHalfTraversal.hpp>
 #include <ArborX_LinearBVH.hpp>
+#include <detail/ArborX_HalfTraversal.hpp>
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include <boost/test/unit_test.hpp>
diff --git a/test/tstDetailsKokkosExtKernelStdAlgorithms.cpp b/test/tstDetailsKokkosExtKernelStdAlgorithms.cpp
index 0bbc9a8c1..407b09709 100644
--- a/test/tstDetailsKokkosExtKernelStdAlgorithms.cpp
+++ b/test/tstDetailsKokkosExtKernelStdAlgorithms.cpp
@@ -11,9 +11,9 @@
 
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsKokkosExtKernelStdAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
-#include <ArborX_Exception.hpp>
+#include <kokkos_ext/ArborX_KokkosExtKernelStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
+#include <misc/ArborX_Exception.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstDetailsKokkosExtMinMaxReduce.cpp b/test/tstDetailsKokkosExtMinMaxReduce.cpp
index e0e53db3c..3fc972399 100644
--- a/test/tstDetailsKokkosExtMinMaxReduce.cpp
+++ b/test/tstDetailsKokkosExtMinMaxReduce.cpp
@@ -12,8 +12,8 @@
 #include "ArborXTest_StdVectorToKokkosView.hpp"
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsKokkosExtMinMaxReduce.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstDetailsKokkosExtStdAlgorithms.cpp b/test/tstDetailsKokkosExtStdAlgorithms.cpp
index 066d4bdc9..0bde51b2f 100644
--- a/test/tstDetailsKokkosExtStdAlgorithms.cpp
+++ b/test/tstDetailsKokkosExtStdAlgorithms.cpp
@@ -11,8 +11,8 @@
 
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_Exception.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <misc/ArborX_Exception.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstDetailsKokkosExtUninitializedMemoryAlgorithms.cpp b/test/tstDetailsKokkosExtUninitializedMemoryAlgorithms.cpp
index 85ada6f2b..3fcd30dbb 100644
--- a/test/tstDetailsKokkosExtUninitializedMemoryAlgorithms.cpp
+++ b/test/tstDetailsKokkosExtUninitializedMemoryAlgorithms.cpp
@@ -10,8 +10,8 @@
  ****************************************************************************/
 
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
-#include <ArborX_DetailsKokkosExtUninitializedMemoryAlgorithms.hpp>
-#include <ArborX_Exception.hpp>
+#include <kokkos_ext/ArborX_KokkosExtUninitializedMemoryAlgorithms.hpp>
+#include <misc/ArborX_Exception.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstDetailsKokkosExtViewHelpers.cpp b/test/tstDetailsKokkosExtViewHelpers.cpp
index 11dca7dfb..fde532dc2 100644
--- a/test/tstDetailsKokkosExtViewHelpers.cpp
+++ b/test/tstDetailsKokkosExtViewHelpers.cpp
@@ -10,8 +10,8 @@
  ****************************************************************************/
 
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
-#include <ArborX_Exception.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
+#include <misc/ArborX_Exception.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstDetailsMortonCodes.cpp b/test/tstDetailsMortonCodes.cpp
index 1b10aaaa4..08a02bc87 100644
--- a/test/tstDetailsMortonCodes.cpp
+++ b/test/tstDetailsMortonCodes.cpp
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_DetailsMortonCode.hpp>
+#include <detail/ArborX_MortonCode.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstDetailsMutualReachabilityDistance.cpp b/test/tstDetailsMutualReachabilityDistance.cpp
index 82f8db406..7a8acea43 100644
--- a/test/tstDetailsMutualReachabilityDistance.cpp
+++ b/test/tstDetailsMutualReachabilityDistance.cpp
@@ -12,9 +12,9 @@
 #include "ArborXTest_StdVectorToKokkosView.hpp"
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
-#include <ArborX_DetailsMutualReachabilityDistance.hpp>
 #include <ArborX_LinearBVH.hpp>
+#include <detail/ArborX_MutualReachabilityDistance.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include <boost/test/unit_test.hpp>
diff --git a/test/tstDetailsTreeConstruction.cpp b/test/tstDetailsTreeConstruction.cpp
index e17fb5fef..b7a609912 100644
--- a/test/tstDetailsTreeConstruction.cpp
+++ b/test/tstDetailsTreeConstruction.cpp
@@ -11,13 +11,13 @@
 #include "ArborXTest_LegacyTree.hpp"
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_DetailsMortonCode.hpp> // expandBits, morton32
-#include <ArborX_DetailsNode.hpp>       // ROPE SENTINEL
-#include <ArborX_DetailsSortUtils.hpp>  // sortObjects
-#include <ArborX_DetailsTreeConstruction.hpp>
-#include <ArborX_IndexableGetter.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <detail/ArborX_IndexableGetter.hpp>
+#include <detail/ArborX_MortonCode.hpp> // expandBits, morton32
+#include <detail/ArborX_Node.hpp>       // ROPE SENTINEL
+#include <detail/ArborX_TreeConstruction.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <misc/ArborX_SortUtils.hpp> // sortObjects
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstDetailsTreeNodeLabeling.cpp b/test/tstDetailsTreeNodeLabeling.cpp
index ad563c764..4650cbc1b 100644
--- a/test/tstDetailsTreeNodeLabeling.cpp
+++ b/test/tstDetailsTreeNodeLabeling.cpp
@@ -12,7 +12,7 @@
 #include "ArborXTest_StdVectorToKokkosView.hpp"
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsTreeNodeLabeling.hpp>
+#include <detail/ArborX_TreeNodeLabeling.hpp>
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include <boost/test/unit_test.hpp>
diff --git a/test/tstDetailsUtils.cpp b/test/tstDetailsUtils.cpp
index 361d91590..232f56389 100644
--- a/test/tstDetailsUtils.cpp
+++ b/test/tstDetailsUtils.cpp
@@ -12,9 +12,9 @@
 #include "ArborXTest_StdVectorToKokkosView.hpp"
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsSortUtils.hpp>
-#include <ArborX_DetailsUtils.hpp>
-#include <ArborX_Exception.hpp>
+#include <misc/ArborX_Exception.hpp>
+#include <misc/ArborX_SortUtils.hpp>
+#include <misc/ArborX_Utils.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstDetailsVector.cpp b/test/tstDetailsVector.cpp
index 2f6deb986..6c04453aa 100644
--- a/test/tstDetailsVector.cpp
+++ b/test/tstDetailsVector.cpp
@@ -8,7 +8,7 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#include <ArborX_DetailsVector.hpp>
+#include <misc/ArborX_Vector.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstException.cpp b/test/tstException.cpp
index 35464677f..859bd9b36 100644
--- a/test/tstException.cpp
+++ b/test/tstException.cpp
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_Exception.hpp>
+#include <misc/ArborX_Exception.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstHeapOperations.cpp b/test/tstHeapOperations.cpp
index 5f6a1936a..143926c94 100644
--- a/test/tstHeapOperations.cpp
+++ b/test/tstHeapOperations.cpp
@@ -10,8 +10,8 @@
  ****************************************************************************/
 
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsHeap.hpp>
-#include <ArborX_DetailsPriorityQueue.hpp> // Less, Greater
+#include <misc/ArborX_Heap.hpp>
+#include <misc/ArborX_PriorityQueue.hpp> // Less, Greater
 
 #include <Kokkos_Array.hpp>
 
diff --git a/test/tstIndexableGetter.cpp b/test/tstIndexableGetter.cpp
index 4bdce5c5a..b36c6af46 100644
--- a/test/tstIndexableGetter.cpp
+++ b/test/tstIndexableGetter.cpp
@@ -9,9 +9,9 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_IndexableGetter.hpp>
 #include <ArborX_LinearBVH.hpp>
+#include <detail/ArborX_AccessTraits.hpp>
+#include <detail/ArborX_IndexableGetter.hpp>
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include <boost/test/unit_test.hpp>
diff --git a/test/tstInterpDetailsCompactRadialBasisFunction.cpp b/test/tstInterpDetailsCompactRadialBasisFunction.cpp
index 5f2e594a8..7cb086b06 100644
--- a/test/tstInterpDetailsCompactRadialBasisFunction.cpp
+++ b/test/tstInterpDetailsCompactRadialBasisFunction.cpp
@@ -11,9 +11,9 @@
 
 #include "ArborX_EnableDeviceTypes.hpp"
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_InterpDetailsCompactRadialBasisFunction.hpp>
 #include <ArborX_Point.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <detail/ArborX_InterpDetailsCompactRadialBasisFunction.hpp>
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include <boost/math/tools/polynomial.hpp>
diff --git a/test/tstInterpDetailsMLSCoefficients.cpp b/test/tstInterpDetailsMLSCoefficients.cpp
index 9c64f7b9f..ea714eb23 100644
--- a/test/tstInterpDetailsMLSCoefficients.cpp
+++ b/test/tstInterpDetailsMLSCoefficients.cpp
@@ -11,8 +11,8 @@
 
 #include "ArborX_EnableDeviceTypes.hpp"
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_InterpDetailsCompactRadialBasisFunction.hpp>
-#include <ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp>
+#include <detail/ArborX_InterpDetailsCompactRadialBasisFunction.hpp>
+#include <detail/ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp>
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include <boost/test/unit_test.hpp>
diff --git a/test/tstInterpDetailsPolyBasis.cpp b/test/tstInterpDetailsPolyBasis.cpp
index 47735975d..6eb045dfa 100644
--- a/test/tstInterpDetailsPolyBasis.cpp
+++ b/test/tstInterpDetailsPolyBasis.cpp
@@ -10,8 +10,8 @@
  ****************************************************************************/
 
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_InterpDetailsPolynomialBasis.hpp>
 #include <ArborX_Point.hpp>
+#include <detail/ArborX_InterpDetailsPolynomialBasis.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstInterpDetailsSVD.cpp b/test/tstInterpDetailsSVD.cpp
index df8b26033..1883e4ac8 100644
--- a/test/tstInterpDetailsSVD.cpp
+++ b/test/tstInterpDetailsSVD.cpp
@@ -11,7 +11,7 @@
 
 #include "ArborX_EnableDeviceTypes.hpp"
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp>
+#include <detail/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp>
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include <boost/test/unit_test.hpp>
diff --git a/test/tstKDOP.cpp b/test/tstKDOP.cpp
index 679fbaa82..8a73c2c9a 100644
--- a/test/tstKDOP.cpp
+++ b/test/tstKDOP.cpp
@@ -10,9 +10,9 @@
  ****************************************************************************/
 
 #include <ArborX_Box.hpp>
-#include <ArborX_DetailsAlgorithms.hpp>
 #include <ArborX_KDOP.hpp>
 #include <ArborX_Point.hpp>
+#include <detail/ArborX_GeometryAlgorithms.hpp>
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include <boost/test/unit_test.hpp>
diff --git a/test/tstNeighborList.cpp b/test/tstNeighborList.cpp
index 44e078cca..48b972725 100644
--- a/test/tstNeighborList.cpp
+++ b/test/tstNeighborList.cpp
@@ -19,9 +19,9 @@
 #include "ArborXTest_StdVectorToKokkosView.hpp"
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsExpandHalfToFull.hpp>
-#include <ArborX_NeighborList.hpp>
 #include <ArborX_Sphere.hpp>
+#include <detail/ArborX_ExpandHalfToFull.hpp>
+#include <detail/ArborX_NeighborList.hpp>
 
 #include <Kokkos_Random.hpp>
 
diff --git a/test/tstPriorityQueueMiscellaneous.cpp b/test/tstPriorityQueueMiscellaneous.cpp
index ac1141a76..a5b54a114 100644
--- a/test/tstPriorityQueueMiscellaneous.cpp
+++ b/test/tstPriorityQueueMiscellaneous.cpp
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_DetailsPriorityQueue.hpp>
+#include <misc/ArborX_PriorityQueue.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstQueryTreeRay.cpp b/test/tstQueryTreeRay.cpp
index 01dfee47c..dc207d21a 100644
--- a/test/tstQueryTreeRay.cpp
+++ b/test/tstQueryTreeRay.cpp
@@ -12,8 +12,8 @@
 #include "ArborXTest_StdVectorToKokkosView.hpp"
 #include <ArborX.hpp>
 #include <ArborXTest_LegacyTree.hpp>
-#include <ArborX_DetailsVector.hpp>
 #include <ArborX_Ray.hpp>
+#include <misc/ArborX_Vector.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstQueryTreeTraversalPolicy.cpp b/test/tstQueryTreeTraversalPolicy.cpp
index bef6d7c35..67d760461 100644
--- a/test/tstQueryTreeTraversalPolicy.cpp
+++ b/test/tstQueryTreeTraversalPolicy.cpp
@@ -11,10 +11,10 @@
 
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include <ArborXTest_LegacyTree.hpp>
-#include <ArborX_DetailsKokkosExtMinMaxReduce.hpp>
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtViewHelpers.hpp>
 #include <ArborX_LinearBVH.hpp>
+#include <kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstSequenceContainers.cpp b/test/tstSequenceContainers.cpp
index 886d68d98..b69244802 100644
--- a/test/tstSequenceContainers.cpp
+++ b/test/tstSequenceContainers.cpp
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_DetailsContainers.hpp>
+#include <misc/ArborX_Containers.hpp>
 
 #define BOOST_TEST_MODULE Containers
 #include <boost/test/unit_test.hpp>
diff --git a/test/tstUnionFind.cpp b/test/tstUnionFind.cpp
index f230d828e..0b10baf9b 100644
--- a/test/tstUnionFind.cpp
+++ b/test/tstUnionFind.cpp
@@ -10,8 +10,8 @@
  ****************************************************************************/
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsKokkosExtStdAlgorithms.hpp> // iota
-#include <ArborX_DetailsUnionFind.hpp>
+#include <detail/ArborX_UnionFind.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp> // iota
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include <boost/test/unit_test.hpp>