diff --git a/include/boost/fusion/sequence/adapted.hpp b/include/boost/fusion/adapted.hpp
similarity index 65%
rename from include/boost/fusion/sequence/adapted.hpp
rename to include/boost/fusion/adapted.hpp
index ea951f19..23693645 100644
--- a/include/boost/fusion/sequence/adapted.hpp
+++ b/include/boost/fusion/adapted.hpp
@@ -8,10 +8,10 @@
 #if !defined(BOOST_FUSION_ADAPTED_30122005_1420)
 #define BOOST_FUSION_ADAPTED_30122005_1420
 
-#include <boost/fusion/sequence/adapted/boost_tuple.hpp>
-#include <boost/fusion/sequence/adapted/std_pair.hpp>
-#include <boost/fusion/sequence/adapted/array.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/adapted/variant.hpp>
+#include <boost/fusion/adapted/boost_tuple.hpp>
+#include <boost/fusion/adapted/std_pair.hpp>
+#include <boost/fusion/adapted/array.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/adapted/variant.hpp>
 
 #endif
diff --git a/include/boost/fusion/adapted/array.hpp b/include/boost/fusion/adapted/array.hpp
new file mode 100644
index 00000000..2be9d4ba
--- /dev/null
+++ b/include/boost/fusion/adapted/array.hpp
@@ -0,0 +1,22 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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)
+==============================================================================*/
+#if !defined(BOOST_FUSION_ARRAY_27122005_1035)
+#define BOOST_FUSION_ARRAY_27122005_1035
+
+#include <boost/fusion/adapted/array/array_iterator.hpp>
+#include <boost/fusion/adapted/array/tag_of.hpp>
+#include <boost/fusion/adapted/array/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/array/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/array/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/array/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/array/detail/end_impl.hpp>
+#include <boost/fusion/adapted/array/detail/size_impl.hpp>
+#include <boost/fusion/adapted/array/detail/at_impl.hpp>
+#include <boost/fusion/adapted/array/detail/value_at_impl.hpp>
+
+#endif
diff --git a/include/boost/fusion/sequence/adapted/array/array_iterator.hpp b/include/boost/fusion/adapted/array/array_iterator.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/array/array_iterator.hpp
rename to include/boost/fusion/adapted/array/array_iterator.hpp
diff --git a/include/boost/fusion/sequence/adapted/array/detail/at_impl.hpp b/include/boost/fusion/adapted/array/detail/at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/array/detail/at_impl.hpp
rename to include/boost/fusion/adapted/array/detail/at_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/array/detail/begin_impl.hpp b/include/boost/fusion/adapted/array/detail/begin_impl.hpp
similarity index 94%
rename from include/boost/fusion/sequence/adapted/array/detail/begin_impl.hpp
rename to include/boost/fusion/adapted/array/detail/begin_impl.hpp
index fc4fb6a3..06dc8c51 100644
--- a/include/boost/fusion/sequence/adapted/array/detail/begin_impl.hpp
+++ b/include/boost/fusion/adapted/array/detail/begin_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_27122005_1117)
 #define BOOST_FUSION_BEGIN_IMPL_27122005_1117
 
-#include <boost/fusion/sequence/adapted/array/array_iterator.hpp>
+#include <boost/fusion/adapted/array/array_iterator.hpp>
 
 namespace boost { namespace fusion {
 
diff --git a/include/boost/fusion/sequence/adapted/array/detail/category_of_impl.hpp b/include/boost/fusion/adapted/array/detail/category_of_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/array/detail/category_of_impl.hpp
rename to include/boost/fusion/adapted/array/detail/category_of_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/array/detail/end_impl.hpp b/include/boost/fusion/adapted/array/detail/end_impl.hpp
similarity index 94%
rename from include/boost/fusion/sequence/adapted/array/detail/end_impl.hpp
rename to include/boost/fusion/adapted/array/detail/end_impl.hpp
index a3ffbed4..c9432c9b 100644
--- a/include/boost/fusion/sequence/adapted/array/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/array/detail/end_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_27122005_1120)
 #define BOOST_FUSION_END_IMPL_27122005_1120
 
-#include <boost/fusion/sequence/adapted/array/array_iterator.hpp>
+#include <boost/fusion/adapted/array/array_iterator.hpp>
 
 namespace boost { namespace fusion {
 
diff --git a/include/boost/fusion/sequence/adapted/array/detail/is_sequence_impl.hpp b/include/boost/fusion/adapted/array/detail/is_sequence_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/array/detail/is_sequence_impl.hpp
rename to include/boost/fusion/adapted/array/detail/is_sequence_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/array/detail/is_view_impl.hpp b/include/boost/fusion/adapted/array/detail/is_view_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/array/detail/is_view_impl.hpp
rename to include/boost/fusion/adapted/array/detail/is_view_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/array/detail/size_impl.hpp b/include/boost/fusion/adapted/array/detail/size_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/array/detail/size_impl.hpp
rename to include/boost/fusion/adapted/array/detail/size_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/array/detail/value_at_impl.hpp b/include/boost/fusion/adapted/array/detail/value_at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/array/detail/value_at_impl.hpp
rename to include/boost/fusion/adapted/array/detail/value_at_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/array/tag_of.hpp b/include/boost/fusion/adapted/array/tag_of.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/array/tag_of.hpp
rename to include/boost/fusion/adapted/array/tag_of.hpp
diff --git a/include/boost/fusion/adapted/boost_tuple.hpp b/include/boost/fusion/adapted/boost_tuple.hpp
new file mode 100644
index 00000000..2924df07
--- /dev/null
+++ b/include/boost/fusion/adapted/boost_tuple.hpp
@@ -0,0 +1,20 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(BOOST_FUSION_BOOST_TUPLE_09272006_0732)
+#define BOOST_FUSION_BOOST_TUPLE_09272006_0732
+
+#include <boost/fusion/adapted/boost_tuple/tag_of.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/end_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/size_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/at_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp>
+
+#endif
diff --git a/include/boost/fusion/sequence/adapted/boost_tuple/boost_tuple_iterator.hpp b/include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/boost_tuple/boost_tuple_iterator.hpp
rename to include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp
diff --git a/include/boost/fusion/sequence/adapted/boost_tuple/detail/at_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/boost_tuple/detail/at_impl.hpp
rename to include/boost/fusion/adapted/boost_tuple/detail/at_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/boost_tuple/detail/begin_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp
similarity index 92%
rename from include/boost/fusion/sequence/adapted/boost_tuple/detail/begin_impl.hpp
rename to include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp
index aaa6a670..ee9a89eb 100644
--- a/include/boost/fusion/sequence/adapted/boost_tuple/detail/begin_impl.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp
@@ -7,7 +7,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_09272006_0719)
 #define BOOST_FUSION_BEGIN_IMPL_09272006_0719
 
-#include <boost/fusion/sequence/adapted/boost_tuple/boost_tuple_iterator.hpp>
+#include <boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp>
 
 namespace boost { namespace fusion 
 {
diff --git a/include/boost/fusion/sequence/adapted/boost_tuple/detail/category_of_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/boost_tuple/detail/category_of_impl.hpp
rename to include/boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/boost_tuple/detail/end_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp
similarity index 94%
rename from include/boost/fusion/sequence/adapted/boost_tuple/detail/end_impl.hpp
rename to include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp
index 016bca3f..2fb27a7a 100644
--- a/include/boost/fusion/sequence/adapted/boost_tuple/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp
@@ -7,7 +7,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_09272006_0721)
 #define BOOST_FUSION_END_IMPL_09272006_0721
 
-#include <boost/fusion/sequence/adapted/boost_tuple/boost_tuple_iterator.hpp>
+#include <boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits/is_const.hpp>
 
diff --git a/include/boost/fusion/sequence/adapted/boost_tuple/detail/is_sequence_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/boost_tuple/detail/is_sequence_impl.hpp
rename to include/boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/boost_tuple/detail/is_view_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/boost_tuple/detail/is_view_impl.hpp
rename to include/boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/boost_tuple/detail/size_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/size_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/boost_tuple/detail/size_impl.hpp
rename to include/boost/fusion/adapted/boost_tuple/detail/size_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/boost_tuple/detail/value_at_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/boost_tuple/detail/value_at_impl.hpp
rename to include/boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/boost_tuple/tag_of.hpp b/include/boost/fusion/adapted/boost_tuple/tag_of.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/boost_tuple/tag_of.hpp
rename to include/boost/fusion/adapted/boost_tuple/tag_of.hpp
diff --git a/include/boost/fusion/adapted/mpl.hpp b/include/boost/fusion/adapted/mpl.hpp
new file mode 100644
index 00000000..f8257846
--- /dev/null
+++ b/include/boost/fusion/adapted/mpl.hpp
@@ -0,0 +1,21 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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)
+==============================================================================*/
+#if !defined(BOOST_FUSION_MPL_31122005_1152)
+#define BOOST_FUSION_MPL_31122005_1152
+
+#include <boost/fusion/adapted/mpl/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/end_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/size_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/value_at_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/at_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/has_key_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/is_view_impl.hpp>
+
+#endif
diff --git a/include/boost/fusion/sequence/adapted/mpl/detail/at_impl.hpp b/include/boost/fusion/adapted/mpl/detail/at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/mpl/detail/at_impl.hpp
rename to include/boost/fusion/adapted/mpl/detail/at_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/mpl/detail/begin_impl.hpp b/include/boost/fusion/adapted/mpl/detail/begin_impl.hpp
similarity index 95%
rename from include/boost/fusion/sequence/adapted/mpl/detail/begin_impl.hpp
rename to include/boost/fusion/adapted/mpl/detail/begin_impl.hpp
index 04e09e44..1ec77d8b 100644
--- a/include/boost/fusion/sequence/adapted/mpl/detail/begin_impl.hpp
+++ b/include/boost/fusion/adapted/mpl/detail/begin_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_31122005_1209)
 #define BOOST_FUSION_BEGIN_IMPL_31122005_1209
 
-#include <boost/fusion/sequence/adapted/mpl/mpl_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 #include <boost/mpl/begin.hpp>
 #include <boost/type_traits/remove_const.hpp>
 
diff --git a/include/boost/fusion/sequence/adapted/mpl/detail/category_of_impl.hpp b/include/boost/fusion/adapted/mpl/detail/category_of_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/mpl/detail/category_of_impl.hpp
rename to include/boost/fusion/adapted/mpl/detail/category_of_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/mpl/detail/empty_impl.hpp b/include/boost/fusion/adapted/mpl/detail/empty_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/mpl/detail/empty_impl.hpp
rename to include/boost/fusion/adapted/mpl/detail/empty_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/mpl/detail/end_impl.hpp b/include/boost/fusion/adapted/mpl/detail/end_impl.hpp
similarity index 95%
rename from include/boost/fusion/sequence/adapted/mpl/detail/end_impl.hpp
rename to include/boost/fusion/adapted/mpl/detail/end_impl.hpp
index 6b3d7933..e3466956 100644
--- a/include/boost/fusion/sequence/adapted/mpl/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/mpl/detail/end_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_31122005_1237)
 #define BOOST_FUSION_END_IMPL_31122005_1237
 
-#include <boost/fusion/sequence/adapted/mpl/mpl_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 #include <boost/mpl/end.hpp>
 #include <boost/type_traits/add_const.hpp>
 
diff --git a/include/boost/fusion/sequence/adapted/mpl/detail/has_key_impl.hpp b/include/boost/fusion/adapted/mpl/detail/has_key_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/mpl/detail/has_key_impl.hpp
rename to include/boost/fusion/adapted/mpl/detail/has_key_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/mpl/detail/is_sequence_impl.hpp b/include/boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/mpl/detail/is_sequence_impl.hpp
rename to include/boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/mpl/detail/is_view_impl.hpp b/include/boost/fusion/adapted/mpl/detail/is_view_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/mpl/detail/is_view_impl.hpp
rename to include/boost/fusion/adapted/mpl/detail/is_view_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/mpl/detail/size_impl.hpp b/include/boost/fusion/adapted/mpl/detail/size_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/mpl/detail/size_impl.hpp
rename to include/boost/fusion/adapted/mpl/detail/size_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/mpl/detail/value_at_impl.hpp b/include/boost/fusion/adapted/mpl/detail/value_at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/mpl/detail/value_at_impl.hpp
rename to include/boost/fusion/adapted/mpl/detail/value_at_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/mpl/mpl_iterator.hpp b/include/boost/fusion/adapted/mpl/mpl_iterator.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/mpl/mpl_iterator.hpp
rename to include/boost/fusion/adapted/mpl/mpl_iterator.hpp
diff --git a/include/boost/fusion/sequence/adapted/std_pair.hpp b/include/boost/fusion/adapted/std_pair.hpp
similarity index 96%
rename from include/boost/fusion/sequence/adapted/std_pair.hpp
rename to include/boost/fusion/adapted/std_pair.hpp
index 0b755a0b..d13b810a 100644
--- a/include/boost/fusion/sequence/adapted/std_pair.hpp
+++ b/include/boost/fusion/adapted/std_pair.hpp
@@ -9,7 +9,7 @@
 #define BOOST_FUSION_STD_PAIR_24122005_1744
 
 #include <boost/fusion/support/tag_of_fwd.hpp>
-#include <boost/fusion/sequence/adapted/struct.hpp>
+#include <boost/fusion/adapted/struct.hpp>
 #include <boost/mpl/int.hpp>
 #include <utility>
 
diff --git a/include/boost/fusion/sequence/adapted/std_pair/detail/at_impl.hpp b/include/boost/fusion/adapted/std_pair/detail/at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/std_pair/detail/at_impl.hpp
rename to include/boost/fusion/adapted/std_pair/detail/at_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/std_pair/detail/begin_impl.hpp b/include/boost/fusion/adapted/std_pair/detail/begin_impl.hpp
similarity index 93%
rename from include/boost/fusion/sequence/adapted/std_pair/detail/begin_impl.hpp
rename to include/boost/fusion/adapted/std_pair/detail/begin_impl.hpp
index 1b77b7a7..1fd48f51 100644
--- a/include/boost/fusion/sequence/adapted/std_pair/detail/begin_impl.hpp
+++ b/include/boost/fusion/adapted/std_pair/detail/begin_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_24122005_1752)
 #define BOOST_FUSION_BEGIN_IMPL_24122005_1752
 
-#include <boost/fusion/sequence/adapted/std_pair/std_pair_iterator.hpp>
+#include <boost/fusion/adapted/std_pair/std_pair_iterator.hpp>
 
 namespace boost { namespace fusion {
 
diff --git a/include/boost/fusion/sequence/adapted/std_pair/detail/category_of_impl.hpp b/include/boost/fusion/adapted/std_pair/detail/category_of_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/std_pair/detail/category_of_impl.hpp
rename to include/boost/fusion/adapted/std_pair/detail/category_of_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/std_pair/detail/end_impl.hpp b/include/boost/fusion/adapted/std_pair/detail/end_impl.hpp
similarity index 93%
rename from include/boost/fusion/sequence/adapted/std_pair/detail/end_impl.hpp
rename to include/boost/fusion/adapted/std_pair/detail/end_impl.hpp
index 9aab76c5..747f2c6f 100644
--- a/include/boost/fusion/sequence/adapted/std_pair/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/std_pair/detail/end_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_24122005_1755)
 #define BOOST_FUSION_END_IMPL_24122005_1755
 
-#include <boost/fusion/sequence/adapted/std_pair/std_pair_iterator.hpp>
+#include <boost/fusion/adapted/std_pair/std_pair_iterator.hpp>
 
 namespace boost { namespace fusion {
 
diff --git a/include/boost/fusion/sequence/adapted/std_pair/detail/is_sequence_impl.hpp b/include/boost/fusion/adapted/std_pair/detail/is_sequence_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/std_pair/detail/is_sequence_impl.hpp
rename to include/boost/fusion/adapted/std_pair/detail/is_sequence_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/std_pair/detail/is_view_impl.hpp b/include/boost/fusion/adapted/std_pair/detail/is_view_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/std_pair/detail/is_view_impl.hpp
rename to include/boost/fusion/adapted/std_pair/detail/is_view_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/std_pair/detail/size_impl.hpp b/include/boost/fusion/adapted/std_pair/detail/size_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/std_pair/detail/size_impl.hpp
rename to include/boost/fusion/adapted/std_pair/detail/size_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/std_pair/detail/value_at_impl.hpp b/include/boost/fusion/adapted/std_pair/detail/value_at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/std_pair/detail/value_at_impl.hpp
rename to include/boost/fusion/adapted/std_pair/detail/value_at_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/std_pair/std_pair_iterator.hpp b/include/boost/fusion/adapted/std_pair/std_pair_iterator.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/std_pair/std_pair_iterator.hpp
rename to include/boost/fusion/adapted/std_pair/std_pair_iterator.hpp
diff --git a/include/boost/fusion/sequence/adapted/std_pair/tag_of.hpp b/include/boost/fusion/adapted/std_pair/tag_of.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/std_pair/tag_of.hpp
rename to include/boost/fusion/adapted/std_pair/tag_of.hpp
diff --git a/include/boost/fusion/adapted/struct.hpp b/include/boost/fusion/adapted/struct.hpp
new file mode 100644
index 00000000..4b36f179
--- /dev/null
+++ b/include/boost/fusion/adapted/struct.hpp
@@ -0,0 +1,23 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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)
+==============================================================================*/
+#if !defined(BOOST_FUSION_STRUCT_24122005_1744)
+#define BOOST_FUSION_STD_STRUCT_24122005_1744
+
+#include <boost/fusion/adapted/struct/extension.hpp>
+#include <boost/fusion/adapted/struct/adapt_struct.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/end_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/size_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/at_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/value_at_impl.hpp>
+
+#endif
diff --git a/include/boost/fusion/sequence/adapted/struct/adapt_assoc_struct.hpp b/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
similarity index 83%
rename from include/boost/fusion/sequence/adapted/struct/adapt_assoc_struct.hpp
rename to include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
index 44357c00..e621187f 100644
--- a/include/boost/fusion/sequence/adapted/struct/adapt_assoc_struct.hpp
+++ b/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
@@ -9,19 +9,19 @@
 #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_20070508_2207
 
 #include <boost/fusion/support/tag_of_fwd.hpp>
-#include <boost/fusion/sequence/adapted/struct/extension.hpp>
-#include <boost/fusion/sequence/adapted/struct/struct_iterator.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/is_view_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/is_sequence_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/category_of_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/end_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/size_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/at_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/value_at_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/has_key_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/at_key_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/value_at_key_impl.hpp>
+#include <boost/fusion/adapted/struct/extension.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/end_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/size_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/at_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/value_at_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/has_key_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/at_key_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/value_at_key_impl.hpp>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>
diff --git a/include/boost/fusion/sequence/adapted/struct/adapt_struct.hpp b/include/boost/fusion/adapted/struct/adapt_struct.hpp
similarity index 84%
rename from include/boost/fusion/sequence/adapted/struct/adapt_struct.hpp
rename to include/boost/fusion/adapted/struct/adapt_struct.hpp
index 38d03edb..e8eb6a67 100644
--- a/include/boost/fusion/sequence/adapted/struct/adapt_struct.hpp
+++ b/include/boost/fusion/adapted/struct/adapt_struct.hpp
@@ -8,16 +8,16 @@
 #define BOOST_FUSION_ADAPT_STRUCT_APRIL_2_2007_1158AM
 
 #include <boost/fusion/support/tag_of_fwd.hpp>
-#include <boost/fusion/sequence/adapted/struct/extension.hpp>
-#include <boost/fusion/sequence/adapted/struct/struct_iterator.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/is_view_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/is_sequence_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/category_of_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/end_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/size_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/at_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/value_at_impl.hpp>
+#include <boost/fusion/adapted/struct/extension.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/end_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/size_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/at_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/value_at_impl.hpp>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>
diff --git a/include/boost/fusion/sequence/adapted/struct/detail/at_impl.hpp b/include/boost/fusion/adapted/struct/detail/at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/struct/detail/at_impl.hpp
rename to include/boost/fusion/adapted/struct/detail/at_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/struct/detail/at_key_impl.hpp b/include/boost/fusion/adapted/struct/detail/at_key_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/struct/detail/at_key_impl.hpp
rename to include/boost/fusion/adapted/struct/detail/at_key_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/struct/detail/begin_impl.hpp b/include/boost/fusion/adapted/struct/detail/begin_impl.hpp
similarity index 93%
rename from include/boost/fusion/sequence/adapted/struct/detail/begin_impl.hpp
rename to include/boost/fusion/adapted/struct/detail/begin_impl.hpp
index 14817726..bf5a00bc 100644
--- a/include/boost/fusion/sequence/adapted/struct/detail/begin_impl.hpp
+++ b/include/boost/fusion/adapted/struct/detail/begin_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_24122005_1752)
 #define BOOST_FUSION_BEGIN_IMPL_24122005_1752
 
-#include <boost/fusion/sequence/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/adapted/struct/detail/category_of_impl.hpp b/include/boost/fusion/adapted/struct/detail/category_of_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/struct/detail/category_of_impl.hpp
rename to include/boost/fusion/adapted/struct/detail/category_of_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/struct/detail/end_impl.hpp b/include/boost/fusion/adapted/struct/detail/end_impl.hpp
similarity index 93%
rename from include/boost/fusion/sequence/adapted/struct/detail/end_impl.hpp
rename to include/boost/fusion/adapted/struct/detail/end_impl.hpp
index 91830cea..42d7f394 100644
--- a/include/boost/fusion/sequence/adapted/struct/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/struct/detail/end_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_24122005_1755)
 #define BOOST_FUSION_END_IMPL_24122005_1755
 
-#include <boost/fusion/sequence/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/adapted/struct/detail/has_key_impl.hpp b/include/boost/fusion/adapted/struct/detail/has_key_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/struct/detail/has_key_impl.hpp
rename to include/boost/fusion/adapted/struct/detail/has_key_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/struct/detail/is_sequence_impl.hpp b/include/boost/fusion/adapted/struct/detail/is_sequence_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/struct/detail/is_sequence_impl.hpp
rename to include/boost/fusion/adapted/struct/detail/is_sequence_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/struct/detail/is_view_impl.hpp b/include/boost/fusion/adapted/struct/detail/is_view_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/struct/detail/is_view_impl.hpp
rename to include/boost/fusion/adapted/struct/detail/is_view_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/struct/detail/size_impl.hpp b/include/boost/fusion/adapted/struct/detail/size_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/struct/detail/size_impl.hpp
rename to include/boost/fusion/adapted/struct/detail/size_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/struct/detail/value_at_impl.hpp b/include/boost/fusion/adapted/struct/detail/value_at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/struct/detail/value_at_impl.hpp
rename to include/boost/fusion/adapted/struct/detail/value_at_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/struct/detail/value_at_key_impl.hpp b/include/boost/fusion/adapted/struct/detail/value_at_key_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/struct/detail/value_at_key_impl.hpp
rename to include/boost/fusion/adapted/struct/detail/value_at_key_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/struct/extension.hpp b/include/boost/fusion/adapted/struct/extension.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/struct/extension.hpp
rename to include/boost/fusion/adapted/struct/extension.hpp
diff --git a/include/boost/fusion/sequence/adapted/struct/struct_iterator.hpp b/include/boost/fusion/adapted/struct/struct_iterator.hpp
similarity index 97%
rename from include/boost/fusion/sequence/adapted/struct/struct_iterator.hpp
rename to include/boost/fusion/adapted/struct/struct_iterator.hpp
index b00251bb..caea895b 100644
--- a/include/boost/fusion/sequence/adapted/struct/struct_iterator.hpp
+++ b/include/boost/fusion/adapted/struct/struct_iterator.hpp
@@ -9,7 +9,7 @@
 #define FUSION_STRUCT_ITERATOR_APRIL_2_2007_1008AM
 
 #include <boost/fusion/iterator/iterator_facade.hpp>
-#include <boost/fusion/sequence/adapted/struct/extension.hpp>
+#include <boost/fusion/adapted/struct/extension.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/mpl/assert.hpp>
diff --git a/include/boost/fusion/adapted/variant.hpp b/include/boost/fusion/adapted/variant.hpp
new file mode 100644
index 00000000..5e711c17
--- /dev/null
+++ b/include/boost/fusion/adapted/variant.hpp
@@ -0,0 +1,20 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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)
+==============================================================================*/
+#if !defined(BOOST_FUSION_VARIANT_12112006_1614)
+#define BOOST_FUSION_VARIANT_12112006_1614
+
+#include <boost/fusion/adapted/variant/variant_iterator.hpp>
+#include <boost/fusion/adapted/variant/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/variant/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/variant/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/variant/tag_of.hpp>
+#include <boost/fusion/adapted/variant/detail/size_impl.hpp>
+#include <boost/fusion/adapted/variant/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/variant/detail/end_impl.hpp>
+
+#endif
diff --git a/include/boost/fusion/sequence/adapted/variant/detail/begin_impl.hpp b/include/boost/fusion/adapted/variant/detail/begin_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/variant/detail/begin_impl.hpp
rename to include/boost/fusion/adapted/variant/detail/begin_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/variant/detail/category_of_impl.hpp b/include/boost/fusion/adapted/variant/detail/category_of_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/variant/detail/category_of_impl.hpp
rename to include/boost/fusion/adapted/variant/detail/category_of_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/variant/detail/end_impl.hpp b/include/boost/fusion/adapted/variant/detail/end_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/variant/detail/end_impl.hpp
rename to include/boost/fusion/adapted/variant/detail/end_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/variant/detail/is_sequence_impl.hpp b/include/boost/fusion/adapted/variant/detail/is_sequence_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/variant/detail/is_sequence_impl.hpp
rename to include/boost/fusion/adapted/variant/detail/is_sequence_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/variant/detail/is_view_impl.hpp b/include/boost/fusion/adapted/variant/detail/is_view_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/variant/detail/is_view_impl.hpp
rename to include/boost/fusion/adapted/variant/detail/is_view_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/variant/detail/size_impl.hpp b/include/boost/fusion/adapted/variant/detail/size_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/variant/detail/size_impl.hpp
rename to include/boost/fusion/adapted/variant/detail/size_impl.hpp
diff --git a/include/boost/fusion/sequence/adapted/variant/tag_of.hpp b/include/boost/fusion/adapted/variant/tag_of.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/variant/tag_of.hpp
rename to include/boost/fusion/adapted/variant/tag_of.hpp
diff --git a/include/boost/fusion/sequence/adapted/variant/variant_iterator.hpp b/include/boost/fusion/adapted/variant/variant_iterator.hpp
similarity index 100%
rename from include/boost/fusion/sequence/adapted/variant/variant_iterator.hpp
rename to include/boost/fusion/adapted/variant/variant_iterator.hpp
diff --git a/include/boost/fusion/algorithm/iteration/detail/fold.hpp b/include/boost/fusion/algorithm/iteration/detail/fold.hpp
index 542a8114..390b188c 100644
--- a/include/boost/fusion/algorithm/iteration/detail/fold.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/fold.hpp
@@ -1,3 +1,10 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2006 Dan Marsden
+
+    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)
+==============================================================================*/
 #if !defined(BOOST_FUSION_FOLD_HPP_20070528_1253)
 #define BOOST_FUSION_FOLD_HPP_20070528_1253
 
