diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54d4dd85a..ab3c3ea4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,18 +73,30 @@ 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/cluster/details>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/distributed>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/distributed/details>
   $<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_SOURCE_DIR}/src/spatial/details>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/misc>
   $<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/cluster/details>
+  $<INSTALL_INTERFACE:include/ArborX/distributed>
+  $<INSTALL_INTERFACE:include/ArborX/distributed/details>
   $<INSTALL_INTERFACE:include/ArborX/interpolation>
   $<INSTALL_INTERFACE:include/ArborX/interpolation/details>
+  $<INSTALL_INTERFACE:include/ArborX/spatial>
+  $<INSTALL_INTERFACE:include/ArborX/spatial/details>
+  $<INSTALL_INTERFACE:include/ArborX/misc>
 )
 
 install(TARGETS ArborX
diff --git a/src/ArborX_DBSCAN.hpp b/src/cluster/ArborX_DBSCAN.hpp
similarity index 100%
rename from src/ArborX_DBSCAN.hpp
rename to src/cluster/ArborX_DBSCAN.hpp
diff --git a/src/details/ArborX_Dendrogram.hpp b/src/cluster/ArborX_Dendrogram.hpp
similarity index 100%
rename from src/details/ArborX_Dendrogram.hpp
rename to src/cluster/ArborX_Dendrogram.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 100%
rename from src/details/ArborX_MinimumSpanningTree.hpp
rename to src/cluster/ArborX_MinimumSpanningTree.hpp
diff --git a/src/details/ArborX_DetailsCartesianGrid.hpp b/src/cluster/details/ArborX_DetailsCartesianGrid.hpp
similarity index 100%
rename from src/details/ArborX_DetailsCartesianGrid.hpp
rename to src/cluster/details/ArborX_DetailsCartesianGrid.hpp
diff --git a/src/details/ArborX_DetailsDendrogram.hpp b/src/cluster/details/ArborX_DetailsDendrogram.hpp
similarity index 100%
rename from src/details/ArborX_DetailsDendrogram.hpp
rename to src/cluster/details/ArborX_DetailsDendrogram.hpp
diff --git a/src/details/ArborX_DetailsFDBSCAN.hpp b/src/cluster/details/ArborX_DetailsFDBSCAN.hpp
similarity index 100%
rename from src/details/ArborX_DetailsFDBSCAN.hpp
rename to src/cluster/details/ArborX_DetailsFDBSCAN.hpp
diff --git a/src/details/ArborX_DetailsFDBSCANDenseBox.hpp b/src/cluster/details/ArborX_DetailsFDBSCANDenseBox.hpp
similarity index 100%
rename from src/details/ArborX_DetailsFDBSCANDenseBox.hpp
rename to src/cluster/details/ArborX_DetailsFDBSCANDenseBox.hpp
diff --git a/src/details/ArborX_DetailsMinimumSpanningTree.hpp b/src/cluster/details/ArborX_DetailsMinimumSpanningTree.hpp
similarity index 100%
rename from src/details/ArborX_DetailsMinimumSpanningTree.hpp
rename to src/cluster/details/ArborX_DetailsMinimumSpanningTree.hpp
diff --git a/src/details/ArborX_DetailsMutualReachabilityDistance.hpp b/src/cluster/details/ArborX_DetailsMutualReachabilityDistance.hpp
similarity index 100%
rename from src/details/ArborX_DetailsMutualReachabilityDistance.hpp
rename to src/cluster/details/ArborX_DetailsMutualReachabilityDistance.hpp
diff --git a/src/details/ArborX_DetailsUnionFind.hpp b/src/cluster/details/ArborX_DetailsUnionFind.hpp
similarity index 100%
rename from src/details/ArborX_DetailsUnionFind.hpp
rename to src/cluster/details/ArborX_DetailsUnionFind.hpp
diff --git a/src/details/ArborX_DetailsWeightedEdge.hpp b/src/cluster/details/ArborX_DetailsWeightedEdge.hpp
similarity index 100%
rename from src/details/ArborX_DetailsWeightedEdge.hpp
rename to src/cluster/details/ArborX_DetailsWeightedEdge.hpp
diff --git a/src/ArborX_DistributedTree.hpp b/src/distributed/ArborX_DistributedTree.hpp
similarity index 100%
rename from src/ArborX_DistributedTree.hpp
rename to src/distributed/ArborX_DistributedTree.hpp
diff --git a/src/details/ArborX_DetailsDistributedTreeImpl.hpp b/src/distributed/details/ArborX_DetailsDistributedTreeImpl.hpp
similarity index 100%
rename from src/details/ArborX_DetailsDistributedTreeImpl.hpp
rename to src/distributed/details/ArborX_DetailsDistributedTreeImpl.hpp
diff --git a/src/details/ArborX_DetailsDistributedTreeNearest.hpp b/src/distributed/details/ArborX_DetailsDistributedTreeNearest.hpp
similarity index 100%
rename from src/details/ArborX_DetailsDistributedTreeNearest.hpp
rename to src/distributed/details/ArborX_DetailsDistributedTreeNearest.hpp
diff --git a/src/details/ArborX_DetailsDistributedTreeNearestHelpers.hpp b/src/distributed/details/ArborX_DetailsDistributedTreeNearestHelpers.hpp
similarity index 100%
rename from src/details/ArborX_DetailsDistributedTreeNearestHelpers.hpp
rename to src/distributed/details/ArborX_DetailsDistributedTreeNearestHelpers.hpp
diff --git a/src/details/ArborX_DetailsDistributedTreeSpatial.hpp b/src/distributed/details/ArborX_DetailsDistributedTreeSpatial.hpp
similarity index 100%
rename from src/details/ArborX_DetailsDistributedTreeSpatial.hpp
rename to src/distributed/details/ArborX_DetailsDistributedTreeSpatial.hpp
diff --git a/src/details/ArborX_DetailsDistributedTreeUtils.hpp b/src/distributed/details/ArborX_DetailsDistributedTreeUtils.hpp
similarity index 100%
rename from src/details/ArborX_DetailsDistributedTreeUtils.hpp
rename to src/distributed/details/ArborX_DetailsDistributedTreeUtils.hpp
diff --git a/src/details/ArborX_DetailsDistributor.hpp b/src/distributed/details/ArborX_DetailsDistributor.hpp
similarity index 100%
rename from src/details/ArborX_DetailsDistributor.hpp
rename to src/distributed/details/ArborX_DetailsDistributor.hpp
diff --git a/src/details/ArborX_DetailsContainers.hpp b/src/misc/ArborX_DetailsContainers.hpp
similarity index 100%
rename from src/details/ArborX_DetailsContainers.hpp
rename to src/misc/ArborX_DetailsContainers.hpp
diff --git a/src/details/ArborX_DetailsHeap.hpp b/src/misc/ArborX_DetailsHeap.hpp
similarity index 100%
rename from src/details/ArborX_DetailsHeap.hpp
rename to src/misc/ArborX_DetailsHeap.hpp
diff --git a/src/details/ArborX_DetailsMortonCode.hpp b/src/misc/ArborX_DetailsMortonCode.hpp
similarity index 100%
rename from src/details/ArborX_DetailsMortonCode.hpp
rename to src/misc/ArborX_DetailsMortonCode.hpp
diff --git a/src/details/ArborX_DetailsOperatorFunctionObjects.hpp b/src/misc/ArborX_DetailsOperatorFunctionObjects.hpp
similarity index 100%
rename from src/details/ArborX_DetailsOperatorFunctionObjects.hpp
rename to src/misc/ArborX_DetailsOperatorFunctionObjects.hpp
diff --git a/src/details/ArborX_DetailsPriorityQueue.hpp b/src/misc/ArborX_DetailsPriorityQueue.hpp
similarity index 100%
rename from src/details/ArborX_DetailsPriorityQueue.hpp
rename to src/misc/ArborX_DetailsPriorityQueue.hpp
diff --git a/src/details/ArborX_DetailsSortUtils.hpp b/src/misc/ArborX_DetailsSortUtils.hpp
similarity index 100%
rename from src/details/ArborX_DetailsSortUtils.hpp
rename to src/misc/ArborX_DetailsSortUtils.hpp
diff --git a/src/details/ArborX_DetailsStack.hpp b/src/misc/ArborX_DetailsStack.hpp
similarity index 100%
rename from src/details/ArborX_DetailsStack.hpp
rename to src/misc/ArborX_DetailsStack.hpp
diff --git a/src/details/ArborX_DetailsUtils.hpp b/src/misc/ArborX_DetailsUtils.hpp
similarity index 100%
rename from src/details/ArborX_DetailsUtils.hpp
rename to src/misc/ArborX_DetailsUtils.hpp
diff --git a/src/details/ArborX_DetailsVector.hpp b/src/misc/ArborX_DetailsVector.hpp
similarity index 100%
rename from src/details/ArborX_DetailsVector.hpp
rename to src/misc/ArborX_DetailsVector.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_SpaceFillingCurves.hpp b/src/misc/ArborX_SpaceFillingCurves.hpp
similarity index 100%
rename from src/details/ArborX_SpaceFillingCurves.hpp
rename to src/misc/ArborX_SpaceFillingCurves.hpp
diff --git a/src/ArborX_BruteForce.hpp b/src/spatial/ArborX_BruteForce.hpp
similarity index 100%
rename from src/ArborX_BruteForce.hpp
rename to src/spatial/ArborX_BruteForce.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 100%
rename from src/ArborX_LinearBVH.hpp
rename to src/spatial/ArborX_LinearBVH.hpp
diff --git a/src/details/ArborX_AccessTraits.hpp b/src/spatial/details/ArborX_AccessTraits.hpp
similarity index 100%
rename from src/details/ArborX_AccessTraits.hpp
rename to src/spatial/details/ArborX_AccessTraits.hpp
diff --git a/src/details/ArborX_AttachIndices.hpp b/src/spatial/details/ArborX_AttachIndices.hpp
similarity index 100%
rename from src/details/ArborX_AttachIndices.hpp
rename to src/spatial/details/ArborX_AttachIndices.hpp
diff --git a/src/details/ArborX_Callbacks.hpp b/src/spatial/details/ArborX_Callbacks.hpp
similarity index 100%
rename from src/details/ArborX_Callbacks.hpp
rename to src/spatial/details/ArborX_Callbacks.hpp
diff --git a/src/details/ArborX_DetailsBatchedQueries.hpp b/src/spatial/details/ArborX_DetailsBatchedQueries.hpp
similarity index 100%
rename from src/details/ArborX_DetailsBatchedQueries.hpp
rename to src/spatial/details/ArborX_DetailsBatchedQueries.hpp
diff --git a/src/details/ArborX_DetailsBruteForceImpl.hpp b/src/spatial/details/ArborX_DetailsBruteForceImpl.hpp
similarity index 100%
rename from src/details/ArborX_DetailsBruteForceImpl.hpp
rename to src/spatial/details/ArborX_DetailsBruteForceImpl.hpp
diff --git a/src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp b/src/spatial/details/ArborX_DetailsCrsGraphWrapperImpl.hpp
similarity index 100%
rename from src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp
rename to src/spatial/details/ArborX_DetailsCrsGraphWrapperImpl.hpp
diff --git a/src/details/ArborX_DetailsExpandHalfToFull.hpp b/src/spatial/details/ArborX_DetailsExpandHalfToFull.hpp
similarity index 100%
rename from src/details/ArborX_DetailsExpandHalfToFull.hpp
rename to src/spatial/details/ArborX_DetailsExpandHalfToFull.hpp
diff --git a/src/details/ArborX_DetailsHalfTraversal.hpp b/src/spatial/details/ArborX_DetailsHalfTraversal.hpp
similarity index 100%
rename from src/details/ArborX_DetailsHalfTraversal.hpp
rename to src/spatial/details/ArborX_DetailsHalfTraversal.hpp
diff --git a/src/details/ArborX_DetailsHappyTreeFriends.hpp b/src/spatial/details/ArborX_DetailsHappyTreeFriends.hpp
similarity index 100%
rename from src/details/ArborX_DetailsHappyTreeFriends.hpp
rename to src/spatial/details/ArborX_DetailsHappyTreeFriends.hpp
diff --git a/src/details/ArborX_DetailsNearestBufferProvider.hpp b/src/spatial/details/ArborX_DetailsNearestBufferProvider.hpp
similarity index 100%
rename from src/details/ArborX_DetailsNearestBufferProvider.hpp
rename to src/spatial/details/ArborX_DetailsNearestBufferProvider.hpp
diff --git a/src/details/ArborX_DetailsNode.hpp b/src/spatial/details/ArborX_DetailsNode.hpp
similarity index 100%
rename from src/details/ArborX_DetailsNode.hpp
rename to src/spatial/details/ArborX_DetailsNode.hpp
diff --git a/src/details/ArborX_DetailsPermutedData.hpp b/src/spatial/details/ArborX_DetailsPermutedData.hpp
similarity index 100%
rename from src/details/ArborX_DetailsPermutedData.hpp
rename to src/spatial/details/ArborX_DetailsPermutedData.hpp
diff --git a/src/details/ArborX_DetailsTreeConstruction.hpp b/src/spatial/details/ArborX_DetailsTreeConstruction.hpp
similarity index 100%
rename from src/details/ArborX_DetailsTreeConstruction.hpp
rename to src/spatial/details/ArborX_DetailsTreeConstruction.hpp
diff --git a/src/details/ArborX_DetailsTreeNodeLabeling.hpp b/src/spatial/details/ArborX_DetailsTreeNodeLabeling.hpp
similarity index 100%
rename from src/details/ArborX_DetailsTreeNodeLabeling.hpp
rename to src/spatial/details/ArborX_DetailsTreeNodeLabeling.hpp
diff --git a/src/details/ArborX_DetailsTreeTraversal.hpp b/src/spatial/details/ArborX_DetailsTreeTraversal.hpp
similarity index 100%
rename from src/details/ArborX_DetailsTreeTraversal.hpp
rename to src/spatial/details/ArborX_DetailsTreeTraversal.hpp
diff --git a/src/details/ArborX_DetailsTreeVisualization.hpp b/src/spatial/details/ArborX_DetailsTreeVisualization.hpp
similarity index 100%
rename from src/details/ArborX_DetailsTreeVisualization.hpp
rename to src/spatial/details/ArborX_DetailsTreeVisualization.hpp
diff --git a/src/details/ArborX_IndexableGetter.hpp b/src/spatial/details/ArborX_IndexableGetter.hpp
similarity index 100%
rename from src/details/ArborX_IndexableGetter.hpp
rename to src/spatial/details/ArborX_IndexableGetter.hpp
diff --git a/src/details/ArborX_NeighborList.hpp b/src/spatial/details/ArborX_NeighborList.hpp
similarity index 100%
rename from src/details/ArborX_NeighborList.hpp
rename to src/spatial/details/ArborX_NeighborList.hpp
diff --git a/src/details/ArborX_PairValueIndex.hpp b/src/spatial/details/ArborX_PairValueIndex.hpp
similarity index 100%
rename from src/details/ArborX_PairValueIndex.hpp
rename to src/spatial/details/ArborX_PairValueIndex.hpp
diff --git a/src/details/ArborX_PredicateHelpers.hpp b/src/spatial/details/ArborX_PredicateHelpers.hpp
similarity index 100%
rename from src/details/ArborX_PredicateHelpers.hpp
rename to src/spatial/details/ArborX_PredicateHelpers.hpp
diff --git a/src/details/ArborX_Predicates.hpp b/src/spatial/details/ArborX_Predicates.hpp
similarity index 100%
rename from src/details/ArborX_Predicates.hpp
rename to src/spatial/details/ArborX_Predicates.hpp
diff --git a/src/details/ArborX_TraversalPolicy.hpp b/src/spatial/details/ArborX_TraversalPolicy.hpp
similarity index 100%
rename from src/details/ArborX_TraversalPolicy.hpp
rename to src/spatial/details/ArborX_TraversalPolicy.hpp