diff --git a/example/cookbook/do_the_bind.cpp b/example/cookbook/do_the_bind.cpp
index 33772383..e63556a9 100644
--- a/example/cookbook/do_the_bind.cpp
+++ b/example/cookbook/do_the_bind.cpp
@@ -28,7 +28,7 @@
 #include <boost/fusion/support/deduce_sequence.hpp>
 
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/mpl.hpp>
+#include <boost/fusion/sequence/intrinsic/mpl.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
diff --git a/example/cookbook/fill_em_up.cpp b/example/cookbook/fill_em_up.cpp
index 69576612..c77c7b68 100644
--- a/example/cookbook/fill_em_up.cpp
+++ b/example/cookbook/fill_em_up.cpp
@@ -24,8 +24,8 @@
 ==============================================================================*/
 
 // We'll use these containers as examples
-#include <boost/fusion/container/list.hpp>
-#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/container/list.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
 
 // For doing I/O
 #include <boost/fusion/sequence/io.hpp>
diff --git a/example/performance/accumulate.cpp b/example/performance/accumulate.cpp
index 6e3d9f80..7d8f0a76 100644
--- a/example/performance/accumulate.cpp
+++ b/example/performance/accumulate.cpp
@@ -10,10 +10,10 @@
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
-#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/adapted/array.hpp>
+#include <boost/fusion/sequence/adapted/array.hpp>
 
 #include <algorithm>
 #include <numeric>
diff --git a/example/performance/functional.cpp b/example/performance/functional.cpp
index cb4c2ab9..228586eb 100644
--- a/example/performance/functional.cpp
+++ b/example/performance/functional.cpp
@@ -7,8 +7,8 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#include <boost/fusion/container/list.hpp>
-#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/container/list.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
 #include <boost/fusion/algorithm/iteration/fold.hpp>
 #include <boost/fusion/functional/adapter/unfused_generic.hpp>
 #include <boost/fusion/functional/adapter/unfused_rvalue_args.hpp>
diff --git a/example/performance/inner_product.cpp b/example/performance/inner_product.cpp
index b84eabde..8257921d 100644
--- a/example/performance/inner_product.cpp
+++ b/example/performance/inner_product.cpp
@@ -10,10 +10,10 @@
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
-#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/adapted/array.hpp>
+#include <boost/fusion/sequence/adapted/array.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 
 #include <algorithm>
diff --git a/example/performance/inner_product2.cpp b/example/performance/inner_product2.cpp
index 9bab438e..b831b219 100644
--- a/example/performance/inner_product2.cpp
+++ b/example/performance/inner_product2.cpp
@@ -10,10 +10,10 @@
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
-#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/adapted/array.hpp>
+#include <boost/fusion/sequence/adapted/array.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 
 #include <algorithm>
diff --git a/example/performance/sequence_efficiency.cpp b/example/performance/sequence_efficiency.cpp
index 9e1d34c8..6a24f74f 100644
--- a/example/performance/sequence_efficiency.cpp
+++ b/example/performance/sequence_efficiency.cpp
@@ -10,8 +10,8 @@
 #define FUSION_MAX_VECTOR_SIZE 30
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
-#include <boost/fusion/container/vector.hpp>
-#include <boost/fusion/container/list.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/sequence/container/list.hpp>
 
 #include <boost/lexical_cast.hpp>
 #include <boost/preprocessor/stringize.hpp>
diff --git a/example/performance/zip_efficiency.cpp b/example/performance/zip_efficiency.cpp
index 36ded283..c8132c74 100644
--- a/example/performance/zip_efficiency.cpp
+++ b/example/performance/zip_efficiency.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
-#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/type_traits/remove_reference.hpp>
diff --git a/test/algorithm/all.cpp b/test/algorithm/all.cpp
index 47c65e50..983059c8 100644
--- a/test/algorithm/all.cpp
+++ b/test/algorithm/all.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/all.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/test/algorithm/any.cpp b/test/algorithm/any.cpp
index 69f114f8..71685ef2 100644
--- a/test/algorithm/any.cpp
+++ b/test/algorithm/any.cpp
@@ -7,8 +7,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/any.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/test/algorithm/clear.cpp b/test/algorithm/clear.cpp
index 3ab42030..309f3e28 100644
--- a/test/algorithm/clear.cpp
+++ b/test/algorithm/clear.cpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/count.cpp b/test/algorithm/count.cpp
index e87ff9d8..ae6ccde6 100644
--- a/test/algorithm/count.cpp
+++ b/test/algorithm/count.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/count.hpp>
 #include <boost/mpl/vector_c.hpp>
 #include <string>
diff --git a/test/algorithm/count_if.cpp b/test/algorithm/count_if.cpp
index d67e464c..1a8c02e5 100644
--- a/test/algorithm/count_if.cpp
+++ b/test/algorithm/count_if.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/count_if.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/test/algorithm/erase.cpp b/test/algorithm/erase.cpp
index 44f641f3..efe7dcfe 100644
--- a/test/algorithm/erase.cpp
+++ b/test/algorithm/erase.cpp
@@ -5,9 +5,9 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/container/vector/vector_iterator.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/vector/vector_iterator.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/erase_key.cpp b/test/algorithm/erase_key.cpp
index 2685bfd2..d940714c 100644
--- a/test/algorithm/erase_key.cpp
+++ b/test/algorithm/erase_key.cpp
@@ -5,14 +5,14 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/set/set.hpp>
+#include <boost/fusion/sequence/container/set/set.hpp>
 #include <boost/fusion/sequence/generation/make_set.hpp>
-#include <boost/fusion/container/map/map.hpp>
+#include <boost/fusion/sequence/container/map/map.hpp>
 #include <boost/fusion/sequence/generation/make_map.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/container/vector/convert.hpp>