@@ -98,7 +105,7 @@ namespace detail
     struct unrolled_fold<3>
     {
         template<typename I0, typename State, typename F>
-        static typename result_of_unrolled_fold<I0, State, F, 3>::type 
+        static typename result_of_unrolled_fold<I0, State, F, 3>::type
         call(I0 const& i0, State const& state, F f)
         {
             typedef typename result_of::next<I0>::type I1;
@@ -113,7 +120,7 @@ namespace detail
     struct unrolled_fold<2>
     {
         template<typename I0, typename State, typename F>
-        static typename result_of_unrolled_fold<I0, State, F, 2>::type 
+        static typename result_of_unrolled_fold<I0, State, F, 2>::type
         call(I0 const& i0, State const& state, F f)
         {
             typedef typename result_of::next<I0>::type I1;
@@ -126,7 +133,7 @@ namespace detail
     struct unrolled_fold<1>
     {
         template<typename I0, typename State, typename F>
-        static typename result_of_unrolled_fold<I0, State, F, 1>::type 
+        static typename result_of_unrolled_fold<I0, State, F, 1>::type
         call(I0 const& i0, State const& state, F f)
         {
             return f(*i0, state);
diff --git a/include/boost/fusion/algorithm/query/ext_/find_if_s.hpp b/include/boost/fusion/algorithm/query/ext_/find_if_s.hpp
index 2534ba4e..82c20b4c 100755
--- a/include/boost/fusion/algorithm/query/ext_/find_if_s.hpp
+++ b/include/boost/fusion/algorithm/query/ext_/find_if_s.hpp
@@ -14,10 +14,10 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/fusion/algorithm/query/find_if.hpp>
-#include <boost/fusion/sequence/container/list/cons.hpp>
+#include <boost/fusion/container/list/cons.hpp>
 #include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
-#include <boost/fusion/sequence/view/ext_/segmented_iterator.hpp>
-#include <boost/fusion/sequence/view/ext_/segmented_iterator_range.hpp>
+#include <boost/fusion/view/ext_/segmented_iterator.hpp>
+#include <boost/fusion/view/ext_/segmented_iterator_range.hpp>
 #include <boost/fusion/support/ext_/is_segmented.hpp>
 
 // fwd declarations
diff --git a/include/boost/fusion/algorithm/transformation/clear.hpp b/include/boost/fusion/algorithm/transformation/clear.hpp
index 31e4269d..75328232 100644
--- a/include/boost/fusion/algorithm/transformation/clear.hpp
+++ b/include/boost/fusion/algorithm/transformation/clear.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_CLEAR_09172005_1127)
 #define FUSION_CLEAR_09172005_1127
 
-#include <boost/fusion/sequence/container/vector/vector10.hpp>
+#include <boost/fusion/container/vector/vector10.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/algorithm/transformation/erase.hpp b/include/boost/fusion/algorithm/transformation/erase.hpp
index 9e78da27..d0405c30 100644
--- a/include/boost/fusion/algorithm/transformation/erase.hpp
+++ b/include/boost/fusion/algorithm/transformation/erase.hpp
@@ -1,20 +1,21 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_ERASE_07232005_0534)
 #define FUSION_ERASE_07232005_0534
 
-#include <boost/fusion/sequence/container/vector/vector10.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/iterator/equal_to.hpp>
+#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/container/vector/vector10.hpp>
+#include <boost/fusion/view/joint_view/joint_view.hpp>
+#include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/iterator/equal_to.hpp>
-#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 
 namespace boost { namespace fusion
 {
@@ -25,7 +26,7 @@ namespace boost { namespace fusion
         {
             typedef typename result_of::end<Sequence>::type seq_last_type;
             typedef typename convert_iterator<First>::type first_type;
-            typedef typename 
+            typedef typename
                 mpl::if_<
                     result_of::equal_to<first_type, seq_last_type>
                   , first_type
@@ -33,19 +34,19 @@ namespace boost { namespace fusion
                 >::type
             type;
 
-            static type 
+            static type
             call(First const& first, mpl::false_)
             {
                 return fusion::next(convert_iterator<First>::call(first));
             }
 
-            static type 
+            static type
             call(First const& first, mpl::true_)
             {
                 return convert_iterator<First>::call(first);
             }
 
-            static type 
+            static type
             call(First const& first)
             {
                 return call(first, result_of::equal_to<first_type, seq_last_type>());
diff --git a/include/boost/fusion/algorithm/transformation/filter.hpp b/include/boost/fusion/algorithm/transformation/filter.hpp
index 16244649..52bf6af3 100644
--- a/include/boost/fusion/algorithm/transformation/filter.hpp
+++ b/include/boost/fusion/algorithm/transformation/filter.hpp
@@ -8,7 +8,7 @@
 #if !defined(FUSION_FILTER_02122005_1839)
 #define FUSION_FILTER_02122005_1839
 
-#include <boost/fusion/sequence/view/filter_view/filter_view.hpp>
+#include <boost/fusion/view/filter_view/filter_view.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/algorithm/transformation/filter_if.hpp b/include/boost/fusion/algorithm/transformation/filter_if.hpp
index 4f362882..d13113b1 100644
--- a/include/boost/fusion/algorithm/transformation/filter_if.hpp
+++ b/include/boost/fusion/algorithm/transformation/filter_if.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_FILTER_IF_07172005_0818)
 #define FUSION_FILTER_IF_07172005_0818
 
-#include <boost/fusion/sequence/view/filter_view/filter_view.hpp>
+#include <boost/fusion/view/filter_view/filter_view.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/algorithm/transformation/insert.hpp b/include/boost/fusion/algorithm/transformation/insert.hpp
index ebe06f14..1702bc19 100644
--- a/include/boost/fusion/algorithm/transformation/insert.hpp
+++ b/include/boost/fusion/algorithm/transformation/insert.hpp
@@ -1,20 +1,21 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_INSERT_07222005_0730)
 #define FUSION_INSERT_07222005_0730
 
-#include <boost/fusion/sequence/container/vector/vector10.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
-#include <boost/fusion/sequence/view/single_view/single_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/container/vector/vector10.hpp>
+#include <boost/fusion/view/joint_view/joint_view.hpp>
+#include <boost/fusion/view/single_view/single_view.hpp>
+#include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 
 namespace boost { namespace fusion
 {
@@ -42,7 +43,7 @@ namespace boost { namespace fusion
     insert(Sequence const& seq, Position const& pos, T const& x)
     {
         typedef result_of::insert<
-            Sequence const, Position, T> 
+            Sequence const, Position, T>
         result_of;
         typedef typename result_of::left_type left_type;
         typedef typename result_of::right_type right_type;
diff --git a/include/boost/fusion/algorithm/transformation/insert_range.hpp b/include/boost/fusion/algorithm/transformation/insert_range.hpp
index 4db840aa..1915c413 100644
--- a/include/boost/fusion/algorithm/transformation/insert_range.hpp
+++ b/include/boost/fusion/algorithm/transformation/insert_range.hpp
@@ -1,19 +1,20 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_INSERT_RANGE_009172005_1147)
 #define FUSION_INSERT_RANGE_009172005_1147
 
-#include <boost/fusion/sequence/container/vector/vector10.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/container/vector/vector10.hpp>
+#include <boost/fusion/view/joint_view/joint_view.hpp>
+#include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/algorithm/transformation/join.hpp b/include/boost/fusion/algorithm/transformation/join.hpp
index 10a5eecc..4ed78b5f 100644
--- a/include/boost/fusion/algorithm/transformation/join.hpp
+++ b/include/boost/fusion/algorithm/transformation/join.hpp
@@ -8,7 +8,7 @@
 #if !defined(FUSION_JOIN_200601222109)
 #define FUSION_JOIN_200601222109
 
-#include <boost/fusion/sequence/view/joint_view.hpp>
+#include <boost/fusion/view/joint_view.hpp>
 
 namespace boost { namespace fusion {
 
diff --git a/include/boost/fusion/algorithm/transformation/pop_back.hpp b/include/boost/fusion/algorithm/transformation/pop_back.hpp
index c83d5904..6eb743fd 100644
--- a/include/boost/fusion/algorithm/transformation/pop_back.hpp
+++ b/include/boost/fusion/algorithm/transformation/pop_back.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_POP_BACK_09172005_1038)
 #define FUSION_POP_BACK_09172005_1038
 
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/fusion/iterator/prior.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/pop_front.hpp b/include/boost/fusion/algorithm/transformation/pop_front.hpp
index d01e3754..aed524d3 100644
--- a/include/boost/fusion/algorithm/transformation/pop_front.hpp
+++ b/include/boost/fusion/algorithm/transformation/pop_front.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_POP_FRONT_09172005_1115)
 #define FUSION_POP_FRONT_09172005_1115
 
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/fusion/iterator/next.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/push_back.hpp b/include/boost/fusion/algorithm/transformation/push_back.hpp
index 98f63702..4fadc79c 100644
--- a/include/boost/fusion/algorithm/transformation/push_back.hpp
+++ b/include/boost/fusion/algorithm/transformation/push_back.hpp
@@ -8,8 +8,8 @@
 #define FUSION_PUSH_BACK_07162005_0235
 
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
-#include <boost/fusion/sequence/view/single_view/single_view.hpp>
+#include <boost/fusion/view/joint_view/joint_view.hpp>
+#include <boost/fusion/view/single_view/single_view.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/algorithm/transformation/push_front.hpp b/include/boost/fusion/algorithm/transformation/push_front.hpp
index 526e28f1..10f9fc10 100644
--- a/include/boost/fusion/algorithm/transformation/push_front.hpp
+++ b/include/boost/fusion/algorithm/transformation/push_front.hpp
@@ -8,8 +8,8 @@
 #define FUSION_PUSH_FRONT_07162005_0749
 
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
-#include <boost/fusion/sequence/view/single_view/single_view.hpp>
+#include <boost/fusion/view/joint_view/joint_view.hpp>
+#include <boost/fusion/view/single_view/single_view.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/algorithm/transformation/remove.hpp b/include/boost/fusion/algorithm/transformation/remove.hpp
index 1eb4bfb3..01718d32 100644
--- a/include/boost/fusion/algorithm/transformation/remove.hpp
+++ b/include/boost/fusion/algorithm/transformation/remove.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_REMOVE_07162005_0818)
 #define FUSION_REMOVE_07162005_0818
 
-#include <boost/fusion/sequence/view/filter_view/filter_view.hpp>
+#include <boost/fusion/view/filter_view/filter_view.hpp>
 #include <boost/mpl/not.hpp>
 #include <boost/type_traits/is_same.hpp>
 
diff --git a/include/boost/fusion/algorithm/transformation/remove_if.hpp b/include/boost/fusion/algorithm/transformation/remove_if.hpp
index c2140d17..ab13694d 100644
--- a/include/boost/fusion/algorithm/transformation/remove_if.hpp
+++ b/include/boost/fusion/algorithm/transformation/remove_if.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_REMOVE_IF_07162005_0818)
 #define FUSION_REMOVE_IF_07162005_0818
 
-#include <boost/fusion/sequence/view/filter_view/filter_view.hpp>
+#include <boost/fusion/view/filter_view/filter_view.hpp>
 #include <boost/mpl/not.hpp>
 #include <boost/type_traits/is_same.hpp>
 
diff --git a/include/boost/fusion/algorithm/transformation/replace.hpp b/include/boost/fusion/algorithm/transformation/replace.hpp
index 43657f99..780f1a45 100644
--- a/include/boost/fusion/algorithm/transformation/replace.hpp
+++ b/include/boost/fusion/algorithm/transformation/replace.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_REPLACE_08182005_0830)
 #define FUSION_REPLACE_08182005_0830
 
-#include <boost/fusion/sequence/view/transform_view/transform_view.hpp>
+#include <boost/fusion/view/transform_view/transform_view.hpp>
 #include <boost/fusion/algorithm/transformation/detail/replace.hpp>
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/algorithm/transformation/replace_if.hpp b/include/boost/fusion/algorithm/transformation/replace_if.hpp
index 07abbdca..90db5683 100644
--- a/include/boost/fusion/algorithm/transformation/replace_if.hpp
+++ b/include/boost/fusion/algorithm/transformation/replace_if.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_REPLACE_IF_08182005_0939)
 #define FUSION_REPLACE_IF_08182005_0939
 
-#include <boost/fusion/sequence/view/transform_view/transform_view.hpp>
+#include <boost/fusion/view/transform_view/transform_view.hpp>
 #include <boost/fusion/algorithm/transformation/detail/replace_if.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/reverse.hpp b/include/boost/fusion/algorithm/transformation/reverse.hpp
index faf78114..b95461c8 100644
--- a/include/boost/fusion/algorithm/transformation/reverse.hpp
+++ b/include/boost/fusion/algorithm/transformation/reverse.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_REVERSE_07212005_1230)
 #define FUSION_REVERSE_07212005_1230
 
-#include <boost/fusion/sequence/view/reverse_view/reverse_view.hpp>
+#include <boost/fusion/view/reverse_view/reverse_view.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/algorithm/transformation/transform.hpp b/include/boost/fusion/algorithm/transformation/transform.hpp
index 0315a8d0..d9f06e7c 100644
--- a/include/boost/fusion/algorithm/transformation/transform.hpp
+++ b/include/boost/fusion/algorithm/transformation/transform.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_TRANSFORM_07052005_1057)
 #define FUSION_TRANSFORM_07052005_1057
 
-#include <boost/fusion/sequence/view/transform_view/transform_view.hpp>
+#include <boost/fusion/view/transform_view/transform_view.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/algorithm/transformation/zip.hpp b/include/boost/fusion/algorithm/transformation/zip.hpp
index 33b7d25b..a2f66bfd 100644
--- a/include/boost/fusion/algorithm/transformation/zip.hpp
+++ b/include/boost/fusion/algorithm/transformation/zip.hpp
@@ -9,10 +9,10 @@
 #if !defined(FUSION_ZIP_HPP_20060125_2058)
 #define FUSION_ZIP_HPP_20060125_2058
 
-#include <boost/fusion/sequence/view/zip_view.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/view/zip_view.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/preprocessor/repetition/enum.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
diff --git a/include/boost/fusion/sequence/container.hpp b/include/boost/fusion/container.hpp
similarity index 64%
rename from include/boost/fusion/sequence/container.hpp
rename to include/boost/fusion/container.hpp
index 6a1047cc..e41c9cb3 100644
--- a/include/boost/fusion/sequence/container.hpp
+++ b/include/boost/fusion/container.hpp
@@ -7,10 +7,10 @@
 #if !defined(FUSION_SEQUENCE_CLASS_10022005_0614)
 #define FUSION_SEQUENCE_CLASS_10022005_0614
 
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/container/list.hpp>
-#include <boost/fusion/sequence/container/map.hpp>
-#include <boost/fusion/sequence/container/set.hpp>
-#include <boost/fusion/sequence/container/deque.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
+#include <boost/fusion/container/map.hpp>
+#include <boost/fusion/container/set.hpp>
+#include <boost/fusion/container/deque.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence/container/deque.hpp b/include/boost/fusion/container/deque.hpp
similarity index 81%
rename from include/boost/fusion/sequence/container/deque.hpp
rename to include/boost/fusion/container/deque.hpp
index 0c9614a9..bb29ce2f 100644
--- a/include/boost/fusion/sequence/container/deque.hpp
+++ b/include/boost/fusion/container/deque.hpp
@@ -2,13 +2,14 @@
     Copyright (c) 2001-2006 Joel de Guzman
     Copyright (c) 2005-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)
 ==============================================================================*/
 #if !defined(BOOST_FUSION_SEQUENCE_CONTAINER_DEQUE_24112006_2036)
 #define BOOST_FUSION_SEQUENCE_CONTAINER_DEQUE_24112006_2036
 
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/convert.hpp>
 
 #endif
 
diff --git a/include/boost/fusion/sequence/container/deque/back_extended_deque.hpp b/include/boost/fusion/container/deque/back_extended_deque.hpp
similarity index 95%
rename from include/boost/fusion/sequence/container/deque/back_extended_deque.hpp
rename to include/boost/fusion/container/deque/back_extended_deque.hpp
index 6310bb59..28d5ceca 100644
--- a/include/boost/fusion/sequence/container/deque/back_extended_deque.hpp
+++ b/include/boost/fusion/container/deque/back_extended_deque.hpp
@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_BACK_EXTENDED_DEQUE_26112006_2209)
 #define BOOST_FUSION_BACK_EXTENDED_DEQUE_26112006_2209
 
-#include <boost/fusion/sequence/container/deque/detail/keyed_element.hpp>
+#include <boost/fusion/container/deque/detail/keyed_element.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/plus.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
diff --git a/include/boost/fusion/sequence/conversion/as_deque.hpp b/include/boost/fusion/container/deque/convert.hpp
similarity index 81%
rename from include/boost/fusion/sequence/conversion/as_deque.hpp
rename to include/boost/fusion/container/deque/convert.hpp
index 78ae1273..0f3a75e2 100644
--- a/include/boost/fusion/sequence/conversion/as_deque.hpp
+++ b/include/boost/fusion/container/deque/convert.hpp
@@ -2,18 +2,19 @@
     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)
 ==============================================================================*/
-#if !defined(FUSION_AS_DEQUE_20061213_2207)
-#define FUSION_AS_DEQUE_20061213_2207
+#if !defined(FUSION_CONVERT_20061213_2207)
+#define FUSION_CONVERT_20061213_2207
 
-#include <boost/fusion/sequence/conversion/detail/as_deque.hpp>
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/detail/as_deque.hpp>
+#include <boost/fusion/container/deque/detail/convert_impl.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 
-namespace boost { namespace fusion 
+namespace boost { namespace fusion
 {
     namespace result_of
     {
diff --git a/include/boost/fusion/sequence/container/deque/deque.hpp b/include/boost/fusion/container/deque/deque.hpp
similarity index 77%
rename from include/boost/fusion/sequence/container/deque/deque.hpp
rename to include/boost/fusion/container/deque/deque.hpp
index 884899f8..27d9ce78 100644
--- a/include/boost/fusion/sequence/container/deque/deque.hpp
+++ b/include/boost/fusion/container/deque/deque.hpp
@@ -8,13 +8,13 @@
 #if !defined(BOOST_FUSION_DEQUE_26112006_1649)
 #define BOOST_FUSION_DEQUE_26112006_1649
 
-#include <boost/fusion/sequence/container/deque/limits.hpp>
-#include <boost/fusion/sequence/container/deque/front_extended_deque.hpp>
-#include <boost/fusion/sequence/container/deque/back_extended_deque.hpp>
-#include <boost/fusion/sequence/container/deque/detail/deque_keyed_values.hpp>
-#include <boost/fusion/sequence/container/deque/detail/deque_initial_size.hpp>
+#include <boost/fusion/container/deque/limits.hpp>
+#include <boost/fusion/container/deque/front_extended_deque.hpp>
+#include <boost/fusion/container/deque/back_extended_deque.hpp>
+#include <boost/fusion/container/deque/detail/deque_keyed_values.hpp>
+#include <boost/fusion/container/deque/detail/deque_initial_size.hpp>
 #include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/sequence/container/deque/detail/keyed_element.hpp>
+#include <boost/fusion/container/deque/detail/keyed_element.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
@@ -22,11 +22,11 @@
 #include <boost/type_traits/add_const.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 
-#include <boost/fusion/sequence/container/deque/deque_fwd.hpp>
-#include <boost/fusion/sequence/container/deque/detail/value_at_impl.hpp>
-#include <boost/fusion/sequence/container/deque/detail/at_impl.hpp>
-#include <boost/fusion/sequence/container/deque/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/container/deque/detail/end_impl.hpp>
+#include <boost/fusion/container/deque/deque_fwd.hpp>
+#include <boost/fusion/container/deque/detail/value_at_impl.hpp>
+#include <boost/fusion/container/deque/detail/at_impl.hpp>
+#include <boost/fusion/container/deque/detail/begin_impl.hpp>
+#include <boost/fusion/container/deque/detail/end_impl.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/mpl/bool.hpp>
 
@@ -52,7 +52,7 @@ namespace boost { namespace fusion {
             mpl::if_<mpl::equal_to<size, mpl::int_<0> >, mpl::int_<0>, mpl::int_<-1> >::type::value> next_down;
         typedef mpl::false_ is_view;
 
-#include <boost/fusion/sequence/container/deque/detail/deque_forward_ctor.hpp>
+#include <boost/fusion/container/deque/detail/deque_forward_ctor.hpp>
 
         deque()
             {}
diff --git a/include/boost/fusion/sequence/container/deque/deque_fwd.hpp b/include/boost/fusion/container/deque/deque_fwd.hpp
similarity index 92%
rename from include/boost/fusion/sequence/container/deque/deque_fwd.hpp
rename to include/boost/fusion/container/deque/deque_fwd.hpp
index ce47bf62..415bb2f2 100644
--- a/include/boost/fusion/sequence/container/deque/deque_fwd.hpp
+++ b/include/boost/fusion/container/deque/deque_fwd.hpp
@@ -8,7 +8,7 @@
 #if !defined(FUSION_DEQUE_FORWARD_02092007_0749)
 #define FUSION_DEQUE_FORWARD_02092007_0749
 
-#include <boost/fusion/sequence/container/deque/limits.hpp>
+#include <boost/fusion/container/deque/limits.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/sequence/container/deque/deque_iterator.hpp b/include/boost/fusion/container/deque/deque_iterator.hpp
similarity index 97%
rename from include/boost/fusion/sequence/container/deque/deque_iterator.hpp
rename to include/boost/fusion/container/deque/deque_iterator.hpp
index 8fb6f009..90c68918 100644
--- a/include/boost/fusion/sequence/container/deque/deque_iterator.hpp
+++ b/include/boost/fusion/container/deque/deque_iterator.hpp
@@ -9,7 +9,7 @@
 #define BOOST_FUSION_DEQUE_ITERATOR_26112006_2154
 
 #include <boost/fusion/iterator/iterator_facade.hpp>
-#include <boost/fusion/sequence/container/deque/detail/keyed_element.hpp>
+#include <boost/fusion/container/deque/detail/keyed_element.hpp>
 #include <boost/mpl/minus.hpp>
 #include <boost/mpl/equal_to.hpp>
 
diff --git a/include/boost/fusion/sequence/conversion/detail/as_deque.hpp b/include/boost/fusion/container/deque/detail/as_deque.hpp
similarity index 95%
rename from include/boost/fusion/sequence/conversion/detail/as_deque.hpp
rename to include/boost/fusion/container/deque/detail/as_deque.hpp
index 04e2a559..e48b7910 100644
--- a/include/boost/fusion/sequence/conversion/detail/as_deque.hpp
+++ b/include/boost/fusion/container/deque/detail/as_deque.hpp
@@ -16,7 +16,7 @@
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/inc.hpp>
 #include <boost/preprocessor/dec.hpp>
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 #include <boost/fusion/iterator/value_of.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/iterator/next.hpp>
@@ -55,7 +55,7 @@ namespace boost { namespace fusion { namespace detail
     typedef typename fusion::result_of::value_of<BOOST_PP_CAT(I, n)>::type      \
         BOOST_PP_CAT(T, n);
 
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/conversion/detail/as_deque.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/deque/detail/as_deque.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_DEQUE_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/deque/detail/at_impl.hpp b/include/boost/fusion/container/deque/detail/at_impl.hpp
similarity index 96%
rename from include/boost/fusion/sequence/container/deque/detail/at_impl.hpp
rename to include/boost/fusion/container/deque/detail/at_impl.hpp
index 7edf37f1..3dc7cde9 100644
--- a/include/boost/fusion/sequence/container/deque/detail/at_impl.hpp
+++ b/include/boost/fusion/container/deque/detail/at_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_DEQUE_AT_IMPL_09122006_2017)
 #define BOOST_FUSION_DEQUE_AT_IMPL_09122006_2017
 
-#include <boost/fusion/sequence/container/deque/detail/keyed_element.hpp>
+#include <boost/fusion/container/deque/detail/keyed_element.hpp>
 
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/equal_to.hpp>
diff --git a/include/boost/fusion/sequence/container/deque/detail/begin_impl.hpp b/include/boost/fusion/container/deque/detail/begin_impl.hpp
similarity index 95%
rename from include/boost/fusion/sequence/container/deque/detail/begin_impl.hpp
rename to include/boost/fusion/container/deque/detail/begin_impl.hpp
index 867cab8e..13b50143 100644
--- a/include/boost/fusion/sequence/container/deque/detail/begin_impl.hpp
+++ b/include/boost/fusion/container/deque/detail/begin_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_DEQUE_BEGIN_IMPL_09122006_2034)
 #define BOOST_FUSION_DEQUE_BEGIN_IMPL_09122006_2034
 
-#include <boost/fusion/sequence/container/deque/deque_iterator.hpp>
+#include <boost/fusion/container/deque/deque_iterator.hpp>
 
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/if.hpp>
diff --git a/include/boost/fusion/container/deque/detail/convert_impl.hpp b/include/boost/fusion/container/deque/detail/convert_impl.hpp
new file mode 100644
index 00000000..ac310a19
--- /dev/null
+++ b/include/boost/fusion/container/deque/detail/convert_impl.hpp
@@ -0,0 +1,45 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_CONVERT_IMPL_20061213_2207)
+#define FUSION_CONVERT_IMPL_20061213_2207
+
+#include <boost/fusion/container/deque/detail/as_deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/sequence/intrinsic/size.hpp>
+
+namespace boost { namespace fusion
+{
+    struct deque_tag;
+
+    namespace extension
+    {
+        template <typename T>
+        struct convert_impl;
+
+        template <>
+        struct convert_impl<deque_tag>
+        {
+            template <typename Sequence>
+            struct apply
+            {
+                typedef typename detail::as_deque<result_of::size<Sequence>::value> gen;
+                typedef typename gen::
+                    template apply<typename result_of::begin<Sequence>::type>::type
+                type;
+
+                static type call(Sequence& seq)
+                {
+                    return gen::call(fusion::begin(seq));
+                }
+            };
+        };
+    }
+}}
+
+#endif
diff --git a/include/boost/fusion/sequence/container/deque/detail/deque_forward_ctor.hpp b/include/boost/fusion/container/deque/detail/deque_forward_ctor.hpp
similarity index 93%
rename from include/boost/fusion/sequence/container/deque/detail/deque_forward_ctor.hpp
rename to include/boost/fusion/container/deque/detail/deque_forward_ctor.hpp
index f79a02e5..813c0491 100644
--- a/include/boost/fusion/sequence/container/deque/detail/deque_forward_ctor.hpp
+++ b/include/boost/fusion/container/deque/detail/deque_forward_ctor.hpp
@@ -14,7 +14,7 @@
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 
 #define BOOST_PP_FILENAME_1 \
-    <boost/fusion/sequence/container/deque/detail/deque_forward_ctor.hpp>
+    <boost/fusion/container/deque/detail/deque_forward_ctor.hpp>
 #define BOOST_PP_ITERATION_LIMITS (2, FUSION_MAX_DEQUE_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/deque/detail/deque_initial_size.hpp b/include/boost/fusion/container/deque/detail/deque_initial_size.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/deque/detail/deque_initial_size.hpp
rename to include/boost/fusion/container/deque/detail/deque_initial_size.hpp
diff --git a/include/boost/fusion/sequence/container/deque/detail/deque_keyed_values.hpp b/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp
similarity index 91%
rename from include/boost/fusion/sequence/container/deque/detail/deque_keyed_values.hpp
rename to include/boost/fusion/container/deque/detail/deque_keyed_values.hpp
index 26a76512..11b229b2 100644
--- a/include/boost/fusion/sequence/container/deque/detail/deque_keyed_values.hpp
+++ b/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp
@@ -8,8 +8,8 @@
 #if !defined(BOOST_FUSION_DEQUE_DETAIL_DEQUE_KEYED_VALUES_26112006_1330)
 #define BOOST_FUSION_DEQUE_DETAIL_DEQUE_KEYED_VALUES_26112006_1330
 
-#include <boost/fusion/sequence/container/deque/limits.hpp>
-#include <boost/fusion/sequence/container/deque/detail/keyed_element.hpp>
+#include <boost/fusion/container/deque/limits.hpp>
+#include <boost/fusion/container/deque/detail/keyed_element.hpp>
 
 #include <boost/preprocessor/iterate.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
@@ -59,7 +59,7 @@ namespace detail {
             BOOST_PP_ENUM_SHIFTED_PARAMS(FUSION_MAX_DEQUE_SIZE, T)>::type tail;
         typedef keyed_element<N, T0, tail> type;
 
-#include <boost/fusion/sequence/container/deque/detail/deque_keyed_values_call.hpp>
+#include <boost/fusion/container/deque/detail/deque_keyed_values_call.hpp>
 
     };
 
diff --git a/include/boost/fusion/sequence/container/deque/detail/deque_keyed_values_call.hpp b/include/boost/fusion/container/deque/detail/deque_keyed_values_call.hpp
similarity index 94%
rename from include/boost/fusion/sequence/container/deque/detail/deque_keyed_values_call.hpp
rename to include/boost/fusion/container/deque/detail/deque_keyed_values_call.hpp
index ab31c43c..0a39add6 100644
--- a/include/boost/fusion/sequence/container/deque/detail/deque_keyed_values_call.hpp
+++ b/include/boost/fusion/container/deque/detail/deque_keyed_values_call.hpp
@@ -14,7 +14,7 @@
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 
 #define BOOST_PP_FILENAME_1 \
-    <boost/fusion/sequence/container/deque/detail/deque_keyed_values_call.hpp>
+    <boost/fusion/container/deque/detail/deque_keyed_values_call.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_DEQUE_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/deque/detail/end_impl.hpp b/include/boost/fusion/container/deque/detail/end_impl.hpp
similarity index 95%
rename from include/boost/fusion/sequence/container/deque/detail/end_impl.hpp
rename to include/boost/fusion/container/deque/detail/end_impl.hpp
index 505dfdac..96a1b17d 100644
--- a/include/boost/fusion/sequence/container/deque/detail/end_impl.hpp
+++ b/include/boost/fusion/container/deque/detail/end_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_DEQUE_END_IMPL_09122006_2034)
 #define BOOST_FUSION_DEQUE_END_IMPL_09122006_2034
 
-#include <boost/fusion/sequence/container/deque/deque_iterator.hpp>
+#include <boost/fusion/container/deque/deque_iterator.hpp>
 
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/if.hpp>
diff --git a/include/boost/fusion/sequence/container/deque/detail/keyed_element.hpp b/include/boost/fusion/container/deque/detail/keyed_element.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/deque/detail/keyed_element.hpp
rename to include/boost/fusion/container/deque/detail/keyed_element.hpp
diff --git a/include/boost/fusion/sequence/container/deque/detail/value_at_impl.hpp b/include/boost/fusion/container/deque/detail/value_at_impl.hpp
similarity index 95%
rename from include/boost/fusion/sequence/container/deque/detail/value_at_impl.hpp
rename to include/boost/fusion/container/deque/detail/value_at_impl.hpp
index 6c08231d..ec0351de 100644
--- a/include/boost/fusion/sequence/container/deque/detail/value_at_impl.hpp
+++ b/include/boost/fusion/container/deque/detail/value_at_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_DEQUE_VALUE_AT_IMPL_08122006_0756)
 #define BOOST_FUSION_DEQUE_VALUE_AT_IMPL_08122006_0756
 
-#include <boost/fusion/sequence/container/deque/detail/keyed_element.hpp>
+#include <boost/fusion/container/deque/detail/keyed_element.hpp>
 
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/assert.hpp>
diff --git a/include/boost/fusion/sequence/container/deque/front_extended_deque.hpp b/include/boost/fusion/container/deque/front_extended_deque.hpp
similarity index 95%
rename from include/boost/fusion/sequence/container/deque/front_extended_deque.hpp
rename to include/boost/fusion/container/deque/front_extended_deque.hpp
index b52508e7..156e66a4 100644
--- a/include/boost/fusion/sequence/container/deque/front_extended_deque.hpp
+++ b/include/boost/fusion/container/deque/front_extended_deque.hpp
@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_FRONT_EXTENDED_DEQUE_26112006_2209)
 #define BOOST_FUSION_FRONT_EXTENDED_DEQUE_26112006_2209
 
-#include <boost/fusion/sequence/container/deque/detail/keyed_element.hpp>
+#include <boost/fusion/container/deque/detail/keyed_element.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/minus.hpp>
 #include <boost/mpl/plus.hpp>
diff --git a/include/boost/fusion/sequence/container/deque/limits.hpp b/include/boost/fusion/container/deque/limits.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/deque/limits.hpp
rename to include/boost/fusion/container/deque/limits.hpp
diff --git a/include/boost/fusion/sequence/container/ext_/tree.hpp b/include/boost/fusion/container/ext_/tree.hpp
similarity index 93%
rename from include/boost/fusion/sequence/container/ext_/tree.hpp
rename to include/boost/fusion/container/ext_/tree.hpp
index c6edc28c..cd8c5dcd 100755
--- a/include/boost/fusion/sequence/container/ext_/tree.hpp
+++ b/include/boost/fusion/container/ext_/tree.hpp
@@ -14,13 +14,13 @@
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/fusion/support/is_sequence.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/view/single_view.hpp>
-#include <boost/fusion/sequence/container/list/cons.hpp> // for nil
-#include <boost/fusion/sequence/container/vector/vector10.hpp>
+#include <boost/fusion/view/single_view.hpp>
+#include <boost/fusion/container/list/cons.hpp> // for nil
+#include <boost/fusion/container/vector/vector10.hpp>
 #include <boost/fusion/support/sequence_base.hpp>
 #include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
 #include <boost/fusion/support/ext_/is_segmented.hpp>
-#include <boost/fusion/sequence/view/ext_/segmented_iterator.hpp>
+#include <boost/fusion/view/ext_/segmented_iterator.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/container/list.hpp b/include/boost/fusion/container/list.hpp
similarity index 58%
rename from include/boost/fusion/sequence/container/list.hpp
rename to include/boost/fusion/container/list.hpp
index 47024b9c..8a0d6456 100644
--- a/include/boost/fusion/sequence/container/list.hpp
+++ b/include/boost/fusion/container/list.hpp
@@ -1,16 +1,17 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_SEQUENCE_CLASS_LIST_10022005_0605)
 #define FUSION_SEQUENCE_CLASS_LIST_10022005_0605
 
-#include <boost/fusion/sequence/container/list/cons.hpp>
-#include <boost/fusion/sequence/container/list/cons_iterator.hpp>
-#include <boost/fusion/sequence/container/list/limits.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
-#include <boost/fusion/sequence/container/list/list_fwd.hpp>
+#include <boost/fusion/container/list/cons.hpp>
+#include <boost/fusion/container/list/cons_iterator.hpp>
+#include <boost/fusion/container/list/limits.hpp>
+#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/container/list/list_fwd.hpp>
+#include <boost/fusion/container/list/convert.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence/container/list/cons.hpp b/include/boost/fusion/container/list/cons.hpp
similarity index 91%
rename from include/boost/fusion/sequence/container/list/cons.hpp
rename to include/boost/fusion/container/list/cons.hpp
index 877f2982..8e500f66 100644
--- a/include/boost/fusion/sequence/container/list/cons.hpp
+++ b/include/boost/fusion/container/list/cons.hpp
@@ -13,12 +13,12 @@
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/iterator/deref.hpp>
-#include <boost/fusion/sequence/container/list/cons_iterator.hpp>
-#include <boost/fusion/sequence/container/list/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/container/list/detail/end_impl.hpp>
-#include <boost/fusion/sequence/container/list/detail/at_impl.hpp>
-#include <boost/fusion/sequence/container/list/detail/value_at_impl.hpp>
-#include <boost/fusion/sequence/container/list/detail/empty_impl.hpp>
+#include <boost/fusion/container/list/cons_iterator.hpp>
+#include <boost/fusion/container/list/detail/begin_impl.hpp>
+#include <boost/fusion/container/list/detail/end_impl.hpp>
+#include <boost/fusion/container/list/detail/at_impl.hpp>
+#include <boost/fusion/container/list/detail/value_at_impl.hpp>
+#include <boost/fusion/container/list/detail/empty_impl.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/fusion/support/sequence_base.hpp>
diff --git a/include/boost/fusion/sequence/container/list/cons_iterator.hpp b/include/boost/fusion/container/list/cons_iterator.hpp
similarity index 86%
rename from include/boost/fusion/sequence/container/list/cons_iterator.hpp
rename to include/boost/fusion/container/list/cons_iterator.hpp
index 6455f04f..7ef034e3 100644
--- a/include/boost/fusion/sequence/container/list/cons_iterator.hpp
+++ b/include/boost/fusion/container/list/cons_iterator.hpp
@@ -10,11 +10,11 @@
 
 #include <boost/type_traits/add_const.hpp>
 #include <boost/fusion/support/iterator_base.hpp>
-#include <boost/fusion/sequence/container/list/detail/deref_impl.hpp>
-#include <boost/fusion/sequence/container/list/detail/next_impl.hpp>
-#include <boost/fusion/sequence/container/list/detail/value_of_impl.hpp>
-#include <boost/fusion/sequence/container/list/detail/equal_to_impl.hpp>
-#include <boost/fusion/sequence/container/list/list_fwd.hpp>
+#include <boost/fusion/container/list/detail/deref_impl.hpp>
+#include <boost/fusion/container/list/detail/next_impl.hpp>
+#include <boost/fusion/container/list/detail/value_of_impl.hpp>
+#include <boost/fusion/container/list/detail/equal_to_impl.hpp>
+#include <boost/fusion/container/list/list_fwd.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/conversion/as_list.hpp b/include/boost/fusion/container/list/convert.hpp
similarity index 81%
rename from include/boost/fusion/sequence/conversion/as_list.hpp
rename to include/boost/fusion/container/list/convert.hpp
index 21b70bee..418158cf 100644
--- a/include/boost/fusion/sequence/conversion/as_list.hpp
+++ b/include/boost/fusion/container/list/convert.hpp
@@ -1,26 +1,27 @@
 /*=============================================================================
     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)
 ==============================================================================*/
-#if !defined(FUSION_AS_LIST_09232005_1215)
-#define FUSION_AS_LIST_09232005_1215
+#if !defined(FUSION_CONVERT_09232005_1215)
+#define FUSION_CONVERT_09232005_1215
 
-#include <boost/fusion/sequence/container/list/cons.hpp>
+#include <boost/fusion/container/list/cons.hpp>
+#include <boost/fusion/container/list/detail/build_cons.hpp>
+#include <boost/fusion/container/list/detail/convert_impl.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/sequence/conversion/detail/build_cons.hpp>
 
-namespace boost { namespace fusion 
+namespace boost { namespace fusion
 {
     namespace result_of
     {
         template <typename Sequence>
         struct as_list
         {
-            typedef typename 
+            typedef typename
                 detail::build_cons<
                     typename result_of::begin<Sequence>::type
                   , typename result_of::end<Sequence>::type
diff --git a/include/boost/fusion/sequence/container/list/detail/at_impl.hpp b/include/boost/fusion/container/list/detail/at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/list/detail/at_impl.hpp
rename to include/boost/fusion/container/list/detail/at_impl.hpp
diff --git a/include/boost/fusion/sequence/container/list/detail/begin_impl.hpp b/include/boost/fusion/container/list/detail/begin_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/list/detail/begin_impl.hpp
rename to include/boost/fusion/container/list/detail/begin_impl.hpp
diff --git a/include/boost/fusion/sequence/conversion/detail/build_cons.hpp b/include/boost/fusion/container/list/detail/build_cons.hpp
similarity index 96%
rename from include/boost/fusion/sequence/conversion/detail/build_cons.hpp
rename to include/boost/fusion/container/list/detail/build_cons.hpp
index 4b08447f..befbd4e9 100644
--- a/include/boost/fusion/sequence/conversion/detail/build_cons.hpp
+++ b/include/boost/fusion/container/list/detail/build_cons.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_BUILD_CONS_09232005_1222)
 #define FUSION_BUILD_CONS_09232005_1222
 
-#include <boost/fusion/sequence/container/list/cons.hpp>
+#include <boost/fusion/container/list/cons.hpp>
 #include <boost/fusion/iterator/equal_to.hpp>
 #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/iterator/value_of.hpp>
diff --git a/include/boost/fusion/container/list/detail/convert_impl.hpp b/include/boost/fusion/container/list/detail/convert_impl.hpp
new file mode 100644
index 00000000..cfe7a1df
--- /dev/null
+++ b/include/boost/fusion/container/list/detail/convert_impl.hpp
@@ -0,0 +1,51 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_CONVERT_IMPL_09232005_1215)
+#define FUSION_CONVERT_IMPL_09232005_1215
+
+#include <boost/fusion/container/list/cons.hpp>
+#include <boost/fusion/container/list/detail/build_cons.hpp>
+#include <boost/fusion/sequence/intrinsic/empty.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/sequence/intrinsic/end.hpp>
+
+namespace boost { namespace fusion
+{
+    struct cons_tag;
+
+    namespace extension
+    {
+        template <typename T>
+        struct convert_impl;
+
+        template <>
+        struct convert_impl<cons_tag>
+        {
+            template <typename Sequence>
+            struct apply
+            {
+                typedef typename
+                    detail::build_cons<
+                        typename result_of::begin<Sequence>::type
+                      , typename result_of::end<Sequence>::type
+                    >
+                build_cons;
+
+                typedef typename build_cons::type type;
+
+                static type
+                call(Sequence& seq)
+                {
+                    return build_cons::call(fusion::begin(seq), fusion::end(seq));
+                }
+            };
+        };
+    }
+}}
+
+#endif
diff --git a/include/boost/fusion/sequence/container/list/detail/deref_impl.hpp b/include/boost/fusion/container/list/detail/deref_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/list/detail/deref_impl.hpp
rename to include/boost/fusion/container/list/detail/deref_impl.hpp
diff --git a/include/boost/fusion/sequence/container/list/detail/empty_impl.hpp b/include/boost/fusion/container/list/detail/empty_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/list/detail/empty_impl.hpp
rename to include/boost/fusion/container/list/detail/empty_impl.hpp
diff --git a/include/boost/fusion/sequence/container/list/detail/end_impl.hpp b/include/boost/fusion/container/list/detail/end_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/list/detail/end_impl.hpp
rename to include/boost/fusion/container/list/detail/end_impl.hpp
diff --git a/include/boost/fusion/sequence/container/list/detail/equal_to_impl.hpp b/include/boost/fusion/container/list/detail/equal_to_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/list/detail/equal_to_impl.hpp
rename to include/boost/fusion/container/list/detail/equal_to_impl.hpp
diff --git a/include/boost/fusion/sequence/container/list/detail/list_forward_ctor.hpp b/include/boost/fusion/container/list/detail/list_forward_ctor.hpp
similarity index 95%
rename from include/boost/fusion/sequence/container/list/detail/list_forward_ctor.hpp
rename to include/boost/fusion/container/list/detail/list_forward_ctor.hpp
index 7922f382..39471809 100644
--- a/include/boost/fusion/sequence/container/list/detail/list_forward_ctor.hpp
+++ b/include/boost/fusion/container/list/detail/list_forward_ctor.hpp
@@ -18,7 +18,7 @@
 #define FUSION_LIST_CL_PAREN(z, n, type) )
 
 #define BOOST_PP_FILENAME_1 \
-    <boost/fusion/sequence/container/list/detail/list_forward_ctor.hpp>
+    <boost/fusion/container/list/detail/list_forward_ctor.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_LIST_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/list/detail/list_to_cons.hpp b/include/boost/fusion/container/list/detail/list_to_cons.hpp
similarity index 87%
rename from include/boost/fusion/sequence/container/list/detail/list_to_cons.hpp
rename to include/boost/fusion/container/list/detail/list_to_cons.hpp
index fa5c7bb9..8e6d6912 100644
--- a/include/boost/fusion/sequence/container/list/detail/list_to_cons.hpp
+++ b/include/boost/fusion/container/list/detail/list_to_cons.hpp
@@ -7,8 +7,8 @@
 #if !defined(FUSION_LIST_TO_CONS_07172005_1041)
 #define FUSION_LIST_TO_CONS_07172005_1041
 
-#include <boost/fusion/sequence/container/list/cons.hpp>
-#include <boost/fusion/sequence/container/list/limits.hpp>
+#include <boost/fusion/container/list/cons.hpp>
+#include <boost/fusion/container/list/limits.hpp>
 #include <boost/preprocessor/repetition/enum.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_shifted_params.hpp>
@@ -35,7 +35,7 @@ namespace boost { namespace fusion { namespace detail
         
         typedef cons<head_type, tail_type> type;
         
-        #include <boost/fusion/sequence/container/list/detail/list_to_cons_call.hpp>
+        #include <boost/fusion/container/list/detail/list_to_cons_call.hpp>
     };
 
     template <>
diff --git a/include/boost/fusion/sequence/container/list/detail/list_to_cons_call.hpp b/include/boost/fusion/container/list/detail/list_to_cons_call.hpp
similarity index 95%
rename from include/boost/fusion/sequence/container/list/detail/list_to_cons_call.hpp
rename to include/boost/fusion/container/list/detail/list_to_cons_call.hpp
index c8e63e95..069f0598 100644
--- a/include/boost/fusion/sequence/container/list/detail/list_to_cons_call.hpp
+++ b/include/boost/fusion/container/list/detail/list_to_cons_call.hpp
@@ -13,7 +13,7 @@
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 
 #define BOOST_PP_FILENAME_1 \
-    <boost/fusion/sequence/container/list/detail/list_to_cons_call.hpp>
+    <boost/fusion/container/list/detail/list_to_cons_call.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_LIST_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/list/detail/next_impl.hpp b/include/boost/fusion/container/list/detail/next_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/list/detail/next_impl.hpp
rename to include/boost/fusion/container/list/detail/next_impl.hpp
diff --git a/include/boost/fusion/sequence/container/list/detail/value_at_impl.hpp b/include/boost/fusion/container/list/detail/value_at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/list/detail/value_at_impl.hpp
rename to include/boost/fusion/container/list/detail/value_at_impl.hpp
diff --git a/include/boost/fusion/sequence/container/list/detail/value_of_impl.hpp b/include/boost/fusion/container/list/detail/value_of_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/list/detail/value_of_impl.hpp
rename to include/boost/fusion/container/list/detail/value_of_impl.hpp
diff --git a/include/boost/fusion/sequence/container/list/limits.hpp b/include/boost/fusion/container/list/limits.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/list/limits.hpp
rename to include/boost/fusion/container/list/limits.hpp
diff --git a/include/boost/fusion/sequence/container/list/list.hpp b/include/boost/fusion/container/list/list.hpp
similarity index 90%
rename from include/boost/fusion/sequence/container/list/list.hpp
rename to include/boost/fusion/container/list/list.hpp
index e34e648f..7516df48 100644
--- a/include/boost/fusion/sequence/container/list/list.hpp
+++ b/include/boost/fusion/container/list/list.hpp
@@ -7,8 +7,8 @@
 #if !defined(FUSION_LIST_07172005_1153)
 #define FUSION_LIST_07172005_1153
 
-#include <boost/fusion/sequence/container/list/list_fwd.hpp>
-#include <boost/fusion/sequence/container/list/detail/list_to_cons.hpp>
+#include <boost/fusion/container/list/list_fwd.hpp>
+#include <boost/fusion/container/list/detail/list_to_cons.hpp>
 
 namespace boost { namespace fusion
 {
@@ -45,7 +45,7 @@ namespace boost { namespace fusion
         //      typename detail::call_param<T0>::type _0
         //    , typename detail::call_param<T1>::type _1)
         //    : inherited_type(list_to_cons::call(_0, _1)) {}
-        #include <boost/fusion/sequence/container/list/detail/list_forward_ctor.hpp>
+        #include <boost/fusion/container/list/detail/list_forward_ctor.hpp>
 
         template <BOOST_PP_ENUM_PARAMS(FUSION_MAX_LIST_SIZE, typename U)>
         list&
diff --git a/include/boost/fusion/sequence/container/list/list_fwd.hpp b/include/boost/fusion/container/list/list_fwd.hpp
similarity index 92%
rename from include/boost/fusion/sequence/container/list/list_fwd.hpp
rename to include/boost/fusion/container/list/list_fwd.hpp
index cfd4e370..90c088b4 100644
--- a/include/boost/fusion/sequence/container/list/list_fwd.hpp
+++ b/include/boost/fusion/container/list/list_fwd.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_LIST_FORWARD_07172005_0224)
 #define FUSION_LIST_FORWARD_07172005_0224
 
-#include <boost/fusion/sequence/container/list/limits.hpp>
+#include <boost/fusion/container/list/limits.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/sequence/container/map.hpp b/include/boost/fusion/container/map.hpp
similarity index 68%
rename from include/boost/fusion/sequence/container/map.hpp
rename to include/boost/fusion/container/map.hpp
index 100905cf..69518311 100644
--- a/include/boost/fusion/sequence/container/map.hpp
+++ b/include/boost/fusion/container/map.hpp
@@ -1,14 +1,15 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_SEQUENCE_CLASS_MAP_10022005_0606)
 #define FUSION_SEQUENCE_CLASS_MAP_10022005_0606
 
-#include <boost/fusion/sequence/container/map/limits.hpp>
-#include <boost/fusion/sequence/container/map/map.hpp>
-#include <boost/fusion/sequence/container/map/map_fwd.hpp>
+#include <boost/fusion/container/map/limits.hpp>
+#include <boost/fusion/container/map/map.hpp>
+#include <boost/fusion/container/map/map_fwd.hpp>
+#include <boost/fusion/container/map/convert.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence/conversion/as_map.hpp b/include/boost/fusion/container/map/convert.hpp
similarity index 81%
rename from include/boost/fusion/sequence/conversion/as_map.hpp
rename to include/boost/fusion/container/map/convert.hpp
index 4195dc25..f174da58 100644
--- a/include/boost/fusion/sequence/conversion/as_map.hpp
+++ b/include/boost/fusion/container/map/convert.hpp
@@ -1,18 +1,19 @@
 /*=============================================================================
     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)
 ==============================================================================*/
-#if !defined(FUSION_AS_MAP_09232005_1340)
-#define FUSION_AS_MAP_09232005_1340
+#if !defined(FUSION_CONVERT_09232005_1340)
+#define FUSION_CONVERT_09232005_1340
 
-#include <boost/fusion/sequence/conversion/detail/as_map.hpp>
-#include <boost/fusion/sequence/container/map/map.hpp>
+#include <boost/fusion/container/map/detail/as_map.hpp>
+#include <boost/fusion/container/map/detail/convert_impl.hpp>
+#include <boost/fusion/container/map/map.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 
-namespace boost { namespace fusion 
+namespace boost { namespace fusion
 {
     namespace result_of
     {
diff --git a/include/boost/fusion/sequence/conversion/detail/as_map.hpp b/include/boost/fusion/container/map/detail/as_map.hpp
similarity index 95%
rename from include/boost/fusion/sequence/conversion/detail/as_map.hpp
rename to include/boost/fusion/container/map/detail/as_map.hpp
index d163311c..326877f9 100644
--- a/include/boost/fusion/sequence/conversion/detail/as_map.hpp
+++ b/include/boost/fusion/container/map/detail/as_map.hpp
@@ -15,7 +15,7 @@
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/inc.hpp>
 #include <boost/preprocessor/dec.hpp>
-#include <boost/fusion/sequence/container/map/map.hpp>
+#include <boost/fusion/container/map/map.hpp>
 #include <boost/fusion/iterator/value_of.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/iterator/next.hpp>
@@ -54,7 +54,7 @@ namespace boost { namespace fusion { namespace detail
     typedef typename fusion::result_of::value_of<BOOST_PP_CAT(I, n)>::type      \
         BOOST_PP_CAT(T, n);
 
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/conversion/detail/as_map.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/map/detail/as_map.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_MAP_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/map/detail/at_key_impl.hpp b/include/boost/fusion/container/map/detail/at_key_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/map/detail/at_key_impl.hpp
rename to include/boost/fusion/container/map/detail/at_key_impl.hpp
diff --git a/include/boost/fusion/sequence/container/map/detail/begin_impl.hpp b/include/boost/fusion/container/map/detail/begin_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/map/detail/begin_impl.hpp
rename to include/boost/fusion/container/map/detail/begin_impl.hpp
diff --git a/include/boost/fusion/container/map/detail/convert_impl.hpp b/include/boost/fusion/container/map/detail/convert_impl.hpp
new file mode 100644
index 00000000..aedd3e3d
--- /dev/null
+++ b/include/boost/fusion/container/map/detail/convert_impl.hpp
@@ -0,0 +1,45 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_CONVERT_IMPL_09232005_1340)
+#define FUSION_CONVERT_IMPL_09232005_1340
+
+#include <boost/fusion/container/map/detail/as_map.hpp>
+#include <boost/fusion/container/map/map.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/sequence/intrinsic/size.hpp>
+
+namespace boost { namespace fusion
+{
+    struct map_tag;
+
+    namespace extension
+    {
+        template <typename T>
+        struct convert_impl;
+
+        template <>
+        struct convert_impl<map_tag>
+        {
+            template <typename Sequence>
+            struct apply
+            {
+                typedef typename detail::as_map<result_of::size<Sequence>::value> gen;
+                typedef typename gen::
+                    template apply<typename result_of::begin<Sequence>::type>::type
+                type;
+
+                static type call(Sequence& seq)
+                {
+                    return gen::call(fusion::begin(seq));
+                }
+            };
+        };
+    }
+}}
+
+#endif
diff --git a/include/boost/fusion/sequence/container/map/detail/end_impl.hpp b/include/boost/fusion/container/map/detail/end_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/map/detail/end_impl.hpp
rename to include/boost/fusion/container/map/detail/end_impl.hpp
diff --git a/include/boost/fusion/sequence/container/map/detail/lookup_key.hpp b/include/boost/fusion/container/map/detail/lookup_key.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/map/detail/lookup_key.hpp
rename to include/boost/fusion/container/map/detail/lookup_key.hpp
diff --git a/include/boost/fusion/sequence/container/map/detail/map_forward_ctor.hpp b/include/boost/fusion/container/map/detail/map_forward_ctor.hpp
similarity index 94%
rename from include/boost/fusion/sequence/container/map/detail/map_forward_ctor.hpp
rename to include/boost/fusion/container/map/detail/map_forward_ctor.hpp
index 34b81830..c35168ba 100644
--- a/include/boost/fusion/sequence/container/map/detail/map_forward_ctor.hpp
+++ b/include/boost/fusion/container/map/detail/map_forward_ctor.hpp
@@ -13,7 +13,7 @@
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 
 #define BOOST_PP_FILENAME_1 \
-    <boost/fusion/sequence/container/map/detail/map_forward_ctor.hpp>
+    <boost/fusion/container/map/detail/map_forward_ctor.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_MAP_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/map/detail/map_lookup.hpp b/include/boost/fusion/container/map/detail/map_lookup.hpp
similarity index 98%
rename from include/boost/fusion/sequence/container/map/detail/map_lookup.hpp
rename to include/boost/fusion/container/map/detail/map_lookup.hpp
index aef42c62..2f792cbd 100644
--- a/include/boost/fusion/sequence/container/map/detail/map_lookup.hpp
+++ b/include/boost/fusion/container/map/detail/map_lookup.hpp
@@ -52,10 +52,14 @@
     }
 
 #define BOOST_PP_FILENAME_1 \
-    <boost/fusion/sequence/container/map/detail/map_lookup.hpp>
+    <boost/fusion/container/map/detail/map_lookup.hpp>
 #define BOOST_PP_ITERATION_LIMITS (0, BOOST_PP_DEC(FUSION_MAX_MAP_SIZE))
 #include BOOST_PP_ITERATE()
 
+#if defined(BOOST_MSVC) && (BOOST_MSVC == 1310)
+#pragma warning (pop)
+#endif
+
 #endif
 #else // defined(BOOST_PP_IS_ITERATING)
 ///////////////////////////////////////////////////////////////////////////////
@@ -120,10 +124,5 @@
     }
 
 #undef N
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1310)
-#pragma warning (pop)
-#endif
-
 #endif // defined(BOOST_PP_IS_ITERATING)
 
diff --git a/include/boost/fusion/sequence/container/map/detail/value_at_key_impl.hpp b/include/boost/fusion/container/map/detail/value_at_key_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/map/detail/value_at_key_impl.hpp
rename to include/boost/fusion/container/map/detail/value_at_key_impl.hpp
diff --git a/include/boost/fusion/sequence/container/map/limits.hpp b/include/boost/fusion/container/map/limits.hpp
similarity index 92%
rename from include/boost/fusion/sequence/container/map/limits.hpp
rename to include/boost/fusion/container/map/limits.hpp
index 33cbc832..738abff4 100644
--- a/include/boost/fusion/sequence/container/map/limits.hpp
+++ b/include/boost/fusion/container/map/limits.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_MAP_LIMITS_07212005_1104)
 #define FUSION_MAP_LIMITS_07212005_1104
 
-#include <boost/fusion/sequence/container/vector/limits.hpp>
+#include <boost/fusion/container/vector/limits.hpp>
 
 #if !defined(FUSION_MAX_MAP_SIZE)
 # define FUSION_MAX_MAP_SIZE FUSION_MAX_VECTOR_SIZE
diff --git a/include/boost/fusion/sequence/container/map/map.hpp b/include/boost/fusion/container/map/map.hpp
similarity index 73%
rename from include/boost/fusion/sequence/container/map/map.hpp
rename to include/boost/fusion/container/map/map.hpp
index bf6a0fa8..5f5fb1cc 100644
--- a/include/boost/fusion/sequence/container/map/map.hpp
+++ b/include/boost/fusion/container/map/map.hpp
@@ -10,13 +10,13 @@
 #include <boost/fusion/support/pair.hpp>
 #include <boost/fusion/support/category_of.hpp>
 #include <boost/fusion/support/detail/access.hpp>
-#include <boost/fusion/sequence/container/map/map_fwd.hpp>
-#include <boost/fusion/sequence/container/map/detail/lookup_key.hpp>
-#include <boost/fusion/sequence/container/map/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/container/map/detail/end_impl.hpp>
-#include <boost/fusion/sequence/container/map/detail/at_key_impl.hpp>
-#include <boost/fusion/sequence/container/map/detail/value_at_key_impl.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/map/map_fwd.hpp>
+#include <boost/fusion/container/map/detail/lookup_key.hpp>
+#include <boost/fusion/container/map/detail/begin_impl.hpp>
+#include <boost/fusion/container/map/detail/end_impl.hpp>
+#include <boost/fusion/container/map/detail/at_key_impl.hpp>
+#include <boost/fusion/container/map/detail/value_at_key_impl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/bool.hpp>
 
@@ -48,8 +48,8 @@ namespace boost { namespace fusion
         map(Sequence const& rhs)
             : data(rhs) {}
 
-        #include <boost/fusion/sequence/container/map/detail/map_forward_ctor.hpp>
-        #include <boost/fusion/sequence/container/map/detail/map_lookup.hpp>
+        #include <boost/fusion/container/map/detail/map_forward_ctor.hpp>
+        #include <boost/fusion/container/map/detail/map_lookup.hpp>
 
         template <typename T>
         map&
diff --git a/include/boost/fusion/sequence/container/map/map_fwd.hpp b/include/boost/fusion/container/map/map_fwd.hpp
similarity index 92%
rename from include/boost/fusion/sequence/container/map/map_fwd.hpp
rename to include/boost/fusion/container/map/map_fwd.hpp
index 311dce5a..660466bd 100644
--- a/include/boost/fusion/sequence/container/map/map_fwd.hpp
+++ b/include/boost/fusion/container/map/map_fwd.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_MAP_FORWARD_07212005_1105)
 #define FUSION_MAP_FORWARD_07212005_1105
 
-#include <boost/fusion/sequence/container/map/limits.hpp>
+#include <boost/fusion/container/map/limits.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/sequence/container/set.hpp b/include/boost/fusion/container/set.hpp
similarity index 68%
rename from include/boost/fusion/sequence/container/set.hpp
rename to include/boost/fusion/container/set.hpp
index 24ec2c67..6b7674d6 100644
--- a/include/boost/fusion/sequence/container/set.hpp
+++ b/include/boost/fusion/container/set.hpp
@@ -1,14 +1,15 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_SEQUENCE_CLASS_SET_10022005_0607)
 #define FUSION_SEQUENCE_CLASS_SET_10022005_0607
 
-#include <boost/fusion/sequence/container/set/limits.hpp>
-#include <boost/fusion/sequence/container/set/set.hpp>
-#include <boost/fusion/sequence/container/set/set_fwd.hpp>
+#include <boost/fusion/container/set/limits.hpp>
+#include <boost/fusion/container/set/set.hpp>
+#include <boost/fusion/container/set/set_fwd.hpp>
+#include <boost/fusion/container/set/convert.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence/conversion/as_set.hpp b/include/boost/fusion/container/set/convert.hpp
similarity index 81%
rename from include/boost/fusion/sequence/conversion/as_set.hpp
rename to include/boost/fusion/container/set/convert.hpp
index 9d9c02df..1aaddf0c 100644
--- a/include/boost/fusion/sequence/conversion/as_set.hpp
+++ b/include/boost/fusion/container/set/convert.hpp
@@ -1,18 +1,19 @@
 /*=============================================================================
     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)
 ==============================================================================*/
-#if !defined(FUSION_AS_SET_09232005_1341)
-#define FUSION_AS_SET_09232005_1341
+#if !defined(FUSION_CONVERT_09232005_1341)
+#define FUSION_CONVERT_09232005_1341
 
-#include <boost/fusion/sequence/conversion/detail/as_set.hpp>
-#include <boost/fusion/sequence/container/set/set.hpp>
+#include <boost/fusion/container/set/detail/as_set.hpp>
+#include <boost/fusion/container/set/detail/convert_impl.hpp>
+#include <boost/fusion/container/set/set.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 
-namespace boost { namespace fusion 
+namespace boost { namespace fusion
 {
     namespace result_of
     {
diff --git a/include/boost/fusion/sequence/conversion/detail/as_set.hpp b/include/boost/fusion/container/set/detail/as_set.hpp
similarity index 95%
rename from include/boost/fusion/sequence/conversion/detail/as_set.hpp
rename to include/boost/fusion/container/set/detail/as_set.hpp
index bd21f3c0..33786338 100644
--- a/include/boost/fusion/sequence/conversion/detail/as_set.hpp
+++ b/include/boost/fusion/container/set/detail/as_set.hpp
@@ -15,7 +15,7 @@
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/inc.hpp>
 #include <boost/preprocessor/dec.hpp>
-#include <boost/fusion/sequence/container/set/set.hpp>
+#include <boost/fusion/container/set/set.hpp>
 #include <boost/fusion/iterator/value_of.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/iterator/next.hpp>
@@ -54,7 +54,7 @@ namespace boost { namespace fusion { namespace detail
     typedef typename fusion::result_of::value_of<BOOST_PP_CAT(I, n)>::type      \
         BOOST_PP_CAT(T, n);
 
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/conversion/detail/as_set.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/set/detail/as_set.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_SET_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/set/detail/at_key_impl.hpp b/include/boost/fusion/container/set/detail/at_key_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/set/detail/at_key_impl.hpp
rename to include/boost/fusion/container/set/detail/at_key_impl.hpp
diff --git a/include/boost/fusion/sequence/container/set/detail/begin_impl.hpp b/include/boost/fusion/container/set/detail/begin_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/set/detail/begin_impl.hpp
rename to include/boost/fusion/container/set/detail/begin_impl.hpp
diff --git a/include/boost/fusion/container/set/detail/convert_impl.hpp b/include/boost/fusion/container/set/detail/convert_impl.hpp
new file mode 100644
index 00000000..1aa79fb1
--- /dev/null
+++ b/include/boost/fusion/container/set/detail/convert_impl.hpp
@@ -0,0 +1,45 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_CONVERT_IMPL_09232005_1341)
+#define FUSION_CONVERT_IMPL_09232005_1341
+
+#include <boost/fusion/container/set/detail/as_set.hpp>
+#include <boost/fusion/container/set/set.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/sequence/intrinsic/size.hpp>
+
+namespace boost { namespace fusion
+{
+    struct set_tag;
+
+    namespace extension
+    {
+        template <typename T>
+        struct convert_impl;
+
+        template <>
+        struct convert_impl<set_tag>
+        {
+            template <typename Sequence>
+            struct apply
+            {
+                typedef typename detail::as_set<result_of::size<Sequence>::value> gen;
+                typedef typename gen::
+                    template apply<typename result_of::begin<Sequence>::type>::type
+                type;
+
+                static type call(Sequence& seq)
+                {
+                    return gen::call(fusion::begin(seq));
+                }
+            };
+        };
+    }
+}}
+
+#endif
diff --git a/include/boost/fusion/sequence/container/set/detail/end_impl.hpp b/include/boost/fusion/container/set/detail/end_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/set/detail/end_impl.hpp
rename to include/boost/fusion/container/set/detail/end_impl.hpp
diff --git a/include/boost/fusion/sequence/container/set/detail/lookup_key.hpp b/include/boost/fusion/container/set/detail/lookup_key.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/set/detail/lookup_key.hpp
rename to include/boost/fusion/container/set/detail/lookup_key.hpp
diff --git a/include/boost/fusion/sequence/container/set/detail/set_forward_ctor.hpp b/include/boost/fusion/container/set/detail/set_forward_ctor.hpp
similarity index 94%
rename from include/boost/fusion/sequence/container/set/detail/set_forward_ctor.hpp
rename to include/boost/fusion/container/set/detail/set_forward_ctor.hpp
index 6eddd650..d105b150 100644
--- a/include/boost/fusion/sequence/container/set/detail/set_forward_ctor.hpp
+++ b/include/boost/fusion/container/set/detail/set_forward_ctor.hpp
@@ -13,7 +13,7 @@
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 
 #define BOOST_PP_FILENAME_1 \
-    <boost/fusion/sequence/container/set/detail/set_forward_ctor.hpp>
+    <boost/fusion/container/set/detail/set_forward_ctor.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_SET_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/set/detail/set_lookup.hpp b/include/boost/fusion/container/set/detail/set_lookup.hpp
similarity index 98%
rename from include/boost/fusion/sequence/container/set/detail/set_lookup.hpp
rename to include/boost/fusion/container/set/detail/set_lookup.hpp
index fd300457..6df4b401 100644
--- a/include/boost/fusion/sequence/container/set/detail/set_lookup.hpp
+++ b/include/boost/fusion/container/set/detail/set_lookup.hpp
@@ -52,10 +52,14 @@
     }
 
 #define BOOST_PP_FILENAME_1 \
-    <boost/fusion/sequence/container/set/detail/set_lookup.hpp>
+    <boost/fusion/container/set/detail/set_lookup.hpp>
 #define BOOST_PP_ITERATION_LIMITS (0, BOOST_PP_DEC(FUSION_MAX_SET_SIZE))
 #include BOOST_PP_ITERATE()
 
+#if defined(BOOST_MSVC) && (BOOST_MSVC == 1310)
+#pragma warning (pop)
+#endif
+
 #endif
 #else // defined(BOOST_PP_IS_ITERATING)
 ///////////////////////////////////////////////////////////////////////////////
@@ -120,10 +124,5 @@
     }
 
 #undef N
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1310)
-#pragma warning (pop)
-#endif
-
 #endif // defined(BOOST_PP_IS_ITERATING)
 
diff --git a/include/boost/fusion/sequence/container/set/detail/value_at_key_impl.hpp b/include/boost/fusion/container/set/detail/value_at_key_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/set/detail/value_at_key_impl.hpp
rename to include/boost/fusion/container/set/detail/value_at_key_impl.hpp
diff --git a/include/boost/fusion/sequence/container/set/limits.hpp b/include/boost/fusion/container/set/limits.hpp
similarity index 92%
rename from include/boost/fusion/sequence/container/set/limits.hpp
rename to include/boost/fusion/container/set/limits.hpp
index 0b03b4dc..35eb0803 100644
--- a/include/boost/fusion/sequence/container/set/limits.hpp
+++ b/include/boost/fusion/container/set/limits.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_SET_LIMITS_09162005_1103)
 #define FUSION_SET_LIMITS_09162005_1103
 
-#include <boost/fusion/sequence/container/vector/limits.hpp>
+#include <boost/fusion/container/vector/limits.hpp>
 
 #if !defined(FUSION_MAX_SET_SIZE)
 # define FUSION_MAX_SET_SIZE FUSION_MAX_VECTOR_SIZE
diff --git a/include/boost/fusion/sequence/container/set/set.hpp b/include/boost/fusion/container/set/set.hpp
similarity index 73%
rename from include/boost/fusion/sequence/container/set/set.hpp
rename to include/boost/fusion/container/set/set.hpp
index f5e7f152..07580bb6 100644
--- a/include/boost/fusion/sequence/container/set/set.hpp
+++ b/include/boost/fusion/container/set/set.hpp
@@ -10,13 +10,13 @@
 #include <boost/fusion/support/sequence_base.hpp>
 #include <boost/fusion/support/category_of.hpp>
 #include <boost/fusion/support/detail/access.hpp>
-#include <boost/fusion/sequence/container/set/set_fwd.hpp>
-#include <boost/fusion/sequence/container/set/detail/lookup_key.hpp>
-#include <boost/fusion/sequence/container/set/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/container/set/detail/end_impl.hpp>
-#include <boost/fusion/sequence/container/set/detail/at_key_impl.hpp>
-#include <boost/fusion/sequence/container/set/detail/value_at_key_impl.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/set/set_fwd.hpp>
+#include <boost/fusion/container/set/detail/lookup_key.hpp>
+#include <boost/fusion/container/set/detail/begin_impl.hpp>
+#include <boost/fusion/container/set/detail/end_impl.hpp>
+#include <boost/fusion/container/set/detail/at_key_impl.hpp>
+#include <boost/fusion/container/set/detail/value_at_key_impl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/bool.hpp>
 
@@ -48,8 +48,8 @@ namespace boost { namespace fusion
         set(Sequence const& rhs)
             : data(rhs) {}
 
-        #include <boost/fusion/sequence/container/set/detail/set_forward_ctor.hpp>
-        #include <boost/fusion/sequence/container/set/detail/set_lookup.hpp>
+        #include <boost/fusion/container/set/detail/set_forward_ctor.hpp>
+        #include <boost/fusion/container/set/detail/set_lookup.hpp>
 
         template <typename T>
         set&
diff --git a/include/boost/fusion/sequence/container/set/set_fwd.hpp b/include/boost/fusion/container/set/set_fwd.hpp
similarity index 92%
rename from include/boost/fusion/sequence/container/set/set_fwd.hpp
rename to include/boost/fusion/container/set/set_fwd.hpp
index 38ca9d22..7facb513 100644
--- a/include/boost/fusion/sequence/container/set/set_fwd.hpp
+++ b/include/boost/fusion/container/set/set_fwd.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_SET_FORWARD_09162005_1102)
 #define FUSION_SET_FORWARD_09162005_1102
 
-#include <boost/fusion/sequence/container/set/limits.hpp>
+#include <boost/fusion/container/set/limits.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/container/vector.hpp b/include/boost/fusion/container/vector.hpp
new file mode 100644
index 00000000..389a102e
--- /dev/null
+++ b/include/boost/fusion/container/vector.hpp
@@ -0,0 +1,21 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_SEQUENCE_CLASS_VECTOR_10022005_0602)
+#define FUSION_SEQUENCE_CLASS_VECTOR_10022005_0602
+
+#include <boost/fusion/container/vector/limits.hpp>
+#include <boost/fusion/container/vector/vector10.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/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector_fwd.hpp>
+#include <boost/fusion/container/vector/vector_iterator.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
+
+#endif
diff --git a/include/boost/fusion/sequence/conversion/as_vector.hpp b/include/boost/fusion/container/vector/convert.hpp
similarity index 80%
rename from include/boost/fusion/sequence/conversion/as_vector.hpp
rename to include/boost/fusion/container/vector/convert.hpp
index 3e8cfab1..a31578a2 100644
--- a/include/boost/fusion/sequence/conversion/as_vector.hpp
+++ b/include/boost/fusion/container/vector/convert.hpp
@@ -1,18 +1,19 @@
 /*=============================================================================
     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)
 ==============================================================================*/
-#if !defined(FUSION_AS_VECTOR_09222005_1104)
-#define FUSION_AS_VECTOR_09222005_1104
+#if !defined(FUSION_CONVERT_09222005_1104)
+#define FUSION_CONVERT_09222005_1104
 
-#include <boost/fusion/sequence/conversion/detail/as_vector.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/detail/as_vector.hpp>
+#include <boost/fusion/container/vector/detail/convert_impl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 
-namespace boost { namespace fusion 
+namespace boost { namespace fusion
 {
     namespace result_of
     {
diff --git a/include/boost/fusion/sequence/container/vector/detail/advance_impl.hpp b/include/boost/fusion/container/vector/detail/advance_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/vector/detail/advance_impl.hpp
rename to include/boost/fusion/container/vector/detail/advance_impl.hpp
diff --git a/include/boost/fusion/sequence/conversion/detail/as_vector.hpp b/include/boost/fusion/container/vector/detail/as_vector.hpp
similarity index 95%
rename from include/boost/fusion/sequence/conversion/detail/as_vector.hpp
rename to include/boost/fusion/container/vector/detail/as_vector.hpp
index ffd79df0..fa8dadcf 100644
--- a/include/boost/fusion/sequence/conversion/detail/as_vector.hpp
+++ b/include/boost/fusion/container/vector/detail/as_vector.hpp
@@ -15,7 +15,7 @@
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/inc.hpp>
 #include <boost/preprocessor/dec.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/iterator/value_of.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/iterator/next.hpp>
@@ -54,7 +54,7 @@ namespace boost { namespace fusion { namespace detail
     typedef typename fusion::result_of::value_of<BOOST_PP_CAT(I, n)>::type      \
         BOOST_PP_CAT(T, n);
 
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/conversion/detail/as_vector.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/vector/detail/as_vector.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/vector/detail/at_impl.hpp b/include/boost/fusion/container/vector/detail/at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/vector/detail/at_impl.hpp
rename to include/boost/fusion/container/vector/detail/at_impl.hpp
diff --git a/include/boost/fusion/sequence/container/vector/detail/begin_impl.hpp b/include/boost/fusion/container/vector/detail/begin_impl.hpp
similarity index 93%
rename from include/boost/fusion/sequence/container/vector/detail/begin_impl.hpp
rename to include/boost/fusion/container/vector/detail/begin_impl.hpp
index 31d5643c..d2d687be 100644
--- a/include/boost/fusion/sequence/container/vector/detail/begin_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/begin_impl.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_BEGIN_IMPL_05042005_1136)
 #define FUSION_BEGIN_IMPL_05042005_1136
 
-#include <boost/fusion/sequence/container/vector/vector_iterator.hpp>
+#include <boost/fusion/container/vector/vector_iterator.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/container/vector/detail/convert_impl.hpp b/include/boost/fusion/container/vector/detail/convert_impl.hpp
new file mode 100644
index 00000000..5e1d080f
--- /dev/null
+++ b/include/boost/fusion/container/vector/detail/convert_impl.hpp
@@ -0,0 +1,45 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_CONVERT_IMPL_09222005_1104)
+#define FUSION_CONVERT_IMPL_09222005_1104
+
+#include <boost/fusion/container/vector/detail/as_vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/sequence/intrinsic/size.hpp>
+
+namespace boost { namespace fusion
+{
+    struct vector_tag;
+
+    namespace extension
+    {
+        template <typename T>
+        struct convert_impl;
+
+        template <>
+        struct convert_impl<vector_tag>
+        {
+            template <typename Sequence>
+            struct apply
+            {
+                typedef typename detail::as_vector<result_of::size<Sequence>::value> gen;
+                typedef typename gen::
+                    template apply<typename result_of::begin<Sequence>::type>::type
+                type;
+
+                static type call(Sequence& seq)
+                {
+                    return gen::call(fusion::begin(seq));
+                }
+            };
+        };
+    }
+}}
+
+#endif
diff --git a/include/boost/fusion/sequence/container/vector/detail/deref_impl.hpp b/include/boost/fusion/container/vector/detail/deref_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/vector/detail/deref_impl.hpp
rename to include/boost/fusion/container/vector/detail/deref_impl.hpp
diff --git a/include/boost/fusion/sequence/container/vector/detail/distance_impl.hpp b/include/boost/fusion/container/vector/detail/distance_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/vector/detail/distance_impl.hpp
rename to include/boost/fusion/container/vector/detail/distance_impl.hpp
diff --git a/include/boost/fusion/sequence/container/vector/detail/end_impl.hpp b/include/boost/fusion/container/vector/detail/end_impl.hpp
similarity index 93%
rename from include/boost/fusion/sequence/container/vector/detail/end_impl.hpp
rename to include/boost/fusion/container/vector/detail/end_impl.hpp
index 795cabaa..f33282dc 100644
--- a/include/boost/fusion/sequence/container/vector/detail/end_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/end_impl.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_END_IMPL_05042005_1142)
 #define FUSION_END_IMPL_05042005_1142
 
-#include <boost/fusion/sequence/container/vector/vector_iterator.hpp>
+#include <boost/fusion/container/vector/vector_iterator.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/container/vector/detail/equal_to_impl.hpp b/include/boost/fusion/container/vector/detail/equal_to_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/vector/detail/equal_to_impl.hpp
rename to include/boost/fusion/container/vector/detail/equal_to_impl.hpp
diff --git a/include/boost/fusion/sequence/container/vector/detail/next_impl.hpp b/include/boost/fusion/container/vector/detail/next_impl.hpp
similarity index 94%
rename from include/boost/fusion/sequence/container/vector/detail/next_impl.hpp
rename to include/boost/fusion/container/vector/detail/next_impl.hpp
index 1bbe16f1..b11cfdb2 100644
--- a/include/boost/fusion/sequence/container/vector/detail/next_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/next_impl.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_NEXT_IMPL_05042005_1058)
 #define FUSION_NEXT_IMPL_05042005_1058
 
-#include <boost/fusion/sequence/container/vector/vector_iterator.hpp>
+#include <boost/fusion/container/vector/vector_iterator.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/container/vector/detail/prior_impl.hpp b/include/boost/fusion/container/vector/detail/prior_impl.hpp
similarity index 94%
rename from include/boost/fusion/sequence/container/vector/detail/prior_impl.hpp
rename to include/boost/fusion/container/vector/detail/prior_impl.hpp
index 3caaa590..610591b6 100644
--- a/include/boost/fusion/sequence/container/vector/detail/prior_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/prior_impl.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_PRIOR_IMPL_05042005_1145)
 #define FUSION_PRIOR_IMPL_05042005_1145
 
-#include <boost/fusion/sequence/container/vector/vector_iterator.hpp>
+#include <boost/fusion/container/vector/vector_iterator.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/container/vector/detail/value_at_impl.hpp b/include/boost/fusion/container/vector/detail/value_at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/vector/detail/value_at_impl.hpp
rename to include/boost/fusion/container/vector/detail/value_at_impl.hpp
diff --git a/include/boost/fusion/sequence/container/vector/detail/value_of_impl.hpp b/include/boost/fusion/container/vector/detail/value_of_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/vector/detail/value_of_impl.hpp
rename to include/boost/fusion/container/vector/detail/value_of_impl.hpp
diff --git a/include/boost/fusion/sequence/container/vector/detail/vector_forward_ctor.hpp b/include/boost/fusion/container/vector/detail/vector_forward_ctor.hpp
similarity index 94%
rename from include/boost/fusion/sequence/container/vector/detail/vector_forward_ctor.hpp
rename to include/boost/fusion/container/vector/detail/vector_forward_ctor.hpp
index 0dadc05d..e4680bb8 100644
--- a/include/boost/fusion/sequence/container/vector/detail/vector_forward_ctor.hpp
+++ b/include/boost/fusion/container/vector/detail/vector_forward_ctor.hpp
@@ -13,7 +13,7 @@
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 
 #define BOOST_PP_FILENAME_1 \
-    <boost/fusion/sequence/container/vector/detail/vector_forward_ctor.hpp>
+    <boost/fusion/container/vector/detail/vector_forward_ctor.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/vector/detail/vector_n.hpp b/include/boost/fusion/container/vector/detail/vector_n.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/vector/detail/vector_n.hpp
rename to include/boost/fusion/container/vector/detail/vector_n.hpp
diff --git a/include/boost/fusion/sequence/container/vector/detail/vector_n_chooser.hpp b/include/boost/fusion/container/vector/detail/vector_n_chooser.hpp
similarity index 85%
rename from include/boost/fusion/sequence/container/vector/detail/vector_n_chooser.hpp
rename to include/boost/fusion/container/vector/detail/vector_n_chooser.hpp
index 8f372b9b..29248907 100644
--- a/include/boost/fusion/sequence/container/vector/detail/vector_n_chooser.hpp
+++ b/include/boost/fusion/container/vector/detail/vector_n_chooser.hpp
@@ -8,21 +8,21 @@
 #if !defined(FUSION_VECTOR_N_CHOOSER_07072005_1248)
 #define FUSION_VECTOR_N_CHOOSER_07072005_1248
 
-#include <boost/fusion/sequence/container/vector/limits.hpp>
+#include <boost/fusion/container/vector/limits.hpp>
 
 //  include vector0..N where N is FUSION_MAX_VECTOR_SIZE
-#include <boost/fusion/sequence/container/vector/vector10.hpp>
+#include <boost/fusion/container/vector/vector10.hpp>
 #if (FUSION_MAX_VECTOR_SIZE > 10)
-#include <boost/fusion/sequence/container/vector/vector20.hpp>
+#include <boost/fusion/container/vector/vector20.hpp>
 #endif
 #if (FUSION_MAX_VECTOR_SIZE > 20)
-#include <boost/fusion/sequence/container/vector/vector30.hpp>
+#include <boost/fusion/container/vector/vector30.hpp>
 #endif
 #if (FUSION_MAX_VECTOR_SIZE > 30)
-#include <boost/fusion/sequence/container/vector/vector40.hpp>
+#include <boost/fusion/container/vector/vector40.hpp>
 #endif
 #if (FUSION_MAX_VECTOR_SIZE > 40)
-#include <boost/fusion/sequence/container/vector/vector50.hpp>
+#include <boost/fusion/container/vector/vector50.hpp>
 #endif
 
 #include <boost/mpl/distance.hpp>
@@ -52,7 +52,7 @@ namespace boost { namespace fusion { namespace detail
     };
 
 #define BOOST_PP_FILENAME_1 \
-    <boost/fusion/sequence/container/vector/detail/vector_n_chooser.hpp>
+    <boost/fusion/container/vector/detail/vector_n_chooser.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/vector/limits.hpp b/include/boost/fusion/container/vector/limits.hpp
similarity index 100%
rename from include/boost/fusion/sequence/container/vector/limits.hpp
rename to include/boost/fusion/container/vector/limits.hpp
diff --git a/include/boost/fusion/sequence/container/vector/vector.hpp b/include/boost/fusion/container/vector/vector.hpp
similarity index 94%
rename from include/boost/fusion/sequence/container/vector/vector.hpp
rename to include/boost/fusion/container/vector/vector.hpp
index adbce7f0..aef3134c 100644
--- a/include/boost/fusion/sequence/container/vector/vector.hpp
+++ b/include/boost/fusion/container/vector/vector.hpp
@@ -7,8 +7,8 @@
 #if !defined(FUSION_VECTOR_07072005_1244)
 #define FUSION_VECTOR_07072005_1244
 
-#include <boost/fusion/sequence/container/vector/vector_fwd.hpp>
-#include <boost/fusion/sequence/container/vector/detail/vector_n_chooser.hpp>
+#include <boost/fusion/container/vector/vector_fwd.hpp>
+#include <boost/fusion/container/vector/detail/vector_n_chooser.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/mpl/at.hpp>
 #include <boost/mpl/bool.hpp>
@@ -69,7 +69,7 @@ namespace boost { namespace fusion
         //      typename detail::call_param<T0>::type _0
         //    , typename detail::call_param<T1>::type _1)
         //    : vec(_0, _1) {}
-        #include <boost/fusion/sequence/container/vector/detail/vector_forward_ctor.hpp>
+        #include <boost/fusion/container/vector/detail/vector_forward_ctor.hpp>
 
         template <BOOST_PP_ENUM_PARAMS(FUSION_MAX_VECTOR_SIZE, typename U)>
         vector&
diff --git a/include/boost/fusion/sequence/container/vector/vector10.hpp b/include/boost/fusion/container/vector/vector10.hpp
similarity index 84%
rename from include/boost/fusion/sequence/container/vector/vector10.hpp
rename to include/boost/fusion/container/vector/vector10.hpp
index 6ff80a0c..28531b6f 100644
--- a/include/boost/fusion/sequence/container/vector/vector10.hpp
+++ b/include/boost/fusion/container/vector/vector10.hpp
@@ -12,10 +12,10 @@
 #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/container/vector/detail/at_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/value_at_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/end_impl.hpp>
+#include <boost/fusion/container/vector/detail/at_impl.hpp>
+#include <boost/fusion/container/vector/detail/value_at_impl.hpp>
+#include <boost/fusion/container/vector/detail/begin_impl.hpp>
+#include <boost/fusion/container/vector/detail/end_impl.hpp>
 
 #include <boost/mpl/void.hpp>
 #include <boost/mpl/int.hpp>
@@ -56,7 +56,7 @@ namespace boost { namespace fusion
     };
 
 // expand vector1 to vector10
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/container/vector/detail/vector_n.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/vector/detail/vector_n.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, 10)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/vector/vector20.hpp b/include/boost/fusion/container/vector/vector20.hpp
similarity index 80%
rename from include/boost/fusion/sequence/container/vector/vector20.hpp
rename to include/boost/fusion/container/vector/vector20.hpp
index 63809dfb..be711006 100644
--- a/include/boost/fusion/sequence/container/vector/vector20.hpp
+++ b/include/boost/fusion/container/vector/vector20.hpp
@@ -12,10 +12,10 @@
 #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/container/vector/detail/at_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/value_at_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/end_impl.hpp>
+#include <boost/fusion/container/vector/detail/at_impl.hpp>
+#include <boost/fusion/container/vector/detail/value_at_impl.hpp>
+#include <boost/fusion/container/vector/detail/begin_impl.hpp>
+#include <boost/fusion/container/vector/detail/end_impl.hpp>
 
 #include <boost/mpl/void.hpp>
 #include <boost/mpl/int.hpp>
@@ -40,7 +40,7 @@ namespace boost { namespace fusion
     struct random_access_traversal_tag;
 
 // expand vector11 to vector20
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/container/vector/detail/vector_n.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/vector/detail/vector_n.hpp>
 #define BOOST_PP_ITERATION_LIMITS (11, 20)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/vector/vector30.hpp b/include/boost/fusion/container/vector/vector30.hpp
similarity index 80%
rename from include/boost/fusion/sequence/container/vector/vector30.hpp
rename to include/boost/fusion/container/vector/vector30.hpp
index 0c094ebd..efbe9293 100644
--- a/include/boost/fusion/sequence/container/vector/vector30.hpp
+++ b/include/boost/fusion/container/vector/vector30.hpp
@@ -12,10 +12,10 @@
 #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/container/vector/detail/at_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/value_at_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/end_impl.hpp>
+#include <boost/fusion/container/vector/detail/at_impl.hpp>
+#include <boost/fusion/container/vector/detail/value_at_impl.hpp>
+#include <boost/fusion/container/vector/detail/begin_impl.hpp>
+#include <boost/fusion/container/vector/detail/end_impl.hpp>
 
 #include <boost/mpl/void.hpp>
 #include <boost/mpl/int.hpp>
@@ -40,7 +40,7 @@ namespace boost { namespace fusion
     struct random_access_traversal_tag;
  
 // expand vector21 to vector30
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/container/vector/detail/vector_n.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/vector/detail/vector_n.hpp>
 #define BOOST_PP_ITERATION_LIMITS (21, 30)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/vector/vector40.hpp b/include/boost/fusion/container/vector/vector40.hpp
similarity index 80%
rename from include/boost/fusion/sequence/container/vector/vector40.hpp
rename to include/boost/fusion/container/vector/vector40.hpp
index ecb13b71..b72a23c5 100644
--- a/include/boost/fusion/sequence/container/vector/vector40.hpp
+++ b/include/boost/fusion/container/vector/vector40.hpp
@@ -12,10 +12,10 @@
 #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/container/vector/detail/at_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/value_at_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/end_impl.hpp>
+#include <boost/fusion/container/vector/detail/at_impl.hpp>
+#include <boost/fusion/container/vector/detail/value_at_impl.hpp>
+#include <boost/fusion/container/vector/detail/begin_impl.hpp>
+#include <boost/fusion/container/vector/detail/end_impl.hpp>
 
 #include <boost/mpl/void.hpp>
 #include <boost/mpl/int.hpp>
@@ -40,7 +40,7 @@ namespace boost { namespace fusion
     struct random_access_traversal_tag;
 
 // expand vector31 to vector40
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/container/vector/detail/vector_n.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/vector/detail/vector_n.hpp>
 #define BOOST_PP_ITERATION_LIMITS (31, 40)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/vector/vector50.hpp b/include/boost/fusion/container/vector/vector50.hpp
similarity index 80%
rename from include/boost/fusion/sequence/container/vector/vector50.hpp
rename to include/boost/fusion/container/vector/vector50.hpp
index f5109448..ab8515d7 100644
--- a/include/boost/fusion/sequence/container/vector/vector50.hpp
+++ b/include/boost/fusion/container/vector/vector50.hpp
@@ -12,10 +12,10 @@
 #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/container/vector/detail/at_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/value_at_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/end_impl.hpp>
+#include <boost/fusion/container/vector/detail/at_impl.hpp>
+#include <boost/fusion/container/vector/detail/value_at_impl.hpp>
+#include <boost/fusion/container/vector/detail/begin_impl.hpp>
+#include <boost/fusion/container/vector/detail/end_impl.hpp>
 
 #include <boost/mpl/void.hpp>
 #include <boost/mpl/int.hpp>
@@ -40,7 +40,7 @@ namespace boost { namespace fusion
     struct random_access_traversal_tag;
 
 // expand vector41 to vector50
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/container/vector/detail/vector_n.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/vector/detail/vector_n.hpp>
 #define BOOST_PP_ITERATION_LIMITS (41, 50)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/container/vector/vector_fwd.hpp b/include/boost/fusion/container/vector/vector_fwd.hpp
similarity index 92%
rename from include/boost/fusion/sequence/container/vector/vector_fwd.hpp
rename to include/boost/fusion/container/vector/vector_fwd.hpp
index 8d1e23d6..a6b9cc66 100644
--- a/include/boost/fusion/sequence/container/vector/vector_fwd.hpp
+++ b/include/boost/fusion/container/vector/vector_fwd.hpp
@@ -8,7 +8,7 @@
 #if !defined(FUSION_VECTOR_FORWARD_07072005_0125)
 #define FUSION_VECTOR_FORWARD_07072005_0125
 
-#include <boost/fusion/sequence/container/vector/limits.hpp>
+#include <boost/fusion/container/vector/limits.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/sequence/container/vector/vector_iterator.hpp b/include/boost/fusion/container/vector/vector_iterator.hpp
similarity index 70%
rename from include/boost/fusion/sequence/container/vector/vector_iterator.hpp
rename to include/boost/fusion/container/vector/vector_iterator.hpp
index fee4f6b0..9feeb520 100644
--- a/include/boost/fusion/sequence/container/vector/vector_iterator.hpp
+++ b/include/boost/fusion/container/vector/vector_iterator.hpp
@@ -8,13 +8,13 @@
 #define FUSION_VECTOR_ITERATOR_05042005_0635
 
 #include <boost/fusion/support/iterator_base.hpp>
-#include <boost/fusion/sequence/container/vector/detail/deref_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/value_of_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/next_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/prior_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/equal_to_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/distance_impl.hpp>
-#include <boost/fusion/sequence/container/vector/detail/advance_impl.hpp>
+#include <boost/fusion/container/vector/detail/deref_impl.hpp>
+#include <boost/fusion/container/vector/detail/value_of_impl.hpp>
+#include <boost/fusion/container/vector/detail/next_impl.hpp>
+#include <boost/fusion/container/vector/detail/prior_impl.hpp>
+#include <boost/fusion/container/vector/detail/equal_to_impl.hpp>
+#include <boost/fusion/container/vector/detail/distance_impl.hpp>
+#include <boost/fusion/container/vector/detail/advance_impl.hpp>
 #include <boost/type_traits/add_const.hpp>
 #include <boost/mpl/int.hpp>
 
diff --git a/include/boost/fusion/functional/adapter/limits.hpp b/include/boost/fusion/functional/adapter/limits.hpp
index 476fe021..cf6701c4 100644
--- a/include/boost/fusion/functional/adapter/limits.hpp
+++ b/include/boost/fusion/functional/adapter/limits.hpp
@@ -9,7 +9,7 @@
 #if !defined(BOOST_FUSION_FUNCTIONAL_ADAPTER_LIMITS_HPP_INCLUDED)
 #   define BOOST_FUSION_FUNCTIONAL_ADAPTER_LIMITS_HPP_INCLUDED
 
-#   include <boost/fusion/sequence/container/vector/limits.hpp>
+#   include <boost/fusion/container/vector/limits.hpp>
 
 #   if !defined(BOOST_FUSION_UNFUSED_GENERIC_MAX_ARITY)
 #       define BOOST_FUSION_UNFUSED_GENERIC_MAX_ARITY 6
diff --git a/include/boost/fusion/functional/adapter/unfused_generic.hpp b/include/boost/fusion/functional/adapter/unfused_generic.hpp
index 69191ef3..82b1e4b0 100644
--- a/include/boost/fusion/functional/adapter/unfused_generic.hpp
+++ b/include/boost/fusion/functional/adapter/unfused_generic.hpp
@@ -18,7 +18,7 @@
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/facilities/intercept.hpp>
 
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 
 #include <boost/fusion/functional/adapter/limits.hpp>
 #include <boost/fusion/functional/adapter/detail/access.hpp>
diff --git a/include/boost/fusion/functional/adapter/unfused_lvalue_args.hpp b/include/boost/fusion/functional/adapter/unfused_lvalue_args.hpp
index 7b801cf7..ba2f31b6 100644
--- a/include/boost/fusion/functional/adapter/unfused_lvalue_args.hpp
+++ b/include/boost/fusion/functional/adapter/unfused_lvalue_args.hpp
@@ -17,7 +17,7 @@
 
 #include <boost/utility/result_of.hpp>
 
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 
 #include <boost/fusion/functional/adapter/limits.hpp>
 #include <boost/fusion/functional/adapter/detail/access.hpp>
diff --git a/include/boost/fusion/functional/adapter/unfused_rvalue_args.hpp b/include/boost/fusion/functional/adapter/unfused_rvalue_args.hpp
index eea0fec9..3c80475e 100644
--- a/include/boost/fusion/functional/adapter/unfused_rvalue_args.hpp
+++ b/include/boost/fusion/functional/adapter/unfused_rvalue_args.hpp
@@ -17,7 +17,7 @@
 
 #include <boost/utility/result_of.hpp>
 
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 
 #include <boost/fusion/functional/adapter/limits.hpp>
 #include <boost/fusion/functional/adapter/detail/access.hpp>
diff --git a/include/boost/fusion/functional/adapter/unfused_typed.hpp b/include/boost/fusion/functional/adapter/unfused_typed.hpp
index 94385a35..9ee3a7a6 100644
--- a/include/boost/fusion/functional/adapter/unfused_typed.hpp
+++ b/include/boost/fusion/functional/adapter/unfused_typed.hpp
@@ -22,8 +22,8 @@
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 
 #include <boost/fusion/functional/adapter/limits.hpp>
 #include <boost/fusion/functional/adapter/detail/access.hpp>
diff --git a/include/boost/fusion/include/accumulate.hpp b/include/boost/fusion/include/accumulate.hpp
new file mode 100644
index 00000000..e3532dc0
--- /dev/null
+++ b/include/boost/fusion/include/accumulate.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ACCUMULATE)
+#define FUSION_INCLUDE_ACCUMULATE
+
+#include <boost/fusion/algorithm/accumulate.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/adapt_struct.hpp b/include/boost/fusion/include/adapt_struct.hpp
index 2fab5de7..facc8970 100644
--- a/include/boost/fusion/include/adapt_struct.hpp
+++ b/include/boost/fusion/include/adapt_struct.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_ADAPT_STRUCT)
 #define FUSION_INCLUDE_ADAPT_STRUCT
 
-#include <boost/fusion/sequence/adapted/struct/adapt_struct.hpp>
+#include <boost/fusion/adapted/struct/adapt_struct.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/adapted.hpp b/include/boost/fusion/include/adapted.hpp
new file mode 100644
index 00000000..1827267d
--- /dev/null
+++ b/include/boost/fusion/include/adapted.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ADAPTED)
+#define FUSION_INCLUDE_ADAPTED
+
+#include <boost/fusion/adapted.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/adapter.hpp b/include/boost/fusion/include/adapter.hpp
new file mode 100644
index 00000000..2441d7ca
--- /dev/null
+++ b/include/boost/fusion/include/adapter.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ADAPTER)
+#define FUSION_INCLUDE_ADAPTER
+
+#include <boost/fusion/functional/adapter.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/advance.hpp b/include/boost/fusion/include/advance.hpp
new file mode 100644
index 00000000..cb9ed7a9
--- /dev/null
+++ b/include/boost/fusion/include/advance.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ADVANCE)
+#define FUSION_INCLUDE_ADVANCE
+
+#include <boost/fusion/iterator/advance.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/algorithm.hpp b/include/boost/fusion/include/algorithm.hpp
new file mode 100644
index 00000000..1a362fd8
--- /dev/null
+++ b/include/boost/fusion/include/algorithm.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ALGORITHM)
+#define FUSION_INCLUDE_ALGORITHM
+
+#include <boost/fusion/algorithm.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/all.hpp b/include/boost/fusion/include/all.hpp
new file mode 100644
index 00000000..58026268
--- /dev/null
+++ b/include/boost/fusion/include/all.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ALL)
+#define FUSION_INCLUDE_ALL
+
+#include <boost/fusion/algorithm/query/all.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/array.hpp b/include/boost/fusion/include/array.hpp
new file mode 100644
index 00000000..b54cd70d
--- /dev/null
+++ b/include/boost/fusion/include/array.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ARRAY)
+#define FUSION_INCLUDE_ARRAY
+
+#include <boost/fusion/adapted/array.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/as_deque.hpp b/include/boost/fusion/include/as_deque.hpp
new file mode 100644
index 00000000..8f1686f2
--- /dev/null
+++ b/include/boost/fusion/include/as_deque.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_AS_DEQUE)
+#define FUSION_INCLUDE_AS_DEQUE
+
+#include <boost/fusion/container/deque/convert.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/as_list.hpp b/include/boost/fusion/include/as_list.hpp
new file mode 100644
index 00000000..6c477d24
--- /dev/null
+++ b/include/boost/fusion/include/as_list.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_AS_LIST)
+#define FUSION_INCLUDE_AS_LIST
+
+#include <boost/fusion/container/list/convert.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/as_map.hpp b/include/boost/fusion/include/as_map.hpp
new file mode 100644
index 00000000..bdfd3f53
--- /dev/null
+++ b/include/boost/fusion/include/as_map.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_AS_MAP)
+#define FUSION_INCLUDE_AS_MAP
+
+#include <boost/fusion/container/map/convert.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/as_set.hpp b/include/boost/fusion/include/as_set.hpp
new file mode 100644
index 00000000..c0d5a8b3
--- /dev/null
+++ b/include/boost/fusion/include/as_set.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_AS_SET)
+#define FUSION_INCLUDE_AS_SET
+
+#include <boost/fusion/container/set/convert.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/as_vector.hpp b/include/boost/fusion/include/as_vector.hpp
index 2136b492..4c9b39d0 100644
--- a/include/boost/fusion/include/as_vector.hpp
+++ b/include/boost/fusion/include/as_vector.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_AS_VECTOR)
 #define FUSION_INCLUDE_AS_VECTOR
 
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/at_key.hpp b/include/boost/fusion/include/at_key.hpp
new file mode 100644
index 00000000..89a0aae2
--- /dev/null
+++ b/include/boost/fusion/include/at_key.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_AT_KEY)
+#define FUSION_INCLUDE_AT_KEY
+
+#include <boost/fusion/sequence/intrinsic/at_key.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/back.hpp b/include/boost/fusion/include/back.hpp
new file mode 100644
index 00000000..d5e77f0a
--- /dev/null
+++ b/include/boost/fusion/include/back.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_BACK)
+#define FUSION_INCLUDE_BACK
+
+#include <boost/fusion/sequence/intrinsic/back.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/boost_tuple.hpp b/include/boost/fusion/include/boost_tuple.hpp
new file mode 100644
index 00000000..1ccc94da
--- /dev/null
+++ b/include/boost/fusion/include/boost_tuple.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_BOOST_TUPLE)
+#define FUSION_INCLUDE_BOOST_TUPLE
+
+#include <boost/fusion/adapted/boost_tuple.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/category_of.hpp b/include/boost/fusion/include/category_of.hpp
new file mode 100644
index 00000000..c390686c
--- /dev/null
+++ b/include/boost/fusion/include/category_of.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_CATEGORY_OF)
+#define FUSION_INCLUDE_CATEGORY_OF
+
+#include <boost/fusion/support/category_of.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/clear.hpp b/include/boost/fusion/include/clear.hpp
new file mode 100644
index 00000000..7fd86332
--- /dev/null
+++ b/include/boost/fusion/include/clear.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_CLEAR)
+#define FUSION_INCLUDE_CLEAR
+
+#include <boost/fusion/algorithm/transformation/clear.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/comparison.hpp b/include/boost/fusion/include/comparison.hpp
new file mode 100644
index 00000000..e7790f28
--- /dev/null
+++ b/include/boost/fusion/include/comparison.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_COMPARISON)
+#define FUSION_INCLUDE_COMPARISON
+
+#include <boost/fusion/sequence/comparison.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/cons.hpp b/include/boost/fusion/include/cons.hpp
new file mode 100644
index 00000000..853eb6d2
--- /dev/null
+++ b/include/boost/fusion/include/cons.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_CONS)
+#define FUSION_INCLUDE_CONS
+
+#include <boost/fusion/container/list/cons.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/cons_tie.hpp b/include/boost/fusion/include/cons_tie.hpp
new file mode 100644
index 00000000..0fa5a592
--- /dev/null
+++ b/include/boost/fusion/include/cons_tie.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_CONS_TIE)
+#define FUSION_INCLUDE_CONS_TIE
+
+#include <boost/fusion/sequence/generation/cons_tie.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/container.hpp b/include/boost/fusion/include/container.hpp
new file mode 100644
index 00000000..657b4c30
--- /dev/null
+++ b/include/boost/fusion/include/container.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_CONTAINER)
+#define FUSION_INCLUDE_CONTAINER
+
+#include <boost/fusion/container.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/convert.hpp b/include/boost/fusion/include/convert.hpp
new file mode 100644
index 00000000..1d64ea1b
--- /dev/null
+++ b/include/boost/fusion/include/convert.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_CONVERT)
+#define FUSION_INCLUDE_CONVERT
+
+#include <boost/fusion/sequence/convert.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/count.hpp b/include/boost/fusion/include/count.hpp
new file mode 100644
index 00000000..750a0303
--- /dev/null
+++ b/include/boost/fusion/include/count.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_COUNT)
+#define FUSION_INCLUDE_COUNT
+
+#include <boost/fusion/algorithm/query/count.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/count_if.hpp b/include/boost/fusion/include/count_if.hpp
new file mode 100644
index 00000000..ff804ae9
--- /dev/null
+++ b/include/boost/fusion/include/count_if.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_COUNT_IF)
+#define FUSION_INCLUDE_COUNT_IF
+
+#include <boost/fusion/algorithm/query/count_if.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/deduce.hpp b/include/boost/fusion/include/deduce.hpp
new file mode 100644
index 00000000..43ec5c0f
--- /dev/null
+++ b/include/boost/fusion/include/deduce.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_DEDUCE)
+#define FUSION_INCLUDE_DEDUCE
+
+#include <boost/fusion/support/deduce.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/deduce_sequence.hpp b/include/boost/fusion/include/deduce_sequence.hpp
new file mode 100644
index 00000000..a8d36c08
--- /dev/null
+++ b/include/boost/fusion/include/deduce_sequence.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_DEDUCE_SEQUENCE)
+#define FUSION_INCLUDE_DEDUCE_SEQUENCE
+
+#include <boost/fusion/support/deduce_sequence.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/deque.hpp b/include/boost/fusion/include/deque.hpp
new file mode 100644
index 00000000..17386a1d
--- /dev/null
+++ b/include/boost/fusion/include/deque.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_DEQUE)
+#define FUSION_INCLUDE_DEQUE
+
+#include <boost/fusion/container/deque.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/deque_fwd.hpp b/include/boost/fusion/include/deque_fwd.hpp
new file mode 100644
index 00000000..915c3cbb
--- /dev/null
+++ b/include/boost/fusion/include/deque_fwd.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_DEQUE)
+#define FUSION_INCLUDE_DEQUE
+
+#include <boost/fusion/container/deque/deque_fwd.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/deque_tie.hpp b/include/boost/fusion/include/deque_tie.hpp
new file mode 100644
index 00000000..20ab1958
--- /dev/null
+++ b/include/boost/fusion/include/deque_tie.hpp
@@ -0,0 +1,13 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_GENERATION)
+#define FUSION_INCLUDE_GENERATION
+
+#include <boost/fusion/sequence/generation.hpp>
+#include <boost/fusion/functional/generation.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/distance.hpp b/include/boost/fusion/include/distance.hpp
new file mode 100644
index 00000000..fac103a6
--- /dev/null
+++ b/include/boost/fusion/include/distance.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_DISTANCE)
+#define FUSION_INCLUDE_DISTANCE
+
+#include <boost/fusion/iterator/distance.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/empty.hpp b/include/boost/fusion/include/empty.hpp
new file mode 100644
index 00000000..0a8af33c
--- /dev/null
+++ b/include/boost/fusion/include/empty.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_EMPTY)
+#define FUSION_INCLUDE_EMPTY
+
+#include <boost/fusion/sequence/intrinsic/empty.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/erase.hpp b/include/boost/fusion/include/erase.hpp
new file mode 100644
index 00000000..b7e6fafb
--- /dev/null
+++ b/include/boost/fusion/include/erase.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ERASE)
+#define FUSION_INCLUDE_ERASE
+
+#include <boost/fusion/algorithm/transformation/erase.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/erase_key.hpp b/include/boost/fusion/include/erase_key.hpp
new file mode 100644
index 00000000..e13c889f
--- /dev/null
+++ b/include/boost/fusion/include/erase_key.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ERASE_KEY)
+#define FUSION_INCLUDE_ERASE_KEY
+
+#include <boost/fusion/algorithm/transformation/erase_key.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/filter.hpp b/include/boost/fusion/include/filter.hpp
new file mode 100644
index 00000000..234e4064
--- /dev/null
+++ b/include/boost/fusion/include/filter.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_FILTER)
+#define FUSION_INCLUDE_FILTER
+
+#include <boost/fusion/algorithm/transformation/filter.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/filter_view.hpp b/include/boost/fusion/include/filter_view.hpp
new file mode 100644
index 00000000..196df8a0
--- /dev/null
+++ b/include/boost/fusion/include/filter_view.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_FILTER_VIEW)
+#define FUSION_INCLUDE_FILTER_VIEW
+
+#include <boost/fusion/view/filter_view.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/find.hpp b/include/boost/fusion/include/find.hpp
new file mode 100644
index 00000000..cf50c412
--- /dev/null
+++ b/include/boost/fusion/include/find.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_FIND)
+#define FUSION_INCLUDE_FIND
+
+#include <boost/fusion/algorithm/query/find.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/find_if.hpp b/include/boost/fusion/include/find_if.hpp
new file mode 100644
index 00000000..aa1a4c7a
--- /dev/null
+++ b/include/boost/fusion/include/find_if.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_FIND_IF)
+#define FUSION_INCLUDE_FIND_IF
+
+#include <boost/fusion/algorithm/query/find_if.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/fold.hpp b/include/boost/fusion/include/fold.hpp
new file mode 100644
index 00000000..40bf3a79
--- /dev/null
+++ b/include/boost/fusion/include/fold.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_FOLD)
+#define FUSION_INCLUDE_FOLD
+
+#include <boost/fusion/algorithm/iteration/fold.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/front.hpp b/include/boost/fusion/include/front.hpp
new file mode 100644
index 00000000..495deaf7
--- /dev/null
+++ b/include/boost/fusion/include/front.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_FRONT)
+#define FUSION_INCLUDE_FRONT
+
+#include <boost/fusion/sequence/intrinsic/front.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/functional.hpp b/include/boost/fusion/include/functional.hpp
new file mode 100644
index 00000000..ab38fe1f
--- /dev/null
+++ b/include/boost/fusion/include/functional.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_FUNCTIONAL)
+#define FUSION_INCLUDE_FUNCTIONAL
+
+#include <boost/fusion/functional.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/fused.hpp b/include/boost/fusion/include/fused.hpp
new file mode 100644
index 00000000..fa9dd464
--- /dev/null
+++ b/include/boost/fusion/include/fused.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_FUSED)
+#define FUSION_INCLUDE_FUSED
+
+#include <boost/fusion/functional/adapter/fused.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/fused_function_object.hpp b/include/boost/fusion/include/fused_function_object.hpp
new file mode 100644
index 00000000..d35140c6
--- /dev/null
+++ b/include/boost/fusion/include/fused_function_object.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_FUSED_FUNCTION_OBJECT)
+#define FUSION_INCLUDE_FUSED_FUNCTION_OBJECT
+
+#include <boost/fusion/functional/adapter/fused_function_object.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/fused_procedure.hpp b/include/boost/fusion/include/fused_procedure.hpp
new file mode 100644
index 00000000..9df4717b
--- /dev/null
+++ b/include/boost/fusion/include/fused_procedure.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_FUSED_PROCEDURE)
+#define FUSION_INCLUDE_FUSED_PROCEDURE
+
+#include <boost/fusion/functional/adapter/fused_procedure.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/generation.hpp b/include/boost/fusion/include/generation.hpp
new file mode 100644
index 00000000..20ab1958
--- /dev/null
+++ b/include/boost/fusion/include/generation.hpp
@@ -0,0 +1,13 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_GENERATION)
+#define FUSION_INCLUDE_GENERATION
+
+#include <boost/fusion/sequence/generation.hpp>
+#include <boost/fusion/functional/generation.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/greater.hpp b/include/boost/fusion/include/greater.hpp
new file mode 100644
index 00000000..a5ff306f
--- /dev/null
+++ b/include/boost/fusion/include/greater.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_NOT_GREATER)
+#define FUSION_INCLUDE_NOT_GREATER
+
+#include <boost/fusion/sequence/comparison/greater.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/greater_equal.hpp b/include/boost/fusion/include/greater_equal.hpp
new file mode 100644
index 00000000..3a092551
--- /dev/null
+++ b/include/boost/fusion/include/greater_equal.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_GREATER_EQUAL)
+#define FUSION_INCLUDE_GREATER_EQUAL
+
+#include <boost/fusion/sequence/comparison/greater_equal.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/has_key.hpp b/include/boost/fusion/include/has_key.hpp
new file mode 100644
index 00000000..4eef64a1
--- /dev/null
+++ b/include/boost/fusion/include/has_key.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_HAS_KEY)
+#define FUSION_INCLUDE_EMPTY
+
+#include <boost/fusion/sequence/intrinsic/has_key.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/ignore.hpp b/include/boost/fusion/include/ignore.hpp
new file mode 100644
index 00000000..20ab1958
--- /dev/null
+++ b/include/boost/fusion/include/ignore.hpp
@@ -0,0 +1,13 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_GENERATION)
+#define FUSION_INCLUDE_GENERATION
+
+#include <boost/fusion/sequence/generation.hpp>
+#include <boost/fusion/functional/generation.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/in.hpp b/include/boost/fusion/include/in.hpp
new file mode 100644
index 00000000..ca285c0e
--- /dev/null
+++ b/include/boost/fusion/include/in.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Hartmut Kaiser
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_IN)
+#define FUSION_INCLUDE_IN
+
+#include <boost/fusion/sequence/io/in.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/insert.hpp b/include/boost/fusion/include/insert.hpp
new file mode 100644
index 00000000..53c0b05e
--- /dev/null
+++ b/include/boost/fusion/include/insert.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_INSERT)
+#define FUSION_INCLUDE_INSERT
+
+#include <boost/fusion/algorithm/transformation/insert.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/insert_range.hpp b/include/boost/fusion/include/insert_range.hpp
new file mode 100644
index 00000000..f7093ed9
--- /dev/null
+++ b/include/boost/fusion/include/insert_range.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_INSERT_RANGE)
+#define FUSION_INCLUDE_INSERT_RANGE
+
+#include <boost/fusion/algorithm/transformation/insert_range.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/intrinsic.hpp b/include/boost/fusion/include/intrinsic.hpp
new file mode 100644
index 00000000..c9d78711
--- /dev/null
+++ b/include/boost/fusion/include/intrinsic.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_INTRINSIC)
+#define FUSION_INCLUDE_INTRINSIC
+
+#include <boost/fusion/sequence/intrinsic.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/invocation.hpp b/include/boost/fusion/include/invocation.hpp
new file mode 100644
index 00000000..2a6f12a3
--- /dev/null
+++ b/include/boost/fusion/include/invocation.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_INVOCATION)
+#define FUSION_INCLUDE_INVOCATION
+
+#include <boost/fusion/functional/invocation.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/invoke.hpp b/include/boost/fusion/include/invoke.hpp
new file mode 100644
index 00000000..45226425
--- /dev/null
+++ b/include/boost/fusion/include/invoke.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_INVOKE)
+#define FUSION_INCLUDE_INVOKE
+
+#include <boost/fusion/functional/invocation/invoke.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/invoke_function_object.hpp b/include/boost/fusion/include/invoke_function_object.hpp
new file mode 100644
index 00000000..4ffeb24d
--- /dev/null
+++ b/include/boost/fusion/include/invoke_function_object.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_INVOKE_FUNCTION_OBJECT)
+#define FUSION_INCLUDE_INVOKE_FUNCTION_OBJECT
+
+#include <boost/fusion/functional/invocation/invoke_function_object.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/invoke_procedure.hpp b/include/boost/fusion/include/invoke_procedure.hpp
new file mode 100644
index 00000000..afd46259
--- /dev/null
+++ b/include/boost/fusion/include/invoke_procedure.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_INVOKE_PROCEDURE)
+#define FUSION_INCLUDE_INVOKE_PROCEDURE
+
+#include <boost/fusion/functional/invocation/invoke_procedure.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/is_iterator.hpp b/include/boost/fusion/include/is_iterator.hpp
new file mode 100644
index 00000000..31348eb7
--- /dev/null
+++ b/include/boost/fusion/include/is_iterator.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_IS_ITERATOR)
+#define FUSION_INCLUDE_IS_ITERATOR
+
+#include <boost/fusion/support/is_iterator.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/is_view.hpp b/include/boost/fusion/include/is_view.hpp
new file mode 100644
index 00000000..5ebc3473
--- /dev/null
+++ b/include/boost/fusion/include/is_view.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_IS_VIEW)
+#define FUSION_INCLUDE_IS_VIEW
+
+#include <boost/fusion/support/is_view.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/iteration.hpp b/include/boost/fusion/include/iteration.hpp
new file mode 100644
index 00000000..372aa726
--- /dev/null
+++ b/include/boost/fusion/include/iteration.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ITERATION)
+#define FUSION_INCLUDE_ITERATION
+
+#include <boost/fusion/algorithm/iteration.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/iterator.hpp b/include/boost/fusion/include/iterator.hpp
new file mode 100644
index 00000000..2ed8e838
--- /dev/null
+++ b/include/boost/fusion/include/iterator.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ITERATOR)
+#define FUSION_INCLUDE_ITERATOR
+
+#include <boost/fusion/iterator.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/iterator_base.hpp b/include/boost/fusion/include/iterator_base.hpp
new file mode 100644
index 00000000..bbd35321
--- /dev/null
+++ b/include/boost/fusion/include/iterator_base.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ITERATOR_BASE)
+#define FUSION_INCLUDE_ITERATOR_BASE
+
+#include <boost/fusion/support/iterator_base.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/iterator_facade.hpp b/include/boost/fusion/include/iterator_facade.hpp
new file mode 100644
index 00000000..a36f8b16
--- /dev/null
+++ b/include/boost/fusion/include/iterator_facade.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ITERATOR_FACADE)
+#define FUSION_INCLUDE_ITERATOR_FACADE
+
+#include <boost/fusion/iterator/iterator_facade.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/iterator_range.hpp b/include/boost/fusion/include/iterator_range.hpp
new file mode 100644
index 00000000..54eba6dd
--- /dev/null
+++ b/include/boost/fusion/include/iterator_range.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ITERATOR_RANGE)
+#define FUSION_INCLUDE_ITERATOR_RANGE
+
+#include <boost/fusion/view/iterator_range.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/joint_view.hpp b/include/boost/fusion/include/joint_view.hpp
index c60e34e5..e3d1e204 100644
--- a/include/boost/fusion/include/joint_view.hpp
+++ b/include/boost/fusion/include/joint_view.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_JOINT_VIEW)
 #define FUSION_INCLUDE_JOINT_VIEW
 
