diff --git a/benchmark/functor/fmap/mpl_list.cpp b/benchmark/functor/fmap/mpl_list.cpp
index 5b7e530dd..212705b00 100644
--- a/benchmark/functor/fmap/mpl_list.cpp
+++ b/benchmark/functor/fmap/mpl_list.cpp
@@ -1,4 +1,4 @@
-#include <boost/hana/adapted/mpl_list.hpp>
+#include <boost/hana/ext/mpl/list.hpp>
 #include <boost/hana/type.hpp>
 
 <% list = Benchcc::MPL::List.new((0...x).map { |i| "x<#{i}>" }) %>
diff --git a/benchmark/functor/fmap/mpl_vector.cpp b/benchmark/functor/fmap/mpl_vector.cpp
index 7dcf8cc08..e7deff69a 100644
--- a/benchmark/functor/fmap/mpl_vector.cpp
+++ b/benchmark/functor/fmap/mpl_vector.cpp
@@ -1,4 +1,4 @@
-#include <boost/hana/adapted/mpl_vector.hpp>
+#include <boost/hana/ext/mpl/vector.hpp>
 #include <boost/hana/type.hpp>
 
 <% vector = Benchcc::MPL::Vector.new((0...x).map { |i| "x<#{i}>" }) %>
diff --git a/benchmark/functor/fmap/std_tuple.cpp b/benchmark/functor/fmap/std_tuple.cpp
index 62e003a4e..71606fa60 100644
--- a/benchmark/functor/fmap/std_tuple.cpp
+++ b/benchmark/functor/fmap/std_tuple.cpp
@@ -1,4 +1,4 @@
-#include <boost/hana/adapted/std_tuple.hpp>
+#include <boost/hana/ext/std/tuple.hpp>
 
 
 template <typename X>
diff --git a/benchmark/list/permutations/std_tuple.cpp b/benchmark/list/permutations/std_tuple.cpp
index c9476fbb2..4c7dffb12 100644
--- a/benchmark/list/permutations/std_tuple.cpp
+++ b/benchmark/list/permutations/std_tuple.cpp
@@ -1,4 +1,4 @@
-#include <boost/hana/adapted/std_tuple.hpp>
+#include <boost/hana/ext/std/tuple.hpp>
 #include <boost/hana/list.hpp>
 
 #include <tuple>
diff --git a/example/core/convert.cpp b/example/core/convert.cpp
index d2930d9a7..5bba0e2d5 100644
--- a/example/core/convert.cpp
+++ b/example/core/convert.cpp
@@ -4,9 +4,9 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_list.hpp>
 #include <boost/hana/comparable.hpp>
 #include <boost/hana/core.hpp>
+#include <boost/hana/ext/std/list.hpp>
 #include <boost/hana/list.hpp>
 
 #include <cassert>
diff --git a/example/core/disable.cpp b/example/core/disable.cpp
index 8b466a7d8..9d3e6f290 100644
--- a/example/core/disable.cpp
+++ b/example/core/disable.cpp
@@ -4,9 +4,10 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_tuple.hpp>
 #include <boost/hana/core.hpp>
 #include <boost/hana/detail/static_assert.hpp>
+#include <boost/hana/ext/std/tuple.hpp>
+#include <boost/hana/list.hpp>
 using namespace boost::hana;
 
 
@@ -16,5 +17,7 @@ namespace boost { namespace hana {
 }}
 
 int main() {
+    // Usually, List should provide Foldable.
+    BOOST_HANA_STATIC_ASSERT(instantiates<List, StdTuple>);
     BOOST_HANA_STATIC_ASSERT(!instantiates<Foldable, StdTuple>);
 }
diff --git a/example/core/is_a.cpp b/example/core/is_a.cpp
index a7fa2a06f..66063e170 100644
--- a/example/core/is_a.cpp
+++ b/example/core/is_a.cpp
@@ -4,10 +4,10 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_tuple.hpp>
 #include <boost/hana/bool.hpp>
 #include <boost/hana/core.hpp>
 #include <boost/hana/detail/constexpr.hpp>
+#include <boost/hana/ext/std/tuple.hpp>
 #include <boost/hana/integral.hpp>
 #include <boost/hana/iterable.hpp>
 #include <boost/hana/list.hpp>