-#include <boost/fusion/container/set/convert.hpp>
-#include <boost/fusion/container/map/convert.hpp>
+#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/sequence/conversion/as_set.hpp>
+#include <boost/fusion/sequence/conversion/as_map.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/iterator/deref.hpp>
diff --git a/test/algorithm/ext_/find_if_s.cpp b/test/algorithm/ext_/find_if_s.cpp
index f3b06d2b..d57876e2 100755
--- a/test/algorithm/ext_/find_if_s.cpp
+++ b/test/algorithm/ext_/find_if_s.cpp
@@ -5,11 +5,11 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/query/ext_/find_if_s.hpp>
-#include <boost/fusion/container/ext_/tree.hpp>
+#include <boost/fusion/sequence/container/ext_/tree.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/test/algorithm/ext_/for_each_s.cpp b/test/algorithm/ext_/for_each_s.cpp
index bf4e2bbd..6758872c 100755
--- a/test/algorithm/ext_/for_each_s.cpp
+++ b/test/algorithm/ext_/for_each_s.cpp
@@ -5,13 +5,13 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/iteration/ext_/for_each_s.hpp>
 #include <boost/mpl/vector_c.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/container/ext_/tree.hpp>
+#include <boost/fusion/sequence/container/ext_/tree.hpp>
 
 struct print
 {
diff --git a/test/algorithm/filter.cpp b/test/algorithm/filter.cpp
index 4c21d03a..21c93ed0 100644
--- a/test/algorithm/filter.cpp
+++ b/test/algorithm/filter.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
diff --git a/test/algorithm/filter_if.cpp b/test/algorithm/filter_if.cpp
index e1bbb230..681d2bbd 100644
--- a/test/algorithm/filter_if.cpp
+++ b/test/algorithm/filter_if.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
diff --git a/test/algorithm/find.cpp b/test/algorithm/find.cpp
index 25a61e94..1b913a73 100644
--- a/test/algorithm/find.cpp
+++ b/test/algorithm/find.cpp
@@ -5,10 +5,10 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
-#include <boost/fusion/container/set/set.hpp>
-#include <boost/fusion/container/map/map.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/set/set.hpp>
+#include <boost/fusion/sequence/container/map/map.hpp>
 #include <boost/fusion/algorithm/query/find.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/mpl/vector.hpp>
diff --git a/test/algorithm/find_if.cpp b/test/algorithm/find_if.cpp
index 2b402b9f..93c694cb 100644
--- a/test/algorithm/find_if.cpp
+++ b/test/algorithm/find_if.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/query/find_if.hpp>
 #include <boost/mpl/vector.hpp>
diff --git a/test/algorithm/fold.cpp b/test/algorithm/fold.cpp
index 55641677..933eadb3 100644
--- a/test/algorithm/fold.cpp
+++ b/test/algorithm/fold.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/for_each.cpp b/test/algorithm/for_each.cpp
index a0054fad..18ebbda9 100644
--- a/test/algorithm/for_each.cpp
+++ b/test/algorithm/for_each.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/iteration/for_each.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/test/algorithm/insert.cpp b/test/algorithm/insert.cpp
index acbcf9a3..8780636f 100644
--- a/test/algorithm/insert.cpp
+++ b/test/algorithm/insert.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/insert_range.cpp b/test/algorithm/insert_range.cpp
index 4cd3ae41..0aef1e81 100644
--- a/test/algorithm/insert_range.cpp
+++ b/test/algorithm/insert_range.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/join.cpp b/test/algorithm/join.cpp
index 04341160..39709c50 100644
--- a/test/algorithm/join.cpp
+++ b/test/algorithm/join.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/algorithm/transformation/join.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/mpl/vector/vector10_c.hpp>
 
 int main()
diff --git a/test/algorithm/none.cpp b/test/algorithm/none.cpp
index ec5676b6..5747494b 100644
--- a/test/algorithm/none.cpp
+++ b/test/algorithm/none.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/none.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/test/algorithm/pop_back.cpp b/test/algorithm/pop_back.cpp
index 55d4b7fe..5f9ebaf4 100644
--- a/test/algorithm/pop_back.cpp
+++ b/test/algorithm/pop_back.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/pop_front.cpp b/test/algorithm/pop_front.cpp
index c4b797ab..8e87a959 100644
--- a/test/algorithm/pop_front.cpp
+++ b/test/algorithm/pop_front.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/push_back.cpp b/test/algorithm/push_back.cpp
index a15d4401..94e013a3 100644
--- a/test/algorithm/push_back.cpp
+++ b/test/algorithm/push_back.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
diff --git a/test/algorithm/push_front.cpp b/test/algorithm/push_front.cpp
index 5c9e8fa8..dabdbf77 100644
--- a/test/algorithm/push_front.cpp
+++ b/test/algorithm/push_front.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/remove.cpp b/test/algorithm/remove.cpp
index 95f351ef..a0f20ba0 100644
--- a/test/algorithm/remove.cpp
+++ b/test/algorithm/remove.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
diff --git a/test/algorithm/remove_if.cpp b/test/algorithm/remove_if.cpp
index 9cef9a3d..ee4ca848 100644
--- a/test/algorithm/remove_if.cpp
+++ b/test/algorithm/remove_if.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
diff --git a/test/algorithm/replace.cpp b/test/algorithm/replace.cpp
index acdb9761..3ccf13b1 100644
--- a/test/algorithm/replace.cpp
+++ b/test/algorithm/replace.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
diff --git a/test/algorithm/replace_if.cpp b/test/algorithm/replace_if.cpp
index b885976c..01b2df8a 100644
--- a/test/algorithm/replace_if.cpp
+++ b/test/algorithm/replace_if.cpp
@@ -5,9 +5,9 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
diff --git a/test/algorithm/reverse.cpp b/test/algorithm/reverse.cpp
index 4cae9b33..598edac0 100644
--- a/test/algorithm/reverse.cpp
+++ b/test/algorithm/reverse.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
diff --git a/test/algorithm/transform.cpp b/test/algorithm/transform.cpp
index 1597dfd2..c7ce3625 100644
--- a/test/algorithm/transform.cpp
+++ b/test/algorithm/transform.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
diff --git a/test/algorithm/zip.cpp b/test/algorithm/zip.cpp
index e4f9bedb..eb60ba17 100644
--- a/test/algorithm/zip.cpp
+++ b/test/algorithm/zip.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/mpl/vector.hpp>
 
 int main()
diff --git a/test/algorithm/zip2.cpp b/test/algorithm/zip2.cpp
index c8007117..0823af0e 100644
--- a/test/algorithm/zip2.cpp
+++ b/test/algorithm/zip2.cpp
@@ -8,7 +8,7 @@
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/mpl/vector.hpp>
 
 int main()
diff --git a/test/algorithm/zip_ignore.cpp b/test/algorithm/zip_ignore.cpp
index a12b5820..cd71ed44 100644
--- a/test/algorithm/zip_ignore.cpp
+++ b/test/algorithm/zip_ignore.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/support/unused.hpp>
 #include <boost/fusion/iterator.hpp>
diff --git a/test/functional/fused.cpp b/test/functional/fused.cpp
index de974cf8..4b960ee0 100644
--- a/test/functional/fused.cpp
+++ b/test/functional/fused.cpp
@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
 
 #include <boost/type_traits/is_same.hpp>
 #include <boost/mpl/assert.hpp>
diff --git a/test/functional/fused_function_object.cpp b/test/functional/fused_function_object.cpp
index 45fab30f..50a1b38b 100644
--- a/test/functional/fused_function_object.cpp
+++ b/test/functional/fused_function_object.cpp
@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;
diff --git a/test/functional/fused_procedure.cpp b/test/functional/fused_procedure.cpp
index 34ba09d0..d4fd0d9f 100644
--- a/test/functional/fused_procedure.cpp
+++ b/test/functional/fused_procedure.cpp
@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;
diff --git a/test/functional/invoke.cpp b/test/functional/invoke.cpp
index 3960af17..f6e4c868 100644
--- a/test/functional/invoke.cpp
+++ b/test/functional/invoke.cpp
@@ -17,12 +17,12 @@
 
 #include <boost/mpl/int.hpp>
 
-#include <boost/fusion/container/vector.hpp>
-#include <boost/fusion/container/list.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/sequence/container/list.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/view/single_view.hpp>
-#include <boost/fusion/view/iterator_range.hpp>
+#include <boost/fusion/sequence/view/single_view.hpp>
+#include <boost/fusion/sequence/view/iterator_range.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/algorithm/transformation/join.hpp>
 
diff --git a/test/functional/invoke_function_object.cpp b/test/functional/invoke_function_object.cpp
index 5f08f650..0f6272b2 100644
--- a/test/functional/invoke_function_object.cpp
+++ b/test/functional/invoke_function_object.cpp
@@ -17,12 +17,12 @@
 
 #include <boost/mpl/int.hpp>
 
-#include <boost/fusion/container/vector.hpp>
-#include <boost/fusion/container/list.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/sequence/container/list.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/view/single_view.hpp>
-#include <boost/fusion/view/iterator_range.hpp>
+#include <boost/fusion/sequence/view/single_view.hpp>
+#include <boost/fusion/sequence/view/iterator_range.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/algorithm/transformation/join.hpp>
 
diff --git a/test/functional/invoke_procedure.cpp b/test/functional/invoke_procedure.cpp
index 810cb903..bf92ef23 100644
--- a/test/functional/invoke_procedure.cpp
+++ b/test/functional/invoke_procedure.cpp
@@ -15,12 +15,12 @@
 
 #include <boost/mpl/int.hpp>
 
-#include <boost/fusion/container/vector.hpp>
-#include <boost/fusion/container/list.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/sequence/container/list.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/view/single_view.hpp>
-#include <boost/fusion/view/iterator_range.hpp>
+#include <boost/fusion/sequence/view/single_view.hpp>
+#include <boost/fusion/sequence/view/iterator_range.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/algorithm/transformation/join.hpp>
 
diff --git a/test/functional/make_fused.cpp b/test/functional/make_fused.cpp
index ba5e604f..a1cd77f7 100644
--- a/test/functional/make_fused.cpp
+++ b/test/functional/make_fused.cpp
@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;
diff --git a/test/functional/make_fused_function_object.cpp b/test/functional/make_fused_function_object.cpp
index f2463003..51808266 100644
--- a/test/functional/make_fused_function_object.cpp
+++ b/test/functional/make_fused_function_object.cpp
@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;
diff --git a/test/functional/make_fused_procedure.cpp b/test/functional/make_fused_procedure.cpp
index 6a4cf572..ebe5b555 100644
--- a/test/functional/make_fused_procedure.cpp
+++ b/test/functional/make_fused_procedure.cpp
@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;
diff --git a/test/sequence/adapt_assoc_struct.cpp b/test/sequence/adapt_assoc_struct.cpp
index 277433b3..926294a6 100644
--- a/test/sequence/adapt_assoc_struct.cpp
+++ b/test/sequence/adapt_assoc_struct.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/adapted/struct/adapt_assoc_struct.hpp>
+#include <boost/fusion/sequence/adapted/struct/adapt_assoc_struct.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
@@ -16,10 +16,10 @@
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/container/vector/convert.hpp>
+#include <boost/fusion/sequence/conversion/as_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/comparison/not_equal_to.hpp>
 #include <boost/fusion/sequence/comparison/less.hpp>
diff --git a/test/sequence/adapt_struct.cpp b/test/sequence/adapt_struct.cpp
index 0f47c648..114b8862 100644
--- a/test/sequence/adapt_struct.cpp
+++ b/test/sequence/adapt_struct.cpp
@@ -5,17 +5,17 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/adapted/struct/adapt_struct.hpp>
+#include <boost/fusion/sequence/adapted/struct/adapt_struct.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/sequence/intrinsic/back.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/container/vector/convert.hpp>
+#include <boost/fusion/sequence/conversion/as_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/comparison/not_equal_to.hpp>
 #include <boost/fusion/sequence/comparison/less.hpp>
diff --git a/test/sequence/array.cpp b/test/sequence/array.cpp
index 0ca5255d..3a776d52 100644
--- a/test/sequence/array.cpp
+++ b/test/sequence/array.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/fusion/adapted/array.hpp>
+#include <boost/fusion/sequence/adapted/array.hpp>
 #include <boost/array.hpp>
 
 #include <boost/fusion/sequence/intrinsic.hpp>
diff --git a/test/sequence/as_list.cpp b/test/sequence/as_list.cpp
index 72dc9aa4..aa45d469 100644
--- a/test/sequence/as_list.cpp
+++ b/test/sequence/as_list.cpp
@@ -5,11 +5,11 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
-#include <boost/fusion/container/list/convert.hpp>
+#include <boost/fusion/sequence/conversion/as_list.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
diff --git a/test/sequence/as_map.cpp b/test/sequence/as_map.cpp
index a9364bc6..b1b336fb 100644
--- a/test/sequence/as_map.cpp
+++ b/test/sequence/as_map.cpp
@@ -5,12 +5,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
-#include <boost/fusion/container/map/convert.hpp>
-#include <boost/fusion/container/vector/convert.hpp>
+#include <boost/fusion/sequence/conversion/as_map.hpp>
+#include <boost/fusion/sequence/conversion/as_vector.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
diff --git a/test/sequence/as_set.cpp b/test/sequence/as_set.cpp
index 9bfd5869..40488f32 100644
--- a/test/sequence/as_set.cpp
+++ b/test/sequence/as_set.cpp
@@ -5,13 +5,13 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
-#include <boost/fusion/container/set/convert.hpp>
-#include <boost/fusion/container/list/convert.hpp>
-#include <boost/fusion/container/vector/convert.hpp>
+#include <boost/fusion/sequence/conversion/as_set.hpp>
+#include <boost/fusion/sequence/conversion/as_list.hpp>
+#include <boost/fusion/sequence/conversion/as_vector.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
diff --git a/test/sequence/as_vector.cpp b/test/sequence/as_vector.cpp
index d728c837..b5c3425e 100644
--- a/test/sequence/as_vector.cpp
+++ b/test/sequence/as_vector.cpp
@@ -5,11 +5,11 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
-#include <boost/fusion/container/vector/convert.hpp>
+#include <boost/fusion/sequence/conversion/as_vector.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
diff --git a/test/sequence/back_extended_deque.cpp b/test/sequence/back_extended_deque.cpp
index a2daa4cf..f58dfdc6 100644
--- a/test/sequence/back_extended_deque.cpp
+++ b/test/sequence/back_extended_deque.cpp
@@ -3,16 +3,15 @@
     Copyright (c) 2001-2006 Joel de Guzman
     Copyright (c) 2006 Dan Marsden
 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/fusion/container/deque/deque.hpp>
-#include <boost/fusion/container/deque/back_extended_deque.hpp>
+#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/sequence/container/deque/back_extended_deque.hpp>
 #include <boost/fusion/sequence/comparison.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/mpl.hpp>
 
 #include <boost/fusion/sequence/intrinsic.hpp>
 #include <boost/fusion/iterator.hpp>
diff --git a/test/sequence/boost_tuple.cpp b/test/sequence/boost_tuple.cpp
index 1e3d23b4..522686fd 100644
--- a/test/sequence/boost_tuple.cpp
+++ b/test/sequence/boost_tuple.cpp
@@ -5,17 +5,17 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/adapted/boost_tuple.hpp>
+#include <boost/fusion/sequence/adapted/boost_tuple.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/sequence/intrinsic/back.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/container/vector/convert.hpp>
+#include <boost/fusion/sequence/conversion/as_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/comparison/not_equal_to.hpp>
 #include <boost/fusion/sequence/comparison/less.hpp>
diff --git a/test/sequence/cons.cpp b/test/sequence/cons.cpp
index b27345e6..644ced5c 100644
--- a/test/sequence/cons.cpp
+++ b/test/sequence/cons.cpp
@@ -7,10 +7,10 @@
 ==============================================================================*/
 #include <string>
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/list/cons.hpp>
+#include <boost/fusion/sequence/container/list/cons.hpp>
 #include <boost/fusion/sequence/generation/make_cons.hpp>
 #include <boost/fusion/sequence/generation/cons_tie.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/lambda/lambda.hpp>
diff --git a/test/sequence/construction.hpp b/test/sequence/construction.hpp
index d5c56664..6c289749 100644
--- a/test/sequence/construction.hpp
+++ b/test/sequence/construction.hpp
@@ -7,7 +7,7 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/container/list/cons.hpp>
+#include <boost/fusion/sequence/container/list/cons.hpp>
 
 #if !defined(FUSION_AT)
 #define FUSION_AT at_c
diff --git a/test/sequence/copy.hpp b/test/sequence/copy.hpp
index 96edbc45..f47a0bca 100644
--- a/test/sequence/copy.hpp
+++ b/test/sequence/copy.hpp
@@ -7,7 +7,7 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/mpl.hpp>
+#include <boost/fusion/sequence/intrinsic/mpl.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/mpl/insert_range.hpp>
 #include <boost/mpl/vector.hpp>
diff --git a/test/sequence/deduce_sequence.cpp b/test/sequence/deduce_sequence.cpp
index 5b234781..9c6d1ef4 100644
--- a/test/sequence/deduce_sequence.cpp
+++ b/test/sequence/deduce_sequence.cpp
@@ -7,7 +7,7 @@
 ==============================================================================*/
 
 #include <boost/fusion/support/deduce_sequence.hpp>
-#include <boost/fusion/mpl.hpp>
+#include <boost/fusion/sequence/intrinsic/mpl.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
 #include <boost/mpl/equal.hpp>
diff --git a/test/sequence/deque_comparison.cpp b/test/sequence/deque_comparison.cpp
index 229fd0e6..2c6db999 100644
--- a/test/sequence/deque_comparison.cpp
+++ b/test/sequence/deque_comparison.cpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/sequence/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "comparison.hpp"
diff --git a/test/sequence/deque_construction.cpp b/test/sequence/deque_construction.cpp
index bba8f09a..7ec3caff 100644
--- a/test/sequence/deque_construction.cpp
+++ b/test/sequence/deque_construction.cpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/sequence/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "construction.hpp"
diff --git a/test/sequence/deque_copy.cpp b/test/sequence/deque_copy.cpp
index 57e7334d..6d3ee13f 100644
--- a/test/sequence/deque_copy.cpp
+++ b/test/sequence/deque_copy.cpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/sequence/container/deque/deque.hpp>
 #include <boost/fusion/sequence/generation/make_deque.hpp>
 #include <boost/fusion/sequence/generation/deque_tie.hpp>
 
diff --git a/test/sequence/deque_iterator.cpp b/test/sequence/deque_iterator.cpp
index baf6f827..414b94c5 100644
--- a/test/sequence/deque_iterator.cpp
+++ b/test/sequence/deque_iterator.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/sequence/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #define FUSION_TRAVERSAL_TAG bidirectional_traversal_tag
diff --git a/test/sequence/deque_make.cpp b/test/sequence/deque_make.cpp
index 4dc7346b..dfdc681d 100644
--- a/test/sequence/deque_make.cpp
+++ b/test/sequence/deque_make.cpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/sequence/container/deque/deque.hpp>
 #include <boost/fusion/sequence/generation/make_deque.hpp>
 
 #define FUSION_SEQUENCE deque
diff --git a/test/sequence/deque_misc.cpp b/test/sequence/deque_misc.cpp
index 53836bbc..01784c1e 100644
--- a/test/sequence/deque_misc.cpp
+++ b/test/sequence/deque_misc.cpp
@@ -6,9 +6,9 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/deque/deque.hpp>
-#include <boost/fusion/container/deque/convert.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/sequence/conversion/as_deque.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "misc.hpp"
diff --git a/test/sequence/deque_mutate.cpp b/test/sequence/deque_mutate.cpp
index 66ab1478..8b56aeac 100644
--- a/test/sequence/deque_mutate.cpp
+++ b/test/sequence/deque_mutate.cpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/sequence/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "mutate.hpp"
diff --git a/test/sequence/deque_tie.cpp b/test/sequence/deque_tie.cpp
index e922335b..2afb519f 100644
--- a/test/sequence/deque_tie.cpp
+++ b/test/sequence/deque_tie.cpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/sequence/container/deque/deque.hpp>
 #include <boost/fusion/sequence/generation/deque_tie.hpp>
 #include <boost/fusion/sequence/generation/ignore.hpp>
 #include <boost/fusion/sequence/generation/make_deque.hpp>
diff --git a/test/sequence/deque_value_at.cpp b/test/sequence/deque_value_at.cpp
index c348d287..4a0a9ab3 100644
--- a/test/sequence/deque_value_at.cpp
+++ b/test/sequence/deque_value_at.cpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/sequence/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "value_at.hpp"
diff --git a/test/sequence/ext_/iterator_range_s.cpp b/test/sequence/ext_/iterator_range_s.cpp
index 1468f61b..4f6ead43 100755
--- a/test/sequence/ext_/iterator_range_s.cpp
+++ b/test/sequence/ext_/iterator_range_s.cpp
@@ -7,11 +7,11 @@
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/algorithm/iteration/ext_/for_each_s.hpp>
 #include <boost/fusion/algorithm/query/ext_/find_if_s.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/container/ext_/tree.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/ext_/tree.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/view/iterator_range/iterator_range.hpp>
-#include <boost/fusion/view/ext_/segmented_iterator_range.hpp>
+#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/sequence/view/ext_/segmented_iterator_range.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
diff --git a/test/sequence/filter_view.cpp b/test/sequence/filter_view.cpp
index eaefb35e..28dbb8a0 100644
--- a/test/sequence/filter_view.cpp
+++ b/test/sequence/filter_view.cpp
@@ -5,12 +5,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
-#include <boost/fusion/container/vector/vector_iterator.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector_iterator.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/view/filter_view/filter_view.hpp>
+#include <boost/fusion/sequence/view/filter_view/filter_view.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/type_traits/is_class.hpp>
diff --git a/test/sequence/front_extended_deque.cpp b/test/sequence/front_extended_deque.cpp
index 40100c32..2afa6190 100644
--- a/test/sequence/front_extended_deque.cpp
+++ b/test/sequence/front_extended_deque.cpp
@@ -3,16 +3,15 @@
     Copyright (c) 2001-2006 Joel de Guzman
     Copyright (c) 2006 Dan Marsden
 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/fusion/container/deque/deque.hpp>
-#include <boost/fusion/container/deque/front_extended_deque.hpp>
+#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/sequence/container/deque/front_extended_deque.hpp>
 #include <boost/fusion/sequence/comparison.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/mpl.hpp>
 
 #include <boost/fusion/sequence/intrinsic.hpp>
 #include <boost/fusion/iterator.hpp>
diff --git a/test/sequence/io.cpp b/test/sequence/io.cpp
index f7692163..3629ea39 100644
--- a/test/sequence/io.cpp
+++ b/test/sequence/io.cpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
diff --git a/test/sequence/iterator_range.cpp b/test/sequence/iterator_range.cpp
index 29993d8e..1abaf0d5 100644
--- a/test/sequence/iterator_range.cpp
+++ b/test/sequence/iterator_range.cpp
@@ -5,9 +5,9 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
diff --git a/test/sequence/joint_view.cpp b/test/sequence/joint_view.cpp
index 7ce135e7..eb108df1 100644
--- a/test/sequence/joint_view.cpp
+++ b/test/sequence/joint_view.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/view/joint_view/joint_view.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/sequence/list_comparison.cpp b/test/sequence/list_comparison.cpp
index fcf213c5..19094687 100644
--- a/test/sequence/list_comparison.cpp
+++ b/test/sequence/list_comparison.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/sequence/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "comparison.hpp"
diff --git a/test/sequence/list_construction.cpp b/test/sequence/list_construction.cpp
index 26d648fd..83d748be 100644
--- a/test/sequence/list_construction.cpp
+++ b/test/sequence/list_construction.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/sequence/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "construction.hpp"
diff --git a/test/sequence/list_copy.cpp b/test/sequence/list_copy.cpp
index 561ab10d..68ae042f 100644
--- a/test/sequence/list_copy.cpp
+++ b/test/sequence/list_copy.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/sequence/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
 #include <boost/fusion/sequence/generation/list_tie.hpp>
 
diff --git a/test/sequence/list_iterator.cpp b/test/sequence/list_iterator.cpp
index f7cc6e1d..515a6e0f 100644
--- a/test/sequence/list_iterator.cpp
+++ b/test/sequence/list_iterator.cpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/sequence/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #define FUSION_NO_PRIOR
diff --git a/test/sequence/list_make.cpp b/test/sequence/list_make.cpp
index 7e7120fe..55833b64 100644
--- a/test/sequence/list_make.cpp
+++ b/test/sequence/list_make.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/sequence/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
 
 #define FUSION_SEQUENCE list
diff --git a/test/sequence/list_misc.cpp b/test/sequence/list_misc.cpp
index 2d8fe047..c5ff71ca 100644
--- a/test/sequence/list_misc.cpp
+++ b/test/sequence/list_misc.cpp
@@ -2,11 +2,12 @@
     Copyright (c) 1999-2003 Jaakko Järvi
     Copyright (c) 2001-2006 Joel de Guzman
 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/list/list.hpp>
-#include <boost/fusion/container/list/convert.hpp>
+#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/sequence/conversion/as_list.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE list
 #define FUSION_FORWARD_ONLY
diff --git a/test/sequence/list_mutate.cpp b/test/sequence/list_mutate.cpp
index f8802b27..abfc9a3e 100644
--- a/test/sequence/list_mutate.cpp
+++ b/test/sequence/list_mutate.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/sequence/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "mutate.hpp"
diff --git a/test/sequence/list_tie.cpp b/test/sequence/list_tie.cpp
index 1a0e73b2..e227edee 100644
--- a/test/sequence/list_tie.cpp
+++ b/test/sequence/list_tie.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/sequence/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/list_tie.hpp>
 #include <boost/fusion/sequence/generation/ignore.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
diff --git a/test/sequence/list_value_at.cpp b/test/sequence/list_value_at.cpp
index 763cf265..9bd3de69 100644
--- a/test/sequence/list_value_at.cpp
+++ b/test/sequence/list_value_at.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/sequence/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "value_at.hpp"
diff --git a/test/sequence/make_list.cpp b/test/sequence/make_list.cpp
index 7e7120fe..55833b64 100644
--- a/test/sequence/make_list.cpp
+++ b/test/sequence/make_list.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/sequence/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
 
 #define FUSION_SEQUENCE list
diff --git a/test/sequence/make_vector.cpp b/test/sequence/make_vector.cpp
index 228fbb77..ffd06489 100644
--- a/test/sequence/make_vector.cpp
+++ b/test/sequence/make_vector.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 
 #define FUSION_SEQUENCE vector
diff --git a/test/sequence/map.cpp b/test/sequence/map.cpp
index 689e086d..b170158d 100644
--- a/test/sequence/map.cpp
+++ b/test/sequence/map.cpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/map/map.hpp>
+#include <boost/fusion/sequence/container/map/map.hpp>
 #include <boost/fusion/sequence/generation/make_map.hpp>
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
diff --git a/test/sequence/misc.hpp b/test/sequence/misc.hpp
index d1fae03b..01ee773d 100644
--- a/test/sequence/misc.hpp
+++ b/test/sequence/misc.hpp
@@ -2,13 +2,12 @@
     Copyright (C) 1999-2003 Jaakko Järvi
     Copyright (c) 2001-2006 Joel de Guzman
 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/intrinsic.hpp>
 #include <boost/fusion/support/is_sequence.hpp>
-#include <boost/fusion/mpl.hpp>
 #include <boost/mpl/find.hpp>
 #include <boost/mpl/equal.hpp>
 #include <boost/mpl/int.hpp>
@@ -106,7 +105,7 @@ struct test_intrinsics2
     BOOST_STATIC_ASSERT((boost::mpl::equal<seq2, target2>::value));
 
 #endif
-
+    
     typedef boost::fusion::FUSION_SEQUENCE<int> target3;
     typedef boost::mpl::push_front<seq0, int>::type seq3;
     BOOST_STATIC_ASSERT((boost::mpl::equal<seq3, target3>::value));
@@ -171,9 +170,9 @@ test()
         BOOST_STATIC_ASSERT(!traits::is_sequence<int>::value);
         BOOST_STATIC_ASSERT(!traits::is_sequence<char>::value);
     }
