phase3: refactoring for v2.1

[SVN r40210]

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/sequence/intrinsic/mpl.hpp>
+#include <boost/fusion/mpl.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>

example/cookbook/fill_em_up.cpp

@@ -24,8 +24,8 @@
 ==============================================================================*/
 
 // We'll use these containers as examples
-#include <boost/fusion/sequence/container/list.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 // For doing I/O
 #include <boost/fusion/sequence/io.hpp>

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/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/adapted/array.hpp>
+#include <boost/fusion/adapted/array.hpp>
 
 #include <algorithm>
 #include <numeric>

example/performance/functional.cpp

@@ -7,8 +7,8 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#include <boost/fusion/sequence/container/list.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/adapted/array.hpp>
+#include <boost/fusion/adapted/array.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 
 #include <algorithm>

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/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/adapted/array.hpp>
+#include <boost/fusion/adapted/array.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 
 #include <algorithm>

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/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/container/list.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
 
 #include <boost/lexical_cast.hpp>
 #include <boost/preprocessor/stringize.hpp>

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/sequence/container/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/all.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/any.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>

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/sequence/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/count.hpp>
 #include <boost/mpl/vector_c.hpp>
 #include <string>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/count_if.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/vector/vector_iterator.hpp>
-#include <boost/fusion/sequence/adapted/mpl.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/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>

test/algorithm/erase_key.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/sequence/container/set/set.hpp>
+#include <boost/fusion/container/set/set.hpp>
 #include <boost/fusion/sequence/generation/make_set.hpp>
-#include <boost/fusion/sequence/container/map/map.hpp>
+#include <boost/fusion/container/map/map.hpp>
 #include <boost/fusion/sequence/generation/make_map.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/conversion/as_vector.hpp>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/query/ext_/find_if_s.hpp>