diff --git a/example/integer_list/take_until.cpp b/example/integer_list/take_until.cpp
index 3bc139108..d1cbcac09 100644
--- a/example/integer_list/take_until.cpp
+++ b/example/integer_list/take_until.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
 #include <boost/hana/detail/static_assert.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 #include <boost/hana/functional.hpp>
 #include <boost/hana/integer_list.hpp>
 #include <boost/hana/integral.hpp>
diff --git a/example/integral/logical/eval_if.cpp b/example/integral/logical/eval_if.cpp
index 1bb48d3d3..93e436f62 100644
--- a/example/integral/logical/eval_if.cpp
+++ b/example/integral/logical/eval_if.cpp
@@ -4,9 +4,9 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/static_assert.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 #include <boost/hana/functional.hpp>
 #include <boost/hana/type.hpp>
 
diff --git a/example/list/filter.cpp b/example/list/filter.cpp
index 649781e24..70ea50036 100644
--- a/example/list/filter.cpp
+++ b/example/list/filter.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
 #include <boost/hana/detail/static_assert.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 #include <boost/hana/list.hpp>
 #include <boost/hana/type.hpp>
 
diff --git a/example/list/foldable/find.cpp b/example/list/foldable/find.cpp
index cd42a8f85..ca655cf97 100644
--- a/example/list/foldable/find.cpp
+++ b/example/list/foldable/find.cpp
@@ -4,9 +4,9 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/static_assert.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 #include <boost/hana/list.hpp>
 #include <boost/hana/maybe.hpp>
 #include <boost/hana/type.hpp>
diff --git a/example/list/into.cpp b/example/list/into.cpp
index 701729f4f..bcd48e36a 100644
--- a/example/list/into.cpp
+++ b/example/list/into.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_tuple.hpp>
 #include <boost/hana/detail/static_assert.hpp>
+#include <boost/hana/ext/std/tuple.hpp>
 #include <boost/hana/list.hpp>
 #include <boost/hana/maybe.hpp>
 
diff --git a/example/list/to.cpp b/example/list/to.cpp
index 5eb64b7a8..11c2bae0e 100644
--- a/example/list/to.cpp
+++ b/example/list/to.cpp
@@ -4,9 +4,9 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_array.hpp>
-#include <boost/hana/adapted/std_tuple.hpp>
 #include <boost/hana/detail/static_assert.hpp>
+#include <boost/hana/ext/std/array.hpp>
+#include <boost/hana/ext/std/tuple.hpp>
 #include <boost/hana/integral.hpp>
 #include <boost/hana/list.hpp>
 #include <boost/hana/range.hpp>
diff --git a/example/type/trait.cpp b/example/type/trait.cpp
index 5323624ad..f272ad9e1 100644
--- a/example/type/trait.cpp
+++ b/example/type/trait.cpp
@@ -4,9 +4,9 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/static_assert.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 #include <boost/hana/integral.hpp>
 #include <boost/hana/type.hpp>
 
diff --git a/example/type/trait_.cpp b/example/type/trait_.cpp
index 118ee0f19..752794777 100644
--- a/example/type/trait_.cpp
+++ b/example/type/trait_.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
 #include <boost/hana/detail/static_assert.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 #include <boost/hana/type.hpp>
 
 #include <type_traits>
diff --git a/example/type_list/foldable/count.cpp b/example/type_list/foldable/count.cpp
index 9a9bb48e7..97f62de33 100644
--- a/example/type_list/foldable/count.cpp
+++ b/example/type_list/foldable/count.cpp
@@ -4,9 +4,9 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/static_assert.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 #include <boost/hana/functional.hpp>
 #include <boost/hana/integral.hpp>
 #include <boost/hana/type.hpp>
diff --git a/example/type_list/foldable/foldl.cpp b/example/type_list/foldable/foldl.cpp
index f63fc1b4e..8f13b5aa8 100644
--- a/example/type_list/foldable/foldl.cpp
+++ b/example/type_list/foldable/foldl.cpp
@@ -4,9 +4,9 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/static_assert.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 #include <boost/hana/integral.hpp>
 #include <boost/hana/type.hpp>
 #include <boost/hana/type_list.hpp>