-
+    
     {   // testing mpl compatibility
-
+        
         // test begin, end, next, prior, advance, size, deref, etc.
         //~ typedef FUSION_SEQUENCE<int, float, bool, char> tuple_type;
         //~ test_intrinsics1<tuple_type> test1;
@@ -182,7 +181,7 @@ test()
         // test an algorithm
         typedef FUSION_SEQUENCE<int, float, double> t1;
         typedef boost::mpl::find<t1, float>::type iter;
-        typedef boost::mpl::deref<iter>::type type;
+        typedef boost::mpl::deref<iter>::type type;        
         BOOST_STATIC_ASSERT((boost::is_same<type, float>::value));
 
     }
diff --git a/test/sequence/repetitive_view.cpp b/test/sequence/repetitive_view.cpp
index 54da37bc..0a2c01d9 100644
--- a/test/sequence/repetitive_view.cpp
+++ b/test/sequence/repetitive_view.cpp
@@ -7,10 +7,10 @@
 ==============================================================================*/
 
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/view/repetitive_view.hpp>
+#include <boost/fusion/sequence/view/repetitive_view.hpp>
 
-#include <boost/fusion/container/vector.hpp>
-#include <boost/fusion/view/joint_view.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/sequence/view/joint_view.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/algorithm/iteration/for_each.hpp>
 