-#include <boost/fusion/sequence/view/joint_view.hpp>
+#include <boost/fusion/view/joint_view.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/less.hpp b/include/boost/fusion/include/less.hpp
new file mode 100644
index 00000000..bd4d2771
--- /dev/null
+++ b/include/boost/fusion/include/less.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_LESS)
+#define FUSION_INCLUDE_LESS
+
+#include <boost/fusion/sequence/comparison/less.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/less_equal.hpp b/include/boost/fusion/include/less_equal.hpp
new file mode 100644
index 00000000..2ac1b72b
--- /dev/null
+++ b/include/boost/fusion/include/less_equal.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_LESS_EQUAL)
+#define FUSION_INCLUDE_LESS_EQUAL
+
+#include <boost/fusion/sequence/comparison/less_equal.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/list.hpp b/include/boost/fusion/include/list.hpp
index fb5c0b42..0a3a1a63 100644
--- a/include/boost/fusion/include/list.hpp
+++ b/include/boost/fusion/include/list.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_LIST)
 #define FUSION_INCLUDE_LIST
 
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/list_fwd.hpp b/include/boost/fusion/include/list_fwd.hpp
new file mode 100644
index 00000000..08823bf6
--- /dev/null
+++ b/include/boost/fusion/include/list_fwd.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_LIST_FWD)
+#define FUSION_INCLUDE_LIST_FWD
+
+#include <boost/fusion/container/list/list_fwd.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/list_tie.hpp b/include/boost/fusion/include/list_tie.hpp
new file mode 100644
index 00000000..20ab1958
--- /dev/null
+++ b/include/boost/fusion/include/list_tie.hpp
@@ -0,0 +1,13 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_GENERATION)
+#define FUSION_INCLUDE_GENERATION
+
+#include <boost/fusion/sequence/generation.hpp>
+#include <boost/fusion/functional/generation.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/make_deque.hpp b/include/boost/fusion/include/make_deque.hpp
new file mode 100644
index 00000000..73ee13d5
--- /dev/null
+++ b/include/boost/fusion/include/make_deque.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_MAKE_DEQUE)
+#define FUSION_INCLUDE_MAKE_DEQUE
+
+#include <boost/fusion/sequence/generation/make_deque.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/make_fused.hpp b/include/boost/fusion/include/make_fused.hpp
new file mode 100644
index 00000000..6ed860ef
--- /dev/null
+++ b/include/boost/fusion/include/make_fused.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_MAKE_FUSED)
+#define FUSION_INCLUDE_MAKE_FUSED
+
+#include <boost/fusion/functional/generation/make_fused.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/make_fused_function_object.hpp b/include/boost/fusion/include/make_fused_function_object.hpp
new file mode 100644
index 00000000..dfc1295b
--- /dev/null
+++ b/include/boost/fusion/include/make_fused_function_object.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_MAKE_FUSED_FUNCTION_OBJECT)
+#define FUSION_INCLUDE_MAKE_FUSED_FUNCTION_OBJECT
+
+#include <boost/fusion/functional/generation/make_fused_function_object.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/make_fused_procedure.hpp b/include/boost/fusion/include/make_fused_procedure.hpp
new file mode 100644
index 00000000..94e44717
--- /dev/null
+++ b/include/boost/fusion/include/make_fused_procedure.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_MAKE_FUSED_PROCEDURE)
+#define FUSION_INCLUDE_MAKE_FUSED_PROCEDURE
+
+#include <boost/fusion/functional/generation/make_fused_procedure.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/make_list.hpp b/include/boost/fusion/include/make_list.hpp
new file mode 100644
index 00000000..2fb5d12e
--- /dev/null
+++ b/include/boost/fusion/include/make_list.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_MAKE_LIST)
+#define FUSION_INCLUDE_MAKE_LIST
+
+#include <boost/fusion/sequence/generation/make_list.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/make_map.hpp b/include/boost/fusion/include/make_map.hpp
new file mode 100644
index 00000000..d5e05c94
--- /dev/null
+++ b/include/boost/fusion/include/make_map.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_MAKE_MAP)
+#define FUSION_INCLUDE_MAKE_MAP
+
+#include <boost/fusion/sequence/generation/make_map.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/make_set.hpp b/include/boost/fusion/include/make_set.hpp
new file mode 100644
index 00000000..a2470ade
--- /dev/null
+++ b/include/boost/fusion/include/make_set.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_MAKE_SET)
+#define FUSION_INCLUDE_MAKE_SET
+
+#include <boost/fusion/sequence/generation/make_set.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/make_tuple.hpp b/include/boost/fusion/include/make_tuple.hpp
new file mode 100644
index 00000000..8cfbdc8e
--- /dev/null
+++ b/include/boost/fusion/include/make_tuple.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_MAKE_TUPLE)
+#define FUSION_INCLUDE_MAKE_TUPLE
+
+#include <boost/fusion/tuple/make_tuple.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/make_unfused_generic.hpp b/include/boost/fusion/include/make_unfused_generic.hpp
new file mode 100644
index 00000000..dcebceb1
--- /dev/null
+++ b/include/boost/fusion/include/make_unfused_generic.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_MAKE_UNFUSED_GENERIC)
+#define FUSION_INCLUDE_MAKE_UNFUSED_GENERIC
+
+#include <boost/fusion/functional/generation/make_unfused_generic.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/make_unfused_lvalue_args.hpp b/include/boost/fusion/include/make_unfused_lvalue_args.hpp
new file mode 100644
index 00000000..1805bb18
--- /dev/null
+++ b/include/boost/fusion/include/make_unfused_lvalue_args.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_MAKE_UNFUSED_LVALUE_ARGS)
+#define FUSION_INCLUDE_MAKE_UNFUSED_LVALUE_ARGS
+
+#include <boost/fusion/functional/generation/make_unfused_lvalue_args.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/make_unfused_rvalue_args.hpp b/include/boost/fusion/include/make_unfused_rvalue_args.hpp
new file mode 100644
index 00000000..0d546be7
--- /dev/null
+++ b/include/boost/fusion/include/make_unfused_rvalue_args.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_MAKE_UNFUSED_RVALUE_ARGS)
+#define FUSION_INCLUDE_MAKE_UNFUSED_RVALUE_ARGS
+
+#include <boost/fusion/functional/generation/make_unfused_rvalue_args.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/map.hpp b/include/boost/fusion/include/map.hpp
new file mode 100644
index 00000000..07441b4a
--- /dev/null
+++ b/include/boost/fusion/include/map.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_MAP)
+#define FUSION_INCLUDE_MAP
+
+#include <boost/fusion/container/map.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/map_fwd.hpp b/include/boost/fusion/include/map_fwd.hpp
new file mode 100644
index 00000000..970c4132
--- /dev/null
+++ b/include/boost/fusion/include/map_fwd.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_MAP_FWD)
+#define FUSION_INCLUDE_MAP_FWD
+
+#include <boost/fusion/container/map/map_fwd.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/map_tie.hpp b/include/boost/fusion/include/map_tie.hpp
new file mode 100644
index 00000000..87e4130f
--- /dev/null
+++ b/include/boost/fusion/include/map_tie.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_MAP_TIE)
+#define FUSION_INCLUDE_MAP_TIE
+
+#include <boost/fusion/sequence/generation/map_tie.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/mpl.hpp b/include/boost/fusion/include/mpl.hpp
index 5e3f906d..8a1cbfd0 100644
--- a/include/boost/fusion/include/mpl.hpp
+++ b/include/boost/fusion/include/mpl.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_INCLUDE_MPL)
 #define FUSION_INCLUDE_MPL
 
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/mpl.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/none.hpp b/include/boost/fusion/include/none.hpp
new file mode 100644
index 00000000..19720ef8
--- /dev/null
+++ b/include/boost/fusion/include/none.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_NONE)
+#define FUSION_INCLUDE_NONE
+
+#include <boost/fusion/algorithm/query/none.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/not_equal_to.hpp b/include/boost/fusion/include/not_equal_to.hpp
new file mode 100644
index 00000000..9e23b899
--- /dev/null
+++ b/include/boost/fusion/include/not_equal_to.hpp
@@ -0,0 +1,13 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_NOT_EQUAL_TO)
+#define FUSION_INCLUDE_NOT_EQUAL_TO
+
+#include <boost/fusion/iterator/equal_to.hpp>
+#include <boost/fusion/sequence/comparison/not_equal_to.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/out.hpp b/include/boost/fusion/include/out.hpp
new file mode 100644
index 00000000..9ecef3e7
--- /dev/null
+++ b/include/boost/fusion/include/out.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Hartmut Kaiser
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_OUT)
+#define FUSION_INCLUDE_OUT
+
+#include <boost/fusion/sequence/io/out.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/pair.hpp b/include/boost/fusion/include/pair.hpp
new file mode 100644
index 00000000..97ebfcd8
--- /dev/null
+++ b/include/boost/fusion/include/pair.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_PAIR)
+#define FUSION_INCLUDE_PAIR
+
+#include <boost/fusion/support/pair.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/pair_tie.hpp b/include/boost/fusion/include/pair_tie.hpp
new file mode 100644
index 00000000..5096ef4f
--- /dev/null
+++ b/include/boost/fusion/include/pair_tie.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_PAIR_TIE)
+#define FUSION_INCLUDE_PAIR_TIE
+
+#include <boost/fusion/sequence/generation/pair_tie.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/pop_back.hpp b/include/boost/fusion/include/pop_back.hpp
new file mode 100644
index 00000000..b5a808cd
--- /dev/null
+++ b/include/boost/fusion/include/pop_back.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_POP_BACK)
+#define FUSION_INCLUDE_POP_BACK
+
+#include <boost/fusion/algorithm/transformation/pop_back.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/pop_front.hpp b/include/boost/fusion/include/pop_front.hpp
new file mode 100644
index 00000000..7df977e0
--- /dev/null
+++ b/include/boost/fusion/include/pop_front.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_POP_FRONT)
+#define FUSION_INCLUDE_POP_FRONT
+
+#include <boost/fusion/algorithm/transformation/pop_front.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/prior.hpp b/include/boost/fusion/include/prior.hpp
new file mode 100644
index 00000000..b18a55a3
--- /dev/null
+++ b/include/boost/fusion/include/prior.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_PRIOR)
+#define FUSION_INCLUDE_PRIOR
+
+#include <boost/fusion/iterator/prior.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/push_back.hpp b/include/boost/fusion/include/push_back.hpp
new file mode 100644
index 00000000..4908e87c
--- /dev/null
+++ b/include/boost/fusion/include/push_back.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_PUSH_BACK)
+#define FUSION_INCLUDE_PUSH_BACK
+
+#include <boost/fusion/algorithm/transformation/push_back.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/query.hpp b/include/boost/fusion/include/query.hpp
new file mode 100644
index 00000000..6e5144b5
--- /dev/null
+++ b/include/boost/fusion/include/query.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_QUERY)
+#define FUSION_INCLUDE_QUERY
+
+#include <boost/fusion/algorithm/query.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/remove.hpp b/include/boost/fusion/include/remove.hpp
new file mode 100644
index 00000000..7f0b4657
--- /dev/null
+++ b/include/boost/fusion/include/remove.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_REMOVE_IF)
+#define FUSION_INCLUDE_REMOVE_IF
+
+#include <boost/fusion/algorithm/transformation/remove_if.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/remove_if.hpp b/include/boost/fusion/include/remove_if.hpp
new file mode 100644
index 00000000..7f0b4657
--- /dev/null
+++ b/include/boost/fusion/include/remove_if.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_REMOVE_IF)
+#define FUSION_INCLUDE_REMOVE_IF
+
+#include <boost/fusion/algorithm/transformation/remove_if.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/repetetive_view.hpp b/include/boost/fusion/include/repetetive_view.hpp
new file mode 100644
index 00000000..f56bca88
--- /dev/null
+++ b/include/boost/fusion/include/repetetive_view.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_REPETETIVE_VIEW)
+#define FUSION_INCLUDE_REPETETIVE_VIEW
+
+#include <boost/fusion/view/repetitive_view.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/replace.hpp b/include/boost/fusion/include/replace.hpp
new file mode 100644
index 00000000..4d0b3af8
--- /dev/null
+++ b/include/boost/fusion/include/replace.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_REPLACE)
+#define FUSION_INCLUDE_REPLACE
+
+#include <boost/fusion/algorithm/transformation/replace.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/replace_if.hpp b/include/boost/fusion/include/replace_if.hpp
new file mode 100644
index 00000000..354e13ab
--- /dev/null
+++ b/include/boost/fusion/include/replace_if.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_REPLACE_IF)
+#define FUSION_INCLUDE_REPLACE_IF
+
+#include <boost/fusion/algorithm/transformation/replace_if.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/reverse.hpp b/include/boost/fusion/include/reverse.hpp
new file mode 100644
index 00000000..3f9fd782
--- /dev/null
+++ b/include/boost/fusion/include/reverse.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_REVERSE)
+#define FUSION_INCLUDE_REVERSE
+
+#include <boost/fusion/algorithm/transformation/reverse.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/reverse_view.hpp b/include/boost/fusion/include/reverse_view.hpp
new file mode 100644
index 00000000..844532d6
--- /dev/null
+++ b/include/boost/fusion/include/reverse_view.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_REVERSE_VIEW)
+#define FUSION_INCLUDE_REVERSE_VIEW
+
+#include <boost/fusion/view/reverse_view.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/sequence.hpp b/include/boost/fusion/include/sequence.hpp
new file mode 100644
index 00000000..09cded77
--- /dev/null
+++ b/include/boost/fusion/include/sequence.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_SEQUENCE)
+#define FUSION_INCLUDE_SEQUENCE
+
+#include <boost/fusion/sequence.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/sequence_base.hpp b/include/boost/fusion/include/sequence_base.hpp
new file mode 100644
index 00000000..7e50a237
--- /dev/null
+++ b/include/boost/fusion/include/sequence_base.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_SEQUENCE_BASE)
+#define FUSION_INCLUDE_SEQUENCE_BASE
+
+#include <boost/fusion/support/sequence_base.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/sequence_facade.hpp b/include/boost/fusion/include/sequence_facade.hpp
new file mode 100644
index 00000000..b8773e28
--- /dev/null
+++ b/include/boost/fusion/include/sequence_facade.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_SEQUENCE_FACADE)
+#define FUSION_INCLUDE_SEQUENCE_FACADE
+
+#include <boost/fusion/sequence/sequence_facade.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/set.hpp b/include/boost/fusion/include/set.hpp
new file mode 100644
index 00000000..90dd5004
--- /dev/null
+++ b/include/boost/fusion/include/set.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_SET)
+#define FUSION_INCLUDE_SET
+
+#include <boost/fusion/container/set.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/set_fwd.hpp b/include/boost/fusion/include/set_fwd.hpp
new file mode 100644
index 00000000..9bc45ad5
--- /dev/null
+++ b/include/boost/fusion/include/set_fwd.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_SET_FWD)
+#define FUSION_INCLUDE_SET_FWD
+
+#include <boost/fusion/container/set/set_fwd.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/single_view.hpp b/include/boost/fusion/include/single_view.hpp
index ae60d867..a95d04a8 100644
--- a/include/boost/fusion/include/single_view.hpp
+++ b/include/boost/fusion/include/single_view.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_SINGLE_VIEW)
 #define FUSION_INCLUDE_SINGLE_VIEW
 