diff --git a/example/type_list/partition.cpp b/example/type_list/partition.cpp
index ee570c53a..a1cdf7489 100644
--- a/example/type_list/partition.cpp
+++ b/example/type_list/partition.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
 #include <boost/hana/detail/static_assert.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 #include <boost/hana/pair.hpp>
 #include <boost/hana/type.hpp>
 #include <boost/hana/type_list.hpp>
diff --git a/example/type_list/take_until.cpp b/example/type_list/take_until.cpp
index 2d5d08be0..5d1ee8de6 100644
--- a/example/type_list/take_until.cpp
+++ b/example/type_list/take_until.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
 #include <boost/hana/detail/static_assert.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 #include <boost/hana/type.hpp>
 #include <boost/hana/type_list.hpp>
 
diff --git a/example/type_list/take_while.cpp b/example/type_list/take_while.cpp
index e28f4ffde..ac64dffec 100644
--- a/example/type_list/take_while.cpp
+++ b/example/type_list/take_while.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
 #include <boost/hana/detail/static_assert.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 #include <boost/hana/type.hpp>
 #include <boost/hana/type_list.hpp>
 
diff --git a/include/boost/hana.hpp b/include/boost/hana.hpp
index 392bd3dc7..8fcdea285 100644
--- a/include/boost/hana.hpp
+++ b/include/boost/hana.hpp
@@ -27,18 +27,18 @@ Distributed under the Boost Software License, Version 1.0.
 //! @defgroup datatypes Data types
 //! General purpose data types provided by the library.
 
-#include <boost/hana/adapted/mpl_list.hpp>
-#include <boost/hana/adapted/mpl_vector.hpp>
-#include <boost/hana/adapted/std_array.hpp>
-#include <boost/hana/adapted/std_integer_sequence.hpp>
-#include <boost/hana/adapted/std_integral_constant.hpp>
-#include <boost/hana/adapted/std_list.hpp>
-#include <boost/hana/adapted/std_pair.hpp>
-#include <boost/hana/adapted/std_tuple.hpp>
 #include <boost/hana/applicative.hpp>
 #include <boost/hana/bool.hpp>
 #include <boost/hana/comparable.hpp>
 #include <boost/hana/core.hpp>
+#include <boost/hana/ext/mpl/list.hpp>
+#include <boost/hana/ext/mpl/vector.hpp>
+#include <boost/hana/ext/std/array.hpp>
+#include <boost/hana/ext/std/integer_sequence.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
+#include <boost/hana/ext/std/list.hpp>
+#include <boost/hana/ext/std/pair.hpp>
+#include <boost/hana/ext/std/tuple.hpp>
 #include <boost/hana/foldable.hpp>
 #include <boost/hana/functional.hpp>
 #include <boost/hana/functor.hpp>
diff --git a/include/boost/hana/adapted/mpl_list.hpp b/include/boost/hana/ext/mpl/list.hpp
similarity index 93%
rename from include/boost/hana/adapted/mpl_list.hpp
rename to include/boost/hana/ext/mpl/list.hpp
index db7778c7e..6d820a75d 100644
--- a/include/boost/hana/adapted/mpl_list.hpp
+++ b/include/boost/hana/ext/mpl/list.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_ADAPTED_MPL_LIST_HPP
-#define BOOST_HANA_ADAPTED_MPL_LIST_HPP
+#ifndef BOOST_HANA_EXT_MPL_LIST_HPP
+#define BOOST_HANA_EXT_MPL_LIST_HPP
 
 #include <boost/hana/bool.hpp>
 #include <boost/hana/comparable.hpp>
@@ -63,4 +63,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_ADAPTED_MPL_LIST_HPP
+#endif // !BOOST_HANA_EXT_MPL_LIST_HPP
diff --git a/include/boost/hana/adapted/mpl_vector.hpp b/include/boost/hana/ext/mpl/vector.hpp
similarity index 93%
rename from include/boost/hana/adapted/mpl_vector.hpp
rename to include/boost/hana/ext/mpl/vector.hpp
index efbcb4aa2..b550d2e16 100644
--- a/include/boost/hana/adapted/mpl_vector.hpp
+++ b/include/boost/hana/ext/mpl/vector.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_ADAPTED_MPL_VECTOR_HPP
-#define BOOST_HANA_ADAPTED_MPL_VECTOR_HPP
+#ifndef BOOST_HANA_EXT_MPL_VECTOR_HPP
+#define BOOST_HANA_EXT_MPL_VECTOR_HPP
 
 #include <boost/hana/bool.hpp>
 #include <boost/hana/comparable.hpp>