diff --git a/test/sequence/reverse_view.cpp b/test/sequence/reverse_view.cpp
index 03d0632f..3cc2bf91 100644
--- a/test/sequence/reverse_view.cpp
+++ b/test/sequence/reverse_view.cpp
@@ -5,12 +5,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/view/reverse_view/reverse_view.hpp>
+#include <boost/fusion/sequence/view/reverse_view/reverse_view.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/iterator/prior.hpp>
diff --git a/test/sequence/set.cpp b/test/sequence/set.cpp
index 0c376f3a..c658380e 100644
--- a/test/sequence/set.cpp
+++ b/test/sequence/set.cpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/set/set.hpp>
+#include <boost/fusion/sequence/container/set/set.hpp>
 #include <boost/fusion/sequence/generation/make_set.hpp>
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
diff --git a/test/sequence/single_view.cpp b/test/sequence/single_view.cpp
index e3faa26a..fd1d1341 100644
--- a/test/sequence/single_view.cpp
+++ b/test/sequence/single_view.cpp
@@ -6,7 +6,7 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/view/single_view/single_view.hpp>
+#include <boost/fusion/sequence/view/single_view/single_view.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 
diff --git a/test/sequence/std_pair.cpp b/test/sequence/std_pair.cpp
index 127a1fbc..d0434821 100644
--- a/test/sequence/std_pair.cpp
+++ b/test/sequence/std_pair.cpp
@@ -5,17 +5,17 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/adapted/std_pair.hpp>
+#include <boost/fusion/sequence/adapted/std_pair.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/sequence/intrinsic/back.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/container/vector/convert.hpp>
+#include <boost/fusion/sequence/conversion/as_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/comparison/not_equal_to.hpp>
 #include <boost/fusion/sequence/comparison/less.hpp>