-#include <boost/fusion/sequence/view/single_view.hpp>
+#include <boost/fusion/view/single_view.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/size.hpp b/include/boost/fusion/include/size.hpp
new file mode 100644
index 00000000..02d2a00f
--- /dev/null
+++ b/include/boost/fusion/include/size.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_SIZE)
+#define FUSION_INCLUDE_SIZE
+
+#include <boost/fusion/sequence/intrinsic/size.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/std_pair.hpp b/include/boost/fusion/include/std_pair.hpp
index bb4d5952..98f37c86 100644
--- a/include/boost/fusion/include/std_pair.hpp
+++ b/include/boost/fusion/include/std_pair.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_STD_PAIR)
 #define FUSION_INCLUDE_STD_PAIR
 
-#include <boost/fusion/sequence/adapted/std_pair.hpp>
+#include <boost/fusion/adapted/std_pair.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/struct.hpp b/include/boost/fusion/include/struct.hpp
new file mode 100644
index 00000000..f0886aab
--- /dev/null
+++ b/include/boost/fusion/include/struct.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_STRUCT)
+#define FUSION_INCLUDE_STRUCT
+
+#include <boost/fusion/adapted/struct.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/support.hpp b/include/boost/fusion/include/support.hpp
new file mode 100644
index 00000000..d57eafeb
--- /dev/null
+++ b/include/boost/fusion/include/support.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_SUPPORT)
+#define FUSION_INCLUDE_SUPPORT
+
+#include <boost/fusion/support.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/tag_of.hpp b/include/boost/fusion/include/tag_of.hpp
new file mode 100644
index 00000000..f15b41b5
--- /dev/null
+++ b/include/boost/fusion/include/tag_of.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_TAG_OF)
+#define FUSION_INCLUDE_TAG_OF
+
+#include <boost/fusion/support/tag_of.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/tag_of_fwd.hpp b/include/boost/fusion/include/tag_of_fwd.hpp
new file mode 100644
index 00000000..fbc7ebe7
--- /dev/null
+++ b/include/boost/fusion/include/tag_of_fwd.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_TAG_OF_FWD)
+#define FUSION_INCLUDE_TAG_OF_FWD
+
+#include <boost/fusion/support/tag_of_fwd.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/transform_view.hpp b/include/boost/fusion/include/transform_view.hpp
index 7564c6ab..3aceaaee 100644
--- a/include/boost/fusion/include/transform_view.hpp
+++ b/include/boost/fusion/include/transform_view.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_TRANSFORM_VIEW)
 #define FUSION_INCLUDE_TRANSFORM_VIEW
 