@@ -63,4 +63,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_ADAPTED_MPL_VECTOR_HPP
+#endif // !BOOST_HANA_EXT_MPL_VECTOR_HPP
diff --git a/include/boost/hana/adapted/std_array.hpp b/include/boost/hana/ext/std/array.hpp
similarity index 94%
rename from include/boost/hana/adapted/std_array.hpp
rename to include/boost/hana/ext/std/array.hpp
index 0f25b7e42..85822d1e7 100644
--- a/include/boost/hana/adapted/std_array.hpp
+++ b/include/boost/hana/ext/std/array.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_ADAPTED_STD_ARRAY_HPP
-#define BOOST_HANA_ADAPTED_STD_ARRAY_HPP
+#ifndef BOOST_HANA_EXT_STD_ARRAY_HPP
+#define BOOST_HANA_EXT_STD_ARRAY_HPP
 
 #include <boost/hana/bool.hpp>
 #include <boost/hana/core.hpp>
@@ -74,4 +74,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_ADAPTED_STD_ARRAY_HPP
+#endif // !BOOST_HANA_EXT_STD_ARRAY_HPP
diff --git a/include/boost/hana/adapted/std_integer_sequence.hpp b/include/boost/hana/ext/std/integer_sequence.hpp
similarity index 86%
rename from include/boost/hana/adapted/std_integer_sequence.hpp
rename to include/boost/hana/ext/std/integer_sequence.hpp
index 3dce00d39..458f64a29 100644
--- a/include/boost/hana/adapted/std_integer_sequence.hpp
+++ b/include/boost/hana/ext/std/integer_sequence.hpp
@@ -7,13 +7,13 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_ADAPTED_STD_INTEGER_SEQUENCE_HPP
-#define BOOST_HANA_ADAPTED_STD_INTEGER_SEQUENCE_HPP
+#ifndef BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_HPP
+#define BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_HPP
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
 #include <boost/hana/bool.hpp>
 #include <boost/hana/comparable.hpp>
 #include <boost/hana/core.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 #include <boost/hana/iterable.hpp>
 
 #include <type_traits>