diff --git a/test/sequence/swap.cpp b/test/sequence/swap.cpp
index e89542e0..f9573d52 100644
--- a/test/sequence/swap.cpp
+++ b/test/sequence/swap.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/fusion/sequence/intrinsic/swap.hpp>
-#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/detail/lightweight_test.hpp>
diff --git a/test/sequence/transform_view.cpp b/test/sequence/transform_view.cpp
index e811f5f7..3dce9043 100644
--- a/test/sequence/transform_view.cpp
+++ b/test/sequence/transform_view.cpp
@@ -5,12 +5,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/view/transform_view/transform_view.hpp>
+#include <boost/fusion/sequence/view/transform_view/transform_view.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at.hpp>
diff --git a/test/sequence/tuple_comparison.cpp b/test/sequence/tuple_comparison.cpp
index 8108256b..fde2ad47 100644
--- a/test/sequence/tuple_comparison.cpp
+++ b/test/sequence/tuple_comparison.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/fusion/tuple/tuple.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE tuple
 #include "comparison.hpp"
diff --git a/test/sequence/tuple_construction.cpp b/test/sequence/tuple_construction.cpp
index 323c72ed..0d357002 100644
--- a/test/sequence/tuple_construction.cpp
+++ b/test/sequence/tuple_construction.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/fusion/tuple/tuple.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE tuple
 #define FUSION_AT get