-#include <boost/fusion/sequence/view/transform_view.hpp>
+#include <boost/fusion/view/transform_view.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/transformation.hpp b/include/boost/fusion/include/transformation.hpp
new file mode 100644
index 00000000..f14ab70c
--- /dev/null
+++ b/include/boost/fusion/include/transformation.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_TRANSFORMATION)
+#define FUSION_INCLUDE_TRANSFORMATION
+
+#include <boost/fusion/algorithm/transformation.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/tuple.hpp b/include/boost/fusion/include/tuple.hpp
new file mode 100644
index 00000000..52e53fb5
--- /dev/null
+++ b/include/boost/fusion/include/tuple.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_TUPLE)
+#define FUSION_INCLUDE_TUPLE
+
+#include <boost/fusion/tuple.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/tuple_fwd.hpp b/include/boost/fusion/include/tuple_fwd.hpp
new file mode 100644
index 00000000..a66653a3
--- /dev/null
+++ b/include/boost/fusion/include/tuple_fwd.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_TUPLE_FWD)
+#define FUSION_INCLUDE_TUPLE_FWD
+
+#include <boost/fusion/tuple/tuple_fwd.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/tuple_tie.hpp b/include/boost/fusion/include/tuple_tie.hpp
new file mode 100644
index 00000000..677976a6
--- /dev/null
+++ b/include/boost/fusion/include/tuple_tie.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_TUPLE_TIE)
+#define FUSION_INCLUDE_TUPLE_TIE
+
+#include <boost/fusion/tuple/tuple_tie.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/unfused_generic.hpp b/include/boost/fusion/include/unfused_generic.hpp
new file mode 100644
index 00000000..d377900f
--- /dev/null
+++ b/include/boost/fusion/include/unfused_generic.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_UNFUSED_GENERIC)
+#define FUSION_INCLUDE_UNFUSED_GENERIC
+
+#include <boost/fusion/functional/adapter/unfused_generic.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/unfused_lvalue_args.hpp b/include/boost/fusion/include/unfused_lvalue_args.hpp
new file mode 100644
index 00000000..17acc261
--- /dev/null
+++ b/include/boost/fusion/include/unfused_lvalue_args.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_UNFUSED_LVALUE_ARGS)
+#define FUSION_INCLUDE_UNFUSED_LVALUE_ARGS
+
+#include <boost/fusion/functional/adapter/unfused_lvalue_args.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/unfused_rvalue_args.hpp b/include/boost/fusion/include/unfused_rvalue_args.hpp
new file mode 100644
index 00000000..556b2dee
--- /dev/null
+++ b/include/boost/fusion/include/unfused_rvalue_args.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_UNFUSED_RVALUE_ARGS)
+#define FUSION_INCLUDE_UNFUSED_RVALUE_ARGS
+
+#include <boost/fusion/functional/adapter/unfused_rvalue_args.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/unfused_typed.hpp b/include/boost/fusion/include/unfused_typed.hpp
new file mode 100644
index 00000000..a118b306
--- /dev/null
+++ b/include/boost/fusion/include/unfused_typed.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_UNFUSED_TYPED)
+#define FUSION_INCLUDE_UNFUSED_TYPED
+
+#include <boost/fusion/functional/adapter/unfused_typed.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/unused.hpp b/include/boost/fusion/include/unused.hpp
new file mode 100644
index 00000000..f91ea8fe
--- /dev/null
+++ b/include/boost/fusion/include/unused.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_UNUSED)
+#define FUSION_INCLUDE_UNUSED
+
+#include <boost/fusion/support/unused.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/utility.hpp b/include/boost/fusion/include/utility.hpp
new file mode 100644
index 00000000..915d8b16
--- /dev/null
+++ b/include/boost/fusion/include/utility.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_UTILITY)
+#define FUSION_INCLUDE_UTILITY
+
+#include <boost/fusion/sequence/utility.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/value_at_key.hpp b/include/boost/fusion/include/value_at_key.hpp
new file mode 100644
index 00000000..4ab3dc14
--- /dev/null
+++ b/include/boost/fusion/include/value_at_key.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_VALUE_AT_KEY)
+#define FUSION_INCLUDE_VALUE_AT_KEY
+
+#include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/variant.hpp b/include/boost/fusion/include/variant.hpp
index 824b8a6a..3d013b8e 100644
--- a/include/boost/fusion/include/variant.hpp
+++ b/include/boost/fusion/include/variant.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_VARIANT)
 #define FUSION_INCLUDE_VARIANT
 
-#include <boost/fusion/sequence/adapted/variant.hpp>
+#include <boost/fusion/adapted/variant.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/vector.hpp b/include/boost/fusion/include/vector.hpp
index e49568e2..689c2f88 100644
--- a/include/boost/fusion/include/vector.hpp
+++ b/include/boost/fusion/include/vector.hpp
@@ -1,12 +1,12 @@
 /*=============================================================================
     Copyright (c) 2001-2007 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)
 ==============================================================================*/
 #if !defined(FUSION_INCLUDE_VECTOR)
 #define FUSION_INCLUDE_VECTOR
 
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/vector10.hpp b/include/boost/fusion/include/vector10.hpp
new file mode 100644
index 00000000..d3e10ddc
--- /dev/null
+++ b/include/boost/fusion/include/vector10.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_VECTOR10)
+#define FUSION_INCLUDE_VECTOR10
+
+#include <boost/fusion/container/vector/vector10.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/vector20.hpp b/include/boost/fusion/include/vector20.hpp
new file mode 100644
index 00000000..accda290
--- /dev/null
+++ b/include/boost/fusion/include/vector20.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_VECTOR20)
+#define FUSION_INCLUDE_VECTOR20
+
+#include <boost/fusion/container/vector/vector20.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/vector30.hpp b/include/boost/fusion/include/vector30.hpp
new file mode 100644
index 00000000..72a72a25
--- /dev/null
+++ b/include/boost/fusion/include/vector30.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_VECTOR30)
+#define FUSION_INCLUDE_VECTOR30
+
+#include <boost/fusion/container/vector/vector30.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/vector40.hpp b/include/boost/fusion/include/vector40.hpp
new file mode 100644
index 00000000..427c5319
--- /dev/null
+++ b/include/boost/fusion/include/vector40.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_VECTOR40)
+#define FUSION_INCLUDE_VECTOR40
+
+#include <boost/fusion/container/vector/vector40.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/vector50.hpp b/include/boost/fusion/include/vector50.hpp
new file mode 100644
index 00000000..5980373b
--- /dev/null
+++ b/include/boost/fusion/include/vector50.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_VECTOR50)
+#define FUSION_INCLUDE_VECTOR50
+
+#include <boost/fusion/container/vector/vector50.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/vector_fwd.hpp b/include/boost/fusion/include/vector_fwd.hpp
new file mode 100644
index 00000000..578754fb
--- /dev/null
+++ b/include/boost/fusion/include/vector_fwd.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_VECTOR_FWD)
+#define FUSION_INCLUDE_VECTOR_FWD
+
+#include <boost/fusion/container/vector/vector_fwd.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/view.hpp b/include/boost/fusion/include/view.hpp
new file mode 100644
index 00000000..48405df8
--- /dev/null
+++ b/include/boost/fusion/include/view.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_VIEW)
+#define FUSION_INCLUDE_VIEW
+
+#include <boost/fusion/view.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/void.hpp b/include/boost/fusion/include/void.hpp
new file mode 100644
index 00000000..b3e9cf27
--- /dev/null
+++ b/include/boost/fusion/include/void.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_VOID)
+#define FUSION_INCLUDE_VOID
+
+#include <boost/fusion/support/void.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/zip.hpp b/include/boost/fusion/include/zip.hpp
new file mode 100644
index 00000000..8a565610
--- /dev/null
+++ b/include/boost/fusion/include/zip.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ZIP)
+#define FUSION_INCLUDE_ZIP
+
+#include <boost/fusion/algorithm/transformation/zip.hpp>
+
+#endif
diff --git a/include/boost/fusion/include/zip_view.hpp b/include/boost/fusion/include/zip_view.hpp
new file mode 100644
index 00000000..1aecfd4d
--- /dev/null
+++ b/include/boost/fusion/include/zip_view.hpp
@@ -0,0 +1,12 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_INCLUDE_ZIP_VIEW)
+#define FUSION_INCLUDE_ZIP_VIEW
+
+#include <boost/fusion/view/zip_view.hpp>
+
+#endif
diff --git a/include/boost/fusion/iterator/mpl/convert_iterator.hpp b/include/boost/fusion/iterator/mpl/convert_iterator.hpp
index fc2efacf..5716ce4e 100644
--- a/include/boost/fusion/iterator/mpl/convert_iterator.hpp
+++ b/include/boost/fusion/iterator/mpl/convert_iterator.hpp
@@ -1,19 +1,21 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_CONVERT_ITERATOR_05062005_1218)
 #define FUSION_CONVERT_ITERATOR_05062005_1218
 
 #include <boost/fusion/support/is_iterator.hpp>