@@ -49,4 +49,4 @@ namespace boost { namespace hana {
     { };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_ADAPTED_STD_INTEGER_SEQUENCE_HPP
+#endif // !BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_HPP
diff --git a/include/boost/hana/adapted/std_integral_constant.hpp b/include/boost/hana/ext/std/integral_constant.hpp
similarity index 84%
rename from include/boost/hana/adapted/std_integral_constant.hpp
rename to include/boost/hana/ext/std/integral_constant.hpp
index 20c13ff49..74798921d 100644
--- a/include/boost/hana/adapted/std_integral_constant.hpp
+++ b/include/boost/hana/ext/std/integral_constant.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_ADAPTED_STD_INTEGRAL_CONSTANT_HPP
-#define BOOST_HANA_ADAPTED_STD_INTEGRAL_CONSTANT_HPP
+#ifndef BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_HPP
+#define BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_HPP
 
 #include <boost/hana/core.hpp>
 #include <boost/hana/detail/enable_if.hpp>
@@ -38,4 +38,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_ADAPTED_STD_INTEGRAL_CONSTANT_HPP
+#endif // !BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_HPP
diff --git a/include/boost/hana/adapted/std_list.hpp b/include/boost/hana/ext/std/list.hpp
similarity index 92%
rename from include/boost/hana/adapted/std_list.hpp
rename to include/boost/hana/ext/std/list.hpp
index 02c1860ef..65456adf0 100644
--- a/include/boost/hana/adapted/std_list.hpp
+++ b/include/boost/hana/ext/std/list.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_ADAPTED_STD_LIST_HPP
-#define BOOST_HANA_ADAPTED_STD_LIST_HPP
+#ifndef BOOST_HANA_EXT_STD_LIST_HPP
+#define BOOST_HANA_EXT_STD_LIST_HPP
 
 #include <boost/hana/comparable.hpp>
 #include <boost/hana/core.hpp>
@@ -62,4 +62,4 @@ namespace boost { namespace hana {
     { };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_ADAPTED_STD_LIST_HPP
+#endif // !BOOST_HANA_EXT_STD_LIST_HPP
diff --git a/include/boost/hana/adapted/std_pair.hpp b/include/boost/hana/ext/std/pair.hpp
similarity index 86%
rename from include/boost/hana/adapted/std_pair.hpp
rename to include/boost/hana/ext/std/pair.hpp
index a16d78d36..01af96106 100644
--- a/include/boost/hana/adapted/std_pair.hpp
+++ b/include/boost/hana/ext/std/pair.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_ADAPTED_STD_PAIR_HPP
-#define BOOST_HANA_ADAPTED_STD_PAIR_HPP
+#ifndef BOOST_HANA_EXT_STD_PAIR_HPP
+#define BOOST_HANA_EXT_STD_PAIR_HPP
 
 #include <boost/hana/core.hpp>
 #include <boost/hana/pair.hpp>
@@ -34,4 +34,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_ADAPTED_STD_PAIR_HPP
+#endif // !BOOST_HANA_EXT_STD_PAIR_HPP
diff --git a/include/boost/hana/adapted/std_tuple.hpp b/include/boost/hana/ext/std/tuple.hpp
similarity index 96%
rename from include/boost/hana/adapted/std_tuple.hpp
rename to include/boost/hana/ext/std/tuple.hpp
index a073c5fe4..b47e9dd82 100644
--- a/include/boost/hana/adapted/std_tuple.hpp
+++ b/include/boost/hana/ext/std/tuple.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_ADAPTED_STD_TUPLE_HPP
-#define BOOST_HANA_ADAPTED_STD_TUPLE_HPP
+#ifndef BOOST_HANA_EXT_STD_TUPLE_HPP
+#define BOOST_HANA_EXT_STD_TUPLE_HPP
 
 #include <boost/hana/applicative.hpp>
 #include <boost/hana/bool.hpp>
@@ -98,4 +98,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_ADAPTED_STD_TUPLE_HPP
+#endif // !BOOST_HANA_EXT_STD_TUPLE_HPP
diff --git a/include/boost/hana/type.hpp b/include/boost/hana/type.hpp
index cdbba8540..62eac99d0 100644
--- a/include/boost/hana/type.hpp
+++ b/include/boost/hana/type.hpp
@@ -216,7 +216,7 @@ namespace boost { namespace hana {
     //!
     //! @note
     //! When using `trait` with metafunctions returning `std::integral_constant`s,
-    //! don't forget to include the boost/hana/adapted/std_integral_constant.hpp
+    //! don't forget to include the boost/hana/ext/std/integral_constant.hpp
     //! header!
     template <template <typename ...> class f>
     constexpr type_detail::trait<f> trait{};
diff --git a/test/adapted/mpl_list/comparable/equal.cpp b/test/ext/mpl/list/comparable/equal.cpp
similarity index 95%
rename from test/adapted/mpl_list/comparable/equal.cpp
rename to test/ext/mpl/list/comparable/equal.cpp
index 6295c5fde..1008da6a7 100644
--- a/test/adapted/mpl_list/comparable/equal.cpp
+++ b/test/ext/mpl/list/comparable/equal.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/mpl_list.hpp>
+#include <boost/hana/ext/mpl/list.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 
diff --git a/test/adapted/mpl_list/datatype.cpp b/test/ext/mpl/list/datatype.cpp
similarity index 96%
rename from test/adapted/mpl_list/datatype.cpp
rename to test/ext/mpl/list/datatype.cpp
index 6f46e7b46..37e480918 100644
--- a/test/adapted/mpl_list/datatype.cpp
+++ b/test/ext/mpl/list/datatype.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/mpl_list.hpp>
+#include <boost/hana/ext/mpl/list.hpp>
 
 #include <boost/hana/core.hpp>
 
diff --git a/test/adapted/mpl_list/functor/fmap.cpp b/test/ext/mpl/list/functor/fmap.cpp
similarity index 95%
rename from test/adapted/mpl_list/functor/fmap.cpp
rename to test/ext/mpl/list/functor/fmap.cpp
index 795dfca87..b11c8ebf3 100644
--- a/test/adapted/mpl_list/functor/fmap.cpp
+++ b/test/ext/mpl/list/functor/fmap.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/mpl_list.hpp>
+#include <boost/hana/ext/mpl/list.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 #include <boost/hana/type.hpp>
diff --git a/test/adapted/mpl_list/functor/laws.cpp b/test/ext/mpl/list/functor/laws.cpp
similarity index 95%
rename from test/adapted/mpl_list/functor/laws.cpp
rename to test/ext/mpl/list/functor/laws.cpp
index 8b5d1fc11..567c2c1e6 100644
--- a/test/adapted/mpl_list/functor/laws.cpp
+++ b/test/ext/mpl/list/functor/laws.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/mpl_list.hpp>
+#include <boost/hana/ext/mpl/list.hpp>
 
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/laws.hpp>
diff --git a/test/adapted/mpl_vector/comparable/equal.cpp b/test/ext/mpl/vector/comparable/equal.cpp
similarity index 95%
rename from test/adapted/mpl_vector/comparable/equal.cpp
rename to test/ext/mpl/vector/comparable/equal.cpp
index 82eca543c..0bf4722e8 100644
--- a/test/adapted/mpl_vector/comparable/equal.cpp
+++ b/test/ext/mpl/vector/comparable/equal.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/mpl_vector.hpp>
+#include <boost/hana/ext/mpl/vector.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 
diff --git a/test/adapted/mpl_vector/datatype.cpp b/test/ext/mpl/vector/datatype.cpp
similarity index 96%
rename from test/adapted/mpl_vector/datatype.cpp
rename to test/ext/mpl/vector/datatype.cpp
index 7ef253a98..96ba52920 100644
--- a/test/adapted/mpl_vector/datatype.cpp
+++ b/test/ext/mpl/vector/datatype.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/mpl_vector.hpp>
+#include <boost/hana/ext/mpl/vector.hpp>
 
 #include <boost/hana/core.hpp>
 
diff --git a/test/adapted/mpl_vector/functor/fmap.cpp b/test/ext/mpl/vector/functor/fmap.cpp
similarity index 94%
rename from test/adapted/mpl_vector/functor/fmap.cpp
rename to test/ext/mpl/vector/functor/fmap.cpp
index 75c211b8a..86b03e890 100644
--- a/test/adapted/mpl_vector/functor/fmap.cpp
+++ b/test/ext/mpl/vector/functor/fmap.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/mpl_vector.hpp>
+#include <boost/hana/ext/mpl/vector.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 #include <boost/hana/type.hpp>
diff --git a/test/adapted/mpl_vector/functor/laws.cpp b/test/ext/mpl/vector/functor/laws.cpp
similarity index 95%
rename from test/adapted/mpl_vector/functor/laws.cpp
rename to test/ext/mpl/vector/functor/laws.cpp
index a4ea63f50..fe70947f6 100644
--- a/test/adapted/mpl_vector/functor/laws.cpp
+++ b/test/ext/mpl/vector/functor/laws.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/mpl_vector.hpp>
+#include <boost/hana/ext/mpl/vector.hpp>
 
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/laws.hpp>
diff --git a/test/adapted/std_array/iterable/head.cpp b/test/ext/std/array/iterable/head.cpp
similarity index 92%
rename from test/adapted/std_array/iterable/head.cpp
rename to test/ext/std/array/iterable/head.cpp
index 25bba72c3..4a1ec77f6 100644
--- a/test/adapted/std_array/iterable/head.cpp
+++ b/test/ext/std/array/iterable/head.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_array.hpp>
+#include <boost/hana/ext/std/array.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 
diff --git a/test/adapted/std_array/iterable/is_empty.cpp b/test/ext/std/array/iterable/is_empty.cpp
similarity index 92%
rename from test/adapted/std_array/iterable/is_empty.cpp
rename to test/ext/std/array/iterable/is_empty.cpp
index 8aa69e68e..287509685 100644
--- a/test/adapted/std_array/iterable/is_empty.cpp
+++ b/test/ext/std/array/iterable/is_empty.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_array.hpp>
+#include <boost/hana/ext/std/array.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 
diff --git a/test/adapted/std_array/iterable/tail.cpp b/test/ext/std/array/iterable/tail.cpp
similarity index 93%
rename from test/adapted/std_array/iterable/tail.cpp
rename to test/ext/std/array/iterable/tail.cpp
index 47fac2766..8d78c432e 100644
--- a/test/adapted/std_array/iterable/tail.cpp
+++ b/test/ext/std/array/iterable/tail.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_array.hpp>
+#include <boost/hana/ext/std/array.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 
diff --git a/test/adapted/std_array/list/cons.cpp b/test/ext/std/array/list/cons.cpp
similarity index 94%
rename from test/adapted/std_array/list/cons.cpp
rename to test/ext/std/array/list/cons.cpp
index 120af36d6..6757db82b 100644
--- a/test/adapted/std_array/list/cons.cpp
+++ b/test/ext/std/array/list/cons.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_array.hpp>
+#include <boost/hana/ext/std/array.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 
diff --git a/test/adapted/std_array/list/nil.cpp b/test/ext/std/array/list/nil.cpp
similarity index 92%
rename from test/adapted/std_array/list/nil.cpp
rename to test/ext/std/array/list/nil.cpp
index ad931bbd1..fdb6637ae 100644
--- a/test/adapted/std_array/list/nil.cpp
+++ b/test/ext/std/array/list/nil.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_array.hpp>
+#include <boost/hana/ext/std/array.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 
diff --git a/test/adapted/std_integer_sequence/iterable.cpp b/test/ext/std/integer_sequence/iterable.cpp
similarity index 94%
rename from test/adapted/std_integer_sequence/iterable.cpp
rename to test/ext/std/integer_sequence/iterable.cpp
index 6b039951c..ead7cd85e 100644
--- a/test/adapted/std_integer_sequence/iterable.cpp
+++ b/test/ext/std/integer_sequence/iterable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integer_sequence.hpp>
+#include <boost/hana/ext/std/integer_sequence.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 
diff --git a/test/adapted/std_integral_constant/api.cpp b/test/ext/std/integral_constant/api.cpp
similarity index 95%
rename from test/adapted/std_integral_constant/api.cpp
rename to test/ext/std/integral_constant/api.cpp
index 7865ac0d1..f2d298e0a 100644
--- a/test/adapted/std_integral_constant/api.cpp
+++ b/test/ext/std/integral_constant/api.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 #include <boost/hana/type.hpp>
diff --git a/test/adapted/std_integral_constant/bug_datatype_inheritance.cpp b/test/ext/std/integral_constant/bug_datatype_inheritance.cpp
similarity index 95%
rename from test/adapted/std_integral_constant/bug_datatype_inheritance.cpp
rename to test/ext/std/integral_constant/bug_datatype_inheritance.cpp
index e37943755..3ad94c21c 100644
--- a/test/adapted/std_integral_constant/bug_datatype_inheritance.cpp
+++ b/test/ext/std/integral_constant/bug_datatype_inheritance.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 
 #include <boost/hana/core.hpp>
 
diff --git a/test/adapted/std_integral_constant/integral_interop.cpp b/test/ext/std/integral_constant/integral_interop.cpp
similarity index 90%
rename from test/adapted/std_integral_constant/integral_interop.cpp
rename to test/ext/std/integral_constant/integral_interop.cpp
index 0e0bfffe2..32f4c6314 100644
--- a/test/adapted/std_integral_constant/integral_interop.cpp
+++ b/test/ext/std/integral_constant/integral_interop.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_integral_constant.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 #include <boost/hana/integral.hpp>
diff --git a/test/adapted/std_list/bug.cpp b/test/ext/std/list/bug.cpp
similarity index 93%
rename from test/adapted/std_list/bug.cpp
rename to test/ext/std/list/bug.cpp
index dcf8c5a46..dd78e86c0 100644
--- a/test/adapted/std_list/bug.cpp
+++ b/test/ext/std/list/bug.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_list.hpp>
+#include <boost/hana/ext/std/list.hpp>
 
 #include <boost/hana/integral.hpp>
 
diff --git a/test/adapted/std_list/functor.cpp b/test/ext/std/list/functor.cpp
similarity index 95%
rename from test/adapted/std_list/functor.cpp
rename to test/ext/std/list/functor.cpp
index c7fc66429..4525ab0fa 100644
--- a/test/adapted/std_list/functor.cpp
+++ b/test/ext/std/list/functor.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_list.hpp>
+#include <boost/hana/ext/std/list.hpp>
 
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/laws.hpp>
diff --git a/test/adapted/std_list/iterable.cpp b/test/ext/std/list/iterable.cpp
similarity index 93%
rename from test/adapted/std_list/iterable.cpp
rename to test/ext/std/list/iterable.cpp
index a822ec01d..208b8931f 100644
--- a/test/adapted/std_list/iterable.cpp
+++ b/test/ext/std/list/iterable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_list.hpp>
+#include <boost/hana/ext/std/list.hpp>
 
 #include <cassert>
 #include <list>
diff --git a/test/adapted/std_pair/pair.cpp b/test/ext/std/pair/pair.cpp
similarity index 90%
rename from test/adapted/std_pair/pair.cpp
rename to test/ext/std/pair/pair.cpp
index 0ee1b19ce..355b35be4 100644
--- a/test/adapted/std_pair/pair.cpp
+++ b/test/ext/std/pair/pair.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_pair.hpp>
+#include <boost/hana/ext/std/pair.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 
diff --git a/test/adapted/std_tuple/applicative.cpp b/test/ext/std/tuple/applicative.cpp
similarity index 97%
rename from test/adapted/std_tuple/applicative.cpp
rename to test/ext/std/tuple/applicative.cpp
index c99e01ce2..c0bc68659 100644
--- a/test/adapted/std_tuple/applicative.cpp
+++ b/test/ext/std/tuple/applicative.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_tuple.hpp>
+#include <boost/hana/ext/std/tuple.hpp>
 
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/static_assert.hpp>
diff --git a/test/adapted/std_tuple/functor.cpp b/test/ext/std/tuple/functor.cpp
similarity index 96%
rename from test/adapted/std_tuple/functor.cpp
rename to test/ext/std/tuple/functor.cpp
index fd94a0503..da6a30d79 100644
--- a/test/adapted/std_tuple/functor.cpp
+++ b/test/ext/std/tuple/functor.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_tuple.hpp>
+#include <boost/hana/ext/std/tuple.hpp>
 
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/laws.hpp>
diff --git a/test/adapted/std_tuple/iterable.cpp b/test/ext/std/tuple/iterable.cpp
similarity index 95%
rename from test/adapted/std_tuple/iterable.cpp
rename to test/ext/std/tuple/iterable.cpp
index bb988cd69..bd2720860 100644
--- a/test/adapted/std_tuple/iterable.cpp
+++ b/test/ext/std/tuple/iterable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_tuple.hpp>
+#include <boost/hana/ext/std/tuple.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 #include <boost/hana/integral.hpp>
diff --git a/test/adapted/std_tuple/list/cons.cpp b/test/ext/std/tuple/list/cons.cpp
similarity index 93%
rename from test/adapted/std_tuple/list/cons.cpp
rename to test/ext/std/tuple/list/cons.cpp
index 38dae9e54..f3e283dd6 100644
--- a/test/adapted/std_tuple/list/cons.cpp
+++ b/test/ext/std/tuple/list/cons.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_tuple.hpp>
+#include <boost/hana/ext/std/tuple.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 
diff --git a/test/adapted/std_tuple/list/nil.cpp b/test/ext/std/tuple/list/nil.cpp
similarity index 88%
rename from test/adapted/std_tuple/list/nil.cpp
rename to test/ext/std/tuple/list/nil.cpp
index a66872739..6187980aa 100644
--- a/test/adapted/std_tuple/list/nil.cpp
+++ b/test/ext/std/tuple/list/nil.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_tuple.hpp>
+#include <boost/hana/ext/std/tuple.hpp>
 
 #include <boost/hana/detail/static_assert.hpp>
 
diff --git a/test/adapted/std_tuple/monad.cpp b/test/ext/std/tuple/monad.cpp
similarity index 97%
rename from test/adapted/std_tuple/monad.cpp
rename to test/ext/std/tuple/monad.cpp
index 7756ebc7f..ae0653cea 100644
--- a/test/adapted/std_tuple/monad.cpp
+++ b/test/ext/std/tuple/monad.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/adapted/std_tuple.hpp>
+#include <boost/hana/ext/std/tuple.hpp>
 
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/laws.hpp>