diff --git a/test/sequence/tuple_misc.cpp b/test/sequence/tuple_misc.cpp
index daef0322..704ebd3a 100644
--- a/test/sequence/tuple_misc.cpp
+++ b/test/sequence/tuple_misc.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/fusion/tuple.hpp>
-#include <boost/fusion/container/vector/convert.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE tuple
 #define FUSION_AT get
diff --git a/test/sequence/variant.cpp b/test/sequence/variant.cpp
index bfbf6fd3..b4feee13 100644
--- a/test/sequence/variant.cpp
+++ b/test/sequence/variant.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#include <boost/fusion/adapted/variant.hpp>
+#include <boost/fusion/sequence/adapted/variant.hpp>
 
 #include <boost/fusion/support/is_sequence.hpp>
 #include <boost/fusion/support/is_view.hpp>
diff --git a/test/sequence/vector_comparison.cpp b/test/sequence/vector_comparison.cpp
index 7321820e..0a7ae781 100644
--- a/test/sequence/vector_comparison.cpp
+++ b/test/sequence/vector_comparison.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
 
 #define FUSION_SEQUENCE vector
 #include "comparison.hpp"
diff --git a/test/sequence/vector_construction.cpp b/test/sequence/vector_construction.cpp
index d279c232..4f1eaa02 100644
--- a/test/sequence/vector_construction.cpp
+++ b/test/sequence/vector_construction.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
 
 #define FUSION_SEQUENCE vector
 #include "construction.hpp"