-#include <boost/fusion/sequence/adapted/mpl/mpl_iterator.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/bool.hpp>
 
 namespace boost { namespace fusion
 {
+    template <typename Iterator>
+    struct mpl_iterator; // forward declaration
+
     //  Test T. If it is a fusion iterator, return a reference to it.
     //  else, assume it is an mpl iterator.
 
diff --git a/include/boost/fusion/mpl.hpp b/include/boost/fusion/mpl.hpp
index 6eb2538b..e499df93 100644
--- a/include/boost/fusion/mpl.hpp
+++ b/include/boost/fusion/mpl.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_MPL_09172006_2049)
@@ -9,7 +9,24 @@
 
 // The fusion <--> MPL link headers
 #include <boost/fusion/iterator/mpl.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+
+#include <boost/fusion/mpl/at.hpp>
+#include <boost/fusion/mpl/back.hpp>
+#include <boost/fusion/mpl/begin.hpp>
+#include <boost/fusion/mpl/clear.hpp>
+#include <boost/fusion/mpl/empty.hpp>
+#include <boost/fusion/mpl/end.hpp>
+#include <boost/fusion/mpl/erase.hpp>
+#include <boost/fusion/mpl/erase_key.hpp>
+#include <boost/fusion/mpl/front.hpp>
+#include <boost/fusion/mpl/has_key.hpp>
+#include <boost/fusion/mpl/insert.hpp>
+#include <boost/fusion/mpl/insert_range.hpp>
+#include <boost/fusion/mpl/pop_back.hpp>
+#include <boost/fusion/mpl/pop_front.hpp>
+#include <boost/fusion/mpl/push_back.hpp>
+#include <boost/fusion/mpl/push_front.hpp>
+#include <boost/fusion/mpl/size.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/at.hpp b/include/boost/fusion/mpl/at.hpp
similarity index 100%
rename from include/boost/fusion/sequence/intrinsic/mpl/at.hpp
rename to include/boost/fusion/mpl/at.hpp
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/back.hpp b/include/boost/fusion/mpl/back.hpp
similarity index 100%
rename from include/boost/fusion/sequence/intrinsic/mpl/back.hpp
rename to include/boost/fusion/mpl/back.hpp
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/begin.hpp b/include/boost/fusion/mpl/begin.hpp
similarity index 93%
rename from include/boost/fusion/sequence/intrinsic/mpl/begin.hpp
rename to include/boost/fusion/mpl/begin.hpp
index 6d344d75..be8b3142 100644
--- a/include/boost/fusion/sequence/intrinsic/mpl/begin.hpp
+++ b/include/boost/fusion/mpl/begin.hpp
@@ -9,7 +9,7 @@
 
 #include <boost/mpl/begin_end.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/adapted/mpl/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/begin_impl.hpp>
 #include <boost/fusion/iterator/mpl/fusion_iterator.hpp>
 
 namespace boost { namespace mpl
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/clear.hpp b/include/boost/fusion/mpl/clear.hpp
similarity index 93%
rename from include/boost/fusion/sequence/intrinsic/mpl/clear.hpp
rename to include/boost/fusion/mpl/clear.hpp
index 0f2d492b..14b3489e 100644
--- a/include/boost/fusion/sequence/intrinsic/mpl/clear.hpp
+++ b/include/boost/fusion/mpl/clear.hpp
@@ -9,7 +9,7 @@
 
 #include <boost/mpl/clear.hpp>
 #include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/clear.hpp>
+#include <boost/fusion/mpl/detail/clear.hpp>
 
 namespace boost { namespace mpl
 {
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/detail/clear.hpp b/include/boost/fusion/mpl/detail/clear.hpp
similarity index 77%
rename from include/boost/fusion/sequence/intrinsic/mpl/detail/clear.hpp
rename to include/boost/fusion/mpl/detail/clear.hpp
index 28807cc7..d8c32d5a 100644
--- a/include/boost/fusion/sequence/intrinsic/mpl/detail/clear.hpp
+++ b/include/boost/fusion/mpl/detail/clear.hpp
@@ -7,11 +7,11 @@
 #if !defined(FUSION_CLEAR_10022005_1442)
 #define FUSION_CLEAR_10022005_1442
 
-#include <boost/fusion/sequence/container/vector/vector_fwd.hpp>
-#include <boost/fusion/sequence/container/list/list_fwd.hpp>
-#include <boost/fusion/sequence/container/map/map_fwd.hpp>
-#include <boost/fusion/sequence/container/set/set_fwd.hpp>
-#include <boost/fusion/sequence/container/deque/deque_fwd.hpp>
+#include <boost/fusion/container/vector/vector_fwd.hpp>
+#include <boost/fusion/container/list/list_fwd.hpp>
+#include <boost/fusion/container/map/map_fwd.hpp>
+#include <boost/fusion/container/set/set_fwd.hpp>
+#include <boost/fusion/container/deque/deque_fwd.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/empty.hpp b/include/boost/fusion/mpl/empty.hpp
similarity index 100%
rename from include/boost/fusion/sequence/intrinsic/mpl/empty.hpp
rename to include/boost/fusion/mpl/empty.hpp
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/end.hpp b/include/boost/fusion/mpl/end.hpp
similarity index 93%
rename from include/boost/fusion/sequence/intrinsic/mpl/end.hpp
rename to include/boost/fusion/mpl/end.hpp
index 7d84a81b..ed3320b2 100644
--- a/include/boost/fusion/sequence/intrinsic/mpl/end.hpp
+++ b/include/boost/fusion/mpl/end.hpp
@@ -9,7 +9,7 @@
 
 #include <boost/mpl/begin_end.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/sequence/adapted/mpl/detail/end_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/end_impl.hpp>
 #include <boost/fusion/iterator/mpl/fusion_iterator.hpp>
 
 namespace boost { namespace mpl
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/erase.hpp b/include/boost/fusion/mpl/erase.hpp
similarity index 78%
rename from include/boost/fusion/sequence/intrinsic/mpl/erase.hpp
rename to include/boost/fusion/mpl/erase.hpp
index 0ee650e0..a8b092ae 100644
--- a/include/boost/fusion/sequence/intrinsic/mpl/erase.hpp
+++ b/include/boost/fusion/mpl/erase.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_ERASE_10022005_1835)
@@ -10,7 +10,7 @@
 #include <boost/mpl/erase.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/erase.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/sequence/convert.hpp>
 
 namespace boost { namespace mpl
 {
@@ -23,12 +23,13 @@ namespace boost { namespace mpl
         template <typename Sequence, typename First, typename Last>
         struct apply
         {
-            typedef typename 
-                fusion::result_of::erase<Sequence, First, Last>::type 
+            typedef typename
+                fusion::result_of::erase<Sequence, First, Last>::type
             result;
-            
-            typedef typename 
-                fusion::detail::as<typename fusion::detail::tag_of<Sequence>::type, result>::type 
+
+            typedef typename
+                fusion::result_of::convert<
+                    typename fusion::detail::tag_of<Sequence>::type, result>::type
             type;
         };
     };
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/erase_key.hpp b/include/boost/fusion/mpl/erase_key.hpp
similarity index 78%
rename from include/boost/fusion/sequence/intrinsic/mpl/erase_key.hpp
rename to include/boost/fusion/mpl/erase_key.hpp
index 6c8ba6cf..3cda2686 100644
--- a/include/boost/fusion/sequence/intrinsic/mpl/erase_key.hpp
+++ b/include/boost/fusion/mpl/erase_key.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_ERASE_KEY_10022005_1907)
@@ -10,7 +10,7 @@
 #include <boost/mpl/erase_key.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/erase_key.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/sequence/convert.hpp>
 
 namespace boost { namespace mpl
 {
@@ -23,12 +23,13 @@ namespace boost { namespace mpl
         template <typename Sequence, typename Key>
         struct apply
         {
-            typedef typename 
-                fusion::result_of::erase_key<Sequence, Key>::type 
+            typedef typename
+                fusion::result_of::erase_key<Sequence, Key>::type
             result;
-            
-            typedef typename 
-                fusion::detail::as<typename fusion::detail::tag_of<Sequence>::type, result>::type 
+
+            typedef typename
+                fusion::result_of::convert<
+                    typename fusion::detail::tag_of<Sequence>::type, result>::type
             type;
         };
     };
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/front.hpp b/include/boost/fusion/mpl/front.hpp
similarity index 100%
rename from include/boost/fusion/sequence/intrinsic/mpl/front.hpp
rename to include/boost/fusion/mpl/front.hpp
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/has_key.hpp b/include/boost/fusion/mpl/has_key.hpp
similarity index 100%
rename from include/boost/fusion/sequence/intrinsic/mpl/has_key.hpp
rename to include/boost/fusion/mpl/has_key.hpp
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/insert.hpp b/include/boost/fusion/mpl/insert.hpp
similarity index 78%
rename from include/boost/fusion/sequence/intrinsic/mpl/insert.hpp
rename to include/boost/fusion/mpl/insert.hpp
index 7df943a5..76918ce9 100644
--- a/include/boost/fusion/sequence/intrinsic/mpl/insert.hpp
+++ b/include/boost/fusion/mpl/insert.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_INSERT_10022005_1837)
@@ -10,7 +10,7 @@
 #include <boost/mpl/insert.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/insert.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/sequence/convert.hpp>
 
 namespace boost { namespace mpl
 {
@@ -23,12 +23,13 @@ namespace boost { namespace mpl
         template <typename Sequence, typename Pos, typename T>
         struct apply
         {
-            typedef typename 
-                fusion::result_of::insert<Sequence, Pos, T>::type 
+            typedef typename
+                fusion::result_of::insert<Sequence, Pos, T>::type
             result;
-            
-            typedef typename 
-                fusion::detail::as<typename fusion::detail::tag_of<Sequence>::type, result>::type 
+
+            typedef typename
+                fusion::result_of::convert<
+                    typename fusion::detail::tag_of<Sequence>::type, result>::type
             type;
         };
     };
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/insert_range.hpp b/include/boost/fusion/mpl/insert_range.hpp
similarity index 78%
rename from include/boost/fusion/sequence/intrinsic/mpl/insert_range.hpp
rename to include/boost/fusion/mpl/insert_range.hpp
index 1c7abc89..4da39365 100644
--- a/include/boost/fusion/sequence/intrinsic/mpl/insert_range.hpp
+++ b/include/boost/fusion/mpl/insert_range.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_INSERT_RANGE_10022005_1838)
@@ -10,7 +10,7 @@
 #include <boost/mpl/insert_range.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/insert_range.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/sequence/convert.hpp>
 
 namespace boost { namespace mpl
 {
@@ -23,12 +23,13 @@ namespace boost { namespace mpl
         template <typename Sequence, typename Pos, typename Range>
         struct apply
         {
-            typedef typename 
-                fusion::result_of::insert_range<Sequence, Pos, Range>::type 
+            typedef typename
+                fusion::result_of::insert_range<Sequence, Pos, Range>::type
             result;
-            
-            typedef typename 
-                fusion::detail::as<typename fusion::detail::tag_of<Sequence>::type, result>::type 
+
+            typedef typename
+                fusion::result_of::convert<
+                    typename fusion::detail::tag_of<Sequence>::type, result>::type
             type;
         };
     };
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/pop_back.hpp b/include/boost/fusion/mpl/pop_back.hpp
similarity index 73%
rename from include/boost/fusion/sequence/intrinsic/mpl/pop_back.hpp
rename to include/boost/fusion/mpl/pop_back.hpp
index 94dbba3a..84bd75a4 100644
--- a/include/boost/fusion/sequence/intrinsic/mpl/pop_back.hpp
+++ b/include/boost/fusion/mpl/pop_back.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_POP_BACK_10022005_1801)
@@ -10,7 +10,7 @@
 #include <boost/mpl/pop_back.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/pop_back.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/sequence/convert.hpp>
 
 namespace boost { namespace mpl
 {
@@ -23,12 +23,13 @@ namespace boost { namespace mpl
         template <typename Sequence>
         struct apply
         {
-            typedef typename 
-                fusion::result_of::pop_back<Sequence>::type 
+            typedef typename
+                fusion::result_of::pop_back<Sequence>::type
             result;
-            
-            typedef typename 
-                fusion::detail::as<typename fusion::detail::tag_of<Sequence>::type, result>::type 
+
+            typedef typename
+                fusion::result_of::convert<
+                    typename fusion::detail::tag_of<Sequence>::type, result>::type
             type;
         };
     };
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/pop_front.hpp b/include/boost/fusion/mpl/pop_front.hpp
similarity index 73%
rename from include/boost/fusion/sequence/intrinsic/mpl/pop_front.hpp
rename to include/boost/fusion/mpl/pop_front.hpp
index 957a673e..ffe6c302 100644
--- a/include/boost/fusion/sequence/intrinsic/mpl/pop_front.hpp
+++ b/include/boost/fusion/mpl/pop_front.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_POP_FRONT_10022005_1800)
@@ -10,7 +10,7 @@
 #include <boost/mpl/pop_front.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/pop_front.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/sequence/convert.hpp>
 
 namespace boost { namespace mpl
 {
@@ -23,12 +23,13 @@ namespace boost { namespace mpl
         template <typename Sequence>
         struct apply
         {
-            typedef typename 
-                fusion::result_of::pop_front<Sequence>::type 
+            typedef typename
+                fusion::result_of::pop_front<Sequence>::type
             result;
-            
-            typedef typename 
-                fusion::detail::as<typename fusion::detail::tag_of<Sequence>::type, result>::type 
+
+            typedef typename
+                fusion::result_of::convert<
+                    typename fusion::detail::tag_of<Sequence>::type, result>::type
             type;
         };
     };
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/push_back.hpp b/include/boost/fusion/mpl/push_back.hpp
similarity index 73%
rename from include/boost/fusion/sequence/intrinsic/mpl/push_back.hpp
rename to include/boost/fusion/mpl/push_back.hpp
index e828af9e..e96faa06 100644
--- a/include/boost/fusion/sequence/intrinsic/mpl/push_back.hpp
+++ b/include/boost/fusion/mpl/push_back.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_PUSH_BACK_10022005_1647)
@@ -10,7 +10,7 @@
 #include <boost/mpl/push_back.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/sequence/convert.hpp>
 
 namespace boost { namespace mpl
 {
@@ -23,12 +23,13 @@ namespace boost { namespace mpl
         template <typename Sequence, typename T>
         struct apply
         {
-            typedef typename 
-                fusion::result_of::push_back<Sequence, T>::type 
+            typedef typename
+                fusion::result_of::push_back<Sequence, T>::type
             result;
-            
-            typedef typename 
-                fusion::detail::as<typename fusion::detail::tag_of<Sequence>::type, result>::type 
+
+            typedef typename
+                fusion::result_of::convert<
+                    typename fusion::detail::tag_of<Sequence>::type, result>::type
             type;
         };
     };
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/push_front.hpp b/include/boost/fusion/mpl/push_front.hpp
similarity index 79%
rename from include/boost/fusion/sequence/intrinsic/mpl/push_front.hpp
rename to include/boost/fusion/mpl/push_front.hpp
index 00431af2..c508d652 100644
--- a/include/boost/fusion/sequence/intrinsic/mpl/push_front.hpp
+++ b/include/boost/fusion/mpl/push_front.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_PUSH_FRONT_10022005_1720)
@@ -10,7 +10,7 @@
 #include <boost/mpl/push_front.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/push_front.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/sequence/convert.hpp>
 
 namespace boost { namespace mpl
 {
@@ -23,12 +23,13 @@ namespace boost { namespace mpl
         template <typename Sequence, typename T>
         struct apply
         {
-            typedef typename 
-                fusion::result_of::push_front<Sequence, T>::type 
+            typedef typename
+                fusion::result_of::push_front<Sequence, T>::type
             result;
-            
-            typedef typename 
-                fusion::detail::as<typename fusion::detail::tag_of<Sequence>::type, result>::type 
+
+            typedef typename
+                fusion::result_of::convert<
+                    typename fusion::detail::tag_of<Sequence>::type, result>::type
             type;
         };
     };
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/size.hpp b/include/boost/fusion/mpl/size.hpp
similarity index 100%
rename from include/boost/fusion/sequence/intrinsic/mpl/size.hpp
rename to include/boost/fusion/mpl/size.hpp
diff --git a/include/boost/fusion/sequence.hpp b/include/boost/fusion/sequence.hpp
index 9a794c2e..e60fdd7d 100644
--- a/include/boost/fusion/sequence.hpp
+++ b/include/boost/fusion/sequence.hpp
@@ -8,13 +8,10 @@
 #define FUSION_ITERATOR_10022005_0559
 
 #include <boost/fusion/sequence/sequence_facade.hpp>
-#include <boost/fusion/sequence/container.hpp>
 #include <boost/fusion/sequence/comparison.hpp>
-#include <boost/fusion/sequence/conversion.hpp>
 #include <boost/fusion/sequence/generation.hpp>
 #include <boost/fusion/sequence/intrinsic.hpp>
 #include <boost/fusion/sequence/io.hpp>
-#include <boost/fusion/sequence/view.hpp>
-#include <boost/fusion/sequence/adapted.hpp>
+#include <boost/fusion/sequence/convert.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence/adapted/array.hpp b/include/boost/fusion/sequence/adapted/array.hpp
deleted file mode 100644
index 0e1537f8..00000000
--- a/include/boost/fusion/sequence/adapted/array.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_ARRAY_27122005_1035)
-#define BOOST_FUSION_ARRAY_27122005_1035
-
-#include <boost/fusion/sequence/adapted/array/array_iterator.hpp>
-#include <boost/fusion/sequence/adapted/array/tag_of.hpp>
-#include <boost/fusion/sequence/adapted/array/detail/is_view_impl.hpp>
-#include <boost/fusion/sequence/adapted/array/detail/is_sequence_impl.hpp>
-#include <boost/fusion/sequence/adapted/array/detail/category_of_impl.hpp>
-#include <boost/fusion/sequence/adapted/array/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/adapted/array/detail/end_impl.hpp>
-#include <boost/fusion/sequence/adapted/array/detail/size_impl.hpp>
-#include <boost/fusion/sequence/adapted/array/detail/at_impl.hpp>
-#include <boost/fusion/sequence/adapted/array/detail/value_at_impl.hpp>
-
-#endif
diff --git a/include/boost/fusion/sequence/adapted/boost_tuple.hpp b/include/boost/fusion/sequence/adapted/boost_tuple.hpp
deleted file mode 100644
index 14288087..00000000
--- a/include/boost/fusion/sequence/adapted/boost_tuple.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_BOOST_TUPLE_09272006_0732)
-#define BOOST_FUSION_BOOST_TUPLE_09272006_0732
-
-#include <boost/fusion/sequence/adapted/boost_tuple/tag_of.hpp>
-#include <boost/fusion/sequence/adapted/boost_tuple/detail/is_view_impl.hpp>
-#include <boost/fusion/sequence/adapted/boost_tuple/detail/is_sequence_impl.hpp>
-#include <boost/fusion/sequence/adapted/boost_tuple/detail/category_of_impl.hpp>
-#include <boost/fusion/sequence/adapted/boost_tuple/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/adapted/boost_tuple/detail/end_impl.hpp>
-#include <boost/fusion/sequence/adapted/boost_tuple/detail/size_impl.hpp>
-#include <boost/fusion/sequence/adapted/boost_tuple/detail/at_impl.hpp>
-#include <boost/fusion/sequence/adapted/boost_tuple/detail/value_at_impl.hpp>
-
-#endif
diff --git a/include/boost/fusion/sequence/adapted/mpl.hpp b/include/boost/fusion/sequence/adapted/mpl.hpp
deleted file mode 100644
index 94f4967a..00000000
--- a/include/boost/fusion/sequence/adapted/mpl.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_MPL_31122005_1152)
-#define BOOST_FUSION_MPL_31122005_1152
-
-#include <boost/fusion/sequence/adapted/mpl/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/adapted/mpl/detail/end_impl.hpp>
-#include <boost/fusion/sequence/adapted/mpl/detail/is_sequence_impl.hpp>
-#include <boost/fusion/sequence/adapted/mpl/detail/size_impl.hpp>
-#include <boost/fusion/sequence/adapted/mpl/detail/value_at_impl.hpp>
-#include <boost/fusion/sequence/adapted/mpl/detail/at_impl.hpp>
-#include <boost/fusion/sequence/adapted/mpl/detail/has_key_impl.hpp>
-#include <boost/fusion/sequence/adapted/mpl/detail/category_of_impl.hpp>
-#include <boost/fusion/sequence/adapted/mpl/detail/is_view_impl.hpp>
-
-#endif
diff --git a/include/boost/fusion/sequence/adapted/struct.hpp b/include/boost/fusion/sequence/adapted/struct.hpp
deleted file mode 100644
index f4aed34e..00000000
--- a/include/boost/fusion/sequence/adapted/struct.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_STRUCT_24122005_1744)
-#define BOOST_FUSION_STD_STRUCT_24122005_1744
-
-#include <boost/fusion/sequence/adapted/struct/extension.hpp>
-#include <boost/fusion/sequence/adapted/struct/adapt_struct.hpp>
-#include <boost/fusion/sequence/adapted/struct/struct_iterator.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/is_view_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/is_sequence_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/category_of_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/end_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/size_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/at_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/value_at_impl.hpp>
-
-#endif
diff --git a/include/boost/fusion/sequence/adapted/variant.hpp b/include/boost/fusion/sequence/adapted/variant.hpp
deleted file mode 100644
index 2443312d..00000000
--- a/include/boost/fusion/sequence/adapted/variant.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_VARIANT_12112006_1614)
-#define BOOST_FUSION_VARIANT_12112006_1614
-
-#include <boost/fusion/sequence/adapted/variant/variant_iterator.hpp>
-#include <boost/fusion/sequence/adapted/variant/detail/is_view_impl.hpp>
-#include <boost/fusion/sequence/adapted/variant/detail/is_sequence_impl.hpp>
-#include <boost/fusion/sequence/adapted/variant/detail/category_of_impl.hpp>
-#include <boost/fusion/sequence/adapted/variant/tag_of.hpp>
-#include <boost/fusion/sequence/adapted/variant/detail/size_impl.hpp>
-#include <boost/fusion/sequence/adapted/variant/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/adapted/variant/detail/end_impl.hpp>
-
-#endif
diff --git a/include/boost/fusion/sequence/container/vector.hpp b/include/boost/fusion/sequence/container/vector.hpp
deleted file mode 100644
index dd7f4333..00000000
--- a/include/boost/fusion/sequence/container/vector.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-
-    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)
-==============================================================================*/
-#if !defined(FUSION_SEQUENCE_CLASS_VECTOR_10022005_0602)
-#define FUSION_SEQUENCE_CLASS_VECTOR_10022005_0602
-
-#include <boost/fusion/sequence/container/vector/limits.hpp>
-#include <boost/fusion/sequence/container/vector/vector10.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/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/vector/vector_fwd.hpp>
-#include <boost/fusion/sequence/container/vector/vector_iterator.hpp>
-
-#endif
diff --git a/include/boost/fusion/sequence/conversion.hpp b/include/boost/fusion/sequence/conversion.hpp
deleted file mode 100644
index e70cc88a..00000000
--- a/include/boost/fusion/sequence/conversion.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-
-    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)
-==============================================================================*/
-#if !defined(FUSION_SEQUENCE_CONVERSION_10022005_0622)
-#define FUSION_SEQUENCE_CONVERSION_10022005_0622
-
-#include <boost/fusion/sequence/conversion/as_list.hpp>
-#include <boost/fusion/sequence/conversion/as_map.hpp>
-#include <boost/fusion/sequence/conversion/as_set.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
-#include <boost/fusion/sequence/conversion/as_deque.hpp>
-
-#endif
diff --git a/include/boost/fusion/sequence/convert.hpp b/include/boost/fusion/sequence/convert.hpp
new file mode 100644
index 00000000..a6e3ccca
--- /dev/null
+++ b/include/boost/fusion/sequence/convert.hpp
@@ -0,0 +1,48 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(FUSION_CONVERT_10022005_1442)
+#define FUSION_CONVERT_10022005_1442
+
+namespace boost { namespace fusion
+{
+    namespace extension
+    {
+        template <typename Tag>
+        struct convert_impl;
+    }
+
+    namespace result_of
+    {
+        template <typename Tag, typename Sequence>
+        struct convert
+        {
+            typedef typename extension::convert_impl<Tag> gen;
+
+            typedef typename
+                gen::template apply<Sequence>::type
+            type;
+        };
+    }
+
+    template <typename Tag, typename Sequence>
+    inline typename result_of::convert<Tag, Sequence>::type
+    convert(Sequence& seq)
+    {
+        typedef typename result_of::convert<Tag, Sequence>::gen gen;
+        return gen::call(seq);
+    }
+
+    template <typename Tag, typename Sequence>
+    inline typename result_of::convert<Tag, Sequence const>::type
+    convert(Sequence const& seq)
+    {
+        typedef typename result_of::convert<Tag, Sequence const>::gen gen;
+        return gen::call(seq);
+    }
+}}
+
+#endif
diff --git a/include/boost/fusion/sequence/generation/cons_tie.hpp b/include/boost/fusion/sequence/generation/cons_tie.hpp
index 2b695d25..88ce0aa4 100644
--- a/include/boost/fusion/sequence/generation/cons_tie.hpp
+++ b/include/boost/fusion/sequence/generation/cons_tie.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_CONS_TIE_07182005_0854)
 #define FUSION_CONS_TIE_07182005_0854
 
-#include <boost/fusion/sequence/container/list/cons.hpp>
+#include <boost/fusion/container/list/cons.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/generation/deque_tie.hpp b/include/boost/fusion/sequence/generation/deque_tie.hpp
index 77478c03..5f8a2f08 100644
--- a/include/boost/fusion/sequence/generation/deque_tie.hpp
+++ b/include/boost/fusion/sequence/generation/deque_tie.hpp
@@ -14,7 +14,7 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/generation/list_tie.hpp b/include/boost/fusion/sequence/generation/list_tie.hpp
index 56fb6823..946fdbc3 100644
--- a/include/boost/fusion/sequence/generation/list_tie.hpp
+++ b/include/boost/fusion/sequence/generation/list_tie.hpp
@@ -13,7 +13,7 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/generation/make_cons.hpp b/include/boost/fusion/sequence/generation/make_cons.hpp
index 704b35e2..47a2f461 100644
--- a/include/boost/fusion/sequence/generation/make_cons.hpp
+++ b/include/boost/fusion/sequence/generation/make_cons.hpp
@@ -9,7 +9,7 @@
 #define FUSION_MAKE_CONS_07172005_0918
 
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/fusion/sequence/container/list/cons.hpp>
+#include <boost/fusion/container/list/cons.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/generation/make_deque.hpp b/include/boost/fusion/sequence/generation/make_deque.hpp
index 4c8544c2..5bcd4962 100644
--- a/include/boost/fusion/sequence/generation/make_deque.hpp
+++ b/include/boost/fusion/sequence/generation/make_deque.hpp
@@ -19,7 +19,7 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/sequence/generation/make_list.hpp b/include/boost/fusion/sequence/generation/make_list.hpp
index a37a2367..122fe751 100644
--- a/include/boost/fusion/sequence/generation/make_list.hpp
+++ b/include/boost/fusion/sequence/generation/make_list.hpp
@@ -12,7 +12,7 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/sequence/generation/make_map.hpp b/include/boost/fusion/sequence/generation/make_map.hpp
index 885cea2b..5bc054e3 100644
--- a/include/boost/fusion/sequence/generation/make_map.hpp
+++ b/include/boost/fusion/sequence/generation/make_map.hpp
@@ -12,7 +12,7 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
-#include <boost/fusion/sequence/container/map/map.hpp>
+#include <boost/fusion/container/map/map.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 #include <boost/fusion/support/pair.hpp>
 
diff --git a/include/boost/fusion/sequence/generation/make_set.hpp b/include/boost/fusion/sequence/generation/make_set.hpp
index 7f56159c..b434923f 100644
--- a/include/boost/fusion/sequence/generation/make_set.hpp
+++ b/include/boost/fusion/sequence/generation/make_set.hpp
@@ -12,7 +12,7 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
-#include <boost/fusion/sequence/container/set/set.hpp>
+#include <boost/fusion/container/set/set.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 #include <boost/fusion/support/pair.hpp>
 
diff --git a/include/boost/fusion/sequence/generation/make_vector.hpp b/include/boost/fusion/sequence/generation/make_vector.hpp
index 2dc292fd..b73598d6 100644
--- a/include/boost/fusion/sequence/generation/make_vector.hpp
+++ b/include/boost/fusion/sequence/generation/make_vector.hpp
@@ -12,7 +12,7 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/sequence/generation/map_tie.hpp b/include/boost/fusion/sequence/generation/map_tie.hpp
index 523a22d4..a5cb08c9 100644
--- a/include/boost/fusion/sequence/generation/map_tie.hpp
+++ b/include/boost/fusion/sequence/generation/map_tie.hpp
@@ -13,8 +13,8 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
-#include <boost/fusion/sequence/container/map/map.hpp>
-#include <boost/fusion/sequence/container/map/limits.hpp>
+#include <boost/fusion/container/map/map.hpp>
+#include <boost/fusion/container/map/limits.hpp>
 #include <boost/fusion/support/pair.hpp>
 #include <boost/fusion/sequence/generation/pair_tie.hpp>
 #include <boost/type_traits/add_reference.hpp>
diff --git a/include/boost/fusion/sequence/generation/vector_tie.hpp b/include/boost/fusion/sequence/generation/vector_tie.hpp
index b8cfe527..f70c4e89 100644
--- a/include/boost/fusion/sequence/generation/vector_tie.hpp
+++ b/include/boost/fusion/sequence/generation/vector_tie.hpp
@@ -13,7 +13,7 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/intrinsic.hpp b/include/boost/fusion/sequence/intrinsic.hpp
index 59aaf9ff..8c5f4abd 100644
--- a/include/boost/fusion/sequence/intrinsic.hpp
+++ b/include/boost/fusion/sequence/intrinsic.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_SEQUENCE_INTRINSIC_10022005_0618)
@@ -14,7 +14,6 @@
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/sequence/intrinsic/has_key.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at.hpp>
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/mpl.hpp b/include/boost/fusion/sequence/intrinsic/mpl.hpp
deleted file mode 100644
index 9d5bb609..00000000
--- a/include/boost/fusion/sequence/intrinsic/mpl.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-
-    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)
-==============================================================================*/
-#if !defined(FUSION_SEQUENCE_INTRINSIC_MPL_10022005_1641)
-#define FUSION_SEQUENCE_INTRINSIC_MPL_10022005_1641
-
-#include <boost/fusion/sequence/intrinsic/mpl/at.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/back.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/begin.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/clear.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/empty.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/end.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/erase.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/erase_key.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/front.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/has_key.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/insert.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/insert_range.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/pop_back.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/pop_front.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/push_back.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/push_front.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/size.hpp>
-
-#endif
diff --git a/include/boost/fusion/sequence/intrinsic/mpl/detail/as.hpp b/include/boost/fusion/sequence/intrinsic/mpl/detail/as.hpp
deleted file mode 100644
index 1537e549..00000000
--- a/include/boost/fusion/sequence/intrinsic/mpl/detail/as.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-
-    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)
-==============================================================================*/
-#if !defined(FUSION_AS_10022005_1442)
-#define FUSION_AS_10022005_1442
-
-namespace boost { namespace fusion
-{
-    namespace result_of
-    {
-        template <typename Sequence>
-        struct as_list;
-
-        template <typename Sequence>
-        struct as_map;
-
-        template <typename Sequence>
-        struct as_set;
-
-        template <typename Sequence>
-        struct as_vector;
-
-        template <typename Sequence>
-        struct as_deque;
-    }
-
-    namespace detail
-    {
-        template <typename Tag>
-        struct as_impl;
-
-        template <>
-        struct as_impl<cons_tag>
-        {
-            template <typename Sequence>
-            struct apply : result_of::as_list<Sequence> {};
-        };
-
-        template <>
-        struct as_impl<map_tag>
-        {
-            template <typename Sequence>
-            struct apply : result_of::as_map<Sequence> {};
-        };
-
-        template <>
-        struct as_impl<set_tag>
-        {
-            template <typename Sequence>
-            struct apply : result_of::as_set<Sequence> {};
-        };
-
-        template <>
-        struct as_impl<vector_tag>
-        {
-            template <typename Sequence>
-            struct apply : result_of::as_vector<Sequence> {};
-        };
-
-        template<>
-        struct as_impl<deque_tag>
-        {
-            template <typename Sequence>
-            struct apply : result_of::as_deque<Sequence> {};
-        };
-
-        template <typename Tag, typename Sequence>
-        struct as
-        {
-            typedef typename
-                as_impl<Tag>::template apply<Sequence>::type
-            type;
-        };
-    }
-}}
-
-#endif
diff --git a/include/boost/fusion/sequence/intrinsic/swap.hpp b/include/boost/fusion/sequence/intrinsic/swap.hpp
index 90570c1f..7a385ae8 100644
--- a/include/boost/fusion/sequence/intrinsic/swap.hpp
+++ b/include/boost/fusion/sequence/intrinsic/swap.hpp
@@ -11,7 +11,7 @@
 #include <algorithm>
 
 #include <boost/fusion/support/is_sequence.hpp>
-#include <boost/fusion/sequence/view/zip_view.hpp>
+#include <boost/fusion/view/zip_view.hpp>
 #include <boost/fusion/algorithm/iteration/for_each.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
diff --git a/include/boost/fusion/support/deduce_sequence.hpp b/include/boost/fusion/support/deduce_sequence.hpp
index eaf19afa..9cf97922 100644
--- a/include/boost/fusion/support/deduce_sequence.hpp
+++ b/include/boost/fusion/support/deduce_sequence.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     Copyright (c) 2007 Tobias Schwinger
-  
-    Use modification and distribution are subject to the Boost Software 
+
+    Use modification and distribution are subject to 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).
 ==============================================================================*/
@@ -10,9 +10,9 @@
 #define BOOST_FUSION_SUPPORT_DEDUCE_SEQUENCE_HPP_INCLUDED
 
 #include <boost/fusion/support/deduce.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
-#include <boost/fusion/sequence/view/transform_view.hpp>
-
+#include <boost/fusion/container/vector/convert.hpp>
+#include <boost/fusion/mpl.hpp>
+#include <boost/mpl/transform.hpp>
 
 namespace boost { namespace fusion { namespace traits
 {
@@ -22,20 +22,19 @@ namespace boost { namespace fusion { namespace traits
     {
         struct deducer
         {
-            template <typename Sig>
-            struct result;
-
-            template <class Self, typename T>
-            struct result< Self(T) >
+            template <typename T>
+            struct apply
                 : fusion::traits::deduce<T>
             { };
         };
     }
 
+    // We cannot use fusion::transform_view here as result_of loses cv qualifiers
+    // on built in types
     template <class Sequence>
     struct deduce_sequence
         : result_of::as_vector<
-            fusion::transform_view<Sequence, detail::deducer> >
+            typename mpl::transform<Sequence, detail::deducer>::type>
     { };
 
 }}}
diff --git a/include/boost/fusion/support/detail/compiler_config.hpp b/include/boost/fusion/support/detail/compiler_config.hpp
deleted file mode 100644
index 3859ef78..00000000
--- a/include/boost/fusion/support/detail/compiler_config.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2006 Joel de Guzman
-
-    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)
-==============================================================================*/
-#if !defined(FUSION_COMPILER_CONFIG_01052006_1200)
-#define FUSION_COMPILER_CONFIG_01052006_1200
-
-#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
-
-#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1310))
-#pragma warning(disable : 4512 4244 4100 4305)
-#endif
-
-#endif
diff --git a/include/boost/fusion/support/iterator_base.hpp b/include/boost/fusion/support/iterator_base.hpp
index 39d05c40..2f909b2e 100644
--- a/include/boost/fusion/support/iterator_base.hpp
+++ b/include/boost/fusion/support/iterator_base.hpp
@@ -1,14 +1,12 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_ITERATOR_BASE_05042005_1008)
 #define FUSION_ITERATOR_BASE_05042005_1008
 
-#include <boost/fusion/support/detail/compiler_config.hpp>
-
 namespace boost { namespace fusion
 {
     struct iterator_root {};
diff --git a/include/boost/fusion/support/pair.hpp b/include/boost/fusion/support/pair.hpp
index 67758071..cf285714 100644
--- a/include/boost/fusion/support/pair.hpp
+++ b/include/boost/fusion/support/pair.hpp
@@ -2,13 +2,12 @@
     Copyright (c) 2005 Joel de Guzman
     Copyright (c) 2006 Tobias Schwinger
 
-    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)
 ==============================================================================*/
 #if !defined(FUSION_PAIR_07222005_1203)
 #define FUSION_PAIR_07222005_1203
 
-#include <boost/fusion/support/detail/compiler_config.hpp>
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 
@@ -23,7 +22,7 @@ namespace boost { namespace fusion
 
         pair(typename detail::call_param<Second>::type val)
             : second(val) {}
-        
+
         template <typename Second2>
         pair(pair<First, Second2> const& rhs)
             : second(rhs.second) {}
@@ -45,7 +44,7 @@ namespace boost { namespace fusion
         template<typename First, typename Second>
         struct make_pair
         {
-            typedef fusion::pair<First, 
+            typedef fusion::pair<First,
                         typename detail::as_fusion_element<Second>::type> type;
         };
 
@@ -84,16 +83,16 @@ namespace boost { namespace fusion
         is >> p.second;
         return is;
     }
-    
+
     template <typename First, typename SecondL, typename SecondR>
-    inline bool 
+    inline bool
     operator==(pair<First, SecondL> const& l, pair<First, SecondR> const& r)
     {
         return l.second == r.second;
     }
 
     template <typename First, typename SecondL, typename SecondR>
-    inline bool 
+    inline bool
     operator!=(pair<First, SecondL> const& l, pair<First, SecondR> const& r)
     {
         return l.second != r.second;
diff --git a/include/boost/fusion/support/sequence_base.hpp b/include/boost/fusion/support/sequence_base.hpp
index 1a82848d..1d436ef1 100644
--- a/include/boost/fusion/support/sequence_base.hpp
+++ b/include/boost/fusion/support/sequence_base.hpp
@@ -2,13 +2,12 @@
     Copyright (c) 2001-2006 Joel de Guzman
     Copyright (c) 2007 Tobias Schwinger
 
-    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)
 ==============================================================================*/
 #if !defined(FUSION_SEQUENCE_BASE_04182005_0737)
 #define FUSION_SEQUENCE_BASE_04182005_0737
 
-#include <boost/fusion/support/detail/compiler_config.hpp>
 #include <boost/mpl/begin_end_fwd.hpp>
 
 namespace boost { namespace fusion
@@ -37,7 +36,7 @@ namespace boost { namespace fusion
 namespace boost { namespace mpl
 {
     // Deliberately break mpl::begin, so it doesn't lie that a Fusion sequence
-    // is not an MPL sequence by returning mpl::void_. 
+    // is not an MPL sequence by returning mpl::void_.
     // In other words: Fusion Sequences are always MPL Sequences, but they can
     // be incompletely defined.
     template<> struct begin_impl< boost::fusion::fusion_sequence_tag >;
diff --git a/include/boost/fusion/support/tag_of.hpp b/include/boost/fusion/support/tag_of.hpp
index a1ccf12d..209ceeff 100644
--- a/include/boost/fusion/support/tag_of.hpp
+++ b/include/boost/fusion/support/tag_of.hpp
@@ -1,17 +1,17 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_TAG_OF_09232005_0845)
 #define FUSION_TAG_OF_09232005_0845
 
+#include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/remove_const.hpp>
 #include <boost/fusion/support/tag_of_fwd.hpp>
 #include <boost/fusion/support/detail/is_mpl_sequence.hpp>
 #include <boost/mpl/has_xxx.hpp>
-#include <boost/utility/enable_if.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/bool.hpp>
@@ -26,13 +26,13 @@ namespace boost
     namespace tuples
     {
         struct null_type;
-        
+
         template <
-            class T0, class T1, class T2, class T3, class T4, 
+            class T0, class T1, class T2, class T3, class T4,
             class T5, class T6, class T7, class T8, class T9
         >
         class tuple;
-    
+
         template <class Head, class Tail>
         struct cons;
     }
@@ -53,7 +53,7 @@ namespace boost { namespace fusion
         {};
 
         template <
-            class T0, class T1, class T2, class T3, class T4, 
+            class T0, class T1, class T2, class T3, class T4,
             class T5, class T6, class T7, class T8, class T9
         >
         struct is_specialized<tuples::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> >
diff --git a/include/boost/fusion/support/tag_of_fwd.hpp b/include/boost/fusion/support/tag_of_fwd.hpp
index 053cacaf..e6c883d5 100644
--- a/include/boost/fusion/support/tag_of_fwd.hpp
+++ b/include/boost/fusion/support/tag_of_fwd.hpp
@@ -2,14 +2,14 @@
     Copyright (c) 2001-2006 Joel de Guzman
     Copyright (c) 2005-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)
 ==============================================================================*/
 #if !defined(BOOST_FUSION_TAG_OF_FWD_31122005_1445)
 #define BOOST_FUSION_TAG_OF_FWD_31122005_1445
 
-namespace boost { namespace fusion {
-
+namespace boost { namespace fusion
+{
     namespace traits
     {
         template<typename T, typename Active = void>
diff --git a/include/boost/fusion/support/void.hpp b/include/boost/fusion/support/void.hpp
index 63275b11..7dd11e5c 100644
--- a/include/boost/fusion/support/void.hpp
+++ b/include/boost/fusion/support/void.hpp
@@ -1,7 +1,14 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+
+    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)
+==============================================================================*/
 #if !defined(BOOST_FUSION_SUPPORT_VOID_20070706_2125)
 #define BOOST_FUSION_SUPPORT_VOID_20070706_2125
 
-namespace boost { namespace fusion {
+namespace boost { namespace fusion
+{
     struct void_ {};
 }}
 
diff --git a/include/boost/fusion/tuple/tuple.hpp b/include/boost/fusion/tuple/tuple.hpp
index a32e6b3e..d9860323 100644
--- a/include/boost/fusion/tuple/tuple.hpp
+++ b/include/boost/fusion/tuple/tuple.hpp
@@ -8,7 +8,7 @@
 #define FUSION_TUPLE_10032005_0810
 
 #include <boost/fusion/tuple/tuple_fwd.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
diff --git a/include/boost/fusion/tuple/tuple_fwd.hpp b/include/boost/fusion/tuple/tuple_fwd.hpp
index f3e660e5..1a127cab 100644
--- a/include/boost/fusion/tuple/tuple_fwd.hpp
+++ b/include/boost/fusion/tuple/tuple_fwd.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_TUPLE_FORWARD_10032005_0956)
 #define FUSION_TUPLE_FORWARD_10032005_0956
 
-#include <boost/fusion/sequence/container/vector/limits.hpp>
+#include <boost/fusion/container/vector/limits.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/sequence/view.hpp b/include/boost/fusion/view.hpp
similarity index 58%
rename from include/boost/fusion/sequence/view.hpp
rename to include/boost/fusion/view.hpp
index 712a9ac5..12d5cc5d 100644
--- a/include/boost/fusion/sequence/view.hpp
+++ b/include/boost/fusion/view.hpp
@@ -7,11 +7,11 @@
 #if !defined(FUSION_SEQUENCE_VIEW_10022005_0620)
 #define FUSION_SEQUENCE_VIEW_10022005_0620
 
-#include <boost/fusion/sequence/view/filter_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range.hpp>
-#include <boost/fusion/sequence/view/joint_view.hpp>
-#include <boost/fusion/sequence/view/transform_view.hpp>
-#include <boost/fusion/sequence/view/reverse_view.hpp>
-#include <boost/fusion/sequence/view/zip_view.hpp>
+#include <boost/fusion/view/filter_view.hpp>
+#include <boost/fusion/view/iterator_range.hpp>
+#include <boost/fusion/view/joint_view.hpp>
+#include <boost/fusion/view/transform_view.hpp>
+#include <boost/fusion/view/reverse_view.hpp>
+#include <boost/fusion/view/zip_view.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence/view/ext_/multiple_view.hpp b/include/boost/fusion/view/ext_/multiple_view.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/ext_/multiple_view.hpp
rename to include/boost/fusion/view/ext_/multiple_view.hpp
diff --git a/include/boost/fusion/sequence/view/ext_/segmented_iterator.hpp b/include/boost/fusion/view/ext_/segmented_iterator.hpp
similarity index 99%
rename from include/boost/fusion/sequence/view/ext_/segmented_iterator.hpp
rename to include/boost/fusion/view/ext_/segmented_iterator.hpp
index 2f6c1f74..2216929b 100755
--- a/include/boost/fusion/sequence/view/ext_/segmented_iterator.hpp
+++ b/include/boost/fusion/view/ext_/segmented_iterator.hpp
@@ -17,8 +17,8 @@
 #include <boost/type_traits/remove_reference.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/support/is_sequence.hpp>
-#include <boost/fusion/sequence/view/filter_view.hpp>
-#include <boost/fusion/sequence/container/list/cons.hpp> // for nil
+#include <boost/fusion/view/filter_view.hpp>
+#include <boost/fusion/container/list/cons.hpp> // for nil
 #include <boost/fusion/sequence/generation/make_cons.hpp>
 #include <boost/fusion/iterator/distance.hpp>
 #include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
diff --git a/include/boost/fusion/sequence/view/ext_/segmented_iterator_range.hpp b/include/boost/fusion/view/ext_/segmented_iterator_range.hpp
similarity index 97%
rename from include/boost/fusion/sequence/view/ext_/segmented_iterator_range.hpp
rename to include/boost/fusion/view/ext_/segmented_iterator_range.hpp
index 7bab8789..c4dcd01c 100755
--- a/include/boost/fusion/sequence/view/ext_/segmented_iterator_range.hpp
+++ b/include/boost/fusion/view/ext_/segmented_iterator_range.hpp
@@ -12,13 +12,15 @@
 #include <boost/mpl/minus.hpp>
 #include <boost/mpl/next_prior.hpp>
 #include <boost/mpl/and.hpp>
-#include <boost/fusion/sequence/container/list/cons.hpp>
-#include <boost/fusion/sequence/view/joint_view.hpp>
-#include <boost/fusion/sequence/view/single_view.hpp>
-#include <boost/fusion/sequence/view/transform_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range.hpp>
-#include <boost/fusion/sequence/view/ext_/multiple_view.hpp>
-#include <boost/fusion/sequence/view/ext_/segmented_iterator.hpp>
+#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/container/list/cons.hpp>
+#include <boost/fusion/view/joint_view.hpp>
+#include <boost/fusion/view/single_view.hpp>
+#include <boost/fusion/view/transform_view.hpp>
+#include <boost/fusion/view/iterator_range.hpp>
+#include <boost/fusion/view/ext_/multiple_view.hpp>
+#include <boost/fusion/view/ext_/segmented_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/view/filter_view.hpp b/include/boost/fusion/view/filter_view.hpp
similarity index 77%
rename from include/boost/fusion/sequence/view/filter_view.hpp
rename to include/boost/fusion/view/filter_view.hpp
index d8fb4936..c649407f 100644
--- a/include/boost/fusion/sequence/view/filter_view.hpp
+++ b/include/boost/fusion/view/filter_view.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_SEQUENCE_VIEW_FILTER_VIEW_10022005_0608)
 #define FUSION_SEQUENCE_VIEW_FILTER_VIEW_10022005_0608
 
-#include <boost/fusion/sequence/view/filter_view/filter_view.hpp>
-#include <boost/fusion/sequence/view/filter_view/filter_view_iterator.hpp>
+#include <boost/fusion/view/filter_view/filter_view.hpp>
+#include <boost/fusion/view/filter_view/filter_view_iterator.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence/view/filter_view/detail/begin_impl.hpp b/include/boost/fusion/view/filter_view/detail/begin_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/filter_view/detail/begin_impl.hpp
rename to include/boost/fusion/view/filter_view/detail/begin_impl.hpp
diff --git a/include/boost/fusion/sequence/view/filter_view/detail/deref_impl.hpp b/include/boost/fusion/view/filter_view/detail/deref_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/filter_view/detail/deref_impl.hpp
rename to include/boost/fusion/view/filter_view/detail/deref_impl.hpp
diff --git a/include/boost/fusion/sequence/view/filter_view/detail/end_impl.hpp b/include/boost/fusion/view/filter_view/detail/end_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/filter_view/detail/end_impl.hpp
rename to include/boost/fusion/view/filter_view/detail/end_impl.hpp
diff --git a/include/boost/fusion/sequence/view/filter_view/detail/equal_to_impl.hpp b/include/boost/fusion/view/filter_view/detail/equal_to_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/filter_view/detail/equal_to_impl.hpp
rename to include/boost/fusion/view/filter_view/detail/equal_to_impl.hpp
diff --git a/include/boost/fusion/sequence/view/filter_view/detail/next_impl.hpp b/include/boost/fusion/view/filter_view/detail/next_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/filter_view/detail/next_impl.hpp
rename to include/boost/fusion/view/filter_view/detail/next_impl.hpp
diff --git a/include/boost/fusion/sequence/view/filter_view/detail/size_impl.hpp b/include/boost/fusion/view/filter_view/detail/size_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/filter_view/detail/size_impl.hpp
rename to include/boost/fusion/view/filter_view/detail/size_impl.hpp
diff --git a/include/boost/fusion/sequence/view/filter_view/detail/value_of_impl.hpp b/include/boost/fusion/view/filter_view/detail/value_of_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/filter_view/detail/value_of_impl.hpp
rename to include/boost/fusion/view/filter_view/detail/value_of_impl.hpp
diff --git a/include/boost/fusion/sequence/view/filter_view/filter_view.hpp b/include/boost/fusion/view/filter_view/filter_view.hpp
similarity index 85%
rename from include/boost/fusion/sequence/view/filter_view/filter_view.hpp
rename to include/boost/fusion/view/filter_view/filter_view.hpp
index e09ec97f..a34747e6 100644
--- a/include/boost/fusion/sequence/view/filter_view/filter_view.hpp
+++ b/include/boost/fusion/view/filter_view/filter_view.hpp
@@ -10,10 +10,10 @@
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/support/sequence_base.hpp>
 #include <boost/fusion/support/is_view.hpp>
-#include <boost/fusion/sequence/view/filter_view/filter_view_iterator.hpp>
-#include <boost/fusion/sequence/view/filter_view/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/view/filter_view/detail/end_impl.hpp>
-#include <boost/fusion/sequence/view/filter_view/detail/size_impl.hpp>
+#include <boost/fusion/view/filter_view/filter_view_iterator.hpp>
+#include <boost/fusion/view/filter_view/detail/begin_impl.hpp>
+#include <boost/fusion/view/filter_view/detail/end_impl.hpp>
+#include <boost/fusion/view/filter_view/detail/size_impl.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/mpl/bool.hpp>
diff --git a/include/boost/fusion/sequence/view/filter_view/filter_view_iterator.hpp b/include/boost/fusion/view/filter_view/filter_view_iterator.hpp
similarity index 82%
rename from include/boost/fusion/sequence/view/filter_view/filter_view_iterator.hpp
rename to include/boost/fusion/view/filter_view/filter_view_iterator.hpp
index aaf1d6e0..be93c657 100644
--- a/include/boost/fusion/sequence/view/filter_view/filter_view_iterator.hpp
+++ b/include/boost/fusion/view/filter_view/filter_view_iterator.hpp
@@ -1,18 +1,19 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_FILTER_VIEW_ITERATOR_05062005_0849)
 #define FUSION_FILTER_VIEW_ITERATOR_05062005_0849
 
 #include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 #include <boost/fusion/support/iterator_base.hpp>
-#include <boost/fusion/sequence/view/filter_view/detail/deref_impl.hpp>
-#include <boost/fusion/sequence/view/filter_view/detail/next_impl.hpp>
-#include <boost/fusion/sequence/view/filter_view/detail/value_of_impl.hpp>
-#include <boost/fusion/sequence/view/filter_view/detail/equal_to_impl.hpp>
+#include <boost/fusion/view/filter_view/detail/deref_impl.hpp>
+#include <boost/fusion/view/filter_view/detail/next_impl.hpp>
+#include <boost/fusion/view/filter_view/detail/value_of_impl.hpp>
+#include <boost/fusion/view/filter_view/detail/equal_to_impl.hpp>
 #include <boost/fusion/algorithm/query/detail/find_if.hpp>
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/sequence/view/iterator_range.hpp b/include/boost/fusion/view/iterator_range.hpp
similarity index 87%
rename from include/boost/fusion/sequence/view/iterator_range.hpp
rename to include/boost/fusion/view/iterator_range.hpp
index 16485eb4..f8d30221 100644
--- a/include/boost/fusion/sequence/view/iterator_range.hpp
+++ b/include/boost/fusion/view/iterator_range.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_SEQUENCE_VIEW_ITERATOR_RANGE_10022005_0610)
 #define FUSION_SEQUENCE_VIEW_ITERATOR_RANGE_10022005_0610
 
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/view/iterator_range/iterator_range.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence/view/iterator_range/detail/at_impl.hpp b/include/boost/fusion/view/iterator_range/detail/at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/iterator_range/detail/at_impl.hpp
rename to include/boost/fusion/view/iterator_range/detail/at_impl.hpp
diff --git a/include/boost/fusion/sequence/view/iterator_range/detail/begin_impl.hpp b/include/boost/fusion/view/iterator_range/detail/begin_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/iterator_range/detail/begin_impl.hpp
rename to include/boost/fusion/view/iterator_range/detail/begin_impl.hpp
diff --git a/include/boost/fusion/sequence/view/iterator_range/detail/end_impl.hpp b/include/boost/fusion/view/iterator_range/detail/end_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/iterator_range/detail/end_impl.hpp
rename to include/boost/fusion/view/iterator_range/detail/end_impl.hpp
diff --git a/include/boost/fusion/sequence/view/iterator_range/detail/value_at_impl.hpp b/include/boost/fusion/view/iterator_range/detail/value_at_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/iterator_range/detail/value_at_impl.hpp
rename to include/boost/fusion/view/iterator_range/detail/value_at_impl.hpp
diff --git a/include/boost/fusion/sequence/view/iterator_range/iterator_range.hpp b/include/boost/fusion/view/iterator_range/iterator_range.hpp
similarity index 83%
rename from include/boost/fusion/sequence/view/iterator_range/iterator_range.hpp
rename to include/boost/fusion/view/iterator_range/iterator_range.hpp
index dee6c00a..0036f0ae 100644
--- a/include/boost/fusion/sequence/view/iterator_range/iterator_range.hpp
+++ b/include/boost/fusion/view/iterator_range/iterator_range.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_ITERATOR_RANGE_05062005_1224)
@@ -10,12 +10,13 @@
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/support/sequence_base.hpp>
 #include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/sequence/view/iterator_range/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/view/iterator_range/detail/end_impl.hpp>
-#include <boost/fusion/sequence/view/iterator_range/detail/at_impl.hpp>
-#include <boost/fusion/sequence/view/iterator_range/detail/value_at_impl.hpp>
-#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
 #include <boost/fusion/iterator/distance.hpp>
+#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/view/iterator_range/detail/begin_impl.hpp>
+#include <boost/fusion/view/iterator_range/detail/end_impl.hpp>
+#include <boost/fusion/view/iterator_range/detail/at_impl.hpp>
+#include <boost/fusion/view/iterator_range/detail/value_at_impl.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 #include <boost/mpl/bool.hpp>
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/sequence/view/joint_view.hpp b/include/boost/fusion/view/joint_view.hpp
similarity index 77%
rename from include/boost/fusion/sequence/view/joint_view.hpp
rename to include/boost/fusion/view/joint_view.hpp
index 6d9209a8..cd1b8571 100644
--- a/include/boost/fusion/sequence/view/joint_view.hpp
+++ b/include/boost/fusion/view/joint_view.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_SEQUENCE_VIEW_JOINT_VIEW_10022005_0610)
 #define FUSION_SEQUENCE_VIEW_JOINT_VIEW_10022005_0610
 
-#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view_iterator.hpp>
+#include <boost/fusion/view/joint_view/joint_view.hpp>
+#include <boost/fusion/view/joint_view/joint_view_iterator.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence/view/joint_view/detail/begin_impl.hpp b/include/boost/fusion/view/joint_view/detail/begin_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/joint_view/detail/begin_impl.hpp
rename to include/boost/fusion/view/joint_view/detail/begin_impl.hpp
diff --git a/include/boost/fusion/sequence/view/joint_view/detail/deref_impl.hpp b/include/boost/fusion/view/joint_view/detail/deref_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/joint_view/detail/deref_impl.hpp
rename to include/boost/fusion/view/joint_view/detail/deref_impl.hpp
diff --git a/include/boost/fusion/sequence/view/joint_view/detail/end_impl.hpp b/include/boost/fusion/view/joint_view/detail/end_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/joint_view/detail/end_impl.hpp
rename to include/boost/fusion/view/joint_view/detail/end_impl.hpp
diff --git a/include/boost/fusion/sequence/view/joint_view/detail/next_impl.hpp b/include/boost/fusion/view/joint_view/detail/next_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/joint_view/detail/next_impl.hpp
rename to include/boost/fusion/view/joint_view/detail/next_impl.hpp
diff --git a/include/boost/fusion/sequence/view/joint_view/detail/value_of_impl.hpp b/include/boost/fusion/view/joint_view/detail/value_of_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/joint_view/detail/value_of_impl.hpp
rename to include/boost/fusion/view/joint_view/detail/value_of_impl.hpp
diff --git a/include/boost/fusion/sequence/view/joint_view/joint_view.hpp b/include/boost/fusion/view/joint_view/joint_view.hpp
similarity index 91%
rename from include/boost/fusion/sequence/view/joint_view/joint_view.hpp
rename to include/boost/fusion/view/joint_view/joint_view.hpp
index d0c48200..9cc798d3 100644
--- a/include/boost/fusion/sequence/view/joint_view/joint_view.hpp
+++ b/include/boost/fusion/view/joint_view/joint_view.hpp
@@ -12,9 +12,9 @@
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view_iterator.hpp>
-#include <boost/fusion/sequence/view/joint_view/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/view/joint_view/detail/end_impl.hpp>
+#include <boost/fusion/view/joint_view/joint_view_iterator.hpp>
+#include <boost/fusion/view/joint_view/detail/begin_impl.hpp>
+#include <boost/fusion/view/joint_view/detail/end_impl.hpp>
 #include <boost/fusion/support/sequence_base.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/plus.hpp>
diff --git a/include/boost/fusion/sequence/view/joint_view/joint_view_iterator.hpp b/include/boost/fusion/view/joint_view/joint_view_iterator.hpp
similarity index 86%
rename from include/boost/fusion/sequence/view/joint_view/joint_view_iterator.hpp
rename to include/boost/fusion/view/joint_view/joint_view_iterator.hpp
index 0bdfae07..18696d7e 100644
--- a/include/boost/fusion/sequence/view/joint_view/joint_view_iterator.hpp
+++ b/include/boost/fusion/view/joint_view/joint_view_iterator.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_JOINT_VIEW_ITERATOR_07162005_0140)
@@ -10,9 +10,10 @@
 #include <boost/fusion/support/iterator_base.hpp>
 #include <boost/fusion/iterator/equal_to.hpp>
 #include <boost/fusion/iterator/mpl/convert_iterator.hpp>
-#include <boost/fusion/sequence/view/joint_view/detail/deref_impl.hpp>
-#include <boost/fusion/sequence/view/joint_view/detail/next_impl.hpp>
-#include <boost/fusion/sequence/view/joint_view/detail/value_of_impl.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
+#include <boost/fusion/view/joint_view/detail/deref_impl.hpp>
+#include <boost/fusion/view/joint_view/detail/next_impl.hpp>
+#include <boost/fusion/view/joint_view/detail/value_of_impl.hpp>
 #include <boost/static_assert.hpp>
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/sequence/view/repetitive_view.hpp b/include/boost/fusion/view/repetitive_view.hpp
similarity index 75%
rename from include/boost/fusion/sequence/view/repetitive_view.hpp
rename to include/boost/fusion/view/repetitive_view.hpp
index 8940174b..fef1462f 100644
--- a/include/boost/fusion/sequence/view/repetitive_view.hpp
+++ b/include/boost/fusion/view/repetitive_view.hpp
@@ -8,8 +8,8 @@
 #if !defined(BOOST_FUSION_REPETITIVE_VIEW_HPP_INCLUDED)
 #define BOOST_FUSION_REPETITIVE_VIEW_HPP_INCLUDED
 
-#include <boost/fusion/sequence/view/repetitive_view/repetitive_view.hpp>
-#include <boost/fusion/sequence/view/repetitive_view/repetitive_view_iterator.hpp>
+#include <boost/fusion/view/repetitive_view/repetitive_view.hpp>
+#include <boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp>
 
 #endif
 
diff --git a/include/boost/fusion/sequence/view/repetitive_view/detail/begin_impl.hpp b/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp
similarity index 94%
rename from include/boost/fusion/sequence/view/repetitive_view/detail/begin_impl.hpp
rename to include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp
index b5c4c29a..321d7b8d 100644
--- a/include/boost/fusion/sequence/view/repetitive_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp
@@ -9,7 +9,7 @@
 #define BOOST_FUSION_REPETITIVE_VIEW_BEGIN_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/view/repetitive_view/repetitive_view_fwd.hpp>
+#include <boost/fusion/view/repetitive_view/repetitive_view_fwd.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/view/repetitive_view/detail/deref_impl.hpp b/include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/repetitive_view/detail/deref_impl.hpp
rename to include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp
diff --git a/include/boost/fusion/sequence/view/repetitive_view/detail/end_impl.hpp b/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp
similarity index 94%
rename from include/boost/fusion/sequence/view/repetitive_view/detail/end_impl.hpp
rename to include/boost/fusion/view/repetitive_view/detail/end_impl.hpp
index 00ac0874..52e36da5 100644
--- a/include/boost/fusion/sequence/view/repetitive_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp
@@ -9,7 +9,7 @@
 #define BOOST_FUSION_REPETITIVE_VIEW_END_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/sequence/view/repetitive_view/repetitive_view_fwd.hpp>
+#include <boost/fusion/view/repetitive_view/repetitive_view_fwd.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/view/repetitive_view/detail/next_impl.hpp b/include/boost/fusion/view/repetitive_view/detail/next_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/repetitive_view/detail/next_impl.hpp
rename to include/boost/fusion/view/repetitive_view/detail/next_impl.hpp
diff --git a/include/boost/fusion/sequence/view/repetitive_view/detail/value_of_impl.hpp b/include/boost/fusion/view/repetitive_view/detail/value_of_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/repetitive_view/detail/value_of_impl.hpp
rename to include/boost/fusion/view/repetitive_view/detail/value_of_impl.hpp
diff --git a/include/boost/fusion/sequence/view/repetitive_view/repetitive_view.hpp b/include/boost/fusion/view/repetitive_view/repetitive_view.hpp
similarity index 90%
rename from include/boost/fusion/sequence/view/repetitive_view/repetitive_view.hpp
rename to include/boost/fusion/view/repetitive_view/repetitive_view.hpp
index 2e06fd80..050affb1 100644
--- a/include/boost/fusion/sequence/view/repetitive_view/repetitive_view.hpp
+++ b/include/boost/fusion/view/repetitive_view/repetitive_view.hpp
@@ -14,8 +14,8 @@
 #include <boost/fusion/support/is_view.hpp>
 #include <boost/fusion/support/category_of.hpp>
 
-#include <boost/fusion/sequence/view/repetitive_view/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/view/repetitive_view/detail/end_impl.hpp>
+#include <boost/fusion/view/repetitive_view/detail/begin_impl.hpp>
+#include <boost/fusion/view/repetitive_view/detail/end_impl.hpp>
 
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/sequence/view/repetitive_view/repetitive_view_fwd.hpp b/include/boost/fusion/view/repetitive_view/repetitive_view_fwd.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/repetitive_view/repetitive_view_fwd.hpp
rename to include/boost/fusion/view/repetitive_view/repetitive_view_fwd.hpp
diff --git a/include/boost/fusion/sequence/view/repetitive_view/repetitive_view_iterator.hpp b/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp
similarity index 84%
rename from include/boost/fusion/sequence/view/repetitive_view/repetitive_view_iterator.hpp
rename to include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp
index 6b2a9a5e..9a7334de 100644
--- a/include/boost/fusion/sequence/view/repetitive_view/repetitive_view_iterator.hpp
+++ b/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp
@@ -11,17 +11,18 @@
 #include <boost/fusion/support/iterator_base.hpp>
 #include <boost/fusion/support/category_of.hpp>
 #include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/sequence/view/repetitive_view/detail/deref_impl.hpp>
-#include <boost/fusion/sequence/view/repetitive_view/detail/next_impl.hpp>
-#include <boost/fusion/sequence/view/repetitive_view/detail/value_of_impl.hpp>
+#include <boost/fusion/view/repetitive_view/detail/deref_impl.hpp>
+#include <boost/fusion/view/repetitive_view/detail/next_impl.hpp>
+#include <boost/fusion/view/repetitive_view/detail/value_of_impl.hpp>
 
 namespace boost { namespace fusion
 {
     struct repetitive_view_iterator_tag;
 
-    template<typename Sequence, typename Pos = 
+    template<typename Sequence, typename Pos =
         typename result_of::begin<Sequence>::type>
     struct repetitive_view_iterator
         : iterator_base< repetitive_view_iterator<Sequence,Pos> >
diff --git a/include/boost/fusion/sequence/view/reverse_view.hpp b/include/boost/fusion/view/reverse_view.hpp
similarity index 77%
rename from include/boost/fusion/sequence/view/reverse_view.hpp
rename to include/boost/fusion/view/reverse_view.hpp
index 6aa499e3..634b398c 100644
--- a/include/boost/fusion/sequence/view/reverse_view.hpp
+++ b/include/boost/fusion/view/reverse_view.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_SEQUENCE_VIEW_REVERSE_VIEW_10022005_0612)
 #define FUSION_SEQUENCE_VIEW_REVERSE_VIEW_10022005_0612
 
-#include <boost/fusion/sequence/view/reverse_view/reverse_view.hpp>
-#include <boost/fusion/sequence/view/reverse_view/reverse_view_iterator.hpp>
+#include <boost/fusion/view/reverse_view/reverse_view.hpp>
+#include <boost/fusion/view/reverse_view/reverse_view_iterator.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence/view/reverse_view/detail/advance_impl.hpp b/include/boost/fusion/view/reverse_view/detail/advance_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/reverse_view/detail/advance_impl.hpp
rename to include/boost/fusion/view/reverse_view/detail/advance_impl.hpp
diff --git a/include/boost/fusion/sequence/view/reverse_view/detail/begin_impl.hpp b/include/boost/fusion/view/reverse_view/detail/begin_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/reverse_view/detail/begin_impl.hpp
rename to include/boost/fusion/view/reverse_view/detail/begin_impl.hpp
diff --git a/include/boost/fusion/sequence/view/reverse_view/detail/deref_impl.hpp b/include/boost/fusion/view/reverse_view/detail/deref_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/reverse_view/detail/deref_impl.hpp
rename to include/boost/fusion/view/reverse_view/detail/deref_impl.hpp
diff --git a/include/boost/fusion/sequence/view/reverse_view/detail/distance_impl.hpp b/include/boost/fusion/view/reverse_view/detail/distance_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/reverse_view/detail/distance_impl.hpp
rename to include/boost/fusion/view/reverse_view/detail/distance_impl.hpp
diff --git a/include/boost/fusion/sequence/view/reverse_view/detail/end_impl.hpp b/include/boost/fusion/view/reverse_view/detail/end_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/reverse_view/detail/end_impl.hpp
rename to include/boost/fusion/view/reverse_view/detail/end_impl.hpp
diff --git a/include/boost/fusion/sequence/view/reverse_view/detail/next_impl.hpp b/include/boost/fusion/view/reverse_view/detail/next_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/reverse_view/detail/next_impl.hpp
rename to include/boost/fusion/view/reverse_view/detail/next_impl.hpp
diff --git a/include/boost/fusion/sequence/view/reverse_view/detail/prior_impl.hpp b/include/boost/fusion/view/reverse_view/detail/prior_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/reverse_view/detail/prior_impl.hpp
rename to include/boost/fusion/view/reverse_view/detail/prior_impl.hpp
diff --git a/include/boost/fusion/sequence/view/reverse_view/detail/value_of_impl.hpp b/include/boost/fusion/view/reverse_view/detail/value_of_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/reverse_view/detail/value_of_impl.hpp
rename to include/boost/fusion/view/reverse_view/detail/value_of_impl.hpp
diff --git a/include/boost/fusion/sequence/view/reverse_view/reverse_view.hpp b/include/boost/fusion/view/reverse_view/reverse_view.hpp
similarity index 90%
rename from include/boost/fusion/sequence/view/reverse_view/reverse_view.hpp
rename to include/boost/fusion/view/reverse_view/reverse_view.hpp
index 6e6f4c09..c939f7ce 100644
--- a/include/boost/fusion/sequence/view/reverse_view/reverse_view.hpp
+++ b/include/boost/fusion/view/reverse_view/reverse_view.hpp
@@ -10,9 +10,9 @@
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/support/is_view.hpp>
 #include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/sequence/view/reverse_view/reverse_view_iterator.hpp>
-#include <boost/fusion/sequence/view/reverse_view/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/view/reverse_view/detail/end_impl.hpp>
+#include <boost/fusion/view/reverse_view/reverse_view_iterator.hpp>
+#include <boost/fusion/view/reverse_view/detail/begin_impl.hpp>
+#include <boost/fusion/view/reverse_view/detail/end_impl.hpp>
 #include <boost/fusion/support/sequence_base.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
diff --git a/include/boost/fusion/sequence/view/reverse_view/reverse_view_iterator.hpp b/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
similarity index 75%
rename from include/boost/fusion/sequence/view/reverse_view/reverse_view_iterator.hpp
rename to include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
index 5f44b8b5..0a890437 100644
--- a/include/boost/fusion/sequence/view/reverse_view/reverse_view_iterator.hpp
+++ b/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_REVERSE_VIEW_ITERATOR_07202005_0835)
@@ -10,12 +10,13 @@
 #include <boost/fusion/support/iterator_base.hpp>
 #include <boost/fusion/support/category_of.hpp>
 #include <boost/fusion/iterator/mpl/convert_iterator.hpp>
-#include <boost/fusion/sequence/view/reverse_view/detail/deref_impl.hpp>
-#include <boost/fusion/sequence/view/reverse_view/detail/next_impl.hpp>
-#include <boost/fusion/sequence/view/reverse_view/detail/prior_impl.hpp>
-#include <boost/fusion/sequence/view/reverse_view/detail/advance_impl.hpp>
-#include <boost/fusion/sequence/view/reverse_view/detail/distance_impl.hpp>
-#include <boost/fusion/sequence/view/reverse_view/detail/value_of_impl.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
+#include <boost/fusion/view/reverse_view/detail/deref_impl.hpp>
+#include <boost/fusion/view/reverse_view/detail/next_impl.hpp>
+#include <boost/fusion/view/reverse_view/detail/prior_impl.hpp>
+#include <boost/fusion/view/reverse_view/detail/advance_impl.hpp>
+#include <boost/fusion/view/reverse_view/detail/distance_impl.hpp>
+#include <boost/fusion/view/reverse_view/detail/value_of_impl.hpp>
 #include <boost/type_traits/is_base_of.hpp>
 #include <boost/static_assert.hpp>
 
diff --git a/include/boost/fusion/sequence/view/single_view.hpp b/include/boost/fusion/view/single_view.hpp
similarity index 76%
rename from include/boost/fusion/sequence/view/single_view.hpp
rename to include/boost/fusion/view/single_view.hpp
index e4a59476..3640fae8 100644
--- a/include/boost/fusion/sequence/view/single_view.hpp
+++ b/include/boost/fusion/view/single_view.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_SINGLE_VIEW_03192006_2216)
 #define FUSION_SINGLE_VIEW_03192006_2216
 
-#include <boost/fusion/sequence/view/single_view/single_view.hpp>
-#include <boost/fusion/sequence/view/single_view/single_view_iterator.hpp>
+#include <boost/fusion/view/single_view/single_view.hpp>
+#include <boost/fusion/view/single_view/single_view_iterator.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence/view/single_view/detail/begin_impl.hpp b/include/boost/fusion/view/single_view/detail/begin_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/single_view/detail/begin_impl.hpp
rename to include/boost/fusion/view/single_view/detail/begin_impl.hpp
diff --git a/include/boost/fusion/sequence/view/single_view/detail/deref_impl.hpp b/include/boost/fusion/view/single_view/detail/deref_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/single_view/detail/deref_impl.hpp
rename to include/boost/fusion/view/single_view/detail/deref_impl.hpp
diff --git a/include/boost/fusion/sequence/view/single_view/detail/end_impl.hpp b/include/boost/fusion/view/single_view/detail/end_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/single_view/detail/end_impl.hpp
rename to include/boost/fusion/view/single_view/detail/end_impl.hpp
diff --git a/include/boost/fusion/sequence/view/single_view/detail/next_impl.hpp b/include/boost/fusion/view/single_view/detail/next_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/single_view/detail/next_impl.hpp
rename to include/boost/fusion/view/single_view/detail/next_impl.hpp
diff --git a/include/boost/fusion/sequence/view/single_view/detail/value_of_impl.hpp b/include/boost/fusion/view/single_view/detail/value_of_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/single_view/detail/value_of_impl.hpp
rename to include/boost/fusion/view/single_view/detail/value_of_impl.hpp
diff --git a/include/boost/fusion/sequence/view/single_view/single_view.hpp b/include/boost/fusion/view/single_view/single_view.hpp
similarity index 87%
rename from include/boost/fusion/sequence/view/single_view/single_view.hpp
rename to include/boost/fusion/view/single_view/single_view.hpp
index 31b68e20..7c10afe6 100644
--- a/include/boost/fusion/sequence/view/single_view/single_view.hpp
+++ b/include/boost/fusion/view/single_view/single_view.hpp
@@ -10,9 +10,9 @@
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 #include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/sequence/view/single_view/single_view_iterator.hpp>
-#include <boost/fusion/sequence/view/single_view/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/view/single_view/detail/end_impl.hpp>
+#include <boost/fusion/view/single_view/single_view_iterator.hpp>
+#include <boost/fusion/view/single_view/detail/begin_impl.hpp>
+#include <boost/fusion/view/single_view/detail/end_impl.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/int.hpp>
 
diff --git a/include/boost/fusion/sequence/view/single_view/single_view_iterator.hpp b/include/boost/fusion/view/single_view/single_view_iterator.hpp
similarity index 86%
rename from include/boost/fusion/sequence/view/single_view/single_view_iterator.hpp
rename to include/boost/fusion/view/single_view/single_view_iterator.hpp
index 68155d37..1a44bb15 100644
--- a/include/boost/fusion/sequence/view/single_view/single_view_iterator.hpp
+++ b/include/boost/fusion/view/single_view/single_view_iterator.hpp
@@ -9,9 +9,9 @@
 
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/support/iterator_base.hpp>
-#include <boost/fusion/sequence/view/single_view/detail/deref_impl.hpp>
-#include <boost/fusion/sequence/view/single_view/detail/next_impl.hpp>
-#include <boost/fusion/sequence/view/single_view/detail/value_of_impl.hpp>
+#include <boost/fusion/view/single_view/detail/deref_impl.hpp>
+#include <boost/fusion/view/single_view/detail/next_impl.hpp>
+#include <boost/fusion/view/single_view/detail/value_of_impl.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/view/transform_view.hpp b/include/boost/fusion/view/transform_view.hpp
similarity index 76%
rename from include/boost/fusion/sequence/view/transform_view.hpp
rename to include/boost/fusion/view/transform_view.hpp
index 714f8784..744d063c 100644
--- a/include/boost/fusion/sequence/view/transform_view.hpp
+++ b/include/boost/fusion/view/transform_view.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_SEQUENCE_VIEW_TRANSFORM_VIEW_10022005_0612)
 #define FUSION_SEQUENCE_VIEW_TRANSFORM_VIEW_10022005_0612
 
-#include <boost/fusion/sequence/view/transform_view/transform_view.hpp>
-#include <boost/fusion/sequence/view/transform_view/transform_view_iterator.hpp>
+#include <boost/fusion/view/transform_view/transform_view.hpp>
+#include <boost/fusion/view/transform_view/transform_view_iterator.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence/view/transform_view/detail/advance_impl.hpp b/include/boost/fusion/view/transform_view/detail/advance_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/transform_view/detail/advance_impl.hpp
rename to include/boost/fusion/view/transform_view/detail/advance_impl.hpp
diff --git a/include/boost/fusion/sequence/view/transform_view/detail/apply_transform_result.hpp b/include/boost/fusion/view/transform_view/detail/apply_transform_result.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/transform_view/detail/apply_transform_result.hpp
rename to include/boost/fusion/view/transform_view/detail/apply_transform_result.hpp
diff --git a/include/boost/fusion/sequence/view/transform_view/detail/at_impl.hpp b/include/boost/fusion/view/transform_view/detail/at_impl.hpp
similarity index 96%
rename from include/boost/fusion/sequence/view/transform_view/detail/at_impl.hpp
rename to include/boost/fusion/view/transform_view/detail/at_impl.hpp
index eb48cfa0..620d96fe 100644
--- a/include/boost/fusion/sequence/view/transform_view/detail/at_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/at_impl.hpp
@@ -9,7 +9,7 @@
 #define BOOST_FUSION_AT_IMPL_20061029_1946
 
 #include <boost/mpl/apply.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/apply_transform_result.hpp>
+#include <boost/fusion/view/transform_view/detail/apply_transform_result.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 
 namespace boost { namespace fusion {
diff --git a/include/boost/fusion/sequence/view/transform_view/detail/begin_impl.hpp b/include/boost/fusion/view/transform_view/detail/begin_impl.hpp
similarity index 96%
rename from include/boost/fusion/sequence/view/transform_view/detail/begin_impl.hpp
rename to include/boost/fusion/view/transform_view/detail/begin_impl.hpp
index b5f4bc29..75b04382 100644
--- a/include/boost/fusion/sequence/view/transform_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/begin_impl.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_BEGIN_IMPL_07162005_1031)
 #define FUSION_BEGIN_IMPL_07162005_1031
 
-#include <boost/fusion/sequence/view/transform_view/transform_view_fwd.hpp>
+#include <boost/fusion/view/transform_view/transform_view_fwd.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/view/transform_view/detail/deref_impl.hpp b/include/boost/fusion/view/transform_view/detail/deref_impl.hpp
similarity index 96%
rename from include/boost/fusion/sequence/view/transform_view/detail/deref_impl.hpp
rename to include/boost/fusion/view/transform_view/detail/deref_impl.hpp
index d466cfd3..3849f80a 100644
--- a/include/boost/fusion/sequence/view/transform_view/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/deref_impl.hpp
@@ -10,7 +10,7 @@
 #include <boost/mpl/apply.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/iterator/value_of.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/apply_transform_result.hpp>
+#include <boost/fusion/view/transform_view/detail/apply_transform_result.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/view/transform_view/detail/distance_impl.hpp b/include/boost/fusion/view/transform_view/detail/distance_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/transform_view/detail/distance_impl.hpp
rename to include/boost/fusion/view/transform_view/detail/distance_impl.hpp
diff --git a/include/boost/fusion/sequence/view/transform_view/detail/end_impl.hpp b/include/boost/fusion/view/transform_view/detail/end_impl.hpp
similarity index 96%
rename from include/boost/fusion/sequence/view/transform_view/detail/end_impl.hpp
rename to include/boost/fusion/view/transform_view/detail/end_impl.hpp
index a689d933..465a2cbe 100644
--- a/include/boost/fusion/sequence/view/transform_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/end_impl.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_END_IMPL_07162005_1028)
 #define FUSION_END_IMPL_07162005_1028
 
-#include <boost/fusion/sequence/view/transform_view/transform_view_fwd.hpp>
+#include <boost/fusion/view/transform_view/transform_view_fwd.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/view/transform_view/detail/equal_to_impl.hpp b/include/boost/fusion/view/transform_view/detail/equal_to_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/transform_view/detail/equal_to_impl.hpp
rename to include/boost/fusion/view/transform_view/detail/equal_to_impl.hpp
diff --git a/include/boost/fusion/sequence/view/transform_view/detail/next_impl.hpp b/include/boost/fusion/view/transform_view/detail/next_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/transform_view/detail/next_impl.hpp
rename to include/boost/fusion/view/transform_view/detail/next_impl.hpp
diff --git a/include/boost/fusion/sequence/view/transform_view/detail/prior_impl.hpp b/include/boost/fusion/view/transform_view/detail/prior_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/transform_view/detail/prior_impl.hpp
rename to include/boost/fusion/view/transform_view/detail/prior_impl.hpp
diff --git a/include/boost/fusion/sequence/view/transform_view/detail/value_at_impl.hpp b/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp
similarity index 95%
rename from include/boost/fusion/sequence/view/transform_view/detail/value_at_impl.hpp
rename to include/boost/fusion/view/transform_view/detail/value_at_impl.hpp
index cc5bbf46..cb581583 100644
--- a/include/boost/fusion/sequence/view/transform_view/detail/value_at_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp
@@ -9,7 +9,7 @@
 #define BOOST_FUSION_VALUE_AT_IMPL_20061101_0745
 
 #include <boost/mpl/apply.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/apply_transform_result.hpp>
+#include <boost/fusion/view/transform_view/detail/apply_transform_result.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 
 namespace boost { namespace fusion {
diff --git a/include/boost/fusion/sequence/view/transform_view/detail/value_of_impl.hpp b/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp
similarity index 95%
rename from include/boost/fusion/sequence/view/transform_view/detail/value_of_impl.hpp
rename to include/boost/fusion/view/transform_view/detail/value_of_impl.hpp
index 28e9942c..08bbf209 100644
--- a/include/boost/fusion/sequence/view/transform_view/detail/value_of_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp
@@ -9,7 +9,7 @@
 
 #include <boost/mpl/apply.hpp>
 #include <boost/fusion/iterator/value_of.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/apply_transform_result.hpp>
+#include <boost/fusion/view/transform_view/detail/apply_transform_result.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/view/transform_view/transform_view.hpp b/include/boost/fusion/view/transform_view/transform_view.hpp
similarity index 89%
rename from include/boost/fusion/sequence/view/transform_view/transform_view.hpp
rename to include/boost/fusion/view/transform_view/transform_view.hpp
index 853bdf61..27ddc273 100644
--- a/include/boost/fusion/sequence/view/transform_view/transform_view.hpp
+++ b/include/boost/fusion/view/transform_view/transform_view.hpp
@@ -11,12 +11,12 @@
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/support/is_view.hpp>
 #include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/sequence/view/transform_view/transform_view_iterator.hpp>
-#include <boost/fusion/sequence/view/transform_view/transform_view_fwd.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/end_impl.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/at_impl.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/value_at_impl.hpp>
+#include <boost/fusion/view/transform_view/transform_view_iterator.hpp>
+#include <boost/fusion/view/transform_view/transform_view_fwd.hpp>
+#include <boost/fusion/view/transform_view/detail/begin_impl.hpp>
+#include <boost/fusion/view/transform_view/detail/end_impl.hpp>
+#include <boost/fusion/view/transform_view/detail/at_impl.hpp>
+#include <boost/fusion/view/transform_view/detail/value_at_impl.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/support/sequence_base.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
diff --git a/include/boost/fusion/sequence/view/transform_view/transform_view_fwd.hpp b/include/boost/fusion/view/transform_view/transform_view_fwd.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/transform_view/transform_view_fwd.hpp
rename to include/boost/fusion/view/transform_view/transform_view_fwd.hpp
diff --git a/include/boost/fusion/sequence/view/transform_view/transform_view_iterator.hpp b/include/boost/fusion/view/transform_view/transform_view_iterator.hpp
similarity index 79%
rename from include/boost/fusion/sequence/view/transform_view/transform_view_iterator.hpp
rename to include/boost/fusion/view/transform_view/transform_view_iterator.hpp
index 4d63f7e0..bb4b6afd 100644
--- a/include/boost/fusion/sequence/view/transform_view/transform_view_iterator.hpp
+++ b/include/boost/fusion/view/transform_view/transform_view_iterator.hpp
@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_TRANSFORM_VIEW_ITERATOR_07162005_1033)
@@ -10,13 +10,14 @@
 #include <boost/fusion/support/iterator_base.hpp>
 #include <boost/fusion/support/category_of.hpp>
 #include <boost/fusion/iterator/mpl/convert_iterator.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/deref_impl.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/next_impl.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/prior_impl.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/value_of_impl.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/advance_impl.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/distance_impl.hpp>
-#include <boost/fusion/sequence/view/transform_view/detail/equal_to_impl.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
+#include <boost/fusion/view/transform_view/detail/deref_impl.hpp>
+#include <boost/fusion/view/transform_view/detail/next_impl.hpp>
+#include <boost/fusion/view/transform_view/detail/prior_impl.hpp>
+#include <boost/fusion/view/transform_view/detail/value_of_impl.hpp>
+#include <boost/fusion/view/transform_view/detail/advance_impl.hpp>
+#include <boost/fusion/view/transform_view/detail/distance_impl.hpp>
+#include <boost/fusion/view/transform_view/detail/equal_to_impl.hpp>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/view/zip_view.hpp b/include/boost/fusion/view/zip_view.hpp
similarity index 79%
rename from include/boost/fusion/sequence/view/zip_view.hpp
rename to include/boost/fusion/view/zip_view.hpp
index 74f71421..f7a16ea0 100644
--- a/include/boost/fusion/sequence/view/zip_view.hpp
+++ b/include/boost/fusion/view/zip_view.hpp
@@ -8,7 +8,7 @@
 #if !defined(FUSION_ZIP_VIEW_23012006_0811)
 #define FUSION_ZIP_VIEW_23012006_0811
 
-#include <boost/fusion/sequence/view/zip_view/zip_view.hpp>
-#include <boost/fusion/sequence/view/zip_view/zip_view_iterator.hpp>
+#include <boost/fusion/view/zip_view/zip_view.hpp>
+#include <boost/fusion/view/zip_view/zip_view_iterator.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence/view/zip_view/detail/advance_impl.hpp b/include/boost/fusion/view/zip_view/detail/advance_impl.hpp
similarity index 96%
rename from include/boost/fusion/sequence/view/zip_view/detail/advance_impl.hpp
rename to include/boost/fusion/view/zip_view/detail/advance_impl.hpp
index 36da0444..9aa00deb 100644
--- a/include/boost/fusion/sequence/view/zip_view/detail/advance_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/advance_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(FUSION_ADVANCE_IMPL_20061024_2021)
 #define FUSION_ADVANCE_IMPL_20061024_2021
 
-#include <boost/fusion/sequence/view/zip_view/zip_view_iterator_fwd.hpp>
+#include <boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
 #include <boost/type_traits/remove_reference.hpp>
diff --git a/include/boost/fusion/sequence/view/zip_view/detail/at_impl.hpp b/include/boost/fusion/view/zip_view/detail/at_impl.hpp
similarity index 96%
rename from include/boost/fusion/sequence/view/zip_view/detail/at_impl.hpp
rename to include/boost/fusion/view/zip_view/detail/at_impl.hpp
index d90b5d05..b01b8cfa 100644
--- a/include/boost/fusion/sequence/view/zip_view/detail/at_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/at_impl.hpp
@@ -8,9 +8,9 @@
 #if !defined(FUSION_AT_IMPL_20060124_1933)
 #define FUSION_AT_IMPL_20060124_1933
 
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <boost/type_traits/is_reference.hpp>
diff --git a/include/boost/fusion/sequence/view/zip_view/detail/begin_impl.hpp b/include/boost/fusion/view/zip_view/detail/begin_impl.hpp
similarity index 97%
rename from include/boost/fusion/sequence/view/zip_view/detail/begin_impl.hpp
rename to include/boost/fusion/view/zip_view/detail/begin_impl.hpp
index c98eb7fc..674dea38 100644
--- a/include/boost/fusion/sequence/view/zip_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/begin_impl.hpp
@@ -9,7 +9,7 @@
 #define FUSION_BEGIN_IMPL_20060123_2147
 
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/view/zip_view/zip_view_iterator_fwd.hpp>
+#include <boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <boost/type_traits/is_reference.hpp>
diff --git a/include/boost/fusion/sequence/view/zip_view/detail/deref_impl.hpp b/include/boost/fusion/view/zip_view/detail/deref_impl.hpp
similarity index 95%
rename from include/boost/fusion/sequence/view/zip_view/detail/deref_impl.hpp
rename to include/boost/fusion/view/zip_view/detail/deref_impl.hpp
index 70b95d55..69cc8825 100644
--- a/include/boost/fusion/sequence/view/zip_view/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/deref_impl.hpp
@@ -8,10 +8,10 @@
 #if !defined(FUSION_DEREF_IMPL_20061024_1959)
 #define FUSION_DEREF_IMPL_20061024_1959
 
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/support/unused.hpp>
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/identity.hpp>
diff --git a/include/boost/fusion/sequence/view/zip_view/detail/distance_impl.hpp b/include/boost/fusion/view/zip_view/detail/distance_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/zip_view/detail/distance_impl.hpp
rename to include/boost/fusion/view/zip_view/detail/distance_impl.hpp
diff --git a/include/boost/fusion/sequence/view/zip_view/detail/end_impl.hpp b/include/boost/fusion/view/zip_view/detail/end_impl.hpp
similarity index 97%
rename from include/boost/fusion/sequence/view/zip_view/detail/end_impl.hpp
rename to include/boost/fusion/view/zip_view/detail/end_impl.hpp
index a19b5c1f..fa9c31db 100644
--- a/include/boost/fusion/sequence/view/zip_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/end_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(FUSION_END_IMPL_20060123_2208)
 #define FUSION_END_IMPL_20060123_2208
 
-#include <boost/fusion/sequence/view/zip_view/zip_view_iterator_fwd.hpp>
+#include <boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
diff --git a/include/boost/fusion/sequence/view/zip_view/detail/equal_to_impl.hpp b/include/boost/fusion/view/zip_view/detail/equal_to_impl.hpp
similarity index 97%
rename from include/boost/fusion/sequence/view/zip_view/detail/equal_to_impl.hpp
rename to include/boost/fusion/view/zip_view/detail/equal_to_impl.hpp
index 7def2030..c3962a63 100644
--- a/include/boost/fusion/sequence/view/zip_view/detail/equal_to_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/equal_to_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(FUSION_EQUAL_TO_IMPL_20060128_1423)
 #define FUSION_EQUAL_TO_IMPL_20060128_1423
 
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
+#include <boost/fusion/mpl.hpp>
 
 #include <boost/mpl/lambda.hpp>
 #include <boost/mpl/and.hpp>
diff --git a/include/boost/fusion/sequence/view/zip_view/detail/next_impl.hpp b/include/boost/fusion/view/zip_view/detail/next_impl.hpp
similarity index 97%
rename from include/boost/fusion/sequence/view/zip_view/detail/next_impl.hpp
rename to include/boost/fusion/view/zip_view/detail/next_impl.hpp
index cae95eec..1c9c0245 100644
--- a/include/boost/fusion/sequence/view/zip_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/next_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(FUSION_NEXT_IMPL_20060124_2006)
 #define FUSION_NEXT_IMPL_20060124_2006
 
-#include <boost/fusion/sequence/view/zip_view/zip_view_iterator_fwd.hpp>
+#include <boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp>
 #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
 #include <boost/fusion/support/unused.hpp>
diff --git a/include/boost/fusion/sequence/view/zip_view/detail/prior_impl.hpp b/include/boost/fusion/view/zip_view/detail/prior_impl.hpp
similarity index 97%
rename from include/boost/fusion/sequence/view/zip_view/detail/prior_impl.hpp
rename to include/boost/fusion/view/zip_view/detail/prior_impl.hpp
index 787eb4f9..49b99397 100644
--- a/include/boost/fusion/sequence/view/zip_view/detail/prior_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/prior_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(FUSION_PRIOR_IMPL_20060124_2006)
 #define FUSION_PRIOR_IMPL_20060124_2006
 
-#include <boost/fusion/sequence/view/zip_view/zip_view_iterator_fwd.hpp>
+#include <boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp>
 #include <boost/fusion/iterator/prior.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
 #include <boost/fusion/support/unused.hpp>
diff --git a/include/boost/fusion/sequence/view/zip_view/detail/size_impl.hpp b/include/boost/fusion/view/zip_view/detail/size_impl.hpp
similarity index 100%
rename from include/boost/fusion/sequence/view/zip_view/detail/size_impl.hpp
rename to include/boost/fusion/view/zip_view/detail/size_impl.hpp
diff --git a/include/boost/fusion/sequence/view/zip_view/detail/strictest_traversal.hpp b/include/boost/fusion/view/zip_view/detail/strictest_traversal.hpp
similarity index 92%
rename from include/boost/fusion/sequence/view/zip_view/detail/strictest_traversal.hpp
rename to include/boost/fusion/view/zip_view/detail/strictest_traversal.hpp
index 60abb57c..e74ffbfc 100644
--- a/include/boost/fusion/sequence/view/zip_view/detail/strictest_traversal.hpp
+++ b/include/boost/fusion/view/zip_view/detail/strictest_traversal.hpp
@@ -2,7 +2,7 @@
     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)
 ==============================================================================*/
 #if !defined(FUSION_STRICTEST_TRAVERSAL_20060123_2101)
@@ -11,13 +11,13 @@
 #include <boost/mpl/or.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
+#include <boost/fusion/mpl.hpp>
 #include <boost/fusion/algorithm/iteration/fold.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 
-namespace boost { namespace fusion {
-    
+namespace boost { namespace fusion
+{
     struct forward_traversal_tag;
     struct bidirectional_traversal_tag;
     struct random_access_traversal_tag;
@@ -58,7 +58,7 @@ namespace boost { namespace fusion {
         template<typename Sequence>
         struct strictest_traversal
             : result_of::fold<
-            Sequence, fusion::random_access_traversal_tag, 
+            Sequence, fusion::random_access_traversal_tag,
             strictest_traversal_impl>
         {};
 
diff --git a/include/boost/fusion/sequence/view/zip_view/detail/value_at_impl.hpp b/include/boost/fusion/view/zip_view/detail/value_at_impl.hpp
similarity index 97%
rename from include/boost/fusion/sequence/view/zip_view/detail/value_at_impl.hpp
rename to include/boost/fusion/view/zip_view/detail/value_at_impl.hpp
index ed5475ba..7905b063 100644
--- a/include/boost/fusion/sequence/view/zip_view/detail/value_at_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/value_at_impl.hpp
@@ -8,7 +8,7 @@
 #if !defined(FUSION_VALUE_AT_IMPL_20060124_2129)
 #define FUSION_VALUE_AT_IMPL_20060124_2129
 
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at.hpp>
 #include <boost/type_traits/remove_reference.hpp>
diff --git a/include/boost/fusion/sequence/view/zip_view/detail/value_of_impl.hpp b/include/boost/fusion/view/zip_view/detail/value_of_impl.hpp
similarity index 93%
rename from include/boost/fusion/sequence/view/zip_view/detail/value_of_impl.hpp
rename to include/boost/fusion/view/zip_view/detail/value_of_impl.hpp
index 9ea84a17..4ba4c3c5 100644
--- a/include/boost/fusion/sequence/view/zip_view/detail/value_of_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/value_of_impl.hpp
@@ -2,13 +2,13 @@
     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)
 ==============================================================================*/
 #if !defined(FUSION_VALUE_OF_IMPL_20060124_2147)
 #define FUSION_VALUE_OF_IMPL_20060124_2147
 
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
 #include <boost/fusion/iterator/value_of.hpp>
 #include <boost/mpl/placeholders.hpp>
@@ -17,8 +17,8 @@
 #include <boost/mpl/identity.hpp>
 #include <boost/type_traits/is_same.hpp>
 
-namespace boost { namespace fusion {
-
+namespace boost { namespace fusion
+{
     struct zip_view_iterator_tag;
 
     namespace detail
diff --git a/include/boost/fusion/sequence/view/zip_view/zip_view.hpp b/include/boost/fusion/view/zip_view/zip_view.hpp
similarity index 87%
rename from include/boost/fusion/sequence/view/zip_view/zip_view.hpp
rename to include/boost/fusion/view/zip_view/zip_view.hpp
index 563d853f..5f152eb0 100644
--- a/include/boost/fusion/sequence/view/zip_view/zip_view.hpp
+++ b/include/boost/fusion/view/zip_view/zip_view.hpp
@@ -11,17 +11,17 @@
 #include <boost/fusion/support/sequence_base.hpp>
 #include <boost/fusion/support/unused.hpp>
 #include <boost/fusion/iterator/equal_to.hpp>
-#include <boost/fusion/sequence/view/zip_view/detail/strictest_traversal.hpp>
-#include <boost/fusion/sequence/view/zip_view/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/view/zip_view/detail/end_impl.hpp>
-#include <boost/fusion/sequence/view/zip_view/detail/size_impl.hpp>
-#include <boost/fusion/sequence/view/zip_view/detail/at_impl.hpp>
-#include <boost/fusion/sequence/view/zip_view/detail/value_at_impl.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/view/zip_view/detail/strictest_traversal.hpp>
+#include <boost/fusion/view/zip_view/detail/begin_impl.hpp>
+#include <boost/fusion/view/zip_view/detail/end_impl.hpp>
+#include <boost/fusion/view/zip_view/detail/size_impl.hpp>
+#include <boost/fusion/view/zip_view/detail/at_impl.hpp>
+#include <boost/fusion/view/zip_view/detail/value_at_impl.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/algorithm/query/find_if.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
+#include <boost/fusion/mpl.hpp>
 #include <boost/fusion/algorithm/transformation/remove.hpp>
 
 #include <boost/mpl/assert.hpp>
diff --git a/include/boost/fusion/sequence/view/zip_view/zip_view_iterator.hpp b/include/boost/fusion/view/zip_view/zip_view_iterator.hpp
similarity index 65%
rename from include/boost/fusion/sequence/view/zip_view/zip_view_iterator.hpp
rename to include/boost/fusion/view/zip_view/zip_view_iterator.hpp
index d4ebcc58..66b514dc 100644
--- a/include/boost/fusion/sequence/view/zip_view/zip_view_iterator.hpp
+++ b/include/boost/fusion/view/zip_view/zip_view_iterator.hpp
@@ -8,17 +8,17 @@
 #if !defined(FUSION_ZIP_VIEW_ITERATOR_23012006_0814)
 #define FUSION_ZIP_VIEW_ITERATOR_23012006_0814
 
-#include <boost/fusion/sequence/view/zip_view/zip_view_iterator_fwd.hpp>
+#include <boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp>
 #include <boost/fusion/support/iterator_base.hpp>
-#include <boost/fusion/sequence/view/zip_view/detail/deref_impl.hpp>
-#include <boost/fusion/sequence/view/zip_view/detail/next_impl.hpp>
-#include <boost/fusion/sequence/view/zip_view/detail/prior_impl.hpp>
-#include <boost/fusion/sequence/view/zip_view/detail/advance_impl.hpp>
-#include <boost/fusion/sequence/view/zip_view/detail/distance_impl.hpp>
-#include <boost/fusion/sequence/view/zip_view/detail/value_of_impl.hpp>
-#include <boost/fusion/sequence/view/zip_view/detail/equal_to_impl.hpp>
+#include <boost/fusion/view/zip_view/detail/deref_impl.hpp>
+#include <boost/fusion/view/zip_view/detail/next_impl.hpp>
+#include <boost/fusion/view/zip_view/detail/prior_impl.hpp>
+#include <boost/fusion/view/zip_view/detail/advance_impl.hpp>
+#include <boost/fusion/view/zip_view/detail/distance_impl.hpp>
+#include <boost/fusion/view/zip_view/detail/value_of_impl.hpp>
+#include <boost/fusion/view/zip_view/detail/equal_to_impl.hpp>
 
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 
 namespace boost { namespace fusion {
     
diff --git a/include/boost/fusion/sequence/view/zip_view/zip_view_iterator_fwd.hpp b/include/boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp
similarity index 89%
rename from include/boost/fusion/sequence/view/zip_view/zip_view_iterator_fwd.hpp
rename to include/boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp
index 6e8bf3f2..6edf4d68 100644
--- a/include/boost/fusion/sequence/view/zip_view/zip_view_iterator_fwd.hpp
+++ b/include/boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp
@@ -8,7 +8,7 @@
 #if !defined(FUSION_ZIP_VIEW_ITERATOR_FWD)
 #define FUSION_ZIP_VIEW_ITERATOR_FWD
 
-#include <boost/fusion/sequence/view/zip_view/detail/strictest_traversal.hpp>
+#include <boost/fusion/view/zip_view/detail/strictest_traversal.hpp>
 
 namespace boost { namespace fusion {