-#include <boost/fusion/sequence/container/ext_/tree.hpp>
+#include <boost/fusion/container/ext_/tree.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/vector_c.hpp>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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/sequence/container/ext_/tree.hpp>
+#include <boost/fusion/container/ext_/tree.hpp>
 
 struct print
 {

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/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/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/algorithm/query/find.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/mpl/vector.hpp>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/query/find_if.hpp>
 #include <boost/mpl/vector.hpp>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/iteration/for_each.hpp>
 #include <boost/mpl/vector_c.hpp>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/mpl/vector/vector10_c.hpp>
 
 int main()

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/none.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/mpl/vector.hpp>
 
 int main()

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/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/mpl/vector.hpp>
 
 int main()

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/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/support/unused.hpp>
 #include <boost/fusion/iterator.hpp>

test/functional/fused.cpp

@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 #include <boost/type_traits/is_same.hpp>
 #include <boost/mpl/assert.hpp>

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/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;

test/functional/fused_procedure.cpp

@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;

test/functional/invoke.cpp

@@ -17,12 +17,12 @@
 
 #include <boost/mpl/int.hpp>
 
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/container/list.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/view/single_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range.hpp>
+#include <boost/fusion/view/single_view.hpp>
+#include <boost/fusion/view/iterator_range.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/algorithm/transformation/join.hpp>
 

test/functional/invoke_function_object.cpp

@@ -17,12 +17,12 @@
 
 #include <boost/mpl/int.hpp>
 
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/container/list.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/view/single_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range.hpp>
+#include <boost/fusion/view/single_view.hpp>
+#include <boost/fusion/view/iterator_range.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/algorithm/transformation/join.hpp>
 

test/functional/invoke_procedure.cpp

@@ -15,12 +15,12 @@
 
 #include <boost/mpl/int.hpp>
 
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/container/list.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/view/single_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range.hpp>
+#include <boost/fusion/view/single_view.hpp>
+#include <boost/fusion/view/iterator_range.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/algorithm/transformation/join.hpp>
 

test/functional/make_fused.cpp

@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;

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/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;

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/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;

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/sequence/adapted/struct/adapt_assoc_struct.hpp>
+#include <boost/fusion/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,8 +16,8 @@
 #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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/conversion/as_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>

test/sequence/adapt_struct.cpp

@@ -5,15 +5,15 @@
     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/adapted/struct/adapt_struct.hpp>
+#include <boost/fusion/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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/conversion/as_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>

test/sequence/array.cpp

@@ -8,7 +8,7 @@
 
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/fusion/sequence/adapted/array.hpp>
+#include <boost/fusion/adapted/array.hpp>
 #include <boost/array.hpp>
 
 #include <boost/fusion/sequence/intrinsic.hpp>

test/sequence/as_list.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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
 #include <boost/fusion/sequence/conversion/as_list.hpp>

test/sequence/as_map.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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
 #include <boost/fusion/sequence/conversion/as_map.hpp>

test/sequence/as_set.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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
 #include <boost/fusion/sequence/conversion/as_set.hpp>

test/sequence/as_vector.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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
 #include <boost/fusion/sequence/conversion/as_vector.hpp>

test/sequence/back_extended_deque.cpp

@@ -8,10 +8,11 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/fusion/sequence/container/deque/deque.hpp>
-#include <boost/fusion/sequence/container/deque/back_extended_deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/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>

test/sequence/boost_tuple.cpp

@@ -5,15 +5,15 @@
     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/adapted/boost_tuple.hpp>
+#include <boost/fusion/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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/conversion/as_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>

test/sequence/cons.cpp

@@ -7,10 +7,10 @@
 ==============================================================================*/
 #include <string>
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/list/cons.hpp>
+#include <boost/fusion/container/list/cons.hpp>
 #include <boost/fusion/sequence/generation/make_cons.hpp>
 #include <boost/fusion/sequence/generation/cons_tie.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/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>

test/sequence/construction.hpp

@@ -7,7 +7,7 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/container/list/cons.hpp>
+#include <boost/fusion/container/list/cons.hpp>
 
 #if !defined(FUSION_AT)
 #define FUSION_AT at_c

test/sequence/copy.hpp

@@ -7,7 +7,7 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
+#include <boost/fusion/mpl.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/mpl/insert_range.hpp>
 #include <boost/mpl/vector.hpp>

test/sequence/deduce_sequence.cpp

@@ -7,7 +7,7 @@
 ==============================================================================*/
 
 #include <boost/fusion/support/deduce_sequence.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
+#include <boost/fusion/mpl.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
 #include <boost/mpl/equal.hpp>

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/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "comparison.hpp"

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/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "construction.hpp"

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/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 #include <boost/fusion/sequence/generation/make_deque.hpp>
 #include <boost/fusion/sequence/generation/deque_tie.hpp>
 

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/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #define FUSION_TRAVERSAL_TAG bidirectional_traversal_tag

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/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 #include <boost/fusion/sequence/generation/make_deque.hpp>
 
 #define FUSION_SEQUENCE deque

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/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 #include <boost/fusion/sequence/conversion/as_deque.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "misc.hpp"

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/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "mutate.hpp"

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/sequence/container/deque/deque.hpp>
+#include <boost/fusion/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>

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/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "value_at.hpp"

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/ext_/tree.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/ext_/tree.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
-#include <boost/fusion/sequence/view/ext_/segmented_iterator_range.hpp>
+#include <boost/fusion/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/container/vector/vector_iterator.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/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/view/filter_view/filter_view.hpp>
+#include <boost/fusion/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>

test/sequence/front_extended_deque.cpp

@@ -8,10 +8,11 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/fusion/sequence/container/deque/deque.hpp>
-#include <boost/fusion/sequence/container/deque/front_extended_deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "comparison.hpp"

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/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "construction.hpp"

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/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
 #include <boost/fusion/sequence/generation/list_tie.hpp>
 

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/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #define FUSION_NO_PRIOR

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/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
 
 #define FUSION_SEQUENCE list

test/sequence/list_misc.cpp

@@ -5,9 +5,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/sequence/container/list/list.hpp>
+#include <boost/fusion/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

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/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "mutate.hpp"

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/sequence/container/list/list.hpp>
+#include <boost/fusion/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>

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/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "value_at.hpp"

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/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
 
 #define FUSION_SEQUENCE list

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/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 
 #define FUSION_SEQUENCE vector

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/sequence/container/map/map.hpp>
+#include <boost/fusion/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>

test/sequence/misc.hpp

@@ -8,6 +8,7 @@
 #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>

test/sequence/repetitive_view.cpp

@@ -7,10 +7,10 @@
 ==============================================================================*/
 
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/view/repetitive_view.hpp>
+#include <boost/fusion/view/repetitive_view.hpp>
 
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/view/joint_view.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/view/joint_view.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/algorithm/iteration/for_each.hpp>
 

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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/sequence/view/reverse_view/reverse_view.hpp>
+#include <boost/fusion/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>

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/sequence/container/set/set.hpp>
+#include <boost/fusion/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>

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/sequence/view/single_view/single_view.hpp>
+#include <boost/fusion/view/single_view/single_view.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 

test/sequence/std_pair.cpp

@@ -5,15 +5,15 @@
     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/adapted/std_pair.hpp>
+#include <boost/fusion/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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/conversion/as_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>

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/sequence/container/vector.hpp>
+#include <boost/fusion/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>

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/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/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/sequence/view/transform_view/transform_view.hpp>
+#include <boost/fusion/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>

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/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE tuple
 #include "comparison.hpp"

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/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE tuple
 #define FUSION_AT get

test/sequence/tuple_misc.cpp

@@ -7,7 +7,7 @@
 ==============================================================================*/
 #include <boost/fusion/tuple.hpp>
 #include <boost/fusion/sequence/conversion/as_vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE tuple
 #define FUSION_AT get