diff --git a/test/sequence/vector_copy.cpp b/test/sequence/vector_copy.cpp
index 9b1e207d..e554a768 100644
--- a/test/sequence/vector_copy.cpp
+++ b/test/sequence/vector_copy.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/generation/vector_tie.hpp>
 
diff --git a/test/sequence/vector_iterator.cpp b/test/sequence/vector_iterator.cpp
index bcf15c69..662466fa 100644
--- a/test/sequence/vector_iterator.cpp
+++ b/test/sequence/vector_iterator.cpp
@@ -4,8 +4,8 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/container/vector/vector_iterator.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/vector/vector_iterator.hpp>
 
 #define FUSION_SEQUENCE vector
 #define FUSION_TRAVERSAL_TAG random_access_traversal_tag
diff --git a/test/sequence/vector_make.cpp b/test/sequence/vector_make.cpp
index 228fbb77..ffd06489 100644
--- a/test/sequence/vector_make.cpp
+++ b/test/sequence/vector_make.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 
 #define FUSION_SEQUENCE vector
diff --git a/test/sequence/vector_misc.cpp b/test/sequence/vector_misc.cpp
index 25d3ecfc..e2a22fb7 100644
--- a/test/sequence/vector_misc.cpp
+++ b/test/sequence/vector_misc.cpp
@@ -5,9 +5,9 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/container/vector/convert.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE vector
 #include "misc.hpp"
