diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85e27fa9..65ea546d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,9 +182,6 @@ endif()
 install(DIRECTORY include/mdspan DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 if (MDSPAN_INSTALL_STDMODE_HEADERS)
   install(DIRECTORY include/experimental DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-else()
-  install(DIRECTORY include/experimental DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-          REGEX "/mdspan$|/mdarray$" EXCLUDE)
 endif()
 
 include(CMakePackageConfigHelpers)
diff --git a/include/experimental/__p0009_bits/compressed_pair.hpp b/include/mdspan/impl/compressed_pair.hpp
similarity index 100%
rename from include/experimental/__p0009_bits/compressed_pair.hpp
rename to include/mdspan/impl/compressed_pair.hpp
diff --git a/include/experimental/__p0009_bits/config.hpp b/include/mdspan/impl/config.hpp
similarity index 100%
rename from include/experimental/__p0009_bits/config.hpp
rename to include/mdspan/impl/config.hpp
diff --git a/include/experimental/__p2630_bits/constant_wrapper.hpp b/include/mdspan/impl/constant_wrapper.hpp
similarity index 99%
rename from include/experimental/__p2630_bits/constant_wrapper.hpp
rename to include/mdspan/impl/constant_wrapper.hpp
index ae686285..5cf9755f 100644
--- a/include/experimental/__p2630_bits/constant_wrapper.hpp
+++ b/include/mdspan/impl/constant_wrapper.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../__p0009_bits/utility.hpp"
+#include "utility.hpp"
 #include <type_traits>
 
 namespace MDSPAN_IMPL_STANDARD_NAMESPACE {
diff --git a/include/experimental/__p0009_bits/default_accessor.hpp b/include/mdspan/impl/default_accessor.hpp
similarity index 100%
rename from include/experimental/__p0009_bits/default_accessor.hpp
rename to include/mdspan/impl/default_accessor.hpp
diff --git a/include/experimental/__p2389_bits/dims.hpp b/include/mdspan/impl/dims.hpp
similarity index 100%
rename from include/experimental/__p2389_bits/dims.hpp
rename to include/mdspan/impl/dims.hpp
diff --git a/include/experimental/__p0009_bits/dynamic_extent.hpp b/include/mdspan/impl/dynamic_extent.hpp
similarity index 100%
rename from include/experimental/__p0009_bits/dynamic_extent.hpp
rename to include/mdspan/impl/dynamic_extent.hpp
diff --git a/include/experimental/__p0009_bits/extents.hpp b/include/mdspan/impl/extents.hpp
similarity index 100%
rename from include/experimental/__p0009_bits/extents.hpp
rename to include/mdspan/impl/extents.hpp
diff --git a/include/experimental/__p0009_bits/full_extent_t.hpp b/include/mdspan/impl/full_extent_t.hpp
similarity index 100%
rename from include/experimental/__p0009_bits/full_extent_t.hpp
rename to include/mdspan/impl/full_extent_t.hpp
diff --git a/include/experimental/__p2630_bits/integral_constant_like.hpp b/include/mdspan/impl/integral_constant_like.hpp
similarity index 99%
rename from include/experimental/__p2630_bits/integral_constant_like.hpp
rename to include/mdspan/impl/integral_constant_like.hpp
index 5acdb4b7..5c0b84ce 100644
--- a/include/experimental/__p2630_bits/integral_constant_like.hpp
+++ b/include/mdspan/impl/integral_constant_like.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../__p0009_bits/utility.hpp"
+#include "utility.hpp"
 #include <type_traits>
 #if defined(__cpp_lib_concepts)
 #  include <concepts>
diff --git a/include/experimental/__p0009_bits/layout_left.hpp b/include/mdspan/impl/layout_left.hpp
similarity index 99%
rename from include/experimental/__p0009_bits/layout_left.hpp
rename to include/mdspan/impl/layout_left.hpp
index 4b767353..87d0bdbd 100644
--- a/include/experimental/__p0009_bits/layout_left.hpp
+++ b/include/mdspan/impl/layout_left.hpp
@@ -9,7 +9,7 @@
 #include "layout_stride.hpp"
 #include "utility.hpp"
 #if MDSPAN_HAS_CXX_17
-#include "../__p2642_bits/layout_padded_fwd.hpp"
+#include "layout_padded_fwd.hpp"
 #endif
 #include <type_traits>
 
diff --git a/include/experimental/__p2642_bits/layout_padded.hpp b/include/mdspan/impl/layout_padded.hpp
similarity index 99%
rename from include/experimental/__p2642_bits/layout_padded.hpp
rename to include/mdspan/impl/layout_padded.hpp
index 0ced8053..77659ddd 100644
--- a/include/experimental/__p2642_bits/layout_padded.hpp
+++ b/include/mdspan/impl/layout_padded.hpp
@@ -5,13 +5,13 @@
 
 #include <cassert>
 #include "layout_padded_fwd.hpp"
-#include "../__p0009_bits/dynamic_extent.hpp"
-#include "../__p0009_bits/extents.hpp"
-#include "../__p0009_bits/mdspan.hpp"
-#include "../__p0009_bits/layout_left.hpp"
-#include "../__p0009_bits/layout_right.hpp"
-#include "../__p0009_bits/layout_stride.hpp"
-#include "../__p0009_bits/utility.hpp"
+#include "dynamic_extent.hpp"
+#include "extents.hpp"
+#include "mdspan.hpp"
+#include "layout_left.hpp"
+#include "layout_right.hpp"
+#include "layout_stride.hpp"
+#include "utility.hpp"
 
 namespace MDSPAN_IMPL_STANDARD_NAMESPACE {
 namespace detail {
diff --git a/include/experimental/__p2642_bits/layout_padded_fwd.hpp b/include/mdspan/impl/layout_padded_fwd.hpp
similarity index 98%
rename from include/experimental/__p2642_bits/layout_padded_fwd.hpp
rename to include/mdspan/impl/layout_padded_fwd.hpp
index 65312061..c633e63c 100644
--- a/include/experimental/__p2642_bits/layout_padded_fwd.hpp
+++ b/include/mdspan/impl/layout_padded_fwd.hpp
@@ -4,8 +4,8 @@
 #pragma once
 
 #include <cassert>
-#include "../__p0009_bits/dynamic_extent.hpp"
-#include "../__p0009_bits/utility.hpp"
+#include "dynamic_extent.hpp"
+#include "utility.hpp"
 
 namespace MDSPAN_IMPL_STANDARD_NAMESPACE {
 
diff --git a/include/experimental/__p0009_bits/layout_right.hpp b/include/mdspan/impl/layout_right.hpp
similarity index 99%
rename from include/experimental/__p0009_bits/layout_right.hpp
rename to include/mdspan/impl/layout_right.hpp
index 4ef1c225..73c92f3e 100644
--- a/include/experimental/__p0009_bits/layout_right.hpp
+++ b/include/mdspan/impl/layout_right.hpp
@@ -9,7 +9,7 @@
 #include "layout_stride.hpp"
 #include "utility.hpp"
 #if MDSPAN_HAS_CXX_17
-#include "../__p2642_bits/layout_padded_fwd.hpp"
+#include "layout_padded_fwd.hpp"
 #endif
 
 namespace MDSPAN_IMPL_STANDARD_NAMESPACE {
diff --git a/include/experimental/__p0009_bits/layout_stride.hpp b/include/mdspan/impl/layout_stride.hpp
similarity index 99%
rename from include/experimental/__p0009_bits/layout_stride.hpp
rename to include/mdspan/impl/layout_stride.hpp
index d14513cd..3b50e3a5 100644
--- a/include/experimental/__p0009_bits/layout_stride.hpp
+++ b/include/mdspan/impl/layout_stride.hpp
@@ -10,7 +10,7 @@
 #include "utility.hpp"
 
 #if MDSPAN_HAS_CXX_17
-#include "../__p2642_bits/layout_padded_fwd.hpp"
+#include "layout_padded_fwd.hpp"
 #endif
 
 #if !defined(MDSPAN_IMPL_USE_ATTRIBUTE_NO_UNIQUE_ADDRESS)
diff --git a/include/experimental/__p0009_bits/macros.hpp b/include/mdspan/impl/macros.hpp
similarity index 100%
rename from include/experimental/__p0009_bits/macros.hpp
rename to include/mdspan/impl/macros.hpp
diff --git a/include/experimental/__p1684_bits/mdarray.hpp b/include/mdspan/impl/mdarray.hpp
similarity index 99%
rename from include/experimental/__p1684_bits/mdarray.hpp
rename to include/mdspan/impl/mdarray.hpp
index 7d2a55f1..34b7c62a 100644
--- a/include/experimental/__p1684_bits/mdarray.hpp
+++ b/include/mdspan/impl/mdarray.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../../mdspan/mdspan.hpp"
+#include "mdspan.hpp"
 #include <cassert>
 #include <vector>
 
diff --git a/include/experimental/__p0009_bits/mdspan.hpp b/include/mdspan/impl/mdspan.hpp
similarity index 100%
rename from include/experimental/__p0009_bits/mdspan.hpp
rename to include/mdspan/impl/mdspan.hpp
diff --git a/include/experimental/__p0009_bits/no_unique_address.hpp b/include/mdspan/impl/no_unique_address.hpp
similarity index 100%
rename from include/experimental/__p0009_bits/no_unique_address.hpp
rename to include/mdspan/impl/no_unique_address.hpp
diff --git a/include/experimental/__p2630_bits/strided_slice.hpp b/include/mdspan/impl/strided_slice.hpp
similarity index 98%
rename from include/experimental/__p2630_bits/strided_slice.hpp
rename to include/mdspan/impl/strided_slice.hpp
index 57ca5aba..c1dcd8a5 100644
--- a/include/experimental/__p2630_bits/strided_slice.hpp
+++ b/include/mdspan/impl/strided_slice.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "../__p0009_bits/config.hpp"
+#include "config.hpp"
 #include "constant_wrapper.hpp"
 #include "integral_constant_like.hpp"
 
diff --git a/include/experimental/__p2630_bits/submdspan.hpp b/include/mdspan/impl/submdspan.hpp
similarity index 100%
rename from include/experimental/__p2630_bits/submdspan.hpp
rename to include/mdspan/impl/submdspan.hpp
diff --git a/include/experimental/__p2630_bits/submdspan_canonicalize_slices.hpp b/include/mdspan/impl/submdspan_canonicalize_slices.hpp
similarity index 100%
rename from include/experimental/__p2630_bits/submdspan_canonicalize_slices.hpp
rename to include/mdspan/impl/submdspan_canonicalize_slices.hpp
diff --git a/include/experimental/__p2630_bits/submdspan_extents.hpp b/include/mdspan/impl/submdspan_extents.hpp
similarity index 99%
rename from include/experimental/__p2630_bits/submdspan_extents.hpp
rename to include/mdspan/impl/submdspan_extents.hpp
index 8cf85ab8..f19d2e2b 100644
--- a/include/experimental/__p2630_bits/submdspan_extents.hpp
+++ b/include/mdspan/impl/submdspan_extents.hpp
@@ -7,8 +7,8 @@
 
 #include "constant_wrapper.hpp"
 #include "strided_slice.hpp"
-#include "../__p0009_bits/utility.hpp"
 #include "submdspan_canonicalize_slices.hpp"
+#include "utility.hpp"
 
 namespace MDSPAN_IMPL_STANDARD_NAMESPACE {
 namespace detail {
diff --git a/include/experimental/__p2630_bits/submdspan_mapping.hpp b/include/mdspan/impl/submdspan_mapping.hpp
similarity index 99%
rename from include/experimental/__p2630_bits/submdspan_mapping.hpp
rename to include/mdspan/impl/submdspan_mapping.hpp
index e6916006..00041b4f 100644
--- a/include/experimental/__p2630_bits/submdspan_mapping.hpp
+++ b/include/mdspan/impl/submdspan_mapping.hpp
@@ -6,7 +6,7 @@
 #include <array>
 #include <type_traits>
 #include <utility> // index_sequence
-#include "../__p0009_bits/utility.hpp"
+#include "utility.hpp"
 
 // Suppress spurious warning with NVCC about no return statement.
 // This is a known issue in NVCC and NVC++
diff --git a/include/experimental/__p0009_bits/trait_backports.hpp b/include/mdspan/impl/trait_backports.hpp
similarity index 100%
rename from include/experimental/__p0009_bits/trait_backports.hpp
rename to include/mdspan/impl/trait_backports.hpp
diff --git a/include/experimental/__p0009_bits/type_list.hpp b/include/mdspan/impl/type_list.hpp
similarity index 100%
rename from include/experimental/__p0009_bits/type_list.hpp
rename to include/mdspan/impl/type_list.hpp
diff --git a/include/experimental/__p0009_bits/utility.hpp b/include/mdspan/impl/utility.hpp
similarity index 100%
rename from include/experimental/__p0009_bits/utility.hpp
rename to include/mdspan/impl/utility.hpp
diff --git a/include/mdspan/mdarray.hpp b/include/mdspan/mdarray.hpp
index 584605aa..95e8ec65 100644
--- a/include/mdspan/mdarray.hpp
+++ b/include/mdspan/mdarray.hpp
@@ -13,6 +13,6 @@
 #endif
 
 #include "mdspan.hpp"
-#include "../experimental/__p1684_bits/mdarray.hpp"
+#include "impl/mdarray.hpp"
 
 #endif // MDARRAY_HPP_
diff --git a/include/mdspan/mdspan.hpp b/include/mdspan/mdspan.hpp
index a437c423..1aeb949a 100644
--- a/include/mdspan/mdspan.hpp
+++ b/include/mdspan/mdspan.hpp
@@ -12,19 +12,19 @@
   #define MDSPAN_IMPL_PROPOSED_NAMESPACE Experimental
 #endif
 
-#include "../experimental/__p0009_bits/default_accessor.hpp"
-#include "../experimental/__p0009_bits/full_extent_t.hpp"
-#include "../experimental/__p0009_bits/mdspan.hpp"
-#include "../experimental/__p0009_bits/dynamic_extent.hpp"
-#include "../experimental/__p0009_bits/extents.hpp"
-#include "../experimental/__p0009_bits/layout_stride.hpp"
-#include "../experimental/__p0009_bits/layout_left.hpp"
-#include "../experimental/__p0009_bits/layout_right.hpp"
-#include "../experimental/__p0009_bits/macros.hpp"
+#include "impl/default_accessor.hpp"
+#include "impl/full_extent_t.hpp"
+#include "impl/mdspan.hpp"
+#include "impl/dynamic_extent.hpp"
+#include "impl/extents.hpp"
+#include "impl/layout_stride.hpp"
+#include "impl/layout_left.hpp"
+#include "impl/layout_right.hpp"
+#include "impl/macros.hpp"
 #if MDSPAN_HAS_CXX_17
-#include "../experimental/__p2642_bits/layout_padded.hpp"
-#include "../experimental/__p2630_bits/submdspan.hpp"
+#include "impl/layout_padded.hpp"
+#include "impl/submdspan.hpp"
 #endif
-#include "../experimental/__p2389_bits/dims.hpp"
+#include "impl/dims.hpp"
 
 #endif // MDSPAN_HPP_
diff --git a/tests/test_constant_wrapper.cpp b/tests/test_constant_wrapper.cpp
index c9db4fad..3f145f09 100644
--- a/tests/test_constant_wrapper.cpp
+++ b/tests/test_constant_wrapper.cpp
@@ -4,7 +4,7 @@
 #include <type_traits>
 #include <gtest/gtest.h>
 
-#include "../include/experimental/__p2630_bits/constant_wrapper.hpp"
+#include "mdspan/impl/constant_wrapper.hpp"
 
 namespace { // (anonymous)