support hash: floating point

sprout/algorithm/adjacent_find.hpp

@@ -6,7 +6,7 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/type_traits/is_iterator.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/all_of.hpp

@@ -6,7 +6,7 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/type_traits/is_iterator.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/algorithm/all_of_equal.hpp

@@ -6,7 +6,7 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/type_traits/is_iterator.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/algorithm/any_of.hpp

@@ -6,7 +6,7 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/type_traits/is_iterator.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/algorithm/any_of_equal.hpp

@@ -6,7 +6,7 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/type_traits/is_iterator.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/algorithm/count.hpp

@@ -6,7 +6,7 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/type_traits/is_iterator.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/algorithm/count_if.hpp

@@ -6,7 +6,7 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/type_traits/is_iterator.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/algorithm/equal.hpp

@@ -6,7 +6,8 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/type_traits/common.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 #include <sprout/functional/equal_to.hpp>
 
 namespace sprout {

sprout/algorithm/equal_range.hpp

@@ -5,7 +5,7 @@
 #include <sprout/config.hpp>
 #include <sprout/algorithm/lower_bound.hpp>
 #include <sprout/algorithm/upper_bound.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/find.hpp

@@ -6,7 +6,7 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/type_traits/is_iterator.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/algorithm/find_difference.hpp

@@ -5,9 +5,10 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 #include <sprout/functional/less.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/algorithm/find_end.hpp

@@ -7,7 +7,7 @@
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/type_traits/is_iterator.hpp>
 #include <sprout/functional/equal_to.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 #include <sprout/detail/algorithm/search_one.hpp>
 
 namespace sprout {

sprout/algorithm/find_first_of.hpp

@@ -9,7 +9,7 @@
 #include <sprout/functional/equal_to.hpp>
 #include <sprout/functional/bind2nd.hpp>
 #include <sprout/algorithm/find_if.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/algorithm/find_if.hpp

@@ -6,7 +6,7 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/type_traits/is_iterator.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/algorithm/find_if_not.hpp

@@ -6,7 +6,7 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/type_traits/is_iterator.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/algorithm/find_intersection.hpp

@@ -5,9 +5,10 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 #include <sprout/functional/less.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/algorithm/find_symmetric_difference.hpp

@@ -5,9 +5,10 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 #include <sprout/functional/less.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace detail {

sprout/algorithm/fit/bogo_sort.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/bogo_sort.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/bogo_sort_result.hpp

@@ -2,13 +2,15 @@
 #define SPROUT_ALGORITHM_FIT_BOGO_SORT_RESULT_HPP
 
 #include <sprout/config.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 #include <sprout/container/traits.hpp>
 #include <sprout/container/functions.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/algorithm/fixed/bogo_sort_result.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/bozo_sort.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/bozo_sort.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/bozo_sort_result.hpp

@@ -2,13 +2,15 @@
 #define SPROUT_ALGORITHM_FIT_BOZO_SORT_RESULT_HPP
 
 #include <sprout/config.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 #include <sprout/container/traits.hpp>
 #include <sprout/container/functions.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/algorithm/fixed/bozo_sort_result.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/clamp_range.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/clamp_range.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/clamp_range_copy.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/clamp_range_copy.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>
 

sprout/algorithm/fit/copy.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/copy.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>
 

sprout/algorithm/fit/copy_backward.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/copy_backward.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/fit/copy_if.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/copy_if.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>
 

sprout/algorithm/fit/copy_n.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/copy_n.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/fit/copy_until.hpp

@@ -8,7 +8,8 @@
 #include <sprout/algorithm/fixed/copy_while.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
 #include <sprout/algorithm/find_if.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>
 

sprout/algorithm/fit/copy_while.hpp

@@ -8,7 +8,8 @@
 #include <sprout/algorithm/fixed/copy_while.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
 #include <sprout/algorithm/find_if_not.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>
 

sprout/algorithm/fit/fill.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/fill.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/fill_n.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/fill_n.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/fit/generate.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/generate.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/generate_n.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/generate_n.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/fit/inplace_merge.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/inplace_merge.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/make_heap.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/make_heap.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/make_partial_heap.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/make_partial_heap.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/merge.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/merge.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>
 

sprout/algorithm/fit/next_permutation.hpp

@@ -6,8 +6,9 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/next_permutation.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/nth_element.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/nth_element.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/partial_sort.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/partial_sort.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/partition.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/partition.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/fit/partition_copy.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/partition_copy.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include <sprout/detail/algorithm/count_n_if.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT

sprout/algorithm/fit/pop_heap.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/pop_heap.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/prev_permutation.hpp

@@ -6,8 +6,9 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/prev_permutation.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/push_heap.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/push_heap.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/random_swap.hpp

@@ -7,7 +7,8 @@
 #include <sprout/utility/forward.hpp>
 #include <sprout/algorithm/fixed/random_swap.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/random_swap_result.hpp

@@ -2,13 +2,15 @@
 #define SPROUT_ALGORITHM_FIT_RANDOM_SWAP_RESULT_HPP
 
 #include <sprout/config.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 #include <sprout/container/traits.hpp>
 #include <sprout/container/functions.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/algorithm/fixed/random_swap_result.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/recurrence.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/recurrence.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/recurrence_n.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/recurrence_n.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/fit/remove.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/remove.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/fit/remove_copy.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/remove_copy.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>
 

sprout/algorithm/fit/remove_copy_if.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/remove_copy_if.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>
 

sprout/algorithm/fit/remove_if.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/remove_if.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/fit/replace.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/replace.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/replace_copy.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/replace_copy.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>
 

sprout/algorithm/fit/replace_copy_if.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/replace_copy_if.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>
 

sprout/algorithm/fit/replace_if.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/replace_if.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/result_of.hpp

@@ -6,7 +6,7 @@
 #include <sprout/container/traits.hpp>
 #include <sprout/container/metafunctions.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/reverse.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/reverse.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/reverse_copy.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/reverse_copy.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/fit/rotate.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/rotate.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/rotate_copy.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/rotate_copy.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/fit/set_difference.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/set_union.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include <sprout/detail/algorithm/set_overlap_count.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>

sprout/algorithm/fit/set_intersection.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/set_union.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include <sprout/detail/algorithm/set_overlap_count.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>

sprout/algorithm/fit/set_symmetric_difference.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/set_union.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include <sprout/detail/algorithm/set_overlap_count.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>

sprout/algorithm/fit/set_union.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/set_union.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include <sprout/detail/algorithm/set_overlap_count.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>

sprout/algorithm/fit/shuffle.hpp

@@ -7,7 +7,8 @@
 #include <sprout/utility/forward.hpp>
 #include <sprout/algorithm/fixed/shuffle.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/shuffle_result.hpp

@@ -2,13 +2,15 @@
 #define SPROUT_ALGORITHM_FIT_SHUFFLE_RESULT_HPP
 
 #include <sprout/config.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 #include <sprout/container/traits.hpp>
 #include <sprout/container/functions.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/algorithm/fixed/shuffle_result.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/sort.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/sort.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/sort_heap.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/sort_heap.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/stable_partition.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/stable_partition.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/fit/stable_partition_copy.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/stable_partition_copy.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>
 

sprout/algorithm/fit/stable_sort.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/stable_sort.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/swap_element.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/swap_element.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 
 namespace sprout {

sprout/algorithm/fit/swap_element_copy.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/swap_element_copy.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/operation.hpp>
 

sprout/algorithm/fit/transform.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/transform.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>
 

sprout/algorithm/fit/unfold.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/unfold.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 
 namespace sprout {
 	namespace fit {

sprout/algorithm/fit/unfold_n.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/unfold_n.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/fit/unique.hpp

@@ -6,7 +6,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/unique.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include <sprout/detail/algorithm/overlap_count.hpp>
 
 namespace sprout {

sprout/algorithm/fit/unique_copy.hpp

@@ -7,7 +7,8 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/unique_copy.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
-#include <sprout/sub_array.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/sub_array/sub.hpp>
 #include <sprout/detail/algorithm/overlap_count.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT
 #include <sprout/iterator/type_traits/is_iterator.hpp>

sprout/algorithm/fixed/bogo_sort.hpp

@@ -3,7 +3,7 @@
 
 #include <sprout/config.hpp>
 #include <sprout/utility/forward.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/bogo_sort_result.hpp>
 

sprout/algorithm/fixed/bogo_sort_result.hpp

@@ -7,7 +7,7 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/utility/forward.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 #include <sprout/algorithm/is_sorted.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/shuffle_result.hpp>

sprout/algorithm/fixed/bozo_sort.hpp

@@ -3,7 +3,7 @@
 
 #include <sprout/config.hpp>
 #include <sprout/utility/forward.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/bozo_sort_result.hpp>
 

sprout/algorithm/fixed/bozo_sort_result.hpp

@@ -7,7 +7,7 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/utility/forward.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 #include <sprout/algorithm/is_sorted.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/random_swap_result.hpp>

sprout/algorithm/fixed/clamp_range_copy.hpp

@@ -11,7 +11,7 @@
 #include <sprout/iterator/clamp_iterator.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/clamp.hpp>
-#include <sprout/pit.hpp>
+#include <sprout/pit/pit.hpp>
 #include <sprout/detail/container_complate.hpp>
 #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
 

sprout/algorithm/fixed/copy.hpp

@@ -9,7 +9,7 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
-#include <sprout/pit.hpp>
+#include <sprout/pit/pit.hpp>
 #include <sprout/math/comparison.hpp>
 #include <sprout/detail/container_complate.hpp>
 

sprout/algorithm/fixed/copy_backward.hpp

@@ -9,7 +9,7 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
-#include <sprout/pit.hpp>
+#include <sprout/pit/pit.hpp>
 #include <sprout/math/comparison.hpp>
 #include <sprout/detail/container_complate_backward.hpp>
 

sprout/algorithm/fixed/copy_if.hpp

@@ -8,7 +8,7 @@
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/filter_iterator.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
-#include <sprout/pit.hpp>
+#include <sprout/pit/pit.hpp>
 #include <sprout/detail/container_complate.hpp>
 
 namespace sprout {

sprout/algorithm/fixed/copy_n.hpp

@@ -9,7 +9,7 @@
 #include <sprout/iterator/operation.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/copy.hpp>
-#include <sprout/pit.hpp>
+#include <sprout/pit/pit.hpp>
 #include <sprout/math/comparison.hpp>
 #include <sprout/detail/container_complate.hpp>
 #include <sprout/iterator/type_traits/is_iterator.hpp>

sprout/algorithm/fixed/copy_until.hpp

@@ -12,7 +12,7 @@
 #include <sprout/algorithm/find_if.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/copy.hpp>
-#include <sprout/pit.hpp>
+#include <sprout/pit/pit.hpp>
 #include <sprout/detail/container_complate.hpp>
 
 namespace sprout {

sprout/algorithm/fixed/copy_while.hpp

@@ -11,7 +11,7 @@
 #include <sprout/algorithm/find_if_not.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/copy.hpp>
-#include <sprout/pit.hpp>
+#include <sprout/pit/pit.hpp>
 #include <sprout/detail/container_complate.hpp>
 
 namespace sprout {

sprout/algorithm/fixed/fill.hpp

@@ -8,7 +8,7 @@
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/value_iterator.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
-#include <sprout/pit.hpp>
+#include <sprout/pit/pit.hpp>
 
 namespace sprout {
 	namespace fixed {

sprout/algorithm/fixed/fill_n.hpp

@@ -8,7 +8,7 @@
 #include <sprout/iterator/value_iterator.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/fill.hpp>
-#include <sprout/pit.hpp>
+#include <sprout/pit/pit.hpp>
 
 namespace sprout {
 	namespace fixed {

sprout/algorithm/fixed/generate.hpp

@@ -7,7 +7,7 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/generator/functions.hpp>
-#include <sprout/pit.hpp>
+#include <sprout/pit/pit.hpp>
 #include <sprout/detail/container_complate.hpp>
 
 namespace sprout {

sprout/algorithm/fixed/generate_n.hpp

@@ -5,7 +5,7 @@
 #include <sprout/container/traits.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/generate.hpp>
-#include <sprout/pit.hpp>
+#include <sprout/pit/pit.hpp>
 
 namespace sprout {
 	namespace fixed {

sprout/algorithm/fixed/merge.hpp

@@ -9,7 +9,7 @@
 #include <sprout/iterator/merge_iterator.hpp>
 #include <sprout/functional/less.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
-#include <sprout/pit.hpp>
+#include <sprout/pit/pit.hpp>
 #include <sprout/detail/container_complate.hpp>
 
 namespace sprout {

sprout/algorithm/fixed/next_permutation.hpp

@@ -8,8 +8,8 @@
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/swap_element.hpp>
 #include <sprout/algorithm/fixed/reverse.hpp>
-#include <sprout/sub_array.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/utility/pair/pair.hpp>
 #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/fixed/partition_copy.hpp

@@ -7,7 +7,7 @@
 #include <sprout/container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
-#include <sprout/pit.hpp>
+#include <sprout/pit/pit.hpp>
 #include <sprout/detail/container_complate.hpp>
 
 namespace sprout {

sprout/algorithm/fixed/prev_permutation.hpp

@@ -8,8 +8,8 @@
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/swap_element.hpp>
 #include <sprout/algorithm/fixed/reverse.hpp>
-#include <sprout/sub_array.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/sub_array/sub_array.hpp>
+#include <sprout/utility/pair/pair.hpp>
 #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
 
 namespace sprout {

sprout/algorithm/fixed/random_swap.hpp

@@ -3,12 +3,12 @@
 
 #include <cstddef>
 #include <sprout/config.hpp>
-#include <sprout/array.hpp>
+#include <sprout/array/array.hpp>
 #include <sprout/container/traits.hpp>
 #include <sprout/container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/utility/forward.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/swap_element.hpp>
 #include <sprout/workaround/detail/uniform_int_distribution.hpp>