diff --git a/test/sequence/vector_mutate.cpp b/test/sequence/vector_mutate.cpp
index 610c0c18..60a410b7 100644
--- a/test/sequence/vector_mutate.cpp
+++ b/test/sequence/vector_mutate.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
 
 #define FUSION_SEQUENCE vector
 #include "mutate.hpp"
diff --git a/test/sequence/vector_n.cpp b/test/sequence/vector_n.cpp
index b051ca89..e7ff4ad3 100644
--- a/test/sequence/vector_n.cpp
+++ b/test/sequence/vector_n.cpp
@@ -5,16 +5,16 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector/vector10.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/container/vector/vector10.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at.hpp>
 
-#include <boost/fusion/container/vector/vector20.hpp>
-#include <boost/fusion/container/vector/vector30.hpp>
-#include <boost/fusion/container/vector/vector40.hpp>
-#include <boost/fusion/container/vector/vector50.hpp>
+#include <boost/fusion/sequence/container/vector/vector20.hpp>
+#include <boost/fusion/sequence/container/vector/vector30.hpp>
+#include <boost/fusion/sequence/container/vector/vector40.hpp>
+#include <boost/fusion/sequence/container/vector/vector50.hpp>
 
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_empty.hpp>
diff --git a/test/sequence/vector_tie.cpp b/test/sequence/vector_tie.cpp
index 08a82e3d..348e235c 100644
--- a/test/sequence/vector_tie.cpp
+++ b/test/sequence/vector_tie.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/vector_tie.hpp>
 #include <boost/fusion/sequence/generation/ignore.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/sequence/vector_value_at.cpp b/test/sequence/vector_value_at.cpp
index 8a99da5b..e4aa9ac4 100644
--- a/test/sequence/vector_value_at.cpp
+++ b/test/sequence/vector_value_at.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/sequence/container/vector/vector.hpp>
 
 #define FUSION_SEQUENCE vector
 #include "value_at.hpp"
diff --git a/test/sequence/zip_view.cpp b/test/sequence/zip_view.cpp
index 0fcb438d..485760cd 100644
--- a/test/sequence/zip_view.cpp
+++ b/test/sequence/zip_view.cpp
@@ -7,9 +7,9 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/view/zip_view.hpp>
-#include <boost/fusion/container/vector.hpp>
-#include <boost/fusion/container/list.hpp>
+#include <boost/fusion/sequence/view/zip_view.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/sequence/container/list.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
@@ -20,7 +20,7 @@
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/test/sequence/zip_view2.cpp b/test/sequence/zip_view2.cpp
index 611c41cb..c8c42e1e 100644
--- a/test/sequence/zip_view2.cpp
+++ b/test/sequence/zip_view2.cpp
@@ -9,9 +9,9 @@
 
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/view/zip_view.hpp>
-#include <boost/fusion/container/vector.hpp>
-#include <boost/fusion/container/list.hpp>
+#include <boost/fusion/sequence/view/zip_view.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/sequence/container/list.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
@@ -22,7 +22,7 @@
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/sequence/adapted/mpl.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/equal_to.hpp>
 
diff --git a/test/sequence/zip_view_ignore.cpp b/test/sequence/zip_view_ignore.cpp
index 2a300809..5eb3bf39 100644
--- a/test/sequence/zip_view_ignore.cpp
+++ b/test/sequence/zip_view_ignore.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/container/vector.hpp>
-#include <boost/fusion/view/zip_view.hpp>
+#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/sequence/view/zip_view.hpp>
 #include <boost/fusion/support/unused.hpp>
 #include <boost/fusion/iterator.hpp>
 #include <boost/fusion/sequence/intrinsic.hpp>