diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index c78c930..148c556 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -3,7 +3,8 @@ { "name": "Win32", "includePath": [ - "${workspaceFolder}/**" + "${workspaceFolder}/**", + "${workspaceFolder}/include/**" ], "defines": [ "_DEBUG", diff --git a/README.md b/README.md index 844cd3b..ca24f14 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# EchoWhisperer (Main) v0.0.1 +# EchoWhisperer (Main) v0.0.2 ### A up-to-date process logger for easy use and bragging rights for WINDOWS. Echo Whisperer is a commandline/gui application that simply logs the amount diff --git a/c++/.vscode/c_cpp_properties.json b/c++/.vscode/c_cpp_properties.json deleted file mode 100644 index 148c556..0000000 --- a/c++/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "configurations": [ - { - "name": "Win32", - "includePath": [ - "${workspaceFolder}/**", - "${workspaceFolder}/include/**" - ], - "defines": [ - "_DEBUG", - "UNICODE", - "_UNICODE" - ], - "windowsSdkVersion": "10.0.22000.0", - "compilerPath": "cl.exe", - "cStandard": "c17", - "cppStandard": "c++17", - "intelliSenseMode": "windows-msvc-x64" - } - ], - "version": 4 -} \ No newline at end of file diff --git a/c++/include/boost/align.hpp b/c++/boost/align.hpp similarity index 100% rename from c++/include/boost/align.hpp rename to c++/boost/align.hpp diff --git a/c++/include/boost/align/align.hpp b/c++/boost/align/align.hpp similarity index 100% rename from c++/include/boost/align/align.hpp rename to c++/boost/align/align.hpp diff --git a/c++/include/boost/align/align_down.hpp b/c++/boost/align/align_down.hpp similarity index 100% rename from c++/include/boost/align/align_down.hpp rename to c++/boost/align/align_down.hpp diff --git a/c++/include/boost/align/align_up.hpp b/c++/boost/align/align_up.hpp similarity index 100% rename from c++/include/boost/align/align_up.hpp rename to c++/boost/align/align_up.hpp diff --git a/c++/include/boost/align/aligned_alloc.hpp b/c++/boost/align/aligned_alloc.hpp similarity index 100% rename from c++/include/boost/align/aligned_alloc.hpp rename to c++/boost/align/aligned_alloc.hpp diff --git a/c++/include/boost/align/aligned_allocator.hpp b/c++/boost/align/aligned_allocator.hpp similarity index 100% rename from c++/include/boost/align/aligned_allocator.hpp rename to c++/boost/align/aligned_allocator.hpp diff --git a/c++/include/boost/align/aligned_allocator_adaptor.hpp b/c++/boost/align/aligned_allocator_adaptor.hpp similarity index 100% rename from c++/include/boost/align/aligned_allocator_adaptor.hpp rename to c++/boost/align/aligned_allocator_adaptor.hpp diff --git a/c++/include/boost/align/aligned_allocator_adaptor_forward.hpp b/c++/boost/align/aligned_allocator_adaptor_forward.hpp similarity index 100% rename from c++/include/boost/align/aligned_allocator_adaptor_forward.hpp rename to c++/boost/align/aligned_allocator_adaptor_forward.hpp diff --git a/c++/include/boost/align/aligned_allocator_forward.hpp b/c++/boost/align/aligned_allocator_forward.hpp similarity index 100% rename from c++/include/boost/align/aligned_allocator_forward.hpp rename to c++/boost/align/aligned_allocator_forward.hpp diff --git a/c++/include/boost/align/aligned_delete.hpp b/c++/boost/align/aligned_delete.hpp similarity index 100% rename from c++/include/boost/align/aligned_delete.hpp rename to c++/boost/align/aligned_delete.hpp diff --git a/c++/include/boost/align/aligned_delete_forward.hpp b/c++/boost/align/aligned_delete_forward.hpp similarity index 100% rename from c++/include/boost/align/aligned_delete_forward.hpp rename to c++/boost/align/aligned_delete_forward.hpp diff --git a/c++/include/boost/align/alignment_of.hpp b/c++/boost/align/alignment_of.hpp similarity index 100% rename from c++/include/boost/align/alignment_of.hpp rename to c++/boost/align/alignment_of.hpp diff --git a/c++/include/boost/align/alignment_of_forward.hpp b/c++/boost/align/alignment_of_forward.hpp similarity index 100% rename from c++/include/boost/align/alignment_of_forward.hpp rename to c++/boost/align/alignment_of_forward.hpp diff --git a/c++/include/boost/align/assume_aligned.hpp b/c++/boost/align/assume_aligned.hpp similarity index 100% rename from c++/include/boost/align/assume_aligned.hpp rename to c++/boost/align/assume_aligned.hpp diff --git a/c++/include/boost/align/detail/add_reference.hpp b/c++/boost/align/detail/add_reference.hpp similarity index 100% rename from c++/include/boost/align/detail/add_reference.hpp rename to c++/boost/align/detail/add_reference.hpp diff --git a/c++/include/boost/align/detail/align.hpp b/c++/boost/align/detail/align.hpp similarity index 100% rename from c++/include/boost/align/detail/align.hpp rename to c++/boost/align/detail/align.hpp diff --git a/c++/include/boost/align/detail/align_cxx11.hpp b/c++/boost/align/detail/align_cxx11.hpp similarity index 100% rename from c++/include/boost/align/detail/align_cxx11.hpp rename to c++/boost/align/detail/align_cxx11.hpp diff --git a/c++/include/boost/align/detail/align_down.hpp b/c++/boost/align/detail/align_down.hpp similarity index 100% rename from c++/include/boost/align/detail/align_down.hpp rename to c++/boost/align/detail/align_down.hpp diff --git a/c++/include/boost/align/detail/align_up.hpp b/c++/boost/align/detail/align_up.hpp similarity index 100% rename from c++/include/boost/align/detail/align_up.hpp rename to c++/boost/align/detail/align_up.hpp diff --git a/c++/include/boost/align/detail/aligned_alloc.hpp b/c++/boost/align/detail/aligned_alloc.hpp similarity index 100% rename from c++/include/boost/align/detail/aligned_alloc.hpp rename to c++/boost/align/detail/aligned_alloc.hpp diff --git a/c++/include/boost/align/detail/aligned_alloc_android.hpp b/c++/boost/align/detail/aligned_alloc_android.hpp similarity index 100% rename from c++/include/boost/align/detail/aligned_alloc_android.hpp rename to c++/boost/align/detail/aligned_alloc_android.hpp diff --git a/c++/include/boost/align/detail/aligned_alloc_macos.hpp b/c++/boost/align/detail/aligned_alloc_macos.hpp similarity index 100% rename from c++/include/boost/align/detail/aligned_alloc_macos.hpp rename to c++/boost/align/detail/aligned_alloc_macos.hpp diff --git a/c++/include/boost/align/detail/aligned_alloc_mingw.hpp b/c++/boost/align/detail/aligned_alloc_mingw.hpp similarity index 100% rename from c++/include/boost/align/detail/aligned_alloc_mingw.hpp rename to c++/boost/align/detail/aligned_alloc_mingw.hpp diff --git a/c++/include/boost/align/detail/aligned_alloc_msvc.hpp b/c++/boost/align/detail/aligned_alloc_msvc.hpp similarity index 100% rename from c++/include/boost/align/detail/aligned_alloc_msvc.hpp rename to c++/boost/align/detail/aligned_alloc_msvc.hpp diff --git a/c++/include/boost/align/detail/aligned_alloc_new.hpp b/c++/boost/align/detail/aligned_alloc_new.hpp similarity index 100% rename from c++/include/boost/align/detail/aligned_alloc_new.hpp rename to c++/boost/align/detail/aligned_alloc_new.hpp diff --git a/c++/include/boost/align/detail/aligned_alloc_posix.hpp b/c++/boost/align/detail/aligned_alloc_posix.hpp similarity index 100% rename from c++/include/boost/align/detail/aligned_alloc_posix.hpp rename to c++/boost/align/detail/aligned_alloc_posix.hpp diff --git a/c++/include/boost/align/detail/aligned_alloc_sunos.hpp b/c++/boost/align/detail/aligned_alloc_sunos.hpp similarity index 100% rename from c++/include/boost/align/detail/aligned_alloc_sunos.hpp rename to c++/boost/align/detail/aligned_alloc_sunos.hpp diff --git a/c++/include/boost/align/detail/alignment_of.hpp b/c++/boost/align/detail/alignment_of.hpp similarity index 100% rename from c++/include/boost/align/detail/alignment_of.hpp rename to c++/boost/align/detail/alignment_of.hpp diff --git a/c++/include/boost/align/detail/alignment_of_clang.hpp b/c++/boost/align/detail/alignment_of_clang.hpp similarity index 100% rename from c++/include/boost/align/detail/alignment_of_clang.hpp rename to c++/boost/align/detail/alignment_of_clang.hpp diff --git a/c++/include/boost/align/detail/alignment_of_codegear.hpp b/c++/boost/align/detail/alignment_of_codegear.hpp similarity index 100% rename from c++/include/boost/align/detail/alignment_of_codegear.hpp rename to c++/boost/align/detail/alignment_of_codegear.hpp diff --git a/c++/include/boost/align/detail/alignment_of_cxx11.hpp b/c++/boost/align/detail/alignment_of_cxx11.hpp similarity index 100% rename from c++/include/boost/align/detail/alignment_of_cxx11.hpp rename to c++/boost/align/detail/alignment_of_cxx11.hpp diff --git a/c++/include/boost/align/detail/alignment_of_gcc.hpp b/c++/boost/align/detail/alignment_of_gcc.hpp similarity index 100% rename from c++/include/boost/align/detail/alignment_of_gcc.hpp rename to c++/boost/align/detail/alignment_of_gcc.hpp diff --git a/c++/include/boost/align/detail/alignment_of_msvc.hpp b/c++/boost/align/detail/alignment_of_msvc.hpp similarity index 100% rename from c++/include/boost/align/detail/alignment_of_msvc.hpp rename to c++/boost/align/detail/alignment_of_msvc.hpp diff --git a/c++/include/boost/align/detail/assume_aligned.hpp b/c++/boost/align/detail/assume_aligned.hpp similarity index 100% rename from c++/include/boost/align/detail/assume_aligned.hpp rename to c++/boost/align/detail/assume_aligned.hpp diff --git a/c++/include/boost/align/detail/assume_aligned_clang.hpp b/c++/boost/align/detail/assume_aligned_clang.hpp similarity index 100% rename from c++/include/boost/align/detail/assume_aligned_clang.hpp rename to c++/boost/align/detail/assume_aligned_clang.hpp diff --git a/c++/include/boost/align/detail/assume_aligned_gcc.hpp b/c++/boost/align/detail/assume_aligned_gcc.hpp similarity index 100% rename from c++/include/boost/align/detail/assume_aligned_gcc.hpp rename to c++/boost/align/detail/assume_aligned_gcc.hpp diff --git a/c++/include/boost/align/detail/assume_aligned_intel.hpp b/c++/boost/align/detail/assume_aligned_intel.hpp similarity index 100% rename from c++/include/boost/align/detail/assume_aligned_intel.hpp rename to c++/boost/align/detail/assume_aligned_intel.hpp diff --git a/c++/include/boost/align/detail/assume_aligned_msvc.hpp b/c++/boost/align/detail/assume_aligned_msvc.hpp similarity index 100% rename from c++/include/boost/align/detail/assume_aligned_msvc.hpp rename to c++/boost/align/detail/assume_aligned_msvc.hpp diff --git a/c++/include/boost/align/detail/element_type.hpp b/c++/boost/align/detail/element_type.hpp similarity index 100% rename from c++/include/boost/align/detail/element_type.hpp rename to c++/boost/align/detail/element_type.hpp diff --git a/c++/include/boost/align/detail/integral_constant.hpp b/c++/boost/align/detail/integral_constant.hpp similarity index 100% rename from c++/include/boost/align/detail/integral_constant.hpp rename to c++/boost/align/detail/integral_constant.hpp diff --git a/c++/include/boost/align/detail/is_aligned.hpp b/c++/boost/align/detail/is_aligned.hpp similarity index 100% rename from c++/include/boost/align/detail/is_aligned.hpp rename to c++/boost/align/detail/is_aligned.hpp diff --git a/c++/include/boost/align/detail/is_alignment.hpp b/c++/boost/align/detail/is_alignment.hpp similarity index 100% rename from c++/include/boost/align/detail/is_alignment.hpp rename to c++/boost/align/detail/is_alignment.hpp diff --git a/c++/include/boost/align/detail/is_alignment_constant.hpp b/c++/boost/align/detail/is_alignment_constant.hpp similarity index 100% rename from c++/include/boost/align/detail/is_alignment_constant.hpp rename to c++/boost/align/detail/is_alignment_constant.hpp diff --git a/c++/include/boost/align/detail/max_align.hpp b/c++/boost/align/detail/max_align.hpp similarity index 100% rename from c++/include/boost/align/detail/max_align.hpp rename to c++/boost/align/detail/max_align.hpp diff --git a/c++/include/boost/align/detail/max_objects.hpp b/c++/boost/align/detail/max_objects.hpp similarity index 100% rename from c++/include/boost/align/detail/max_objects.hpp rename to c++/boost/align/detail/max_objects.hpp diff --git a/c++/include/boost/align/detail/max_size.hpp b/c++/boost/align/detail/max_size.hpp similarity index 100% rename from c++/include/boost/align/detail/max_size.hpp rename to c++/boost/align/detail/max_size.hpp diff --git a/c++/include/boost/align/detail/min_size.hpp b/c++/boost/align/detail/min_size.hpp similarity index 100% rename from c++/include/boost/align/detail/min_size.hpp rename to c++/boost/align/detail/min_size.hpp diff --git a/c++/include/boost/align/detail/not_pointer.hpp b/c++/boost/align/detail/not_pointer.hpp similarity index 100% rename from c++/include/boost/align/detail/not_pointer.hpp rename to c++/boost/align/detail/not_pointer.hpp diff --git a/c++/include/boost/align/detail/throw_exception.hpp b/c++/boost/align/detail/throw_exception.hpp similarity index 100% rename from c++/include/boost/align/detail/throw_exception.hpp rename to c++/boost/align/detail/throw_exception.hpp diff --git a/c++/include/boost/align/is_aligned.hpp b/c++/boost/align/is_aligned.hpp similarity index 100% rename from c++/include/boost/align/is_aligned.hpp rename to c++/boost/align/is_aligned.hpp diff --git a/c++/include/boost/aligned_storage.hpp b/c++/boost/aligned_storage.hpp similarity index 100% rename from c++/include/boost/aligned_storage.hpp rename to c++/boost/aligned_storage.hpp diff --git a/c++/include/boost/any.hpp b/c++/boost/any.hpp similarity index 100% rename from c++/include/boost/any.hpp rename to c++/boost/any.hpp diff --git a/c++/include/boost/array.hpp b/c++/boost/array.hpp similarity index 100% rename from c++/include/boost/array.hpp rename to c++/boost/array.hpp diff --git a/c++/include/boost/asio.hpp b/c++/boost/asio.hpp similarity index 100% rename from c++/include/boost/asio.hpp rename to c++/boost/asio.hpp diff --git a/c++/include/boost/asio/any_completion_executor.hpp b/c++/boost/asio/any_completion_executor.hpp similarity index 100% rename from c++/include/boost/asio/any_completion_executor.hpp rename to c++/boost/asio/any_completion_executor.hpp diff --git a/c++/include/boost/asio/any_completion_handler.hpp b/c++/boost/asio/any_completion_handler.hpp similarity index 100% rename from c++/include/boost/asio/any_completion_handler.hpp rename to c++/boost/asio/any_completion_handler.hpp diff --git a/c++/include/boost/asio/any_io_executor.hpp b/c++/boost/asio/any_io_executor.hpp similarity index 100% rename from c++/include/boost/asio/any_io_executor.hpp rename to c++/boost/asio/any_io_executor.hpp diff --git a/c++/include/boost/asio/append.hpp b/c++/boost/asio/append.hpp similarity index 100% rename from c++/include/boost/asio/append.hpp rename to c++/boost/asio/append.hpp diff --git a/c++/include/boost/asio/as_tuple.hpp b/c++/boost/asio/as_tuple.hpp similarity index 100% rename from c++/include/boost/asio/as_tuple.hpp rename to c++/boost/asio/as_tuple.hpp diff --git a/c++/include/boost/asio/associated_allocator.hpp b/c++/boost/asio/associated_allocator.hpp similarity index 100% rename from c++/include/boost/asio/associated_allocator.hpp rename to c++/boost/asio/associated_allocator.hpp diff --git a/c++/include/boost/asio/associated_cancellation_slot.hpp b/c++/boost/asio/associated_cancellation_slot.hpp similarity index 100% rename from c++/include/boost/asio/associated_cancellation_slot.hpp rename to c++/boost/asio/associated_cancellation_slot.hpp diff --git a/c++/include/boost/asio/associated_executor.hpp b/c++/boost/asio/associated_executor.hpp similarity index 100% rename from c++/include/boost/asio/associated_executor.hpp rename to c++/boost/asio/associated_executor.hpp diff --git a/c++/include/boost/asio/associated_immediate_executor.hpp b/c++/boost/asio/associated_immediate_executor.hpp similarity index 100% rename from c++/include/boost/asio/associated_immediate_executor.hpp rename to c++/boost/asio/associated_immediate_executor.hpp diff --git a/c++/include/boost/asio/associator.hpp b/c++/boost/asio/associator.hpp similarity index 100% rename from c++/include/boost/asio/associator.hpp rename to c++/boost/asio/associator.hpp diff --git a/c++/include/boost/asio/async_result.hpp b/c++/boost/asio/async_result.hpp similarity index 100% rename from c++/include/boost/asio/async_result.hpp rename to c++/boost/asio/async_result.hpp diff --git a/c++/include/boost/asio/awaitable.hpp b/c++/boost/asio/awaitable.hpp similarity index 100% rename from c++/include/boost/asio/awaitable.hpp rename to c++/boost/asio/awaitable.hpp diff --git a/c++/include/boost/asio/basic_datagram_socket.hpp b/c++/boost/asio/basic_datagram_socket.hpp similarity index 100% rename from c++/include/boost/asio/basic_datagram_socket.hpp rename to c++/boost/asio/basic_datagram_socket.hpp diff --git a/c++/include/boost/asio/basic_deadline_timer.hpp b/c++/boost/asio/basic_deadline_timer.hpp similarity index 100% rename from c++/include/boost/asio/basic_deadline_timer.hpp rename to c++/boost/asio/basic_deadline_timer.hpp diff --git a/c++/include/boost/asio/basic_file.hpp b/c++/boost/asio/basic_file.hpp similarity index 100% rename from c++/include/boost/asio/basic_file.hpp rename to c++/boost/asio/basic_file.hpp diff --git a/c++/include/boost/asio/basic_io_object.hpp b/c++/boost/asio/basic_io_object.hpp similarity index 100% rename from c++/include/boost/asio/basic_io_object.hpp rename to c++/boost/asio/basic_io_object.hpp diff --git a/c++/include/boost/asio/basic_random_access_file.hpp b/c++/boost/asio/basic_random_access_file.hpp similarity index 100% rename from c++/include/boost/asio/basic_random_access_file.hpp rename to c++/boost/asio/basic_random_access_file.hpp diff --git a/c++/include/boost/asio/basic_raw_socket.hpp b/c++/boost/asio/basic_raw_socket.hpp similarity index 100% rename from c++/include/boost/asio/basic_raw_socket.hpp rename to c++/boost/asio/basic_raw_socket.hpp diff --git a/c++/include/boost/asio/basic_readable_pipe.hpp b/c++/boost/asio/basic_readable_pipe.hpp similarity index 100% rename from c++/include/boost/asio/basic_readable_pipe.hpp rename to c++/boost/asio/basic_readable_pipe.hpp diff --git a/c++/include/boost/asio/basic_seq_packet_socket.hpp b/c++/boost/asio/basic_seq_packet_socket.hpp similarity index 100% rename from c++/include/boost/asio/basic_seq_packet_socket.hpp rename to c++/boost/asio/basic_seq_packet_socket.hpp diff --git a/c++/include/boost/asio/basic_serial_port.hpp b/c++/boost/asio/basic_serial_port.hpp similarity index 100% rename from c++/include/boost/asio/basic_serial_port.hpp rename to c++/boost/asio/basic_serial_port.hpp diff --git a/c++/include/boost/asio/basic_signal_set.hpp b/c++/boost/asio/basic_signal_set.hpp similarity index 100% rename from c++/include/boost/asio/basic_signal_set.hpp rename to c++/boost/asio/basic_signal_set.hpp diff --git a/c++/include/boost/asio/basic_socket.hpp b/c++/boost/asio/basic_socket.hpp similarity index 100% rename from c++/include/boost/asio/basic_socket.hpp rename to c++/boost/asio/basic_socket.hpp diff --git a/c++/include/boost/asio/basic_socket_acceptor.hpp b/c++/boost/asio/basic_socket_acceptor.hpp similarity index 100% rename from c++/include/boost/asio/basic_socket_acceptor.hpp rename to c++/boost/asio/basic_socket_acceptor.hpp diff --git a/c++/include/boost/asio/basic_socket_iostream.hpp b/c++/boost/asio/basic_socket_iostream.hpp similarity index 100% rename from c++/include/boost/asio/basic_socket_iostream.hpp rename to c++/boost/asio/basic_socket_iostream.hpp diff --git a/c++/include/boost/asio/basic_socket_streambuf.hpp b/c++/boost/asio/basic_socket_streambuf.hpp similarity index 100% rename from c++/include/boost/asio/basic_socket_streambuf.hpp rename to c++/boost/asio/basic_socket_streambuf.hpp diff --git a/c++/include/boost/asio/basic_stream_file.hpp b/c++/boost/asio/basic_stream_file.hpp similarity index 100% rename from c++/include/boost/asio/basic_stream_file.hpp rename to c++/boost/asio/basic_stream_file.hpp diff --git a/c++/include/boost/asio/basic_stream_socket.hpp b/c++/boost/asio/basic_stream_socket.hpp similarity index 100% rename from c++/include/boost/asio/basic_stream_socket.hpp rename to c++/boost/asio/basic_stream_socket.hpp diff --git a/c++/include/boost/asio/basic_streambuf.hpp b/c++/boost/asio/basic_streambuf.hpp similarity index 100% rename from c++/include/boost/asio/basic_streambuf.hpp rename to c++/boost/asio/basic_streambuf.hpp diff --git a/c++/include/boost/asio/basic_streambuf_fwd.hpp b/c++/boost/asio/basic_streambuf_fwd.hpp similarity index 100% rename from c++/include/boost/asio/basic_streambuf_fwd.hpp rename to c++/boost/asio/basic_streambuf_fwd.hpp diff --git a/c++/include/boost/asio/basic_waitable_timer.hpp b/c++/boost/asio/basic_waitable_timer.hpp similarity index 100% rename from c++/include/boost/asio/basic_waitable_timer.hpp rename to c++/boost/asio/basic_waitable_timer.hpp diff --git a/c++/include/boost/asio/basic_writable_pipe.hpp b/c++/boost/asio/basic_writable_pipe.hpp similarity index 100% rename from c++/include/boost/asio/basic_writable_pipe.hpp rename to c++/boost/asio/basic_writable_pipe.hpp diff --git a/c++/include/boost/asio/bind_allocator.hpp b/c++/boost/asio/bind_allocator.hpp similarity index 100% rename from c++/include/boost/asio/bind_allocator.hpp rename to c++/boost/asio/bind_allocator.hpp diff --git a/c++/include/boost/asio/bind_cancellation_slot.hpp b/c++/boost/asio/bind_cancellation_slot.hpp similarity index 100% rename from c++/include/boost/asio/bind_cancellation_slot.hpp rename to c++/boost/asio/bind_cancellation_slot.hpp diff --git a/c++/include/boost/asio/bind_executor.hpp b/c++/boost/asio/bind_executor.hpp similarity index 100% rename from c++/include/boost/asio/bind_executor.hpp rename to c++/boost/asio/bind_executor.hpp diff --git a/c++/include/boost/asio/bind_immediate_executor.hpp b/c++/boost/asio/bind_immediate_executor.hpp similarity index 100% rename from c++/include/boost/asio/bind_immediate_executor.hpp rename to c++/boost/asio/bind_immediate_executor.hpp diff --git a/c++/include/boost/asio/buffer.hpp b/c++/boost/asio/buffer.hpp similarity index 100% rename from c++/include/boost/asio/buffer.hpp rename to c++/boost/asio/buffer.hpp diff --git a/c++/include/boost/asio/buffer_registration.hpp b/c++/boost/asio/buffer_registration.hpp similarity index 100% rename from c++/include/boost/asio/buffer_registration.hpp rename to c++/boost/asio/buffer_registration.hpp diff --git a/c++/include/boost/asio/buffered_read_stream.hpp b/c++/boost/asio/buffered_read_stream.hpp similarity index 100% rename from c++/include/boost/asio/buffered_read_stream.hpp rename to c++/boost/asio/buffered_read_stream.hpp diff --git a/c++/include/boost/asio/buffered_read_stream_fwd.hpp b/c++/boost/asio/buffered_read_stream_fwd.hpp similarity index 100% rename from c++/include/boost/asio/buffered_read_stream_fwd.hpp rename to c++/boost/asio/buffered_read_stream_fwd.hpp diff --git a/c++/include/boost/asio/buffered_stream.hpp b/c++/boost/asio/buffered_stream.hpp similarity index 100% rename from c++/include/boost/asio/buffered_stream.hpp rename to c++/boost/asio/buffered_stream.hpp diff --git a/c++/include/boost/asio/buffered_stream_fwd.hpp b/c++/boost/asio/buffered_stream_fwd.hpp similarity index 100% rename from c++/include/boost/asio/buffered_stream_fwd.hpp rename to c++/boost/asio/buffered_stream_fwd.hpp diff --git a/c++/include/boost/asio/buffered_write_stream.hpp b/c++/boost/asio/buffered_write_stream.hpp similarity index 100% rename from c++/include/boost/asio/buffered_write_stream.hpp rename to c++/boost/asio/buffered_write_stream.hpp diff --git a/c++/include/boost/asio/buffered_write_stream_fwd.hpp b/c++/boost/asio/buffered_write_stream_fwd.hpp similarity index 100% rename from c++/include/boost/asio/buffered_write_stream_fwd.hpp rename to c++/boost/asio/buffered_write_stream_fwd.hpp diff --git a/c++/include/boost/asio/buffers_iterator.hpp b/c++/boost/asio/buffers_iterator.hpp similarity index 100% rename from c++/include/boost/asio/buffers_iterator.hpp rename to c++/boost/asio/buffers_iterator.hpp diff --git a/c++/include/boost/asio/cancellation_signal.hpp b/c++/boost/asio/cancellation_signal.hpp similarity index 100% rename from c++/include/boost/asio/cancellation_signal.hpp rename to c++/boost/asio/cancellation_signal.hpp diff --git a/c++/include/boost/asio/cancellation_state.hpp b/c++/boost/asio/cancellation_state.hpp similarity index 100% rename from c++/include/boost/asio/cancellation_state.hpp rename to c++/boost/asio/cancellation_state.hpp diff --git a/c++/include/boost/asio/cancellation_type.hpp b/c++/boost/asio/cancellation_type.hpp similarity index 100% rename from c++/include/boost/asio/cancellation_type.hpp rename to c++/boost/asio/cancellation_type.hpp diff --git a/c++/include/boost/asio/co_spawn.hpp b/c++/boost/asio/co_spawn.hpp similarity index 100% rename from c++/include/boost/asio/co_spawn.hpp rename to c++/boost/asio/co_spawn.hpp diff --git a/c++/include/boost/asio/completion_condition.hpp b/c++/boost/asio/completion_condition.hpp similarity index 100% rename from c++/include/boost/asio/completion_condition.hpp rename to c++/boost/asio/completion_condition.hpp diff --git a/c++/include/boost/asio/compose.hpp b/c++/boost/asio/compose.hpp similarity index 100% rename from c++/include/boost/asio/compose.hpp rename to c++/boost/asio/compose.hpp diff --git a/c++/include/boost/asio/connect.hpp b/c++/boost/asio/connect.hpp similarity index 100% rename from c++/include/boost/asio/connect.hpp rename to c++/boost/asio/connect.hpp diff --git a/c++/include/boost/asio/connect_pipe.hpp b/c++/boost/asio/connect_pipe.hpp similarity index 100% rename from c++/include/boost/asio/connect_pipe.hpp rename to c++/boost/asio/connect_pipe.hpp diff --git a/c++/include/boost/asio/consign.hpp b/c++/boost/asio/consign.hpp similarity index 100% rename from c++/include/boost/asio/consign.hpp rename to c++/boost/asio/consign.hpp diff --git a/c++/include/boost/asio/coroutine.hpp b/c++/boost/asio/coroutine.hpp similarity index 100% rename from c++/include/boost/asio/coroutine.hpp rename to c++/boost/asio/coroutine.hpp diff --git a/c++/include/boost/asio/deadline_timer.hpp b/c++/boost/asio/deadline_timer.hpp similarity index 100% rename from c++/include/boost/asio/deadline_timer.hpp rename to c++/boost/asio/deadline_timer.hpp diff --git a/c++/include/boost/asio/defer.hpp b/c++/boost/asio/defer.hpp similarity index 100% rename from c++/include/boost/asio/defer.hpp rename to c++/boost/asio/defer.hpp diff --git a/c++/include/boost/asio/deferred.hpp b/c++/boost/asio/deferred.hpp similarity index 100% rename from c++/include/boost/asio/deferred.hpp rename to c++/boost/asio/deferred.hpp diff --git a/c++/include/boost/asio/detached.hpp b/c++/boost/asio/detached.hpp similarity index 100% rename from c++/include/boost/asio/detached.hpp rename to c++/boost/asio/detached.hpp diff --git a/c++/include/boost/asio/detail/array.hpp b/c++/boost/asio/detail/array.hpp similarity index 100% rename from c++/include/boost/asio/detail/array.hpp rename to c++/boost/asio/detail/array.hpp diff --git a/c++/include/boost/asio/detail/array_fwd.hpp b/c++/boost/asio/detail/array_fwd.hpp similarity index 100% rename from c++/include/boost/asio/detail/array_fwd.hpp rename to c++/boost/asio/detail/array_fwd.hpp diff --git a/c++/include/boost/asio/detail/assert.hpp b/c++/boost/asio/detail/assert.hpp similarity index 100% rename from c++/include/boost/asio/detail/assert.hpp rename to c++/boost/asio/detail/assert.hpp diff --git a/c++/include/boost/asio/detail/atomic_count.hpp b/c++/boost/asio/detail/atomic_count.hpp similarity index 100% rename from c++/include/boost/asio/detail/atomic_count.hpp rename to c++/boost/asio/detail/atomic_count.hpp diff --git a/c++/include/boost/asio/detail/base_from_cancellation_state.hpp b/c++/boost/asio/detail/base_from_cancellation_state.hpp similarity index 100% rename from c++/include/boost/asio/detail/base_from_cancellation_state.hpp rename to c++/boost/asio/detail/base_from_cancellation_state.hpp diff --git a/c++/include/boost/asio/detail/base_from_completion_cond.hpp b/c++/boost/asio/detail/base_from_completion_cond.hpp similarity index 100% rename from c++/include/boost/asio/detail/base_from_completion_cond.hpp rename to c++/boost/asio/detail/base_from_completion_cond.hpp diff --git a/c++/include/boost/asio/detail/bind_handler.hpp b/c++/boost/asio/detail/bind_handler.hpp similarity index 100% rename from c++/include/boost/asio/detail/bind_handler.hpp rename to c++/boost/asio/detail/bind_handler.hpp diff --git a/c++/include/boost/asio/detail/blocking_executor_op.hpp b/c++/boost/asio/detail/blocking_executor_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/blocking_executor_op.hpp rename to c++/boost/asio/detail/blocking_executor_op.hpp diff --git a/c++/include/boost/asio/detail/buffer_resize_guard.hpp b/c++/boost/asio/detail/buffer_resize_guard.hpp similarity index 100% rename from c++/include/boost/asio/detail/buffer_resize_guard.hpp rename to c++/boost/asio/detail/buffer_resize_guard.hpp diff --git a/c++/include/boost/asio/detail/buffer_sequence_adapter.hpp b/c++/boost/asio/detail/buffer_sequence_adapter.hpp similarity index 100% rename from c++/include/boost/asio/detail/buffer_sequence_adapter.hpp rename to c++/boost/asio/detail/buffer_sequence_adapter.hpp diff --git a/c++/include/boost/asio/detail/buffered_stream_storage.hpp b/c++/boost/asio/detail/buffered_stream_storage.hpp similarity index 100% rename from c++/include/boost/asio/detail/buffered_stream_storage.hpp rename to c++/boost/asio/detail/buffered_stream_storage.hpp diff --git a/c++/include/boost/asio/detail/bulk_executor_op.hpp b/c++/boost/asio/detail/bulk_executor_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/bulk_executor_op.hpp rename to c++/boost/asio/detail/bulk_executor_op.hpp diff --git a/c++/include/boost/asio/detail/call_stack.hpp b/c++/boost/asio/detail/call_stack.hpp similarity index 100% rename from c++/include/boost/asio/detail/call_stack.hpp rename to c++/boost/asio/detail/call_stack.hpp diff --git a/c++/include/boost/asio/detail/chrono.hpp b/c++/boost/asio/detail/chrono.hpp similarity index 100% rename from c++/include/boost/asio/detail/chrono.hpp rename to c++/boost/asio/detail/chrono.hpp diff --git a/c++/include/boost/asio/detail/chrono_time_traits.hpp b/c++/boost/asio/detail/chrono_time_traits.hpp similarity index 100% rename from c++/include/boost/asio/detail/chrono_time_traits.hpp rename to c++/boost/asio/detail/chrono_time_traits.hpp diff --git a/c++/include/boost/asio/detail/completion_handler.hpp b/c++/boost/asio/detail/completion_handler.hpp similarity index 100% rename from c++/include/boost/asio/detail/completion_handler.hpp rename to c++/boost/asio/detail/completion_handler.hpp diff --git a/c++/include/boost/asio/detail/composed_work.hpp b/c++/boost/asio/detail/composed_work.hpp similarity index 100% rename from c++/include/boost/asio/detail/composed_work.hpp rename to c++/boost/asio/detail/composed_work.hpp diff --git a/c++/include/boost/asio/detail/concurrency_hint.hpp b/c++/boost/asio/detail/concurrency_hint.hpp similarity index 100% rename from c++/include/boost/asio/detail/concurrency_hint.hpp rename to c++/boost/asio/detail/concurrency_hint.hpp diff --git a/c++/include/boost/asio/detail/conditionally_enabled_event.hpp b/c++/boost/asio/detail/conditionally_enabled_event.hpp similarity index 100% rename from c++/include/boost/asio/detail/conditionally_enabled_event.hpp rename to c++/boost/asio/detail/conditionally_enabled_event.hpp diff --git a/c++/include/boost/asio/detail/conditionally_enabled_mutex.hpp b/c++/boost/asio/detail/conditionally_enabled_mutex.hpp similarity index 100% rename from c++/include/boost/asio/detail/conditionally_enabled_mutex.hpp rename to c++/boost/asio/detail/conditionally_enabled_mutex.hpp diff --git a/c++/include/boost/asio/detail/config.hpp b/c++/boost/asio/detail/config.hpp similarity index 100% rename from c++/include/boost/asio/detail/config.hpp rename to c++/boost/asio/detail/config.hpp diff --git a/c++/include/boost/asio/detail/consuming_buffers.hpp b/c++/boost/asio/detail/consuming_buffers.hpp similarity index 100% rename from c++/include/boost/asio/detail/consuming_buffers.hpp rename to c++/boost/asio/detail/consuming_buffers.hpp diff --git a/c++/include/boost/asio/detail/cstddef.hpp b/c++/boost/asio/detail/cstddef.hpp similarity index 100% rename from c++/include/boost/asio/detail/cstddef.hpp rename to c++/boost/asio/detail/cstddef.hpp diff --git a/c++/include/boost/asio/detail/cstdint.hpp b/c++/boost/asio/detail/cstdint.hpp similarity index 100% rename from c++/include/boost/asio/detail/cstdint.hpp rename to c++/boost/asio/detail/cstdint.hpp diff --git a/c++/include/boost/asio/detail/date_time_fwd.hpp b/c++/boost/asio/detail/date_time_fwd.hpp similarity index 100% rename from c++/include/boost/asio/detail/date_time_fwd.hpp rename to c++/boost/asio/detail/date_time_fwd.hpp diff --git a/c++/include/boost/asio/detail/deadline_timer_service.hpp b/c++/boost/asio/detail/deadline_timer_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/deadline_timer_service.hpp rename to c++/boost/asio/detail/deadline_timer_service.hpp diff --git a/c++/include/boost/asio/detail/dependent_type.hpp b/c++/boost/asio/detail/dependent_type.hpp similarity index 100% rename from c++/include/boost/asio/detail/dependent_type.hpp rename to c++/boost/asio/detail/dependent_type.hpp diff --git a/c++/include/boost/asio/detail/descriptor_ops.hpp b/c++/boost/asio/detail/descriptor_ops.hpp similarity index 100% rename from c++/include/boost/asio/detail/descriptor_ops.hpp rename to c++/boost/asio/detail/descriptor_ops.hpp diff --git a/c++/include/boost/asio/detail/descriptor_read_op.hpp b/c++/boost/asio/detail/descriptor_read_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/descriptor_read_op.hpp rename to c++/boost/asio/detail/descriptor_read_op.hpp diff --git a/c++/include/boost/asio/detail/descriptor_write_op.hpp b/c++/boost/asio/detail/descriptor_write_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/descriptor_write_op.hpp rename to c++/boost/asio/detail/descriptor_write_op.hpp diff --git a/c++/include/boost/asio/detail/dev_poll_reactor.hpp b/c++/boost/asio/detail/dev_poll_reactor.hpp similarity index 100% rename from c++/include/boost/asio/detail/dev_poll_reactor.hpp rename to c++/boost/asio/detail/dev_poll_reactor.hpp diff --git a/c++/include/boost/asio/detail/epoll_reactor.hpp b/c++/boost/asio/detail/epoll_reactor.hpp similarity index 100% rename from c++/include/boost/asio/detail/epoll_reactor.hpp rename to c++/boost/asio/detail/epoll_reactor.hpp diff --git a/c++/include/boost/asio/detail/event.hpp b/c++/boost/asio/detail/event.hpp similarity index 100% rename from c++/include/boost/asio/detail/event.hpp rename to c++/boost/asio/detail/event.hpp diff --git a/c++/include/boost/asio/detail/eventfd_select_interrupter.hpp b/c++/boost/asio/detail/eventfd_select_interrupter.hpp similarity index 100% rename from c++/include/boost/asio/detail/eventfd_select_interrupter.hpp rename to c++/boost/asio/detail/eventfd_select_interrupter.hpp diff --git a/c++/include/boost/asio/detail/exception.hpp b/c++/boost/asio/detail/exception.hpp similarity index 100% rename from c++/include/boost/asio/detail/exception.hpp rename to c++/boost/asio/detail/exception.hpp diff --git a/c++/include/boost/asio/detail/executor_function.hpp b/c++/boost/asio/detail/executor_function.hpp similarity index 100% rename from c++/include/boost/asio/detail/executor_function.hpp rename to c++/boost/asio/detail/executor_function.hpp diff --git a/c++/include/boost/asio/detail/executor_op.hpp b/c++/boost/asio/detail/executor_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/executor_op.hpp rename to c++/boost/asio/detail/executor_op.hpp diff --git a/c++/include/boost/asio/detail/fd_set_adapter.hpp b/c++/boost/asio/detail/fd_set_adapter.hpp similarity index 100% rename from c++/include/boost/asio/detail/fd_set_adapter.hpp rename to c++/boost/asio/detail/fd_set_adapter.hpp diff --git a/c++/include/boost/asio/detail/fenced_block.hpp b/c++/boost/asio/detail/fenced_block.hpp similarity index 100% rename from c++/include/boost/asio/detail/fenced_block.hpp rename to c++/boost/asio/detail/fenced_block.hpp diff --git a/c++/include/boost/asio/detail/functional.hpp b/c++/boost/asio/detail/functional.hpp similarity index 100% rename from c++/include/boost/asio/detail/functional.hpp rename to c++/boost/asio/detail/functional.hpp diff --git a/c++/include/boost/asio/detail/future.hpp b/c++/boost/asio/detail/future.hpp similarity index 100% rename from c++/include/boost/asio/detail/future.hpp rename to c++/boost/asio/detail/future.hpp diff --git a/c++/include/boost/asio/detail/gcc_arm_fenced_block.hpp b/c++/boost/asio/detail/gcc_arm_fenced_block.hpp similarity index 100% rename from c++/include/boost/asio/detail/gcc_arm_fenced_block.hpp rename to c++/boost/asio/detail/gcc_arm_fenced_block.hpp diff --git a/c++/include/boost/asio/detail/gcc_hppa_fenced_block.hpp b/c++/boost/asio/detail/gcc_hppa_fenced_block.hpp similarity index 100% rename from c++/include/boost/asio/detail/gcc_hppa_fenced_block.hpp rename to c++/boost/asio/detail/gcc_hppa_fenced_block.hpp diff --git a/c++/include/boost/asio/detail/gcc_sync_fenced_block.hpp b/c++/boost/asio/detail/gcc_sync_fenced_block.hpp similarity index 100% rename from c++/include/boost/asio/detail/gcc_sync_fenced_block.hpp rename to c++/boost/asio/detail/gcc_sync_fenced_block.hpp diff --git a/c++/include/boost/asio/detail/gcc_x86_fenced_block.hpp b/c++/boost/asio/detail/gcc_x86_fenced_block.hpp similarity index 100% rename from c++/include/boost/asio/detail/gcc_x86_fenced_block.hpp rename to c++/boost/asio/detail/gcc_x86_fenced_block.hpp diff --git a/c++/include/boost/asio/detail/global.hpp b/c++/boost/asio/detail/global.hpp similarity index 100% rename from c++/include/boost/asio/detail/global.hpp rename to c++/boost/asio/detail/global.hpp diff --git a/c++/include/boost/asio/detail/handler_alloc_helpers.hpp b/c++/boost/asio/detail/handler_alloc_helpers.hpp similarity index 100% rename from c++/include/boost/asio/detail/handler_alloc_helpers.hpp rename to c++/boost/asio/detail/handler_alloc_helpers.hpp diff --git a/c++/include/boost/asio/detail/handler_cont_helpers.hpp b/c++/boost/asio/detail/handler_cont_helpers.hpp similarity index 100% rename from c++/include/boost/asio/detail/handler_cont_helpers.hpp rename to c++/boost/asio/detail/handler_cont_helpers.hpp diff --git a/c++/include/boost/asio/detail/handler_invoke_helpers.hpp b/c++/boost/asio/detail/handler_invoke_helpers.hpp similarity index 100% rename from c++/include/boost/asio/detail/handler_invoke_helpers.hpp rename to c++/boost/asio/detail/handler_invoke_helpers.hpp diff --git a/c++/include/boost/asio/detail/handler_tracking.hpp b/c++/boost/asio/detail/handler_tracking.hpp similarity index 100% rename from c++/include/boost/asio/detail/handler_tracking.hpp rename to c++/boost/asio/detail/handler_tracking.hpp diff --git a/c++/include/boost/asio/detail/handler_type_requirements.hpp b/c++/boost/asio/detail/handler_type_requirements.hpp similarity index 100% rename from c++/include/boost/asio/detail/handler_type_requirements.hpp rename to c++/boost/asio/detail/handler_type_requirements.hpp diff --git a/c++/include/boost/asio/detail/handler_work.hpp b/c++/boost/asio/detail/handler_work.hpp similarity index 100% rename from c++/include/boost/asio/detail/handler_work.hpp rename to c++/boost/asio/detail/handler_work.hpp diff --git a/c++/include/boost/asio/detail/hash_map.hpp b/c++/boost/asio/detail/hash_map.hpp similarity index 100% rename from c++/include/boost/asio/detail/hash_map.hpp rename to c++/boost/asio/detail/hash_map.hpp diff --git a/c++/include/boost/asio/detail/impl/buffer_sequence_adapter.ipp b/c++/boost/asio/detail/impl/buffer_sequence_adapter.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/buffer_sequence_adapter.ipp rename to c++/boost/asio/detail/impl/buffer_sequence_adapter.ipp diff --git a/c++/include/boost/asio/detail/impl/descriptor_ops.ipp b/c++/boost/asio/detail/impl/descriptor_ops.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/descriptor_ops.ipp rename to c++/boost/asio/detail/impl/descriptor_ops.ipp diff --git a/c++/include/boost/asio/detail/impl/dev_poll_reactor.hpp b/c++/boost/asio/detail/impl/dev_poll_reactor.hpp similarity index 100% rename from c++/include/boost/asio/detail/impl/dev_poll_reactor.hpp rename to c++/boost/asio/detail/impl/dev_poll_reactor.hpp diff --git a/c++/include/boost/asio/detail/impl/dev_poll_reactor.ipp b/c++/boost/asio/detail/impl/dev_poll_reactor.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/dev_poll_reactor.ipp rename to c++/boost/asio/detail/impl/dev_poll_reactor.ipp diff --git a/c++/include/boost/asio/detail/impl/epoll_reactor.hpp b/c++/boost/asio/detail/impl/epoll_reactor.hpp similarity index 100% rename from c++/include/boost/asio/detail/impl/epoll_reactor.hpp rename to c++/boost/asio/detail/impl/epoll_reactor.hpp diff --git a/c++/include/boost/asio/detail/impl/epoll_reactor.ipp b/c++/boost/asio/detail/impl/epoll_reactor.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/epoll_reactor.ipp rename to c++/boost/asio/detail/impl/epoll_reactor.ipp diff --git a/c++/include/boost/asio/detail/impl/eventfd_select_interrupter.ipp b/c++/boost/asio/detail/impl/eventfd_select_interrupter.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/eventfd_select_interrupter.ipp rename to c++/boost/asio/detail/impl/eventfd_select_interrupter.ipp diff --git a/c++/include/boost/asio/detail/impl/handler_tracking.ipp b/c++/boost/asio/detail/impl/handler_tracking.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/handler_tracking.ipp rename to c++/boost/asio/detail/impl/handler_tracking.ipp diff --git a/c++/include/boost/asio/detail/impl/io_uring_descriptor_service.ipp b/c++/boost/asio/detail/impl/io_uring_descriptor_service.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/io_uring_descriptor_service.ipp rename to c++/boost/asio/detail/impl/io_uring_descriptor_service.ipp diff --git a/c++/include/boost/asio/detail/impl/io_uring_file_service.ipp b/c++/boost/asio/detail/impl/io_uring_file_service.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/io_uring_file_service.ipp rename to c++/boost/asio/detail/impl/io_uring_file_service.ipp diff --git a/c++/include/boost/asio/detail/impl/io_uring_service.hpp b/c++/boost/asio/detail/impl/io_uring_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/impl/io_uring_service.hpp rename to c++/boost/asio/detail/impl/io_uring_service.hpp diff --git a/c++/include/boost/asio/detail/impl/io_uring_service.ipp b/c++/boost/asio/detail/impl/io_uring_service.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/io_uring_service.ipp rename to c++/boost/asio/detail/impl/io_uring_service.ipp diff --git a/c++/include/boost/asio/detail/impl/io_uring_socket_service_base.ipp b/c++/boost/asio/detail/impl/io_uring_socket_service_base.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/io_uring_socket_service_base.ipp rename to c++/boost/asio/detail/impl/io_uring_socket_service_base.ipp diff --git a/c++/include/boost/asio/detail/impl/kqueue_reactor.hpp b/c++/boost/asio/detail/impl/kqueue_reactor.hpp similarity index 100% rename from c++/include/boost/asio/detail/impl/kqueue_reactor.hpp rename to c++/boost/asio/detail/impl/kqueue_reactor.hpp diff --git a/c++/include/boost/asio/detail/impl/kqueue_reactor.ipp b/c++/boost/asio/detail/impl/kqueue_reactor.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/kqueue_reactor.ipp rename to c++/boost/asio/detail/impl/kqueue_reactor.ipp diff --git a/c++/include/boost/asio/detail/impl/null_event.ipp b/c++/boost/asio/detail/impl/null_event.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/null_event.ipp rename to c++/boost/asio/detail/impl/null_event.ipp diff --git a/c++/include/boost/asio/detail/impl/pipe_select_interrupter.ipp b/c++/boost/asio/detail/impl/pipe_select_interrupter.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/pipe_select_interrupter.ipp rename to c++/boost/asio/detail/impl/pipe_select_interrupter.ipp diff --git a/c++/include/boost/asio/detail/impl/posix_event.ipp b/c++/boost/asio/detail/impl/posix_event.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/posix_event.ipp rename to c++/boost/asio/detail/impl/posix_event.ipp diff --git a/c++/include/boost/asio/detail/impl/posix_mutex.ipp b/c++/boost/asio/detail/impl/posix_mutex.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/posix_mutex.ipp rename to c++/boost/asio/detail/impl/posix_mutex.ipp diff --git a/c++/include/boost/asio/detail/impl/posix_serial_port_service.ipp b/c++/boost/asio/detail/impl/posix_serial_port_service.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/posix_serial_port_service.ipp rename to c++/boost/asio/detail/impl/posix_serial_port_service.ipp diff --git a/c++/include/boost/asio/detail/impl/posix_thread.ipp b/c++/boost/asio/detail/impl/posix_thread.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/posix_thread.ipp rename to c++/boost/asio/detail/impl/posix_thread.ipp diff --git a/c++/include/boost/asio/detail/impl/posix_tss_ptr.ipp b/c++/boost/asio/detail/impl/posix_tss_ptr.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/posix_tss_ptr.ipp rename to c++/boost/asio/detail/impl/posix_tss_ptr.ipp diff --git a/c++/include/boost/asio/detail/impl/reactive_descriptor_service.ipp b/c++/boost/asio/detail/impl/reactive_descriptor_service.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/reactive_descriptor_service.ipp rename to c++/boost/asio/detail/impl/reactive_descriptor_service.ipp diff --git a/c++/include/boost/asio/detail/impl/reactive_socket_service_base.ipp b/c++/boost/asio/detail/impl/reactive_socket_service_base.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/reactive_socket_service_base.ipp rename to c++/boost/asio/detail/impl/reactive_socket_service_base.ipp diff --git a/c++/include/boost/asio/detail/impl/resolver_service_base.ipp b/c++/boost/asio/detail/impl/resolver_service_base.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/resolver_service_base.ipp rename to c++/boost/asio/detail/impl/resolver_service_base.ipp diff --git a/c++/include/boost/asio/detail/impl/scheduler.ipp b/c++/boost/asio/detail/impl/scheduler.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/scheduler.ipp rename to c++/boost/asio/detail/impl/scheduler.ipp diff --git a/c++/include/boost/asio/detail/impl/select_reactor.hpp b/c++/boost/asio/detail/impl/select_reactor.hpp similarity index 100% rename from c++/include/boost/asio/detail/impl/select_reactor.hpp rename to c++/boost/asio/detail/impl/select_reactor.hpp diff --git a/c++/include/boost/asio/detail/impl/select_reactor.ipp b/c++/boost/asio/detail/impl/select_reactor.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/select_reactor.ipp rename to c++/boost/asio/detail/impl/select_reactor.ipp diff --git a/c++/include/boost/asio/detail/impl/service_registry.hpp b/c++/boost/asio/detail/impl/service_registry.hpp similarity index 100% rename from c++/include/boost/asio/detail/impl/service_registry.hpp rename to c++/boost/asio/detail/impl/service_registry.hpp diff --git a/c++/include/boost/asio/detail/impl/service_registry.ipp b/c++/boost/asio/detail/impl/service_registry.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/service_registry.ipp rename to c++/boost/asio/detail/impl/service_registry.ipp diff --git a/c++/include/boost/asio/detail/impl/signal_set_service.ipp b/c++/boost/asio/detail/impl/signal_set_service.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/signal_set_service.ipp rename to c++/boost/asio/detail/impl/signal_set_service.ipp diff --git a/c++/include/boost/asio/detail/impl/socket_ops.ipp b/c++/boost/asio/detail/impl/socket_ops.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/socket_ops.ipp rename to c++/boost/asio/detail/impl/socket_ops.ipp diff --git a/c++/include/boost/asio/detail/impl/socket_select_interrupter.ipp b/c++/boost/asio/detail/impl/socket_select_interrupter.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/socket_select_interrupter.ipp rename to c++/boost/asio/detail/impl/socket_select_interrupter.ipp diff --git a/c++/include/boost/asio/detail/impl/strand_executor_service.hpp b/c++/boost/asio/detail/impl/strand_executor_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/impl/strand_executor_service.hpp rename to c++/boost/asio/detail/impl/strand_executor_service.hpp diff --git a/c++/include/boost/asio/detail/impl/strand_executor_service.ipp b/c++/boost/asio/detail/impl/strand_executor_service.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/strand_executor_service.ipp rename to c++/boost/asio/detail/impl/strand_executor_service.ipp diff --git a/c++/include/boost/asio/detail/impl/strand_service.hpp b/c++/boost/asio/detail/impl/strand_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/impl/strand_service.hpp rename to c++/boost/asio/detail/impl/strand_service.hpp diff --git a/c++/include/boost/asio/detail/impl/strand_service.ipp b/c++/boost/asio/detail/impl/strand_service.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/strand_service.ipp rename to c++/boost/asio/detail/impl/strand_service.ipp diff --git a/c++/include/boost/asio/detail/impl/thread_context.ipp b/c++/boost/asio/detail/impl/thread_context.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/thread_context.ipp rename to c++/boost/asio/detail/impl/thread_context.ipp diff --git a/c++/include/boost/asio/detail/impl/throw_error.ipp b/c++/boost/asio/detail/impl/throw_error.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/throw_error.ipp rename to c++/boost/asio/detail/impl/throw_error.ipp diff --git a/c++/include/boost/asio/detail/impl/timer_queue_ptime.ipp b/c++/boost/asio/detail/impl/timer_queue_ptime.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/timer_queue_ptime.ipp rename to c++/boost/asio/detail/impl/timer_queue_ptime.ipp diff --git a/c++/include/boost/asio/detail/impl/timer_queue_set.ipp b/c++/boost/asio/detail/impl/timer_queue_set.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/timer_queue_set.ipp rename to c++/boost/asio/detail/impl/timer_queue_set.ipp diff --git a/c++/include/boost/asio/detail/impl/win_event.ipp b/c++/boost/asio/detail/impl/win_event.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/win_event.ipp rename to c++/boost/asio/detail/impl/win_event.ipp diff --git a/c++/include/boost/asio/detail/impl/win_iocp_file_service.ipp b/c++/boost/asio/detail/impl/win_iocp_file_service.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/win_iocp_file_service.ipp rename to c++/boost/asio/detail/impl/win_iocp_file_service.ipp diff --git a/c++/include/boost/asio/detail/impl/win_iocp_handle_service.ipp b/c++/boost/asio/detail/impl/win_iocp_handle_service.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/win_iocp_handle_service.ipp rename to c++/boost/asio/detail/impl/win_iocp_handle_service.ipp diff --git a/c++/include/boost/asio/detail/impl/win_iocp_io_context.hpp b/c++/boost/asio/detail/impl/win_iocp_io_context.hpp similarity index 100% rename from c++/include/boost/asio/detail/impl/win_iocp_io_context.hpp rename to c++/boost/asio/detail/impl/win_iocp_io_context.hpp diff --git a/c++/include/boost/asio/detail/impl/win_iocp_io_context.ipp b/c++/boost/asio/detail/impl/win_iocp_io_context.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/win_iocp_io_context.ipp rename to c++/boost/asio/detail/impl/win_iocp_io_context.ipp diff --git a/c++/include/boost/asio/detail/impl/win_iocp_serial_port_service.ipp b/c++/boost/asio/detail/impl/win_iocp_serial_port_service.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/win_iocp_serial_port_service.ipp rename to c++/boost/asio/detail/impl/win_iocp_serial_port_service.ipp diff --git a/c++/include/boost/asio/detail/impl/win_iocp_socket_service_base.ipp b/c++/boost/asio/detail/impl/win_iocp_socket_service_base.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/win_iocp_socket_service_base.ipp rename to c++/boost/asio/detail/impl/win_iocp_socket_service_base.ipp diff --git a/c++/include/boost/asio/detail/impl/win_mutex.ipp b/c++/boost/asio/detail/impl/win_mutex.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/win_mutex.ipp rename to c++/boost/asio/detail/impl/win_mutex.ipp diff --git a/c++/include/boost/asio/detail/impl/win_object_handle_service.ipp b/c++/boost/asio/detail/impl/win_object_handle_service.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/win_object_handle_service.ipp rename to c++/boost/asio/detail/impl/win_object_handle_service.ipp diff --git a/c++/include/boost/asio/detail/impl/win_static_mutex.ipp b/c++/boost/asio/detail/impl/win_static_mutex.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/win_static_mutex.ipp rename to c++/boost/asio/detail/impl/win_static_mutex.ipp diff --git a/c++/include/boost/asio/detail/impl/win_thread.ipp b/c++/boost/asio/detail/impl/win_thread.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/win_thread.ipp rename to c++/boost/asio/detail/impl/win_thread.ipp diff --git a/c++/include/boost/asio/detail/impl/win_tss_ptr.ipp b/c++/boost/asio/detail/impl/win_tss_ptr.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/win_tss_ptr.ipp rename to c++/boost/asio/detail/impl/win_tss_ptr.ipp diff --git a/c++/include/boost/asio/detail/impl/winrt_ssocket_service_base.ipp b/c++/boost/asio/detail/impl/winrt_ssocket_service_base.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/winrt_ssocket_service_base.ipp rename to c++/boost/asio/detail/impl/winrt_ssocket_service_base.ipp diff --git a/c++/include/boost/asio/detail/impl/winrt_timer_scheduler.hpp b/c++/boost/asio/detail/impl/winrt_timer_scheduler.hpp similarity index 100% rename from c++/include/boost/asio/detail/impl/winrt_timer_scheduler.hpp rename to c++/boost/asio/detail/impl/winrt_timer_scheduler.hpp diff --git a/c++/include/boost/asio/detail/impl/winrt_timer_scheduler.ipp b/c++/boost/asio/detail/impl/winrt_timer_scheduler.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/winrt_timer_scheduler.ipp rename to c++/boost/asio/detail/impl/winrt_timer_scheduler.ipp diff --git a/c++/include/boost/asio/detail/impl/winsock_init.ipp b/c++/boost/asio/detail/impl/winsock_init.ipp similarity index 100% rename from c++/include/boost/asio/detail/impl/winsock_init.ipp rename to c++/boost/asio/detail/impl/winsock_init.ipp diff --git a/c++/include/boost/asio/detail/initiate_defer.hpp b/c++/boost/asio/detail/initiate_defer.hpp similarity index 100% rename from c++/include/boost/asio/detail/initiate_defer.hpp rename to c++/boost/asio/detail/initiate_defer.hpp diff --git a/c++/include/boost/asio/detail/initiate_dispatch.hpp b/c++/boost/asio/detail/initiate_dispatch.hpp similarity index 100% rename from c++/include/boost/asio/detail/initiate_dispatch.hpp rename to c++/boost/asio/detail/initiate_dispatch.hpp diff --git a/c++/include/boost/asio/detail/initiate_post.hpp b/c++/boost/asio/detail/initiate_post.hpp similarity index 100% rename from c++/include/boost/asio/detail/initiate_post.hpp rename to c++/boost/asio/detail/initiate_post.hpp diff --git a/c++/include/boost/asio/detail/io_control.hpp b/c++/boost/asio/detail/io_control.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_control.hpp rename to c++/boost/asio/detail/io_control.hpp diff --git a/c++/include/boost/asio/detail/io_object_impl.hpp b/c++/boost/asio/detail/io_object_impl.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_object_impl.hpp rename to c++/boost/asio/detail/io_object_impl.hpp diff --git a/c++/include/boost/asio/detail/io_uring_descriptor_read_at_op.hpp b/c++/boost/asio/detail/io_uring_descriptor_read_at_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_descriptor_read_at_op.hpp rename to c++/boost/asio/detail/io_uring_descriptor_read_at_op.hpp diff --git a/c++/include/boost/asio/detail/io_uring_descriptor_read_op.hpp b/c++/boost/asio/detail/io_uring_descriptor_read_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_descriptor_read_op.hpp rename to c++/boost/asio/detail/io_uring_descriptor_read_op.hpp diff --git a/c++/include/boost/asio/detail/io_uring_descriptor_service.hpp b/c++/boost/asio/detail/io_uring_descriptor_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_descriptor_service.hpp rename to c++/boost/asio/detail/io_uring_descriptor_service.hpp diff --git a/c++/include/boost/asio/detail/io_uring_descriptor_write_at_op.hpp b/c++/boost/asio/detail/io_uring_descriptor_write_at_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_descriptor_write_at_op.hpp rename to c++/boost/asio/detail/io_uring_descriptor_write_at_op.hpp diff --git a/c++/include/boost/asio/detail/io_uring_descriptor_write_op.hpp b/c++/boost/asio/detail/io_uring_descriptor_write_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_descriptor_write_op.hpp rename to c++/boost/asio/detail/io_uring_descriptor_write_op.hpp diff --git a/c++/include/boost/asio/detail/io_uring_file_service.hpp b/c++/boost/asio/detail/io_uring_file_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_file_service.hpp rename to c++/boost/asio/detail/io_uring_file_service.hpp diff --git a/c++/include/boost/asio/detail/io_uring_null_buffers_op.hpp b/c++/boost/asio/detail/io_uring_null_buffers_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_null_buffers_op.hpp rename to c++/boost/asio/detail/io_uring_null_buffers_op.hpp diff --git a/c++/include/boost/asio/detail/io_uring_operation.hpp b/c++/boost/asio/detail/io_uring_operation.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_operation.hpp rename to c++/boost/asio/detail/io_uring_operation.hpp diff --git a/c++/include/boost/asio/detail/io_uring_service.hpp b/c++/boost/asio/detail/io_uring_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_service.hpp rename to c++/boost/asio/detail/io_uring_service.hpp diff --git a/c++/include/boost/asio/detail/io_uring_socket_accept_op.hpp b/c++/boost/asio/detail/io_uring_socket_accept_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_socket_accept_op.hpp rename to c++/boost/asio/detail/io_uring_socket_accept_op.hpp diff --git a/c++/include/boost/asio/detail/io_uring_socket_connect_op.hpp b/c++/boost/asio/detail/io_uring_socket_connect_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_socket_connect_op.hpp rename to c++/boost/asio/detail/io_uring_socket_connect_op.hpp diff --git a/c++/include/boost/asio/detail/io_uring_socket_recv_op.hpp b/c++/boost/asio/detail/io_uring_socket_recv_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_socket_recv_op.hpp rename to c++/boost/asio/detail/io_uring_socket_recv_op.hpp diff --git a/c++/include/boost/asio/detail/io_uring_socket_recvfrom_op.hpp b/c++/boost/asio/detail/io_uring_socket_recvfrom_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_socket_recvfrom_op.hpp rename to c++/boost/asio/detail/io_uring_socket_recvfrom_op.hpp diff --git a/c++/include/boost/asio/detail/io_uring_socket_recvmsg_op.hpp b/c++/boost/asio/detail/io_uring_socket_recvmsg_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_socket_recvmsg_op.hpp rename to c++/boost/asio/detail/io_uring_socket_recvmsg_op.hpp diff --git a/c++/include/boost/asio/detail/io_uring_socket_send_op.hpp b/c++/boost/asio/detail/io_uring_socket_send_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_socket_send_op.hpp rename to c++/boost/asio/detail/io_uring_socket_send_op.hpp diff --git a/c++/include/boost/asio/detail/io_uring_socket_sendto_op.hpp b/c++/boost/asio/detail/io_uring_socket_sendto_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_socket_sendto_op.hpp rename to c++/boost/asio/detail/io_uring_socket_sendto_op.hpp diff --git a/c++/include/boost/asio/detail/io_uring_socket_service.hpp b/c++/boost/asio/detail/io_uring_socket_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_socket_service.hpp rename to c++/boost/asio/detail/io_uring_socket_service.hpp diff --git a/c++/include/boost/asio/detail/io_uring_socket_service_base.hpp b/c++/boost/asio/detail/io_uring_socket_service_base.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_socket_service_base.hpp rename to c++/boost/asio/detail/io_uring_socket_service_base.hpp diff --git a/c++/include/boost/asio/detail/io_uring_wait_op.hpp b/c++/boost/asio/detail/io_uring_wait_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/io_uring_wait_op.hpp rename to c++/boost/asio/detail/io_uring_wait_op.hpp diff --git a/c++/include/boost/asio/detail/is_buffer_sequence.hpp b/c++/boost/asio/detail/is_buffer_sequence.hpp similarity index 100% rename from c++/include/boost/asio/detail/is_buffer_sequence.hpp rename to c++/boost/asio/detail/is_buffer_sequence.hpp diff --git a/c++/include/boost/asio/detail/is_executor.hpp b/c++/boost/asio/detail/is_executor.hpp similarity index 100% rename from c++/include/boost/asio/detail/is_executor.hpp rename to c++/boost/asio/detail/is_executor.hpp diff --git a/c++/include/boost/asio/detail/keyword_tss_ptr.hpp b/c++/boost/asio/detail/keyword_tss_ptr.hpp similarity index 100% rename from c++/include/boost/asio/detail/keyword_tss_ptr.hpp rename to c++/boost/asio/detail/keyword_tss_ptr.hpp diff --git a/c++/include/boost/asio/detail/kqueue_reactor.hpp b/c++/boost/asio/detail/kqueue_reactor.hpp similarity index 100% rename from c++/include/boost/asio/detail/kqueue_reactor.hpp rename to c++/boost/asio/detail/kqueue_reactor.hpp diff --git a/c++/include/boost/asio/detail/limits.hpp b/c++/boost/asio/detail/limits.hpp similarity index 100% rename from c++/include/boost/asio/detail/limits.hpp rename to c++/boost/asio/detail/limits.hpp diff --git a/c++/include/boost/asio/detail/local_free_on_block_exit.hpp b/c++/boost/asio/detail/local_free_on_block_exit.hpp similarity index 100% rename from c++/include/boost/asio/detail/local_free_on_block_exit.hpp rename to c++/boost/asio/detail/local_free_on_block_exit.hpp diff --git a/c++/include/boost/asio/detail/macos_fenced_block.hpp b/c++/boost/asio/detail/macos_fenced_block.hpp similarity index 100% rename from c++/include/boost/asio/detail/macos_fenced_block.hpp rename to c++/boost/asio/detail/macos_fenced_block.hpp diff --git a/c++/include/boost/asio/detail/memory.hpp b/c++/boost/asio/detail/memory.hpp similarity index 100% rename from c++/include/boost/asio/detail/memory.hpp rename to c++/boost/asio/detail/memory.hpp diff --git a/c++/include/boost/asio/detail/mutex.hpp b/c++/boost/asio/detail/mutex.hpp similarity index 100% rename from c++/include/boost/asio/detail/mutex.hpp rename to c++/boost/asio/detail/mutex.hpp diff --git a/c++/include/boost/asio/detail/non_const_lvalue.hpp b/c++/boost/asio/detail/non_const_lvalue.hpp similarity index 100% rename from c++/include/boost/asio/detail/non_const_lvalue.hpp rename to c++/boost/asio/detail/non_const_lvalue.hpp diff --git a/c++/include/boost/asio/detail/noncopyable.hpp b/c++/boost/asio/detail/noncopyable.hpp similarity index 100% rename from c++/include/boost/asio/detail/noncopyable.hpp rename to c++/boost/asio/detail/noncopyable.hpp diff --git a/c++/include/boost/asio/detail/null_event.hpp b/c++/boost/asio/detail/null_event.hpp similarity index 100% rename from c++/include/boost/asio/detail/null_event.hpp rename to c++/boost/asio/detail/null_event.hpp diff --git a/c++/include/boost/asio/detail/null_fenced_block.hpp b/c++/boost/asio/detail/null_fenced_block.hpp similarity index 100% rename from c++/include/boost/asio/detail/null_fenced_block.hpp rename to c++/boost/asio/detail/null_fenced_block.hpp diff --git a/c++/include/boost/asio/detail/null_global.hpp b/c++/boost/asio/detail/null_global.hpp similarity index 100% rename from c++/include/boost/asio/detail/null_global.hpp rename to c++/boost/asio/detail/null_global.hpp diff --git a/c++/include/boost/asio/detail/null_mutex.hpp b/c++/boost/asio/detail/null_mutex.hpp similarity index 100% rename from c++/include/boost/asio/detail/null_mutex.hpp rename to c++/boost/asio/detail/null_mutex.hpp diff --git a/c++/include/boost/asio/detail/null_reactor.hpp b/c++/boost/asio/detail/null_reactor.hpp similarity index 100% rename from c++/include/boost/asio/detail/null_reactor.hpp rename to c++/boost/asio/detail/null_reactor.hpp diff --git a/c++/include/boost/asio/detail/null_signal_blocker.hpp b/c++/boost/asio/detail/null_signal_blocker.hpp similarity index 100% rename from c++/include/boost/asio/detail/null_signal_blocker.hpp rename to c++/boost/asio/detail/null_signal_blocker.hpp diff --git a/c++/include/boost/asio/detail/null_socket_service.hpp b/c++/boost/asio/detail/null_socket_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/null_socket_service.hpp rename to c++/boost/asio/detail/null_socket_service.hpp diff --git a/c++/include/boost/asio/detail/null_static_mutex.hpp b/c++/boost/asio/detail/null_static_mutex.hpp similarity index 100% rename from c++/include/boost/asio/detail/null_static_mutex.hpp rename to c++/boost/asio/detail/null_static_mutex.hpp diff --git a/c++/include/boost/asio/detail/null_thread.hpp b/c++/boost/asio/detail/null_thread.hpp similarity index 100% rename from c++/include/boost/asio/detail/null_thread.hpp rename to c++/boost/asio/detail/null_thread.hpp diff --git a/c++/include/boost/asio/detail/null_tss_ptr.hpp b/c++/boost/asio/detail/null_tss_ptr.hpp similarity index 100% rename from c++/include/boost/asio/detail/null_tss_ptr.hpp rename to c++/boost/asio/detail/null_tss_ptr.hpp diff --git a/c++/include/boost/asio/detail/object_pool.hpp b/c++/boost/asio/detail/object_pool.hpp similarity index 100% rename from c++/include/boost/asio/detail/object_pool.hpp rename to c++/boost/asio/detail/object_pool.hpp diff --git a/c++/include/boost/asio/detail/old_win_sdk_compat.hpp b/c++/boost/asio/detail/old_win_sdk_compat.hpp similarity index 100% rename from c++/include/boost/asio/detail/old_win_sdk_compat.hpp rename to c++/boost/asio/detail/old_win_sdk_compat.hpp diff --git a/c++/include/boost/asio/detail/op_queue.hpp b/c++/boost/asio/detail/op_queue.hpp similarity index 100% rename from c++/include/boost/asio/detail/op_queue.hpp rename to c++/boost/asio/detail/op_queue.hpp diff --git a/c++/include/boost/asio/detail/operation.hpp b/c++/boost/asio/detail/operation.hpp similarity index 100% rename from c++/include/boost/asio/detail/operation.hpp rename to c++/boost/asio/detail/operation.hpp diff --git a/c++/include/boost/asio/detail/pipe_select_interrupter.hpp b/c++/boost/asio/detail/pipe_select_interrupter.hpp similarity index 100% rename from c++/include/boost/asio/detail/pipe_select_interrupter.hpp rename to c++/boost/asio/detail/pipe_select_interrupter.hpp diff --git a/c++/include/boost/asio/detail/pop_options.hpp b/c++/boost/asio/detail/pop_options.hpp similarity index 100% rename from c++/include/boost/asio/detail/pop_options.hpp rename to c++/boost/asio/detail/pop_options.hpp diff --git a/c++/include/boost/asio/detail/posix_event.hpp b/c++/boost/asio/detail/posix_event.hpp similarity index 100% rename from c++/include/boost/asio/detail/posix_event.hpp rename to c++/boost/asio/detail/posix_event.hpp diff --git a/c++/include/boost/asio/detail/posix_fd_set_adapter.hpp b/c++/boost/asio/detail/posix_fd_set_adapter.hpp similarity index 100% rename from c++/include/boost/asio/detail/posix_fd_set_adapter.hpp rename to c++/boost/asio/detail/posix_fd_set_adapter.hpp diff --git a/c++/include/boost/asio/detail/posix_global.hpp b/c++/boost/asio/detail/posix_global.hpp similarity index 100% rename from c++/include/boost/asio/detail/posix_global.hpp rename to c++/boost/asio/detail/posix_global.hpp diff --git a/c++/include/boost/asio/detail/posix_mutex.hpp b/c++/boost/asio/detail/posix_mutex.hpp similarity index 100% rename from c++/include/boost/asio/detail/posix_mutex.hpp rename to c++/boost/asio/detail/posix_mutex.hpp diff --git a/c++/include/boost/asio/detail/posix_serial_port_service.hpp b/c++/boost/asio/detail/posix_serial_port_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/posix_serial_port_service.hpp rename to c++/boost/asio/detail/posix_serial_port_service.hpp diff --git a/c++/include/boost/asio/detail/posix_signal_blocker.hpp b/c++/boost/asio/detail/posix_signal_blocker.hpp similarity index 100% rename from c++/include/boost/asio/detail/posix_signal_blocker.hpp rename to c++/boost/asio/detail/posix_signal_blocker.hpp diff --git a/c++/include/boost/asio/detail/posix_static_mutex.hpp b/c++/boost/asio/detail/posix_static_mutex.hpp similarity index 100% rename from c++/include/boost/asio/detail/posix_static_mutex.hpp rename to c++/boost/asio/detail/posix_static_mutex.hpp diff --git a/c++/include/boost/asio/detail/posix_thread.hpp b/c++/boost/asio/detail/posix_thread.hpp similarity index 100% rename from c++/include/boost/asio/detail/posix_thread.hpp rename to c++/boost/asio/detail/posix_thread.hpp diff --git a/c++/include/boost/asio/detail/posix_tss_ptr.hpp b/c++/boost/asio/detail/posix_tss_ptr.hpp similarity index 100% rename from c++/include/boost/asio/detail/posix_tss_ptr.hpp rename to c++/boost/asio/detail/posix_tss_ptr.hpp diff --git a/c++/include/boost/asio/detail/push_options.hpp b/c++/boost/asio/detail/push_options.hpp similarity index 100% rename from c++/include/boost/asio/detail/push_options.hpp rename to c++/boost/asio/detail/push_options.hpp diff --git a/c++/include/boost/asio/detail/reactive_descriptor_service.hpp b/c++/boost/asio/detail/reactive_descriptor_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactive_descriptor_service.hpp rename to c++/boost/asio/detail/reactive_descriptor_service.hpp diff --git a/c++/include/boost/asio/detail/reactive_null_buffers_op.hpp b/c++/boost/asio/detail/reactive_null_buffers_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactive_null_buffers_op.hpp rename to c++/boost/asio/detail/reactive_null_buffers_op.hpp diff --git a/c++/include/boost/asio/detail/reactive_socket_accept_op.hpp b/c++/boost/asio/detail/reactive_socket_accept_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactive_socket_accept_op.hpp rename to c++/boost/asio/detail/reactive_socket_accept_op.hpp diff --git a/c++/include/boost/asio/detail/reactive_socket_connect_op.hpp b/c++/boost/asio/detail/reactive_socket_connect_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactive_socket_connect_op.hpp rename to c++/boost/asio/detail/reactive_socket_connect_op.hpp diff --git a/c++/include/boost/asio/detail/reactive_socket_recv_op.hpp b/c++/boost/asio/detail/reactive_socket_recv_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactive_socket_recv_op.hpp rename to c++/boost/asio/detail/reactive_socket_recv_op.hpp diff --git a/c++/include/boost/asio/detail/reactive_socket_recvfrom_op.hpp b/c++/boost/asio/detail/reactive_socket_recvfrom_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactive_socket_recvfrom_op.hpp rename to c++/boost/asio/detail/reactive_socket_recvfrom_op.hpp diff --git a/c++/include/boost/asio/detail/reactive_socket_recvmsg_op.hpp b/c++/boost/asio/detail/reactive_socket_recvmsg_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactive_socket_recvmsg_op.hpp rename to c++/boost/asio/detail/reactive_socket_recvmsg_op.hpp diff --git a/c++/include/boost/asio/detail/reactive_socket_send_op.hpp b/c++/boost/asio/detail/reactive_socket_send_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactive_socket_send_op.hpp rename to c++/boost/asio/detail/reactive_socket_send_op.hpp diff --git a/c++/include/boost/asio/detail/reactive_socket_sendto_op.hpp b/c++/boost/asio/detail/reactive_socket_sendto_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactive_socket_sendto_op.hpp rename to c++/boost/asio/detail/reactive_socket_sendto_op.hpp diff --git a/c++/include/boost/asio/detail/reactive_socket_service.hpp b/c++/boost/asio/detail/reactive_socket_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactive_socket_service.hpp rename to c++/boost/asio/detail/reactive_socket_service.hpp diff --git a/c++/include/boost/asio/detail/reactive_socket_service_base.hpp b/c++/boost/asio/detail/reactive_socket_service_base.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactive_socket_service_base.hpp rename to c++/boost/asio/detail/reactive_socket_service_base.hpp diff --git a/c++/include/boost/asio/detail/reactive_wait_op.hpp b/c++/boost/asio/detail/reactive_wait_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactive_wait_op.hpp rename to c++/boost/asio/detail/reactive_wait_op.hpp diff --git a/c++/include/boost/asio/detail/reactor.hpp b/c++/boost/asio/detail/reactor.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactor.hpp rename to c++/boost/asio/detail/reactor.hpp diff --git a/c++/include/boost/asio/detail/reactor_op.hpp b/c++/boost/asio/detail/reactor_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactor_op.hpp rename to c++/boost/asio/detail/reactor_op.hpp diff --git a/c++/include/boost/asio/detail/reactor_op_queue.hpp b/c++/boost/asio/detail/reactor_op_queue.hpp similarity index 100% rename from c++/include/boost/asio/detail/reactor_op_queue.hpp rename to c++/boost/asio/detail/reactor_op_queue.hpp diff --git a/c++/include/boost/asio/detail/recycling_allocator.hpp b/c++/boost/asio/detail/recycling_allocator.hpp similarity index 100% rename from c++/include/boost/asio/detail/recycling_allocator.hpp rename to c++/boost/asio/detail/recycling_allocator.hpp diff --git a/c++/include/boost/asio/detail/regex_fwd.hpp b/c++/boost/asio/detail/regex_fwd.hpp similarity index 100% rename from c++/include/boost/asio/detail/regex_fwd.hpp rename to c++/boost/asio/detail/regex_fwd.hpp diff --git a/c++/include/boost/asio/detail/resolve_endpoint_op.hpp b/c++/boost/asio/detail/resolve_endpoint_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/resolve_endpoint_op.hpp rename to c++/boost/asio/detail/resolve_endpoint_op.hpp diff --git a/c++/include/boost/asio/detail/resolve_op.hpp b/c++/boost/asio/detail/resolve_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/resolve_op.hpp rename to c++/boost/asio/detail/resolve_op.hpp diff --git a/c++/include/boost/asio/detail/resolve_query_op.hpp b/c++/boost/asio/detail/resolve_query_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/resolve_query_op.hpp rename to c++/boost/asio/detail/resolve_query_op.hpp diff --git a/c++/include/boost/asio/detail/resolver_service.hpp b/c++/boost/asio/detail/resolver_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/resolver_service.hpp rename to c++/boost/asio/detail/resolver_service.hpp diff --git a/c++/include/boost/asio/detail/resolver_service_base.hpp b/c++/boost/asio/detail/resolver_service_base.hpp similarity index 100% rename from c++/include/boost/asio/detail/resolver_service_base.hpp rename to c++/boost/asio/detail/resolver_service_base.hpp diff --git a/c++/include/boost/asio/detail/scheduler.hpp b/c++/boost/asio/detail/scheduler.hpp similarity index 100% rename from c++/include/boost/asio/detail/scheduler.hpp rename to c++/boost/asio/detail/scheduler.hpp diff --git a/c++/include/boost/asio/detail/scheduler_operation.hpp b/c++/boost/asio/detail/scheduler_operation.hpp similarity index 100% rename from c++/include/boost/asio/detail/scheduler_operation.hpp rename to c++/boost/asio/detail/scheduler_operation.hpp diff --git a/c++/include/boost/asio/detail/scheduler_task.hpp b/c++/boost/asio/detail/scheduler_task.hpp similarity index 100% rename from c++/include/boost/asio/detail/scheduler_task.hpp rename to c++/boost/asio/detail/scheduler_task.hpp diff --git a/c++/include/boost/asio/detail/scheduler_thread_info.hpp b/c++/boost/asio/detail/scheduler_thread_info.hpp similarity index 100% rename from c++/include/boost/asio/detail/scheduler_thread_info.hpp rename to c++/boost/asio/detail/scheduler_thread_info.hpp diff --git a/c++/include/boost/asio/detail/scoped_lock.hpp b/c++/boost/asio/detail/scoped_lock.hpp similarity index 100% rename from c++/include/boost/asio/detail/scoped_lock.hpp rename to c++/boost/asio/detail/scoped_lock.hpp diff --git a/c++/include/boost/asio/detail/scoped_ptr.hpp b/c++/boost/asio/detail/scoped_ptr.hpp similarity index 100% rename from c++/include/boost/asio/detail/scoped_ptr.hpp rename to c++/boost/asio/detail/scoped_ptr.hpp diff --git a/c++/include/boost/asio/detail/select_interrupter.hpp b/c++/boost/asio/detail/select_interrupter.hpp similarity index 100% rename from c++/include/boost/asio/detail/select_interrupter.hpp rename to c++/boost/asio/detail/select_interrupter.hpp diff --git a/c++/include/boost/asio/detail/select_reactor.hpp b/c++/boost/asio/detail/select_reactor.hpp similarity index 100% rename from c++/include/boost/asio/detail/select_reactor.hpp rename to c++/boost/asio/detail/select_reactor.hpp diff --git a/c++/include/boost/asio/detail/service_registry.hpp b/c++/boost/asio/detail/service_registry.hpp similarity index 100% rename from c++/include/boost/asio/detail/service_registry.hpp rename to c++/boost/asio/detail/service_registry.hpp diff --git a/c++/include/boost/asio/detail/signal_blocker.hpp b/c++/boost/asio/detail/signal_blocker.hpp similarity index 100% rename from c++/include/boost/asio/detail/signal_blocker.hpp rename to c++/boost/asio/detail/signal_blocker.hpp diff --git a/c++/include/boost/asio/detail/signal_handler.hpp b/c++/boost/asio/detail/signal_handler.hpp similarity index 100% rename from c++/include/boost/asio/detail/signal_handler.hpp rename to c++/boost/asio/detail/signal_handler.hpp diff --git a/c++/include/boost/asio/detail/signal_init.hpp b/c++/boost/asio/detail/signal_init.hpp similarity index 100% rename from c++/include/boost/asio/detail/signal_init.hpp rename to c++/boost/asio/detail/signal_init.hpp diff --git a/c++/include/boost/asio/detail/signal_op.hpp b/c++/boost/asio/detail/signal_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/signal_op.hpp rename to c++/boost/asio/detail/signal_op.hpp diff --git a/c++/include/boost/asio/detail/signal_set_service.hpp b/c++/boost/asio/detail/signal_set_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/signal_set_service.hpp rename to c++/boost/asio/detail/signal_set_service.hpp diff --git a/c++/include/boost/asio/detail/socket_holder.hpp b/c++/boost/asio/detail/socket_holder.hpp similarity index 100% rename from c++/include/boost/asio/detail/socket_holder.hpp rename to c++/boost/asio/detail/socket_holder.hpp diff --git a/c++/include/boost/asio/detail/socket_ops.hpp b/c++/boost/asio/detail/socket_ops.hpp similarity index 100% rename from c++/include/boost/asio/detail/socket_ops.hpp rename to c++/boost/asio/detail/socket_ops.hpp diff --git a/c++/include/boost/asio/detail/socket_option.hpp b/c++/boost/asio/detail/socket_option.hpp similarity index 100% rename from c++/include/boost/asio/detail/socket_option.hpp rename to c++/boost/asio/detail/socket_option.hpp diff --git a/c++/include/boost/asio/detail/socket_select_interrupter.hpp b/c++/boost/asio/detail/socket_select_interrupter.hpp similarity index 100% rename from c++/include/boost/asio/detail/socket_select_interrupter.hpp rename to c++/boost/asio/detail/socket_select_interrupter.hpp diff --git a/c++/include/boost/asio/detail/socket_types.hpp b/c++/boost/asio/detail/socket_types.hpp similarity index 100% rename from c++/include/boost/asio/detail/socket_types.hpp rename to c++/boost/asio/detail/socket_types.hpp diff --git a/c++/include/boost/asio/detail/solaris_fenced_block.hpp b/c++/boost/asio/detail/solaris_fenced_block.hpp similarity index 100% rename from c++/include/boost/asio/detail/solaris_fenced_block.hpp rename to c++/boost/asio/detail/solaris_fenced_block.hpp diff --git a/c++/include/boost/asio/detail/source_location.hpp b/c++/boost/asio/detail/source_location.hpp similarity index 100% rename from c++/include/boost/asio/detail/source_location.hpp rename to c++/boost/asio/detail/source_location.hpp diff --git a/c++/include/boost/asio/detail/static_mutex.hpp b/c++/boost/asio/detail/static_mutex.hpp similarity index 100% rename from c++/include/boost/asio/detail/static_mutex.hpp rename to c++/boost/asio/detail/static_mutex.hpp diff --git a/c++/include/boost/asio/detail/std_event.hpp b/c++/boost/asio/detail/std_event.hpp similarity index 100% rename from c++/include/boost/asio/detail/std_event.hpp rename to c++/boost/asio/detail/std_event.hpp diff --git a/c++/include/boost/asio/detail/std_fenced_block.hpp b/c++/boost/asio/detail/std_fenced_block.hpp similarity index 100% rename from c++/include/boost/asio/detail/std_fenced_block.hpp rename to c++/boost/asio/detail/std_fenced_block.hpp diff --git a/c++/include/boost/asio/detail/std_global.hpp b/c++/boost/asio/detail/std_global.hpp similarity index 100% rename from c++/include/boost/asio/detail/std_global.hpp rename to c++/boost/asio/detail/std_global.hpp diff --git a/c++/include/boost/asio/detail/std_mutex.hpp b/c++/boost/asio/detail/std_mutex.hpp similarity index 100% rename from c++/include/boost/asio/detail/std_mutex.hpp rename to c++/boost/asio/detail/std_mutex.hpp diff --git a/c++/include/boost/asio/detail/std_static_mutex.hpp b/c++/boost/asio/detail/std_static_mutex.hpp similarity index 100% rename from c++/include/boost/asio/detail/std_static_mutex.hpp rename to c++/boost/asio/detail/std_static_mutex.hpp diff --git a/c++/include/boost/asio/detail/std_thread.hpp b/c++/boost/asio/detail/std_thread.hpp similarity index 100% rename from c++/include/boost/asio/detail/std_thread.hpp rename to c++/boost/asio/detail/std_thread.hpp diff --git a/c++/include/boost/asio/detail/strand_executor_service.hpp b/c++/boost/asio/detail/strand_executor_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/strand_executor_service.hpp rename to c++/boost/asio/detail/strand_executor_service.hpp diff --git a/c++/include/boost/asio/detail/strand_service.hpp b/c++/boost/asio/detail/strand_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/strand_service.hpp rename to c++/boost/asio/detail/strand_service.hpp diff --git a/c++/include/boost/asio/detail/string_view.hpp b/c++/boost/asio/detail/string_view.hpp similarity index 100% rename from c++/include/boost/asio/detail/string_view.hpp rename to c++/boost/asio/detail/string_view.hpp diff --git a/c++/include/boost/asio/detail/thread.hpp b/c++/boost/asio/detail/thread.hpp similarity index 100% rename from c++/include/boost/asio/detail/thread.hpp rename to c++/boost/asio/detail/thread.hpp diff --git a/c++/include/boost/asio/detail/thread_context.hpp b/c++/boost/asio/detail/thread_context.hpp similarity index 100% rename from c++/include/boost/asio/detail/thread_context.hpp rename to c++/boost/asio/detail/thread_context.hpp diff --git a/c++/include/boost/asio/detail/thread_group.hpp b/c++/boost/asio/detail/thread_group.hpp similarity index 100% rename from c++/include/boost/asio/detail/thread_group.hpp rename to c++/boost/asio/detail/thread_group.hpp diff --git a/c++/include/boost/asio/detail/thread_info_base.hpp b/c++/boost/asio/detail/thread_info_base.hpp similarity index 100% rename from c++/include/boost/asio/detail/thread_info_base.hpp rename to c++/boost/asio/detail/thread_info_base.hpp diff --git a/c++/include/boost/asio/detail/throw_error.hpp b/c++/boost/asio/detail/throw_error.hpp similarity index 100% rename from c++/include/boost/asio/detail/throw_error.hpp rename to c++/boost/asio/detail/throw_error.hpp diff --git a/c++/include/boost/asio/detail/throw_exception.hpp b/c++/boost/asio/detail/throw_exception.hpp similarity index 100% rename from c++/include/boost/asio/detail/throw_exception.hpp rename to c++/boost/asio/detail/throw_exception.hpp diff --git a/c++/include/boost/asio/detail/timer_queue.hpp b/c++/boost/asio/detail/timer_queue.hpp similarity index 100% rename from c++/include/boost/asio/detail/timer_queue.hpp rename to c++/boost/asio/detail/timer_queue.hpp diff --git a/c++/include/boost/asio/detail/timer_queue_base.hpp b/c++/boost/asio/detail/timer_queue_base.hpp similarity index 100% rename from c++/include/boost/asio/detail/timer_queue_base.hpp rename to c++/boost/asio/detail/timer_queue_base.hpp diff --git a/c++/include/boost/asio/detail/timer_queue_ptime.hpp b/c++/boost/asio/detail/timer_queue_ptime.hpp similarity index 100% rename from c++/include/boost/asio/detail/timer_queue_ptime.hpp rename to c++/boost/asio/detail/timer_queue_ptime.hpp diff --git a/c++/include/boost/asio/detail/timer_queue_set.hpp b/c++/boost/asio/detail/timer_queue_set.hpp similarity index 100% rename from c++/include/boost/asio/detail/timer_queue_set.hpp rename to c++/boost/asio/detail/timer_queue_set.hpp diff --git a/c++/include/boost/asio/detail/timer_scheduler.hpp b/c++/boost/asio/detail/timer_scheduler.hpp similarity index 100% rename from c++/include/boost/asio/detail/timer_scheduler.hpp rename to c++/boost/asio/detail/timer_scheduler.hpp diff --git a/c++/include/boost/asio/detail/timer_scheduler_fwd.hpp b/c++/boost/asio/detail/timer_scheduler_fwd.hpp similarity index 100% rename from c++/include/boost/asio/detail/timer_scheduler_fwd.hpp rename to c++/boost/asio/detail/timer_scheduler_fwd.hpp diff --git a/c++/include/boost/asio/detail/tss_ptr.hpp b/c++/boost/asio/detail/tss_ptr.hpp similarity index 100% rename from c++/include/boost/asio/detail/tss_ptr.hpp rename to c++/boost/asio/detail/tss_ptr.hpp diff --git a/c++/include/boost/asio/detail/type_traits.hpp b/c++/boost/asio/detail/type_traits.hpp similarity index 100% rename from c++/include/boost/asio/detail/type_traits.hpp rename to c++/boost/asio/detail/type_traits.hpp diff --git a/c++/include/boost/asio/detail/utility.hpp b/c++/boost/asio/detail/utility.hpp similarity index 100% rename from c++/include/boost/asio/detail/utility.hpp rename to c++/boost/asio/detail/utility.hpp diff --git a/c++/include/boost/asio/detail/variadic_templates.hpp b/c++/boost/asio/detail/variadic_templates.hpp similarity index 100% rename from c++/include/boost/asio/detail/variadic_templates.hpp rename to c++/boost/asio/detail/variadic_templates.hpp diff --git a/c++/include/boost/asio/detail/wait_handler.hpp b/c++/boost/asio/detail/wait_handler.hpp similarity index 100% rename from c++/include/boost/asio/detail/wait_handler.hpp rename to c++/boost/asio/detail/wait_handler.hpp diff --git a/c++/include/boost/asio/detail/wait_op.hpp b/c++/boost/asio/detail/wait_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/wait_op.hpp rename to c++/boost/asio/detail/wait_op.hpp diff --git a/c++/include/boost/asio/detail/win_event.hpp b/c++/boost/asio/detail/win_event.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_event.hpp rename to c++/boost/asio/detail/win_event.hpp diff --git a/c++/include/boost/asio/detail/win_fd_set_adapter.hpp b/c++/boost/asio/detail/win_fd_set_adapter.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_fd_set_adapter.hpp rename to c++/boost/asio/detail/win_fd_set_adapter.hpp diff --git a/c++/include/boost/asio/detail/win_fenced_block.hpp b/c++/boost/asio/detail/win_fenced_block.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_fenced_block.hpp rename to c++/boost/asio/detail/win_fenced_block.hpp diff --git a/c++/include/boost/asio/detail/win_global.hpp b/c++/boost/asio/detail/win_global.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_global.hpp rename to c++/boost/asio/detail/win_global.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_file_service.hpp b/c++/boost/asio/detail/win_iocp_file_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_file_service.hpp rename to c++/boost/asio/detail/win_iocp_file_service.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_handle_read_op.hpp b/c++/boost/asio/detail/win_iocp_handle_read_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_handle_read_op.hpp rename to c++/boost/asio/detail/win_iocp_handle_read_op.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_handle_service.hpp b/c++/boost/asio/detail/win_iocp_handle_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_handle_service.hpp rename to c++/boost/asio/detail/win_iocp_handle_service.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_handle_write_op.hpp b/c++/boost/asio/detail/win_iocp_handle_write_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_handle_write_op.hpp rename to c++/boost/asio/detail/win_iocp_handle_write_op.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_io_context.hpp b/c++/boost/asio/detail/win_iocp_io_context.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_io_context.hpp rename to c++/boost/asio/detail/win_iocp_io_context.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_null_buffers_op.hpp b/c++/boost/asio/detail/win_iocp_null_buffers_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_null_buffers_op.hpp rename to c++/boost/asio/detail/win_iocp_null_buffers_op.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_operation.hpp b/c++/boost/asio/detail/win_iocp_operation.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_operation.hpp rename to c++/boost/asio/detail/win_iocp_operation.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_overlapped_op.hpp b/c++/boost/asio/detail/win_iocp_overlapped_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_overlapped_op.hpp rename to c++/boost/asio/detail/win_iocp_overlapped_op.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_overlapped_ptr.hpp b/c++/boost/asio/detail/win_iocp_overlapped_ptr.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_overlapped_ptr.hpp rename to c++/boost/asio/detail/win_iocp_overlapped_ptr.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_serial_port_service.hpp b/c++/boost/asio/detail/win_iocp_serial_port_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_serial_port_service.hpp rename to c++/boost/asio/detail/win_iocp_serial_port_service.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_socket_accept_op.hpp b/c++/boost/asio/detail/win_iocp_socket_accept_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_socket_accept_op.hpp rename to c++/boost/asio/detail/win_iocp_socket_accept_op.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_socket_connect_op.hpp b/c++/boost/asio/detail/win_iocp_socket_connect_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_socket_connect_op.hpp rename to c++/boost/asio/detail/win_iocp_socket_connect_op.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_socket_recv_op.hpp b/c++/boost/asio/detail/win_iocp_socket_recv_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_socket_recv_op.hpp rename to c++/boost/asio/detail/win_iocp_socket_recv_op.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_socket_recvfrom_op.hpp b/c++/boost/asio/detail/win_iocp_socket_recvfrom_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_socket_recvfrom_op.hpp rename to c++/boost/asio/detail/win_iocp_socket_recvfrom_op.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_socket_recvmsg_op.hpp b/c++/boost/asio/detail/win_iocp_socket_recvmsg_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_socket_recvmsg_op.hpp rename to c++/boost/asio/detail/win_iocp_socket_recvmsg_op.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_socket_send_op.hpp b/c++/boost/asio/detail/win_iocp_socket_send_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_socket_send_op.hpp rename to c++/boost/asio/detail/win_iocp_socket_send_op.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_socket_service.hpp b/c++/boost/asio/detail/win_iocp_socket_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_socket_service.hpp rename to c++/boost/asio/detail/win_iocp_socket_service.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_socket_service_base.hpp b/c++/boost/asio/detail/win_iocp_socket_service_base.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_socket_service_base.hpp rename to c++/boost/asio/detail/win_iocp_socket_service_base.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_thread_info.hpp b/c++/boost/asio/detail/win_iocp_thread_info.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_thread_info.hpp rename to c++/boost/asio/detail/win_iocp_thread_info.hpp diff --git a/c++/include/boost/asio/detail/win_iocp_wait_op.hpp b/c++/boost/asio/detail/win_iocp_wait_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_iocp_wait_op.hpp rename to c++/boost/asio/detail/win_iocp_wait_op.hpp diff --git a/c++/include/boost/asio/detail/win_mutex.hpp b/c++/boost/asio/detail/win_mutex.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_mutex.hpp rename to c++/boost/asio/detail/win_mutex.hpp diff --git a/c++/include/boost/asio/detail/win_object_handle_service.hpp b/c++/boost/asio/detail/win_object_handle_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_object_handle_service.hpp rename to c++/boost/asio/detail/win_object_handle_service.hpp diff --git a/c++/include/boost/asio/detail/win_static_mutex.hpp b/c++/boost/asio/detail/win_static_mutex.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_static_mutex.hpp rename to c++/boost/asio/detail/win_static_mutex.hpp diff --git a/c++/include/boost/asio/detail/win_thread.hpp b/c++/boost/asio/detail/win_thread.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_thread.hpp rename to c++/boost/asio/detail/win_thread.hpp diff --git a/c++/include/boost/asio/detail/win_tss_ptr.hpp b/c++/boost/asio/detail/win_tss_ptr.hpp similarity index 100% rename from c++/include/boost/asio/detail/win_tss_ptr.hpp rename to c++/boost/asio/detail/win_tss_ptr.hpp diff --git a/c++/include/boost/asio/detail/winapp_thread.hpp b/c++/boost/asio/detail/winapp_thread.hpp similarity index 100% rename from c++/include/boost/asio/detail/winapp_thread.hpp rename to c++/boost/asio/detail/winapp_thread.hpp diff --git a/c++/include/boost/asio/detail/wince_thread.hpp b/c++/boost/asio/detail/wince_thread.hpp similarity index 100% rename from c++/include/boost/asio/detail/wince_thread.hpp rename to c++/boost/asio/detail/wince_thread.hpp diff --git a/c++/include/boost/asio/detail/winrt_async_manager.hpp b/c++/boost/asio/detail/winrt_async_manager.hpp similarity index 100% rename from c++/include/boost/asio/detail/winrt_async_manager.hpp rename to c++/boost/asio/detail/winrt_async_manager.hpp diff --git a/c++/include/boost/asio/detail/winrt_async_op.hpp b/c++/boost/asio/detail/winrt_async_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/winrt_async_op.hpp rename to c++/boost/asio/detail/winrt_async_op.hpp diff --git a/c++/include/boost/asio/detail/winrt_resolve_op.hpp b/c++/boost/asio/detail/winrt_resolve_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/winrt_resolve_op.hpp rename to c++/boost/asio/detail/winrt_resolve_op.hpp diff --git a/c++/include/boost/asio/detail/winrt_resolver_service.hpp b/c++/boost/asio/detail/winrt_resolver_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/winrt_resolver_service.hpp rename to c++/boost/asio/detail/winrt_resolver_service.hpp diff --git a/c++/include/boost/asio/detail/winrt_socket_connect_op.hpp b/c++/boost/asio/detail/winrt_socket_connect_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/winrt_socket_connect_op.hpp rename to c++/boost/asio/detail/winrt_socket_connect_op.hpp diff --git a/c++/include/boost/asio/detail/winrt_socket_recv_op.hpp b/c++/boost/asio/detail/winrt_socket_recv_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/winrt_socket_recv_op.hpp rename to c++/boost/asio/detail/winrt_socket_recv_op.hpp diff --git a/c++/include/boost/asio/detail/winrt_socket_send_op.hpp b/c++/boost/asio/detail/winrt_socket_send_op.hpp similarity index 100% rename from c++/include/boost/asio/detail/winrt_socket_send_op.hpp rename to c++/boost/asio/detail/winrt_socket_send_op.hpp diff --git a/c++/include/boost/asio/detail/winrt_ssocket_service.hpp b/c++/boost/asio/detail/winrt_ssocket_service.hpp similarity index 100% rename from c++/include/boost/asio/detail/winrt_ssocket_service.hpp rename to c++/boost/asio/detail/winrt_ssocket_service.hpp diff --git a/c++/include/boost/asio/detail/winrt_ssocket_service_base.hpp b/c++/boost/asio/detail/winrt_ssocket_service_base.hpp similarity index 100% rename from c++/include/boost/asio/detail/winrt_ssocket_service_base.hpp rename to c++/boost/asio/detail/winrt_ssocket_service_base.hpp diff --git a/c++/include/boost/asio/detail/winrt_timer_scheduler.hpp b/c++/boost/asio/detail/winrt_timer_scheduler.hpp similarity index 100% rename from c++/include/boost/asio/detail/winrt_timer_scheduler.hpp rename to c++/boost/asio/detail/winrt_timer_scheduler.hpp diff --git a/c++/include/boost/asio/detail/winrt_utils.hpp b/c++/boost/asio/detail/winrt_utils.hpp similarity index 100% rename from c++/include/boost/asio/detail/winrt_utils.hpp rename to c++/boost/asio/detail/winrt_utils.hpp diff --git a/c++/include/boost/asio/detail/winsock_init.hpp b/c++/boost/asio/detail/winsock_init.hpp similarity index 100% rename from c++/include/boost/asio/detail/winsock_init.hpp rename to c++/boost/asio/detail/winsock_init.hpp diff --git a/c++/include/boost/asio/detail/work_dispatcher.hpp b/c++/boost/asio/detail/work_dispatcher.hpp similarity index 100% rename from c++/include/boost/asio/detail/work_dispatcher.hpp rename to c++/boost/asio/detail/work_dispatcher.hpp diff --git a/c++/include/boost/asio/detail/wrapped_handler.hpp b/c++/boost/asio/detail/wrapped_handler.hpp similarity index 100% rename from c++/include/boost/asio/detail/wrapped_handler.hpp rename to c++/boost/asio/detail/wrapped_handler.hpp diff --git a/c++/include/boost/asio/dispatch.hpp b/c++/boost/asio/dispatch.hpp similarity index 100% rename from c++/include/boost/asio/dispatch.hpp rename to c++/boost/asio/dispatch.hpp diff --git a/c++/include/boost/asio/error.hpp b/c++/boost/asio/error.hpp similarity index 100% rename from c++/include/boost/asio/error.hpp rename to c++/boost/asio/error.hpp diff --git a/c++/include/boost/asio/execution.hpp b/c++/boost/asio/execution.hpp similarity index 100% rename from c++/include/boost/asio/execution.hpp rename to c++/boost/asio/execution.hpp diff --git a/c++/include/boost/asio/execution/allocator.hpp b/c++/boost/asio/execution/allocator.hpp similarity index 100% rename from c++/include/boost/asio/execution/allocator.hpp rename to c++/boost/asio/execution/allocator.hpp diff --git a/c++/include/boost/asio/execution/any_executor.hpp b/c++/boost/asio/execution/any_executor.hpp similarity index 100% rename from c++/include/boost/asio/execution/any_executor.hpp rename to c++/boost/asio/execution/any_executor.hpp diff --git a/c++/include/boost/asio/execution/bad_executor.hpp b/c++/boost/asio/execution/bad_executor.hpp similarity index 100% rename from c++/include/boost/asio/execution/bad_executor.hpp rename to c++/boost/asio/execution/bad_executor.hpp diff --git a/c++/include/boost/asio/execution/blocking.hpp b/c++/boost/asio/execution/blocking.hpp similarity index 100% rename from c++/include/boost/asio/execution/blocking.hpp rename to c++/boost/asio/execution/blocking.hpp diff --git a/c++/include/boost/asio/execution/blocking_adaptation.hpp b/c++/boost/asio/execution/blocking_adaptation.hpp similarity index 100% rename from c++/include/boost/asio/execution/blocking_adaptation.hpp rename to c++/boost/asio/execution/blocking_adaptation.hpp diff --git a/c++/include/boost/asio/execution/bulk_execute.hpp b/c++/boost/asio/execution/bulk_execute.hpp similarity index 100% rename from c++/include/boost/asio/execution/bulk_execute.hpp rename to c++/boost/asio/execution/bulk_execute.hpp diff --git a/c++/include/boost/asio/execution/bulk_guarantee.hpp b/c++/boost/asio/execution/bulk_guarantee.hpp similarity index 100% rename from c++/include/boost/asio/execution/bulk_guarantee.hpp rename to c++/boost/asio/execution/bulk_guarantee.hpp diff --git a/c++/include/boost/asio/execution/connect.hpp b/c++/boost/asio/execution/connect.hpp similarity index 100% rename from c++/include/boost/asio/execution/connect.hpp rename to c++/boost/asio/execution/connect.hpp diff --git a/c++/include/boost/asio/execution/context.hpp b/c++/boost/asio/execution/context.hpp similarity index 100% rename from c++/include/boost/asio/execution/context.hpp rename to c++/boost/asio/execution/context.hpp diff --git a/c++/include/boost/asio/execution/context_as.hpp b/c++/boost/asio/execution/context_as.hpp similarity index 100% rename from c++/include/boost/asio/execution/context_as.hpp rename to c++/boost/asio/execution/context_as.hpp diff --git a/c++/include/boost/asio/execution/detail/as_invocable.hpp b/c++/boost/asio/execution/detail/as_invocable.hpp similarity index 100% rename from c++/include/boost/asio/execution/detail/as_invocable.hpp rename to c++/boost/asio/execution/detail/as_invocable.hpp diff --git a/c++/include/boost/asio/execution/detail/as_operation.hpp b/c++/boost/asio/execution/detail/as_operation.hpp similarity index 100% rename from c++/include/boost/asio/execution/detail/as_operation.hpp rename to c++/boost/asio/execution/detail/as_operation.hpp diff --git a/c++/include/boost/asio/execution/detail/as_receiver.hpp b/c++/boost/asio/execution/detail/as_receiver.hpp similarity index 100% rename from c++/include/boost/asio/execution/detail/as_receiver.hpp rename to c++/boost/asio/execution/detail/as_receiver.hpp diff --git a/c++/include/boost/asio/execution/detail/bulk_sender.hpp b/c++/boost/asio/execution/detail/bulk_sender.hpp similarity index 100% rename from c++/include/boost/asio/execution/detail/bulk_sender.hpp rename to c++/boost/asio/execution/detail/bulk_sender.hpp diff --git a/c++/include/boost/asio/execution/detail/submit_receiver.hpp b/c++/boost/asio/execution/detail/submit_receiver.hpp similarity index 100% rename from c++/include/boost/asio/execution/detail/submit_receiver.hpp rename to c++/boost/asio/execution/detail/submit_receiver.hpp diff --git a/c++/include/boost/asio/execution/detail/void_receiver.hpp b/c++/boost/asio/execution/detail/void_receiver.hpp similarity index 100% rename from c++/include/boost/asio/execution/detail/void_receiver.hpp rename to c++/boost/asio/execution/detail/void_receiver.hpp diff --git a/c++/include/boost/asio/execution/execute.hpp b/c++/boost/asio/execution/execute.hpp similarity index 100% rename from c++/include/boost/asio/execution/execute.hpp rename to c++/boost/asio/execution/execute.hpp diff --git a/c++/include/boost/asio/execution/executor.hpp b/c++/boost/asio/execution/executor.hpp similarity index 100% rename from c++/include/boost/asio/execution/executor.hpp rename to c++/boost/asio/execution/executor.hpp diff --git a/c++/include/boost/asio/execution/impl/bad_executor.ipp b/c++/boost/asio/execution/impl/bad_executor.ipp similarity index 100% rename from c++/include/boost/asio/execution/impl/bad_executor.ipp rename to c++/boost/asio/execution/impl/bad_executor.ipp diff --git a/c++/include/boost/asio/execution/impl/receiver_invocation_error.ipp b/c++/boost/asio/execution/impl/receiver_invocation_error.ipp similarity index 100% rename from c++/include/boost/asio/execution/impl/receiver_invocation_error.ipp rename to c++/boost/asio/execution/impl/receiver_invocation_error.ipp diff --git a/c++/include/boost/asio/execution/invocable_archetype.hpp b/c++/boost/asio/execution/invocable_archetype.hpp similarity index 100% rename from c++/include/boost/asio/execution/invocable_archetype.hpp rename to c++/boost/asio/execution/invocable_archetype.hpp diff --git a/c++/include/boost/asio/execution/mapping.hpp b/c++/boost/asio/execution/mapping.hpp similarity index 100% rename from c++/include/boost/asio/execution/mapping.hpp rename to c++/boost/asio/execution/mapping.hpp diff --git a/c++/include/boost/asio/execution/occupancy.hpp b/c++/boost/asio/execution/occupancy.hpp similarity index 100% rename from c++/include/boost/asio/execution/occupancy.hpp rename to c++/boost/asio/execution/occupancy.hpp diff --git a/c++/include/boost/asio/execution/operation_state.hpp b/c++/boost/asio/execution/operation_state.hpp similarity index 100% rename from c++/include/boost/asio/execution/operation_state.hpp rename to c++/boost/asio/execution/operation_state.hpp diff --git a/c++/include/boost/asio/execution/outstanding_work.hpp b/c++/boost/asio/execution/outstanding_work.hpp similarity index 100% rename from c++/include/boost/asio/execution/outstanding_work.hpp rename to c++/boost/asio/execution/outstanding_work.hpp diff --git a/c++/include/boost/asio/execution/prefer_only.hpp b/c++/boost/asio/execution/prefer_only.hpp similarity index 100% rename from c++/include/boost/asio/execution/prefer_only.hpp rename to c++/boost/asio/execution/prefer_only.hpp diff --git a/c++/include/boost/asio/execution/receiver.hpp b/c++/boost/asio/execution/receiver.hpp similarity index 100% rename from c++/include/boost/asio/execution/receiver.hpp rename to c++/boost/asio/execution/receiver.hpp diff --git a/c++/include/boost/asio/execution/receiver_invocation_error.hpp b/c++/boost/asio/execution/receiver_invocation_error.hpp similarity index 100% rename from c++/include/boost/asio/execution/receiver_invocation_error.hpp rename to c++/boost/asio/execution/receiver_invocation_error.hpp diff --git a/c++/include/boost/asio/execution/relationship.hpp b/c++/boost/asio/execution/relationship.hpp similarity index 100% rename from c++/include/boost/asio/execution/relationship.hpp rename to c++/boost/asio/execution/relationship.hpp diff --git a/c++/include/boost/asio/execution/schedule.hpp b/c++/boost/asio/execution/schedule.hpp similarity index 100% rename from c++/include/boost/asio/execution/schedule.hpp rename to c++/boost/asio/execution/schedule.hpp diff --git a/c++/include/boost/asio/execution/scheduler.hpp b/c++/boost/asio/execution/scheduler.hpp similarity index 100% rename from c++/include/boost/asio/execution/scheduler.hpp rename to c++/boost/asio/execution/scheduler.hpp diff --git a/c++/include/boost/asio/execution/sender.hpp b/c++/boost/asio/execution/sender.hpp similarity index 100% rename from c++/include/boost/asio/execution/sender.hpp rename to c++/boost/asio/execution/sender.hpp diff --git a/c++/include/boost/asio/execution/set_done.hpp b/c++/boost/asio/execution/set_done.hpp similarity index 100% rename from c++/include/boost/asio/execution/set_done.hpp rename to c++/boost/asio/execution/set_done.hpp diff --git a/c++/include/boost/asio/execution/set_error.hpp b/c++/boost/asio/execution/set_error.hpp similarity index 100% rename from c++/include/boost/asio/execution/set_error.hpp rename to c++/boost/asio/execution/set_error.hpp diff --git a/c++/include/boost/asio/execution/set_value.hpp b/c++/boost/asio/execution/set_value.hpp similarity index 100% rename from c++/include/boost/asio/execution/set_value.hpp rename to c++/boost/asio/execution/set_value.hpp diff --git a/c++/include/boost/asio/execution/start.hpp b/c++/boost/asio/execution/start.hpp similarity index 100% rename from c++/include/boost/asio/execution/start.hpp rename to c++/boost/asio/execution/start.hpp diff --git a/c++/include/boost/asio/execution/submit.hpp b/c++/boost/asio/execution/submit.hpp similarity index 100% rename from c++/include/boost/asio/execution/submit.hpp rename to c++/boost/asio/execution/submit.hpp diff --git a/c++/include/boost/asio/execution_context.hpp b/c++/boost/asio/execution_context.hpp similarity index 100% rename from c++/include/boost/asio/execution_context.hpp rename to c++/boost/asio/execution_context.hpp diff --git a/c++/include/boost/asio/executor.hpp b/c++/boost/asio/executor.hpp similarity index 100% rename from c++/include/boost/asio/executor.hpp rename to c++/boost/asio/executor.hpp diff --git a/c++/include/boost/asio/executor_work_guard.hpp b/c++/boost/asio/executor_work_guard.hpp similarity index 100% rename from c++/include/boost/asio/executor_work_guard.hpp rename to c++/boost/asio/executor_work_guard.hpp diff --git a/c++/include/boost/asio/experimental/append.hpp b/c++/boost/asio/experimental/append.hpp similarity index 100% rename from c++/include/boost/asio/experimental/append.hpp rename to c++/boost/asio/experimental/append.hpp diff --git a/c++/include/boost/asio/experimental/as_single.hpp b/c++/boost/asio/experimental/as_single.hpp similarity index 100% rename from c++/include/boost/asio/experimental/as_single.hpp rename to c++/boost/asio/experimental/as_single.hpp diff --git a/c++/include/boost/asio/experimental/as_tuple.hpp b/c++/boost/asio/experimental/as_tuple.hpp similarity index 100% rename from c++/include/boost/asio/experimental/as_tuple.hpp rename to c++/boost/asio/experimental/as_tuple.hpp diff --git a/c++/include/boost/asio/experimental/awaitable_operators.hpp b/c++/boost/asio/experimental/awaitable_operators.hpp similarity index 100% rename from c++/include/boost/asio/experimental/awaitable_operators.hpp rename to c++/boost/asio/experimental/awaitable_operators.hpp diff --git a/c++/include/boost/asio/experimental/basic_channel.hpp b/c++/boost/asio/experimental/basic_channel.hpp similarity index 100% rename from c++/include/boost/asio/experimental/basic_channel.hpp rename to c++/boost/asio/experimental/basic_channel.hpp diff --git a/c++/include/boost/asio/experimental/basic_concurrent_channel.hpp b/c++/boost/asio/experimental/basic_concurrent_channel.hpp similarity index 100% rename from c++/include/boost/asio/experimental/basic_concurrent_channel.hpp rename to c++/boost/asio/experimental/basic_concurrent_channel.hpp diff --git a/c++/include/boost/asio/experimental/cancellation_condition.hpp b/c++/boost/asio/experimental/cancellation_condition.hpp similarity index 100% rename from c++/include/boost/asio/experimental/cancellation_condition.hpp rename to c++/boost/asio/experimental/cancellation_condition.hpp diff --git a/c++/include/boost/asio/experimental/channel.hpp b/c++/boost/asio/experimental/channel.hpp similarity index 100% rename from c++/include/boost/asio/experimental/channel.hpp rename to c++/boost/asio/experimental/channel.hpp diff --git a/c++/include/boost/asio/experimental/channel_error.hpp b/c++/boost/asio/experimental/channel_error.hpp similarity index 100% rename from c++/include/boost/asio/experimental/channel_error.hpp rename to c++/boost/asio/experimental/channel_error.hpp diff --git a/c++/include/boost/asio/experimental/channel_traits.hpp b/c++/boost/asio/experimental/channel_traits.hpp similarity index 100% rename from c++/include/boost/asio/experimental/channel_traits.hpp rename to c++/boost/asio/experimental/channel_traits.hpp diff --git a/c++/include/boost/asio/experimental/co_composed.hpp b/c++/boost/asio/experimental/co_composed.hpp similarity index 100% rename from c++/include/boost/asio/experimental/co_composed.hpp rename to c++/boost/asio/experimental/co_composed.hpp diff --git a/c++/include/boost/asio/experimental/co_spawn.hpp b/c++/boost/asio/experimental/co_spawn.hpp similarity index 100% rename from c++/include/boost/asio/experimental/co_spawn.hpp rename to c++/boost/asio/experimental/co_spawn.hpp diff --git a/c++/include/boost/asio/experimental/concurrent_channel.hpp b/c++/boost/asio/experimental/concurrent_channel.hpp similarity index 100% rename from c++/include/boost/asio/experimental/concurrent_channel.hpp rename to c++/boost/asio/experimental/concurrent_channel.hpp diff --git a/c++/include/boost/asio/experimental/coro.hpp b/c++/boost/asio/experimental/coro.hpp similarity index 100% rename from c++/include/boost/asio/experimental/coro.hpp rename to c++/boost/asio/experimental/coro.hpp diff --git a/c++/include/boost/asio/experimental/coro_traits.hpp b/c++/boost/asio/experimental/coro_traits.hpp similarity index 100% rename from c++/include/boost/asio/experimental/coro_traits.hpp rename to c++/boost/asio/experimental/coro_traits.hpp diff --git a/c++/include/boost/asio/experimental/deferred.hpp b/c++/boost/asio/experimental/deferred.hpp similarity index 100% rename from c++/include/boost/asio/experimental/deferred.hpp rename to c++/boost/asio/experimental/deferred.hpp diff --git a/c++/include/boost/asio/experimental/detail/channel_handler.hpp b/c++/boost/asio/experimental/detail/channel_handler.hpp similarity index 100% rename from c++/include/boost/asio/experimental/detail/channel_handler.hpp rename to c++/boost/asio/experimental/detail/channel_handler.hpp diff --git a/c++/include/boost/asio/experimental/detail/channel_message.hpp b/c++/boost/asio/experimental/detail/channel_message.hpp similarity index 100% rename from c++/include/boost/asio/experimental/detail/channel_message.hpp rename to c++/boost/asio/experimental/detail/channel_message.hpp diff --git a/c++/include/boost/asio/experimental/detail/channel_operation.hpp b/c++/boost/asio/experimental/detail/channel_operation.hpp similarity index 100% rename from c++/include/boost/asio/experimental/detail/channel_operation.hpp rename to c++/boost/asio/experimental/detail/channel_operation.hpp diff --git a/c++/include/boost/asio/experimental/detail/channel_payload.hpp b/c++/boost/asio/experimental/detail/channel_payload.hpp similarity index 100% rename from c++/include/boost/asio/experimental/detail/channel_payload.hpp rename to c++/boost/asio/experimental/detail/channel_payload.hpp diff --git a/c++/include/boost/asio/experimental/detail/channel_receive_op.hpp b/c++/boost/asio/experimental/detail/channel_receive_op.hpp similarity index 100% rename from c++/include/boost/asio/experimental/detail/channel_receive_op.hpp rename to c++/boost/asio/experimental/detail/channel_receive_op.hpp diff --git a/c++/include/boost/asio/experimental/detail/channel_send_functions.hpp b/c++/boost/asio/experimental/detail/channel_send_functions.hpp similarity index 100% rename from c++/include/boost/asio/experimental/detail/channel_send_functions.hpp rename to c++/boost/asio/experimental/detail/channel_send_functions.hpp diff --git a/c++/include/boost/asio/experimental/detail/channel_send_op.hpp b/c++/boost/asio/experimental/detail/channel_send_op.hpp similarity index 100% rename from c++/include/boost/asio/experimental/detail/channel_send_op.hpp rename to c++/boost/asio/experimental/detail/channel_send_op.hpp diff --git a/c++/include/boost/asio/experimental/detail/channel_service.hpp b/c++/boost/asio/experimental/detail/channel_service.hpp similarity index 100% rename from c++/include/boost/asio/experimental/detail/channel_service.hpp rename to c++/boost/asio/experimental/detail/channel_service.hpp diff --git a/c++/include/boost/asio/experimental/detail/coro_completion_handler.hpp b/c++/boost/asio/experimental/detail/coro_completion_handler.hpp similarity index 100% rename from c++/include/boost/asio/experimental/detail/coro_completion_handler.hpp rename to c++/boost/asio/experimental/detail/coro_completion_handler.hpp diff --git a/c++/include/boost/asio/experimental/detail/coro_promise_allocator.hpp b/c++/boost/asio/experimental/detail/coro_promise_allocator.hpp similarity index 100% rename from c++/include/boost/asio/experimental/detail/coro_promise_allocator.hpp rename to c++/boost/asio/experimental/detail/coro_promise_allocator.hpp diff --git a/c++/include/boost/asio/experimental/detail/has_signature.hpp b/c++/boost/asio/experimental/detail/has_signature.hpp similarity index 100% rename from c++/include/boost/asio/experimental/detail/has_signature.hpp rename to c++/boost/asio/experimental/detail/has_signature.hpp diff --git a/c++/include/boost/asio/experimental/detail/impl/channel_service.hpp b/c++/boost/asio/experimental/detail/impl/channel_service.hpp similarity index 100% rename from c++/include/boost/asio/experimental/detail/impl/channel_service.hpp rename to c++/boost/asio/experimental/detail/impl/channel_service.hpp diff --git a/c++/include/boost/asio/experimental/detail/partial_promise.hpp b/c++/boost/asio/experimental/detail/partial_promise.hpp similarity index 100% rename from c++/include/boost/asio/experimental/detail/partial_promise.hpp rename to c++/boost/asio/experimental/detail/partial_promise.hpp diff --git a/c++/include/boost/asio/experimental/impl/as_single.hpp b/c++/boost/asio/experimental/impl/as_single.hpp similarity index 100% rename from c++/include/boost/asio/experimental/impl/as_single.hpp rename to c++/boost/asio/experimental/impl/as_single.hpp diff --git a/c++/include/boost/asio/experimental/impl/channel_error.ipp b/c++/boost/asio/experimental/impl/channel_error.ipp similarity index 100% rename from c++/include/boost/asio/experimental/impl/channel_error.ipp rename to c++/boost/asio/experimental/impl/channel_error.ipp diff --git a/c++/include/boost/asio/experimental/impl/co_composed.hpp b/c++/boost/asio/experimental/impl/co_composed.hpp similarity index 100% rename from c++/include/boost/asio/experimental/impl/co_composed.hpp rename to c++/boost/asio/experimental/impl/co_composed.hpp diff --git a/c++/include/boost/asio/experimental/impl/coro.hpp b/c++/boost/asio/experimental/impl/coro.hpp similarity index 100% rename from c++/include/boost/asio/experimental/impl/coro.hpp rename to c++/boost/asio/experimental/impl/coro.hpp diff --git a/c++/include/boost/asio/experimental/impl/parallel_group.hpp b/c++/boost/asio/experimental/impl/parallel_group.hpp similarity index 100% rename from c++/include/boost/asio/experimental/impl/parallel_group.hpp rename to c++/boost/asio/experimental/impl/parallel_group.hpp diff --git a/c++/include/boost/asio/experimental/impl/promise.hpp b/c++/boost/asio/experimental/impl/promise.hpp similarity index 100% rename from c++/include/boost/asio/experimental/impl/promise.hpp rename to c++/boost/asio/experimental/impl/promise.hpp diff --git a/c++/include/boost/asio/experimental/impl/use_coro.hpp b/c++/boost/asio/experimental/impl/use_coro.hpp similarity index 100% rename from c++/include/boost/asio/experimental/impl/use_coro.hpp rename to c++/boost/asio/experimental/impl/use_coro.hpp diff --git a/c++/include/boost/asio/experimental/impl/use_promise.hpp b/c++/boost/asio/experimental/impl/use_promise.hpp similarity index 100% rename from c++/include/boost/asio/experimental/impl/use_promise.hpp rename to c++/boost/asio/experimental/impl/use_promise.hpp diff --git a/c++/include/boost/asio/experimental/parallel_group.hpp b/c++/boost/asio/experimental/parallel_group.hpp similarity index 100% rename from c++/include/boost/asio/experimental/parallel_group.hpp rename to c++/boost/asio/experimental/parallel_group.hpp diff --git a/c++/include/boost/asio/experimental/prepend.hpp b/c++/boost/asio/experimental/prepend.hpp similarity index 100% rename from c++/include/boost/asio/experimental/prepend.hpp rename to c++/boost/asio/experimental/prepend.hpp diff --git a/c++/include/boost/asio/experimental/promise.hpp b/c++/boost/asio/experimental/promise.hpp similarity index 100% rename from c++/include/boost/asio/experimental/promise.hpp rename to c++/boost/asio/experimental/promise.hpp diff --git a/c++/include/boost/asio/experimental/use_coro.hpp b/c++/boost/asio/experimental/use_coro.hpp similarity index 100% rename from c++/include/boost/asio/experimental/use_coro.hpp rename to c++/boost/asio/experimental/use_coro.hpp diff --git a/c++/include/boost/asio/experimental/use_promise.hpp b/c++/boost/asio/experimental/use_promise.hpp similarity index 100% rename from c++/include/boost/asio/experimental/use_promise.hpp rename to c++/boost/asio/experimental/use_promise.hpp diff --git a/c++/include/boost/asio/file_base.hpp b/c++/boost/asio/file_base.hpp similarity index 100% rename from c++/include/boost/asio/file_base.hpp rename to c++/boost/asio/file_base.hpp diff --git a/c++/include/boost/asio/generic/basic_endpoint.hpp b/c++/boost/asio/generic/basic_endpoint.hpp similarity index 100% rename from c++/include/boost/asio/generic/basic_endpoint.hpp rename to c++/boost/asio/generic/basic_endpoint.hpp diff --git a/c++/include/boost/asio/generic/datagram_protocol.hpp b/c++/boost/asio/generic/datagram_protocol.hpp similarity index 100% rename from c++/include/boost/asio/generic/datagram_protocol.hpp rename to c++/boost/asio/generic/datagram_protocol.hpp diff --git a/c++/include/boost/asio/generic/detail/endpoint.hpp b/c++/boost/asio/generic/detail/endpoint.hpp similarity index 100% rename from c++/include/boost/asio/generic/detail/endpoint.hpp rename to c++/boost/asio/generic/detail/endpoint.hpp diff --git a/c++/include/boost/asio/generic/detail/impl/endpoint.ipp b/c++/boost/asio/generic/detail/impl/endpoint.ipp similarity index 100% rename from c++/include/boost/asio/generic/detail/impl/endpoint.ipp rename to c++/boost/asio/generic/detail/impl/endpoint.ipp diff --git a/c++/include/boost/asio/generic/raw_protocol.hpp b/c++/boost/asio/generic/raw_protocol.hpp similarity index 100% rename from c++/include/boost/asio/generic/raw_protocol.hpp rename to c++/boost/asio/generic/raw_protocol.hpp diff --git a/c++/include/boost/asio/generic/seq_packet_protocol.hpp b/c++/boost/asio/generic/seq_packet_protocol.hpp similarity index 100% rename from c++/include/boost/asio/generic/seq_packet_protocol.hpp rename to c++/boost/asio/generic/seq_packet_protocol.hpp diff --git a/c++/include/boost/asio/generic/stream_protocol.hpp b/c++/boost/asio/generic/stream_protocol.hpp similarity index 100% rename from c++/include/boost/asio/generic/stream_protocol.hpp rename to c++/boost/asio/generic/stream_protocol.hpp diff --git a/c++/include/boost/asio/handler_alloc_hook.hpp b/c++/boost/asio/handler_alloc_hook.hpp similarity index 100% rename from c++/include/boost/asio/handler_alloc_hook.hpp rename to c++/boost/asio/handler_alloc_hook.hpp diff --git a/c++/include/boost/asio/handler_continuation_hook.hpp b/c++/boost/asio/handler_continuation_hook.hpp similarity index 100% rename from c++/include/boost/asio/handler_continuation_hook.hpp rename to c++/boost/asio/handler_continuation_hook.hpp diff --git a/c++/include/boost/asio/handler_invoke_hook.hpp b/c++/boost/asio/handler_invoke_hook.hpp similarity index 100% rename from c++/include/boost/asio/handler_invoke_hook.hpp rename to c++/boost/asio/handler_invoke_hook.hpp diff --git a/c++/include/boost/asio/high_resolution_timer.hpp b/c++/boost/asio/high_resolution_timer.hpp similarity index 100% rename from c++/include/boost/asio/high_resolution_timer.hpp rename to c++/boost/asio/high_resolution_timer.hpp diff --git a/c++/include/boost/asio/impl/any_completion_executor.ipp b/c++/boost/asio/impl/any_completion_executor.ipp similarity index 100% rename from c++/include/boost/asio/impl/any_completion_executor.ipp rename to c++/boost/asio/impl/any_completion_executor.ipp diff --git a/c++/include/boost/asio/impl/any_io_executor.ipp b/c++/boost/asio/impl/any_io_executor.ipp similarity index 100% rename from c++/include/boost/asio/impl/any_io_executor.ipp rename to c++/boost/asio/impl/any_io_executor.ipp diff --git a/c++/include/boost/asio/impl/append.hpp b/c++/boost/asio/impl/append.hpp similarity index 100% rename from c++/include/boost/asio/impl/append.hpp rename to c++/boost/asio/impl/append.hpp diff --git a/c++/include/boost/asio/impl/as_tuple.hpp b/c++/boost/asio/impl/as_tuple.hpp similarity index 100% rename from c++/include/boost/asio/impl/as_tuple.hpp rename to c++/boost/asio/impl/as_tuple.hpp diff --git a/c++/include/boost/asio/impl/awaitable.hpp b/c++/boost/asio/impl/awaitable.hpp similarity index 100% rename from c++/include/boost/asio/impl/awaitable.hpp rename to c++/boost/asio/impl/awaitable.hpp diff --git a/c++/include/boost/asio/impl/buffered_read_stream.hpp b/c++/boost/asio/impl/buffered_read_stream.hpp similarity index 100% rename from c++/include/boost/asio/impl/buffered_read_stream.hpp rename to c++/boost/asio/impl/buffered_read_stream.hpp diff --git a/c++/include/boost/asio/impl/buffered_write_stream.hpp b/c++/boost/asio/impl/buffered_write_stream.hpp similarity index 100% rename from c++/include/boost/asio/impl/buffered_write_stream.hpp rename to c++/boost/asio/impl/buffered_write_stream.hpp diff --git a/c++/include/boost/asio/impl/cancellation_signal.ipp b/c++/boost/asio/impl/cancellation_signal.ipp similarity index 100% rename from c++/include/boost/asio/impl/cancellation_signal.ipp rename to c++/boost/asio/impl/cancellation_signal.ipp diff --git a/c++/include/boost/asio/impl/co_spawn.hpp b/c++/boost/asio/impl/co_spawn.hpp similarity index 100% rename from c++/include/boost/asio/impl/co_spawn.hpp rename to c++/boost/asio/impl/co_spawn.hpp diff --git a/c++/include/boost/asio/impl/connect.hpp b/c++/boost/asio/impl/connect.hpp similarity index 100% rename from c++/include/boost/asio/impl/connect.hpp rename to c++/boost/asio/impl/connect.hpp diff --git a/c++/include/boost/asio/impl/connect_pipe.hpp b/c++/boost/asio/impl/connect_pipe.hpp similarity index 100% rename from c++/include/boost/asio/impl/connect_pipe.hpp rename to c++/boost/asio/impl/connect_pipe.hpp diff --git a/c++/include/boost/asio/impl/connect_pipe.ipp b/c++/boost/asio/impl/connect_pipe.ipp similarity index 100% rename from c++/include/boost/asio/impl/connect_pipe.ipp rename to c++/boost/asio/impl/connect_pipe.ipp diff --git a/c++/include/boost/asio/impl/consign.hpp b/c++/boost/asio/impl/consign.hpp similarity index 100% rename from c++/include/boost/asio/impl/consign.hpp rename to c++/boost/asio/impl/consign.hpp diff --git a/c++/include/boost/asio/impl/deferred.hpp b/c++/boost/asio/impl/deferred.hpp similarity index 100% rename from c++/include/boost/asio/impl/deferred.hpp rename to c++/boost/asio/impl/deferred.hpp diff --git a/c++/include/boost/asio/impl/detached.hpp b/c++/boost/asio/impl/detached.hpp similarity index 100% rename from c++/include/boost/asio/impl/detached.hpp rename to c++/boost/asio/impl/detached.hpp diff --git a/c++/include/boost/asio/impl/error.ipp b/c++/boost/asio/impl/error.ipp similarity index 100% rename from c++/include/boost/asio/impl/error.ipp rename to c++/boost/asio/impl/error.ipp diff --git a/c++/include/boost/asio/impl/execution_context.hpp b/c++/boost/asio/impl/execution_context.hpp similarity index 100% rename from c++/include/boost/asio/impl/execution_context.hpp rename to c++/boost/asio/impl/execution_context.hpp diff --git a/c++/include/boost/asio/impl/execution_context.ipp b/c++/boost/asio/impl/execution_context.ipp similarity index 100% rename from c++/include/boost/asio/impl/execution_context.ipp rename to c++/boost/asio/impl/execution_context.ipp diff --git a/c++/include/boost/asio/impl/executor.hpp b/c++/boost/asio/impl/executor.hpp similarity index 100% rename from c++/include/boost/asio/impl/executor.hpp rename to c++/boost/asio/impl/executor.hpp diff --git a/c++/include/boost/asio/impl/executor.ipp b/c++/boost/asio/impl/executor.ipp similarity index 100% rename from c++/include/boost/asio/impl/executor.ipp rename to c++/boost/asio/impl/executor.ipp diff --git a/c++/include/boost/asio/impl/handler_alloc_hook.ipp b/c++/boost/asio/impl/handler_alloc_hook.ipp similarity index 100% rename from c++/include/boost/asio/impl/handler_alloc_hook.ipp rename to c++/boost/asio/impl/handler_alloc_hook.ipp diff --git a/c++/include/boost/asio/impl/io_context.hpp b/c++/boost/asio/impl/io_context.hpp similarity index 100% rename from c++/include/boost/asio/impl/io_context.hpp rename to c++/boost/asio/impl/io_context.hpp diff --git a/c++/include/boost/asio/impl/io_context.ipp b/c++/boost/asio/impl/io_context.ipp similarity index 100% rename from c++/include/boost/asio/impl/io_context.ipp rename to c++/boost/asio/impl/io_context.ipp diff --git a/c++/include/boost/asio/impl/multiple_exceptions.ipp b/c++/boost/asio/impl/multiple_exceptions.ipp similarity index 100% rename from c++/include/boost/asio/impl/multiple_exceptions.ipp rename to c++/boost/asio/impl/multiple_exceptions.ipp diff --git a/c++/include/boost/asio/impl/prepend.hpp b/c++/boost/asio/impl/prepend.hpp similarity index 100% rename from c++/include/boost/asio/impl/prepend.hpp rename to c++/boost/asio/impl/prepend.hpp diff --git a/c++/include/boost/asio/impl/read.hpp b/c++/boost/asio/impl/read.hpp similarity index 100% rename from c++/include/boost/asio/impl/read.hpp rename to c++/boost/asio/impl/read.hpp diff --git a/c++/include/boost/asio/impl/read_at.hpp b/c++/boost/asio/impl/read_at.hpp similarity index 100% rename from c++/include/boost/asio/impl/read_at.hpp rename to c++/boost/asio/impl/read_at.hpp diff --git a/c++/include/boost/asio/impl/read_until.hpp b/c++/boost/asio/impl/read_until.hpp similarity index 100% rename from c++/include/boost/asio/impl/read_until.hpp rename to c++/boost/asio/impl/read_until.hpp diff --git a/c++/include/boost/asio/impl/redirect_error.hpp b/c++/boost/asio/impl/redirect_error.hpp similarity index 100% rename from c++/include/boost/asio/impl/redirect_error.hpp rename to c++/boost/asio/impl/redirect_error.hpp diff --git a/c++/include/boost/asio/impl/serial_port_base.hpp b/c++/boost/asio/impl/serial_port_base.hpp similarity index 100% rename from c++/include/boost/asio/impl/serial_port_base.hpp rename to c++/boost/asio/impl/serial_port_base.hpp diff --git a/c++/include/boost/asio/impl/serial_port_base.ipp b/c++/boost/asio/impl/serial_port_base.ipp similarity index 100% rename from c++/include/boost/asio/impl/serial_port_base.ipp rename to c++/boost/asio/impl/serial_port_base.ipp diff --git a/c++/include/boost/asio/impl/spawn.hpp b/c++/boost/asio/impl/spawn.hpp similarity index 100% rename from c++/include/boost/asio/impl/spawn.hpp rename to c++/boost/asio/impl/spawn.hpp diff --git a/c++/include/boost/asio/impl/src.hpp b/c++/boost/asio/impl/src.hpp similarity index 100% rename from c++/include/boost/asio/impl/src.hpp rename to c++/boost/asio/impl/src.hpp diff --git a/c++/include/boost/asio/impl/system_context.hpp b/c++/boost/asio/impl/system_context.hpp similarity index 100% rename from c++/include/boost/asio/impl/system_context.hpp rename to c++/boost/asio/impl/system_context.hpp diff --git a/c++/include/boost/asio/impl/system_context.ipp b/c++/boost/asio/impl/system_context.ipp similarity index 100% rename from c++/include/boost/asio/impl/system_context.ipp rename to c++/boost/asio/impl/system_context.ipp diff --git a/c++/include/boost/asio/impl/system_executor.hpp b/c++/boost/asio/impl/system_executor.hpp similarity index 100% rename from c++/include/boost/asio/impl/system_executor.hpp rename to c++/boost/asio/impl/system_executor.hpp diff --git a/c++/include/boost/asio/impl/thread_pool.hpp b/c++/boost/asio/impl/thread_pool.hpp similarity index 100% rename from c++/include/boost/asio/impl/thread_pool.hpp rename to c++/boost/asio/impl/thread_pool.hpp diff --git a/c++/include/boost/asio/impl/thread_pool.ipp b/c++/boost/asio/impl/thread_pool.ipp similarity index 100% rename from c++/include/boost/asio/impl/thread_pool.ipp rename to c++/boost/asio/impl/thread_pool.ipp diff --git a/c++/include/boost/asio/impl/use_awaitable.hpp b/c++/boost/asio/impl/use_awaitable.hpp similarity index 100% rename from c++/include/boost/asio/impl/use_awaitable.hpp rename to c++/boost/asio/impl/use_awaitable.hpp diff --git a/c++/include/boost/asio/impl/use_future.hpp b/c++/boost/asio/impl/use_future.hpp similarity index 100% rename from c++/include/boost/asio/impl/use_future.hpp rename to c++/boost/asio/impl/use_future.hpp diff --git a/c++/include/boost/asio/impl/write.hpp b/c++/boost/asio/impl/write.hpp similarity index 100% rename from c++/include/boost/asio/impl/write.hpp rename to c++/boost/asio/impl/write.hpp diff --git a/c++/include/boost/asio/impl/write_at.hpp b/c++/boost/asio/impl/write_at.hpp similarity index 100% rename from c++/include/boost/asio/impl/write_at.hpp rename to c++/boost/asio/impl/write_at.hpp diff --git a/c++/include/boost/asio/io_context.hpp b/c++/boost/asio/io_context.hpp similarity index 100% rename from c++/include/boost/asio/io_context.hpp rename to c++/boost/asio/io_context.hpp diff --git a/c++/include/boost/asio/io_context_strand.hpp b/c++/boost/asio/io_context_strand.hpp similarity index 100% rename from c++/include/boost/asio/io_context_strand.hpp rename to c++/boost/asio/io_context_strand.hpp diff --git a/c++/include/boost/asio/io_service.hpp b/c++/boost/asio/io_service.hpp similarity index 100% rename from c++/include/boost/asio/io_service.hpp rename to c++/boost/asio/io_service.hpp diff --git a/c++/include/boost/asio/io_service_strand.hpp b/c++/boost/asio/io_service_strand.hpp similarity index 100% rename from c++/include/boost/asio/io_service_strand.hpp rename to c++/boost/asio/io_service_strand.hpp diff --git a/c++/include/boost/asio/ip/address.hpp b/c++/boost/asio/ip/address.hpp similarity index 100% rename from c++/include/boost/asio/ip/address.hpp rename to c++/boost/asio/ip/address.hpp diff --git a/c++/include/boost/asio/ip/address_v4.hpp b/c++/boost/asio/ip/address_v4.hpp similarity index 100% rename from c++/include/boost/asio/ip/address_v4.hpp rename to c++/boost/asio/ip/address_v4.hpp diff --git a/c++/include/boost/asio/ip/address_v4_iterator.hpp b/c++/boost/asio/ip/address_v4_iterator.hpp similarity index 100% rename from c++/include/boost/asio/ip/address_v4_iterator.hpp rename to c++/boost/asio/ip/address_v4_iterator.hpp diff --git a/c++/include/boost/asio/ip/address_v4_range.hpp b/c++/boost/asio/ip/address_v4_range.hpp similarity index 100% rename from c++/include/boost/asio/ip/address_v4_range.hpp rename to c++/boost/asio/ip/address_v4_range.hpp diff --git a/c++/include/boost/asio/ip/address_v6.hpp b/c++/boost/asio/ip/address_v6.hpp similarity index 100% rename from c++/include/boost/asio/ip/address_v6.hpp rename to c++/boost/asio/ip/address_v6.hpp diff --git a/c++/include/boost/asio/ip/address_v6_iterator.hpp b/c++/boost/asio/ip/address_v6_iterator.hpp similarity index 100% rename from c++/include/boost/asio/ip/address_v6_iterator.hpp rename to c++/boost/asio/ip/address_v6_iterator.hpp diff --git a/c++/include/boost/asio/ip/address_v6_range.hpp b/c++/boost/asio/ip/address_v6_range.hpp similarity index 100% rename from c++/include/boost/asio/ip/address_v6_range.hpp rename to c++/boost/asio/ip/address_v6_range.hpp diff --git a/c++/include/boost/asio/ip/bad_address_cast.hpp b/c++/boost/asio/ip/bad_address_cast.hpp similarity index 100% rename from c++/include/boost/asio/ip/bad_address_cast.hpp rename to c++/boost/asio/ip/bad_address_cast.hpp diff --git a/c++/include/boost/asio/ip/basic_endpoint.hpp b/c++/boost/asio/ip/basic_endpoint.hpp similarity index 100% rename from c++/include/boost/asio/ip/basic_endpoint.hpp rename to c++/boost/asio/ip/basic_endpoint.hpp diff --git a/c++/include/boost/asio/ip/basic_resolver.hpp b/c++/boost/asio/ip/basic_resolver.hpp similarity index 100% rename from c++/include/boost/asio/ip/basic_resolver.hpp rename to c++/boost/asio/ip/basic_resolver.hpp diff --git a/c++/include/boost/asio/ip/basic_resolver_entry.hpp b/c++/boost/asio/ip/basic_resolver_entry.hpp similarity index 100% rename from c++/include/boost/asio/ip/basic_resolver_entry.hpp rename to c++/boost/asio/ip/basic_resolver_entry.hpp diff --git a/c++/include/boost/asio/ip/basic_resolver_iterator.hpp b/c++/boost/asio/ip/basic_resolver_iterator.hpp similarity index 100% rename from c++/include/boost/asio/ip/basic_resolver_iterator.hpp rename to c++/boost/asio/ip/basic_resolver_iterator.hpp diff --git a/c++/include/boost/asio/ip/basic_resolver_query.hpp b/c++/boost/asio/ip/basic_resolver_query.hpp similarity index 100% rename from c++/include/boost/asio/ip/basic_resolver_query.hpp rename to c++/boost/asio/ip/basic_resolver_query.hpp diff --git a/c++/include/boost/asio/ip/basic_resolver_results.hpp b/c++/boost/asio/ip/basic_resolver_results.hpp similarity index 100% rename from c++/include/boost/asio/ip/basic_resolver_results.hpp rename to c++/boost/asio/ip/basic_resolver_results.hpp diff --git a/c++/include/boost/asio/ip/detail/endpoint.hpp b/c++/boost/asio/ip/detail/endpoint.hpp similarity index 100% rename from c++/include/boost/asio/ip/detail/endpoint.hpp rename to c++/boost/asio/ip/detail/endpoint.hpp diff --git a/c++/include/boost/asio/ip/detail/impl/endpoint.ipp b/c++/boost/asio/ip/detail/impl/endpoint.ipp similarity index 100% rename from c++/include/boost/asio/ip/detail/impl/endpoint.ipp rename to c++/boost/asio/ip/detail/impl/endpoint.ipp diff --git a/c++/include/boost/asio/ip/detail/socket_option.hpp b/c++/boost/asio/ip/detail/socket_option.hpp similarity index 100% rename from c++/include/boost/asio/ip/detail/socket_option.hpp rename to c++/boost/asio/ip/detail/socket_option.hpp diff --git a/c++/include/boost/asio/ip/host_name.hpp b/c++/boost/asio/ip/host_name.hpp similarity index 100% rename from c++/include/boost/asio/ip/host_name.hpp rename to c++/boost/asio/ip/host_name.hpp diff --git a/c++/include/boost/asio/ip/icmp.hpp b/c++/boost/asio/ip/icmp.hpp similarity index 100% rename from c++/include/boost/asio/ip/icmp.hpp rename to c++/boost/asio/ip/icmp.hpp diff --git a/c++/include/boost/asio/ip/impl/address.hpp b/c++/boost/asio/ip/impl/address.hpp similarity index 100% rename from c++/include/boost/asio/ip/impl/address.hpp rename to c++/boost/asio/ip/impl/address.hpp diff --git a/c++/include/boost/asio/ip/impl/address.ipp b/c++/boost/asio/ip/impl/address.ipp similarity index 100% rename from c++/include/boost/asio/ip/impl/address.ipp rename to c++/boost/asio/ip/impl/address.ipp diff --git a/c++/include/boost/asio/ip/impl/address_v4.hpp b/c++/boost/asio/ip/impl/address_v4.hpp similarity index 100% rename from c++/include/boost/asio/ip/impl/address_v4.hpp rename to c++/boost/asio/ip/impl/address_v4.hpp diff --git a/c++/include/boost/asio/ip/impl/address_v4.ipp b/c++/boost/asio/ip/impl/address_v4.ipp similarity index 100% rename from c++/include/boost/asio/ip/impl/address_v4.ipp rename to c++/boost/asio/ip/impl/address_v4.ipp diff --git a/c++/include/boost/asio/ip/impl/address_v6.hpp b/c++/boost/asio/ip/impl/address_v6.hpp similarity index 100% rename from c++/include/boost/asio/ip/impl/address_v6.hpp rename to c++/boost/asio/ip/impl/address_v6.hpp diff --git a/c++/include/boost/asio/ip/impl/address_v6.ipp b/c++/boost/asio/ip/impl/address_v6.ipp similarity index 100% rename from c++/include/boost/asio/ip/impl/address_v6.ipp rename to c++/boost/asio/ip/impl/address_v6.ipp diff --git a/c++/include/boost/asio/ip/impl/basic_endpoint.hpp b/c++/boost/asio/ip/impl/basic_endpoint.hpp similarity index 100% rename from c++/include/boost/asio/ip/impl/basic_endpoint.hpp rename to c++/boost/asio/ip/impl/basic_endpoint.hpp diff --git a/c++/include/boost/asio/ip/impl/host_name.ipp b/c++/boost/asio/ip/impl/host_name.ipp similarity index 100% rename from c++/include/boost/asio/ip/impl/host_name.ipp rename to c++/boost/asio/ip/impl/host_name.ipp diff --git a/c++/include/boost/asio/ip/impl/network_v4.hpp b/c++/boost/asio/ip/impl/network_v4.hpp similarity index 100% rename from c++/include/boost/asio/ip/impl/network_v4.hpp rename to c++/boost/asio/ip/impl/network_v4.hpp diff --git a/c++/include/boost/asio/ip/impl/network_v4.ipp b/c++/boost/asio/ip/impl/network_v4.ipp similarity index 100% rename from c++/include/boost/asio/ip/impl/network_v4.ipp rename to c++/boost/asio/ip/impl/network_v4.ipp diff --git a/c++/include/boost/asio/ip/impl/network_v6.hpp b/c++/boost/asio/ip/impl/network_v6.hpp similarity index 100% rename from c++/include/boost/asio/ip/impl/network_v6.hpp rename to c++/boost/asio/ip/impl/network_v6.hpp diff --git a/c++/include/boost/asio/ip/impl/network_v6.ipp b/c++/boost/asio/ip/impl/network_v6.ipp similarity index 100% rename from c++/include/boost/asio/ip/impl/network_v6.ipp rename to c++/boost/asio/ip/impl/network_v6.ipp diff --git a/c++/include/boost/asio/ip/multicast.hpp b/c++/boost/asio/ip/multicast.hpp similarity index 100% rename from c++/include/boost/asio/ip/multicast.hpp rename to c++/boost/asio/ip/multicast.hpp diff --git a/c++/include/boost/asio/ip/network_v4.hpp b/c++/boost/asio/ip/network_v4.hpp similarity index 100% rename from c++/include/boost/asio/ip/network_v4.hpp rename to c++/boost/asio/ip/network_v4.hpp diff --git a/c++/include/boost/asio/ip/network_v6.hpp b/c++/boost/asio/ip/network_v6.hpp similarity index 100% rename from c++/include/boost/asio/ip/network_v6.hpp rename to c++/boost/asio/ip/network_v6.hpp diff --git a/c++/include/boost/asio/ip/resolver_base.hpp b/c++/boost/asio/ip/resolver_base.hpp similarity index 100% rename from c++/include/boost/asio/ip/resolver_base.hpp rename to c++/boost/asio/ip/resolver_base.hpp diff --git a/c++/include/boost/asio/ip/resolver_query_base.hpp b/c++/boost/asio/ip/resolver_query_base.hpp similarity index 100% rename from c++/include/boost/asio/ip/resolver_query_base.hpp rename to c++/boost/asio/ip/resolver_query_base.hpp diff --git a/c++/include/boost/asio/ip/tcp.hpp b/c++/boost/asio/ip/tcp.hpp similarity index 100% rename from c++/include/boost/asio/ip/tcp.hpp rename to c++/boost/asio/ip/tcp.hpp diff --git a/c++/include/boost/asio/ip/udp.hpp b/c++/boost/asio/ip/udp.hpp similarity index 100% rename from c++/include/boost/asio/ip/udp.hpp rename to c++/boost/asio/ip/udp.hpp diff --git a/c++/include/boost/asio/ip/unicast.hpp b/c++/boost/asio/ip/unicast.hpp similarity index 100% rename from c++/include/boost/asio/ip/unicast.hpp rename to c++/boost/asio/ip/unicast.hpp diff --git a/c++/include/boost/asio/ip/v6_only.hpp b/c++/boost/asio/ip/v6_only.hpp similarity index 100% rename from c++/include/boost/asio/ip/v6_only.hpp rename to c++/boost/asio/ip/v6_only.hpp diff --git a/c++/include/boost/asio/is_applicable_property.hpp b/c++/boost/asio/is_applicable_property.hpp similarity index 100% rename from c++/include/boost/asio/is_applicable_property.hpp rename to c++/boost/asio/is_applicable_property.hpp diff --git a/c++/include/boost/asio/is_contiguous_iterator.hpp b/c++/boost/asio/is_contiguous_iterator.hpp similarity index 100% rename from c++/include/boost/asio/is_contiguous_iterator.hpp rename to c++/boost/asio/is_contiguous_iterator.hpp diff --git a/c++/include/boost/asio/is_executor.hpp b/c++/boost/asio/is_executor.hpp similarity index 100% rename from c++/include/boost/asio/is_executor.hpp rename to c++/boost/asio/is_executor.hpp diff --git a/c++/include/boost/asio/is_read_buffered.hpp b/c++/boost/asio/is_read_buffered.hpp similarity index 100% rename from c++/include/boost/asio/is_read_buffered.hpp rename to c++/boost/asio/is_read_buffered.hpp diff --git a/c++/include/boost/asio/is_write_buffered.hpp b/c++/boost/asio/is_write_buffered.hpp similarity index 100% rename from c++/include/boost/asio/is_write_buffered.hpp rename to c++/boost/asio/is_write_buffered.hpp diff --git a/c++/include/boost/asio/local/basic_endpoint.hpp b/c++/boost/asio/local/basic_endpoint.hpp similarity index 100% rename from c++/include/boost/asio/local/basic_endpoint.hpp rename to c++/boost/asio/local/basic_endpoint.hpp diff --git a/c++/include/boost/asio/local/connect_pair.hpp b/c++/boost/asio/local/connect_pair.hpp similarity index 100% rename from c++/include/boost/asio/local/connect_pair.hpp rename to c++/boost/asio/local/connect_pair.hpp diff --git a/c++/include/boost/asio/local/datagram_protocol.hpp b/c++/boost/asio/local/datagram_protocol.hpp similarity index 100% rename from c++/include/boost/asio/local/datagram_protocol.hpp rename to c++/boost/asio/local/datagram_protocol.hpp diff --git a/c++/include/boost/asio/local/detail/endpoint.hpp b/c++/boost/asio/local/detail/endpoint.hpp similarity index 100% rename from c++/include/boost/asio/local/detail/endpoint.hpp rename to c++/boost/asio/local/detail/endpoint.hpp diff --git a/c++/include/boost/asio/local/detail/impl/endpoint.ipp b/c++/boost/asio/local/detail/impl/endpoint.ipp similarity index 100% rename from c++/include/boost/asio/local/detail/impl/endpoint.ipp rename to c++/boost/asio/local/detail/impl/endpoint.ipp diff --git a/c++/include/boost/asio/local/seq_packet_protocol.hpp b/c++/boost/asio/local/seq_packet_protocol.hpp similarity index 100% rename from c++/include/boost/asio/local/seq_packet_protocol.hpp rename to c++/boost/asio/local/seq_packet_protocol.hpp diff --git a/c++/include/boost/asio/local/stream_protocol.hpp b/c++/boost/asio/local/stream_protocol.hpp similarity index 100% rename from c++/include/boost/asio/local/stream_protocol.hpp rename to c++/boost/asio/local/stream_protocol.hpp diff --git a/c++/include/boost/asio/multiple_exceptions.hpp b/c++/boost/asio/multiple_exceptions.hpp similarity index 100% rename from c++/include/boost/asio/multiple_exceptions.hpp rename to c++/boost/asio/multiple_exceptions.hpp diff --git a/c++/include/boost/asio/packaged_task.hpp b/c++/boost/asio/packaged_task.hpp similarity index 100% rename from c++/include/boost/asio/packaged_task.hpp rename to c++/boost/asio/packaged_task.hpp diff --git a/c++/include/boost/asio/placeholders.hpp b/c++/boost/asio/placeholders.hpp similarity index 100% rename from c++/include/boost/asio/placeholders.hpp rename to c++/boost/asio/placeholders.hpp diff --git a/c++/include/boost/asio/posix/basic_descriptor.hpp b/c++/boost/asio/posix/basic_descriptor.hpp similarity index 100% rename from c++/include/boost/asio/posix/basic_descriptor.hpp rename to c++/boost/asio/posix/basic_descriptor.hpp diff --git a/c++/include/boost/asio/posix/basic_stream_descriptor.hpp b/c++/boost/asio/posix/basic_stream_descriptor.hpp similarity index 100% rename from c++/include/boost/asio/posix/basic_stream_descriptor.hpp rename to c++/boost/asio/posix/basic_stream_descriptor.hpp diff --git a/c++/include/boost/asio/posix/descriptor.hpp b/c++/boost/asio/posix/descriptor.hpp similarity index 100% rename from c++/include/boost/asio/posix/descriptor.hpp rename to c++/boost/asio/posix/descriptor.hpp diff --git a/c++/include/boost/asio/posix/descriptor_base.hpp b/c++/boost/asio/posix/descriptor_base.hpp similarity index 100% rename from c++/include/boost/asio/posix/descriptor_base.hpp rename to c++/boost/asio/posix/descriptor_base.hpp diff --git a/c++/include/boost/asio/posix/stream_descriptor.hpp b/c++/boost/asio/posix/stream_descriptor.hpp similarity index 100% rename from c++/include/boost/asio/posix/stream_descriptor.hpp rename to c++/boost/asio/posix/stream_descriptor.hpp diff --git a/c++/include/boost/asio/post.hpp b/c++/boost/asio/post.hpp similarity index 100% rename from c++/include/boost/asio/post.hpp rename to c++/boost/asio/post.hpp diff --git a/c++/include/boost/asio/prefer.hpp b/c++/boost/asio/prefer.hpp similarity index 100% rename from c++/include/boost/asio/prefer.hpp rename to c++/boost/asio/prefer.hpp diff --git a/c++/include/boost/asio/prepend.hpp b/c++/boost/asio/prepend.hpp similarity index 100% rename from c++/include/boost/asio/prepend.hpp rename to c++/boost/asio/prepend.hpp diff --git a/c++/include/boost/asio/query.hpp b/c++/boost/asio/query.hpp similarity index 100% rename from c++/include/boost/asio/query.hpp rename to c++/boost/asio/query.hpp diff --git a/c++/include/boost/asio/random_access_file.hpp b/c++/boost/asio/random_access_file.hpp similarity index 100% rename from c++/include/boost/asio/random_access_file.hpp rename to c++/boost/asio/random_access_file.hpp diff --git a/c++/include/boost/asio/read.hpp b/c++/boost/asio/read.hpp similarity index 100% rename from c++/include/boost/asio/read.hpp rename to c++/boost/asio/read.hpp diff --git a/c++/include/boost/asio/read_at.hpp b/c++/boost/asio/read_at.hpp similarity index 100% rename from c++/include/boost/asio/read_at.hpp rename to c++/boost/asio/read_at.hpp diff --git a/c++/include/boost/asio/read_until.hpp b/c++/boost/asio/read_until.hpp similarity index 100% rename from c++/include/boost/asio/read_until.hpp rename to c++/boost/asio/read_until.hpp diff --git a/c++/include/boost/asio/readable_pipe.hpp b/c++/boost/asio/readable_pipe.hpp similarity index 100% rename from c++/include/boost/asio/readable_pipe.hpp rename to c++/boost/asio/readable_pipe.hpp diff --git a/c++/include/boost/asio/recycling_allocator.hpp b/c++/boost/asio/recycling_allocator.hpp similarity index 100% rename from c++/include/boost/asio/recycling_allocator.hpp rename to c++/boost/asio/recycling_allocator.hpp diff --git a/c++/include/boost/asio/redirect_error.hpp b/c++/boost/asio/redirect_error.hpp similarity index 100% rename from c++/include/boost/asio/redirect_error.hpp rename to c++/boost/asio/redirect_error.hpp diff --git a/c++/include/boost/asio/registered_buffer.hpp b/c++/boost/asio/registered_buffer.hpp similarity index 100% rename from c++/include/boost/asio/registered_buffer.hpp rename to c++/boost/asio/registered_buffer.hpp diff --git a/c++/include/boost/asio/require.hpp b/c++/boost/asio/require.hpp similarity index 100% rename from c++/include/boost/asio/require.hpp rename to c++/boost/asio/require.hpp diff --git a/c++/include/boost/asio/require_concept.hpp b/c++/boost/asio/require_concept.hpp similarity index 100% rename from c++/include/boost/asio/require_concept.hpp rename to c++/boost/asio/require_concept.hpp diff --git a/c++/include/boost/asio/serial_port.hpp b/c++/boost/asio/serial_port.hpp similarity index 100% rename from c++/include/boost/asio/serial_port.hpp rename to c++/boost/asio/serial_port.hpp diff --git a/c++/include/boost/asio/serial_port_base.hpp b/c++/boost/asio/serial_port_base.hpp similarity index 100% rename from c++/include/boost/asio/serial_port_base.hpp rename to c++/boost/asio/serial_port_base.hpp diff --git a/c++/include/boost/asio/signal_set.hpp b/c++/boost/asio/signal_set.hpp similarity index 100% rename from c++/include/boost/asio/signal_set.hpp rename to c++/boost/asio/signal_set.hpp diff --git a/c++/include/boost/asio/signal_set_base.hpp b/c++/boost/asio/signal_set_base.hpp similarity index 100% rename from c++/include/boost/asio/signal_set_base.hpp rename to c++/boost/asio/signal_set_base.hpp diff --git a/c++/include/boost/asio/socket_base.hpp b/c++/boost/asio/socket_base.hpp similarity index 100% rename from c++/include/boost/asio/socket_base.hpp rename to c++/boost/asio/socket_base.hpp diff --git a/c++/include/boost/asio/spawn.hpp b/c++/boost/asio/spawn.hpp similarity index 100% rename from c++/include/boost/asio/spawn.hpp rename to c++/boost/asio/spawn.hpp diff --git a/c++/include/boost/asio/ssl.hpp b/c++/boost/asio/ssl.hpp similarity index 100% rename from c++/include/boost/asio/ssl.hpp rename to c++/boost/asio/ssl.hpp diff --git a/c++/include/boost/asio/ssl/context.hpp b/c++/boost/asio/ssl/context.hpp similarity index 100% rename from c++/include/boost/asio/ssl/context.hpp rename to c++/boost/asio/ssl/context.hpp diff --git a/c++/include/boost/asio/ssl/context_base.hpp b/c++/boost/asio/ssl/context_base.hpp similarity index 100% rename from c++/include/boost/asio/ssl/context_base.hpp rename to c++/boost/asio/ssl/context_base.hpp diff --git a/c++/include/boost/asio/ssl/detail/buffered_handshake_op.hpp b/c++/boost/asio/ssl/detail/buffered_handshake_op.hpp similarity index 100% rename from c++/include/boost/asio/ssl/detail/buffered_handshake_op.hpp rename to c++/boost/asio/ssl/detail/buffered_handshake_op.hpp diff --git a/c++/include/boost/asio/ssl/detail/engine.hpp b/c++/boost/asio/ssl/detail/engine.hpp similarity index 100% rename from c++/include/boost/asio/ssl/detail/engine.hpp rename to c++/boost/asio/ssl/detail/engine.hpp diff --git a/c++/include/boost/asio/ssl/detail/handshake_op.hpp b/c++/boost/asio/ssl/detail/handshake_op.hpp similarity index 100% rename from c++/include/boost/asio/ssl/detail/handshake_op.hpp rename to c++/boost/asio/ssl/detail/handshake_op.hpp diff --git a/c++/include/boost/asio/ssl/detail/impl/engine.ipp b/c++/boost/asio/ssl/detail/impl/engine.ipp similarity index 100% rename from c++/include/boost/asio/ssl/detail/impl/engine.ipp rename to c++/boost/asio/ssl/detail/impl/engine.ipp diff --git a/c++/include/boost/asio/ssl/detail/impl/openssl_init.ipp b/c++/boost/asio/ssl/detail/impl/openssl_init.ipp similarity index 100% rename from c++/include/boost/asio/ssl/detail/impl/openssl_init.ipp rename to c++/boost/asio/ssl/detail/impl/openssl_init.ipp diff --git a/c++/include/boost/asio/ssl/detail/io.hpp b/c++/boost/asio/ssl/detail/io.hpp similarity index 100% rename from c++/include/boost/asio/ssl/detail/io.hpp rename to c++/boost/asio/ssl/detail/io.hpp diff --git a/c++/include/boost/asio/ssl/detail/openssl_init.hpp b/c++/boost/asio/ssl/detail/openssl_init.hpp similarity index 100% rename from c++/include/boost/asio/ssl/detail/openssl_init.hpp rename to c++/boost/asio/ssl/detail/openssl_init.hpp diff --git a/c++/include/boost/asio/ssl/detail/openssl_types.hpp b/c++/boost/asio/ssl/detail/openssl_types.hpp similarity index 100% rename from c++/include/boost/asio/ssl/detail/openssl_types.hpp rename to c++/boost/asio/ssl/detail/openssl_types.hpp diff --git a/c++/include/boost/asio/ssl/detail/password_callback.hpp b/c++/boost/asio/ssl/detail/password_callback.hpp similarity index 100% rename from c++/include/boost/asio/ssl/detail/password_callback.hpp rename to c++/boost/asio/ssl/detail/password_callback.hpp diff --git a/c++/include/boost/asio/ssl/detail/read_op.hpp b/c++/boost/asio/ssl/detail/read_op.hpp similarity index 100% rename from c++/include/boost/asio/ssl/detail/read_op.hpp rename to c++/boost/asio/ssl/detail/read_op.hpp diff --git a/c++/include/boost/asio/ssl/detail/shutdown_op.hpp b/c++/boost/asio/ssl/detail/shutdown_op.hpp similarity index 100% rename from c++/include/boost/asio/ssl/detail/shutdown_op.hpp rename to c++/boost/asio/ssl/detail/shutdown_op.hpp diff --git a/c++/include/boost/asio/ssl/detail/stream_core.hpp b/c++/boost/asio/ssl/detail/stream_core.hpp similarity index 100% rename from c++/include/boost/asio/ssl/detail/stream_core.hpp rename to c++/boost/asio/ssl/detail/stream_core.hpp diff --git a/c++/include/boost/asio/ssl/detail/verify_callback.hpp b/c++/boost/asio/ssl/detail/verify_callback.hpp similarity index 100% rename from c++/include/boost/asio/ssl/detail/verify_callback.hpp rename to c++/boost/asio/ssl/detail/verify_callback.hpp diff --git a/c++/include/boost/asio/ssl/detail/write_op.hpp b/c++/boost/asio/ssl/detail/write_op.hpp similarity index 100% rename from c++/include/boost/asio/ssl/detail/write_op.hpp rename to c++/boost/asio/ssl/detail/write_op.hpp diff --git a/c++/include/boost/asio/ssl/error.hpp b/c++/boost/asio/ssl/error.hpp similarity index 100% rename from c++/include/boost/asio/ssl/error.hpp rename to c++/boost/asio/ssl/error.hpp diff --git a/c++/include/boost/asio/ssl/host_name_verification.hpp b/c++/boost/asio/ssl/host_name_verification.hpp similarity index 100% rename from c++/include/boost/asio/ssl/host_name_verification.hpp rename to c++/boost/asio/ssl/host_name_verification.hpp diff --git a/c++/include/boost/asio/ssl/impl/context.hpp b/c++/boost/asio/ssl/impl/context.hpp similarity index 100% rename from c++/include/boost/asio/ssl/impl/context.hpp rename to c++/boost/asio/ssl/impl/context.hpp diff --git a/c++/include/boost/asio/ssl/impl/context.ipp b/c++/boost/asio/ssl/impl/context.ipp similarity index 100% rename from c++/include/boost/asio/ssl/impl/context.ipp rename to c++/boost/asio/ssl/impl/context.ipp diff --git a/c++/include/boost/asio/ssl/impl/error.ipp b/c++/boost/asio/ssl/impl/error.ipp similarity index 100% rename from c++/include/boost/asio/ssl/impl/error.ipp rename to c++/boost/asio/ssl/impl/error.ipp diff --git a/c++/include/boost/asio/ssl/impl/host_name_verification.ipp b/c++/boost/asio/ssl/impl/host_name_verification.ipp similarity index 100% rename from c++/include/boost/asio/ssl/impl/host_name_verification.ipp rename to c++/boost/asio/ssl/impl/host_name_verification.ipp diff --git a/c++/include/boost/asio/ssl/impl/rfc2818_verification.ipp b/c++/boost/asio/ssl/impl/rfc2818_verification.ipp similarity index 100% rename from c++/include/boost/asio/ssl/impl/rfc2818_verification.ipp rename to c++/boost/asio/ssl/impl/rfc2818_verification.ipp diff --git a/c++/include/boost/asio/ssl/impl/src.hpp b/c++/boost/asio/ssl/impl/src.hpp similarity index 100% rename from c++/include/boost/asio/ssl/impl/src.hpp rename to c++/boost/asio/ssl/impl/src.hpp diff --git a/c++/include/boost/asio/ssl/rfc2818_verification.hpp b/c++/boost/asio/ssl/rfc2818_verification.hpp similarity index 100% rename from c++/include/boost/asio/ssl/rfc2818_verification.hpp rename to c++/boost/asio/ssl/rfc2818_verification.hpp diff --git a/c++/include/boost/asio/ssl/stream.hpp b/c++/boost/asio/ssl/stream.hpp similarity index 100% rename from c++/include/boost/asio/ssl/stream.hpp rename to c++/boost/asio/ssl/stream.hpp diff --git a/c++/include/boost/asio/ssl/stream_base.hpp b/c++/boost/asio/ssl/stream_base.hpp similarity index 100% rename from c++/include/boost/asio/ssl/stream_base.hpp rename to c++/boost/asio/ssl/stream_base.hpp diff --git a/c++/include/boost/asio/ssl/verify_context.hpp b/c++/boost/asio/ssl/verify_context.hpp similarity index 100% rename from c++/include/boost/asio/ssl/verify_context.hpp rename to c++/boost/asio/ssl/verify_context.hpp diff --git a/c++/include/boost/asio/ssl/verify_mode.hpp b/c++/boost/asio/ssl/verify_mode.hpp similarity index 100% rename from c++/include/boost/asio/ssl/verify_mode.hpp rename to c++/boost/asio/ssl/verify_mode.hpp diff --git a/c++/include/boost/asio/static_thread_pool.hpp b/c++/boost/asio/static_thread_pool.hpp similarity index 100% rename from c++/include/boost/asio/static_thread_pool.hpp rename to c++/boost/asio/static_thread_pool.hpp diff --git a/c++/include/boost/asio/steady_timer.hpp b/c++/boost/asio/steady_timer.hpp similarity index 100% rename from c++/include/boost/asio/steady_timer.hpp rename to c++/boost/asio/steady_timer.hpp diff --git a/c++/include/boost/asio/strand.hpp b/c++/boost/asio/strand.hpp similarity index 100% rename from c++/include/boost/asio/strand.hpp rename to c++/boost/asio/strand.hpp diff --git a/c++/include/boost/asio/stream_file.hpp b/c++/boost/asio/stream_file.hpp similarity index 100% rename from c++/include/boost/asio/stream_file.hpp rename to c++/boost/asio/stream_file.hpp diff --git a/c++/include/boost/asio/streambuf.hpp b/c++/boost/asio/streambuf.hpp similarity index 100% rename from c++/include/boost/asio/streambuf.hpp rename to c++/boost/asio/streambuf.hpp diff --git a/c++/include/boost/asio/system_context.hpp b/c++/boost/asio/system_context.hpp similarity index 100% rename from c++/include/boost/asio/system_context.hpp rename to c++/boost/asio/system_context.hpp diff --git a/c++/include/boost/asio/system_executor.hpp b/c++/boost/asio/system_executor.hpp similarity index 100% rename from c++/include/boost/asio/system_executor.hpp rename to c++/boost/asio/system_executor.hpp diff --git a/c++/include/boost/asio/system_timer.hpp b/c++/boost/asio/system_timer.hpp similarity index 100% rename from c++/include/boost/asio/system_timer.hpp rename to c++/boost/asio/system_timer.hpp diff --git a/c++/include/boost/asio/this_coro.hpp b/c++/boost/asio/this_coro.hpp similarity index 100% rename from c++/include/boost/asio/this_coro.hpp rename to c++/boost/asio/this_coro.hpp diff --git a/c++/include/boost/asio/thread_pool.hpp b/c++/boost/asio/thread_pool.hpp similarity index 100% rename from c++/include/boost/asio/thread_pool.hpp rename to c++/boost/asio/thread_pool.hpp diff --git a/c++/include/boost/asio/time_traits.hpp b/c++/boost/asio/time_traits.hpp similarity index 100% rename from c++/include/boost/asio/time_traits.hpp rename to c++/boost/asio/time_traits.hpp diff --git a/c++/include/boost/asio/traits/bulk_execute_free.hpp b/c++/boost/asio/traits/bulk_execute_free.hpp similarity index 100% rename from c++/include/boost/asio/traits/bulk_execute_free.hpp rename to c++/boost/asio/traits/bulk_execute_free.hpp diff --git a/c++/include/boost/asio/traits/bulk_execute_member.hpp b/c++/boost/asio/traits/bulk_execute_member.hpp similarity index 100% rename from c++/include/boost/asio/traits/bulk_execute_member.hpp rename to c++/boost/asio/traits/bulk_execute_member.hpp diff --git a/c++/include/boost/asio/traits/connect_free.hpp b/c++/boost/asio/traits/connect_free.hpp similarity index 100% rename from c++/include/boost/asio/traits/connect_free.hpp rename to c++/boost/asio/traits/connect_free.hpp diff --git a/c++/include/boost/asio/traits/connect_member.hpp b/c++/boost/asio/traits/connect_member.hpp similarity index 100% rename from c++/include/boost/asio/traits/connect_member.hpp rename to c++/boost/asio/traits/connect_member.hpp diff --git a/c++/include/boost/asio/traits/equality_comparable.hpp b/c++/boost/asio/traits/equality_comparable.hpp similarity index 100% rename from c++/include/boost/asio/traits/equality_comparable.hpp rename to c++/boost/asio/traits/equality_comparable.hpp diff --git a/c++/include/boost/asio/traits/execute_free.hpp b/c++/boost/asio/traits/execute_free.hpp similarity index 100% rename from c++/include/boost/asio/traits/execute_free.hpp rename to c++/boost/asio/traits/execute_free.hpp diff --git a/c++/include/boost/asio/traits/execute_member.hpp b/c++/boost/asio/traits/execute_member.hpp similarity index 100% rename from c++/include/boost/asio/traits/execute_member.hpp rename to c++/boost/asio/traits/execute_member.hpp diff --git a/c++/include/boost/asio/traits/prefer_free.hpp b/c++/boost/asio/traits/prefer_free.hpp similarity index 100% rename from c++/include/boost/asio/traits/prefer_free.hpp rename to c++/boost/asio/traits/prefer_free.hpp diff --git a/c++/include/boost/asio/traits/prefer_member.hpp b/c++/boost/asio/traits/prefer_member.hpp similarity index 100% rename from c++/include/boost/asio/traits/prefer_member.hpp rename to c++/boost/asio/traits/prefer_member.hpp diff --git a/c++/include/boost/asio/traits/query_free.hpp b/c++/boost/asio/traits/query_free.hpp similarity index 100% rename from c++/include/boost/asio/traits/query_free.hpp rename to c++/boost/asio/traits/query_free.hpp diff --git a/c++/include/boost/asio/traits/query_member.hpp b/c++/boost/asio/traits/query_member.hpp similarity index 100% rename from c++/include/boost/asio/traits/query_member.hpp rename to c++/boost/asio/traits/query_member.hpp diff --git a/c++/include/boost/asio/traits/query_static_constexpr_member.hpp b/c++/boost/asio/traits/query_static_constexpr_member.hpp similarity index 100% rename from c++/include/boost/asio/traits/query_static_constexpr_member.hpp rename to c++/boost/asio/traits/query_static_constexpr_member.hpp diff --git a/c++/include/boost/asio/traits/require_concept_free.hpp b/c++/boost/asio/traits/require_concept_free.hpp similarity index 100% rename from c++/include/boost/asio/traits/require_concept_free.hpp rename to c++/boost/asio/traits/require_concept_free.hpp diff --git a/c++/include/boost/asio/traits/require_concept_member.hpp b/c++/boost/asio/traits/require_concept_member.hpp similarity index 100% rename from c++/include/boost/asio/traits/require_concept_member.hpp rename to c++/boost/asio/traits/require_concept_member.hpp diff --git a/c++/include/boost/asio/traits/require_free.hpp b/c++/boost/asio/traits/require_free.hpp similarity index 100% rename from c++/include/boost/asio/traits/require_free.hpp rename to c++/boost/asio/traits/require_free.hpp diff --git a/c++/include/boost/asio/traits/require_member.hpp b/c++/boost/asio/traits/require_member.hpp similarity index 100% rename from c++/include/boost/asio/traits/require_member.hpp rename to c++/boost/asio/traits/require_member.hpp diff --git a/c++/include/boost/asio/traits/schedule_free.hpp b/c++/boost/asio/traits/schedule_free.hpp similarity index 100% rename from c++/include/boost/asio/traits/schedule_free.hpp rename to c++/boost/asio/traits/schedule_free.hpp diff --git a/c++/include/boost/asio/traits/schedule_member.hpp b/c++/boost/asio/traits/schedule_member.hpp similarity index 100% rename from c++/include/boost/asio/traits/schedule_member.hpp rename to c++/boost/asio/traits/schedule_member.hpp diff --git a/c++/include/boost/asio/traits/set_done_free.hpp b/c++/boost/asio/traits/set_done_free.hpp similarity index 100% rename from c++/include/boost/asio/traits/set_done_free.hpp rename to c++/boost/asio/traits/set_done_free.hpp diff --git a/c++/include/boost/asio/traits/set_done_member.hpp b/c++/boost/asio/traits/set_done_member.hpp similarity index 100% rename from c++/include/boost/asio/traits/set_done_member.hpp rename to c++/boost/asio/traits/set_done_member.hpp diff --git a/c++/include/boost/asio/traits/set_error_free.hpp b/c++/boost/asio/traits/set_error_free.hpp similarity index 100% rename from c++/include/boost/asio/traits/set_error_free.hpp rename to c++/boost/asio/traits/set_error_free.hpp diff --git a/c++/include/boost/asio/traits/set_error_member.hpp b/c++/boost/asio/traits/set_error_member.hpp similarity index 100% rename from c++/include/boost/asio/traits/set_error_member.hpp rename to c++/boost/asio/traits/set_error_member.hpp diff --git a/c++/include/boost/asio/traits/set_value_free.hpp b/c++/boost/asio/traits/set_value_free.hpp similarity index 100% rename from c++/include/boost/asio/traits/set_value_free.hpp rename to c++/boost/asio/traits/set_value_free.hpp diff --git a/c++/include/boost/asio/traits/set_value_member.hpp b/c++/boost/asio/traits/set_value_member.hpp similarity index 100% rename from c++/include/boost/asio/traits/set_value_member.hpp rename to c++/boost/asio/traits/set_value_member.hpp diff --git a/c++/include/boost/asio/traits/start_free.hpp b/c++/boost/asio/traits/start_free.hpp similarity index 100% rename from c++/include/boost/asio/traits/start_free.hpp rename to c++/boost/asio/traits/start_free.hpp diff --git a/c++/include/boost/asio/traits/start_member.hpp b/c++/boost/asio/traits/start_member.hpp similarity index 100% rename from c++/include/boost/asio/traits/start_member.hpp rename to c++/boost/asio/traits/start_member.hpp diff --git a/c++/include/boost/asio/traits/static_query.hpp b/c++/boost/asio/traits/static_query.hpp similarity index 100% rename from c++/include/boost/asio/traits/static_query.hpp rename to c++/boost/asio/traits/static_query.hpp diff --git a/c++/include/boost/asio/traits/static_require.hpp b/c++/boost/asio/traits/static_require.hpp similarity index 100% rename from c++/include/boost/asio/traits/static_require.hpp rename to c++/boost/asio/traits/static_require.hpp diff --git a/c++/include/boost/asio/traits/static_require_concept.hpp b/c++/boost/asio/traits/static_require_concept.hpp similarity index 100% rename from c++/include/boost/asio/traits/static_require_concept.hpp rename to c++/boost/asio/traits/static_require_concept.hpp diff --git a/c++/include/boost/asio/traits/submit_free.hpp b/c++/boost/asio/traits/submit_free.hpp similarity index 100% rename from c++/include/boost/asio/traits/submit_free.hpp rename to c++/boost/asio/traits/submit_free.hpp diff --git a/c++/include/boost/asio/traits/submit_member.hpp b/c++/boost/asio/traits/submit_member.hpp similarity index 100% rename from c++/include/boost/asio/traits/submit_member.hpp rename to c++/boost/asio/traits/submit_member.hpp diff --git a/c++/include/boost/asio/ts/buffer.hpp b/c++/boost/asio/ts/buffer.hpp similarity index 100% rename from c++/include/boost/asio/ts/buffer.hpp rename to c++/boost/asio/ts/buffer.hpp diff --git a/c++/include/boost/asio/ts/executor.hpp b/c++/boost/asio/ts/executor.hpp similarity index 100% rename from c++/include/boost/asio/ts/executor.hpp rename to c++/boost/asio/ts/executor.hpp diff --git a/c++/include/boost/asio/ts/internet.hpp b/c++/boost/asio/ts/internet.hpp similarity index 100% rename from c++/include/boost/asio/ts/internet.hpp rename to c++/boost/asio/ts/internet.hpp diff --git a/c++/include/boost/asio/ts/io_context.hpp b/c++/boost/asio/ts/io_context.hpp similarity index 100% rename from c++/include/boost/asio/ts/io_context.hpp rename to c++/boost/asio/ts/io_context.hpp diff --git a/c++/include/boost/asio/ts/net.hpp b/c++/boost/asio/ts/net.hpp similarity index 100% rename from c++/include/boost/asio/ts/net.hpp rename to c++/boost/asio/ts/net.hpp diff --git a/c++/include/boost/asio/ts/netfwd.hpp b/c++/boost/asio/ts/netfwd.hpp similarity index 100% rename from c++/include/boost/asio/ts/netfwd.hpp rename to c++/boost/asio/ts/netfwd.hpp diff --git a/c++/include/boost/asio/ts/socket.hpp b/c++/boost/asio/ts/socket.hpp similarity index 100% rename from c++/include/boost/asio/ts/socket.hpp rename to c++/boost/asio/ts/socket.hpp diff --git a/c++/include/boost/asio/ts/timer.hpp b/c++/boost/asio/ts/timer.hpp similarity index 100% rename from c++/include/boost/asio/ts/timer.hpp rename to c++/boost/asio/ts/timer.hpp diff --git a/c++/include/boost/asio/unyield.hpp b/c++/boost/asio/unyield.hpp similarity index 100% rename from c++/include/boost/asio/unyield.hpp rename to c++/boost/asio/unyield.hpp diff --git a/c++/include/boost/asio/use_awaitable.hpp b/c++/boost/asio/use_awaitable.hpp similarity index 100% rename from c++/include/boost/asio/use_awaitable.hpp rename to c++/boost/asio/use_awaitable.hpp diff --git a/c++/include/boost/asio/use_future.hpp b/c++/boost/asio/use_future.hpp similarity index 100% rename from c++/include/boost/asio/use_future.hpp rename to c++/boost/asio/use_future.hpp diff --git a/c++/include/boost/asio/uses_executor.hpp b/c++/boost/asio/uses_executor.hpp similarity index 100% rename from c++/include/boost/asio/uses_executor.hpp rename to c++/boost/asio/uses_executor.hpp diff --git a/c++/include/boost/asio/version.hpp b/c++/boost/asio/version.hpp similarity index 100% rename from c++/include/boost/asio/version.hpp rename to c++/boost/asio/version.hpp diff --git a/c++/include/boost/asio/wait_traits.hpp b/c++/boost/asio/wait_traits.hpp similarity index 100% rename from c++/include/boost/asio/wait_traits.hpp rename to c++/boost/asio/wait_traits.hpp diff --git a/c++/include/boost/asio/windows/basic_object_handle.hpp b/c++/boost/asio/windows/basic_object_handle.hpp similarity index 100% rename from c++/include/boost/asio/windows/basic_object_handle.hpp rename to c++/boost/asio/windows/basic_object_handle.hpp diff --git a/c++/include/boost/asio/windows/basic_overlapped_handle.hpp b/c++/boost/asio/windows/basic_overlapped_handle.hpp similarity index 100% rename from c++/include/boost/asio/windows/basic_overlapped_handle.hpp rename to c++/boost/asio/windows/basic_overlapped_handle.hpp diff --git a/c++/include/boost/asio/windows/basic_random_access_handle.hpp b/c++/boost/asio/windows/basic_random_access_handle.hpp similarity index 100% rename from c++/include/boost/asio/windows/basic_random_access_handle.hpp rename to c++/boost/asio/windows/basic_random_access_handle.hpp diff --git a/c++/include/boost/asio/windows/basic_stream_handle.hpp b/c++/boost/asio/windows/basic_stream_handle.hpp similarity index 100% rename from c++/include/boost/asio/windows/basic_stream_handle.hpp rename to c++/boost/asio/windows/basic_stream_handle.hpp diff --git a/c++/include/boost/asio/windows/object_handle.hpp b/c++/boost/asio/windows/object_handle.hpp similarity index 100% rename from c++/include/boost/asio/windows/object_handle.hpp rename to c++/boost/asio/windows/object_handle.hpp diff --git a/c++/include/boost/asio/windows/overlapped_handle.hpp b/c++/boost/asio/windows/overlapped_handle.hpp similarity index 100% rename from c++/include/boost/asio/windows/overlapped_handle.hpp rename to c++/boost/asio/windows/overlapped_handle.hpp diff --git a/c++/include/boost/asio/windows/overlapped_ptr.hpp b/c++/boost/asio/windows/overlapped_ptr.hpp similarity index 100% rename from c++/include/boost/asio/windows/overlapped_ptr.hpp rename to c++/boost/asio/windows/overlapped_ptr.hpp diff --git a/c++/include/boost/asio/windows/random_access_handle.hpp b/c++/boost/asio/windows/random_access_handle.hpp similarity index 100% rename from c++/include/boost/asio/windows/random_access_handle.hpp rename to c++/boost/asio/windows/random_access_handle.hpp diff --git a/c++/include/boost/asio/windows/stream_handle.hpp b/c++/boost/asio/windows/stream_handle.hpp similarity index 100% rename from c++/include/boost/asio/windows/stream_handle.hpp rename to c++/boost/asio/windows/stream_handle.hpp diff --git a/c++/include/boost/asio/writable_pipe.hpp b/c++/boost/asio/writable_pipe.hpp similarity index 100% rename from c++/include/boost/asio/writable_pipe.hpp rename to c++/boost/asio/writable_pipe.hpp diff --git a/c++/include/boost/asio/write.hpp b/c++/boost/asio/write.hpp similarity index 100% rename from c++/include/boost/asio/write.hpp rename to c++/boost/asio/write.hpp diff --git a/c++/include/boost/asio/write_at.hpp b/c++/boost/asio/write_at.hpp similarity index 100% rename from c++/include/boost/asio/write_at.hpp rename to c++/boost/asio/write_at.hpp diff --git a/c++/include/boost/asio/yield.hpp b/c++/boost/asio/yield.hpp similarity index 100% rename from c++/include/boost/asio/yield.hpp rename to c++/boost/asio/yield.hpp diff --git a/c++/include/boost/assert.hpp b/c++/boost/assert.hpp similarity index 100% rename from c++/include/boost/assert.hpp rename to c++/boost/assert.hpp diff --git a/c++/include/boost/assert/source_location.hpp b/c++/boost/assert/source_location.hpp similarity index 100% rename from c++/include/boost/assert/source_location.hpp rename to c++/boost/assert/source_location.hpp diff --git a/c++/include/boost/assign.hpp b/c++/boost/assign.hpp similarity index 100% rename from c++/include/boost/assign.hpp rename to c++/boost/assign.hpp diff --git a/c++/include/boost/assign/assignment_exception.hpp b/c++/boost/assign/assignment_exception.hpp similarity index 100% rename from c++/include/boost/assign/assignment_exception.hpp rename to c++/boost/assign/assignment_exception.hpp diff --git a/c++/include/boost/assign/list_inserter.hpp b/c++/boost/assign/list_inserter.hpp similarity index 100% rename from c++/include/boost/assign/list_inserter.hpp rename to c++/boost/assign/list_inserter.hpp diff --git a/c++/include/boost/assign/list_of.hpp b/c++/boost/assign/list_of.hpp similarity index 100% rename from c++/include/boost/assign/list_of.hpp rename to c++/boost/assign/list_of.hpp diff --git a/c++/include/boost/assign/ptr_list_inserter.hpp b/c++/boost/assign/ptr_list_inserter.hpp similarity index 100% rename from c++/include/boost/assign/ptr_list_inserter.hpp rename to c++/boost/assign/ptr_list_inserter.hpp diff --git a/c++/include/boost/assign/ptr_list_of.hpp b/c++/boost/assign/ptr_list_of.hpp similarity index 100% rename from c++/include/boost/assign/ptr_list_of.hpp rename to c++/boost/assign/ptr_list_of.hpp diff --git a/c++/include/boost/assign/ptr_map_inserter.hpp b/c++/boost/assign/ptr_map_inserter.hpp similarity index 100% rename from c++/include/boost/assign/ptr_map_inserter.hpp rename to c++/boost/assign/ptr_map_inserter.hpp diff --git a/c++/include/boost/assign/std.hpp b/c++/boost/assign/std.hpp similarity index 100% rename from c++/include/boost/assign/std.hpp rename to c++/boost/assign/std.hpp diff --git a/c++/include/boost/assign/std/deque.hpp b/c++/boost/assign/std/deque.hpp similarity index 100% rename from c++/include/boost/assign/std/deque.hpp rename to c++/boost/assign/std/deque.hpp diff --git a/c++/include/boost/assign/std/list.hpp b/c++/boost/assign/std/list.hpp similarity index 100% rename from c++/include/boost/assign/std/list.hpp rename to c++/boost/assign/std/list.hpp diff --git a/c++/include/boost/assign/std/map.hpp b/c++/boost/assign/std/map.hpp similarity index 100% rename from c++/include/boost/assign/std/map.hpp rename to c++/boost/assign/std/map.hpp diff --git a/c++/include/boost/assign/std/queue.hpp b/c++/boost/assign/std/queue.hpp similarity index 100% rename from c++/include/boost/assign/std/queue.hpp rename to c++/boost/assign/std/queue.hpp diff --git a/c++/include/boost/assign/std/set.hpp b/c++/boost/assign/std/set.hpp similarity index 100% rename from c++/include/boost/assign/std/set.hpp rename to c++/boost/assign/std/set.hpp diff --git a/c++/include/boost/assign/std/slist.hpp b/c++/boost/assign/std/slist.hpp similarity index 100% rename from c++/include/boost/assign/std/slist.hpp rename to c++/boost/assign/std/slist.hpp diff --git a/c++/include/boost/assign/std/stack.hpp b/c++/boost/assign/std/stack.hpp similarity index 100% rename from c++/include/boost/assign/std/stack.hpp rename to c++/boost/assign/std/stack.hpp diff --git a/c++/include/boost/assign/std/vector.hpp b/c++/boost/assign/std/vector.hpp similarity index 100% rename from c++/include/boost/assign/std/vector.hpp rename to c++/boost/assign/std/vector.hpp diff --git a/c++/include/boost/atomic.hpp b/c++/boost/atomic.hpp similarity index 100% rename from c++/include/boost/atomic.hpp rename to c++/boost/atomic.hpp diff --git a/c++/include/boost/beast.hpp b/c++/boost/beast.hpp similarity index 100% rename from c++/include/boost/beast.hpp rename to c++/boost/beast.hpp diff --git a/c++/include/boost/beast/_experimental/http/icy_stream.hpp b/c++/boost/beast/_experimental/http/icy_stream.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/http/icy_stream.hpp rename to c++/boost/beast/_experimental/http/icy_stream.hpp diff --git a/c++/include/boost/beast/_experimental/http/impl/icy_stream.hpp b/c++/boost/beast/_experimental/http/impl/icy_stream.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/http/impl/icy_stream.hpp rename to c++/boost/beast/_experimental/http/impl/icy_stream.hpp diff --git a/c++/include/boost/beast/_experimental/test/detail/stream_state.hpp b/c++/boost/beast/_experimental/test/detail/stream_state.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/test/detail/stream_state.hpp rename to c++/boost/beast/_experimental/test/detail/stream_state.hpp diff --git a/c++/include/boost/beast/_experimental/test/detail/stream_state.ipp b/c++/boost/beast/_experimental/test/detail/stream_state.ipp similarity index 100% rename from c++/include/boost/beast/_experimental/test/detail/stream_state.ipp rename to c++/boost/beast/_experimental/test/detail/stream_state.ipp diff --git a/c++/include/boost/beast/_experimental/test/error.hpp b/c++/boost/beast/_experimental/test/error.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/test/error.hpp rename to c++/boost/beast/_experimental/test/error.hpp diff --git a/c++/include/boost/beast/_experimental/test/fail_count.hpp b/c++/boost/beast/_experimental/test/fail_count.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/test/fail_count.hpp rename to c++/boost/beast/_experimental/test/fail_count.hpp diff --git a/c++/include/boost/beast/_experimental/test/handler.hpp b/c++/boost/beast/_experimental/test/handler.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/test/handler.hpp rename to c++/boost/beast/_experimental/test/handler.hpp diff --git a/c++/include/boost/beast/_experimental/test/impl/error.hpp b/c++/boost/beast/_experimental/test/impl/error.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/test/impl/error.hpp rename to c++/boost/beast/_experimental/test/impl/error.hpp diff --git a/c++/include/boost/beast/_experimental/test/impl/error.ipp b/c++/boost/beast/_experimental/test/impl/error.ipp similarity index 100% rename from c++/include/boost/beast/_experimental/test/impl/error.ipp rename to c++/boost/beast/_experimental/test/impl/error.ipp diff --git a/c++/include/boost/beast/_experimental/test/impl/fail_count.ipp b/c++/boost/beast/_experimental/test/impl/fail_count.ipp similarity index 100% rename from c++/include/boost/beast/_experimental/test/impl/fail_count.ipp rename to c++/boost/beast/_experimental/test/impl/fail_count.ipp diff --git a/c++/include/boost/beast/_experimental/test/impl/stream.hpp b/c++/boost/beast/_experimental/test/impl/stream.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/test/impl/stream.hpp rename to c++/boost/beast/_experimental/test/impl/stream.hpp diff --git a/c++/include/boost/beast/_experimental/test/impl/stream.ipp b/c++/boost/beast/_experimental/test/impl/stream.ipp similarity index 100% rename from c++/include/boost/beast/_experimental/test/impl/stream.ipp rename to c++/boost/beast/_experimental/test/impl/stream.ipp diff --git a/c++/include/boost/beast/_experimental/test/stream.hpp b/c++/boost/beast/_experimental/test/stream.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/test/stream.hpp rename to c++/boost/beast/_experimental/test/stream.hpp diff --git a/c++/include/boost/beast/_experimental/test/tcp.hpp b/c++/boost/beast/_experimental/test/tcp.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/test/tcp.hpp rename to c++/boost/beast/_experimental/test/tcp.hpp diff --git a/c++/include/boost/beast/_experimental/unit_test/amount.hpp b/c++/boost/beast/_experimental/unit_test/amount.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/unit_test/amount.hpp rename to c++/boost/beast/_experimental/unit_test/amount.hpp diff --git a/c++/include/boost/beast/_experimental/unit_test/detail/const_container.hpp b/c++/boost/beast/_experimental/unit_test/detail/const_container.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/unit_test/detail/const_container.hpp rename to c++/boost/beast/_experimental/unit_test/detail/const_container.hpp diff --git a/c++/include/boost/beast/_experimental/unit_test/dstream.hpp b/c++/boost/beast/_experimental/unit_test/dstream.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/unit_test/dstream.hpp rename to c++/boost/beast/_experimental/unit_test/dstream.hpp diff --git a/c++/include/boost/beast/_experimental/unit_test/global_suites.hpp b/c++/boost/beast/_experimental/unit_test/global_suites.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/unit_test/global_suites.hpp rename to c++/boost/beast/_experimental/unit_test/global_suites.hpp diff --git a/c++/include/boost/beast/_experimental/unit_test/main.ipp b/c++/boost/beast/_experimental/unit_test/main.ipp similarity index 100% rename from c++/include/boost/beast/_experimental/unit_test/main.ipp rename to c++/boost/beast/_experimental/unit_test/main.ipp diff --git a/c++/include/boost/beast/_experimental/unit_test/match.hpp b/c++/boost/beast/_experimental/unit_test/match.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/unit_test/match.hpp rename to c++/boost/beast/_experimental/unit_test/match.hpp diff --git a/c++/include/boost/beast/_experimental/unit_test/recorder.hpp b/c++/boost/beast/_experimental/unit_test/recorder.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/unit_test/recorder.hpp rename to c++/boost/beast/_experimental/unit_test/recorder.hpp diff --git a/c++/include/boost/beast/_experimental/unit_test/reporter.hpp b/c++/boost/beast/_experimental/unit_test/reporter.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/unit_test/reporter.hpp rename to c++/boost/beast/_experimental/unit_test/reporter.hpp diff --git a/c++/include/boost/beast/_experimental/unit_test/results.hpp b/c++/boost/beast/_experimental/unit_test/results.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/unit_test/results.hpp rename to c++/boost/beast/_experimental/unit_test/results.hpp diff --git a/c++/include/boost/beast/_experimental/unit_test/runner.hpp b/c++/boost/beast/_experimental/unit_test/runner.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/unit_test/runner.hpp rename to c++/boost/beast/_experimental/unit_test/runner.hpp diff --git a/c++/include/boost/beast/_experimental/unit_test/suite.hpp b/c++/boost/beast/_experimental/unit_test/suite.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/unit_test/suite.hpp rename to c++/boost/beast/_experimental/unit_test/suite.hpp diff --git a/c++/include/boost/beast/_experimental/unit_test/suite_info.hpp b/c++/boost/beast/_experimental/unit_test/suite_info.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/unit_test/suite_info.hpp rename to c++/boost/beast/_experimental/unit_test/suite_info.hpp diff --git a/c++/include/boost/beast/_experimental/unit_test/suite_list.hpp b/c++/boost/beast/_experimental/unit_test/suite_list.hpp similarity index 100% rename from c++/include/boost/beast/_experimental/unit_test/suite_list.hpp rename to c++/boost/beast/_experimental/unit_test/suite_list.hpp diff --git a/c++/include/boost/beast/core.hpp b/c++/boost/beast/core.hpp similarity index 100% rename from c++/include/boost/beast/core.hpp rename to c++/boost/beast/core.hpp diff --git a/c++/include/boost/beast/core/async_base.hpp b/c++/boost/beast/core/async_base.hpp similarity index 100% rename from c++/include/boost/beast/core/async_base.hpp rename to c++/boost/beast/core/async_base.hpp diff --git a/c++/include/boost/beast/core/basic_stream.hpp b/c++/boost/beast/core/basic_stream.hpp similarity index 100% rename from c++/include/boost/beast/core/basic_stream.hpp rename to c++/boost/beast/core/basic_stream.hpp diff --git a/c++/include/boost/beast/core/bind_handler.hpp b/c++/boost/beast/core/bind_handler.hpp similarity index 100% rename from c++/include/boost/beast/core/bind_handler.hpp rename to c++/boost/beast/core/bind_handler.hpp diff --git a/c++/include/boost/beast/core/buffer_ref.hpp b/c++/boost/beast/core/buffer_ref.hpp similarity index 100% rename from c++/include/boost/beast/core/buffer_ref.hpp rename to c++/boost/beast/core/buffer_ref.hpp diff --git a/c++/include/boost/beast/core/buffer_traits.hpp b/c++/boost/beast/core/buffer_traits.hpp similarity index 100% rename from c++/include/boost/beast/core/buffer_traits.hpp rename to c++/boost/beast/core/buffer_traits.hpp diff --git a/c++/include/boost/beast/core/buffered_read_stream.hpp b/c++/boost/beast/core/buffered_read_stream.hpp similarity index 100% rename from c++/include/boost/beast/core/buffered_read_stream.hpp rename to c++/boost/beast/core/buffered_read_stream.hpp diff --git a/c++/include/boost/beast/core/buffers_adaptor.hpp b/c++/boost/beast/core/buffers_adaptor.hpp similarity index 100% rename from c++/include/boost/beast/core/buffers_adaptor.hpp rename to c++/boost/beast/core/buffers_adaptor.hpp diff --git a/c++/include/boost/beast/core/buffers_cat.hpp b/c++/boost/beast/core/buffers_cat.hpp similarity index 100% rename from c++/include/boost/beast/core/buffers_cat.hpp rename to c++/boost/beast/core/buffers_cat.hpp diff --git a/c++/include/boost/beast/core/buffers_generator.hpp b/c++/boost/beast/core/buffers_generator.hpp similarity index 100% rename from c++/include/boost/beast/core/buffers_generator.hpp rename to c++/boost/beast/core/buffers_generator.hpp diff --git a/c++/include/boost/beast/core/buffers_prefix.hpp b/c++/boost/beast/core/buffers_prefix.hpp similarity index 100% rename from c++/include/boost/beast/core/buffers_prefix.hpp rename to c++/boost/beast/core/buffers_prefix.hpp diff --git a/c++/include/boost/beast/core/buffers_range.hpp b/c++/boost/beast/core/buffers_range.hpp similarity index 100% rename from c++/include/boost/beast/core/buffers_range.hpp rename to c++/boost/beast/core/buffers_range.hpp diff --git a/c++/include/boost/beast/core/buffers_suffix.hpp b/c++/boost/beast/core/buffers_suffix.hpp similarity index 100% rename from c++/include/boost/beast/core/buffers_suffix.hpp rename to c++/boost/beast/core/buffers_suffix.hpp diff --git a/c++/include/boost/beast/core/buffers_to_string.hpp b/c++/boost/beast/core/buffers_to_string.hpp similarity index 100% rename from c++/include/boost/beast/core/buffers_to_string.hpp rename to c++/boost/beast/core/buffers_to_string.hpp diff --git a/c++/include/boost/beast/core/detail/allocator.hpp b/c++/boost/beast/core/detail/allocator.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/allocator.hpp rename to c++/boost/beast/core/detail/allocator.hpp diff --git a/c++/include/boost/beast/core/detail/async_base.hpp b/c++/boost/beast/core/detail/async_base.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/async_base.hpp rename to c++/boost/beast/core/detail/async_base.hpp diff --git a/c++/include/boost/beast/core/detail/base64.hpp b/c++/boost/beast/core/detail/base64.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/base64.hpp rename to c++/boost/beast/core/detail/base64.hpp diff --git a/c++/include/boost/beast/core/detail/base64.ipp b/c++/boost/beast/core/detail/base64.ipp similarity index 100% rename from c++/include/boost/beast/core/detail/base64.ipp rename to c++/boost/beast/core/detail/base64.ipp diff --git a/c++/include/boost/beast/core/detail/bind_continuation.hpp b/c++/boost/beast/core/detail/bind_continuation.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/bind_continuation.hpp rename to c++/boost/beast/core/detail/bind_continuation.hpp diff --git a/c++/include/boost/beast/core/detail/bind_default_executor.hpp b/c++/boost/beast/core/detail/bind_default_executor.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/bind_default_executor.hpp rename to c++/boost/beast/core/detail/bind_default_executor.hpp diff --git a/c++/include/boost/beast/core/detail/bind_handler.hpp b/c++/boost/beast/core/detail/bind_handler.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/bind_handler.hpp rename to c++/boost/beast/core/detail/bind_handler.hpp diff --git a/c++/include/boost/beast/core/detail/buffer.hpp b/c++/boost/beast/core/detail/buffer.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/buffer.hpp rename to c++/boost/beast/core/detail/buffer.hpp diff --git a/c++/include/boost/beast/core/detail/buffer_traits.hpp b/c++/boost/beast/core/detail/buffer_traits.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/buffer_traits.hpp rename to c++/boost/beast/core/detail/buffer_traits.hpp diff --git a/c++/include/boost/beast/core/detail/buffers_pair.hpp b/c++/boost/beast/core/detail/buffers_pair.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/buffers_pair.hpp rename to c++/boost/beast/core/detail/buffers_pair.hpp diff --git a/c++/include/boost/beast/core/detail/buffers_range_adaptor.hpp b/c++/boost/beast/core/detail/buffers_range_adaptor.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/buffers_range_adaptor.hpp rename to c++/boost/beast/core/detail/buffers_range_adaptor.hpp diff --git a/c++/include/boost/beast/core/detail/buffers_ref.hpp b/c++/boost/beast/core/detail/buffers_ref.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/buffers_ref.hpp rename to c++/boost/beast/core/detail/buffers_ref.hpp diff --git a/c++/include/boost/beast/core/detail/chacha.hpp b/c++/boost/beast/core/detail/chacha.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/chacha.hpp rename to c++/boost/beast/core/detail/chacha.hpp diff --git a/c++/include/boost/beast/core/detail/char_buffer.hpp b/c++/boost/beast/core/detail/char_buffer.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/char_buffer.hpp rename to c++/boost/beast/core/detail/char_buffer.hpp diff --git a/c++/include/boost/beast/core/detail/clamp.hpp b/c++/boost/beast/core/detail/clamp.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/clamp.hpp rename to c++/boost/beast/core/detail/clamp.hpp diff --git a/c++/include/boost/beast/core/detail/config.hpp b/c++/boost/beast/core/detail/config.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/config.hpp rename to c++/boost/beast/core/detail/config.hpp diff --git a/c++/include/boost/beast/core/detail/cpu_info.hpp b/c++/boost/beast/core/detail/cpu_info.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/cpu_info.hpp rename to c++/boost/beast/core/detail/cpu_info.hpp diff --git a/c++/include/boost/beast/core/detail/filtering_cancellation_slot.hpp b/c++/boost/beast/core/detail/filtering_cancellation_slot.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/filtering_cancellation_slot.hpp rename to c++/boost/beast/core/detail/filtering_cancellation_slot.hpp diff --git a/c++/include/boost/beast/core/detail/flat_stream.hpp b/c++/boost/beast/core/detail/flat_stream.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/flat_stream.hpp rename to c++/boost/beast/core/detail/flat_stream.hpp diff --git a/c++/include/boost/beast/core/detail/get_io_context.hpp b/c++/boost/beast/core/detail/get_io_context.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/get_io_context.hpp rename to c++/boost/beast/core/detail/get_io_context.hpp diff --git a/c++/include/boost/beast/core/detail/impl/read.hpp b/c++/boost/beast/core/detail/impl/read.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/impl/read.hpp rename to c++/boost/beast/core/detail/impl/read.hpp diff --git a/c++/include/boost/beast/core/detail/impl/temporary_buffer.ipp b/c++/boost/beast/core/detail/impl/temporary_buffer.ipp similarity index 100% rename from c++/include/boost/beast/core/detail/impl/temporary_buffer.ipp rename to c++/boost/beast/core/detail/impl/temporary_buffer.ipp diff --git a/c++/include/boost/beast/core/detail/is_invocable.hpp b/c++/boost/beast/core/detail/is_invocable.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/is_invocable.hpp rename to c++/boost/beast/core/detail/is_invocable.hpp diff --git a/c++/include/boost/beast/core/detail/ostream.hpp b/c++/boost/beast/core/detail/ostream.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/ostream.hpp rename to c++/boost/beast/core/detail/ostream.hpp diff --git a/c++/include/boost/beast/core/detail/pcg.hpp b/c++/boost/beast/core/detail/pcg.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/pcg.hpp rename to c++/boost/beast/core/detail/pcg.hpp diff --git a/c++/include/boost/beast/core/detail/read.hpp b/c++/boost/beast/core/detail/read.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/read.hpp rename to c++/boost/beast/core/detail/read.hpp diff --git a/c++/include/boost/beast/core/detail/remap_post_to_defer.hpp b/c++/boost/beast/core/detail/remap_post_to_defer.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/remap_post_to_defer.hpp rename to c++/boost/beast/core/detail/remap_post_to_defer.hpp diff --git a/c++/include/boost/beast/core/detail/service_base.hpp b/c++/boost/beast/core/detail/service_base.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/service_base.hpp rename to c++/boost/beast/core/detail/service_base.hpp diff --git a/c++/include/boost/beast/core/detail/sha1.hpp b/c++/boost/beast/core/detail/sha1.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/sha1.hpp rename to c++/boost/beast/core/detail/sha1.hpp diff --git a/c++/include/boost/beast/core/detail/sha1.ipp b/c++/boost/beast/core/detail/sha1.ipp similarity index 100% rename from c++/include/boost/beast/core/detail/sha1.ipp rename to c++/boost/beast/core/detail/sha1.ipp diff --git a/c++/include/boost/beast/core/detail/static_const.hpp b/c++/boost/beast/core/detail/static_const.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/static_const.hpp rename to c++/boost/beast/core/detail/static_const.hpp diff --git a/c++/include/boost/beast/core/detail/static_ostream.hpp b/c++/boost/beast/core/detail/static_ostream.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/static_ostream.hpp rename to c++/boost/beast/core/detail/static_ostream.hpp diff --git a/c++/include/boost/beast/core/detail/static_string.hpp b/c++/boost/beast/core/detail/static_string.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/static_string.hpp rename to c++/boost/beast/core/detail/static_string.hpp diff --git a/c++/include/boost/beast/core/detail/stream_base.hpp b/c++/boost/beast/core/detail/stream_base.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/stream_base.hpp rename to c++/boost/beast/core/detail/stream_base.hpp diff --git a/c++/include/boost/beast/core/detail/stream_traits.hpp b/c++/boost/beast/core/detail/stream_traits.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/stream_traits.hpp rename to c++/boost/beast/core/detail/stream_traits.hpp diff --git a/c++/include/boost/beast/core/detail/string.hpp b/c++/boost/beast/core/detail/string.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/string.hpp rename to c++/boost/beast/core/detail/string.hpp diff --git a/c++/include/boost/beast/core/detail/temporary_buffer.hpp b/c++/boost/beast/core/detail/temporary_buffer.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/temporary_buffer.hpp rename to c++/boost/beast/core/detail/temporary_buffer.hpp diff --git a/c++/include/boost/beast/core/detail/tuple.hpp b/c++/boost/beast/core/detail/tuple.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/tuple.hpp rename to c++/boost/beast/core/detail/tuple.hpp diff --git a/c++/include/boost/beast/core/detail/type_traits.hpp b/c++/boost/beast/core/detail/type_traits.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/type_traits.hpp rename to c++/boost/beast/core/detail/type_traits.hpp diff --git a/c++/include/boost/beast/core/detail/variant.hpp b/c++/boost/beast/core/detail/variant.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/variant.hpp rename to c++/boost/beast/core/detail/variant.hpp diff --git a/c++/include/boost/beast/core/detail/varint.hpp b/c++/boost/beast/core/detail/varint.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/varint.hpp rename to c++/boost/beast/core/detail/varint.hpp diff --git a/c++/include/boost/beast/core/detail/win32_unicode_path.hpp b/c++/boost/beast/core/detail/win32_unicode_path.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/win32_unicode_path.hpp rename to c++/boost/beast/core/detail/win32_unicode_path.hpp diff --git a/c++/include/boost/beast/core/detail/work_guard.hpp b/c++/boost/beast/core/detail/work_guard.hpp similarity index 100% rename from c++/include/boost/beast/core/detail/work_guard.hpp rename to c++/boost/beast/core/detail/work_guard.hpp diff --git a/c++/include/boost/beast/core/detect_ssl.hpp b/c++/boost/beast/core/detect_ssl.hpp similarity index 100% rename from c++/include/boost/beast/core/detect_ssl.hpp rename to c++/boost/beast/core/detect_ssl.hpp diff --git a/c++/include/boost/beast/core/error.hpp b/c++/boost/beast/core/error.hpp similarity index 100% rename from c++/include/boost/beast/core/error.hpp rename to c++/boost/beast/core/error.hpp diff --git a/c++/include/boost/beast/core/file.hpp b/c++/boost/beast/core/file.hpp similarity index 100% rename from c++/include/boost/beast/core/file.hpp rename to c++/boost/beast/core/file.hpp diff --git a/c++/include/boost/beast/core/file_base.hpp b/c++/boost/beast/core/file_base.hpp similarity index 100% rename from c++/include/boost/beast/core/file_base.hpp rename to c++/boost/beast/core/file_base.hpp diff --git a/c++/include/boost/beast/core/file_posix.hpp b/c++/boost/beast/core/file_posix.hpp similarity index 100% rename from c++/include/boost/beast/core/file_posix.hpp rename to c++/boost/beast/core/file_posix.hpp diff --git a/c++/include/boost/beast/core/file_stdio.hpp b/c++/boost/beast/core/file_stdio.hpp similarity index 100% rename from c++/include/boost/beast/core/file_stdio.hpp rename to c++/boost/beast/core/file_stdio.hpp diff --git a/c++/include/boost/beast/core/file_win32.hpp b/c++/boost/beast/core/file_win32.hpp similarity index 100% rename from c++/include/boost/beast/core/file_win32.hpp rename to c++/boost/beast/core/file_win32.hpp diff --git a/c++/include/boost/beast/core/flat_buffer.hpp b/c++/boost/beast/core/flat_buffer.hpp similarity index 100% rename from c++/include/boost/beast/core/flat_buffer.hpp rename to c++/boost/beast/core/flat_buffer.hpp diff --git a/c++/include/boost/beast/core/flat_static_buffer.hpp b/c++/boost/beast/core/flat_static_buffer.hpp similarity index 100% rename from c++/include/boost/beast/core/flat_static_buffer.hpp rename to c++/boost/beast/core/flat_static_buffer.hpp diff --git a/c++/include/boost/beast/core/flat_stream.hpp b/c++/boost/beast/core/flat_stream.hpp similarity index 100% rename from c++/include/boost/beast/core/flat_stream.hpp rename to c++/boost/beast/core/flat_stream.hpp diff --git a/c++/include/boost/beast/core/impl/async_base.hpp b/c++/boost/beast/core/impl/async_base.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/async_base.hpp rename to c++/boost/beast/core/impl/async_base.hpp diff --git a/c++/include/boost/beast/core/impl/basic_stream.hpp b/c++/boost/beast/core/impl/basic_stream.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/basic_stream.hpp rename to c++/boost/beast/core/impl/basic_stream.hpp diff --git a/c++/include/boost/beast/core/impl/buffered_read_stream.hpp b/c++/boost/beast/core/impl/buffered_read_stream.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/buffered_read_stream.hpp rename to c++/boost/beast/core/impl/buffered_read_stream.hpp diff --git a/c++/include/boost/beast/core/impl/buffers_adaptor.hpp b/c++/boost/beast/core/impl/buffers_adaptor.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/buffers_adaptor.hpp rename to c++/boost/beast/core/impl/buffers_adaptor.hpp diff --git a/c++/include/boost/beast/core/impl/buffers_cat.hpp b/c++/boost/beast/core/impl/buffers_cat.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/buffers_cat.hpp rename to c++/boost/beast/core/impl/buffers_cat.hpp diff --git a/c++/include/boost/beast/core/impl/buffers_generator.hpp b/c++/boost/beast/core/impl/buffers_generator.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/buffers_generator.hpp rename to c++/boost/beast/core/impl/buffers_generator.hpp diff --git a/c++/include/boost/beast/core/impl/buffers_prefix.hpp b/c++/boost/beast/core/impl/buffers_prefix.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/buffers_prefix.hpp rename to c++/boost/beast/core/impl/buffers_prefix.hpp diff --git a/c++/include/boost/beast/core/impl/buffers_suffix.hpp b/c++/boost/beast/core/impl/buffers_suffix.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/buffers_suffix.hpp rename to c++/boost/beast/core/impl/buffers_suffix.hpp diff --git a/c++/include/boost/beast/core/impl/error.hpp b/c++/boost/beast/core/impl/error.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/error.hpp rename to c++/boost/beast/core/impl/error.hpp diff --git a/c++/include/boost/beast/core/impl/error.ipp b/c++/boost/beast/core/impl/error.ipp similarity index 100% rename from c++/include/boost/beast/core/impl/error.ipp rename to c++/boost/beast/core/impl/error.ipp diff --git a/c++/include/boost/beast/core/impl/file_posix.ipp b/c++/boost/beast/core/impl/file_posix.ipp similarity index 100% rename from c++/include/boost/beast/core/impl/file_posix.ipp rename to c++/boost/beast/core/impl/file_posix.ipp diff --git a/c++/include/boost/beast/core/impl/file_stdio.ipp b/c++/boost/beast/core/impl/file_stdio.ipp similarity index 100% rename from c++/include/boost/beast/core/impl/file_stdio.ipp rename to c++/boost/beast/core/impl/file_stdio.ipp diff --git a/c++/include/boost/beast/core/impl/file_win32.ipp b/c++/boost/beast/core/impl/file_win32.ipp similarity index 100% rename from c++/include/boost/beast/core/impl/file_win32.ipp rename to c++/boost/beast/core/impl/file_win32.ipp diff --git a/c++/include/boost/beast/core/impl/flat_buffer.hpp b/c++/boost/beast/core/impl/flat_buffer.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/flat_buffer.hpp rename to c++/boost/beast/core/impl/flat_buffer.hpp diff --git a/c++/include/boost/beast/core/impl/flat_static_buffer.hpp b/c++/boost/beast/core/impl/flat_static_buffer.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/flat_static_buffer.hpp rename to c++/boost/beast/core/impl/flat_static_buffer.hpp diff --git a/c++/include/boost/beast/core/impl/flat_static_buffer.ipp b/c++/boost/beast/core/impl/flat_static_buffer.ipp similarity index 100% rename from c++/include/boost/beast/core/impl/flat_static_buffer.ipp rename to c++/boost/beast/core/impl/flat_static_buffer.ipp diff --git a/c++/include/boost/beast/core/impl/flat_stream.hpp b/c++/boost/beast/core/impl/flat_stream.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/flat_stream.hpp rename to c++/boost/beast/core/impl/flat_stream.hpp diff --git a/c++/include/boost/beast/core/impl/multi_buffer.hpp b/c++/boost/beast/core/impl/multi_buffer.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/multi_buffer.hpp rename to c++/boost/beast/core/impl/multi_buffer.hpp diff --git a/c++/include/boost/beast/core/impl/read_size.hpp b/c++/boost/beast/core/impl/read_size.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/read_size.hpp rename to c++/boost/beast/core/impl/read_size.hpp diff --git a/c++/include/boost/beast/core/impl/saved_handler.hpp b/c++/boost/beast/core/impl/saved_handler.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/saved_handler.hpp rename to c++/boost/beast/core/impl/saved_handler.hpp diff --git a/c++/include/boost/beast/core/impl/saved_handler.ipp b/c++/boost/beast/core/impl/saved_handler.ipp similarity index 100% rename from c++/include/boost/beast/core/impl/saved_handler.ipp rename to c++/boost/beast/core/impl/saved_handler.ipp diff --git a/c++/include/boost/beast/core/impl/static_buffer.hpp b/c++/boost/beast/core/impl/static_buffer.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/static_buffer.hpp rename to c++/boost/beast/core/impl/static_buffer.hpp diff --git a/c++/include/boost/beast/core/impl/static_buffer.ipp b/c++/boost/beast/core/impl/static_buffer.ipp similarity index 100% rename from c++/include/boost/beast/core/impl/static_buffer.ipp rename to c++/boost/beast/core/impl/static_buffer.ipp diff --git a/c++/include/boost/beast/core/impl/string.ipp b/c++/boost/beast/core/impl/string.ipp similarity index 100% rename from c++/include/boost/beast/core/impl/string.ipp rename to c++/boost/beast/core/impl/string.ipp diff --git a/c++/include/boost/beast/core/impl/string_param.hpp b/c++/boost/beast/core/impl/string_param.hpp similarity index 100% rename from c++/include/boost/beast/core/impl/string_param.hpp rename to c++/boost/beast/core/impl/string_param.hpp diff --git a/c++/include/boost/beast/core/make_printable.hpp b/c++/boost/beast/core/make_printable.hpp similarity index 100% rename from c++/include/boost/beast/core/make_printable.hpp rename to c++/boost/beast/core/make_printable.hpp diff --git a/c++/include/boost/beast/core/multi_buffer.hpp b/c++/boost/beast/core/multi_buffer.hpp similarity index 100% rename from c++/include/boost/beast/core/multi_buffer.hpp rename to c++/boost/beast/core/multi_buffer.hpp diff --git a/c++/include/boost/beast/core/ostream.hpp b/c++/boost/beast/core/ostream.hpp similarity index 100% rename from c++/include/boost/beast/core/ostream.hpp rename to c++/boost/beast/core/ostream.hpp diff --git a/c++/include/boost/beast/core/rate_policy.hpp b/c++/boost/beast/core/rate_policy.hpp similarity index 100% rename from c++/include/boost/beast/core/rate_policy.hpp rename to c++/boost/beast/core/rate_policy.hpp diff --git a/c++/include/boost/beast/core/read_size.hpp b/c++/boost/beast/core/read_size.hpp similarity index 100% rename from c++/include/boost/beast/core/read_size.hpp rename to c++/boost/beast/core/read_size.hpp diff --git a/c++/include/boost/beast/core/role.hpp b/c++/boost/beast/core/role.hpp similarity index 100% rename from c++/include/boost/beast/core/role.hpp rename to c++/boost/beast/core/role.hpp diff --git a/c++/include/boost/beast/core/saved_handler.hpp b/c++/boost/beast/core/saved_handler.hpp similarity index 100% rename from c++/include/boost/beast/core/saved_handler.hpp rename to c++/boost/beast/core/saved_handler.hpp diff --git a/c++/include/boost/beast/core/span.hpp b/c++/boost/beast/core/span.hpp similarity index 100% rename from c++/include/boost/beast/core/span.hpp rename to c++/boost/beast/core/span.hpp diff --git a/c++/include/boost/beast/core/static_buffer.hpp b/c++/boost/beast/core/static_buffer.hpp similarity index 100% rename from c++/include/boost/beast/core/static_buffer.hpp rename to c++/boost/beast/core/static_buffer.hpp diff --git a/c++/include/boost/beast/core/static_string.hpp b/c++/boost/beast/core/static_string.hpp similarity index 100% rename from c++/include/boost/beast/core/static_string.hpp rename to c++/boost/beast/core/static_string.hpp diff --git a/c++/include/boost/beast/core/stream_traits.hpp b/c++/boost/beast/core/stream_traits.hpp similarity index 100% rename from c++/include/boost/beast/core/stream_traits.hpp rename to c++/boost/beast/core/stream_traits.hpp diff --git a/c++/include/boost/beast/core/string.hpp b/c++/boost/beast/core/string.hpp similarity index 100% rename from c++/include/boost/beast/core/string.hpp rename to c++/boost/beast/core/string.hpp diff --git a/c++/include/boost/beast/core/string_param.hpp b/c++/boost/beast/core/string_param.hpp similarity index 100% rename from c++/include/boost/beast/core/string_param.hpp rename to c++/boost/beast/core/string_param.hpp diff --git a/c++/include/boost/beast/core/string_type.hpp b/c++/boost/beast/core/string_type.hpp similarity index 100% rename from c++/include/boost/beast/core/string_type.hpp rename to c++/boost/beast/core/string_type.hpp diff --git a/c++/include/boost/beast/core/tcp_stream.hpp b/c++/boost/beast/core/tcp_stream.hpp similarity index 100% rename from c++/include/boost/beast/core/tcp_stream.hpp rename to c++/boost/beast/core/tcp_stream.hpp diff --git a/c++/include/boost/beast/http.hpp b/c++/boost/beast/http.hpp similarity index 100% rename from c++/include/boost/beast/http.hpp rename to c++/boost/beast/http.hpp diff --git a/c++/include/boost/beast/http/basic_dynamic_body.hpp b/c++/boost/beast/http/basic_dynamic_body.hpp similarity index 100% rename from c++/include/boost/beast/http/basic_dynamic_body.hpp rename to c++/boost/beast/http/basic_dynamic_body.hpp diff --git a/c++/include/boost/beast/http/basic_file_body.hpp b/c++/boost/beast/http/basic_file_body.hpp similarity index 100% rename from c++/include/boost/beast/http/basic_file_body.hpp rename to c++/boost/beast/http/basic_file_body.hpp diff --git a/c++/include/boost/beast/http/basic_parser.hpp b/c++/boost/beast/http/basic_parser.hpp similarity index 100% rename from c++/include/boost/beast/http/basic_parser.hpp rename to c++/boost/beast/http/basic_parser.hpp diff --git a/c++/include/boost/beast/http/buffer_body.hpp b/c++/boost/beast/http/buffer_body.hpp similarity index 100% rename from c++/include/boost/beast/http/buffer_body.hpp rename to c++/boost/beast/http/buffer_body.hpp diff --git a/c++/include/boost/beast/http/chunk_encode.hpp b/c++/boost/beast/http/chunk_encode.hpp similarity index 100% rename from c++/include/boost/beast/http/chunk_encode.hpp rename to c++/boost/beast/http/chunk_encode.hpp diff --git a/c++/include/boost/beast/http/detail/basic_parsed_list.hpp b/c++/boost/beast/http/detail/basic_parsed_list.hpp similarity index 100% rename from c++/include/boost/beast/http/detail/basic_parsed_list.hpp rename to c++/boost/beast/http/detail/basic_parsed_list.hpp diff --git a/c++/include/boost/beast/http/detail/basic_parser.hpp b/c++/boost/beast/http/detail/basic_parser.hpp similarity index 100% rename from c++/include/boost/beast/http/detail/basic_parser.hpp rename to c++/boost/beast/http/detail/basic_parser.hpp diff --git a/c++/include/boost/beast/http/detail/basic_parser.ipp b/c++/boost/beast/http/detail/basic_parser.ipp similarity index 100% rename from c++/include/boost/beast/http/detail/basic_parser.ipp rename to c++/boost/beast/http/detail/basic_parser.ipp diff --git a/c++/include/boost/beast/http/detail/chunk_encode.hpp b/c++/boost/beast/http/detail/chunk_encode.hpp similarity index 100% rename from c++/include/boost/beast/http/detail/chunk_encode.hpp rename to c++/boost/beast/http/detail/chunk_encode.hpp diff --git a/c++/include/boost/beast/http/detail/rfc7230.hpp b/c++/boost/beast/http/detail/rfc7230.hpp similarity index 100% rename from c++/include/boost/beast/http/detail/rfc7230.hpp rename to c++/boost/beast/http/detail/rfc7230.hpp diff --git a/c++/include/boost/beast/http/detail/rfc7230.ipp b/c++/boost/beast/http/detail/rfc7230.ipp similarity index 100% rename from c++/include/boost/beast/http/detail/rfc7230.ipp rename to c++/boost/beast/http/detail/rfc7230.ipp diff --git a/c++/include/boost/beast/http/detail/type_traits.hpp b/c++/boost/beast/http/detail/type_traits.hpp similarity index 100% rename from c++/include/boost/beast/http/detail/type_traits.hpp rename to c++/boost/beast/http/detail/type_traits.hpp diff --git a/c++/include/boost/beast/http/dynamic_body.hpp b/c++/boost/beast/http/dynamic_body.hpp similarity index 100% rename from c++/include/boost/beast/http/dynamic_body.hpp rename to c++/boost/beast/http/dynamic_body.hpp diff --git a/c++/include/boost/beast/http/empty_body.hpp b/c++/boost/beast/http/empty_body.hpp similarity index 100% rename from c++/include/boost/beast/http/empty_body.hpp rename to c++/boost/beast/http/empty_body.hpp diff --git a/c++/include/boost/beast/http/error.hpp b/c++/boost/beast/http/error.hpp similarity index 100% rename from c++/include/boost/beast/http/error.hpp rename to c++/boost/beast/http/error.hpp diff --git a/c++/include/boost/beast/http/field.hpp b/c++/boost/beast/http/field.hpp similarity index 100% rename from c++/include/boost/beast/http/field.hpp rename to c++/boost/beast/http/field.hpp diff --git a/c++/include/boost/beast/http/fields.hpp b/c++/boost/beast/http/fields.hpp similarity index 100% rename from c++/include/boost/beast/http/fields.hpp rename to c++/boost/beast/http/fields.hpp diff --git a/c++/include/boost/beast/http/file_body.hpp b/c++/boost/beast/http/file_body.hpp similarity index 100% rename from c++/include/boost/beast/http/file_body.hpp rename to c++/boost/beast/http/file_body.hpp diff --git a/c++/include/boost/beast/http/impl/basic_parser.hpp b/c++/boost/beast/http/impl/basic_parser.hpp similarity index 100% rename from c++/include/boost/beast/http/impl/basic_parser.hpp rename to c++/boost/beast/http/impl/basic_parser.hpp diff --git a/c++/include/boost/beast/http/impl/basic_parser.ipp b/c++/boost/beast/http/impl/basic_parser.ipp similarity index 100% rename from c++/include/boost/beast/http/impl/basic_parser.ipp rename to c++/boost/beast/http/impl/basic_parser.ipp diff --git a/c++/include/boost/beast/http/impl/chunk_encode.hpp b/c++/boost/beast/http/impl/chunk_encode.hpp similarity index 100% rename from c++/include/boost/beast/http/impl/chunk_encode.hpp rename to c++/boost/beast/http/impl/chunk_encode.hpp diff --git a/c++/include/boost/beast/http/impl/error.hpp b/c++/boost/beast/http/impl/error.hpp similarity index 100% rename from c++/include/boost/beast/http/impl/error.hpp rename to c++/boost/beast/http/impl/error.hpp diff --git a/c++/include/boost/beast/http/impl/error.ipp b/c++/boost/beast/http/impl/error.ipp similarity index 100% rename from c++/include/boost/beast/http/impl/error.ipp rename to c++/boost/beast/http/impl/error.ipp diff --git a/c++/include/boost/beast/http/impl/field.ipp b/c++/boost/beast/http/impl/field.ipp similarity index 100% rename from c++/include/boost/beast/http/impl/field.ipp rename to c++/boost/beast/http/impl/field.ipp diff --git a/c++/include/boost/beast/http/impl/fields.hpp b/c++/boost/beast/http/impl/fields.hpp similarity index 100% rename from c++/include/boost/beast/http/impl/fields.hpp rename to c++/boost/beast/http/impl/fields.hpp diff --git a/c++/include/boost/beast/http/impl/fields.ipp b/c++/boost/beast/http/impl/fields.ipp similarity index 100% rename from c++/include/boost/beast/http/impl/fields.ipp rename to c++/boost/beast/http/impl/fields.ipp diff --git a/c++/include/boost/beast/http/impl/file_body_win32.hpp b/c++/boost/beast/http/impl/file_body_win32.hpp similarity index 100% rename from c++/include/boost/beast/http/impl/file_body_win32.hpp rename to c++/boost/beast/http/impl/file_body_win32.hpp diff --git a/c++/include/boost/beast/http/impl/message.hpp b/c++/boost/beast/http/impl/message.hpp similarity index 100% rename from c++/include/boost/beast/http/impl/message.hpp rename to c++/boost/beast/http/impl/message.hpp diff --git a/c++/include/boost/beast/http/impl/message_generator.hpp b/c++/boost/beast/http/impl/message_generator.hpp similarity index 100% rename from c++/include/boost/beast/http/impl/message_generator.hpp rename to c++/boost/beast/http/impl/message_generator.hpp diff --git a/c++/include/boost/beast/http/impl/parser.hpp b/c++/boost/beast/http/impl/parser.hpp similarity index 100% rename from c++/include/boost/beast/http/impl/parser.hpp rename to c++/boost/beast/http/impl/parser.hpp diff --git a/c++/include/boost/beast/http/impl/read.hpp b/c++/boost/beast/http/impl/read.hpp similarity index 100% rename from c++/include/boost/beast/http/impl/read.hpp rename to c++/boost/beast/http/impl/read.hpp diff --git a/c++/include/boost/beast/http/impl/rfc7230.hpp b/c++/boost/beast/http/impl/rfc7230.hpp similarity index 100% rename from c++/include/boost/beast/http/impl/rfc7230.hpp rename to c++/boost/beast/http/impl/rfc7230.hpp diff --git a/c++/include/boost/beast/http/impl/rfc7230.ipp b/c++/boost/beast/http/impl/rfc7230.ipp similarity index 100% rename from c++/include/boost/beast/http/impl/rfc7230.ipp rename to c++/boost/beast/http/impl/rfc7230.ipp diff --git a/c++/include/boost/beast/http/impl/serializer.hpp b/c++/boost/beast/http/impl/serializer.hpp similarity index 100% rename from c++/include/boost/beast/http/impl/serializer.hpp rename to c++/boost/beast/http/impl/serializer.hpp diff --git a/c++/include/boost/beast/http/impl/status.ipp b/c++/boost/beast/http/impl/status.ipp similarity index 100% rename from c++/include/boost/beast/http/impl/status.ipp rename to c++/boost/beast/http/impl/status.ipp diff --git a/c++/include/boost/beast/http/impl/verb.ipp b/c++/boost/beast/http/impl/verb.ipp similarity index 100% rename from c++/include/boost/beast/http/impl/verb.ipp rename to c++/boost/beast/http/impl/verb.ipp diff --git a/c++/include/boost/beast/http/impl/write.hpp b/c++/boost/beast/http/impl/write.hpp similarity index 100% rename from c++/include/boost/beast/http/impl/write.hpp rename to c++/boost/beast/http/impl/write.hpp diff --git a/c++/include/boost/beast/http/message.hpp b/c++/boost/beast/http/message.hpp similarity index 100% rename from c++/include/boost/beast/http/message.hpp rename to c++/boost/beast/http/message.hpp diff --git a/c++/include/boost/beast/http/message_generator.hpp b/c++/boost/beast/http/message_generator.hpp similarity index 100% rename from c++/include/boost/beast/http/message_generator.hpp rename to c++/boost/beast/http/message_generator.hpp diff --git a/c++/include/boost/beast/http/parser.hpp b/c++/boost/beast/http/parser.hpp similarity index 100% rename from c++/include/boost/beast/http/parser.hpp rename to c++/boost/beast/http/parser.hpp diff --git a/c++/include/boost/beast/http/read.hpp b/c++/boost/beast/http/read.hpp similarity index 100% rename from c++/include/boost/beast/http/read.hpp rename to c++/boost/beast/http/read.hpp diff --git a/c++/include/boost/beast/http/rfc7230.hpp b/c++/boost/beast/http/rfc7230.hpp similarity index 100% rename from c++/include/boost/beast/http/rfc7230.hpp rename to c++/boost/beast/http/rfc7230.hpp diff --git a/c++/include/boost/beast/http/serializer.hpp b/c++/boost/beast/http/serializer.hpp similarity index 100% rename from c++/include/boost/beast/http/serializer.hpp rename to c++/boost/beast/http/serializer.hpp diff --git a/c++/include/boost/beast/http/span_body.hpp b/c++/boost/beast/http/span_body.hpp similarity index 100% rename from c++/include/boost/beast/http/span_body.hpp rename to c++/boost/beast/http/span_body.hpp diff --git a/c++/include/boost/beast/http/status.hpp b/c++/boost/beast/http/status.hpp similarity index 100% rename from c++/include/boost/beast/http/status.hpp rename to c++/boost/beast/http/status.hpp diff --git a/c++/include/boost/beast/http/string_body.hpp b/c++/boost/beast/http/string_body.hpp similarity index 100% rename from c++/include/boost/beast/http/string_body.hpp rename to c++/boost/beast/http/string_body.hpp diff --git a/c++/include/boost/beast/http/type_traits.hpp b/c++/boost/beast/http/type_traits.hpp similarity index 100% rename from c++/include/boost/beast/http/type_traits.hpp rename to c++/boost/beast/http/type_traits.hpp diff --git a/c++/include/boost/beast/http/vector_body.hpp b/c++/boost/beast/http/vector_body.hpp similarity index 100% rename from c++/include/boost/beast/http/vector_body.hpp rename to c++/boost/beast/http/vector_body.hpp diff --git a/c++/include/boost/beast/http/verb.hpp b/c++/boost/beast/http/verb.hpp similarity index 100% rename from c++/include/boost/beast/http/verb.hpp rename to c++/boost/beast/http/verb.hpp diff --git a/c++/include/boost/beast/http/write.hpp b/c++/boost/beast/http/write.hpp similarity index 100% rename from c++/include/boost/beast/http/write.hpp rename to c++/boost/beast/http/write.hpp diff --git a/c++/include/boost/beast/src.hpp b/c++/boost/beast/src.hpp similarity index 100% rename from c++/include/boost/beast/src.hpp rename to c++/boost/beast/src.hpp diff --git a/c++/include/boost/beast/ssl.hpp b/c++/boost/beast/ssl.hpp similarity index 100% rename from c++/include/boost/beast/ssl.hpp rename to c++/boost/beast/ssl.hpp diff --git a/c++/include/boost/beast/ssl/ssl_stream.hpp b/c++/boost/beast/ssl/ssl_stream.hpp similarity index 100% rename from c++/include/boost/beast/ssl/ssl_stream.hpp rename to c++/boost/beast/ssl/ssl_stream.hpp diff --git a/c++/include/boost/beast/version.hpp b/c++/boost/beast/version.hpp similarity index 100% rename from c++/include/boost/beast/version.hpp rename to c++/boost/beast/version.hpp diff --git a/c++/include/boost/beast/websocket.hpp b/c++/boost/beast/websocket.hpp similarity index 100% rename from c++/include/boost/beast/websocket.hpp rename to c++/boost/beast/websocket.hpp diff --git a/c++/include/boost/beast/websocket/detail/decorator.hpp b/c++/boost/beast/websocket/detail/decorator.hpp similarity index 100% rename from c++/include/boost/beast/websocket/detail/decorator.hpp rename to c++/boost/beast/websocket/detail/decorator.hpp diff --git a/c++/include/boost/beast/websocket/detail/frame.hpp b/c++/boost/beast/websocket/detail/frame.hpp similarity index 100% rename from c++/include/boost/beast/websocket/detail/frame.hpp rename to c++/boost/beast/websocket/detail/frame.hpp diff --git a/c++/include/boost/beast/websocket/detail/hybi13.hpp b/c++/boost/beast/websocket/detail/hybi13.hpp similarity index 100% rename from c++/include/boost/beast/websocket/detail/hybi13.hpp rename to c++/boost/beast/websocket/detail/hybi13.hpp diff --git a/c++/include/boost/beast/websocket/detail/hybi13.ipp b/c++/boost/beast/websocket/detail/hybi13.ipp similarity index 100% rename from c++/include/boost/beast/websocket/detail/hybi13.ipp rename to c++/boost/beast/websocket/detail/hybi13.ipp diff --git a/c++/include/boost/beast/websocket/detail/impl_base.hpp b/c++/boost/beast/websocket/detail/impl_base.hpp similarity index 100% rename from c++/include/boost/beast/websocket/detail/impl_base.hpp rename to c++/boost/beast/websocket/detail/impl_base.hpp diff --git a/c++/include/boost/beast/websocket/detail/mask.hpp b/c++/boost/beast/websocket/detail/mask.hpp similarity index 100% rename from c++/include/boost/beast/websocket/detail/mask.hpp rename to c++/boost/beast/websocket/detail/mask.hpp diff --git a/c++/include/boost/beast/websocket/detail/mask.ipp b/c++/boost/beast/websocket/detail/mask.ipp similarity index 100% rename from c++/include/boost/beast/websocket/detail/mask.ipp rename to c++/boost/beast/websocket/detail/mask.ipp diff --git a/c++/include/boost/beast/websocket/detail/pmd_extension.hpp b/c++/boost/beast/websocket/detail/pmd_extension.hpp similarity index 100% rename from c++/include/boost/beast/websocket/detail/pmd_extension.hpp rename to c++/boost/beast/websocket/detail/pmd_extension.hpp diff --git a/c++/include/boost/beast/websocket/detail/pmd_extension.ipp b/c++/boost/beast/websocket/detail/pmd_extension.ipp similarity index 100% rename from c++/include/boost/beast/websocket/detail/pmd_extension.ipp rename to c++/boost/beast/websocket/detail/pmd_extension.ipp diff --git a/c++/include/boost/beast/websocket/detail/prng.hpp b/c++/boost/beast/websocket/detail/prng.hpp similarity index 100% rename from c++/include/boost/beast/websocket/detail/prng.hpp rename to c++/boost/beast/websocket/detail/prng.hpp diff --git a/c++/include/boost/beast/websocket/detail/prng.ipp b/c++/boost/beast/websocket/detail/prng.ipp similarity index 100% rename from c++/include/boost/beast/websocket/detail/prng.ipp rename to c++/boost/beast/websocket/detail/prng.ipp diff --git a/c++/include/boost/beast/websocket/detail/service.hpp b/c++/boost/beast/websocket/detail/service.hpp similarity index 100% rename from c++/include/boost/beast/websocket/detail/service.hpp rename to c++/boost/beast/websocket/detail/service.hpp diff --git a/c++/include/boost/beast/websocket/detail/service.ipp b/c++/boost/beast/websocket/detail/service.ipp similarity index 100% rename from c++/include/boost/beast/websocket/detail/service.ipp rename to c++/boost/beast/websocket/detail/service.ipp diff --git a/c++/include/boost/beast/websocket/detail/soft_mutex.hpp b/c++/boost/beast/websocket/detail/soft_mutex.hpp similarity index 100% rename from c++/include/boost/beast/websocket/detail/soft_mutex.hpp rename to c++/boost/beast/websocket/detail/soft_mutex.hpp diff --git a/c++/include/boost/beast/websocket/detail/type_traits.hpp b/c++/boost/beast/websocket/detail/type_traits.hpp similarity index 100% rename from c++/include/boost/beast/websocket/detail/type_traits.hpp rename to c++/boost/beast/websocket/detail/type_traits.hpp diff --git a/c++/include/boost/beast/websocket/detail/utf8_checker.hpp b/c++/boost/beast/websocket/detail/utf8_checker.hpp similarity index 100% rename from c++/include/boost/beast/websocket/detail/utf8_checker.hpp rename to c++/boost/beast/websocket/detail/utf8_checker.hpp diff --git a/c++/include/boost/beast/websocket/detail/utf8_checker.ipp b/c++/boost/beast/websocket/detail/utf8_checker.ipp similarity index 100% rename from c++/include/boost/beast/websocket/detail/utf8_checker.ipp rename to c++/boost/beast/websocket/detail/utf8_checker.ipp diff --git a/c++/include/boost/beast/websocket/error.hpp b/c++/boost/beast/websocket/error.hpp similarity index 100% rename from c++/include/boost/beast/websocket/error.hpp rename to c++/boost/beast/websocket/error.hpp diff --git a/c++/include/boost/beast/websocket/impl/accept.hpp b/c++/boost/beast/websocket/impl/accept.hpp similarity index 100% rename from c++/include/boost/beast/websocket/impl/accept.hpp rename to c++/boost/beast/websocket/impl/accept.hpp diff --git a/c++/include/boost/beast/websocket/impl/close.hpp b/c++/boost/beast/websocket/impl/close.hpp similarity index 100% rename from c++/include/boost/beast/websocket/impl/close.hpp rename to c++/boost/beast/websocket/impl/close.hpp diff --git a/c++/include/boost/beast/websocket/impl/error.hpp b/c++/boost/beast/websocket/impl/error.hpp similarity index 100% rename from c++/include/boost/beast/websocket/impl/error.hpp rename to c++/boost/beast/websocket/impl/error.hpp diff --git a/c++/include/boost/beast/websocket/impl/error.ipp b/c++/boost/beast/websocket/impl/error.ipp similarity index 100% rename from c++/include/boost/beast/websocket/impl/error.ipp rename to c++/boost/beast/websocket/impl/error.ipp diff --git a/c++/include/boost/beast/websocket/impl/handshake.hpp b/c++/boost/beast/websocket/impl/handshake.hpp similarity index 100% rename from c++/include/boost/beast/websocket/impl/handshake.hpp rename to c++/boost/beast/websocket/impl/handshake.hpp diff --git a/c++/include/boost/beast/websocket/impl/ping.hpp b/c++/boost/beast/websocket/impl/ping.hpp similarity index 100% rename from c++/include/boost/beast/websocket/impl/ping.hpp rename to c++/boost/beast/websocket/impl/ping.hpp diff --git a/c++/include/boost/beast/websocket/impl/read.hpp b/c++/boost/beast/websocket/impl/read.hpp similarity index 100% rename from c++/include/boost/beast/websocket/impl/read.hpp rename to c++/boost/beast/websocket/impl/read.hpp diff --git a/c++/include/boost/beast/websocket/impl/rfc6455.hpp b/c++/boost/beast/websocket/impl/rfc6455.hpp similarity index 100% rename from c++/include/boost/beast/websocket/impl/rfc6455.hpp rename to c++/boost/beast/websocket/impl/rfc6455.hpp diff --git a/c++/include/boost/beast/websocket/impl/ssl.hpp b/c++/boost/beast/websocket/impl/ssl.hpp similarity index 100% rename from c++/include/boost/beast/websocket/impl/ssl.hpp rename to c++/boost/beast/websocket/impl/ssl.hpp diff --git a/c++/include/boost/beast/websocket/impl/stream.hpp b/c++/boost/beast/websocket/impl/stream.hpp similarity index 100% rename from c++/include/boost/beast/websocket/impl/stream.hpp rename to c++/boost/beast/websocket/impl/stream.hpp diff --git a/c++/include/boost/beast/websocket/impl/stream_impl.hpp b/c++/boost/beast/websocket/impl/stream_impl.hpp similarity index 100% rename from c++/include/boost/beast/websocket/impl/stream_impl.hpp rename to c++/boost/beast/websocket/impl/stream_impl.hpp diff --git a/c++/include/boost/beast/websocket/impl/teardown.hpp b/c++/boost/beast/websocket/impl/teardown.hpp similarity index 100% rename from c++/include/boost/beast/websocket/impl/teardown.hpp rename to c++/boost/beast/websocket/impl/teardown.hpp diff --git a/c++/include/boost/beast/websocket/impl/write.hpp b/c++/boost/beast/websocket/impl/write.hpp similarity index 100% rename from c++/include/boost/beast/websocket/impl/write.hpp rename to c++/boost/beast/websocket/impl/write.hpp diff --git a/c++/include/boost/beast/websocket/option.hpp b/c++/boost/beast/websocket/option.hpp similarity index 100% rename from c++/include/boost/beast/websocket/option.hpp rename to c++/boost/beast/websocket/option.hpp diff --git a/c++/include/boost/beast/websocket/rfc6455.hpp b/c++/boost/beast/websocket/rfc6455.hpp similarity index 100% rename from c++/include/boost/beast/websocket/rfc6455.hpp rename to c++/boost/beast/websocket/rfc6455.hpp diff --git a/c++/include/boost/beast/websocket/ssl.hpp b/c++/boost/beast/websocket/ssl.hpp similarity index 100% rename from c++/include/boost/beast/websocket/ssl.hpp rename to c++/boost/beast/websocket/ssl.hpp diff --git a/c++/include/boost/beast/websocket/stream.hpp b/c++/boost/beast/websocket/stream.hpp similarity index 100% rename from c++/include/boost/beast/websocket/stream.hpp rename to c++/boost/beast/websocket/stream.hpp diff --git a/c++/include/boost/beast/websocket/stream_base.hpp b/c++/boost/beast/websocket/stream_base.hpp similarity index 100% rename from c++/include/boost/beast/websocket/stream_base.hpp rename to c++/boost/beast/websocket/stream_base.hpp diff --git a/c++/include/boost/beast/websocket/stream_fwd.hpp b/c++/boost/beast/websocket/stream_fwd.hpp similarity index 100% rename from c++/include/boost/beast/websocket/stream_fwd.hpp rename to c++/boost/beast/websocket/stream_fwd.hpp diff --git a/c++/include/boost/beast/websocket/teardown.hpp b/c++/boost/beast/websocket/teardown.hpp similarity index 100% rename from c++/include/boost/beast/websocket/teardown.hpp rename to c++/boost/beast/websocket/teardown.hpp diff --git a/c++/include/boost/beast/zlib.hpp b/c++/boost/beast/zlib.hpp similarity index 100% rename from c++/include/boost/beast/zlib.hpp rename to c++/boost/beast/zlib.hpp diff --git a/c++/include/boost/beast/zlib/deflate_stream.hpp b/c++/boost/beast/zlib/deflate_stream.hpp similarity index 100% rename from c++/include/boost/beast/zlib/deflate_stream.hpp rename to c++/boost/beast/zlib/deflate_stream.hpp diff --git a/c++/include/boost/beast/zlib/detail/bitstream.hpp b/c++/boost/beast/zlib/detail/bitstream.hpp similarity index 100% rename from c++/include/boost/beast/zlib/detail/bitstream.hpp rename to c++/boost/beast/zlib/detail/bitstream.hpp diff --git a/c++/include/boost/beast/zlib/detail/deflate_stream.hpp b/c++/boost/beast/zlib/detail/deflate_stream.hpp similarity index 100% rename from c++/include/boost/beast/zlib/detail/deflate_stream.hpp rename to c++/boost/beast/zlib/detail/deflate_stream.hpp diff --git a/c++/include/boost/beast/zlib/detail/deflate_stream.ipp b/c++/boost/beast/zlib/detail/deflate_stream.ipp similarity index 100% rename from c++/include/boost/beast/zlib/detail/deflate_stream.ipp rename to c++/boost/beast/zlib/detail/deflate_stream.ipp diff --git a/c++/include/boost/beast/zlib/detail/inflate_stream.hpp b/c++/boost/beast/zlib/detail/inflate_stream.hpp similarity index 100% rename from c++/include/boost/beast/zlib/detail/inflate_stream.hpp rename to c++/boost/beast/zlib/detail/inflate_stream.hpp diff --git a/c++/include/boost/beast/zlib/detail/inflate_stream.ipp b/c++/boost/beast/zlib/detail/inflate_stream.ipp similarity index 100% rename from c++/include/boost/beast/zlib/detail/inflate_stream.ipp rename to c++/boost/beast/zlib/detail/inflate_stream.ipp diff --git a/c++/include/boost/beast/zlib/detail/ranges.hpp b/c++/boost/beast/zlib/detail/ranges.hpp similarity index 100% rename from c++/include/boost/beast/zlib/detail/ranges.hpp rename to c++/boost/beast/zlib/detail/ranges.hpp diff --git a/c++/include/boost/beast/zlib/detail/window.hpp b/c++/boost/beast/zlib/detail/window.hpp similarity index 100% rename from c++/include/boost/beast/zlib/detail/window.hpp rename to c++/boost/beast/zlib/detail/window.hpp diff --git a/c++/include/boost/beast/zlib/error.hpp b/c++/boost/beast/zlib/error.hpp similarity index 100% rename from c++/include/boost/beast/zlib/error.hpp rename to c++/boost/beast/zlib/error.hpp diff --git a/c++/include/boost/beast/zlib/impl/error.hpp b/c++/boost/beast/zlib/impl/error.hpp similarity index 100% rename from c++/include/boost/beast/zlib/impl/error.hpp rename to c++/boost/beast/zlib/impl/error.hpp diff --git a/c++/include/boost/beast/zlib/impl/error.ipp b/c++/boost/beast/zlib/impl/error.ipp similarity index 100% rename from c++/include/boost/beast/zlib/impl/error.ipp rename to c++/boost/beast/zlib/impl/error.ipp diff --git a/c++/include/boost/beast/zlib/inflate_stream.hpp b/c++/boost/beast/zlib/inflate_stream.hpp similarity index 100% rename from c++/include/boost/beast/zlib/inflate_stream.hpp rename to c++/boost/beast/zlib/inflate_stream.hpp diff --git a/c++/include/boost/beast/zlib/zlib.hpp b/c++/boost/beast/zlib/zlib.hpp similarity index 100% rename from c++/include/boost/beast/zlib/zlib.hpp rename to c++/boost/beast/zlib/zlib.hpp diff --git a/c++/include/boost/bimap.hpp b/c++/boost/bimap.hpp similarity index 100% rename from c++/include/boost/bimap.hpp rename to c++/boost/bimap.hpp diff --git a/c++/include/boost/bind.hpp b/c++/boost/bind.hpp similarity index 100% rename from c++/include/boost/bind.hpp rename to c++/boost/bind.hpp diff --git a/c++/include/boost/bind/apply.hpp b/c++/boost/bind/apply.hpp similarity index 100% rename from c++/include/boost/bind/apply.hpp rename to c++/boost/bind/apply.hpp diff --git a/c++/include/boost/bind/arg.hpp b/c++/boost/bind/arg.hpp similarity index 100% rename from c++/include/boost/bind/arg.hpp rename to c++/boost/bind/arg.hpp diff --git a/c++/include/boost/bind/bind.hpp b/c++/boost/bind/bind.hpp similarity index 100% rename from c++/include/boost/bind/bind.hpp rename to c++/boost/bind/bind.hpp diff --git a/c++/include/boost/bind/bind_cc.hpp b/c++/boost/bind/bind_cc.hpp similarity index 100% rename from c++/include/boost/bind/bind_cc.hpp rename to c++/boost/bind/bind_cc.hpp diff --git a/c++/include/boost/bind/bind_mf2_cc.hpp b/c++/boost/bind/bind_mf2_cc.hpp similarity index 100% rename from c++/include/boost/bind/bind_mf2_cc.hpp rename to c++/boost/bind/bind_mf2_cc.hpp diff --git a/c++/include/boost/bind/bind_mf_cc.hpp b/c++/boost/bind/bind_mf_cc.hpp similarity index 100% rename from c++/include/boost/bind/bind_mf_cc.hpp rename to c++/boost/bind/bind_mf_cc.hpp diff --git a/c++/include/boost/bind/bind_template.hpp b/c++/boost/bind/bind_template.hpp similarity index 100% rename from c++/include/boost/bind/bind_template.hpp rename to c++/boost/bind/bind_template.hpp diff --git a/c++/include/boost/bind/detail/is_same.hpp b/c++/boost/bind/detail/is_same.hpp similarity index 100% rename from c++/include/boost/bind/detail/is_same.hpp rename to c++/boost/bind/detail/is_same.hpp diff --git a/c++/include/boost/bind/detail/requires_cxx11.hpp b/c++/boost/bind/detail/requires_cxx11.hpp similarity index 100% rename from c++/include/boost/bind/detail/requires_cxx11.hpp rename to c++/boost/bind/detail/requires_cxx11.hpp diff --git a/c++/include/boost/bind/detail/result_traits.hpp b/c++/boost/bind/detail/result_traits.hpp similarity index 100% rename from c++/include/boost/bind/detail/result_traits.hpp rename to c++/boost/bind/detail/result_traits.hpp diff --git a/c++/include/boost/bind/make_adaptable.hpp b/c++/boost/bind/make_adaptable.hpp similarity index 100% rename from c++/include/boost/bind/make_adaptable.hpp rename to c++/boost/bind/make_adaptable.hpp diff --git a/c++/include/boost/bind/mem_fn.hpp b/c++/boost/bind/mem_fn.hpp similarity index 100% rename from c++/include/boost/bind/mem_fn.hpp rename to c++/boost/bind/mem_fn.hpp diff --git a/c++/include/boost/bind/mem_fn_cc.hpp b/c++/boost/bind/mem_fn_cc.hpp similarity index 100% rename from c++/include/boost/bind/mem_fn_cc.hpp rename to c++/boost/bind/mem_fn_cc.hpp diff --git a/c++/include/boost/bind/mem_fn_template.hpp b/c++/boost/bind/mem_fn_template.hpp similarity index 100% rename from c++/include/boost/bind/mem_fn_template.hpp rename to c++/boost/bind/mem_fn_template.hpp diff --git a/c++/include/boost/bind/mem_fn_vw.hpp b/c++/boost/bind/mem_fn_vw.hpp similarity index 100% rename from c++/include/boost/bind/mem_fn_vw.hpp rename to c++/boost/bind/mem_fn_vw.hpp diff --git a/c++/include/boost/bind/placeholders.hpp b/c++/boost/bind/placeholders.hpp similarity index 100% rename from c++/include/boost/bind/placeholders.hpp rename to c++/boost/bind/placeholders.hpp diff --git a/c++/include/boost/bind/protect.hpp b/c++/boost/bind/protect.hpp similarity index 100% rename from c++/include/boost/bind/protect.hpp rename to c++/boost/bind/protect.hpp diff --git a/c++/include/boost/bind/std_placeholders.hpp b/c++/boost/bind/std_placeholders.hpp similarity index 100% rename from c++/include/boost/bind/std_placeholders.hpp rename to c++/boost/bind/std_placeholders.hpp diff --git a/c++/include/boost/bind/storage.hpp b/c++/boost/bind/storage.hpp similarity index 100% rename from c++/include/boost/bind/storage.hpp rename to c++/boost/bind/storage.hpp diff --git a/c++/include/boost/blank.hpp b/c++/boost/blank.hpp similarity index 100% rename from c++/include/boost/blank.hpp rename to c++/boost/blank.hpp diff --git a/c++/include/boost/blank_fwd.hpp b/c++/boost/blank_fwd.hpp similarity index 100% rename from c++/include/boost/blank_fwd.hpp rename to c++/boost/blank_fwd.hpp diff --git a/c++/include/boost/call_traits.hpp b/c++/boost/call_traits.hpp similarity index 100% rename from c++/include/boost/call_traits.hpp rename to c++/boost/call_traits.hpp diff --git a/c++/include/boost/callable_traits.hpp b/c++/boost/callable_traits.hpp similarity index 100% rename from c++/include/boost/callable_traits.hpp rename to c++/boost/callable_traits.hpp diff --git a/c++/include/boost/cast.hpp b/c++/boost/cast.hpp similarity index 100% rename from c++/include/boost/cast.hpp rename to c++/boost/cast.hpp diff --git a/c++/include/boost/cerrno.hpp b/c++/boost/cerrno.hpp similarity index 100% rename from c++/include/boost/cerrno.hpp rename to c++/boost/cerrno.hpp diff --git a/c++/include/boost/checked_delete.hpp b/c++/boost/checked_delete.hpp similarity index 100% rename from c++/include/boost/checked_delete.hpp rename to c++/boost/checked_delete.hpp diff --git a/c++/include/boost/chrono.hpp b/c++/boost/chrono.hpp similarity index 100% rename from c++/include/boost/chrono.hpp rename to c++/boost/chrono.hpp diff --git a/c++/include/boost/chrono/ceil.hpp b/c++/boost/chrono/ceil.hpp similarity index 100% rename from c++/include/boost/chrono/ceil.hpp rename to c++/boost/chrono/ceil.hpp diff --git a/c++/include/boost/chrono/chrono.hpp b/c++/boost/chrono/chrono.hpp similarity index 100% rename from c++/include/boost/chrono/chrono.hpp rename to c++/boost/chrono/chrono.hpp diff --git a/c++/include/boost/chrono/chrono_io.hpp b/c++/boost/chrono/chrono_io.hpp similarity index 100% rename from c++/include/boost/chrono/chrono_io.hpp rename to c++/boost/chrono/chrono_io.hpp diff --git a/c++/include/boost/chrono/clock_string.hpp b/c++/boost/chrono/clock_string.hpp similarity index 100% rename from c++/include/boost/chrono/clock_string.hpp rename to c++/boost/chrono/clock_string.hpp diff --git a/c++/include/boost/chrono/config.hpp b/c++/boost/chrono/config.hpp similarity index 100% rename from c++/include/boost/chrono/config.hpp rename to c++/boost/chrono/config.hpp diff --git a/c++/include/boost/chrono/detail/inlined/chrono.hpp b/c++/boost/chrono/detail/inlined/chrono.hpp similarity index 100% rename from c++/include/boost/chrono/detail/inlined/chrono.hpp rename to c++/boost/chrono/detail/inlined/chrono.hpp diff --git a/c++/include/boost/chrono/detail/inlined/mac/chrono.hpp b/c++/boost/chrono/detail/inlined/mac/chrono.hpp similarity index 100% rename from c++/include/boost/chrono/detail/inlined/mac/chrono.hpp rename to c++/boost/chrono/detail/inlined/mac/chrono.hpp diff --git a/c++/include/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp b/c++/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp similarity index 100% rename from c++/include/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp rename to c++/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp diff --git a/c++/include/boost/chrono/detail/inlined/mac/thread_clock.hpp b/c++/boost/chrono/detail/inlined/mac/thread_clock.hpp similarity index 100% rename from c++/include/boost/chrono/detail/inlined/mac/thread_clock.hpp rename to c++/boost/chrono/detail/inlined/mac/thread_clock.hpp diff --git a/c++/include/boost/chrono/detail/inlined/posix/chrono.hpp b/c++/boost/chrono/detail/inlined/posix/chrono.hpp similarity index 100% rename from c++/include/boost/chrono/detail/inlined/posix/chrono.hpp rename to c++/boost/chrono/detail/inlined/posix/chrono.hpp diff --git a/c++/include/boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp b/c++/boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp similarity index 100% rename from c++/include/boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp rename to c++/boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp diff --git a/c++/include/boost/chrono/detail/inlined/posix/thread_clock.hpp b/c++/boost/chrono/detail/inlined/posix/thread_clock.hpp similarity index 100% rename from c++/include/boost/chrono/detail/inlined/posix/thread_clock.hpp rename to c++/boost/chrono/detail/inlined/posix/thread_clock.hpp diff --git a/c++/include/boost/chrono/detail/inlined/process_cpu_clocks.hpp b/c++/boost/chrono/detail/inlined/process_cpu_clocks.hpp similarity index 100% rename from c++/include/boost/chrono/detail/inlined/process_cpu_clocks.hpp rename to c++/boost/chrono/detail/inlined/process_cpu_clocks.hpp diff --git a/c++/include/boost/chrono/detail/inlined/thread_clock.hpp b/c++/boost/chrono/detail/inlined/thread_clock.hpp similarity index 100% rename from c++/include/boost/chrono/detail/inlined/thread_clock.hpp rename to c++/boost/chrono/detail/inlined/thread_clock.hpp diff --git a/c++/include/boost/chrono/detail/inlined/win/chrono.hpp b/c++/boost/chrono/detail/inlined/win/chrono.hpp similarity index 100% rename from c++/include/boost/chrono/detail/inlined/win/chrono.hpp rename to c++/boost/chrono/detail/inlined/win/chrono.hpp diff --git a/c++/include/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp b/c++/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp similarity index 100% rename from c++/include/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp rename to c++/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp diff --git a/c++/include/boost/chrono/detail/inlined/win/thread_clock.hpp b/c++/boost/chrono/detail/inlined/win/thread_clock.hpp similarity index 100% rename from c++/include/boost/chrono/detail/inlined/win/thread_clock.hpp rename to c++/boost/chrono/detail/inlined/win/thread_clock.hpp diff --git a/c++/include/boost/chrono/detail/is_evenly_divisible_by.hpp b/c++/boost/chrono/detail/is_evenly_divisible_by.hpp similarity index 100% rename from c++/include/boost/chrono/detail/is_evenly_divisible_by.hpp rename to c++/boost/chrono/detail/is_evenly_divisible_by.hpp diff --git a/c++/include/boost/chrono/detail/no_warning/signed_unsigned_cmp.hpp b/c++/boost/chrono/detail/no_warning/signed_unsigned_cmp.hpp similarity index 100% rename from c++/include/boost/chrono/detail/no_warning/signed_unsigned_cmp.hpp rename to c++/boost/chrono/detail/no_warning/signed_unsigned_cmp.hpp diff --git a/c++/include/boost/chrono/detail/requires_cxx11.hpp b/c++/boost/chrono/detail/requires_cxx11.hpp similarity index 100% rename from c++/include/boost/chrono/detail/requires_cxx11.hpp rename to c++/boost/chrono/detail/requires_cxx11.hpp diff --git a/c++/include/boost/chrono/detail/scan_keyword.hpp b/c++/boost/chrono/detail/scan_keyword.hpp similarity index 100% rename from c++/include/boost/chrono/detail/scan_keyword.hpp rename to c++/boost/chrono/detail/scan_keyword.hpp diff --git a/c++/include/boost/chrono/detail/static_assert.hpp b/c++/boost/chrono/detail/static_assert.hpp similarity index 100% rename from c++/include/boost/chrono/detail/static_assert.hpp rename to c++/boost/chrono/detail/static_assert.hpp diff --git a/c++/include/boost/chrono/detail/system.hpp b/c++/boost/chrono/detail/system.hpp similarity index 100% rename from c++/include/boost/chrono/detail/system.hpp rename to c++/boost/chrono/detail/system.hpp diff --git a/c++/include/boost/chrono/duration.hpp b/c++/boost/chrono/duration.hpp similarity index 100% rename from c++/include/boost/chrono/duration.hpp rename to c++/boost/chrono/duration.hpp diff --git a/c++/include/boost/chrono/floor.hpp b/c++/boost/chrono/floor.hpp similarity index 100% rename from c++/include/boost/chrono/floor.hpp rename to c++/boost/chrono/floor.hpp diff --git a/c++/include/boost/chrono/include.hpp b/c++/boost/chrono/include.hpp similarity index 100% rename from c++/include/boost/chrono/include.hpp rename to c++/boost/chrono/include.hpp diff --git a/c++/include/boost/chrono/io/duration_get.hpp b/c++/boost/chrono/io/duration_get.hpp similarity index 100% rename from c++/include/boost/chrono/io/duration_get.hpp rename to c++/boost/chrono/io/duration_get.hpp diff --git a/c++/include/boost/chrono/io/duration_io.hpp b/c++/boost/chrono/io/duration_io.hpp similarity index 100% rename from c++/include/boost/chrono/io/duration_io.hpp rename to c++/boost/chrono/io/duration_io.hpp diff --git a/c++/include/boost/chrono/io/duration_put.hpp b/c++/boost/chrono/io/duration_put.hpp similarity index 100% rename from c++/include/boost/chrono/io/duration_put.hpp rename to c++/boost/chrono/io/duration_put.hpp diff --git a/c++/include/boost/chrono/io/duration_style.hpp b/c++/boost/chrono/io/duration_style.hpp similarity index 100% rename from c++/include/boost/chrono/io/duration_style.hpp rename to c++/boost/chrono/io/duration_style.hpp diff --git a/c++/include/boost/chrono/io/duration_units.hpp b/c++/boost/chrono/io/duration_units.hpp similarity index 100% rename from c++/include/boost/chrono/io/duration_units.hpp rename to c++/boost/chrono/io/duration_units.hpp diff --git a/c++/include/boost/chrono/io/ios_base_state.hpp b/c++/boost/chrono/io/ios_base_state.hpp similarity index 100% rename from c++/include/boost/chrono/io/ios_base_state.hpp rename to c++/boost/chrono/io/ios_base_state.hpp diff --git a/c++/include/boost/chrono/io/time_point_get.hpp b/c++/boost/chrono/io/time_point_get.hpp similarity index 100% rename from c++/include/boost/chrono/io/time_point_get.hpp rename to c++/boost/chrono/io/time_point_get.hpp diff --git a/c++/include/boost/chrono/io/time_point_io.hpp b/c++/boost/chrono/io/time_point_io.hpp similarity index 100% rename from c++/include/boost/chrono/io/time_point_io.hpp rename to c++/boost/chrono/io/time_point_io.hpp diff --git a/c++/include/boost/chrono/io/time_point_put.hpp b/c++/boost/chrono/io/time_point_put.hpp similarity index 100% rename from c++/include/boost/chrono/io/time_point_put.hpp rename to c++/boost/chrono/io/time_point_put.hpp diff --git a/c++/include/boost/chrono/io/time_point_units.hpp b/c++/boost/chrono/io/time_point_units.hpp similarity index 100% rename from c++/include/boost/chrono/io/time_point_units.hpp rename to c++/boost/chrono/io/time_point_units.hpp diff --git a/c++/include/boost/chrono/io/timezone.hpp b/c++/boost/chrono/io/timezone.hpp similarity index 100% rename from c++/include/boost/chrono/io/timezone.hpp rename to c++/boost/chrono/io/timezone.hpp diff --git a/c++/include/boost/chrono/io/utility/ios_base_state_ptr.hpp b/c++/boost/chrono/io/utility/ios_base_state_ptr.hpp similarity index 100% rename from c++/include/boost/chrono/io/utility/ios_base_state_ptr.hpp rename to c++/boost/chrono/io/utility/ios_base_state_ptr.hpp diff --git a/c++/include/boost/chrono/io/utility/manip_base.hpp b/c++/boost/chrono/io/utility/manip_base.hpp similarity index 100% rename from c++/include/boost/chrono/io/utility/manip_base.hpp rename to c++/boost/chrono/io/utility/manip_base.hpp diff --git a/c++/include/boost/chrono/io/utility/to_string.hpp b/c++/boost/chrono/io/utility/to_string.hpp similarity index 100% rename from c++/include/boost/chrono/io/utility/to_string.hpp rename to c++/boost/chrono/io/utility/to_string.hpp diff --git a/c++/include/boost/chrono/io_v1/chrono_io.hpp b/c++/boost/chrono/io_v1/chrono_io.hpp similarity index 100% rename from c++/include/boost/chrono/io_v1/chrono_io.hpp rename to c++/boost/chrono/io_v1/chrono_io.hpp diff --git a/c++/include/boost/chrono/process_cpu_clocks.hpp b/c++/boost/chrono/process_cpu_clocks.hpp similarity index 100% rename from c++/include/boost/chrono/process_cpu_clocks.hpp rename to c++/boost/chrono/process_cpu_clocks.hpp diff --git a/c++/include/boost/chrono/round.hpp b/c++/boost/chrono/round.hpp similarity index 100% rename from c++/include/boost/chrono/round.hpp rename to c++/boost/chrono/round.hpp diff --git a/c++/include/boost/chrono/system_clocks.hpp b/c++/boost/chrono/system_clocks.hpp similarity index 100% rename from c++/include/boost/chrono/system_clocks.hpp rename to c++/boost/chrono/system_clocks.hpp diff --git a/c++/include/boost/chrono/thread_clock.hpp b/c++/boost/chrono/thread_clock.hpp similarity index 100% rename from c++/include/boost/chrono/thread_clock.hpp rename to c++/boost/chrono/thread_clock.hpp diff --git a/c++/include/boost/chrono/time_point.hpp b/c++/boost/chrono/time_point.hpp similarity index 100% rename from c++/include/boost/chrono/time_point.hpp rename to c++/boost/chrono/time_point.hpp diff --git a/c++/include/boost/chrono/typeof/boost/chrono/chrono.hpp b/c++/boost/chrono/typeof/boost/chrono/chrono.hpp similarity index 100% rename from c++/include/boost/chrono/typeof/boost/chrono/chrono.hpp rename to c++/boost/chrono/typeof/boost/chrono/chrono.hpp diff --git a/c++/include/boost/chrono/typeof/boost/ratio.hpp b/c++/boost/chrono/typeof/boost/ratio.hpp similarity index 100% rename from c++/include/boost/chrono/typeof/boost/ratio.hpp rename to c++/boost/chrono/typeof/boost/ratio.hpp diff --git a/c++/include/boost/circular_buffer.hpp b/c++/boost/circular_buffer.hpp similarity index 100% rename from c++/include/boost/circular_buffer.hpp rename to c++/boost/circular_buffer.hpp diff --git a/c++/include/boost/circular_buffer/base.hpp b/c++/boost/circular_buffer/base.hpp similarity index 100% rename from c++/include/boost/circular_buffer/base.hpp rename to c++/boost/circular_buffer/base.hpp diff --git a/c++/include/boost/circular_buffer/debug.hpp b/c++/boost/circular_buffer/debug.hpp similarity index 100% rename from c++/include/boost/circular_buffer/debug.hpp rename to c++/boost/circular_buffer/debug.hpp diff --git a/c++/include/boost/circular_buffer/details.hpp b/c++/boost/circular_buffer/details.hpp similarity index 100% rename from c++/include/boost/circular_buffer/details.hpp rename to c++/boost/circular_buffer/details.hpp diff --git a/c++/include/boost/circular_buffer/space_optimized.hpp b/c++/boost/circular_buffer/space_optimized.hpp similarity index 100% rename from c++/include/boost/circular_buffer/space_optimized.hpp rename to c++/boost/circular_buffer/space_optimized.hpp diff --git a/c++/include/boost/circular_buffer_fwd.hpp b/c++/boost/circular_buffer_fwd.hpp similarity index 100% rename from c++/include/boost/circular_buffer_fwd.hpp rename to c++/boost/circular_buffer_fwd.hpp diff --git a/c++/include/boost/compatibility/cpp_c_headers/cassert b/c++/boost/compatibility/cpp_c_headers/cassert similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/cassert rename to c++/boost/compatibility/cpp_c_headers/cassert diff --git a/c++/include/boost/compatibility/cpp_c_headers/cctype b/c++/boost/compatibility/cpp_c_headers/cctype similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/cctype rename to c++/boost/compatibility/cpp_c_headers/cctype diff --git a/c++/include/boost/compatibility/cpp_c_headers/cerrno b/c++/boost/compatibility/cpp_c_headers/cerrno similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/cerrno rename to c++/boost/compatibility/cpp_c_headers/cerrno diff --git a/c++/include/boost/compatibility/cpp_c_headers/cfloat b/c++/boost/compatibility/cpp_c_headers/cfloat similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/cfloat rename to c++/boost/compatibility/cpp_c_headers/cfloat diff --git a/c++/include/boost/compatibility/cpp_c_headers/climits b/c++/boost/compatibility/cpp_c_headers/climits similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/climits rename to c++/boost/compatibility/cpp_c_headers/climits diff --git a/c++/include/boost/compatibility/cpp_c_headers/clocale b/c++/boost/compatibility/cpp_c_headers/clocale similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/clocale rename to c++/boost/compatibility/cpp_c_headers/clocale diff --git a/c++/include/boost/compatibility/cpp_c_headers/cmath b/c++/boost/compatibility/cpp_c_headers/cmath similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/cmath rename to c++/boost/compatibility/cpp_c_headers/cmath diff --git a/c++/include/boost/compatibility/cpp_c_headers/csetjmp b/c++/boost/compatibility/cpp_c_headers/csetjmp similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/csetjmp rename to c++/boost/compatibility/cpp_c_headers/csetjmp diff --git a/c++/include/boost/compatibility/cpp_c_headers/csignal b/c++/boost/compatibility/cpp_c_headers/csignal similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/csignal rename to c++/boost/compatibility/cpp_c_headers/csignal diff --git a/c++/include/boost/compatibility/cpp_c_headers/cstdarg b/c++/boost/compatibility/cpp_c_headers/cstdarg similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/cstdarg rename to c++/boost/compatibility/cpp_c_headers/cstdarg diff --git a/c++/include/boost/compatibility/cpp_c_headers/cstddef b/c++/boost/compatibility/cpp_c_headers/cstddef similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/cstddef rename to c++/boost/compatibility/cpp_c_headers/cstddef diff --git a/c++/include/boost/compatibility/cpp_c_headers/cstdio b/c++/boost/compatibility/cpp_c_headers/cstdio similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/cstdio rename to c++/boost/compatibility/cpp_c_headers/cstdio diff --git a/c++/include/boost/compatibility/cpp_c_headers/cstdlib b/c++/boost/compatibility/cpp_c_headers/cstdlib similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/cstdlib rename to c++/boost/compatibility/cpp_c_headers/cstdlib diff --git a/c++/include/boost/compatibility/cpp_c_headers/cstring b/c++/boost/compatibility/cpp_c_headers/cstring similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/cstring rename to c++/boost/compatibility/cpp_c_headers/cstring diff --git a/c++/include/boost/compatibility/cpp_c_headers/ctime b/c++/boost/compatibility/cpp_c_headers/ctime similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/ctime rename to c++/boost/compatibility/cpp_c_headers/ctime diff --git a/c++/include/boost/compatibility/cpp_c_headers/cwchar b/c++/boost/compatibility/cpp_c_headers/cwchar similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/cwchar rename to c++/boost/compatibility/cpp_c_headers/cwchar diff --git a/c++/include/boost/compatibility/cpp_c_headers/cwctype b/c++/boost/compatibility/cpp_c_headers/cwctype similarity index 100% rename from c++/include/boost/compatibility/cpp_c_headers/cwctype rename to c++/boost/compatibility/cpp_c_headers/cwctype diff --git a/c++/include/boost/compressed_pair.hpp b/c++/boost/compressed_pair.hpp similarity index 100% rename from c++/include/boost/compressed_pair.hpp rename to c++/boost/compressed_pair.hpp diff --git a/c++/include/boost/compute.hpp b/c++/boost/compute.hpp similarity index 100% rename from c++/include/boost/compute.hpp rename to c++/boost/compute.hpp diff --git a/c++/include/boost/compute/algorithm.hpp b/c++/boost/compute/algorithm.hpp similarity index 100% rename from c++/include/boost/compute/algorithm.hpp rename to c++/boost/compute/algorithm.hpp diff --git a/c++/include/boost/compute/algorithm/accumulate.hpp b/c++/boost/compute/algorithm/accumulate.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/accumulate.hpp rename to c++/boost/compute/algorithm/accumulate.hpp diff --git a/c++/include/boost/compute/algorithm/adjacent_difference.hpp b/c++/boost/compute/algorithm/adjacent_difference.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/adjacent_difference.hpp rename to c++/boost/compute/algorithm/adjacent_difference.hpp diff --git a/c++/include/boost/compute/algorithm/adjacent_find.hpp b/c++/boost/compute/algorithm/adjacent_find.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/adjacent_find.hpp rename to c++/boost/compute/algorithm/adjacent_find.hpp diff --git a/c++/include/boost/compute/algorithm/all_of.hpp b/c++/boost/compute/algorithm/all_of.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/all_of.hpp rename to c++/boost/compute/algorithm/all_of.hpp diff --git a/c++/include/boost/compute/algorithm/any_of.hpp b/c++/boost/compute/algorithm/any_of.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/any_of.hpp rename to c++/boost/compute/algorithm/any_of.hpp diff --git a/c++/include/boost/compute/algorithm/binary_search.hpp b/c++/boost/compute/algorithm/binary_search.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/binary_search.hpp rename to c++/boost/compute/algorithm/binary_search.hpp diff --git a/c++/include/boost/compute/algorithm/copy.hpp b/c++/boost/compute/algorithm/copy.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/copy.hpp rename to c++/boost/compute/algorithm/copy.hpp diff --git a/c++/include/boost/compute/algorithm/copy_if.hpp b/c++/boost/compute/algorithm/copy_if.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/copy_if.hpp rename to c++/boost/compute/algorithm/copy_if.hpp diff --git a/c++/include/boost/compute/algorithm/copy_n.hpp b/c++/boost/compute/algorithm/copy_n.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/copy_n.hpp rename to c++/boost/compute/algorithm/copy_n.hpp diff --git a/c++/include/boost/compute/algorithm/count.hpp b/c++/boost/compute/algorithm/count.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/count.hpp rename to c++/boost/compute/algorithm/count.hpp diff --git a/c++/include/boost/compute/algorithm/count_if.hpp b/c++/boost/compute/algorithm/count_if.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/count_if.hpp rename to c++/boost/compute/algorithm/count_if.hpp diff --git a/c++/include/boost/compute/algorithm/detail/balanced_path.hpp b/c++/boost/compute/algorithm/detail/balanced_path.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/balanced_path.hpp rename to c++/boost/compute/algorithm/detail/balanced_path.hpp diff --git a/c++/include/boost/compute/algorithm/detail/binary_find.hpp b/c++/boost/compute/algorithm/detail/binary_find.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/binary_find.hpp rename to c++/boost/compute/algorithm/detail/binary_find.hpp diff --git a/c++/include/boost/compute/algorithm/detail/compact.hpp b/c++/boost/compute/algorithm/detail/compact.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/compact.hpp rename to c++/boost/compute/algorithm/detail/compact.hpp diff --git a/c++/include/boost/compute/algorithm/detail/copy_on_device.hpp b/c++/boost/compute/algorithm/detail/copy_on_device.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/copy_on_device.hpp rename to c++/boost/compute/algorithm/detail/copy_on_device.hpp diff --git a/c++/include/boost/compute/algorithm/detail/copy_to_device.hpp b/c++/boost/compute/algorithm/detail/copy_to_device.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/copy_to_device.hpp rename to c++/boost/compute/algorithm/detail/copy_to_device.hpp diff --git a/c++/include/boost/compute/algorithm/detail/copy_to_host.hpp b/c++/boost/compute/algorithm/detail/copy_to_host.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/copy_to_host.hpp rename to c++/boost/compute/algorithm/detail/copy_to_host.hpp diff --git a/c++/include/boost/compute/algorithm/detail/count_if_with_ballot.hpp b/c++/boost/compute/algorithm/detail/count_if_with_ballot.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/count_if_with_ballot.hpp rename to c++/boost/compute/algorithm/detail/count_if_with_ballot.hpp diff --git a/c++/include/boost/compute/algorithm/detail/count_if_with_reduce.hpp b/c++/boost/compute/algorithm/detail/count_if_with_reduce.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/count_if_with_reduce.hpp rename to c++/boost/compute/algorithm/detail/count_if_with_reduce.hpp diff --git a/c++/include/boost/compute/algorithm/detail/count_if_with_threads.hpp b/c++/boost/compute/algorithm/detail/count_if_with_threads.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/count_if_with_threads.hpp rename to c++/boost/compute/algorithm/detail/count_if_with_threads.hpp diff --git a/c++/include/boost/compute/algorithm/detail/find_extrema.hpp b/c++/boost/compute/algorithm/detail/find_extrema.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/find_extrema.hpp rename to c++/boost/compute/algorithm/detail/find_extrema.hpp diff --git a/c++/include/boost/compute/algorithm/detail/find_extrema_on_cpu.hpp b/c++/boost/compute/algorithm/detail/find_extrema_on_cpu.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/find_extrema_on_cpu.hpp rename to c++/boost/compute/algorithm/detail/find_extrema_on_cpu.hpp diff --git a/c++/include/boost/compute/algorithm/detail/find_extrema_with_atomics.hpp b/c++/boost/compute/algorithm/detail/find_extrema_with_atomics.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/find_extrema_with_atomics.hpp rename to c++/boost/compute/algorithm/detail/find_extrema_with_atomics.hpp diff --git a/c++/include/boost/compute/algorithm/detail/find_extrema_with_reduce.hpp b/c++/boost/compute/algorithm/detail/find_extrema_with_reduce.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/find_extrema_with_reduce.hpp rename to c++/boost/compute/algorithm/detail/find_extrema_with_reduce.hpp diff --git a/c++/include/boost/compute/algorithm/detail/find_if_with_atomics.hpp b/c++/boost/compute/algorithm/detail/find_if_with_atomics.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/find_if_with_atomics.hpp rename to c++/boost/compute/algorithm/detail/find_if_with_atomics.hpp diff --git a/c++/include/boost/compute/algorithm/detail/inplace_reduce.hpp b/c++/boost/compute/algorithm/detail/inplace_reduce.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/inplace_reduce.hpp rename to c++/boost/compute/algorithm/detail/inplace_reduce.hpp diff --git a/c++/include/boost/compute/algorithm/detail/insertion_sort.hpp b/c++/boost/compute/algorithm/detail/insertion_sort.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/insertion_sort.hpp rename to c++/boost/compute/algorithm/detail/insertion_sort.hpp diff --git a/c++/include/boost/compute/algorithm/detail/merge_path.hpp b/c++/boost/compute/algorithm/detail/merge_path.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/merge_path.hpp rename to c++/boost/compute/algorithm/detail/merge_path.hpp diff --git a/c++/include/boost/compute/algorithm/detail/merge_sort_on_cpu.hpp b/c++/boost/compute/algorithm/detail/merge_sort_on_cpu.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/merge_sort_on_cpu.hpp rename to c++/boost/compute/algorithm/detail/merge_sort_on_cpu.hpp diff --git a/c++/include/boost/compute/algorithm/detail/merge_sort_on_gpu.hpp b/c++/boost/compute/algorithm/detail/merge_sort_on_gpu.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/merge_sort_on_gpu.hpp rename to c++/boost/compute/algorithm/detail/merge_sort_on_gpu.hpp diff --git a/c++/include/boost/compute/algorithm/detail/merge_with_merge_path.hpp b/c++/boost/compute/algorithm/detail/merge_with_merge_path.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/merge_with_merge_path.hpp rename to c++/boost/compute/algorithm/detail/merge_with_merge_path.hpp diff --git a/c++/include/boost/compute/algorithm/detail/radix_sort.hpp b/c++/boost/compute/algorithm/detail/radix_sort.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/radix_sort.hpp rename to c++/boost/compute/algorithm/detail/radix_sort.hpp diff --git a/c++/include/boost/compute/algorithm/detail/random_fill.hpp b/c++/boost/compute/algorithm/detail/random_fill.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/random_fill.hpp rename to c++/boost/compute/algorithm/detail/random_fill.hpp diff --git a/c++/include/boost/compute/algorithm/detail/reduce_by_key.hpp b/c++/boost/compute/algorithm/detail/reduce_by_key.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/reduce_by_key.hpp rename to c++/boost/compute/algorithm/detail/reduce_by_key.hpp diff --git a/c++/include/boost/compute/algorithm/detail/reduce_by_key_with_scan.hpp b/c++/boost/compute/algorithm/detail/reduce_by_key_with_scan.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/reduce_by_key_with_scan.hpp rename to c++/boost/compute/algorithm/detail/reduce_by_key_with_scan.hpp diff --git a/c++/include/boost/compute/algorithm/detail/reduce_on_cpu.hpp b/c++/boost/compute/algorithm/detail/reduce_on_cpu.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/reduce_on_cpu.hpp rename to c++/boost/compute/algorithm/detail/reduce_on_cpu.hpp diff --git a/c++/include/boost/compute/algorithm/detail/reduce_on_gpu.hpp b/c++/boost/compute/algorithm/detail/reduce_on_gpu.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/reduce_on_gpu.hpp rename to c++/boost/compute/algorithm/detail/reduce_on_gpu.hpp diff --git a/c++/include/boost/compute/algorithm/detail/scan.hpp b/c++/boost/compute/algorithm/detail/scan.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/scan.hpp rename to c++/boost/compute/algorithm/detail/scan.hpp diff --git a/c++/include/boost/compute/algorithm/detail/scan_on_cpu.hpp b/c++/boost/compute/algorithm/detail/scan_on_cpu.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/scan_on_cpu.hpp rename to c++/boost/compute/algorithm/detail/scan_on_cpu.hpp diff --git a/c++/include/boost/compute/algorithm/detail/scan_on_gpu.hpp b/c++/boost/compute/algorithm/detail/scan_on_gpu.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/scan_on_gpu.hpp rename to c++/boost/compute/algorithm/detail/scan_on_gpu.hpp diff --git a/c++/include/boost/compute/algorithm/detail/search_all.hpp b/c++/boost/compute/algorithm/detail/search_all.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/search_all.hpp rename to c++/boost/compute/algorithm/detail/search_all.hpp diff --git a/c++/include/boost/compute/algorithm/detail/serial_accumulate.hpp b/c++/boost/compute/algorithm/detail/serial_accumulate.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/serial_accumulate.hpp rename to c++/boost/compute/algorithm/detail/serial_accumulate.hpp diff --git a/c++/include/boost/compute/algorithm/detail/serial_count_if.hpp b/c++/boost/compute/algorithm/detail/serial_count_if.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/serial_count_if.hpp rename to c++/boost/compute/algorithm/detail/serial_count_if.hpp diff --git a/c++/include/boost/compute/algorithm/detail/serial_find_extrema.hpp b/c++/boost/compute/algorithm/detail/serial_find_extrema.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/serial_find_extrema.hpp rename to c++/boost/compute/algorithm/detail/serial_find_extrema.hpp diff --git a/c++/include/boost/compute/algorithm/detail/serial_merge.hpp b/c++/boost/compute/algorithm/detail/serial_merge.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/serial_merge.hpp rename to c++/boost/compute/algorithm/detail/serial_merge.hpp diff --git a/c++/include/boost/compute/algorithm/detail/serial_reduce.hpp b/c++/boost/compute/algorithm/detail/serial_reduce.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/serial_reduce.hpp rename to c++/boost/compute/algorithm/detail/serial_reduce.hpp diff --git a/c++/include/boost/compute/algorithm/detail/serial_reduce_by_key.hpp b/c++/boost/compute/algorithm/detail/serial_reduce_by_key.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/serial_reduce_by_key.hpp rename to c++/boost/compute/algorithm/detail/serial_reduce_by_key.hpp diff --git a/c++/include/boost/compute/algorithm/detail/serial_scan.hpp b/c++/boost/compute/algorithm/detail/serial_scan.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/detail/serial_scan.hpp rename to c++/boost/compute/algorithm/detail/serial_scan.hpp diff --git a/c++/include/boost/compute/algorithm/equal.hpp b/c++/boost/compute/algorithm/equal.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/equal.hpp rename to c++/boost/compute/algorithm/equal.hpp diff --git a/c++/include/boost/compute/algorithm/equal_range.hpp b/c++/boost/compute/algorithm/equal_range.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/equal_range.hpp rename to c++/boost/compute/algorithm/equal_range.hpp diff --git a/c++/include/boost/compute/algorithm/exclusive_scan.hpp b/c++/boost/compute/algorithm/exclusive_scan.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/exclusive_scan.hpp rename to c++/boost/compute/algorithm/exclusive_scan.hpp diff --git a/c++/include/boost/compute/algorithm/fill.hpp b/c++/boost/compute/algorithm/fill.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/fill.hpp rename to c++/boost/compute/algorithm/fill.hpp diff --git a/c++/include/boost/compute/algorithm/fill_n.hpp b/c++/boost/compute/algorithm/fill_n.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/fill_n.hpp rename to c++/boost/compute/algorithm/fill_n.hpp diff --git a/c++/include/boost/compute/algorithm/find.hpp b/c++/boost/compute/algorithm/find.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/find.hpp rename to c++/boost/compute/algorithm/find.hpp diff --git a/c++/include/boost/compute/algorithm/find_end.hpp b/c++/boost/compute/algorithm/find_end.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/find_end.hpp rename to c++/boost/compute/algorithm/find_end.hpp diff --git a/c++/include/boost/compute/algorithm/find_if.hpp b/c++/boost/compute/algorithm/find_if.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/find_if.hpp rename to c++/boost/compute/algorithm/find_if.hpp diff --git a/c++/include/boost/compute/algorithm/find_if_not.hpp b/c++/boost/compute/algorithm/find_if_not.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/find_if_not.hpp rename to c++/boost/compute/algorithm/find_if_not.hpp diff --git a/c++/include/boost/compute/algorithm/for_each.hpp b/c++/boost/compute/algorithm/for_each.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/for_each.hpp rename to c++/boost/compute/algorithm/for_each.hpp diff --git a/c++/include/boost/compute/algorithm/for_each_n.hpp b/c++/boost/compute/algorithm/for_each_n.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/for_each_n.hpp rename to c++/boost/compute/algorithm/for_each_n.hpp diff --git a/c++/include/boost/compute/algorithm/gather.hpp b/c++/boost/compute/algorithm/gather.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/gather.hpp rename to c++/boost/compute/algorithm/gather.hpp diff --git a/c++/include/boost/compute/algorithm/generate.hpp b/c++/boost/compute/algorithm/generate.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/generate.hpp rename to c++/boost/compute/algorithm/generate.hpp diff --git a/c++/include/boost/compute/algorithm/generate_n.hpp b/c++/boost/compute/algorithm/generate_n.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/generate_n.hpp rename to c++/boost/compute/algorithm/generate_n.hpp diff --git a/c++/include/boost/compute/algorithm/includes.hpp b/c++/boost/compute/algorithm/includes.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/includes.hpp rename to c++/boost/compute/algorithm/includes.hpp diff --git a/c++/include/boost/compute/algorithm/inclusive_scan.hpp b/c++/boost/compute/algorithm/inclusive_scan.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/inclusive_scan.hpp rename to c++/boost/compute/algorithm/inclusive_scan.hpp diff --git a/c++/include/boost/compute/algorithm/inner_product.hpp b/c++/boost/compute/algorithm/inner_product.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/inner_product.hpp rename to c++/boost/compute/algorithm/inner_product.hpp diff --git a/c++/include/boost/compute/algorithm/inplace_merge.hpp b/c++/boost/compute/algorithm/inplace_merge.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/inplace_merge.hpp rename to c++/boost/compute/algorithm/inplace_merge.hpp diff --git a/c++/include/boost/compute/algorithm/iota.hpp b/c++/boost/compute/algorithm/iota.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/iota.hpp rename to c++/boost/compute/algorithm/iota.hpp diff --git a/c++/include/boost/compute/algorithm/is_partitioned.hpp b/c++/boost/compute/algorithm/is_partitioned.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/is_partitioned.hpp rename to c++/boost/compute/algorithm/is_partitioned.hpp diff --git a/c++/include/boost/compute/algorithm/is_permutation.hpp b/c++/boost/compute/algorithm/is_permutation.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/is_permutation.hpp rename to c++/boost/compute/algorithm/is_permutation.hpp diff --git a/c++/include/boost/compute/algorithm/is_sorted.hpp b/c++/boost/compute/algorithm/is_sorted.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/is_sorted.hpp rename to c++/boost/compute/algorithm/is_sorted.hpp diff --git a/c++/include/boost/compute/algorithm/lexicographical_compare.hpp b/c++/boost/compute/algorithm/lexicographical_compare.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/lexicographical_compare.hpp rename to c++/boost/compute/algorithm/lexicographical_compare.hpp diff --git a/c++/include/boost/compute/algorithm/lower_bound.hpp b/c++/boost/compute/algorithm/lower_bound.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/lower_bound.hpp rename to c++/boost/compute/algorithm/lower_bound.hpp diff --git a/c++/include/boost/compute/algorithm/max_element.hpp b/c++/boost/compute/algorithm/max_element.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/max_element.hpp rename to c++/boost/compute/algorithm/max_element.hpp diff --git a/c++/include/boost/compute/algorithm/merge.hpp b/c++/boost/compute/algorithm/merge.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/merge.hpp rename to c++/boost/compute/algorithm/merge.hpp diff --git a/c++/include/boost/compute/algorithm/min_element.hpp b/c++/boost/compute/algorithm/min_element.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/min_element.hpp rename to c++/boost/compute/algorithm/min_element.hpp diff --git a/c++/include/boost/compute/algorithm/minmax_element.hpp b/c++/boost/compute/algorithm/minmax_element.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/minmax_element.hpp rename to c++/boost/compute/algorithm/minmax_element.hpp diff --git a/c++/include/boost/compute/algorithm/mismatch.hpp b/c++/boost/compute/algorithm/mismatch.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/mismatch.hpp rename to c++/boost/compute/algorithm/mismatch.hpp diff --git a/c++/include/boost/compute/algorithm/next_permutation.hpp b/c++/boost/compute/algorithm/next_permutation.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/next_permutation.hpp rename to c++/boost/compute/algorithm/next_permutation.hpp diff --git a/c++/include/boost/compute/algorithm/none_of.hpp b/c++/boost/compute/algorithm/none_of.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/none_of.hpp rename to c++/boost/compute/algorithm/none_of.hpp diff --git a/c++/include/boost/compute/algorithm/nth_element.hpp b/c++/boost/compute/algorithm/nth_element.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/nth_element.hpp rename to c++/boost/compute/algorithm/nth_element.hpp diff --git a/c++/include/boost/compute/algorithm/partial_sum.hpp b/c++/boost/compute/algorithm/partial_sum.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/partial_sum.hpp rename to c++/boost/compute/algorithm/partial_sum.hpp diff --git a/c++/include/boost/compute/algorithm/partition.hpp b/c++/boost/compute/algorithm/partition.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/partition.hpp rename to c++/boost/compute/algorithm/partition.hpp diff --git a/c++/include/boost/compute/algorithm/partition_copy.hpp b/c++/boost/compute/algorithm/partition_copy.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/partition_copy.hpp rename to c++/boost/compute/algorithm/partition_copy.hpp diff --git a/c++/include/boost/compute/algorithm/partition_point.hpp b/c++/boost/compute/algorithm/partition_point.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/partition_point.hpp rename to c++/boost/compute/algorithm/partition_point.hpp diff --git a/c++/include/boost/compute/algorithm/prev_permutation.hpp b/c++/boost/compute/algorithm/prev_permutation.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/prev_permutation.hpp rename to c++/boost/compute/algorithm/prev_permutation.hpp diff --git a/c++/include/boost/compute/algorithm/random_shuffle.hpp b/c++/boost/compute/algorithm/random_shuffle.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/random_shuffle.hpp rename to c++/boost/compute/algorithm/random_shuffle.hpp diff --git a/c++/include/boost/compute/algorithm/reduce.hpp b/c++/boost/compute/algorithm/reduce.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/reduce.hpp rename to c++/boost/compute/algorithm/reduce.hpp diff --git a/c++/include/boost/compute/algorithm/reduce_by_key.hpp b/c++/boost/compute/algorithm/reduce_by_key.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/reduce_by_key.hpp rename to c++/boost/compute/algorithm/reduce_by_key.hpp diff --git a/c++/include/boost/compute/algorithm/remove.hpp b/c++/boost/compute/algorithm/remove.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/remove.hpp rename to c++/boost/compute/algorithm/remove.hpp diff --git a/c++/include/boost/compute/algorithm/remove_if.hpp b/c++/boost/compute/algorithm/remove_if.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/remove_if.hpp rename to c++/boost/compute/algorithm/remove_if.hpp diff --git a/c++/include/boost/compute/algorithm/replace.hpp b/c++/boost/compute/algorithm/replace.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/replace.hpp rename to c++/boost/compute/algorithm/replace.hpp diff --git a/c++/include/boost/compute/algorithm/replace_copy.hpp b/c++/boost/compute/algorithm/replace_copy.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/replace_copy.hpp rename to c++/boost/compute/algorithm/replace_copy.hpp diff --git a/c++/include/boost/compute/algorithm/reverse.hpp b/c++/boost/compute/algorithm/reverse.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/reverse.hpp rename to c++/boost/compute/algorithm/reverse.hpp diff --git a/c++/include/boost/compute/algorithm/reverse_copy.hpp b/c++/boost/compute/algorithm/reverse_copy.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/reverse_copy.hpp rename to c++/boost/compute/algorithm/reverse_copy.hpp diff --git a/c++/include/boost/compute/algorithm/rotate.hpp b/c++/boost/compute/algorithm/rotate.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/rotate.hpp rename to c++/boost/compute/algorithm/rotate.hpp diff --git a/c++/include/boost/compute/algorithm/rotate_copy.hpp b/c++/boost/compute/algorithm/rotate_copy.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/rotate_copy.hpp rename to c++/boost/compute/algorithm/rotate_copy.hpp diff --git a/c++/include/boost/compute/algorithm/scatter.hpp b/c++/boost/compute/algorithm/scatter.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/scatter.hpp rename to c++/boost/compute/algorithm/scatter.hpp diff --git a/c++/include/boost/compute/algorithm/scatter_if.hpp b/c++/boost/compute/algorithm/scatter_if.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/scatter_if.hpp rename to c++/boost/compute/algorithm/scatter_if.hpp diff --git a/c++/include/boost/compute/algorithm/search.hpp b/c++/boost/compute/algorithm/search.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/search.hpp rename to c++/boost/compute/algorithm/search.hpp diff --git a/c++/include/boost/compute/algorithm/search_n.hpp b/c++/boost/compute/algorithm/search_n.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/search_n.hpp rename to c++/boost/compute/algorithm/search_n.hpp diff --git a/c++/include/boost/compute/algorithm/set_difference.hpp b/c++/boost/compute/algorithm/set_difference.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/set_difference.hpp rename to c++/boost/compute/algorithm/set_difference.hpp diff --git a/c++/include/boost/compute/algorithm/set_intersection.hpp b/c++/boost/compute/algorithm/set_intersection.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/set_intersection.hpp rename to c++/boost/compute/algorithm/set_intersection.hpp diff --git a/c++/include/boost/compute/algorithm/set_symmetric_difference.hpp b/c++/boost/compute/algorithm/set_symmetric_difference.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/set_symmetric_difference.hpp rename to c++/boost/compute/algorithm/set_symmetric_difference.hpp diff --git a/c++/include/boost/compute/algorithm/set_union.hpp b/c++/boost/compute/algorithm/set_union.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/set_union.hpp rename to c++/boost/compute/algorithm/set_union.hpp diff --git a/c++/include/boost/compute/algorithm/sort.hpp b/c++/boost/compute/algorithm/sort.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/sort.hpp rename to c++/boost/compute/algorithm/sort.hpp diff --git a/c++/include/boost/compute/algorithm/sort_by_key.hpp b/c++/boost/compute/algorithm/sort_by_key.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/sort_by_key.hpp rename to c++/boost/compute/algorithm/sort_by_key.hpp diff --git a/c++/include/boost/compute/algorithm/stable_partition.hpp b/c++/boost/compute/algorithm/stable_partition.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/stable_partition.hpp rename to c++/boost/compute/algorithm/stable_partition.hpp diff --git a/c++/include/boost/compute/algorithm/stable_sort.hpp b/c++/boost/compute/algorithm/stable_sort.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/stable_sort.hpp rename to c++/boost/compute/algorithm/stable_sort.hpp diff --git a/c++/include/boost/compute/algorithm/stable_sort_by_key.hpp b/c++/boost/compute/algorithm/stable_sort_by_key.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/stable_sort_by_key.hpp rename to c++/boost/compute/algorithm/stable_sort_by_key.hpp diff --git a/c++/include/boost/compute/algorithm/swap_ranges.hpp b/c++/boost/compute/algorithm/swap_ranges.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/swap_ranges.hpp rename to c++/boost/compute/algorithm/swap_ranges.hpp diff --git a/c++/include/boost/compute/algorithm/transform.hpp b/c++/boost/compute/algorithm/transform.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/transform.hpp rename to c++/boost/compute/algorithm/transform.hpp diff --git a/c++/include/boost/compute/algorithm/transform_if.hpp b/c++/boost/compute/algorithm/transform_if.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/transform_if.hpp rename to c++/boost/compute/algorithm/transform_if.hpp diff --git a/c++/include/boost/compute/algorithm/transform_reduce.hpp b/c++/boost/compute/algorithm/transform_reduce.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/transform_reduce.hpp rename to c++/boost/compute/algorithm/transform_reduce.hpp diff --git a/c++/include/boost/compute/algorithm/unique.hpp b/c++/boost/compute/algorithm/unique.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/unique.hpp rename to c++/boost/compute/algorithm/unique.hpp diff --git a/c++/include/boost/compute/algorithm/unique_copy.hpp b/c++/boost/compute/algorithm/unique_copy.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/unique_copy.hpp rename to c++/boost/compute/algorithm/unique_copy.hpp diff --git a/c++/include/boost/compute/algorithm/upper_bound.hpp b/c++/boost/compute/algorithm/upper_bound.hpp similarity index 100% rename from c++/include/boost/compute/algorithm/upper_bound.hpp rename to c++/boost/compute/algorithm/upper_bound.hpp diff --git a/c++/include/boost/compute/allocator.hpp b/c++/boost/compute/allocator.hpp similarity index 100% rename from c++/include/boost/compute/allocator.hpp rename to c++/boost/compute/allocator.hpp diff --git a/c++/include/boost/compute/allocator/buffer_allocator.hpp b/c++/boost/compute/allocator/buffer_allocator.hpp similarity index 100% rename from c++/include/boost/compute/allocator/buffer_allocator.hpp rename to c++/boost/compute/allocator/buffer_allocator.hpp diff --git a/c++/include/boost/compute/allocator/pinned_allocator.hpp b/c++/boost/compute/allocator/pinned_allocator.hpp similarity index 100% rename from c++/include/boost/compute/allocator/pinned_allocator.hpp rename to c++/boost/compute/allocator/pinned_allocator.hpp diff --git a/c++/include/boost/compute/async.hpp b/c++/boost/compute/async.hpp similarity index 100% rename from c++/include/boost/compute/async.hpp rename to c++/boost/compute/async.hpp diff --git a/c++/include/boost/compute/async/future.hpp b/c++/boost/compute/async/future.hpp similarity index 100% rename from c++/include/boost/compute/async/future.hpp rename to c++/boost/compute/async/future.hpp diff --git a/c++/include/boost/compute/async/wait.hpp b/c++/boost/compute/async/wait.hpp similarity index 100% rename from c++/include/boost/compute/async/wait.hpp rename to c++/boost/compute/async/wait.hpp diff --git a/c++/include/boost/compute/async/wait_guard.hpp b/c++/boost/compute/async/wait_guard.hpp similarity index 100% rename from c++/include/boost/compute/async/wait_guard.hpp rename to c++/boost/compute/async/wait_guard.hpp diff --git a/c++/include/boost/compute/buffer.hpp b/c++/boost/compute/buffer.hpp similarity index 100% rename from c++/include/boost/compute/buffer.hpp rename to c++/boost/compute/buffer.hpp diff --git a/c++/include/boost/compute/cl.hpp b/c++/boost/compute/cl.hpp similarity index 100% rename from c++/include/boost/compute/cl.hpp rename to c++/boost/compute/cl.hpp diff --git a/c++/include/boost/compute/cl_ext.hpp b/c++/boost/compute/cl_ext.hpp similarity index 100% rename from c++/include/boost/compute/cl_ext.hpp rename to c++/boost/compute/cl_ext.hpp diff --git a/c++/include/boost/compute/closure.hpp b/c++/boost/compute/closure.hpp similarity index 100% rename from c++/include/boost/compute/closure.hpp rename to c++/boost/compute/closure.hpp diff --git a/c++/include/boost/compute/command_queue.hpp b/c++/boost/compute/command_queue.hpp similarity index 100% rename from c++/include/boost/compute/command_queue.hpp rename to c++/boost/compute/command_queue.hpp diff --git a/c++/include/boost/compute/config.hpp b/c++/boost/compute/config.hpp similarity index 100% rename from c++/include/boost/compute/config.hpp rename to c++/boost/compute/config.hpp diff --git a/c++/include/boost/compute/container.hpp b/c++/boost/compute/container.hpp similarity index 100% rename from c++/include/boost/compute/container.hpp rename to c++/boost/compute/container.hpp diff --git a/c++/include/boost/compute/container/array.hpp b/c++/boost/compute/container/array.hpp similarity index 100% rename from c++/include/boost/compute/container/array.hpp rename to c++/boost/compute/container/array.hpp diff --git a/c++/include/boost/compute/container/basic_string.hpp b/c++/boost/compute/container/basic_string.hpp similarity index 100% rename from c++/include/boost/compute/container/basic_string.hpp rename to c++/boost/compute/container/basic_string.hpp diff --git a/c++/include/boost/compute/container/detail/scalar.hpp b/c++/boost/compute/container/detail/scalar.hpp similarity index 100% rename from c++/include/boost/compute/container/detail/scalar.hpp rename to c++/boost/compute/container/detail/scalar.hpp diff --git a/c++/include/boost/compute/container/dynamic_bitset.hpp b/c++/boost/compute/container/dynamic_bitset.hpp similarity index 100% rename from c++/include/boost/compute/container/dynamic_bitset.hpp rename to c++/boost/compute/container/dynamic_bitset.hpp diff --git a/c++/include/boost/compute/container/flat_map.hpp b/c++/boost/compute/container/flat_map.hpp similarity index 100% rename from c++/include/boost/compute/container/flat_map.hpp rename to c++/boost/compute/container/flat_map.hpp diff --git a/c++/include/boost/compute/container/flat_set.hpp b/c++/boost/compute/container/flat_set.hpp similarity index 100% rename from c++/include/boost/compute/container/flat_set.hpp rename to c++/boost/compute/container/flat_set.hpp diff --git a/c++/include/boost/compute/container/mapped_view.hpp b/c++/boost/compute/container/mapped_view.hpp similarity index 100% rename from c++/include/boost/compute/container/mapped_view.hpp rename to c++/boost/compute/container/mapped_view.hpp diff --git a/c++/include/boost/compute/container/stack.hpp b/c++/boost/compute/container/stack.hpp similarity index 100% rename from c++/include/boost/compute/container/stack.hpp rename to c++/boost/compute/container/stack.hpp diff --git a/c++/include/boost/compute/container/string.hpp b/c++/boost/compute/container/string.hpp similarity index 100% rename from c++/include/boost/compute/container/string.hpp rename to c++/boost/compute/container/string.hpp diff --git a/c++/include/boost/compute/container/valarray.hpp b/c++/boost/compute/container/valarray.hpp similarity index 100% rename from c++/include/boost/compute/container/valarray.hpp rename to c++/boost/compute/container/valarray.hpp diff --git a/c++/include/boost/compute/container/vector.hpp b/c++/boost/compute/container/vector.hpp similarity index 100% rename from c++/include/boost/compute/container/vector.hpp rename to c++/boost/compute/container/vector.hpp diff --git a/c++/include/boost/compute/context.hpp b/c++/boost/compute/context.hpp similarity index 100% rename from c++/include/boost/compute/context.hpp rename to c++/boost/compute/context.hpp diff --git a/c++/include/boost/compute/core.hpp b/c++/boost/compute/core.hpp similarity index 100% rename from c++/include/boost/compute/core.hpp rename to c++/boost/compute/core.hpp diff --git a/c++/include/boost/compute/detail/assert_cl_success.hpp b/c++/boost/compute/detail/assert_cl_success.hpp similarity index 100% rename from c++/include/boost/compute/detail/assert_cl_success.hpp rename to c++/boost/compute/detail/assert_cl_success.hpp diff --git a/c++/include/boost/compute/detail/buffer_value.hpp b/c++/boost/compute/detail/buffer_value.hpp similarity index 100% rename from c++/include/boost/compute/detail/buffer_value.hpp rename to c++/boost/compute/detail/buffer_value.hpp diff --git a/c++/include/boost/compute/detail/cl_versions.hpp b/c++/boost/compute/detail/cl_versions.hpp similarity index 100% rename from c++/include/boost/compute/detail/cl_versions.hpp rename to c++/boost/compute/detail/cl_versions.hpp diff --git a/c++/include/boost/compute/detail/device_ptr.hpp b/c++/boost/compute/detail/device_ptr.hpp similarity index 100% rename from c++/include/boost/compute/detail/device_ptr.hpp rename to c++/boost/compute/detail/device_ptr.hpp diff --git a/c++/include/boost/compute/detail/diagnostic.hpp b/c++/boost/compute/detail/diagnostic.hpp similarity index 100% rename from c++/include/boost/compute/detail/diagnostic.hpp rename to c++/boost/compute/detail/diagnostic.hpp diff --git a/c++/include/boost/compute/detail/duration.hpp b/c++/boost/compute/detail/duration.hpp similarity index 100% rename from c++/include/boost/compute/detail/duration.hpp rename to c++/boost/compute/detail/duration.hpp diff --git a/c++/include/boost/compute/detail/get_object_info.hpp b/c++/boost/compute/detail/get_object_info.hpp similarity index 100% rename from c++/include/boost/compute/detail/get_object_info.hpp rename to c++/boost/compute/detail/get_object_info.hpp diff --git a/c++/include/boost/compute/detail/getenv.hpp b/c++/boost/compute/detail/getenv.hpp similarity index 100% rename from c++/include/boost/compute/detail/getenv.hpp rename to c++/boost/compute/detail/getenv.hpp diff --git a/c++/include/boost/compute/detail/global_static.hpp b/c++/boost/compute/detail/global_static.hpp similarity index 100% rename from c++/include/boost/compute/detail/global_static.hpp rename to c++/boost/compute/detail/global_static.hpp diff --git a/c++/include/boost/compute/detail/is_buffer_iterator.hpp b/c++/boost/compute/detail/is_buffer_iterator.hpp similarity index 100% rename from c++/include/boost/compute/detail/is_buffer_iterator.hpp rename to c++/boost/compute/detail/is_buffer_iterator.hpp diff --git a/c++/include/boost/compute/detail/is_contiguous_iterator.hpp b/c++/boost/compute/detail/is_contiguous_iterator.hpp similarity index 100% rename from c++/include/boost/compute/detail/is_contiguous_iterator.hpp rename to c++/boost/compute/detail/is_contiguous_iterator.hpp diff --git a/c++/include/boost/compute/detail/iterator_plus_distance.hpp b/c++/boost/compute/detail/iterator_plus_distance.hpp similarity index 100% rename from c++/include/boost/compute/detail/iterator_plus_distance.hpp rename to c++/boost/compute/detail/iterator_plus_distance.hpp diff --git a/c++/include/boost/compute/detail/iterator_range_size.hpp b/c++/boost/compute/detail/iterator_range_size.hpp similarity index 100% rename from c++/include/boost/compute/detail/iterator_range_size.hpp rename to c++/boost/compute/detail/iterator_range_size.hpp diff --git a/c++/include/boost/compute/detail/iterator_traits.hpp b/c++/boost/compute/detail/iterator_traits.hpp similarity index 100% rename from c++/include/boost/compute/detail/iterator_traits.hpp rename to c++/boost/compute/detail/iterator_traits.hpp diff --git a/c++/include/boost/compute/detail/literal.hpp b/c++/boost/compute/detail/literal.hpp similarity index 100% rename from c++/include/boost/compute/detail/literal.hpp rename to c++/boost/compute/detail/literal.hpp diff --git a/c++/include/boost/compute/detail/lru_cache.hpp b/c++/boost/compute/detail/lru_cache.hpp similarity index 100% rename from c++/include/boost/compute/detail/lru_cache.hpp rename to c++/boost/compute/detail/lru_cache.hpp diff --git a/c++/include/boost/compute/detail/meta_kernel.hpp b/c++/boost/compute/detail/meta_kernel.hpp similarity index 100% rename from c++/include/boost/compute/detail/meta_kernel.hpp rename to c++/boost/compute/detail/meta_kernel.hpp diff --git a/c++/include/boost/compute/detail/mpl_vector_to_tuple.hpp b/c++/boost/compute/detail/mpl_vector_to_tuple.hpp similarity index 100% rename from c++/include/boost/compute/detail/mpl_vector_to_tuple.hpp rename to c++/boost/compute/detail/mpl_vector_to_tuple.hpp diff --git a/c++/include/boost/compute/detail/nvidia_compute_capability.hpp b/c++/boost/compute/detail/nvidia_compute_capability.hpp similarity index 100% rename from c++/include/boost/compute/detail/nvidia_compute_capability.hpp rename to c++/boost/compute/detail/nvidia_compute_capability.hpp diff --git a/c++/include/boost/compute/detail/parameter_cache.hpp b/c++/boost/compute/detail/parameter_cache.hpp similarity index 100% rename from c++/include/boost/compute/detail/parameter_cache.hpp rename to c++/boost/compute/detail/parameter_cache.hpp diff --git a/c++/include/boost/compute/detail/path.hpp b/c++/boost/compute/detail/path.hpp similarity index 100% rename from c++/include/boost/compute/detail/path.hpp rename to c++/boost/compute/detail/path.hpp diff --git a/c++/include/boost/compute/detail/print_range.hpp b/c++/boost/compute/detail/print_range.hpp similarity index 100% rename from c++/include/boost/compute/detail/print_range.hpp rename to c++/boost/compute/detail/print_range.hpp diff --git a/c++/include/boost/compute/detail/read_write_single_value.hpp b/c++/boost/compute/detail/read_write_single_value.hpp similarity index 100% rename from c++/include/boost/compute/detail/read_write_single_value.hpp rename to c++/boost/compute/detail/read_write_single_value.hpp diff --git a/c++/include/boost/compute/detail/sha1.hpp b/c++/boost/compute/detail/sha1.hpp similarity index 100% rename from c++/include/boost/compute/detail/sha1.hpp rename to c++/boost/compute/detail/sha1.hpp diff --git a/c++/include/boost/compute/detail/variadic_macros.hpp b/c++/boost/compute/detail/variadic_macros.hpp similarity index 100% rename from c++/include/boost/compute/detail/variadic_macros.hpp rename to c++/boost/compute/detail/variadic_macros.hpp diff --git a/c++/include/boost/compute/detail/vendor.hpp b/c++/boost/compute/detail/vendor.hpp similarity index 100% rename from c++/include/boost/compute/detail/vendor.hpp rename to c++/boost/compute/detail/vendor.hpp diff --git a/c++/include/boost/compute/detail/work_size.hpp b/c++/boost/compute/detail/work_size.hpp similarity index 100% rename from c++/include/boost/compute/detail/work_size.hpp rename to c++/boost/compute/detail/work_size.hpp diff --git a/c++/include/boost/compute/device.hpp b/c++/boost/compute/device.hpp similarity index 100% rename from c++/include/boost/compute/device.hpp rename to c++/boost/compute/device.hpp diff --git a/c++/include/boost/compute/event.hpp b/c++/boost/compute/event.hpp similarity index 100% rename from c++/include/boost/compute/event.hpp rename to c++/boost/compute/event.hpp diff --git a/c++/include/boost/compute/exception.hpp b/c++/boost/compute/exception.hpp similarity index 100% rename from c++/include/boost/compute/exception.hpp rename to c++/boost/compute/exception.hpp diff --git a/c++/include/boost/compute/exception/context_error.hpp b/c++/boost/compute/exception/context_error.hpp similarity index 100% rename from c++/include/boost/compute/exception/context_error.hpp rename to c++/boost/compute/exception/context_error.hpp diff --git a/c++/include/boost/compute/exception/no_device_found.hpp b/c++/boost/compute/exception/no_device_found.hpp similarity index 100% rename from c++/include/boost/compute/exception/no_device_found.hpp rename to c++/boost/compute/exception/no_device_found.hpp diff --git a/c++/include/boost/compute/exception/opencl_error.hpp b/c++/boost/compute/exception/opencl_error.hpp similarity index 100% rename from c++/include/boost/compute/exception/opencl_error.hpp rename to c++/boost/compute/exception/opencl_error.hpp diff --git a/c++/include/boost/compute/exception/program_build_failure.hpp b/c++/boost/compute/exception/program_build_failure.hpp similarity index 100% rename from c++/include/boost/compute/exception/program_build_failure.hpp rename to c++/boost/compute/exception/program_build_failure.hpp diff --git a/c++/include/boost/compute/exception/unsupported_extension_error.hpp b/c++/boost/compute/exception/unsupported_extension_error.hpp similarity index 100% rename from c++/include/boost/compute/exception/unsupported_extension_error.hpp rename to c++/boost/compute/exception/unsupported_extension_error.hpp diff --git a/c++/include/boost/compute/experimental/clamp_range.hpp b/c++/boost/compute/experimental/clamp_range.hpp similarity index 100% rename from c++/include/boost/compute/experimental/clamp_range.hpp rename to c++/boost/compute/experimental/clamp_range.hpp diff --git a/c++/include/boost/compute/experimental/malloc.hpp b/c++/boost/compute/experimental/malloc.hpp similarity index 100% rename from c++/include/boost/compute/experimental/malloc.hpp rename to c++/boost/compute/experimental/malloc.hpp diff --git a/c++/include/boost/compute/experimental/sort_by_transform.hpp b/c++/boost/compute/experimental/sort_by_transform.hpp similarity index 100% rename from c++/include/boost/compute/experimental/sort_by_transform.hpp rename to c++/boost/compute/experimental/sort_by_transform.hpp diff --git a/c++/include/boost/compute/experimental/tabulate.hpp b/c++/boost/compute/experimental/tabulate.hpp similarity index 100% rename from c++/include/boost/compute/experimental/tabulate.hpp rename to c++/boost/compute/experimental/tabulate.hpp diff --git a/c++/include/boost/compute/function.hpp b/c++/boost/compute/function.hpp similarity index 100% rename from c++/include/boost/compute/function.hpp rename to c++/boost/compute/function.hpp diff --git a/c++/include/boost/compute/functional.hpp b/c++/boost/compute/functional.hpp similarity index 100% rename from c++/include/boost/compute/functional.hpp rename to c++/boost/compute/functional.hpp diff --git a/c++/include/boost/compute/functional/as.hpp b/c++/boost/compute/functional/as.hpp similarity index 100% rename from c++/include/boost/compute/functional/as.hpp rename to c++/boost/compute/functional/as.hpp diff --git a/c++/include/boost/compute/functional/atomic.hpp b/c++/boost/compute/functional/atomic.hpp similarity index 100% rename from c++/include/boost/compute/functional/atomic.hpp rename to c++/boost/compute/functional/atomic.hpp diff --git a/c++/include/boost/compute/functional/bind.hpp b/c++/boost/compute/functional/bind.hpp similarity index 100% rename from c++/include/boost/compute/functional/bind.hpp rename to c++/boost/compute/functional/bind.hpp diff --git a/c++/include/boost/compute/functional/common.hpp b/c++/boost/compute/functional/common.hpp similarity index 100% rename from c++/include/boost/compute/functional/common.hpp rename to c++/boost/compute/functional/common.hpp diff --git a/c++/include/boost/compute/functional/convert.hpp b/c++/boost/compute/functional/convert.hpp similarity index 100% rename from c++/include/boost/compute/functional/convert.hpp rename to c++/boost/compute/functional/convert.hpp diff --git a/c++/include/boost/compute/functional/detail/macros.hpp b/c++/boost/compute/functional/detail/macros.hpp similarity index 100% rename from c++/include/boost/compute/functional/detail/macros.hpp rename to c++/boost/compute/functional/detail/macros.hpp diff --git a/c++/include/boost/compute/functional/detail/nvidia_ballot.hpp b/c++/boost/compute/functional/detail/nvidia_ballot.hpp similarity index 100% rename from c++/include/boost/compute/functional/detail/nvidia_ballot.hpp rename to c++/boost/compute/functional/detail/nvidia_ballot.hpp diff --git a/c++/include/boost/compute/functional/detail/nvidia_popcount.hpp b/c++/boost/compute/functional/detail/nvidia_popcount.hpp similarity index 100% rename from c++/include/boost/compute/functional/detail/nvidia_popcount.hpp rename to c++/boost/compute/functional/detail/nvidia_popcount.hpp diff --git a/c++/include/boost/compute/functional/detail/unpack.hpp b/c++/boost/compute/functional/detail/unpack.hpp similarity index 100% rename from c++/include/boost/compute/functional/detail/unpack.hpp rename to c++/boost/compute/functional/detail/unpack.hpp diff --git a/c++/include/boost/compute/functional/field.hpp b/c++/boost/compute/functional/field.hpp similarity index 100% rename from c++/include/boost/compute/functional/field.hpp rename to c++/boost/compute/functional/field.hpp diff --git a/c++/include/boost/compute/functional/geometry.hpp b/c++/boost/compute/functional/geometry.hpp similarity index 100% rename from c++/include/boost/compute/functional/geometry.hpp rename to c++/boost/compute/functional/geometry.hpp diff --git a/c++/include/boost/compute/functional/get.hpp b/c++/boost/compute/functional/get.hpp similarity index 100% rename from c++/include/boost/compute/functional/get.hpp rename to c++/boost/compute/functional/get.hpp diff --git a/c++/include/boost/compute/functional/hash.hpp b/c++/boost/compute/functional/hash.hpp similarity index 100% rename from c++/include/boost/compute/functional/hash.hpp rename to c++/boost/compute/functional/hash.hpp diff --git a/c++/include/boost/compute/functional/identity.hpp b/c++/boost/compute/functional/identity.hpp similarity index 100% rename from c++/include/boost/compute/functional/identity.hpp rename to c++/boost/compute/functional/identity.hpp diff --git a/c++/include/boost/compute/functional/integer.hpp b/c++/boost/compute/functional/integer.hpp similarity index 100% rename from c++/include/boost/compute/functional/integer.hpp rename to c++/boost/compute/functional/integer.hpp diff --git a/c++/include/boost/compute/functional/logical.hpp b/c++/boost/compute/functional/logical.hpp similarity index 100% rename from c++/include/boost/compute/functional/logical.hpp rename to c++/boost/compute/functional/logical.hpp diff --git a/c++/include/boost/compute/functional/math.hpp b/c++/boost/compute/functional/math.hpp similarity index 100% rename from c++/include/boost/compute/functional/math.hpp rename to c++/boost/compute/functional/math.hpp diff --git a/c++/include/boost/compute/functional/operator.hpp b/c++/boost/compute/functional/operator.hpp similarity index 100% rename from c++/include/boost/compute/functional/operator.hpp rename to c++/boost/compute/functional/operator.hpp diff --git a/c++/include/boost/compute/functional/popcount.hpp b/c++/boost/compute/functional/popcount.hpp similarity index 100% rename from c++/include/boost/compute/functional/popcount.hpp rename to c++/boost/compute/functional/popcount.hpp diff --git a/c++/include/boost/compute/functional/relational.hpp b/c++/boost/compute/functional/relational.hpp similarity index 100% rename from c++/include/boost/compute/functional/relational.hpp rename to c++/boost/compute/functional/relational.hpp diff --git a/c++/include/boost/compute/image.hpp b/c++/boost/compute/image.hpp similarity index 100% rename from c++/include/boost/compute/image.hpp rename to c++/boost/compute/image.hpp diff --git a/c++/include/boost/compute/image/image1d.hpp b/c++/boost/compute/image/image1d.hpp similarity index 100% rename from c++/include/boost/compute/image/image1d.hpp rename to c++/boost/compute/image/image1d.hpp diff --git a/c++/include/boost/compute/image/image2d.hpp b/c++/boost/compute/image/image2d.hpp similarity index 100% rename from c++/include/boost/compute/image/image2d.hpp rename to c++/boost/compute/image/image2d.hpp diff --git a/c++/include/boost/compute/image/image3d.hpp b/c++/boost/compute/image/image3d.hpp similarity index 100% rename from c++/include/boost/compute/image/image3d.hpp rename to c++/boost/compute/image/image3d.hpp diff --git a/c++/include/boost/compute/image/image_format.hpp b/c++/boost/compute/image/image_format.hpp similarity index 100% rename from c++/include/boost/compute/image/image_format.hpp rename to c++/boost/compute/image/image_format.hpp diff --git a/c++/include/boost/compute/image/image_object.hpp b/c++/boost/compute/image/image_object.hpp similarity index 100% rename from c++/include/boost/compute/image/image_object.hpp rename to c++/boost/compute/image/image_object.hpp diff --git a/c++/include/boost/compute/image/image_sampler.hpp b/c++/boost/compute/image/image_sampler.hpp similarity index 100% rename from c++/include/boost/compute/image/image_sampler.hpp rename to c++/boost/compute/image/image_sampler.hpp diff --git a/c++/include/boost/compute/image2d.hpp b/c++/boost/compute/image2d.hpp similarity index 100% rename from c++/include/boost/compute/image2d.hpp rename to c++/boost/compute/image2d.hpp diff --git a/c++/include/boost/compute/image3d.hpp b/c++/boost/compute/image3d.hpp similarity index 100% rename from c++/include/boost/compute/image3d.hpp rename to c++/boost/compute/image3d.hpp diff --git a/c++/include/boost/compute/image_format.hpp b/c++/boost/compute/image_format.hpp similarity index 100% rename from c++/include/boost/compute/image_format.hpp rename to c++/boost/compute/image_format.hpp diff --git a/c++/include/boost/compute/image_sampler.hpp b/c++/boost/compute/image_sampler.hpp similarity index 100% rename from c++/include/boost/compute/image_sampler.hpp rename to c++/boost/compute/image_sampler.hpp diff --git a/c++/include/boost/compute/interop/eigen.hpp b/c++/boost/compute/interop/eigen.hpp similarity index 100% rename from c++/include/boost/compute/interop/eigen.hpp rename to c++/boost/compute/interop/eigen.hpp diff --git a/c++/include/boost/compute/interop/eigen/core.hpp b/c++/boost/compute/interop/eigen/core.hpp similarity index 100% rename from c++/include/boost/compute/interop/eigen/core.hpp rename to c++/boost/compute/interop/eigen/core.hpp diff --git a/c++/include/boost/compute/interop/opencv.hpp b/c++/boost/compute/interop/opencv.hpp similarity index 100% rename from c++/include/boost/compute/interop/opencv.hpp rename to c++/boost/compute/interop/opencv.hpp diff --git a/c++/include/boost/compute/interop/opencv/core.hpp b/c++/boost/compute/interop/opencv/core.hpp similarity index 100% rename from c++/include/boost/compute/interop/opencv/core.hpp rename to c++/boost/compute/interop/opencv/core.hpp diff --git a/c++/include/boost/compute/interop/opencv/highgui.hpp b/c++/boost/compute/interop/opencv/highgui.hpp similarity index 100% rename from c++/include/boost/compute/interop/opencv/highgui.hpp rename to c++/boost/compute/interop/opencv/highgui.hpp diff --git a/c++/include/boost/compute/interop/opencv/ocl.hpp b/c++/boost/compute/interop/opencv/ocl.hpp similarity index 100% rename from c++/include/boost/compute/interop/opencv/ocl.hpp rename to c++/boost/compute/interop/opencv/ocl.hpp diff --git a/c++/include/boost/compute/interop/opengl.hpp b/c++/boost/compute/interop/opengl.hpp similarity index 100% rename from c++/include/boost/compute/interop/opengl.hpp rename to c++/boost/compute/interop/opengl.hpp diff --git a/c++/include/boost/compute/interop/opengl/acquire.hpp b/c++/boost/compute/interop/opengl/acquire.hpp similarity index 100% rename from c++/include/boost/compute/interop/opengl/acquire.hpp rename to c++/boost/compute/interop/opengl/acquire.hpp diff --git a/c++/include/boost/compute/interop/opengl/cl_gl.hpp b/c++/boost/compute/interop/opengl/cl_gl.hpp similarity index 100% rename from c++/include/boost/compute/interop/opengl/cl_gl.hpp rename to c++/boost/compute/interop/opengl/cl_gl.hpp diff --git a/c++/include/boost/compute/interop/opengl/cl_gl_ext.hpp b/c++/boost/compute/interop/opengl/cl_gl_ext.hpp similarity index 100% rename from c++/include/boost/compute/interop/opengl/cl_gl_ext.hpp rename to c++/boost/compute/interop/opengl/cl_gl_ext.hpp diff --git a/c++/include/boost/compute/interop/opengl/context.hpp b/c++/boost/compute/interop/opengl/context.hpp similarity index 100% rename from c++/include/boost/compute/interop/opengl/context.hpp rename to c++/boost/compute/interop/opengl/context.hpp diff --git a/c++/include/boost/compute/interop/opengl/gl.hpp b/c++/boost/compute/interop/opengl/gl.hpp similarity index 100% rename from c++/include/boost/compute/interop/opengl/gl.hpp rename to c++/boost/compute/interop/opengl/gl.hpp diff --git a/c++/include/boost/compute/interop/opengl/opengl_buffer.hpp b/c++/boost/compute/interop/opengl/opengl_buffer.hpp similarity index 100% rename from c++/include/boost/compute/interop/opengl/opengl_buffer.hpp rename to c++/boost/compute/interop/opengl/opengl_buffer.hpp diff --git a/c++/include/boost/compute/interop/opengl/opengl_renderbuffer.hpp b/c++/boost/compute/interop/opengl/opengl_renderbuffer.hpp similarity index 100% rename from c++/include/boost/compute/interop/opengl/opengl_renderbuffer.hpp rename to c++/boost/compute/interop/opengl/opengl_renderbuffer.hpp diff --git a/c++/include/boost/compute/interop/opengl/opengl_texture.hpp b/c++/boost/compute/interop/opengl/opengl_texture.hpp similarity index 100% rename from c++/include/boost/compute/interop/opengl/opengl_texture.hpp rename to c++/boost/compute/interop/opengl/opengl_texture.hpp diff --git a/c++/include/boost/compute/interop/qt.hpp b/c++/boost/compute/interop/qt.hpp similarity index 100% rename from c++/include/boost/compute/interop/qt.hpp rename to c++/boost/compute/interop/qt.hpp diff --git a/c++/include/boost/compute/interop/qt/qimage.hpp b/c++/boost/compute/interop/qt/qimage.hpp similarity index 100% rename from c++/include/boost/compute/interop/qt/qimage.hpp rename to c++/boost/compute/interop/qt/qimage.hpp diff --git a/c++/include/boost/compute/interop/qt/qpoint.hpp b/c++/boost/compute/interop/qt/qpoint.hpp similarity index 100% rename from c++/include/boost/compute/interop/qt/qpoint.hpp rename to c++/boost/compute/interop/qt/qpoint.hpp diff --git a/c++/include/boost/compute/interop/qt/qpointf.hpp b/c++/boost/compute/interop/qt/qpointf.hpp similarity index 100% rename from c++/include/boost/compute/interop/qt/qpointf.hpp rename to c++/boost/compute/interop/qt/qpointf.hpp diff --git a/c++/include/boost/compute/interop/qt/qtcore.hpp b/c++/boost/compute/interop/qt/qtcore.hpp similarity index 100% rename from c++/include/boost/compute/interop/qt/qtcore.hpp rename to c++/boost/compute/interop/qt/qtcore.hpp diff --git a/c++/include/boost/compute/interop/qt/qtgui.hpp b/c++/boost/compute/interop/qt/qtgui.hpp similarity index 100% rename from c++/include/boost/compute/interop/qt/qtgui.hpp rename to c++/boost/compute/interop/qt/qtgui.hpp diff --git a/c++/include/boost/compute/interop/qt/qvector.hpp b/c++/boost/compute/interop/qt/qvector.hpp similarity index 100% rename from c++/include/boost/compute/interop/qt/qvector.hpp rename to c++/boost/compute/interop/qt/qvector.hpp diff --git a/c++/include/boost/compute/interop/vtk.hpp b/c++/boost/compute/interop/vtk.hpp similarity index 100% rename from c++/include/boost/compute/interop/vtk.hpp rename to c++/boost/compute/interop/vtk.hpp diff --git a/c++/include/boost/compute/interop/vtk/bounds.hpp b/c++/boost/compute/interop/vtk/bounds.hpp similarity index 100% rename from c++/include/boost/compute/interop/vtk/bounds.hpp rename to c++/boost/compute/interop/vtk/bounds.hpp diff --git a/c++/include/boost/compute/interop/vtk/data_array.hpp b/c++/boost/compute/interop/vtk/data_array.hpp similarity index 100% rename from c++/include/boost/compute/interop/vtk/data_array.hpp rename to c++/boost/compute/interop/vtk/data_array.hpp diff --git a/c++/include/boost/compute/interop/vtk/matrix4x4.hpp b/c++/boost/compute/interop/vtk/matrix4x4.hpp similarity index 100% rename from c++/include/boost/compute/interop/vtk/matrix4x4.hpp rename to c++/boost/compute/interop/vtk/matrix4x4.hpp diff --git a/c++/include/boost/compute/interop/vtk/points.hpp b/c++/boost/compute/interop/vtk/points.hpp similarity index 100% rename from c++/include/boost/compute/interop/vtk/points.hpp rename to c++/boost/compute/interop/vtk/points.hpp diff --git a/c++/include/boost/compute/iterator.hpp b/c++/boost/compute/iterator.hpp similarity index 100% rename from c++/include/boost/compute/iterator.hpp rename to c++/boost/compute/iterator.hpp diff --git a/c++/include/boost/compute/iterator/buffer_iterator.hpp b/c++/boost/compute/iterator/buffer_iterator.hpp similarity index 100% rename from c++/include/boost/compute/iterator/buffer_iterator.hpp rename to c++/boost/compute/iterator/buffer_iterator.hpp diff --git a/c++/include/boost/compute/iterator/constant_buffer_iterator.hpp b/c++/boost/compute/iterator/constant_buffer_iterator.hpp similarity index 100% rename from c++/include/boost/compute/iterator/constant_buffer_iterator.hpp rename to c++/boost/compute/iterator/constant_buffer_iterator.hpp diff --git a/c++/include/boost/compute/iterator/constant_iterator.hpp b/c++/boost/compute/iterator/constant_iterator.hpp similarity index 100% rename from c++/include/boost/compute/iterator/constant_iterator.hpp rename to c++/boost/compute/iterator/constant_iterator.hpp diff --git a/c++/include/boost/compute/iterator/counting_iterator.hpp b/c++/boost/compute/iterator/counting_iterator.hpp similarity index 100% rename from c++/include/boost/compute/iterator/counting_iterator.hpp rename to c++/boost/compute/iterator/counting_iterator.hpp diff --git a/c++/include/boost/compute/iterator/detail/get_base_iterator_buffer.hpp b/c++/boost/compute/iterator/detail/get_base_iterator_buffer.hpp similarity index 100% rename from c++/include/boost/compute/iterator/detail/get_base_iterator_buffer.hpp rename to c++/boost/compute/iterator/detail/get_base_iterator_buffer.hpp diff --git a/c++/include/boost/compute/iterator/detail/swizzle_iterator.hpp b/c++/boost/compute/iterator/detail/swizzle_iterator.hpp similarity index 100% rename from c++/include/boost/compute/iterator/detail/swizzle_iterator.hpp rename to c++/boost/compute/iterator/detail/swizzle_iterator.hpp diff --git a/c++/include/boost/compute/iterator/discard_iterator.hpp b/c++/boost/compute/iterator/discard_iterator.hpp similarity index 100% rename from c++/include/boost/compute/iterator/discard_iterator.hpp rename to c++/boost/compute/iterator/discard_iterator.hpp diff --git a/c++/include/boost/compute/iterator/function_input_iterator.hpp b/c++/boost/compute/iterator/function_input_iterator.hpp similarity index 100% rename from c++/include/boost/compute/iterator/function_input_iterator.hpp rename to c++/boost/compute/iterator/function_input_iterator.hpp diff --git a/c++/include/boost/compute/iterator/permutation_iterator.hpp b/c++/boost/compute/iterator/permutation_iterator.hpp similarity index 100% rename from c++/include/boost/compute/iterator/permutation_iterator.hpp rename to c++/boost/compute/iterator/permutation_iterator.hpp diff --git a/c++/include/boost/compute/iterator/strided_iterator.hpp b/c++/boost/compute/iterator/strided_iterator.hpp similarity index 100% rename from c++/include/boost/compute/iterator/strided_iterator.hpp rename to c++/boost/compute/iterator/strided_iterator.hpp diff --git a/c++/include/boost/compute/iterator/transform_iterator.hpp b/c++/boost/compute/iterator/transform_iterator.hpp similarity index 100% rename from c++/include/boost/compute/iterator/transform_iterator.hpp rename to c++/boost/compute/iterator/transform_iterator.hpp diff --git a/c++/include/boost/compute/iterator/zip_iterator.hpp b/c++/boost/compute/iterator/zip_iterator.hpp similarity index 100% rename from c++/include/boost/compute/iterator/zip_iterator.hpp rename to c++/boost/compute/iterator/zip_iterator.hpp diff --git a/c++/include/boost/compute/kernel.hpp b/c++/boost/compute/kernel.hpp similarity index 100% rename from c++/include/boost/compute/kernel.hpp rename to c++/boost/compute/kernel.hpp diff --git a/c++/include/boost/compute/lambda.hpp b/c++/boost/compute/lambda.hpp similarity index 100% rename from c++/include/boost/compute/lambda.hpp rename to c++/boost/compute/lambda.hpp diff --git a/c++/include/boost/compute/lambda/context.hpp b/c++/boost/compute/lambda/context.hpp similarity index 100% rename from c++/include/boost/compute/lambda/context.hpp rename to c++/boost/compute/lambda/context.hpp diff --git a/c++/include/boost/compute/lambda/functional.hpp b/c++/boost/compute/lambda/functional.hpp similarity index 100% rename from c++/include/boost/compute/lambda/functional.hpp rename to c++/boost/compute/lambda/functional.hpp diff --git a/c++/include/boost/compute/lambda/get.hpp b/c++/boost/compute/lambda/get.hpp similarity index 100% rename from c++/include/boost/compute/lambda/get.hpp rename to c++/boost/compute/lambda/get.hpp diff --git a/c++/include/boost/compute/lambda/make_pair.hpp b/c++/boost/compute/lambda/make_pair.hpp similarity index 100% rename from c++/include/boost/compute/lambda/make_pair.hpp rename to c++/boost/compute/lambda/make_pair.hpp diff --git a/c++/include/boost/compute/lambda/make_tuple.hpp b/c++/boost/compute/lambda/make_tuple.hpp similarity index 100% rename from c++/include/boost/compute/lambda/make_tuple.hpp rename to c++/boost/compute/lambda/make_tuple.hpp diff --git a/c++/include/boost/compute/lambda/placeholder.hpp b/c++/boost/compute/lambda/placeholder.hpp similarity index 100% rename from c++/include/boost/compute/lambda/placeholder.hpp rename to c++/boost/compute/lambda/placeholder.hpp diff --git a/c++/include/boost/compute/lambda/placeholders.hpp b/c++/boost/compute/lambda/placeholders.hpp similarity index 100% rename from c++/include/boost/compute/lambda/placeholders.hpp rename to c++/boost/compute/lambda/placeholders.hpp diff --git a/c++/include/boost/compute/lambda/result_of.hpp b/c++/boost/compute/lambda/result_of.hpp similarity index 100% rename from c++/include/boost/compute/lambda/result_of.hpp rename to c++/boost/compute/lambda/result_of.hpp diff --git a/c++/include/boost/compute/memory.hpp b/c++/boost/compute/memory.hpp similarity index 100% rename from c++/include/boost/compute/memory.hpp rename to c++/boost/compute/memory.hpp diff --git a/c++/include/boost/compute/memory/local_buffer.hpp b/c++/boost/compute/memory/local_buffer.hpp similarity index 100% rename from c++/include/boost/compute/memory/local_buffer.hpp rename to c++/boost/compute/memory/local_buffer.hpp diff --git a/c++/include/boost/compute/memory/svm_ptr.hpp b/c++/boost/compute/memory/svm_ptr.hpp similarity index 100% rename from c++/include/boost/compute/memory/svm_ptr.hpp rename to c++/boost/compute/memory/svm_ptr.hpp diff --git a/c++/include/boost/compute/memory_object.hpp b/c++/boost/compute/memory_object.hpp similarity index 100% rename from c++/include/boost/compute/memory_object.hpp rename to c++/boost/compute/memory_object.hpp diff --git a/c++/include/boost/compute/pipe.hpp b/c++/boost/compute/pipe.hpp similarity index 100% rename from c++/include/boost/compute/pipe.hpp rename to c++/boost/compute/pipe.hpp diff --git a/c++/include/boost/compute/platform.hpp b/c++/boost/compute/platform.hpp similarity index 100% rename from c++/include/boost/compute/platform.hpp rename to c++/boost/compute/platform.hpp diff --git a/c++/include/boost/compute/program.hpp b/c++/boost/compute/program.hpp similarity index 100% rename from c++/include/boost/compute/program.hpp rename to c++/boost/compute/program.hpp diff --git a/c++/include/boost/compute/random.hpp b/c++/boost/compute/random.hpp similarity index 100% rename from c++/include/boost/compute/random.hpp rename to c++/boost/compute/random.hpp diff --git a/c++/include/boost/compute/random/bernoulli_distribution.hpp b/c++/boost/compute/random/bernoulli_distribution.hpp similarity index 100% rename from c++/include/boost/compute/random/bernoulli_distribution.hpp rename to c++/boost/compute/random/bernoulli_distribution.hpp diff --git a/c++/include/boost/compute/random/default_random_engine.hpp b/c++/boost/compute/random/default_random_engine.hpp similarity index 100% rename from c++/include/boost/compute/random/default_random_engine.hpp rename to c++/boost/compute/random/default_random_engine.hpp diff --git a/c++/include/boost/compute/random/discrete_distribution.hpp b/c++/boost/compute/random/discrete_distribution.hpp similarity index 100% rename from c++/include/boost/compute/random/discrete_distribution.hpp rename to c++/boost/compute/random/discrete_distribution.hpp diff --git a/c++/include/boost/compute/random/linear_congruential_engine.hpp b/c++/boost/compute/random/linear_congruential_engine.hpp similarity index 100% rename from c++/include/boost/compute/random/linear_congruential_engine.hpp rename to c++/boost/compute/random/linear_congruential_engine.hpp diff --git a/c++/include/boost/compute/random/mersenne_twister_engine.hpp b/c++/boost/compute/random/mersenne_twister_engine.hpp similarity index 100% rename from c++/include/boost/compute/random/mersenne_twister_engine.hpp rename to c++/boost/compute/random/mersenne_twister_engine.hpp diff --git a/c++/include/boost/compute/random/normal_distribution.hpp b/c++/boost/compute/random/normal_distribution.hpp similarity index 100% rename from c++/include/boost/compute/random/normal_distribution.hpp rename to c++/boost/compute/random/normal_distribution.hpp diff --git a/c++/include/boost/compute/random/threefry_engine.hpp b/c++/boost/compute/random/threefry_engine.hpp similarity index 100% rename from c++/include/boost/compute/random/threefry_engine.hpp rename to c++/boost/compute/random/threefry_engine.hpp diff --git a/c++/include/boost/compute/random/uniform_int_distribution.hpp b/c++/boost/compute/random/uniform_int_distribution.hpp similarity index 100% rename from c++/include/boost/compute/random/uniform_int_distribution.hpp rename to c++/boost/compute/random/uniform_int_distribution.hpp diff --git a/c++/include/boost/compute/random/uniform_real_distribution.hpp b/c++/boost/compute/random/uniform_real_distribution.hpp similarity index 100% rename from c++/include/boost/compute/random/uniform_real_distribution.hpp rename to c++/boost/compute/random/uniform_real_distribution.hpp diff --git a/c++/include/boost/compute/source.hpp b/c++/boost/compute/source.hpp similarity index 100% rename from c++/include/boost/compute/source.hpp rename to c++/boost/compute/source.hpp diff --git a/c++/include/boost/compute/svm.hpp b/c++/boost/compute/svm.hpp similarity index 100% rename from c++/include/boost/compute/svm.hpp rename to c++/boost/compute/svm.hpp diff --git a/c++/include/boost/compute/system.hpp b/c++/boost/compute/system.hpp similarity index 100% rename from c++/include/boost/compute/system.hpp rename to c++/boost/compute/system.hpp diff --git a/c++/include/boost/compute/type_traits.hpp b/c++/boost/compute/type_traits.hpp similarity index 100% rename from c++/include/boost/compute/type_traits.hpp rename to c++/boost/compute/type_traits.hpp diff --git a/c++/include/boost/compute/type_traits/common_type.hpp b/c++/boost/compute/type_traits/common_type.hpp similarity index 100% rename from c++/include/boost/compute/type_traits/common_type.hpp rename to c++/boost/compute/type_traits/common_type.hpp diff --git a/c++/include/boost/compute/type_traits/detail/capture_traits.hpp b/c++/boost/compute/type_traits/detail/capture_traits.hpp similarity index 100% rename from c++/include/boost/compute/type_traits/detail/capture_traits.hpp rename to c++/boost/compute/type_traits/detail/capture_traits.hpp diff --git a/c++/include/boost/compute/type_traits/is_device_iterator.hpp b/c++/boost/compute/type_traits/is_device_iterator.hpp similarity index 100% rename from c++/include/boost/compute/type_traits/is_device_iterator.hpp rename to c++/boost/compute/type_traits/is_device_iterator.hpp diff --git a/c++/include/boost/compute/type_traits/is_fundamental.hpp b/c++/boost/compute/type_traits/is_fundamental.hpp similarity index 100% rename from c++/include/boost/compute/type_traits/is_fundamental.hpp rename to c++/boost/compute/type_traits/is_fundamental.hpp diff --git a/c++/include/boost/compute/type_traits/is_vector_type.hpp b/c++/boost/compute/type_traits/is_vector_type.hpp similarity index 100% rename from c++/include/boost/compute/type_traits/is_vector_type.hpp rename to c++/boost/compute/type_traits/is_vector_type.hpp diff --git a/c++/include/boost/compute/type_traits/make_vector_type.hpp b/c++/boost/compute/type_traits/make_vector_type.hpp similarity index 100% rename from c++/include/boost/compute/type_traits/make_vector_type.hpp rename to c++/boost/compute/type_traits/make_vector_type.hpp diff --git a/c++/include/boost/compute/type_traits/result_of.hpp b/c++/boost/compute/type_traits/result_of.hpp similarity index 100% rename from c++/include/boost/compute/type_traits/result_of.hpp rename to c++/boost/compute/type_traits/result_of.hpp diff --git a/c++/include/boost/compute/type_traits/scalar_type.hpp b/c++/boost/compute/type_traits/scalar_type.hpp similarity index 100% rename from c++/include/boost/compute/type_traits/scalar_type.hpp rename to c++/boost/compute/type_traits/scalar_type.hpp diff --git a/c++/include/boost/compute/type_traits/type_definition.hpp b/c++/boost/compute/type_traits/type_definition.hpp similarity index 100% rename from c++/include/boost/compute/type_traits/type_definition.hpp rename to c++/boost/compute/type_traits/type_definition.hpp diff --git a/c++/include/boost/compute/type_traits/type_name.hpp b/c++/boost/compute/type_traits/type_name.hpp similarity index 100% rename from c++/include/boost/compute/type_traits/type_name.hpp rename to c++/boost/compute/type_traits/type_name.hpp diff --git a/c++/include/boost/compute/type_traits/vector_size.hpp b/c++/boost/compute/type_traits/vector_size.hpp similarity index 100% rename from c++/include/boost/compute/type_traits/vector_size.hpp rename to c++/boost/compute/type_traits/vector_size.hpp diff --git a/c++/include/boost/compute/types.hpp b/c++/boost/compute/types.hpp similarity index 100% rename from c++/include/boost/compute/types.hpp rename to c++/boost/compute/types.hpp diff --git a/c++/include/boost/compute/types/builtin.hpp b/c++/boost/compute/types/builtin.hpp similarity index 100% rename from c++/include/boost/compute/types/builtin.hpp rename to c++/boost/compute/types/builtin.hpp diff --git a/c++/include/boost/compute/types/complex.hpp b/c++/boost/compute/types/complex.hpp similarity index 100% rename from c++/include/boost/compute/types/complex.hpp rename to c++/boost/compute/types/complex.hpp diff --git a/c++/include/boost/compute/types/fundamental.hpp b/c++/boost/compute/types/fundamental.hpp similarity index 100% rename from c++/include/boost/compute/types/fundamental.hpp rename to c++/boost/compute/types/fundamental.hpp diff --git a/c++/include/boost/compute/types/pair.hpp b/c++/boost/compute/types/pair.hpp similarity index 100% rename from c++/include/boost/compute/types/pair.hpp rename to c++/boost/compute/types/pair.hpp diff --git a/c++/include/boost/compute/types/size_t.hpp b/c++/boost/compute/types/size_t.hpp similarity index 100% rename from c++/include/boost/compute/types/size_t.hpp rename to c++/boost/compute/types/size_t.hpp diff --git a/c++/include/boost/compute/types/struct.hpp b/c++/boost/compute/types/struct.hpp similarity index 100% rename from c++/include/boost/compute/types/struct.hpp rename to c++/boost/compute/types/struct.hpp diff --git a/c++/include/boost/compute/types/tuple.hpp b/c++/boost/compute/types/tuple.hpp similarity index 100% rename from c++/include/boost/compute/types/tuple.hpp rename to c++/boost/compute/types/tuple.hpp diff --git a/c++/include/boost/compute/user_event.hpp b/c++/boost/compute/user_event.hpp similarity index 100% rename from c++/include/boost/compute/user_event.hpp rename to c++/boost/compute/user_event.hpp diff --git a/c++/include/boost/compute/utility.hpp b/c++/boost/compute/utility.hpp similarity index 100% rename from c++/include/boost/compute/utility.hpp rename to c++/boost/compute/utility.hpp diff --git a/c++/include/boost/compute/utility/dim.hpp b/c++/boost/compute/utility/dim.hpp similarity index 100% rename from c++/include/boost/compute/utility/dim.hpp rename to c++/boost/compute/utility/dim.hpp diff --git a/c++/include/boost/compute/utility/extents.hpp b/c++/boost/compute/utility/extents.hpp similarity index 100% rename from c++/include/boost/compute/utility/extents.hpp rename to c++/boost/compute/utility/extents.hpp diff --git a/c++/include/boost/compute/utility/invoke.hpp b/c++/boost/compute/utility/invoke.hpp similarity index 100% rename from c++/include/boost/compute/utility/invoke.hpp rename to c++/boost/compute/utility/invoke.hpp diff --git a/c++/include/boost/compute/utility/program_cache.hpp b/c++/boost/compute/utility/program_cache.hpp similarity index 100% rename from c++/include/boost/compute/utility/program_cache.hpp rename to c++/boost/compute/utility/program_cache.hpp diff --git a/c++/include/boost/compute/utility/source.hpp b/c++/boost/compute/utility/source.hpp similarity index 100% rename from c++/include/boost/compute/utility/source.hpp rename to c++/boost/compute/utility/source.hpp diff --git a/c++/include/boost/compute/utility/wait_list.hpp b/c++/boost/compute/utility/wait_list.hpp similarity index 100% rename from c++/include/boost/compute/utility/wait_list.hpp rename to c++/boost/compute/utility/wait_list.hpp diff --git a/c++/include/boost/compute/version.hpp b/c++/boost/compute/version.hpp similarity index 100% rename from c++/include/boost/compute/version.hpp rename to c++/boost/compute/version.hpp diff --git a/c++/include/boost/compute/wait_list.hpp b/c++/boost/compute/wait_list.hpp similarity index 100% rename from c++/include/boost/compute/wait_list.hpp rename to c++/boost/compute/wait_list.hpp diff --git a/c++/include/boost/concept/assert.hpp b/c++/boost/concept/assert.hpp similarity index 100% rename from c++/include/boost/concept/assert.hpp rename to c++/boost/concept/assert.hpp diff --git a/c++/include/boost/concept/detail/backward_compatibility.hpp b/c++/boost/concept/detail/backward_compatibility.hpp similarity index 100% rename from c++/include/boost/concept/detail/backward_compatibility.hpp rename to c++/boost/concept/detail/backward_compatibility.hpp diff --git a/c++/include/boost/concept/detail/borland.hpp b/c++/boost/concept/detail/borland.hpp similarity index 100% rename from c++/include/boost/concept/detail/borland.hpp rename to c++/boost/concept/detail/borland.hpp diff --git a/c++/include/boost/concept/detail/concept_def.hpp b/c++/boost/concept/detail/concept_def.hpp similarity index 100% rename from c++/include/boost/concept/detail/concept_def.hpp rename to c++/boost/concept/detail/concept_def.hpp diff --git a/c++/include/boost/concept/detail/concept_undef.hpp b/c++/boost/concept/detail/concept_undef.hpp similarity index 100% rename from c++/include/boost/concept/detail/concept_undef.hpp rename to c++/boost/concept/detail/concept_undef.hpp diff --git a/c++/include/boost/concept/detail/general.hpp b/c++/boost/concept/detail/general.hpp similarity index 100% rename from c++/include/boost/concept/detail/general.hpp rename to c++/boost/concept/detail/general.hpp diff --git a/c++/include/boost/concept/detail/has_constraints.hpp b/c++/boost/concept/detail/has_constraints.hpp similarity index 100% rename from c++/include/boost/concept/detail/has_constraints.hpp rename to c++/boost/concept/detail/has_constraints.hpp diff --git a/c++/include/boost/concept/detail/msvc.hpp b/c++/boost/concept/detail/msvc.hpp similarity index 100% rename from c++/include/boost/concept/detail/msvc.hpp rename to c++/boost/concept/detail/msvc.hpp diff --git a/c++/include/boost/concept/requires.hpp b/c++/boost/concept/requires.hpp similarity index 100% rename from c++/include/boost/concept/requires.hpp rename to c++/boost/concept/requires.hpp diff --git a/c++/include/boost/concept/usage.hpp b/c++/boost/concept/usage.hpp similarity index 100% rename from c++/include/boost/concept/usage.hpp rename to c++/boost/concept/usage.hpp diff --git a/c++/include/boost/concept_archetype.hpp b/c++/boost/concept_archetype.hpp similarity index 100% rename from c++/include/boost/concept_archetype.hpp rename to c++/boost/concept_archetype.hpp diff --git a/c++/include/boost/concept_check.hpp b/c++/boost/concept_check.hpp similarity index 100% rename from c++/include/boost/concept_check.hpp rename to c++/boost/concept_check.hpp diff --git a/c++/include/boost/concept_check/borland.hpp b/c++/boost/concept_check/borland.hpp similarity index 100% rename from c++/include/boost/concept_check/borland.hpp rename to c++/boost/concept_check/borland.hpp diff --git a/c++/include/boost/concept_check/general.hpp b/c++/boost/concept_check/general.hpp similarity index 100% rename from c++/include/boost/concept_check/general.hpp rename to c++/boost/concept_check/general.hpp diff --git a/c++/include/boost/concept_check/has_constraints.hpp b/c++/boost/concept_check/has_constraints.hpp similarity index 100% rename from c++/include/boost/concept_check/has_constraints.hpp rename to c++/boost/concept_check/has_constraints.hpp diff --git a/c++/include/boost/concept_check/msvc.hpp b/c++/boost/concept_check/msvc.hpp similarity index 100% rename from c++/include/boost/concept_check/msvc.hpp rename to c++/boost/concept_check/msvc.hpp diff --git a/c++/include/boost/config.hpp b/c++/boost/config.hpp similarity index 100% rename from c++/include/boost/config.hpp rename to c++/boost/config.hpp diff --git a/c++/include/boost/config/abi/borland_prefix.hpp b/c++/boost/config/abi/borland_prefix.hpp similarity index 100% rename from c++/include/boost/config/abi/borland_prefix.hpp rename to c++/boost/config/abi/borland_prefix.hpp diff --git a/c++/include/boost/config/abi/borland_suffix.hpp b/c++/boost/config/abi/borland_suffix.hpp similarity index 100% rename from c++/include/boost/config/abi/borland_suffix.hpp rename to c++/boost/config/abi/borland_suffix.hpp diff --git a/c++/include/boost/config/abi/msvc_prefix.hpp b/c++/boost/config/abi/msvc_prefix.hpp similarity index 100% rename from c++/include/boost/config/abi/msvc_prefix.hpp rename to c++/boost/config/abi/msvc_prefix.hpp diff --git a/c++/include/boost/config/abi/msvc_suffix.hpp b/c++/boost/config/abi/msvc_suffix.hpp similarity index 100% rename from c++/include/boost/config/abi/msvc_suffix.hpp rename to c++/boost/config/abi/msvc_suffix.hpp diff --git a/c++/include/boost/config/abi_prefix.hpp b/c++/boost/config/abi_prefix.hpp similarity index 100% rename from c++/include/boost/config/abi_prefix.hpp rename to c++/boost/config/abi_prefix.hpp diff --git a/c++/include/boost/config/abi_suffix.hpp b/c++/boost/config/abi_suffix.hpp similarity index 100% rename from c++/include/boost/config/abi_suffix.hpp rename to c++/boost/config/abi_suffix.hpp diff --git a/c++/include/boost/config/assert_cxx03.hpp b/c++/boost/config/assert_cxx03.hpp similarity index 100% rename from c++/include/boost/config/assert_cxx03.hpp rename to c++/boost/config/assert_cxx03.hpp diff --git a/c++/include/boost/config/assert_cxx11.hpp b/c++/boost/config/assert_cxx11.hpp similarity index 100% rename from c++/include/boost/config/assert_cxx11.hpp rename to c++/boost/config/assert_cxx11.hpp diff --git a/c++/include/boost/config/assert_cxx14.hpp b/c++/boost/config/assert_cxx14.hpp similarity index 100% rename from c++/include/boost/config/assert_cxx14.hpp rename to c++/boost/config/assert_cxx14.hpp diff --git a/c++/include/boost/config/assert_cxx17.hpp b/c++/boost/config/assert_cxx17.hpp similarity index 100% rename from c++/include/boost/config/assert_cxx17.hpp rename to c++/boost/config/assert_cxx17.hpp diff --git a/c++/include/boost/config/assert_cxx20.hpp b/c++/boost/config/assert_cxx20.hpp similarity index 100% rename from c++/include/boost/config/assert_cxx20.hpp rename to c++/boost/config/assert_cxx20.hpp diff --git a/c++/include/boost/config/assert_cxx98.hpp b/c++/boost/config/assert_cxx98.hpp similarity index 100% rename from c++/include/boost/config/assert_cxx98.hpp rename to c++/boost/config/assert_cxx98.hpp diff --git a/c++/include/boost/config/auto_link.hpp b/c++/boost/config/auto_link.hpp similarity index 100% rename from c++/include/boost/config/auto_link.hpp rename to c++/boost/config/auto_link.hpp diff --git a/c++/include/boost/config/compiler/borland.hpp b/c++/boost/config/compiler/borland.hpp similarity index 100% rename from c++/include/boost/config/compiler/borland.hpp rename to c++/boost/config/compiler/borland.hpp diff --git a/c++/include/boost/config/compiler/clang.hpp b/c++/boost/config/compiler/clang.hpp similarity index 100% rename from c++/include/boost/config/compiler/clang.hpp rename to c++/boost/config/compiler/clang.hpp diff --git a/c++/include/boost/config/compiler/clang_version.hpp b/c++/boost/config/compiler/clang_version.hpp similarity index 100% rename from c++/include/boost/config/compiler/clang_version.hpp rename to c++/boost/config/compiler/clang_version.hpp diff --git a/c++/include/boost/config/compiler/codegear.hpp b/c++/boost/config/compiler/codegear.hpp similarity index 100% rename from c++/include/boost/config/compiler/codegear.hpp rename to c++/boost/config/compiler/codegear.hpp diff --git a/c++/include/boost/config/compiler/comeau.hpp b/c++/boost/config/compiler/comeau.hpp similarity index 100% rename from c++/include/boost/config/compiler/comeau.hpp rename to c++/boost/config/compiler/comeau.hpp diff --git a/c++/include/boost/config/compiler/common_edg.hpp b/c++/boost/config/compiler/common_edg.hpp similarity index 100% rename from c++/include/boost/config/compiler/common_edg.hpp rename to c++/boost/config/compiler/common_edg.hpp diff --git a/c++/include/boost/config/compiler/compaq_cxx.hpp b/c++/boost/config/compiler/compaq_cxx.hpp similarity index 100% rename from c++/include/boost/config/compiler/compaq_cxx.hpp rename to c++/boost/config/compiler/compaq_cxx.hpp diff --git a/c++/include/boost/config/compiler/cray.hpp b/c++/boost/config/compiler/cray.hpp similarity index 100% rename from c++/include/boost/config/compiler/cray.hpp rename to c++/boost/config/compiler/cray.hpp diff --git a/c++/include/boost/config/compiler/diab.hpp b/c++/boost/config/compiler/diab.hpp similarity index 100% rename from c++/include/boost/config/compiler/diab.hpp rename to c++/boost/config/compiler/diab.hpp diff --git a/c++/include/boost/config/compiler/digitalmars.hpp b/c++/boost/config/compiler/digitalmars.hpp similarity index 100% rename from c++/include/boost/config/compiler/digitalmars.hpp rename to c++/boost/config/compiler/digitalmars.hpp diff --git a/c++/include/boost/config/compiler/gcc.hpp b/c++/boost/config/compiler/gcc.hpp similarity index 100% rename from c++/include/boost/config/compiler/gcc.hpp rename to c++/boost/config/compiler/gcc.hpp diff --git a/c++/include/boost/config/compiler/gcc_xml.hpp b/c++/boost/config/compiler/gcc_xml.hpp similarity index 100% rename from c++/include/boost/config/compiler/gcc_xml.hpp rename to c++/boost/config/compiler/gcc_xml.hpp diff --git a/c++/include/boost/config/compiler/greenhills.hpp b/c++/boost/config/compiler/greenhills.hpp similarity index 100% rename from c++/include/boost/config/compiler/greenhills.hpp rename to c++/boost/config/compiler/greenhills.hpp diff --git a/c++/include/boost/config/compiler/hp_acc.hpp b/c++/boost/config/compiler/hp_acc.hpp similarity index 100% rename from c++/include/boost/config/compiler/hp_acc.hpp rename to c++/boost/config/compiler/hp_acc.hpp diff --git a/c++/include/boost/config/compiler/intel.hpp b/c++/boost/config/compiler/intel.hpp similarity index 100% rename from c++/include/boost/config/compiler/intel.hpp rename to c++/boost/config/compiler/intel.hpp diff --git a/c++/include/boost/config/compiler/kai.hpp b/c++/boost/config/compiler/kai.hpp similarity index 100% rename from c++/include/boost/config/compiler/kai.hpp rename to c++/boost/config/compiler/kai.hpp diff --git a/c++/include/boost/config/compiler/metrowerks.hpp b/c++/boost/config/compiler/metrowerks.hpp similarity index 100% rename from c++/include/boost/config/compiler/metrowerks.hpp rename to c++/boost/config/compiler/metrowerks.hpp diff --git a/c++/include/boost/config/compiler/mpw.hpp b/c++/boost/config/compiler/mpw.hpp similarity index 100% rename from c++/include/boost/config/compiler/mpw.hpp rename to c++/boost/config/compiler/mpw.hpp diff --git a/c++/include/boost/config/compiler/nvcc.hpp b/c++/boost/config/compiler/nvcc.hpp similarity index 100% rename from c++/include/boost/config/compiler/nvcc.hpp rename to c++/boost/config/compiler/nvcc.hpp diff --git a/c++/include/boost/config/compiler/pathscale.hpp b/c++/boost/config/compiler/pathscale.hpp similarity index 100% rename from c++/include/boost/config/compiler/pathscale.hpp rename to c++/boost/config/compiler/pathscale.hpp diff --git a/c++/include/boost/config/compiler/pgi.hpp b/c++/boost/config/compiler/pgi.hpp similarity index 100% rename from c++/include/boost/config/compiler/pgi.hpp rename to c++/boost/config/compiler/pgi.hpp diff --git a/c++/include/boost/config/compiler/sgi_mipspro.hpp b/c++/boost/config/compiler/sgi_mipspro.hpp similarity index 100% rename from c++/include/boost/config/compiler/sgi_mipspro.hpp rename to c++/boost/config/compiler/sgi_mipspro.hpp diff --git a/c++/include/boost/config/compiler/sunpro_cc.hpp b/c++/boost/config/compiler/sunpro_cc.hpp similarity index 100% rename from c++/include/boost/config/compiler/sunpro_cc.hpp rename to c++/boost/config/compiler/sunpro_cc.hpp diff --git a/c++/include/boost/config/compiler/vacpp.hpp b/c++/boost/config/compiler/vacpp.hpp similarity index 100% rename from c++/include/boost/config/compiler/vacpp.hpp rename to c++/boost/config/compiler/vacpp.hpp diff --git a/c++/include/boost/config/compiler/visualc.hpp b/c++/boost/config/compiler/visualc.hpp similarity index 100% rename from c++/include/boost/config/compiler/visualc.hpp rename to c++/boost/config/compiler/visualc.hpp diff --git a/c++/include/boost/config/compiler/xlcpp.hpp b/c++/boost/config/compiler/xlcpp.hpp similarity index 100% rename from c++/include/boost/config/compiler/xlcpp.hpp rename to c++/boost/config/compiler/xlcpp.hpp diff --git a/c++/include/boost/config/compiler/xlcpp_zos.hpp b/c++/boost/config/compiler/xlcpp_zos.hpp similarity index 100% rename from c++/include/boost/config/compiler/xlcpp_zos.hpp rename to c++/boost/config/compiler/xlcpp_zos.hpp diff --git a/c++/include/boost/config/detail/cxx_composite.hpp b/c++/boost/config/detail/cxx_composite.hpp similarity index 100% rename from c++/include/boost/config/detail/cxx_composite.hpp rename to c++/boost/config/detail/cxx_composite.hpp diff --git a/c++/include/boost/config/detail/posix_features.hpp b/c++/boost/config/detail/posix_features.hpp similarity index 100% rename from c++/include/boost/config/detail/posix_features.hpp rename to c++/boost/config/detail/posix_features.hpp diff --git a/c++/include/boost/config/detail/select_compiler_config.hpp b/c++/boost/config/detail/select_compiler_config.hpp similarity index 100% rename from c++/include/boost/config/detail/select_compiler_config.hpp rename to c++/boost/config/detail/select_compiler_config.hpp diff --git a/c++/include/boost/config/detail/select_platform_config.hpp b/c++/boost/config/detail/select_platform_config.hpp similarity index 100% rename from c++/include/boost/config/detail/select_platform_config.hpp rename to c++/boost/config/detail/select_platform_config.hpp diff --git a/c++/include/boost/config/detail/select_stdlib_config.hpp b/c++/boost/config/detail/select_stdlib_config.hpp similarity index 100% rename from c++/include/boost/config/detail/select_stdlib_config.hpp rename to c++/boost/config/detail/select_stdlib_config.hpp diff --git a/c++/include/boost/config/detail/suffix.hpp b/c++/boost/config/detail/suffix.hpp similarity index 100% rename from c++/include/boost/config/detail/suffix.hpp rename to c++/boost/config/detail/suffix.hpp diff --git a/c++/include/boost/config/header_deprecated.hpp b/c++/boost/config/header_deprecated.hpp similarity index 100% rename from c++/include/boost/config/header_deprecated.hpp rename to c++/boost/config/header_deprecated.hpp diff --git a/c++/include/boost/config/helper_macros.hpp b/c++/boost/config/helper_macros.hpp similarity index 100% rename from c++/include/boost/config/helper_macros.hpp rename to c++/boost/config/helper_macros.hpp diff --git a/c++/include/boost/config/no_tr1/cmath.hpp b/c++/boost/config/no_tr1/cmath.hpp similarity index 100% rename from c++/include/boost/config/no_tr1/cmath.hpp rename to c++/boost/config/no_tr1/cmath.hpp diff --git a/c++/include/boost/config/no_tr1/complex.hpp b/c++/boost/config/no_tr1/complex.hpp similarity index 100% rename from c++/include/boost/config/no_tr1/complex.hpp rename to c++/boost/config/no_tr1/complex.hpp diff --git a/c++/include/boost/config/no_tr1/functional.hpp b/c++/boost/config/no_tr1/functional.hpp similarity index 100% rename from c++/include/boost/config/no_tr1/functional.hpp rename to c++/boost/config/no_tr1/functional.hpp diff --git a/c++/include/boost/config/no_tr1/memory.hpp b/c++/boost/config/no_tr1/memory.hpp similarity index 100% rename from c++/include/boost/config/no_tr1/memory.hpp rename to c++/boost/config/no_tr1/memory.hpp diff --git a/c++/include/boost/config/no_tr1/utility.hpp b/c++/boost/config/no_tr1/utility.hpp similarity index 100% rename from c++/include/boost/config/no_tr1/utility.hpp rename to c++/boost/config/no_tr1/utility.hpp diff --git a/c++/include/boost/config/platform/aix.hpp b/c++/boost/config/platform/aix.hpp similarity index 100% rename from c++/include/boost/config/platform/aix.hpp rename to c++/boost/config/platform/aix.hpp diff --git a/c++/include/boost/config/platform/amigaos.hpp b/c++/boost/config/platform/amigaos.hpp similarity index 100% rename from c++/include/boost/config/platform/amigaos.hpp rename to c++/boost/config/platform/amigaos.hpp diff --git a/c++/include/boost/config/platform/beos.hpp b/c++/boost/config/platform/beos.hpp similarity index 100% rename from c++/include/boost/config/platform/beos.hpp rename to c++/boost/config/platform/beos.hpp diff --git a/c++/include/boost/config/platform/bsd.hpp b/c++/boost/config/platform/bsd.hpp similarity index 100% rename from c++/include/boost/config/platform/bsd.hpp rename to c++/boost/config/platform/bsd.hpp diff --git a/c++/include/boost/config/platform/cloudabi.hpp b/c++/boost/config/platform/cloudabi.hpp similarity index 100% rename from c++/include/boost/config/platform/cloudabi.hpp rename to c++/boost/config/platform/cloudabi.hpp diff --git a/c++/include/boost/config/platform/cray.hpp b/c++/boost/config/platform/cray.hpp similarity index 100% rename from c++/include/boost/config/platform/cray.hpp rename to c++/boost/config/platform/cray.hpp diff --git a/c++/include/boost/config/platform/cygwin.hpp b/c++/boost/config/platform/cygwin.hpp similarity index 100% rename from c++/include/boost/config/platform/cygwin.hpp rename to c++/boost/config/platform/cygwin.hpp diff --git a/c++/include/boost/config/platform/haiku.hpp b/c++/boost/config/platform/haiku.hpp similarity index 100% rename from c++/include/boost/config/platform/haiku.hpp rename to c++/boost/config/platform/haiku.hpp diff --git a/c++/include/boost/config/platform/hpux.hpp b/c++/boost/config/platform/hpux.hpp similarity index 100% rename from c++/include/boost/config/platform/hpux.hpp rename to c++/boost/config/platform/hpux.hpp diff --git a/c++/include/boost/config/platform/irix.hpp b/c++/boost/config/platform/irix.hpp similarity index 100% rename from c++/include/boost/config/platform/irix.hpp rename to c++/boost/config/platform/irix.hpp diff --git a/c++/include/boost/config/platform/linux.hpp b/c++/boost/config/platform/linux.hpp similarity index 100% rename from c++/include/boost/config/platform/linux.hpp rename to c++/boost/config/platform/linux.hpp diff --git a/c++/include/boost/config/platform/macos.hpp b/c++/boost/config/platform/macos.hpp similarity index 100% rename from c++/include/boost/config/platform/macos.hpp rename to c++/boost/config/platform/macos.hpp diff --git a/c++/include/boost/config/platform/qnxnto.hpp b/c++/boost/config/platform/qnxnto.hpp similarity index 100% rename from c++/include/boost/config/platform/qnxnto.hpp rename to c++/boost/config/platform/qnxnto.hpp diff --git a/c++/include/boost/config/platform/solaris.hpp b/c++/boost/config/platform/solaris.hpp similarity index 100% rename from c++/include/boost/config/platform/solaris.hpp rename to c++/boost/config/platform/solaris.hpp diff --git a/c++/include/boost/config/platform/symbian.hpp b/c++/boost/config/platform/symbian.hpp similarity index 100% rename from c++/include/boost/config/platform/symbian.hpp rename to c++/boost/config/platform/symbian.hpp diff --git a/c++/include/boost/config/platform/vms.hpp b/c++/boost/config/platform/vms.hpp similarity index 100% rename from c++/include/boost/config/platform/vms.hpp rename to c++/boost/config/platform/vms.hpp diff --git a/c++/include/boost/config/platform/vxworks.hpp b/c++/boost/config/platform/vxworks.hpp similarity index 100% rename from c++/include/boost/config/platform/vxworks.hpp rename to c++/boost/config/platform/vxworks.hpp diff --git a/c++/include/boost/config/platform/wasm.hpp b/c++/boost/config/platform/wasm.hpp similarity index 100% rename from c++/include/boost/config/platform/wasm.hpp rename to c++/boost/config/platform/wasm.hpp diff --git a/c++/include/boost/config/platform/win32.hpp b/c++/boost/config/platform/win32.hpp similarity index 100% rename from c++/include/boost/config/platform/win32.hpp rename to c++/boost/config/platform/win32.hpp diff --git a/c++/include/boost/config/platform/zos.hpp b/c++/boost/config/platform/zos.hpp similarity index 100% rename from c++/include/boost/config/platform/zos.hpp rename to c++/boost/config/platform/zos.hpp diff --git a/c++/include/boost/config/pragma_message.hpp b/c++/boost/config/pragma_message.hpp similarity index 100% rename from c++/include/boost/config/pragma_message.hpp rename to c++/boost/config/pragma_message.hpp diff --git a/c++/include/boost/config/requires_threads.hpp b/c++/boost/config/requires_threads.hpp similarity index 100% rename from c++/include/boost/config/requires_threads.hpp rename to c++/boost/config/requires_threads.hpp diff --git a/c++/include/boost/config/stdlib/dinkumware.hpp b/c++/boost/config/stdlib/dinkumware.hpp similarity index 100% rename from c++/include/boost/config/stdlib/dinkumware.hpp rename to c++/boost/config/stdlib/dinkumware.hpp diff --git a/c++/include/boost/config/stdlib/libcomo.hpp b/c++/boost/config/stdlib/libcomo.hpp similarity index 100% rename from c++/include/boost/config/stdlib/libcomo.hpp rename to c++/boost/config/stdlib/libcomo.hpp diff --git a/c++/include/boost/config/stdlib/libcpp.hpp b/c++/boost/config/stdlib/libcpp.hpp similarity index 100% rename from c++/include/boost/config/stdlib/libcpp.hpp rename to c++/boost/config/stdlib/libcpp.hpp diff --git a/c++/include/boost/config/stdlib/libstdcpp3.hpp b/c++/boost/config/stdlib/libstdcpp3.hpp similarity index 100% rename from c++/include/boost/config/stdlib/libstdcpp3.hpp rename to c++/boost/config/stdlib/libstdcpp3.hpp diff --git a/c++/include/boost/config/stdlib/modena.hpp b/c++/boost/config/stdlib/modena.hpp similarity index 100% rename from c++/include/boost/config/stdlib/modena.hpp rename to c++/boost/config/stdlib/modena.hpp diff --git a/c++/include/boost/config/stdlib/msl.hpp b/c++/boost/config/stdlib/msl.hpp similarity index 100% rename from c++/include/boost/config/stdlib/msl.hpp rename to c++/boost/config/stdlib/msl.hpp diff --git a/c++/include/boost/config/stdlib/roguewave.hpp b/c++/boost/config/stdlib/roguewave.hpp similarity index 100% rename from c++/include/boost/config/stdlib/roguewave.hpp rename to c++/boost/config/stdlib/roguewave.hpp diff --git a/c++/include/boost/config/stdlib/sgi.hpp b/c++/boost/config/stdlib/sgi.hpp similarity index 100% rename from c++/include/boost/config/stdlib/sgi.hpp rename to c++/boost/config/stdlib/sgi.hpp diff --git a/c++/include/boost/config/stdlib/stlport.hpp b/c++/boost/config/stdlib/stlport.hpp similarity index 100% rename from c++/include/boost/config/stdlib/stlport.hpp rename to c++/boost/config/stdlib/stlport.hpp diff --git a/c++/include/boost/config/stdlib/vacpp.hpp b/c++/boost/config/stdlib/vacpp.hpp similarity index 100% rename from c++/include/boost/config/stdlib/vacpp.hpp rename to c++/boost/config/stdlib/vacpp.hpp diff --git a/c++/include/boost/config/stdlib/xlcpp_zos.hpp b/c++/boost/config/stdlib/xlcpp_zos.hpp similarity index 100% rename from c++/include/boost/config/stdlib/xlcpp_zos.hpp rename to c++/boost/config/stdlib/xlcpp_zos.hpp diff --git a/c++/include/boost/config/user.hpp b/c++/boost/config/user.hpp similarity index 100% rename from c++/include/boost/config/user.hpp rename to c++/boost/config/user.hpp diff --git a/c++/include/boost/config/warning_disable.hpp b/c++/boost/config/warning_disable.hpp similarity index 100% rename from c++/include/boost/config/warning_disable.hpp rename to c++/boost/config/warning_disable.hpp diff --git a/c++/include/boost/config/workaround.hpp b/c++/boost/config/workaround.hpp similarity index 100% rename from c++/include/boost/config/workaround.hpp rename to c++/boost/config/workaround.hpp diff --git a/c++/include/boost/container_hash/detail/hash_mix.hpp b/c++/boost/container_hash/detail/hash_mix.hpp similarity index 100% rename from c++/include/boost/container_hash/detail/hash_mix.hpp rename to c++/boost/container_hash/detail/hash_mix.hpp diff --git a/c++/include/boost/container_hash/detail/hash_range.hpp b/c++/boost/container_hash/detail/hash_range.hpp similarity index 100% rename from c++/include/boost/container_hash/detail/hash_range.hpp rename to c++/boost/container_hash/detail/hash_range.hpp diff --git a/c++/include/boost/container_hash/detail/hash_tuple_like.hpp b/c++/boost/container_hash/detail/hash_tuple_like.hpp similarity index 100% rename from c++/include/boost/container_hash/detail/hash_tuple_like.hpp rename to c++/boost/container_hash/detail/hash_tuple_like.hpp diff --git a/c++/include/boost/container_hash/detail/limits.hpp b/c++/boost/container_hash/detail/limits.hpp similarity index 100% rename from c++/include/boost/container_hash/detail/limits.hpp rename to c++/boost/container_hash/detail/limits.hpp diff --git a/c++/include/boost/container_hash/detail/mulx.hpp b/c++/boost/container_hash/detail/mulx.hpp similarity index 100% rename from c++/include/boost/container_hash/detail/mulx.hpp rename to c++/boost/container_hash/detail/mulx.hpp diff --git a/c++/include/boost/container_hash/detail/requires_cxx11.hpp b/c++/boost/container_hash/detail/requires_cxx11.hpp similarity index 100% rename from c++/include/boost/container_hash/detail/requires_cxx11.hpp rename to c++/boost/container_hash/detail/requires_cxx11.hpp diff --git a/c++/include/boost/container_hash/extensions.hpp b/c++/boost/container_hash/extensions.hpp similarity index 100% rename from c++/include/boost/container_hash/extensions.hpp rename to c++/boost/container_hash/extensions.hpp diff --git a/c++/include/boost/container_hash/hash.hpp b/c++/boost/container_hash/hash.hpp similarity index 100% rename from c++/include/boost/container_hash/hash.hpp rename to c++/boost/container_hash/hash.hpp diff --git a/c++/include/boost/container_hash/hash_fwd.hpp b/c++/boost/container_hash/hash_fwd.hpp similarity index 100% rename from c++/include/boost/container_hash/hash_fwd.hpp rename to c++/boost/container_hash/hash_fwd.hpp diff --git a/c++/include/boost/container_hash/is_contiguous_range.hpp b/c++/boost/container_hash/is_contiguous_range.hpp similarity index 100% rename from c++/include/boost/container_hash/is_contiguous_range.hpp rename to c++/boost/container_hash/is_contiguous_range.hpp diff --git a/c++/include/boost/container_hash/is_described_class.hpp b/c++/boost/container_hash/is_described_class.hpp similarity index 100% rename from c++/include/boost/container_hash/is_described_class.hpp rename to c++/boost/container_hash/is_described_class.hpp diff --git a/c++/include/boost/container_hash/is_range.hpp b/c++/boost/container_hash/is_range.hpp similarity index 100% rename from c++/include/boost/container_hash/is_range.hpp rename to c++/boost/container_hash/is_range.hpp diff --git a/c++/include/boost/container_hash/is_tuple_like.hpp b/c++/boost/container_hash/is_tuple_like.hpp similarity index 100% rename from c++/include/boost/container_hash/is_tuple_like.hpp rename to c++/boost/container_hash/is_tuple_like.hpp diff --git a/c++/include/boost/container_hash/is_unordered_range.hpp b/c++/boost/container_hash/is_unordered_range.hpp similarity index 100% rename from c++/include/boost/container_hash/is_unordered_range.hpp rename to c++/boost/container_hash/is_unordered_range.hpp diff --git a/c++/include/boost/contract.hpp b/c++/boost/contract.hpp similarity index 100% rename from c++/include/boost/contract.hpp rename to c++/boost/contract.hpp diff --git a/c++/include/boost/contract_macro.hpp b/c++/boost/contract_macro.hpp similarity index 100% rename from c++/include/boost/contract_macro.hpp rename to c++/boost/contract_macro.hpp diff --git a/c++/include/boost/convert.hpp b/c++/boost/convert.hpp similarity index 100% rename from c++/include/boost/convert.hpp rename to c++/boost/convert.hpp diff --git a/c++/include/boost/core/addressof.hpp b/c++/boost/core/addressof.hpp similarity index 100% rename from c++/include/boost/core/addressof.hpp rename to c++/boost/core/addressof.hpp diff --git a/c++/include/boost/core/alignof.hpp b/c++/boost/core/alignof.hpp similarity index 100% rename from c++/include/boost/core/alignof.hpp rename to c++/boost/core/alignof.hpp diff --git a/c++/include/boost/core/alloc_construct.hpp b/c++/boost/core/alloc_construct.hpp similarity index 100% rename from c++/include/boost/core/alloc_construct.hpp rename to c++/boost/core/alloc_construct.hpp diff --git a/c++/include/boost/core/allocator_access.hpp b/c++/boost/core/allocator_access.hpp similarity index 100% rename from c++/include/boost/core/allocator_access.hpp rename to c++/boost/core/allocator_access.hpp diff --git a/c++/include/boost/core/allocator_traits.hpp b/c++/boost/core/allocator_traits.hpp similarity index 100% rename from c++/include/boost/core/allocator_traits.hpp rename to c++/boost/core/allocator_traits.hpp diff --git a/c++/include/boost/core/bit.hpp b/c++/boost/core/bit.hpp similarity index 100% rename from c++/include/boost/core/bit.hpp rename to c++/boost/core/bit.hpp diff --git a/c++/include/boost/core/checked_delete.hpp b/c++/boost/core/checked_delete.hpp similarity index 100% rename from c++/include/boost/core/checked_delete.hpp rename to c++/boost/core/checked_delete.hpp diff --git a/c++/include/boost/core/cmath.hpp b/c++/boost/core/cmath.hpp similarity index 100% rename from c++/include/boost/core/cmath.hpp rename to c++/boost/core/cmath.hpp diff --git a/c++/include/boost/core/data.hpp b/c++/boost/core/data.hpp similarity index 100% rename from c++/include/boost/core/data.hpp rename to c++/boost/core/data.hpp diff --git a/c++/include/boost/core/default_allocator.hpp b/c++/boost/core/default_allocator.hpp similarity index 100% rename from c++/include/boost/core/default_allocator.hpp rename to c++/boost/core/default_allocator.hpp diff --git a/c++/include/boost/core/demangle.hpp b/c++/boost/core/demangle.hpp similarity index 100% rename from c++/include/boost/core/demangle.hpp rename to c++/boost/core/demangle.hpp diff --git a/c++/include/boost/core/detail/is_same.hpp b/c++/boost/core/detail/is_same.hpp similarity index 100% rename from c++/include/boost/core/detail/is_same.hpp rename to c++/boost/core/detail/is_same.hpp diff --git a/c++/include/boost/core/detail/lwt_unattended.hpp b/c++/boost/core/detail/lwt_unattended.hpp similarity index 100% rename from c++/include/boost/core/detail/lwt_unattended.hpp rename to c++/boost/core/detail/lwt_unattended.hpp diff --git a/c++/include/boost/core/detail/splitmix64.hpp b/c++/boost/core/detail/splitmix64.hpp similarity index 100% rename from c++/include/boost/core/detail/splitmix64.hpp rename to c++/boost/core/detail/splitmix64.hpp diff --git a/c++/include/boost/core/detail/string_view.hpp b/c++/boost/core/detail/string_view.hpp similarity index 100% rename from c++/include/boost/core/detail/string_view.hpp rename to c++/boost/core/detail/string_view.hpp diff --git a/c++/include/boost/core/empty_value.hpp b/c++/boost/core/empty_value.hpp similarity index 100% rename from c++/include/boost/core/empty_value.hpp rename to c++/boost/core/empty_value.hpp diff --git a/c++/include/boost/core/enable_if.hpp b/c++/boost/core/enable_if.hpp similarity index 100% rename from c++/include/boost/core/enable_if.hpp rename to c++/boost/core/enable_if.hpp diff --git a/c++/include/boost/core/exchange.hpp b/c++/boost/core/exchange.hpp similarity index 100% rename from c++/include/boost/core/exchange.hpp rename to c++/boost/core/exchange.hpp diff --git a/c++/include/boost/core/explicit_operator_bool.hpp b/c++/boost/core/explicit_operator_bool.hpp similarity index 100% rename from c++/include/boost/core/explicit_operator_bool.hpp rename to c++/boost/core/explicit_operator_bool.hpp diff --git a/c++/include/boost/core/fclose_deleter.hpp b/c++/boost/core/fclose_deleter.hpp similarity index 100% rename from c++/include/boost/core/fclose_deleter.hpp rename to c++/boost/core/fclose_deleter.hpp diff --git a/c++/include/boost/core/first_scalar.hpp b/c++/boost/core/first_scalar.hpp similarity index 100% rename from c++/include/boost/core/first_scalar.hpp rename to c++/boost/core/first_scalar.hpp diff --git a/c++/include/boost/core/identity.hpp b/c++/boost/core/identity.hpp similarity index 100% rename from c++/include/boost/core/identity.hpp rename to c++/boost/core/identity.hpp diff --git a/c++/include/boost/core/ignore_unused.hpp b/c++/boost/core/ignore_unused.hpp similarity index 100% rename from c++/include/boost/core/ignore_unused.hpp rename to c++/boost/core/ignore_unused.hpp diff --git a/c++/include/boost/core/is_same.hpp b/c++/boost/core/is_same.hpp similarity index 100% rename from c++/include/boost/core/is_same.hpp rename to c++/boost/core/is_same.hpp diff --git a/c++/include/boost/core/launder.hpp b/c++/boost/core/launder.hpp similarity index 100% rename from c++/include/boost/core/launder.hpp rename to c++/boost/core/launder.hpp diff --git a/c++/include/boost/core/lightweight_test.hpp b/c++/boost/core/lightweight_test.hpp similarity index 100% rename from c++/include/boost/core/lightweight_test.hpp rename to c++/boost/core/lightweight_test.hpp diff --git a/c++/include/boost/core/lightweight_test_trait.hpp b/c++/boost/core/lightweight_test_trait.hpp similarity index 100% rename from c++/include/boost/core/lightweight_test_trait.hpp rename to c++/boost/core/lightweight_test_trait.hpp diff --git a/c++/include/boost/core/make_span.hpp b/c++/boost/core/make_span.hpp similarity index 100% rename from c++/include/boost/core/make_span.hpp rename to c++/boost/core/make_span.hpp diff --git a/c++/include/boost/core/max_align.hpp b/c++/boost/core/max_align.hpp similarity index 100% rename from c++/include/boost/core/max_align.hpp rename to c++/boost/core/max_align.hpp diff --git a/c++/include/boost/core/memory_resource.hpp b/c++/boost/core/memory_resource.hpp similarity index 100% rename from c++/include/boost/core/memory_resource.hpp rename to c++/boost/core/memory_resource.hpp diff --git a/c++/include/boost/core/no_exceptions_support.hpp b/c++/boost/core/no_exceptions_support.hpp similarity index 100% rename from c++/include/boost/core/no_exceptions_support.hpp rename to c++/boost/core/no_exceptions_support.hpp diff --git a/c++/include/boost/core/noinit_adaptor.hpp b/c++/boost/core/noinit_adaptor.hpp similarity index 100% rename from c++/include/boost/core/noinit_adaptor.hpp rename to c++/boost/core/noinit_adaptor.hpp diff --git a/c++/include/boost/core/noncopyable.hpp b/c++/boost/core/noncopyable.hpp similarity index 100% rename from c++/include/boost/core/noncopyable.hpp rename to c++/boost/core/noncopyable.hpp diff --git a/c++/include/boost/core/null_deleter.hpp b/c++/boost/core/null_deleter.hpp similarity index 100% rename from c++/include/boost/core/null_deleter.hpp rename to c++/boost/core/null_deleter.hpp diff --git a/c++/include/boost/core/nvp.hpp b/c++/boost/core/nvp.hpp similarity index 100% rename from c++/include/boost/core/nvp.hpp rename to c++/boost/core/nvp.hpp diff --git a/c++/include/boost/core/pointer_traits.hpp b/c++/boost/core/pointer_traits.hpp similarity index 100% rename from c++/include/boost/core/pointer_traits.hpp rename to c++/boost/core/pointer_traits.hpp diff --git a/c++/include/boost/core/quick_exit.hpp b/c++/boost/core/quick_exit.hpp similarity index 100% rename from c++/include/boost/core/quick_exit.hpp rename to c++/boost/core/quick_exit.hpp diff --git a/c++/include/boost/core/ref.hpp b/c++/boost/core/ref.hpp similarity index 100% rename from c++/include/boost/core/ref.hpp rename to c++/boost/core/ref.hpp diff --git a/c++/include/boost/core/scoped_enum.hpp b/c++/boost/core/scoped_enum.hpp similarity index 100% rename from c++/include/boost/core/scoped_enum.hpp rename to c++/boost/core/scoped_enum.hpp diff --git a/c++/include/boost/core/serialization.hpp b/c++/boost/core/serialization.hpp similarity index 100% rename from c++/include/boost/core/serialization.hpp rename to c++/boost/core/serialization.hpp diff --git a/c++/include/boost/core/size.hpp b/c++/boost/core/size.hpp similarity index 100% rename from c++/include/boost/core/size.hpp rename to c++/boost/core/size.hpp diff --git a/c++/include/boost/core/snprintf.hpp b/c++/boost/core/snprintf.hpp similarity index 100% rename from c++/include/boost/core/snprintf.hpp rename to c++/boost/core/snprintf.hpp diff --git a/c++/include/boost/core/span.hpp b/c++/boost/core/span.hpp similarity index 100% rename from c++/include/boost/core/span.hpp rename to c++/boost/core/span.hpp diff --git a/c++/include/boost/core/swap.hpp b/c++/boost/core/swap.hpp similarity index 100% rename from c++/include/boost/core/swap.hpp rename to c++/boost/core/swap.hpp diff --git a/c++/include/boost/core/type_name.hpp b/c++/boost/core/type_name.hpp similarity index 100% rename from c++/include/boost/core/type_name.hpp rename to c++/boost/core/type_name.hpp diff --git a/c++/include/boost/core/typeinfo.hpp b/c++/boost/core/typeinfo.hpp similarity index 100% rename from c++/include/boost/core/typeinfo.hpp rename to c++/boost/core/typeinfo.hpp diff --git a/c++/include/boost/core/uncaught_exceptions.hpp b/c++/boost/core/uncaught_exceptions.hpp similarity index 100% rename from c++/include/boost/core/uncaught_exceptions.hpp rename to c++/boost/core/uncaught_exceptions.hpp diff --git a/c++/include/boost/core/underlying_type.hpp b/c++/boost/core/underlying_type.hpp similarity index 100% rename from c++/include/boost/core/underlying_type.hpp rename to c++/boost/core/underlying_type.hpp diff --git a/c++/include/boost/core/use_default.hpp b/c++/boost/core/use_default.hpp similarity index 100% rename from c++/include/boost/core/use_default.hpp rename to c++/boost/core/use_default.hpp diff --git a/c++/include/boost/core/verbose_terminate_handler.hpp b/c++/boost/core/verbose_terminate_handler.hpp similarity index 100% rename from c++/include/boost/core/verbose_terminate_handler.hpp rename to c++/boost/core/verbose_terminate_handler.hpp diff --git a/c++/include/boost/crc.hpp b/c++/boost/crc.hpp similarity index 100% rename from c++/include/boost/crc.hpp rename to c++/boost/crc.hpp diff --git a/c++/include/boost/cregex.hpp b/c++/boost/cregex.hpp similarity index 100% rename from c++/include/boost/cregex.hpp rename to c++/boost/cregex.hpp diff --git a/c++/include/boost/cstdfloat.hpp b/c++/boost/cstdfloat.hpp similarity index 100% rename from c++/include/boost/cstdfloat.hpp rename to c++/boost/cstdfloat.hpp diff --git a/c++/include/boost/cstdint.hpp b/c++/boost/cstdint.hpp similarity index 100% rename from c++/include/boost/cstdint.hpp rename to c++/boost/cstdint.hpp diff --git a/c++/include/boost/cstdlib.hpp b/c++/boost/cstdlib.hpp similarity index 100% rename from c++/include/boost/cstdlib.hpp rename to c++/boost/cstdlib.hpp diff --git a/c++/include/boost/current_function.hpp b/c++/boost/current_function.hpp similarity index 100% rename from c++/include/boost/current_function.hpp rename to c++/boost/current_function.hpp diff --git a/c++/include/boost/cxx11_char_types.hpp b/c++/boost/cxx11_char_types.hpp similarity index 100% rename from c++/include/boost/cxx11_char_types.hpp rename to c++/boost/cxx11_char_types.hpp diff --git a/c++/include/boost/date_time.hpp b/c++/boost/date_time.hpp similarity index 100% rename from c++/include/boost/date_time.hpp rename to c++/boost/date_time.hpp diff --git a/c++/include/boost/date_time/adjust_functors.hpp b/c++/boost/date_time/adjust_functors.hpp similarity index 100% rename from c++/include/boost/date_time/adjust_functors.hpp rename to c++/boost/date_time/adjust_functors.hpp diff --git a/c++/include/boost/date_time/c_local_time_adjustor.hpp b/c++/boost/date_time/c_local_time_adjustor.hpp similarity index 100% rename from c++/include/boost/date_time/c_local_time_adjustor.hpp rename to c++/boost/date_time/c_local_time_adjustor.hpp diff --git a/c++/include/boost/date_time/c_time.hpp b/c++/boost/date_time/c_time.hpp similarity index 100% rename from c++/include/boost/date_time/c_time.hpp rename to c++/boost/date_time/c_time.hpp diff --git a/c++/include/boost/date_time/compiler_config.hpp b/c++/boost/date_time/compiler_config.hpp similarity index 100% rename from c++/include/boost/date_time/compiler_config.hpp rename to c++/boost/date_time/compiler_config.hpp diff --git a/c++/include/boost/date_time/constrained_value.hpp b/c++/boost/date_time/constrained_value.hpp similarity index 100% rename from c++/include/boost/date_time/constrained_value.hpp rename to c++/boost/date_time/constrained_value.hpp diff --git a/c++/include/boost/date_time/date.hpp b/c++/boost/date_time/date.hpp similarity index 100% rename from c++/include/boost/date_time/date.hpp rename to c++/boost/date_time/date.hpp diff --git a/c++/include/boost/date_time/date_clock_device.hpp b/c++/boost/date_time/date_clock_device.hpp similarity index 100% rename from c++/include/boost/date_time/date_clock_device.hpp rename to c++/boost/date_time/date_clock_device.hpp diff --git a/c++/include/boost/date_time/date_defs.hpp b/c++/boost/date_time/date_defs.hpp similarity index 100% rename from c++/include/boost/date_time/date_defs.hpp rename to c++/boost/date_time/date_defs.hpp diff --git a/c++/include/boost/date_time/date_duration.hpp b/c++/boost/date_time/date_duration.hpp similarity index 100% rename from c++/include/boost/date_time/date_duration.hpp rename to c++/boost/date_time/date_duration.hpp diff --git a/c++/include/boost/date_time/date_duration_types.hpp b/c++/boost/date_time/date_duration_types.hpp similarity index 100% rename from c++/include/boost/date_time/date_duration_types.hpp rename to c++/boost/date_time/date_duration_types.hpp diff --git a/c++/include/boost/date_time/date_facet.hpp b/c++/boost/date_time/date_facet.hpp similarity index 100% rename from c++/include/boost/date_time/date_facet.hpp rename to c++/boost/date_time/date_facet.hpp diff --git a/c++/include/boost/date_time/date_format_simple.hpp b/c++/boost/date_time/date_format_simple.hpp similarity index 100% rename from c++/include/boost/date_time/date_format_simple.hpp rename to c++/boost/date_time/date_format_simple.hpp diff --git a/c++/include/boost/date_time/date_formatting.hpp b/c++/boost/date_time/date_formatting.hpp similarity index 100% rename from c++/include/boost/date_time/date_formatting.hpp rename to c++/boost/date_time/date_formatting.hpp diff --git a/c++/include/boost/date_time/date_formatting_limited.hpp b/c++/boost/date_time/date_formatting_limited.hpp similarity index 100% rename from c++/include/boost/date_time/date_formatting_limited.hpp rename to c++/boost/date_time/date_formatting_limited.hpp diff --git a/c++/include/boost/date_time/date_formatting_locales.hpp b/c++/boost/date_time/date_formatting_locales.hpp similarity index 100% rename from c++/include/boost/date_time/date_formatting_locales.hpp rename to c++/boost/date_time/date_formatting_locales.hpp diff --git a/c++/include/boost/date_time/date_generator_formatter.hpp b/c++/boost/date_time/date_generator_formatter.hpp similarity index 100% rename from c++/include/boost/date_time/date_generator_formatter.hpp rename to c++/boost/date_time/date_generator_formatter.hpp diff --git a/c++/include/boost/date_time/date_generator_parser.hpp b/c++/boost/date_time/date_generator_parser.hpp similarity index 100% rename from c++/include/boost/date_time/date_generator_parser.hpp rename to c++/boost/date_time/date_generator_parser.hpp diff --git a/c++/include/boost/date_time/date_generators.hpp b/c++/boost/date_time/date_generators.hpp similarity index 100% rename from c++/include/boost/date_time/date_generators.hpp rename to c++/boost/date_time/date_generators.hpp diff --git a/c++/include/boost/date_time/date_iterator.hpp b/c++/boost/date_time/date_iterator.hpp similarity index 100% rename from c++/include/boost/date_time/date_iterator.hpp rename to c++/boost/date_time/date_iterator.hpp diff --git a/c++/include/boost/date_time/date_names_put.hpp b/c++/boost/date_time/date_names_put.hpp similarity index 100% rename from c++/include/boost/date_time/date_names_put.hpp rename to c++/boost/date_time/date_names_put.hpp diff --git a/c++/include/boost/date_time/date_parsing.hpp b/c++/boost/date_time/date_parsing.hpp similarity index 100% rename from c++/include/boost/date_time/date_parsing.hpp rename to c++/boost/date_time/date_parsing.hpp diff --git a/c++/include/boost/date_time/dst_rules.hpp b/c++/boost/date_time/dst_rules.hpp similarity index 100% rename from c++/include/boost/date_time/dst_rules.hpp rename to c++/boost/date_time/dst_rules.hpp diff --git a/c++/include/boost/date_time/dst_transition_generators.hpp b/c++/boost/date_time/dst_transition_generators.hpp similarity index 100% rename from c++/include/boost/date_time/dst_transition_generators.hpp rename to c++/boost/date_time/dst_transition_generators.hpp diff --git a/c++/include/boost/date_time/filetime_functions.hpp b/c++/boost/date_time/filetime_functions.hpp similarity index 100% rename from c++/include/boost/date_time/filetime_functions.hpp rename to c++/boost/date_time/filetime_functions.hpp diff --git a/c++/include/boost/date_time/find_match.hpp b/c++/boost/date_time/find_match.hpp similarity index 100% rename from c++/include/boost/date_time/find_match.hpp rename to c++/boost/date_time/find_match.hpp diff --git a/c++/include/boost/date_time/format_date_parser.hpp b/c++/boost/date_time/format_date_parser.hpp similarity index 100% rename from c++/include/boost/date_time/format_date_parser.hpp rename to c++/boost/date_time/format_date_parser.hpp diff --git a/c++/include/boost/date_time/gregorian/conversion.hpp b/c++/boost/date_time/gregorian/conversion.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/conversion.hpp rename to c++/boost/date_time/gregorian/conversion.hpp diff --git a/c++/include/boost/date_time/gregorian/formatters.hpp b/c++/boost/date_time/gregorian/formatters.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/formatters.hpp rename to c++/boost/date_time/gregorian/formatters.hpp diff --git a/c++/include/boost/date_time/gregorian/formatters_limited.hpp b/c++/boost/date_time/gregorian/formatters_limited.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/formatters_limited.hpp rename to c++/boost/date_time/gregorian/formatters_limited.hpp diff --git a/c++/include/boost/date_time/gregorian/greg_calendar.hpp b/c++/boost/date_time/gregorian/greg_calendar.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/greg_calendar.hpp rename to c++/boost/date_time/gregorian/greg_calendar.hpp diff --git a/c++/include/boost/date_time/gregorian/greg_date.hpp b/c++/boost/date_time/gregorian/greg_date.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/greg_date.hpp rename to c++/boost/date_time/gregorian/greg_date.hpp diff --git a/c++/include/boost/date_time/gregorian/greg_day.hpp b/c++/boost/date_time/gregorian/greg_day.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/greg_day.hpp rename to c++/boost/date_time/gregorian/greg_day.hpp diff --git a/c++/include/boost/date_time/gregorian/greg_day_of_year.hpp b/c++/boost/date_time/gregorian/greg_day_of_year.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/greg_day_of_year.hpp rename to c++/boost/date_time/gregorian/greg_day_of_year.hpp diff --git a/c++/include/boost/date_time/gregorian/greg_duration.hpp b/c++/boost/date_time/gregorian/greg_duration.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/greg_duration.hpp rename to c++/boost/date_time/gregorian/greg_duration.hpp diff --git a/c++/include/boost/date_time/gregorian/greg_duration_types.hpp b/c++/boost/date_time/gregorian/greg_duration_types.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/greg_duration_types.hpp rename to c++/boost/date_time/gregorian/greg_duration_types.hpp diff --git a/c++/include/boost/date_time/gregorian/greg_facet.hpp b/c++/boost/date_time/gregorian/greg_facet.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/greg_facet.hpp rename to c++/boost/date_time/gregorian/greg_facet.hpp diff --git a/c++/include/boost/date_time/gregorian/greg_month.hpp b/c++/boost/date_time/gregorian/greg_month.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/greg_month.hpp rename to c++/boost/date_time/gregorian/greg_month.hpp diff --git a/c++/include/boost/date_time/gregorian/greg_serialize.hpp b/c++/boost/date_time/gregorian/greg_serialize.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/greg_serialize.hpp rename to c++/boost/date_time/gregorian/greg_serialize.hpp diff --git a/c++/include/boost/date_time/gregorian/greg_weekday.hpp b/c++/boost/date_time/gregorian/greg_weekday.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/greg_weekday.hpp rename to c++/boost/date_time/gregorian/greg_weekday.hpp diff --git a/c++/include/boost/date_time/gregorian/greg_year.hpp b/c++/boost/date_time/gregorian/greg_year.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/greg_year.hpp rename to c++/boost/date_time/gregorian/greg_year.hpp diff --git a/c++/include/boost/date_time/gregorian/greg_ymd.hpp b/c++/boost/date_time/gregorian/greg_ymd.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/greg_ymd.hpp rename to c++/boost/date_time/gregorian/greg_ymd.hpp diff --git a/c++/include/boost/date_time/gregorian/gregorian.hpp b/c++/boost/date_time/gregorian/gregorian.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/gregorian.hpp rename to c++/boost/date_time/gregorian/gregorian.hpp diff --git a/c++/include/boost/date_time/gregorian/gregorian_io.hpp b/c++/boost/date_time/gregorian/gregorian_io.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/gregorian_io.hpp rename to c++/boost/date_time/gregorian/gregorian_io.hpp diff --git a/c++/include/boost/date_time/gregorian/gregorian_types.hpp b/c++/boost/date_time/gregorian/gregorian_types.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/gregorian_types.hpp rename to c++/boost/date_time/gregorian/gregorian_types.hpp diff --git a/c++/include/boost/date_time/gregorian/parsers.hpp b/c++/boost/date_time/gregorian/parsers.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian/parsers.hpp rename to c++/boost/date_time/gregorian/parsers.hpp diff --git a/c++/include/boost/date_time/gregorian_calendar.hpp b/c++/boost/date_time/gregorian_calendar.hpp similarity index 100% rename from c++/include/boost/date_time/gregorian_calendar.hpp rename to c++/boost/date_time/gregorian_calendar.hpp diff --git a/c++/include/boost/date_time/gregorian_calendar.ipp b/c++/boost/date_time/gregorian_calendar.ipp similarity index 100% rename from c++/include/boost/date_time/gregorian_calendar.ipp rename to c++/boost/date_time/gregorian_calendar.ipp diff --git a/c++/include/boost/date_time/int_adapter.hpp b/c++/boost/date_time/int_adapter.hpp similarity index 100% rename from c++/include/boost/date_time/int_adapter.hpp rename to c++/boost/date_time/int_adapter.hpp diff --git a/c++/include/boost/date_time/iso_format.hpp b/c++/boost/date_time/iso_format.hpp similarity index 100% rename from c++/include/boost/date_time/iso_format.hpp rename to c++/boost/date_time/iso_format.hpp diff --git a/c++/include/boost/date_time/local_time/conversion.hpp b/c++/boost/date_time/local_time/conversion.hpp similarity index 100% rename from c++/include/boost/date_time/local_time/conversion.hpp rename to c++/boost/date_time/local_time/conversion.hpp diff --git a/c++/include/boost/date_time/local_time/custom_time_zone.hpp b/c++/boost/date_time/local_time/custom_time_zone.hpp similarity index 100% rename from c++/include/boost/date_time/local_time/custom_time_zone.hpp rename to c++/boost/date_time/local_time/custom_time_zone.hpp diff --git a/c++/include/boost/date_time/local_time/date_duration_operators.hpp b/c++/boost/date_time/local_time/date_duration_operators.hpp similarity index 100% rename from c++/include/boost/date_time/local_time/date_duration_operators.hpp rename to c++/boost/date_time/local_time/date_duration_operators.hpp diff --git a/c++/include/boost/date_time/local_time/dst_transition_day_rules.hpp b/c++/boost/date_time/local_time/dst_transition_day_rules.hpp similarity index 100% rename from c++/include/boost/date_time/local_time/dst_transition_day_rules.hpp rename to c++/boost/date_time/local_time/dst_transition_day_rules.hpp diff --git a/c++/include/boost/date_time/local_time/local_date_time.hpp b/c++/boost/date_time/local_time/local_date_time.hpp similarity index 100% rename from c++/include/boost/date_time/local_time/local_date_time.hpp rename to c++/boost/date_time/local_time/local_date_time.hpp diff --git a/c++/include/boost/date_time/local_time/local_time.hpp b/c++/boost/date_time/local_time/local_time.hpp similarity index 100% rename from c++/include/boost/date_time/local_time/local_time.hpp rename to c++/boost/date_time/local_time/local_time.hpp diff --git a/c++/include/boost/date_time/local_time/local_time_io.hpp b/c++/boost/date_time/local_time/local_time_io.hpp similarity index 100% rename from c++/include/boost/date_time/local_time/local_time_io.hpp rename to c++/boost/date_time/local_time/local_time_io.hpp diff --git a/c++/include/boost/date_time/local_time/local_time_types.hpp b/c++/boost/date_time/local_time/local_time_types.hpp similarity index 100% rename from c++/include/boost/date_time/local_time/local_time_types.hpp rename to c++/boost/date_time/local_time/local_time_types.hpp diff --git a/c++/include/boost/date_time/local_time/posix_time_zone.hpp b/c++/boost/date_time/local_time/posix_time_zone.hpp similarity index 100% rename from c++/include/boost/date_time/local_time/posix_time_zone.hpp rename to c++/boost/date_time/local_time/posix_time_zone.hpp diff --git a/c++/include/boost/date_time/local_time/tz_database.hpp b/c++/boost/date_time/local_time/tz_database.hpp similarity index 100% rename from c++/include/boost/date_time/local_time/tz_database.hpp rename to c++/boost/date_time/local_time/tz_database.hpp diff --git a/c++/include/boost/date_time/local_time_adjustor.hpp b/c++/boost/date_time/local_time_adjustor.hpp similarity index 100% rename from c++/include/boost/date_time/local_time_adjustor.hpp rename to c++/boost/date_time/local_time_adjustor.hpp diff --git a/c++/include/boost/date_time/local_timezone_defs.hpp b/c++/boost/date_time/local_timezone_defs.hpp similarity index 100% rename from c++/include/boost/date_time/local_timezone_defs.hpp rename to c++/boost/date_time/local_timezone_defs.hpp diff --git a/c++/include/boost/date_time/locale_config.hpp b/c++/boost/date_time/locale_config.hpp similarity index 100% rename from c++/include/boost/date_time/locale_config.hpp rename to c++/boost/date_time/locale_config.hpp diff --git a/c++/include/boost/date_time/microsec_time_clock.hpp b/c++/boost/date_time/microsec_time_clock.hpp similarity index 100% rename from c++/include/boost/date_time/microsec_time_clock.hpp rename to c++/boost/date_time/microsec_time_clock.hpp diff --git a/c++/include/boost/date_time/parse_format_base.hpp b/c++/boost/date_time/parse_format_base.hpp similarity index 100% rename from c++/include/boost/date_time/parse_format_base.hpp rename to c++/boost/date_time/parse_format_base.hpp diff --git a/c++/include/boost/date_time/period.hpp b/c++/boost/date_time/period.hpp similarity index 100% rename from c++/include/boost/date_time/period.hpp rename to c++/boost/date_time/period.hpp diff --git a/c++/include/boost/date_time/period_formatter.hpp b/c++/boost/date_time/period_formatter.hpp similarity index 100% rename from c++/include/boost/date_time/period_formatter.hpp rename to c++/boost/date_time/period_formatter.hpp diff --git a/c++/include/boost/date_time/period_parser.hpp b/c++/boost/date_time/period_parser.hpp similarity index 100% rename from c++/include/boost/date_time/period_parser.hpp rename to c++/boost/date_time/period_parser.hpp diff --git a/c++/include/boost/date_time/posix_time/conversion.hpp b/c++/boost/date_time/posix_time/conversion.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/conversion.hpp rename to c++/boost/date_time/posix_time/conversion.hpp diff --git a/c++/include/boost/date_time/posix_time/date_duration_operators.hpp b/c++/boost/date_time/posix_time/date_duration_operators.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/date_duration_operators.hpp rename to c++/boost/date_time/posix_time/date_duration_operators.hpp diff --git a/c++/include/boost/date_time/posix_time/posix_time.hpp b/c++/boost/date_time/posix_time/posix_time.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/posix_time.hpp rename to c++/boost/date_time/posix_time/posix_time.hpp diff --git a/c++/include/boost/date_time/posix_time/posix_time_config.hpp b/c++/boost/date_time/posix_time/posix_time_config.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/posix_time_config.hpp rename to c++/boost/date_time/posix_time/posix_time_config.hpp diff --git a/c++/include/boost/date_time/posix_time/posix_time_duration.hpp b/c++/boost/date_time/posix_time/posix_time_duration.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/posix_time_duration.hpp rename to c++/boost/date_time/posix_time/posix_time_duration.hpp diff --git a/c++/include/boost/date_time/posix_time/posix_time_io.hpp b/c++/boost/date_time/posix_time/posix_time_io.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/posix_time_io.hpp rename to c++/boost/date_time/posix_time/posix_time_io.hpp diff --git a/c++/include/boost/date_time/posix_time/posix_time_legacy_io.hpp b/c++/boost/date_time/posix_time/posix_time_legacy_io.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/posix_time_legacy_io.hpp rename to c++/boost/date_time/posix_time/posix_time_legacy_io.hpp diff --git a/c++/include/boost/date_time/posix_time/posix_time_system.hpp b/c++/boost/date_time/posix_time/posix_time_system.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/posix_time_system.hpp rename to c++/boost/date_time/posix_time/posix_time_system.hpp diff --git a/c++/include/boost/date_time/posix_time/posix_time_types.hpp b/c++/boost/date_time/posix_time/posix_time_types.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/posix_time_types.hpp rename to c++/boost/date_time/posix_time/posix_time_types.hpp diff --git a/c++/include/boost/date_time/posix_time/ptime.hpp b/c++/boost/date_time/posix_time/ptime.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/ptime.hpp rename to c++/boost/date_time/posix_time/ptime.hpp diff --git a/c++/include/boost/date_time/posix_time/time_formatters.hpp b/c++/boost/date_time/posix_time/time_formatters.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/time_formatters.hpp rename to c++/boost/date_time/posix_time/time_formatters.hpp diff --git a/c++/include/boost/date_time/posix_time/time_formatters_limited.hpp b/c++/boost/date_time/posix_time/time_formatters_limited.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/time_formatters_limited.hpp rename to c++/boost/date_time/posix_time/time_formatters_limited.hpp diff --git a/c++/include/boost/date_time/posix_time/time_parsers.hpp b/c++/boost/date_time/posix_time/time_parsers.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/time_parsers.hpp rename to c++/boost/date_time/posix_time/time_parsers.hpp diff --git a/c++/include/boost/date_time/posix_time/time_period.hpp b/c++/boost/date_time/posix_time/time_period.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/time_period.hpp rename to c++/boost/date_time/posix_time/time_period.hpp diff --git a/c++/include/boost/date_time/posix_time/time_serialize.hpp b/c++/boost/date_time/posix_time/time_serialize.hpp similarity index 100% rename from c++/include/boost/date_time/posix_time/time_serialize.hpp rename to c++/boost/date_time/posix_time/time_serialize.hpp diff --git a/c++/include/boost/date_time/special_defs.hpp b/c++/boost/date_time/special_defs.hpp similarity index 100% rename from c++/include/boost/date_time/special_defs.hpp rename to c++/boost/date_time/special_defs.hpp diff --git a/c++/include/boost/date_time/special_values_formatter.hpp b/c++/boost/date_time/special_values_formatter.hpp similarity index 100% rename from c++/include/boost/date_time/special_values_formatter.hpp rename to c++/boost/date_time/special_values_formatter.hpp diff --git a/c++/include/boost/date_time/special_values_parser.hpp b/c++/boost/date_time/special_values_parser.hpp similarity index 100% rename from c++/include/boost/date_time/special_values_parser.hpp rename to c++/boost/date_time/special_values_parser.hpp diff --git a/c++/include/boost/date_time/string_convert.hpp b/c++/boost/date_time/string_convert.hpp similarity index 100% rename from c++/include/boost/date_time/string_convert.hpp rename to c++/boost/date_time/string_convert.hpp diff --git a/c++/include/boost/date_time/string_parse_tree.hpp b/c++/boost/date_time/string_parse_tree.hpp similarity index 100% rename from c++/include/boost/date_time/string_parse_tree.hpp rename to c++/boost/date_time/string_parse_tree.hpp diff --git a/c++/include/boost/date_time/strings_from_facet.hpp b/c++/boost/date_time/strings_from_facet.hpp similarity index 100% rename from c++/include/boost/date_time/strings_from_facet.hpp rename to c++/boost/date_time/strings_from_facet.hpp diff --git a/c++/include/boost/date_time/time.hpp b/c++/boost/date_time/time.hpp similarity index 100% rename from c++/include/boost/date_time/time.hpp rename to c++/boost/date_time/time.hpp diff --git a/c++/include/boost/date_time/time_clock.hpp b/c++/boost/date_time/time_clock.hpp similarity index 100% rename from c++/include/boost/date_time/time_clock.hpp rename to c++/boost/date_time/time_clock.hpp diff --git a/c++/include/boost/date_time/time_defs.hpp b/c++/boost/date_time/time_defs.hpp similarity index 100% rename from c++/include/boost/date_time/time_defs.hpp rename to c++/boost/date_time/time_defs.hpp diff --git a/c++/include/boost/date_time/time_duration.hpp b/c++/boost/date_time/time_duration.hpp similarity index 100% rename from c++/include/boost/date_time/time_duration.hpp rename to c++/boost/date_time/time_duration.hpp diff --git a/c++/include/boost/date_time/time_facet.hpp b/c++/boost/date_time/time_facet.hpp similarity index 100% rename from c++/include/boost/date_time/time_facet.hpp rename to c++/boost/date_time/time_facet.hpp diff --git a/c++/include/boost/date_time/time_formatting_streams.hpp b/c++/boost/date_time/time_formatting_streams.hpp similarity index 100% rename from c++/include/boost/date_time/time_formatting_streams.hpp rename to c++/boost/date_time/time_formatting_streams.hpp diff --git a/c++/include/boost/date_time/time_iterator.hpp b/c++/boost/date_time/time_iterator.hpp similarity index 100% rename from c++/include/boost/date_time/time_iterator.hpp rename to c++/boost/date_time/time_iterator.hpp diff --git a/c++/include/boost/date_time/time_parsing.hpp b/c++/boost/date_time/time_parsing.hpp similarity index 100% rename from c++/include/boost/date_time/time_parsing.hpp rename to c++/boost/date_time/time_parsing.hpp diff --git a/c++/include/boost/date_time/time_resolution_traits.hpp b/c++/boost/date_time/time_resolution_traits.hpp similarity index 100% rename from c++/include/boost/date_time/time_resolution_traits.hpp rename to c++/boost/date_time/time_resolution_traits.hpp diff --git a/c++/include/boost/date_time/time_system_counted.hpp b/c++/boost/date_time/time_system_counted.hpp similarity index 100% rename from c++/include/boost/date_time/time_system_counted.hpp rename to c++/boost/date_time/time_system_counted.hpp diff --git a/c++/include/boost/date_time/time_system_split.hpp b/c++/boost/date_time/time_system_split.hpp similarity index 100% rename from c++/include/boost/date_time/time_system_split.hpp rename to c++/boost/date_time/time_system_split.hpp diff --git a/c++/include/boost/date_time/time_zone_base.hpp b/c++/boost/date_time/time_zone_base.hpp similarity index 100% rename from c++/include/boost/date_time/time_zone_base.hpp rename to c++/boost/date_time/time_zone_base.hpp diff --git a/c++/include/boost/date_time/time_zone_names.hpp b/c++/boost/date_time/time_zone_names.hpp similarity index 100% rename from c++/include/boost/date_time/time_zone_names.hpp rename to c++/boost/date_time/time_zone_names.hpp diff --git a/c++/include/boost/date_time/tz_db_base.hpp b/c++/boost/date_time/tz_db_base.hpp similarity index 100% rename from c++/include/boost/date_time/tz_db_base.hpp rename to c++/boost/date_time/tz_db_base.hpp diff --git a/c++/include/boost/date_time/wrapping_int.hpp b/c++/boost/date_time/wrapping_int.hpp similarity index 100% rename from c++/include/boost/date_time/wrapping_int.hpp rename to c++/boost/date_time/wrapping_int.hpp diff --git a/c++/include/boost/date_time/year_month_day.hpp b/c++/boost/date_time/year_month_day.hpp similarity index 100% rename from c++/include/boost/date_time/year_month_day.hpp rename to c++/boost/date_time/year_month_day.hpp diff --git a/c++/include/boost/describe.hpp b/c++/boost/describe.hpp similarity index 100% rename from c++/include/boost/describe.hpp rename to c++/boost/describe.hpp diff --git a/c++/include/boost/describe/bases.hpp b/c++/boost/describe/bases.hpp similarity index 100% rename from c++/include/boost/describe/bases.hpp rename to c++/boost/describe/bases.hpp diff --git a/c++/include/boost/describe/class.hpp b/c++/boost/describe/class.hpp similarity index 100% rename from c++/include/boost/describe/class.hpp rename to c++/boost/describe/class.hpp diff --git a/c++/include/boost/describe/descriptor_by_name.hpp b/c++/boost/describe/descriptor_by_name.hpp similarity index 100% rename from c++/include/boost/describe/descriptor_by_name.hpp rename to c++/boost/describe/descriptor_by_name.hpp diff --git a/c++/include/boost/describe/descriptor_by_pointer.hpp b/c++/boost/describe/descriptor_by_pointer.hpp similarity index 100% rename from c++/include/boost/describe/descriptor_by_pointer.hpp rename to c++/boost/describe/descriptor_by_pointer.hpp diff --git a/c++/include/boost/describe/detail/bases.hpp b/c++/boost/describe/detail/bases.hpp similarity index 100% rename from c++/include/boost/describe/detail/bases.hpp rename to c++/boost/describe/detail/bases.hpp diff --git a/c++/include/boost/describe/detail/compute_base_modifiers.hpp b/c++/boost/describe/detail/compute_base_modifiers.hpp similarity index 100% rename from c++/include/boost/describe/detail/compute_base_modifiers.hpp rename to c++/boost/describe/detail/compute_base_modifiers.hpp diff --git a/c++/include/boost/describe/detail/config.hpp b/c++/boost/describe/detail/config.hpp similarity index 100% rename from c++/include/boost/describe/detail/config.hpp rename to c++/boost/describe/detail/config.hpp diff --git a/c++/include/boost/describe/detail/cx_streq.hpp b/c++/boost/describe/detail/cx_streq.hpp similarity index 100% rename from c++/include/boost/describe/detail/cx_streq.hpp rename to c++/boost/describe/detail/cx_streq.hpp diff --git a/c++/include/boost/describe/detail/list.hpp b/c++/boost/describe/detail/list.hpp similarity index 100% rename from c++/include/boost/describe/detail/list.hpp rename to c++/boost/describe/detail/list.hpp diff --git a/c++/include/boost/describe/detail/members.hpp b/c++/boost/describe/detail/members.hpp similarity index 100% rename from c++/include/boost/describe/detail/members.hpp rename to c++/boost/describe/detail/members.hpp diff --git a/c++/include/boost/describe/detail/pp_for_each.hpp b/c++/boost/describe/detail/pp_for_each.hpp similarity index 100% rename from c++/include/boost/describe/detail/pp_for_each.hpp rename to c++/boost/describe/detail/pp_for_each.hpp diff --git a/c++/include/boost/describe/detail/pp_utilities.hpp b/c++/boost/describe/detail/pp_utilities.hpp similarity index 100% rename from c++/include/boost/describe/detail/pp_utilities.hpp rename to c++/boost/describe/detail/pp_utilities.hpp diff --git a/c++/include/boost/describe/detail/void_t.hpp b/c++/boost/describe/detail/void_t.hpp similarity index 100% rename from c++/include/boost/describe/detail/void_t.hpp rename to c++/boost/describe/detail/void_t.hpp diff --git a/c++/include/boost/describe/enum.hpp b/c++/boost/describe/enum.hpp similarity index 100% rename from c++/include/boost/describe/enum.hpp rename to c++/boost/describe/enum.hpp diff --git a/c++/include/boost/describe/enum_from_string.hpp b/c++/boost/describe/enum_from_string.hpp similarity index 100% rename from c++/include/boost/describe/enum_from_string.hpp rename to c++/boost/describe/enum_from_string.hpp diff --git a/c++/include/boost/describe/enum_to_string.hpp b/c++/boost/describe/enum_to_string.hpp similarity index 100% rename from c++/include/boost/describe/enum_to_string.hpp rename to c++/boost/describe/enum_to_string.hpp diff --git a/c++/include/boost/describe/enumerators.hpp b/c++/boost/describe/enumerators.hpp similarity index 100% rename from c++/include/boost/describe/enumerators.hpp rename to c++/boost/describe/enumerators.hpp diff --git a/c++/include/boost/describe/members.hpp b/c++/boost/describe/members.hpp similarity index 100% rename from c++/include/boost/describe/members.hpp rename to c++/boost/describe/members.hpp diff --git a/c++/include/boost/describe/modifier_description.hpp b/c++/boost/describe/modifier_description.hpp similarity index 100% rename from c++/include/boost/describe/modifier_description.hpp rename to c++/boost/describe/modifier_description.hpp diff --git a/c++/include/boost/describe/modifiers.hpp b/c++/boost/describe/modifiers.hpp similarity index 100% rename from c++/include/boost/describe/modifiers.hpp rename to c++/boost/describe/modifiers.hpp diff --git a/c++/include/boost/describe/operators.hpp b/c++/boost/describe/operators.hpp similarity index 100% rename from c++/include/boost/describe/operators.hpp rename to c++/boost/describe/operators.hpp diff --git a/c++/include/boost/detail/algorithm.hpp b/c++/boost/detail/algorithm.hpp similarity index 100% rename from c++/include/boost/detail/algorithm.hpp rename to c++/boost/detail/algorithm.hpp diff --git a/c++/include/boost/detail/allocator_utilities.hpp b/c++/boost/detail/allocator_utilities.hpp similarity index 100% rename from c++/include/boost/detail/allocator_utilities.hpp rename to c++/boost/detail/allocator_utilities.hpp diff --git a/c++/include/boost/detail/atomic_count.hpp b/c++/boost/detail/atomic_count.hpp similarity index 100% rename from c++/include/boost/detail/atomic_count.hpp rename to c++/boost/detail/atomic_count.hpp diff --git a/c++/include/boost/detail/basic_pointerbuf.hpp b/c++/boost/detail/basic_pointerbuf.hpp similarity index 100% rename from c++/include/boost/detail/basic_pointerbuf.hpp rename to c++/boost/detail/basic_pointerbuf.hpp diff --git a/c++/include/boost/detail/binary_search.hpp b/c++/boost/detail/binary_search.hpp similarity index 100% rename from c++/include/boost/detail/binary_search.hpp rename to c++/boost/detail/binary_search.hpp diff --git a/c++/include/boost/detail/bitmask.hpp b/c++/boost/detail/bitmask.hpp similarity index 100% rename from c++/include/boost/detail/bitmask.hpp rename to c++/boost/detail/bitmask.hpp diff --git a/c++/include/boost/detail/call_traits.hpp b/c++/boost/detail/call_traits.hpp similarity index 100% rename from c++/include/boost/detail/call_traits.hpp rename to c++/boost/detail/call_traits.hpp diff --git a/c++/include/boost/detail/catch_exceptions.hpp b/c++/boost/detail/catch_exceptions.hpp similarity index 100% rename from c++/include/boost/detail/catch_exceptions.hpp rename to c++/boost/detail/catch_exceptions.hpp diff --git a/c++/include/boost/detail/compressed_pair.hpp b/c++/boost/detail/compressed_pair.hpp similarity index 100% rename from c++/include/boost/detail/compressed_pair.hpp rename to c++/boost/detail/compressed_pair.hpp diff --git a/c++/include/boost/detail/container_fwd.hpp b/c++/boost/detail/container_fwd.hpp similarity index 100% rename from c++/include/boost/detail/container_fwd.hpp rename to c++/boost/detail/container_fwd.hpp diff --git a/c++/include/boost/detail/fenv.hpp b/c++/boost/detail/fenv.hpp similarity index 100% rename from c++/include/boost/detail/fenv.hpp rename to c++/boost/detail/fenv.hpp diff --git a/c++/include/boost/detail/has_default_constructor.hpp b/c++/boost/detail/has_default_constructor.hpp similarity index 100% rename from c++/include/boost/detail/has_default_constructor.hpp rename to c++/boost/detail/has_default_constructor.hpp diff --git a/c++/include/boost/detail/identifier.hpp b/c++/boost/detail/identifier.hpp similarity index 100% rename from c++/include/boost/detail/identifier.hpp rename to c++/boost/detail/identifier.hpp diff --git a/c++/include/boost/detail/indirect_traits.hpp b/c++/boost/detail/indirect_traits.hpp similarity index 100% rename from c++/include/boost/detail/indirect_traits.hpp rename to c++/boost/detail/indirect_traits.hpp diff --git a/c++/include/boost/detail/interlocked.hpp b/c++/boost/detail/interlocked.hpp similarity index 100% rename from c++/include/boost/detail/interlocked.hpp rename to c++/boost/detail/interlocked.hpp diff --git a/c++/include/boost/detail/is_incrementable.hpp b/c++/boost/detail/is_incrementable.hpp similarity index 100% rename from c++/include/boost/detail/is_incrementable.hpp rename to c++/boost/detail/is_incrementable.hpp diff --git a/c++/include/boost/detail/is_sorted.hpp b/c++/boost/detail/is_sorted.hpp similarity index 100% rename from c++/include/boost/detail/is_sorted.hpp rename to c++/boost/detail/is_sorted.hpp diff --git a/c++/include/boost/detail/is_xxx.hpp b/c++/boost/detail/is_xxx.hpp similarity index 100% rename from c++/include/boost/detail/is_xxx.hpp rename to c++/boost/detail/is_xxx.hpp diff --git a/c++/include/boost/detail/iterator.hpp b/c++/boost/detail/iterator.hpp similarity index 100% rename from c++/include/boost/detail/iterator.hpp rename to c++/boost/detail/iterator.hpp diff --git a/c++/include/boost/detail/lcast_precision.hpp b/c++/boost/detail/lcast_precision.hpp similarity index 100% rename from c++/include/boost/detail/lcast_precision.hpp rename to c++/boost/detail/lcast_precision.hpp diff --git a/c++/include/boost/detail/lightweight_main.hpp b/c++/boost/detail/lightweight_main.hpp similarity index 100% rename from c++/include/boost/detail/lightweight_main.hpp rename to c++/boost/detail/lightweight_main.hpp diff --git a/c++/include/boost/detail/lightweight_mutex.hpp b/c++/boost/detail/lightweight_mutex.hpp similarity index 100% rename from c++/include/boost/detail/lightweight_mutex.hpp rename to c++/boost/detail/lightweight_mutex.hpp diff --git a/c++/include/boost/detail/lightweight_test.hpp b/c++/boost/detail/lightweight_test.hpp similarity index 100% rename from c++/include/boost/detail/lightweight_test.hpp rename to c++/boost/detail/lightweight_test.hpp diff --git a/c++/include/boost/detail/lightweight_test_report.hpp b/c++/boost/detail/lightweight_test_report.hpp similarity index 100% rename from c++/include/boost/detail/lightweight_test_report.hpp rename to c++/boost/detail/lightweight_test_report.hpp diff --git a/c++/include/boost/detail/lightweight_thread.hpp b/c++/boost/detail/lightweight_thread.hpp similarity index 100% rename from c++/include/boost/detail/lightweight_thread.hpp rename to c++/boost/detail/lightweight_thread.hpp diff --git a/c++/include/boost/detail/named_template_params.hpp b/c++/boost/detail/named_template_params.hpp similarity index 100% rename from c++/include/boost/detail/named_template_params.hpp rename to c++/boost/detail/named_template_params.hpp diff --git a/c++/include/boost/detail/no_exceptions_support.hpp b/c++/boost/detail/no_exceptions_support.hpp similarity index 100% rename from c++/include/boost/detail/no_exceptions_support.hpp rename to c++/boost/detail/no_exceptions_support.hpp diff --git a/c++/include/boost/detail/numeric_traits.hpp b/c++/boost/detail/numeric_traits.hpp similarity index 100% rename from c++/include/boost/detail/numeric_traits.hpp rename to c++/boost/detail/numeric_traits.hpp diff --git a/c++/include/boost/detail/ob_compressed_pair.hpp b/c++/boost/detail/ob_compressed_pair.hpp similarity index 100% rename from c++/include/boost/detail/ob_compressed_pair.hpp rename to c++/boost/detail/ob_compressed_pair.hpp diff --git a/c++/include/boost/detail/quick_allocator.hpp b/c++/boost/detail/quick_allocator.hpp similarity index 100% rename from c++/include/boost/detail/quick_allocator.hpp rename to c++/boost/detail/quick_allocator.hpp diff --git a/c++/include/boost/detail/reference_content.hpp b/c++/boost/detail/reference_content.hpp similarity index 100% rename from c++/include/boost/detail/reference_content.hpp rename to c++/boost/detail/reference_content.hpp diff --git a/c++/include/boost/detail/scoped_enum_emulation.hpp b/c++/boost/detail/scoped_enum_emulation.hpp similarity index 100% rename from c++/include/boost/detail/scoped_enum_emulation.hpp rename to c++/boost/detail/scoped_enum_emulation.hpp diff --git a/c++/include/boost/detail/select_type.hpp b/c++/boost/detail/select_type.hpp similarity index 100% rename from c++/include/boost/detail/select_type.hpp rename to c++/boost/detail/select_type.hpp diff --git a/c++/include/boost/detail/sp_typeinfo.hpp b/c++/boost/detail/sp_typeinfo.hpp similarity index 100% rename from c++/include/boost/detail/sp_typeinfo.hpp rename to c++/boost/detail/sp_typeinfo.hpp diff --git a/c++/include/boost/detail/templated_streams.hpp b/c++/boost/detail/templated_streams.hpp similarity index 100% rename from c++/include/boost/detail/templated_streams.hpp rename to c++/boost/detail/templated_streams.hpp diff --git a/c++/include/boost/detail/utf8_codecvt_facet.hpp b/c++/boost/detail/utf8_codecvt_facet.hpp similarity index 100% rename from c++/include/boost/detail/utf8_codecvt_facet.hpp rename to c++/boost/detail/utf8_codecvt_facet.hpp diff --git a/c++/include/boost/detail/utf8_codecvt_facet.ipp b/c++/boost/detail/utf8_codecvt_facet.ipp similarity index 100% rename from c++/include/boost/detail/utf8_codecvt_facet.ipp rename to c++/boost/detail/utf8_codecvt_facet.ipp diff --git a/c++/include/boost/detail/winapi/access_rights.hpp b/c++/boost/detail/winapi/access_rights.hpp similarity index 100% rename from c++/include/boost/detail/winapi/access_rights.hpp rename to c++/boost/detail/winapi/access_rights.hpp diff --git a/c++/include/boost/detail/winapi/apc.hpp b/c++/boost/detail/winapi/apc.hpp similarity index 100% rename from c++/include/boost/detail/winapi/apc.hpp rename to c++/boost/detail/winapi/apc.hpp diff --git a/c++/include/boost/detail/winapi/basic_types.hpp b/c++/boost/detail/winapi/basic_types.hpp similarity index 100% rename from c++/include/boost/detail/winapi/basic_types.hpp rename to c++/boost/detail/winapi/basic_types.hpp diff --git a/c++/include/boost/detail/winapi/bcrypt.hpp b/c++/boost/detail/winapi/bcrypt.hpp similarity index 100% rename from c++/include/boost/detail/winapi/bcrypt.hpp rename to c++/boost/detail/winapi/bcrypt.hpp diff --git a/c++/include/boost/detail/winapi/character_code_conversion.hpp b/c++/boost/detail/winapi/character_code_conversion.hpp similarity index 100% rename from c++/include/boost/detail/winapi/character_code_conversion.hpp rename to c++/boost/detail/winapi/character_code_conversion.hpp diff --git a/c++/include/boost/detail/winapi/condition_variable.hpp b/c++/boost/detail/winapi/condition_variable.hpp similarity index 100% rename from c++/include/boost/detail/winapi/condition_variable.hpp rename to c++/boost/detail/winapi/condition_variable.hpp diff --git a/c++/include/boost/detail/winapi/config.hpp b/c++/boost/detail/winapi/config.hpp similarity index 100% rename from c++/include/boost/detail/winapi/config.hpp rename to c++/boost/detail/winapi/config.hpp diff --git a/c++/include/boost/detail/winapi/critical_section.hpp b/c++/boost/detail/winapi/critical_section.hpp similarity index 100% rename from c++/include/boost/detail/winapi/critical_section.hpp rename to c++/boost/detail/winapi/critical_section.hpp diff --git a/c++/include/boost/detail/winapi/crypt.hpp b/c++/boost/detail/winapi/crypt.hpp similarity index 100% rename from c++/include/boost/detail/winapi/crypt.hpp rename to c++/boost/detail/winapi/crypt.hpp diff --git a/c++/include/boost/detail/winapi/dbghelp.hpp b/c++/boost/detail/winapi/dbghelp.hpp similarity index 100% rename from c++/include/boost/detail/winapi/dbghelp.hpp rename to c++/boost/detail/winapi/dbghelp.hpp diff --git a/c++/include/boost/detail/winapi/debugapi.hpp b/c++/boost/detail/winapi/debugapi.hpp similarity index 100% rename from c++/include/boost/detail/winapi/debugapi.hpp rename to c++/boost/detail/winapi/debugapi.hpp diff --git a/c++/include/boost/detail/winapi/detail/deprecated_namespace.hpp b/c++/boost/detail/winapi/detail/deprecated_namespace.hpp similarity index 100% rename from c++/include/boost/detail/winapi/detail/deprecated_namespace.hpp rename to c++/boost/detail/winapi/detail/deprecated_namespace.hpp diff --git a/c++/include/boost/detail/winapi/directory_management.hpp b/c++/boost/detail/winapi/directory_management.hpp similarity index 100% rename from c++/include/boost/detail/winapi/directory_management.hpp rename to c++/boost/detail/winapi/directory_management.hpp diff --git a/c++/include/boost/detail/winapi/dll.hpp b/c++/boost/detail/winapi/dll.hpp similarity index 100% rename from c++/include/boost/detail/winapi/dll.hpp rename to c++/boost/detail/winapi/dll.hpp diff --git a/c++/include/boost/detail/winapi/environment.hpp b/c++/boost/detail/winapi/environment.hpp similarity index 100% rename from c++/include/boost/detail/winapi/environment.hpp rename to c++/boost/detail/winapi/environment.hpp diff --git a/c++/include/boost/detail/winapi/error_codes.hpp b/c++/boost/detail/winapi/error_codes.hpp similarity index 100% rename from c++/include/boost/detail/winapi/error_codes.hpp rename to c++/boost/detail/winapi/error_codes.hpp diff --git a/c++/include/boost/detail/winapi/error_handling.hpp b/c++/boost/detail/winapi/error_handling.hpp similarity index 100% rename from c++/include/boost/detail/winapi/error_handling.hpp rename to c++/boost/detail/winapi/error_handling.hpp diff --git a/c++/include/boost/detail/winapi/event.hpp b/c++/boost/detail/winapi/event.hpp similarity index 100% rename from c++/include/boost/detail/winapi/event.hpp rename to c++/boost/detail/winapi/event.hpp diff --git a/c++/include/boost/detail/winapi/file_management.hpp b/c++/boost/detail/winapi/file_management.hpp similarity index 100% rename from c++/include/boost/detail/winapi/file_management.hpp rename to c++/boost/detail/winapi/file_management.hpp diff --git a/c++/include/boost/detail/winapi/file_mapping.hpp b/c++/boost/detail/winapi/file_mapping.hpp similarity index 100% rename from c++/include/boost/detail/winapi/file_mapping.hpp rename to c++/boost/detail/winapi/file_mapping.hpp diff --git a/c++/include/boost/detail/winapi/get_current_process.hpp b/c++/boost/detail/winapi/get_current_process.hpp similarity index 100% rename from c++/include/boost/detail/winapi/get_current_process.hpp rename to c++/boost/detail/winapi/get_current_process.hpp diff --git a/c++/include/boost/detail/winapi/get_current_process_id.hpp b/c++/boost/detail/winapi/get_current_process_id.hpp similarity index 100% rename from c++/include/boost/detail/winapi/get_current_process_id.hpp rename to c++/boost/detail/winapi/get_current_process_id.hpp diff --git a/c++/include/boost/detail/winapi/get_current_thread.hpp b/c++/boost/detail/winapi/get_current_thread.hpp similarity index 100% rename from c++/include/boost/detail/winapi/get_current_thread.hpp rename to c++/boost/detail/winapi/get_current_thread.hpp diff --git a/c++/include/boost/detail/winapi/get_current_thread_id.hpp b/c++/boost/detail/winapi/get_current_thread_id.hpp similarity index 100% rename from c++/include/boost/detail/winapi/get_current_thread_id.hpp rename to c++/boost/detail/winapi/get_current_thread_id.hpp diff --git a/c++/include/boost/detail/winapi/get_last_error.hpp b/c++/boost/detail/winapi/get_last_error.hpp similarity index 100% rename from c++/include/boost/detail/winapi/get_last_error.hpp rename to c++/boost/detail/winapi/get_last_error.hpp diff --git a/c++/include/boost/detail/winapi/get_process_times.hpp b/c++/boost/detail/winapi/get_process_times.hpp similarity index 100% rename from c++/include/boost/detail/winapi/get_process_times.hpp rename to c++/boost/detail/winapi/get_process_times.hpp diff --git a/c++/include/boost/detail/winapi/get_system_directory.hpp b/c++/boost/detail/winapi/get_system_directory.hpp similarity index 100% rename from c++/include/boost/detail/winapi/get_system_directory.hpp rename to c++/boost/detail/winapi/get_system_directory.hpp diff --git a/c++/include/boost/detail/winapi/get_thread_times.hpp b/c++/boost/detail/winapi/get_thread_times.hpp similarity index 100% rename from c++/include/boost/detail/winapi/get_thread_times.hpp rename to c++/boost/detail/winapi/get_thread_times.hpp diff --git a/c++/include/boost/detail/winapi/handle_info.hpp b/c++/boost/detail/winapi/handle_info.hpp similarity index 100% rename from c++/include/boost/detail/winapi/handle_info.hpp rename to c++/boost/detail/winapi/handle_info.hpp diff --git a/c++/include/boost/detail/winapi/handles.hpp b/c++/boost/detail/winapi/handles.hpp similarity index 100% rename from c++/include/boost/detail/winapi/handles.hpp rename to c++/boost/detail/winapi/handles.hpp diff --git a/c++/include/boost/detail/winapi/heap_memory.hpp b/c++/boost/detail/winapi/heap_memory.hpp similarity index 100% rename from c++/include/boost/detail/winapi/heap_memory.hpp rename to c++/boost/detail/winapi/heap_memory.hpp diff --git a/c++/include/boost/detail/winapi/init_once.hpp b/c++/boost/detail/winapi/init_once.hpp similarity index 100% rename from c++/include/boost/detail/winapi/init_once.hpp rename to c++/boost/detail/winapi/init_once.hpp diff --git a/c++/include/boost/detail/winapi/jobs.hpp b/c++/boost/detail/winapi/jobs.hpp similarity index 100% rename from c++/include/boost/detail/winapi/jobs.hpp rename to c++/boost/detail/winapi/jobs.hpp diff --git a/c++/include/boost/detail/winapi/limits.hpp b/c++/boost/detail/winapi/limits.hpp similarity index 100% rename from c++/include/boost/detail/winapi/limits.hpp rename to c++/boost/detail/winapi/limits.hpp diff --git a/c++/include/boost/detail/winapi/local_memory.hpp b/c++/boost/detail/winapi/local_memory.hpp similarity index 100% rename from c++/include/boost/detail/winapi/local_memory.hpp rename to c++/boost/detail/winapi/local_memory.hpp diff --git a/c++/include/boost/detail/winapi/memory.hpp b/c++/boost/detail/winapi/memory.hpp similarity index 100% rename from c++/include/boost/detail/winapi/memory.hpp rename to c++/boost/detail/winapi/memory.hpp diff --git a/c++/include/boost/detail/winapi/mutex.hpp b/c++/boost/detail/winapi/mutex.hpp similarity index 100% rename from c++/include/boost/detail/winapi/mutex.hpp rename to c++/boost/detail/winapi/mutex.hpp diff --git a/c++/include/boost/detail/winapi/overlapped.hpp b/c++/boost/detail/winapi/overlapped.hpp similarity index 100% rename from c++/include/boost/detail/winapi/overlapped.hpp rename to c++/boost/detail/winapi/overlapped.hpp diff --git a/c++/include/boost/detail/winapi/page_protection_flags.hpp b/c++/boost/detail/winapi/page_protection_flags.hpp similarity index 100% rename from c++/include/boost/detail/winapi/page_protection_flags.hpp rename to c++/boost/detail/winapi/page_protection_flags.hpp diff --git a/c++/include/boost/detail/winapi/pipes.hpp b/c++/boost/detail/winapi/pipes.hpp similarity index 100% rename from c++/include/boost/detail/winapi/pipes.hpp rename to c++/boost/detail/winapi/pipes.hpp diff --git a/c++/include/boost/detail/winapi/priority_class.hpp b/c++/boost/detail/winapi/priority_class.hpp similarity index 100% rename from c++/include/boost/detail/winapi/priority_class.hpp rename to c++/boost/detail/winapi/priority_class.hpp diff --git a/c++/include/boost/detail/winapi/process.hpp b/c++/boost/detail/winapi/process.hpp similarity index 100% rename from c++/include/boost/detail/winapi/process.hpp rename to c++/boost/detail/winapi/process.hpp diff --git a/c++/include/boost/detail/winapi/security.hpp b/c++/boost/detail/winapi/security.hpp similarity index 100% rename from c++/include/boost/detail/winapi/security.hpp rename to c++/boost/detail/winapi/security.hpp diff --git a/c++/include/boost/detail/winapi/semaphore.hpp b/c++/boost/detail/winapi/semaphore.hpp similarity index 100% rename from c++/include/boost/detail/winapi/semaphore.hpp rename to c++/boost/detail/winapi/semaphore.hpp diff --git a/c++/include/boost/detail/winapi/shell.hpp b/c++/boost/detail/winapi/shell.hpp similarity index 100% rename from c++/include/boost/detail/winapi/shell.hpp rename to c++/boost/detail/winapi/shell.hpp diff --git a/c++/include/boost/detail/winapi/show_window.hpp b/c++/boost/detail/winapi/show_window.hpp similarity index 100% rename from c++/include/boost/detail/winapi/show_window.hpp rename to c++/boost/detail/winapi/show_window.hpp diff --git a/c++/include/boost/detail/winapi/srw_lock.hpp b/c++/boost/detail/winapi/srw_lock.hpp similarity index 100% rename from c++/include/boost/detail/winapi/srw_lock.hpp rename to c++/boost/detail/winapi/srw_lock.hpp diff --git a/c++/include/boost/detail/winapi/stack_backtrace.hpp b/c++/boost/detail/winapi/stack_backtrace.hpp similarity index 100% rename from c++/include/boost/detail/winapi/stack_backtrace.hpp rename to c++/boost/detail/winapi/stack_backtrace.hpp diff --git a/c++/include/boost/detail/winapi/synchronization.hpp b/c++/boost/detail/winapi/synchronization.hpp similarity index 100% rename from c++/include/boost/detail/winapi/synchronization.hpp rename to c++/boost/detail/winapi/synchronization.hpp diff --git a/c++/include/boost/detail/winapi/system.hpp b/c++/boost/detail/winapi/system.hpp similarity index 100% rename from c++/include/boost/detail/winapi/system.hpp rename to c++/boost/detail/winapi/system.hpp diff --git a/c++/include/boost/detail/winapi/thread.hpp b/c++/boost/detail/winapi/thread.hpp similarity index 100% rename from c++/include/boost/detail/winapi/thread.hpp rename to c++/boost/detail/winapi/thread.hpp diff --git a/c++/include/boost/detail/winapi/thread_pool.hpp b/c++/boost/detail/winapi/thread_pool.hpp similarity index 100% rename from c++/include/boost/detail/winapi/thread_pool.hpp rename to c++/boost/detail/winapi/thread_pool.hpp diff --git a/c++/include/boost/detail/winapi/time.hpp b/c++/boost/detail/winapi/time.hpp similarity index 100% rename from c++/include/boost/detail/winapi/time.hpp rename to c++/boost/detail/winapi/time.hpp diff --git a/c++/include/boost/detail/winapi/timers.hpp b/c++/boost/detail/winapi/timers.hpp similarity index 100% rename from c++/include/boost/detail/winapi/timers.hpp rename to c++/boost/detail/winapi/timers.hpp diff --git a/c++/include/boost/detail/winapi/tls.hpp b/c++/boost/detail/winapi/tls.hpp similarity index 100% rename from c++/include/boost/detail/winapi/tls.hpp rename to c++/boost/detail/winapi/tls.hpp diff --git a/c++/include/boost/detail/winapi/wait.hpp b/c++/boost/detail/winapi/wait.hpp similarity index 100% rename from c++/include/boost/detail/winapi/wait.hpp rename to c++/boost/detail/winapi/wait.hpp diff --git a/c++/include/boost/detail/winapi/waitable_timer.hpp b/c++/boost/detail/winapi/waitable_timer.hpp similarity index 100% rename from c++/include/boost/detail/winapi/waitable_timer.hpp rename to c++/boost/detail/winapi/waitable_timer.hpp diff --git a/c++/include/boost/detail/workaround.hpp b/c++/boost/detail/workaround.hpp similarity index 100% rename from c++/include/boost/detail/workaround.hpp rename to c++/boost/detail/workaround.hpp diff --git a/c++/include/boost/dll.hpp b/c++/boost/dll.hpp similarity index 100% rename from c++/include/boost/dll.hpp rename to c++/boost/dll.hpp diff --git a/c++/include/boost/dynamic_bitset.hpp b/c++/boost/dynamic_bitset.hpp similarity index 100% rename from c++/include/boost/dynamic_bitset.hpp rename to c++/boost/dynamic_bitset.hpp diff --git a/c++/include/boost/dynamic_bitset_fwd.hpp b/c++/boost/dynamic_bitset_fwd.hpp similarity index 100% rename from c++/include/boost/dynamic_bitset_fwd.hpp rename to c++/boost/dynamic_bitset_fwd.hpp diff --git a/c++/include/boost/enable_shared_from_this.hpp b/c++/boost/enable_shared_from_this.hpp similarity index 100% rename from c++/include/boost/enable_shared_from_this.hpp rename to c++/boost/enable_shared_from_this.hpp diff --git a/c++/include/boost/endian.hpp b/c++/boost/endian.hpp similarity index 100% rename from c++/include/boost/endian.hpp rename to c++/boost/endian.hpp diff --git a/c++/include/boost/endian/arithmetic.hpp b/c++/boost/endian/arithmetic.hpp similarity index 100% rename from c++/include/boost/endian/arithmetic.hpp rename to c++/boost/endian/arithmetic.hpp diff --git a/c++/include/boost/endian/buffers.hpp b/c++/boost/endian/buffers.hpp similarity index 100% rename from c++/include/boost/endian/buffers.hpp rename to c++/boost/endian/buffers.hpp diff --git a/c++/include/boost/endian/conversion.hpp b/c++/boost/endian/conversion.hpp similarity index 100% rename from c++/include/boost/endian/conversion.hpp rename to c++/boost/endian/conversion.hpp diff --git a/c++/include/boost/endian/detail/disable_warnings.hpp b/c++/boost/endian/detail/disable_warnings.hpp similarity index 100% rename from c++/include/boost/endian/detail/disable_warnings.hpp rename to c++/boost/endian/detail/disable_warnings.hpp diff --git a/c++/include/boost/endian/detail/disable_warnings_pop.hpp b/c++/boost/endian/detail/disable_warnings_pop.hpp similarity index 100% rename from c++/include/boost/endian/detail/disable_warnings_pop.hpp rename to c++/boost/endian/detail/disable_warnings_pop.hpp diff --git a/c++/include/boost/endian/detail/endian_load.hpp b/c++/boost/endian/detail/endian_load.hpp similarity index 100% rename from c++/include/boost/endian/detail/endian_load.hpp rename to c++/boost/endian/detail/endian_load.hpp diff --git a/c++/include/boost/endian/detail/endian_reverse.hpp b/c++/boost/endian/detail/endian_reverse.hpp similarity index 100% rename from c++/include/boost/endian/detail/endian_reverse.hpp rename to c++/boost/endian/detail/endian_reverse.hpp diff --git a/c++/include/boost/endian/detail/endian_store.hpp b/c++/boost/endian/detail/endian_store.hpp similarity index 100% rename from c++/include/boost/endian/detail/endian_store.hpp rename to c++/boost/endian/detail/endian_store.hpp diff --git a/c++/include/boost/endian/detail/integral_by_size.hpp b/c++/boost/endian/detail/integral_by_size.hpp similarity index 100% rename from c++/include/boost/endian/detail/integral_by_size.hpp rename to c++/boost/endian/detail/integral_by_size.hpp diff --git a/c++/include/boost/endian/detail/intrinsic.hpp b/c++/boost/endian/detail/intrinsic.hpp similarity index 100% rename from c++/include/boost/endian/detail/intrinsic.hpp rename to c++/boost/endian/detail/intrinsic.hpp diff --git a/c++/include/boost/endian/detail/is_scoped_enum.hpp b/c++/boost/endian/detail/is_scoped_enum.hpp similarity index 100% rename from c++/include/boost/endian/detail/is_scoped_enum.hpp rename to c++/boost/endian/detail/is_scoped_enum.hpp diff --git a/c++/include/boost/endian/detail/is_trivially_copyable.hpp b/c++/boost/endian/detail/is_trivially_copyable.hpp similarity index 100% rename from c++/include/boost/endian/detail/is_trivially_copyable.hpp rename to c++/boost/endian/detail/is_trivially_copyable.hpp diff --git a/c++/include/boost/endian/detail/order.hpp b/c++/boost/endian/detail/order.hpp similarity index 100% rename from c++/include/boost/endian/detail/order.hpp rename to c++/boost/endian/detail/order.hpp diff --git a/c++/include/boost/endian/detail/requires_cxx11.hpp b/c++/boost/endian/detail/requires_cxx11.hpp similarity index 100% rename from c++/include/boost/endian/detail/requires_cxx11.hpp rename to c++/boost/endian/detail/requires_cxx11.hpp diff --git a/c++/include/boost/endian/endian.hpp b/c++/boost/endian/endian.hpp similarity index 100% rename from c++/include/boost/endian/endian.hpp rename to c++/boost/endian/endian.hpp diff --git a/c++/include/boost/exception/all.hpp b/c++/boost/exception/all.hpp similarity index 100% rename from c++/include/boost/exception/all.hpp rename to c++/boost/exception/all.hpp diff --git a/c++/include/boost/exception/current_exception_cast.hpp b/c++/boost/exception/current_exception_cast.hpp similarity index 100% rename from c++/include/boost/exception/current_exception_cast.hpp rename to c++/boost/exception/current_exception_cast.hpp diff --git a/c++/include/boost/exception/detail/clone_current_exception.hpp b/c++/boost/exception/detail/clone_current_exception.hpp similarity index 100% rename from c++/include/boost/exception/detail/clone_current_exception.hpp rename to c++/boost/exception/detail/clone_current_exception.hpp diff --git a/c++/include/boost/exception/detail/error_info_impl.hpp b/c++/boost/exception/detail/error_info_impl.hpp similarity index 100% rename from c++/include/boost/exception/detail/error_info_impl.hpp rename to c++/boost/exception/detail/error_info_impl.hpp diff --git a/c++/include/boost/exception/detail/exception_ptr.hpp b/c++/boost/exception/detail/exception_ptr.hpp similarity index 100% rename from c++/include/boost/exception/detail/exception_ptr.hpp rename to c++/boost/exception/detail/exception_ptr.hpp diff --git a/c++/include/boost/exception/detail/is_output_streamable.hpp b/c++/boost/exception/detail/is_output_streamable.hpp similarity index 100% rename from c++/include/boost/exception/detail/is_output_streamable.hpp rename to c++/boost/exception/detail/is_output_streamable.hpp diff --git a/c++/include/boost/exception/detail/object_hex_dump.hpp b/c++/boost/exception/detail/object_hex_dump.hpp similarity index 100% rename from c++/include/boost/exception/detail/object_hex_dump.hpp rename to c++/boost/exception/detail/object_hex_dump.hpp diff --git a/c++/include/boost/exception/detail/shared_ptr.hpp b/c++/boost/exception/detail/shared_ptr.hpp similarity index 100% rename from c++/include/boost/exception/detail/shared_ptr.hpp rename to c++/boost/exception/detail/shared_ptr.hpp diff --git a/c++/include/boost/exception/detail/type_info.hpp b/c++/boost/exception/detail/type_info.hpp similarity index 100% rename from c++/include/boost/exception/detail/type_info.hpp rename to c++/boost/exception/detail/type_info.hpp diff --git a/c++/include/boost/exception/diagnostic_information.hpp b/c++/boost/exception/diagnostic_information.hpp similarity index 100% rename from c++/include/boost/exception/diagnostic_information.hpp rename to c++/boost/exception/diagnostic_information.hpp diff --git a/c++/include/boost/exception/enable_current_exception.hpp b/c++/boost/exception/enable_current_exception.hpp similarity index 100% rename from c++/include/boost/exception/enable_current_exception.hpp rename to c++/boost/exception/enable_current_exception.hpp diff --git a/c++/include/boost/exception/enable_error_info.hpp b/c++/boost/exception/enable_error_info.hpp similarity index 100% rename from c++/include/boost/exception/enable_error_info.hpp rename to c++/boost/exception/enable_error_info.hpp diff --git a/c++/include/boost/exception/errinfo_api_function.hpp b/c++/boost/exception/errinfo_api_function.hpp similarity index 100% rename from c++/include/boost/exception/errinfo_api_function.hpp rename to c++/boost/exception/errinfo_api_function.hpp diff --git a/c++/include/boost/exception/errinfo_at_line.hpp b/c++/boost/exception/errinfo_at_line.hpp similarity index 100% rename from c++/include/boost/exception/errinfo_at_line.hpp rename to c++/boost/exception/errinfo_at_line.hpp diff --git a/c++/include/boost/exception/errinfo_errno.hpp b/c++/boost/exception/errinfo_errno.hpp similarity index 100% rename from c++/include/boost/exception/errinfo_errno.hpp rename to c++/boost/exception/errinfo_errno.hpp diff --git a/c++/include/boost/exception/errinfo_file_handle.hpp b/c++/boost/exception/errinfo_file_handle.hpp similarity index 100% rename from c++/include/boost/exception/errinfo_file_handle.hpp rename to c++/boost/exception/errinfo_file_handle.hpp diff --git a/c++/include/boost/exception/errinfo_file_name.hpp b/c++/boost/exception/errinfo_file_name.hpp similarity index 100% rename from c++/include/boost/exception/errinfo_file_name.hpp rename to c++/boost/exception/errinfo_file_name.hpp diff --git a/c++/include/boost/exception/errinfo_file_open_mode.hpp b/c++/boost/exception/errinfo_file_open_mode.hpp similarity index 100% rename from c++/include/boost/exception/errinfo_file_open_mode.hpp rename to c++/boost/exception/errinfo_file_open_mode.hpp diff --git a/c++/include/boost/exception/errinfo_nested_exception.hpp b/c++/boost/exception/errinfo_nested_exception.hpp similarity index 100% rename from c++/include/boost/exception/errinfo_nested_exception.hpp rename to c++/boost/exception/errinfo_nested_exception.hpp diff --git a/c++/include/boost/exception/errinfo_type_info_name.hpp b/c++/boost/exception/errinfo_type_info_name.hpp similarity index 100% rename from c++/include/boost/exception/errinfo_type_info_name.hpp rename to c++/boost/exception/errinfo_type_info_name.hpp diff --git a/c++/include/boost/exception/error_info.hpp b/c++/boost/exception/error_info.hpp similarity index 100% rename from c++/include/boost/exception/error_info.hpp rename to c++/boost/exception/error_info.hpp diff --git a/c++/include/boost/exception/exception.hpp b/c++/boost/exception/exception.hpp similarity index 100% rename from c++/include/boost/exception/exception.hpp rename to c++/boost/exception/exception.hpp diff --git a/c++/include/boost/exception/get_error_info.hpp b/c++/boost/exception/get_error_info.hpp similarity index 100% rename from c++/include/boost/exception/get_error_info.hpp rename to c++/boost/exception/get_error_info.hpp diff --git a/c++/include/boost/exception/info.hpp b/c++/boost/exception/info.hpp similarity index 100% rename from c++/include/boost/exception/info.hpp rename to c++/boost/exception/info.hpp diff --git a/c++/include/boost/exception/info_tuple.hpp b/c++/boost/exception/info_tuple.hpp similarity index 100% rename from c++/include/boost/exception/info_tuple.hpp rename to c++/boost/exception/info_tuple.hpp diff --git a/c++/include/boost/exception/to_string.hpp b/c++/boost/exception/to_string.hpp similarity index 100% rename from c++/include/boost/exception/to_string.hpp rename to c++/boost/exception/to_string.hpp diff --git a/c++/include/boost/exception/to_string_stub.hpp b/c++/boost/exception/to_string_stub.hpp similarity index 100% rename from c++/include/boost/exception/to_string_stub.hpp rename to c++/boost/exception/to_string_stub.hpp diff --git a/c++/include/boost/exception_ptr.hpp b/c++/boost/exception_ptr.hpp similarity index 100% rename from c++/include/boost/exception_ptr.hpp rename to c++/boost/exception_ptr.hpp diff --git a/c++/include/boost/fiber/algo/algorithm.hpp b/c++/boost/fiber/algo/algorithm.hpp similarity index 100% rename from c++/include/boost/fiber/algo/algorithm.hpp rename to c++/boost/fiber/algo/algorithm.hpp diff --git a/c++/include/boost/fiber/algo/round_robin.hpp b/c++/boost/fiber/algo/round_robin.hpp similarity index 100% rename from c++/include/boost/fiber/algo/round_robin.hpp rename to c++/boost/fiber/algo/round_robin.hpp diff --git a/c++/include/boost/fiber/algo/shared_work.hpp b/c++/boost/fiber/algo/shared_work.hpp similarity index 100% rename from c++/include/boost/fiber/algo/shared_work.hpp rename to c++/boost/fiber/algo/shared_work.hpp diff --git a/c++/include/boost/fiber/algo/work_stealing.hpp b/c++/boost/fiber/algo/work_stealing.hpp similarity index 100% rename from c++/include/boost/fiber/algo/work_stealing.hpp rename to c++/boost/fiber/algo/work_stealing.hpp diff --git a/c++/include/boost/fiber/all.hpp b/c++/boost/fiber/all.hpp similarity index 100% rename from c++/include/boost/fiber/all.hpp rename to c++/boost/fiber/all.hpp diff --git a/c++/include/boost/fiber/barrier.hpp b/c++/boost/fiber/barrier.hpp similarity index 100% rename from c++/include/boost/fiber/barrier.hpp rename to c++/boost/fiber/barrier.hpp diff --git a/c++/include/boost/fiber/buffered_channel.hpp b/c++/boost/fiber/buffered_channel.hpp similarity index 100% rename from c++/include/boost/fiber/buffered_channel.hpp rename to c++/boost/fiber/buffered_channel.hpp diff --git a/c++/include/boost/fiber/channel_op_status.hpp b/c++/boost/fiber/channel_op_status.hpp similarity index 100% rename from c++/include/boost/fiber/channel_op_status.hpp rename to c++/boost/fiber/channel_op_status.hpp diff --git a/c++/include/boost/fiber/condition_variable.hpp b/c++/boost/fiber/condition_variable.hpp similarity index 100% rename from c++/include/boost/fiber/condition_variable.hpp rename to c++/boost/fiber/condition_variable.hpp diff --git a/c++/include/boost/fiber/context.hpp b/c++/boost/fiber/context.hpp similarity index 100% rename from c++/include/boost/fiber/context.hpp rename to c++/boost/fiber/context.hpp diff --git a/c++/include/boost/fiber/cuda/waitfor.hpp b/c++/boost/fiber/cuda/waitfor.hpp similarity index 100% rename from c++/include/boost/fiber/cuda/waitfor.hpp rename to c++/boost/fiber/cuda/waitfor.hpp diff --git a/c++/include/boost/fiber/detail/config.hpp b/c++/boost/fiber/detail/config.hpp similarity index 100% rename from c++/include/boost/fiber/detail/config.hpp rename to c++/boost/fiber/detail/config.hpp diff --git a/c++/include/boost/fiber/detail/context_spinlock_queue.hpp b/c++/boost/fiber/detail/context_spinlock_queue.hpp similarity index 100% rename from c++/include/boost/fiber/detail/context_spinlock_queue.hpp rename to c++/boost/fiber/detail/context_spinlock_queue.hpp diff --git a/c++/include/boost/fiber/detail/context_spmc_queue.hpp b/c++/boost/fiber/detail/context_spmc_queue.hpp similarity index 100% rename from c++/include/boost/fiber/detail/context_spmc_queue.hpp rename to c++/boost/fiber/detail/context_spmc_queue.hpp diff --git a/c++/include/boost/fiber/detail/convert.hpp b/c++/boost/fiber/detail/convert.hpp similarity index 100% rename from c++/include/boost/fiber/detail/convert.hpp rename to c++/boost/fiber/detail/convert.hpp diff --git a/c++/include/boost/fiber/detail/cpu_relax.hpp b/c++/boost/fiber/detail/cpu_relax.hpp similarity index 100% rename from c++/include/boost/fiber/detail/cpu_relax.hpp rename to c++/boost/fiber/detail/cpu_relax.hpp diff --git a/c++/include/boost/fiber/detail/data.hpp b/c++/boost/fiber/detail/data.hpp similarity index 100% rename from c++/include/boost/fiber/detail/data.hpp rename to c++/boost/fiber/detail/data.hpp diff --git a/c++/include/boost/fiber/detail/decay_copy.hpp b/c++/boost/fiber/detail/decay_copy.hpp similarity index 100% rename from c++/include/boost/fiber/detail/decay_copy.hpp rename to c++/boost/fiber/detail/decay_copy.hpp diff --git a/c++/include/boost/fiber/detail/disable_overload.hpp b/c++/boost/fiber/detail/disable_overload.hpp similarity index 100% rename from c++/include/boost/fiber/detail/disable_overload.hpp rename to c++/boost/fiber/detail/disable_overload.hpp diff --git a/c++/include/boost/fiber/detail/exchange.hpp b/c++/boost/fiber/detail/exchange.hpp similarity index 100% rename from c++/include/boost/fiber/detail/exchange.hpp rename to c++/boost/fiber/detail/exchange.hpp diff --git a/c++/include/boost/fiber/detail/fss.hpp b/c++/boost/fiber/detail/fss.hpp similarity index 100% rename from c++/include/boost/fiber/detail/fss.hpp rename to c++/boost/fiber/detail/fss.hpp diff --git a/c++/include/boost/fiber/detail/futex.hpp b/c++/boost/fiber/detail/futex.hpp similarity index 100% rename from c++/include/boost/fiber/detail/futex.hpp rename to c++/boost/fiber/detail/futex.hpp diff --git a/c++/include/boost/fiber/detail/is_all_same.hpp b/c++/boost/fiber/detail/is_all_same.hpp similarity index 100% rename from c++/include/boost/fiber/detail/is_all_same.hpp rename to c++/boost/fiber/detail/is_all_same.hpp diff --git a/c++/include/boost/fiber/detail/rtm.hpp b/c++/boost/fiber/detail/rtm.hpp similarity index 100% rename from c++/include/boost/fiber/detail/rtm.hpp rename to c++/boost/fiber/detail/rtm.hpp diff --git a/c++/include/boost/fiber/detail/spinlock.hpp b/c++/boost/fiber/detail/spinlock.hpp similarity index 100% rename from c++/include/boost/fiber/detail/spinlock.hpp rename to c++/boost/fiber/detail/spinlock.hpp diff --git a/c++/include/boost/fiber/detail/spinlock_rtm.hpp b/c++/boost/fiber/detail/spinlock_rtm.hpp similarity index 100% rename from c++/include/boost/fiber/detail/spinlock_rtm.hpp rename to c++/boost/fiber/detail/spinlock_rtm.hpp diff --git a/c++/include/boost/fiber/detail/spinlock_status.hpp b/c++/boost/fiber/detail/spinlock_status.hpp similarity index 100% rename from c++/include/boost/fiber/detail/spinlock_status.hpp rename to c++/boost/fiber/detail/spinlock_status.hpp diff --git a/c++/include/boost/fiber/detail/spinlock_ttas.hpp b/c++/boost/fiber/detail/spinlock_ttas.hpp similarity index 100% rename from c++/include/boost/fiber/detail/spinlock_ttas.hpp rename to c++/boost/fiber/detail/spinlock_ttas.hpp diff --git a/c++/include/boost/fiber/detail/spinlock_ttas_adaptive.hpp b/c++/boost/fiber/detail/spinlock_ttas_adaptive.hpp similarity index 100% rename from c++/include/boost/fiber/detail/spinlock_ttas_adaptive.hpp rename to c++/boost/fiber/detail/spinlock_ttas_adaptive.hpp diff --git a/c++/include/boost/fiber/detail/spinlock_ttas_adaptive_futex.hpp b/c++/boost/fiber/detail/spinlock_ttas_adaptive_futex.hpp similarity index 100% rename from c++/include/boost/fiber/detail/spinlock_ttas_adaptive_futex.hpp rename to c++/boost/fiber/detail/spinlock_ttas_adaptive_futex.hpp diff --git a/c++/include/boost/fiber/detail/spinlock_ttas_futex.hpp b/c++/boost/fiber/detail/spinlock_ttas_futex.hpp similarity index 100% rename from c++/include/boost/fiber/detail/spinlock_ttas_futex.hpp rename to c++/boost/fiber/detail/spinlock_ttas_futex.hpp diff --git a/c++/include/boost/fiber/detail/thread_barrier.hpp b/c++/boost/fiber/detail/thread_barrier.hpp similarity index 100% rename from c++/include/boost/fiber/detail/thread_barrier.hpp rename to c++/boost/fiber/detail/thread_barrier.hpp diff --git a/c++/include/boost/fiber/exceptions.hpp b/c++/boost/fiber/exceptions.hpp similarity index 100% rename from c++/include/boost/fiber/exceptions.hpp rename to c++/boost/fiber/exceptions.hpp diff --git a/c++/include/boost/fiber/fiber.hpp b/c++/boost/fiber/fiber.hpp similarity index 100% rename from c++/include/boost/fiber/fiber.hpp rename to c++/boost/fiber/fiber.hpp diff --git a/c++/include/boost/fiber/fixedsize_stack.hpp b/c++/boost/fiber/fixedsize_stack.hpp similarity index 100% rename from c++/include/boost/fiber/fixedsize_stack.hpp rename to c++/boost/fiber/fixedsize_stack.hpp diff --git a/c++/include/boost/fiber/fss.hpp b/c++/boost/fiber/fss.hpp similarity index 100% rename from c++/include/boost/fiber/fss.hpp rename to c++/boost/fiber/fss.hpp diff --git a/c++/include/boost/fiber/future.hpp b/c++/boost/fiber/future.hpp similarity index 100% rename from c++/include/boost/fiber/future.hpp rename to c++/boost/fiber/future.hpp diff --git a/c++/include/boost/fiber/future/async.hpp b/c++/boost/fiber/future/async.hpp similarity index 100% rename from c++/include/boost/fiber/future/async.hpp rename to c++/boost/fiber/future/async.hpp diff --git a/c++/include/boost/fiber/future/detail/shared_state.hpp b/c++/boost/fiber/future/detail/shared_state.hpp similarity index 100% rename from c++/include/boost/fiber/future/detail/shared_state.hpp rename to c++/boost/fiber/future/detail/shared_state.hpp diff --git a/c++/include/boost/fiber/future/detail/shared_state_object.hpp b/c++/boost/fiber/future/detail/shared_state_object.hpp similarity index 100% rename from c++/include/boost/fiber/future/detail/shared_state_object.hpp rename to c++/boost/fiber/future/detail/shared_state_object.hpp diff --git a/c++/include/boost/fiber/future/detail/task_base.hpp b/c++/boost/fiber/future/detail/task_base.hpp similarity index 100% rename from c++/include/boost/fiber/future/detail/task_base.hpp rename to c++/boost/fiber/future/detail/task_base.hpp diff --git a/c++/include/boost/fiber/future/detail/task_object.hpp b/c++/boost/fiber/future/detail/task_object.hpp similarity index 100% rename from c++/include/boost/fiber/future/detail/task_object.hpp rename to c++/boost/fiber/future/detail/task_object.hpp diff --git a/c++/include/boost/fiber/future/future.hpp b/c++/boost/fiber/future/future.hpp similarity index 100% rename from c++/include/boost/fiber/future/future.hpp rename to c++/boost/fiber/future/future.hpp diff --git a/c++/include/boost/fiber/future/future_status.hpp b/c++/boost/fiber/future/future_status.hpp similarity index 100% rename from c++/include/boost/fiber/future/future_status.hpp rename to c++/boost/fiber/future/future_status.hpp diff --git a/c++/include/boost/fiber/future/packaged_task.hpp b/c++/boost/fiber/future/packaged_task.hpp similarity index 100% rename from c++/include/boost/fiber/future/packaged_task.hpp rename to c++/boost/fiber/future/packaged_task.hpp diff --git a/c++/include/boost/fiber/future/promise.hpp b/c++/boost/fiber/future/promise.hpp similarity index 100% rename from c++/include/boost/fiber/future/promise.hpp rename to c++/boost/fiber/future/promise.hpp diff --git a/c++/include/boost/fiber/hip/waitfor.hpp b/c++/boost/fiber/hip/waitfor.hpp similarity index 100% rename from c++/include/boost/fiber/hip/waitfor.hpp rename to c++/boost/fiber/hip/waitfor.hpp diff --git a/c++/include/boost/fiber/mutex.hpp b/c++/boost/fiber/mutex.hpp similarity index 100% rename from c++/include/boost/fiber/mutex.hpp rename to c++/boost/fiber/mutex.hpp diff --git a/c++/include/boost/fiber/numa/algo/work_stealing.hpp b/c++/boost/fiber/numa/algo/work_stealing.hpp similarity index 100% rename from c++/include/boost/fiber/numa/algo/work_stealing.hpp rename to c++/boost/fiber/numa/algo/work_stealing.hpp diff --git a/c++/include/boost/fiber/numa/all.hpp b/c++/boost/fiber/numa/all.hpp similarity index 100% rename from c++/include/boost/fiber/numa/all.hpp rename to c++/boost/fiber/numa/all.hpp diff --git a/c++/include/boost/fiber/numa/pin_thread.hpp b/c++/boost/fiber/numa/pin_thread.hpp similarity index 100% rename from c++/include/boost/fiber/numa/pin_thread.hpp rename to c++/boost/fiber/numa/pin_thread.hpp diff --git a/c++/include/boost/fiber/numa/topology.hpp b/c++/boost/fiber/numa/topology.hpp similarity index 100% rename from c++/include/boost/fiber/numa/topology.hpp rename to c++/boost/fiber/numa/topology.hpp diff --git a/c++/include/boost/fiber/operations.hpp b/c++/boost/fiber/operations.hpp similarity index 100% rename from c++/include/boost/fiber/operations.hpp rename to c++/boost/fiber/operations.hpp diff --git a/c++/include/boost/fiber/policy.hpp b/c++/boost/fiber/policy.hpp similarity index 100% rename from c++/include/boost/fiber/policy.hpp rename to c++/boost/fiber/policy.hpp diff --git a/c++/include/boost/fiber/pooled_fixedsize_stack.hpp b/c++/boost/fiber/pooled_fixedsize_stack.hpp similarity index 100% rename from c++/include/boost/fiber/pooled_fixedsize_stack.hpp rename to c++/boost/fiber/pooled_fixedsize_stack.hpp diff --git a/c++/include/boost/fiber/properties.hpp b/c++/boost/fiber/properties.hpp similarity index 100% rename from c++/include/boost/fiber/properties.hpp rename to c++/boost/fiber/properties.hpp diff --git a/c++/include/boost/fiber/protected_fixedsize_stack.hpp b/c++/boost/fiber/protected_fixedsize_stack.hpp similarity index 100% rename from c++/include/boost/fiber/protected_fixedsize_stack.hpp rename to c++/boost/fiber/protected_fixedsize_stack.hpp diff --git a/c++/include/boost/fiber/recursive_mutex.hpp b/c++/boost/fiber/recursive_mutex.hpp similarity index 100% rename from c++/include/boost/fiber/recursive_mutex.hpp rename to c++/boost/fiber/recursive_mutex.hpp diff --git a/c++/include/boost/fiber/recursive_timed_mutex.hpp b/c++/boost/fiber/recursive_timed_mutex.hpp similarity index 100% rename from c++/include/boost/fiber/recursive_timed_mutex.hpp rename to c++/boost/fiber/recursive_timed_mutex.hpp diff --git a/c++/include/boost/fiber/scheduler.hpp b/c++/boost/fiber/scheduler.hpp similarity index 100% rename from c++/include/boost/fiber/scheduler.hpp rename to c++/boost/fiber/scheduler.hpp diff --git a/c++/include/boost/fiber/segmented_stack.hpp b/c++/boost/fiber/segmented_stack.hpp similarity index 100% rename from c++/include/boost/fiber/segmented_stack.hpp rename to c++/boost/fiber/segmented_stack.hpp diff --git a/c++/include/boost/fiber/timed_mutex.hpp b/c++/boost/fiber/timed_mutex.hpp similarity index 100% rename from c++/include/boost/fiber/timed_mutex.hpp rename to c++/boost/fiber/timed_mutex.hpp diff --git a/c++/include/boost/fiber/type.hpp b/c++/boost/fiber/type.hpp similarity index 100% rename from c++/include/boost/fiber/type.hpp rename to c++/boost/fiber/type.hpp diff --git a/c++/include/boost/fiber/unbuffered_channel.hpp b/c++/boost/fiber/unbuffered_channel.hpp similarity index 100% rename from c++/include/boost/fiber/unbuffered_channel.hpp rename to c++/boost/fiber/unbuffered_channel.hpp diff --git a/c++/include/boost/fiber/waker.hpp b/c++/boost/fiber/waker.hpp similarity index 100% rename from c++/include/boost/fiber/waker.hpp rename to c++/boost/fiber/waker.hpp diff --git a/c++/include/boost/filesystem.hpp b/c++/boost/filesystem.hpp similarity index 100% rename from c++/include/boost/filesystem.hpp rename to c++/boost/filesystem.hpp diff --git a/c++/include/boost/filesystem/config.hpp b/c++/boost/filesystem/config.hpp similarity index 100% rename from c++/include/boost/filesystem/config.hpp rename to c++/boost/filesystem/config.hpp diff --git a/c++/include/boost/filesystem/convenience.hpp b/c++/boost/filesystem/convenience.hpp similarity index 100% rename from c++/include/boost/filesystem/convenience.hpp rename to c++/boost/filesystem/convenience.hpp diff --git a/c++/include/boost/filesystem/detail/footer.hpp b/c++/boost/filesystem/detail/footer.hpp similarity index 100% rename from c++/include/boost/filesystem/detail/footer.hpp rename to c++/boost/filesystem/detail/footer.hpp diff --git a/c++/include/boost/filesystem/detail/header.hpp b/c++/boost/filesystem/detail/header.hpp similarity index 100% rename from c++/include/boost/filesystem/detail/header.hpp rename to c++/boost/filesystem/detail/header.hpp diff --git a/c++/include/boost/filesystem/detail/path_traits.hpp b/c++/boost/filesystem/detail/path_traits.hpp similarity index 100% rename from c++/include/boost/filesystem/detail/path_traits.hpp rename to c++/boost/filesystem/detail/path_traits.hpp diff --git a/c++/include/boost/filesystem/detail/utf8_codecvt_facet.hpp b/c++/boost/filesystem/detail/utf8_codecvt_facet.hpp similarity index 100% rename from c++/include/boost/filesystem/detail/utf8_codecvt_facet.hpp rename to c++/boost/filesystem/detail/utf8_codecvt_facet.hpp diff --git a/c++/include/boost/filesystem/directory.hpp b/c++/boost/filesystem/directory.hpp similarity index 100% rename from c++/include/boost/filesystem/directory.hpp rename to c++/boost/filesystem/directory.hpp diff --git a/c++/include/boost/filesystem/exception.hpp b/c++/boost/filesystem/exception.hpp similarity index 100% rename from c++/include/boost/filesystem/exception.hpp rename to c++/boost/filesystem/exception.hpp diff --git a/c++/include/boost/filesystem/file_status.hpp b/c++/boost/filesystem/file_status.hpp similarity index 100% rename from c++/include/boost/filesystem/file_status.hpp rename to c++/boost/filesystem/file_status.hpp diff --git a/c++/include/boost/filesystem/fstream.hpp b/c++/boost/filesystem/fstream.hpp similarity index 100% rename from c++/include/boost/filesystem/fstream.hpp rename to c++/boost/filesystem/fstream.hpp diff --git a/c++/include/boost/filesystem/operations.hpp b/c++/boost/filesystem/operations.hpp similarity index 100% rename from c++/include/boost/filesystem/operations.hpp rename to c++/boost/filesystem/operations.hpp diff --git a/c++/include/boost/filesystem/path.hpp b/c++/boost/filesystem/path.hpp similarity index 100% rename from c++/include/boost/filesystem/path.hpp rename to c++/boost/filesystem/path.hpp diff --git a/c++/include/boost/filesystem/path_traits.hpp b/c++/boost/filesystem/path_traits.hpp similarity index 100% rename from c++/include/boost/filesystem/path_traits.hpp rename to c++/boost/filesystem/path_traits.hpp diff --git a/c++/include/boost/filesystem/string_file.hpp b/c++/boost/filesystem/string_file.hpp similarity index 100% rename from c++/include/boost/filesystem/string_file.hpp rename to c++/boost/filesystem/string_file.hpp diff --git a/c++/include/boost/flyweight.hpp b/c++/boost/flyweight.hpp similarity index 100% rename from c++/include/boost/flyweight.hpp rename to c++/boost/flyweight.hpp diff --git a/c++/include/boost/flyweight/assoc_container_factory.hpp b/c++/boost/flyweight/assoc_container_factory.hpp similarity index 100% rename from c++/include/boost/flyweight/assoc_container_factory.hpp rename to c++/boost/flyweight/assoc_container_factory.hpp diff --git a/c++/include/boost/flyweight/assoc_container_factory_fwd.hpp b/c++/boost/flyweight/assoc_container_factory_fwd.hpp similarity index 100% rename from c++/include/boost/flyweight/assoc_container_factory_fwd.hpp rename to c++/boost/flyweight/assoc_container_factory_fwd.hpp diff --git a/c++/include/boost/flyweight/detail/archive_constructed.hpp b/c++/boost/flyweight/detail/archive_constructed.hpp similarity index 100% rename from c++/include/boost/flyweight/detail/archive_constructed.hpp rename to c++/boost/flyweight/detail/archive_constructed.hpp diff --git a/c++/include/boost/flyweight/detail/default_value_policy.hpp b/c++/boost/flyweight/detail/default_value_policy.hpp similarity index 100% rename from c++/include/boost/flyweight/detail/default_value_policy.hpp rename to c++/boost/flyweight/detail/default_value_policy.hpp diff --git a/c++/include/boost/flyweight/detail/dyn_perfect_fwd.hpp b/c++/boost/flyweight/detail/dyn_perfect_fwd.hpp similarity index 100% rename from c++/include/boost/flyweight/detail/dyn_perfect_fwd.hpp rename to c++/boost/flyweight/detail/dyn_perfect_fwd.hpp diff --git a/c++/include/boost/flyweight/detail/flyweight_core.hpp b/c++/boost/flyweight/detail/flyweight_core.hpp similarity index 100% rename from c++/include/boost/flyweight/detail/flyweight_core.hpp rename to c++/boost/flyweight/detail/flyweight_core.hpp diff --git a/c++/include/boost/flyweight/detail/is_placeholder_expr.hpp b/c++/boost/flyweight/detail/is_placeholder_expr.hpp similarity index 100% rename from c++/include/boost/flyweight/detail/is_placeholder_expr.hpp rename to c++/boost/flyweight/detail/is_placeholder_expr.hpp diff --git a/c++/include/boost/flyweight/detail/nested_xxx_if_not_ph.hpp b/c++/boost/flyweight/detail/nested_xxx_if_not_ph.hpp similarity index 100% rename from c++/include/boost/flyweight/detail/nested_xxx_if_not_ph.hpp rename to c++/boost/flyweight/detail/nested_xxx_if_not_ph.hpp diff --git a/c++/include/boost/flyweight/detail/not_placeholder_expr.hpp b/c++/boost/flyweight/detail/not_placeholder_expr.hpp similarity index 100% rename from c++/include/boost/flyweight/detail/not_placeholder_expr.hpp rename to c++/boost/flyweight/detail/not_placeholder_expr.hpp diff --git a/c++/include/boost/flyweight/detail/perfect_fwd.hpp b/c++/boost/flyweight/detail/perfect_fwd.hpp similarity index 100% rename from c++/include/boost/flyweight/detail/perfect_fwd.hpp rename to c++/boost/flyweight/detail/perfect_fwd.hpp diff --git a/c++/include/boost/flyweight/detail/pp_perfect_fwd.hpp b/c++/boost/flyweight/detail/pp_perfect_fwd.hpp similarity index 100% rename from c++/include/boost/flyweight/detail/pp_perfect_fwd.hpp rename to c++/boost/flyweight/detail/pp_perfect_fwd.hpp diff --git a/c++/include/boost/flyweight/detail/recursive_lw_mutex.hpp b/c++/boost/flyweight/detail/recursive_lw_mutex.hpp similarity index 100% rename from c++/include/boost/flyweight/detail/recursive_lw_mutex.hpp rename to c++/boost/flyweight/detail/recursive_lw_mutex.hpp diff --git a/c++/include/boost/flyweight/detail/serialization_helper.hpp b/c++/boost/flyweight/detail/serialization_helper.hpp similarity index 100% rename from c++/include/boost/flyweight/detail/serialization_helper.hpp rename to c++/boost/flyweight/detail/serialization_helper.hpp diff --git a/c++/include/boost/flyweight/detail/value_tag.hpp b/c++/boost/flyweight/detail/value_tag.hpp similarity index 100% rename from c++/include/boost/flyweight/detail/value_tag.hpp rename to c++/boost/flyweight/detail/value_tag.hpp diff --git a/c++/include/boost/flyweight/factory_tag.hpp b/c++/boost/flyweight/factory_tag.hpp similarity index 100% rename from c++/include/boost/flyweight/factory_tag.hpp rename to c++/boost/flyweight/factory_tag.hpp diff --git a/c++/include/boost/flyweight/flyweight.hpp b/c++/boost/flyweight/flyweight.hpp similarity index 100% rename from c++/include/boost/flyweight/flyweight.hpp rename to c++/boost/flyweight/flyweight.hpp diff --git a/c++/include/boost/flyweight/flyweight_fwd.hpp b/c++/boost/flyweight/flyweight_fwd.hpp similarity index 100% rename from c++/include/boost/flyweight/flyweight_fwd.hpp rename to c++/boost/flyweight/flyweight_fwd.hpp diff --git a/c++/include/boost/flyweight/hashed_factory.hpp b/c++/boost/flyweight/hashed_factory.hpp similarity index 100% rename from c++/include/boost/flyweight/hashed_factory.hpp rename to c++/boost/flyweight/hashed_factory.hpp diff --git a/c++/include/boost/flyweight/hashed_factory_fwd.hpp b/c++/boost/flyweight/hashed_factory_fwd.hpp similarity index 100% rename from c++/include/boost/flyweight/hashed_factory_fwd.hpp rename to c++/boost/flyweight/hashed_factory_fwd.hpp diff --git a/c++/include/boost/flyweight/holder_tag.hpp b/c++/boost/flyweight/holder_tag.hpp similarity index 100% rename from c++/include/boost/flyweight/holder_tag.hpp rename to c++/boost/flyweight/holder_tag.hpp diff --git a/c++/include/boost/flyweight/intermodule_holder.hpp b/c++/boost/flyweight/intermodule_holder.hpp similarity index 100% rename from c++/include/boost/flyweight/intermodule_holder.hpp rename to c++/boost/flyweight/intermodule_holder.hpp diff --git a/c++/include/boost/flyweight/intermodule_holder_fwd.hpp b/c++/boost/flyweight/intermodule_holder_fwd.hpp similarity index 100% rename from c++/include/boost/flyweight/intermodule_holder_fwd.hpp rename to c++/boost/flyweight/intermodule_holder_fwd.hpp diff --git a/c++/include/boost/flyweight/key_value.hpp b/c++/boost/flyweight/key_value.hpp similarity index 100% rename from c++/include/boost/flyweight/key_value.hpp rename to c++/boost/flyweight/key_value.hpp diff --git a/c++/include/boost/flyweight/key_value_fwd.hpp b/c++/boost/flyweight/key_value_fwd.hpp similarity index 100% rename from c++/include/boost/flyweight/key_value_fwd.hpp rename to c++/boost/flyweight/key_value_fwd.hpp diff --git a/c++/include/boost/flyweight/locking_tag.hpp b/c++/boost/flyweight/locking_tag.hpp similarity index 100% rename from c++/include/boost/flyweight/locking_tag.hpp rename to c++/boost/flyweight/locking_tag.hpp diff --git a/c++/include/boost/flyweight/no_locking.hpp b/c++/boost/flyweight/no_locking.hpp similarity index 100% rename from c++/include/boost/flyweight/no_locking.hpp rename to c++/boost/flyweight/no_locking.hpp diff --git a/c++/include/boost/flyweight/no_locking_fwd.hpp b/c++/boost/flyweight/no_locking_fwd.hpp similarity index 100% rename from c++/include/boost/flyweight/no_locking_fwd.hpp rename to c++/boost/flyweight/no_locking_fwd.hpp diff --git a/c++/include/boost/flyweight/no_tracking.hpp b/c++/boost/flyweight/no_tracking.hpp similarity index 100% rename from c++/include/boost/flyweight/no_tracking.hpp rename to c++/boost/flyweight/no_tracking.hpp diff --git a/c++/include/boost/flyweight/no_tracking_fwd.hpp b/c++/boost/flyweight/no_tracking_fwd.hpp similarity index 100% rename from c++/include/boost/flyweight/no_tracking_fwd.hpp rename to c++/boost/flyweight/no_tracking_fwd.hpp diff --git a/c++/include/boost/flyweight/refcounted.hpp b/c++/boost/flyweight/refcounted.hpp similarity index 100% rename from c++/include/boost/flyweight/refcounted.hpp rename to c++/boost/flyweight/refcounted.hpp diff --git a/c++/include/boost/flyweight/refcounted_fwd.hpp b/c++/boost/flyweight/refcounted_fwd.hpp similarity index 100% rename from c++/include/boost/flyweight/refcounted_fwd.hpp rename to c++/boost/flyweight/refcounted_fwd.hpp diff --git a/c++/include/boost/flyweight/serialize.hpp b/c++/boost/flyweight/serialize.hpp similarity index 100% rename from c++/include/boost/flyweight/serialize.hpp rename to c++/boost/flyweight/serialize.hpp diff --git a/c++/include/boost/flyweight/set_factory.hpp b/c++/boost/flyweight/set_factory.hpp similarity index 100% rename from c++/include/boost/flyweight/set_factory.hpp rename to c++/boost/flyweight/set_factory.hpp diff --git a/c++/include/boost/flyweight/set_factory_fwd.hpp b/c++/boost/flyweight/set_factory_fwd.hpp similarity index 100% rename from c++/include/boost/flyweight/set_factory_fwd.hpp rename to c++/boost/flyweight/set_factory_fwd.hpp diff --git a/c++/include/boost/flyweight/simple_locking.hpp b/c++/boost/flyweight/simple_locking.hpp similarity index 100% rename from c++/include/boost/flyweight/simple_locking.hpp rename to c++/boost/flyweight/simple_locking.hpp diff --git a/c++/include/boost/flyweight/simple_locking_fwd.hpp b/c++/boost/flyweight/simple_locking_fwd.hpp similarity index 100% rename from c++/include/boost/flyweight/simple_locking_fwd.hpp rename to c++/boost/flyweight/simple_locking_fwd.hpp diff --git a/c++/include/boost/flyweight/static_holder.hpp b/c++/boost/flyweight/static_holder.hpp similarity index 100% rename from c++/include/boost/flyweight/static_holder.hpp rename to c++/boost/flyweight/static_holder.hpp diff --git a/c++/include/boost/flyweight/static_holder_fwd.hpp b/c++/boost/flyweight/static_holder_fwd.hpp similarity index 100% rename from c++/include/boost/flyweight/static_holder_fwd.hpp rename to c++/boost/flyweight/static_holder_fwd.hpp diff --git a/c++/include/boost/flyweight/tag.hpp b/c++/boost/flyweight/tag.hpp similarity index 100% rename from c++/include/boost/flyweight/tag.hpp rename to c++/boost/flyweight/tag.hpp diff --git a/c++/include/boost/flyweight/tracking_tag.hpp b/c++/boost/flyweight/tracking_tag.hpp similarity index 100% rename from c++/include/boost/flyweight/tracking_tag.hpp rename to c++/boost/flyweight/tracking_tag.hpp diff --git a/c++/include/boost/foreach.hpp b/c++/boost/foreach.hpp similarity index 100% rename from c++/include/boost/foreach.hpp rename to c++/boost/foreach.hpp diff --git a/c++/include/boost/foreach_fwd.hpp b/c++/boost/foreach_fwd.hpp similarity index 100% rename from c++/include/boost/foreach_fwd.hpp rename to c++/boost/foreach_fwd.hpp diff --git a/c++/include/boost/format.hpp b/c++/boost/format.hpp similarity index 100% rename from c++/include/boost/format.hpp rename to c++/boost/format.hpp diff --git a/c++/include/boost/format/alt_sstream.hpp b/c++/boost/format/alt_sstream.hpp similarity index 100% rename from c++/include/boost/format/alt_sstream.hpp rename to c++/boost/format/alt_sstream.hpp diff --git a/c++/include/boost/format/alt_sstream_impl.hpp b/c++/boost/format/alt_sstream_impl.hpp similarity index 100% rename from c++/include/boost/format/alt_sstream_impl.hpp rename to c++/boost/format/alt_sstream_impl.hpp diff --git a/c++/include/boost/format/detail/compat_workarounds.hpp b/c++/boost/format/detail/compat_workarounds.hpp similarity index 100% rename from c++/include/boost/format/detail/compat_workarounds.hpp rename to c++/boost/format/detail/compat_workarounds.hpp diff --git a/c++/include/boost/format/detail/config_macros.hpp b/c++/boost/format/detail/config_macros.hpp similarity index 100% rename from c++/include/boost/format/detail/config_macros.hpp rename to c++/boost/format/detail/config_macros.hpp diff --git a/c++/include/boost/format/detail/msvc_disambiguater.hpp b/c++/boost/format/detail/msvc_disambiguater.hpp similarity index 100% rename from c++/include/boost/format/detail/msvc_disambiguater.hpp rename to c++/boost/format/detail/msvc_disambiguater.hpp diff --git a/c++/include/boost/format/detail/unset_macros.hpp b/c++/boost/format/detail/unset_macros.hpp similarity index 100% rename from c++/include/boost/format/detail/unset_macros.hpp rename to c++/boost/format/detail/unset_macros.hpp diff --git a/c++/include/boost/format/detail/workarounds_gcc-2_95.hpp b/c++/boost/format/detail/workarounds_gcc-2_95.hpp similarity index 100% rename from c++/include/boost/format/detail/workarounds_gcc-2_95.hpp rename to c++/boost/format/detail/workarounds_gcc-2_95.hpp diff --git a/c++/include/boost/format/detail/workarounds_stlport.hpp b/c++/boost/format/detail/workarounds_stlport.hpp similarity index 100% rename from c++/include/boost/format/detail/workarounds_stlport.hpp rename to c++/boost/format/detail/workarounds_stlport.hpp diff --git a/c++/include/boost/format/exceptions.hpp b/c++/boost/format/exceptions.hpp similarity index 100% rename from c++/include/boost/format/exceptions.hpp rename to c++/boost/format/exceptions.hpp diff --git a/c++/include/boost/format/feed_args.hpp b/c++/boost/format/feed_args.hpp similarity index 100% rename from c++/include/boost/format/feed_args.hpp rename to c++/boost/format/feed_args.hpp diff --git a/c++/include/boost/format/format_class.hpp b/c++/boost/format/format_class.hpp similarity index 100% rename from c++/include/boost/format/format_class.hpp rename to c++/boost/format/format_class.hpp diff --git a/c++/include/boost/format/format_fwd.hpp b/c++/boost/format/format_fwd.hpp similarity index 100% rename from c++/include/boost/format/format_fwd.hpp rename to c++/boost/format/format_fwd.hpp diff --git a/c++/include/boost/format/format_implementation.hpp b/c++/boost/format/format_implementation.hpp similarity index 100% rename from c++/include/boost/format/format_implementation.hpp rename to c++/boost/format/format_implementation.hpp diff --git a/c++/include/boost/format/free_funcs.hpp b/c++/boost/format/free_funcs.hpp similarity index 100% rename from c++/include/boost/format/free_funcs.hpp rename to c++/boost/format/free_funcs.hpp diff --git a/c++/include/boost/format/group.hpp b/c++/boost/format/group.hpp similarity index 100% rename from c++/include/boost/format/group.hpp rename to c++/boost/format/group.hpp diff --git a/c++/include/boost/format/internals.hpp b/c++/boost/format/internals.hpp similarity index 100% rename from c++/include/boost/format/internals.hpp rename to c++/boost/format/internals.hpp diff --git a/c++/include/boost/format/internals_fwd.hpp b/c++/boost/format/internals_fwd.hpp similarity index 100% rename from c++/include/boost/format/internals_fwd.hpp rename to c++/boost/format/internals_fwd.hpp diff --git a/c++/include/boost/format/parsing.hpp b/c++/boost/format/parsing.hpp similarity index 100% rename from c++/include/boost/format/parsing.hpp rename to c++/boost/format/parsing.hpp diff --git a/c++/include/boost/function.hpp b/c++/boost/function.hpp similarity index 100% rename from c++/include/boost/function.hpp rename to c++/boost/function.hpp diff --git a/c++/include/boost/function/detail/epilogue.hpp b/c++/boost/function/detail/epilogue.hpp similarity index 100% rename from c++/include/boost/function/detail/epilogue.hpp rename to c++/boost/function/detail/epilogue.hpp diff --git a/c++/include/boost/function/detail/function_iterate.hpp b/c++/boost/function/detail/function_iterate.hpp similarity index 100% rename from c++/include/boost/function/detail/function_iterate.hpp rename to c++/boost/function/detail/function_iterate.hpp diff --git a/c++/include/boost/function/detail/gen_maybe_include.pl b/c++/boost/function/detail/gen_maybe_include.pl similarity index 100% rename from c++/include/boost/function/detail/gen_maybe_include.pl rename to c++/boost/function/detail/gen_maybe_include.pl diff --git a/c++/include/boost/function/detail/maybe_include.hpp b/c++/boost/function/detail/maybe_include.hpp similarity index 100% rename from c++/include/boost/function/detail/maybe_include.hpp rename to c++/boost/function/detail/maybe_include.hpp diff --git a/c++/include/boost/function/detail/prologue.hpp b/c++/boost/function/detail/prologue.hpp similarity index 100% rename from c++/include/boost/function/detail/prologue.hpp rename to c++/boost/function/detail/prologue.hpp diff --git a/c++/include/boost/function/detail/requires_cxx11.hpp b/c++/boost/function/detail/requires_cxx11.hpp similarity index 100% rename from c++/include/boost/function/detail/requires_cxx11.hpp rename to c++/boost/function/detail/requires_cxx11.hpp diff --git a/c++/include/boost/function/function0.hpp b/c++/boost/function/function0.hpp similarity index 100% rename from c++/include/boost/function/function0.hpp rename to c++/boost/function/function0.hpp diff --git a/c++/include/boost/function/function1.hpp b/c++/boost/function/function1.hpp similarity index 100% rename from c++/include/boost/function/function1.hpp rename to c++/boost/function/function1.hpp diff --git a/c++/include/boost/function/function10.hpp b/c++/boost/function/function10.hpp similarity index 100% rename from c++/include/boost/function/function10.hpp rename to c++/boost/function/function10.hpp diff --git a/c++/include/boost/function/function2.hpp b/c++/boost/function/function2.hpp similarity index 100% rename from c++/include/boost/function/function2.hpp rename to c++/boost/function/function2.hpp diff --git a/c++/include/boost/function/function3.hpp b/c++/boost/function/function3.hpp similarity index 100% rename from c++/include/boost/function/function3.hpp rename to c++/boost/function/function3.hpp diff --git a/c++/include/boost/function/function4.hpp b/c++/boost/function/function4.hpp similarity index 100% rename from c++/include/boost/function/function4.hpp rename to c++/boost/function/function4.hpp diff --git a/c++/include/boost/function/function5.hpp b/c++/boost/function/function5.hpp similarity index 100% rename from c++/include/boost/function/function5.hpp rename to c++/boost/function/function5.hpp diff --git a/c++/include/boost/function/function6.hpp b/c++/boost/function/function6.hpp similarity index 100% rename from c++/include/boost/function/function6.hpp rename to c++/boost/function/function6.hpp diff --git a/c++/include/boost/function/function7.hpp b/c++/boost/function/function7.hpp similarity index 100% rename from c++/include/boost/function/function7.hpp rename to c++/boost/function/function7.hpp diff --git a/c++/include/boost/function/function8.hpp b/c++/boost/function/function8.hpp similarity index 100% rename from c++/include/boost/function/function8.hpp rename to c++/boost/function/function8.hpp diff --git a/c++/include/boost/function/function9.hpp b/c++/boost/function/function9.hpp similarity index 100% rename from c++/include/boost/function/function9.hpp rename to c++/boost/function/function9.hpp diff --git a/c++/include/boost/function/function_base.hpp b/c++/boost/function/function_base.hpp similarity index 100% rename from c++/include/boost/function/function_base.hpp rename to c++/boost/function/function_base.hpp diff --git a/c++/include/boost/function/function_fwd.hpp b/c++/boost/function/function_fwd.hpp similarity index 100% rename from c++/include/boost/function/function_fwd.hpp rename to c++/boost/function/function_fwd.hpp diff --git a/c++/include/boost/function/function_template.hpp b/c++/boost/function/function_template.hpp similarity index 100% rename from c++/include/boost/function/function_template.hpp rename to c++/boost/function/function_template.hpp diff --git a/c++/include/boost/function/function_typeof.hpp b/c++/boost/function/function_typeof.hpp similarity index 100% rename from c++/include/boost/function/function_typeof.hpp rename to c++/boost/function/function_typeof.hpp diff --git a/c++/include/boost/function/gen_function_N.pl b/c++/boost/function/gen_function_N.pl similarity index 100% rename from c++/include/boost/function/gen_function_N.pl rename to c++/boost/function/gen_function_N.pl diff --git a/c++/include/boost/function_equal.hpp b/c++/boost/function_equal.hpp similarity index 100% rename from c++/include/boost/function_equal.hpp rename to c++/boost/function_equal.hpp diff --git a/c++/include/boost/function_output_iterator.hpp b/c++/boost/function_output_iterator.hpp similarity index 100% rename from c++/include/boost/function_output_iterator.hpp rename to c++/boost/function_output_iterator.hpp diff --git a/c++/include/boost/function_types/components.hpp b/c++/boost/function_types/components.hpp similarity index 100% rename from c++/include/boost/function_types/components.hpp rename to c++/boost/function_types/components.hpp diff --git a/c++/include/boost/function_types/config/cc_names.hpp b/c++/boost/function_types/config/cc_names.hpp similarity index 100% rename from c++/include/boost/function_types/config/cc_names.hpp rename to c++/boost/function_types/config/cc_names.hpp diff --git a/c++/include/boost/function_types/config/compiler.hpp b/c++/boost/function_types/config/compiler.hpp similarity index 100% rename from c++/include/boost/function_types/config/compiler.hpp rename to c++/boost/function_types/config/compiler.hpp diff --git a/c++/include/boost/function_types/config/config.hpp b/c++/boost/function_types/config/config.hpp similarity index 100% rename from c++/include/boost/function_types/config/config.hpp rename to c++/boost/function_types/config/config.hpp diff --git a/c++/include/boost/function_types/detail/class_transform.hpp b/c++/boost/function_types/detail/class_transform.hpp similarity index 100% rename from c++/include/boost/function_types/detail/class_transform.hpp rename to c++/boost/function_types/detail/class_transform.hpp diff --git a/c++/include/boost/function_types/detail/classifier.hpp b/c++/boost/function_types/detail/classifier.hpp similarity index 100% rename from c++/include/boost/function_types/detail/classifier.hpp rename to c++/boost/function_types/detail/classifier.hpp diff --git a/c++/include/boost/function_types/detail/classifier_impl/arity10_0.hpp b/c++/boost/function_types/detail/classifier_impl/arity10_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/classifier_impl/arity10_0.hpp rename to c++/boost/function_types/detail/classifier_impl/arity10_0.hpp diff --git a/c++/include/boost/function_types/detail/classifier_impl/arity10_1.hpp b/c++/boost/function_types/detail/classifier_impl/arity10_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/classifier_impl/arity10_1.hpp rename to c++/boost/function_types/detail/classifier_impl/arity10_1.hpp diff --git a/c++/include/boost/function_types/detail/classifier_impl/arity20_0.hpp b/c++/boost/function_types/detail/classifier_impl/arity20_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/classifier_impl/arity20_0.hpp rename to c++/boost/function_types/detail/classifier_impl/arity20_0.hpp diff --git a/c++/include/boost/function_types/detail/classifier_impl/arity20_1.hpp b/c++/boost/function_types/detail/classifier_impl/arity20_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/classifier_impl/arity20_1.hpp rename to c++/boost/function_types/detail/classifier_impl/arity20_1.hpp diff --git a/c++/include/boost/function_types/detail/classifier_impl/arity30_0.hpp b/c++/boost/function_types/detail/classifier_impl/arity30_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/classifier_impl/arity30_0.hpp rename to c++/boost/function_types/detail/classifier_impl/arity30_0.hpp diff --git a/c++/include/boost/function_types/detail/classifier_impl/arity30_1.hpp b/c++/boost/function_types/detail/classifier_impl/arity30_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/classifier_impl/arity30_1.hpp rename to c++/boost/function_types/detail/classifier_impl/arity30_1.hpp diff --git a/c++/include/boost/function_types/detail/classifier_impl/arity40_0.hpp b/c++/boost/function_types/detail/classifier_impl/arity40_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/classifier_impl/arity40_0.hpp rename to c++/boost/function_types/detail/classifier_impl/arity40_0.hpp diff --git a/c++/include/boost/function_types/detail/classifier_impl/arity40_1.hpp b/c++/boost/function_types/detail/classifier_impl/arity40_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/classifier_impl/arity40_1.hpp rename to c++/boost/function_types/detail/classifier_impl/arity40_1.hpp diff --git a/c++/include/boost/function_types/detail/classifier_impl/arity50_0.hpp b/c++/boost/function_types/detail/classifier_impl/arity50_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/classifier_impl/arity50_0.hpp rename to c++/boost/function_types/detail/classifier_impl/arity50_0.hpp diff --git a/c++/include/boost/function_types/detail/classifier_impl/arity50_1.hpp b/c++/boost/function_types/detail/classifier_impl/arity50_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/classifier_impl/arity50_1.hpp rename to c++/boost/function_types/detail/classifier_impl/arity50_1.hpp diff --git a/c++/include/boost/function_types/detail/classifier_impl/master.hpp b/c++/boost/function_types/detail/classifier_impl/master.hpp similarity index 100% rename from c++/include/boost/function_types/detail/classifier_impl/master.hpp rename to c++/boost/function_types/detail/classifier_impl/master.hpp diff --git a/c++/include/boost/function_types/detail/components_as_mpl_sequence.hpp b/c++/boost/function_types/detail/components_as_mpl_sequence.hpp similarity index 100% rename from c++/include/boost/function_types/detail/components_as_mpl_sequence.hpp rename to c++/boost/function_types/detail/components_as_mpl_sequence.hpp diff --git a/c++/include/boost/function_types/detail/components_impl/arity10_0.hpp b/c++/boost/function_types/detail/components_impl/arity10_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/components_impl/arity10_0.hpp rename to c++/boost/function_types/detail/components_impl/arity10_0.hpp diff --git a/c++/include/boost/function_types/detail/components_impl/arity10_1.hpp b/c++/boost/function_types/detail/components_impl/arity10_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/components_impl/arity10_1.hpp rename to c++/boost/function_types/detail/components_impl/arity10_1.hpp diff --git a/c++/include/boost/function_types/detail/components_impl/arity20_0.hpp b/c++/boost/function_types/detail/components_impl/arity20_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/components_impl/arity20_0.hpp rename to c++/boost/function_types/detail/components_impl/arity20_0.hpp diff --git a/c++/include/boost/function_types/detail/components_impl/arity20_1.hpp b/c++/boost/function_types/detail/components_impl/arity20_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/components_impl/arity20_1.hpp rename to c++/boost/function_types/detail/components_impl/arity20_1.hpp diff --git a/c++/include/boost/function_types/detail/components_impl/arity30_0.hpp b/c++/boost/function_types/detail/components_impl/arity30_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/components_impl/arity30_0.hpp rename to c++/boost/function_types/detail/components_impl/arity30_0.hpp diff --git a/c++/include/boost/function_types/detail/components_impl/arity30_1.hpp b/c++/boost/function_types/detail/components_impl/arity30_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/components_impl/arity30_1.hpp rename to c++/boost/function_types/detail/components_impl/arity30_1.hpp diff --git a/c++/include/boost/function_types/detail/components_impl/arity40_0.hpp b/c++/boost/function_types/detail/components_impl/arity40_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/components_impl/arity40_0.hpp rename to c++/boost/function_types/detail/components_impl/arity40_0.hpp diff --git a/c++/include/boost/function_types/detail/components_impl/arity40_1.hpp b/c++/boost/function_types/detail/components_impl/arity40_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/components_impl/arity40_1.hpp rename to c++/boost/function_types/detail/components_impl/arity40_1.hpp diff --git a/c++/include/boost/function_types/detail/components_impl/arity50_0.hpp b/c++/boost/function_types/detail/components_impl/arity50_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/components_impl/arity50_0.hpp rename to c++/boost/function_types/detail/components_impl/arity50_0.hpp diff --git a/c++/include/boost/function_types/detail/components_impl/arity50_1.hpp b/c++/boost/function_types/detail/components_impl/arity50_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/components_impl/arity50_1.hpp rename to c++/boost/function_types/detail/components_impl/arity50_1.hpp diff --git a/c++/include/boost/function_types/detail/components_impl/master.hpp b/c++/boost/function_types/detail/components_impl/master.hpp similarity index 100% rename from c++/include/boost/function_types/detail/components_impl/master.hpp rename to c++/boost/function_types/detail/components_impl/master.hpp diff --git a/c++/include/boost/function_types/detail/cv_traits.hpp b/c++/boost/function_types/detail/cv_traits.hpp similarity index 100% rename from c++/include/boost/function_types/detail/cv_traits.hpp rename to c++/boost/function_types/detail/cv_traits.hpp diff --git a/c++/include/boost/function_types/detail/encoding/aliases_def.hpp b/c++/boost/function_types/detail/encoding/aliases_def.hpp similarity index 100% rename from c++/include/boost/function_types/detail/encoding/aliases_def.hpp rename to c++/boost/function_types/detail/encoding/aliases_def.hpp diff --git a/c++/include/boost/function_types/detail/encoding/aliases_undef.hpp b/c++/boost/function_types/detail/encoding/aliases_undef.hpp similarity index 100% rename from c++/include/boost/function_types/detail/encoding/aliases_undef.hpp rename to c++/boost/function_types/detail/encoding/aliases_undef.hpp diff --git a/c++/include/boost/function_types/detail/encoding/def.hpp b/c++/boost/function_types/detail/encoding/def.hpp similarity index 100% rename from c++/include/boost/function_types/detail/encoding/def.hpp rename to c++/boost/function_types/detail/encoding/def.hpp diff --git a/c++/include/boost/function_types/detail/encoding/undef.hpp b/c++/boost/function_types/detail/encoding/undef.hpp similarity index 100% rename from c++/include/boost/function_types/detail/encoding/undef.hpp rename to c++/boost/function_types/detail/encoding/undef.hpp diff --git a/c++/include/boost/function_types/detail/pp_arity_loop.hpp b/c++/boost/function_types/detail/pp_arity_loop.hpp similarity index 100% rename from c++/include/boost/function_types/detail/pp_arity_loop.hpp rename to c++/boost/function_types/detail/pp_arity_loop.hpp diff --git a/c++/include/boost/function_types/detail/pp_cc_loop/master.hpp b/c++/boost/function_types/detail/pp_cc_loop/master.hpp similarity index 100% rename from c++/include/boost/function_types/detail/pp_cc_loop/master.hpp rename to c++/boost/function_types/detail/pp_cc_loop/master.hpp diff --git a/c++/include/boost/function_types/detail/pp_cc_loop/preprocessed.hpp b/c++/boost/function_types/detail/pp_cc_loop/preprocessed.hpp similarity index 100% rename from c++/include/boost/function_types/detail/pp_cc_loop/preprocessed.hpp rename to c++/boost/function_types/detail/pp_cc_loop/preprocessed.hpp diff --git a/c++/include/boost/function_types/detail/pp_loop.hpp b/c++/boost/function_types/detail/pp_loop.hpp similarity index 100% rename from c++/include/boost/function_types/detail/pp_loop.hpp rename to c++/boost/function_types/detail/pp_loop.hpp diff --git a/c++/include/boost/function_types/detail/pp_retag_default_cc/master.hpp b/c++/boost/function_types/detail/pp_retag_default_cc/master.hpp similarity index 100% rename from c++/include/boost/function_types/detail/pp_retag_default_cc/master.hpp rename to c++/boost/function_types/detail/pp_retag_default_cc/master.hpp diff --git a/c++/include/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp b/c++/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp similarity index 100% rename from c++/include/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp rename to c++/boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp diff --git a/c++/include/boost/function_types/detail/pp_tags/cc_tag.hpp b/c++/boost/function_types/detail/pp_tags/cc_tag.hpp similarity index 100% rename from c++/include/boost/function_types/detail/pp_tags/cc_tag.hpp rename to c++/boost/function_types/detail/pp_tags/cc_tag.hpp diff --git a/c++/include/boost/function_types/detail/pp_tags/master.hpp b/c++/boost/function_types/detail/pp_tags/master.hpp similarity index 100% rename from c++/include/boost/function_types/detail/pp_tags/master.hpp rename to c++/boost/function_types/detail/pp_tags/master.hpp diff --git a/c++/include/boost/function_types/detail/pp_tags/preprocessed.hpp b/c++/boost/function_types/detail/pp_tags/preprocessed.hpp similarity index 100% rename from c++/include/boost/function_types/detail/pp_tags/preprocessed.hpp rename to c++/boost/function_types/detail/pp_tags/preprocessed.hpp diff --git a/c++/include/boost/function_types/detail/pp_variate_loop/master.hpp b/c++/boost/function_types/detail/pp_variate_loop/master.hpp similarity index 100% rename from c++/include/boost/function_types/detail/pp_variate_loop/master.hpp rename to c++/boost/function_types/detail/pp_variate_loop/master.hpp diff --git a/c++/include/boost/function_types/detail/pp_variate_loop/preprocessed.hpp b/c++/boost/function_types/detail/pp_variate_loop/preprocessed.hpp similarity index 100% rename from c++/include/boost/function_types/detail/pp_variate_loop/preprocessed.hpp rename to c++/boost/function_types/detail/pp_variate_loop/preprocessed.hpp diff --git a/c++/include/boost/function_types/detail/retag_default_cc.hpp b/c++/boost/function_types/detail/retag_default_cc.hpp similarity index 100% rename from c++/include/boost/function_types/detail/retag_default_cc.hpp rename to c++/boost/function_types/detail/retag_default_cc.hpp diff --git a/c++/include/boost/function_types/detail/synthesize.hpp b/c++/boost/function_types/detail/synthesize.hpp similarity index 100% rename from c++/include/boost/function_types/detail/synthesize.hpp rename to c++/boost/function_types/detail/synthesize.hpp diff --git a/c++/include/boost/function_types/detail/synthesize_impl/arity10_0.hpp b/c++/boost/function_types/detail/synthesize_impl/arity10_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/synthesize_impl/arity10_0.hpp rename to c++/boost/function_types/detail/synthesize_impl/arity10_0.hpp diff --git a/c++/include/boost/function_types/detail/synthesize_impl/arity10_1.hpp b/c++/boost/function_types/detail/synthesize_impl/arity10_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/synthesize_impl/arity10_1.hpp rename to c++/boost/function_types/detail/synthesize_impl/arity10_1.hpp diff --git a/c++/include/boost/function_types/detail/synthesize_impl/arity20_0.hpp b/c++/boost/function_types/detail/synthesize_impl/arity20_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/synthesize_impl/arity20_0.hpp rename to c++/boost/function_types/detail/synthesize_impl/arity20_0.hpp diff --git a/c++/include/boost/function_types/detail/synthesize_impl/arity20_1.hpp b/c++/boost/function_types/detail/synthesize_impl/arity20_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/synthesize_impl/arity20_1.hpp rename to c++/boost/function_types/detail/synthesize_impl/arity20_1.hpp diff --git a/c++/include/boost/function_types/detail/synthesize_impl/arity30_0.hpp b/c++/boost/function_types/detail/synthesize_impl/arity30_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/synthesize_impl/arity30_0.hpp rename to c++/boost/function_types/detail/synthesize_impl/arity30_0.hpp diff --git a/c++/include/boost/function_types/detail/synthesize_impl/arity30_1.hpp b/c++/boost/function_types/detail/synthesize_impl/arity30_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/synthesize_impl/arity30_1.hpp rename to c++/boost/function_types/detail/synthesize_impl/arity30_1.hpp diff --git a/c++/include/boost/function_types/detail/synthesize_impl/arity40_0.hpp b/c++/boost/function_types/detail/synthesize_impl/arity40_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/synthesize_impl/arity40_0.hpp rename to c++/boost/function_types/detail/synthesize_impl/arity40_0.hpp diff --git a/c++/include/boost/function_types/detail/synthesize_impl/arity40_1.hpp b/c++/boost/function_types/detail/synthesize_impl/arity40_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/synthesize_impl/arity40_1.hpp rename to c++/boost/function_types/detail/synthesize_impl/arity40_1.hpp diff --git a/c++/include/boost/function_types/detail/synthesize_impl/arity50_0.hpp b/c++/boost/function_types/detail/synthesize_impl/arity50_0.hpp similarity index 100% rename from c++/include/boost/function_types/detail/synthesize_impl/arity50_0.hpp rename to c++/boost/function_types/detail/synthesize_impl/arity50_0.hpp diff --git a/c++/include/boost/function_types/detail/synthesize_impl/arity50_1.hpp b/c++/boost/function_types/detail/synthesize_impl/arity50_1.hpp similarity index 100% rename from c++/include/boost/function_types/detail/synthesize_impl/arity50_1.hpp rename to c++/boost/function_types/detail/synthesize_impl/arity50_1.hpp diff --git a/c++/include/boost/function_types/detail/synthesize_impl/master.hpp b/c++/boost/function_types/detail/synthesize_impl/master.hpp similarity index 100% rename from c++/include/boost/function_types/detail/synthesize_impl/master.hpp rename to c++/boost/function_types/detail/synthesize_impl/master.hpp diff --git a/c++/include/boost/function_types/detail/to_sequence.hpp b/c++/boost/function_types/detail/to_sequence.hpp similarity index 100% rename from c++/include/boost/function_types/detail/to_sequence.hpp rename to c++/boost/function_types/detail/to_sequence.hpp diff --git a/c++/include/boost/function_types/function_arity.hpp b/c++/boost/function_types/function_arity.hpp similarity index 100% rename from c++/include/boost/function_types/function_arity.hpp rename to c++/boost/function_types/function_arity.hpp diff --git a/c++/include/boost/function_types/function_pointer.hpp b/c++/boost/function_types/function_pointer.hpp similarity index 100% rename from c++/include/boost/function_types/function_pointer.hpp rename to c++/boost/function_types/function_pointer.hpp diff --git a/c++/include/boost/function_types/function_reference.hpp b/c++/boost/function_types/function_reference.hpp similarity index 100% rename from c++/include/boost/function_types/function_reference.hpp rename to c++/boost/function_types/function_reference.hpp diff --git a/c++/include/boost/function_types/function_type.hpp b/c++/boost/function_types/function_type.hpp similarity index 100% rename from c++/include/boost/function_types/function_type.hpp rename to c++/boost/function_types/function_type.hpp diff --git a/c++/include/boost/function_types/is_callable_builtin.hpp b/c++/boost/function_types/is_callable_builtin.hpp similarity index 100% rename from c++/include/boost/function_types/is_callable_builtin.hpp rename to c++/boost/function_types/is_callable_builtin.hpp diff --git a/c++/include/boost/function_types/is_function.hpp b/c++/boost/function_types/is_function.hpp similarity index 100% rename from c++/include/boost/function_types/is_function.hpp rename to c++/boost/function_types/is_function.hpp diff --git a/c++/include/boost/function_types/is_function_pointer.hpp b/c++/boost/function_types/is_function_pointer.hpp similarity index 100% rename from c++/include/boost/function_types/is_function_pointer.hpp rename to c++/boost/function_types/is_function_pointer.hpp diff --git a/c++/include/boost/function_types/is_function_reference.hpp b/c++/boost/function_types/is_function_reference.hpp similarity index 100% rename from c++/include/boost/function_types/is_function_reference.hpp rename to c++/boost/function_types/is_function_reference.hpp diff --git a/c++/include/boost/function_types/is_member_function_pointer.hpp b/c++/boost/function_types/is_member_function_pointer.hpp similarity index 100% rename from c++/include/boost/function_types/is_member_function_pointer.hpp rename to c++/boost/function_types/is_member_function_pointer.hpp diff --git a/c++/include/boost/function_types/is_member_object_pointer.hpp b/c++/boost/function_types/is_member_object_pointer.hpp similarity index 100% rename from c++/include/boost/function_types/is_member_object_pointer.hpp rename to c++/boost/function_types/is_member_object_pointer.hpp diff --git a/c++/include/boost/function_types/is_member_pointer.hpp b/c++/boost/function_types/is_member_pointer.hpp similarity index 100% rename from c++/include/boost/function_types/is_member_pointer.hpp rename to c++/boost/function_types/is_member_pointer.hpp diff --git a/c++/include/boost/function_types/is_nonmember_callable_builtin.hpp b/c++/boost/function_types/is_nonmember_callable_builtin.hpp similarity index 100% rename from c++/include/boost/function_types/is_nonmember_callable_builtin.hpp rename to c++/boost/function_types/is_nonmember_callable_builtin.hpp diff --git a/c++/include/boost/function_types/member_function_pointer.hpp b/c++/boost/function_types/member_function_pointer.hpp similarity index 100% rename from c++/include/boost/function_types/member_function_pointer.hpp rename to c++/boost/function_types/member_function_pointer.hpp diff --git a/c++/include/boost/function_types/member_object_pointer.hpp b/c++/boost/function_types/member_object_pointer.hpp similarity index 100% rename from c++/include/boost/function_types/member_object_pointer.hpp rename to c++/boost/function_types/member_object_pointer.hpp diff --git a/c++/include/boost/function_types/parameter_types.hpp b/c++/boost/function_types/parameter_types.hpp similarity index 100% rename from c++/include/boost/function_types/parameter_types.hpp rename to c++/boost/function_types/parameter_types.hpp diff --git a/c++/include/boost/function_types/property_tags.hpp b/c++/boost/function_types/property_tags.hpp similarity index 100% rename from c++/include/boost/function_types/property_tags.hpp rename to c++/boost/function_types/property_tags.hpp diff --git a/c++/include/boost/function_types/result_type.hpp b/c++/boost/function_types/result_type.hpp similarity index 100% rename from c++/include/boost/function_types/result_type.hpp rename to c++/boost/function_types/result_type.hpp diff --git a/c++/include/boost/functional.hpp b/c++/boost/functional.hpp similarity index 100% rename from c++/include/boost/functional.hpp rename to c++/boost/functional.hpp diff --git a/c++/include/boost/functional/factory.hpp b/c++/boost/functional/factory.hpp similarity index 100% rename from c++/include/boost/functional/factory.hpp rename to c++/boost/functional/factory.hpp diff --git a/c++/include/boost/functional/forward_adapter.hpp b/c++/boost/functional/forward_adapter.hpp similarity index 100% rename from c++/include/boost/functional/forward_adapter.hpp rename to c++/boost/functional/forward_adapter.hpp diff --git a/c++/include/boost/functional/hash.hpp b/c++/boost/functional/hash.hpp similarity index 100% rename from c++/include/boost/functional/hash.hpp rename to c++/boost/functional/hash.hpp diff --git a/c++/include/boost/functional/hash/extensions.hpp b/c++/boost/functional/hash/extensions.hpp similarity index 100% rename from c++/include/boost/functional/hash/extensions.hpp rename to c++/boost/functional/hash/extensions.hpp diff --git a/c++/include/boost/functional/hash/hash.hpp b/c++/boost/functional/hash/hash.hpp similarity index 100% rename from c++/include/boost/functional/hash/hash.hpp rename to c++/boost/functional/hash/hash.hpp diff --git a/c++/include/boost/functional/hash/hash_fwd.hpp b/c++/boost/functional/hash/hash_fwd.hpp similarity index 100% rename from c++/include/boost/functional/hash/hash_fwd.hpp rename to c++/boost/functional/hash/hash_fwd.hpp diff --git a/c++/include/boost/functional/hash_fwd.hpp b/c++/boost/functional/hash_fwd.hpp similarity index 100% rename from c++/include/boost/functional/hash_fwd.hpp rename to c++/boost/functional/hash_fwd.hpp diff --git a/c++/include/boost/functional/identity.hpp b/c++/boost/functional/identity.hpp similarity index 100% rename from c++/include/boost/functional/identity.hpp rename to c++/boost/functional/identity.hpp diff --git a/c++/include/boost/functional/lightweight_forward_adapter.hpp b/c++/boost/functional/lightweight_forward_adapter.hpp similarity index 100% rename from c++/include/boost/functional/lightweight_forward_adapter.hpp rename to c++/boost/functional/lightweight_forward_adapter.hpp diff --git a/c++/include/boost/functional/overloaded_function.hpp b/c++/boost/functional/overloaded_function.hpp similarity index 100% rename from c++/include/boost/functional/overloaded_function.hpp rename to c++/boost/functional/overloaded_function.hpp diff --git a/c++/include/boost/functional/overloaded_function/config.hpp b/c++/boost/functional/overloaded_function/config.hpp similarity index 100% rename from c++/include/boost/functional/overloaded_function/config.hpp rename to c++/boost/functional/overloaded_function/config.hpp diff --git a/c++/include/boost/functional/overloaded_function/detail/base.hpp b/c++/boost/functional/overloaded_function/detail/base.hpp similarity index 100% rename from c++/include/boost/functional/overloaded_function/detail/base.hpp rename to c++/boost/functional/overloaded_function/detail/base.hpp diff --git a/c++/include/boost/functional/overloaded_function/detail/function_type.hpp b/c++/boost/functional/overloaded_function/detail/function_type.hpp similarity index 100% rename from c++/include/boost/functional/overloaded_function/detail/function_type.hpp rename to c++/boost/functional/overloaded_function/detail/function_type.hpp diff --git a/c++/include/boost/functional/value_factory.hpp b/c++/boost/functional/value_factory.hpp similarity index 100% rename from c++/include/boost/functional/value_factory.hpp rename to c++/boost/functional/value_factory.hpp diff --git a/c++/include/boost/generator_iterator.hpp b/c++/boost/generator_iterator.hpp similarity index 100% rename from c++/include/boost/generator_iterator.hpp rename to c++/boost/generator_iterator.hpp diff --git a/c++/include/boost/geometry.hpp b/c++/boost/geometry.hpp similarity index 100% rename from c++/include/boost/geometry.hpp rename to c++/boost/geometry.hpp diff --git a/c++/include/boost/get_pointer.hpp b/c++/boost/get_pointer.hpp similarity index 100% rename from c++/include/boost/get_pointer.hpp rename to c++/boost/get_pointer.hpp diff --git a/c++/include/boost/gil.hpp b/c++/boost/gil.hpp similarity index 100% rename from c++/include/boost/gil.hpp rename to c++/boost/gil.hpp diff --git a/c++/include/boost/gil/algorithm.hpp b/c++/boost/gil/algorithm.hpp similarity index 100% rename from c++/include/boost/gil/algorithm.hpp rename to c++/boost/gil/algorithm.hpp diff --git a/c++/include/boost/gil/bit_aligned_pixel_iterator.hpp b/c++/boost/gil/bit_aligned_pixel_iterator.hpp similarity index 100% rename from c++/include/boost/gil/bit_aligned_pixel_iterator.hpp rename to c++/boost/gil/bit_aligned_pixel_iterator.hpp diff --git a/c++/include/boost/gil/bit_aligned_pixel_reference.hpp b/c++/boost/gil/bit_aligned_pixel_reference.hpp similarity index 100% rename from c++/include/boost/gil/bit_aligned_pixel_reference.hpp rename to c++/boost/gil/bit_aligned_pixel_reference.hpp diff --git a/c++/include/boost/gil/channel.hpp b/c++/boost/gil/channel.hpp similarity index 100% rename from c++/include/boost/gil/channel.hpp rename to c++/boost/gil/channel.hpp diff --git a/c++/include/boost/gil/channel_algorithm.hpp b/c++/boost/gil/channel_algorithm.hpp similarity index 100% rename from c++/include/boost/gil/channel_algorithm.hpp rename to c++/boost/gil/channel_algorithm.hpp diff --git a/c++/include/boost/gil/channel_numeric_operations.hpp b/c++/boost/gil/channel_numeric_operations.hpp similarity index 100% rename from c++/include/boost/gil/channel_numeric_operations.hpp rename to c++/boost/gil/channel_numeric_operations.hpp diff --git a/c++/include/boost/gil/cmyk.hpp b/c++/boost/gil/cmyk.hpp similarity index 100% rename from c++/include/boost/gil/cmyk.hpp rename to c++/boost/gil/cmyk.hpp diff --git a/c++/include/boost/gil/color_base.hpp b/c++/boost/gil/color_base.hpp similarity index 100% rename from c++/include/boost/gil/color_base.hpp rename to c++/boost/gil/color_base.hpp diff --git a/c++/include/boost/gil/color_base_algorithm.hpp b/c++/boost/gil/color_base_algorithm.hpp similarity index 100% rename from c++/include/boost/gil/color_base_algorithm.hpp rename to c++/boost/gil/color_base_algorithm.hpp diff --git a/c++/include/boost/gil/color_convert.hpp b/c++/boost/gil/color_convert.hpp similarity index 100% rename from c++/include/boost/gil/color_convert.hpp rename to c++/boost/gil/color_convert.hpp diff --git a/c++/include/boost/gil/concepts.hpp b/c++/boost/gil/concepts.hpp similarity index 100% rename from c++/include/boost/gil/concepts.hpp rename to c++/boost/gil/concepts.hpp diff --git a/c++/include/boost/gil/concepts/basic.hpp b/c++/boost/gil/concepts/basic.hpp similarity index 100% rename from c++/include/boost/gil/concepts/basic.hpp rename to c++/boost/gil/concepts/basic.hpp diff --git a/c++/include/boost/gil/concepts/channel.hpp b/c++/boost/gil/concepts/channel.hpp similarity index 100% rename from c++/include/boost/gil/concepts/channel.hpp rename to c++/boost/gil/concepts/channel.hpp diff --git a/c++/include/boost/gil/concepts/color.hpp b/c++/boost/gil/concepts/color.hpp similarity index 100% rename from c++/include/boost/gil/concepts/color.hpp rename to c++/boost/gil/concepts/color.hpp diff --git a/c++/include/boost/gil/concepts/color_base.hpp b/c++/boost/gil/concepts/color_base.hpp similarity index 100% rename from c++/include/boost/gil/concepts/color_base.hpp rename to c++/boost/gil/concepts/color_base.hpp diff --git a/c++/include/boost/gil/concepts/concept_check.hpp b/c++/boost/gil/concepts/concept_check.hpp similarity index 100% rename from c++/include/boost/gil/concepts/concept_check.hpp rename to c++/boost/gil/concepts/concept_check.hpp diff --git a/c++/include/boost/gil/concepts/detail/type_traits.hpp b/c++/boost/gil/concepts/detail/type_traits.hpp similarity index 100% rename from c++/include/boost/gil/concepts/detail/type_traits.hpp rename to c++/boost/gil/concepts/detail/type_traits.hpp diff --git a/c++/include/boost/gil/concepts/detail/utility.hpp b/c++/boost/gil/concepts/detail/utility.hpp similarity index 100% rename from c++/include/boost/gil/concepts/detail/utility.hpp rename to c++/boost/gil/concepts/detail/utility.hpp diff --git a/c++/include/boost/gil/concepts/dynamic_step.hpp b/c++/boost/gil/concepts/dynamic_step.hpp similarity index 100% rename from c++/include/boost/gil/concepts/dynamic_step.hpp rename to c++/boost/gil/concepts/dynamic_step.hpp diff --git a/c++/include/boost/gil/concepts/fwd.hpp b/c++/boost/gil/concepts/fwd.hpp similarity index 100% rename from c++/include/boost/gil/concepts/fwd.hpp rename to c++/boost/gil/concepts/fwd.hpp diff --git a/c++/include/boost/gil/concepts/image.hpp b/c++/boost/gil/concepts/image.hpp similarity index 100% rename from c++/include/boost/gil/concepts/image.hpp rename to c++/boost/gil/concepts/image.hpp diff --git a/c++/include/boost/gil/concepts/image_view.hpp b/c++/boost/gil/concepts/image_view.hpp similarity index 100% rename from c++/include/boost/gil/concepts/image_view.hpp rename to c++/boost/gil/concepts/image_view.hpp diff --git a/c++/include/boost/gil/concepts/pixel.hpp b/c++/boost/gil/concepts/pixel.hpp similarity index 100% rename from c++/include/boost/gil/concepts/pixel.hpp rename to c++/boost/gil/concepts/pixel.hpp diff --git a/c++/include/boost/gil/concepts/pixel_based.hpp b/c++/boost/gil/concepts/pixel_based.hpp similarity index 100% rename from c++/include/boost/gil/concepts/pixel_based.hpp rename to c++/boost/gil/concepts/pixel_based.hpp diff --git a/c++/include/boost/gil/concepts/pixel_dereference.hpp b/c++/boost/gil/concepts/pixel_dereference.hpp similarity index 100% rename from c++/include/boost/gil/concepts/pixel_dereference.hpp rename to c++/boost/gil/concepts/pixel_dereference.hpp diff --git a/c++/include/boost/gil/concepts/pixel_iterator.hpp b/c++/boost/gil/concepts/pixel_iterator.hpp similarity index 100% rename from c++/include/boost/gil/concepts/pixel_iterator.hpp rename to c++/boost/gil/concepts/pixel_iterator.hpp diff --git a/c++/include/boost/gil/concepts/pixel_locator.hpp b/c++/boost/gil/concepts/pixel_locator.hpp similarity index 100% rename from c++/include/boost/gil/concepts/pixel_locator.hpp rename to c++/boost/gil/concepts/pixel_locator.hpp diff --git a/c++/include/boost/gil/concepts/point.hpp b/c++/boost/gil/concepts/point.hpp similarity index 100% rename from c++/include/boost/gil/concepts/point.hpp rename to c++/boost/gil/concepts/point.hpp diff --git a/c++/include/boost/gil/detail/is_channel_integral.hpp b/c++/boost/gil/detail/is_channel_integral.hpp similarity index 100% rename from c++/include/boost/gil/detail/is_channel_integral.hpp rename to c++/boost/gil/detail/is_channel_integral.hpp diff --git a/c++/include/boost/gil/detail/math.hpp b/c++/boost/gil/detail/math.hpp similarity index 100% rename from c++/include/boost/gil/detail/math.hpp rename to c++/boost/gil/detail/math.hpp diff --git a/c++/include/boost/gil/detail/mp11.hpp b/c++/boost/gil/detail/mp11.hpp similarity index 100% rename from c++/include/boost/gil/detail/mp11.hpp rename to c++/boost/gil/detail/mp11.hpp diff --git a/c++/include/boost/gil/detail/std_common_type.hpp b/c++/boost/gil/detail/std_common_type.hpp similarity index 100% rename from c++/include/boost/gil/detail/std_common_type.hpp rename to c++/boost/gil/detail/std_common_type.hpp diff --git a/c++/include/boost/gil/detail/type_traits.hpp b/c++/boost/gil/detail/type_traits.hpp similarity index 100% rename from c++/include/boost/gil/detail/type_traits.hpp rename to c++/boost/gil/detail/type_traits.hpp diff --git a/c++/include/boost/gil/device_n.hpp b/c++/boost/gil/device_n.hpp similarity index 100% rename from c++/include/boost/gil/device_n.hpp rename to c++/boost/gil/device_n.hpp diff --git a/c++/include/boost/gil/dynamic_step.hpp b/c++/boost/gil/dynamic_step.hpp similarity index 100% rename from c++/include/boost/gil/dynamic_step.hpp rename to c++/boost/gil/dynamic_step.hpp diff --git a/c++/include/boost/gil/extension/dynamic_image/algorithm.hpp b/c++/boost/gil/extension/dynamic_image/algorithm.hpp similarity index 100% rename from c++/include/boost/gil/extension/dynamic_image/algorithm.hpp rename to c++/boost/gil/extension/dynamic_image/algorithm.hpp diff --git a/c++/include/boost/gil/extension/dynamic_image/any_image.hpp b/c++/boost/gil/extension/dynamic_image/any_image.hpp similarity index 100% rename from c++/include/boost/gil/extension/dynamic_image/any_image.hpp rename to c++/boost/gil/extension/dynamic_image/any_image.hpp diff --git a/c++/include/boost/gil/extension/dynamic_image/any_image_view.hpp b/c++/boost/gil/extension/dynamic_image/any_image_view.hpp similarity index 100% rename from c++/include/boost/gil/extension/dynamic_image/any_image_view.hpp rename to c++/boost/gil/extension/dynamic_image/any_image_view.hpp diff --git a/c++/include/boost/gil/extension/dynamic_image/apply_operation.hpp b/c++/boost/gil/extension/dynamic_image/apply_operation.hpp similarity index 100% rename from c++/include/boost/gil/extension/dynamic_image/apply_operation.hpp rename to c++/boost/gil/extension/dynamic_image/apply_operation.hpp diff --git a/c++/include/boost/gil/extension/dynamic_image/dynamic_at_c.hpp b/c++/boost/gil/extension/dynamic_image/dynamic_at_c.hpp similarity index 100% rename from c++/include/boost/gil/extension/dynamic_image/dynamic_at_c.hpp rename to c++/boost/gil/extension/dynamic_image/dynamic_at_c.hpp diff --git a/c++/include/boost/gil/extension/dynamic_image/dynamic_image_all.hpp b/c++/boost/gil/extension/dynamic_image/dynamic_image_all.hpp similarity index 100% rename from c++/include/boost/gil/extension/dynamic_image/dynamic_image_all.hpp rename to c++/boost/gil/extension/dynamic_image/dynamic_image_all.hpp diff --git a/c++/include/boost/gil/extension/dynamic_image/image_view_factory.hpp b/c++/boost/gil/extension/dynamic_image/image_view_factory.hpp similarity index 100% rename from c++/include/boost/gil/extension/dynamic_image/image_view_factory.hpp rename to c++/boost/gil/extension/dynamic_image/image_view_factory.hpp diff --git a/c++/include/boost/gil/extension/histogram/std.hpp b/c++/boost/gil/extension/histogram/std.hpp similarity index 100% rename from c++/include/boost/gil/extension/histogram/std.hpp rename to c++/boost/gil/extension/histogram/std.hpp diff --git a/c++/include/boost/gil/extension/image_processing/diffusion.hpp b/c++/boost/gil/extension/image_processing/diffusion.hpp similarity index 100% rename from c++/include/boost/gil/extension/image_processing/diffusion.hpp rename to c++/boost/gil/extension/image_processing/diffusion.hpp diff --git a/c++/include/boost/gil/extension/image_processing/hough_parameter.hpp b/c++/boost/gil/extension/image_processing/hough_parameter.hpp similarity index 100% rename from c++/include/boost/gil/extension/image_processing/hough_parameter.hpp rename to c++/boost/gil/extension/image_processing/hough_parameter.hpp diff --git a/c++/include/boost/gil/extension/image_processing/hough_transform.hpp b/c++/boost/gil/extension/image_processing/hough_transform.hpp similarity index 100% rename from c++/include/boost/gil/extension/image_processing/hough_transform.hpp rename to c++/boost/gil/extension/image_processing/hough_transform.hpp diff --git a/c++/include/boost/gil/extension/io/bmp.hpp b/c++/boost/gil/extension/io/bmp.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/bmp.hpp rename to c++/boost/gil/extension/io/bmp.hpp diff --git a/c++/include/boost/gil/extension/io/bmp/detail/is_allowed.hpp b/c++/boost/gil/extension/io/bmp/detail/is_allowed.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/bmp/detail/is_allowed.hpp rename to c++/boost/gil/extension/io/bmp/detail/is_allowed.hpp diff --git a/c++/include/boost/gil/extension/io/bmp/detail/read.hpp b/c++/boost/gil/extension/io/bmp/detail/read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/bmp/detail/read.hpp rename to c++/boost/gil/extension/io/bmp/detail/read.hpp diff --git a/c++/include/boost/gil/extension/io/bmp/detail/reader_backend.hpp b/c++/boost/gil/extension/io/bmp/detail/reader_backend.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/bmp/detail/reader_backend.hpp rename to c++/boost/gil/extension/io/bmp/detail/reader_backend.hpp diff --git a/c++/include/boost/gil/extension/io/bmp/detail/scanline_read.hpp b/c++/boost/gil/extension/io/bmp/detail/scanline_read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/bmp/detail/scanline_read.hpp rename to c++/boost/gil/extension/io/bmp/detail/scanline_read.hpp diff --git a/c++/include/boost/gil/extension/io/bmp/detail/supported_types.hpp b/c++/boost/gil/extension/io/bmp/detail/supported_types.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/bmp/detail/supported_types.hpp rename to c++/boost/gil/extension/io/bmp/detail/supported_types.hpp diff --git a/c++/include/boost/gil/extension/io/bmp/detail/write.hpp b/c++/boost/gil/extension/io/bmp/detail/write.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/bmp/detail/write.hpp rename to c++/boost/gil/extension/io/bmp/detail/write.hpp diff --git a/c++/include/boost/gil/extension/io/bmp/detail/writer_backend.hpp b/c++/boost/gil/extension/io/bmp/detail/writer_backend.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/bmp/detail/writer_backend.hpp rename to c++/boost/gil/extension/io/bmp/detail/writer_backend.hpp diff --git a/c++/include/boost/gil/extension/io/bmp/old.hpp b/c++/boost/gil/extension/io/bmp/old.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/bmp/old.hpp rename to c++/boost/gil/extension/io/bmp/old.hpp diff --git a/c++/include/boost/gil/extension/io/bmp/read.hpp b/c++/boost/gil/extension/io/bmp/read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/bmp/read.hpp rename to c++/boost/gil/extension/io/bmp/read.hpp diff --git a/c++/include/boost/gil/extension/io/bmp/tags.hpp b/c++/boost/gil/extension/io/bmp/tags.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/bmp/tags.hpp rename to c++/boost/gil/extension/io/bmp/tags.hpp diff --git a/c++/include/boost/gil/extension/io/bmp/write.hpp b/c++/boost/gil/extension/io/bmp/write.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/bmp/write.hpp rename to c++/boost/gil/extension/io/bmp/write.hpp diff --git a/c++/include/boost/gil/extension/io/jpeg.hpp b/c++/boost/gil/extension/io/jpeg.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/jpeg.hpp rename to c++/boost/gil/extension/io/jpeg.hpp diff --git a/c++/include/boost/gil/extension/io/jpeg/detail/base.hpp b/c++/boost/gil/extension/io/jpeg/detail/base.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/jpeg/detail/base.hpp rename to c++/boost/gil/extension/io/jpeg/detail/base.hpp diff --git a/c++/include/boost/gil/extension/io/jpeg/detail/is_allowed.hpp b/c++/boost/gil/extension/io/jpeg/detail/is_allowed.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/jpeg/detail/is_allowed.hpp rename to c++/boost/gil/extension/io/jpeg/detail/is_allowed.hpp diff --git a/c++/include/boost/gil/extension/io/jpeg/detail/read.hpp b/c++/boost/gil/extension/io/jpeg/detail/read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/jpeg/detail/read.hpp rename to c++/boost/gil/extension/io/jpeg/detail/read.hpp diff --git a/c++/include/boost/gil/extension/io/jpeg/detail/reader_backend.hpp b/c++/boost/gil/extension/io/jpeg/detail/reader_backend.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/jpeg/detail/reader_backend.hpp rename to c++/boost/gil/extension/io/jpeg/detail/reader_backend.hpp diff --git a/c++/include/boost/gil/extension/io/jpeg/detail/scanline_read.hpp b/c++/boost/gil/extension/io/jpeg/detail/scanline_read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/jpeg/detail/scanline_read.hpp rename to c++/boost/gil/extension/io/jpeg/detail/scanline_read.hpp diff --git a/c++/include/boost/gil/extension/io/jpeg/detail/supported_types.hpp b/c++/boost/gil/extension/io/jpeg/detail/supported_types.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/jpeg/detail/supported_types.hpp rename to c++/boost/gil/extension/io/jpeg/detail/supported_types.hpp diff --git a/c++/include/boost/gil/extension/io/jpeg/detail/write.hpp b/c++/boost/gil/extension/io/jpeg/detail/write.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/jpeg/detail/write.hpp rename to c++/boost/gil/extension/io/jpeg/detail/write.hpp diff --git a/c++/include/boost/gil/extension/io/jpeg/detail/writer_backend.hpp b/c++/boost/gil/extension/io/jpeg/detail/writer_backend.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/jpeg/detail/writer_backend.hpp rename to c++/boost/gil/extension/io/jpeg/detail/writer_backend.hpp diff --git a/c++/include/boost/gil/extension/io/jpeg/old.hpp b/c++/boost/gil/extension/io/jpeg/old.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/jpeg/old.hpp rename to c++/boost/gil/extension/io/jpeg/old.hpp diff --git a/c++/include/boost/gil/extension/io/jpeg/read.hpp b/c++/boost/gil/extension/io/jpeg/read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/jpeg/read.hpp rename to c++/boost/gil/extension/io/jpeg/read.hpp diff --git a/c++/include/boost/gil/extension/io/jpeg/tags.hpp b/c++/boost/gil/extension/io/jpeg/tags.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/jpeg/tags.hpp rename to c++/boost/gil/extension/io/jpeg/tags.hpp diff --git a/c++/include/boost/gil/extension/io/jpeg/write.hpp b/c++/boost/gil/extension/io/jpeg/write.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/jpeg/write.hpp rename to c++/boost/gil/extension/io/jpeg/write.hpp diff --git a/c++/include/boost/gil/extension/io/png.hpp b/c++/boost/gil/extension/io/png.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/png.hpp rename to c++/boost/gil/extension/io/png.hpp diff --git a/c++/include/boost/gil/extension/io/png/detail/base.hpp b/c++/boost/gil/extension/io/png/detail/base.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/png/detail/base.hpp rename to c++/boost/gil/extension/io/png/detail/base.hpp diff --git a/c++/include/boost/gil/extension/io/png/detail/is_allowed.hpp b/c++/boost/gil/extension/io/png/detail/is_allowed.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/png/detail/is_allowed.hpp rename to c++/boost/gil/extension/io/png/detail/is_allowed.hpp diff --git a/c++/include/boost/gil/extension/io/png/detail/read.hpp b/c++/boost/gil/extension/io/png/detail/read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/png/detail/read.hpp rename to c++/boost/gil/extension/io/png/detail/read.hpp diff --git a/c++/include/boost/gil/extension/io/png/detail/reader_backend.hpp b/c++/boost/gil/extension/io/png/detail/reader_backend.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/png/detail/reader_backend.hpp rename to c++/boost/gil/extension/io/png/detail/reader_backend.hpp diff --git a/c++/include/boost/gil/extension/io/png/detail/scanline_read.hpp b/c++/boost/gil/extension/io/png/detail/scanline_read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/png/detail/scanline_read.hpp rename to c++/boost/gil/extension/io/png/detail/scanline_read.hpp diff --git a/c++/include/boost/gil/extension/io/png/detail/supported_types.hpp b/c++/boost/gil/extension/io/png/detail/supported_types.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/png/detail/supported_types.hpp rename to c++/boost/gil/extension/io/png/detail/supported_types.hpp diff --git a/c++/include/boost/gil/extension/io/png/detail/write.hpp b/c++/boost/gil/extension/io/png/detail/write.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/png/detail/write.hpp rename to c++/boost/gil/extension/io/png/detail/write.hpp diff --git a/c++/include/boost/gil/extension/io/png/detail/writer_backend.hpp b/c++/boost/gil/extension/io/png/detail/writer_backend.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/png/detail/writer_backend.hpp rename to c++/boost/gil/extension/io/png/detail/writer_backend.hpp diff --git a/c++/include/boost/gil/extension/io/png/old.hpp b/c++/boost/gil/extension/io/png/old.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/png/old.hpp rename to c++/boost/gil/extension/io/png/old.hpp diff --git a/c++/include/boost/gil/extension/io/png/read.hpp b/c++/boost/gil/extension/io/png/read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/png/read.hpp rename to c++/boost/gil/extension/io/png/read.hpp diff --git a/c++/include/boost/gil/extension/io/png/tags.hpp b/c++/boost/gil/extension/io/png/tags.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/png/tags.hpp rename to c++/boost/gil/extension/io/png/tags.hpp diff --git a/c++/include/boost/gil/extension/io/png/write.hpp b/c++/boost/gil/extension/io/png/write.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/png/write.hpp rename to c++/boost/gil/extension/io/png/write.hpp diff --git a/c++/include/boost/gil/extension/io/pnm.hpp b/c++/boost/gil/extension/io/pnm.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/pnm.hpp rename to c++/boost/gil/extension/io/pnm.hpp diff --git a/c++/include/boost/gil/extension/io/pnm/detail/is_allowed.hpp b/c++/boost/gil/extension/io/pnm/detail/is_allowed.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/pnm/detail/is_allowed.hpp rename to c++/boost/gil/extension/io/pnm/detail/is_allowed.hpp diff --git a/c++/include/boost/gil/extension/io/pnm/detail/read.hpp b/c++/boost/gil/extension/io/pnm/detail/read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/pnm/detail/read.hpp rename to c++/boost/gil/extension/io/pnm/detail/read.hpp diff --git a/c++/include/boost/gil/extension/io/pnm/detail/reader_backend.hpp b/c++/boost/gil/extension/io/pnm/detail/reader_backend.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/pnm/detail/reader_backend.hpp rename to c++/boost/gil/extension/io/pnm/detail/reader_backend.hpp diff --git a/c++/include/boost/gil/extension/io/pnm/detail/scanline_read.hpp b/c++/boost/gil/extension/io/pnm/detail/scanline_read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/pnm/detail/scanline_read.hpp rename to c++/boost/gil/extension/io/pnm/detail/scanline_read.hpp diff --git a/c++/include/boost/gil/extension/io/pnm/detail/supported_types.hpp b/c++/boost/gil/extension/io/pnm/detail/supported_types.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/pnm/detail/supported_types.hpp rename to c++/boost/gil/extension/io/pnm/detail/supported_types.hpp diff --git a/c++/include/boost/gil/extension/io/pnm/detail/write.hpp b/c++/boost/gil/extension/io/pnm/detail/write.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/pnm/detail/write.hpp rename to c++/boost/gil/extension/io/pnm/detail/write.hpp diff --git a/c++/include/boost/gil/extension/io/pnm/detail/writer_backend.hpp b/c++/boost/gil/extension/io/pnm/detail/writer_backend.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/pnm/detail/writer_backend.hpp rename to c++/boost/gil/extension/io/pnm/detail/writer_backend.hpp diff --git a/c++/include/boost/gil/extension/io/pnm/old.hpp b/c++/boost/gil/extension/io/pnm/old.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/pnm/old.hpp rename to c++/boost/gil/extension/io/pnm/old.hpp diff --git a/c++/include/boost/gil/extension/io/pnm/read.hpp b/c++/boost/gil/extension/io/pnm/read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/pnm/read.hpp rename to c++/boost/gil/extension/io/pnm/read.hpp diff --git a/c++/include/boost/gil/extension/io/pnm/tags.hpp b/c++/boost/gil/extension/io/pnm/tags.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/pnm/tags.hpp rename to c++/boost/gil/extension/io/pnm/tags.hpp diff --git a/c++/include/boost/gil/extension/io/pnm/write.hpp b/c++/boost/gil/extension/io/pnm/write.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/pnm/write.hpp rename to c++/boost/gil/extension/io/pnm/write.hpp diff --git a/c++/include/boost/gil/extension/io/raw.hpp b/c++/boost/gil/extension/io/raw.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/raw.hpp rename to c++/boost/gil/extension/io/raw.hpp diff --git a/c++/include/boost/gil/extension/io/raw/detail/device.hpp b/c++/boost/gil/extension/io/raw/detail/device.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/raw/detail/device.hpp rename to c++/boost/gil/extension/io/raw/detail/device.hpp diff --git a/c++/include/boost/gil/extension/io/raw/detail/is_allowed.hpp b/c++/boost/gil/extension/io/raw/detail/is_allowed.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/raw/detail/is_allowed.hpp rename to c++/boost/gil/extension/io/raw/detail/is_allowed.hpp diff --git a/c++/include/boost/gil/extension/io/raw/detail/read.hpp b/c++/boost/gil/extension/io/raw/detail/read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/raw/detail/read.hpp rename to c++/boost/gil/extension/io/raw/detail/read.hpp diff --git a/c++/include/boost/gil/extension/io/raw/detail/reader_backend.hpp b/c++/boost/gil/extension/io/raw/detail/reader_backend.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/raw/detail/reader_backend.hpp rename to c++/boost/gil/extension/io/raw/detail/reader_backend.hpp diff --git a/c++/include/boost/gil/extension/io/raw/detail/supported_types.hpp b/c++/boost/gil/extension/io/raw/detail/supported_types.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/raw/detail/supported_types.hpp rename to c++/boost/gil/extension/io/raw/detail/supported_types.hpp diff --git a/c++/include/boost/gil/extension/io/raw/read.hpp b/c++/boost/gil/extension/io/raw/read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/raw/read.hpp rename to c++/boost/gil/extension/io/raw/read.hpp diff --git a/c++/include/boost/gil/extension/io/raw/tags.hpp b/c++/boost/gil/extension/io/raw/tags.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/raw/tags.hpp rename to c++/boost/gil/extension/io/raw/tags.hpp diff --git a/c++/include/boost/gil/extension/io/targa.hpp b/c++/boost/gil/extension/io/targa.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/targa.hpp rename to c++/boost/gil/extension/io/targa.hpp diff --git a/c++/include/boost/gil/extension/io/targa/detail/is_allowed.hpp b/c++/boost/gil/extension/io/targa/detail/is_allowed.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/targa/detail/is_allowed.hpp rename to c++/boost/gil/extension/io/targa/detail/is_allowed.hpp diff --git a/c++/include/boost/gil/extension/io/targa/detail/read.hpp b/c++/boost/gil/extension/io/targa/detail/read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/targa/detail/read.hpp rename to c++/boost/gil/extension/io/targa/detail/read.hpp diff --git a/c++/include/boost/gil/extension/io/targa/detail/reader_backend.hpp b/c++/boost/gil/extension/io/targa/detail/reader_backend.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/targa/detail/reader_backend.hpp rename to c++/boost/gil/extension/io/targa/detail/reader_backend.hpp diff --git a/c++/include/boost/gil/extension/io/targa/detail/scanline_read.hpp b/c++/boost/gil/extension/io/targa/detail/scanline_read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/targa/detail/scanline_read.hpp rename to c++/boost/gil/extension/io/targa/detail/scanline_read.hpp diff --git a/c++/include/boost/gil/extension/io/targa/detail/supported_types.hpp b/c++/boost/gil/extension/io/targa/detail/supported_types.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/targa/detail/supported_types.hpp rename to c++/boost/gil/extension/io/targa/detail/supported_types.hpp diff --git a/c++/include/boost/gil/extension/io/targa/detail/write.hpp b/c++/boost/gil/extension/io/targa/detail/write.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/targa/detail/write.hpp rename to c++/boost/gil/extension/io/targa/detail/write.hpp diff --git a/c++/include/boost/gil/extension/io/targa/detail/writer_backend.hpp b/c++/boost/gil/extension/io/targa/detail/writer_backend.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/targa/detail/writer_backend.hpp rename to c++/boost/gil/extension/io/targa/detail/writer_backend.hpp diff --git a/c++/include/boost/gil/extension/io/targa/old.hpp b/c++/boost/gil/extension/io/targa/old.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/targa/old.hpp rename to c++/boost/gil/extension/io/targa/old.hpp diff --git a/c++/include/boost/gil/extension/io/targa/read.hpp b/c++/boost/gil/extension/io/targa/read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/targa/read.hpp rename to c++/boost/gil/extension/io/targa/read.hpp diff --git a/c++/include/boost/gil/extension/io/targa/tags.hpp b/c++/boost/gil/extension/io/targa/tags.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/targa/tags.hpp rename to c++/boost/gil/extension/io/targa/tags.hpp diff --git a/c++/include/boost/gil/extension/io/targa/write.hpp b/c++/boost/gil/extension/io/targa/write.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/targa/write.hpp rename to c++/boost/gil/extension/io/targa/write.hpp diff --git a/c++/include/boost/gil/extension/io/tiff.hpp b/c++/boost/gil/extension/io/tiff.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/tiff.hpp rename to c++/boost/gil/extension/io/tiff.hpp diff --git a/c++/include/boost/gil/extension/io/tiff/detail/device.hpp b/c++/boost/gil/extension/io/tiff/detail/device.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/tiff/detail/device.hpp rename to c++/boost/gil/extension/io/tiff/detail/device.hpp diff --git a/c++/include/boost/gil/extension/io/tiff/detail/is_allowed.hpp b/c++/boost/gil/extension/io/tiff/detail/is_allowed.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/tiff/detail/is_allowed.hpp rename to c++/boost/gil/extension/io/tiff/detail/is_allowed.hpp diff --git a/c++/include/boost/gil/extension/io/tiff/detail/log.hpp b/c++/boost/gil/extension/io/tiff/detail/log.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/tiff/detail/log.hpp rename to c++/boost/gil/extension/io/tiff/detail/log.hpp diff --git a/c++/include/boost/gil/extension/io/tiff/detail/read.hpp b/c++/boost/gil/extension/io/tiff/detail/read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/tiff/detail/read.hpp rename to c++/boost/gil/extension/io/tiff/detail/read.hpp diff --git a/c++/include/boost/gil/extension/io/tiff/detail/reader_backend.hpp b/c++/boost/gil/extension/io/tiff/detail/reader_backend.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/tiff/detail/reader_backend.hpp rename to c++/boost/gil/extension/io/tiff/detail/reader_backend.hpp diff --git a/c++/include/boost/gil/extension/io/tiff/detail/scanline_read.hpp b/c++/boost/gil/extension/io/tiff/detail/scanline_read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/tiff/detail/scanline_read.hpp rename to c++/boost/gil/extension/io/tiff/detail/scanline_read.hpp diff --git a/c++/include/boost/gil/extension/io/tiff/detail/supported_types.hpp b/c++/boost/gil/extension/io/tiff/detail/supported_types.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/tiff/detail/supported_types.hpp rename to c++/boost/gil/extension/io/tiff/detail/supported_types.hpp diff --git a/c++/include/boost/gil/extension/io/tiff/detail/write.hpp b/c++/boost/gil/extension/io/tiff/detail/write.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/tiff/detail/write.hpp rename to c++/boost/gil/extension/io/tiff/detail/write.hpp diff --git a/c++/include/boost/gil/extension/io/tiff/detail/writer_backend.hpp b/c++/boost/gil/extension/io/tiff/detail/writer_backend.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/tiff/detail/writer_backend.hpp rename to c++/boost/gil/extension/io/tiff/detail/writer_backend.hpp diff --git a/c++/include/boost/gil/extension/io/tiff/old.hpp b/c++/boost/gil/extension/io/tiff/old.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/tiff/old.hpp rename to c++/boost/gil/extension/io/tiff/old.hpp diff --git a/c++/include/boost/gil/extension/io/tiff/read.hpp b/c++/boost/gil/extension/io/tiff/read.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/tiff/read.hpp rename to c++/boost/gil/extension/io/tiff/read.hpp diff --git a/c++/include/boost/gil/extension/io/tiff/tags.hpp b/c++/boost/gil/extension/io/tiff/tags.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/tiff/tags.hpp rename to c++/boost/gil/extension/io/tiff/tags.hpp diff --git a/c++/include/boost/gil/extension/io/tiff/write.hpp b/c++/boost/gil/extension/io/tiff/write.hpp similarity index 100% rename from c++/include/boost/gil/extension/io/tiff/write.hpp rename to c++/boost/gil/extension/io/tiff/write.hpp diff --git a/c++/include/boost/gil/extension/numeric/affine.hpp b/c++/boost/gil/extension/numeric/affine.hpp similarity index 100% rename from c++/include/boost/gil/extension/numeric/affine.hpp rename to c++/boost/gil/extension/numeric/affine.hpp diff --git a/c++/include/boost/gil/extension/numeric/algorithm.hpp b/c++/boost/gil/extension/numeric/algorithm.hpp similarity index 100% rename from c++/include/boost/gil/extension/numeric/algorithm.hpp rename to c++/boost/gil/extension/numeric/algorithm.hpp diff --git a/c++/include/boost/gil/extension/numeric/channel_numeric_operations.hpp b/c++/boost/gil/extension/numeric/channel_numeric_operations.hpp similarity index 100% rename from c++/include/boost/gil/extension/numeric/channel_numeric_operations.hpp rename to c++/boost/gil/extension/numeric/channel_numeric_operations.hpp diff --git a/c++/include/boost/gil/extension/numeric/convolve.hpp b/c++/boost/gil/extension/numeric/convolve.hpp similarity index 100% rename from c++/include/boost/gil/extension/numeric/convolve.hpp rename to c++/boost/gil/extension/numeric/convolve.hpp diff --git a/c++/include/boost/gil/extension/numeric/kernel.hpp b/c++/boost/gil/extension/numeric/kernel.hpp similarity index 100% rename from c++/include/boost/gil/extension/numeric/kernel.hpp rename to c++/boost/gil/extension/numeric/kernel.hpp diff --git a/c++/include/boost/gil/extension/numeric/pixel_numeric_operations.hpp b/c++/boost/gil/extension/numeric/pixel_numeric_operations.hpp similarity index 100% rename from c++/include/boost/gil/extension/numeric/pixel_numeric_operations.hpp rename to c++/boost/gil/extension/numeric/pixel_numeric_operations.hpp diff --git a/c++/include/boost/gil/extension/numeric/resample.hpp b/c++/boost/gil/extension/numeric/resample.hpp similarity index 100% rename from c++/include/boost/gil/extension/numeric/resample.hpp rename to c++/boost/gil/extension/numeric/resample.hpp diff --git a/c++/include/boost/gil/extension/numeric/sampler.hpp b/c++/boost/gil/extension/numeric/sampler.hpp similarity index 100% rename from c++/include/boost/gil/extension/numeric/sampler.hpp rename to c++/boost/gil/extension/numeric/sampler.hpp diff --git a/c++/include/boost/gil/extension/rasterization/apply_rasterizer.hpp b/c++/boost/gil/extension/rasterization/apply_rasterizer.hpp similarity index 100% rename from c++/include/boost/gil/extension/rasterization/apply_rasterizer.hpp rename to c++/boost/gil/extension/rasterization/apply_rasterizer.hpp diff --git a/c++/include/boost/gil/extension/rasterization/circle.hpp b/c++/boost/gil/extension/rasterization/circle.hpp similarity index 100% rename from c++/include/boost/gil/extension/rasterization/circle.hpp rename to c++/boost/gil/extension/rasterization/circle.hpp diff --git a/c++/include/boost/gil/extension/rasterization/ellipse.hpp b/c++/boost/gil/extension/rasterization/ellipse.hpp similarity index 100% rename from c++/include/boost/gil/extension/rasterization/ellipse.hpp rename to c++/boost/gil/extension/rasterization/ellipse.hpp diff --git a/c++/include/boost/gil/extension/rasterization/line.hpp b/c++/boost/gil/extension/rasterization/line.hpp similarity index 100% rename from c++/include/boost/gil/extension/rasterization/line.hpp rename to c++/boost/gil/extension/rasterization/line.hpp diff --git a/c++/include/boost/gil/extension/toolbox/color_converters.hpp b/c++/boost/gil/extension/toolbox/color_converters.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/color_converters.hpp rename to c++/boost/gil/extension/toolbox/color_converters.hpp diff --git a/c++/include/boost/gil/extension/toolbox/color_converters/gray_to_rgba.hpp b/c++/boost/gil/extension/toolbox/color_converters/gray_to_rgba.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/color_converters/gray_to_rgba.hpp rename to c++/boost/gil/extension/toolbox/color_converters/gray_to_rgba.hpp diff --git a/c++/include/boost/gil/extension/toolbox/color_converters/rgb_to_luminance.hpp b/c++/boost/gil/extension/toolbox/color_converters/rgb_to_luminance.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/color_converters/rgb_to_luminance.hpp rename to c++/boost/gil/extension/toolbox/color_converters/rgb_to_luminance.hpp diff --git a/c++/include/boost/gil/extension/toolbox/color_spaces.hpp b/c++/boost/gil/extension/toolbox/color_spaces.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/color_spaces.hpp rename to c++/boost/gil/extension/toolbox/color_spaces.hpp diff --git a/c++/include/boost/gil/extension/toolbox/color_spaces/cmyka.hpp b/c++/boost/gil/extension/toolbox/color_spaces/cmyka.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/color_spaces/cmyka.hpp rename to c++/boost/gil/extension/toolbox/color_spaces/cmyka.hpp diff --git a/c++/include/boost/gil/extension/toolbox/color_spaces/gray_alpha.hpp b/c++/boost/gil/extension/toolbox/color_spaces/gray_alpha.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/color_spaces/gray_alpha.hpp rename to c++/boost/gil/extension/toolbox/color_spaces/gray_alpha.hpp diff --git a/c++/include/boost/gil/extension/toolbox/color_spaces/hsl.hpp b/c++/boost/gil/extension/toolbox/color_spaces/hsl.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/color_spaces/hsl.hpp rename to c++/boost/gil/extension/toolbox/color_spaces/hsl.hpp diff --git a/c++/include/boost/gil/extension/toolbox/color_spaces/hsv.hpp b/c++/boost/gil/extension/toolbox/color_spaces/hsv.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/color_spaces/hsv.hpp rename to c++/boost/gil/extension/toolbox/color_spaces/hsv.hpp diff --git a/c++/include/boost/gil/extension/toolbox/color_spaces/lab.hpp b/c++/boost/gil/extension/toolbox/color_spaces/lab.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/color_spaces/lab.hpp rename to c++/boost/gil/extension/toolbox/color_spaces/lab.hpp diff --git a/c++/include/boost/gil/extension/toolbox/color_spaces/xyz.hpp b/c++/boost/gil/extension/toolbox/color_spaces/xyz.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/color_spaces/xyz.hpp rename to c++/boost/gil/extension/toolbox/color_spaces/xyz.hpp diff --git a/c++/include/boost/gil/extension/toolbox/color_spaces/ycbcr.hpp b/c++/boost/gil/extension/toolbox/color_spaces/ycbcr.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/color_spaces/ycbcr.hpp rename to c++/boost/gil/extension/toolbox/color_spaces/ycbcr.hpp diff --git a/c++/include/boost/gil/extension/toolbox/dynamic_images.hpp b/c++/boost/gil/extension/toolbox/dynamic_images.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/dynamic_images.hpp rename to c++/boost/gil/extension/toolbox/dynamic_images.hpp diff --git a/c++/include/boost/gil/extension/toolbox/image_types.hpp b/c++/boost/gil/extension/toolbox/image_types.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/image_types.hpp rename to c++/boost/gil/extension/toolbox/image_types.hpp diff --git a/c++/include/boost/gil/extension/toolbox/image_types/indexed_image.hpp b/c++/boost/gil/extension/toolbox/image_types/indexed_image.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/image_types/indexed_image.hpp rename to c++/boost/gil/extension/toolbox/image_types/indexed_image.hpp diff --git a/c++/include/boost/gil/extension/toolbox/image_types/subchroma_image.hpp b/c++/boost/gil/extension/toolbox/image_types/subchroma_image.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/image_types/subchroma_image.hpp rename to c++/boost/gil/extension/toolbox/image_types/subchroma_image.hpp diff --git a/c++/include/boost/gil/extension/toolbox/metafunctions.hpp b/c++/boost/gil/extension/toolbox/metafunctions.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/metafunctions.hpp rename to c++/boost/gil/extension/toolbox/metafunctions.hpp diff --git a/c++/include/boost/gil/extension/toolbox/metafunctions/channel_type.hpp b/c++/boost/gil/extension/toolbox/metafunctions/channel_type.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/metafunctions/channel_type.hpp rename to c++/boost/gil/extension/toolbox/metafunctions/channel_type.hpp diff --git a/c++/include/boost/gil/extension/toolbox/metafunctions/channel_view.hpp b/c++/boost/gil/extension/toolbox/metafunctions/channel_view.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/metafunctions/channel_view.hpp rename to c++/boost/gil/extension/toolbox/metafunctions/channel_view.hpp diff --git a/c++/include/boost/gil/extension/toolbox/metafunctions/get_num_bits.hpp b/c++/boost/gil/extension/toolbox/metafunctions/get_num_bits.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/metafunctions/get_num_bits.hpp rename to c++/boost/gil/extension/toolbox/metafunctions/get_num_bits.hpp diff --git a/c++/include/boost/gil/extension/toolbox/metafunctions/get_pixel_type.hpp b/c++/boost/gil/extension/toolbox/metafunctions/get_pixel_type.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/metafunctions/get_pixel_type.hpp rename to c++/boost/gil/extension/toolbox/metafunctions/get_pixel_type.hpp diff --git a/c++/include/boost/gil/extension/toolbox/metafunctions/is_bit_aligned.hpp b/c++/boost/gil/extension/toolbox/metafunctions/is_bit_aligned.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/metafunctions/is_bit_aligned.hpp rename to c++/boost/gil/extension/toolbox/metafunctions/is_bit_aligned.hpp diff --git a/c++/include/boost/gil/extension/toolbox/metafunctions/is_homogeneous.hpp b/c++/boost/gil/extension/toolbox/metafunctions/is_homogeneous.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/metafunctions/is_homogeneous.hpp rename to c++/boost/gil/extension/toolbox/metafunctions/is_homogeneous.hpp diff --git a/c++/include/boost/gil/extension/toolbox/metafunctions/is_similar.hpp b/c++/boost/gil/extension/toolbox/metafunctions/is_similar.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/metafunctions/is_similar.hpp rename to c++/boost/gil/extension/toolbox/metafunctions/is_similar.hpp diff --git a/c++/include/boost/gil/extension/toolbox/metafunctions/pixel_bit_size.hpp b/c++/boost/gil/extension/toolbox/metafunctions/pixel_bit_size.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/metafunctions/pixel_bit_size.hpp rename to c++/boost/gil/extension/toolbox/metafunctions/pixel_bit_size.hpp diff --git a/c++/include/boost/gil/extension/toolbox/toolbox.hpp b/c++/boost/gil/extension/toolbox/toolbox.hpp similarity index 100% rename from c++/include/boost/gil/extension/toolbox/toolbox.hpp rename to c++/boost/gil/extension/toolbox/toolbox.hpp diff --git a/c++/include/boost/gil/gray.hpp b/c++/boost/gil/gray.hpp similarity index 100% rename from c++/include/boost/gil/gray.hpp rename to c++/boost/gil/gray.hpp diff --git a/c++/include/boost/gil/histogram.hpp b/c++/boost/gil/histogram.hpp similarity index 100% rename from c++/include/boost/gil/histogram.hpp rename to c++/boost/gil/histogram.hpp diff --git a/c++/include/boost/gil/image.hpp b/c++/boost/gil/image.hpp similarity index 100% rename from c++/include/boost/gil/image.hpp rename to c++/boost/gil/image.hpp diff --git a/c++/include/boost/gil/image_processing/adaptive_histogram_equalization.hpp b/c++/boost/gil/image_processing/adaptive_histogram_equalization.hpp similarity index 100% rename from c++/include/boost/gil/image_processing/adaptive_histogram_equalization.hpp rename to c++/boost/gil/image_processing/adaptive_histogram_equalization.hpp diff --git a/c++/include/boost/gil/image_processing/convolve.hpp b/c++/boost/gil/image_processing/convolve.hpp similarity index 100% rename from c++/include/boost/gil/image_processing/convolve.hpp rename to c++/boost/gil/image_processing/convolve.hpp diff --git a/c++/include/boost/gil/image_processing/filter.hpp b/c++/boost/gil/image_processing/filter.hpp similarity index 100% rename from c++/include/boost/gil/image_processing/filter.hpp rename to c++/boost/gil/image_processing/filter.hpp diff --git a/c++/include/boost/gil/image_processing/harris.hpp b/c++/boost/gil/image_processing/harris.hpp similarity index 100% rename from c++/include/boost/gil/image_processing/harris.hpp rename to c++/boost/gil/image_processing/harris.hpp diff --git a/c++/include/boost/gil/image_processing/hessian.hpp b/c++/boost/gil/image_processing/hessian.hpp similarity index 100% rename from c++/include/boost/gil/image_processing/hessian.hpp rename to c++/boost/gil/image_processing/hessian.hpp diff --git a/c++/include/boost/gil/image_processing/histogram_equalization.hpp b/c++/boost/gil/image_processing/histogram_equalization.hpp similarity index 100% rename from c++/include/boost/gil/image_processing/histogram_equalization.hpp rename to c++/boost/gil/image_processing/histogram_equalization.hpp diff --git a/c++/include/boost/gil/image_processing/histogram_matching.hpp b/c++/boost/gil/image_processing/histogram_matching.hpp similarity index 100% rename from c++/include/boost/gil/image_processing/histogram_matching.hpp rename to c++/boost/gil/image_processing/histogram_matching.hpp diff --git a/c++/include/boost/gil/image_processing/kernel.hpp b/c++/boost/gil/image_processing/kernel.hpp similarity index 100% rename from c++/include/boost/gil/image_processing/kernel.hpp rename to c++/boost/gil/image_processing/kernel.hpp diff --git a/c++/include/boost/gil/image_processing/morphology.hpp b/c++/boost/gil/image_processing/morphology.hpp similarity index 100% rename from c++/include/boost/gil/image_processing/morphology.hpp rename to c++/boost/gil/image_processing/morphology.hpp diff --git a/c++/include/boost/gil/image_processing/numeric.hpp b/c++/boost/gil/image_processing/numeric.hpp similarity index 100% rename from c++/include/boost/gil/image_processing/numeric.hpp rename to c++/boost/gil/image_processing/numeric.hpp diff --git a/c++/include/boost/gil/image_processing/scaling.hpp b/c++/boost/gil/image_processing/scaling.hpp similarity index 100% rename from c++/include/boost/gil/image_processing/scaling.hpp rename to c++/boost/gil/image_processing/scaling.hpp diff --git a/c++/include/boost/gil/image_processing/threshold.hpp b/c++/boost/gil/image_processing/threshold.hpp similarity index 100% rename from c++/include/boost/gil/image_processing/threshold.hpp rename to c++/boost/gil/image_processing/threshold.hpp diff --git a/c++/include/boost/gil/image_view.hpp b/c++/boost/gil/image_view.hpp similarity index 100% rename from c++/include/boost/gil/image_view.hpp rename to c++/boost/gil/image_view.hpp diff --git a/c++/include/boost/gil/image_view_factory.hpp b/c++/boost/gil/image_view_factory.hpp similarity index 100% rename from c++/include/boost/gil/image_view_factory.hpp rename to c++/boost/gil/image_view_factory.hpp diff --git a/c++/include/boost/gil/io/base.hpp b/c++/boost/gil/io/base.hpp similarity index 100% rename from c++/include/boost/gil/io/base.hpp rename to c++/boost/gil/io/base.hpp diff --git a/c++/include/boost/gil/io/bit_operations.hpp b/c++/boost/gil/io/bit_operations.hpp similarity index 100% rename from c++/include/boost/gil/io/bit_operations.hpp rename to c++/boost/gil/io/bit_operations.hpp diff --git a/c++/include/boost/gil/io/conversion_policies.hpp b/c++/boost/gil/io/conversion_policies.hpp similarity index 100% rename from c++/include/boost/gil/io/conversion_policies.hpp rename to c++/boost/gil/io/conversion_policies.hpp diff --git a/c++/include/boost/gil/io/detail/dynamic.hpp b/c++/boost/gil/io/detail/dynamic.hpp similarity index 100% rename from c++/include/boost/gil/io/detail/dynamic.hpp rename to c++/boost/gil/io/detail/dynamic.hpp diff --git a/c++/include/boost/gil/io/detail/filesystem.hpp b/c++/boost/gil/io/detail/filesystem.hpp similarity index 100% rename from c++/include/boost/gil/io/detail/filesystem.hpp rename to c++/boost/gil/io/detail/filesystem.hpp diff --git a/c++/include/boost/gil/io/device.hpp b/c++/boost/gil/io/device.hpp similarity index 100% rename from c++/include/boost/gil/io/device.hpp rename to c++/boost/gil/io/device.hpp diff --git a/c++/include/boost/gil/io/error.hpp b/c++/boost/gil/io/error.hpp similarity index 100% rename from c++/include/boost/gil/io/error.hpp rename to c++/boost/gil/io/error.hpp diff --git a/c++/include/boost/gil/io/get_read_device.hpp b/c++/boost/gil/io/get_read_device.hpp similarity index 100% rename from c++/include/boost/gil/io/get_read_device.hpp rename to c++/boost/gil/io/get_read_device.hpp diff --git a/c++/include/boost/gil/io/get_reader.hpp b/c++/boost/gil/io/get_reader.hpp similarity index 100% rename from c++/include/boost/gil/io/get_reader.hpp rename to c++/boost/gil/io/get_reader.hpp diff --git a/c++/include/boost/gil/io/get_write_device.hpp b/c++/boost/gil/io/get_write_device.hpp similarity index 100% rename from c++/include/boost/gil/io/get_write_device.hpp rename to c++/boost/gil/io/get_write_device.hpp diff --git a/c++/include/boost/gil/io/get_writer.hpp b/c++/boost/gil/io/get_writer.hpp similarity index 100% rename from c++/include/boost/gil/io/get_writer.hpp rename to c++/boost/gil/io/get_writer.hpp diff --git a/c++/include/boost/gil/io/io.hpp b/c++/boost/gil/io/io.hpp similarity index 100% rename from c++/include/boost/gil/io/io.hpp rename to c++/boost/gil/io/io.hpp diff --git a/c++/include/boost/gil/io/make_backend.hpp b/c++/boost/gil/io/make_backend.hpp similarity index 100% rename from c++/include/boost/gil/io/make_backend.hpp rename to c++/boost/gil/io/make_backend.hpp diff --git a/c++/include/boost/gil/io/make_dynamic_image_reader.hpp b/c++/boost/gil/io/make_dynamic_image_reader.hpp similarity index 100% rename from c++/include/boost/gil/io/make_dynamic_image_reader.hpp rename to c++/boost/gil/io/make_dynamic_image_reader.hpp diff --git a/c++/include/boost/gil/io/make_dynamic_image_writer.hpp b/c++/boost/gil/io/make_dynamic_image_writer.hpp similarity index 100% rename from c++/include/boost/gil/io/make_dynamic_image_writer.hpp rename to c++/boost/gil/io/make_dynamic_image_writer.hpp diff --git a/c++/include/boost/gil/io/make_reader.hpp b/c++/boost/gil/io/make_reader.hpp similarity index 100% rename from c++/include/boost/gil/io/make_reader.hpp rename to c++/boost/gil/io/make_reader.hpp diff --git a/c++/include/boost/gil/io/make_scanline_reader.hpp b/c++/boost/gil/io/make_scanline_reader.hpp similarity index 100% rename from c++/include/boost/gil/io/make_scanline_reader.hpp rename to c++/boost/gil/io/make_scanline_reader.hpp diff --git a/c++/include/boost/gil/io/make_writer.hpp b/c++/boost/gil/io/make_writer.hpp similarity index 100% rename from c++/include/boost/gil/io/make_writer.hpp rename to c++/boost/gil/io/make_writer.hpp diff --git a/c++/include/boost/gil/io/path_spec.hpp b/c++/boost/gil/io/path_spec.hpp similarity index 100% rename from c++/include/boost/gil/io/path_spec.hpp rename to c++/boost/gil/io/path_spec.hpp diff --git a/c++/include/boost/gil/io/read_and_convert_image.hpp b/c++/boost/gil/io/read_and_convert_image.hpp similarity index 100% rename from c++/include/boost/gil/io/read_and_convert_image.hpp rename to c++/boost/gil/io/read_and_convert_image.hpp diff --git a/c++/include/boost/gil/io/read_and_convert_view.hpp b/c++/boost/gil/io/read_and_convert_view.hpp similarity index 100% rename from c++/include/boost/gil/io/read_and_convert_view.hpp rename to c++/boost/gil/io/read_and_convert_view.hpp diff --git a/c++/include/boost/gil/io/read_image.hpp b/c++/boost/gil/io/read_image.hpp similarity index 100% rename from c++/include/boost/gil/io/read_image.hpp rename to c++/boost/gil/io/read_image.hpp diff --git a/c++/include/boost/gil/io/read_image_info.hpp b/c++/boost/gil/io/read_image_info.hpp similarity index 100% rename from c++/include/boost/gil/io/read_image_info.hpp rename to c++/boost/gil/io/read_image_info.hpp diff --git a/c++/include/boost/gil/io/read_view.hpp b/c++/boost/gil/io/read_view.hpp similarity index 100% rename from c++/include/boost/gil/io/read_view.hpp rename to c++/boost/gil/io/read_view.hpp diff --git a/c++/include/boost/gil/io/reader_base.hpp b/c++/boost/gil/io/reader_base.hpp similarity index 100% rename from c++/include/boost/gil/io/reader_base.hpp rename to c++/boost/gil/io/reader_base.hpp diff --git a/c++/include/boost/gil/io/row_buffer_helper.hpp b/c++/boost/gil/io/row_buffer_helper.hpp similarity index 100% rename from c++/include/boost/gil/io/row_buffer_helper.hpp rename to c++/boost/gil/io/row_buffer_helper.hpp diff --git a/c++/include/boost/gil/io/scanline_read_iterator.hpp b/c++/boost/gil/io/scanline_read_iterator.hpp similarity index 100% rename from c++/include/boost/gil/io/scanline_read_iterator.hpp rename to c++/boost/gil/io/scanline_read_iterator.hpp diff --git a/c++/include/boost/gil/io/typedefs.hpp b/c++/boost/gil/io/typedefs.hpp similarity index 100% rename from c++/include/boost/gil/io/typedefs.hpp rename to c++/boost/gil/io/typedefs.hpp diff --git a/c++/include/boost/gil/io/write_view.hpp b/c++/boost/gil/io/write_view.hpp similarity index 100% rename from c++/include/boost/gil/io/write_view.hpp rename to c++/boost/gil/io/write_view.hpp diff --git a/c++/include/boost/gil/iterator_from_2d.hpp b/c++/boost/gil/iterator_from_2d.hpp similarity index 100% rename from c++/include/boost/gil/iterator_from_2d.hpp rename to c++/boost/gil/iterator_from_2d.hpp diff --git a/c++/include/boost/gil/locator.hpp b/c++/boost/gil/locator.hpp similarity index 100% rename from c++/include/boost/gil/locator.hpp rename to c++/boost/gil/locator.hpp diff --git a/c++/include/boost/gil/metafunctions.hpp b/c++/boost/gil/metafunctions.hpp similarity index 100% rename from c++/include/boost/gil/metafunctions.hpp rename to c++/boost/gil/metafunctions.hpp diff --git a/c++/include/boost/gil/packed_pixel.hpp b/c++/boost/gil/packed_pixel.hpp similarity index 100% rename from c++/include/boost/gil/packed_pixel.hpp rename to c++/boost/gil/packed_pixel.hpp diff --git a/c++/include/boost/gil/pixel.hpp b/c++/boost/gil/pixel.hpp similarity index 100% rename from c++/include/boost/gil/pixel.hpp rename to c++/boost/gil/pixel.hpp diff --git a/c++/include/boost/gil/pixel_iterator.hpp b/c++/boost/gil/pixel_iterator.hpp similarity index 100% rename from c++/include/boost/gil/pixel_iterator.hpp rename to c++/boost/gil/pixel_iterator.hpp diff --git a/c++/include/boost/gil/pixel_iterator_adaptor.hpp b/c++/boost/gil/pixel_iterator_adaptor.hpp similarity index 100% rename from c++/include/boost/gil/pixel_iterator_adaptor.hpp rename to c++/boost/gil/pixel_iterator_adaptor.hpp diff --git a/c++/include/boost/gil/pixel_numeric_operations.hpp b/c++/boost/gil/pixel_numeric_operations.hpp similarity index 100% rename from c++/include/boost/gil/pixel_numeric_operations.hpp rename to c++/boost/gil/pixel_numeric_operations.hpp diff --git a/c++/include/boost/gil/planar_pixel_iterator.hpp b/c++/boost/gil/planar_pixel_iterator.hpp similarity index 100% rename from c++/include/boost/gil/planar_pixel_iterator.hpp rename to c++/boost/gil/planar_pixel_iterator.hpp diff --git a/c++/include/boost/gil/planar_pixel_reference.hpp b/c++/boost/gil/planar_pixel_reference.hpp similarity index 100% rename from c++/include/boost/gil/planar_pixel_reference.hpp rename to c++/boost/gil/planar_pixel_reference.hpp diff --git a/c++/include/boost/gil/point.hpp b/c++/boost/gil/point.hpp similarity index 100% rename from c++/include/boost/gil/point.hpp rename to c++/boost/gil/point.hpp diff --git a/c++/include/boost/gil/position_iterator.hpp b/c++/boost/gil/position_iterator.hpp similarity index 100% rename from c++/include/boost/gil/position_iterator.hpp rename to c++/boost/gil/position_iterator.hpp diff --git a/c++/include/boost/gil/premultiply.hpp b/c++/boost/gil/premultiply.hpp similarity index 100% rename from c++/include/boost/gil/premultiply.hpp rename to c++/boost/gil/premultiply.hpp diff --git a/c++/include/boost/gil/promote_integral.hpp b/c++/boost/gil/promote_integral.hpp similarity index 100% rename from c++/include/boost/gil/promote_integral.hpp rename to c++/boost/gil/promote_integral.hpp diff --git a/c++/include/boost/gil/rgb.hpp b/c++/boost/gil/rgb.hpp similarity index 100% rename from c++/include/boost/gil/rgb.hpp rename to c++/boost/gil/rgb.hpp diff --git a/c++/include/boost/gil/rgba.hpp b/c++/boost/gil/rgba.hpp similarity index 100% rename from c++/include/boost/gil/rgba.hpp rename to c++/boost/gil/rgba.hpp diff --git a/c++/include/boost/gil/step_iterator.hpp b/c++/boost/gil/step_iterator.hpp similarity index 100% rename from c++/include/boost/gil/step_iterator.hpp rename to c++/boost/gil/step_iterator.hpp diff --git a/c++/include/boost/gil/typedefs.hpp b/c++/boost/gil/typedefs.hpp similarity index 100% rename from c++/include/boost/gil/typedefs.hpp rename to c++/boost/gil/typedefs.hpp diff --git a/c++/include/boost/gil/utilities.hpp b/c++/boost/gil/utilities.hpp similarity index 100% rename from c++/include/boost/gil/utilities.hpp rename to c++/boost/gil/utilities.hpp diff --git a/c++/include/boost/gil/virtual_locator.hpp b/c++/boost/gil/virtual_locator.hpp similarity index 100% rename from c++/include/boost/gil/virtual_locator.hpp rename to c++/boost/gil/virtual_locator.hpp diff --git a/c++/include/boost/hana.hpp b/c++/boost/hana.hpp similarity index 100% rename from c++/include/boost/hana.hpp rename to c++/boost/hana.hpp diff --git a/c++/include/boost/histogram.hpp b/c++/boost/histogram.hpp similarity index 100% rename from c++/include/boost/histogram.hpp rename to c++/boost/histogram.hpp diff --git a/c++/include/boost/hof.hpp b/c++/boost/hof.hpp similarity index 100% rename from c++/include/boost/hof.hpp rename to c++/boost/hof.hpp diff --git a/c++/include/boost/implicit_cast.hpp b/c++/boost/implicit_cast.hpp similarity index 100% rename from c++/include/boost/implicit_cast.hpp rename to c++/boost/implicit_cast.hpp diff --git a/c++/include/boost/indirect_reference.hpp b/c++/boost/indirect_reference.hpp similarity index 100% rename from c++/include/boost/indirect_reference.hpp rename to c++/boost/indirect_reference.hpp diff --git a/c++/include/boost/integer.hpp b/c++/boost/integer.hpp similarity index 100% rename from c++/include/boost/integer.hpp rename to c++/boost/integer.hpp diff --git a/c++/include/boost/integer_fwd.hpp b/c++/boost/integer_fwd.hpp similarity index 100% rename from c++/include/boost/integer_fwd.hpp rename to c++/boost/integer_fwd.hpp diff --git a/c++/include/boost/integer_traits.hpp b/c++/boost/integer_traits.hpp similarity index 100% rename from c++/include/boost/integer_traits.hpp rename to c++/boost/integer_traits.hpp diff --git a/c++/include/boost/intrusive/any_hook.hpp b/c++/boost/intrusive/any_hook.hpp similarity index 100% rename from c++/include/boost/intrusive/any_hook.hpp rename to c++/boost/intrusive/any_hook.hpp diff --git a/c++/include/boost/intrusive/avl_set.hpp b/c++/boost/intrusive/avl_set.hpp similarity index 100% rename from c++/include/boost/intrusive/avl_set.hpp rename to c++/boost/intrusive/avl_set.hpp diff --git a/c++/include/boost/intrusive/avl_set_hook.hpp b/c++/boost/intrusive/avl_set_hook.hpp similarity index 100% rename from c++/include/boost/intrusive/avl_set_hook.hpp rename to c++/boost/intrusive/avl_set_hook.hpp diff --git a/c++/include/boost/intrusive/avltree.hpp b/c++/boost/intrusive/avltree.hpp similarity index 100% rename from c++/include/boost/intrusive/avltree.hpp rename to c++/boost/intrusive/avltree.hpp diff --git a/c++/include/boost/intrusive/avltree_algorithms.hpp b/c++/boost/intrusive/avltree_algorithms.hpp similarity index 100% rename from c++/include/boost/intrusive/avltree_algorithms.hpp rename to c++/boost/intrusive/avltree_algorithms.hpp diff --git a/c++/include/boost/intrusive/bs_set.hpp b/c++/boost/intrusive/bs_set.hpp similarity index 100% rename from c++/include/boost/intrusive/bs_set.hpp rename to c++/boost/intrusive/bs_set.hpp diff --git a/c++/include/boost/intrusive/bs_set_hook.hpp b/c++/boost/intrusive/bs_set_hook.hpp similarity index 100% rename from c++/include/boost/intrusive/bs_set_hook.hpp rename to c++/boost/intrusive/bs_set_hook.hpp diff --git a/c++/include/boost/intrusive/bstree.hpp b/c++/boost/intrusive/bstree.hpp similarity index 100% rename from c++/include/boost/intrusive/bstree.hpp rename to c++/boost/intrusive/bstree.hpp diff --git a/c++/include/boost/intrusive/bstree_algorithms.hpp b/c++/boost/intrusive/bstree_algorithms.hpp similarity index 100% rename from c++/include/boost/intrusive/bstree_algorithms.hpp rename to c++/boost/intrusive/bstree_algorithms.hpp diff --git a/c++/include/boost/intrusive/circular_list_algorithms.hpp b/c++/boost/intrusive/circular_list_algorithms.hpp similarity index 100% rename from c++/include/boost/intrusive/circular_list_algorithms.hpp rename to c++/boost/intrusive/circular_list_algorithms.hpp diff --git a/c++/include/boost/intrusive/circular_slist_algorithms.hpp b/c++/boost/intrusive/circular_slist_algorithms.hpp similarity index 100% rename from c++/include/boost/intrusive/circular_slist_algorithms.hpp rename to c++/boost/intrusive/circular_slist_algorithms.hpp diff --git a/c++/include/boost/intrusive/derivation_value_traits.hpp b/c++/boost/intrusive/derivation_value_traits.hpp similarity index 100% rename from c++/include/boost/intrusive/derivation_value_traits.hpp rename to c++/boost/intrusive/derivation_value_traits.hpp diff --git a/c++/include/boost/intrusive/detail/algo_type.hpp b/c++/boost/intrusive/detail/algo_type.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/algo_type.hpp rename to c++/boost/intrusive/detail/algo_type.hpp diff --git a/c++/include/boost/intrusive/detail/algorithm.hpp b/c++/boost/intrusive/detail/algorithm.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/algorithm.hpp rename to c++/boost/intrusive/detail/algorithm.hpp diff --git a/c++/include/boost/intrusive/detail/any_node_and_algorithms.hpp b/c++/boost/intrusive/detail/any_node_and_algorithms.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/any_node_and_algorithms.hpp rename to c++/boost/intrusive/detail/any_node_and_algorithms.hpp diff --git a/c++/include/boost/intrusive/detail/array_initializer.hpp b/c++/boost/intrusive/detail/array_initializer.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/array_initializer.hpp rename to c++/boost/intrusive/detail/array_initializer.hpp diff --git a/c++/include/boost/intrusive/detail/assert.hpp b/c++/boost/intrusive/detail/assert.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/assert.hpp rename to c++/boost/intrusive/detail/assert.hpp diff --git a/c++/include/boost/intrusive/detail/avltree_node.hpp b/c++/boost/intrusive/detail/avltree_node.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/avltree_node.hpp rename to c++/boost/intrusive/detail/avltree_node.hpp diff --git a/c++/include/boost/intrusive/detail/bstree_algorithms_base.hpp b/c++/boost/intrusive/detail/bstree_algorithms_base.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/bstree_algorithms_base.hpp rename to c++/boost/intrusive/detail/bstree_algorithms_base.hpp diff --git a/c++/include/boost/intrusive/detail/common_slist_algorithms.hpp b/c++/boost/intrusive/detail/common_slist_algorithms.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/common_slist_algorithms.hpp rename to c++/boost/intrusive/detail/common_slist_algorithms.hpp diff --git a/c++/include/boost/intrusive/detail/config_begin.hpp b/c++/boost/intrusive/detail/config_begin.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/config_begin.hpp rename to c++/boost/intrusive/detail/config_begin.hpp diff --git a/c++/include/boost/intrusive/detail/config_end.hpp b/c++/boost/intrusive/detail/config_end.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/config_end.hpp rename to c++/boost/intrusive/detail/config_end.hpp diff --git a/c++/include/boost/intrusive/detail/default_header_holder.hpp b/c++/boost/intrusive/detail/default_header_holder.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/default_header_holder.hpp rename to c++/boost/intrusive/detail/default_header_holder.hpp diff --git a/c++/include/boost/intrusive/detail/ebo_functor_holder.hpp b/c++/boost/intrusive/detail/ebo_functor_holder.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/ebo_functor_holder.hpp rename to c++/boost/intrusive/detail/ebo_functor_holder.hpp diff --git a/c++/include/boost/intrusive/detail/empty_node_checker.hpp b/c++/boost/intrusive/detail/empty_node_checker.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/empty_node_checker.hpp rename to c++/boost/intrusive/detail/empty_node_checker.hpp diff --git a/c++/include/boost/intrusive/detail/equal_to_value.hpp b/c++/boost/intrusive/detail/equal_to_value.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/equal_to_value.hpp rename to c++/boost/intrusive/detail/equal_to_value.hpp diff --git a/c++/include/boost/intrusive/detail/exception_disposer.hpp b/c++/boost/intrusive/detail/exception_disposer.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/exception_disposer.hpp rename to c++/boost/intrusive/detail/exception_disposer.hpp diff --git a/c++/include/boost/intrusive/detail/function_detector.hpp b/c++/boost/intrusive/detail/function_detector.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/function_detector.hpp rename to c++/boost/intrusive/detail/function_detector.hpp diff --git a/c++/include/boost/intrusive/detail/generic_hook.hpp b/c++/boost/intrusive/detail/generic_hook.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/generic_hook.hpp rename to c++/boost/intrusive/detail/generic_hook.hpp diff --git a/c++/include/boost/intrusive/detail/get_value_traits.hpp b/c++/boost/intrusive/detail/get_value_traits.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/get_value_traits.hpp rename to c++/boost/intrusive/detail/get_value_traits.hpp diff --git a/c++/include/boost/intrusive/detail/has_member_function_callable_with.hpp b/c++/boost/intrusive/detail/has_member_function_callable_with.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/has_member_function_callable_with.hpp rename to c++/boost/intrusive/detail/has_member_function_callable_with.hpp diff --git a/c++/include/boost/intrusive/detail/hash_combine.hpp b/c++/boost/intrusive/detail/hash_combine.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/hash_combine.hpp rename to c++/boost/intrusive/detail/hash_combine.hpp diff --git a/c++/include/boost/intrusive/detail/hashtable_node.hpp b/c++/boost/intrusive/detail/hashtable_node.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/hashtable_node.hpp rename to c++/boost/intrusive/detail/hashtable_node.hpp diff --git a/c++/include/boost/intrusive/detail/hook_traits.hpp b/c++/boost/intrusive/detail/hook_traits.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/hook_traits.hpp rename to c++/boost/intrusive/detail/hook_traits.hpp diff --git a/c++/include/boost/intrusive/detail/iiterator.hpp b/c++/boost/intrusive/detail/iiterator.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/iiterator.hpp rename to c++/boost/intrusive/detail/iiterator.hpp diff --git a/c++/include/boost/intrusive/detail/is_stateful_value_traits.hpp b/c++/boost/intrusive/detail/is_stateful_value_traits.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/is_stateful_value_traits.hpp rename to c++/boost/intrusive/detail/is_stateful_value_traits.hpp diff --git a/c++/include/boost/intrusive/detail/iterator.hpp b/c++/boost/intrusive/detail/iterator.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/iterator.hpp rename to c++/boost/intrusive/detail/iterator.hpp diff --git a/c++/include/boost/intrusive/detail/key_nodeptr_comp.hpp b/c++/boost/intrusive/detail/key_nodeptr_comp.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/key_nodeptr_comp.hpp rename to c++/boost/intrusive/detail/key_nodeptr_comp.hpp diff --git a/c++/include/boost/intrusive/detail/list_iterator.hpp b/c++/boost/intrusive/detail/list_iterator.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/list_iterator.hpp rename to c++/boost/intrusive/detail/list_iterator.hpp diff --git a/c++/include/boost/intrusive/detail/list_node.hpp b/c++/boost/intrusive/detail/list_node.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/list_node.hpp rename to c++/boost/intrusive/detail/list_node.hpp diff --git a/c++/include/boost/intrusive/detail/math.hpp b/c++/boost/intrusive/detail/math.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/math.hpp rename to c++/boost/intrusive/detail/math.hpp diff --git a/c++/include/boost/intrusive/detail/minimal_less_equal_header.hpp b/c++/boost/intrusive/detail/minimal_less_equal_header.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/minimal_less_equal_header.hpp rename to c++/boost/intrusive/detail/minimal_less_equal_header.hpp diff --git a/c++/include/boost/intrusive/detail/minimal_pair_header.hpp b/c++/boost/intrusive/detail/minimal_pair_header.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/minimal_pair_header.hpp rename to c++/boost/intrusive/detail/minimal_pair_header.hpp diff --git a/c++/include/boost/intrusive/detail/mpl.hpp b/c++/boost/intrusive/detail/mpl.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/mpl.hpp rename to c++/boost/intrusive/detail/mpl.hpp diff --git a/c++/include/boost/intrusive/detail/node_cloner_disposer.hpp b/c++/boost/intrusive/detail/node_cloner_disposer.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/node_cloner_disposer.hpp rename to c++/boost/intrusive/detail/node_cloner_disposer.hpp diff --git a/c++/include/boost/intrusive/detail/node_holder.hpp b/c++/boost/intrusive/detail/node_holder.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/node_holder.hpp rename to c++/boost/intrusive/detail/node_holder.hpp diff --git a/c++/include/boost/intrusive/detail/node_to_value.hpp b/c++/boost/intrusive/detail/node_to_value.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/node_to_value.hpp rename to c++/boost/intrusive/detail/node_to_value.hpp diff --git a/c++/include/boost/intrusive/detail/parent_from_member.hpp b/c++/boost/intrusive/detail/parent_from_member.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/parent_from_member.hpp rename to c++/boost/intrusive/detail/parent_from_member.hpp diff --git a/c++/include/boost/intrusive/detail/rbtree_node.hpp b/c++/boost/intrusive/detail/rbtree_node.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/rbtree_node.hpp rename to c++/boost/intrusive/detail/rbtree_node.hpp diff --git a/c++/include/boost/intrusive/detail/reverse_iterator.hpp b/c++/boost/intrusive/detail/reverse_iterator.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/reverse_iterator.hpp rename to c++/boost/intrusive/detail/reverse_iterator.hpp diff --git a/c++/include/boost/intrusive/detail/simple_disposers.hpp b/c++/boost/intrusive/detail/simple_disposers.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/simple_disposers.hpp rename to c++/boost/intrusive/detail/simple_disposers.hpp diff --git a/c++/include/boost/intrusive/detail/size_holder.hpp b/c++/boost/intrusive/detail/size_holder.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/size_holder.hpp rename to c++/boost/intrusive/detail/size_holder.hpp diff --git a/c++/include/boost/intrusive/detail/slist_iterator.hpp b/c++/boost/intrusive/detail/slist_iterator.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/slist_iterator.hpp rename to c++/boost/intrusive/detail/slist_iterator.hpp diff --git a/c++/include/boost/intrusive/detail/slist_node.hpp b/c++/boost/intrusive/detail/slist_node.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/slist_node.hpp rename to c++/boost/intrusive/detail/slist_node.hpp diff --git a/c++/include/boost/intrusive/detail/std_fwd.hpp b/c++/boost/intrusive/detail/std_fwd.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/std_fwd.hpp rename to c++/boost/intrusive/detail/std_fwd.hpp diff --git a/c++/include/boost/intrusive/detail/transform_iterator.hpp b/c++/boost/intrusive/detail/transform_iterator.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/transform_iterator.hpp rename to c++/boost/intrusive/detail/transform_iterator.hpp diff --git a/c++/include/boost/intrusive/detail/tree_iterator.hpp b/c++/boost/intrusive/detail/tree_iterator.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/tree_iterator.hpp rename to c++/boost/intrusive/detail/tree_iterator.hpp diff --git a/c++/include/boost/intrusive/detail/tree_node.hpp b/c++/boost/intrusive/detail/tree_node.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/tree_node.hpp rename to c++/boost/intrusive/detail/tree_node.hpp diff --git a/c++/include/boost/intrusive/detail/tree_value_compare.hpp b/c++/boost/intrusive/detail/tree_value_compare.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/tree_value_compare.hpp rename to c++/boost/intrusive/detail/tree_value_compare.hpp diff --git a/c++/include/boost/intrusive/detail/twin.hpp b/c++/boost/intrusive/detail/twin.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/twin.hpp rename to c++/boost/intrusive/detail/twin.hpp diff --git a/c++/include/boost/intrusive/detail/uncast.hpp b/c++/boost/intrusive/detail/uncast.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/uncast.hpp rename to c++/boost/intrusive/detail/uncast.hpp diff --git a/c++/include/boost/intrusive/detail/value_functors.hpp b/c++/boost/intrusive/detail/value_functors.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/value_functors.hpp rename to c++/boost/intrusive/detail/value_functors.hpp diff --git a/c++/include/boost/intrusive/detail/workaround.hpp b/c++/boost/intrusive/detail/workaround.hpp similarity index 100% rename from c++/include/boost/intrusive/detail/workaround.hpp rename to c++/boost/intrusive/detail/workaround.hpp diff --git a/c++/include/boost/intrusive/hashtable.hpp b/c++/boost/intrusive/hashtable.hpp similarity index 100% rename from c++/include/boost/intrusive/hashtable.hpp rename to c++/boost/intrusive/hashtable.hpp diff --git a/c++/include/boost/intrusive/intrusive_fwd.hpp b/c++/boost/intrusive/intrusive_fwd.hpp similarity index 100% rename from c++/include/boost/intrusive/intrusive_fwd.hpp rename to c++/boost/intrusive/intrusive_fwd.hpp diff --git a/c++/include/boost/intrusive/linear_slist_algorithms.hpp b/c++/boost/intrusive/linear_slist_algorithms.hpp similarity index 100% rename from c++/include/boost/intrusive/linear_slist_algorithms.hpp rename to c++/boost/intrusive/linear_slist_algorithms.hpp diff --git a/c++/include/boost/intrusive/link_mode.hpp b/c++/boost/intrusive/link_mode.hpp similarity index 100% rename from c++/include/boost/intrusive/link_mode.hpp rename to c++/boost/intrusive/link_mode.hpp diff --git a/c++/include/boost/intrusive/list.hpp b/c++/boost/intrusive/list.hpp similarity index 100% rename from c++/include/boost/intrusive/list.hpp rename to c++/boost/intrusive/list.hpp diff --git a/c++/include/boost/intrusive/list_hook.hpp b/c++/boost/intrusive/list_hook.hpp similarity index 100% rename from c++/include/boost/intrusive/list_hook.hpp rename to c++/boost/intrusive/list_hook.hpp diff --git a/c++/include/boost/intrusive/member_value_traits.hpp b/c++/boost/intrusive/member_value_traits.hpp similarity index 100% rename from c++/include/boost/intrusive/member_value_traits.hpp rename to c++/boost/intrusive/member_value_traits.hpp diff --git a/c++/include/boost/intrusive/options.hpp b/c++/boost/intrusive/options.hpp similarity index 100% rename from c++/include/boost/intrusive/options.hpp rename to c++/boost/intrusive/options.hpp diff --git a/c++/include/boost/intrusive/pack_options.hpp b/c++/boost/intrusive/pack_options.hpp similarity index 100% rename from c++/include/boost/intrusive/pack_options.hpp rename to c++/boost/intrusive/pack_options.hpp diff --git a/c++/include/boost/intrusive/parent_from_member.hpp b/c++/boost/intrusive/parent_from_member.hpp similarity index 100% rename from c++/include/boost/intrusive/parent_from_member.hpp rename to c++/boost/intrusive/parent_from_member.hpp diff --git a/c++/include/boost/intrusive/pointer_plus_bits.hpp b/c++/boost/intrusive/pointer_plus_bits.hpp similarity index 100% rename from c++/include/boost/intrusive/pointer_plus_bits.hpp rename to c++/boost/intrusive/pointer_plus_bits.hpp diff --git a/c++/include/boost/intrusive/pointer_rebind.hpp b/c++/boost/intrusive/pointer_rebind.hpp similarity index 100% rename from c++/include/boost/intrusive/pointer_rebind.hpp rename to c++/boost/intrusive/pointer_rebind.hpp diff --git a/c++/include/boost/intrusive/pointer_traits.hpp b/c++/boost/intrusive/pointer_traits.hpp similarity index 100% rename from c++/include/boost/intrusive/pointer_traits.hpp rename to c++/boost/intrusive/pointer_traits.hpp diff --git a/c++/include/boost/intrusive/priority_compare.hpp b/c++/boost/intrusive/priority_compare.hpp similarity index 100% rename from c++/include/boost/intrusive/priority_compare.hpp rename to c++/boost/intrusive/priority_compare.hpp diff --git a/c++/include/boost/intrusive/rbtree.hpp b/c++/boost/intrusive/rbtree.hpp similarity index 100% rename from c++/include/boost/intrusive/rbtree.hpp rename to c++/boost/intrusive/rbtree.hpp diff --git a/c++/include/boost/intrusive/rbtree_algorithms.hpp b/c++/boost/intrusive/rbtree_algorithms.hpp similarity index 100% rename from c++/include/boost/intrusive/rbtree_algorithms.hpp rename to c++/boost/intrusive/rbtree_algorithms.hpp diff --git a/c++/include/boost/intrusive/set.hpp b/c++/boost/intrusive/set.hpp similarity index 100% rename from c++/include/boost/intrusive/set.hpp rename to c++/boost/intrusive/set.hpp diff --git a/c++/include/boost/intrusive/set_hook.hpp b/c++/boost/intrusive/set_hook.hpp similarity index 100% rename from c++/include/boost/intrusive/set_hook.hpp rename to c++/boost/intrusive/set_hook.hpp diff --git a/c++/include/boost/intrusive/sg_set.hpp b/c++/boost/intrusive/sg_set.hpp similarity index 100% rename from c++/include/boost/intrusive/sg_set.hpp rename to c++/boost/intrusive/sg_set.hpp diff --git a/c++/include/boost/intrusive/sgtree.hpp b/c++/boost/intrusive/sgtree.hpp similarity index 100% rename from c++/include/boost/intrusive/sgtree.hpp rename to c++/boost/intrusive/sgtree.hpp diff --git a/c++/include/boost/intrusive/sgtree_algorithms.hpp b/c++/boost/intrusive/sgtree_algorithms.hpp similarity index 100% rename from c++/include/boost/intrusive/sgtree_algorithms.hpp rename to c++/boost/intrusive/sgtree_algorithms.hpp diff --git a/c++/include/boost/intrusive/slist.hpp b/c++/boost/intrusive/slist.hpp similarity index 100% rename from c++/include/boost/intrusive/slist.hpp rename to c++/boost/intrusive/slist.hpp diff --git a/c++/include/boost/intrusive/slist_hook.hpp b/c++/boost/intrusive/slist_hook.hpp similarity index 100% rename from c++/include/boost/intrusive/slist_hook.hpp rename to c++/boost/intrusive/slist_hook.hpp diff --git a/c++/include/boost/intrusive/splay_set.hpp b/c++/boost/intrusive/splay_set.hpp similarity index 100% rename from c++/include/boost/intrusive/splay_set.hpp rename to c++/boost/intrusive/splay_set.hpp diff --git a/c++/include/boost/intrusive/splaytree.hpp b/c++/boost/intrusive/splaytree.hpp similarity index 100% rename from c++/include/boost/intrusive/splaytree.hpp rename to c++/boost/intrusive/splaytree.hpp diff --git a/c++/include/boost/intrusive/splaytree_algorithms.hpp b/c++/boost/intrusive/splaytree_algorithms.hpp similarity index 100% rename from c++/include/boost/intrusive/splaytree_algorithms.hpp rename to c++/boost/intrusive/splaytree_algorithms.hpp diff --git a/c++/include/boost/intrusive/treap.hpp b/c++/boost/intrusive/treap.hpp similarity index 100% rename from c++/include/boost/intrusive/treap.hpp rename to c++/boost/intrusive/treap.hpp diff --git a/c++/include/boost/intrusive/treap_algorithms.hpp b/c++/boost/intrusive/treap_algorithms.hpp similarity index 100% rename from c++/include/boost/intrusive/treap_algorithms.hpp rename to c++/boost/intrusive/treap_algorithms.hpp diff --git a/c++/include/boost/intrusive/treap_set.hpp b/c++/boost/intrusive/treap_set.hpp similarity index 100% rename from c++/include/boost/intrusive/treap_set.hpp rename to c++/boost/intrusive/treap_set.hpp diff --git a/c++/include/boost/intrusive/trivial_value_traits.hpp b/c++/boost/intrusive/trivial_value_traits.hpp similarity index 100% rename from c++/include/boost/intrusive/trivial_value_traits.hpp rename to c++/boost/intrusive/trivial_value_traits.hpp diff --git a/c++/include/boost/intrusive/unordered_set.hpp b/c++/boost/intrusive/unordered_set.hpp similarity index 100% rename from c++/include/boost/intrusive/unordered_set.hpp rename to c++/boost/intrusive/unordered_set.hpp diff --git a/c++/include/boost/intrusive/unordered_set_hook.hpp b/c++/boost/intrusive/unordered_set_hook.hpp similarity index 100% rename from c++/include/boost/intrusive/unordered_set_hook.hpp rename to c++/boost/intrusive/unordered_set_hook.hpp diff --git a/c++/include/boost/intrusive_ptr.hpp b/c++/boost/intrusive_ptr.hpp similarity index 100% rename from c++/include/boost/intrusive_ptr.hpp rename to c++/boost/intrusive_ptr.hpp diff --git a/c++/include/boost/io/detail/buffer_fill.hpp b/c++/boost/io/detail/buffer_fill.hpp similarity index 100% rename from c++/include/boost/io/detail/buffer_fill.hpp rename to c++/boost/io/detail/buffer_fill.hpp diff --git a/c++/include/boost/io/detail/ostream_guard.hpp b/c++/boost/io/detail/ostream_guard.hpp similarity index 100% rename from c++/include/boost/io/detail/ostream_guard.hpp rename to c++/boost/io/detail/ostream_guard.hpp diff --git a/c++/include/boost/io/ios_state.hpp b/c++/boost/io/ios_state.hpp similarity index 100% rename from c++/include/boost/io/ios_state.hpp rename to c++/boost/io/ios_state.hpp diff --git a/c++/include/boost/io/nullstream.hpp b/c++/boost/io/nullstream.hpp similarity index 100% rename from c++/include/boost/io/nullstream.hpp rename to c++/boost/io/nullstream.hpp diff --git a/c++/include/boost/io/ostream_joiner.hpp b/c++/boost/io/ostream_joiner.hpp similarity index 100% rename from c++/include/boost/io/ostream_joiner.hpp rename to c++/boost/io/ostream_joiner.hpp diff --git a/c++/include/boost/io/ostream_put.hpp b/c++/boost/io/ostream_put.hpp similarity index 100% rename from c++/include/boost/io/ostream_put.hpp rename to c++/boost/io/ostream_put.hpp diff --git a/c++/include/boost/io/quoted.hpp b/c++/boost/io/quoted.hpp similarity index 100% rename from c++/include/boost/io/quoted.hpp rename to c++/boost/io/quoted.hpp diff --git a/c++/include/boost/io_fwd.hpp b/c++/boost/io_fwd.hpp similarity index 100% rename from c++/include/boost/io_fwd.hpp rename to c++/boost/io_fwd.hpp diff --git a/c++/include/boost/is_placeholder.hpp b/c++/boost/is_placeholder.hpp similarity index 100% rename from c++/include/boost/is_placeholder.hpp rename to c++/boost/is_placeholder.hpp diff --git a/c++/include/boost/iterator.hpp b/c++/boost/iterator.hpp similarity index 100% rename from c++/include/boost/iterator.hpp rename to c++/boost/iterator.hpp diff --git a/c++/include/boost/iterator_adaptors.hpp b/c++/boost/iterator_adaptors.hpp similarity index 100% rename from c++/include/boost/iterator_adaptors.hpp rename to c++/boost/iterator_adaptors.hpp diff --git a/c++/include/boost/json.hpp b/c++/boost/json.hpp similarity index 100% rename from c++/include/boost/json.hpp rename to c++/boost/json.hpp diff --git a/c++/include/boost/lambda2.hpp b/c++/boost/lambda2.hpp similarity index 100% rename from c++/include/boost/lambda2.hpp rename to c++/boost/lambda2.hpp diff --git a/c++/include/boost/leaf.hpp b/c++/boost/leaf.hpp similarity index 100% rename from c++/include/boost/leaf.hpp rename to c++/boost/leaf.hpp diff --git a/c++/include/boost/lexical_cast.hpp b/c++/boost/lexical_cast.hpp similarity index 100% rename from c++/include/boost/lexical_cast.hpp rename to c++/boost/lexical_cast.hpp diff --git a/c++/include/boost/limits.hpp b/c++/boost/limits.hpp similarity index 100% rename from c++/include/boost/limits.hpp rename to c++/boost/limits.hpp diff --git a/c++/include/boost/local_function.hpp b/c++/boost/local_function.hpp similarity index 100% rename from c++/include/boost/local_function.hpp rename to c++/boost/local_function.hpp diff --git a/c++/include/boost/locale.hpp b/c++/boost/locale.hpp similarity index 100% rename from c++/include/boost/locale.hpp rename to c++/boost/locale.hpp diff --git a/c++/include/boost/logic/tribool.hpp b/c++/boost/logic/tribool.hpp similarity index 100% rename from c++/include/boost/logic/tribool.hpp rename to c++/boost/logic/tribool.hpp diff --git a/c++/include/boost/logic/tribool_fwd.hpp b/c++/boost/logic/tribool_fwd.hpp similarity index 100% rename from c++/include/boost/logic/tribool_fwd.hpp rename to c++/boost/logic/tribool_fwd.hpp diff --git a/c++/include/boost/logic/tribool_io.hpp b/c++/boost/logic/tribool_io.hpp similarity index 100% rename from c++/include/boost/logic/tribool_io.hpp rename to c++/boost/logic/tribool_io.hpp diff --git a/c++/include/boost/make_default.hpp b/c++/boost/make_default.hpp similarity index 100% rename from c++/include/boost/make_default.hpp rename to c++/boost/make_default.hpp diff --git a/c++/include/boost/make_shared.hpp b/c++/boost/make_shared.hpp similarity index 100% rename from c++/include/boost/make_shared.hpp rename to c++/boost/make_shared.hpp diff --git a/c++/include/boost/make_unique.hpp b/c++/boost/make_unique.hpp similarity index 100% rename from c++/include/boost/make_unique.hpp rename to c++/boost/make_unique.hpp diff --git a/c++/include/boost/math_fwd.hpp b/c++/boost/math_fwd.hpp similarity index 100% rename from c++/include/boost/math_fwd.hpp rename to c++/boost/math_fwd.hpp diff --git a/c++/include/boost/mem_fn.hpp b/c++/boost/mem_fn.hpp similarity index 100% rename from c++/include/boost/mem_fn.hpp rename to c++/boost/mem_fn.hpp diff --git a/c++/include/boost/memory_order.hpp b/c++/boost/memory_order.hpp similarity index 100% rename from c++/include/boost/memory_order.hpp rename to c++/boost/memory_order.hpp diff --git a/c++/include/boost/metaparse.hpp b/c++/boost/metaparse.hpp similarity index 100% rename from c++/include/boost/metaparse.hpp rename to c++/boost/metaparse.hpp diff --git a/c++/include/boost/metaparse/accept.hpp b/c++/boost/metaparse/accept.hpp similarity index 100% rename from c++/include/boost/metaparse/accept.hpp rename to c++/boost/metaparse/accept.hpp diff --git a/c++/include/boost/metaparse/accept_tag.hpp b/c++/boost/metaparse/accept_tag.hpp similarity index 100% rename from c++/include/boost/metaparse/accept_tag.hpp rename to c++/boost/metaparse/accept_tag.hpp diff --git a/c++/include/boost/metaparse/accept_when.hpp b/c++/boost/metaparse/accept_when.hpp similarity index 100% rename from c++/include/boost/metaparse/accept_when.hpp rename to c++/boost/metaparse/accept_when.hpp diff --git a/c++/include/boost/metaparse/alphanum.hpp b/c++/boost/metaparse/alphanum.hpp similarity index 100% rename from c++/include/boost/metaparse/alphanum.hpp rename to c++/boost/metaparse/alphanum.hpp diff --git a/c++/include/boost/metaparse/always.hpp b/c++/boost/metaparse/always.hpp similarity index 100% rename from c++/include/boost/metaparse/always.hpp rename to c++/boost/metaparse/always.hpp diff --git a/c++/include/boost/metaparse/always_c.hpp b/c++/boost/metaparse/always_c.hpp similarity index 100% rename from c++/include/boost/metaparse/always_c.hpp rename to c++/boost/metaparse/always_c.hpp diff --git a/c++/include/boost/metaparse/build_parser.hpp b/c++/boost/metaparse/build_parser.hpp similarity index 100% rename from c++/include/boost/metaparse/build_parser.hpp rename to c++/boost/metaparse/build_parser.hpp diff --git a/c++/include/boost/metaparse/change_error_message.hpp b/c++/boost/metaparse/change_error_message.hpp similarity index 100% rename from c++/include/boost/metaparse/change_error_message.hpp rename to c++/boost/metaparse/change_error_message.hpp diff --git a/c++/include/boost/metaparse/config.hpp b/c++/boost/metaparse/config.hpp similarity index 100% rename from c++/include/boost/metaparse/config.hpp rename to c++/boost/metaparse/config.hpp diff --git a/c++/include/boost/metaparse/debug_parsing_error.hpp b/c++/boost/metaparse/debug_parsing_error.hpp similarity index 100% rename from c++/include/boost/metaparse/debug_parsing_error.hpp rename to c++/boost/metaparse/debug_parsing_error.hpp diff --git a/c++/include/boost/metaparse/define_error.hpp b/c++/boost/metaparse/define_error.hpp similarity index 100% rename from c++/include/boost/metaparse/define_error.hpp rename to c++/boost/metaparse/define_error.hpp diff --git a/c++/include/boost/metaparse/digit.hpp b/c++/boost/metaparse/digit.hpp similarity index 100% rename from c++/include/boost/metaparse/digit.hpp rename to c++/boost/metaparse/digit.hpp diff --git a/c++/include/boost/metaparse/digit_val.hpp b/c++/boost/metaparse/digit_val.hpp similarity index 100% rename from c++/include/boost/metaparse/digit_val.hpp rename to c++/boost/metaparse/digit_val.hpp diff --git a/c++/include/boost/metaparse/empty.hpp b/c++/boost/metaparse/empty.hpp similarity index 100% rename from c++/include/boost/metaparse/empty.hpp rename to c++/boost/metaparse/empty.hpp diff --git a/c++/include/boost/metaparse/entire_input.hpp b/c++/boost/metaparse/entire_input.hpp similarity index 100% rename from c++/include/boost/metaparse/entire_input.hpp rename to c++/boost/metaparse/entire_input.hpp diff --git a/c++/include/boost/metaparse/error/digit_expected.hpp b/c++/boost/metaparse/error/digit_expected.hpp similarity index 100% rename from c++/include/boost/metaparse/error/digit_expected.hpp rename to c++/boost/metaparse/error/digit_expected.hpp diff --git a/c++/include/boost/metaparse/error/end_of_input_expected.hpp b/c++/boost/metaparse/error/end_of_input_expected.hpp similarity index 100% rename from c++/include/boost/metaparse/error/end_of_input_expected.hpp rename to c++/boost/metaparse/error/end_of_input_expected.hpp diff --git a/c++/include/boost/metaparse/error/index_out_of_range.hpp b/c++/boost/metaparse/error/index_out_of_range.hpp similarity index 100% rename from c++/include/boost/metaparse/error/index_out_of_range.hpp rename to c++/boost/metaparse/error/index_out_of_range.hpp diff --git a/c++/include/boost/metaparse/error/letter_expected.hpp b/c++/boost/metaparse/error/letter_expected.hpp similarity index 100% rename from c++/include/boost/metaparse/error/letter_expected.hpp rename to c++/boost/metaparse/error/letter_expected.hpp diff --git a/c++/include/boost/metaparse/error/literal_expected.hpp b/c++/boost/metaparse/error/literal_expected.hpp similarity index 100% rename from c++/include/boost/metaparse/error/literal_expected.hpp rename to c++/boost/metaparse/error/literal_expected.hpp diff --git a/c++/include/boost/metaparse/error/none_of_the_expected_cases_found.hpp b/c++/boost/metaparse/error/none_of_the_expected_cases_found.hpp similarity index 100% rename from c++/include/boost/metaparse/error/none_of_the_expected_cases_found.hpp rename to c++/boost/metaparse/error/none_of_the_expected_cases_found.hpp diff --git a/c++/include/boost/metaparse/error/unexpected_character.hpp b/c++/boost/metaparse/error/unexpected_character.hpp similarity index 100% rename from c++/include/boost/metaparse/error/unexpected_character.hpp rename to c++/boost/metaparse/error/unexpected_character.hpp diff --git a/c++/include/boost/metaparse/error/unexpected_end_of_input.hpp b/c++/boost/metaparse/error/unexpected_end_of_input.hpp similarity index 100% rename from c++/include/boost/metaparse/error/unexpected_end_of_input.hpp rename to c++/boost/metaparse/error/unexpected_end_of_input.hpp diff --git a/c++/include/boost/metaparse/error/unpaired.hpp b/c++/boost/metaparse/error/unpaired.hpp similarity index 100% rename from c++/include/boost/metaparse/error/unpaired.hpp rename to c++/boost/metaparse/error/unpaired.hpp diff --git a/c++/include/boost/metaparse/error/whitespace_expected.hpp b/c++/boost/metaparse/error/whitespace_expected.hpp similarity index 100% rename from c++/include/boost/metaparse/error/whitespace_expected.hpp rename to c++/boost/metaparse/error/whitespace_expected.hpp diff --git a/c++/include/boost/metaparse/except.hpp b/c++/boost/metaparse/except.hpp similarity index 100% rename from c++/include/boost/metaparse/except.hpp rename to c++/boost/metaparse/except.hpp diff --git a/c++/include/boost/metaparse/fail.hpp b/c++/boost/metaparse/fail.hpp similarity index 100% rename from c++/include/boost/metaparse/fail.hpp rename to c++/boost/metaparse/fail.hpp diff --git a/c++/include/boost/metaparse/fail_at_first_char_expected.hpp b/c++/boost/metaparse/fail_at_first_char_expected.hpp similarity index 100% rename from c++/include/boost/metaparse/fail_at_first_char_expected.hpp rename to c++/boost/metaparse/fail_at_first_char_expected.hpp diff --git a/c++/include/boost/metaparse/fail_tag.hpp b/c++/boost/metaparse/fail_tag.hpp similarity index 100% rename from c++/include/boost/metaparse/fail_tag.hpp rename to c++/boost/metaparse/fail_tag.hpp diff --git a/c++/include/boost/metaparse/first_of.hpp b/c++/boost/metaparse/first_of.hpp similarity index 100% rename from c++/include/boost/metaparse/first_of.hpp rename to c++/boost/metaparse/first_of.hpp diff --git a/c++/include/boost/metaparse/foldl.hpp b/c++/boost/metaparse/foldl.hpp similarity index 100% rename from c++/include/boost/metaparse/foldl.hpp rename to c++/boost/metaparse/foldl.hpp diff --git a/c++/include/boost/metaparse/foldl1.hpp b/c++/boost/metaparse/foldl1.hpp similarity index 100% rename from c++/include/boost/metaparse/foldl1.hpp rename to c++/boost/metaparse/foldl1.hpp diff --git a/c++/include/boost/metaparse/foldl_reject_incomplete.hpp b/c++/boost/metaparse/foldl_reject_incomplete.hpp similarity index 100% rename from c++/include/boost/metaparse/foldl_reject_incomplete.hpp rename to c++/boost/metaparse/foldl_reject_incomplete.hpp diff --git a/c++/include/boost/metaparse/foldl_reject_incomplete1.hpp b/c++/boost/metaparse/foldl_reject_incomplete1.hpp similarity index 100% rename from c++/include/boost/metaparse/foldl_reject_incomplete1.hpp rename to c++/boost/metaparse/foldl_reject_incomplete1.hpp diff --git a/c++/include/boost/metaparse/foldl_reject_incomplete_start_with_parser.hpp b/c++/boost/metaparse/foldl_reject_incomplete_start_with_parser.hpp similarity index 100% rename from c++/include/boost/metaparse/foldl_reject_incomplete_start_with_parser.hpp rename to c++/boost/metaparse/foldl_reject_incomplete_start_with_parser.hpp diff --git a/c++/include/boost/metaparse/foldl_start_with_parser.hpp b/c++/boost/metaparse/foldl_start_with_parser.hpp similarity index 100% rename from c++/include/boost/metaparse/foldl_start_with_parser.hpp rename to c++/boost/metaparse/foldl_start_with_parser.hpp diff --git a/c++/include/boost/metaparse/foldr.hpp b/c++/boost/metaparse/foldr.hpp similarity index 100% rename from c++/include/boost/metaparse/foldr.hpp rename to c++/boost/metaparse/foldr.hpp diff --git a/c++/include/boost/metaparse/foldr1.hpp b/c++/boost/metaparse/foldr1.hpp similarity index 100% rename from c++/include/boost/metaparse/foldr1.hpp rename to c++/boost/metaparse/foldr1.hpp diff --git a/c++/include/boost/metaparse/foldr_reject_incomplete.hpp b/c++/boost/metaparse/foldr_reject_incomplete.hpp similarity index 100% rename from c++/include/boost/metaparse/foldr_reject_incomplete.hpp rename to c++/boost/metaparse/foldr_reject_incomplete.hpp diff --git a/c++/include/boost/metaparse/foldr_reject_incomplete1.hpp b/c++/boost/metaparse/foldr_reject_incomplete1.hpp similarity index 100% rename from c++/include/boost/metaparse/foldr_reject_incomplete1.hpp rename to c++/boost/metaparse/foldr_reject_incomplete1.hpp diff --git a/c++/include/boost/metaparse/foldr_start_with_parser.hpp b/c++/boost/metaparse/foldr_start_with_parser.hpp similarity index 100% rename from c++/include/boost/metaparse/foldr_start_with_parser.hpp rename to c++/boost/metaparse/foldr_start_with_parser.hpp diff --git a/c++/include/boost/metaparse/get_col.hpp b/c++/boost/metaparse/get_col.hpp similarity index 100% rename from c++/include/boost/metaparse/get_col.hpp rename to c++/boost/metaparse/get_col.hpp diff --git a/c++/include/boost/metaparse/get_line.hpp b/c++/boost/metaparse/get_line.hpp similarity index 100% rename from c++/include/boost/metaparse/get_line.hpp rename to c++/boost/metaparse/get_line.hpp diff --git a/c++/include/boost/metaparse/get_message.hpp b/c++/boost/metaparse/get_message.hpp similarity index 100% rename from c++/include/boost/metaparse/get_message.hpp rename to c++/boost/metaparse/get_message.hpp diff --git a/c++/include/boost/metaparse/get_position.hpp b/c++/boost/metaparse/get_position.hpp similarity index 100% rename from c++/include/boost/metaparse/get_position.hpp rename to c++/boost/metaparse/get_position.hpp diff --git a/c++/include/boost/metaparse/get_prev_char.hpp b/c++/boost/metaparse/get_prev_char.hpp similarity index 100% rename from c++/include/boost/metaparse/get_prev_char.hpp rename to c++/boost/metaparse/get_prev_char.hpp diff --git a/c++/include/boost/metaparse/get_remaining.hpp b/c++/boost/metaparse/get_remaining.hpp similarity index 100% rename from c++/include/boost/metaparse/get_remaining.hpp rename to c++/boost/metaparse/get_remaining.hpp diff --git a/c++/include/boost/metaparse/get_result.hpp b/c++/boost/metaparse/get_result.hpp similarity index 100% rename from c++/include/boost/metaparse/get_result.hpp rename to c++/boost/metaparse/get_result.hpp diff --git a/c++/include/boost/metaparse/grammar.hpp b/c++/boost/metaparse/grammar.hpp similarity index 100% rename from c++/include/boost/metaparse/grammar.hpp rename to c++/boost/metaparse/grammar.hpp diff --git a/c++/include/boost/metaparse/if_.hpp b/c++/boost/metaparse/if_.hpp similarity index 100% rename from c++/include/boost/metaparse/if_.hpp rename to c++/boost/metaparse/if_.hpp diff --git a/c++/include/boost/metaparse/int_.hpp b/c++/boost/metaparse/int_.hpp similarity index 100% rename from c++/include/boost/metaparse/int_.hpp rename to c++/boost/metaparse/int_.hpp diff --git a/c++/include/boost/metaparse/is_error.hpp b/c++/boost/metaparse/is_error.hpp similarity index 100% rename from c++/include/boost/metaparse/is_error.hpp rename to c++/boost/metaparse/is_error.hpp diff --git a/c++/include/boost/metaparse/iterate.hpp b/c++/boost/metaparse/iterate.hpp similarity index 100% rename from c++/include/boost/metaparse/iterate.hpp rename to c++/boost/metaparse/iterate.hpp diff --git a/c++/include/boost/metaparse/iterate_c.hpp b/c++/boost/metaparse/iterate_c.hpp similarity index 100% rename from c++/include/boost/metaparse/iterate_c.hpp rename to c++/boost/metaparse/iterate_c.hpp diff --git a/c++/include/boost/metaparse/keyword.hpp b/c++/boost/metaparse/keyword.hpp similarity index 100% rename from c++/include/boost/metaparse/keyword.hpp rename to c++/boost/metaparse/keyword.hpp diff --git a/c++/include/boost/metaparse/last_of.hpp b/c++/boost/metaparse/last_of.hpp similarity index 100% rename from c++/include/boost/metaparse/last_of.hpp rename to c++/boost/metaparse/last_of.hpp diff --git a/c++/include/boost/metaparse/letter.hpp b/c++/boost/metaparse/letter.hpp similarity index 100% rename from c++/include/boost/metaparse/letter.hpp rename to c++/boost/metaparse/letter.hpp diff --git a/c++/include/boost/metaparse/limit_one_char_except_size.hpp b/c++/boost/metaparse/limit_one_char_except_size.hpp similarity index 100% rename from c++/include/boost/metaparse/limit_one_char_except_size.hpp rename to c++/boost/metaparse/limit_one_char_except_size.hpp diff --git a/c++/include/boost/metaparse/limit_one_of_size.hpp b/c++/boost/metaparse/limit_one_of_size.hpp similarity index 100% rename from c++/include/boost/metaparse/limit_one_of_size.hpp rename to c++/boost/metaparse/limit_one_of_size.hpp diff --git a/c++/include/boost/metaparse/limit_sequence_size.hpp b/c++/boost/metaparse/limit_sequence_size.hpp similarity index 100% rename from c++/include/boost/metaparse/limit_sequence_size.hpp rename to c++/boost/metaparse/limit_sequence_size.hpp diff --git a/c++/include/boost/metaparse/limit_string_size.hpp b/c++/boost/metaparse/limit_string_size.hpp similarity index 100% rename from c++/include/boost/metaparse/limit_string_size.hpp rename to c++/boost/metaparse/limit_string_size.hpp diff --git a/c++/include/boost/metaparse/lit.hpp b/c++/boost/metaparse/lit.hpp similarity index 100% rename from c++/include/boost/metaparse/lit.hpp rename to c++/boost/metaparse/lit.hpp diff --git a/c++/include/boost/metaparse/lit_c.hpp b/c++/boost/metaparse/lit_c.hpp similarity index 100% rename from c++/include/boost/metaparse/lit_c.hpp rename to c++/boost/metaparse/lit_c.hpp diff --git a/c++/include/boost/metaparse/look_ahead.hpp b/c++/boost/metaparse/look_ahead.hpp similarity index 100% rename from c++/include/boost/metaparse/look_ahead.hpp rename to c++/boost/metaparse/look_ahead.hpp diff --git a/c++/include/boost/metaparse/middle_of.hpp b/c++/boost/metaparse/middle_of.hpp similarity index 100% rename from c++/include/boost/metaparse/middle_of.hpp rename to c++/boost/metaparse/middle_of.hpp diff --git a/c++/include/boost/metaparse/next_char.hpp b/c++/boost/metaparse/next_char.hpp similarity index 100% rename from c++/include/boost/metaparse/next_char.hpp rename to c++/boost/metaparse/next_char.hpp diff --git a/c++/include/boost/metaparse/next_line.hpp b/c++/boost/metaparse/next_line.hpp similarity index 100% rename from c++/include/boost/metaparse/next_line.hpp rename to c++/boost/metaparse/next_line.hpp diff --git a/c++/include/boost/metaparse/nth_of.hpp b/c++/boost/metaparse/nth_of.hpp similarity index 100% rename from c++/include/boost/metaparse/nth_of.hpp rename to c++/boost/metaparse/nth_of.hpp diff --git a/c++/include/boost/metaparse/nth_of_c.hpp b/c++/boost/metaparse/nth_of_c.hpp similarity index 100% rename from c++/include/boost/metaparse/nth_of_c.hpp rename to c++/boost/metaparse/nth_of_c.hpp diff --git a/c++/include/boost/metaparse/one_char.hpp b/c++/boost/metaparse/one_char.hpp similarity index 100% rename from c++/include/boost/metaparse/one_char.hpp rename to c++/boost/metaparse/one_char.hpp diff --git a/c++/include/boost/metaparse/one_char_except.hpp b/c++/boost/metaparse/one_char_except.hpp similarity index 100% rename from c++/include/boost/metaparse/one_char_except.hpp rename to c++/boost/metaparse/one_char_except.hpp diff --git a/c++/include/boost/metaparse/one_char_except_c.hpp b/c++/boost/metaparse/one_char_except_c.hpp similarity index 100% rename from c++/include/boost/metaparse/one_char_except_c.hpp rename to c++/boost/metaparse/one_char_except_c.hpp diff --git a/c++/include/boost/metaparse/one_of.hpp b/c++/boost/metaparse/one_of.hpp similarity index 100% rename from c++/include/boost/metaparse/one_of.hpp rename to c++/boost/metaparse/one_of.hpp diff --git a/c++/include/boost/metaparse/one_of_c.hpp b/c++/boost/metaparse/one_of_c.hpp similarity index 100% rename from c++/include/boost/metaparse/one_of_c.hpp rename to c++/boost/metaparse/one_of_c.hpp diff --git a/c++/include/boost/metaparse/optional.hpp b/c++/boost/metaparse/optional.hpp similarity index 100% rename from c++/include/boost/metaparse/optional.hpp rename to c++/boost/metaparse/optional.hpp diff --git a/c++/include/boost/metaparse/range.hpp b/c++/boost/metaparse/range.hpp similarity index 100% rename from c++/include/boost/metaparse/range.hpp rename to c++/boost/metaparse/range.hpp diff --git a/c++/include/boost/metaparse/range_c.hpp b/c++/boost/metaparse/range_c.hpp similarity index 100% rename from c++/include/boost/metaparse/range_c.hpp rename to c++/boost/metaparse/range_c.hpp diff --git a/c++/include/boost/metaparse/reject.hpp b/c++/boost/metaparse/reject.hpp similarity index 100% rename from c++/include/boost/metaparse/reject.hpp rename to c++/boost/metaparse/reject.hpp diff --git a/c++/include/boost/metaparse/repeated.hpp b/c++/boost/metaparse/repeated.hpp similarity index 100% rename from c++/include/boost/metaparse/repeated.hpp rename to c++/boost/metaparse/repeated.hpp diff --git a/c++/include/boost/metaparse/repeated1.hpp b/c++/boost/metaparse/repeated1.hpp similarity index 100% rename from c++/include/boost/metaparse/repeated1.hpp rename to c++/boost/metaparse/repeated1.hpp diff --git a/c++/include/boost/metaparse/repeated_one_of.hpp b/c++/boost/metaparse/repeated_one_of.hpp similarity index 100% rename from c++/include/boost/metaparse/repeated_one_of.hpp rename to c++/boost/metaparse/repeated_one_of.hpp diff --git a/c++/include/boost/metaparse/repeated_one_of1.hpp b/c++/boost/metaparse/repeated_one_of1.hpp similarity index 100% rename from c++/include/boost/metaparse/repeated_one_of1.hpp rename to c++/boost/metaparse/repeated_one_of1.hpp diff --git a/c++/include/boost/metaparse/repeated_reject_incomplete.hpp b/c++/boost/metaparse/repeated_reject_incomplete.hpp similarity index 100% rename from c++/include/boost/metaparse/repeated_reject_incomplete.hpp rename to c++/boost/metaparse/repeated_reject_incomplete.hpp diff --git a/c++/include/boost/metaparse/repeated_reject_incomplete1.hpp b/c++/boost/metaparse/repeated_reject_incomplete1.hpp similarity index 100% rename from c++/include/boost/metaparse/repeated_reject_incomplete1.hpp rename to c++/boost/metaparse/repeated_reject_incomplete1.hpp diff --git a/c++/include/boost/metaparse/return_.hpp b/c++/boost/metaparse/return_.hpp similarity index 100% rename from c++/include/boost/metaparse/return_.hpp rename to c++/boost/metaparse/return_.hpp diff --git a/c++/include/boost/metaparse/sequence.hpp b/c++/boost/metaparse/sequence.hpp similarity index 100% rename from c++/include/boost/metaparse/sequence.hpp rename to c++/boost/metaparse/sequence.hpp diff --git a/c++/include/boost/metaparse/sequence_apply.hpp b/c++/boost/metaparse/sequence_apply.hpp similarity index 100% rename from c++/include/boost/metaparse/sequence_apply.hpp rename to c++/boost/metaparse/sequence_apply.hpp diff --git a/c++/include/boost/metaparse/source_position.hpp b/c++/boost/metaparse/source_position.hpp similarity index 100% rename from c++/include/boost/metaparse/source_position.hpp rename to c++/boost/metaparse/source_position.hpp diff --git a/c++/include/boost/metaparse/source_position_tag.hpp b/c++/boost/metaparse/source_position_tag.hpp similarity index 100% rename from c++/include/boost/metaparse/source_position_tag.hpp rename to c++/boost/metaparse/source_position_tag.hpp diff --git a/c++/include/boost/metaparse/space.hpp b/c++/boost/metaparse/space.hpp similarity index 100% rename from c++/include/boost/metaparse/space.hpp rename to c++/boost/metaparse/space.hpp diff --git a/c++/include/boost/metaparse/spaces.hpp b/c++/boost/metaparse/spaces.hpp similarity index 100% rename from c++/include/boost/metaparse/spaces.hpp rename to c++/boost/metaparse/spaces.hpp diff --git a/c++/include/boost/metaparse/start.hpp b/c++/boost/metaparse/start.hpp similarity index 100% rename from c++/include/boost/metaparse/start.hpp rename to c++/boost/metaparse/start.hpp diff --git a/c++/include/boost/metaparse/string.hpp b/c++/boost/metaparse/string.hpp similarity index 100% rename from c++/include/boost/metaparse/string.hpp rename to c++/boost/metaparse/string.hpp diff --git a/c++/include/boost/metaparse/string_tag.hpp b/c++/boost/metaparse/string_tag.hpp similarity index 100% rename from c++/include/boost/metaparse/string_tag.hpp rename to c++/boost/metaparse/string_tag.hpp diff --git a/c++/include/boost/metaparse/string_value.hpp b/c++/boost/metaparse/string_value.hpp similarity index 100% rename from c++/include/boost/metaparse/string_value.hpp rename to c++/boost/metaparse/string_value.hpp diff --git a/c++/include/boost/metaparse/token.hpp b/c++/boost/metaparse/token.hpp similarity index 100% rename from c++/include/boost/metaparse/token.hpp rename to c++/boost/metaparse/token.hpp diff --git a/c++/include/boost/metaparse/transform.hpp b/c++/boost/metaparse/transform.hpp similarity index 100% rename from c++/include/boost/metaparse/transform.hpp rename to c++/boost/metaparse/transform.hpp diff --git a/c++/include/boost/metaparse/transform_error.hpp b/c++/boost/metaparse/transform_error.hpp similarity index 100% rename from c++/include/boost/metaparse/transform_error.hpp rename to c++/boost/metaparse/transform_error.hpp diff --git a/c++/include/boost/metaparse/transform_error_message.hpp b/c++/boost/metaparse/transform_error_message.hpp similarity index 100% rename from c++/include/boost/metaparse/transform_error_message.hpp rename to c++/boost/metaparse/transform_error_message.hpp diff --git a/c++/include/boost/metaparse/unless_error.hpp b/c++/boost/metaparse/unless_error.hpp similarity index 100% rename from c++/include/boost/metaparse/unless_error.hpp rename to c++/boost/metaparse/unless_error.hpp diff --git a/c++/include/boost/metaparse/util/digit_to_int.hpp b/c++/boost/metaparse/util/digit_to_int.hpp similarity index 100% rename from c++/include/boost/metaparse/util/digit_to_int.hpp rename to c++/boost/metaparse/util/digit_to_int.hpp diff --git a/c++/include/boost/metaparse/util/digit_to_int_c.hpp b/c++/boost/metaparse/util/digit_to_int_c.hpp similarity index 100% rename from c++/include/boost/metaparse/util/digit_to_int_c.hpp rename to c++/boost/metaparse/util/digit_to_int_c.hpp diff --git a/c++/include/boost/metaparse/util/in_range.hpp b/c++/boost/metaparse/util/in_range.hpp similarity index 100% rename from c++/include/boost/metaparse/util/in_range.hpp rename to c++/boost/metaparse/util/in_range.hpp diff --git a/c++/include/boost/metaparse/util/in_range_c.hpp b/c++/boost/metaparse/util/in_range_c.hpp similarity index 100% rename from c++/include/boost/metaparse/util/in_range_c.hpp rename to c++/boost/metaparse/util/in_range_c.hpp diff --git a/c++/include/boost/metaparse/util/int_to_digit.hpp b/c++/boost/metaparse/util/int_to_digit.hpp similarity index 100% rename from c++/include/boost/metaparse/util/int_to_digit.hpp rename to c++/boost/metaparse/util/int_to_digit.hpp diff --git a/c++/include/boost/metaparse/util/int_to_digit_c.hpp b/c++/boost/metaparse/util/int_to_digit_c.hpp similarity index 100% rename from c++/include/boost/metaparse/util/int_to_digit_c.hpp rename to c++/boost/metaparse/util/int_to_digit_c.hpp diff --git a/c++/include/boost/metaparse/util/is_digit.hpp b/c++/boost/metaparse/util/is_digit.hpp similarity index 100% rename from c++/include/boost/metaparse/util/is_digit.hpp rename to c++/boost/metaparse/util/is_digit.hpp diff --git a/c++/include/boost/metaparse/util/is_lcase_letter.hpp b/c++/boost/metaparse/util/is_lcase_letter.hpp similarity index 100% rename from c++/include/boost/metaparse/util/is_lcase_letter.hpp rename to c++/boost/metaparse/util/is_lcase_letter.hpp diff --git a/c++/include/boost/metaparse/util/is_letter.hpp b/c++/boost/metaparse/util/is_letter.hpp similarity index 100% rename from c++/include/boost/metaparse/util/is_letter.hpp rename to c++/boost/metaparse/util/is_letter.hpp diff --git a/c++/include/boost/metaparse/util/is_ucase_letter.hpp b/c++/boost/metaparse/util/is_ucase_letter.hpp similarity index 100% rename from c++/include/boost/metaparse/util/is_ucase_letter.hpp rename to c++/boost/metaparse/util/is_ucase_letter.hpp diff --git a/c++/include/boost/metaparse/util/is_whitespace.hpp b/c++/boost/metaparse/util/is_whitespace.hpp similarity index 100% rename from c++/include/boost/metaparse/util/is_whitespace.hpp rename to c++/boost/metaparse/util/is_whitespace.hpp diff --git a/c++/include/boost/metaparse/util/is_whitespace_c.hpp b/c++/boost/metaparse/util/is_whitespace_c.hpp similarity index 100% rename from c++/include/boost/metaparse/util/is_whitespace_c.hpp rename to c++/boost/metaparse/util/is_whitespace_c.hpp diff --git a/c++/include/boost/metaparse/v1/accept.hpp b/c++/boost/metaparse/v1/accept.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/accept.hpp rename to c++/boost/metaparse/v1/accept.hpp diff --git a/c++/include/boost/metaparse/v1/accept_tag.hpp b/c++/boost/metaparse/v1/accept_tag.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/accept_tag.hpp rename to c++/boost/metaparse/v1/accept_tag.hpp diff --git a/c++/include/boost/metaparse/v1/accept_when.hpp b/c++/boost/metaparse/v1/accept_when.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/accept_when.hpp rename to c++/boost/metaparse/v1/accept_when.hpp diff --git a/c++/include/boost/metaparse/v1/alphanum.hpp b/c++/boost/metaparse/v1/alphanum.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/alphanum.hpp rename to c++/boost/metaparse/v1/alphanum.hpp diff --git a/c++/include/boost/metaparse/v1/always.hpp b/c++/boost/metaparse/v1/always.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/always.hpp rename to c++/boost/metaparse/v1/always.hpp diff --git a/c++/include/boost/metaparse/v1/always_c.hpp b/c++/boost/metaparse/v1/always_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/always_c.hpp rename to c++/boost/metaparse/v1/always_c.hpp diff --git a/c++/include/boost/metaparse/v1/build_parser.hpp b/c++/boost/metaparse/v1/build_parser.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/build_parser.hpp rename to c++/boost/metaparse/v1/build_parser.hpp diff --git a/c++/include/boost/metaparse/v1/change_error_message.hpp b/c++/boost/metaparse/v1/change_error_message.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/change_error_message.hpp rename to c++/boost/metaparse/v1/change_error_message.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/first_of.hpp b/c++/boost/metaparse/v1/cpp11/first_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/first_of.hpp rename to c++/boost/metaparse/v1/cpp11/first_of.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/fwd/string.hpp b/c++/boost/metaparse/v1/cpp11/fwd/string.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/fwd/string.hpp rename to c++/boost/metaparse/v1/cpp11/fwd/string.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/any_of_c.hpp b/c++/boost/metaparse/v1/cpp11/impl/any_of_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/any_of_c.hpp rename to c++/boost/metaparse/v1/cpp11/impl/any_of_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/at_c.hpp b/c++/boost/metaparse/v1/cpp11/impl/at_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/at_c.hpp rename to c++/boost/metaparse/v1/cpp11/impl/at_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/concat.hpp b/c++/boost/metaparse/v1/cpp11/impl/concat.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/concat.hpp rename to c++/boost/metaparse/v1/cpp11/impl/concat.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/empty_string.hpp b/c++/boost/metaparse/v1/cpp11/impl/empty_string.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/empty_string.hpp rename to c++/boost/metaparse/v1/cpp11/impl/empty_string.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/eval_later_result.hpp b/c++/boost/metaparse/v1/cpp11/impl/eval_later_result.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/eval_later_result.hpp rename to c++/boost/metaparse/v1/cpp11/impl/eval_later_result.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/is_none_c.hpp b/c++/boost/metaparse/v1/cpp11/impl/is_none_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/is_none_c.hpp rename to c++/boost/metaparse/v1/cpp11/impl/is_none_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/is_none_c_impl.hpp b/c++/boost/metaparse/v1/cpp11/impl/is_none_c_impl.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/is_none_c_impl.hpp rename to c++/boost/metaparse/v1/cpp11/impl/is_none_c_impl.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/nth_of_c.hpp b/c++/boost/metaparse/v1/cpp11/impl/nth_of_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/nth_of_c.hpp rename to c++/boost/metaparse/v1/cpp11/impl/nth_of_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/nth_of_c_skip_remaining.hpp b/c++/boost/metaparse/v1/cpp11/impl/nth_of_c_skip_remaining.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/nth_of_c_skip_remaining.hpp rename to c++/boost/metaparse/v1/cpp11/impl/nth_of_c_skip_remaining.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/or_c.hpp b/c++/boost/metaparse/v1/cpp11/impl/or_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/or_c.hpp rename to c++/boost/metaparse/v1/cpp11/impl/or_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/pop_back.hpp b/c++/boost/metaparse/v1/cpp11/impl/pop_back.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/pop_back.hpp rename to c++/boost/metaparse/v1/cpp11/impl/pop_back.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/pop_front.hpp b/c++/boost/metaparse/v1/cpp11/impl/pop_front.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/pop_front.hpp rename to c++/boost/metaparse/v1/cpp11/impl/pop_front.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/push_back_c.hpp b/c++/boost/metaparse/v1/cpp11/impl/push_back_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/push_back_c.hpp rename to c++/boost/metaparse/v1/cpp11/impl/push_back_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/push_front_c.hpp b/c++/boost/metaparse/v1/cpp11/impl/push_front_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/push_front_c.hpp rename to c++/boost/metaparse/v1/cpp11/impl/push_front_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/push_front_result.hpp b/c++/boost/metaparse/v1/cpp11/impl/push_front_result.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/push_front_result.hpp rename to c++/boost/metaparse/v1/cpp11/impl/push_front_result.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/size.hpp b/c++/boost/metaparse/v1/cpp11/impl/size.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/size.hpp rename to c++/boost/metaparse/v1/cpp11/impl/size.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/string.hpp b/c++/boost/metaparse/v1/cpp11/impl/string.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/string.hpp rename to c++/boost/metaparse/v1/cpp11/impl/string.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/impl/string_at.hpp b/c++/boost/metaparse/v1/cpp11/impl/string_at.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/impl/string_at.hpp rename to c++/boost/metaparse/v1/cpp11/impl/string_at.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/last_of.hpp b/c++/boost/metaparse/v1/cpp11/last_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/last_of.hpp rename to c++/boost/metaparse/v1/cpp11/last_of.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/nth_of.hpp b/c++/boost/metaparse/v1/cpp11/nth_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/nth_of.hpp rename to c++/boost/metaparse/v1/cpp11/nth_of.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/nth_of_c.hpp b/c++/boost/metaparse/v1/cpp11/nth_of_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/nth_of_c.hpp rename to c++/boost/metaparse/v1/cpp11/nth_of_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/one_char_except.hpp b/c++/boost/metaparse/v1/cpp11/one_char_except.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/one_char_except.hpp rename to c++/boost/metaparse/v1/cpp11/one_char_except.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/one_char_except_c.hpp b/c++/boost/metaparse/v1/cpp11/one_char_except_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/one_char_except_c.hpp rename to c++/boost/metaparse/v1/cpp11/one_char_except_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/one_of.hpp b/c++/boost/metaparse/v1/cpp11/one_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/one_of.hpp rename to c++/boost/metaparse/v1/cpp11/one_of.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/one_of_c.hpp b/c++/boost/metaparse/v1/cpp11/one_of_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/one_of_c.hpp rename to c++/boost/metaparse/v1/cpp11/one_of_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/repeated_one_of.hpp b/c++/boost/metaparse/v1/cpp11/repeated_one_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/repeated_one_of.hpp rename to c++/boost/metaparse/v1/cpp11/repeated_one_of.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/repeated_one_of1.hpp b/c++/boost/metaparse/v1/cpp11/repeated_one_of1.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/repeated_one_of1.hpp rename to c++/boost/metaparse/v1/cpp11/repeated_one_of1.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/sequence.hpp b/c++/boost/metaparse/v1/cpp11/sequence.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/sequence.hpp rename to c++/boost/metaparse/v1/cpp11/sequence.hpp diff --git a/c++/include/boost/metaparse/v1/cpp11/string.hpp b/c++/boost/metaparse/v1/cpp11/string.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp11/string.hpp rename to c++/boost/metaparse/v1/cpp11/string.hpp diff --git a/c++/include/boost/metaparse/v1/cpp14/impl/any_of_c.hpp b/c++/boost/metaparse/v1/cpp14/impl/any_of_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp14/impl/any_of_c.hpp rename to c++/boost/metaparse/v1/cpp14/impl/any_of_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp14/one_of_c.hpp b/c++/boost/metaparse/v1/cpp14/one_of_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp14/one_of_c.hpp rename to c++/boost/metaparse/v1/cpp14/one_of_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/first_of.hpp b/c++/boost/metaparse/v1/cpp98/first_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/first_of.hpp rename to c++/boost/metaparse/v1/cpp98/first_of.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/fwd/string.hpp b/c++/boost/metaparse/v1/cpp98/fwd/string.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/fwd/string.hpp rename to c++/boost/metaparse/v1/cpp98/fwd/string.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/at_c.hpp b/c++/boost/metaparse/v1/cpp98/impl/at_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/at_c.hpp rename to c++/boost/metaparse/v1/cpp98/impl/at_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/empty_string.hpp b/c++/boost/metaparse/v1/cpp98/impl/empty_string.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/empty_string.hpp rename to c++/boost/metaparse/v1/cpp98/impl/empty_string.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/is_none.hpp b/c++/boost/metaparse/v1/cpp98/impl/is_none.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/is_none.hpp rename to c++/boost/metaparse/v1/cpp98/impl/is_none.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/later_result.hpp b/c++/boost/metaparse/v1/cpp98/impl/later_result.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/later_result.hpp rename to c++/boost/metaparse/v1/cpp98/impl/later_result.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/nth_of_c.hpp b/c++/boost/metaparse/v1/cpp98/impl/nth_of_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/nth_of_c.hpp rename to c++/boost/metaparse/v1/cpp98/impl/nth_of_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/nth_of_c_impl.hpp b/c++/boost/metaparse/v1/cpp98/impl/nth_of_c_impl.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/nth_of_c_impl.hpp rename to c++/boost/metaparse/v1/cpp98/impl/nth_of_c_impl.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/one_char_except_not_used.hpp b/c++/boost/metaparse/v1/cpp98/impl/one_char_except_not_used.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/one_char_except_not_used.hpp rename to c++/boost/metaparse/v1/cpp98/impl/one_char_except_not_used.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/one_of.hpp b/c++/boost/metaparse/v1/cpp98/impl/one_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/one_of.hpp rename to c++/boost/metaparse/v1/cpp98/impl/one_of.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/one_of_fwd_op.hpp b/c++/boost/metaparse/v1/cpp98/impl/one_of_fwd_op.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/one_of_fwd_op.hpp rename to c++/boost/metaparse/v1/cpp98/impl/one_of_fwd_op.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/pop_back.hpp b/c++/boost/metaparse/v1/cpp98/impl/pop_back.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/pop_back.hpp rename to c++/boost/metaparse/v1/cpp98/impl/pop_back.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/pop_front.hpp b/c++/boost/metaparse/v1/cpp98/impl/pop_front.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/pop_front.hpp rename to c++/boost/metaparse/v1/cpp98/impl/pop_front.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/push_back_c.hpp b/c++/boost/metaparse/v1/cpp98/impl/push_back_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/push_back_c.hpp rename to c++/boost/metaparse/v1/cpp98/impl/push_back_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/push_front_c.hpp b/c++/boost/metaparse/v1/cpp98/impl/push_front_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/push_front_c.hpp rename to c++/boost/metaparse/v1/cpp98/impl/push_front_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/sequence.hpp b/c++/boost/metaparse/v1/cpp98/impl/sequence.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/sequence.hpp rename to c++/boost/metaparse/v1/cpp98/impl/sequence.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/sequence_impl.hpp b/c++/boost/metaparse/v1/cpp98/impl/sequence_impl.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/sequence_impl.hpp rename to c++/boost/metaparse/v1/cpp98/impl/sequence_impl.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/size.hpp b/c++/boost/metaparse/v1/cpp98/impl/size.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/size.hpp rename to c++/boost/metaparse/v1/cpp98/impl/size.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/skip_seq.hpp b/c++/boost/metaparse/v1/cpp98/impl/skip_seq.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/skip_seq.hpp rename to c++/boost/metaparse/v1/cpp98/impl/skip_seq.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/impl/update_c.hpp b/c++/boost/metaparse/v1/cpp98/impl/update_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/impl/update_c.hpp rename to c++/boost/metaparse/v1/cpp98/impl/update_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/last_of.hpp b/c++/boost/metaparse/v1/cpp98/last_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/last_of.hpp rename to c++/boost/metaparse/v1/cpp98/last_of.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/nth_of.hpp b/c++/boost/metaparse/v1/cpp98/nth_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/nth_of.hpp rename to c++/boost/metaparse/v1/cpp98/nth_of.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/nth_of_c.hpp b/c++/boost/metaparse/v1/cpp98/nth_of_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/nth_of_c.hpp rename to c++/boost/metaparse/v1/cpp98/nth_of_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/one_char_except.hpp b/c++/boost/metaparse/v1/cpp98/one_char_except.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/one_char_except.hpp rename to c++/boost/metaparse/v1/cpp98/one_char_except.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/one_char_except_c.hpp b/c++/boost/metaparse/v1/cpp98/one_char_except_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/one_char_except_c.hpp rename to c++/boost/metaparse/v1/cpp98/one_char_except_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/one_of.hpp b/c++/boost/metaparse/v1/cpp98/one_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/one_of.hpp rename to c++/boost/metaparse/v1/cpp98/one_of.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/one_of_c.hpp b/c++/boost/metaparse/v1/cpp98/one_of_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/one_of_c.hpp rename to c++/boost/metaparse/v1/cpp98/one_of_c.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/repeated_one_of.hpp b/c++/boost/metaparse/v1/cpp98/repeated_one_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/repeated_one_of.hpp rename to c++/boost/metaparse/v1/cpp98/repeated_one_of.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/repeated_one_of1.hpp b/c++/boost/metaparse/v1/cpp98/repeated_one_of1.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/repeated_one_of1.hpp rename to c++/boost/metaparse/v1/cpp98/repeated_one_of1.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/sequence.hpp b/c++/boost/metaparse/v1/cpp98/sequence.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/sequence.hpp rename to c++/boost/metaparse/v1/cpp98/sequence.hpp diff --git a/c++/include/boost/metaparse/v1/cpp98/string.hpp b/c++/boost/metaparse/v1/cpp98/string.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/cpp98/string.hpp rename to c++/boost/metaparse/v1/cpp98/string.hpp diff --git a/c++/include/boost/metaparse/v1/debug_parsing_error.hpp b/c++/boost/metaparse/v1/debug_parsing_error.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/debug_parsing_error.hpp rename to c++/boost/metaparse/v1/debug_parsing_error.hpp diff --git a/c++/include/boost/metaparse/v1/define_error.hpp b/c++/boost/metaparse/v1/define_error.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/define_error.hpp rename to c++/boost/metaparse/v1/define_error.hpp diff --git a/c++/include/boost/metaparse/v1/digit.hpp b/c++/boost/metaparse/v1/digit.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/digit.hpp rename to c++/boost/metaparse/v1/digit.hpp diff --git a/c++/include/boost/metaparse/v1/digit_val.hpp b/c++/boost/metaparse/v1/digit_val.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/digit_val.hpp rename to c++/boost/metaparse/v1/digit_val.hpp diff --git a/c++/include/boost/metaparse/v1/empty.hpp b/c++/boost/metaparse/v1/empty.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/empty.hpp rename to c++/boost/metaparse/v1/empty.hpp diff --git a/c++/include/boost/metaparse/v1/entire_input.hpp b/c++/boost/metaparse/v1/entire_input.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/entire_input.hpp rename to c++/boost/metaparse/v1/entire_input.hpp diff --git a/c++/include/boost/metaparse/v1/error/digit_expected.hpp b/c++/boost/metaparse/v1/error/digit_expected.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/error/digit_expected.hpp rename to c++/boost/metaparse/v1/error/digit_expected.hpp diff --git a/c++/include/boost/metaparse/v1/error/end_of_input_expected.hpp b/c++/boost/metaparse/v1/error/end_of_input_expected.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/error/end_of_input_expected.hpp rename to c++/boost/metaparse/v1/error/end_of_input_expected.hpp diff --git a/c++/include/boost/metaparse/v1/error/expected_to_fail.hpp b/c++/boost/metaparse/v1/error/expected_to_fail.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/error/expected_to_fail.hpp rename to c++/boost/metaparse/v1/error/expected_to_fail.hpp diff --git a/c++/include/boost/metaparse/v1/error/index_out_of_range.hpp b/c++/boost/metaparse/v1/error/index_out_of_range.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/error/index_out_of_range.hpp rename to c++/boost/metaparse/v1/error/index_out_of_range.hpp diff --git a/c++/include/boost/metaparse/v1/error/letter_expected.hpp b/c++/boost/metaparse/v1/error/letter_expected.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/error/letter_expected.hpp rename to c++/boost/metaparse/v1/error/letter_expected.hpp diff --git a/c++/include/boost/metaparse/v1/error/literal_expected.hpp b/c++/boost/metaparse/v1/error/literal_expected.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/error/literal_expected.hpp rename to c++/boost/metaparse/v1/error/literal_expected.hpp diff --git a/c++/include/boost/metaparse/v1/error/none_of_the_expected_cases_found.hpp b/c++/boost/metaparse/v1/error/none_of_the_expected_cases_found.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/error/none_of_the_expected_cases_found.hpp rename to c++/boost/metaparse/v1/error/none_of_the_expected_cases_found.hpp diff --git a/c++/include/boost/metaparse/v1/error/unexpected_character.hpp b/c++/boost/metaparse/v1/error/unexpected_character.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/error/unexpected_character.hpp rename to c++/boost/metaparse/v1/error/unexpected_character.hpp diff --git a/c++/include/boost/metaparse/v1/error/unexpected_end_of_input.hpp b/c++/boost/metaparse/v1/error/unexpected_end_of_input.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/error/unexpected_end_of_input.hpp rename to c++/boost/metaparse/v1/error/unexpected_end_of_input.hpp diff --git a/c++/include/boost/metaparse/v1/error/unpaired.hpp b/c++/boost/metaparse/v1/error/unpaired.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/error/unpaired.hpp rename to c++/boost/metaparse/v1/error/unpaired.hpp diff --git a/c++/include/boost/metaparse/v1/error/whitespace_expected.hpp b/c++/boost/metaparse/v1/error/whitespace_expected.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/error/whitespace_expected.hpp rename to c++/boost/metaparse/v1/error/whitespace_expected.hpp diff --git a/c++/include/boost/metaparse/v1/except.hpp b/c++/boost/metaparse/v1/except.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/except.hpp rename to c++/boost/metaparse/v1/except.hpp diff --git a/c++/include/boost/metaparse/v1/fail.hpp b/c++/boost/metaparse/v1/fail.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fail.hpp rename to c++/boost/metaparse/v1/fail.hpp diff --git a/c++/include/boost/metaparse/v1/fail_at_first_char_expected.hpp b/c++/boost/metaparse/v1/fail_at_first_char_expected.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fail_at_first_char_expected.hpp rename to c++/boost/metaparse/v1/fail_at_first_char_expected.hpp diff --git a/c++/include/boost/metaparse/v1/fail_tag.hpp b/c++/boost/metaparse/v1/fail_tag.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fail_tag.hpp rename to c++/boost/metaparse/v1/fail_tag.hpp diff --git a/c++/include/boost/metaparse/v1/first_of.hpp b/c++/boost/metaparse/v1/first_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/first_of.hpp rename to c++/boost/metaparse/v1/first_of.hpp diff --git a/c++/include/boost/metaparse/v1/foldl.hpp b/c++/boost/metaparse/v1/foldl.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/foldl.hpp rename to c++/boost/metaparse/v1/foldl.hpp diff --git a/c++/include/boost/metaparse/v1/foldl1.hpp b/c++/boost/metaparse/v1/foldl1.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/foldl1.hpp rename to c++/boost/metaparse/v1/foldl1.hpp diff --git a/c++/include/boost/metaparse/v1/foldl_reject_incomplete.hpp b/c++/boost/metaparse/v1/foldl_reject_incomplete.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/foldl_reject_incomplete.hpp rename to c++/boost/metaparse/v1/foldl_reject_incomplete.hpp diff --git a/c++/include/boost/metaparse/v1/foldl_reject_incomplete1.hpp b/c++/boost/metaparse/v1/foldl_reject_incomplete1.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/foldl_reject_incomplete1.hpp rename to c++/boost/metaparse/v1/foldl_reject_incomplete1.hpp diff --git a/c++/include/boost/metaparse/v1/foldl_reject_incomplete_start_with_parser.hpp b/c++/boost/metaparse/v1/foldl_reject_incomplete_start_with_parser.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/foldl_reject_incomplete_start_with_parser.hpp rename to c++/boost/metaparse/v1/foldl_reject_incomplete_start_with_parser.hpp diff --git a/c++/include/boost/metaparse/v1/foldl_start_with_parser.hpp b/c++/boost/metaparse/v1/foldl_start_with_parser.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/foldl_start_with_parser.hpp rename to c++/boost/metaparse/v1/foldl_start_with_parser.hpp diff --git a/c++/include/boost/metaparse/v1/foldr.hpp b/c++/boost/metaparse/v1/foldr.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/foldr.hpp rename to c++/boost/metaparse/v1/foldr.hpp diff --git a/c++/include/boost/metaparse/v1/foldr1.hpp b/c++/boost/metaparse/v1/foldr1.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/foldr1.hpp rename to c++/boost/metaparse/v1/foldr1.hpp diff --git a/c++/include/boost/metaparse/v1/foldr_reject_incomplete.hpp b/c++/boost/metaparse/v1/foldr_reject_incomplete.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/foldr_reject_incomplete.hpp rename to c++/boost/metaparse/v1/foldr_reject_incomplete.hpp diff --git a/c++/include/boost/metaparse/v1/foldr_reject_incomplete1.hpp b/c++/boost/metaparse/v1/foldr_reject_incomplete1.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/foldr_reject_incomplete1.hpp rename to c++/boost/metaparse/v1/foldr_reject_incomplete1.hpp diff --git a/c++/include/boost/metaparse/v1/foldr_start_with_parser.hpp b/c++/boost/metaparse/v1/foldr_start_with_parser.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/foldr_start_with_parser.hpp rename to c++/boost/metaparse/v1/foldr_start_with_parser.hpp diff --git a/c++/include/boost/metaparse/v1/fwd/accept.hpp b/c++/boost/metaparse/v1/fwd/accept.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fwd/accept.hpp rename to c++/boost/metaparse/v1/fwd/accept.hpp diff --git a/c++/include/boost/metaparse/v1/fwd/build_parser.hpp b/c++/boost/metaparse/v1/fwd/build_parser.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fwd/build_parser.hpp rename to c++/boost/metaparse/v1/fwd/build_parser.hpp diff --git a/c++/include/boost/metaparse/v1/fwd/get_col.hpp b/c++/boost/metaparse/v1/fwd/get_col.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fwd/get_col.hpp rename to c++/boost/metaparse/v1/fwd/get_col.hpp diff --git a/c++/include/boost/metaparse/v1/fwd/get_line.hpp b/c++/boost/metaparse/v1/fwd/get_line.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fwd/get_line.hpp rename to c++/boost/metaparse/v1/fwd/get_line.hpp diff --git a/c++/include/boost/metaparse/v1/fwd/get_message.hpp b/c++/boost/metaparse/v1/fwd/get_message.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fwd/get_message.hpp rename to c++/boost/metaparse/v1/fwd/get_message.hpp diff --git a/c++/include/boost/metaparse/v1/fwd/get_position.hpp b/c++/boost/metaparse/v1/fwd/get_position.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fwd/get_position.hpp rename to c++/boost/metaparse/v1/fwd/get_position.hpp diff --git a/c++/include/boost/metaparse/v1/fwd/get_prev_char.hpp b/c++/boost/metaparse/v1/fwd/get_prev_char.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fwd/get_prev_char.hpp rename to c++/boost/metaparse/v1/fwd/get_prev_char.hpp diff --git a/c++/include/boost/metaparse/v1/fwd/get_remaining.hpp b/c++/boost/metaparse/v1/fwd/get_remaining.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fwd/get_remaining.hpp rename to c++/boost/metaparse/v1/fwd/get_remaining.hpp diff --git a/c++/include/boost/metaparse/v1/fwd/get_result.hpp b/c++/boost/metaparse/v1/fwd/get_result.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fwd/get_result.hpp rename to c++/boost/metaparse/v1/fwd/get_result.hpp diff --git a/c++/include/boost/metaparse/v1/fwd/next_char.hpp b/c++/boost/metaparse/v1/fwd/next_char.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fwd/next_char.hpp rename to c++/boost/metaparse/v1/fwd/next_char.hpp diff --git a/c++/include/boost/metaparse/v1/fwd/next_line.hpp b/c++/boost/metaparse/v1/fwd/next_line.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fwd/next_line.hpp rename to c++/boost/metaparse/v1/fwd/next_line.hpp diff --git a/c++/include/boost/metaparse/v1/fwd/reject.hpp b/c++/boost/metaparse/v1/fwd/reject.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fwd/reject.hpp rename to c++/boost/metaparse/v1/fwd/reject.hpp diff --git a/c++/include/boost/metaparse/v1/fwd/source_position.hpp b/c++/boost/metaparse/v1/fwd/source_position.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fwd/source_position.hpp rename to c++/boost/metaparse/v1/fwd/source_position.hpp diff --git a/c++/include/boost/metaparse/v1/fwd/string.hpp b/c++/boost/metaparse/v1/fwd/string.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/fwd/string.hpp rename to c++/boost/metaparse/v1/fwd/string.hpp diff --git a/c++/include/boost/metaparse/v1/get_col.hpp b/c++/boost/metaparse/v1/get_col.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/get_col.hpp rename to c++/boost/metaparse/v1/get_col.hpp diff --git a/c++/include/boost/metaparse/v1/get_line.hpp b/c++/boost/metaparse/v1/get_line.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/get_line.hpp rename to c++/boost/metaparse/v1/get_line.hpp diff --git a/c++/include/boost/metaparse/v1/get_message.hpp b/c++/boost/metaparse/v1/get_message.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/get_message.hpp rename to c++/boost/metaparse/v1/get_message.hpp diff --git a/c++/include/boost/metaparse/v1/get_position.hpp b/c++/boost/metaparse/v1/get_position.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/get_position.hpp rename to c++/boost/metaparse/v1/get_position.hpp diff --git a/c++/include/boost/metaparse/v1/get_prev_char.hpp b/c++/boost/metaparse/v1/get_prev_char.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/get_prev_char.hpp rename to c++/boost/metaparse/v1/get_prev_char.hpp diff --git a/c++/include/boost/metaparse/v1/get_remaining.hpp b/c++/boost/metaparse/v1/get_remaining.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/get_remaining.hpp rename to c++/boost/metaparse/v1/get_remaining.hpp diff --git a/c++/include/boost/metaparse/v1/get_result.hpp b/c++/boost/metaparse/v1/get_result.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/get_result.hpp rename to c++/boost/metaparse/v1/get_result.hpp diff --git a/c++/include/boost/metaparse/v1/grammar.hpp b/c++/boost/metaparse/v1/grammar.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/grammar.hpp rename to c++/boost/metaparse/v1/grammar.hpp diff --git a/c++/include/boost/metaparse/v1/if_.hpp b/c++/boost/metaparse/v1/if_.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/if_.hpp rename to c++/boost/metaparse/v1/if_.hpp diff --git a/c++/include/boost/metaparse/v1/impl/apply_parser.hpp b/c++/boost/metaparse/v1/impl/apply_parser.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/apply_parser.hpp rename to c++/boost/metaparse/v1/impl/apply_parser.hpp diff --git a/c++/include/boost/metaparse/v1/impl/assert_string_length.hpp b/c++/boost/metaparse/v1/impl/assert_string_length.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/assert_string_length.hpp rename to c++/boost/metaparse/v1/impl/assert_string_length.hpp diff --git a/c++/include/boost/metaparse/v1/impl/at_c.hpp b/c++/boost/metaparse/v1/impl/at_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/at_c.hpp rename to c++/boost/metaparse/v1/impl/at_c.hpp diff --git a/c++/include/boost/metaparse/v1/impl/back_inserter.hpp b/c++/boost/metaparse/v1/impl/back_inserter.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/back_inserter.hpp rename to c++/boost/metaparse/v1/impl/back_inserter.hpp diff --git a/c++/include/boost/metaparse/v1/impl/front_inserter.hpp b/c++/boost/metaparse/v1/impl/front_inserter.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/front_inserter.hpp rename to c++/boost/metaparse/v1/impl/front_inserter.hpp diff --git a/c++/include/boost/metaparse/v1/impl/fwd/iterate_impl.hpp b/c++/boost/metaparse/v1/impl/fwd/iterate_impl.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/fwd/iterate_impl.hpp rename to c++/boost/metaparse/v1/impl/fwd/iterate_impl.hpp diff --git a/c++/include/boost/metaparse/v1/impl/has_type.hpp b/c++/boost/metaparse/v1/impl/has_type.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/has_type.hpp rename to c++/boost/metaparse/v1/impl/has_type.hpp diff --git a/c++/include/boost/metaparse/v1/impl/is_char_c.hpp b/c++/boost/metaparse/v1/impl/is_char_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/is_char_c.hpp rename to c++/boost/metaparse/v1/impl/is_char_c.hpp diff --git a/c++/include/boost/metaparse/v1/impl/iterate_impl.hpp b/c++/boost/metaparse/v1/impl/iterate_impl.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/iterate_impl.hpp rename to c++/boost/metaparse/v1/impl/iterate_impl.hpp diff --git a/c++/include/boost/metaparse/v1/impl/iterate_impl_unchecked.hpp b/c++/boost/metaparse/v1/impl/iterate_impl_unchecked.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/iterate_impl_unchecked.hpp rename to c++/boost/metaparse/v1/impl/iterate_impl_unchecked.hpp diff --git a/c++/include/boost/metaparse/v1/impl/next_digit.hpp b/c++/boost/metaparse/v1/impl/next_digit.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/next_digit.hpp rename to c++/boost/metaparse/v1/impl/next_digit.hpp diff --git a/c++/include/boost/metaparse/v1/impl/no_char.hpp b/c++/boost/metaparse/v1/impl/no_char.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/no_char.hpp rename to c++/boost/metaparse/v1/impl/no_char.hpp diff --git a/c++/include/boost/metaparse/v1/impl/returns.hpp b/c++/boost/metaparse/v1/impl/returns.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/returns.hpp rename to c++/boost/metaparse/v1/impl/returns.hpp diff --git a/c++/include/boost/metaparse/v1/impl/string_iterator.hpp b/c++/boost/metaparse/v1/impl/string_iterator.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/string_iterator.hpp rename to c++/boost/metaparse/v1/impl/string_iterator.hpp diff --git a/c++/include/boost/metaparse/v1/impl/string_iterator_tag.hpp b/c++/boost/metaparse/v1/impl/string_iterator_tag.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/string_iterator_tag.hpp rename to c++/boost/metaparse/v1/impl/string_iterator_tag.hpp diff --git a/c++/include/boost/metaparse/v1/impl/void_.hpp b/c++/boost/metaparse/v1/impl/void_.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/impl/void_.hpp rename to c++/boost/metaparse/v1/impl/void_.hpp diff --git a/c++/include/boost/metaparse/v1/int_.hpp b/c++/boost/metaparse/v1/int_.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/int_.hpp rename to c++/boost/metaparse/v1/int_.hpp diff --git a/c++/include/boost/metaparse/v1/is_error.hpp b/c++/boost/metaparse/v1/is_error.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/is_error.hpp rename to c++/boost/metaparse/v1/is_error.hpp diff --git a/c++/include/boost/metaparse/v1/iterate.hpp b/c++/boost/metaparse/v1/iterate.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/iterate.hpp rename to c++/boost/metaparse/v1/iterate.hpp diff --git a/c++/include/boost/metaparse/v1/iterate_c.hpp b/c++/boost/metaparse/v1/iterate_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/iterate_c.hpp rename to c++/boost/metaparse/v1/iterate_c.hpp diff --git a/c++/include/boost/metaparse/v1/keyword.hpp b/c++/boost/metaparse/v1/keyword.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/keyword.hpp rename to c++/boost/metaparse/v1/keyword.hpp diff --git a/c++/include/boost/metaparse/v1/last_of.hpp b/c++/boost/metaparse/v1/last_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/last_of.hpp rename to c++/boost/metaparse/v1/last_of.hpp diff --git a/c++/include/boost/metaparse/v1/letter.hpp b/c++/boost/metaparse/v1/letter.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/letter.hpp rename to c++/boost/metaparse/v1/letter.hpp diff --git a/c++/include/boost/metaparse/v1/lit.hpp b/c++/boost/metaparse/v1/lit.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/lit.hpp rename to c++/boost/metaparse/v1/lit.hpp diff --git a/c++/include/boost/metaparse/v1/lit_c.hpp b/c++/boost/metaparse/v1/lit_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/lit_c.hpp rename to c++/boost/metaparse/v1/lit_c.hpp diff --git a/c++/include/boost/metaparse/v1/look_ahead.hpp b/c++/boost/metaparse/v1/look_ahead.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/look_ahead.hpp rename to c++/boost/metaparse/v1/look_ahead.hpp diff --git a/c++/include/boost/metaparse/v1/middle_of.hpp b/c++/boost/metaparse/v1/middle_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/middle_of.hpp rename to c++/boost/metaparse/v1/middle_of.hpp diff --git a/c++/include/boost/metaparse/v1/next_char.hpp b/c++/boost/metaparse/v1/next_char.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/next_char.hpp rename to c++/boost/metaparse/v1/next_char.hpp diff --git a/c++/include/boost/metaparse/v1/next_line.hpp b/c++/boost/metaparse/v1/next_line.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/next_line.hpp rename to c++/boost/metaparse/v1/next_line.hpp diff --git a/c++/include/boost/metaparse/v1/nth_of.hpp b/c++/boost/metaparse/v1/nth_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/nth_of.hpp rename to c++/boost/metaparse/v1/nth_of.hpp diff --git a/c++/include/boost/metaparse/v1/nth_of_c.hpp b/c++/boost/metaparse/v1/nth_of_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/nth_of_c.hpp rename to c++/boost/metaparse/v1/nth_of_c.hpp diff --git a/c++/include/boost/metaparse/v1/one_char.hpp b/c++/boost/metaparse/v1/one_char.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/one_char.hpp rename to c++/boost/metaparse/v1/one_char.hpp diff --git a/c++/include/boost/metaparse/v1/one_char_except.hpp b/c++/boost/metaparse/v1/one_char_except.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/one_char_except.hpp rename to c++/boost/metaparse/v1/one_char_except.hpp diff --git a/c++/include/boost/metaparse/v1/one_char_except_c.hpp b/c++/boost/metaparse/v1/one_char_except_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/one_char_except_c.hpp rename to c++/boost/metaparse/v1/one_char_except_c.hpp diff --git a/c++/include/boost/metaparse/v1/one_of.hpp b/c++/boost/metaparse/v1/one_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/one_of.hpp rename to c++/boost/metaparse/v1/one_of.hpp diff --git a/c++/include/boost/metaparse/v1/one_of_c.hpp b/c++/boost/metaparse/v1/one_of_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/one_of_c.hpp rename to c++/boost/metaparse/v1/one_of_c.hpp diff --git a/c++/include/boost/metaparse/v1/optional.hpp b/c++/boost/metaparse/v1/optional.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/optional.hpp rename to c++/boost/metaparse/v1/optional.hpp diff --git a/c++/include/boost/metaparse/v1/range.hpp b/c++/boost/metaparse/v1/range.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/range.hpp rename to c++/boost/metaparse/v1/range.hpp diff --git a/c++/include/boost/metaparse/v1/range_c.hpp b/c++/boost/metaparse/v1/range_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/range_c.hpp rename to c++/boost/metaparse/v1/range_c.hpp diff --git a/c++/include/boost/metaparse/v1/reject.hpp b/c++/boost/metaparse/v1/reject.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/reject.hpp rename to c++/boost/metaparse/v1/reject.hpp diff --git a/c++/include/boost/metaparse/v1/repeated.hpp b/c++/boost/metaparse/v1/repeated.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/repeated.hpp rename to c++/boost/metaparse/v1/repeated.hpp diff --git a/c++/include/boost/metaparse/v1/repeated1.hpp b/c++/boost/metaparse/v1/repeated1.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/repeated1.hpp rename to c++/boost/metaparse/v1/repeated1.hpp diff --git a/c++/include/boost/metaparse/v1/repeated_one_of.hpp b/c++/boost/metaparse/v1/repeated_one_of.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/repeated_one_of.hpp rename to c++/boost/metaparse/v1/repeated_one_of.hpp diff --git a/c++/include/boost/metaparse/v1/repeated_one_of1.hpp b/c++/boost/metaparse/v1/repeated_one_of1.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/repeated_one_of1.hpp rename to c++/boost/metaparse/v1/repeated_one_of1.hpp diff --git a/c++/include/boost/metaparse/v1/repeated_reject_incomplete.hpp b/c++/boost/metaparse/v1/repeated_reject_incomplete.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/repeated_reject_incomplete.hpp rename to c++/boost/metaparse/v1/repeated_reject_incomplete.hpp diff --git a/c++/include/boost/metaparse/v1/repeated_reject_incomplete1.hpp b/c++/boost/metaparse/v1/repeated_reject_incomplete1.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/repeated_reject_incomplete1.hpp rename to c++/boost/metaparse/v1/repeated_reject_incomplete1.hpp diff --git a/c++/include/boost/metaparse/v1/return_.hpp b/c++/boost/metaparse/v1/return_.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/return_.hpp rename to c++/boost/metaparse/v1/return_.hpp diff --git a/c++/include/boost/metaparse/v1/sequence.hpp b/c++/boost/metaparse/v1/sequence.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/sequence.hpp rename to c++/boost/metaparse/v1/sequence.hpp diff --git a/c++/include/boost/metaparse/v1/sequence_apply.hpp b/c++/boost/metaparse/v1/sequence_apply.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/sequence_apply.hpp rename to c++/boost/metaparse/v1/sequence_apply.hpp diff --git a/c++/include/boost/metaparse/v1/source_position.hpp b/c++/boost/metaparse/v1/source_position.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/source_position.hpp rename to c++/boost/metaparse/v1/source_position.hpp diff --git a/c++/include/boost/metaparse/v1/source_position_tag.hpp b/c++/boost/metaparse/v1/source_position_tag.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/source_position_tag.hpp rename to c++/boost/metaparse/v1/source_position_tag.hpp diff --git a/c++/include/boost/metaparse/v1/space.hpp b/c++/boost/metaparse/v1/space.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/space.hpp rename to c++/boost/metaparse/v1/space.hpp diff --git a/c++/include/boost/metaparse/v1/spaces.hpp b/c++/boost/metaparse/v1/spaces.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/spaces.hpp rename to c++/boost/metaparse/v1/spaces.hpp diff --git a/c++/include/boost/metaparse/v1/start.hpp b/c++/boost/metaparse/v1/start.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/start.hpp rename to c++/boost/metaparse/v1/start.hpp diff --git a/c++/include/boost/metaparse/v1/string.hpp b/c++/boost/metaparse/v1/string.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/string.hpp rename to c++/boost/metaparse/v1/string.hpp diff --git a/c++/include/boost/metaparse/v1/string_tag.hpp b/c++/boost/metaparse/v1/string_tag.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/string_tag.hpp rename to c++/boost/metaparse/v1/string_tag.hpp diff --git a/c++/include/boost/metaparse/v1/string_value.hpp b/c++/boost/metaparse/v1/string_value.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/string_value.hpp rename to c++/boost/metaparse/v1/string_value.hpp diff --git a/c++/include/boost/metaparse/v1/swap.hpp b/c++/boost/metaparse/v1/swap.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/swap.hpp rename to c++/boost/metaparse/v1/swap.hpp diff --git a/c++/include/boost/metaparse/v1/token.hpp b/c++/boost/metaparse/v1/token.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/token.hpp rename to c++/boost/metaparse/v1/token.hpp diff --git a/c++/include/boost/metaparse/v1/transform.hpp b/c++/boost/metaparse/v1/transform.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/transform.hpp rename to c++/boost/metaparse/v1/transform.hpp diff --git a/c++/include/boost/metaparse/v1/transform_error.hpp b/c++/boost/metaparse/v1/transform_error.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/transform_error.hpp rename to c++/boost/metaparse/v1/transform_error.hpp diff --git a/c++/include/boost/metaparse/v1/transform_error_message.hpp b/c++/boost/metaparse/v1/transform_error_message.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/transform_error_message.hpp rename to c++/boost/metaparse/v1/transform_error_message.hpp diff --git a/c++/include/boost/metaparse/v1/unless_error.hpp b/c++/boost/metaparse/v1/unless_error.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/unless_error.hpp rename to c++/boost/metaparse/v1/unless_error.hpp diff --git a/c++/include/boost/metaparse/v1/util/digit_to_int.hpp b/c++/boost/metaparse/v1/util/digit_to_int.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/util/digit_to_int.hpp rename to c++/boost/metaparse/v1/util/digit_to_int.hpp diff --git a/c++/include/boost/metaparse/v1/util/digit_to_int_c.hpp b/c++/boost/metaparse/v1/util/digit_to_int_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/util/digit_to_int_c.hpp rename to c++/boost/metaparse/v1/util/digit_to_int_c.hpp diff --git a/c++/include/boost/metaparse/v1/util/in_range.hpp b/c++/boost/metaparse/v1/util/in_range.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/util/in_range.hpp rename to c++/boost/metaparse/v1/util/in_range.hpp diff --git a/c++/include/boost/metaparse/v1/util/in_range_c.hpp b/c++/boost/metaparse/v1/util/in_range_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/util/in_range_c.hpp rename to c++/boost/metaparse/v1/util/in_range_c.hpp diff --git a/c++/include/boost/metaparse/v1/util/int_to_digit.hpp b/c++/boost/metaparse/v1/util/int_to_digit.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/util/int_to_digit.hpp rename to c++/boost/metaparse/v1/util/int_to_digit.hpp diff --git a/c++/include/boost/metaparse/v1/util/int_to_digit_c.hpp b/c++/boost/metaparse/v1/util/int_to_digit_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/util/int_to_digit_c.hpp rename to c++/boost/metaparse/v1/util/int_to_digit_c.hpp diff --git a/c++/include/boost/metaparse/v1/util/is_digit.hpp b/c++/boost/metaparse/v1/util/is_digit.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/util/is_digit.hpp rename to c++/boost/metaparse/v1/util/is_digit.hpp diff --git a/c++/include/boost/metaparse/v1/util/is_lcase_letter.hpp b/c++/boost/metaparse/v1/util/is_lcase_letter.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/util/is_lcase_letter.hpp rename to c++/boost/metaparse/v1/util/is_lcase_letter.hpp diff --git a/c++/include/boost/metaparse/v1/util/is_letter.hpp b/c++/boost/metaparse/v1/util/is_letter.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/util/is_letter.hpp rename to c++/boost/metaparse/v1/util/is_letter.hpp diff --git a/c++/include/boost/metaparse/v1/util/is_ucase_letter.hpp b/c++/boost/metaparse/v1/util/is_ucase_letter.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/util/is_ucase_letter.hpp rename to c++/boost/metaparse/v1/util/is_ucase_letter.hpp diff --git a/c++/include/boost/metaparse/v1/util/is_whitespace.hpp b/c++/boost/metaparse/v1/util/is_whitespace.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/util/is_whitespace.hpp rename to c++/boost/metaparse/v1/util/is_whitespace.hpp diff --git a/c++/include/boost/metaparse/v1/util/is_whitespace_c.hpp b/c++/boost/metaparse/v1/util/is_whitespace_c.hpp similarity index 100% rename from c++/include/boost/metaparse/v1/util/is_whitespace_c.hpp rename to c++/boost/metaparse/v1/util/is_whitespace_c.hpp diff --git a/c++/include/boost/metaparse/version.hpp b/c++/boost/metaparse/version.hpp similarity index 100% rename from c++/include/boost/metaparse/version.hpp rename to c++/boost/metaparse/version.hpp diff --git a/c++/include/boost/move/adl_move_swap.hpp b/c++/boost/move/adl_move_swap.hpp similarity index 100% rename from c++/include/boost/move/adl_move_swap.hpp rename to c++/boost/move/adl_move_swap.hpp diff --git a/c++/include/boost/move/algo/adaptive_merge.hpp b/c++/boost/move/algo/adaptive_merge.hpp similarity index 100% rename from c++/include/boost/move/algo/adaptive_merge.hpp rename to c++/boost/move/algo/adaptive_merge.hpp diff --git a/c++/include/boost/move/algo/adaptive_sort.hpp b/c++/boost/move/algo/adaptive_sort.hpp similarity index 100% rename from c++/include/boost/move/algo/adaptive_sort.hpp rename to c++/boost/move/algo/adaptive_sort.hpp diff --git a/c++/include/boost/move/algo/detail/adaptive_sort_merge.hpp b/c++/boost/move/algo/detail/adaptive_sort_merge.hpp similarity index 100% rename from c++/include/boost/move/algo/detail/adaptive_sort_merge.hpp rename to c++/boost/move/algo/detail/adaptive_sort_merge.hpp diff --git a/c++/include/boost/move/algo/detail/basic_op.hpp b/c++/boost/move/algo/detail/basic_op.hpp similarity index 100% rename from c++/include/boost/move/algo/detail/basic_op.hpp rename to c++/boost/move/algo/detail/basic_op.hpp diff --git a/c++/include/boost/move/algo/detail/heap_sort.hpp b/c++/boost/move/algo/detail/heap_sort.hpp similarity index 100% rename from c++/include/boost/move/algo/detail/heap_sort.hpp rename to c++/boost/move/algo/detail/heap_sort.hpp diff --git a/c++/include/boost/move/algo/detail/insertion_sort.hpp b/c++/boost/move/algo/detail/insertion_sort.hpp similarity index 100% rename from c++/include/boost/move/algo/detail/insertion_sort.hpp rename to c++/boost/move/algo/detail/insertion_sort.hpp diff --git a/c++/include/boost/move/algo/detail/is_sorted.hpp b/c++/boost/move/algo/detail/is_sorted.hpp similarity index 100% rename from c++/include/boost/move/algo/detail/is_sorted.hpp rename to c++/boost/move/algo/detail/is_sorted.hpp diff --git a/c++/include/boost/move/algo/detail/merge.hpp b/c++/boost/move/algo/detail/merge.hpp similarity index 100% rename from c++/include/boost/move/algo/detail/merge.hpp rename to c++/boost/move/algo/detail/merge.hpp diff --git a/c++/include/boost/move/algo/detail/merge_sort.hpp b/c++/boost/move/algo/detail/merge_sort.hpp similarity index 100% rename from c++/include/boost/move/algo/detail/merge_sort.hpp rename to c++/boost/move/algo/detail/merge_sort.hpp diff --git a/c++/include/boost/move/algo/detail/pdqsort.hpp b/c++/boost/move/algo/detail/pdqsort.hpp similarity index 100% rename from c++/include/boost/move/algo/detail/pdqsort.hpp rename to c++/boost/move/algo/detail/pdqsort.hpp diff --git a/c++/include/boost/move/algo/detail/search.hpp b/c++/boost/move/algo/detail/search.hpp similarity index 100% rename from c++/include/boost/move/algo/detail/search.hpp rename to c++/boost/move/algo/detail/search.hpp diff --git a/c++/include/boost/move/algo/detail/set_difference.hpp b/c++/boost/move/algo/detail/set_difference.hpp similarity index 100% rename from c++/include/boost/move/algo/detail/set_difference.hpp rename to c++/boost/move/algo/detail/set_difference.hpp diff --git a/c++/include/boost/move/algo/move.hpp b/c++/boost/move/algo/move.hpp similarity index 100% rename from c++/include/boost/move/algo/move.hpp rename to c++/boost/move/algo/move.hpp diff --git a/c++/include/boost/move/algo/predicate.hpp b/c++/boost/move/algo/predicate.hpp similarity index 100% rename from c++/include/boost/move/algo/predicate.hpp rename to c++/boost/move/algo/predicate.hpp diff --git a/c++/include/boost/move/algo/unique.hpp b/c++/boost/move/algo/unique.hpp similarity index 100% rename from c++/include/boost/move/algo/unique.hpp rename to c++/boost/move/algo/unique.hpp diff --git a/c++/include/boost/move/algorithm.hpp b/c++/boost/move/algorithm.hpp similarity index 100% rename from c++/include/boost/move/algorithm.hpp rename to c++/boost/move/algorithm.hpp diff --git a/c++/include/boost/move/core.hpp b/c++/boost/move/core.hpp similarity index 100% rename from c++/include/boost/move/core.hpp rename to c++/boost/move/core.hpp diff --git a/c++/include/boost/move/default_delete.hpp b/c++/boost/move/default_delete.hpp similarity index 100% rename from c++/include/boost/move/default_delete.hpp rename to c++/boost/move/default_delete.hpp diff --git a/c++/include/boost/move/detail/addressof.hpp b/c++/boost/move/detail/addressof.hpp similarity index 100% rename from c++/include/boost/move/detail/addressof.hpp rename to c++/boost/move/detail/addressof.hpp diff --git a/c++/include/boost/move/detail/config_begin.hpp b/c++/boost/move/detail/config_begin.hpp similarity index 100% rename from c++/include/boost/move/detail/config_begin.hpp rename to c++/boost/move/detail/config_begin.hpp diff --git a/c++/include/boost/move/detail/config_end.hpp b/c++/boost/move/detail/config_end.hpp similarity index 100% rename from c++/include/boost/move/detail/config_end.hpp rename to c++/boost/move/detail/config_end.hpp diff --git a/c++/include/boost/move/detail/destruct_n.hpp b/c++/boost/move/detail/destruct_n.hpp similarity index 100% rename from c++/include/boost/move/detail/destruct_n.hpp rename to c++/boost/move/detail/destruct_n.hpp diff --git a/c++/include/boost/move/detail/force_ptr.hpp b/c++/boost/move/detail/force_ptr.hpp similarity index 100% rename from c++/include/boost/move/detail/force_ptr.hpp rename to c++/boost/move/detail/force_ptr.hpp diff --git a/c++/include/boost/move/detail/fwd_macros.hpp b/c++/boost/move/detail/fwd_macros.hpp similarity index 100% rename from c++/include/boost/move/detail/fwd_macros.hpp rename to c++/boost/move/detail/fwd_macros.hpp diff --git a/c++/include/boost/move/detail/iterator_to_raw_pointer.hpp b/c++/boost/move/detail/iterator_to_raw_pointer.hpp similarity index 100% rename from c++/include/boost/move/detail/iterator_to_raw_pointer.hpp rename to c++/boost/move/detail/iterator_to_raw_pointer.hpp diff --git a/c++/include/boost/move/detail/iterator_traits.hpp b/c++/boost/move/detail/iterator_traits.hpp similarity index 100% rename from c++/include/boost/move/detail/iterator_traits.hpp rename to c++/boost/move/detail/iterator_traits.hpp diff --git a/c++/include/boost/move/detail/meta_utils.hpp b/c++/boost/move/detail/meta_utils.hpp similarity index 100% rename from c++/include/boost/move/detail/meta_utils.hpp rename to c++/boost/move/detail/meta_utils.hpp diff --git a/c++/include/boost/move/detail/meta_utils_core.hpp b/c++/boost/move/detail/meta_utils_core.hpp similarity index 100% rename from c++/include/boost/move/detail/meta_utils_core.hpp rename to c++/boost/move/detail/meta_utils_core.hpp diff --git a/c++/include/boost/move/detail/move_helpers.hpp b/c++/boost/move/detail/move_helpers.hpp similarity index 100% rename from c++/include/boost/move/detail/move_helpers.hpp rename to c++/boost/move/detail/move_helpers.hpp diff --git a/c++/include/boost/move/detail/nsec_clock.hpp b/c++/boost/move/detail/nsec_clock.hpp similarity index 100% rename from c++/include/boost/move/detail/nsec_clock.hpp rename to c++/boost/move/detail/nsec_clock.hpp diff --git a/c++/include/boost/move/detail/placement_new.hpp b/c++/boost/move/detail/placement_new.hpp similarity index 100% rename from c++/include/boost/move/detail/placement_new.hpp rename to c++/boost/move/detail/placement_new.hpp diff --git a/c++/include/boost/move/detail/pointer_element.hpp b/c++/boost/move/detail/pointer_element.hpp similarity index 100% rename from c++/include/boost/move/detail/pointer_element.hpp rename to c++/boost/move/detail/pointer_element.hpp diff --git a/c++/include/boost/move/detail/reverse_iterator.hpp b/c++/boost/move/detail/reverse_iterator.hpp similarity index 100% rename from c++/include/boost/move/detail/reverse_iterator.hpp rename to c++/boost/move/detail/reverse_iterator.hpp diff --git a/c++/include/boost/move/detail/std_ns_begin.hpp b/c++/boost/move/detail/std_ns_begin.hpp similarity index 100% rename from c++/include/boost/move/detail/std_ns_begin.hpp rename to c++/boost/move/detail/std_ns_begin.hpp diff --git a/c++/include/boost/move/detail/std_ns_end.hpp b/c++/boost/move/detail/std_ns_end.hpp similarity index 100% rename from c++/include/boost/move/detail/std_ns_end.hpp rename to c++/boost/move/detail/std_ns_end.hpp diff --git a/c++/include/boost/move/detail/to_raw_pointer.hpp b/c++/boost/move/detail/to_raw_pointer.hpp similarity index 100% rename from c++/include/boost/move/detail/to_raw_pointer.hpp rename to c++/boost/move/detail/to_raw_pointer.hpp diff --git a/c++/include/boost/move/detail/type_traits.hpp b/c++/boost/move/detail/type_traits.hpp similarity index 100% rename from c++/include/boost/move/detail/type_traits.hpp rename to c++/boost/move/detail/type_traits.hpp diff --git a/c++/include/boost/move/detail/unique_ptr_meta_utils.hpp b/c++/boost/move/detail/unique_ptr_meta_utils.hpp similarity index 100% rename from c++/include/boost/move/detail/unique_ptr_meta_utils.hpp rename to c++/boost/move/detail/unique_ptr_meta_utils.hpp diff --git a/c++/include/boost/move/detail/workaround.hpp b/c++/boost/move/detail/workaround.hpp similarity index 100% rename from c++/include/boost/move/detail/workaround.hpp rename to c++/boost/move/detail/workaround.hpp diff --git a/c++/include/boost/move/iterator.hpp b/c++/boost/move/iterator.hpp similarity index 100% rename from c++/include/boost/move/iterator.hpp rename to c++/boost/move/iterator.hpp diff --git a/c++/include/boost/move/make_unique.hpp b/c++/boost/move/make_unique.hpp similarity index 100% rename from c++/include/boost/move/make_unique.hpp rename to c++/boost/move/make_unique.hpp diff --git a/c++/include/boost/move/move.hpp b/c++/boost/move/move.hpp similarity index 100% rename from c++/include/boost/move/move.hpp rename to c++/boost/move/move.hpp diff --git a/c++/include/boost/move/traits.hpp b/c++/boost/move/traits.hpp similarity index 100% rename from c++/include/boost/move/traits.hpp rename to c++/boost/move/traits.hpp diff --git a/c++/include/boost/move/unique_ptr.hpp b/c++/boost/move/unique_ptr.hpp similarity index 100% rename from c++/include/boost/move/unique_ptr.hpp rename to c++/boost/move/unique_ptr.hpp diff --git a/c++/include/boost/move/utility.hpp b/c++/boost/move/utility.hpp similarity index 100% rename from c++/include/boost/move/utility.hpp rename to c++/boost/move/utility.hpp diff --git a/c++/include/boost/move/utility_core.hpp b/c++/boost/move/utility_core.hpp similarity index 100% rename from c++/include/boost/move/utility_core.hpp rename to c++/boost/move/utility_core.hpp diff --git a/c++/include/boost/mp11.hpp b/c++/boost/mp11.hpp similarity index 100% rename from c++/include/boost/mp11.hpp rename to c++/boost/mp11.hpp diff --git a/c++/include/boost/mp11/algorithm.hpp b/c++/boost/mp11/algorithm.hpp similarity index 100% rename from c++/include/boost/mp11/algorithm.hpp rename to c++/boost/mp11/algorithm.hpp diff --git a/c++/include/boost/mp11/bind.hpp b/c++/boost/mp11/bind.hpp similarity index 100% rename from c++/include/boost/mp11/bind.hpp rename to c++/boost/mp11/bind.hpp diff --git a/c++/include/boost/mp11/detail/config.hpp b/c++/boost/mp11/detail/config.hpp similarity index 100% rename from c++/include/boost/mp11/detail/config.hpp rename to c++/boost/mp11/detail/config.hpp diff --git a/c++/include/boost/mp11/detail/mp_append.hpp b/c++/boost/mp11/detail/mp_append.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mp_append.hpp rename to c++/boost/mp11/detail/mp_append.hpp diff --git a/c++/include/boost/mp11/detail/mp_copy_if.hpp b/c++/boost/mp11/detail/mp_copy_if.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mp_copy_if.hpp rename to c++/boost/mp11/detail/mp_copy_if.hpp diff --git a/c++/include/boost/mp11/detail/mp_count.hpp b/c++/boost/mp11/detail/mp_count.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mp_count.hpp rename to c++/boost/mp11/detail/mp_count.hpp diff --git a/c++/include/boost/mp11/detail/mp_fold.hpp b/c++/boost/mp11/detail/mp_fold.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mp_fold.hpp rename to c++/boost/mp11/detail/mp_fold.hpp diff --git a/c++/include/boost/mp11/detail/mp_front.hpp b/c++/boost/mp11/detail/mp_front.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mp_front.hpp rename to c++/boost/mp11/detail/mp_front.hpp diff --git a/c++/include/boost/mp11/detail/mp_is_list.hpp b/c++/boost/mp11/detail/mp_is_list.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mp_is_list.hpp rename to c++/boost/mp11/detail/mp_is_list.hpp diff --git a/c++/include/boost/mp11/detail/mp_list.hpp b/c++/boost/mp11/detail/mp_list.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mp_list.hpp rename to c++/boost/mp11/detail/mp_list.hpp diff --git a/c++/include/boost/mp11/detail/mp_map_find.hpp b/c++/boost/mp11/detail/mp_map_find.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mp_map_find.hpp rename to c++/boost/mp11/detail/mp_map_find.hpp diff --git a/c++/include/boost/mp11/detail/mp_min_element.hpp b/c++/boost/mp11/detail/mp_min_element.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mp_min_element.hpp rename to c++/boost/mp11/detail/mp_min_element.hpp diff --git a/c++/include/boost/mp11/detail/mp_plus.hpp b/c++/boost/mp11/detail/mp_plus.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mp_plus.hpp rename to c++/boost/mp11/detail/mp_plus.hpp diff --git a/c++/include/boost/mp11/detail/mp_remove_if.hpp b/c++/boost/mp11/detail/mp_remove_if.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mp_remove_if.hpp rename to c++/boost/mp11/detail/mp_remove_if.hpp diff --git a/c++/include/boost/mp11/detail/mp_rename.hpp b/c++/boost/mp11/detail/mp_rename.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mp_rename.hpp rename to c++/boost/mp11/detail/mp_rename.hpp diff --git a/c++/include/boost/mp11/detail/mp_void.hpp b/c++/boost/mp11/detail/mp_void.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mp_void.hpp rename to c++/boost/mp11/detail/mp_void.hpp diff --git a/c++/include/boost/mp11/detail/mp_with_index.hpp b/c++/boost/mp11/detail/mp_with_index.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mp_with_index.hpp rename to c++/boost/mp11/detail/mp_with_index.hpp diff --git a/c++/include/boost/mp11/detail/mpl_common.hpp b/c++/boost/mp11/detail/mpl_common.hpp similarity index 100% rename from c++/include/boost/mp11/detail/mpl_common.hpp rename to c++/boost/mp11/detail/mpl_common.hpp diff --git a/c++/include/boost/mp11/function.hpp b/c++/boost/mp11/function.hpp similarity index 100% rename from c++/include/boost/mp11/function.hpp rename to c++/boost/mp11/function.hpp diff --git a/c++/include/boost/mp11/integer_sequence.hpp b/c++/boost/mp11/integer_sequence.hpp similarity index 100% rename from c++/include/boost/mp11/integer_sequence.hpp rename to c++/boost/mp11/integer_sequence.hpp diff --git a/c++/include/boost/mp11/integral.hpp b/c++/boost/mp11/integral.hpp similarity index 100% rename from c++/include/boost/mp11/integral.hpp rename to c++/boost/mp11/integral.hpp diff --git a/c++/include/boost/mp11/list.hpp b/c++/boost/mp11/list.hpp similarity index 100% rename from c++/include/boost/mp11/list.hpp rename to c++/boost/mp11/list.hpp diff --git a/c++/include/boost/mp11/map.hpp b/c++/boost/mp11/map.hpp similarity index 100% rename from c++/include/boost/mp11/map.hpp rename to c++/boost/mp11/map.hpp diff --git a/c++/include/boost/mp11/mpl.hpp b/c++/boost/mp11/mpl.hpp similarity index 100% rename from c++/include/boost/mp11/mpl.hpp rename to c++/boost/mp11/mpl.hpp diff --git a/c++/include/boost/mp11/mpl_list.hpp b/c++/boost/mp11/mpl_list.hpp similarity index 100% rename from c++/include/boost/mp11/mpl_list.hpp rename to c++/boost/mp11/mpl_list.hpp diff --git a/c++/include/boost/mp11/mpl_tuple.hpp b/c++/boost/mp11/mpl_tuple.hpp similarity index 100% rename from c++/include/boost/mp11/mpl_tuple.hpp rename to c++/boost/mp11/mpl_tuple.hpp diff --git a/c++/include/boost/mp11/set.hpp b/c++/boost/mp11/set.hpp similarity index 100% rename from c++/include/boost/mp11/set.hpp rename to c++/boost/mp11/set.hpp diff --git a/c++/include/boost/mp11/tuple.hpp b/c++/boost/mp11/tuple.hpp similarity index 100% rename from c++/include/boost/mp11/tuple.hpp rename to c++/boost/mp11/tuple.hpp diff --git a/c++/include/boost/mp11/utility.hpp b/c++/boost/mp11/utility.hpp similarity index 100% rename from c++/include/boost/mp11/utility.hpp rename to c++/boost/mp11/utility.hpp diff --git a/c++/include/boost/mp11/version.hpp b/c++/boost/mp11/version.hpp similarity index 100% rename from c++/include/boost/mp11/version.hpp rename to c++/boost/mp11/version.hpp diff --git a/c++/include/boost/mpi.hpp b/c++/boost/mpi.hpp similarity index 100% rename from c++/include/boost/mpi.hpp rename to c++/boost/mpi.hpp diff --git a/c++/include/boost/mpl/O1_size.hpp b/c++/boost/mpl/O1_size.hpp similarity index 100% rename from c++/include/boost/mpl/O1_size.hpp rename to c++/boost/mpl/O1_size.hpp diff --git a/c++/include/boost/mpl/O1_size_fwd.hpp b/c++/boost/mpl/O1_size_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/O1_size_fwd.hpp rename to c++/boost/mpl/O1_size_fwd.hpp diff --git a/c++/include/boost/mpl/accumulate.hpp b/c++/boost/mpl/accumulate.hpp similarity index 100% rename from c++/include/boost/mpl/accumulate.hpp rename to c++/boost/mpl/accumulate.hpp diff --git a/c++/include/boost/mpl/advance.hpp b/c++/boost/mpl/advance.hpp similarity index 100% rename from c++/include/boost/mpl/advance.hpp rename to c++/boost/mpl/advance.hpp diff --git a/c++/include/boost/mpl/advance_fwd.hpp b/c++/boost/mpl/advance_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/advance_fwd.hpp rename to c++/boost/mpl/advance_fwd.hpp diff --git a/c++/include/boost/mpl/alias.hpp b/c++/boost/mpl/alias.hpp similarity index 100% rename from c++/include/boost/mpl/alias.hpp rename to c++/boost/mpl/alias.hpp diff --git a/c++/include/boost/mpl/always.hpp b/c++/boost/mpl/always.hpp similarity index 100% rename from c++/include/boost/mpl/always.hpp rename to c++/boost/mpl/always.hpp diff --git a/c++/include/boost/mpl/and.hpp b/c++/boost/mpl/and.hpp similarity index 100% rename from c++/include/boost/mpl/and.hpp rename to c++/boost/mpl/and.hpp diff --git a/c++/include/boost/mpl/apply.hpp b/c++/boost/mpl/apply.hpp similarity index 100% rename from c++/include/boost/mpl/apply.hpp rename to c++/boost/mpl/apply.hpp diff --git a/c++/include/boost/mpl/apply_fwd.hpp b/c++/boost/mpl/apply_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/apply_fwd.hpp rename to c++/boost/mpl/apply_fwd.hpp diff --git a/c++/include/boost/mpl/apply_wrap.hpp b/c++/boost/mpl/apply_wrap.hpp similarity index 100% rename from c++/include/boost/mpl/apply_wrap.hpp rename to c++/boost/mpl/apply_wrap.hpp diff --git a/c++/include/boost/mpl/arg.hpp b/c++/boost/mpl/arg.hpp similarity index 100% rename from c++/include/boost/mpl/arg.hpp rename to c++/boost/mpl/arg.hpp diff --git a/c++/include/boost/mpl/arg_fwd.hpp b/c++/boost/mpl/arg_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/arg_fwd.hpp rename to c++/boost/mpl/arg_fwd.hpp diff --git a/c++/include/boost/mpl/arithmetic.hpp b/c++/boost/mpl/arithmetic.hpp similarity index 100% rename from c++/include/boost/mpl/arithmetic.hpp rename to c++/boost/mpl/arithmetic.hpp diff --git a/c++/include/boost/mpl/as_sequence.hpp b/c++/boost/mpl/as_sequence.hpp similarity index 100% rename from c++/include/boost/mpl/as_sequence.hpp rename to c++/boost/mpl/as_sequence.hpp diff --git a/c++/include/boost/mpl/assert.hpp b/c++/boost/mpl/assert.hpp similarity index 100% rename from c++/include/boost/mpl/assert.hpp rename to c++/boost/mpl/assert.hpp diff --git a/c++/include/boost/mpl/at.hpp b/c++/boost/mpl/at.hpp similarity index 100% rename from c++/include/boost/mpl/at.hpp rename to c++/boost/mpl/at.hpp diff --git a/c++/include/boost/mpl/at_fwd.hpp b/c++/boost/mpl/at_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/at_fwd.hpp rename to c++/boost/mpl/at_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/O1_size_impl.hpp b/c++/boost/mpl/aux_/O1_size_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/O1_size_impl.hpp rename to c++/boost/mpl/aux_/O1_size_impl.hpp diff --git a/c++/include/boost/mpl/aux_/adl_barrier.hpp b/c++/boost/mpl/aux_/adl_barrier.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/adl_barrier.hpp rename to c++/boost/mpl/aux_/adl_barrier.hpp diff --git a/c++/include/boost/mpl/aux_/advance_backward.hpp b/c++/boost/mpl/aux_/advance_backward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/advance_backward.hpp rename to c++/boost/mpl/aux_/advance_backward.hpp diff --git a/c++/include/boost/mpl/aux_/advance_forward.hpp b/c++/boost/mpl/aux_/advance_forward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/advance_forward.hpp rename to c++/boost/mpl/aux_/advance_forward.hpp diff --git a/c++/include/boost/mpl/aux_/apply_1st.hpp b/c++/boost/mpl/aux_/apply_1st.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/apply_1st.hpp rename to c++/boost/mpl/aux_/apply_1st.hpp diff --git a/c++/include/boost/mpl/aux_/arg_typedef.hpp b/c++/boost/mpl/aux_/arg_typedef.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/arg_typedef.hpp rename to c++/boost/mpl/aux_/arg_typedef.hpp diff --git a/c++/include/boost/mpl/aux_/arithmetic_op.hpp b/c++/boost/mpl/aux_/arithmetic_op.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/arithmetic_op.hpp rename to c++/boost/mpl/aux_/arithmetic_op.hpp diff --git a/c++/include/boost/mpl/aux_/arity.hpp b/c++/boost/mpl/aux_/arity.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/arity.hpp rename to c++/boost/mpl/aux_/arity.hpp diff --git a/c++/include/boost/mpl/aux_/arity_spec.hpp b/c++/boost/mpl/aux_/arity_spec.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/arity_spec.hpp rename to c++/boost/mpl/aux_/arity_spec.hpp diff --git a/c++/include/boost/mpl/aux_/at_impl.hpp b/c++/boost/mpl/aux_/at_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/at_impl.hpp rename to c++/boost/mpl/aux_/at_impl.hpp diff --git a/c++/include/boost/mpl/aux_/back_impl.hpp b/c++/boost/mpl/aux_/back_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/back_impl.hpp rename to c++/boost/mpl/aux_/back_impl.hpp diff --git a/c++/include/boost/mpl/aux_/basic_bind.hpp b/c++/boost/mpl/aux_/basic_bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/basic_bind.hpp rename to c++/boost/mpl/aux_/basic_bind.hpp diff --git a/c++/include/boost/mpl/aux_/begin_end_impl.hpp b/c++/boost/mpl/aux_/begin_end_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/begin_end_impl.hpp rename to c++/boost/mpl/aux_/begin_end_impl.hpp diff --git a/c++/include/boost/mpl/aux_/clear_impl.hpp b/c++/boost/mpl/aux_/clear_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/clear_impl.hpp rename to c++/boost/mpl/aux_/clear_impl.hpp diff --git a/c++/include/boost/mpl/aux_/common_name_wknd.hpp b/c++/boost/mpl/aux_/common_name_wknd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/common_name_wknd.hpp rename to c++/boost/mpl/aux_/common_name_wknd.hpp diff --git a/c++/include/boost/mpl/aux_/comparison_op.hpp b/c++/boost/mpl/aux_/comparison_op.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/comparison_op.hpp rename to c++/boost/mpl/aux_/comparison_op.hpp diff --git a/c++/include/boost/mpl/aux_/config/adl.hpp b/c++/boost/mpl/aux_/config/adl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/adl.hpp rename to c++/boost/mpl/aux_/config/adl.hpp diff --git a/c++/include/boost/mpl/aux_/config/arrays.hpp b/c++/boost/mpl/aux_/config/arrays.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/arrays.hpp rename to c++/boost/mpl/aux_/config/arrays.hpp diff --git a/c++/include/boost/mpl/aux_/config/bcc.hpp b/c++/boost/mpl/aux_/config/bcc.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/bcc.hpp rename to c++/boost/mpl/aux_/config/bcc.hpp diff --git a/c++/include/boost/mpl/aux_/config/bind.hpp b/c++/boost/mpl/aux_/config/bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/bind.hpp rename to c++/boost/mpl/aux_/config/bind.hpp diff --git a/c++/include/boost/mpl/aux_/config/compiler.hpp b/c++/boost/mpl/aux_/config/compiler.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/compiler.hpp rename to c++/boost/mpl/aux_/config/compiler.hpp diff --git a/c++/include/boost/mpl/aux_/config/ctps.hpp b/c++/boost/mpl/aux_/config/ctps.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/ctps.hpp rename to c++/boost/mpl/aux_/config/ctps.hpp diff --git a/c++/include/boost/mpl/aux_/config/dependent_nttp.hpp b/c++/boost/mpl/aux_/config/dependent_nttp.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/dependent_nttp.hpp rename to c++/boost/mpl/aux_/config/dependent_nttp.hpp diff --git a/c++/include/boost/mpl/aux_/config/dmc_ambiguous_ctps.hpp b/c++/boost/mpl/aux_/config/dmc_ambiguous_ctps.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/dmc_ambiguous_ctps.hpp rename to c++/boost/mpl/aux_/config/dmc_ambiguous_ctps.hpp diff --git a/c++/include/boost/mpl/aux_/config/dtp.hpp b/c++/boost/mpl/aux_/config/dtp.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/dtp.hpp rename to c++/boost/mpl/aux_/config/dtp.hpp diff --git a/c++/include/boost/mpl/aux_/config/eti.hpp b/c++/boost/mpl/aux_/config/eti.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/eti.hpp rename to c++/boost/mpl/aux_/config/eti.hpp diff --git a/c++/include/boost/mpl/aux_/config/forwarding.hpp b/c++/boost/mpl/aux_/config/forwarding.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/forwarding.hpp rename to c++/boost/mpl/aux_/config/forwarding.hpp diff --git a/c++/include/boost/mpl/aux_/config/gcc.hpp b/c++/boost/mpl/aux_/config/gcc.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/gcc.hpp rename to c++/boost/mpl/aux_/config/gcc.hpp diff --git a/c++/include/boost/mpl/aux_/config/gpu.hpp b/c++/boost/mpl/aux_/config/gpu.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/gpu.hpp rename to c++/boost/mpl/aux_/config/gpu.hpp diff --git a/c++/include/boost/mpl/aux_/config/has_apply.hpp b/c++/boost/mpl/aux_/config/has_apply.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/has_apply.hpp rename to c++/boost/mpl/aux_/config/has_apply.hpp diff --git a/c++/include/boost/mpl/aux_/config/has_xxx.hpp b/c++/boost/mpl/aux_/config/has_xxx.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/has_xxx.hpp rename to c++/boost/mpl/aux_/config/has_xxx.hpp diff --git a/c++/include/boost/mpl/aux_/config/integral.hpp b/c++/boost/mpl/aux_/config/integral.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/integral.hpp rename to c++/boost/mpl/aux_/config/integral.hpp diff --git a/c++/include/boost/mpl/aux_/config/intel.hpp b/c++/boost/mpl/aux_/config/intel.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/intel.hpp rename to c++/boost/mpl/aux_/config/intel.hpp diff --git a/c++/include/boost/mpl/aux_/config/lambda.hpp b/c++/boost/mpl/aux_/config/lambda.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/lambda.hpp rename to c++/boost/mpl/aux_/config/lambda.hpp diff --git a/c++/include/boost/mpl/aux_/config/msvc.hpp b/c++/boost/mpl/aux_/config/msvc.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/msvc.hpp rename to c++/boost/mpl/aux_/config/msvc.hpp diff --git a/c++/include/boost/mpl/aux_/config/msvc_typename.hpp b/c++/boost/mpl/aux_/config/msvc_typename.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/msvc_typename.hpp rename to c++/boost/mpl/aux_/config/msvc_typename.hpp diff --git a/c++/include/boost/mpl/aux_/config/nttp.hpp b/c++/boost/mpl/aux_/config/nttp.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/nttp.hpp rename to c++/boost/mpl/aux_/config/nttp.hpp diff --git a/c++/include/boost/mpl/aux_/config/operators.hpp b/c++/boost/mpl/aux_/config/operators.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/operators.hpp rename to c++/boost/mpl/aux_/config/operators.hpp diff --git a/c++/include/boost/mpl/aux_/config/overload_resolution.hpp b/c++/boost/mpl/aux_/config/overload_resolution.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/overload_resolution.hpp rename to c++/boost/mpl/aux_/config/overload_resolution.hpp diff --git a/c++/include/boost/mpl/aux_/config/pp_counter.hpp b/c++/boost/mpl/aux_/config/pp_counter.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/pp_counter.hpp rename to c++/boost/mpl/aux_/config/pp_counter.hpp diff --git a/c++/include/boost/mpl/aux_/config/preprocessor.hpp b/c++/boost/mpl/aux_/config/preprocessor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/preprocessor.hpp rename to c++/boost/mpl/aux_/config/preprocessor.hpp diff --git a/c++/include/boost/mpl/aux_/config/static_constant.hpp b/c++/boost/mpl/aux_/config/static_constant.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/static_constant.hpp rename to c++/boost/mpl/aux_/config/static_constant.hpp diff --git a/c++/include/boost/mpl/aux_/config/ttp.hpp b/c++/boost/mpl/aux_/config/ttp.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/ttp.hpp rename to c++/boost/mpl/aux_/config/ttp.hpp diff --git a/c++/include/boost/mpl/aux_/config/typeof.hpp b/c++/boost/mpl/aux_/config/typeof.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/typeof.hpp rename to c++/boost/mpl/aux_/config/typeof.hpp diff --git a/c++/include/boost/mpl/aux_/config/use_preprocessed.hpp b/c++/boost/mpl/aux_/config/use_preprocessed.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/use_preprocessed.hpp rename to c++/boost/mpl/aux_/config/use_preprocessed.hpp diff --git a/c++/include/boost/mpl/aux_/config/workaround.hpp b/c++/boost/mpl/aux_/config/workaround.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/config/workaround.hpp rename to c++/boost/mpl/aux_/config/workaround.hpp diff --git a/c++/include/boost/mpl/aux_/contains_impl.hpp b/c++/boost/mpl/aux_/contains_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/contains_impl.hpp rename to c++/boost/mpl/aux_/contains_impl.hpp diff --git a/c++/include/boost/mpl/aux_/count_args.hpp b/c++/boost/mpl/aux_/count_args.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/count_args.hpp rename to c++/boost/mpl/aux_/count_args.hpp diff --git a/c++/include/boost/mpl/aux_/count_impl.hpp b/c++/boost/mpl/aux_/count_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/count_impl.hpp rename to c++/boost/mpl/aux_/count_impl.hpp diff --git a/c++/include/boost/mpl/aux_/empty_impl.hpp b/c++/boost/mpl/aux_/empty_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/empty_impl.hpp rename to c++/boost/mpl/aux_/empty_impl.hpp diff --git a/c++/include/boost/mpl/aux_/erase_impl.hpp b/c++/boost/mpl/aux_/erase_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/erase_impl.hpp rename to c++/boost/mpl/aux_/erase_impl.hpp diff --git a/c++/include/boost/mpl/aux_/erase_key_impl.hpp b/c++/boost/mpl/aux_/erase_key_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/erase_key_impl.hpp rename to c++/boost/mpl/aux_/erase_key_impl.hpp diff --git a/c++/include/boost/mpl/aux_/filter_iter.hpp b/c++/boost/mpl/aux_/filter_iter.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/filter_iter.hpp rename to c++/boost/mpl/aux_/filter_iter.hpp diff --git a/c++/include/boost/mpl/aux_/find_if_pred.hpp b/c++/boost/mpl/aux_/find_if_pred.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/find_if_pred.hpp rename to c++/boost/mpl/aux_/find_if_pred.hpp diff --git a/c++/include/boost/mpl/aux_/fold_impl.hpp b/c++/boost/mpl/aux_/fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/fold_impl.hpp rename to c++/boost/mpl/aux_/fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/fold_impl_body.hpp b/c++/boost/mpl/aux_/fold_impl_body.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/fold_impl_body.hpp rename to c++/boost/mpl/aux_/fold_impl_body.hpp diff --git a/c++/include/boost/mpl/aux_/fold_op.hpp b/c++/boost/mpl/aux_/fold_op.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/fold_op.hpp rename to c++/boost/mpl/aux_/fold_op.hpp diff --git a/c++/include/boost/mpl/aux_/fold_pred.hpp b/c++/boost/mpl/aux_/fold_pred.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/fold_pred.hpp rename to c++/boost/mpl/aux_/fold_pred.hpp diff --git a/c++/include/boost/mpl/aux_/front_impl.hpp b/c++/boost/mpl/aux_/front_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/front_impl.hpp rename to c++/boost/mpl/aux_/front_impl.hpp diff --git a/c++/include/boost/mpl/aux_/full_lambda.hpp b/c++/boost/mpl/aux_/full_lambda.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/full_lambda.hpp rename to c++/boost/mpl/aux_/full_lambda.hpp diff --git a/c++/include/boost/mpl/aux_/has_apply.hpp b/c++/boost/mpl/aux_/has_apply.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/has_apply.hpp rename to c++/boost/mpl/aux_/has_apply.hpp diff --git a/c++/include/boost/mpl/aux_/has_begin.hpp b/c++/boost/mpl/aux_/has_begin.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/has_begin.hpp rename to c++/boost/mpl/aux_/has_begin.hpp diff --git a/c++/include/boost/mpl/aux_/has_key_impl.hpp b/c++/boost/mpl/aux_/has_key_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/has_key_impl.hpp rename to c++/boost/mpl/aux_/has_key_impl.hpp diff --git a/c++/include/boost/mpl/aux_/has_rebind.hpp b/c++/boost/mpl/aux_/has_rebind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/has_rebind.hpp rename to c++/boost/mpl/aux_/has_rebind.hpp diff --git a/c++/include/boost/mpl/aux_/has_size.hpp b/c++/boost/mpl/aux_/has_size.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/has_size.hpp rename to c++/boost/mpl/aux_/has_size.hpp diff --git a/c++/include/boost/mpl/aux_/has_tag.hpp b/c++/boost/mpl/aux_/has_tag.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/has_tag.hpp rename to c++/boost/mpl/aux_/has_tag.hpp diff --git a/c++/include/boost/mpl/aux_/has_type.hpp b/c++/boost/mpl/aux_/has_type.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/has_type.hpp rename to c++/boost/mpl/aux_/has_type.hpp diff --git a/c++/include/boost/mpl/aux_/include_preprocessed.hpp b/c++/boost/mpl/aux_/include_preprocessed.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/include_preprocessed.hpp rename to c++/boost/mpl/aux_/include_preprocessed.hpp diff --git a/c++/include/boost/mpl/aux_/insert_impl.hpp b/c++/boost/mpl/aux_/insert_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/insert_impl.hpp rename to c++/boost/mpl/aux_/insert_impl.hpp diff --git a/c++/include/boost/mpl/aux_/insert_range_impl.hpp b/c++/boost/mpl/aux_/insert_range_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/insert_range_impl.hpp rename to c++/boost/mpl/aux_/insert_range_impl.hpp diff --git a/c++/include/boost/mpl/aux_/inserter_algorithm.hpp b/c++/boost/mpl/aux_/inserter_algorithm.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/inserter_algorithm.hpp rename to c++/boost/mpl/aux_/inserter_algorithm.hpp diff --git a/c++/include/boost/mpl/aux_/integral_wrapper.hpp b/c++/boost/mpl/aux_/integral_wrapper.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/integral_wrapper.hpp rename to c++/boost/mpl/aux_/integral_wrapper.hpp diff --git a/c++/include/boost/mpl/aux_/is_msvc_eti_arg.hpp b/c++/boost/mpl/aux_/is_msvc_eti_arg.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/is_msvc_eti_arg.hpp rename to c++/boost/mpl/aux_/is_msvc_eti_arg.hpp diff --git a/c++/include/boost/mpl/aux_/iter_apply.hpp b/c++/boost/mpl/aux_/iter_apply.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/iter_apply.hpp rename to c++/boost/mpl/aux_/iter_apply.hpp diff --git a/c++/include/boost/mpl/aux_/iter_fold_if_impl.hpp b/c++/boost/mpl/aux_/iter_fold_if_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/iter_fold_if_impl.hpp rename to c++/boost/mpl/aux_/iter_fold_if_impl.hpp diff --git a/c++/include/boost/mpl/aux_/iter_fold_impl.hpp b/c++/boost/mpl/aux_/iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/iter_fold_impl.hpp rename to c++/boost/mpl/aux_/iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/iter_push_front.hpp b/c++/boost/mpl/aux_/iter_push_front.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/iter_push_front.hpp rename to c++/boost/mpl/aux_/iter_push_front.hpp diff --git a/c++/include/boost/mpl/aux_/joint_iter.hpp b/c++/boost/mpl/aux_/joint_iter.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/joint_iter.hpp rename to c++/boost/mpl/aux_/joint_iter.hpp diff --git a/c++/include/boost/mpl/aux_/lambda_arity_param.hpp b/c++/boost/mpl/aux_/lambda_arity_param.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/lambda_arity_param.hpp rename to c++/boost/mpl/aux_/lambda_arity_param.hpp diff --git a/c++/include/boost/mpl/aux_/lambda_no_ctps.hpp b/c++/boost/mpl/aux_/lambda_no_ctps.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/lambda_no_ctps.hpp rename to c++/boost/mpl/aux_/lambda_no_ctps.hpp diff --git a/c++/include/boost/mpl/aux_/lambda_spec.hpp b/c++/boost/mpl/aux_/lambda_spec.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/lambda_spec.hpp rename to c++/boost/mpl/aux_/lambda_spec.hpp diff --git a/c++/include/boost/mpl/aux_/lambda_support.hpp b/c++/boost/mpl/aux_/lambda_support.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/lambda_support.hpp rename to c++/boost/mpl/aux_/lambda_support.hpp diff --git a/c++/include/boost/mpl/aux_/largest_int.hpp b/c++/boost/mpl/aux_/largest_int.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/largest_int.hpp rename to c++/boost/mpl/aux_/largest_int.hpp diff --git a/c++/include/boost/mpl/aux_/logical_op.hpp b/c++/boost/mpl/aux_/logical_op.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/logical_op.hpp rename to c++/boost/mpl/aux_/logical_op.hpp diff --git a/c++/include/boost/mpl/aux_/msvc_dtw.hpp b/c++/boost/mpl/aux_/msvc_dtw.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/msvc_dtw.hpp rename to c++/boost/mpl/aux_/msvc_dtw.hpp diff --git a/c++/include/boost/mpl/aux_/msvc_eti_base.hpp b/c++/boost/mpl/aux_/msvc_eti_base.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/msvc_eti_base.hpp rename to c++/boost/mpl/aux_/msvc_eti_base.hpp diff --git a/c++/include/boost/mpl/aux_/msvc_is_class.hpp b/c++/boost/mpl/aux_/msvc_is_class.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/msvc_is_class.hpp rename to c++/boost/mpl/aux_/msvc_is_class.hpp diff --git a/c++/include/boost/mpl/aux_/msvc_never_true.hpp b/c++/boost/mpl/aux_/msvc_never_true.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/msvc_never_true.hpp rename to c++/boost/mpl/aux_/msvc_never_true.hpp diff --git a/c++/include/boost/mpl/aux_/msvc_type.hpp b/c++/boost/mpl/aux_/msvc_type.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/msvc_type.hpp rename to c++/boost/mpl/aux_/msvc_type.hpp diff --git a/c++/include/boost/mpl/aux_/na.hpp b/c++/boost/mpl/aux_/na.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/na.hpp rename to c++/boost/mpl/aux_/na.hpp diff --git a/c++/include/boost/mpl/aux_/na_assert.hpp b/c++/boost/mpl/aux_/na_assert.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/na_assert.hpp rename to c++/boost/mpl/aux_/na_assert.hpp diff --git a/c++/include/boost/mpl/aux_/na_fwd.hpp b/c++/boost/mpl/aux_/na_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/na_fwd.hpp rename to c++/boost/mpl/aux_/na_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/na_spec.hpp b/c++/boost/mpl/aux_/na_spec.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/na_spec.hpp rename to c++/boost/mpl/aux_/na_spec.hpp diff --git a/c++/include/boost/mpl/aux_/nested_type_wknd.hpp b/c++/boost/mpl/aux_/nested_type_wknd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/nested_type_wknd.hpp rename to c++/boost/mpl/aux_/nested_type_wknd.hpp diff --git a/c++/include/boost/mpl/aux_/nttp_decl.hpp b/c++/boost/mpl/aux_/nttp_decl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/nttp_decl.hpp rename to c++/boost/mpl/aux_/nttp_decl.hpp diff --git a/c++/include/boost/mpl/aux_/numeric_cast_utils.hpp b/c++/boost/mpl/aux_/numeric_cast_utils.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/numeric_cast_utils.hpp rename to c++/boost/mpl/aux_/numeric_cast_utils.hpp diff --git a/c++/include/boost/mpl/aux_/numeric_op.hpp b/c++/boost/mpl/aux_/numeric_op.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/numeric_op.hpp rename to c++/boost/mpl/aux_/numeric_op.hpp diff --git a/c++/include/boost/mpl/aux_/order_impl.hpp b/c++/boost/mpl/aux_/order_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/order_impl.hpp rename to c++/boost/mpl/aux_/order_impl.hpp diff --git a/c++/include/boost/mpl/aux_/overload_names.hpp b/c++/boost/mpl/aux_/overload_names.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/overload_names.hpp rename to c++/boost/mpl/aux_/overload_names.hpp diff --git a/c++/include/boost/mpl/aux_/partition_op.hpp b/c++/boost/mpl/aux_/partition_op.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/partition_op.hpp rename to c++/boost/mpl/aux_/partition_op.hpp diff --git a/c++/include/boost/mpl/aux_/pop_back_impl.hpp b/c++/boost/mpl/aux_/pop_back_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/pop_back_impl.hpp rename to c++/boost/mpl/aux_/pop_back_impl.hpp diff --git a/c++/include/boost/mpl/aux_/pop_front_impl.hpp b/c++/boost/mpl/aux_/pop_front_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/pop_front_impl.hpp rename to c++/boost/mpl/aux_/pop_front_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/advance_backward.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/advance_backward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/advance_backward.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/advance_backward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/advance_forward.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/advance_forward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/advance_forward.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/advance_forward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/and.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/and.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/and.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/and.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/apply.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/apply.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/apply.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/apply.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/apply_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/apply_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/apply_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/apply_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/apply_wrap.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/apply_wrap.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/apply_wrap.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/apply_wrap.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/arg.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/arg.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/arg.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/arg.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/basic_bind.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/basic_bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/basic_bind.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/basic_bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/bind.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/bind.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/bind_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/bind_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/bind_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/bind_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/bitand.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/bitand.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/bitand.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/bitand.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/bitor.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/bitor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/bitor.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/bitor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/bitxor.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/bitxor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/bitxor.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/bitxor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/deque.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/deque.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/deque.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/deque.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/divides.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/divides.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/divides.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/divides.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/full_lambda.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/full_lambda.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/full_lambda.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/full_lambda.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/greater.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/greater.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/greater.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/greater.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/greater_equal.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/greater_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/greater_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/greater_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/inherit.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/inherit.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/inherit.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/inherit.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/iter_fold_if_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/iter_fold_if_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/iter_fold_if_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/iter_fold_if_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/lambda_no_ctps.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/lambda_no_ctps.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/lambda_no_ctps.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/lambda_no_ctps.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/less.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/less.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/less.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/less.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/less_equal.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/less_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/less_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/less_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/list.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/list.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/list.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/list.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/list_c.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/list_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/list_c.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/list_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/map.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/map.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/map.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/map.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/minus.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/minus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/minus.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/minus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/modulus.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/modulus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/modulus.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/modulus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/not_equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/not_equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/not_equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/not_equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/or.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/or.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/or.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/or.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/placeholders.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/placeholders.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/placeholders.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/placeholders.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/plus.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/plus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/plus.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/plus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/quote.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/quote.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/quote.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/quote.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/reverse_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/reverse_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/reverse_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/reverse_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/reverse_iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/reverse_iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/reverse_iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/reverse_iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/set.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/set.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/set.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/set.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/set_c.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/set_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/set_c.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/set_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/shift_left.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/shift_left.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/shift_left.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/shift_left.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/shift_right.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/shift_right.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/shift_right.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/shift_right.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/template_arity.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/template_arity.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/template_arity.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/template_arity.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/times.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/times.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/times.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/times.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/unpack_args.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/unpack_args.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/unpack_args.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/unpack_args.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/vector.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/vector.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/vector.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/vector.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc/vector_c.hpp b/c++/boost/mpl/aux_/preprocessed/bcc/vector_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc/vector_c.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc/vector_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/advance_backward.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/advance_backward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/advance_backward.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/advance_backward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/advance_forward.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/advance_forward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/advance_forward.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/advance_forward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/and.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/and.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/and.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/and.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/apply.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/apply.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/apply.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/apply.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/apply_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/apply_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/apply_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/apply_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/apply_wrap.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/apply_wrap.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/apply_wrap.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/apply_wrap.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/arg.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/arg.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/arg.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/arg.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/basic_bind.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/basic_bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/basic_bind.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/basic_bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/bind.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/bind.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/bind_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/bind_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/bind_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/bind_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/bitand.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/bitand.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/bitand.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/bitand.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/bitor.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/bitor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/bitor.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/bitor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/bitxor.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/bitxor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/bitxor.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/bitxor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/deque.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/deque.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/deque.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/deque.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/divides.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/divides.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/divides.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/divides.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/full_lambda.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/full_lambda.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/full_lambda.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/full_lambda.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/greater.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/greater.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/greater.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/greater.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/greater_equal.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/greater_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/greater_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/greater_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/inherit.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/inherit.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/inherit.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/inherit.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/iter_fold_if_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/iter_fold_if_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/iter_fold_if_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/iter_fold_if_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/lambda_no_ctps.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/lambda_no_ctps.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/lambda_no_ctps.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/lambda_no_ctps.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/less.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/less.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/less.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/less.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/less_equal.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/less_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/less_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/less_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/list.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/list.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/list.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/list.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/list_c.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/list_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/list_c.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/list_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/map.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/map.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/map.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/map.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/minus.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/minus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/minus.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/minus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/modulus.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/modulus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/modulus.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/modulus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/not_equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/not_equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/not_equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/not_equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/or.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/or.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/or.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/or.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/placeholders.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/placeholders.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/placeholders.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/placeholders.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/plus.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/plus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/plus.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/plus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/quote.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/quote.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/quote.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/quote.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/reverse_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/reverse_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/reverse_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/reverse_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/reverse_iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/reverse_iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/reverse_iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/reverse_iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/set.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/set.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/set.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/set.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/set_c.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/set_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/set_c.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/set_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/shift_left.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/shift_left.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/shift_left.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/shift_left.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/shift_right.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/shift_right.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/shift_right.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/shift_right.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/template_arity.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/template_arity.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/template_arity.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/template_arity.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/times.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/times.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/times.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/times.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/unpack_args.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/unpack_args.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/unpack_args.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/unpack_args.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/vector.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/vector.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/vector.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/vector.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc551/vector_c.hpp b/c++/boost/mpl/aux_/preprocessed/bcc551/vector_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc551/vector_c.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc551/vector_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/advance_backward.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/advance_backward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/advance_backward.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/advance_backward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/advance_forward.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/advance_forward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/advance_forward.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/advance_forward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/and.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/and.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/and.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/and.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/apply.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/apply.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/apply_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/apply_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply_wrap.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/apply_wrap.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/apply_wrap.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/apply_wrap.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/arg.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/arg.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/arg.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/arg.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/basic_bind.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/basic_bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/basic_bind.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/basic_bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/bind.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/bind.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/bind_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/bind_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/bind_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/bind_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitand.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/bitand.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitand.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/bitand.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitor.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/bitor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitor.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/bitor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitxor.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/bitxor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/bitxor.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/bitxor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/deque.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/deque.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/deque.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/deque.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/divides.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/divides.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/divides.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/divides.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/full_lambda.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/full_lambda.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/full_lambda.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/full_lambda.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/greater.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/greater.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/greater.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/greater.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/greater_equal.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/greater_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/greater_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/greater_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/inherit.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/inherit.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/inherit.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/inherit.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_if_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_if_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_if_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_if_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/lambda_no_ctps.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/lambda_no_ctps.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/lambda_no_ctps.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/lambda_no_ctps.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/less.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/less.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/less.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/less.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/less_equal.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/less_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/less_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/less_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/list.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/list.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/list.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/list.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/list_c.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/list_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/list_c.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/list_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/map.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/map.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/map.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/map.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/minus.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/minus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/minus.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/minus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/modulus.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/modulus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/modulus.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/modulus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/not_equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/not_equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/not_equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/not_equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/or.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/or.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/or.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/or.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/placeholders.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/placeholders.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/placeholders.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/placeholders.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/plus.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/plus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/plus.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/plus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/quote.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/quote.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/quote.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/quote.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/reverse_iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/set.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/set.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/set.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/set.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/set_c.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/set_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/set_c.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/set_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/shift_left.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/shift_left.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/shift_left.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/shift_left.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/shift_right.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/shift_right.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/shift_right.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/shift_right.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/template_arity.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/template_arity.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/template_arity.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/template_arity.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/times.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/times.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/times.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/times.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/unpack_args.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/unpack_args.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/unpack_args.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/unpack_args.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/vector.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/vector.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/vector.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/vector.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/vector_c.hpp b/c++/boost/mpl/aux_/preprocessed/bcc_pre590/vector_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/bcc_pre590/vector_c.hpp rename to c++/boost/mpl/aux_/preprocessed/bcc_pre590/vector_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/advance_backward.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/advance_backward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/advance_backward.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/advance_backward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/advance_forward.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/advance_forward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/advance_forward.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/advance_forward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/and.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/and.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/and.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/and.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/apply.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/apply.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/apply.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/apply.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/apply_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/apply_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/apply_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/apply_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/apply_wrap.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/apply_wrap.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/apply_wrap.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/apply_wrap.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/arg.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/arg.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/arg.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/arg.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/basic_bind.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/basic_bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/basic_bind.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/basic_bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/bind.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/bind.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/bind_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/bind_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/bind_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/bind_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/bitand.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/bitand.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/bitand.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/bitand.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/bitor.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/bitor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/bitor.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/bitor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/bitxor.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/bitxor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/bitxor.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/bitxor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/deque.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/deque.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/deque.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/deque.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/divides.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/divides.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/divides.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/divides.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/full_lambda.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/full_lambda.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/full_lambda.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/full_lambda.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/greater.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/greater.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/greater.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/greater.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/greater_equal.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/greater_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/greater_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/greater_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/inherit.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/inherit.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/inherit.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/inherit.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/iter_fold_if_impl.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/iter_fold_if_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/iter_fold_if_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/iter_fold_if_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/lambda_no_ctps.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/lambda_no_ctps.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/lambda_no_ctps.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/lambda_no_ctps.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/less.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/less.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/less.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/less.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/less_equal.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/less_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/less_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/less_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/list.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/list.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/list.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/list.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/list_c.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/list_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/list_c.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/list_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/map.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/map.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/map.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/map.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/minus.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/minus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/minus.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/minus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/modulus.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/modulus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/modulus.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/modulus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/not_equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/not_equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/not_equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/not_equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/or.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/or.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/or.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/or.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/placeholders.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/placeholders.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/placeholders.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/placeholders.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/plus.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/plus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/plus.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/plus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/quote.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/quote.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/quote.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/quote.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/reverse_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/reverse_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/reverse_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/reverse_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/reverse_iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/reverse_iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/reverse_iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/reverse_iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/set.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/set.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/set.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/set.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/set_c.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/set_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/set_c.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/set_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/shift_left.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/shift_left.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/shift_left.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/shift_left.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/shift_right.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/shift_right.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/shift_right.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/shift_right.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/template_arity.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/template_arity.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/template_arity.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/template_arity.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/times.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/times.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/times.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/times.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/unpack_args.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/unpack_args.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/unpack_args.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/unpack_args.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/vector.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/vector.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/vector.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/vector.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/dmc/vector_c.hpp b/c++/boost/mpl/aux_/preprocessed/dmc/vector_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/dmc/vector_c.hpp rename to c++/boost/mpl/aux_/preprocessed/dmc/vector_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/advance_backward.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/advance_backward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/advance_backward.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/advance_backward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/advance_forward.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/advance_forward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/advance_forward.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/advance_forward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/and.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/and.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/and.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/and.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/apply.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/apply.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/apply.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/apply.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/apply_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/apply_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/apply_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/apply_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/apply_wrap.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/apply_wrap.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/apply_wrap.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/apply_wrap.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/arg.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/arg.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/arg.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/arg.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/basic_bind.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/basic_bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/basic_bind.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/basic_bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/bind.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/bind.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/bind_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/bind_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/bind_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/bind_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/bitand.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/bitand.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/bitand.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/bitand.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/bitor.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/bitor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/bitor.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/bitor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/bitxor.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/bitxor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/bitxor.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/bitxor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/deque.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/deque.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/deque.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/deque.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/divides.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/divides.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/divides.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/divides.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/full_lambda.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/full_lambda.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/full_lambda.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/full_lambda.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/greater.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/greater.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/greater.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/greater.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/inherit.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/inherit.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/inherit.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/inherit.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/iter_fold_if_impl.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/iter_fold_if_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/iter_fold_if_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/iter_fold_if_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/lambda_no_ctps.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/lambda_no_ctps.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/lambda_no_ctps.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/lambda_no_ctps.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/less.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/less.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/less.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/less.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/list.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/list.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/list.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/list.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/list_c.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/list_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/list_c.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/list_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/map.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/map.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/map.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/map.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/minus.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/minus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/minus.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/minus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/modulus.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/modulus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/modulus.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/modulus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/or.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/or.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/or.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/or.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/placeholders.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/placeholders.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/placeholders.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/placeholders.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/plus.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/plus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/plus.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/plus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/quote.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/quote.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/quote.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/quote.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/reverse_iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/reverse_iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/reverse_iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/reverse_iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/set.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/set.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/set.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/set.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/set_c.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/set_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/set_c.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/set_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/shift_left.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/shift_left.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/shift_left.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/shift_left.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/shift_right.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/shift_right.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/shift_right.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/shift_right.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/times.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/times.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/times.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/times.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/unpack_args.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/unpack_args.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/unpack_args.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/unpack_args.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/vector.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/vector.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/vector.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/vector.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/gcc/vector_c.hpp b/c++/boost/mpl/aux_/preprocessed/gcc/vector_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/gcc/vector_c.hpp rename to c++/boost/mpl/aux_/preprocessed/gcc/vector_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/advance_backward.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/advance_backward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/advance_backward.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/advance_backward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/advance_forward.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/advance_forward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/advance_forward.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/advance_forward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/and.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/and.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/and.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/and.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/apply.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/apply.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/apply.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/apply.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/apply_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/apply_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/apply_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/apply_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/apply_wrap.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/apply_wrap.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/apply_wrap.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/apply_wrap.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/arg.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/arg.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/arg.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/arg.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/bind.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/bind.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/bind_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/bind_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/bind_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/bind_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/deque.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/deque.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/deque.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/deque.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/divides.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/divides.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/full_lambda.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/full_lambda.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/full_lambda.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/full_lambda.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/greater.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/greater.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/greater.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/greater.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/inherit.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/inherit.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/inherit.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/inherit.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/iter_fold_if_impl.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/iter_fold_if_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/iter_fold_if_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/iter_fold_if_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/less.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/less.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/less.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/less.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/less_equal.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/less_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/less_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/less_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/list.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/list.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/list.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/list.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/list_c.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/list_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/list_c.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/list_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/map.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/map.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/map.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/map.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/minus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/minus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/modulus.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/modulus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/modulus.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/modulus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/or.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/or.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/or.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/or.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/placeholders.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/placeholders.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/placeholders.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/placeholders.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/plus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/plus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/quote.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/quote.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/quote.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/quote.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/reverse_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/reverse_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/reverse_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/reverse_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/reverse_iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/reverse_iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/reverse_iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/reverse_iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/set.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/set.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/set.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/set.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/set_c.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/set_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/set_c.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/set_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/shift_left.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/shift_left.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/shift_left.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/shift_left.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/shift_right.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/shift_right.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/shift_right.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/shift_right.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/template_arity.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/template_arity.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/template_arity.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/template_arity.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/times.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/times.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/unpack_args.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/unpack_args.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/unpack_args.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/unpack_args.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/vector.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/vector.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/vector.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/vector.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc60/vector_c.hpp b/c++/boost/mpl/aux_/preprocessed/msvc60/vector_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc60/vector_c.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc60/vector_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/advance_backward.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/advance_backward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/advance_backward.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/advance_backward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/advance_forward.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/advance_forward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/advance_forward.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/advance_forward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/and.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/and.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/and.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/and.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/apply.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/apply.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/apply.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/apply.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/apply_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/apply_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/apply_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/apply_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/apply_wrap.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/apply_wrap.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/apply_wrap.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/apply_wrap.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/arg.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/arg.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/arg.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/arg.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/basic_bind.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/basic_bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/basic_bind.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/basic_bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/bind.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/bind.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/bind_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/bind_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/bind_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/bind_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/deque.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/deque.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/deque.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/deque.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/divides.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/divides.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/full_lambda.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/full_lambda.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/full_lambda.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/full_lambda.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/greater.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/greater.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/greater.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/greater.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/greater_equal.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/greater_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/greater_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/greater_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/inherit.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/inherit.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/inherit.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/inherit.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/iter_fold_if_impl.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/iter_fold_if_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/iter_fold_if_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/iter_fold_if_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/lambda_no_ctps.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/lambda_no_ctps.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/lambda_no_ctps.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/lambda_no_ctps.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/less.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/less.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/less.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/less.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/less_equal.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/less_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/less_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/less_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/list.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/list.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/list.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/list.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/list_c.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/list_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/list_c.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/list_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/map.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/map.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/map.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/map.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/minus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/minus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/modulus.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/modulus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/modulus.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/modulus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/not_equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/not_equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/not_equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/not_equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/or.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/or.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/or.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/or.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/placeholders.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/placeholders.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/placeholders.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/placeholders.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/plus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/plus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/quote.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/quote.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/quote.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/quote.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/reverse_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/reverse_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/reverse_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/reverse_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/reverse_iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/reverse_iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/reverse_iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/reverse_iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/set.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/set.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/set.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/set.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/set_c.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/set_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/set_c.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/set_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/shift_left.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/shift_left.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/shift_left.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/shift_left.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/shift_right.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/shift_right.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/shift_right.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/shift_right.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/template_arity.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/template_arity.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/template_arity.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/template_arity.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/times.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/times.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/unpack_args.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/unpack_args.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/unpack_args.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/unpack_args.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/vector.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/vector.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/vector.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/vector.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/msvc70/vector_c.hpp b/c++/boost/mpl/aux_/preprocessed/msvc70/vector_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/msvc70/vector_c.hpp rename to c++/boost/mpl/aux_/preprocessed/msvc70/vector_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/advance_backward.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/advance_backward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/advance_backward.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/advance_backward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/advance_forward.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/advance_forward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/advance_forward.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/advance_forward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/and.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/and.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/and.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/and.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/apply.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/apply.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/apply.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/apply.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/apply_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/apply_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/apply_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/apply_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/apply_wrap.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/apply_wrap.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/apply_wrap.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/apply_wrap.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/arg.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/arg.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/arg.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/arg.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/basic_bind.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/basic_bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/basic_bind.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/basic_bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/bind.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/bind.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/bind_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/bind_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/bind_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/bind_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/bitand.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/bitand.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/bitand.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/bitand.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/bitor.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/bitor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/bitor.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/bitor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/bitxor.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/bitxor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/bitxor.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/bitxor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/deque.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/deque.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/deque.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/deque.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/divides.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/divides.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/divides.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/divides.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/full_lambda.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/full_lambda.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/full_lambda.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/full_lambda.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/greater.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/greater.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/greater.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/greater.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/greater_equal.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/greater_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/greater_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/greater_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/inherit.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/inherit.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/inherit.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/inherit.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/iter_fold_if_impl.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/iter_fold_if_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/iter_fold_if_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/iter_fold_if_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/lambda_no_ctps.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/lambda_no_ctps.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/lambda_no_ctps.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/lambda_no_ctps.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/less.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/less.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/less.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/less.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/less_equal.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/less_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/less_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/less_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/list.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/list.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/list.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/list.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/list_c.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/list_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/list_c.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/list_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/map.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/map.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/map.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/map.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/minus.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/minus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/minus.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/minus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/modulus.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/modulus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/modulus.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/modulus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/not_equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/not_equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/not_equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/not_equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/or.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/or.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/or.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/or.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/placeholders.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/placeholders.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/placeholders.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/placeholders.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/plus.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/plus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/plus.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/plus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/quote.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/quote.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/quote.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/quote.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/reverse_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/reverse_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/reverse_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/reverse_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/reverse_iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/reverse_iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/reverse_iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/reverse_iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/set.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/set.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/set.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/set.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/set_c.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/set_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/set_c.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/set_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/shift_left.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/shift_left.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/shift_left.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/shift_left.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/shift_right.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/shift_right.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/shift_right.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/shift_right.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/template_arity.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/template_arity.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/template_arity.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/template_arity.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/times.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/times.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/times.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/times.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/unpack_args.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/unpack_args.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/unpack_args.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/unpack_args.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/vector.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/vector.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/vector.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/vector.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/mwcw/vector_c.hpp b/c++/boost/mpl/aux_/preprocessed/mwcw/vector_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/mwcw/vector_c.hpp rename to c++/boost/mpl/aux_/preprocessed/mwcw/vector_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/advance_backward.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/advance_backward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/advance_backward.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/advance_backward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/advance_forward.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/advance_forward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/advance_forward.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/advance_forward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/and.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/and.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/and.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/and.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/apply.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/apply.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/apply.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/apply.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/apply_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/apply_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/apply_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/apply_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/apply_wrap.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/apply_wrap.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/apply_wrap.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/apply_wrap.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/arg.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/arg.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/arg.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/arg.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/basic_bind.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/basic_bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/basic_bind.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/basic_bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/bind.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/bind.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/bind_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/bind_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/bind_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/bind_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/deque.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/deque.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/deque.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/deque.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/full_lambda.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/full_lambda.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/full_lambda.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/full_lambda.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/greater.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/greater.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/greater.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/greater.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/greater_equal.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/greater_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/greater_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/greater_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/inherit.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/inherit.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/inherit.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/inherit.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_if_impl.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_if_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_if_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_if_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/lambda_no_ctps.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/lambda_no_ctps.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/lambda_no_ctps.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/lambda_no_ctps.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/less.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/less.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/less.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/less.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/less_equal.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/less_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/less_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/less_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/list.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/list.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/list.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/list.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/list_c.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/list_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/list_c.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/list_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/map.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/map.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/map.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/map.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/modulus.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/modulus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/modulus.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/modulus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/not_equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/not_equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/not_equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/not_equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/or.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/or.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/or.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/or.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/placeholders.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/placeholders.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/placeholders.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/placeholders.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/quote.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/quote.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/quote.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/quote.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/reverse_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/reverse_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/reverse_iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/reverse_iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/set.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/set.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/set.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/set.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/set_c.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/set_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/set_c.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/set_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/shift_left.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/shift_left.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/shift_left.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/shift_left.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/shift_right.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/shift_right.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/shift_right.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/shift_right.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/template_arity.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/template_arity.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/template_arity.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/template_arity.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/times.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/times.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/vector.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/vector.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/vector.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/vector.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ctps/vector_c.hpp b/c++/boost/mpl/aux_/preprocessed/no_ctps/vector_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ctps/vector_c.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ctps/vector_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/advance_backward.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/advance_backward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/advance_backward.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/advance_backward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/advance_forward.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/advance_forward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/advance_forward.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/advance_forward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/and.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/and.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/and.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/and.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/apply.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/apply.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/apply.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/apply.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/apply_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/apply_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/apply_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/apply_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/apply_wrap.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/apply_wrap.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/apply_wrap.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/apply_wrap.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/arg.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/arg.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/arg.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/arg.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/basic_bind.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/basic_bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/basic_bind.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/basic_bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/bind.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/bind.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/bind_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/bind_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/bind_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/bind_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/bitand.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/bitand.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/bitand.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/bitand.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/bitor.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/bitor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/bitor.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/bitor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/bitxor.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/bitxor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/bitxor.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/bitxor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/deque.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/deque.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/deque.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/deque.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/divides.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/divides.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/divides.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/divides.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/full_lambda.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/full_lambda.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/full_lambda.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/full_lambda.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/greater.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/greater.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/greater.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/greater.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/greater_equal.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/greater_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/greater_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/greater_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/inherit.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/inherit.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/inherit.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/inherit.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_if_impl.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_if_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_if_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_if_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/lambda_no_ctps.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/lambda_no_ctps.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/lambda_no_ctps.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/lambda_no_ctps.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/less.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/less.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/less.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/less.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/less_equal.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/less_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/less_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/less_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/list.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/list.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/list.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/list.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/list_c.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/list_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/list_c.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/list_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/map.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/map.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/map.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/map.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/minus.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/minus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/minus.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/minus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/modulus.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/modulus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/modulus.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/modulus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/not_equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/not_equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/not_equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/not_equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/or.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/or.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/or.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/or.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/placeholders.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/placeholders.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/placeholders.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/placeholders.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/plus.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/plus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/plus.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/plus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/quote.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/quote.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/quote.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/quote.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/reverse_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/reverse_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/reverse_iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/reverse_iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/set.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/set.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/set.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/set.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/set_c.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/set_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/set_c.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/set_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/shift_left.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/shift_left.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/shift_left.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/shift_left.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/shift_right.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/shift_right.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/shift_right.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/shift_right.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/template_arity.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/template_arity.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/template_arity.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/template_arity.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/times.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/times.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/times.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/times.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/unpack_args.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/unpack_args.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/unpack_args.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/unpack_args.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/vector.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/vector.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/vector.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/vector.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/no_ttp/vector_c.hpp b/c++/boost/mpl/aux_/preprocessed/no_ttp/vector_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/no_ttp/vector_c.hpp rename to c++/boost/mpl/aux_/preprocessed/no_ttp/vector_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/advance_backward.hpp b/c++/boost/mpl/aux_/preprocessed/plain/advance_backward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/advance_backward.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/advance_backward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/advance_forward.hpp b/c++/boost/mpl/aux_/preprocessed/plain/advance_forward.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/advance_forward.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/advance_forward.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/and.hpp b/c++/boost/mpl/aux_/preprocessed/plain/and.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/and.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/and.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/apply.hpp b/c++/boost/mpl/aux_/preprocessed/plain/apply.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/apply.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/apply.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/apply_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/plain/apply_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/apply_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/apply_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/apply_wrap.hpp b/c++/boost/mpl/aux_/preprocessed/plain/apply_wrap.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/apply_wrap.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/apply_wrap.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/arg.hpp b/c++/boost/mpl/aux_/preprocessed/plain/arg.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/arg.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/arg.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/basic_bind.hpp b/c++/boost/mpl/aux_/preprocessed/plain/basic_bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/basic_bind.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/basic_bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/bind.hpp b/c++/boost/mpl/aux_/preprocessed/plain/bind.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/bind.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/bind.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/bind_fwd.hpp b/c++/boost/mpl/aux_/preprocessed/plain/bind_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/bind_fwd.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/bind_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/bitand.hpp b/c++/boost/mpl/aux_/preprocessed/plain/bitand.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/bitand.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/bitand.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/bitor.hpp b/c++/boost/mpl/aux_/preprocessed/plain/bitor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/bitor.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/bitor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/bitxor.hpp b/c++/boost/mpl/aux_/preprocessed/plain/bitxor.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/bitxor.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/bitxor.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/deque.hpp b/c++/boost/mpl/aux_/preprocessed/plain/deque.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/deque.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/deque.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/divides.hpp b/c++/boost/mpl/aux_/preprocessed/plain/divides.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/divides.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/divides.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/plain/equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/plain/fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/full_lambda.hpp b/c++/boost/mpl/aux_/preprocessed/plain/full_lambda.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/full_lambda.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/full_lambda.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/greater.hpp b/c++/boost/mpl/aux_/preprocessed/plain/greater.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/greater.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/greater.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/greater_equal.hpp b/c++/boost/mpl/aux_/preprocessed/plain/greater_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/greater_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/greater_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/inherit.hpp b/c++/boost/mpl/aux_/preprocessed/plain/inherit.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/inherit.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/inherit.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/iter_fold_if_impl.hpp b/c++/boost/mpl/aux_/preprocessed/plain/iter_fold_if_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/iter_fold_if_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/iter_fold_if_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/plain/iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/lambda_no_ctps.hpp b/c++/boost/mpl/aux_/preprocessed/plain/lambda_no_ctps.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/lambda_no_ctps.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/lambda_no_ctps.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/less.hpp b/c++/boost/mpl/aux_/preprocessed/plain/less.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/less.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/less.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/less_equal.hpp b/c++/boost/mpl/aux_/preprocessed/plain/less_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/less_equal.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/less_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/list.hpp b/c++/boost/mpl/aux_/preprocessed/plain/list.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/list.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/list.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/list_c.hpp b/c++/boost/mpl/aux_/preprocessed/plain/list_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/list_c.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/list_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/map.hpp b/c++/boost/mpl/aux_/preprocessed/plain/map.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/map.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/map.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/minus.hpp b/c++/boost/mpl/aux_/preprocessed/plain/minus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/minus.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/minus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/modulus.hpp b/c++/boost/mpl/aux_/preprocessed/plain/modulus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/modulus.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/modulus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/not_equal_to.hpp b/c++/boost/mpl/aux_/preprocessed/plain/not_equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/not_equal_to.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/not_equal_to.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/or.hpp b/c++/boost/mpl/aux_/preprocessed/plain/or.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/or.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/or.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/placeholders.hpp b/c++/boost/mpl/aux_/preprocessed/plain/placeholders.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/placeholders.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/placeholders.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/plus.hpp b/c++/boost/mpl/aux_/preprocessed/plain/plus.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/plus.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/plus.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/quote.hpp b/c++/boost/mpl/aux_/preprocessed/plain/quote.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/quote.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/quote.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/reverse_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/plain/reverse_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/reverse_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/reverse_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/reverse_iter_fold_impl.hpp b/c++/boost/mpl/aux_/preprocessed/plain/reverse_iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/reverse_iter_fold_impl.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/reverse_iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/set.hpp b/c++/boost/mpl/aux_/preprocessed/plain/set.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/set.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/set.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/set_c.hpp b/c++/boost/mpl/aux_/preprocessed/plain/set_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/set_c.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/set_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/shift_left.hpp b/c++/boost/mpl/aux_/preprocessed/plain/shift_left.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/shift_left.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/shift_left.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/shift_right.hpp b/c++/boost/mpl/aux_/preprocessed/plain/shift_right.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/shift_right.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/shift_right.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/template_arity.hpp b/c++/boost/mpl/aux_/preprocessed/plain/template_arity.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/template_arity.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/template_arity.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/times.hpp b/c++/boost/mpl/aux_/preprocessed/plain/times.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/times.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/times.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/unpack_args.hpp b/c++/boost/mpl/aux_/preprocessed/plain/unpack_args.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/unpack_args.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/unpack_args.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/vector.hpp b/c++/boost/mpl/aux_/preprocessed/plain/vector.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/vector.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/vector.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessed/plain/vector_c.hpp b/c++/boost/mpl/aux_/preprocessed/plain/vector_c.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessed/plain/vector_c.hpp rename to c++/boost/mpl/aux_/preprocessed/plain/vector_c.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessor/add.hpp b/c++/boost/mpl/aux_/preprocessor/add.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessor/add.hpp rename to c++/boost/mpl/aux_/preprocessor/add.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessor/def_params_tail.hpp b/c++/boost/mpl/aux_/preprocessor/def_params_tail.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessor/def_params_tail.hpp rename to c++/boost/mpl/aux_/preprocessor/def_params_tail.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessor/default_params.hpp b/c++/boost/mpl/aux_/preprocessor/default_params.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessor/default_params.hpp rename to c++/boost/mpl/aux_/preprocessor/default_params.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessor/enum.hpp b/c++/boost/mpl/aux_/preprocessor/enum.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessor/enum.hpp rename to c++/boost/mpl/aux_/preprocessor/enum.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessor/ext_params.hpp b/c++/boost/mpl/aux_/preprocessor/ext_params.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessor/ext_params.hpp rename to c++/boost/mpl/aux_/preprocessor/ext_params.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessor/filter_params.hpp b/c++/boost/mpl/aux_/preprocessor/filter_params.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessor/filter_params.hpp rename to c++/boost/mpl/aux_/preprocessor/filter_params.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessor/is_seq.hpp b/c++/boost/mpl/aux_/preprocessor/is_seq.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessor/is_seq.hpp rename to c++/boost/mpl/aux_/preprocessor/is_seq.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessor/params.hpp b/c++/boost/mpl/aux_/preprocessor/params.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessor/params.hpp rename to c++/boost/mpl/aux_/preprocessor/params.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessor/partial_spec_params.hpp b/c++/boost/mpl/aux_/preprocessor/partial_spec_params.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessor/partial_spec_params.hpp rename to c++/boost/mpl/aux_/preprocessor/partial_spec_params.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessor/range.hpp b/c++/boost/mpl/aux_/preprocessor/range.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessor/range.hpp rename to c++/boost/mpl/aux_/preprocessor/range.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessor/repeat.hpp b/c++/boost/mpl/aux_/preprocessor/repeat.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessor/repeat.hpp rename to c++/boost/mpl/aux_/preprocessor/repeat.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessor/sub.hpp b/c++/boost/mpl/aux_/preprocessor/sub.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessor/sub.hpp rename to c++/boost/mpl/aux_/preprocessor/sub.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessor/token_equal.hpp b/c++/boost/mpl/aux_/preprocessor/token_equal.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessor/token_equal.hpp rename to c++/boost/mpl/aux_/preprocessor/token_equal.hpp diff --git a/c++/include/boost/mpl/aux_/preprocessor/tuple.hpp b/c++/boost/mpl/aux_/preprocessor/tuple.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/preprocessor/tuple.hpp rename to c++/boost/mpl/aux_/preprocessor/tuple.hpp diff --git a/c++/include/boost/mpl/aux_/ptr_to_ref.hpp b/c++/boost/mpl/aux_/ptr_to_ref.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/ptr_to_ref.hpp rename to c++/boost/mpl/aux_/ptr_to_ref.hpp diff --git a/c++/include/boost/mpl/aux_/push_back_impl.hpp b/c++/boost/mpl/aux_/push_back_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/push_back_impl.hpp rename to c++/boost/mpl/aux_/push_back_impl.hpp diff --git a/c++/include/boost/mpl/aux_/push_front_impl.hpp b/c++/boost/mpl/aux_/push_front_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/push_front_impl.hpp rename to c++/boost/mpl/aux_/push_front_impl.hpp diff --git a/c++/include/boost/mpl/aux_/range_c/O1_size.hpp b/c++/boost/mpl/aux_/range_c/O1_size.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/range_c/O1_size.hpp rename to c++/boost/mpl/aux_/range_c/O1_size.hpp diff --git a/c++/include/boost/mpl/aux_/range_c/back.hpp b/c++/boost/mpl/aux_/range_c/back.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/range_c/back.hpp rename to c++/boost/mpl/aux_/range_c/back.hpp diff --git a/c++/include/boost/mpl/aux_/range_c/empty.hpp b/c++/boost/mpl/aux_/range_c/empty.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/range_c/empty.hpp rename to c++/boost/mpl/aux_/range_c/empty.hpp diff --git a/c++/include/boost/mpl/aux_/range_c/front.hpp b/c++/boost/mpl/aux_/range_c/front.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/range_c/front.hpp rename to c++/boost/mpl/aux_/range_c/front.hpp diff --git a/c++/include/boost/mpl/aux_/range_c/iterator.hpp b/c++/boost/mpl/aux_/range_c/iterator.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/range_c/iterator.hpp rename to c++/boost/mpl/aux_/range_c/iterator.hpp diff --git a/c++/include/boost/mpl/aux_/range_c/size.hpp b/c++/boost/mpl/aux_/range_c/size.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/range_c/size.hpp rename to c++/boost/mpl/aux_/range_c/size.hpp diff --git a/c++/include/boost/mpl/aux_/range_c/tag.hpp b/c++/boost/mpl/aux_/range_c/tag.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/range_c/tag.hpp rename to c++/boost/mpl/aux_/range_c/tag.hpp diff --git a/c++/include/boost/mpl/aux_/reverse_fold_impl.hpp b/c++/boost/mpl/aux_/reverse_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/reverse_fold_impl.hpp rename to c++/boost/mpl/aux_/reverse_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/reverse_fold_impl_body.hpp b/c++/boost/mpl/aux_/reverse_fold_impl_body.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/reverse_fold_impl_body.hpp rename to c++/boost/mpl/aux_/reverse_fold_impl_body.hpp diff --git a/c++/include/boost/mpl/aux_/reverse_iter_fold_impl.hpp b/c++/boost/mpl/aux_/reverse_iter_fold_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/reverse_iter_fold_impl.hpp rename to c++/boost/mpl/aux_/reverse_iter_fold_impl.hpp diff --git a/c++/include/boost/mpl/aux_/sequence_wrapper.hpp b/c++/boost/mpl/aux_/sequence_wrapper.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/sequence_wrapper.hpp rename to c++/boost/mpl/aux_/sequence_wrapper.hpp diff --git a/c++/include/boost/mpl/aux_/shift_op.hpp b/c++/boost/mpl/aux_/shift_op.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/shift_op.hpp rename to c++/boost/mpl/aux_/shift_op.hpp diff --git a/c++/include/boost/mpl/aux_/single_element_iter.hpp b/c++/boost/mpl/aux_/single_element_iter.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/single_element_iter.hpp rename to c++/boost/mpl/aux_/single_element_iter.hpp diff --git a/c++/include/boost/mpl/aux_/size_impl.hpp b/c++/boost/mpl/aux_/size_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/size_impl.hpp rename to c++/boost/mpl/aux_/size_impl.hpp diff --git a/c++/include/boost/mpl/aux_/sort_impl.hpp b/c++/boost/mpl/aux_/sort_impl.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/sort_impl.hpp rename to c++/boost/mpl/aux_/sort_impl.hpp diff --git a/c++/include/boost/mpl/aux_/static_cast.hpp b/c++/boost/mpl/aux_/static_cast.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/static_cast.hpp rename to c++/boost/mpl/aux_/static_cast.hpp diff --git a/c++/include/boost/mpl/aux_/template_arity.hpp b/c++/boost/mpl/aux_/template_arity.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/template_arity.hpp rename to c++/boost/mpl/aux_/template_arity.hpp diff --git a/c++/include/boost/mpl/aux_/template_arity_fwd.hpp b/c++/boost/mpl/aux_/template_arity_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/template_arity_fwd.hpp rename to c++/boost/mpl/aux_/template_arity_fwd.hpp diff --git a/c++/include/boost/mpl/aux_/test.hpp b/c++/boost/mpl/aux_/test.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/test.hpp rename to c++/boost/mpl/aux_/test.hpp diff --git a/c++/include/boost/mpl/aux_/test/assert.hpp b/c++/boost/mpl/aux_/test/assert.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/test/assert.hpp rename to c++/boost/mpl/aux_/test/assert.hpp diff --git a/c++/include/boost/mpl/aux_/test/data.hpp b/c++/boost/mpl/aux_/test/data.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/test/data.hpp rename to c++/boost/mpl/aux_/test/data.hpp diff --git a/c++/include/boost/mpl/aux_/test/test_case.hpp b/c++/boost/mpl/aux_/test/test_case.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/test/test_case.hpp rename to c++/boost/mpl/aux_/test/test_case.hpp diff --git a/c++/include/boost/mpl/aux_/traits_lambda_spec.hpp b/c++/boost/mpl/aux_/traits_lambda_spec.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/traits_lambda_spec.hpp rename to c++/boost/mpl/aux_/traits_lambda_spec.hpp diff --git a/c++/include/boost/mpl/aux_/transform_iter.hpp b/c++/boost/mpl/aux_/transform_iter.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/transform_iter.hpp rename to c++/boost/mpl/aux_/transform_iter.hpp diff --git a/c++/include/boost/mpl/aux_/type_wrapper.hpp b/c++/boost/mpl/aux_/type_wrapper.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/type_wrapper.hpp rename to c++/boost/mpl/aux_/type_wrapper.hpp diff --git a/c++/include/boost/mpl/aux_/unwrap.hpp b/c++/boost/mpl/aux_/unwrap.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/unwrap.hpp rename to c++/boost/mpl/aux_/unwrap.hpp diff --git a/c++/include/boost/mpl/aux_/value_wknd.hpp b/c++/boost/mpl/aux_/value_wknd.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/value_wknd.hpp rename to c++/boost/mpl/aux_/value_wknd.hpp diff --git a/c++/include/boost/mpl/aux_/yes_no.hpp b/c++/boost/mpl/aux_/yes_no.hpp similarity index 100% rename from c++/include/boost/mpl/aux_/yes_no.hpp rename to c++/boost/mpl/aux_/yes_no.hpp diff --git a/c++/include/boost/mpl/back.hpp b/c++/boost/mpl/back.hpp similarity index 100% rename from c++/include/boost/mpl/back.hpp rename to c++/boost/mpl/back.hpp diff --git a/c++/include/boost/mpl/back_fwd.hpp b/c++/boost/mpl/back_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/back_fwd.hpp rename to c++/boost/mpl/back_fwd.hpp diff --git a/c++/include/boost/mpl/back_inserter.hpp b/c++/boost/mpl/back_inserter.hpp similarity index 100% rename from c++/include/boost/mpl/back_inserter.hpp rename to c++/boost/mpl/back_inserter.hpp diff --git a/c++/include/boost/mpl/base.hpp b/c++/boost/mpl/base.hpp similarity index 100% rename from c++/include/boost/mpl/base.hpp rename to c++/boost/mpl/base.hpp diff --git a/c++/include/boost/mpl/begin.hpp b/c++/boost/mpl/begin.hpp similarity index 100% rename from c++/include/boost/mpl/begin.hpp rename to c++/boost/mpl/begin.hpp diff --git a/c++/include/boost/mpl/begin_end.hpp b/c++/boost/mpl/begin_end.hpp similarity index 100% rename from c++/include/boost/mpl/begin_end.hpp rename to c++/boost/mpl/begin_end.hpp diff --git a/c++/include/boost/mpl/begin_end_fwd.hpp b/c++/boost/mpl/begin_end_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/begin_end_fwd.hpp rename to c++/boost/mpl/begin_end_fwd.hpp diff --git a/c++/include/boost/mpl/bind.hpp b/c++/boost/mpl/bind.hpp similarity index 100% rename from c++/include/boost/mpl/bind.hpp rename to c++/boost/mpl/bind.hpp diff --git a/c++/include/boost/mpl/bind_fwd.hpp b/c++/boost/mpl/bind_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/bind_fwd.hpp rename to c++/boost/mpl/bind_fwd.hpp diff --git a/c++/include/boost/mpl/bitand.hpp b/c++/boost/mpl/bitand.hpp similarity index 100% rename from c++/include/boost/mpl/bitand.hpp rename to c++/boost/mpl/bitand.hpp diff --git a/c++/include/boost/mpl/bitor.hpp b/c++/boost/mpl/bitor.hpp similarity index 100% rename from c++/include/boost/mpl/bitor.hpp rename to c++/boost/mpl/bitor.hpp diff --git a/c++/include/boost/mpl/bitwise.hpp b/c++/boost/mpl/bitwise.hpp similarity index 100% rename from c++/include/boost/mpl/bitwise.hpp rename to c++/boost/mpl/bitwise.hpp diff --git a/c++/include/boost/mpl/bitxor.hpp b/c++/boost/mpl/bitxor.hpp similarity index 100% rename from c++/include/boost/mpl/bitxor.hpp rename to c++/boost/mpl/bitxor.hpp diff --git a/c++/include/boost/mpl/bool.hpp b/c++/boost/mpl/bool.hpp similarity index 100% rename from c++/include/boost/mpl/bool.hpp rename to c++/boost/mpl/bool.hpp diff --git a/c++/include/boost/mpl/bool_fwd.hpp b/c++/boost/mpl/bool_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/bool_fwd.hpp rename to c++/boost/mpl/bool_fwd.hpp diff --git a/c++/include/boost/mpl/char.hpp b/c++/boost/mpl/char.hpp similarity index 100% rename from c++/include/boost/mpl/char.hpp rename to c++/boost/mpl/char.hpp diff --git a/c++/include/boost/mpl/char_fwd.hpp b/c++/boost/mpl/char_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/char_fwd.hpp rename to c++/boost/mpl/char_fwd.hpp diff --git a/c++/include/boost/mpl/clear.hpp b/c++/boost/mpl/clear.hpp similarity index 100% rename from c++/include/boost/mpl/clear.hpp rename to c++/boost/mpl/clear.hpp diff --git a/c++/include/boost/mpl/clear_fwd.hpp b/c++/boost/mpl/clear_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/clear_fwd.hpp rename to c++/boost/mpl/clear_fwd.hpp diff --git a/c++/include/boost/mpl/comparison.hpp b/c++/boost/mpl/comparison.hpp similarity index 100% rename from c++/include/boost/mpl/comparison.hpp rename to c++/boost/mpl/comparison.hpp diff --git a/c++/include/boost/mpl/contains.hpp b/c++/boost/mpl/contains.hpp similarity index 100% rename from c++/include/boost/mpl/contains.hpp rename to c++/boost/mpl/contains.hpp diff --git a/c++/include/boost/mpl/contains_fwd.hpp b/c++/boost/mpl/contains_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/contains_fwd.hpp rename to c++/boost/mpl/contains_fwd.hpp diff --git a/c++/include/boost/mpl/copy.hpp b/c++/boost/mpl/copy.hpp similarity index 100% rename from c++/include/boost/mpl/copy.hpp rename to c++/boost/mpl/copy.hpp diff --git a/c++/include/boost/mpl/copy_if.hpp b/c++/boost/mpl/copy_if.hpp similarity index 100% rename from c++/include/boost/mpl/copy_if.hpp rename to c++/boost/mpl/copy_if.hpp diff --git a/c++/include/boost/mpl/count.hpp b/c++/boost/mpl/count.hpp similarity index 100% rename from c++/include/boost/mpl/count.hpp rename to c++/boost/mpl/count.hpp diff --git a/c++/include/boost/mpl/count_fwd.hpp b/c++/boost/mpl/count_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/count_fwd.hpp rename to c++/boost/mpl/count_fwd.hpp diff --git a/c++/include/boost/mpl/count_if.hpp b/c++/boost/mpl/count_if.hpp similarity index 100% rename from c++/include/boost/mpl/count_if.hpp rename to c++/boost/mpl/count_if.hpp diff --git a/c++/include/boost/mpl/deque.hpp b/c++/boost/mpl/deque.hpp similarity index 100% rename from c++/include/boost/mpl/deque.hpp rename to c++/boost/mpl/deque.hpp diff --git a/c++/include/boost/mpl/deref.hpp b/c++/boost/mpl/deref.hpp similarity index 100% rename from c++/include/boost/mpl/deref.hpp rename to c++/boost/mpl/deref.hpp diff --git a/c++/include/boost/mpl/distance.hpp b/c++/boost/mpl/distance.hpp similarity index 100% rename from c++/include/boost/mpl/distance.hpp rename to c++/boost/mpl/distance.hpp diff --git a/c++/include/boost/mpl/distance_fwd.hpp b/c++/boost/mpl/distance_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/distance_fwd.hpp rename to c++/boost/mpl/distance_fwd.hpp diff --git a/c++/include/boost/mpl/divides.hpp b/c++/boost/mpl/divides.hpp similarity index 100% rename from c++/include/boost/mpl/divides.hpp rename to c++/boost/mpl/divides.hpp diff --git a/c++/include/boost/mpl/empty.hpp b/c++/boost/mpl/empty.hpp similarity index 100% rename from c++/include/boost/mpl/empty.hpp rename to c++/boost/mpl/empty.hpp diff --git a/c++/include/boost/mpl/empty_base.hpp b/c++/boost/mpl/empty_base.hpp similarity index 100% rename from c++/include/boost/mpl/empty_base.hpp rename to c++/boost/mpl/empty_base.hpp diff --git a/c++/include/boost/mpl/empty_fwd.hpp b/c++/boost/mpl/empty_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/empty_fwd.hpp rename to c++/boost/mpl/empty_fwd.hpp diff --git a/c++/include/boost/mpl/empty_sequence.hpp b/c++/boost/mpl/empty_sequence.hpp similarity index 100% rename from c++/include/boost/mpl/empty_sequence.hpp rename to c++/boost/mpl/empty_sequence.hpp diff --git a/c++/include/boost/mpl/end.hpp b/c++/boost/mpl/end.hpp similarity index 100% rename from c++/include/boost/mpl/end.hpp rename to c++/boost/mpl/end.hpp diff --git a/c++/include/boost/mpl/equal.hpp b/c++/boost/mpl/equal.hpp similarity index 100% rename from c++/include/boost/mpl/equal.hpp rename to c++/boost/mpl/equal.hpp diff --git a/c++/include/boost/mpl/equal_to.hpp b/c++/boost/mpl/equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/equal_to.hpp rename to c++/boost/mpl/equal_to.hpp diff --git a/c++/include/boost/mpl/erase.hpp b/c++/boost/mpl/erase.hpp similarity index 100% rename from c++/include/boost/mpl/erase.hpp rename to c++/boost/mpl/erase.hpp diff --git a/c++/include/boost/mpl/erase_fwd.hpp b/c++/boost/mpl/erase_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/erase_fwd.hpp rename to c++/boost/mpl/erase_fwd.hpp diff --git a/c++/include/boost/mpl/erase_key.hpp b/c++/boost/mpl/erase_key.hpp similarity index 100% rename from c++/include/boost/mpl/erase_key.hpp rename to c++/boost/mpl/erase_key.hpp diff --git a/c++/include/boost/mpl/erase_key_fwd.hpp b/c++/boost/mpl/erase_key_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/erase_key_fwd.hpp rename to c++/boost/mpl/erase_key_fwd.hpp diff --git a/c++/include/boost/mpl/eval_if.hpp b/c++/boost/mpl/eval_if.hpp similarity index 100% rename from c++/include/boost/mpl/eval_if.hpp rename to c++/boost/mpl/eval_if.hpp diff --git a/c++/include/boost/mpl/filter_view.hpp b/c++/boost/mpl/filter_view.hpp similarity index 100% rename from c++/include/boost/mpl/filter_view.hpp rename to c++/boost/mpl/filter_view.hpp diff --git a/c++/include/boost/mpl/find.hpp b/c++/boost/mpl/find.hpp similarity index 100% rename from c++/include/boost/mpl/find.hpp rename to c++/boost/mpl/find.hpp diff --git a/c++/include/boost/mpl/find_if.hpp b/c++/boost/mpl/find_if.hpp similarity index 100% rename from c++/include/boost/mpl/find_if.hpp rename to c++/boost/mpl/find_if.hpp diff --git a/c++/include/boost/mpl/fold.hpp b/c++/boost/mpl/fold.hpp similarity index 100% rename from c++/include/boost/mpl/fold.hpp rename to c++/boost/mpl/fold.hpp diff --git a/c++/include/boost/mpl/for_each.hpp b/c++/boost/mpl/for_each.hpp similarity index 100% rename from c++/include/boost/mpl/for_each.hpp rename to c++/boost/mpl/for_each.hpp diff --git a/c++/include/boost/mpl/front.hpp b/c++/boost/mpl/front.hpp similarity index 100% rename from c++/include/boost/mpl/front.hpp rename to c++/boost/mpl/front.hpp diff --git a/c++/include/boost/mpl/front_fwd.hpp b/c++/boost/mpl/front_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/front_fwd.hpp rename to c++/boost/mpl/front_fwd.hpp diff --git a/c++/include/boost/mpl/front_inserter.hpp b/c++/boost/mpl/front_inserter.hpp similarity index 100% rename from c++/include/boost/mpl/front_inserter.hpp rename to c++/boost/mpl/front_inserter.hpp diff --git a/c++/include/boost/mpl/get_tag.hpp b/c++/boost/mpl/get_tag.hpp similarity index 100% rename from c++/include/boost/mpl/get_tag.hpp rename to c++/boost/mpl/get_tag.hpp diff --git a/c++/include/boost/mpl/greater.hpp b/c++/boost/mpl/greater.hpp similarity index 100% rename from c++/include/boost/mpl/greater.hpp rename to c++/boost/mpl/greater.hpp diff --git a/c++/include/boost/mpl/greater_equal.hpp b/c++/boost/mpl/greater_equal.hpp similarity index 100% rename from c++/include/boost/mpl/greater_equal.hpp rename to c++/boost/mpl/greater_equal.hpp diff --git a/c++/include/boost/mpl/has_key.hpp b/c++/boost/mpl/has_key.hpp similarity index 100% rename from c++/include/boost/mpl/has_key.hpp rename to c++/boost/mpl/has_key.hpp diff --git a/c++/include/boost/mpl/has_key_fwd.hpp b/c++/boost/mpl/has_key_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/has_key_fwd.hpp rename to c++/boost/mpl/has_key_fwd.hpp diff --git a/c++/include/boost/mpl/has_xxx.hpp b/c++/boost/mpl/has_xxx.hpp similarity index 100% rename from c++/include/boost/mpl/has_xxx.hpp rename to c++/boost/mpl/has_xxx.hpp diff --git a/c++/include/boost/mpl/identity.hpp b/c++/boost/mpl/identity.hpp similarity index 100% rename from c++/include/boost/mpl/identity.hpp rename to c++/boost/mpl/identity.hpp diff --git a/c++/include/boost/mpl/if.hpp b/c++/boost/mpl/if.hpp similarity index 100% rename from c++/include/boost/mpl/if.hpp rename to c++/boost/mpl/if.hpp diff --git a/c++/include/boost/mpl/index_if.hpp b/c++/boost/mpl/index_if.hpp similarity index 100% rename from c++/include/boost/mpl/index_if.hpp rename to c++/boost/mpl/index_if.hpp diff --git a/c++/include/boost/mpl/index_of.hpp b/c++/boost/mpl/index_of.hpp similarity index 100% rename from c++/include/boost/mpl/index_of.hpp rename to c++/boost/mpl/index_of.hpp diff --git a/c++/include/boost/mpl/inherit.hpp b/c++/boost/mpl/inherit.hpp similarity index 100% rename from c++/include/boost/mpl/inherit.hpp rename to c++/boost/mpl/inherit.hpp diff --git a/c++/include/boost/mpl/inherit_linearly.hpp b/c++/boost/mpl/inherit_linearly.hpp similarity index 100% rename from c++/include/boost/mpl/inherit_linearly.hpp rename to c++/boost/mpl/inherit_linearly.hpp diff --git a/c++/include/boost/mpl/insert.hpp b/c++/boost/mpl/insert.hpp similarity index 100% rename from c++/include/boost/mpl/insert.hpp rename to c++/boost/mpl/insert.hpp diff --git a/c++/include/boost/mpl/insert_fwd.hpp b/c++/boost/mpl/insert_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/insert_fwd.hpp rename to c++/boost/mpl/insert_fwd.hpp diff --git a/c++/include/boost/mpl/insert_range.hpp b/c++/boost/mpl/insert_range.hpp similarity index 100% rename from c++/include/boost/mpl/insert_range.hpp rename to c++/boost/mpl/insert_range.hpp diff --git a/c++/include/boost/mpl/insert_range_fwd.hpp b/c++/boost/mpl/insert_range_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/insert_range_fwd.hpp rename to c++/boost/mpl/insert_range_fwd.hpp diff --git a/c++/include/boost/mpl/inserter.hpp b/c++/boost/mpl/inserter.hpp similarity index 100% rename from c++/include/boost/mpl/inserter.hpp rename to c++/boost/mpl/inserter.hpp diff --git a/c++/include/boost/mpl/int.hpp b/c++/boost/mpl/int.hpp similarity index 100% rename from c++/include/boost/mpl/int.hpp rename to c++/boost/mpl/int.hpp diff --git a/c++/include/boost/mpl/int_fwd.hpp b/c++/boost/mpl/int_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/int_fwd.hpp rename to c++/boost/mpl/int_fwd.hpp diff --git a/c++/include/boost/mpl/integral_c.hpp b/c++/boost/mpl/integral_c.hpp similarity index 100% rename from c++/include/boost/mpl/integral_c.hpp rename to c++/boost/mpl/integral_c.hpp diff --git a/c++/include/boost/mpl/integral_c_fwd.hpp b/c++/boost/mpl/integral_c_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/integral_c_fwd.hpp rename to c++/boost/mpl/integral_c_fwd.hpp diff --git a/c++/include/boost/mpl/integral_c_tag.hpp b/c++/boost/mpl/integral_c_tag.hpp similarity index 100% rename from c++/include/boost/mpl/integral_c_tag.hpp rename to c++/boost/mpl/integral_c_tag.hpp diff --git a/c++/include/boost/mpl/is_placeholder.hpp b/c++/boost/mpl/is_placeholder.hpp similarity index 100% rename from c++/include/boost/mpl/is_placeholder.hpp rename to c++/boost/mpl/is_placeholder.hpp diff --git a/c++/include/boost/mpl/is_sequence.hpp b/c++/boost/mpl/is_sequence.hpp similarity index 100% rename from c++/include/boost/mpl/is_sequence.hpp rename to c++/boost/mpl/is_sequence.hpp diff --git a/c++/include/boost/mpl/iter_fold.hpp b/c++/boost/mpl/iter_fold.hpp similarity index 100% rename from c++/include/boost/mpl/iter_fold.hpp rename to c++/boost/mpl/iter_fold.hpp diff --git a/c++/include/boost/mpl/iter_fold_if.hpp b/c++/boost/mpl/iter_fold_if.hpp similarity index 100% rename from c++/include/boost/mpl/iter_fold_if.hpp rename to c++/boost/mpl/iter_fold_if.hpp diff --git a/c++/include/boost/mpl/iterator_category.hpp b/c++/boost/mpl/iterator_category.hpp similarity index 100% rename from c++/include/boost/mpl/iterator_category.hpp rename to c++/boost/mpl/iterator_category.hpp diff --git a/c++/include/boost/mpl/iterator_range.hpp b/c++/boost/mpl/iterator_range.hpp similarity index 100% rename from c++/include/boost/mpl/iterator_range.hpp rename to c++/boost/mpl/iterator_range.hpp diff --git a/c++/include/boost/mpl/iterator_tags.hpp b/c++/boost/mpl/iterator_tags.hpp similarity index 100% rename from c++/include/boost/mpl/iterator_tags.hpp rename to c++/boost/mpl/iterator_tags.hpp diff --git a/c++/include/boost/mpl/joint_view.hpp b/c++/boost/mpl/joint_view.hpp similarity index 100% rename from c++/include/boost/mpl/joint_view.hpp rename to c++/boost/mpl/joint_view.hpp diff --git a/c++/include/boost/mpl/key_type.hpp b/c++/boost/mpl/key_type.hpp similarity index 100% rename from c++/include/boost/mpl/key_type.hpp rename to c++/boost/mpl/key_type.hpp diff --git a/c++/include/boost/mpl/key_type_fwd.hpp b/c++/boost/mpl/key_type_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/key_type_fwd.hpp rename to c++/boost/mpl/key_type_fwd.hpp diff --git a/c++/include/boost/mpl/lambda.hpp b/c++/boost/mpl/lambda.hpp similarity index 100% rename from c++/include/boost/mpl/lambda.hpp rename to c++/boost/mpl/lambda.hpp diff --git a/c++/include/boost/mpl/lambda_fwd.hpp b/c++/boost/mpl/lambda_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/lambda_fwd.hpp rename to c++/boost/mpl/lambda_fwd.hpp diff --git a/c++/include/boost/mpl/less.hpp b/c++/boost/mpl/less.hpp similarity index 100% rename from c++/include/boost/mpl/less.hpp rename to c++/boost/mpl/less.hpp diff --git a/c++/include/boost/mpl/less_equal.hpp b/c++/boost/mpl/less_equal.hpp similarity index 100% rename from c++/include/boost/mpl/less_equal.hpp rename to c++/boost/mpl/less_equal.hpp diff --git a/c++/include/boost/mpl/limits/arity.hpp b/c++/boost/mpl/limits/arity.hpp similarity index 100% rename from c++/include/boost/mpl/limits/arity.hpp rename to c++/boost/mpl/limits/arity.hpp diff --git a/c++/include/boost/mpl/limits/list.hpp b/c++/boost/mpl/limits/list.hpp similarity index 100% rename from c++/include/boost/mpl/limits/list.hpp rename to c++/boost/mpl/limits/list.hpp diff --git a/c++/include/boost/mpl/limits/map.hpp b/c++/boost/mpl/limits/map.hpp similarity index 100% rename from c++/include/boost/mpl/limits/map.hpp rename to c++/boost/mpl/limits/map.hpp diff --git a/c++/include/boost/mpl/limits/set.hpp b/c++/boost/mpl/limits/set.hpp similarity index 100% rename from c++/include/boost/mpl/limits/set.hpp rename to c++/boost/mpl/limits/set.hpp diff --git a/c++/include/boost/mpl/limits/string.hpp b/c++/boost/mpl/limits/string.hpp similarity index 100% rename from c++/include/boost/mpl/limits/string.hpp rename to c++/boost/mpl/limits/string.hpp diff --git a/c++/include/boost/mpl/limits/unrolling.hpp b/c++/boost/mpl/limits/unrolling.hpp similarity index 100% rename from c++/include/boost/mpl/limits/unrolling.hpp rename to c++/boost/mpl/limits/unrolling.hpp diff --git a/c++/include/boost/mpl/limits/vector.hpp b/c++/boost/mpl/limits/vector.hpp similarity index 100% rename from c++/include/boost/mpl/limits/vector.hpp rename to c++/boost/mpl/limits/vector.hpp diff --git a/c++/include/boost/mpl/list.hpp b/c++/boost/mpl/list.hpp similarity index 100% rename from c++/include/boost/mpl/list.hpp rename to c++/boost/mpl/list.hpp diff --git a/c++/include/boost/mpl/list/aux_/O1_size.hpp b/c++/boost/mpl/list/aux_/O1_size.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/O1_size.hpp rename to c++/boost/mpl/list/aux_/O1_size.hpp diff --git a/c++/include/boost/mpl/list/aux_/begin_end.hpp b/c++/boost/mpl/list/aux_/begin_end.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/begin_end.hpp rename to c++/boost/mpl/list/aux_/begin_end.hpp diff --git a/c++/include/boost/mpl/list/aux_/clear.hpp b/c++/boost/mpl/list/aux_/clear.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/clear.hpp rename to c++/boost/mpl/list/aux_/clear.hpp diff --git a/c++/include/boost/mpl/list/aux_/empty.hpp b/c++/boost/mpl/list/aux_/empty.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/empty.hpp rename to c++/boost/mpl/list/aux_/empty.hpp diff --git a/c++/include/boost/mpl/list/aux_/front.hpp b/c++/boost/mpl/list/aux_/front.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/front.hpp rename to c++/boost/mpl/list/aux_/front.hpp diff --git a/c++/include/boost/mpl/list/aux_/include_preprocessed.hpp b/c++/boost/mpl/list/aux_/include_preprocessed.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/include_preprocessed.hpp rename to c++/boost/mpl/list/aux_/include_preprocessed.hpp diff --git a/c++/include/boost/mpl/list/aux_/item.hpp b/c++/boost/mpl/list/aux_/item.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/item.hpp rename to c++/boost/mpl/list/aux_/item.hpp diff --git a/c++/include/boost/mpl/list/aux_/iterator.hpp b/c++/boost/mpl/list/aux_/iterator.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/iterator.hpp rename to c++/boost/mpl/list/aux_/iterator.hpp diff --git a/c++/include/boost/mpl/list/aux_/numbered.hpp b/c++/boost/mpl/list/aux_/numbered.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/numbered.hpp rename to c++/boost/mpl/list/aux_/numbered.hpp diff --git a/c++/include/boost/mpl/list/aux_/numbered_c.hpp b/c++/boost/mpl/list/aux_/numbered_c.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/numbered_c.hpp rename to c++/boost/mpl/list/aux_/numbered_c.hpp diff --git a/c++/include/boost/mpl/list/aux_/pop_front.hpp b/c++/boost/mpl/list/aux_/pop_front.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/pop_front.hpp rename to c++/boost/mpl/list/aux_/pop_front.hpp diff --git a/c++/include/boost/mpl/list/aux_/preprocessed/plain/list10.hpp b/c++/boost/mpl/list/aux_/preprocessed/plain/list10.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/preprocessed/plain/list10.hpp rename to c++/boost/mpl/list/aux_/preprocessed/plain/list10.hpp diff --git a/c++/include/boost/mpl/list/aux_/preprocessed/plain/list10_c.hpp b/c++/boost/mpl/list/aux_/preprocessed/plain/list10_c.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/preprocessed/plain/list10_c.hpp rename to c++/boost/mpl/list/aux_/preprocessed/plain/list10_c.hpp diff --git a/c++/include/boost/mpl/list/aux_/preprocessed/plain/list20.hpp b/c++/boost/mpl/list/aux_/preprocessed/plain/list20.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/preprocessed/plain/list20.hpp rename to c++/boost/mpl/list/aux_/preprocessed/plain/list20.hpp diff --git a/c++/include/boost/mpl/list/aux_/preprocessed/plain/list20_c.hpp b/c++/boost/mpl/list/aux_/preprocessed/plain/list20_c.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/preprocessed/plain/list20_c.hpp rename to c++/boost/mpl/list/aux_/preprocessed/plain/list20_c.hpp diff --git a/c++/include/boost/mpl/list/aux_/preprocessed/plain/list30.hpp b/c++/boost/mpl/list/aux_/preprocessed/plain/list30.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/preprocessed/plain/list30.hpp rename to c++/boost/mpl/list/aux_/preprocessed/plain/list30.hpp diff --git a/c++/include/boost/mpl/list/aux_/preprocessed/plain/list30_c.hpp b/c++/boost/mpl/list/aux_/preprocessed/plain/list30_c.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/preprocessed/plain/list30_c.hpp rename to c++/boost/mpl/list/aux_/preprocessed/plain/list30_c.hpp diff --git a/c++/include/boost/mpl/list/aux_/preprocessed/plain/list40.hpp b/c++/boost/mpl/list/aux_/preprocessed/plain/list40.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/preprocessed/plain/list40.hpp rename to c++/boost/mpl/list/aux_/preprocessed/plain/list40.hpp diff --git a/c++/include/boost/mpl/list/aux_/preprocessed/plain/list40_c.hpp b/c++/boost/mpl/list/aux_/preprocessed/plain/list40_c.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/preprocessed/plain/list40_c.hpp rename to c++/boost/mpl/list/aux_/preprocessed/plain/list40_c.hpp diff --git a/c++/include/boost/mpl/list/aux_/preprocessed/plain/list50.hpp b/c++/boost/mpl/list/aux_/preprocessed/plain/list50.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/preprocessed/plain/list50.hpp rename to c++/boost/mpl/list/aux_/preprocessed/plain/list50.hpp diff --git a/c++/include/boost/mpl/list/aux_/preprocessed/plain/list50_c.hpp b/c++/boost/mpl/list/aux_/preprocessed/plain/list50_c.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/preprocessed/plain/list50_c.hpp rename to c++/boost/mpl/list/aux_/preprocessed/plain/list50_c.hpp diff --git a/c++/include/boost/mpl/list/aux_/push_back.hpp b/c++/boost/mpl/list/aux_/push_back.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/push_back.hpp rename to c++/boost/mpl/list/aux_/push_back.hpp diff --git a/c++/include/boost/mpl/list/aux_/push_front.hpp b/c++/boost/mpl/list/aux_/push_front.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/push_front.hpp rename to c++/boost/mpl/list/aux_/push_front.hpp diff --git a/c++/include/boost/mpl/list/aux_/size.hpp b/c++/boost/mpl/list/aux_/size.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/size.hpp rename to c++/boost/mpl/list/aux_/size.hpp diff --git a/c++/include/boost/mpl/list/aux_/tag.hpp b/c++/boost/mpl/list/aux_/tag.hpp similarity index 100% rename from c++/include/boost/mpl/list/aux_/tag.hpp rename to c++/boost/mpl/list/aux_/tag.hpp diff --git a/c++/include/boost/mpl/list/list0.hpp b/c++/boost/mpl/list/list0.hpp similarity index 100% rename from c++/include/boost/mpl/list/list0.hpp rename to c++/boost/mpl/list/list0.hpp diff --git a/c++/include/boost/mpl/list/list0_c.hpp b/c++/boost/mpl/list/list0_c.hpp similarity index 100% rename from c++/include/boost/mpl/list/list0_c.hpp rename to c++/boost/mpl/list/list0_c.hpp diff --git a/c++/include/boost/mpl/list/list10.hpp b/c++/boost/mpl/list/list10.hpp similarity index 100% rename from c++/include/boost/mpl/list/list10.hpp rename to c++/boost/mpl/list/list10.hpp diff --git a/c++/include/boost/mpl/list/list10_c.hpp b/c++/boost/mpl/list/list10_c.hpp similarity index 100% rename from c++/include/boost/mpl/list/list10_c.hpp rename to c++/boost/mpl/list/list10_c.hpp diff --git a/c++/include/boost/mpl/list/list20.hpp b/c++/boost/mpl/list/list20.hpp similarity index 100% rename from c++/include/boost/mpl/list/list20.hpp rename to c++/boost/mpl/list/list20.hpp diff --git a/c++/include/boost/mpl/list/list20_c.hpp b/c++/boost/mpl/list/list20_c.hpp similarity index 100% rename from c++/include/boost/mpl/list/list20_c.hpp rename to c++/boost/mpl/list/list20_c.hpp diff --git a/c++/include/boost/mpl/list/list30.hpp b/c++/boost/mpl/list/list30.hpp similarity index 100% rename from c++/include/boost/mpl/list/list30.hpp rename to c++/boost/mpl/list/list30.hpp diff --git a/c++/include/boost/mpl/list/list30_c.hpp b/c++/boost/mpl/list/list30_c.hpp similarity index 100% rename from c++/include/boost/mpl/list/list30_c.hpp rename to c++/boost/mpl/list/list30_c.hpp diff --git a/c++/include/boost/mpl/list/list40.hpp b/c++/boost/mpl/list/list40.hpp similarity index 100% rename from c++/include/boost/mpl/list/list40.hpp rename to c++/boost/mpl/list/list40.hpp diff --git a/c++/include/boost/mpl/list/list40_c.hpp b/c++/boost/mpl/list/list40_c.hpp similarity index 100% rename from c++/include/boost/mpl/list/list40_c.hpp rename to c++/boost/mpl/list/list40_c.hpp diff --git a/c++/include/boost/mpl/list/list50.hpp b/c++/boost/mpl/list/list50.hpp similarity index 100% rename from c++/include/boost/mpl/list/list50.hpp rename to c++/boost/mpl/list/list50.hpp diff --git a/c++/include/boost/mpl/list/list50_c.hpp b/c++/boost/mpl/list/list50_c.hpp similarity index 100% rename from c++/include/boost/mpl/list/list50_c.hpp rename to c++/boost/mpl/list/list50_c.hpp diff --git a/c++/include/boost/mpl/list_c.hpp b/c++/boost/mpl/list_c.hpp similarity index 100% rename from c++/include/boost/mpl/list_c.hpp rename to c++/boost/mpl/list_c.hpp diff --git a/c++/include/boost/mpl/logical.hpp b/c++/boost/mpl/logical.hpp similarity index 100% rename from c++/include/boost/mpl/logical.hpp rename to c++/boost/mpl/logical.hpp diff --git a/c++/include/boost/mpl/long.hpp b/c++/boost/mpl/long.hpp similarity index 100% rename from c++/include/boost/mpl/long.hpp rename to c++/boost/mpl/long.hpp diff --git a/c++/include/boost/mpl/long_fwd.hpp b/c++/boost/mpl/long_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/long_fwd.hpp rename to c++/boost/mpl/long_fwd.hpp diff --git a/c++/include/boost/mpl/lower_bound.hpp b/c++/boost/mpl/lower_bound.hpp similarity index 100% rename from c++/include/boost/mpl/lower_bound.hpp rename to c++/boost/mpl/lower_bound.hpp diff --git a/c++/include/boost/mpl/map.hpp b/c++/boost/mpl/map.hpp similarity index 100% rename from c++/include/boost/mpl/map.hpp rename to c++/boost/mpl/map.hpp diff --git a/c++/include/boost/mpl/map/aux_/at_impl.hpp b/c++/boost/mpl/map/aux_/at_impl.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/at_impl.hpp rename to c++/boost/mpl/map/aux_/at_impl.hpp diff --git a/c++/include/boost/mpl/map/aux_/begin_end_impl.hpp b/c++/boost/mpl/map/aux_/begin_end_impl.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/begin_end_impl.hpp rename to c++/boost/mpl/map/aux_/begin_end_impl.hpp diff --git a/c++/include/boost/mpl/map/aux_/clear_impl.hpp b/c++/boost/mpl/map/aux_/clear_impl.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/clear_impl.hpp rename to c++/boost/mpl/map/aux_/clear_impl.hpp diff --git a/c++/include/boost/mpl/map/aux_/contains_impl.hpp b/c++/boost/mpl/map/aux_/contains_impl.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/contains_impl.hpp rename to c++/boost/mpl/map/aux_/contains_impl.hpp diff --git a/c++/include/boost/mpl/map/aux_/empty_impl.hpp b/c++/boost/mpl/map/aux_/empty_impl.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/empty_impl.hpp rename to c++/boost/mpl/map/aux_/empty_impl.hpp diff --git a/c++/include/boost/mpl/map/aux_/erase_impl.hpp b/c++/boost/mpl/map/aux_/erase_impl.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/erase_impl.hpp rename to c++/boost/mpl/map/aux_/erase_impl.hpp diff --git a/c++/include/boost/mpl/map/aux_/erase_key_impl.hpp b/c++/boost/mpl/map/aux_/erase_key_impl.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/erase_key_impl.hpp rename to c++/boost/mpl/map/aux_/erase_key_impl.hpp diff --git a/c++/include/boost/mpl/map/aux_/has_key_impl.hpp b/c++/boost/mpl/map/aux_/has_key_impl.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/has_key_impl.hpp rename to c++/boost/mpl/map/aux_/has_key_impl.hpp diff --git a/c++/include/boost/mpl/map/aux_/include_preprocessed.hpp b/c++/boost/mpl/map/aux_/include_preprocessed.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/include_preprocessed.hpp rename to c++/boost/mpl/map/aux_/include_preprocessed.hpp diff --git a/c++/include/boost/mpl/map/aux_/insert_impl.hpp b/c++/boost/mpl/map/aux_/insert_impl.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/insert_impl.hpp rename to c++/boost/mpl/map/aux_/insert_impl.hpp diff --git a/c++/include/boost/mpl/map/aux_/insert_range_impl.hpp b/c++/boost/mpl/map/aux_/insert_range_impl.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/insert_range_impl.hpp rename to c++/boost/mpl/map/aux_/insert_range_impl.hpp diff --git a/c++/include/boost/mpl/map/aux_/item.hpp b/c++/boost/mpl/map/aux_/item.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/item.hpp rename to c++/boost/mpl/map/aux_/item.hpp diff --git a/c++/include/boost/mpl/map/aux_/iterator.hpp b/c++/boost/mpl/map/aux_/iterator.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/iterator.hpp rename to c++/boost/mpl/map/aux_/iterator.hpp diff --git a/c++/include/boost/mpl/map/aux_/key_type_impl.hpp b/c++/boost/mpl/map/aux_/key_type_impl.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/key_type_impl.hpp rename to c++/boost/mpl/map/aux_/key_type_impl.hpp diff --git a/c++/include/boost/mpl/map/aux_/map0.hpp b/c++/boost/mpl/map/aux_/map0.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/map0.hpp rename to c++/boost/mpl/map/aux_/map0.hpp diff --git a/c++/include/boost/mpl/map/aux_/numbered.hpp b/c++/boost/mpl/map/aux_/numbered.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/numbered.hpp rename to c++/boost/mpl/map/aux_/numbered.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/no_ctps/map10.hpp b/c++/boost/mpl/map/aux_/preprocessed/no_ctps/map10.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/no_ctps/map10.hpp rename to c++/boost/mpl/map/aux_/preprocessed/no_ctps/map10.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/no_ctps/map20.hpp b/c++/boost/mpl/map/aux_/preprocessed/no_ctps/map20.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/no_ctps/map20.hpp rename to c++/boost/mpl/map/aux_/preprocessed/no_ctps/map20.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/no_ctps/map30.hpp b/c++/boost/mpl/map/aux_/preprocessed/no_ctps/map30.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/no_ctps/map30.hpp rename to c++/boost/mpl/map/aux_/preprocessed/no_ctps/map30.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/no_ctps/map40.hpp b/c++/boost/mpl/map/aux_/preprocessed/no_ctps/map40.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/no_ctps/map40.hpp rename to c++/boost/mpl/map/aux_/preprocessed/no_ctps/map40.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/no_ctps/map50.hpp b/c++/boost/mpl/map/aux_/preprocessed/no_ctps/map50.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/no_ctps/map50.hpp rename to c++/boost/mpl/map/aux_/preprocessed/no_ctps/map50.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/plain/map10.hpp b/c++/boost/mpl/map/aux_/preprocessed/plain/map10.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/plain/map10.hpp rename to c++/boost/mpl/map/aux_/preprocessed/plain/map10.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/plain/map20.hpp b/c++/boost/mpl/map/aux_/preprocessed/plain/map20.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/plain/map20.hpp rename to c++/boost/mpl/map/aux_/preprocessed/plain/map20.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/plain/map30.hpp b/c++/boost/mpl/map/aux_/preprocessed/plain/map30.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/plain/map30.hpp rename to c++/boost/mpl/map/aux_/preprocessed/plain/map30.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/plain/map40.hpp b/c++/boost/mpl/map/aux_/preprocessed/plain/map40.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/plain/map40.hpp rename to c++/boost/mpl/map/aux_/preprocessed/plain/map40.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/plain/map50.hpp b/c++/boost/mpl/map/aux_/preprocessed/plain/map50.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/plain/map50.hpp rename to c++/boost/mpl/map/aux_/preprocessed/plain/map50.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/typeof_based/map10.hpp b/c++/boost/mpl/map/aux_/preprocessed/typeof_based/map10.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/typeof_based/map10.hpp rename to c++/boost/mpl/map/aux_/preprocessed/typeof_based/map10.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/typeof_based/map20.hpp b/c++/boost/mpl/map/aux_/preprocessed/typeof_based/map20.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/typeof_based/map20.hpp rename to c++/boost/mpl/map/aux_/preprocessed/typeof_based/map20.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/typeof_based/map30.hpp b/c++/boost/mpl/map/aux_/preprocessed/typeof_based/map30.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/typeof_based/map30.hpp rename to c++/boost/mpl/map/aux_/preprocessed/typeof_based/map30.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/typeof_based/map40.hpp b/c++/boost/mpl/map/aux_/preprocessed/typeof_based/map40.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/typeof_based/map40.hpp rename to c++/boost/mpl/map/aux_/preprocessed/typeof_based/map40.hpp diff --git a/c++/include/boost/mpl/map/aux_/preprocessed/typeof_based/map50.hpp b/c++/boost/mpl/map/aux_/preprocessed/typeof_based/map50.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/preprocessed/typeof_based/map50.hpp rename to c++/boost/mpl/map/aux_/preprocessed/typeof_based/map50.hpp diff --git a/c++/include/boost/mpl/map/aux_/size_impl.hpp b/c++/boost/mpl/map/aux_/size_impl.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/size_impl.hpp rename to c++/boost/mpl/map/aux_/size_impl.hpp diff --git a/c++/include/boost/mpl/map/aux_/tag.hpp b/c++/boost/mpl/map/aux_/tag.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/tag.hpp rename to c++/boost/mpl/map/aux_/tag.hpp diff --git a/c++/include/boost/mpl/map/aux_/value_type_impl.hpp b/c++/boost/mpl/map/aux_/value_type_impl.hpp similarity index 100% rename from c++/include/boost/mpl/map/aux_/value_type_impl.hpp rename to c++/boost/mpl/map/aux_/value_type_impl.hpp diff --git a/c++/include/boost/mpl/map/map0.hpp b/c++/boost/mpl/map/map0.hpp similarity index 100% rename from c++/include/boost/mpl/map/map0.hpp rename to c++/boost/mpl/map/map0.hpp diff --git a/c++/include/boost/mpl/map/map10.hpp b/c++/boost/mpl/map/map10.hpp similarity index 100% rename from c++/include/boost/mpl/map/map10.hpp rename to c++/boost/mpl/map/map10.hpp diff --git a/c++/include/boost/mpl/map/map20.hpp b/c++/boost/mpl/map/map20.hpp similarity index 100% rename from c++/include/boost/mpl/map/map20.hpp rename to c++/boost/mpl/map/map20.hpp diff --git a/c++/include/boost/mpl/map/map30.hpp b/c++/boost/mpl/map/map30.hpp similarity index 100% rename from c++/include/boost/mpl/map/map30.hpp rename to c++/boost/mpl/map/map30.hpp diff --git a/c++/include/boost/mpl/map/map40.hpp b/c++/boost/mpl/map/map40.hpp similarity index 100% rename from c++/include/boost/mpl/map/map40.hpp rename to c++/boost/mpl/map/map40.hpp diff --git a/c++/include/boost/mpl/map/map50.hpp b/c++/boost/mpl/map/map50.hpp similarity index 100% rename from c++/include/boost/mpl/map/map50.hpp rename to c++/boost/mpl/map/map50.hpp diff --git a/c++/include/boost/mpl/math/fixed_c.hpp b/c++/boost/mpl/math/fixed_c.hpp similarity index 100% rename from c++/include/boost/mpl/math/fixed_c.hpp rename to c++/boost/mpl/math/fixed_c.hpp diff --git a/c++/include/boost/mpl/math/is_even.hpp b/c++/boost/mpl/math/is_even.hpp similarity index 100% rename from c++/include/boost/mpl/math/is_even.hpp rename to c++/boost/mpl/math/is_even.hpp diff --git a/c++/include/boost/mpl/math/rational_c.hpp b/c++/boost/mpl/math/rational_c.hpp similarity index 100% rename from c++/include/boost/mpl/math/rational_c.hpp rename to c++/boost/mpl/math/rational_c.hpp diff --git a/c++/include/boost/mpl/max.hpp b/c++/boost/mpl/max.hpp similarity index 100% rename from c++/include/boost/mpl/max.hpp rename to c++/boost/mpl/max.hpp diff --git a/c++/include/boost/mpl/max_element.hpp b/c++/boost/mpl/max_element.hpp similarity index 100% rename from c++/include/boost/mpl/max_element.hpp rename to c++/boost/mpl/max_element.hpp diff --git a/c++/include/boost/mpl/min.hpp b/c++/boost/mpl/min.hpp similarity index 100% rename from c++/include/boost/mpl/min.hpp rename to c++/boost/mpl/min.hpp diff --git a/c++/include/boost/mpl/min_element.hpp b/c++/boost/mpl/min_element.hpp similarity index 100% rename from c++/include/boost/mpl/min_element.hpp rename to c++/boost/mpl/min_element.hpp diff --git a/c++/include/boost/mpl/min_max.hpp b/c++/boost/mpl/min_max.hpp similarity index 100% rename from c++/include/boost/mpl/min_max.hpp rename to c++/boost/mpl/min_max.hpp diff --git a/c++/include/boost/mpl/minus.hpp b/c++/boost/mpl/minus.hpp similarity index 100% rename from c++/include/boost/mpl/minus.hpp rename to c++/boost/mpl/minus.hpp diff --git a/c++/include/boost/mpl/modulus.hpp b/c++/boost/mpl/modulus.hpp similarity index 100% rename from c++/include/boost/mpl/modulus.hpp rename to c++/boost/mpl/modulus.hpp diff --git a/c++/include/boost/mpl/multiplies.hpp b/c++/boost/mpl/multiplies.hpp similarity index 100% rename from c++/include/boost/mpl/multiplies.hpp rename to c++/boost/mpl/multiplies.hpp diff --git a/c++/include/boost/mpl/multiset/aux_/count_impl.hpp b/c++/boost/mpl/multiset/aux_/count_impl.hpp similarity index 100% rename from c++/include/boost/mpl/multiset/aux_/count_impl.hpp rename to c++/boost/mpl/multiset/aux_/count_impl.hpp diff --git a/c++/include/boost/mpl/multiset/aux_/insert_impl.hpp b/c++/boost/mpl/multiset/aux_/insert_impl.hpp similarity index 100% rename from c++/include/boost/mpl/multiset/aux_/insert_impl.hpp rename to c++/boost/mpl/multiset/aux_/insert_impl.hpp diff --git a/c++/include/boost/mpl/multiset/aux_/item.hpp b/c++/boost/mpl/multiset/aux_/item.hpp similarity index 100% rename from c++/include/boost/mpl/multiset/aux_/item.hpp rename to c++/boost/mpl/multiset/aux_/item.hpp diff --git a/c++/include/boost/mpl/multiset/aux_/multiset0.hpp b/c++/boost/mpl/multiset/aux_/multiset0.hpp similarity index 100% rename from c++/include/boost/mpl/multiset/aux_/multiset0.hpp rename to c++/boost/mpl/multiset/aux_/multiset0.hpp diff --git a/c++/include/boost/mpl/multiset/aux_/tag.hpp b/c++/boost/mpl/multiset/aux_/tag.hpp similarity index 100% rename from c++/include/boost/mpl/multiset/aux_/tag.hpp rename to c++/boost/mpl/multiset/aux_/tag.hpp diff --git a/c++/include/boost/mpl/multiset/multiset0.hpp b/c++/boost/mpl/multiset/multiset0.hpp similarity index 100% rename from c++/include/boost/mpl/multiset/multiset0.hpp rename to c++/boost/mpl/multiset/multiset0.hpp diff --git a/c++/include/boost/mpl/negate.hpp b/c++/boost/mpl/negate.hpp similarity index 100% rename from c++/include/boost/mpl/negate.hpp rename to c++/boost/mpl/negate.hpp diff --git a/c++/include/boost/mpl/next.hpp b/c++/boost/mpl/next.hpp similarity index 100% rename from c++/include/boost/mpl/next.hpp rename to c++/boost/mpl/next.hpp diff --git a/c++/include/boost/mpl/next_prior.hpp b/c++/boost/mpl/next_prior.hpp similarity index 100% rename from c++/include/boost/mpl/next_prior.hpp rename to c++/boost/mpl/next_prior.hpp diff --git a/c++/include/boost/mpl/not.hpp b/c++/boost/mpl/not.hpp similarity index 100% rename from c++/include/boost/mpl/not.hpp rename to c++/boost/mpl/not.hpp diff --git a/c++/include/boost/mpl/not_equal_to.hpp b/c++/boost/mpl/not_equal_to.hpp similarity index 100% rename from c++/include/boost/mpl/not_equal_to.hpp rename to c++/boost/mpl/not_equal_to.hpp diff --git a/c++/include/boost/mpl/numeric_cast.hpp b/c++/boost/mpl/numeric_cast.hpp similarity index 100% rename from c++/include/boost/mpl/numeric_cast.hpp rename to c++/boost/mpl/numeric_cast.hpp diff --git a/c++/include/boost/mpl/or.hpp b/c++/boost/mpl/or.hpp similarity index 100% rename from c++/include/boost/mpl/or.hpp rename to c++/boost/mpl/or.hpp diff --git a/c++/include/boost/mpl/order.hpp b/c++/boost/mpl/order.hpp similarity index 100% rename from c++/include/boost/mpl/order.hpp rename to c++/boost/mpl/order.hpp diff --git a/c++/include/boost/mpl/order_fwd.hpp b/c++/boost/mpl/order_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/order_fwd.hpp rename to c++/boost/mpl/order_fwd.hpp diff --git a/c++/include/boost/mpl/pair.hpp b/c++/boost/mpl/pair.hpp similarity index 100% rename from c++/include/boost/mpl/pair.hpp rename to c++/boost/mpl/pair.hpp diff --git a/c++/include/boost/mpl/pair_view.hpp b/c++/boost/mpl/pair_view.hpp similarity index 100% rename from c++/include/boost/mpl/pair_view.hpp rename to c++/boost/mpl/pair_view.hpp diff --git a/c++/include/boost/mpl/partition.hpp b/c++/boost/mpl/partition.hpp similarity index 100% rename from c++/include/boost/mpl/partition.hpp rename to c++/boost/mpl/partition.hpp diff --git a/c++/include/boost/mpl/placeholders.hpp b/c++/boost/mpl/placeholders.hpp similarity index 100% rename from c++/include/boost/mpl/placeholders.hpp rename to c++/boost/mpl/placeholders.hpp diff --git a/c++/include/boost/mpl/plus.hpp b/c++/boost/mpl/plus.hpp similarity index 100% rename from c++/include/boost/mpl/plus.hpp rename to c++/boost/mpl/plus.hpp diff --git a/c++/include/boost/mpl/pop_back.hpp b/c++/boost/mpl/pop_back.hpp similarity index 100% rename from c++/include/boost/mpl/pop_back.hpp rename to c++/boost/mpl/pop_back.hpp diff --git a/c++/include/boost/mpl/pop_back_fwd.hpp b/c++/boost/mpl/pop_back_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/pop_back_fwd.hpp rename to c++/boost/mpl/pop_back_fwd.hpp diff --git a/c++/include/boost/mpl/pop_front.hpp b/c++/boost/mpl/pop_front.hpp similarity index 100% rename from c++/include/boost/mpl/pop_front.hpp rename to c++/boost/mpl/pop_front.hpp diff --git a/c++/include/boost/mpl/pop_front_fwd.hpp b/c++/boost/mpl/pop_front_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/pop_front_fwd.hpp rename to c++/boost/mpl/pop_front_fwd.hpp diff --git a/c++/include/boost/mpl/print.hpp b/c++/boost/mpl/print.hpp similarity index 100% rename from c++/include/boost/mpl/print.hpp rename to c++/boost/mpl/print.hpp diff --git a/c++/include/boost/mpl/prior.hpp b/c++/boost/mpl/prior.hpp similarity index 100% rename from c++/include/boost/mpl/prior.hpp rename to c++/boost/mpl/prior.hpp diff --git a/c++/include/boost/mpl/protect.hpp b/c++/boost/mpl/protect.hpp similarity index 100% rename from c++/include/boost/mpl/protect.hpp rename to c++/boost/mpl/protect.hpp diff --git a/c++/include/boost/mpl/push_back.hpp b/c++/boost/mpl/push_back.hpp similarity index 100% rename from c++/include/boost/mpl/push_back.hpp rename to c++/boost/mpl/push_back.hpp diff --git a/c++/include/boost/mpl/push_back_fwd.hpp b/c++/boost/mpl/push_back_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/push_back_fwd.hpp rename to c++/boost/mpl/push_back_fwd.hpp diff --git a/c++/include/boost/mpl/push_front.hpp b/c++/boost/mpl/push_front.hpp similarity index 100% rename from c++/include/boost/mpl/push_front.hpp rename to c++/boost/mpl/push_front.hpp diff --git a/c++/include/boost/mpl/push_front_fwd.hpp b/c++/boost/mpl/push_front_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/push_front_fwd.hpp rename to c++/boost/mpl/push_front_fwd.hpp diff --git a/c++/include/boost/mpl/quote.hpp b/c++/boost/mpl/quote.hpp similarity index 100% rename from c++/include/boost/mpl/quote.hpp rename to c++/boost/mpl/quote.hpp diff --git a/c++/include/boost/mpl/range_c.hpp b/c++/boost/mpl/range_c.hpp similarity index 100% rename from c++/include/boost/mpl/range_c.hpp rename to c++/boost/mpl/range_c.hpp diff --git a/c++/include/boost/mpl/remove.hpp b/c++/boost/mpl/remove.hpp similarity index 100% rename from c++/include/boost/mpl/remove.hpp rename to c++/boost/mpl/remove.hpp diff --git a/c++/include/boost/mpl/remove_if.hpp b/c++/boost/mpl/remove_if.hpp similarity index 100% rename from c++/include/boost/mpl/remove_if.hpp rename to c++/boost/mpl/remove_if.hpp diff --git a/c++/include/boost/mpl/replace.hpp b/c++/boost/mpl/replace.hpp similarity index 100% rename from c++/include/boost/mpl/replace.hpp rename to c++/boost/mpl/replace.hpp diff --git a/c++/include/boost/mpl/replace_if.hpp b/c++/boost/mpl/replace_if.hpp similarity index 100% rename from c++/include/boost/mpl/replace_if.hpp rename to c++/boost/mpl/replace_if.hpp diff --git a/c++/include/boost/mpl/reverse.hpp b/c++/boost/mpl/reverse.hpp similarity index 100% rename from c++/include/boost/mpl/reverse.hpp rename to c++/boost/mpl/reverse.hpp diff --git a/c++/include/boost/mpl/reverse_fold.hpp b/c++/boost/mpl/reverse_fold.hpp similarity index 100% rename from c++/include/boost/mpl/reverse_fold.hpp rename to c++/boost/mpl/reverse_fold.hpp diff --git a/c++/include/boost/mpl/reverse_iter_fold.hpp b/c++/boost/mpl/reverse_iter_fold.hpp similarity index 100% rename from c++/include/boost/mpl/reverse_iter_fold.hpp rename to c++/boost/mpl/reverse_iter_fold.hpp diff --git a/c++/include/boost/mpl/same_as.hpp b/c++/boost/mpl/same_as.hpp similarity index 100% rename from c++/include/boost/mpl/same_as.hpp rename to c++/boost/mpl/same_as.hpp diff --git a/c++/include/boost/mpl/sequence_tag.hpp b/c++/boost/mpl/sequence_tag.hpp similarity index 100% rename from c++/include/boost/mpl/sequence_tag.hpp rename to c++/boost/mpl/sequence_tag.hpp diff --git a/c++/include/boost/mpl/sequence_tag_fwd.hpp b/c++/boost/mpl/sequence_tag_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/sequence_tag_fwd.hpp rename to c++/boost/mpl/sequence_tag_fwd.hpp diff --git a/c++/include/boost/mpl/set.hpp b/c++/boost/mpl/set.hpp similarity index 100% rename from c++/include/boost/mpl/set.hpp rename to c++/boost/mpl/set.hpp diff --git a/c++/include/boost/mpl/set/aux_/at_impl.hpp b/c++/boost/mpl/set/aux_/at_impl.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/at_impl.hpp rename to c++/boost/mpl/set/aux_/at_impl.hpp diff --git a/c++/include/boost/mpl/set/aux_/begin_end_impl.hpp b/c++/boost/mpl/set/aux_/begin_end_impl.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/begin_end_impl.hpp rename to c++/boost/mpl/set/aux_/begin_end_impl.hpp diff --git a/c++/include/boost/mpl/set/aux_/clear_impl.hpp b/c++/boost/mpl/set/aux_/clear_impl.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/clear_impl.hpp rename to c++/boost/mpl/set/aux_/clear_impl.hpp diff --git a/c++/include/boost/mpl/set/aux_/empty_impl.hpp b/c++/boost/mpl/set/aux_/empty_impl.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/empty_impl.hpp rename to c++/boost/mpl/set/aux_/empty_impl.hpp diff --git a/c++/include/boost/mpl/set/aux_/erase_impl.hpp b/c++/boost/mpl/set/aux_/erase_impl.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/erase_impl.hpp rename to c++/boost/mpl/set/aux_/erase_impl.hpp diff --git a/c++/include/boost/mpl/set/aux_/erase_key_impl.hpp b/c++/boost/mpl/set/aux_/erase_key_impl.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/erase_key_impl.hpp rename to c++/boost/mpl/set/aux_/erase_key_impl.hpp diff --git a/c++/include/boost/mpl/set/aux_/has_key_impl.hpp b/c++/boost/mpl/set/aux_/has_key_impl.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/has_key_impl.hpp rename to c++/boost/mpl/set/aux_/has_key_impl.hpp diff --git a/c++/include/boost/mpl/set/aux_/include_preprocessed.hpp b/c++/boost/mpl/set/aux_/include_preprocessed.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/include_preprocessed.hpp rename to c++/boost/mpl/set/aux_/include_preprocessed.hpp diff --git a/c++/include/boost/mpl/set/aux_/insert_impl.hpp b/c++/boost/mpl/set/aux_/insert_impl.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/insert_impl.hpp rename to c++/boost/mpl/set/aux_/insert_impl.hpp diff --git a/c++/include/boost/mpl/set/aux_/insert_range_impl.hpp b/c++/boost/mpl/set/aux_/insert_range_impl.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/insert_range_impl.hpp rename to c++/boost/mpl/set/aux_/insert_range_impl.hpp diff --git a/c++/include/boost/mpl/set/aux_/item.hpp b/c++/boost/mpl/set/aux_/item.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/item.hpp rename to c++/boost/mpl/set/aux_/item.hpp diff --git a/c++/include/boost/mpl/set/aux_/iterator.hpp b/c++/boost/mpl/set/aux_/iterator.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/iterator.hpp rename to c++/boost/mpl/set/aux_/iterator.hpp diff --git a/c++/include/boost/mpl/set/aux_/key_type_impl.hpp b/c++/boost/mpl/set/aux_/key_type_impl.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/key_type_impl.hpp rename to c++/boost/mpl/set/aux_/key_type_impl.hpp diff --git a/c++/include/boost/mpl/set/aux_/numbered.hpp b/c++/boost/mpl/set/aux_/numbered.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/numbered.hpp rename to c++/boost/mpl/set/aux_/numbered.hpp diff --git a/c++/include/boost/mpl/set/aux_/numbered_c.hpp b/c++/boost/mpl/set/aux_/numbered_c.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/numbered_c.hpp rename to c++/boost/mpl/set/aux_/numbered_c.hpp diff --git a/c++/include/boost/mpl/set/aux_/preprocessed/plain/set10.hpp b/c++/boost/mpl/set/aux_/preprocessed/plain/set10.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/preprocessed/plain/set10.hpp rename to c++/boost/mpl/set/aux_/preprocessed/plain/set10.hpp diff --git a/c++/include/boost/mpl/set/aux_/preprocessed/plain/set10_c.hpp b/c++/boost/mpl/set/aux_/preprocessed/plain/set10_c.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/preprocessed/plain/set10_c.hpp rename to c++/boost/mpl/set/aux_/preprocessed/plain/set10_c.hpp diff --git a/c++/include/boost/mpl/set/aux_/preprocessed/plain/set20.hpp b/c++/boost/mpl/set/aux_/preprocessed/plain/set20.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/preprocessed/plain/set20.hpp rename to c++/boost/mpl/set/aux_/preprocessed/plain/set20.hpp diff --git a/c++/include/boost/mpl/set/aux_/preprocessed/plain/set20_c.hpp b/c++/boost/mpl/set/aux_/preprocessed/plain/set20_c.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/preprocessed/plain/set20_c.hpp rename to c++/boost/mpl/set/aux_/preprocessed/plain/set20_c.hpp diff --git a/c++/include/boost/mpl/set/aux_/preprocessed/plain/set30.hpp b/c++/boost/mpl/set/aux_/preprocessed/plain/set30.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/preprocessed/plain/set30.hpp rename to c++/boost/mpl/set/aux_/preprocessed/plain/set30.hpp diff --git a/c++/include/boost/mpl/set/aux_/preprocessed/plain/set30_c.hpp b/c++/boost/mpl/set/aux_/preprocessed/plain/set30_c.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/preprocessed/plain/set30_c.hpp rename to c++/boost/mpl/set/aux_/preprocessed/plain/set30_c.hpp diff --git a/c++/include/boost/mpl/set/aux_/preprocessed/plain/set40.hpp b/c++/boost/mpl/set/aux_/preprocessed/plain/set40.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/preprocessed/plain/set40.hpp rename to c++/boost/mpl/set/aux_/preprocessed/plain/set40.hpp diff --git a/c++/include/boost/mpl/set/aux_/preprocessed/plain/set40_c.hpp b/c++/boost/mpl/set/aux_/preprocessed/plain/set40_c.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/preprocessed/plain/set40_c.hpp rename to c++/boost/mpl/set/aux_/preprocessed/plain/set40_c.hpp diff --git a/c++/include/boost/mpl/set/aux_/preprocessed/plain/set50.hpp b/c++/boost/mpl/set/aux_/preprocessed/plain/set50.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/preprocessed/plain/set50.hpp rename to c++/boost/mpl/set/aux_/preprocessed/plain/set50.hpp diff --git a/c++/include/boost/mpl/set/aux_/preprocessed/plain/set50_c.hpp b/c++/boost/mpl/set/aux_/preprocessed/plain/set50_c.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/preprocessed/plain/set50_c.hpp rename to c++/boost/mpl/set/aux_/preprocessed/plain/set50_c.hpp diff --git a/c++/include/boost/mpl/set/aux_/set0.hpp b/c++/boost/mpl/set/aux_/set0.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/set0.hpp rename to c++/boost/mpl/set/aux_/set0.hpp diff --git a/c++/include/boost/mpl/set/aux_/size_impl.hpp b/c++/boost/mpl/set/aux_/size_impl.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/size_impl.hpp rename to c++/boost/mpl/set/aux_/size_impl.hpp diff --git a/c++/include/boost/mpl/set/aux_/tag.hpp b/c++/boost/mpl/set/aux_/tag.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/tag.hpp rename to c++/boost/mpl/set/aux_/tag.hpp diff --git a/c++/include/boost/mpl/set/aux_/value_type_impl.hpp b/c++/boost/mpl/set/aux_/value_type_impl.hpp similarity index 100% rename from c++/include/boost/mpl/set/aux_/value_type_impl.hpp rename to c++/boost/mpl/set/aux_/value_type_impl.hpp diff --git a/c++/include/boost/mpl/set/set0.hpp b/c++/boost/mpl/set/set0.hpp similarity index 100% rename from c++/include/boost/mpl/set/set0.hpp rename to c++/boost/mpl/set/set0.hpp diff --git a/c++/include/boost/mpl/set/set0_c.hpp b/c++/boost/mpl/set/set0_c.hpp similarity index 100% rename from c++/include/boost/mpl/set/set0_c.hpp rename to c++/boost/mpl/set/set0_c.hpp diff --git a/c++/include/boost/mpl/set/set10.hpp b/c++/boost/mpl/set/set10.hpp similarity index 100% rename from c++/include/boost/mpl/set/set10.hpp rename to c++/boost/mpl/set/set10.hpp diff --git a/c++/include/boost/mpl/set/set10_c.hpp b/c++/boost/mpl/set/set10_c.hpp similarity index 100% rename from c++/include/boost/mpl/set/set10_c.hpp rename to c++/boost/mpl/set/set10_c.hpp diff --git a/c++/include/boost/mpl/set/set20.hpp b/c++/boost/mpl/set/set20.hpp similarity index 100% rename from c++/include/boost/mpl/set/set20.hpp rename to c++/boost/mpl/set/set20.hpp diff --git a/c++/include/boost/mpl/set/set20_c.hpp b/c++/boost/mpl/set/set20_c.hpp similarity index 100% rename from c++/include/boost/mpl/set/set20_c.hpp rename to c++/boost/mpl/set/set20_c.hpp diff --git a/c++/include/boost/mpl/set/set30.hpp b/c++/boost/mpl/set/set30.hpp similarity index 100% rename from c++/include/boost/mpl/set/set30.hpp rename to c++/boost/mpl/set/set30.hpp diff --git a/c++/include/boost/mpl/set/set30_c.hpp b/c++/boost/mpl/set/set30_c.hpp similarity index 100% rename from c++/include/boost/mpl/set/set30_c.hpp rename to c++/boost/mpl/set/set30_c.hpp diff --git a/c++/include/boost/mpl/set/set40.hpp b/c++/boost/mpl/set/set40.hpp similarity index 100% rename from c++/include/boost/mpl/set/set40.hpp rename to c++/boost/mpl/set/set40.hpp diff --git a/c++/include/boost/mpl/set/set40_c.hpp b/c++/boost/mpl/set/set40_c.hpp similarity index 100% rename from c++/include/boost/mpl/set/set40_c.hpp rename to c++/boost/mpl/set/set40_c.hpp diff --git a/c++/include/boost/mpl/set/set50.hpp b/c++/boost/mpl/set/set50.hpp similarity index 100% rename from c++/include/boost/mpl/set/set50.hpp rename to c++/boost/mpl/set/set50.hpp diff --git a/c++/include/boost/mpl/set/set50_c.hpp b/c++/boost/mpl/set/set50_c.hpp similarity index 100% rename from c++/include/boost/mpl/set/set50_c.hpp rename to c++/boost/mpl/set/set50_c.hpp diff --git a/c++/include/boost/mpl/set_c.hpp b/c++/boost/mpl/set_c.hpp similarity index 100% rename from c++/include/boost/mpl/set_c.hpp rename to c++/boost/mpl/set_c.hpp diff --git a/c++/include/boost/mpl/shift_left.hpp b/c++/boost/mpl/shift_left.hpp similarity index 100% rename from c++/include/boost/mpl/shift_left.hpp rename to c++/boost/mpl/shift_left.hpp diff --git a/c++/include/boost/mpl/shift_right.hpp b/c++/boost/mpl/shift_right.hpp similarity index 100% rename from c++/include/boost/mpl/shift_right.hpp rename to c++/boost/mpl/shift_right.hpp diff --git a/c++/include/boost/mpl/single_view.hpp b/c++/boost/mpl/single_view.hpp similarity index 100% rename from c++/include/boost/mpl/single_view.hpp rename to c++/boost/mpl/single_view.hpp diff --git a/c++/include/boost/mpl/size.hpp b/c++/boost/mpl/size.hpp similarity index 100% rename from c++/include/boost/mpl/size.hpp rename to c++/boost/mpl/size.hpp diff --git a/c++/include/boost/mpl/size_fwd.hpp b/c++/boost/mpl/size_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/size_fwd.hpp rename to c++/boost/mpl/size_fwd.hpp diff --git a/c++/include/boost/mpl/size_t.hpp b/c++/boost/mpl/size_t.hpp similarity index 100% rename from c++/include/boost/mpl/size_t.hpp rename to c++/boost/mpl/size_t.hpp diff --git a/c++/include/boost/mpl/size_t_fwd.hpp b/c++/boost/mpl/size_t_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/size_t_fwd.hpp rename to c++/boost/mpl/size_t_fwd.hpp diff --git a/c++/include/boost/mpl/sizeof.hpp b/c++/boost/mpl/sizeof.hpp similarity index 100% rename from c++/include/boost/mpl/sizeof.hpp rename to c++/boost/mpl/sizeof.hpp diff --git a/c++/include/boost/mpl/sort.hpp b/c++/boost/mpl/sort.hpp similarity index 100% rename from c++/include/boost/mpl/sort.hpp rename to c++/boost/mpl/sort.hpp diff --git a/c++/include/boost/mpl/stable_partition.hpp b/c++/boost/mpl/stable_partition.hpp similarity index 100% rename from c++/include/boost/mpl/stable_partition.hpp rename to c++/boost/mpl/stable_partition.hpp diff --git a/c++/include/boost/mpl/string.hpp b/c++/boost/mpl/string.hpp similarity index 100% rename from c++/include/boost/mpl/string.hpp rename to c++/boost/mpl/string.hpp diff --git a/c++/include/boost/mpl/switch.hpp b/c++/boost/mpl/switch.hpp similarity index 100% rename from c++/include/boost/mpl/switch.hpp rename to c++/boost/mpl/switch.hpp diff --git a/c++/include/boost/mpl/tag.hpp b/c++/boost/mpl/tag.hpp similarity index 100% rename from c++/include/boost/mpl/tag.hpp rename to c++/boost/mpl/tag.hpp diff --git a/c++/include/boost/mpl/times.hpp b/c++/boost/mpl/times.hpp similarity index 100% rename from c++/include/boost/mpl/times.hpp rename to c++/boost/mpl/times.hpp diff --git a/c++/include/boost/mpl/transform.hpp b/c++/boost/mpl/transform.hpp similarity index 100% rename from c++/include/boost/mpl/transform.hpp rename to c++/boost/mpl/transform.hpp diff --git a/c++/include/boost/mpl/transform_view.hpp b/c++/boost/mpl/transform_view.hpp similarity index 100% rename from c++/include/boost/mpl/transform_view.hpp rename to c++/boost/mpl/transform_view.hpp diff --git a/c++/include/boost/mpl/unique.hpp b/c++/boost/mpl/unique.hpp similarity index 100% rename from c++/include/boost/mpl/unique.hpp rename to c++/boost/mpl/unique.hpp diff --git a/c++/include/boost/mpl/unpack_args.hpp b/c++/boost/mpl/unpack_args.hpp similarity index 100% rename from c++/include/boost/mpl/unpack_args.hpp rename to c++/boost/mpl/unpack_args.hpp diff --git a/c++/include/boost/mpl/upper_bound.hpp b/c++/boost/mpl/upper_bound.hpp similarity index 100% rename from c++/include/boost/mpl/upper_bound.hpp rename to c++/boost/mpl/upper_bound.hpp diff --git a/c++/include/boost/mpl/value_type.hpp b/c++/boost/mpl/value_type.hpp similarity index 100% rename from c++/include/boost/mpl/value_type.hpp rename to c++/boost/mpl/value_type.hpp diff --git a/c++/include/boost/mpl/value_type_fwd.hpp b/c++/boost/mpl/value_type_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/value_type_fwd.hpp rename to c++/boost/mpl/value_type_fwd.hpp diff --git a/c++/include/boost/mpl/vector.hpp b/c++/boost/mpl/vector.hpp similarity index 100% rename from c++/include/boost/mpl/vector.hpp rename to c++/boost/mpl/vector.hpp diff --git a/c++/include/boost/mpl/vector/aux_/O1_size.hpp b/c++/boost/mpl/vector/aux_/O1_size.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/O1_size.hpp rename to c++/boost/mpl/vector/aux_/O1_size.hpp diff --git a/c++/include/boost/mpl/vector/aux_/at.hpp b/c++/boost/mpl/vector/aux_/at.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/at.hpp rename to c++/boost/mpl/vector/aux_/at.hpp diff --git a/c++/include/boost/mpl/vector/aux_/back.hpp b/c++/boost/mpl/vector/aux_/back.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/back.hpp rename to c++/boost/mpl/vector/aux_/back.hpp diff --git a/c++/include/boost/mpl/vector/aux_/begin_end.hpp b/c++/boost/mpl/vector/aux_/begin_end.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/begin_end.hpp rename to c++/boost/mpl/vector/aux_/begin_end.hpp diff --git a/c++/include/boost/mpl/vector/aux_/clear.hpp b/c++/boost/mpl/vector/aux_/clear.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/clear.hpp rename to c++/boost/mpl/vector/aux_/clear.hpp diff --git a/c++/include/boost/mpl/vector/aux_/empty.hpp b/c++/boost/mpl/vector/aux_/empty.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/empty.hpp rename to c++/boost/mpl/vector/aux_/empty.hpp diff --git a/c++/include/boost/mpl/vector/aux_/front.hpp b/c++/boost/mpl/vector/aux_/front.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/front.hpp rename to c++/boost/mpl/vector/aux_/front.hpp diff --git a/c++/include/boost/mpl/vector/aux_/include_preprocessed.hpp b/c++/boost/mpl/vector/aux_/include_preprocessed.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/include_preprocessed.hpp rename to c++/boost/mpl/vector/aux_/include_preprocessed.hpp diff --git a/c++/include/boost/mpl/vector/aux_/item.hpp b/c++/boost/mpl/vector/aux_/item.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/item.hpp rename to c++/boost/mpl/vector/aux_/item.hpp diff --git a/c++/include/boost/mpl/vector/aux_/iterator.hpp b/c++/boost/mpl/vector/aux_/iterator.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/iterator.hpp rename to c++/boost/mpl/vector/aux_/iterator.hpp diff --git a/c++/include/boost/mpl/vector/aux_/numbered.hpp b/c++/boost/mpl/vector/aux_/numbered.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/numbered.hpp rename to c++/boost/mpl/vector/aux_/numbered.hpp diff --git a/c++/include/boost/mpl/vector/aux_/numbered_c.hpp b/c++/boost/mpl/vector/aux_/numbered_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/numbered_c.hpp rename to c++/boost/mpl/vector/aux_/numbered_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/pop_back.hpp b/c++/boost/mpl/vector/aux_/pop_back.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/pop_back.hpp rename to c++/boost/mpl/vector/aux_/pop_back.hpp diff --git a/c++/include/boost/mpl/vector/aux_/pop_front.hpp b/c++/boost/mpl/vector/aux_/pop_front.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/pop_front.hpp rename to c++/boost/mpl/vector/aux_/pop_front.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector10.hpp b/c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector10.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector10.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector10.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector10_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector10_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector10_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector10_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector20.hpp b/c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector20.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector20.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector20.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector20_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector20_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector20_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector20_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector30.hpp b/c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector30.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector30.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector30.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector30_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector30_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector30_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector30_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector40.hpp b/c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector40.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector40.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector40.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector40_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector40_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector40_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector40_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector50.hpp b/c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector50.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector50.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector50.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector50_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector50_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/no_ctps/vector50_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/no_ctps/vector50_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector10.hpp b/c++/boost/mpl/vector/aux_/preprocessed/plain/vector10.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector10.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/plain/vector10.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector10_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/plain/vector10_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector10_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/plain/vector10_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector20.hpp b/c++/boost/mpl/vector/aux_/preprocessed/plain/vector20.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector20.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/plain/vector20.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector20_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/plain/vector20_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector20_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/plain/vector20_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector30.hpp b/c++/boost/mpl/vector/aux_/preprocessed/plain/vector30.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector30.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/plain/vector30.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector30_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/plain/vector30_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector30_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/plain/vector30_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector40.hpp b/c++/boost/mpl/vector/aux_/preprocessed/plain/vector40.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector40.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/plain/vector40.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector40_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/plain/vector40_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector40_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/plain/vector40_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector50.hpp b/c++/boost/mpl/vector/aux_/preprocessed/plain/vector50.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector50.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/plain/vector50.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector50_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/plain/vector50_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/plain/vector50_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/plain/vector50_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10.hpp b/c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20.hpp b/c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector30.hpp b/c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector30.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector30.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector30.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector30_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector30_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector30_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector30_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector40.hpp b/c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector40.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector40.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector40.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector40_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector40_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector40_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector40_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector50.hpp b/c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector50.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector50.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector50.hpp diff --git a/c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector50_c.hpp b/c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector50_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/preprocessed/typeof_based/vector50_c.hpp rename to c++/boost/mpl/vector/aux_/preprocessed/typeof_based/vector50_c.hpp diff --git a/c++/include/boost/mpl/vector/aux_/push_back.hpp b/c++/boost/mpl/vector/aux_/push_back.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/push_back.hpp rename to c++/boost/mpl/vector/aux_/push_back.hpp diff --git a/c++/include/boost/mpl/vector/aux_/push_front.hpp b/c++/boost/mpl/vector/aux_/push_front.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/push_front.hpp rename to c++/boost/mpl/vector/aux_/push_front.hpp diff --git a/c++/include/boost/mpl/vector/aux_/size.hpp b/c++/boost/mpl/vector/aux_/size.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/size.hpp rename to c++/boost/mpl/vector/aux_/size.hpp diff --git a/c++/include/boost/mpl/vector/aux_/tag.hpp b/c++/boost/mpl/vector/aux_/tag.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/tag.hpp rename to c++/boost/mpl/vector/aux_/tag.hpp diff --git a/c++/include/boost/mpl/vector/aux_/vector0.hpp b/c++/boost/mpl/vector/aux_/vector0.hpp similarity index 100% rename from c++/include/boost/mpl/vector/aux_/vector0.hpp rename to c++/boost/mpl/vector/aux_/vector0.hpp diff --git a/c++/include/boost/mpl/vector/vector0.hpp b/c++/boost/mpl/vector/vector0.hpp similarity index 100% rename from c++/include/boost/mpl/vector/vector0.hpp rename to c++/boost/mpl/vector/vector0.hpp diff --git a/c++/include/boost/mpl/vector/vector0_c.hpp b/c++/boost/mpl/vector/vector0_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/vector0_c.hpp rename to c++/boost/mpl/vector/vector0_c.hpp diff --git a/c++/include/boost/mpl/vector/vector10.hpp b/c++/boost/mpl/vector/vector10.hpp similarity index 100% rename from c++/include/boost/mpl/vector/vector10.hpp rename to c++/boost/mpl/vector/vector10.hpp diff --git a/c++/include/boost/mpl/vector/vector10_c.hpp b/c++/boost/mpl/vector/vector10_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/vector10_c.hpp rename to c++/boost/mpl/vector/vector10_c.hpp diff --git a/c++/include/boost/mpl/vector/vector20.hpp b/c++/boost/mpl/vector/vector20.hpp similarity index 100% rename from c++/include/boost/mpl/vector/vector20.hpp rename to c++/boost/mpl/vector/vector20.hpp diff --git a/c++/include/boost/mpl/vector/vector20_c.hpp b/c++/boost/mpl/vector/vector20_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/vector20_c.hpp rename to c++/boost/mpl/vector/vector20_c.hpp diff --git a/c++/include/boost/mpl/vector/vector30.hpp b/c++/boost/mpl/vector/vector30.hpp similarity index 100% rename from c++/include/boost/mpl/vector/vector30.hpp rename to c++/boost/mpl/vector/vector30.hpp diff --git a/c++/include/boost/mpl/vector/vector30_c.hpp b/c++/boost/mpl/vector/vector30_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/vector30_c.hpp rename to c++/boost/mpl/vector/vector30_c.hpp diff --git a/c++/include/boost/mpl/vector/vector40.hpp b/c++/boost/mpl/vector/vector40.hpp similarity index 100% rename from c++/include/boost/mpl/vector/vector40.hpp rename to c++/boost/mpl/vector/vector40.hpp diff --git a/c++/include/boost/mpl/vector/vector40_c.hpp b/c++/boost/mpl/vector/vector40_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/vector40_c.hpp rename to c++/boost/mpl/vector/vector40_c.hpp diff --git a/c++/include/boost/mpl/vector/vector50.hpp b/c++/boost/mpl/vector/vector50.hpp similarity index 100% rename from c++/include/boost/mpl/vector/vector50.hpp rename to c++/boost/mpl/vector/vector50.hpp diff --git a/c++/include/boost/mpl/vector/vector50_c.hpp b/c++/boost/mpl/vector/vector50_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector/vector50_c.hpp rename to c++/boost/mpl/vector/vector50_c.hpp diff --git a/c++/include/boost/mpl/vector_c.hpp b/c++/boost/mpl/vector_c.hpp similarity index 100% rename from c++/include/boost/mpl/vector_c.hpp rename to c++/boost/mpl/vector_c.hpp diff --git a/c++/include/boost/mpl/void.hpp b/c++/boost/mpl/void.hpp similarity index 100% rename from c++/include/boost/mpl/void.hpp rename to c++/boost/mpl/void.hpp diff --git a/c++/include/boost/mpl/void_fwd.hpp b/c++/boost/mpl/void_fwd.hpp similarity index 100% rename from c++/include/boost/mpl/void_fwd.hpp rename to c++/boost/mpl/void_fwd.hpp diff --git a/c++/include/boost/mpl/zip_view.hpp b/c++/boost/mpl/zip_view.hpp similarity index 100% rename from c++/include/boost/mpl/zip_view.hpp rename to c++/boost/mpl/zip_view.hpp diff --git a/c++/include/boost/multi_array.hpp b/c++/boost/multi_array.hpp similarity index 100% rename from c++/include/boost/multi_array.hpp rename to c++/boost/multi_array.hpp diff --git a/c++/include/boost/multi_index_container.hpp b/c++/boost/multi_index_container.hpp similarity index 100% rename from c++/include/boost/multi_index_container.hpp rename to c++/boost/multi_index_container.hpp diff --git a/c++/include/boost/multi_index_container_fwd.hpp b/c++/boost/multi_index_container_fwd.hpp similarity index 100% rename from c++/include/boost/multi_index_container_fwd.hpp rename to c++/boost/multi_index_container_fwd.hpp diff --git a/c++/include/boost/mysql.hpp b/c++/boost/mysql.hpp similarity index 100% rename from c++/include/boost/mysql.hpp rename to c++/boost/mysql.hpp diff --git a/c++/include/boost/next_prior.hpp b/c++/boost/next_prior.hpp similarity index 100% rename from c++/include/boost/next_prior.hpp rename to c++/boost/next_prior.hpp diff --git a/c++/include/boost/non_type.hpp b/c++/boost/non_type.hpp similarity index 100% rename from c++/include/boost/non_type.hpp rename to c++/boost/non_type.hpp diff --git a/c++/include/boost/noncopyable.hpp b/c++/boost/noncopyable.hpp similarity index 100% rename from c++/include/boost/noncopyable.hpp rename to c++/boost/noncopyable.hpp diff --git a/c++/include/boost/nondet_random.hpp b/c++/boost/nondet_random.hpp similarity index 100% rename from c++/include/boost/nondet_random.hpp rename to c++/boost/nondet_random.hpp diff --git a/c++/include/boost/none.hpp b/c++/boost/none.hpp similarity index 100% rename from c++/include/boost/none.hpp rename to c++/boost/none.hpp diff --git a/c++/include/boost/none_t.hpp b/c++/boost/none_t.hpp similarity index 100% rename from c++/include/boost/none_t.hpp rename to c++/boost/none_t.hpp diff --git a/c++/include/boost/numeric/conversion/bounds.hpp b/c++/boost/numeric/conversion/bounds.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/bounds.hpp rename to c++/boost/numeric/conversion/bounds.hpp diff --git a/c++/include/boost/numeric/conversion/cast.hpp b/c++/boost/numeric/conversion/cast.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/cast.hpp rename to c++/boost/numeric/conversion/cast.hpp diff --git a/c++/include/boost/numeric/conversion/conversion_traits.hpp b/c++/boost/numeric/conversion/conversion_traits.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/conversion_traits.hpp rename to c++/boost/numeric/conversion/conversion_traits.hpp diff --git a/c++/include/boost/numeric/conversion/converter.hpp b/c++/boost/numeric/conversion/converter.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/converter.hpp rename to c++/boost/numeric/conversion/converter.hpp diff --git a/c++/include/boost/numeric/conversion/converter_policies.hpp b/c++/boost/numeric/conversion/converter_policies.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/converter_policies.hpp rename to c++/boost/numeric/conversion/converter_policies.hpp diff --git a/c++/include/boost/numeric/conversion/detail/bounds.hpp b/c++/boost/numeric/conversion/detail/bounds.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/detail/bounds.hpp rename to c++/boost/numeric/conversion/detail/bounds.hpp diff --git a/c++/include/boost/numeric/conversion/detail/conversion_traits.hpp b/c++/boost/numeric/conversion/detail/conversion_traits.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/detail/conversion_traits.hpp rename to c++/boost/numeric/conversion/detail/conversion_traits.hpp diff --git a/c++/include/boost/numeric/conversion/detail/converter.hpp b/c++/boost/numeric/conversion/detail/converter.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/detail/converter.hpp rename to c++/boost/numeric/conversion/detail/converter.hpp diff --git a/c++/include/boost/numeric/conversion/detail/int_float_mixture.hpp b/c++/boost/numeric/conversion/detail/int_float_mixture.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/detail/int_float_mixture.hpp rename to c++/boost/numeric/conversion/detail/int_float_mixture.hpp diff --git a/c++/include/boost/numeric/conversion/detail/is_subranged.hpp b/c++/boost/numeric/conversion/detail/is_subranged.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/detail/is_subranged.hpp rename to c++/boost/numeric/conversion/detail/is_subranged.hpp diff --git a/c++/include/boost/numeric/conversion/detail/meta.hpp b/c++/boost/numeric/conversion/detail/meta.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/detail/meta.hpp rename to c++/boost/numeric/conversion/detail/meta.hpp diff --git a/c++/include/boost/numeric/conversion/detail/numeric_cast_traits.hpp b/c++/boost/numeric/conversion/detail/numeric_cast_traits.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/detail/numeric_cast_traits.hpp rename to c++/boost/numeric/conversion/detail/numeric_cast_traits.hpp diff --git a/c++/include/boost/numeric/conversion/detail/old_numeric_cast.hpp b/c++/boost/numeric/conversion/detail/old_numeric_cast.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/detail/old_numeric_cast.hpp rename to c++/boost/numeric/conversion/detail/old_numeric_cast.hpp diff --git a/c++/include/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_common.hpp b/c++/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_common.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_common.hpp rename to c++/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_common.hpp diff --git a/c++/include/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_long_long.hpp b/c++/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_long_long.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_long_long.hpp rename to c++/boost/numeric/conversion/detail/preprocessed/numeric_cast_traits_long_long.hpp diff --git a/c++/include/boost/numeric/conversion/detail/sign_mixture.hpp b/c++/boost/numeric/conversion/detail/sign_mixture.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/detail/sign_mixture.hpp rename to c++/boost/numeric/conversion/detail/sign_mixture.hpp diff --git a/c++/include/boost/numeric/conversion/detail/udt_builtin_mixture.hpp b/c++/boost/numeric/conversion/detail/udt_builtin_mixture.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/detail/udt_builtin_mixture.hpp rename to c++/boost/numeric/conversion/detail/udt_builtin_mixture.hpp diff --git a/c++/include/boost/numeric/conversion/int_float_mixture.hpp b/c++/boost/numeric/conversion/int_float_mixture.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/int_float_mixture.hpp rename to c++/boost/numeric/conversion/int_float_mixture.hpp diff --git a/c++/include/boost/numeric/conversion/int_float_mixture_enum.hpp b/c++/boost/numeric/conversion/int_float_mixture_enum.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/int_float_mixture_enum.hpp rename to c++/boost/numeric/conversion/int_float_mixture_enum.hpp diff --git a/c++/include/boost/numeric/conversion/is_subranged.hpp b/c++/boost/numeric/conversion/is_subranged.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/is_subranged.hpp rename to c++/boost/numeric/conversion/is_subranged.hpp diff --git a/c++/include/boost/numeric/conversion/numeric_cast_traits.hpp b/c++/boost/numeric/conversion/numeric_cast_traits.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/numeric_cast_traits.hpp rename to c++/boost/numeric/conversion/numeric_cast_traits.hpp diff --git a/c++/include/boost/numeric/conversion/sign_mixture.hpp b/c++/boost/numeric/conversion/sign_mixture.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/sign_mixture.hpp rename to c++/boost/numeric/conversion/sign_mixture.hpp diff --git a/c++/include/boost/numeric/conversion/sign_mixture_enum.hpp b/c++/boost/numeric/conversion/sign_mixture_enum.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/sign_mixture_enum.hpp rename to c++/boost/numeric/conversion/sign_mixture_enum.hpp diff --git a/c++/include/boost/numeric/conversion/udt_builtin_mixture.hpp b/c++/boost/numeric/conversion/udt_builtin_mixture.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/udt_builtin_mixture.hpp rename to c++/boost/numeric/conversion/udt_builtin_mixture.hpp diff --git a/c++/include/boost/numeric/conversion/udt_builtin_mixture_enum.hpp b/c++/boost/numeric/conversion/udt_builtin_mixture_enum.hpp similarity index 100% rename from c++/include/boost/numeric/conversion/udt_builtin_mixture_enum.hpp rename to c++/boost/numeric/conversion/udt_builtin_mixture_enum.hpp diff --git a/c++/include/boost/numeric/interval.hpp b/c++/boost/numeric/interval.hpp similarity index 100% rename from c++/include/boost/numeric/interval.hpp rename to c++/boost/numeric/interval.hpp diff --git a/c++/include/boost/numeric/interval/arith.hpp b/c++/boost/numeric/interval/arith.hpp similarity index 100% rename from c++/include/boost/numeric/interval/arith.hpp rename to c++/boost/numeric/interval/arith.hpp diff --git a/c++/include/boost/numeric/interval/arith2.hpp b/c++/boost/numeric/interval/arith2.hpp similarity index 100% rename from c++/include/boost/numeric/interval/arith2.hpp rename to c++/boost/numeric/interval/arith2.hpp diff --git a/c++/include/boost/numeric/interval/arith3.hpp b/c++/boost/numeric/interval/arith3.hpp similarity index 100% rename from c++/include/boost/numeric/interval/arith3.hpp rename to c++/boost/numeric/interval/arith3.hpp diff --git a/c++/include/boost/numeric/interval/checking.hpp b/c++/boost/numeric/interval/checking.hpp similarity index 100% rename from c++/include/boost/numeric/interval/checking.hpp rename to c++/boost/numeric/interval/checking.hpp diff --git a/c++/include/boost/numeric/interval/compare.hpp b/c++/boost/numeric/interval/compare.hpp similarity index 100% rename from c++/include/boost/numeric/interval/compare.hpp rename to c++/boost/numeric/interval/compare.hpp diff --git a/c++/include/boost/numeric/interval/compare/certain.hpp b/c++/boost/numeric/interval/compare/certain.hpp similarity index 100% rename from c++/include/boost/numeric/interval/compare/certain.hpp rename to c++/boost/numeric/interval/compare/certain.hpp diff --git a/c++/include/boost/numeric/interval/compare/explicit.hpp b/c++/boost/numeric/interval/compare/explicit.hpp similarity index 100% rename from c++/include/boost/numeric/interval/compare/explicit.hpp rename to c++/boost/numeric/interval/compare/explicit.hpp diff --git a/c++/include/boost/numeric/interval/compare/lexicographic.hpp b/c++/boost/numeric/interval/compare/lexicographic.hpp similarity index 100% rename from c++/include/boost/numeric/interval/compare/lexicographic.hpp rename to c++/boost/numeric/interval/compare/lexicographic.hpp diff --git a/c++/include/boost/numeric/interval/compare/possible.hpp b/c++/boost/numeric/interval/compare/possible.hpp similarity index 100% rename from c++/include/boost/numeric/interval/compare/possible.hpp rename to c++/boost/numeric/interval/compare/possible.hpp diff --git a/c++/include/boost/numeric/interval/compare/set.hpp b/c++/boost/numeric/interval/compare/set.hpp similarity index 100% rename from c++/include/boost/numeric/interval/compare/set.hpp rename to c++/boost/numeric/interval/compare/set.hpp diff --git a/c++/include/boost/numeric/interval/compare/tribool.hpp b/c++/boost/numeric/interval/compare/tribool.hpp similarity index 100% rename from c++/include/boost/numeric/interval/compare/tribool.hpp rename to c++/boost/numeric/interval/compare/tribool.hpp diff --git a/c++/include/boost/numeric/interval/constants.hpp b/c++/boost/numeric/interval/constants.hpp similarity index 100% rename from c++/include/boost/numeric/interval/constants.hpp rename to c++/boost/numeric/interval/constants.hpp diff --git a/c++/include/boost/numeric/interval/detail/alpha_rounding_control.hpp b/c++/boost/numeric/interval/detail/alpha_rounding_control.hpp similarity index 100% rename from c++/include/boost/numeric/interval/detail/alpha_rounding_control.hpp rename to c++/boost/numeric/interval/detail/alpha_rounding_control.hpp diff --git a/c++/include/boost/numeric/interval/detail/bcc_rounding_control.hpp b/c++/boost/numeric/interval/detail/bcc_rounding_control.hpp similarity index 100% rename from c++/include/boost/numeric/interval/detail/bcc_rounding_control.hpp rename to c++/boost/numeric/interval/detail/bcc_rounding_control.hpp diff --git a/c++/include/boost/numeric/interval/detail/bugs.hpp b/c++/boost/numeric/interval/detail/bugs.hpp similarity index 100% rename from c++/include/boost/numeric/interval/detail/bugs.hpp rename to c++/boost/numeric/interval/detail/bugs.hpp diff --git a/c++/include/boost/numeric/interval/detail/c99_rounding_control.hpp b/c++/boost/numeric/interval/detail/c99_rounding_control.hpp similarity index 100% rename from c++/include/boost/numeric/interval/detail/c99_rounding_control.hpp rename to c++/boost/numeric/interval/detail/c99_rounding_control.hpp diff --git a/c++/include/boost/numeric/interval/detail/c99sub_rounding_control.hpp b/c++/boost/numeric/interval/detail/c99sub_rounding_control.hpp similarity index 100% rename from c++/include/boost/numeric/interval/detail/c99sub_rounding_control.hpp rename to c++/boost/numeric/interval/detail/c99sub_rounding_control.hpp diff --git a/c++/include/boost/numeric/interval/detail/division.hpp b/c++/boost/numeric/interval/detail/division.hpp similarity index 100% rename from c++/include/boost/numeric/interval/detail/division.hpp rename to c++/boost/numeric/interval/detail/division.hpp diff --git a/c++/include/boost/numeric/interval/detail/ia64_rounding_control.hpp b/c++/boost/numeric/interval/detail/ia64_rounding_control.hpp similarity index 100% rename from c++/include/boost/numeric/interval/detail/ia64_rounding_control.hpp rename to c++/boost/numeric/interval/detail/ia64_rounding_control.hpp diff --git a/c++/include/boost/numeric/interval/detail/interval_prototype.hpp b/c++/boost/numeric/interval/detail/interval_prototype.hpp similarity index 100% rename from c++/include/boost/numeric/interval/detail/interval_prototype.hpp rename to c++/boost/numeric/interval/detail/interval_prototype.hpp diff --git a/c++/include/boost/numeric/interval/detail/msvc_rounding_control.hpp b/c++/boost/numeric/interval/detail/msvc_rounding_control.hpp similarity index 100% rename from c++/include/boost/numeric/interval/detail/msvc_rounding_control.hpp rename to c++/boost/numeric/interval/detail/msvc_rounding_control.hpp diff --git a/c++/include/boost/numeric/interval/detail/ppc_rounding_control.hpp b/c++/boost/numeric/interval/detail/ppc_rounding_control.hpp similarity index 100% rename from c++/include/boost/numeric/interval/detail/ppc_rounding_control.hpp rename to c++/boost/numeric/interval/detail/ppc_rounding_control.hpp diff --git a/c++/include/boost/numeric/interval/detail/sparc_rounding_control.hpp b/c++/boost/numeric/interval/detail/sparc_rounding_control.hpp similarity index 100% rename from c++/include/boost/numeric/interval/detail/sparc_rounding_control.hpp rename to c++/boost/numeric/interval/detail/sparc_rounding_control.hpp diff --git a/c++/include/boost/numeric/interval/detail/test_input.hpp b/c++/boost/numeric/interval/detail/test_input.hpp similarity index 100% rename from c++/include/boost/numeric/interval/detail/test_input.hpp rename to c++/boost/numeric/interval/detail/test_input.hpp diff --git a/c++/include/boost/numeric/interval/detail/x86_rounding_control.hpp b/c++/boost/numeric/interval/detail/x86_rounding_control.hpp similarity index 100% rename from c++/include/boost/numeric/interval/detail/x86_rounding_control.hpp rename to c++/boost/numeric/interval/detail/x86_rounding_control.hpp diff --git a/c++/include/boost/numeric/interval/detail/x86gcc_rounding_control.hpp b/c++/boost/numeric/interval/detail/x86gcc_rounding_control.hpp similarity index 100% rename from c++/include/boost/numeric/interval/detail/x86gcc_rounding_control.hpp rename to c++/boost/numeric/interval/detail/x86gcc_rounding_control.hpp diff --git a/c++/include/boost/numeric/interval/ext/integer.hpp b/c++/boost/numeric/interval/ext/integer.hpp similarity index 100% rename from c++/include/boost/numeric/interval/ext/integer.hpp rename to c++/boost/numeric/interval/ext/integer.hpp diff --git a/c++/include/boost/numeric/interval/ext/x86_fast_rounding_control.hpp b/c++/boost/numeric/interval/ext/x86_fast_rounding_control.hpp similarity index 100% rename from c++/include/boost/numeric/interval/ext/x86_fast_rounding_control.hpp rename to c++/boost/numeric/interval/ext/x86_fast_rounding_control.hpp diff --git a/c++/include/boost/numeric/interval/hw_rounding.hpp b/c++/boost/numeric/interval/hw_rounding.hpp similarity index 100% rename from c++/include/boost/numeric/interval/hw_rounding.hpp rename to c++/boost/numeric/interval/hw_rounding.hpp diff --git a/c++/include/boost/numeric/interval/interval.hpp b/c++/boost/numeric/interval/interval.hpp similarity index 100% rename from c++/include/boost/numeric/interval/interval.hpp rename to c++/boost/numeric/interval/interval.hpp diff --git a/c++/include/boost/numeric/interval/io.hpp b/c++/boost/numeric/interval/io.hpp similarity index 100% rename from c++/include/boost/numeric/interval/io.hpp rename to c++/boost/numeric/interval/io.hpp diff --git a/c++/include/boost/numeric/interval/limits.hpp b/c++/boost/numeric/interval/limits.hpp similarity index 100% rename from c++/include/boost/numeric/interval/limits.hpp rename to c++/boost/numeric/interval/limits.hpp diff --git a/c++/include/boost/numeric/interval/policies.hpp b/c++/boost/numeric/interval/policies.hpp similarity index 100% rename from c++/include/boost/numeric/interval/policies.hpp rename to c++/boost/numeric/interval/policies.hpp diff --git a/c++/include/boost/numeric/interval/rounded_arith.hpp b/c++/boost/numeric/interval/rounded_arith.hpp similarity index 100% rename from c++/include/boost/numeric/interval/rounded_arith.hpp rename to c++/boost/numeric/interval/rounded_arith.hpp diff --git a/c++/include/boost/numeric/interval/rounded_transc.hpp b/c++/boost/numeric/interval/rounded_transc.hpp similarity index 100% rename from c++/include/boost/numeric/interval/rounded_transc.hpp rename to c++/boost/numeric/interval/rounded_transc.hpp diff --git a/c++/include/boost/numeric/interval/rounding.hpp b/c++/boost/numeric/interval/rounding.hpp similarity index 100% rename from c++/include/boost/numeric/interval/rounding.hpp rename to c++/boost/numeric/interval/rounding.hpp diff --git a/c++/include/boost/numeric/interval/transc.hpp b/c++/boost/numeric/interval/transc.hpp similarity index 100% rename from c++/include/boost/numeric/interval/transc.hpp rename to c++/boost/numeric/interval/transc.hpp diff --git a/c++/include/boost/numeric/interval/utility.hpp b/c++/boost/numeric/interval/utility.hpp similarity index 100% rename from c++/include/boost/numeric/interval/utility.hpp rename to c++/boost/numeric/interval/utility.hpp diff --git a/c++/include/boost/numeric/interval/utility_fwd.hpp b/c++/boost/numeric/interval/utility_fwd.hpp similarity index 100% rename from c++/include/boost/numeric/interval/utility_fwd.hpp rename to c++/boost/numeric/interval/utility_fwd.hpp diff --git a/c++/include/boost/numeric/odeint.hpp b/c++/boost/numeric/odeint.hpp similarity index 100% rename from c++/include/boost/numeric/odeint.hpp rename to c++/boost/numeric/odeint.hpp diff --git a/c++/include/boost/numeric/odeint/algebra/algebra_dispatcher.hpp b/c++/boost/numeric/odeint/algebra/algebra_dispatcher.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/algebra/algebra_dispatcher.hpp rename to c++/boost/numeric/odeint/algebra/algebra_dispatcher.hpp diff --git a/c++/include/boost/numeric/odeint/algebra/array_algebra.hpp b/c++/boost/numeric/odeint/algebra/array_algebra.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/algebra/array_algebra.hpp rename to c++/boost/numeric/odeint/algebra/array_algebra.hpp diff --git a/c++/include/boost/numeric/odeint/algebra/default_operations.hpp b/c++/boost/numeric/odeint/algebra/default_operations.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/algebra/default_operations.hpp rename to c++/boost/numeric/odeint/algebra/default_operations.hpp diff --git a/c++/include/boost/numeric/odeint/algebra/detail/extract_value_type.hpp b/c++/boost/numeric/odeint/algebra/detail/extract_value_type.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/algebra/detail/extract_value_type.hpp rename to c++/boost/numeric/odeint/algebra/detail/extract_value_type.hpp diff --git a/c++/include/boost/numeric/odeint/algebra/detail/for_each.hpp b/c++/boost/numeric/odeint/algebra/detail/for_each.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/algebra/detail/for_each.hpp rename to c++/boost/numeric/odeint/algebra/detail/for_each.hpp diff --git a/c++/include/boost/numeric/odeint/algebra/detail/macros.hpp b/c++/boost/numeric/odeint/algebra/detail/macros.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/algebra/detail/macros.hpp rename to c++/boost/numeric/odeint/algebra/detail/macros.hpp diff --git a/c++/include/boost/numeric/odeint/algebra/detail/norm_inf.hpp b/c++/boost/numeric/odeint/algebra/detail/norm_inf.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/algebra/detail/norm_inf.hpp rename to c++/boost/numeric/odeint/algebra/detail/norm_inf.hpp diff --git a/c++/include/boost/numeric/odeint/algebra/fusion_algebra.hpp b/c++/boost/numeric/odeint/algebra/fusion_algebra.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/algebra/fusion_algebra.hpp rename to c++/boost/numeric/odeint/algebra/fusion_algebra.hpp diff --git a/c++/include/boost/numeric/odeint/algebra/fusion_algebra_dispatcher.hpp b/c++/boost/numeric/odeint/algebra/fusion_algebra_dispatcher.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/algebra/fusion_algebra_dispatcher.hpp rename to c++/boost/numeric/odeint/algebra/fusion_algebra_dispatcher.hpp diff --git a/c++/include/boost/numeric/odeint/algebra/multi_array_algebra.hpp b/c++/boost/numeric/odeint/algebra/multi_array_algebra.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/algebra/multi_array_algebra.hpp rename to c++/boost/numeric/odeint/algebra/multi_array_algebra.hpp diff --git a/c++/include/boost/numeric/odeint/algebra/norm_result_type.hpp b/c++/boost/numeric/odeint/algebra/norm_result_type.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/algebra/norm_result_type.hpp rename to c++/boost/numeric/odeint/algebra/norm_result_type.hpp diff --git a/c++/include/boost/numeric/odeint/algebra/operations_dispatcher.hpp b/c++/boost/numeric/odeint/algebra/operations_dispatcher.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/algebra/operations_dispatcher.hpp rename to c++/boost/numeric/odeint/algebra/operations_dispatcher.hpp diff --git a/c++/include/boost/numeric/odeint/algebra/range_algebra.hpp b/c++/boost/numeric/odeint/algebra/range_algebra.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/algebra/range_algebra.hpp rename to c++/boost/numeric/odeint/algebra/range_algebra.hpp diff --git a/c++/include/boost/numeric/odeint/algebra/vector_space_algebra.hpp b/c++/boost/numeric/odeint/algebra/vector_space_algebra.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/algebra/vector_space_algebra.hpp rename to c++/boost/numeric/odeint/algebra/vector_space_algebra.hpp diff --git a/c++/include/boost/numeric/odeint/config.hpp b/c++/boost/numeric/odeint/config.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/config.hpp rename to c++/boost/numeric/odeint/config.hpp diff --git a/c++/include/boost/numeric/odeint/external/blaze/blaze_algebra_dispatcher.hpp b/c++/boost/numeric/odeint/external/blaze/blaze_algebra_dispatcher.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/blaze/blaze_algebra_dispatcher.hpp rename to c++/boost/numeric/odeint/external/blaze/blaze_algebra_dispatcher.hpp diff --git a/c++/include/boost/numeric/odeint/external/blaze/blaze_resize.hpp b/c++/boost/numeric/odeint/external/blaze/blaze_resize.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/blaze/blaze_resize.hpp rename to c++/boost/numeric/odeint/external/blaze/blaze_resize.hpp diff --git a/c++/include/boost/numeric/odeint/external/compute/compute.hpp b/c++/boost/numeric/odeint/external/compute/compute.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/compute/compute.hpp rename to c++/boost/numeric/odeint/external/compute/compute.hpp diff --git a/c++/include/boost/numeric/odeint/external/compute/compute_algebra.hpp b/c++/boost/numeric/odeint/external/compute/compute_algebra.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/compute/compute_algebra.hpp rename to c++/boost/numeric/odeint/external/compute/compute_algebra.hpp diff --git a/c++/include/boost/numeric/odeint/external/compute/compute_algebra_dispatcher.hpp b/c++/boost/numeric/odeint/external/compute/compute_algebra_dispatcher.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/compute/compute_algebra_dispatcher.hpp rename to c++/boost/numeric/odeint/external/compute/compute_algebra_dispatcher.hpp diff --git a/c++/include/boost/numeric/odeint/external/compute/compute_operations.hpp b/c++/boost/numeric/odeint/external/compute/compute_operations.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/compute/compute_operations.hpp rename to c++/boost/numeric/odeint/external/compute/compute_operations.hpp diff --git a/c++/include/boost/numeric/odeint/external/compute/compute_operations_dispatcher.hpp b/c++/boost/numeric/odeint/external/compute/compute_operations_dispatcher.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/compute/compute_operations_dispatcher.hpp rename to c++/boost/numeric/odeint/external/compute/compute_operations_dispatcher.hpp diff --git a/c++/include/boost/numeric/odeint/external/compute/compute_resize.hpp b/c++/boost/numeric/odeint/external/compute/compute_resize.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/compute/compute_resize.hpp rename to c++/boost/numeric/odeint/external/compute/compute_resize.hpp diff --git a/c++/include/boost/numeric/odeint/external/eigen/eigen.hpp b/c++/boost/numeric/odeint/external/eigen/eigen.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/eigen/eigen.hpp rename to c++/boost/numeric/odeint/external/eigen/eigen.hpp diff --git a/c++/include/boost/numeric/odeint/external/eigen/eigen_algebra.hpp b/c++/boost/numeric/odeint/external/eigen/eigen_algebra.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/eigen/eigen_algebra.hpp rename to c++/boost/numeric/odeint/external/eigen/eigen_algebra.hpp diff --git a/c++/include/boost/numeric/odeint/external/eigen/eigen_algebra_dispatcher.hpp b/c++/boost/numeric/odeint/external/eigen/eigen_algebra_dispatcher.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/eigen/eigen_algebra_dispatcher.hpp rename to c++/boost/numeric/odeint/external/eigen/eigen_algebra_dispatcher.hpp diff --git a/c++/include/boost/numeric/odeint/external/eigen/eigen_resize.hpp b/c++/boost/numeric/odeint/external/eigen/eigen_resize.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/eigen/eigen_resize.hpp rename to c++/boost/numeric/odeint/external/eigen/eigen_resize.hpp diff --git a/c++/include/boost/numeric/odeint/external/gsl/gsl_wrapper.hpp b/c++/boost/numeric/odeint/external/gsl/gsl_wrapper.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/gsl/gsl_wrapper.hpp rename to c++/boost/numeric/odeint/external/gsl/gsl_wrapper.hpp diff --git a/c++/include/boost/numeric/odeint/external/mkl/mkl_operations.hpp b/c++/boost/numeric/odeint/external/mkl/mkl_operations.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/mkl/mkl_operations.hpp rename to c++/boost/numeric/odeint/external/mkl/mkl_operations.hpp diff --git a/c++/include/boost/numeric/odeint/external/mpi/mpi.hpp b/c++/boost/numeric/odeint/external/mpi/mpi.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/mpi/mpi.hpp rename to c++/boost/numeric/odeint/external/mpi/mpi.hpp diff --git a/c++/include/boost/numeric/odeint/external/mpi/mpi_nested_algebra.hpp b/c++/boost/numeric/odeint/external/mpi/mpi_nested_algebra.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/mpi/mpi_nested_algebra.hpp rename to c++/boost/numeric/odeint/external/mpi/mpi_nested_algebra.hpp diff --git a/c++/include/boost/numeric/odeint/external/mpi/mpi_state.hpp b/c++/boost/numeric/odeint/external/mpi/mpi_state.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/mpi/mpi_state.hpp rename to c++/boost/numeric/odeint/external/mpi/mpi_state.hpp diff --git a/c++/include/boost/numeric/odeint/external/mpi/mpi_vector_state.hpp b/c++/boost/numeric/odeint/external/mpi/mpi_vector_state.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/mpi/mpi_vector_state.hpp rename to c++/boost/numeric/odeint/external/mpi/mpi_vector_state.hpp diff --git a/c++/include/boost/numeric/odeint/external/mtl4/implicit_euler_mtl4.hpp b/c++/boost/numeric/odeint/external/mtl4/implicit_euler_mtl4.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/mtl4/implicit_euler_mtl4.hpp rename to c++/boost/numeric/odeint/external/mtl4/implicit_euler_mtl4.hpp diff --git a/c++/include/boost/numeric/odeint/external/mtl4/mtl4.hpp b/c++/boost/numeric/odeint/external/mtl4/mtl4.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/mtl4/mtl4.hpp rename to c++/boost/numeric/odeint/external/mtl4/mtl4.hpp diff --git a/c++/include/boost/numeric/odeint/external/mtl4/mtl4_algebra_dispatcher.hpp b/c++/boost/numeric/odeint/external/mtl4/mtl4_algebra_dispatcher.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/mtl4/mtl4_algebra_dispatcher.hpp rename to c++/boost/numeric/odeint/external/mtl4/mtl4_algebra_dispatcher.hpp diff --git a/c++/include/boost/numeric/odeint/external/mtl4/mtl4_resize.hpp b/c++/boost/numeric/odeint/external/mtl4/mtl4_resize.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/mtl4/mtl4_resize.hpp rename to c++/boost/numeric/odeint/external/mtl4/mtl4_resize.hpp diff --git a/c++/include/boost/numeric/odeint/external/nt2/nt2_algebra_dispatcher.hpp b/c++/boost/numeric/odeint/external/nt2/nt2_algebra_dispatcher.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/nt2/nt2_algebra_dispatcher.hpp rename to c++/boost/numeric/odeint/external/nt2/nt2_algebra_dispatcher.hpp diff --git a/c++/include/boost/numeric/odeint/external/nt2/nt2_copy.hpp b/c++/boost/numeric/odeint/external/nt2/nt2_copy.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/nt2/nt2_copy.hpp rename to c++/boost/numeric/odeint/external/nt2/nt2_copy.hpp diff --git a/c++/include/boost/numeric/odeint/external/nt2/nt2_norm_inf.hpp b/c++/boost/numeric/odeint/external/nt2/nt2_norm_inf.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/nt2/nt2_norm_inf.hpp rename to c++/boost/numeric/odeint/external/nt2/nt2_norm_inf.hpp diff --git a/c++/include/boost/numeric/odeint/external/nt2/nt2_resize.hpp b/c++/boost/numeric/odeint/external/nt2/nt2_resize.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/nt2/nt2_resize.hpp rename to c++/boost/numeric/odeint/external/nt2/nt2_resize.hpp diff --git a/c++/include/boost/numeric/odeint/external/openmp/openmp.hpp b/c++/boost/numeric/odeint/external/openmp/openmp.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/openmp/openmp.hpp rename to c++/boost/numeric/odeint/external/openmp/openmp.hpp diff --git a/c++/include/boost/numeric/odeint/external/openmp/openmp_nested_algebra.hpp b/c++/boost/numeric/odeint/external/openmp/openmp_nested_algebra.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/openmp/openmp_nested_algebra.hpp rename to c++/boost/numeric/odeint/external/openmp/openmp_nested_algebra.hpp diff --git a/c++/include/boost/numeric/odeint/external/openmp/openmp_range_algebra.hpp b/c++/boost/numeric/odeint/external/openmp/openmp_range_algebra.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/openmp/openmp_range_algebra.hpp rename to c++/boost/numeric/odeint/external/openmp/openmp_range_algebra.hpp diff --git a/c++/include/boost/numeric/odeint/external/openmp/openmp_state.hpp b/c++/boost/numeric/odeint/external/openmp/openmp_state.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/openmp/openmp_state.hpp rename to c++/boost/numeric/odeint/external/openmp/openmp_state.hpp diff --git a/c++/include/boost/numeric/odeint/external/thrust/thrust.hpp b/c++/boost/numeric/odeint/external/thrust/thrust.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/thrust/thrust.hpp rename to c++/boost/numeric/odeint/external/thrust/thrust.hpp diff --git a/c++/include/boost/numeric/odeint/external/thrust/thrust_algebra.hpp b/c++/boost/numeric/odeint/external/thrust/thrust_algebra.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/thrust/thrust_algebra.hpp rename to c++/boost/numeric/odeint/external/thrust/thrust_algebra.hpp diff --git a/c++/include/boost/numeric/odeint/external/thrust/thrust_algebra_dispatcher.hpp b/c++/boost/numeric/odeint/external/thrust/thrust_algebra_dispatcher.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/thrust/thrust_algebra_dispatcher.hpp rename to c++/boost/numeric/odeint/external/thrust/thrust_algebra_dispatcher.hpp diff --git a/c++/include/boost/numeric/odeint/external/thrust/thrust_operations.hpp b/c++/boost/numeric/odeint/external/thrust/thrust_operations.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/thrust/thrust_operations.hpp rename to c++/boost/numeric/odeint/external/thrust/thrust_operations.hpp diff --git a/c++/include/boost/numeric/odeint/external/thrust/thrust_operations_dispatcher.hpp b/c++/boost/numeric/odeint/external/thrust/thrust_operations_dispatcher.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/thrust/thrust_operations_dispatcher.hpp rename to c++/boost/numeric/odeint/external/thrust/thrust_operations_dispatcher.hpp diff --git a/c++/include/boost/numeric/odeint/external/thrust/thrust_resize.hpp b/c++/boost/numeric/odeint/external/thrust/thrust_resize.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/thrust/thrust_resize.hpp rename to c++/boost/numeric/odeint/external/thrust/thrust_resize.hpp diff --git a/c++/include/boost/numeric/odeint/external/vexcl/vexcl.hpp b/c++/boost/numeric/odeint/external/vexcl/vexcl.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/vexcl/vexcl.hpp rename to c++/boost/numeric/odeint/external/vexcl/vexcl.hpp diff --git a/c++/include/boost/numeric/odeint/external/vexcl/vexcl_abs.hpp b/c++/boost/numeric/odeint/external/vexcl/vexcl_abs.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/vexcl/vexcl_abs.hpp rename to c++/boost/numeric/odeint/external/vexcl/vexcl_abs.hpp diff --git a/c++/include/boost/numeric/odeint/external/vexcl/vexcl_algebra_dispatcher.hpp b/c++/boost/numeric/odeint/external/vexcl/vexcl_algebra_dispatcher.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/vexcl/vexcl_algebra_dispatcher.hpp rename to c++/boost/numeric/odeint/external/vexcl/vexcl_algebra_dispatcher.hpp diff --git a/c++/include/boost/numeric/odeint/external/vexcl/vexcl_copy.hpp b/c++/boost/numeric/odeint/external/vexcl/vexcl_copy.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/vexcl/vexcl_copy.hpp rename to c++/boost/numeric/odeint/external/vexcl/vexcl_copy.hpp diff --git a/c++/include/boost/numeric/odeint/external/vexcl/vexcl_norm_inf.hpp b/c++/boost/numeric/odeint/external/vexcl/vexcl_norm_inf.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/vexcl/vexcl_norm_inf.hpp rename to c++/boost/numeric/odeint/external/vexcl/vexcl_norm_inf.hpp diff --git a/c++/include/boost/numeric/odeint/external/vexcl/vexcl_resize.hpp b/c++/boost/numeric/odeint/external/vexcl/vexcl_resize.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/vexcl/vexcl_resize.hpp rename to c++/boost/numeric/odeint/external/vexcl/vexcl_resize.hpp diff --git a/c++/include/boost/numeric/odeint/external/vexcl/vexcl_same_instance.hpp b/c++/boost/numeric/odeint/external/vexcl/vexcl_same_instance.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/vexcl/vexcl_same_instance.hpp rename to c++/boost/numeric/odeint/external/vexcl/vexcl_same_instance.hpp diff --git a/c++/include/boost/numeric/odeint/external/viennacl/viennacl_operations.hpp b/c++/boost/numeric/odeint/external/viennacl/viennacl_operations.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/viennacl/viennacl_operations.hpp rename to c++/boost/numeric/odeint/external/viennacl/viennacl_operations.hpp diff --git a/c++/include/boost/numeric/odeint/external/viennacl/viennacl_resize.hpp b/c++/boost/numeric/odeint/external/viennacl/viennacl_resize.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/external/viennacl/viennacl_resize.hpp rename to c++/boost/numeric/odeint/external/viennacl/viennacl_resize.hpp diff --git a/c++/include/boost/numeric/odeint/integrate/check_adapter.hpp b/c++/boost/numeric/odeint/integrate/check_adapter.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/integrate/check_adapter.hpp rename to c++/boost/numeric/odeint/integrate/check_adapter.hpp diff --git a/c++/include/boost/numeric/odeint/integrate/detail/functors.hpp b/c++/boost/numeric/odeint/integrate/detail/functors.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/integrate/detail/functors.hpp rename to c++/boost/numeric/odeint/integrate/detail/functors.hpp diff --git a/c++/include/boost/numeric/odeint/integrate/detail/integrate_adaptive.hpp b/c++/boost/numeric/odeint/integrate/detail/integrate_adaptive.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/integrate/detail/integrate_adaptive.hpp rename to c++/boost/numeric/odeint/integrate/detail/integrate_adaptive.hpp diff --git a/c++/include/boost/numeric/odeint/integrate/detail/integrate_const.hpp b/c++/boost/numeric/odeint/integrate/detail/integrate_const.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/integrate/detail/integrate_const.hpp rename to c++/boost/numeric/odeint/integrate/detail/integrate_const.hpp diff --git a/c++/include/boost/numeric/odeint/integrate/detail/integrate_n_steps.hpp b/c++/boost/numeric/odeint/integrate/detail/integrate_n_steps.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/integrate/detail/integrate_n_steps.hpp rename to c++/boost/numeric/odeint/integrate/detail/integrate_n_steps.hpp diff --git a/c++/include/boost/numeric/odeint/integrate/detail/integrate_times.hpp b/c++/boost/numeric/odeint/integrate/detail/integrate_times.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/integrate/detail/integrate_times.hpp rename to c++/boost/numeric/odeint/integrate/detail/integrate_times.hpp diff --git a/c++/include/boost/numeric/odeint/integrate/integrate.hpp b/c++/boost/numeric/odeint/integrate/integrate.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/integrate/integrate.hpp rename to c++/boost/numeric/odeint/integrate/integrate.hpp diff --git a/c++/include/boost/numeric/odeint/integrate/integrate_adaptive.hpp b/c++/boost/numeric/odeint/integrate/integrate_adaptive.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/integrate/integrate_adaptive.hpp rename to c++/boost/numeric/odeint/integrate/integrate_adaptive.hpp diff --git a/c++/include/boost/numeric/odeint/integrate/integrate_const.hpp b/c++/boost/numeric/odeint/integrate/integrate_const.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/integrate/integrate_const.hpp rename to c++/boost/numeric/odeint/integrate/integrate_const.hpp diff --git a/c++/include/boost/numeric/odeint/integrate/integrate_n_steps.hpp b/c++/boost/numeric/odeint/integrate/integrate_n_steps.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/integrate/integrate_n_steps.hpp rename to c++/boost/numeric/odeint/integrate/integrate_n_steps.hpp diff --git a/c++/include/boost/numeric/odeint/integrate/integrate_times.hpp b/c++/boost/numeric/odeint/integrate/integrate_times.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/integrate/integrate_times.hpp rename to c++/boost/numeric/odeint/integrate/integrate_times.hpp diff --git a/c++/include/boost/numeric/odeint/integrate/max_step_checker.hpp b/c++/boost/numeric/odeint/integrate/max_step_checker.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/integrate/max_step_checker.hpp rename to c++/boost/numeric/odeint/integrate/max_step_checker.hpp diff --git a/c++/include/boost/numeric/odeint/integrate/null_observer.hpp b/c++/boost/numeric/odeint/integrate/null_observer.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/integrate/null_observer.hpp rename to c++/boost/numeric/odeint/integrate/null_observer.hpp diff --git a/c++/include/boost/numeric/odeint/integrate/observer_collection.hpp b/c++/boost/numeric/odeint/integrate/observer_collection.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/integrate/observer_collection.hpp rename to c++/boost/numeric/odeint/integrate/observer_collection.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/adaptive_iterator.hpp b/c++/boost/numeric/odeint/iterator/adaptive_iterator.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/adaptive_iterator.hpp rename to c++/boost/numeric/odeint/iterator/adaptive_iterator.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/adaptive_time_iterator.hpp b/c++/boost/numeric/odeint/iterator/adaptive_time_iterator.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/adaptive_time_iterator.hpp rename to c++/boost/numeric/odeint/iterator/adaptive_time_iterator.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/const_step_iterator.hpp b/c++/boost/numeric/odeint/iterator/const_step_iterator.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/const_step_iterator.hpp rename to c++/boost/numeric/odeint/iterator/const_step_iterator.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/const_step_time_iterator.hpp b/c++/boost/numeric/odeint/iterator/const_step_time_iterator.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/const_step_time_iterator.hpp rename to c++/boost/numeric/odeint/iterator/const_step_time_iterator.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/detail/ode_iterator_base.hpp b/c++/boost/numeric/odeint/iterator/detail/ode_iterator_base.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/detail/ode_iterator_base.hpp rename to c++/boost/numeric/odeint/iterator/detail/ode_iterator_base.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/impl/adaptive_iterator_impl.hpp b/c++/boost/numeric/odeint/iterator/impl/adaptive_iterator_impl.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/impl/adaptive_iterator_impl.hpp rename to c++/boost/numeric/odeint/iterator/impl/adaptive_iterator_impl.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/impl/const_step_iterator_impl.hpp b/c++/boost/numeric/odeint/iterator/impl/const_step_iterator_impl.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/impl/const_step_iterator_impl.hpp rename to c++/boost/numeric/odeint/iterator/impl/const_step_iterator_impl.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/impl/n_step_iterator_impl.hpp b/c++/boost/numeric/odeint/iterator/impl/n_step_iterator_impl.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/impl/n_step_iterator_impl.hpp rename to c++/boost/numeric/odeint/iterator/impl/n_step_iterator_impl.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/impl/times_iterator_impl.hpp b/c++/boost/numeric/odeint/iterator/impl/times_iterator_impl.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/impl/times_iterator_impl.hpp rename to c++/boost/numeric/odeint/iterator/impl/times_iterator_impl.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/integrate/detail/functors.hpp b/c++/boost/numeric/odeint/iterator/integrate/detail/functors.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/integrate/detail/functors.hpp rename to c++/boost/numeric/odeint/iterator/integrate/detail/functors.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/integrate/detail/integrate_adaptive.hpp b/c++/boost/numeric/odeint/iterator/integrate/detail/integrate_adaptive.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/integrate/detail/integrate_adaptive.hpp rename to c++/boost/numeric/odeint/iterator/integrate/detail/integrate_adaptive.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/integrate/detail/integrate_const.hpp b/c++/boost/numeric/odeint/iterator/integrate/detail/integrate_const.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/integrate/detail/integrate_const.hpp rename to c++/boost/numeric/odeint/iterator/integrate/detail/integrate_const.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/integrate/detail/integrate_n_steps.hpp b/c++/boost/numeric/odeint/iterator/integrate/detail/integrate_n_steps.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/integrate/detail/integrate_n_steps.hpp rename to c++/boost/numeric/odeint/iterator/integrate/detail/integrate_n_steps.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/integrate/detail/integrate_times.hpp b/c++/boost/numeric/odeint/iterator/integrate/detail/integrate_times.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/integrate/detail/integrate_times.hpp rename to c++/boost/numeric/odeint/iterator/integrate/detail/integrate_times.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/integrate/integrate.hpp b/c++/boost/numeric/odeint/iterator/integrate/integrate.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/integrate/integrate.hpp rename to c++/boost/numeric/odeint/iterator/integrate/integrate.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/integrate/integrate_adaptive.hpp b/c++/boost/numeric/odeint/iterator/integrate/integrate_adaptive.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/integrate/integrate_adaptive.hpp rename to c++/boost/numeric/odeint/iterator/integrate/integrate_adaptive.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/integrate/integrate_const.hpp b/c++/boost/numeric/odeint/iterator/integrate/integrate_const.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/integrate/integrate_const.hpp rename to c++/boost/numeric/odeint/iterator/integrate/integrate_const.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/integrate/integrate_n_steps.hpp b/c++/boost/numeric/odeint/iterator/integrate/integrate_n_steps.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/integrate/integrate_n_steps.hpp rename to c++/boost/numeric/odeint/iterator/integrate/integrate_n_steps.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/integrate/integrate_times.hpp b/c++/boost/numeric/odeint/iterator/integrate/integrate_times.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/integrate/integrate_times.hpp rename to c++/boost/numeric/odeint/iterator/integrate/integrate_times.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/integrate/null_observer.hpp b/c++/boost/numeric/odeint/iterator/integrate/null_observer.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/integrate/null_observer.hpp rename to c++/boost/numeric/odeint/iterator/integrate/null_observer.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/integrate/observer_collection.hpp b/c++/boost/numeric/odeint/iterator/integrate/observer_collection.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/integrate/observer_collection.hpp rename to c++/boost/numeric/odeint/iterator/integrate/observer_collection.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/n_step_iterator.hpp b/c++/boost/numeric/odeint/iterator/n_step_iterator.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/n_step_iterator.hpp rename to c++/boost/numeric/odeint/iterator/n_step_iterator.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/n_step_time_iterator.hpp b/c++/boost/numeric/odeint/iterator/n_step_time_iterator.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/n_step_time_iterator.hpp rename to c++/boost/numeric/odeint/iterator/n_step_time_iterator.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/times_iterator.hpp b/c++/boost/numeric/odeint/iterator/times_iterator.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/times_iterator.hpp rename to c++/boost/numeric/odeint/iterator/times_iterator.hpp diff --git a/c++/include/boost/numeric/odeint/iterator/times_time_iterator.hpp b/c++/boost/numeric/odeint/iterator/times_time_iterator.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/iterator/times_time_iterator.hpp rename to c++/boost/numeric/odeint/iterator/times_time_iterator.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/adams_bashforth.hpp b/c++/boost/numeric/odeint/stepper/adams_bashforth.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/adams_bashforth.hpp rename to c++/boost/numeric/odeint/stepper/adams_bashforth.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/adams_bashforth_moulton.hpp b/c++/boost/numeric/odeint/stepper/adams_bashforth_moulton.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/adams_bashforth_moulton.hpp rename to c++/boost/numeric/odeint/stepper/adams_bashforth_moulton.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/adams_moulton.hpp b/c++/boost/numeric/odeint/stepper/adams_moulton.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/adams_moulton.hpp rename to c++/boost/numeric/odeint/stepper/adams_moulton.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/adaptive_adams_bashforth_moulton.hpp b/c++/boost/numeric/odeint/stepper/adaptive_adams_bashforth_moulton.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/adaptive_adams_bashforth_moulton.hpp rename to c++/boost/numeric/odeint/stepper/adaptive_adams_bashforth_moulton.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/base/algebra_stepper_base.hpp b/c++/boost/numeric/odeint/stepper/base/algebra_stepper_base.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/base/algebra_stepper_base.hpp rename to c++/boost/numeric/odeint/stepper/base/algebra_stepper_base.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/base/explicit_error_stepper_base.hpp b/c++/boost/numeric/odeint/stepper/base/explicit_error_stepper_base.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/base/explicit_error_stepper_base.hpp rename to c++/boost/numeric/odeint/stepper/base/explicit_error_stepper_base.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/base/explicit_error_stepper_fsal_base.hpp b/c++/boost/numeric/odeint/stepper/base/explicit_error_stepper_fsal_base.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/base/explicit_error_stepper_fsal_base.hpp rename to c++/boost/numeric/odeint/stepper/base/explicit_error_stepper_fsal_base.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/base/explicit_stepper_base.hpp b/c++/boost/numeric/odeint/stepper/base/explicit_stepper_base.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/base/explicit_stepper_base.hpp rename to c++/boost/numeric/odeint/stepper/base/explicit_stepper_base.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp b/c++/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp rename to c++/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/bulirsch_stoer.hpp b/c++/boost/numeric/odeint/stepper/bulirsch_stoer.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/bulirsch_stoer.hpp rename to c++/boost/numeric/odeint/stepper/bulirsch_stoer.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/bulirsch_stoer_dense_out.hpp b/c++/boost/numeric/odeint/stepper/bulirsch_stoer_dense_out.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/bulirsch_stoer_dense_out.hpp rename to c++/boost/numeric/odeint/stepper/bulirsch_stoer_dense_out.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/controlled_adams_bashforth_moulton.hpp b/c++/boost/numeric/odeint/stepper/controlled_adams_bashforth_moulton.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/controlled_adams_bashforth_moulton.hpp rename to c++/boost/numeric/odeint/stepper/controlled_adams_bashforth_moulton.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/controlled_runge_kutta.hpp b/c++/boost/numeric/odeint/stepper/controlled_runge_kutta.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/controlled_runge_kutta.hpp rename to c++/boost/numeric/odeint/stepper/controlled_runge_kutta.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/controlled_step_result.hpp b/c++/boost/numeric/odeint/stepper/controlled_step_result.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/controlled_step_result.hpp rename to c++/boost/numeric/odeint/stepper/controlled_step_result.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/dense_output_runge_kutta.hpp b/c++/boost/numeric/odeint/stepper/dense_output_runge_kutta.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/dense_output_runge_kutta.hpp rename to c++/boost/numeric/odeint/stepper/dense_output_runge_kutta.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/detail/adams_bashforth_call_algebra.hpp b/c++/boost/numeric/odeint/stepper/detail/adams_bashforth_call_algebra.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/detail/adams_bashforth_call_algebra.hpp rename to c++/boost/numeric/odeint/stepper/detail/adams_bashforth_call_algebra.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/detail/adams_bashforth_coefficients.hpp b/c++/boost/numeric/odeint/stepper/detail/adams_bashforth_coefficients.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/detail/adams_bashforth_coefficients.hpp rename to c++/boost/numeric/odeint/stepper/detail/adams_bashforth_coefficients.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/detail/adams_moulton_call_algebra.hpp b/c++/boost/numeric/odeint/stepper/detail/adams_moulton_call_algebra.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/detail/adams_moulton_call_algebra.hpp rename to c++/boost/numeric/odeint/stepper/detail/adams_moulton_call_algebra.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/detail/adams_moulton_coefficients.hpp b/c++/boost/numeric/odeint/stepper/detail/adams_moulton_coefficients.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/detail/adams_moulton_coefficients.hpp rename to c++/boost/numeric/odeint/stepper/detail/adams_moulton_coefficients.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/detail/adaptive_adams_coefficients.hpp b/c++/boost/numeric/odeint/stepper/detail/adaptive_adams_coefficients.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/detail/adaptive_adams_coefficients.hpp rename to c++/boost/numeric/odeint/stepper/detail/adaptive_adams_coefficients.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/detail/generic_rk_algorithm.hpp b/c++/boost/numeric/odeint/stepper/detail/generic_rk_algorithm.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/detail/generic_rk_algorithm.hpp rename to c++/boost/numeric/odeint/stepper/detail/generic_rk_algorithm.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/detail/generic_rk_call_algebra.hpp b/c++/boost/numeric/odeint/stepper/detail/generic_rk_call_algebra.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/detail/generic_rk_call_algebra.hpp rename to c++/boost/numeric/odeint/stepper/detail/generic_rk_call_algebra.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/detail/generic_rk_operations.hpp b/c++/boost/numeric/odeint/stepper/detail/generic_rk_operations.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/detail/generic_rk_operations.hpp rename to c++/boost/numeric/odeint/stepper/detail/generic_rk_operations.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/detail/pid_step_adjuster.hpp b/c++/boost/numeric/odeint/stepper/detail/pid_step_adjuster.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/detail/pid_step_adjuster.hpp rename to c++/boost/numeric/odeint/stepper/detail/pid_step_adjuster.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/detail/pid_step_adjuster_coefficients.hpp b/c++/boost/numeric/odeint/stepper/detail/pid_step_adjuster_coefficients.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/detail/pid_step_adjuster_coefficients.hpp rename to c++/boost/numeric/odeint/stepper/detail/pid_step_adjuster_coefficients.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/detail/rotating_buffer.hpp b/c++/boost/numeric/odeint/stepper/detail/rotating_buffer.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/detail/rotating_buffer.hpp rename to c++/boost/numeric/odeint/stepper/detail/rotating_buffer.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/euler.hpp b/c++/boost/numeric/odeint/stepper/euler.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/euler.hpp rename to c++/boost/numeric/odeint/stepper/euler.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/explicit_error_generic_rk.hpp b/c++/boost/numeric/odeint/stepper/explicit_error_generic_rk.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/explicit_error_generic_rk.hpp rename to c++/boost/numeric/odeint/stepper/explicit_error_generic_rk.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/explicit_generic_rk.hpp b/c++/boost/numeric/odeint/stepper/explicit_generic_rk.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/explicit_generic_rk.hpp rename to c++/boost/numeric/odeint/stepper/explicit_generic_rk.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/extrapolation_stepper.hpp b/c++/boost/numeric/odeint/stepper/extrapolation_stepper.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/extrapolation_stepper.hpp rename to c++/boost/numeric/odeint/stepper/extrapolation_stepper.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/generation.hpp b/c++/boost/numeric/odeint/stepper/generation.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/generation.hpp rename to c++/boost/numeric/odeint/stepper/generation.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/generation/generation_controlled_adams_bashforth_moulton.hpp b/c++/boost/numeric/odeint/stepper/generation/generation_controlled_adams_bashforth_moulton.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/generation/generation_controlled_adams_bashforth_moulton.hpp rename to c++/boost/numeric/odeint/stepper/generation/generation_controlled_adams_bashforth_moulton.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/generation/generation_controlled_runge_kutta.hpp b/c++/boost/numeric/odeint/stepper/generation/generation_controlled_runge_kutta.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/generation/generation_controlled_runge_kutta.hpp rename to c++/boost/numeric/odeint/stepper/generation/generation_controlled_runge_kutta.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/generation/generation_dense_output_runge_kutta.hpp b/c++/boost/numeric/odeint/stepper/generation/generation_dense_output_runge_kutta.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/generation/generation_dense_output_runge_kutta.hpp rename to c++/boost/numeric/odeint/stepper/generation/generation_dense_output_runge_kutta.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/generation/generation_rosenbrock4.hpp b/c++/boost/numeric/odeint/stepper/generation/generation_rosenbrock4.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/generation/generation_rosenbrock4.hpp rename to c++/boost/numeric/odeint/stepper/generation/generation_rosenbrock4.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54.hpp b/c++/boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54.hpp rename to c++/boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54_classic.hpp b/c++/boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54_classic.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54_classic.hpp rename to c++/boost/numeric/odeint/stepper/generation/generation_runge_kutta_cash_karp54_classic.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/generation/generation_runge_kutta_dopri5.hpp b/c++/boost/numeric/odeint/stepper/generation/generation_runge_kutta_dopri5.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/generation/generation_runge_kutta_dopri5.hpp rename to c++/boost/numeric/odeint/stepper/generation/generation_runge_kutta_dopri5.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/generation/generation_runge_kutta_fehlberg78.hpp b/c++/boost/numeric/odeint/stepper/generation/generation_runge_kutta_fehlberg78.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/generation/generation_runge_kutta_fehlberg78.hpp rename to c++/boost/numeric/odeint/stepper/generation/generation_runge_kutta_fehlberg78.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/generation/make_controlled.hpp b/c++/boost/numeric/odeint/stepper/generation/make_controlled.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/generation/make_controlled.hpp rename to c++/boost/numeric/odeint/stepper/generation/make_controlled.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/generation/make_dense_output.hpp b/c++/boost/numeric/odeint/stepper/generation/make_dense_output.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/generation/make_dense_output.hpp rename to c++/boost/numeric/odeint/stepper/generation/make_dense_output.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/implicit_euler.hpp b/c++/boost/numeric/odeint/stepper/implicit_euler.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/implicit_euler.hpp rename to c++/boost/numeric/odeint/stepper/implicit_euler.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/modified_midpoint.hpp b/c++/boost/numeric/odeint/stepper/modified_midpoint.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/modified_midpoint.hpp rename to c++/boost/numeric/odeint/stepper/modified_midpoint.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/rosenbrock4.hpp b/c++/boost/numeric/odeint/stepper/rosenbrock4.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/rosenbrock4.hpp rename to c++/boost/numeric/odeint/stepper/rosenbrock4.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/rosenbrock4_controller.hpp b/c++/boost/numeric/odeint/stepper/rosenbrock4_controller.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/rosenbrock4_controller.hpp rename to c++/boost/numeric/odeint/stepper/rosenbrock4_controller.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/rosenbrock4_dense_output.hpp b/c++/boost/numeric/odeint/stepper/rosenbrock4_dense_output.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/rosenbrock4_dense_output.hpp rename to c++/boost/numeric/odeint/stepper/rosenbrock4_dense_output.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/runge_kutta4.hpp b/c++/boost/numeric/odeint/stepper/runge_kutta4.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/runge_kutta4.hpp rename to c++/boost/numeric/odeint/stepper/runge_kutta4.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/runge_kutta4_classic.hpp b/c++/boost/numeric/odeint/stepper/runge_kutta4_classic.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/runge_kutta4_classic.hpp rename to c++/boost/numeric/odeint/stepper/runge_kutta4_classic.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/runge_kutta_cash_karp54.hpp b/c++/boost/numeric/odeint/stepper/runge_kutta_cash_karp54.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/runge_kutta_cash_karp54.hpp rename to c++/boost/numeric/odeint/stepper/runge_kutta_cash_karp54.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/runge_kutta_cash_karp54_classic.hpp b/c++/boost/numeric/odeint/stepper/runge_kutta_cash_karp54_classic.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/runge_kutta_cash_karp54_classic.hpp rename to c++/boost/numeric/odeint/stepper/runge_kutta_cash_karp54_classic.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/runge_kutta_dopri5.hpp b/c++/boost/numeric/odeint/stepper/runge_kutta_dopri5.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/runge_kutta_dopri5.hpp rename to c++/boost/numeric/odeint/stepper/runge_kutta_dopri5.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/runge_kutta_fehlberg78.hpp b/c++/boost/numeric/odeint/stepper/runge_kutta_fehlberg78.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/runge_kutta_fehlberg78.hpp rename to c++/boost/numeric/odeint/stepper/runge_kutta_fehlberg78.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/stepper_categories.hpp b/c++/boost/numeric/odeint/stepper/stepper_categories.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/stepper_categories.hpp rename to c++/boost/numeric/odeint/stepper/stepper_categories.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/symplectic_euler.hpp b/c++/boost/numeric/odeint/stepper/symplectic_euler.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/symplectic_euler.hpp rename to c++/boost/numeric/odeint/stepper/symplectic_euler.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_m4_mclachlan.hpp b/c++/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_m4_mclachlan.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_m4_mclachlan.hpp rename to c++/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_m4_mclachlan.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_mclachlan.hpp b/c++/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_mclachlan.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_mclachlan.hpp rename to c++/boost/numeric/odeint/stepper/symplectic_rkn_sb3a_mclachlan.hpp diff --git a/c++/include/boost/numeric/odeint/stepper/velocity_verlet.hpp b/c++/boost/numeric/odeint/stepper/velocity_verlet.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/stepper/velocity_verlet.hpp rename to c++/boost/numeric/odeint/stepper/velocity_verlet.hpp diff --git a/c++/include/boost/numeric/odeint/util/bind.hpp b/c++/boost/numeric/odeint/util/bind.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/bind.hpp rename to c++/boost/numeric/odeint/util/bind.hpp diff --git a/c++/include/boost/numeric/odeint/util/copy.hpp b/c++/boost/numeric/odeint/util/copy.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/copy.hpp rename to c++/boost/numeric/odeint/util/copy.hpp diff --git a/c++/include/boost/numeric/odeint/util/detail/is_range.hpp b/c++/boost/numeric/odeint/util/detail/is_range.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/detail/is_range.hpp rename to c++/boost/numeric/odeint/util/detail/is_range.hpp diff --git a/c++/include/boost/numeric/odeint/util/detail/less_with_sign.hpp b/c++/boost/numeric/odeint/util/detail/less_with_sign.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/detail/less_with_sign.hpp rename to c++/boost/numeric/odeint/util/detail/less_with_sign.hpp diff --git a/c++/include/boost/numeric/odeint/util/is_pair.hpp b/c++/boost/numeric/odeint/util/is_pair.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/is_pair.hpp rename to c++/boost/numeric/odeint/util/is_pair.hpp diff --git a/c++/include/boost/numeric/odeint/util/is_resizeable.hpp b/c++/boost/numeric/odeint/util/is_resizeable.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/is_resizeable.hpp rename to c++/boost/numeric/odeint/util/is_resizeable.hpp diff --git a/c++/include/boost/numeric/odeint/util/multi_array_adaption.hpp b/c++/boost/numeric/odeint/util/multi_array_adaption.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/multi_array_adaption.hpp rename to c++/boost/numeric/odeint/util/multi_array_adaption.hpp diff --git a/c++/include/boost/numeric/odeint/util/n_ary_helper.hpp b/c++/boost/numeric/odeint/util/n_ary_helper.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/n_ary_helper.hpp rename to c++/boost/numeric/odeint/util/n_ary_helper.hpp diff --git a/c++/include/boost/numeric/odeint/util/odeint_error.hpp b/c++/boost/numeric/odeint/util/odeint_error.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/odeint_error.hpp rename to c++/boost/numeric/odeint/util/odeint_error.hpp diff --git a/c++/include/boost/numeric/odeint/util/resize.hpp b/c++/boost/numeric/odeint/util/resize.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/resize.hpp rename to c++/boost/numeric/odeint/util/resize.hpp diff --git a/c++/include/boost/numeric/odeint/util/resizer.hpp b/c++/boost/numeric/odeint/util/resizer.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/resizer.hpp rename to c++/boost/numeric/odeint/util/resizer.hpp diff --git a/c++/include/boost/numeric/odeint/util/same_instance.hpp b/c++/boost/numeric/odeint/util/same_instance.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/same_instance.hpp rename to c++/boost/numeric/odeint/util/same_instance.hpp diff --git a/c++/include/boost/numeric/odeint/util/same_size.hpp b/c++/boost/numeric/odeint/util/same_size.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/same_size.hpp rename to c++/boost/numeric/odeint/util/same_size.hpp diff --git a/c++/include/boost/numeric/odeint/util/split.hpp b/c++/boost/numeric/odeint/util/split.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/split.hpp rename to c++/boost/numeric/odeint/util/split.hpp diff --git a/c++/include/boost/numeric/odeint/util/split_adaptor.hpp b/c++/boost/numeric/odeint/util/split_adaptor.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/split_adaptor.hpp rename to c++/boost/numeric/odeint/util/split_adaptor.hpp diff --git a/c++/include/boost/numeric/odeint/util/state_wrapper.hpp b/c++/boost/numeric/odeint/util/state_wrapper.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/state_wrapper.hpp rename to c++/boost/numeric/odeint/util/state_wrapper.hpp diff --git a/c++/include/boost/numeric/odeint/util/stepper_traits.hpp b/c++/boost/numeric/odeint/util/stepper_traits.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/stepper_traits.hpp rename to c++/boost/numeric/odeint/util/stepper_traits.hpp diff --git a/c++/include/boost/numeric/odeint/util/ublas_matrix_expression.patch b/c++/boost/numeric/odeint/util/ublas_matrix_expression.patch similarity index 100% rename from c++/include/boost/numeric/odeint/util/ublas_matrix_expression.patch rename to c++/boost/numeric/odeint/util/ublas_matrix_expression.patch diff --git a/c++/include/boost/numeric/odeint/util/ublas_wrapper.hpp b/c++/boost/numeric/odeint/util/ublas_wrapper.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/ublas_wrapper.hpp rename to c++/boost/numeric/odeint/util/ublas_wrapper.hpp diff --git a/c++/include/boost/numeric/odeint/util/unit_helper.hpp b/c++/boost/numeric/odeint/util/unit_helper.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/unit_helper.hpp rename to c++/boost/numeric/odeint/util/unit_helper.hpp diff --git a/c++/include/boost/numeric/odeint/util/unwrap_reference.hpp b/c++/boost/numeric/odeint/util/unwrap_reference.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/util/unwrap_reference.hpp rename to c++/boost/numeric/odeint/util/unwrap_reference.hpp diff --git a/c++/include/boost/numeric/odeint/version.hpp b/c++/boost/numeric/odeint/version.hpp similarity index 100% rename from c++/include/boost/numeric/odeint/version.hpp rename to c++/boost/numeric/odeint/version.hpp diff --git a/c++/include/boost/numeric/ublas/assignment.hpp b/c++/boost/numeric/ublas/assignment.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/assignment.hpp rename to c++/boost/numeric/ublas/assignment.hpp diff --git a/c++/include/boost/numeric/ublas/banded.hpp b/c++/boost/numeric/ublas/banded.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/banded.hpp rename to c++/boost/numeric/ublas/banded.hpp diff --git a/c++/include/boost/numeric/ublas/blas.hpp b/c++/boost/numeric/ublas/blas.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/blas.hpp rename to c++/boost/numeric/ublas/blas.hpp diff --git a/c++/include/boost/numeric/ublas/detail/concepts.hpp b/c++/boost/numeric/ublas/detail/concepts.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/detail/concepts.hpp rename to c++/boost/numeric/ublas/detail/concepts.hpp diff --git a/c++/include/boost/numeric/ublas/detail/config.hpp b/c++/boost/numeric/ublas/detail/config.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/detail/config.hpp rename to c++/boost/numeric/ublas/detail/config.hpp diff --git a/c++/include/boost/numeric/ublas/detail/definitions.hpp b/c++/boost/numeric/ublas/detail/definitions.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/detail/definitions.hpp rename to c++/boost/numeric/ublas/detail/definitions.hpp diff --git a/c++/include/boost/numeric/ublas/detail/documentation.hpp b/c++/boost/numeric/ublas/detail/documentation.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/detail/documentation.hpp rename to c++/boost/numeric/ublas/detail/documentation.hpp diff --git a/c++/include/boost/numeric/ublas/detail/duff.hpp b/c++/boost/numeric/ublas/detail/duff.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/detail/duff.hpp rename to c++/boost/numeric/ublas/detail/duff.hpp diff --git a/c++/include/boost/numeric/ublas/detail/iterator.hpp b/c++/boost/numeric/ublas/detail/iterator.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/detail/iterator.hpp rename to c++/boost/numeric/ublas/detail/iterator.hpp diff --git a/c++/include/boost/numeric/ublas/detail/matrix_assign.hpp b/c++/boost/numeric/ublas/detail/matrix_assign.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/detail/matrix_assign.hpp rename to c++/boost/numeric/ublas/detail/matrix_assign.hpp diff --git a/c++/include/boost/numeric/ublas/detail/raw.hpp b/c++/boost/numeric/ublas/detail/raw.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/detail/raw.hpp rename to c++/boost/numeric/ublas/detail/raw.hpp diff --git a/c++/include/boost/numeric/ublas/detail/returntype_deduction.hpp b/c++/boost/numeric/ublas/detail/returntype_deduction.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/detail/returntype_deduction.hpp rename to c++/boost/numeric/ublas/detail/returntype_deduction.hpp diff --git a/c++/include/boost/numeric/ublas/detail/temporary.hpp b/c++/boost/numeric/ublas/detail/temporary.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/detail/temporary.hpp rename to c++/boost/numeric/ublas/detail/temporary.hpp diff --git a/c++/include/boost/numeric/ublas/detail/vector_assign.hpp b/c++/boost/numeric/ublas/detail/vector_assign.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/detail/vector_assign.hpp rename to c++/boost/numeric/ublas/detail/vector_assign.hpp diff --git a/c++/include/boost/numeric/ublas/doxydoc.hpp b/c++/boost/numeric/ublas/doxydoc.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/doxydoc.hpp rename to c++/boost/numeric/ublas/doxydoc.hpp diff --git a/c++/include/boost/numeric/ublas/exception.hpp b/c++/boost/numeric/ublas/exception.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/exception.hpp rename to c++/boost/numeric/ublas/exception.hpp diff --git a/c++/include/boost/numeric/ublas/experimental/sparse_view.hpp b/c++/boost/numeric/ublas/experimental/sparse_view.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/experimental/sparse_view.hpp rename to c++/boost/numeric/ublas/experimental/sparse_view.hpp diff --git a/c++/include/boost/numeric/ublas/expression_types.hpp b/c++/boost/numeric/ublas/expression_types.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/expression_types.hpp rename to c++/boost/numeric/ublas/expression_types.hpp diff --git a/c++/include/boost/numeric/ublas/functional.hpp b/c++/boost/numeric/ublas/functional.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/functional.hpp rename to c++/boost/numeric/ublas/functional.hpp diff --git a/c++/include/boost/numeric/ublas/fwd.hpp b/c++/boost/numeric/ublas/fwd.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/fwd.hpp rename to c++/boost/numeric/ublas/fwd.hpp diff --git a/c++/include/boost/numeric/ublas/hermitian.hpp b/c++/boost/numeric/ublas/hermitian.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/hermitian.hpp rename to c++/boost/numeric/ublas/hermitian.hpp diff --git a/c++/include/boost/numeric/ublas/io.hpp b/c++/boost/numeric/ublas/io.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/io.hpp rename to c++/boost/numeric/ublas/io.hpp diff --git a/c++/include/boost/numeric/ublas/lu.hpp b/c++/boost/numeric/ublas/lu.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/lu.hpp rename to c++/boost/numeric/ublas/lu.hpp diff --git a/c++/include/boost/numeric/ublas/matrix.hpp b/c++/boost/numeric/ublas/matrix.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/matrix.hpp rename to c++/boost/numeric/ublas/matrix.hpp diff --git a/c++/include/boost/numeric/ublas/matrix_expression.hpp b/c++/boost/numeric/ublas/matrix_expression.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/matrix_expression.hpp rename to c++/boost/numeric/ublas/matrix_expression.hpp diff --git a/c++/include/boost/numeric/ublas/matrix_proxy.hpp b/c++/boost/numeric/ublas/matrix_proxy.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/matrix_proxy.hpp rename to c++/boost/numeric/ublas/matrix_proxy.hpp diff --git a/c++/include/boost/numeric/ublas/matrix_sparse.hpp b/c++/boost/numeric/ublas/matrix_sparse.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/matrix_sparse.hpp rename to c++/boost/numeric/ublas/matrix_sparse.hpp diff --git a/c++/include/boost/numeric/ublas/matrix_vector.hpp b/c++/boost/numeric/ublas/matrix_vector.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/matrix_vector.hpp rename to c++/boost/numeric/ublas/matrix_vector.hpp diff --git a/c++/include/boost/numeric/ublas/opencl.hpp b/c++/boost/numeric/ublas/opencl.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/opencl.hpp rename to c++/boost/numeric/ublas/opencl.hpp diff --git a/c++/include/boost/numeric/ublas/opencl/elementwise.hpp b/c++/boost/numeric/ublas/opencl/elementwise.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/opencl/elementwise.hpp rename to c++/boost/numeric/ublas/opencl/elementwise.hpp diff --git a/c++/include/boost/numeric/ublas/opencl/library.hpp b/c++/boost/numeric/ublas/opencl/library.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/opencl/library.hpp rename to c++/boost/numeric/ublas/opencl/library.hpp diff --git a/c++/include/boost/numeric/ublas/opencl/matrix.hpp b/c++/boost/numeric/ublas/opencl/matrix.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/opencl/matrix.hpp rename to c++/boost/numeric/ublas/opencl/matrix.hpp diff --git a/c++/include/boost/numeric/ublas/opencl/misc.hpp b/c++/boost/numeric/ublas/opencl/misc.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/opencl/misc.hpp rename to c++/boost/numeric/ublas/opencl/misc.hpp diff --git a/c++/include/boost/numeric/ublas/opencl/operations.hpp b/c++/boost/numeric/ublas/opencl/operations.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/opencl/operations.hpp rename to c++/boost/numeric/ublas/opencl/operations.hpp diff --git a/c++/include/boost/numeric/ublas/opencl/prod.hpp b/c++/boost/numeric/ublas/opencl/prod.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/opencl/prod.hpp rename to c++/boost/numeric/ublas/opencl/prod.hpp diff --git a/c++/include/boost/numeric/ublas/opencl/transpose.hpp b/c++/boost/numeric/ublas/opencl/transpose.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/opencl/transpose.hpp rename to c++/boost/numeric/ublas/opencl/transpose.hpp diff --git a/c++/include/boost/numeric/ublas/opencl/vector.hpp b/c++/boost/numeric/ublas/opencl/vector.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/opencl/vector.hpp rename to c++/boost/numeric/ublas/opencl/vector.hpp diff --git a/c++/include/boost/numeric/ublas/operation.hpp b/c++/boost/numeric/ublas/operation.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/operation.hpp rename to c++/boost/numeric/ublas/operation.hpp diff --git a/c++/include/boost/numeric/ublas/operation/begin.hpp b/c++/boost/numeric/ublas/operation/begin.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/operation/begin.hpp rename to c++/boost/numeric/ublas/operation/begin.hpp diff --git a/c++/include/boost/numeric/ublas/operation/c_array.hpp b/c++/boost/numeric/ublas/operation/c_array.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/operation/c_array.hpp rename to c++/boost/numeric/ublas/operation/c_array.hpp diff --git a/c++/include/boost/numeric/ublas/operation/end.hpp b/c++/boost/numeric/ublas/operation/end.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/operation/end.hpp rename to c++/boost/numeric/ublas/operation/end.hpp diff --git a/c++/include/boost/numeric/ublas/operation/num_columns.hpp b/c++/boost/numeric/ublas/operation/num_columns.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/operation/num_columns.hpp rename to c++/boost/numeric/ublas/operation/num_columns.hpp diff --git a/c++/include/boost/numeric/ublas/operation/num_rows.hpp b/c++/boost/numeric/ublas/operation/num_rows.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/operation/num_rows.hpp rename to c++/boost/numeric/ublas/operation/num_rows.hpp diff --git a/c++/include/boost/numeric/ublas/operation/size.hpp b/c++/boost/numeric/ublas/operation/size.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/operation/size.hpp rename to c++/boost/numeric/ublas/operation/size.hpp diff --git a/c++/include/boost/numeric/ublas/operation_blocked.hpp b/c++/boost/numeric/ublas/operation_blocked.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/operation_blocked.hpp rename to c++/boost/numeric/ublas/operation_blocked.hpp diff --git a/c++/include/boost/numeric/ublas/operation_sparse.hpp b/c++/boost/numeric/ublas/operation_sparse.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/operation_sparse.hpp rename to c++/boost/numeric/ublas/operation_sparse.hpp diff --git a/c++/include/boost/numeric/ublas/operations.hpp b/c++/boost/numeric/ublas/operations.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/operations.hpp rename to c++/boost/numeric/ublas/operations.hpp diff --git a/c++/include/boost/numeric/ublas/storage.hpp b/c++/boost/numeric/ublas/storage.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/storage.hpp rename to c++/boost/numeric/ublas/storage.hpp diff --git a/c++/include/boost/numeric/ublas/storage_sparse.hpp b/c++/boost/numeric/ublas/storage_sparse.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/storage_sparse.hpp rename to c++/boost/numeric/ublas/storage_sparse.hpp diff --git a/c++/include/boost/numeric/ublas/symmetric.hpp b/c++/boost/numeric/ublas/symmetric.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/symmetric.hpp rename to c++/boost/numeric/ublas/symmetric.hpp diff --git a/c++/include/boost/numeric/ublas/tags.hpp b/c++/boost/numeric/ublas/tags.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tags.hpp rename to c++/boost/numeric/ublas/tags.hpp diff --git a/c++/include/boost/numeric/ublas/tensor.hpp b/c++/boost/numeric/ublas/tensor.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor.hpp rename to c++/boost/numeric/ublas/tensor.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/algorithms.hpp b/c++/boost/numeric/ublas/tensor/algorithms.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/algorithms.hpp rename to c++/boost/numeric/ublas/tensor/algorithms.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/expression.hpp b/c++/boost/numeric/ublas/tensor/expression.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/expression.hpp rename to c++/boost/numeric/ublas/tensor/expression.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/expression_evaluation.hpp b/c++/boost/numeric/ublas/tensor/expression_evaluation.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/expression_evaluation.hpp rename to c++/boost/numeric/ublas/tensor/expression_evaluation.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/extents.hpp b/c++/boost/numeric/ublas/tensor/extents.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/extents.hpp rename to c++/boost/numeric/ublas/tensor/extents.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/functions.hpp b/c++/boost/numeric/ublas/tensor/functions.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/functions.hpp rename to c++/boost/numeric/ublas/tensor/functions.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/index.hpp b/c++/boost/numeric/ublas/tensor/index.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/index.hpp rename to c++/boost/numeric/ublas/tensor/index.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/multi_index.hpp b/c++/boost/numeric/ublas/tensor/multi_index.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/multi_index.hpp rename to c++/boost/numeric/ublas/tensor/multi_index.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/multi_index_utility.hpp b/c++/boost/numeric/ublas/tensor/multi_index_utility.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/multi_index_utility.hpp rename to c++/boost/numeric/ublas/tensor/multi_index_utility.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/multiplication.hpp b/c++/boost/numeric/ublas/tensor/multiplication.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/multiplication.hpp rename to c++/boost/numeric/ublas/tensor/multiplication.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/operators_arithmetic.hpp b/c++/boost/numeric/ublas/tensor/operators_arithmetic.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/operators_arithmetic.hpp rename to c++/boost/numeric/ublas/tensor/operators_arithmetic.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/operators_comparison.hpp b/c++/boost/numeric/ublas/tensor/operators_comparison.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/operators_comparison.hpp rename to c++/boost/numeric/ublas/tensor/operators_comparison.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/ostream.hpp b/c++/boost/numeric/ublas/tensor/ostream.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/ostream.hpp rename to c++/boost/numeric/ublas/tensor/ostream.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/storage_traits.hpp b/c++/boost/numeric/ublas/tensor/storage_traits.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/storage_traits.hpp rename to c++/boost/numeric/ublas/tensor/storage_traits.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/strides.hpp b/c++/boost/numeric/ublas/tensor/strides.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/strides.hpp rename to c++/boost/numeric/ublas/tensor/strides.hpp diff --git a/c++/include/boost/numeric/ublas/tensor/tensor.hpp b/c++/boost/numeric/ublas/tensor/tensor.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/tensor/tensor.hpp rename to c++/boost/numeric/ublas/tensor/tensor.hpp diff --git a/c++/include/boost/numeric/ublas/traits.hpp b/c++/boost/numeric/ublas/traits.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/traits.hpp rename to c++/boost/numeric/ublas/traits.hpp diff --git a/c++/include/boost/numeric/ublas/traits/c_array.hpp b/c++/boost/numeric/ublas/traits/c_array.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/traits/c_array.hpp rename to c++/boost/numeric/ublas/traits/c_array.hpp diff --git a/c++/include/boost/numeric/ublas/traits/const_iterator_type.hpp b/c++/boost/numeric/ublas/traits/const_iterator_type.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/traits/const_iterator_type.hpp rename to c++/boost/numeric/ublas/traits/const_iterator_type.hpp diff --git a/c++/include/boost/numeric/ublas/traits/iterator_type.hpp b/c++/boost/numeric/ublas/traits/iterator_type.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/traits/iterator_type.hpp rename to c++/boost/numeric/ublas/traits/iterator_type.hpp diff --git a/c++/include/boost/numeric/ublas/triangular.hpp b/c++/boost/numeric/ublas/triangular.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/triangular.hpp rename to c++/boost/numeric/ublas/triangular.hpp diff --git a/c++/include/boost/numeric/ublas/vector.hpp b/c++/boost/numeric/ublas/vector.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/vector.hpp rename to c++/boost/numeric/ublas/vector.hpp diff --git a/c++/include/boost/numeric/ublas/vector_expression.hpp b/c++/boost/numeric/ublas/vector_expression.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/vector_expression.hpp rename to c++/boost/numeric/ublas/vector_expression.hpp diff --git a/c++/include/boost/numeric/ublas/vector_of_vector.hpp b/c++/boost/numeric/ublas/vector_of_vector.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/vector_of_vector.hpp rename to c++/boost/numeric/ublas/vector_of_vector.hpp diff --git a/c++/include/boost/numeric/ublas/vector_proxy.hpp b/c++/boost/numeric/ublas/vector_proxy.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/vector_proxy.hpp rename to c++/boost/numeric/ublas/vector_proxy.hpp diff --git a/c++/include/boost/numeric/ublas/vector_sparse.hpp b/c++/boost/numeric/ublas/vector_sparse.hpp similarity index 100% rename from c++/include/boost/numeric/ublas/vector_sparse.hpp rename to c++/boost/numeric/ublas/vector_sparse.hpp diff --git a/c++/include/boost/operators.hpp b/c++/boost/operators.hpp similarity index 100% rename from c++/include/boost/operators.hpp rename to c++/boost/operators.hpp diff --git a/c++/include/boost/operators_v1.hpp b/c++/boost/operators_v1.hpp similarity index 100% rename from c++/include/boost/operators_v1.hpp rename to c++/boost/operators_v1.hpp diff --git a/c++/include/boost/optional.hpp b/c++/boost/optional.hpp similarity index 100% rename from c++/include/boost/optional.hpp rename to c++/boost/optional.hpp diff --git a/c++/include/boost/optional/bad_optional_access.hpp b/c++/boost/optional/bad_optional_access.hpp similarity index 100% rename from c++/include/boost/optional/bad_optional_access.hpp rename to c++/boost/optional/bad_optional_access.hpp diff --git a/c++/include/boost/optional/detail/experimental_traits.hpp b/c++/boost/optional/detail/experimental_traits.hpp similarity index 100% rename from c++/include/boost/optional/detail/experimental_traits.hpp rename to c++/boost/optional/detail/experimental_traits.hpp diff --git a/c++/include/boost/optional/detail/old_optional_implementation.hpp b/c++/boost/optional/detail/old_optional_implementation.hpp similarity index 100% rename from c++/include/boost/optional/detail/old_optional_implementation.hpp rename to c++/boost/optional/detail/old_optional_implementation.hpp diff --git a/c++/include/boost/optional/detail/optional_aligned_storage.hpp b/c++/boost/optional/detail/optional_aligned_storage.hpp similarity index 100% rename from c++/include/boost/optional/detail/optional_aligned_storage.hpp rename to c++/boost/optional/detail/optional_aligned_storage.hpp diff --git a/c++/include/boost/optional/detail/optional_config.hpp b/c++/boost/optional/detail/optional_config.hpp similarity index 100% rename from c++/include/boost/optional/detail/optional_config.hpp rename to c++/boost/optional/detail/optional_config.hpp diff --git a/c++/include/boost/optional/detail/optional_factory_support.hpp b/c++/boost/optional/detail/optional_factory_support.hpp similarity index 100% rename from c++/include/boost/optional/detail/optional_factory_support.hpp rename to c++/boost/optional/detail/optional_factory_support.hpp diff --git a/c++/include/boost/optional/detail/optional_hash.hpp b/c++/boost/optional/detail/optional_hash.hpp similarity index 100% rename from c++/include/boost/optional/detail/optional_hash.hpp rename to c++/boost/optional/detail/optional_hash.hpp diff --git a/c++/include/boost/optional/detail/optional_reference_spec.hpp b/c++/boost/optional/detail/optional_reference_spec.hpp similarity index 100% rename from c++/include/boost/optional/detail/optional_reference_spec.hpp rename to c++/boost/optional/detail/optional_reference_spec.hpp diff --git a/c++/include/boost/optional/detail/optional_relops.hpp b/c++/boost/optional/detail/optional_relops.hpp similarity index 100% rename from c++/include/boost/optional/detail/optional_relops.hpp rename to c++/boost/optional/detail/optional_relops.hpp diff --git a/c++/include/boost/optional/detail/optional_swap.hpp b/c++/boost/optional/detail/optional_swap.hpp similarity index 100% rename from c++/include/boost/optional/detail/optional_swap.hpp rename to c++/boost/optional/detail/optional_swap.hpp diff --git a/c++/include/boost/optional/detail/optional_trivially_copyable_base.hpp b/c++/boost/optional/detail/optional_trivially_copyable_base.hpp similarity index 100% rename from c++/include/boost/optional/detail/optional_trivially_copyable_base.hpp rename to c++/boost/optional/detail/optional_trivially_copyable_base.hpp diff --git a/c++/include/boost/optional/optional.hpp b/c++/boost/optional/optional.hpp similarity index 100% rename from c++/include/boost/optional/optional.hpp rename to c++/boost/optional/optional.hpp diff --git a/c++/include/boost/optional/optional_fwd.hpp b/c++/boost/optional/optional_fwd.hpp similarity index 100% rename from c++/include/boost/optional/optional_fwd.hpp rename to c++/boost/optional/optional_fwd.hpp diff --git a/c++/include/boost/optional/optional_io.hpp b/c++/boost/optional/optional_io.hpp similarity index 100% rename from c++/include/boost/optional/optional_io.hpp rename to c++/boost/optional/optional_io.hpp diff --git a/c++/include/boost/outcome.hpp b/c++/boost/outcome.hpp similarity index 100% rename from c++/include/boost/outcome.hpp rename to c++/boost/outcome.hpp diff --git a/c++/include/boost/parameter.hpp b/c++/boost/parameter.hpp similarity index 100% rename from c++/include/boost/parameter.hpp rename to c++/boost/parameter.hpp diff --git a/c++/include/boost/pfr.hpp b/c++/boost/pfr.hpp similarity index 100% rename from c++/include/boost/pfr.hpp rename to c++/boost/pfr.hpp diff --git a/c++/include/boost/phoenix.hpp b/c++/boost/phoenix.hpp similarity index 100% rename from c++/include/boost/phoenix.hpp rename to c++/boost/phoenix.hpp diff --git a/c++/include/boost/pointee.hpp b/c++/boost/pointee.hpp similarity index 100% rename from c++/include/boost/pointee.hpp rename to c++/boost/pointee.hpp diff --git a/c++/include/boost/pointer_cast.hpp b/c++/boost/pointer_cast.hpp similarity index 100% rename from c++/include/boost/pointer_cast.hpp rename to c++/boost/pointer_cast.hpp diff --git a/c++/include/boost/pointer_to_other.hpp b/c++/boost/pointer_to_other.hpp similarity index 100% rename from c++/include/boost/pointer_to_other.hpp rename to c++/boost/pointer_to_other.hpp diff --git a/c++/include/boost/polymorphic_cast.hpp b/c++/boost/polymorphic_cast.hpp similarity index 100% rename from c++/include/boost/polymorphic_cast.hpp rename to c++/boost/polymorphic_cast.hpp diff --git a/c++/include/boost/polymorphic_pointer_cast.hpp b/c++/boost/polymorphic_pointer_cast.hpp similarity index 100% rename from c++/include/boost/polymorphic_pointer_cast.hpp rename to c++/boost/polymorphic_pointer_cast.hpp diff --git a/c++/include/boost/predef.h b/c++/boost/predef.h similarity index 100% rename from c++/include/boost/predef.h rename to c++/boost/predef.h diff --git a/c++/include/boost/predef/architecture.h b/c++/boost/predef/architecture.h similarity index 100% rename from c++/include/boost/predef/architecture.h rename to c++/boost/predef/architecture.h diff --git a/c++/include/boost/predef/architecture/alpha.h b/c++/boost/predef/architecture/alpha.h similarity index 100% rename from c++/include/boost/predef/architecture/alpha.h rename to c++/boost/predef/architecture/alpha.h diff --git a/c++/include/boost/predef/architecture/arm.h b/c++/boost/predef/architecture/arm.h similarity index 100% rename from c++/include/boost/predef/architecture/arm.h rename to c++/boost/predef/architecture/arm.h diff --git a/c++/include/boost/predef/architecture/blackfin.h b/c++/boost/predef/architecture/blackfin.h similarity index 100% rename from c++/include/boost/predef/architecture/blackfin.h rename to c++/boost/predef/architecture/blackfin.h diff --git a/c++/include/boost/predef/architecture/convex.h b/c++/boost/predef/architecture/convex.h similarity index 100% rename from c++/include/boost/predef/architecture/convex.h rename to c++/boost/predef/architecture/convex.h diff --git a/c++/include/boost/predef/architecture/e2k.h b/c++/boost/predef/architecture/e2k.h similarity index 100% rename from c++/include/boost/predef/architecture/e2k.h rename to c++/boost/predef/architecture/e2k.h diff --git a/c++/include/boost/predef/architecture/ia64.h b/c++/boost/predef/architecture/ia64.h similarity index 100% rename from c++/include/boost/predef/architecture/ia64.h rename to c++/boost/predef/architecture/ia64.h diff --git a/c++/include/boost/predef/architecture/loongarch.h b/c++/boost/predef/architecture/loongarch.h similarity index 100% rename from c++/include/boost/predef/architecture/loongarch.h rename to c++/boost/predef/architecture/loongarch.h diff --git a/c++/include/boost/predef/architecture/m68k.h b/c++/boost/predef/architecture/m68k.h similarity index 100% rename from c++/include/boost/predef/architecture/m68k.h rename to c++/boost/predef/architecture/m68k.h diff --git a/c++/include/boost/predef/architecture/mips.h b/c++/boost/predef/architecture/mips.h similarity index 100% rename from c++/include/boost/predef/architecture/mips.h rename to c++/boost/predef/architecture/mips.h diff --git a/c++/include/boost/predef/architecture/parisc.h b/c++/boost/predef/architecture/parisc.h similarity index 100% rename from c++/include/boost/predef/architecture/parisc.h rename to c++/boost/predef/architecture/parisc.h diff --git a/c++/include/boost/predef/architecture/ppc.h b/c++/boost/predef/architecture/ppc.h similarity index 100% rename from c++/include/boost/predef/architecture/ppc.h rename to c++/boost/predef/architecture/ppc.h diff --git a/c++/include/boost/predef/architecture/ptx.h b/c++/boost/predef/architecture/ptx.h similarity index 100% rename from c++/include/boost/predef/architecture/ptx.h rename to c++/boost/predef/architecture/ptx.h diff --git a/c++/include/boost/predef/architecture/pyramid.h b/c++/boost/predef/architecture/pyramid.h similarity index 100% rename from c++/include/boost/predef/architecture/pyramid.h rename to c++/boost/predef/architecture/pyramid.h diff --git a/c++/include/boost/predef/architecture/riscv.h b/c++/boost/predef/architecture/riscv.h similarity index 100% rename from c++/include/boost/predef/architecture/riscv.h rename to c++/boost/predef/architecture/riscv.h diff --git a/c++/include/boost/predef/architecture/rs6k.h b/c++/boost/predef/architecture/rs6k.h similarity index 100% rename from c++/include/boost/predef/architecture/rs6k.h rename to c++/boost/predef/architecture/rs6k.h diff --git a/c++/include/boost/predef/architecture/sparc.h b/c++/boost/predef/architecture/sparc.h similarity index 100% rename from c++/include/boost/predef/architecture/sparc.h rename to c++/boost/predef/architecture/sparc.h diff --git a/c++/include/boost/predef/architecture/superh.h b/c++/boost/predef/architecture/superh.h similarity index 100% rename from c++/include/boost/predef/architecture/superh.h rename to c++/boost/predef/architecture/superh.h diff --git a/c++/include/boost/predef/architecture/sys370.h b/c++/boost/predef/architecture/sys370.h similarity index 100% rename from c++/include/boost/predef/architecture/sys370.h rename to c++/boost/predef/architecture/sys370.h diff --git a/c++/include/boost/predef/architecture/sys390.h b/c++/boost/predef/architecture/sys390.h similarity index 100% rename from c++/include/boost/predef/architecture/sys390.h rename to c++/boost/predef/architecture/sys390.h diff --git a/c++/include/boost/predef/architecture/x86.h b/c++/boost/predef/architecture/x86.h similarity index 100% rename from c++/include/boost/predef/architecture/x86.h rename to c++/boost/predef/architecture/x86.h diff --git a/c++/include/boost/predef/architecture/x86/32.h b/c++/boost/predef/architecture/x86/32.h similarity index 100% rename from c++/include/boost/predef/architecture/x86/32.h rename to c++/boost/predef/architecture/x86/32.h diff --git a/c++/include/boost/predef/architecture/x86/64.h b/c++/boost/predef/architecture/x86/64.h similarity index 100% rename from c++/include/boost/predef/architecture/x86/64.h rename to c++/boost/predef/architecture/x86/64.h diff --git a/c++/include/boost/predef/architecture/z.h b/c++/boost/predef/architecture/z.h similarity index 100% rename from c++/include/boost/predef/architecture/z.h rename to c++/boost/predef/architecture/z.h diff --git a/c++/include/boost/predef/compiler.h b/c++/boost/predef/compiler.h similarity index 100% rename from c++/include/boost/predef/compiler.h rename to c++/boost/predef/compiler.h diff --git a/c++/include/boost/predef/compiler/borland.h b/c++/boost/predef/compiler/borland.h similarity index 100% rename from c++/include/boost/predef/compiler/borland.h rename to c++/boost/predef/compiler/borland.h diff --git a/c++/include/boost/predef/compiler/clang.h b/c++/boost/predef/compiler/clang.h similarity index 100% rename from c++/include/boost/predef/compiler/clang.h rename to c++/boost/predef/compiler/clang.h diff --git a/c++/include/boost/predef/compiler/comeau.h b/c++/boost/predef/compiler/comeau.h similarity index 100% rename from c++/include/boost/predef/compiler/comeau.h rename to c++/boost/predef/compiler/comeau.h diff --git a/c++/include/boost/predef/compiler/compaq.h b/c++/boost/predef/compiler/compaq.h similarity index 100% rename from c++/include/boost/predef/compiler/compaq.h rename to c++/boost/predef/compiler/compaq.h diff --git a/c++/include/boost/predef/compiler/diab.h b/c++/boost/predef/compiler/diab.h similarity index 100% rename from c++/include/boost/predef/compiler/diab.h rename to c++/boost/predef/compiler/diab.h diff --git a/c++/include/boost/predef/compiler/digitalmars.h b/c++/boost/predef/compiler/digitalmars.h similarity index 100% rename from c++/include/boost/predef/compiler/digitalmars.h rename to c++/boost/predef/compiler/digitalmars.h diff --git a/c++/include/boost/predef/compiler/dignus.h b/c++/boost/predef/compiler/dignus.h similarity index 100% rename from c++/include/boost/predef/compiler/dignus.h rename to c++/boost/predef/compiler/dignus.h diff --git a/c++/include/boost/predef/compiler/edg.h b/c++/boost/predef/compiler/edg.h similarity index 100% rename from c++/include/boost/predef/compiler/edg.h rename to c++/boost/predef/compiler/edg.h diff --git a/c++/include/boost/predef/compiler/ekopath.h b/c++/boost/predef/compiler/ekopath.h similarity index 100% rename from c++/include/boost/predef/compiler/ekopath.h rename to c++/boost/predef/compiler/ekopath.h diff --git a/c++/include/boost/predef/compiler/gcc.h b/c++/boost/predef/compiler/gcc.h similarity index 100% rename from c++/include/boost/predef/compiler/gcc.h rename to c++/boost/predef/compiler/gcc.h diff --git a/c++/include/boost/predef/compiler/gcc_xml.h b/c++/boost/predef/compiler/gcc_xml.h similarity index 100% rename from c++/include/boost/predef/compiler/gcc_xml.h rename to c++/boost/predef/compiler/gcc_xml.h diff --git a/c++/include/boost/predef/compiler/greenhills.h b/c++/boost/predef/compiler/greenhills.h similarity index 100% rename from c++/include/boost/predef/compiler/greenhills.h rename to c++/boost/predef/compiler/greenhills.h diff --git a/c++/include/boost/predef/compiler/hp_acc.h b/c++/boost/predef/compiler/hp_acc.h similarity index 100% rename from c++/include/boost/predef/compiler/hp_acc.h rename to c++/boost/predef/compiler/hp_acc.h diff --git a/c++/include/boost/predef/compiler/iar.h b/c++/boost/predef/compiler/iar.h similarity index 100% rename from c++/include/boost/predef/compiler/iar.h rename to c++/boost/predef/compiler/iar.h diff --git a/c++/include/boost/predef/compiler/ibm.h b/c++/boost/predef/compiler/ibm.h similarity index 100% rename from c++/include/boost/predef/compiler/ibm.h rename to c++/boost/predef/compiler/ibm.h diff --git a/c++/include/boost/predef/compiler/intel.h b/c++/boost/predef/compiler/intel.h similarity index 100% rename from c++/include/boost/predef/compiler/intel.h rename to c++/boost/predef/compiler/intel.h diff --git a/c++/include/boost/predef/compiler/kai.h b/c++/boost/predef/compiler/kai.h similarity index 100% rename from c++/include/boost/predef/compiler/kai.h rename to c++/boost/predef/compiler/kai.h diff --git a/c++/include/boost/predef/compiler/llvm.h b/c++/boost/predef/compiler/llvm.h similarity index 100% rename from c++/include/boost/predef/compiler/llvm.h rename to c++/boost/predef/compiler/llvm.h diff --git a/c++/include/boost/predef/compiler/metaware.h b/c++/boost/predef/compiler/metaware.h similarity index 100% rename from c++/include/boost/predef/compiler/metaware.h rename to c++/boost/predef/compiler/metaware.h diff --git a/c++/include/boost/predef/compiler/metrowerks.h b/c++/boost/predef/compiler/metrowerks.h similarity index 100% rename from c++/include/boost/predef/compiler/metrowerks.h rename to c++/boost/predef/compiler/metrowerks.h diff --git a/c++/include/boost/predef/compiler/microtec.h b/c++/boost/predef/compiler/microtec.h similarity index 100% rename from c++/include/boost/predef/compiler/microtec.h rename to c++/boost/predef/compiler/microtec.h diff --git a/c++/include/boost/predef/compiler/mpw.h b/c++/boost/predef/compiler/mpw.h similarity index 100% rename from c++/include/boost/predef/compiler/mpw.h rename to c++/boost/predef/compiler/mpw.h diff --git a/c++/include/boost/predef/compiler/nvcc.h b/c++/boost/predef/compiler/nvcc.h similarity index 100% rename from c++/include/boost/predef/compiler/nvcc.h rename to c++/boost/predef/compiler/nvcc.h diff --git a/c++/include/boost/predef/compiler/palm.h b/c++/boost/predef/compiler/palm.h similarity index 100% rename from c++/include/boost/predef/compiler/palm.h rename to c++/boost/predef/compiler/palm.h diff --git a/c++/include/boost/predef/compiler/pgi.h b/c++/boost/predef/compiler/pgi.h similarity index 100% rename from c++/include/boost/predef/compiler/pgi.h rename to c++/boost/predef/compiler/pgi.h diff --git a/c++/include/boost/predef/compiler/sgi_mipspro.h b/c++/boost/predef/compiler/sgi_mipspro.h similarity index 100% rename from c++/include/boost/predef/compiler/sgi_mipspro.h rename to c++/boost/predef/compiler/sgi_mipspro.h diff --git a/c++/include/boost/predef/compiler/sunpro.h b/c++/boost/predef/compiler/sunpro.h similarity index 100% rename from c++/include/boost/predef/compiler/sunpro.h rename to c++/boost/predef/compiler/sunpro.h diff --git a/c++/include/boost/predef/compiler/tendra.h b/c++/boost/predef/compiler/tendra.h similarity index 100% rename from c++/include/boost/predef/compiler/tendra.h rename to c++/boost/predef/compiler/tendra.h diff --git a/c++/include/boost/predef/compiler/visualc.h b/c++/boost/predef/compiler/visualc.h similarity index 100% rename from c++/include/boost/predef/compiler/visualc.h rename to c++/boost/predef/compiler/visualc.h diff --git a/c++/include/boost/predef/compiler/watcom.h b/c++/boost/predef/compiler/watcom.h similarity index 100% rename from c++/include/boost/predef/compiler/watcom.h rename to c++/boost/predef/compiler/watcom.h diff --git a/c++/include/boost/predef/detail/_cassert.h b/c++/boost/predef/detail/_cassert.h similarity index 100% rename from c++/include/boost/predef/detail/_cassert.h rename to c++/boost/predef/detail/_cassert.h diff --git a/c++/include/boost/predef/detail/_exception.h b/c++/boost/predef/detail/_exception.h similarity index 100% rename from c++/include/boost/predef/detail/_exception.h rename to c++/boost/predef/detail/_exception.h diff --git a/c++/include/boost/predef/detail/comp_detected.h b/c++/boost/predef/detail/comp_detected.h similarity index 100% rename from c++/include/boost/predef/detail/comp_detected.h rename to c++/boost/predef/detail/comp_detected.h diff --git a/c++/include/boost/predef/detail/os_detected.h b/c++/boost/predef/detail/os_detected.h similarity index 100% rename from c++/include/boost/predef/detail/os_detected.h rename to c++/boost/predef/detail/os_detected.h diff --git a/c++/include/boost/predef/detail/platform_detected.h b/c++/boost/predef/detail/platform_detected.h similarity index 100% rename from c++/include/boost/predef/detail/platform_detected.h rename to c++/boost/predef/detail/platform_detected.h diff --git a/c++/include/boost/predef/detail/test.h b/c++/boost/predef/detail/test.h similarity index 100% rename from c++/include/boost/predef/detail/test.h rename to c++/boost/predef/detail/test.h diff --git a/c++/include/boost/predef/detail/test_def.h b/c++/boost/predef/detail/test_def.h similarity index 100% rename from c++/include/boost/predef/detail/test_def.h rename to c++/boost/predef/detail/test_def.h diff --git a/c++/include/boost/predef/hardware.h b/c++/boost/predef/hardware.h similarity index 100% rename from c++/include/boost/predef/hardware.h rename to c++/boost/predef/hardware.h diff --git a/c++/include/boost/predef/hardware/simd.h b/c++/boost/predef/hardware/simd.h similarity index 100% rename from c++/include/boost/predef/hardware/simd.h rename to c++/boost/predef/hardware/simd.h diff --git a/c++/include/boost/predef/hardware/simd/arm.h b/c++/boost/predef/hardware/simd/arm.h similarity index 100% rename from c++/include/boost/predef/hardware/simd/arm.h rename to c++/boost/predef/hardware/simd/arm.h diff --git a/c++/include/boost/predef/hardware/simd/arm/versions.h b/c++/boost/predef/hardware/simd/arm/versions.h similarity index 100% rename from c++/include/boost/predef/hardware/simd/arm/versions.h rename to c++/boost/predef/hardware/simd/arm/versions.h diff --git a/c++/include/boost/predef/hardware/simd/ppc.h b/c++/boost/predef/hardware/simd/ppc.h similarity index 100% rename from c++/include/boost/predef/hardware/simd/ppc.h rename to c++/boost/predef/hardware/simd/ppc.h diff --git a/c++/include/boost/predef/hardware/simd/ppc/versions.h b/c++/boost/predef/hardware/simd/ppc/versions.h similarity index 100% rename from c++/include/boost/predef/hardware/simd/ppc/versions.h rename to c++/boost/predef/hardware/simd/ppc/versions.h diff --git a/c++/include/boost/predef/hardware/simd/x86.h b/c++/boost/predef/hardware/simd/x86.h similarity index 100% rename from c++/include/boost/predef/hardware/simd/x86.h rename to c++/boost/predef/hardware/simd/x86.h diff --git a/c++/include/boost/predef/hardware/simd/x86/versions.h b/c++/boost/predef/hardware/simd/x86/versions.h similarity index 100% rename from c++/include/boost/predef/hardware/simd/x86/versions.h rename to c++/boost/predef/hardware/simd/x86/versions.h diff --git a/c++/include/boost/predef/hardware/simd/x86_amd.h b/c++/boost/predef/hardware/simd/x86_amd.h similarity index 100% rename from c++/include/boost/predef/hardware/simd/x86_amd.h rename to c++/boost/predef/hardware/simd/x86_amd.h diff --git a/c++/include/boost/predef/hardware/simd/x86_amd/versions.h b/c++/boost/predef/hardware/simd/x86_amd/versions.h similarity index 100% rename from c++/include/boost/predef/hardware/simd/x86_amd/versions.h rename to c++/boost/predef/hardware/simd/x86_amd/versions.h diff --git a/c++/include/boost/predef/language.h b/c++/boost/predef/language.h similarity index 100% rename from c++/include/boost/predef/language.h rename to c++/boost/predef/language.h diff --git a/c++/include/boost/predef/language/cuda.h b/c++/boost/predef/language/cuda.h similarity index 100% rename from c++/include/boost/predef/language/cuda.h rename to c++/boost/predef/language/cuda.h diff --git a/c++/include/boost/predef/language/objc.h b/c++/boost/predef/language/objc.h similarity index 100% rename from c++/include/boost/predef/language/objc.h rename to c++/boost/predef/language/objc.h diff --git a/c++/include/boost/predef/language/stdc.h b/c++/boost/predef/language/stdc.h similarity index 100% rename from c++/include/boost/predef/language/stdc.h rename to c++/boost/predef/language/stdc.h diff --git a/c++/include/boost/predef/language/stdcpp.h b/c++/boost/predef/language/stdcpp.h similarity index 100% rename from c++/include/boost/predef/language/stdcpp.h rename to c++/boost/predef/language/stdcpp.h diff --git a/c++/include/boost/predef/library.h b/c++/boost/predef/library.h similarity index 100% rename from c++/include/boost/predef/library.h rename to c++/boost/predef/library.h diff --git a/c++/include/boost/predef/library/c.h b/c++/boost/predef/library/c.h similarity index 100% rename from c++/include/boost/predef/library/c.h rename to c++/boost/predef/library/c.h diff --git a/c++/include/boost/predef/library/c/_prefix.h b/c++/boost/predef/library/c/_prefix.h similarity index 100% rename from c++/include/boost/predef/library/c/_prefix.h rename to c++/boost/predef/library/c/_prefix.h diff --git a/c++/include/boost/predef/library/c/cloudabi.h b/c++/boost/predef/library/c/cloudabi.h similarity index 100% rename from c++/include/boost/predef/library/c/cloudabi.h rename to c++/boost/predef/library/c/cloudabi.h diff --git a/c++/include/boost/predef/library/c/gnu.h b/c++/boost/predef/library/c/gnu.h similarity index 100% rename from c++/include/boost/predef/library/c/gnu.h rename to c++/boost/predef/library/c/gnu.h diff --git a/c++/include/boost/predef/library/c/uc.h b/c++/boost/predef/library/c/uc.h similarity index 100% rename from c++/include/boost/predef/library/c/uc.h rename to c++/boost/predef/library/c/uc.h diff --git a/c++/include/boost/predef/library/c/vms.h b/c++/boost/predef/library/c/vms.h similarity index 100% rename from c++/include/boost/predef/library/c/vms.h rename to c++/boost/predef/library/c/vms.h diff --git a/c++/include/boost/predef/library/c/zos.h b/c++/boost/predef/library/c/zos.h similarity index 100% rename from c++/include/boost/predef/library/c/zos.h rename to c++/boost/predef/library/c/zos.h diff --git a/c++/include/boost/predef/library/std.h b/c++/boost/predef/library/std.h similarity index 100% rename from c++/include/boost/predef/library/std.h rename to c++/boost/predef/library/std.h diff --git a/c++/include/boost/predef/library/std/_prefix.h b/c++/boost/predef/library/std/_prefix.h similarity index 100% rename from c++/include/boost/predef/library/std/_prefix.h rename to c++/boost/predef/library/std/_prefix.h diff --git a/c++/include/boost/predef/library/std/cxx.h b/c++/boost/predef/library/std/cxx.h similarity index 100% rename from c++/include/boost/predef/library/std/cxx.h rename to c++/boost/predef/library/std/cxx.h diff --git a/c++/include/boost/predef/library/std/dinkumware.h b/c++/boost/predef/library/std/dinkumware.h similarity index 100% rename from c++/include/boost/predef/library/std/dinkumware.h rename to c++/boost/predef/library/std/dinkumware.h diff --git a/c++/include/boost/predef/library/std/libcomo.h b/c++/boost/predef/library/std/libcomo.h similarity index 100% rename from c++/include/boost/predef/library/std/libcomo.h rename to c++/boost/predef/library/std/libcomo.h diff --git a/c++/include/boost/predef/library/std/modena.h b/c++/boost/predef/library/std/modena.h similarity index 100% rename from c++/include/boost/predef/library/std/modena.h rename to c++/boost/predef/library/std/modena.h diff --git a/c++/include/boost/predef/library/std/msl.h b/c++/boost/predef/library/std/msl.h similarity index 100% rename from c++/include/boost/predef/library/std/msl.h rename to c++/boost/predef/library/std/msl.h diff --git a/c++/include/boost/predef/library/std/roguewave.h b/c++/boost/predef/library/std/roguewave.h similarity index 100% rename from c++/include/boost/predef/library/std/roguewave.h rename to c++/boost/predef/library/std/roguewave.h diff --git a/c++/include/boost/predef/library/std/sgi.h b/c++/boost/predef/library/std/sgi.h similarity index 100% rename from c++/include/boost/predef/library/std/sgi.h rename to c++/boost/predef/library/std/sgi.h diff --git a/c++/include/boost/predef/library/std/stdcpp3.h b/c++/boost/predef/library/std/stdcpp3.h similarity index 100% rename from c++/include/boost/predef/library/std/stdcpp3.h rename to c++/boost/predef/library/std/stdcpp3.h diff --git a/c++/include/boost/predef/library/std/stlport.h b/c++/boost/predef/library/std/stlport.h similarity index 100% rename from c++/include/boost/predef/library/std/stlport.h rename to c++/boost/predef/library/std/stlport.h diff --git a/c++/include/boost/predef/library/std/vacpp.h b/c++/boost/predef/library/std/vacpp.h similarity index 100% rename from c++/include/boost/predef/library/std/vacpp.h rename to c++/boost/predef/library/std/vacpp.h diff --git a/c++/include/boost/predef/make.h b/c++/boost/predef/make.h similarity index 100% rename from c++/include/boost/predef/make.h rename to c++/boost/predef/make.h diff --git a/c++/include/boost/predef/os.h b/c++/boost/predef/os.h similarity index 100% rename from c++/include/boost/predef/os.h rename to c++/boost/predef/os.h diff --git a/c++/include/boost/predef/os/aix.h b/c++/boost/predef/os/aix.h similarity index 100% rename from c++/include/boost/predef/os/aix.h rename to c++/boost/predef/os/aix.h diff --git a/c++/include/boost/predef/os/amigaos.h b/c++/boost/predef/os/amigaos.h similarity index 100% rename from c++/include/boost/predef/os/amigaos.h rename to c++/boost/predef/os/amigaos.h diff --git a/c++/include/boost/predef/os/beos.h b/c++/boost/predef/os/beos.h similarity index 100% rename from c++/include/boost/predef/os/beos.h rename to c++/boost/predef/os/beos.h diff --git a/c++/include/boost/predef/os/bsd.h b/c++/boost/predef/os/bsd.h similarity index 100% rename from c++/include/boost/predef/os/bsd.h rename to c++/boost/predef/os/bsd.h diff --git a/c++/include/boost/predef/os/bsd/bsdi.h b/c++/boost/predef/os/bsd/bsdi.h similarity index 100% rename from c++/include/boost/predef/os/bsd/bsdi.h rename to c++/boost/predef/os/bsd/bsdi.h diff --git a/c++/include/boost/predef/os/bsd/dragonfly.h b/c++/boost/predef/os/bsd/dragonfly.h similarity index 100% rename from c++/include/boost/predef/os/bsd/dragonfly.h rename to c++/boost/predef/os/bsd/dragonfly.h diff --git a/c++/include/boost/predef/os/bsd/free.h b/c++/boost/predef/os/bsd/free.h similarity index 100% rename from c++/include/boost/predef/os/bsd/free.h rename to c++/boost/predef/os/bsd/free.h diff --git a/c++/include/boost/predef/os/bsd/net.h b/c++/boost/predef/os/bsd/net.h similarity index 100% rename from c++/include/boost/predef/os/bsd/net.h rename to c++/boost/predef/os/bsd/net.h diff --git a/c++/include/boost/predef/os/bsd/open.h b/c++/boost/predef/os/bsd/open.h similarity index 100% rename from c++/include/boost/predef/os/bsd/open.h rename to c++/boost/predef/os/bsd/open.h diff --git a/c++/include/boost/predef/os/cygwin.h b/c++/boost/predef/os/cygwin.h similarity index 100% rename from c++/include/boost/predef/os/cygwin.h rename to c++/boost/predef/os/cygwin.h diff --git a/c++/include/boost/predef/os/haiku.h b/c++/boost/predef/os/haiku.h similarity index 100% rename from c++/include/boost/predef/os/haiku.h rename to c++/boost/predef/os/haiku.h diff --git a/c++/include/boost/predef/os/hpux.h b/c++/boost/predef/os/hpux.h similarity index 100% rename from c++/include/boost/predef/os/hpux.h rename to c++/boost/predef/os/hpux.h diff --git a/c++/include/boost/predef/os/ios.h b/c++/boost/predef/os/ios.h similarity index 100% rename from c++/include/boost/predef/os/ios.h rename to c++/boost/predef/os/ios.h diff --git a/c++/include/boost/predef/os/irix.h b/c++/boost/predef/os/irix.h similarity index 100% rename from c++/include/boost/predef/os/irix.h rename to c++/boost/predef/os/irix.h diff --git a/c++/include/boost/predef/os/linux.h b/c++/boost/predef/os/linux.h similarity index 100% rename from c++/include/boost/predef/os/linux.h rename to c++/boost/predef/os/linux.h diff --git a/c++/include/boost/predef/os/macos.h b/c++/boost/predef/os/macos.h similarity index 100% rename from c++/include/boost/predef/os/macos.h rename to c++/boost/predef/os/macos.h diff --git a/c++/include/boost/predef/os/os400.h b/c++/boost/predef/os/os400.h similarity index 100% rename from c++/include/boost/predef/os/os400.h rename to c++/boost/predef/os/os400.h diff --git a/c++/include/boost/predef/os/qnxnto.h b/c++/boost/predef/os/qnxnto.h similarity index 100% rename from c++/include/boost/predef/os/qnxnto.h rename to c++/boost/predef/os/qnxnto.h diff --git a/c++/include/boost/predef/os/solaris.h b/c++/boost/predef/os/solaris.h similarity index 100% rename from c++/include/boost/predef/os/solaris.h rename to c++/boost/predef/os/solaris.h diff --git a/c++/include/boost/predef/os/unix.h b/c++/boost/predef/os/unix.h similarity index 100% rename from c++/include/boost/predef/os/unix.h rename to c++/boost/predef/os/unix.h diff --git a/c++/include/boost/predef/os/vms.h b/c++/boost/predef/os/vms.h similarity index 100% rename from c++/include/boost/predef/os/vms.h rename to c++/boost/predef/os/vms.h diff --git a/c++/include/boost/predef/os/windows.h b/c++/boost/predef/os/windows.h similarity index 100% rename from c++/include/boost/predef/os/windows.h rename to c++/boost/predef/os/windows.h diff --git a/c++/include/boost/predef/other.h b/c++/boost/predef/other.h similarity index 100% rename from c++/include/boost/predef/other.h rename to c++/boost/predef/other.h diff --git a/c++/include/boost/predef/other/endian.h b/c++/boost/predef/other/endian.h similarity index 100% rename from c++/include/boost/predef/other/endian.h rename to c++/boost/predef/other/endian.h diff --git a/c++/include/boost/predef/other/wordsize.h b/c++/boost/predef/other/wordsize.h similarity index 100% rename from c++/include/boost/predef/other/wordsize.h rename to c++/boost/predef/other/wordsize.h diff --git a/c++/include/boost/predef/other/workaround.h b/c++/boost/predef/other/workaround.h similarity index 100% rename from c++/include/boost/predef/other/workaround.h rename to c++/boost/predef/other/workaround.h diff --git a/c++/include/boost/predef/platform.h b/c++/boost/predef/platform.h similarity index 100% rename from c++/include/boost/predef/platform.h rename to c++/boost/predef/platform.h diff --git a/c++/include/boost/predef/platform/android.h b/c++/boost/predef/platform/android.h similarity index 100% rename from c++/include/boost/predef/platform/android.h rename to c++/boost/predef/platform/android.h diff --git a/c++/include/boost/predef/platform/cloudabi.h b/c++/boost/predef/platform/cloudabi.h similarity index 100% rename from c++/include/boost/predef/platform/cloudabi.h rename to c++/boost/predef/platform/cloudabi.h diff --git a/c++/include/boost/predef/platform/ios.h b/c++/boost/predef/platform/ios.h similarity index 100% rename from c++/include/boost/predef/platform/ios.h rename to c++/boost/predef/platform/ios.h diff --git a/c++/include/boost/predef/platform/mingw.h b/c++/boost/predef/platform/mingw.h similarity index 100% rename from c++/include/boost/predef/platform/mingw.h rename to c++/boost/predef/platform/mingw.h diff --git a/c++/include/boost/predef/platform/mingw32.h b/c++/boost/predef/platform/mingw32.h similarity index 100% rename from c++/include/boost/predef/platform/mingw32.h rename to c++/boost/predef/platform/mingw32.h diff --git a/c++/include/boost/predef/platform/mingw64.h b/c++/boost/predef/platform/mingw64.h similarity index 100% rename from c++/include/boost/predef/platform/mingw64.h rename to c++/boost/predef/platform/mingw64.h diff --git a/c++/include/boost/predef/platform/windows_desktop.h b/c++/boost/predef/platform/windows_desktop.h similarity index 100% rename from c++/include/boost/predef/platform/windows_desktop.h rename to c++/boost/predef/platform/windows_desktop.h diff --git a/c++/include/boost/predef/platform/windows_phone.h b/c++/boost/predef/platform/windows_phone.h similarity index 100% rename from c++/include/boost/predef/platform/windows_phone.h rename to c++/boost/predef/platform/windows_phone.h diff --git a/c++/include/boost/predef/platform/windows_runtime.h b/c++/boost/predef/platform/windows_runtime.h similarity index 100% rename from c++/include/boost/predef/platform/windows_runtime.h rename to c++/boost/predef/platform/windows_runtime.h diff --git a/c++/include/boost/predef/platform/windows_server.h b/c++/boost/predef/platform/windows_server.h similarity index 100% rename from c++/include/boost/predef/platform/windows_server.h rename to c++/boost/predef/platform/windows_server.h diff --git a/c++/include/boost/predef/platform/windows_store.h b/c++/boost/predef/platform/windows_store.h similarity index 100% rename from c++/include/boost/predef/platform/windows_store.h rename to c++/boost/predef/platform/windows_store.h diff --git a/c++/include/boost/predef/platform/windows_system.h b/c++/boost/predef/platform/windows_system.h similarity index 100% rename from c++/include/boost/predef/platform/windows_system.h rename to c++/boost/predef/platform/windows_system.h diff --git a/c++/include/boost/predef/platform/windows_uwp.h b/c++/boost/predef/platform/windows_uwp.h similarity index 100% rename from c++/include/boost/predef/platform/windows_uwp.h rename to c++/boost/predef/platform/windows_uwp.h diff --git a/c++/include/boost/predef/version.h b/c++/boost/predef/version.h similarity index 100% rename from c++/include/boost/predef/version.h rename to c++/boost/predef/version.h diff --git a/c++/include/boost/predef/version_number.h b/c++/boost/predef/version_number.h similarity index 100% rename from c++/include/boost/predef/version_number.h rename to c++/boost/predef/version_number.h diff --git a/c++/include/boost/preprocessor.hpp b/c++/boost/preprocessor.hpp similarity index 100% rename from c++/include/boost/preprocessor.hpp rename to c++/boost/preprocessor.hpp diff --git a/c++/include/boost/preprocessor/arithmetic.hpp b/c++/boost/preprocessor/arithmetic.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic.hpp rename to c++/boost/preprocessor/arithmetic.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/add.hpp b/c++/boost/preprocessor/arithmetic/add.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/add.hpp rename to c++/boost/preprocessor/arithmetic/add.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/dec.hpp b/c++/boost/preprocessor/arithmetic/dec.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/dec.hpp rename to c++/boost/preprocessor/arithmetic/dec.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/detail/div_base.hpp b/c++/boost/preprocessor/arithmetic/detail/div_base.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/detail/div_base.hpp rename to c++/boost/preprocessor/arithmetic/detail/div_base.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/detail/is_1_number.hpp b/c++/boost/preprocessor/arithmetic/detail/is_1_number.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/detail/is_1_number.hpp rename to c++/boost/preprocessor/arithmetic/detail/is_1_number.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/detail/is_maximum_number.hpp b/c++/boost/preprocessor/arithmetic/detail/is_maximum_number.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/detail/is_maximum_number.hpp rename to c++/boost/preprocessor/arithmetic/detail/is_maximum_number.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/detail/is_minimum_number.hpp b/c++/boost/preprocessor/arithmetic/detail/is_minimum_number.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/detail/is_minimum_number.hpp rename to c++/boost/preprocessor/arithmetic/detail/is_minimum_number.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/detail/maximum_number.hpp b/c++/boost/preprocessor/arithmetic/detail/maximum_number.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/detail/maximum_number.hpp rename to c++/boost/preprocessor/arithmetic/detail/maximum_number.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/div.hpp b/c++/boost/preprocessor/arithmetic/div.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/div.hpp rename to c++/boost/preprocessor/arithmetic/div.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/inc.hpp b/c++/boost/preprocessor/arithmetic/inc.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/inc.hpp rename to c++/boost/preprocessor/arithmetic/inc.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/limits/dec_1024.hpp b/c++/boost/preprocessor/arithmetic/limits/dec_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/limits/dec_1024.hpp rename to c++/boost/preprocessor/arithmetic/limits/dec_1024.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/limits/dec_256.hpp b/c++/boost/preprocessor/arithmetic/limits/dec_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/limits/dec_256.hpp rename to c++/boost/preprocessor/arithmetic/limits/dec_256.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/limits/dec_512.hpp b/c++/boost/preprocessor/arithmetic/limits/dec_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/limits/dec_512.hpp rename to c++/boost/preprocessor/arithmetic/limits/dec_512.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/limits/inc_1024.hpp b/c++/boost/preprocessor/arithmetic/limits/inc_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/limits/inc_1024.hpp rename to c++/boost/preprocessor/arithmetic/limits/inc_1024.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/limits/inc_256.hpp b/c++/boost/preprocessor/arithmetic/limits/inc_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/limits/inc_256.hpp rename to c++/boost/preprocessor/arithmetic/limits/inc_256.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/limits/inc_512.hpp b/c++/boost/preprocessor/arithmetic/limits/inc_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/limits/inc_512.hpp rename to c++/boost/preprocessor/arithmetic/limits/inc_512.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/mod.hpp b/c++/boost/preprocessor/arithmetic/mod.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/mod.hpp rename to c++/boost/preprocessor/arithmetic/mod.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/mul.hpp b/c++/boost/preprocessor/arithmetic/mul.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/mul.hpp rename to c++/boost/preprocessor/arithmetic/mul.hpp diff --git a/c++/include/boost/preprocessor/arithmetic/sub.hpp b/c++/boost/preprocessor/arithmetic/sub.hpp similarity index 100% rename from c++/include/boost/preprocessor/arithmetic/sub.hpp rename to c++/boost/preprocessor/arithmetic/sub.hpp diff --git a/c++/include/boost/preprocessor/array.hpp b/c++/boost/preprocessor/array.hpp similarity index 100% rename from c++/include/boost/preprocessor/array.hpp rename to c++/boost/preprocessor/array.hpp diff --git a/c++/include/boost/preprocessor/array/data.hpp b/c++/boost/preprocessor/array/data.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/data.hpp rename to c++/boost/preprocessor/array/data.hpp diff --git a/c++/include/boost/preprocessor/array/detail/get_data.hpp b/c++/boost/preprocessor/array/detail/get_data.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/detail/get_data.hpp rename to c++/boost/preprocessor/array/detail/get_data.hpp diff --git a/c++/include/boost/preprocessor/array/elem.hpp b/c++/boost/preprocessor/array/elem.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/elem.hpp rename to c++/boost/preprocessor/array/elem.hpp diff --git a/c++/include/boost/preprocessor/array/enum.hpp b/c++/boost/preprocessor/array/enum.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/enum.hpp rename to c++/boost/preprocessor/array/enum.hpp diff --git a/c++/include/boost/preprocessor/array/insert.hpp b/c++/boost/preprocessor/array/insert.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/insert.hpp rename to c++/boost/preprocessor/array/insert.hpp diff --git a/c++/include/boost/preprocessor/array/pop_back.hpp b/c++/boost/preprocessor/array/pop_back.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/pop_back.hpp rename to c++/boost/preprocessor/array/pop_back.hpp diff --git a/c++/include/boost/preprocessor/array/pop_front.hpp b/c++/boost/preprocessor/array/pop_front.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/pop_front.hpp rename to c++/boost/preprocessor/array/pop_front.hpp diff --git a/c++/include/boost/preprocessor/array/push_back.hpp b/c++/boost/preprocessor/array/push_back.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/push_back.hpp rename to c++/boost/preprocessor/array/push_back.hpp diff --git a/c++/include/boost/preprocessor/array/push_front.hpp b/c++/boost/preprocessor/array/push_front.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/push_front.hpp rename to c++/boost/preprocessor/array/push_front.hpp diff --git a/c++/include/boost/preprocessor/array/remove.hpp b/c++/boost/preprocessor/array/remove.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/remove.hpp rename to c++/boost/preprocessor/array/remove.hpp diff --git a/c++/include/boost/preprocessor/array/replace.hpp b/c++/boost/preprocessor/array/replace.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/replace.hpp rename to c++/boost/preprocessor/array/replace.hpp diff --git a/c++/include/boost/preprocessor/array/reverse.hpp b/c++/boost/preprocessor/array/reverse.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/reverse.hpp rename to c++/boost/preprocessor/array/reverse.hpp diff --git a/c++/include/boost/preprocessor/array/size.hpp b/c++/boost/preprocessor/array/size.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/size.hpp rename to c++/boost/preprocessor/array/size.hpp diff --git a/c++/include/boost/preprocessor/array/to_list.hpp b/c++/boost/preprocessor/array/to_list.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/to_list.hpp rename to c++/boost/preprocessor/array/to_list.hpp diff --git a/c++/include/boost/preprocessor/array/to_seq.hpp b/c++/boost/preprocessor/array/to_seq.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/to_seq.hpp rename to c++/boost/preprocessor/array/to_seq.hpp diff --git a/c++/include/boost/preprocessor/array/to_tuple.hpp b/c++/boost/preprocessor/array/to_tuple.hpp similarity index 100% rename from c++/include/boost/preprocessor/array/to_tuple.hpp rename to c++/boost/preprocessor/array/to_tuple.hpp diff --git a/c++/include/boost/preprocessor/assert_msg.hpp b/c++/boost/preprocessor/assert_msg.hpp similarity index 100% rename from c++/include/boost/preprocessor/assert_msg.hpp rename to c++/boost/preprocessor/assert_msg.hpp diff --git a/c++/include/boost/preprocessor/cat.hpp b/c++/boost/preprocessor/cat.hpp similarity index 100% rename from c++/include/boost/preprocessor/cat.hpp rename to c++/boost/preprocessor/cat.hpp diff --git a/c++/include/boost/preprocessor/comma.hpp b/c++/boost/preprocessor/comma.hpp similarity index 100% rename from c++/include/boost/preprocessor/comma.hpp rename to c++/boost/preprocessor/comma.hpp diff --git a/c++/include/boost/preprocessor/comma_if.hpp b/c++/boost/preprocessor/comma_if.hpp similarity index 100% rename from c++/include/boost/preprocessor/comma_if.hpp rename to c++/boost/preprocessor/comma_if.hpp diff --git a/c++/include/boost/preprocessor/comparison.hpp b/c++/boost/preprocessor/comparison.hpp similarity index 100% rename from c++/include/boost/preprocessor/comparison.hpp rename to c++/boost/preprocessor/comparison.hpp diff --git a/c++/include/boost/preprocessor/comparison/equal.hpp b/c++/boost/preprocessor/comparison/equal.hpp similarity index 100% rename from c++/include/boost/preprocessor/comparison/equal.hpp rename to c++/boost/preprocessor/comparison/equal.hpp diff --git a/c++/include/boost/preprocessor/comparison/greater.hpp b/c++/boost/preprocessor/comparison/greater.hpp similarity index 100% rename from c++/include/boost/preprocessor/comparison/greater.hpp rename to c++/boost/preprocessor/comparison/greater.hpp diff --git a/c++/include/boost/preprocessor/comparison/greater_equal.hpp b/c++/boost/preprocessor/comparison/greater_equal.hpp similarity index 100% rename from c++/include/boost/preprocessor/comparison/greater_equal.hpp rename to c++/boost/preprocessor/comparison/greater_equal.hpp diff --git a/c++/include/boost/preprocessor/comparison/less.hpp b/c++/boost/preprocessor/comparison/less.hpp similarity index 100% rename from c++/include/boost/preprocessor/comparison/less.hpp rename to c++/boost/preprocessor/comparison/less.hpp diff --git a/c++/include/boost/preprocessor/comparison/less_equal.hpp b/c++/boost/preprocessor/comparison/less_equal.hpp similarity index 100% rename from c++/include/boost/preprocessor/comparison/less_equal.hpp rename to c++/boost/preprocessor/comparison/less_equal.hpp diff --git a/c++/include/boost/preprocessor/comparison/limits/not_equal_1024.hpp b/c++/boost/preprocessor/comparison/limits/not_equal_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/comparison/limits/not_equal_1024.hpp rename to c++/boost/preprocessor/comparison/limits/not_equal_1024.hpp diff --git a/c++/include/boost/preprocessor/comparison/limits/not_equal_256.hpp b/c++/boost/preprocessor/comparison/limits/not_equal_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/comparison/limits/not_equal_256.hpp rename to c++/boost/preprocessor/comparison/limits/not_equal_256.hpp diff --git a/c++/include/boost/preprocessor/comparison/limits/not_equal_512.hpp b/c++/boost/preprocessor/comparison/limits/not_equal_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/comparison/limits/not_equal_512.hpp rename to c++/boost/preprocessor/comparison/limits/not_equal_512.hpp diff --git a/c++/include/boost/preprocessor/comparison/not_equal.hpp b/c++/boost/preprocessor/comparison/not_equal.hpp similarity index 100% rename from c++/include/boost/preprocessor/comparison/not_equal.hpp rename to c++/boost/preprocessor/comparison/not_equal.hpp diff --git a/c++/include/boost/preprocessor/config/config.hpp b/c++/boost/preprocessor/config/config.hpp similarity index 100% rename from c++/include/boost/preprocessor/config/config.hpp rename to c++/boost/preprocessor/config/config.hpp diff --git a/c++/include/boost/preprocessor/config/limits.hpp b/c++/boost/preprocessor/config/limits.hpp similarity index 100% rename from c++/include/boost/preprocessor/config/limits.hpp rename to c++/boost/preprocessor/config/limits.hpp diff --git a/c++/include/boost/preprocessor/control.hpp b/c++/boost/preprocessor/control.hpp similarity index 100% rename from c++/include/boost/preprocessor/control.hpp rename to c++/boost/preprocessor/control.hpp diff --git a/c++/include/boost/preprocessor/control/deduce_d.hpp b/c++/boost/preprocessor/control/deduce_d.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/deduce_d.hpp rename to c++/boost/preprocessor/control/deduce_d.hpp diff --git a/c++/include/boost/preprocessor/control/detail/dmc/while.hpp b/c++/boost/preprocessor/control/detail/dmc/while.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/detail/dmc/while.hpp rename to c++/boost/preprocessor/control/detail/dmc/while.hpp diff --git a/c++/include/boost/preprocessor/control/detail/edg/limits/while_1024.hpp b/c++/boost/preprocessor/control/detail/edg/limits/while_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/detail/edg/limits/while_1024.hpp rename to c++/boost/preprocessor/control/detail/edg/limits/while_1024.hpp diff --git a/c++/include/boost/preprocessor/control/detail/edg/limits/while_256.hpp b/c++/boost/preprocessor/control/detail/edg/limits/while_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/detail/edg/limits/while_256.hpp rename to c++/boost/preprocessor/control/detail/edg/limits/while_256.hpp diff --git a/c++/include/boost/preprocessor/control/detail/edg/limits/while_512.hpp b/c++/boost/preprocessor/control/detail/edg/limits/while_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/detail/edg/limits/while_512.hpp rename to c++/boost/preprocessor/control/detail/edg/limits/while_512.hpp diff --git a/c++/include/boost/preprocessor/control/detail/edg/while.hpp b/c++/boost/preprocessor/control/detail/edg/while.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/detail/edg/while.hpp rename to c++/boost/preprocessor/control/detail/edg/while.hpp diff --git a/c++/include/boost/preprocessor/control/detail/limits/while_1024.hpp b/c++/boost/preprocessor/control/detail/limits/while_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/detail/limits/while_1024.hpp rename to c++/boost/preprocessor/control/detail/limits/while_1024.hpp diff --git a/c++/include/boost/preprocessor/control/detail/limits/while_256.hpp b/c++/boost/preprocessor/control/detail/limits/while_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/detail/limits/while_256.hpp rename to c++/boost/preprocessor/control/detail/limits/while_256.hpp diff --git a/c++/include/boost/preprocessor/control/detail/limits/while_512.hpp b/c++/boost/preprocessor/control/detail/limits/while_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/detail/limits/while_512.hpp rename to c++/boost/preprocessor/control/detail/limits/while_512.hpp diff --git a/c++/include/boost/preprocessor/control/detail/msvc/while.hpp b/c++/boost/preprocessor/control/detail/msvc/while.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/detail/msvc/while.hpp rename to c++/boost/preprocessor/control/detail/msvc/while.hpp diff --git a/c++/include/boost/preprocessor/control/detail/while.hpp b/c++/boost/preprocessor/control/detail/while.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/detail/while.hpp rename to c++/boost/preprocessor/control/detail/while.hpp diff --git a/c++/include/boost/preprocessor/control/expr_if.hpp b/c++/boost/preprocessor/control/expr_if.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/expr_if.hpp rename to c++/boost/preprocessor/control/expr_if.hpp diff --git a/c++/include/boost/preprocessor/control/expr_iif.hpp b/c++/boost/preprocessor/control/expr_iif.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/expr_iif.hpp rename to c++/boost/preprocessor/control/expr_iif.hpp diff --git a/c++/include/boost/preprocessor/control/if.hpp b/c++/boost/preprocessor/control/if.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/if.hpp rename to c++/boost/preprocessor/control/if.hpp diff --git a/c++/include/boost/preprocessor/control/iif.hpp b/c++/boost/preprocessor/control/iif.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/iif.hpp rename to c++/boost/preprocessor/control/iif.hpp diff --git a/c++/include/boost/preprocessor/control/limits/while_1024.hpp b/c++/boost/preprocessor/control/limits/while_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/limits/while_1024.hpp rename to c++/boost/preprocessor/control/limits/while_1024.hpp diff --git a/c++/include/boost/preprocessor/control/limits/while_256.hpp b/c++/boost/preprocessor/control/limits/while_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/limits/while_256.hpp rename to c++/boost/preprocessor/control/limits/while_256.hpp diff --git a/c++/include/boost/preprocessor/control/limits/while_512.hpp b/c++/boost/preprocessor/control/limits/while_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/limits/while_512.hpp rename to c++/boost/preprocessor/control/limits/while_512.hpp diff --git a/c++/include/boost/preprocessor/control/while.hpp b/c++/boost/preprocessor/control/while.hpp similarity index 100% rename from c++/include/boost/preprocessor/control/while.hpp rename to c++/boost/preprocessor/control/while.hpp diff --git a/c++/include/boost/preprocessor/debug.hpp b/c++/boost/preprocessor/debug.hpp similarity index 100% rename from c++/include/boost/preprocessor/debug.hpp rename to c++/boost/preprocessor/debug.hpp diff --git a/c++/include/boost/preprocessor/debug/assert.hpp b/c++/boost/preprocessor/debug/assert.hpp similarity index 100% rename from c++/include/boost/preprocessor/debug/assert.hpp rename to c++/boost/preprocessor/debug/assert.hpp diff --git a/c++/include/boost/preprocessor/debug/error.hpp b/c++/boost/preprocessor/debug/error.hpp similarity index 100% rename from c++/include/boost/preprocessor/debug/error.hpp rename to c++/boost/preprocessor/debug/error.hpp diff --git a/c++/include/boost/preprocessor/debug/line.hpp b/c++/boost/preprocessor/debug/line.hpp similarity index 100% rename from c++/include/boost/preprocessor/debug/line.hpp rename to c++/boost/preprocessor/debug/line.hpp diff --git a/c++/include/boost/preprocessor/dec.hpp b/c++/boost/preprocessor/dec.hpp similarity index 100% rename from c++/include/boost/preprocessor/dec.hpp rename to c++/boost/preprocessor/dec.hpp diff --git a/c++/include/boost/preprocessor/detail/auto_rec.hpp b/c++/boost/preprocessor/detail/auto_rec.hpp similarity index 100% rename from c++/include/boost/preprocessor/detail/auto_rec.hpp rename to c++/boost/preprocessor/detail/auto_rec.hpp diff --git a/c++/include/boost/preprocessor/detail/check.hpp b/c++/boost/preprocessor/detail/check.hpp similarity index 100% rename from c++/include/boost/preprocessor/detail/check.hpp rename to c++/boost/preprocessor/detail/check.hpp diff --git a/c++/include/boost/preprocessor/detail/dmc/auto_rec.hpp b/c++/boost/preprocessor/detail/dmc/auto_rec.hpp similarity index 100% rename from c++/include/boost/preprocessor/detail/dmc/auto_rec.hpp rename to c++/boost/preprocessor/detail/dmc/auto_rec.hpp diff --git a/c++/include/boost/preprocessor/detail/is_binary.hpp b/c++/boost/preprocessor/detail/is_binary.hpp similarity index 100% rename from c++/include/boost/preprocessor/detail/is_binary.hpp rename to c++/boost/preprocessor/detail/is_binary.hpp diff --git a/c++/include/boost/preprocessor/detail/is_nullary.hpp b/c++/boost/preprocessor/detail/is_nullary.hpp similarity index 100% rename from c++/include/boost/preprocessor/detail/is_nullary.hpp rename to c++/boost/preprocessor/detail/is_nullary.hpp diff --git a/c++/include/boost/preprocessor/detail/is_unary.hpp b/c++/boost/preprocessor/detail/is_unary.hpp similarity index 100% rename from c++/include/boost/preprocessor/detail/is_unary.hpp rename to c++/boost/preprocessor/detail/is_unary.hpp diff --git a/c++/include/boost/preprocessor/detail/limits/auto_rec_1024.hpp b/c++/boost/preprocessor/detail/limits/auto_rec_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/detail/limits/auto_rec_1024.hpp rename to c++/boost/preprocessor/detail/limits/auto_rec_1024.hpp diff --git a/c++/include/boost/preprocessor/detail/limits/auto_rec_256.hpp b/c++/boost/preprocessor/detail/limits/auto_rec_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/detail/limits/auto_rec_256.hpp rename to c++/boost/preprocessor/detail/limits/auto_rec_256.hpp diff --git a/c++/include/boost/preprocessor/detail/limits/auto_rec_512.hpp b/c++/boost/preprocessor/detail/limits/auto_rec_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/detail/limits/auto_rec_512.hpp rename to c++/boost/preprocessor/detail/limits/auto_rec_512.hpp diff --git a/c++/include/boost/preprocessor/detail/null.hpp b/c++/boost/preprocessor/detail/null.hpp similarity index 100% rename from c++/include/boost/preprocessor/detail/null.hpp rename to c++/boost/preprocessor/detail/null.hpp diff --git a/c++/include/boost/preprocessor/detail/split.hpp b/c++/boost/preprocessor/detail/split.hpp similarity index 100% rename from c++/include/boost/preprocessor/detail/split.hpp rename to c++/boost/preprocessor/detail/split.hpp diff --git a/c++/include/boost/preprocessor/empty.hpp b/c++/boost/preprocessor/empty.hpp similarity index 100% rename from c++/include/boost/preprocessor/empty.hpp rename to c++/boost/preprocessor/empty.hpp diff --git a/c++/include/boost/preprocessor/enum.hpp b/c++/boost/preprocessor/enum.hpp similarity index 100% rename from c++/include/boost/preprocessor/enum.hpp rename to c++/boost/preprocessor/enum.hpp diff --git a/c++/include/boost/preprocessor/enum_params.hpp b/c++/boost/preprocessor/enum_params.hpp similarity index 100% rename from c++/include/boost/preprocessor/enum_params.hpp rename to c++/boost/preprocessor/enum_params.hpp diff --git a/c++/include/boost/preprocessor/enum_params_with_a_default.hpp b/c++/boost/preprocessor/enum_params_with_a_default.hpp similarity index 100% rename from c++/include/boost/preprocessor/enum_params_with_a_default.hpp rename to c++/boost/preprocessor/enum_params_with_a_default.hpp diff --git a/c++/include/boost/preprocessor/enum_params_with_defaults.hpp b/c++/boost/preprocessor/enum_params_with_defaults.hpp similarity index 100% rename from c++/include/boost/preprocessor/enum_params_with_defaults.hpp rename to c++/boost/preprocessor/enum_params_with_defaults.hpp diff --git a/c++/include/boost/preprocessor/enum_shifted.hpp b/c++/boost/preprocessor/enum_shifted.hpp similarity index 100% rename from c++/include/boost/preprocessor/enum_shifted.hpp rename to c++/boost/preprocessor/enum_shifted.hpp diff --git a/c++/include/boost/preprocessor/enum_shifted_params.hpp b/c++/boost/preprocessor/enum_shifted_params.hpp similarity index 100% rename from c++/include/boost/preprocessor/enum_shifted_params.hpp rename to c++/boost/preprocessor/enum_shifted_params.hpp diff --git a/c++/include/boost/preprocessor/expand.hpp b/c++/boost/preprocessor/expand.hpp similarity index 100% rename from c++/include/boost/preprocessor/expand.hpp rename to c++/boost/preprocessor/expand.hpp diff --git a/c++/include/boost/preprocessor/expr_if.hpp b/c++/boost/preprocessor/expr_if.hpp similarity index 100% rename from c++/include/boost/preprocessor/expr_if.hpp rename to c++/boost/preprocessor/expr_if.hpp diff --git a/c++/include/boost/preprocessor/facilities.hpp b/c++/boost/preprocessor/facilities.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities.hpp rename to c++/boost/preprocessor/facilities.hpp diff --git a/c++/include/boost/preprocessor/facilities/apply.hpp b/c++/boost/preprocessor/facilities/apply.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/apply.hpp rename to c++/boost/preprocessor/facilities/apply.hpp diff --git a/c++/include/boost/preprocessor/facilities/check_empty.hpp b/c++/boost/preprocessor/facilities/check_empty.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/check_empty.hpp rename to c++/boost/preprocessor/facilities/check_empty.hpp diff --git a/c++/include/boost/preprocessor/facilities/detail/is_empty.hpp b/c++/boost/preprocessor/facilities/detail/is_empty.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/detail/is_empty.hpp rename to c++/boost/preprocessor/facilities/detail/is_empty.hpp diff --git a/c++/include/boost/preprocessor/facilities/empty.hpp b/c++/boost/preprocessor/facilities/empty.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/empty.hpp rename to c++/boost/preprocessor/facilities/empty.hpp diff --git a/c++/include/boost/preprocessor/facilities/expand.hpp b/c++/boost/preprocessor/facilities/expand.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/expand.hpp rename to c++/boost/preprocessor/facilities/expand.hpp diff --git a/c++/include/boost/preprocessor/facilities/identity.hpp b/c++/boost/preprocessor/facilities/identity.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/identity.hpp rename to c++/boost/preprocessor/facilities/identity.hpp diff --git a/c++/include/boost/preprocessor/facilities/intercept.hpp b/c++/boost/preprocessor/facilities/intercept.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/intercept.hpp rename to c++/boost/preprocessor/facilities/intercept.hpp diff --git a/c++/include/boost/preprocessor/facilities/is_1.hpp b/c++/boost/preprocessor/facilities/is_1.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/is_1.hpp rename to c++/boost/preprocessor/facilities/is_1.hpp diff --git a/c++/include/boost/preprocessor/facilities/is_empty.hpp b/c++/boost/preprocessor/facilities/is_empty.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/is_empty.hpp rename to c++/boost/preprocessor/facilities/is_empty.hpp diff --git a/c++/include/boost/preprocessor/facilities/is_empty_or_1.hpp b/c++/boost/preprocessor/facilities/is_empty_or_1.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/is_empty_or_1.hpp rename to c++/boost/preprocessor/facilities/is_empty_or_1.hpp diff --git a/c++/include/boost/preprocessor/facilities/is_empty_variadic.hpp b/c++/boost/preprocessor/facilities/is_empty_variadic.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/is_empty_variadic.hpp rename to c++/boost/preprocessor/facilities/is_empty_variadic.hpp diff --git a/c++/include/boost/preprocessor/facilities/limits/intercept_1024.hpp b/c++/boost/preprocessor/facilities/limits/intercept_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/limits/intercept_1024.hpp rename to c++/boost/preprocessor/facilities/limits/intercept_1024.hpp diff --git a/c++/include/boost/preprocessor/facilities/limits/intercept_256.hpp b/c++/boost/preprocessor/facilities/limits/intercept_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/limits/intercept_256.hpp rename to c++/boost/preprocessor/facilities/limits/intercept_256.hpp diff --git a/c++/include/boost/preprocessor/facilities/limits/intercept_512.hpp b/c++/boost/preprocessor/facilities/limits/intercept_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/limits/intercept_512.hpp rename to c++/boost/preprocessor/facilities/limits/intercept_512.hpp diff --git a/c++/include/boost/preprocessor/facilities/overload.hpp b/c++/boost/preprocessor/facilities/overload.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/overload.hpp rename to c++/boost/preprocessor/facilities/overload.hpp diff --git a/c++/include/boost/preprocessor/facilities/va_opt.hpp b/c++/boost/preprocessor/facilities/va_opt.hpp similarity index 100% rename from c++/include/boost/preprocessor/facilities/va_opt.hpp rename to c++/boost/preprocessor/facilities/va_opt.hpp diff --git a/c++/include/boost/preprocessor/for.hpp b/c++/boost/preprocessor/for.hpp similarity index 100% rename from c++/include/boost/preprocessor/for.hpp rename to c++/boost/preprocessor/for.hpp diff --git a/c++/include/boost/preprocessor/identity.hpp b/c++/boost/preprocessor/identity.hpp similarity index 100% rename from c++/include/boost/preprocessor/identity.hpp rename to c++/boost/preprocessor/identity.hpp diff --git a/c++/include/boost/preprocessor/if.hpp b/c++/boost/preprocessor/if.hpp similarity index 100% rename from c++/include/boost/preprocessor/if.hpp rename to c++/boost/preprocessor/if.hpp diff --git a/c++/include/boost/preprocessor/inc.hpp b/c++/boost/preprocessor/inc.hpp similarity index 100% rename from c++/include/boost/preprocessor/inc.hpp rename to c++/boost/preprocessor/inc.hpp diff --git a/c++/include/boost/preprocessor/iterate.hpp b/c++/boost/preprocessor/iterate.hpp similarity index 100% rename from c++/include/boost/preprocessor/iterate.hpp rename to c++/boost/preprocessor/iterate.hpp diff --git a/c++/include/boost/preprocessor/iteration.hpp b/c++/boost/preprocessor/iteration.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration.hpp rename to c++/boost/preprocessor/iteration.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/bounds/lower1.hpp b/c++/boost/preprocessor/iteration/detail/bounds/lower1.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/bounds/lower1.hpp rename to c++/boost/preprocessor/iteration/detail/bounds/lower1.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/bounds/lower2.hpp b/c++/boost/preprocessor/iteration/detail/bounds/lower2.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/bounds/lower2.hpp rename to c++/boost/preprocessor/iteration/detail/bounds/lower2.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/bounds/lower3.hpp b/c++/boost/preprocessor/iteration/detail/bounds/lower3.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/bounds/lower3.hpp rename to c++/boost/preprocessor/iteration/detail/bounds/lower3.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/bounds/lower4.hpp b/c++/boost/preprocessor/iteration/detail/bounds/lower4.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/bounds/lower4.hpp rename to c++/boost/preprocessor/iteration/detail/bounds/lower4.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/bounds/lower5.hpp b/c++/boost/preprocessor/iteration/detail/bounds/lower5.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/bounds/lower5.hpp rename to c++/boost/preprocessor/iteration/detail/bounds/lower5.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/bounds/upper1.hpp b/c++/boost/preprocessor/iteration/detail/bounds/upper1.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/bounds/upper1.hpp rename to c++/boost/preprocessor/iteration/detail/bounds/upper1.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/bounds/upper2.hpp b/c++/boost/preprocessor/iteration/detail/bounds/upper2.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/bounds/upper2.hpp rename to c++/boost/preprocessor/iteration/detail/bounds/upper2.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/bounds/upper3.hpp b/c++/boost/preprocessor/iteration/detail/bounds/upper3.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/bounds/upper3.hpp rename to c++/boost/preprocessor/iteration/detail/bounds/upper3.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/bounds/upper4.hpp b/c++/boost/preprocessor/iteration/detail/bounds/upper4.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/bounds/upper4.hpp rename to c++/boost/preprocessor/iteration/detail/bounds/upper4.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/bounds/upper5.hpp b/c++/boost/preprocessor/iteration/detail/bounds/upper5.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/bounds/upper5.hpp rename to c++/boost/preprocessor/iteration/detail/bounds/upper5.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/finish.hpp b/c++/boost/preprocessor/iteration/detail/finish.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/finish.hpp rename to c++/boost/preprocessor/iteration/detail/finish.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/forward1.hpp b/c++/boost/preprocessor/iteration/detail/iter/forward1.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/forward1.hpp rename to c++/boost/preprocessor/iteration/detail/iter/forward1.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/forward2.hpp b/c++/boost/preprocessor/iteration/detail/iter/forward2.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/forward2.hpp rename to c++/boost/preprocessor/iteration/detail/iter/forward2.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/forward3.hpp b/c++/boost/preprocessor/iteration/detail/iter/forward3.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/forward3.hpp rename to c++/boost/preprocessor/iteration/detail/iter/forward3.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/forward4.hpp b/c++/boost/preprocessor/iteration/detail/iter/forward4.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/forward4.hpp rename to c++/boost/preprocessor/iteration/detail/iter/forward4.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/forward5.hpp b/c++/boost/preprocessor/iteration/detail/iter/forward5.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/forward5.hpp rename to c++/boost/preprocessor/iteration/detail/iter/forward5.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward1_1024.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward1_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward1_1024.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward1_1024.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward1_256.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward1_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward1_256.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward1_256.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward1_512.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward1_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward1_512.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward1_512.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward2_1024.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward2_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward2_1024.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward2_1024.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward2_256.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward2_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward2_256.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward2_256.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward2_512.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward2_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward2_512.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward2_512.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward3_1024.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward3_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward3_1024.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward3_1024.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward3_256.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward3_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward3_256.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward3_256.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward3_512.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward3_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward3_512.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward3_512.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward4_1024.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward4_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward4_1024.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward4_1024.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward4_256.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward4_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward4_256.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward4_256.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward4_512.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward4_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward4_512.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward4_512.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward5_1024.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward5_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward5_1024.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward5_1024.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward5_256.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward5_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward5_256.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward5_256.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/forward5_512.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/forward5_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/forward5_512.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/forward5_512.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse1_1024.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse1_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse1_1024.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse1_1024.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse1_256.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse1_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse1_256.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse1_256.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse1_512.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse1_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse1_512.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse1_512.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse2_1024.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse2_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse2_1024.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse2_1024.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse2_256.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse2_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse2_256.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse2_256.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse2_512.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse2_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse2_512.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse2_512.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse3_1024.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse3_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse3_1024.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse3_1024.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse3_256.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse3_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse3_256.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse3_256.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse3_512.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse3_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse3_512.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse3_512.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse4_1024.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse4_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse4_1024.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse4_1024.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse4_256.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse4_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse4_256.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse4_256.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse4_512.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse4_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse4_512.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse4_512.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse5_1024.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse5_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse5_1024.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse5_1024.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse5_256.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse5_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse5_256.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse5_256.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse5_512.hpp b/c++/boost/preprocessor/iteration/detail/iter/limits/reverse5_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/limits/reverse5_512.hpp rename to c++/boost/preprocessor/iteration/detail/iter/limits/reverse5_512.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/reverse1.hpp b/c++/boost/preprocessor/iteration/detail/iter/reverse1.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/reverse1.hpp rename to c++/boost/preprocessor/iteration/detail/iter/reverse1.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/reverse2.hpp b/c++/boost/preprocessor/iteration/detail/iter/reverse2.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/reverse2.hpp rename to c++/boost/preprocessor/iteration/detail/iter/reverse2.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/reverse3.hpp b/c++/boost/preprocessor/iteration/detail/iter/reverse3.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/reverse3.hpp rename to c++/boost/preprocessor/iteration/detail/iter/reverse3.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/reverse4.hpp b/c++/boost/preprocessor/iteration/detail/iter/reverse4.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/reverse4.hpp rename to c++/boost/preprocessor/iteration/detail/iter/reverse4.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/iter/reverse5.hpp b/c++/boost/preprocessor/iteration/detail/iter/reverse5.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/iter/reverse5.hpp rename to c++/boost/preprocessor/iteration/detail/iter/reverse5.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/limits/local_1024.hpp b/c++/boost/preprocessor/iteration/detail/limits/local_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/limits/local_1024.hpp rename to c++/boost/preprocessor/iteration/detail/limits/local_1024.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/limits/local_256.hpp b/c++/boost/preprocessor/iteration/detail/limits/local_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/limits/local_256.hpp rename to c++/boost/preprocessor/iteration/detail/limits/local_256.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/limits/local_512.hpp b/c++/boost/preprocessor/iteration/detail/limits/local_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/limits/local_512.hpp rename to c++/boost/preprocessor/iteration/detail/limits/local_512.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/limits/rlocal_1024.hpp b/c++/boost/preprocessor/iteration/detail/limits/rlocal_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/limits/rlocal_1024.hpp rename to c++/boost/preprocessor/iteration/detail/limits/rlocal_1024.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/limits/rlocal_256.hpp b/c++/boost/preprocessor/iteration/detail/limits/rlocal_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/limits/rlocal_256.hpp rename to c++/boost/preprocessor/iteration/detail/limits/rlocal_256.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/limits/rlocal_512.hpp b/c++/boost/preprocessor/iteration/detail/limits/rlocal_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/limits/rlocal_512.hpp rename to c++/boost/preprocessor/iteration/detail/limits/rlocal_512.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/local.hpp b/c++/boost/preprocessor/iteration/detail/local.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/local.hpp rename to c++/boost/preprocessor/iteration/detail/local.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/rlocal.hpp b/c++/boost/preprocessor/iteration/detail/rlocal.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/rlocal.hpp rename to c++/boost/preprocessor/iteration/detail/rlocal.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/self.hpp b/c++/boost/preprocessor/iteration/detail/self.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/self.hpp rename to c++/boost/preprocessor/iteration/detail/self.hpp diff --git a/c++/include/boost/preprocessor/iteration/detail/start.hpp b/c++/boost/preprocessor/iteration/detail/start.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/detail/start.hpp rename to c++/boost/preprocessor/iteration/detail/start.hpp diff --git a/c++/include/boost/preprocessor/iteration/iterate.hpp b/c++/boost/preprocessor/iteration/iterate.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/iterate.hpp rename to c++/boost/preprocessor/iteration/iterate.hpp diff --git a/c++/include/boost/preprocessor/iteration/local.hpp b/c++/boost/preprocessor/iteration/local.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/local.hpp rename to c++/boost/preprocessor/iteration/local.hpp diff --git a/c++/include/boost/preprocessor/iteration/self.hpp b/c++/boost/preprocessor/iteration/self.hpp similarity index 100% rename from c++/include/boost/preprocessor/iteration/self.hpp rename to c++/boost/preprocessor/iteration/self.hpp diff --git a/c++/include/boost/preprocessor/library.hpp b/c++/boost/preprocessor/library.hpp similarity index 100% rename from c++/include/boost/preprocessor/library.hpp rename to c++/boost/preprocessor/library.hpp diff --git a/c++/include/boost/preprocessor/limits.hpp b/c++/boost/preprocessor/limits.hpp similarity index 100% rename from c++/include/boost/preprocessor/limits.hpp rename to c++/boost/preprocessor/limits.hpp diff --git a/c++/include/boost/preprocessor/list.hpp b/c++/boost/preprocessor/list.hpp similarity index 100% rename from c++/include/boost/preprocessor/list.hpp rename to c++/boost/preprocessor/list.hpp diff --git a/c++/include/boost/preprocessor/list/adt.hpp b/c++/boost/preprocessor/list/adt.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/adt.hpp rename to c++/boost/preprocessor/list/adt.hpp diff --git a/c++/include/boost/preprocessor/list/append.hpp b/c++/boost/preprocessor/list/append.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/append.hpp rename to c++/boost/preprocessor/list/append.hpp diff --git a/c++/include/boost/preprocessor/list/at.hpp b/c++/boost/preprocessor/list/at.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/at.hpp rename to c++/boost/preprocessor/list/at.hpp diff --git a/c++/include/boost/preprocessor/list/cat.hpp b/c++/boost/preprocessor/list/cat.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/cat.hpp rename to c++/boost/preprocessor/list/cat.hpp diff --git a/c++/include/boost/preprocessor/list/detail/dmc/fold_left.hpp b/c++/boost/preprocessor/list/detail/dmc/fold_left.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/dmc/fold_left.hpp rename to c++/boost/preprocessor/list/detail/dmc/fold_left.hpp diff --git a/c++/include/boost/preprocessor/list/detail/edg/fold_left.hpp b/c++/boost/preprocessor/list/detail/edg/fold_left.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/edg/fold_left.hpp rename to c++/boost/preprocessor/list/detail/edg/fold_left.hpp diff --git a/c++/include/boost/preprocessor/list/detail/edg/fold_right.hpp b/c++/boost/preprocessor/list/detail/edg/fold_right.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/edg/fold_right.hpp rename to c++/boost/preprocessor/list/detail/edg/fold_right.hpp diff --git a/c++/include/boost/preprocessor/list/detail/edg/limits/fold_left_1024.hpp b/c++/boost/preprocessor/list/detail/edg/limits/fold_left_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/edg/limits/fold_left_1024.hpp rename to c++/boost/preprocessor/list/detail/edg/limits/fold_left_1024.hpp diff --git a/c++/include/boost/preprocessor/list/detail/edg/limits/fold_left_256.hpp b/c++/boost/preprocessor/list/detail/edg/limits/fold_left_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/edg/limits/fold_left_256.hpp rename to c++/boost/preprocessor/list/detail/edg/limits/fold_left_256.hpp diff --git a/c++/include/boost/preprocessor/list/detail/edg/limits/fold_left_512.hpp b/c++/boost/preprocessor/list/detail/edg/limits/fold_left_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/edg/limits/fold_left_512.hpp rename to c++/boost/preprocessor/list/detail/edg/limits/fold_left_512.hpp diff --git a/c++/include/boost/preprocessor/list/detail/edg/limits/fold_right_1024.hpp b/c++/boost/preprocessor/list/detail/edg/limits/fold_right_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/edg/limits/fold_right_1024.hpp rename to c++/boost/preprocessor/list/detail/edg/limits/fold_right_1024.hpp diff --git a/c++/include/boost/preprocessor/list/detail/edg/limits/fold_right_256.hpp b/c++/boost/preprocessor/list/detail/edg/limits/fold_right_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/edg/limits/fold_right_256.hpp rename to c++/boost/preprocessor/list/detail/edg/limits/fold_right_256.hpp diff --git a/c++/include/boost/preprocessor/list/detail/edg/limits/fold_right_512.hpp b/c++/boost/preprocessor/list/detail/edg/limits/fold_right_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/edg/limits/fold_right_512.hpp rename to c++/boost/preprocessor/list/detail/edg/limits/fold_right_512.hpp diff --git a/c++/include/boost/preprocessor/list/detail/fold_left.hpp b/c++/boost/preprocessor/list/detail/fold_left.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/fold_left.hpp rename to c++/boost/preprocessor/list/detail/fold_left.hpp diff --git a/c++/include/boost/preprocessor/list/detail/fold_right.hpp b/c++/boost/preprocessor/list/detail/fold_right.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/fold_right.hpp rename to c++/boost/preprocessor/list/detail/fold_right.hpp diff --git a/c++/include/boost/preprocessor/list/detail/limits/fold_left_1024.hpp b/c++/boost/preprocessor/list/detail/limits/fold_left_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/limits/fold_left_1024.hpp rename to c++/boost/preprocessor/list/detail/limits/fold_left_1024.hpp diff --git a/c++/include/boost/preprocessor/list/detail/limits/fold_left_256.hpp b/c++/boost/preprocessor/list/detail/limits/fold_left_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/limits/fold_left_256.hpp rename to c++/boost/preprocessor/list/detail/limits/fold_left_256.hpp diff --git a/c++/include/boost/preprocessor/list/detail/limits/fold_left_512.hpp b/c++/boost/preprocessor/list/detail/limits/fold_left_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/limits/fold_left_512.hpp rename to c++/boost/preprocessor/list/detail/limits/fold_left_512.hpp diff --git a/c++/include/boost/preprocessor/list/detail/limits/fold_right_1024.hpp b/c++/boost/preprocessor/list/detail/limits/fold_right_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/limits/fold_right_1024.hpp rename to c++/boost/preprocessor/list/detail/limits/fold_right_1024.hpp diff --git a/c++/include/boost/preprocessor/list/detail/limits/fold_right_256.hpp b/c++/boost/preprocessor/list/detail/limits/fold_right_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/limits/fold_right_256.hpp rename to c++/boost/preprocessor/list/detail/limits/fold_right_256.hpp diff --git a/c++/include/boost/preprocessor/list/detail/limits/fold_right_512.hpp b/c++/boost/preprocessor/list/detail/limits/fold_right_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/detail/limits/fold_right_512.hpp rename to c++/boost/preprocessor/list/detail/limits/fold_right_512.hpp diff --git a/c++/include/boost/preprocessor/list/enum.hpp b/c++/boost/preprocessor/list/enum.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/enum.hpp rename to c++/boost/preprocessor/list/enum.hpp diff --git a/c++/include/boost/preprocessor/list/filter.hpp b/c++/boost/preprocessor/list/filter.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/filter.hpp rename to c++/boost/preprocessor/list/filter.hpp diff --git a/c++/include/boost/preprocessor/list/first_n.hpp b/c++/boost/preprocessor/list/first_n.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/first_n.hpp rename to c++/boost/preprocessor/list/first_n.hpp diff --git a/c++/include/boost/preprocessor/list/fold_left.hpp b/c++/boost/preprocessor/list/fold_left.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/fold_left.hpp rename to c++/boost/preprocessor/list/fold_left.hpp diff --git a/c++/include/boost/preprocessor/list/fold_right.hpp b/c++/boost/preprocessor/list/fold_right.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/fold_right.hpp rename to c++/boost/preprocessor/list/fold_right.hpp diff --git a/c++/include/boost/preprocessor/list/for_each.hpp b/c++/boost/preprocessor/list/for_each.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/for_each.hpp rename to c++/boost/preprocessor/list/for_each.hpp diff --git a/c++/include/boost/preprocessor/list/for_each_i.hpp b/c++/boost/preprocessor/list/for_each_i.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/for_each_i.hpp rename to c++/boost/preprocessor/list/for_each_i.hpp diff --git a/c++/include/boost/preprocessor/list/for_each_product.hpp b/c++/boost/preprocessor/list/for_each_product.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/for_each_product.hpp rename to c++/boost/preprocessor/list/for_each_product.hpp diff --git a/c++/include/boost/preprocessor/list/limits/fold_left_1024.hpp b/c++/boost/preprocessor/list/limits/fold_left_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/limits/fold_left_1024.hpp rename to c++/boost/preprocessor/list/limits/fold_left_1024.hpp diff --git a/c++/include/boost/preprocessor/list/limits/fold_left_256.hpp b/c++/boost/preprocessor/list/limits/fold_left_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/limits/fold_left_256.hpp rename to c++/boost/preprocessor/list/limits/fold_left_256.hpp diff --git a/c++/include/boost/preprocessor/list/limits/fold_left_512.hpp b/c++/boost/preprocessor/list/limits/fold_left_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/limits/fold_left_512.hpp rename to c++/boost/preprocessor/list/limits/fold_left_512.hpp diff --git a/c++/include/boost/preprocessor/list/rest_n.hpp b/c++/boost/preprocessor/list/rest_n.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/rest_n.hpp rename to c++/boost/preprocessor/list/rest_n.hpp diff --git a/c++/include/boost/preprocessor/list/reverse.hpp b/c++/boost/preprocessor/list/reverse.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/reverse.hpp rename to c++/boost/preprocessor/list/reverse.hpp diff --git a/c++/include/boost/preprocessor/list/size.hpp b/c++/boost/preprocessor/list/size.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/size.hpp rename to c++/boost/preprocessor/list/size.hpp diff --git a/c++/include/boost/preprocessor/list/to_array.hpp b/c++/boost/preprocessor/list/to_array.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/to_array.hpp rename to c++/boost/preprocessor/list/to_array.hpp diff --git a/c++/include/boost/preprocessor/list/to_seq.hpp b/c++/boost/preprocessor/list/to_seq.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/to_seq.hpp rename to c++/boost/preprocessor/list/to_seq.hpp diff --git a/c++/include/boost/preprocessor/list/to_tuple.hpp b/c++/boost/preprocessor/list/to_tuple.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/to_tuple.hpp rename to c++/boost/preprocessor/list/to_tuple.hpp diff --git a/c++/include/boost/preprocessor/list/transform.hpp b/c++/boost/preprocessor/list/transform.hpp similarity index 100% rename from c++/include/boost/preprocessor/list/transform.hpp rename to c++/boost/preprocessor/list/transform.hpp diff --git a/c++/include/boost/preprocessor/logical.hpp b/c++/boost/preprocessor/logical.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical.hpp rename to c++/boost/preprocessor/logical.hpp diff --git a/c++/include/boost/preprocessor/logical/and.hpp b/c++/boost/preprocessor/logical/and.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical/and.hpp rename to c++/boost/preprocessor/logical/and.hpp diff --git a/c++/include/boost/preprocessor/logical/bitand.hpp b/c++/boost/preprocessor/logical/bitand.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical/bitand.hpp rename to c++/boost/preprocessor/logical/bitand.hpp diff --git a/c++/include/boost/preprocessor/logical/bitnor.hpp b/c++/boost/preprocessor/logical/bitnor.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical/bitnor.hpp rename to c++/boost/preprocessor/logical/bitnor.hpp diff --git a/c++/include/boost/preprocessor/logical/bitor.hpp b/c++/boost/preprocessor/logical/bitor.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical/bitor.hpp rename to c++/boost/preprocessor/logical/bitor.hpp diff --git a/c++/include/boost/preprocessor/logical/bitxor.hpp b/c++/boost/preprocessor/logical/bitxor.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical/bitxor.hpp rename to c++/boost/preprocessor/logical/bitxor.hpp diff --git a/c++/include/boost/preprocessor/logical/bool.hpp b/c++/boost/preprocessor/logical/bool.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical/bool.hpp rename to c++/boost/preprocessor/logical/bool.hpp diff --git a/c++/include/boost/preprocessor/logical/compl.hpp b/c++/boost/preprocessor/logical/compl.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical/compl.hpp rename to c++/boost/preprocessor/logical/compl.hpp diff --git a/c++/include/boost/preprocessor/logical/limits/bool_1024.hpp b/c++/boost/preprocessor/logical/limits/bool_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical/limits/bool_1024.hpp rename to c++/boost/preprocessor/logical/limits/bool_1024.hpp diff --git a/c++/include/boost/preprocessor/logical/limits/bool_256.hpp b/c++/boost/preprocessor/logical/limits/bool_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical/limits/bool_256.hpp rename to c++/boost/preprocessor/logical/limits/bool_256.hpp diff --git a/c++/include/boost/preprocessor/logical/limits/bool_512.hpp b/c++/boost/preprocessor/logical/limits/bool_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical/limits/bool_512.hpp rename to c++/boost/preprocessor/logical/limits/bool_512.hpp diff --git a/c++/include/boost/preprocessor/logical/nor.hpp b/c++/boost/preprocessor/logical/nor.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical/nor.hpp rename to c++/boost/preprocessor/logical/nor.hpp diff --git a/c++/include/boost/preprocessor/logical/not.hpp b/c++/boost/preprocessor/logical/not.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical/not.hpp rename to c++/boost/preprocessor/logical/not.hpp diff --git a/c++/include/boost/preprocessor/logical/or.hpp b/c++/boost/preprocessor/logical/or.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical/or.hpp rename to c++/boost/preprocessor/logical/or.hpp diff --git a/c++/include/boost/preprocessor/logical/xor.hpp b/c++/boost/preprocessor/logical/xor.hpp similarity index 100% rename from c++/include/boost/preprocessor/logical/xor.hpp rename to c++/boost/preprocessor/logical/xor.hpp diff --git a/c++/include/boost/preprocessor/max.hpp b/c++/boost/preprocessor/max.hpp similarity index 100% rename from c++/include/boost/preprocessor/max.hpp rename to c++/boost/preprocessor/max.hpp diff --git a/c++/include/boost/preprocessor/min.hpp b/c++/boost/preprocessor/min.hpp similarity index 100% rename from c++/include/boost/preprocessor/min.hpp rename to c++/boost/preprocessor/min.hpp diff --git a/c++/include/boost/preprocessor/punctuation.hpp b/c++/boost/preprocessor/punctuation.hpp similarity index 100% rename from c++/include/boost/preprocessor/punctuation.hpp rename to c++/boost/preprocessor/punctuation.hpp diff --git a/c++/include/boost/preprocessor/punctuation/comma.hpp b/c++/boost/preprocessor/punctuation/comma.hpp similarity index 100% rename from c++/include/boost/preprocessor/punctuation/comma.hpp rename to c++/boost/preprocessor/punctuation/comma.hpp diff --git a/c++/include/boost/preprocessor/punctuation/comma_if.hpp b/c++/boost/preprocessor/punctuation/comma_if.hpp similarity index 100% rename from c++/include/boost/preprocessor/punctuation/comma_if.hpp rename to c++/boost/preprocessor/punctuation/comma_if.hpp diff --git a/c++/include/boost/preprocessor/punctuation/detail/is_begin_parens.hpp b/c++/boost/preprocessor/punctuation/detail/is_begin_parens.hpp similarity index 100% rename from c++/include/boost/preprocessor/punctuation/detail/is_begin_parens.hpp rename to c++/boost/preprocessor/punctuation/detail/is_begin_parens.hpp diff --git a/c++/include/boost/preprocessor/punctuation/is_begin_parens.hpp b/c++/boost/preprocessor/punctuation/is_begin_parens.hpp similarity index 100% rename from c++/include/boost/preprocessor/punctuation/is_begin_parens.hpp rename to c++/boost/preprocessor/punctuation/is_begin_parens.hpp diff --git a/c++/include/boost/preprocessor/punctuation/paren.hpp b/c++/boost/preprocessor/punctuation/paren.hpp similarity index 100% rename from c++/include/boost/preprocessor/punctuation/paren.hpp rename to c++/boost/preprocessor/punctuation/paren.hpp diff --git a/c++/include/boost/preprocessor/punctuation/paren_if.hpp b/c++/boost/preprocessor/punctuation/paren_if.hpp similarity index 100% rename from c++/include/boost/preprocessor/punctuation/paren_if.hpp rename to c++/boost/preprocessor/punctuation/paren_if.hpp diff --git a/c++/include/boost/preprocessor/punctuation/remove_parens.hpp b/c++/boost/preprocessor/punctuation/remove_parens.hpp similarity index 100% rename from c++/include/boost/preprocessor/punctuation/remove_parens.hpp rename to c++/boost/preprocessor/punctuation/remove_parens.hpp diff --git a/c++/include/boost/preprocessor/repeat.hpp b/c++/boost/preprocessor/repeat.hpp similarity index 100% rename from c++/include/boost/preprocessor/repeat.hpp rename to c++/boost/preprocessor/repeat.hpp diff --git a/c++/include/boost/preprocessor/repeat_2nd.hpp b/c++/boost/preprocessor/repeat_2nd.hpp similarity index 100% rename from c++/include/boost/preprocessor/repeat_2nd.hpp rename to c++/boost/preprocessor/repeat_2nd.hpp diff --git a/c++/include/boost/preprocessor/repeat_3rd.hpp b/c++/boost/preprocessor/repeat_3rd.hpp similarity index 100% rename from c++/include/boost/preprocessor/repeat_3rd.hpp rename to c++/boost/preprocessor/repeat_3rd.hpp diff --git a/c++/include/boost/preprocessor/repeat_from_to.hpp b/c++/boost/preprocessor/repeat_from_to.hpp similarity index 100% rename from c++/include/boost/preprocessor/repeat_from_to.hpp rename to c++/boost/preprocessor/repeat_from_to.hpp diff --git a/c++/include/boost/preprocessor/repeat_from_to_2nd.hpp b/c++/boost/preprocessor/repeat_from_to_2nd.hpp similarity index 100% rename from c++/include/boost/preprocessor/repeat_from_to_2nd.hpp rename to c++/boost/preprocessor/repeat_from_to_2nd.hpp diff --git a/c++/include/boost/preprocessor/repeat_from_to_3rd.hpp b/c++/boost/preprocessor/repeat_from_to_3rd.hpp similarity index 100% rename from c++/include/boost/preprocessor/repeat_from_to_3rd.hpp rename to c++/boost/preprocessor/repeat_from_to_3rd.hpp diff --git a/c++/include/boost/preprocessor/repetition.hpp b/c++/boost/preprocessor/repetition.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition.hpp rename to c++/boost/preprocessor/repetition.hpp diff --git a/c++/include/boost/preprocessor/repetition/deduce_r.hpp b/c++/boost/preprocessor/repetition/deduce_r.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/deduce_r.hpp rename to c++/boost/preprocessor/repetition/deduce_r.hpp diff --git a/c++/include/boost/preprocessor/repetition/deduce_z.hpp b/c++/boost/preprocessor/repetition/deduce_z.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/deduce_z.hpp rename to c++/boost/preprocessor/repetition/deduce_z.hpp diff --git a/c++/include/boost/preprocessor/repetition/detail/dmc/for.hpp b/c++/boost/preprocessor/repetition/detail/dmc/for.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/detail/dmc/for.hpp rename to c++/boost/preprocessor/repetition/detail/dmc/for.hpp diff --git a/c++/include/boost/preprocessor/repetition/detail/edg/for.hpp b/c++/boost/preprocessor/repetition/detail/edg/for.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/detail/edg/for.hpp rename to c++/boost/preprocessor/repetition/detail/edg/for.hpp diff --git a/c++/include/boost/preprocessor/repetition/detail/edg/limits/for_1024.hpp b/c++/boost/preprocessor/repetition/detail/edg/limits/for_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/detail/edg/limits/for_1024.hpp rename to c++/boost/preprocessor/repetition/detail/edg/limits/for_1024.hpp diff --git a/c++/include/boost/preprocessor/repetition/detail/edg/limits/for_256.hpp b/c++/boost/preprocessor/repetition/detail/edg/limits/for_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/detail/edg/limits/for_256.hpp rename to c++/boost/preprocessor/repetition/detail/edg/limits/for_256.hpp diff --git a/c++/include/boost/preprocessor/repetition/detail/edg/limits/for_512.hpp b/c++/boost/preprocessor/repetition/detail/edg/limits/for_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/detail/edg/limits/for_512.hpp rename to c++/boost/preprocessor/repetition/detail/edg/limits/for_512.hpp diff --git a/c++/include/boost/preprocessor/repetition/detail/for.hpp b/c++/boost/preprocessor/repetition/detail/for.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/detail/for.hpp rename to c++/boost/preprocessor/repetition/detail/for.hpp diff --git a/c++/include/boost/preprocessor/repetition/detail/limits/for_1024.hpp b/c++/boost/preprocessor/repetition/detail/limits/for_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/detail/limits/for_1024.hpp rename to c++/boost/preprocessor/repetition/detail/limits/for_1024.hpp diff --git a/c++/include/boost/preprocessor/repetition/detail/limits/for_256.hpp b/c++/boost/preprocessor/repetition/detail/limits/for_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/detail/limits/for_256.hpp rename to c++/boost/preprocessor/repetition/detail/limits/for_256.hpp diff --git a/c++/include/boost/preprocessor/repetition/detail/limits/for_512.hpp b/c++/boost/preprocessor/repetition/detail/limits/for_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/detail/limits/for_512.hpp rename to c++/boost/preprocessor/repetition/detail/limits/for_512.hpp diff --git a/c++/include/boost/preprocessor/repetition/detail/msvc/for.hpp b/c++/boost/preprocessor/repetition/detail/msvc/for.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/detail/msvc/for.hpp rename to c++/boost/preprocessor/repetition/detail/msvc/for.hpp diff --git a/c++/include/boost/preprocessor/repetition/enum.hpp b/c++/boost/preprocessor/repetition/enum.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/enum.hpp rename to c++/boost/preprocessor/repetition/enum.hpp diff --git a/c++/include/boost/preprocessor/repetition/enum_binary_params.hpp b/c++/boost/preprocessor/repetition/enum_binary_params.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/enum_binary_params.hpp rename to c++/boost/preprocessor/repetition/enum_binary_params.hpp diff --git a/c++/include/boost/preprocessor/repetition/enum_params.hpp b/c++/boost/preprocessor/repetition/enum_params.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/enum_params.hpp rename to c++/boost/preprocessor/repetition/enum_params.hpp diff --git a/c++/include/boost/preprocessor/repetition/enum_params_with_a_default.hpp b/c++/boost/preprocessor/repetition/enum_params_with_a_default.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/enum_params_with_a_default.hpp rename to c++/boost/preprocessor/repetition/enum_params_with_a_default.hpp diff --git a/c++/include/boost/preprocessor/repetition/enum_params_with_defaults.hpp b/c++/boost/preprocessor/repetition/enum_params_with_defaults.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/enum_params_with_defaults.hpp rename to c++/boost/preprocessor/repetition/enum_params_with_defaults.hpp diff --git a/c++/include/boost/preprocessor/repetition/enum_shifted.hpp b/c++/boost/preprocessor/repetition/enum_shifted.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/enum_shifted.hpp rename to c++/boost/preprocessor/repetition/enum_shifted.hpp diff --git a/c++/include/boost/preprocessor/repetition/enum_shifted_binary_params.hpp b/c++/boost/preprocessor/repetition/enum_shifted_binary_params.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/enum_shifted_binary_params.hpp rename to c++/boost/preprocessor/repetition/enum_shifted_binary_params.hpp diff --git a/c++/include/boost/preprocessor/repetition/enum_shifted_params.hpp b/c++/boost/preprocessor/repetition/enum_shifted_params.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/enum_shifted_params.hpp rename to c++/boost/preprocessor/repetition/enum_shifted_params.hpp diff --git a/c++/include/boost/preprocessor/repetition/enum_trailing.hpp b/c++/boost/preprocessor/repetition/enum_trailing.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/enum_trailing.hpp rename to c++/boost/preprocessor/repetition/enum_trailing.hpp diff --git a/c++/include/boost/preprocessor/repetition/enum_trailing_binary_params.hpp b/c++/boost/preprocessor/repetition/enum_trailing_binary_params.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/enum_trailing_binary_params.hpp rename to c++/boost/preprocessor/repetition/enum_trailing_binary_params.hpp diff --git a/c++/include/boost/preprocessor/repetition/enum_trailing_params.hpp b/c++/boost/preprocessor/repetition/enum_trailing_params.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/enum_trailing_params.hpp rename to c++/boost/preprocessor/repetition/enum_trailing_params.hpp diff --git a/c++/include/boost/preprocessor/repetition/for.hpp b/c++/boost/preprocessor/repetition/for.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/for.hpp rename to c++/boost/preprocessor/repetition/for.hpp diff --git a/c++/include/boost/preprocessor/repetition/limits/for_1024.hpp b/c++/boost/preprocessor/repetition/limits/for_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/limits/for_1024.hpp rename to c++/boost/preprocessor/repetition/limits/for_1024.hpp diff --git a/c++/include/boost/preprocessor/repetition/limits/for_256.hpp b/c++/boost/preprocessor/repetition/limits/for_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/limits/for_256.hpp rename to c++/boost/preprocessor/repetition/limits/for_256.hpp diff --git a/c++/include/boost/preprocessor/repetition/limits/for_512.hpp b/c++/boost/preprocessor/repetition/limits/for_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/limits/for_512.hpp rename to c++/boost/preprocessor/repetition/limits/for_512.hpp diff --git a/c++/include/boost/preprocessor/repetition/limits/repeat_1024.hpp b/c++/boost/preprocessor/repetition/limits/repeat_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/limits/repeat_1024.hpp rename to c++/boost/preprocessor/repetition/limits/repeat_1024.hpp diff --git a/c++/include/boost/preprocessor/repetition/limits/repeat_256.hpp b/c++/boost/preprocessor/repetition/limits/repeat_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/limits/repeat_256.hpp rename to c++/boost/preprocessor/repetition/limits/repeat_256.hpp diff --git a/c++/include/boost/preprocessor/repetition/limits/repeat_512.hpp b/c++/boost/preprocessor/repetition/limits/repeat_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/limits/repeat_512.hpp rename to c++/boost/preprocessor/repetition/limits/repeat_512.hpp diff --git a/c++/include/boost/preprocessor/repetition/repeat.hpp b/c++/boost/preprocessor/repetition/repeat.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/repeat.hpp rename to c++/boost/preprocessor/repetition/repeat.hpp diff --git a/c++/include/boost/preprocessor/repetition/repeat_from_to.hpp b/c++/boost/preprocessor/repetition/repeat_from_to.hpp similarity index 100% rename from c++/include/boost/preprocessor/repetition/repeat_from_to.hpp rename to c++/boost/preprocessor/repetition/repeat_from_to.hpp diff --git a/c++/include/boost/preprocessor/selection.hpp b/c++/boost/preprocessor/selection.hpp similarity index 100% rename from c++/include/boost/preprocessor/selection.hpp rename to c++/boost/preprocessor/selection.hpp diff --git a/c++/include/boost/preprocessor/selection/max.hpp b/c++/boost/preprocessor/selection/max.hpp similarity index 100% rename from c++/include/boost/preprocessor/selection/max.hpp rename to c++/boost/preprocessor/selection/max.hpp diff --git a/c++/include/boost/preprocessor/selection/min.hpp b/c++/boost/preprocessor/selection/min.hpp similarity index 100% rename from c++/include/boost/preprocessor/selection/min.hpp rename to c++/boost/preprocessor/selection/min.hpp diff --git a/c++/include/boost/preprocessor/seq.hpp b/c++/boost/preprocessor/seq.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq.hpp rename to c++/boost/preprocessor/seq.hpp diff --git a/c++/include/boost/preprocessor/seq/cat.hpp b/c++/boost/preprocessor/seq/cat.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/cat.hpp rename to c++/boost/preprocessor/seq/cat.hpp diff --git a/c++/include/boost/preprocessor/seq/detail/binary_transform.hpp b/c++/boost/preprocessor/seq/detail/binary_transform.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/detail/binary_transform.hpp rename to c++/boost/preprocessor/seq/detail/binary_transform.hpp diff --git a/c++/include/boost/preprocessor/seq/detail/is_empty.hpp b/c++/boost/preprocessor/seq/detail/is_empty.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/detail/is_empty.hpp rename to c++/boost/preprocessor/seq/detail/is_empty.hpp diff --git a/c++/include/boost/preprocessor/seq/detail/limits/split_1024.hpp b/c++/boost/preprocessor/seq/detail/limits/split_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/detail/limits/split_1024.hpp rename to c++/boost/preprocessor/seq/detail/limits/split_1024.hpp diff --git a/c++/include/boost/preprocessor/seq/detail/limits/split_256.hpp b/c++/boost/preprocessor/seq/detail/limits/split_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/detail/limits/split_256.hpp rename to c++/boost/preprocessor/seq/detail/limits/split_256.hpp diff --git a/c++/include/boost/preprocessor/seq/detail/limits/split_512.hpp b/c++/boost/preprocessor/seq/detail/limits/split_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/detail/limits/split_512.hpp rename to c++/boost/preprocessor/seq/detail/limits/split_512.hpp diff --git a/c++/include/boost/preprocessor/seq/detail/split.hpp b/c++/boost/preprocessor/seq/detail/split.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/detail/split.hpp rename to c++/boost/preprocessor/seq/detail/split.hpp diff --git a/c++/include/boost/preprocessor/seq/detail/to_list_msvc.hpp b/c++/boost/preprocessor/seq/detail/to_list_msvc.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/detail/to_list_msvc.hpp rename to c++/boost/preprocessor/seq/detail/to_list_msvc.hpp diff --git a/c++/include/boost/preprocessor/seq/elem.hpp b/c++/boost/preprocessor/seq/elem.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/elem.hpp rename to c++/boost/preprocessor/seq/elem.hpp diff --git a/c++/include/boost/preprocessor/seq/enum.hpp b/c++/boost/preprocessor/seq/enum.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/enum.hpp rename to c++/boost/preprocessor/seq/enum.hpp diff --git a/c++/include/boost/preprocessor/seq/filter.hpp b/c++/boost/preprocessor/seq/filter.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/filter.hpp rename to c++/boost/preprocessor/seq/filter.hpp diff --git a/c++/include/boost/preprocessor/seq/first_n.hpp b/c++/boost/preprocessor/seq/first_n.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/first_n.hpp rename to c++/boost/preprocessor/seq/first_n.hpp diff --git a/c++/include/boost/preprocessor/seq/fold_left.hpp b/c++/boost/preprocessor/seq/fold_left.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/fold_left.hpp rename to c++/boost/preprocessor/seq/fold_left.hpp diff --git a/c++/include/boost/preprocessor/seq/fold_right.hpp b/c++/boost/preprocessor/seq/fold_right.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/fold_right.hpp rename to c++/boost/preprocessor/seq/fold_right.hpp diff --git a/c++/include/boost/preprocessor/seq/for_each.hpp b/c++/boost/preprocessor/seq/for_each.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/for_each.hpp rename to c++/boost/preprocessor/seq/for_each.hpp diff --git a/c++/include/boost/preprocessor/seq/for_each_i.hpp b/c++/boost/preprocessor/seq/for_each_i.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/for_each_i.hpp rename to c++/boost/preprocessor/seq/for_each_i.hpp diff --git a/c++/include/boost/preprocessor/seq/for_each_product.hpp b/c++/boost/preprocessor/seq/for_each_product.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/for_each_product.hpp rename to c++/boost/preprocessor/seq/for_each_product.hpp diff --git a/c++/include/boost/preprocessor/seq/insert.hpp b/c++/boost/preprocessor/seq/insert.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/insert.hpp rename to c++/boost/preprocessor/seq/insert.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/elem_1024.hpp b/c++/boost/preprocessor/seq/limits/elem_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/elem_1024.hpp rename to c++/boost/preprocessor/seq/limits/elem_1024.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/elem_256.hpp b/c++/boost/preprocessor/seq/limits/elem_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/elem_256.hpp rename to c++/boost/preprocessor/seq/limits/elem_256.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/elem_512.hpp b/c++/boost/preprocessor/seq/limits/elem_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/elem_512.hpp rename to c++/boost/preprocessor/seq/limits/elem_512.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/enum_1024.hpp b/c++/boost/preprocessor/seq/limits/enum_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/enum_1024.hpp rename to c++/boost/preprocessor/seq/limits/enum_1024.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/enum_256.hpp b/c++/boost/preprocessor/seq/limits/enum_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/enum_256.hpp rename to c++/boost/preprocessor/seq/limits/enum_256.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/enum_512.hpp b/c++/boost/preprocessor/seq/limits/enum_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/enum_512.hpp rename to c++/boost/preprocessor/seq/limits/enum_512.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/fold_left_1024.hpp b/c++/boost/preprocessor/seq/limits/fold_left_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/fold_left_1024.hpp rename to c++/boost/preprocessor/seq/limits/fold_left_1024.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/fold_left_256.hpp b/c++/boost/preprocessor/seq/limits/fold_left_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/fold_left_256.hpp rename to c++/boost/preprocessor/seq/limits/fold_left_256.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/fold_left_512.hpp b/c++/boost/preprocessor/seq/limits/fold_left_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/fold_left_512.hpp rename to c++/boost/preprocessor/seq/limits/fold_left_512.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/fold_right_1024.hpp b/c++/boost/preprocessor/seq/limits/fold_right_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/fold_right_1024.hpp rename to c++/boost/preprocessor/seq/limits/fold_right_1024.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/fold_right_256.hpp b/c++/boost/preprocessor/seq/limits/fold_right_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/fold_right_256.hpp rename to c++/boost/preprocessor/seq/limits/fold_right_256.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/fold_right_512.hpp b/c++/boost/preprocessor/seq/limits/fold_right_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/fold_right_512.hpp rename to c++/boost/preprocessor/seq/limits/fold_right_512.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/size_1024.hpp b/c++/boost/preprocessor/seq/limits/size_1024.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/size_1024.hpp rename to c++/boost/preprocessor/seq/limits/size_1024.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/size_256.hpp b/c++/boost/preprocessor/seq/limits/size_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/size_256.hpp rename to c++/boost/preprocessor/seq/limits/size_256.hpp diff --git a/c++/include/boost/preprocessor/seq/limits/size_512.hpp b/c++/boost/preprocessor/seq/limits/size_512.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/limits/size_512.hpp rename to c++/boost/preprocessor/seq/limits/size_512.hpp diff --git a/c++/include/boost/preprocessor/seq/pop_back.hpp b/c++/boost/preprocessor/seq/pop_back.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/pop_back.hpp rename to c++/boost/preprocessor/seq/pop_back.hpp diff --git a/c++/include/boost/preprocessor/seq/pop_front.hpp b/c++/boost/preprocessor/seq/pop_front.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/pop_front.hpp rename to c++/boost/preprocessor/seq/pop_front.hpp diff --git a/c++/include/boost/preprocessor/seq/push_back.hpp b/c++/boost/preprocessor/seq/push_back.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/push_back.hpp rename to c++/boost/preprocessor/seq/push_back.hpp diff --git a/c++/include/boost/preprocessor/seq/push_front.hpp b/c++/boost/preprocessor/seq/push_front.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/push_front.hpp rename to c++/boost/preprocessor/seq/push_front.hpp diff --git a/c++/include/boost/preprocessor/seq/remove.hpp b/c++/boost/preprocessor/seq/remove.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/remove.hpp rename to c++/boost/preprocessor/seq/remove.hpp diff --git a/c++/include/boost/preprocessor/seq/replace.hpp b/c++/boost/preprocessor/seq/replace.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/replace.hpp rename to c++/boost/preprocessor/seq/replace.hpp diff --git a/c++/include/boost/preprocessor/seq/rest_n.hpp b/c++/boost/preprocessor/seq/rest_n.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/rest_n.hpp rename to c++/boost/preprocessor/seq/rest_n.hpp diff --git a/c++/include/boost/preprocessor/seq/reverse.hpp b/c++/boost/preprocessor/seq/reverse.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/reverse.hpp rename to c++/boost/preprocessor/seq/reverse.hpp diff --git a/c++/include/boost/preprocessor/seq/seq.hpp b/c++/boost/preprocessor/seq/seq.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/seq.hpp rename to c++/boost/preprocessor/seq/seq.hpp diff --git a/c++/include/boost/preprocessor/seq/size.hpp b/c++/boost/preprocessor/seq/size.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/size.hpp rename to c++/boost/preprocessor/seq/size.hpp diff --git a/c++/include/boost/preprocessor/seq/subseq.hpp b/c++/boost/preprocessor/seq/subseq.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/subseq.hpp rename to c++/boost/preprocessor/seq/subseq.hpp diff --git a/c++/include/boost/preprocessor/seq/to_array.hpp b/c++/boost/preprocessor/seq/to_array.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/to_array.hpp rename to c++/boost/preprocessor/seq/to_array.hpp diff --git a/c++/include/boost/preprocessor/seq/to_list.hpp b/c++/boost/preprocessor/seq/to_list.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/to_list.hpp rename to c++/boost/preprocessor/seq/to_list.hpp diff --git a/c++/include/boost/preprocessor/seq/to_tuple.hpp b/c++/boost/preprocessor/seq/to_tuple.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/to_tuple.hpp rename to c++/boost/preprocessor/seq/to_tuple.hpp diff --git a/c++/include/boost/preprocessor/seq/transform.hpp b/c++/boost/preprocessor/seq/transform.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/transform.hpp rename to c++/boost/preprocessor/seq/transform.hpp diff --git a/c++/include/boost/preprocessor/seq/variadic_seq_to_seq.hpp b/c++/boost/preprocessor/seq/variadic_seq_to_seq.hpp similarity index 100% rename from c++/include/boost/preprocessor/seq/variadic_seq_to_seq.hpp rename to c++/boost/preprocessor/seq/variadic_seq_to_seq.hpp diff --git a/c++/include/boost/preprocessor/slot.hpp b/c++/boost/preprocessor/slot.hpp similarity index 100% rename from c++/include/boost/preprocessor/slot.hpp rename to c++/boost/preprocessor/slot.hpp diff --git a/c++/include/boost/preprocessor/slot/counter.hpp b/c++/boost/preprocessor/slot/counter.hpp similarity index 100% rename from c++/include/boost/preprocessor/slot/counter.hpp rename to c++/boost/preprocessor/slot/counter.hpp diff --git a/c++/include/boost/preprocessor/slot/detail/counter.hpp b/c++/boost/preprocessor/slot/detail/counter.hpp similarity index 100% rename from c++/include/boost/preprocessor/slot/detail/counter.hpp rename to c++/boost/preprocessor/slot/detail/counter.hpp diff --git a/c++/include/boost/preprocessor/slot/detail/def.hpp b/c++/boost/preprocessor/slot/detail/def.hpp similarity index 100% rename from c++/include/boost/preprocessor/slot/detail/def.hpp rename to c++/boost/preprocessor/slot/detail/def.hpp diff --git a/c++/include/boost/preprocessor/slot/detail/shared.hpp b/c++/boost/preprocessor/slot/detail/shared.hpp similarity index 100% rename from c++/include/boost/preprocessor/slot/detail/shared.hpp rename to c++/boost/preprocessor/slot/detail/shared.hpp diff --git a/c++/include/boost/preprocessor/slot/detail/slot1.hpp b/c++/boost/preprocessor/slot/detail/slot1.hpp similarity index 100% rename from c++/include/boost/preprocessor/slot/detail/slot1.hpp rename to c++/boost/preprocessor/slot/detail/slot1.hpp diff --git a/c++/include/boost/preprocessor/slot/detail/slot2.hpp b/c++/boost/preprocessor/slot/detail/slot2.hpp similarity index 100% rename from c++/include/boost/preprocessor/slot/detail/slot2.hpp rename to c++/boost/preprocessor/slot/detail/slot2.hpp diff --git a/c++/include/boost/preprocessor/slot/detail/slot3.hpp b/c++/boost/preprocessor/slot/detail/slot3.hpp similarity index 100% rename from c++/include/boost/preprocessor/slot/detail/slot3.hpp rename to c++/boost/preprocessor/slot/detail/slot3.hpp diff --git a/c++/include/boost/preprocessor/slot/detail/slot4.hpp b/c++/boost/preprocessor/slot/detail/slot4.hpp similarity index 100% rename from c++/include/boost/preprocessor/slot/detail/slot4.hpp rename to c++/boost/preprocessor/slot/detail/slot4.hpp diff --git a/c++/include/boost/preprocessor/slot/detail/slot5.hpp b/c++/boost/preprocessor/slot/detail/slot5.hpp similarity index 100% rename from c++/include/boost/preprocessor/slot/detail/slot5.hpp rename to c++/boost/preprocessor/slot/detail/slot5.hpp diff --git a/c++/include/boost/preprocessor/slot/slot.hpp b/c++/boost/preprocessor/slot/slot.hpp similarity index 100% rename from c++/include/boost/preprocessor/slot/slot.hpp rename to c++/boost/preprocessor/slot/slot.hpp diff --git a/c++/include/boost/preprocessor/stringize.hpp b/c++/boost/preprocessor/stringize.hpp similarity index 100% rename from c++/include/boost/preprocessor/stringize.hpp rename to c++/boost/preprocessor/stringize.hpp diff --git a/c++/include/boost/preprocessor/tuple.hpp b/c++/boost/preprocessor/tuple.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple.hpp rename to c++/boost/preprocessor/tuple.hpp diff --git a/c++/include/boost/preprocessor/tuple/detail/is_single_return.hpp b/c++/boost/preprocessor/tuple/detail/is_single_return.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/detail/is_single_return.hpp rename to c++/boost/preprocessor/tuple/detail/is_single_return.hpp diff --git a/c++/include/boost/preprocessor/tuple/eat.hpp b/c++/boost/preprocessor/tuple/eat.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/eat.hpp rename to c++/boost/preprocessor/tuple/eat.hpp diff --git a/c++/include/boost/preprocessor/tuple/elem.hpp b/c++/boost/preprocessor/tuple/elem.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/elem.hpp rename to c++/boost/preprocessor/tuple/elem.hpp diff --git a/c++/include/boost/preprocessor/tuple/enum.hpp b/c++/boost/preprocessor/tuple/enum.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/enum.hpp rename to c++/boost/preprocessor/tuple/enum.hpp diff --git a/c++/include/boost/preprocessor/tuple/insert.hpp b/c++/boost/preprocessor/tuple/insert.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/insert.hpp rename to c++/boost/preprocessor/tuple/insert.hpp diff --git a/c++/include/boost/preprocessor/tuple/limits/reverse_128.hpp b/c++/boost/preprocessor/tuple/limits/reverse_128.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/limits/reverse_128.hpp rename to c++/boost/preprocessor/tuple/limits/reverse_128.hpp diff --git a/c++/include/boost/preprocessor/tuple/limits/reverse_256.hpp b/c++/boost/preprocessor/tuple/limits/reverse_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/limits/reverse_256.hpp rename to c++/boost/preprocessor/tuple/limits/reverse_256.hpp diff --git a/c++/include/boost/preprocessor/tuple/limits/reverse_64.hpp b/c++/boost/preprocessor/tuple/limits/reverse_64.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/limits/reverse_64.hpp rename to c++/boost/preprocessor/tuple/limits/reverse_64.hpp diff --git a/c++/include/boost/preprocessor/tuple/limits/to_list_128.hpp b/c++/boost/preprocessor/tuple/limits/to_list_128.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/limits/to_list_128.hpp rename to c++/boost/preprocessor/tuple/limits/to_list_128.hpp diff --git a/c++/include/boost/preprocessor/tuple/limits/to_list_256.hpp b/c++/boost/preprocessor/tuple/limits/to_list_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/limits/to_list_256.hpp rename to c++/boost/preprocessor/tuple/limits/to_list_256.hpp diff --git a/c++/include/boost/preprocessor/tuple/limits/to_list_64.hpp b/c++/boost/preprocessor/tuple/limits/to_list_64.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/limits/to_list_64.hpp rename to c++/boost/preprocessor/tuple/limits/to_list_64.hpp diff --git a/c++/include/boost/preprocessor/tuple/limits/to_seq_128.hpp b/c++/boost/preprocessor/tuple/limits/to_seq_128.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/limits/to_seq_128.hpp rename to c++/boost/preprocessor/tuple/limits/to_seq_128.hpp diff --git a/c++/include/boost/preprocessor/tuple/limits/to_seq_256.hpp b/c++/boost/preprocessor/tuple/limits/to_seq_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/limits/to_seq_256.hpp rename to c++/boost/preprocessor/tuple/limits/to_seq_256.hpp diff --git a/c++/include/boost/preprocessor/tuple/limits/to_seq_64.hpp b/c++/boost/preprocessor/tuple/limits/to_seq_64.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/limits/to_seq_64.hpp rename to c++/boost/preprocessor/tuple/limits/to_seq_64.hpp diff --git a/c++/include/boost/preprocessor/tuple/pop_back.hpp b/c++/boost/preprocessor/tuple/pop_back.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/pop_back.hpp rename to c++/boost/preprocessor/tuple/pop_back.hpp diff --git a/c++/include/boost/preprocessor/tuple/pop_front.hpp b/c++/boost/preprocessor/tuple/pop_front.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/pop_front.hpp rename to c++/boost/preprocessor/tuple/pop_front.hpp diff --git a/c++/include/boost/preprocessor/tuple/push_back.hpp b/c++/boost/preprocessor/tuple/push_back.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/push_back.hpp rename to c++/boost/preprocessor/tuple/push_back.hpp diff --git a/c++/include/boost/preprocessor/tuple/push_front.hpp b/c++/boost/preprocessor/tuple/push_front.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/push_front.hpp rename to c++/boost/preprocessor/tuple/push_front.hpp diff --git a/c++/include/boost/preprocessor/tuple/rem.hpp b/c++/boost/preprocessor/tuple/rem.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/rem.hpp rename to c++/boost/preprocessor/tuple/rem.hpp diff --git a/c++/include/boost/preprocessor/tuple/remove.hpp b/c++/boost/preprocessor/tuple/remove.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/remove.hpp rename to c++/boost/preprocessor/tuple/remove.hpp diff --git a/c++/include/boost/preprocessor/tuple/replace.hpp b/c++/boost/preprocessor/tuple/replace.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/replace.hpp rename to c++/boost/preprocessor/tuple/replace.hpp diff --git a/c++/include/boost/preprocessor/tuple/reverse.hpp b/c++/boost/preprocessor/tuple/reverse.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/reverse.hpp rename to c++/boost/preprocessor/tuple/reverse.hpp diff --git a/c++/include/boost/preprocessor/tuple/size.hpp b/c++/boost/preprocessor/tuple/size.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/size.hpp rename to c++/boost/preprocessor/tuple/size.hpp diff --git a/c++/include/boost/preprocessor/tuple/to_array.hpp b/c++/boost/preprocessor/tuple/to_array.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/to_array.hpp rename to c++/boost/preprocessor/tuple/to_array.hpp diff --git a/c++/include/boost/preprocessor/tuple/to_list.hpp b/c++/boost/preprocessor/tuple/to_list.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/to_list.hpp rename to c++/boost/preprocessor/tuple/to_list.hpp diff --git a/c++/include/boost/preprocessor/tuple/to_seq.hpp b/c++/boost/preprocessor/tuple/to_seq.hpp similarity index 100% rename from c++/include/boost/preprocessor/tuple/to_seq.hpp rename to c++/boost/preprocessor/tuple/to_seq.hpp diff --git a/c++/include/boost/preprocessor/variadic.hpp b/c++/boost/preprocessor/variadic.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic.hpp rename to c++/boost/preprocessor/variadic.hpp diff --git a/c++/include/boost/preprocessor/variadic/detail/has_opt.hpp b/c++/boost/preprocessor/variadic/detail/has_opt.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/detail/has_opt.hpp rename to c++/boost/preprocessor/variadic/detail/has_opt.hpp diff --git a/c++/include/boost/preprocessor/variadic/detail/is_single_return.hpp b/c++/boost/preprocessor/variadic/detail/is_single_return.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/detail/is_single_return.hpp rename to c++/boost/preprocessor/variadic/detail/is_single_return.hpp diff --git a/c++/include/boost/preprocessor/variadic/elem.hpp b/c++/boost/preprocessor/variadic/elem.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/elem.hpp rename to c++/boost/preprocessor/variadic/elem.hpp diff --git a/c++/include/boost/preprocessor/variadic/has_opt.hpp b/c++/boost/preprocessor/variadic/has_opt.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/has_opt.hpp rename to c++/boost/preprocessor/variadic/has_opt.hpp diff --git a/c++/include/boost/preprocessor/variadic/limits/elem_128.hpp b/c++/boost/preprocessor/variadic/limits/elem_128.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/limits/elem_128.hpp rename to c++/boost/preprocessor/variadic/limits/elem_128.hpp diff --git a/c++/include/boost/preprocessor/variadic/limits/elem_256.hpp b/c++/boost/preprocessor/variadic/limits/elem_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/limits/elem_256.hpp rename to c++/boost/preprocessor/variadic/limits/elem_256.hpp diff --git a/c++/include/boost/preprocessor/variadic/limits/elem_64.hpp b/c++/boost/preprocessor/variadic/limits/elem_64.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/limits/elem_64.hpp rename to c++/boost/preprocessor/variadic/limits/elem_64.hpp diff --git a/c++/include/boost/preprocessor/variadic/limits/size_128.hpp b/c++/boost/preprocessor/variadic/limits/size_128.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/limits/size_128.hpp rename to c++/boost/preprocessor/variadic/limits/size_128.hpp diff --git a/c++/include/boost/preprocessor/variadic/limits/size_256.hpp b/c++/boost/preprocessor/variadic/limits/size_256.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/limits/size_256.hpp rename to c++/boost/preprocessor/variadic/limits/size_256.hpp diff --git a/c++/include/boost/preprocessor/variadic/limits/size_64.hpp b/c++/boost/preprocessor/variadic/limits/size_64.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/limits/size_64.hpp rename to c++/boost/preprocessor/variadic/limits/size_64.hpp diff --git a/c++/include/boost/preprocessor/variadic/size.hpp b/c++/boost/preprocessor/variadic/size.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/size.hpp rename to c++/boost/preprocessor/variadic/size.hpp diff --git a/c++/include/boost/preprocessor/variadic/to_array.hpp b/c++/boost/preprocessor/variadic/to_array.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/to_array.hpp rename to c++/boost/preprocessor/variadic/to_array.hpp diff --git a/c++/include/boost/preprocessor/variadic/to_list.hpp b/c++/boost/preprocessor/variadic/to_list.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/to_list.hpp rename to c++/boost/preprocessor/variadic/to_list.hpp diff --git a/c++/include/boost/preprocessor/variadic/to_seq.hpp b/c++/boost/preprocessor/variadic/to_seq.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/to_seq.hpp rename to c++/boost/preprocessor/variadic/to_seq.hpp diff --git a/c++/include/boost/preprocessor/variadic/to_tuple.hpp b/c++/boost/preprocessor/variadic/to_tuple.hpp similarity index 100% rename from c++/include/boost/preprocessor/variadic/to_tuple.hpp rename to c++/boost/preprocessor/variadic/to_tuple.hpp diff --git a/c++/include/boost/preprocessor/while.hpp b/c++/boost/preprocessor/while.hpp similarity index 100% rename from c++/include/boost/preprocessor/while.hpp rename to c++/boost/preprocessor/while.hpp diff --git a/c++/include/boost/preprocessor/wstringize.hpp b/c++/boost/preprocessor/wstringize.hpp similarity index 100% rename from c++/include/boost/preprocessor/wstringize.hpp rename to c++/boost/preprocessor/wstringize.hpp diff --git a/c++/include/boost/process.hpp b/c++/boost/process.hpp similarity index 100% rename from c++/include/boost/process.hpp rename to c++/boost/process.hpp diff --git a/c++/include/boost/process/args.hpp b/c++/boost/process/args.hpp similarity index 100% rename from c++/include/boost/process/args.hpp rename to c++/boost/process/args.hpp diff --git a/c++/include/boost/process/async.hpp b/c++/boost/process/async.hpp similarity index 100% rename from c++/include/boost/process/async.hpp rename to c++/boost/process/async.hpp diff --git a/c++/include/boost/process/async_pipe.hpp b/c++/boost/process/async_pipe.hpp similarity index 100% rename from c++/include/boost/process/async_pipe.hpp rename to c++/boost/process/async_pipe.hpp diff --git a/c++/include/boost/process/async_system.hpp b/c++/boost/process/async_system.hpp similarity index 100% rename from c++/include/boost/process/async_system.hpp rename to c++/boost/process/async_system.hpp diff --git a/c++/include/boost/process/child.hpp b/c++/boost/process/child.hpp similarity index 100% rename from c++/include/boost/process/child.hpp rename to c++/boost/process/child.hpp diff --git a/c++/include/boost/process/cmd.hpp b/c++/boost/process/cmd.hpp similarity index 100% rename from c++/include/boost/process/cmd.hpp rename to c++/boost/process/cmd.hpp diff --git a/c++/include/boost/process/detail/async_handler.hpp b/c++/boost/process/detail/async_handler.hpp similarity index 100% rename from c++/include/boost/process/detail/async_handler.hpp rename to c++/boost/process/detail/async_handler.hpp diff --git a/c++/include/boost/process/detail/basic_cmd.hpp b/c++/boost/process/detail/basic_cmd.hpp similarity index 100% rename from c++/include/boost/process/detail/basic_cmd.hpp rename to c++/boost/process/detail/basic_cmd.hpp diff --git a/c++/include/boost/process/detail/child_decl.hpp b/c++/boost/process/detail/child_decl.hpp similarity index 100% rename from c++/include/boost/process/detail/child_decl.hpp rename to c++/boost/process/detail/child_decl.hpp diff --git a/c++/include/boost/process/detail/config.hpp b/c++/boost/process/detail/config.hpp similarity index 100% rename from c++/include/boost/process/detail/config.hpp rename to c++/boost/process/detail/config.hpp diff --git a/c++/include/boost/process/detail/execute_impl.hpp b/c++/boost/process/detail/execute_impl.hpp similarity index 100% rename from c++/include/boost/process/detail/execute_impl.hpp rename to c++/boost/process/detail/execute_impl.hpp diff --git a/c++/include/boost/process/detail/handler.hpp b/c++/boost/process/detail/handler.hpp similarity index 100% rename from c++/include/boost/process/detail/handler.hpp rename to c++/boost/process/detail/handler.hpp diff --git a/c++/include/boost/process/detail/handler_base.hpp b/c++/boost/process/detail/handler_base.hpp similarity index 100% rename from c++/include/boost/process/detail/handler_base.hpp rename to c++/boost/process/detail/handler_base.hpp diff --git a/c++/include/boost/process/detail/on_exit.hpp b/c++/boost/process/detail/on_exit.hpp similarity index 100% rename from c++/include/boost/process/detail/on_exit.hpp rename to c++/boost/process/detail/on_exit.hpp diff --git a/c++/include/boost/process/detail/posix/asio_fwd.hpp b/c++/boost/process/detail/posix/asio_fwd.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/asio_fwd.hpp rename to c++/boost/process/detail/posix/asio_fwd.hpp diff --git a/c++/include/boost/process/detail/posix/async_handler.hpp b/c++/boost/process/detail/posix/async_handler.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/async_handler.hpp rename to c++/boost/process/detail/posix/async_handler.hpp diff --git a/c++/include/boost/process/detail/posix/async_in.hpp b/c++/boost/process/detail/posix/async_in.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/async_in.hpp rename to c++/boost/process/detail/posix/async_in.hpp diff --git a/c++/include/boost/process/detail/posix/async_out.hpp b/c++/boost/process/detail/posix/async_out.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/async_out.hpp rename to c++/boost/process/detail/posix/async_out.hpp diff --git a/c++/include/boost/process/detail/posix/async_pipe.hpp b/c++/boost/process/detail/posix/async_pipe.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/async_pipe.hpp rename to c++/boost/process/detail/posix/async_pipe.hpp diff --git a/c++/include/boost/process/detail/posix/basic_cmd.hpp b/c++/boost/process/detail/posix/basic_cmd.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/basic_cmd.hpp rename to c++/boost/process/detail/posix/basic_cmd.hpp diff --git a/c++/include/boost/process/detail/posix/basic_pipe.hpp b/c++/boost/process/detail/posix/basic_pipe.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/basic_pipe.hpp rename to c++/boost/process/detail/posix/basic_pipe.hpp diff --git a/c++/include/boost/process/detail/posix/child_handle.hpp b/c++/boost/process/detail/posix/child_handle.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/child_handle.hpp rename to c++/boost/process/detail/posix/child_handle.hpp diff --git a/c++/include/boost/process/detail/posix/close_in.hpp b/c++/boost/process/detail/posix/close_in.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/close_in.hpp rename to c++/boost/process/detail/posix/close_in.hpp diff --git a/c++/include/boost/process/detail/posix/close_out.hpp b/c++/boost/process/detail/posix/close_out.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/close_out.hpp rename to c++/boost/process/detail/posix/close_out.hpp diff --git a/c++/include/boost/process/detail/posix/cmd.hpp b/c++/boost/process/detail/posix/cmd.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/cmd.hpp rename to c++/boost/process/detail/posix/cmd.hpp diff --git a/c++/include/boost/process/detail/posix/compare_handles.hpp b/c++/boost/process/detail/posix/compare_handles.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/compare_handles.hpp rename to c++/boost/process/detail/posix/compare_handles.hpp diff --git a/c++/include/boost/process/detail/posix/env_init.hpp b/c++/boost/process/detail/posix/env_init.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/env_init.hpp rename to c++/boost/process/detail/posix/env_init.hpp diff --git a/c++/include/boost/process/detail/posix/environment.hpp b/c++/boost/process/detail/posix/environment.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/environment.hpp rename to c++/boost/process/detail/posix/environment.hpp diff --git a/c++/include/boost/process/detail/posix/exe.hpp b/c++/boost/process/detail/posix/exe.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/exe.hpp rename to c++/boost/process/detail/posix/exe.hpp diff --git a/c++/include/boost/process/detail/posix/executor.hpp b/c++/boost/process/detail/posix/executor.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/executor.hpp rename to c++/boost/process/detail/posix/executor.hpp diff --git a/c++/include/boost/process/detail/posix/fd.hpp b/c++/boost/process/detail/posix/fd.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/fd.hpp rename to c++/boost/process/detail/posix/fd.hpp diff --git a/c++/include/boost/process/detail/posix/file_descriptor.hpp b/c++/boost/process/detail/posix/file_descriptor.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/file_descriptor.hpp rename to c++/boost/process/detail/posix/file_descriptor.hpp diff --git a/c++/include/boost/process/detail/posix/file_in.hpp b/c++/boost/process/detail/posix/file_in.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/file_in.hpp rename to c++/boost/process/detail/posix/file_in.hpp diff --git a/c++/include/boost/process/detail/posix/file_out.hpp b/c++/boost/process/detail/posix/file_out.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/file_out.hpp rename to c++/boost/process/detail/posix/file_out.hpp diff --git a/c++/include/boost/process/detail/posix/group_handle.hpp b/c++/boost/process/detail/posix/group_handle.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/group_handle.hpp rename to c++/boost/process/detail/posix/group_handle.hpp diff --git a/c++/include/boost/process/detail/posix/group_ref.hpp b/c++/boost/process/detail/posix/group_ref.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/group_ref.hpp rename to c++/boost/process/detail/posix/group_ref.hpp diff --git a/c++/include/boost/process/detail/posix/handler.hpp b/c++/boost/process/detail/posix/handler.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/handler.hpp rename to c++/boost/process/detail/posix/handler.hpp diff --git a/c++/include/boost/process/detail/posix/handles.hpp b/c++/boost/process/detail/posix/handles.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/handles.hpp rename to c++/boost/process/detail/posix/handles.hpp diff --git a/c++/include/boost/process/detail/posix/io_context_ref.hpp b/c++/boost/process/detail/posix/io_context_ref.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/io_context_ref.hpp rename to c++/boost/process/detail/posix/io_context_ref.hpp diff --git a/c++/include/boost/process/detail/posix/is_running.hpp b/c++/boost/process/detail/posix/is_running.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/is_running.hpp rename to c++/boost/process/detail/posix/is_running.hpp diff --git a/c++/include/boost/process/detail/posix/null_in.hpp b/c++/boost/process/detail/posix/null_in.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/null_in.hpp rename to c++/boost/process/detail/posix/null_in.hpp diff --git a/c++/include/boost/process/detail/posix/null_out.hpp b/c++/boost/process/detail/posix/null_out.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/null_out.hpp rename to c++/boost/process/detail/posix/null_out.hpp diff --git a/c++/include/boost/process/detail/posix/on_exit.hpp b/c++/boost/process/detail/posix/on_exit.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/on_exit.hpp rename to c++/boost/process/detail/posix/on_exit.hpp diff --git a/c++/include/boost/process/detail/posix/pipe_in.hpp b/c++/boost/process/detail/posix/pipe_in.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/pipe_in.hpp rename to c++/boost/process/detail/posix/pipe_in.hpp diff --git a/c++/include/boost/process/detail/posix/pipe_out.hpp b/c++/boost/process/detail/posix/pipe_out.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/pipe_out.hpp rename to c++/boost/process/detail/posix/pipe_out.hpp diff --git a/c++/include/boost/process/detail/posix/search_path.hpp b/c++/boost/process/detail/posix/search_path.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/search_path.hpp rename to c++/boost/process/detail/posix/search_path.hpp diff --git a/c++/include/boost/process/detail/posix/shell_path.hpp b/c++/boost/process/detail/posix/shell_path.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/shell_path.hpp rename to c++/boost/process/detail/posix/shell_path.hpp diff --git a/c++/include/boost/process/detail/posix/sigchld_service.hpp b/c++/boost/process/detail/posix/sigchld_service.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/sigchld_service.hpp rename to c++/boost/process/detail/posix/sigchld_service.hpp diff --git a/c++/include/boost/process/detail/posix/signal.hpp b/c++/boost/process/detail/posix/signal.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/signal.hpp rename to c++/boost/process/detail/posix/signal.hpp diff --git a/c++/include/boost/process/detail/posix/start_dir.hpp b/c++/boost/process/detail/posix/start_dir.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/start_dir.hpp rename to c++/boost/process/detail/posix/start_dir.hpp diff --git a/c++/include/boost/process/detail/posix/terminate.hpp b/c++/boost/process/detail/posix/terminate.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/terminate.hpp rename to c++/boost/process/detail/posix/terminate.hpp diff --git a/c++/include/boost/process/detail/posix/use_vfork.hpp b/c++/boost/process/detail/posix/use_vfork.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/use_vfork.hpp rename to c++/boost/process/detail/posix/use_vfork.hpp diff --git a/c++/include/boost/process/detail/posix/wait_for_exit.hpp b/c++/boost/process/detail/posix/wait_for_exit.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/wait_for_exit.hpp rename to c++/boost/process/detail/posix/wait_for_exit.hpp diff --git a/c++/include/boost/process/detail/posix/wait_group.hpp b/c++/boost/process/detail/posix/wait_group.hpp similarity index 100% rename from c++/include/boost/process/detail/posix/wait_group.hpp rename to c++/boost/process/detail/posix/wait_group.hpp diff --git a/c++/include/boost/process/detail/throw_on_error.hpp b/c++/boost/process/detail/throw_on_error.hpp similarity index 100% rename from c++/include/boost/process/detail/throw_on_error.hpp rename to c++/boost/process/detail/throw_on_error.hpp diff --git a/c++/include/boost/process/detail/traits.hpp b/c++/boost/process/detail/traits.hpp similarity index 100% rename from c++/include/boost/process/detail/traits.hpp rename to c++/boost/process/detail/traits.hpp diff --git a/c++/include/boost/process/detail/traits/async.hpp b/c++/boost/process/detail/traits/async.hpp similarity index 100% rename from c++/include/boost/process/detail/traits/async.hpp rename to c++/boost/process/detail/traits/async.hpp diff --git a/c++/include/boost/process/detail/traits/cmd_or_exe.hpp b/c++/boost/process/detail/traits/cmd_or_exe.hpp similarity index 100% rename from c++/include/boost/process/detail/traits/cmd_or_exe.hpp rename to c++/boost/process/detail/traits/cmd_or_exe.hpp diff --git a/c++/include/boost/process/detail/traits/decl.hpp b/c++/boost/process/detail/traits/decl.hpp similarity index 100% rename from c++/include/boost/process/detail/traits/decl.hpp rename to c++/boost/process/detail/traits/decl.hpp diff --git a/c++/include/boost/process/detail/traits/env.hpp b/c++/boost/process/detail/traits/env.hpp similarity index 100% rename from c++/include/boost/process/detail/traits/env.hpp rename to c++/boost/process/detail/traits/env.hpp diff --git a/c++/include/boost/process/detail/traits/error.hpp b/c++/boost/process/detail/traits/error.hpp similarity index 100% rename from c++/include/boost/process/detail/traits/error.hpp rename to c++/boost/process/detail/traits/error.hpp diff --git a/c++/include/boost/process/detail/traits/group.hpp b/c++/boost/process/detail/traits/group.hpp similarity index 100% rename from c++/include/boost/process/detail/traits/group.hpp rename to c++/boost/process/detail/traits/group.hpp diff --git a/c++/include/boost/process/detail/traits/wchar_t.hpp b/c++/boost/process/detail/traits/wchar_t.hpp similarity index 100% rename from c++/include/boost/process/detail/traits/wchar_t.hpp rename to c++/boost/process/detail/traits/wchar_t.hpp diff --git a/c++/include/boost/process/detail/used_handles.hpp b/c++/boost/process/detail/used_handles.hpp similarity index 100% rename from c++/include/boost/process/detail/used_handles.hpp rename to c++/boost/process/detail/used_handles.hpp diff --git a/c++/include/boost/process/detail/windows/asio_fwd.hpp b/c++/boost/process/detail/windows/asio_fwd.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/asio_fwd.hpp rename to c++/boost/process/detail/windows/asio_fwd.hpp diff --git a/c++/include/boost/process/detail/windows/async_handler.hpp b/c++/boost/process/detail/windows/async_handler.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/async_handler.hpp rename to c++/boost/process/detail/windows/async_handler.hpp diff --git a/c++/include/boost/process/detail/windows/async_in.hpp b/c++/boost/process/detail/windows/async_in.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/async_in.hpp rename to c++/boost/process/detail/windows/async_in.hpp diff --git a/c++/include/boost/process/detail/windows/async_out.hpp b/c++/boost/process/detail/windows/async_out.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/async_out.hpp rename to c++/boost/process/detail/windows/async_out.hpp diff --git a/c++/include/boost/process/detail/windows/async_pipe.hpp b/c++/boost/process/detail/windows/async_pipe.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/async_pipe.hpp rename to c++/boost/process/detail/windows/async_pipe.hpp diff --git a/c++/include/boost/process/detail/windows/basic_cmd.hpp b/c++/boost/process/detail/windows/basic_cmd.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/basic_cmd.hpp rename to c++/boost/process/detail/windows/basic_cmd.hpp diff --git a/c++/include/boost/process/detail/windows/basic_pipe.hpp b/c++/boost/process/detail/windows/basic_pipe.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/basic_pipe.hpp rename to c++/boost/process/detail/windows/basic_pipe.hpp diff --git a/c++/include/boost/process/detail/windows/child_handle.hpp b/c++/boost/process/detail/windows/child_handle.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/child_handle.hpp rename to c++/boost/process/detail/windows/child_handle.hpp diff --git a/c++/include/boost/process/detail/windows/close_in.hpp b/c++/boost/process/detail/windows/close_in.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/close_in.hpp rename to c++/boost/process/detail/windows/close_in.hpp diff --git a/c++/include/boost/process/detail/windows/close_out.hpp b/c++/boost/process/detail/windows/close_out.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/close_out.hpp rename to c++/boost/process/detail/windows/close_out.hpp diff --git a/c++/include/boost/process/detail/windows/cmd.hpp b/c++/boost/process/detail/windows/cmd.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/cmd.hpp rename to c++/boost/process/detail/windows/cmd.hpp diff --git a/c++/include/boost/process/detail/windows/compare_handles.hpp b/c++/boost/process/detail/windows/compare_handles.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/compare_handles.hpp rename to c++/boost/process/detail/windows/compare_handles.hpp diff --git a/c++/include/boost/process/detail/windows/env_init.hpp b/c++/boost/process/detail/windows/env_init.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/env_init.hpp rename to c++/boost/process/detail/windows/env_init.hpp diff --git a/c++/include/boost/process/detail/windows/environment.hpp b/c++/boost/process/detail/windows/environment.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/environment.hpp rename to c++/boost/process/detail/windows/environment.hpp diff --git a/c++/include/boost/process/detail/windows/executor.hpp b/c++/boost/process/detail/windows/executor.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/executor.hpp rename to c++/boost/process/detail/windows/executor.hpp diff --git a/c++/include/boost/process/detail/windows/file_descriptor.hpp b/c++/boost/process/detail/windows/file_descriptor.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/file_descriptor.hpp rename to c++/boost/process/detail/windows/file_descriptor.hpp diff --git a/c++/include/boost/process/detail/windows/file_in.hpp b/c++/boost/process/detail/windows/file_in.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/file_in.hpp rename to c++/boost/process/detail/windows/file_in.hpp diff --git a/c++/include/boost/process/detail/windows/file_out.hpp b/c++/boost/process/detail/windows/file_out.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/file_out.hpp rename to c++/boost/process/detail/windows/file_out.hpp diff --git a/c++/include/boost/process/detail/windows/group_handle.hpp b/c++/boost/process/detail/windows/group_handle.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/group_handle.hpp rename to c++/boost/process/detail/windows/group_handle.hpp diff --git a/c++/include/boost/process/detail/windows/group_ref.hpp b/c++/boost/process/detail/windows/group_ref.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/group_ref.hpp rename to c++/boost/process/detail/windows/group_ref.hpp diff --git a/c++/include/boost/process/detail/windows/handle_workaround.hpp b/c++/boost/process/detail/windows/handle_workaround.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/handle_workaround.hpp rename to c++/boost/process/detail/windows/handle_workaround.hpp diff --git a/c++/include/boost/process/detail/windows/handler.hpp b/c++/boost/process/detail/windows/handler.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/handler.hpp rename to c++/boost/process/detail/windows/handler.hpp diff --git a/c++/include/boost/process/detail/windows/handles.hpp b/c++/boost/process/detail/windows/handles.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/handles.hpp rename to c++/boost/process/detail/windows/handles.hpp diff --git a/c++/include/boost/process/detail/windows/io_context_ref.hpp b/c++/boost/process/detail/windows/io_context_ref.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/io_context_ref.hpp rename to c++/boost/process/detail/windows/io_context_ref.hpp diff --git a/c++/include/boost/process/detail/windows/is_running.hpp b/c++/boost/process/detail/windows/is_running.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/is_running.hpp rename to c++/boost/process/detail/windows/is_running.hpp diff --git a/c++/include/boost/process/detail/windows/job_workaround.hpp b/c++/boost/process/detail/windows/job_workaround.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/job_workaround.hpp rename to c++/boost/process/detail/windows/job_workaround.hpp diff --git a/c++/include/boost/process/detail/windows/locale.hpp b/c++/boost/process/detail/windows/locale.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/locale.hpp rename to c++/boost/process/detail/windows/locale.hpp diff --git a/c++/include/boost/process/detail/windows/null_in.hpp b/c++/boost/process/detail/windows/null_in.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/null_in.hpp rename to c++/boost/process/detail/windows/null_in.hpp diff --git a/c++/include/boost/process/detail/windows/null_out.hpp b/c++/boost/process/detail/windows/null_out.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/null_out.hpp rename to c++/boost/process/detail/windows/null_out.hpp diff --git a/c++/include/boost/process/detail/windows/on_exit.hpp b/c++/boost/process/detail/windows/on_exit.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/on_exit.hpp rename to c++/boost/process/detail/windows/on_exit.hpp diff --git a/c++/include/boost/process/detail/windows/pipe_in.hpp b/c++/boost/process/detail/windows/pipe_in.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/pipe_in.hpp rename to c++/boost/process/detail/windows/pipe_in.hpp diff --git a/c++/include/boost/process/detail/windows/pipe_out.hpp b/c++/boost/process/detail/windows/pipe_out.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/pipe_out.hpp rename to c++/boost/process/detail/windows/pipe_out.hpp diff --git a/c++/include/boost/process/detail/windows/search_path.hpp b/c++/boost/process/detail/windows/search_path.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/search_path.hpp rename to c++/boost/process/detail/windows/search_path.hpp diff --git a/c++/include/boost/process/detail/windows/shell_path.hpp b/c++/boost/process/detail/windows/shell_path.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/shell_path.hpp rename to c++/boost/process/detail/windows/shell_path.hpp diff --git a/c++/include/boost/process/detail/windows/show_window.hpp b/c++/boost/process/detail/windows/show_window.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/show_window.hpp rename to c++/boost/process/detail/windows/show_window.hpp diff --git a/c++/include/boost/process/detail/windows/start_dir.hpp b/c++/boost/process/detail/windows/start_dir.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/start_dir.hpp rename to c++/boost/process/detail/windows/start_dir.hpp diff --git a/c++/include/boost/process/detail/windows/terminate.hpp b/c++/boost/process/detail/windows/terminate.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/terminate.hpp rename to c++/boost/process/detail/windows/terminate.hpp diff --git a/c++/include/boost/process/detail/windows/wait_for_exit.hpp b/c++/boost/process/detail/windows/wait_for_exit.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/wait_for_exit.hpp rename to c++/boost/process/detail/windows/wait_for_exit.hpp diff --git a/c++/include/boost/process/detail/windows/wait_group.hpp b/c++/boost/process/detail/windows/wait_group.hpp similarity index 100% rename from c++/include/boost/process/detail/windows/wait_group.hpp rename to c++/boost/process/detail/windows/wait_group.hpp diff --git a/c++/include/boost/process/env.hpp b/c++/boost/process/env.hpp similarity index 100% rename from c++/include/boost/process/env.hpp rename to c++/boost/process/env.hpp diff --git a/c++/include/boost/process/environment.hpp b/c++/boost/process/environment.hpp similarity index 100% rename from c++/include/boost/process/environment.hpp rename to c++/boost/process/environment.hpp diff --git a/c++/include/boost/process/error.hpp b/c++/boost/process/error.hpp similarity index 100% rename from c++/include/boost/process/error.hpp rename to c++/boost/process/error.hpp diff --git a/c++/include/boost/process/exception.hpp b/c++/boost/process/exception.hpp similarity index 100% rename from c++/include/boost/process/exception.hpp rename to c++/boost/process/exception.hpp diff --git a/c++/include/boost/process/exe.hpp b/c++/boost/process/exe.hpp similarity index 100% rename from c++/include/boost/process/exe.hpp rename to c++/boost/process/exe.hpp diff --git a/c++/include/boost/process/extend.hpp b/c++/boost/process/extend.hpp similarity index 100% rename from c++/include/boost/process/extend.hpp rename to c++/boost/process/extend.hpp diff --git a/c++/include/boost/process/filesystem.hpp b/c++/boost/process/filesystem.hpp similarity index 100% rename from c++/include/boost/process/filesystem.hpp rename to c++/boost/process/filesystem.hpp diff --git a/c++/include/boost/process/group.hpp b/c++/boost/process/group.hpp similarity index 100% rename from c++/include/boost/process/group.hpp rename to c++/boost/process/group.hpp diff --git a/c++/include/boost/process/handles.hpp b/c++/boost/process/handles.hpp similarity index 100% rename from c++/include/boost/process/handles.hpp rename to c++/boost/process/handles.hpp diff --git a/c++/include/boost/process/io.hpp b/c++/boost/process/io.hpp similarity index 100% rename from c++/include/boost/process/io.hpp rename to c++/boost/process/io.hpp diff --git a/c++/include/boost/process/locale.hpp b/c++/boost/process/locale.hpp similarity index 100% rename from c++/include/boost/process/locale.hpp rename to c++/boost/process/locale.hpp diff --git a/c++/include/boost/process/pipe.hpp b/c++/boost/process/pipe.hpp similarity index 100% rename from c++/include/boost/process/pipe.hpp rename to c++/boost/process/pipe.hpp diff --git a/c++/include/boost/process/posix.hpp b/c++/boost/process/posix.hpp similarity index 100% rename from c++/include/boost/process/posix.hpp rename to c++/boost/process/posix.hpp diff --git a/c++/include/boost/process/search_path.hpp b/c++/boost/process/search_path.hpp similarity index 100% rename from c++/include/boost/process/search_path.hpp rename to c++/boost/process/search_path.hpp diff --git a/c++/include/boost/process/shell.hpp b/c++/boost/process/shell.hpp similarity index 100% rename from c++/include/boost/process/shell.hpp rename to c++/boost/process/shell.hpp diff --git a/c++/include/boost/process/spawn.hpp b/c++/boost/process/spawn.hpp similarity index 100% rename from c++/include/boost/process/spawn.hpp rename to c++/boost/process/spawn.hpp diff --git a/c++/include/boost/process/start_dir.hpp b/c++/boost/process/start_dir.hpp similarity index 100% rename from c++/include/boost/process/start_dir.hpp rename to c++/boost/process/start_dir.hpp diff --git a/c++/include/boost/process/system.hpp b/c++/boost/process/system.hpp similarity index 100% rename from c++/include/boost/process/system.hpp rename to c++/boost/process/system.hpp diff --git a/c++/include/boost/process/v2.hpp b/c++/boost/process/v2.hpp similarity index 100% rename from c++/include/boost/process/v2.hpp rename to c++/boost/process/v2.hpp diff --git a/c++/include/boost/process/v2/bind_launcher.hpp b/c++/boost/process/v2/bind_launcher.hpp similarity index 100% rename from c++/include/boost/process/v2/bind_launcher.hpp rename to c++/boost/process/v2/bind_launcher.hpp diff --git a/c++/include/boost/process/v2/cstring_ref.hpp b/c++/boost/process/v2/cstring_ref.hpp similarity index 100% rename from c++/include/boost/process/v2/cstring_ref.hpp rename to c++/boost/process/v2/cstring_ref.hpp diff --git a/c++/include/boost/process/v2/default_launcher.hpp b/c++/boost/process/v2/default_launcher.hpp similarity index 100% rename from c++/include/boost/process/v2/default_launcher.hpp rename to c++/boost/process/v2/default_launcher.hpp diff --git a/c++/include/boost/process/v2/detail/config.hpp b/c++/boost/process/v2/detail/config.hpp similarity index 100% rename from c++/include/boost/process/v2/detail/config.hpp rename to c++/boost/process/v2/detail/config.hpp diff --git a/c++/include/boost/process/v2/detail/environment_posix.hpp b/c++/boost/process/v2/detail/environment_posix.hpp similarity index 100% rename from c++/include/boost/process/v2/detail/environment_posix.hpp rename to c++/boost/process/v2/detail/environment_posix.hpp diff --git a/c++/include/boost/process/v2/detail/environment_win.hpp b/c++/boost/process/v2/detail/environment_win.hpp similarity index 100% rename from c++/include/boost/process/v2/detail/environment_win.hpp rename to c++/boost/process/v2/detail/environment_win.hpp diff --git a/c++/include/boost/process/v2/detail/impl/environment.ipp b/c++/boost/process/v2/detail/impl/environment.ipp similarity index 100% rename from c++/include/boost/process/v2/detail/impl/environment.ipp rename to c++/boost/process/v2/detail/impl/environment.ipp diff --git a/c++/include/boost/process/v2/detail/impl/environment_posix.ipp b/c++/boost/process/v2/detail/impl/environment_posix.ipp similarity index 100% rename from c++/include/boost/process/v2/detail/impl/environment_posix.ipp rename to c++/boost/process/v2/detail/impl/environment_posix.ipp diff --git a/c++/include/boost/process/v2/detail/impl/environment_win.ipp b/c++/boost/process/v2/detail/impl/environment_win.ipp similarity index 100% rename from c++/include/boost/process/v2/detail/impl/environment_win.ipp rename to c++/boost/process/v2/detail/impl/environment_win.ipp diff --git a/c++/include/boost/process/v2/detail/impl/last_error.ipp b/c++/boost/process/v2/detail/impl/last_error.ipp similarity index 100% rename from c++/include/boost/process/v2/detail/impl/last_error.ipp rename to c++/boost/process/v2/detail/impl/last_error.ipp diff --git a/c++/include/boost/process/v2/detail/impl/process_handle_windows.ipp b/c++/boost/process/v2/detail/impl/process_handle_windows.ipp similarity index 100% rename from c++/include/boost/process/v2/detail/impl/process_handle_windows.ipp rename to c++/boost/process/v2/detail/impl/process_handle_windows.ipp diff --git a/c++/include/boost/process/v2/detail/impl/throw_error.ipp b/c++/boost/process/v2/detail/impl/throw_error.ipp similarity index 100% rename from c++/include/boost/process/v2/detail/impl/throw_error.ipp rename to c++/boost/process/v2/detail/impl/throw_error.ipp diff --git a/c++/include/boost/process/v2/detail/impl/utf8.ipp b/c++/boost/process/v2/detail/impl/utf8.ipp similarity index 100% rename from c++/include/boost/process/v2/detail/impl/utf8.ipp rename to c++/boost/process/v2/detail/impl/utf8.ipp diff --git a/c++/include/boost/process/v2/detail/last_error.hpp b/c++/boost/process/v2/detail/last_error.hpp similarity index 100% rename from c++/include/boost/process/v2/detail/last_error.hpp rename to c++/boost/process/v2/detail/last_error.hpp diff --git a/c++/include/boost/process/v2/detail/process_handle_fd.hpp b/c++/boost/process/v2/detail/process_handle_fd.hpp similarity index 100% rename from c++/include/boost/process/v2/detail/process_handle_fd.hpp rename to c++/boost/process/v2/detail/process_handle_fd.hpp diff --git a/c++/include/boost/process/v2/detail/process_handle_fd_or_signal.hpp b/c++/boost/process/v2/detail/process_handle_fd_or_signal.hpp similarity index 100% rename from c++/include/boost/process/v2/detail/process_handle_fd_or_signal.hpp rename to c++/boost/process/v2/detail/process_handle_fd_or_signal.hpp diff --git a/c++/include/boost/process/v2/detail/process_handle_signal.hpp b/c++/boost/process/v2/detail/process_handle_signal.hpp similarity index 100% rename from c++/include/boost/process/v2/detail/process_handle_signal.hpp rename to c++/boost/process/v2/detail/process_handle_signal.hpp diff --git a/c++/include/boost/process/v2/detail/process_handle_windows.hpp b/c++/boost/process/v2/detail/process_handle_windows.hpp similarity index 100% rename from c++/include/boost/process/v2/detail/process_handle_windows.hpp rename to c++/boost/process/v2/detail/process_handle_windows.hpp diff --git a/c++/include/boost/process/v2/detail/throw_error.hpp b/c++/boost/process/v2/detail/throw_error.hpp similarity index 100% rename from c++/include/boost/process/v2/detail/throw_error.hpp rename to c++/boost/process/v2/detail/throw_error.hpp diff --git a/c++/include/boost/process/v2/detail/throw_exception.hpp b/c++/boost/process/v2/detail/throw_exception.hpp similarity index 100% rename from c++/include/boost/process/v2/detail/throw_exception.hpp rename to c++/boost/process/v2/detail/throw_exception.hpp diff --git a/c++/include/boost/process/v2/detail/utf8.hpp b/c++/boost/process/v2/detail/utf8.hpp similarity index 100% rename from c++/include/boost/process/v2/detail/utf8.hpp rename to c++/boost/process/v2/detail/utf8.hpp diff --git a/c++/include/boost/process/v2/environment.hpp b/c++/boost/process/v2/environment.hpp similarity index 100% rename from c++/include/boost/process/v2/environment.hpp rename to c++/boost/process/v2/environment.hpp diff --git a/c++/include/boost/process/v2/error.hpp b/c++/boost/process/v2/error.hpp similarity index 100% rename from c++/include/boost/process/v2/error.hpp rename to c++/boost/process/v2/error.hpp diff --git a/c++/include/boost/process/v2/execute.hpp b/c++/boost/process/v2/execute.hpp similarity index 100% rename from c++/include/boost/process/v2/execute.hpp rename to c++/boost/process/v2/execute.hpp diff --git a/c++/include/boost/process/v2/exit_code.hpp b/c++/boost/process/v2/exit_code.hpp similarity index 100% rename from c++/include/boost/process/v2/exit_code.hpp rename to c++/boost/process/v2/exit_code.hpp diff --git a/c++/include/boost/process/v2/ext.hpp b/c++/boost/process/v2/ext.hpp similarity index 100% rename from c++/include/boost/process/v2/ext.hpp rename to c++/boost/process/v2/ext.hpp diff --git a/c++/include/boost/process/v2/ext/cmd.hpp b/c++/boost/process/v2/ext/cmd.hpp similarity index 100% rename from c++/include/boost/process/v2/ext/cmd.hpp rename to c++/boost/process/v2/ext/cmd.hpp diff --git a/c++/include/boost/process/v2/ext/cwd.hpp b/c++/boost/process/v2/ext/cwd.hpp similarity index 100% rename from c++/include/boost/process/v2/ext/cwd.hpp rename to c++/boost/process/v2/ext/cwd.hpp diff --git a/c++/include/boost/process/v2/ext/detail/impl/proc_info.ipp b/c++/boost/process/v2/ext/detail/impl/proc_info.ipp similarity index 100% rename from c++/include/boost/process/v2/ext/detail/impl/proc_info.ipp rename to c++/boost/process/v2/ext/detail/impl/proc_info.ipp diff --git a/c++/include/boost/process/v2/ext/detail/proc_info.hpp b/c++/boost/process/v2/ext/detail/proc_info.hpp similarity index 100% rename from c++/include/boost/process/v2/ext/detail/proc_info.hpp rename to c++/boost/process/v2/ext/detail/proc_info.hpp diff --git a/c++/include/boost/process/v2/ext/env.hpp b/c++/boost/process/v2/ext/env.hpp similarity index 100% rename from c++/include/boost/process/v2/ext/env.hpp rename to c++/boost/process/v2/ext/env.hpp diff --git a/c++/include/boost/process/v2/ext/exe.hpp b/c++/boost/process/v2/ext/exe.hpp similarity index 100% rename from c++/include/boost/process/v2/ext/exe.hpp rename to c++/boost/process/v2/ext/exe.hpp diff --git a/c++/include/boost/process/v2/ext/impl/cmd.ipp b/c++/boost/process/v2/ext/impl/cmd.ipp similarity index 100% rename from c++/include/boost/process/v2/ext/impl/cmd.ipp rename to c++/boost/process/v2/ext/impl/cmd.ipp diff --git a/c++/include/boost/process/v2/ext/impl/cwd.ipp b/c++/boost/process/v2/ext/impl/cwd.ipp similarity index 100% rename from c++/include/boost/process/v2/ext/impl/cwd.ipp rename to c++/boost/process/v2/ext/impl/cwd.ipp diff --git a/c++/include/boost/process/v2/ext/impl/env.ipp b/c++/boost/process/v2/ext/impl/env.ipp similarity index 100% rename from c++/include/boost/process/v2/ext/impl/env.ipp rename to c++/boost/process/v2/ext/impl/env.ipp diff --git a/c++/include/boost/process/v2/ext/impl/exe.ipp b/c++/boost/process/v2/ext/impl/exe.ipp similarity index 100% rename from c++/include/boost/process/v2/ext/impl/exe.ipp rename to c++/boost/process/v2/ext/impl/exe.ipp diff --git a/c++/include/boost/process/v2/impl/default_launcher.ipp b/c++/boost/process/v2/impl/default_launcher.ipp similarity index 100% rename from c++/include/boost/process/v2/impl/default_launcher.ipp rename to c++/boost/process/v2/impl/default_launcher.ipp diff --git a/c++/include/boost/process/v2/impl/environment.ipp b/c++/boost/process/v2/impl/environment.ipp similarity index 100% rename from c++/include/boost/process/v2/impl/environment.ipp rename to c++/boost/process/v2/impl/environment.ipp diff --git a/c++/include/boost/process/v2/impl/error.ipp b/c++/boost/process/v2/impl/error.ipp similarity index 100% rename from c++/include/boost/process/v2/impl/error.ipp rename to c++/boost/process/v2/impl/error.ipp diff --git a/c++/include/boost/process/v2/impl/pid.ipp b/c++/boost/process/v2/impl/pid.ipp similarity index 100% rename from c++/include/boost/process/v2/impl/pid.ipp rename to c++/boost/process/v2/impl/pid.ipp diff --git a/c++/include/boost/process/v2/impl/process_handle.ipp b/c++/boost/process/v2/impl/process_handle.ipp similarity index 100% rename from c++/include/boost/process/v2/impl/process_handle.ipp rename to c++/boost/process/v2/impl/process_handle.ipp diff --git a/c++/include/boost/process/v2/impl/shell.ipp b/c++/boost/process/v2/impl/shell.ipp similarity index 100% rename from c++/include/boost/process/v2/impl/shell.ipp rename to c++/boost/process/v2/impl/shell.ipp diff --git a/c++/include/boost/process/v2/pid.hpp b/c++/boost/process/v2/pid.hpp similarity index 100% rename from c++/include/boost/process/v2/pid.hpp rename to c++/boost/process/v2/pid.hpp diff --git a/c++/include/boost/process/v2/popen.hpp b/c++/boost/process/v2/popen.hpp similarity index 100% rename from c++/include/boost/process/v2/popen.hpp rename to c++/boost/process/v2/popen.hpp diff --git a/c++/include/boost/process/v2/posix/bind_fd.hpp b/c++/boost/process/v2/posix/bind_fd.hpp similarity index 100% rename from c++/include/boost/process/v2/posix/bind_fd.hpp rename to c++/boost/process/v2/posix/bind_fd.hpp diff --git a/c++/include/boost/process/v2/posix/default_launcher.hpp b/c++/boost/process/v2/posix/default_launcher.hpp similarity index 100% rename from c++/include/boost/process/v2/posix/default_launcher.hpp rename to c++/boost/process/v2/posix/default_launcher.hpp diff --git a/c++/include/boost/process/v2/posix/detail/close_handles.hpp b/c++/boost/process/v2/posix/detail/close_handles.hpp similarity index 100% rename from c++/include/boost/process/v2/posix/detail/close_handles.hpp rename to c++/boost/process/v2/posix/detail/close_handles.hpp diff --git a/c++/include/boost/process/v2/posix/detail/close_handles.ipp b/c++/boost/process/v2/posix/detail/close_handles.ipp similarity index 100% rename from c++/include/boost/process/v2/posix/detail/close_handles.ipp rename to c++/boost/process/v2/posix/detail/close_handles.ipp diff --git a/c++/include/boost/process/v2/posix/fork_and_forget_launcher.hpp b/c++/boost/process/v2/posix/fork_and_forget_launcher.hpp similarity index 100% rename from c++/include/boost/process/v2/posix/fork_and_forget_launcher.hpp rename to c++/boost/process/v2/posix/fork_and_forget_launcher.hpp diff --git a/c++/include/boost/process/v2/posix/pdfork_launcher.hpp b/c++/boost/process/v2/posix/pdfork_launcher.hpp similarity index 100% rename from c++/include/boost/process/v2/posix/pdfork_launcher.hpp rename to c++/boost/process/v2/posix/pdfork_launcher.hpp diff --git a/c++/include/boost/process/v2/posix/vfork_launcher.hpp b/c++/boost/process/v2/posix/vfork_launcher.hpp similarity index 100% rename from c++/include/boost/process/v2/posix/vfork_launcher.hpp rename to c++/boost/process/v2/posix/vfork_launcher.hpp diff --git a/c++/include/boost/process/v2/process.hpp b/c++/boost/process/v2/process.hpp similarity index 100% rename from c++/include/boost/process/v2/process.hpp rename to c++/boost/process/v2/process.hpp diff --git a/c++/include/boost/process/v2/process_handle.hpp b/c++/boost/process/v2/process_handle.hpp similarity index 100% rename from c++/include/boost/process/v2/process_handle.hpp rename to c++/boost/process/v2/process_handle.hpp diff --git a/c++/include/boost/process/v2/shell.hpp b/c++/boost/process/v2/shell.hpp similarity index 100% rename from c++/include/boost/process/v2/shell.hpp rename to c++/boost/process/v2/shell.hpp diff --git a/c++/include/boost/process/v2/src.hpp b/c++/boost/process/v2/src.hpp similarity index 100% rename from c++/include/boost/process/v2/src.hpp rename to c++/boost/process/v2/src.hpp diff --git a/c++/include/boost/process/v2/start_dir.hpp b/c++/boost/process/v2/start_dir.hpp similarity index 100% rename from c++/include/boost/process/v2/start_dir.hpp rename to c++/boost/process/v2/start_dir.hpp diff --git a/c++/include/boost/process/v2/stdio.hpp b/c++/boost/process/v2/stdio.hpp similarity index 100% rename from c++/include/boost/process/v2/stdio.hpp rename to c++/boost/process/v2/stdio.hpp diff --git a/c++/include/boost/process/v2/windows/as_user_launcher.hpp b/c++/boost/process/v2/windows/as_user_launcher.hpp similarity index 100% rename from c++/include/boost/process/v2/windows/as_user_launcher.hpp rename to c++/boost/process/v2/windows/as_user_launcher.hpp diff --git a/c++/include/boost/process/v2/windows/creation_flags.hpp b/c++/boost/process/v2/windows/creation_flags.hpp similarity index 100% rename from c++/include/boost/process/v2/windows/creation_flags.hpp rename to c++/boost/process/v2/windows/creation_flags.hpp diff --git a/c++/include/boost/process/v2/windows/default_launcher.hpp b/c++/boost/process/v2/windows/default_launcher.hpp similarity index 100% rename from c++/include/boost/process/v2/windows/default_launcher.hpp rename to c++/boost/process/v2/windows/default_launcher.hpp diff --git a/c++/include/boost/process/v2/windows/impl/default_launcher.ipp b/c++/boost/process/v2/windows/impl/default_launcher.ipp similarity index 100% rename from c++/include/boost/process/v2/windows/impl/default_launcher.ipp rename to c++/boost/process/v2/windows/impl/default_launcher.ipp diff --git a/c++/include/boost/process/v2/windows/show_window.hpp b/c++/boost/process/v2/windows/show_window.hpp similarity index 100% rename from c++/include/boost/process/v2/windows/show_window.hpp rename to c++/boost/process/v2/windows/show_window.hpp diff --git a/c++/include/boost/process/v2/windows/with_logon_launcher.hpp b/c++/boost/process/v2/windows/with_logon_launcher.hpp similarity index 100% rename from c++/include/boost/process/v2/windows/with_logon_launcher.hpp rename to c++/boost/process/v2/windows/with_logon_launcher.hpp diff --git a/c++/include/boost/process/v2/windows/with_token_launcher.hpp b/c++/boost/process/v2/windows/with_token_launcher.hpp similarity index 100% rename from c++/include/boost/process/v2/windows/with_token_launcher.hpp rename to c++/boost/process/v2/windows/with_token_launcher.hpp diff --git a/c++/include/boost/process/windows.hpp b/c++/boost/process/windows.hpp similarity index 100% rename from c++/include/boost/process/windows.hpp rename to c++/boost/process/windows.hpp diff --git a/c++/include/boost/program_options.hpp b/c++/boost/program_options.hpp similarity index 100% rename from c++/include/boost/program_options.hpp rename to c++/boost/program_options.hpp diff --git a/c++/include/boost/progress.hpp b/c++/boost/progress.hpp similarity index 100% rename from c++/include/boost/progress.hpp rename to c++/boost/progress.hpp diff --git a/c++/include/boost/python.hpp b/c++/boost/python.hpp similarity index 100% rename from c++/include/boost/python.hpp rename to c++/boost/python.hpp diff --git a/c++/include/boost/qvm.hpp b/c++/boost/qvm.hpp similarity index 100% rename from c++/include/boost/qvm.hpp rename to c++/boost/qvm.hpp diff --git a/c++/include/boost/qvm_lite.hpp b/c++/boost/qvm_lite.hpp similarity index 100% rename from c++/include/boost/qvm_lite.hpp rename to c++/boost/qvm_lite.hpp diff --git a/c++/include/boost/random.hpp b/c++/boost/random.hpp similarity index 100% rename from c++/include/boost/random.hpp rename to c++/boost/random.hpp diff --git a/c++/include/boost/range.hpp b/c++/boost/range.hpp similarity index 100% rename from c++/include/boost/range.hpp rename to c++/boost/range.hpp diff --git a/c++/include/boost/ratio.hpp b/c++/boost/ratio.hpp similarity index 100% rename from c++/include/boost/ratio.hpp rename to c++/boost/ratio.hpp diff --git a/c++/include/boost/rational.hpp b/c++/boost/rational.hpp similarity index 100% rename from c++/include/boost/rational.hpp rename to c++/boost/rational.hpp diff --git a/c++/include/boost/ref.hpp b/c++/boost/ref.hpp similarity index 100% rename from c++/include/boost/ref.hpp rename to c++/boost/ref.hpp diff --git a/c++/include/boost/regex.h b/c++/boost/regex.h similarity index 100% rename from c++/include/boost/regex.h rename to c++/boost/regex.h diff --git a/c++/include/boost/regex.hpp b/c++/boost/regex.hpp similarity index 100% rename from c++/include/boost/regex.hpp rename to c++/boost/regex.hpp diff --git a/c++/include/boost/regex_fwd.hpp b/c++/boost/regex_fwd.hpp similarity index 100% rename from c++/include/boost/regex_fwd.hpp rename to c++/boost/regex_fwd.hpp diff --git a/c++/include/boost/scope_exit.hpp b/c++/boost/scope_exit.hpp similarity index 100% rename from c++/include/boost/scope_exit.hpp rename to c++/boost/scope_exit.hpp diff --git a/c++/include/boost/scoped_array.hpp b/c++/boost/scoped_array.hpp similarity index 100% rename from c++/include/boost/scoped_array.hpp rename to c++/boost/scoped_array.hpp diff --git a/c++/include/boost/scoped_ptr.hpp b/c++/boost/scoped_ptr.hpp similarity index 100% rename from c++/include/boost/scoped_ptr.hpp rename to c++/boost/scoped_ptr.hpp diff --git a/c++/include/boost/shared_array.hpp b/c++/boost/shared_array.hpp similarity index 100% rename from c++/include/boost/shared_array.hpp rename to c++/boost/shared_array.hpp diff --git a/c++/include/boost/shared_container_iterator.hpp b/c++/boost/shared_container_iterator.hpp similarity index 100% rename from c++/include/boost/shared_container_iterator.hpp rename to c++/boost/shared_container_iterator.hpp diff --git a/c++/include/boost/shared_ptr.hpp b/c++/boost/shared_ptr.hpp similarity index 100% rename from c++/include/boost/shared_ptr.hpp rename to c++/boost/shared_ptr.hpp diff --git a/c++/include/boost/signals2.hpp b/c++/boost/signals2.hpp similarity index 100% rename from c++/include/boost/signals2.hpp rename to c++/boost/signals2.hpp diff --git a/c++/include/boost/smart_ptr.hpp b/c++/boost/smart_ptr.hpp similarity index 100% rename from c++/include/boost/smart_ptr.hpp rename to c++/boost/smart_ptr.hpp diff --git a/c++/include/boost/smart_ptr/allocate_local_shared_array.hpp b/c++/boost/smart_ptr/allocate_local_shared_array.hpp similarity index 100% rename from c++/include/boost/smart_ptr/allocate_local_shared_array.hpp rename to c++/boost/smart_ptr/allocate_local_shared_array.hpp diff --git a/c++/include/boost/smart_ptr/allocate_shared_array.hpp b/c++/boost/smart_ptr/allocate_shared_array.hpp similarity index 100% rename from c++/include/boost/smart_ptr/allocate_shared_array.hpp rename to c++/boost/smart_ptr/allocate_shared_array.hpp diff --git a/c++/include/boost/smart_ptr/allocate_unique.hpp b/c++/boost/smart_ptr/allocate_unique.hpp similarity index 100% rename from c++/include/boost/smart_ptr/allocate_unique.hpp rename to c++/boost/smart_ptr/allocate_unique.hpp diff --git a/c++/include/boost/smart_ptr/atomic_shared_ptr.hpp b/c++/boost/smart_ptr/atomic_shared_ptr.hpp similarity index 100% rename from c++/include/boost/smart_ptr/atomic_shared_ptr.hpp rename to c++/boost/smart_ptr/atomic_shared_ptr.hpp diff --git a/c++/include/boost/smart_ptr/bad_weak_ptr.hpp b/c++/boost/smart_ptr/bad_weak_ptr.hpp similarity index 100% rename from c++/include/boost/smart_ptr/bad_weak_ptr.hpp rename to c++/boost/smart_ptr/bad_weak_ptr.hpp diff --git a/c++/include/boost/smart_ptr/detail/atomic_count.hpp b/c++/boost/smart_ptr/detail/atomic_count.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/atomic_count.hpp rename to c++/boost/smart_ptr/detail/atomic_count.hpp diff --git a/c++/include/boost/smart_ptr/detail/atomic_count_gcc.hpp b/c++/boost/smart_ptr/detail/atomic_count_gcc.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/atomic_count_gcc.hpp rename to c++/boost/smart_ptr/detail/atomic_count_gcc.hpp diff --git a/c++/include/boost/smart_ptr/detail/atomic_count_gcc_atomic.hpp b/c++/boost/smart_ptr/detail/atomic_count_gcc_atomic.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/atomic_count_gcc_atomic.hpp rename to c++/boost/smart_ptr/detail/atomic_count_gcc_atomic.hpp diff --git a/c++/include/boost/smart_ptr/detail/atomic_count_gcc_x86.hpp b/c++/boost/smart_ptr/detail/atomic_count_gcc_x86.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/atomic_count_gcc_x86.hpp rename to c++/boost/smart_ptr/detail/atomic_count_gcc_x86.hpp diff --git a/c++/include/boost/smart_ptr/detail/atomic_count_nt.hpp b/c++/boost/smart_ptr/detail/atomic_count_nt.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/atomic_count_nt.hpp rename to c++/boost/smart_ptr/detail/atomic_count_nt.hpp diff --git a/c++/include/boost/smart_ptr/detail/atomic_count_pt.hpp b/c++/boost/smart_ptr/detail/atomic_count_pt.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/atomic_count_pt.hpp rename to c++/boost/smart_ptr/detail/atomic_count_pt.hpp diff --git a/c++/include/boost/smart_ptr/detail/atomic_count_spin.hpp b/c++/boost/smart_ptr/detail/atomic_count_spin.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/atomic_count_spin.hpp rename to c++/boost/smart_ptr/detail/atomic_count_spin.hpp diff --git a/c++/include/boost/smart_ptr/detail/atomic_count_std_atomic.hpp b/c++/boost/smart_ptr/detail/atomic_count_std_atomic.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/atomic_count_std_atomic.hpp rename to c++/boost/smart_ptr/detail/atomic_count_std_atomic.hpp diff --git a/c++/include/boost/smart_ptr/detail/atomic_count_sync.hpp b/c++/boost/smart_ptr/detail/atomic_count_sync.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/atomic_count_sync.hpp rename to c++/boost/smart_ptr/detail/atomic_count_sync.hpp diff --git a/c++/include/boost/smart_ptr/detail/atomic_count_win32.hpp b/c++/boost/smart_ptr/detail/atomic_count_win32.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/atomic_count_win32.hpp rename to c++/boost/smart_ptr/detail/atomic_count_win32.hpp diff --git a/c++/include/boost/smart_ptr/detail/lightweight_mutex.hpp b/c++/boost/smart_ptr/detail/lightweight_mutex.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/lightweight_mutex.hpp rename to c++/boost/smart_ptr/detail/lightweight_mutex.hpp diff --git a/c++/include/boost/smart_ptr/detail/lightweight_thread.hpp b/c++/boost/smart_ptr/detail/lightweight_thread.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/lightweight_thread.hpp rename to c++/boost/smart_ptr/detail/lightweight_thread.hpp diff --git a/c++/include/boost/smart_ptr/detail/local_counted_base.hpp b/c++/boost/smart_ptr/detail/local_counted_base.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/local_counted_base.hpp rename to c++/boost/smart_ptr/detail/local_counted_base.hpp diff --git a/c++/include/boost/smart_ptr/detail/local_sp_deleter.hpp b/c++/boost/smart_ptr/detail/local_sp_deleter.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/local_sp_deleter.hpp rename to c++/boost/smart_ptr/detail/local_sp_deleter.hpp diff --git a/c++/include/boost/smart_ptr/detail/lwm_pthreads.hpp b/c++/boost/smart_ptr/detail/lwm_pthreads.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/lwm_pthreads.hpp rename to c++/boost/smart_ptr/detail/lwm_pthreads.hpp diff --git a/c++/include/boost/smart_ptr/detail/lwm_std_mutex.hpp b/c++/boost/smart_ptr/detail/lwm_std_mutex.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/lwm_std_mutex.hpp rename to c++/boost/smart_ptr/detail/lwm_std_mutex.hpp diff --git a/c++/include/boost/smart_ptr/detail/lwm_win32_cs.hpp b/c++/boost/smart_ptr/detail/lwm_win32_cs.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/lwm_win32_cs.hpp rename to c++/boost/smart_ptr/detail/lwm_win32_cs.hpp diff --git a/c++/include/boost/smart_ptr/detail/operator_bool.hpp b/c++/boost/smart_ptr/detail/operator_bool.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/operator_bool.hpp rename to c++/boost/smart_ptr/detail/operator_bool.hpp diff --git a/c++/include/boost/smart_ptr/detail/quick_allocator.hpp b/c++/boost/smart_ptr/detail/quick_allocator.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/quick_allocator.hpp rename to c++/boost/smart_ptr/detail/quick_allocator.hpp diff --git a/c++/include/boost/smart_ptr/detail/requires_cxx11.hpp b/c++/boost/smart_ptr/detail/requires_cxx11.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/requires_cxx11.hpp rename to c++/boost/smart_ptr/detail/requires_cxx11.hpp diff --git a/c++/include/boost/smart_ptr/detail/shared_count.hpp b/c++/boost/smart_ptr/detail/shared_count.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/shared_count.hpp rename to c++/boost/smart_ptr/detail/shared_count.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_convertible.hpp b/c++/boost/smart_ptr/detail/sp_convertible.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_convertible.hpp rename to c++/boost/smart_ptr/detail/sp_convertible.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base.hpp b/c++/boost/smart_ptr/detail/sp_counted_base.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_aix.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_aix.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_aix.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_aix.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_gcc_atomic.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_gcc_atomic.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_gcc_atomic.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_gcc_atomic.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_nt.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_nt.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_pt.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_pt.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_pt.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_pt.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_spin.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_spin.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_spin.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_spin.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_sync.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_sync.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_sync.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_sync.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp b/c++/boost/smart_ptr/detail/sp_counted_base_w32.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp rename to c++/boost/smart_ptr/detail/sp_counted_base_w32.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_counted_impl.hpp b/c++/boost/smart_ptr/detail/sp_counted_impl.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_counted_impl.hpp rename to c++/boost/smart_ptr/detail/sp_counted_impl.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_disable_deprecated.hpp b/c++/boost/smart_ptr/detail/sp_disable_deprecated.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_disable_deprecated.hpp rename to c++/boost/smart_ptr/detail/sp_disable_deprecated.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_forward.hpp b/c++/boost/smart_ptr/detail/sp_forward.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_forward.hpp rename to c++/boost/smart_ptr/detail/sp_forward.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp b/c++/boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp rename to c++/boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_has_sync_intrinsics.hpp b/c++/boost/smart_ptr/detail/sp_has_sync_intrinsics.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_has_sync_intrinsics.hpp rename to c++/boost/smart_ptr/detail/sp_has_sync_intrinsics.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_interlocked.hpp b/c++/boost/smart_ptr/detail/sp_interlocked.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_interlocked.hpp rename to c++/boost/smart_ptr/detail/sp_interlocked.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_noexcept.hpp b/c++/boost/smart_ptr/detail/sp_noexcept.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_noexcept.hpp rename to c++/boost/smart_ptr/detail/sp_noexcept.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_nullptr_t.hpp b/c++/boost/smart_ptr/detail/sp_nullptr_t.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_nullptr_t.hpp rename to c++/boost/smart_ptr/detail/sp_nullptr_t.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_obsolete.hpp b/c++/boost/smart_ptr/detail/sp_obsolete.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_obsolete.hpp rename to c++/boost/smart_ptr/detail/sp_obsolete.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_thread_pause.hpp b/c++/boost/smart_ptr/detail/sp_thread_pause.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_thread_pause.hpp rename to c++/boost/smart_ptr/detail/sp_thread_pause.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_thread_sleep.hpp b/c++/boost/smart_ptr/detail/sp_thread_sleep.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_thread_sleep.hpp rename to c++/boost/smart_ptr/detail/sp_thread_sleep.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_thread_yield.hpp b/c++/boost/smart_ptr/detail/sp_thread_yield.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_thread_yield.hpp rename to c++/boost/smart_ptr/detail/sp_thread_yield.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_typeinfo_.hpp b/c++/boost/smart_ptr/detail/sp_typeinfo_.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_typeinfo_.hpp rename to c++/boost/smart_ptr/detail/sp_typeinfo_.hpp diff --git a/c++/include/boost/smart_ptr/detail/sp_win32_sleep.hpp b/c++/boost/smart_ptr/detail/sp_win32_sleep.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/sp_win32_sleep.hpp rename to c++/boost/smart_ptr/detail/sp_win32_sleep.hpp diff --git a/c++/include/boost/smart_ptr/detail/spinlock.hpp b/c++/boost/smart_ptr/detail/spinlock.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/spinlock.hpp rename to c++/boost/smart_ptr/detail/spinlock.hpp diff --git a/c++/include/boost/smart_ptr/detail/spinlock_gcc_arm.hpp b/c++/boost/smart_ptr/detail/spinlock_gcc_arm.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/spinlock_gcc_arm.hpp rename to c++/boost/smart_ptr/detail/spinlock_gcc_arm.hpp diff --git a/c++/include/boost/smart_ptr/detail/spinlock_gcc_atomic.hpp b/c++/boost/smart_ptr/detail/spinlock_gcc_atomic.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/spinlock_gcc_atomic.hpp rename to c++/boost/smart_ptr/detail/spinlock_gcc_atomic.hpp diff --git a/c++/include/boost/smart_ptr/detail/spinlock_nt.hpp b/c++/boost/smart_ptr/detail/spinlock_nt.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/spinlock_nt.hpp rename to c++/boost/smart_ptr/detail/spinlock_nt.hpp diff --git a/c++/include/boost/smart_ptr/detail/spinlock_pool.hpp b/c++/boost/smart_ptr/detail/spinlock_pool.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/spinlock_pool.hpp rename to c++/boost/smart_ptr/detail/spinlock_pool.hpp diff --git a/c++/include/boost/smart_ptr/detail/spinlock_pt.hpp b/c++/boost/smart_ptr/detail/spinlock_pt.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/spinlock_pt.hpp rename to c++/boost/smart_ptr/detail/spinlock_pt.hpp diff --git a/c++/include/boost/smart_ptr/detail/spinlock_std_atomic.hpp b/c++/boost/smart_ptr/detail/spinlock_std_atomic.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/spinlock_std_atomic.hpp rename to c++/boost/smart_ptr/detail/spinlock_std_atomic.hpp diff --git a/c++/include/boost/smart_ptr/detail/spinlock_sync.hpp b/c++/boost/smart_ptr/detail/spinlock_sync.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/spinlock_sync.hpp rename to c++/boost/smart_ptr/detail/spinlock_sync.hpp diff --git a/c++/include/boost/smart_ptr/detail/spinlock_w32.hpp b/c++/boost/smart_ptr/detail/spinlock_w32.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/spinlock_w32.hpp rename to c++/boost/smart_ptr/detail/spinlock_w32.hpp diff --git a/c++/include/boost/smart_ptr/detail/yield_k.hpp b/c++/boost/smart_ptr/detail/yield_k.hpp similarity index 100% rename from c++/include/boost/smart_ptr/detail/yield_k.hpp rename to c++/boost/smart_ptr/detail/yield_k.hpp diff --git a/c++/include/boost/smart_ptr/enable_shared_from.hpp b/c++/boost/smart_ptr/enable_shared_from.hpp similarity index 100% rename from c++/include/boost/smart_ptr/enable_shared_from.hpp rename to c++/boost/smart_ptr/enable_shared_from.hpp diff --git a/c++/include/boost/smart_ptr/enable_shared_from_raw.hpp b/c++/boost/smart_ptr/enable_shared_from_raw.hpp similarity index 100% rename from c++/include/boost/smart_ptr/enable_shared_from_raw.hpp rename to c++/boost/smart_ptr/enable_shared_from_raw.hpp diff --git a/c++/include/boost/smart_ptr/enable_shared_from_this.hpp b/c++/boost/smart_ptr/enable_shared_from_this.hpp similarity index 100% rename from c++/include/boost/smart_ptr/enable_shared_from_this.hpp rename to c++/boost/smart_ptr/enable_shared_from_this.hpp diff --git a/c++/include/boost/smart_ptr/intrusive_ptr.hpp b/c++/boost/smart_ptr/intrusive_ptr.hpp similarity index 100% rename from c++/include/boost/smart_ptr/intrusive_ptr.hpp rename to c++/boost/smart_ptr/intrusive_ptr.hpp diff --git a/c++/include/boost/smart_ptr/intrusive_ref_counter.hpp b/c++/boost/smart_ptr/intrusive_ref_counter.hpp similarity index 100% rename from c++/include/boost/smart_ptr/intrusive_ref_counter.hpp rename to c++/boost/smart_ptr/intrusive_ref_counter.hpp diff --git a/c++/include/boost/smart_ptr/local_shared_ptr.hpp b/c++/boost/smart_ptr/local_shared_ptr.hpp similarity index 100% rename from c++/include/boost/smart_ptr/local_shared_ptr.hpp rename to c++/boost/smart_ptr/local_shared_ptr.hpp diff --git a/c++/include/boost/smart_ptr/make_local_shared.hpp b/c++/boost/smart_ptr/make_local_shared.hpp similarity index 100% rename from c++/include/boost/smart_ptr/make_local_shared.hpp rename to c++/boost/smart_ptr/make_local_shared.hpp diff --git a/c++/include/boost/smart_ptr/make_local_shared_array.hpp b/c++/boost/smart_ptr/make_local_shared_array.hpp similarity index 100% rename from c++/include/boost/smart_ptr/make_local_shared_array.hpp rename to c++/boost/smart_ptr/make_local_shared_array.hpp diff --git a/c++/include/boost/smart_ptr/make_local_shared_object.hpp b/c++/boost/smart_ptr/make_local_shared_object.hpp similarity index 100% rename from c++/include/boost/smart_ptr/make_local_shared_object.hpp rename to c++/boost/smart_ptr/make_local_shared_object.hpp diff --git a/c++/include/boost/smart_ptr/make_shared.hpp b/c++/boost/smart_ptr/make_shared.hpp similarity index 100% rename from c++/include/boost/smart_ptr/make_shared.hpp rename to c++/boost/smart_ptr/make_shared.hpp diff --git a/c++/include/boost/smart_ptr/make_shared_array.hpp b/c++/boost/smart_ptr/make_shared_array.hpp similarity index 100% rename from c++/include/boost/smart_ptr/make_shared_array.hpp rename to c++/boost/smart_ptr/make_shared_array.hpp diff --git a/c++/include/boost/smart_ptr/make_shared_object.hpp b/c++/boost/smart_ptr/make_shared_object.hpp similarity index 100% rename from c++/include/boost/smart_ptr/make_shared_object.hpp rename to c++/boost/smart_ptr/make_shared_object.hpp diff --git a/c++/include/boost/smart_ptr/make_unique.hpp b/c++/boost/smart_ptr/make_unique.hpp similarity index 100% rename from c++/include/boost/smart_ptr/make_unique.hpp rename to c++/boost/smart_ptr/make_unique.hpp diff --git a/c++/include/boost/smart_ptr/owner_equal_to.hpp b/c++/boost/smart_ptr/owner_equal_to.hpp similarity index 100% rename from c++/include/boost/smart_ptr/owner_equal_to.hpp rename to c++/boost/smart_ptr/owner_equal_to.hpp diff --git a/c++/include/boost/smart_ptr/owner_hash.hpp b/c++/boost/smart_ptr/owner_hash.hpp similarity index 100% rename from c++/include/boost/smart_ptr/owner_hash.hpp rename to c++/boost/smart_ptr/owner_hash.hpp diff --git a/c++/include/boost/smart_ptr/owner_less.hpp b/c++/boost/smart_ptr/owner_less.hpp similarity index 100% rename from c++/include/boost/smart_ptr/owner_less.hpp rename to c++/boost/smart_ptr/owner_less.hpp diff --git a/c++/include/boost/smart_ptr/scoped_array.hpp b/c++/boost/smart_ptr/scoped_array.hpp similarity index 100% rename from c++/include/boost/smart_ptr/scoped_array.hpp rename to c++/boost/smart_ptr/scoped_array.hpp diff --git a/c++/include/boost/smart_ptr/scoped_ptr.hpp b/c++/boost/smart_ptr/scoped_ptr.hpp similarity index 100% rename from c++/include/boost/smart_ptr/scoped_ptr.hpp rename to c++/boost/smart_ptr/scoped_ptr.hpp diff --git a/c++/include/boost/smart_ptr/shared_array.hpp b/c++/boost/smart_ptr/shared_array.hpp similarity index 100% rename from c++/include/boost/smart_ptr/shared_array.hpp rename to c++/boost/smart_ptr/shared_array.hpp diff --git a/c++/include/boost/smart_ptr/shared_ptr.hpp b/c++/boost/smart_ptr/shared_ptr.hpp similarity index 100% rename from c++/include/boost/smart_ptr/shared_ptr.hpp rename to c++/boost/smart_ptr/shared_ptr.hpp diff --git a/c++/include/boost/smart_ptr/weak_ptr.hpp b/c++/boost/smart_ptr/weak_ptr.hpp similarity index 100% rename from c++/include/boost/smart_ptr/weak_ptr.hpp rename to c++/boost/smart_ptr/weak_ptr.hpp diff --git a/c++/include/boost/spirit.hpp b/c++/boost/spirit.hpp similarity index 100% rename from c++/include/boost/spirit.hpp rename to c++/boost/spirit.hpp diff --git a/c++/include/boost/stacktrace.hpp b/c++/boost/stacktrace.hpp similarity index 100% rename from c++/include/boost/stacktrace.hpp rename to c++/boost/stacktrace.hpp diff --git a/c++/include/boost/static_assert.hpp b/c++/boost/static_assert.hpp similarity index 100% rename from c++/include/boost/static_assert.hpp rename to c++/boost/static_assert.hpp diff --git a/c++/include/boost/static_string.hpp b/c++/boost/static_string.hpp similarity index 100% rename from c++/include/boost/static_string.hpp rename to c++/boost/static_string.hpp diff --git a/c++/include/boost/static_string/config.hpp b/c++/boost/static_string/config.hpp similarity index 100% rename from c++/include/boost/static_string/config.hpp rename to c++/boost/static_string/config.hpp diff --git a/c++/include/boost/static_string/static_string.hpp b/c++/boost/static_string/static_string.hpp similarity index 100% rename from c++/include/boost/static_string/static_string.hpp rename to c++/boost/static_string/static_string.hpp diff --git a/c++/include/boost/swap.hpp b/c++/boost/swap.hpp similarity index 100% rename from c++/include/boost/swap.hpp rename to c++/boost/swap.hpp diff --git a/c++/include/boost/system.hpp b/c++/boost/system.hpp similarity index 100% rename from c++/include/boost/system.hpp rename to c++/boost/system.hpp diff --git a/c++/include/boost/system/api_config.hpp b/c++/boost/system/api_config.hpp similarity index 100% rename from c++/include/boost/system/api_config.hpp rename to c++/boost/system/api_config.hpp diff --git a/c++/include/boost/system/config.hpp b/c++/boost/system/config.hpp similarity index 100% rename from c++/include/boost/system/config.hpp rename to c++/boost/system/config.hpp diff --git a/c++/include/boost/system/cygwin_error.hpp b/c++/boost/system/cygwin_error.hpp similarity index 100% rename from c++/include/boost/system/cygwin_error.hpp rename to c++/boost/system/cygwin_error.hpp diff --git a/c++/include/boost/system/detail/append_int.hpp b/c++/boost/system/detail/append_int.hpp similarity index 100% rename from c++/include/boost/system/detail/append_int.hpp rename to c++/boost/system/detail/append_int.hpp diff --git a/c++/include/boost/system/detail/cerrno.hpp b/c++/boost/system/detail/cerrno.hpp similarity index 100% rename from c++/include/boost/system/detail/cerrno.hpp rename to c++/boost/system/detail/cerrno.hpp diff --git a/c++/include/boost/system/detail/config.hpp b/c++/boost/system/detail/config.hpp similarity index 100% rename from c++/include/boost/system/detail/config.hpp rename to c++/boost/system/detail/config.hpp diff --git a/c++/include/boost/system/detail/enable_if.hpp b/c++/boost/system/detail/enable_if.hpp similarity index 100% rename from c++/include/boost/system/detail/enable_if.hpp rename to c++/boost/system/detail/enable_if.hpp diff --git a/c++/include/boost/system/detail/errc.hpp b/c++/boost/system/detail/errc.hpp similarity index 100% rename from c++/include/boost/system/detail/errc.hpp rename to c++/boost/system/detail/errc.hpp diff --git a/c++/include/boost/system/detail/error_category.hpp b/c++/boost/system/detail/error_category.hpp similarity index 100% rename from c++/include/boost/system/detail/error_category.hpp rename to c++/boost/system/detail/error_category.hpp diff --git a/c++/include/boost/system/detail/error_category_impl.hpp b/c++/boost/system/detail/error_category_impl.hpp similarity index 100% rename from c++/include/boost/system/detail/error_category_impl.hpp rename to c++/boost/system/detail/error_category_impl.hpp diff --git a/c++/include/boost/system/detail/error_code.hpp b/c++/boost/system/detail/error_code.hpp similarity index 100% rename from c++/include/boost/system/detail/error_code.hpp rename to c++/boost/system/detail/error_code.hpp diff --git a/c++/include/boost/system/detail/error_condition.hpp b/c++/boost/system/detail/error_condition.hpp similarity index 100% rename from c++/include/boost/system/detail/error_condition.hpp rename to c++/boost/system/detail/error_condition.hpp diff --git a/c++/include/boost/system/detail/generic_category.hpp b/c++/boost/system/detail/generic_category.hpp similarity index 100% rename from c++/include/boost/system/detail/generic_category.hpp rename to c++/boost/system/detail/generic_category.hpp diff --git a/c++/include/boost/system/detail/generic_category_message.hpp b/c++/boost/system/detail/generic_category_message.hpp similarity index 100% rename from c++/include/boost/system/detail/generic_category_message.hpp rename to c++/boost/system/detail/generic_category_message.hpp diff --git a/c++/include/boost/system/detail/interop_category.hpp b/c++/boost/system/detail/interop_category.hpp similarity index 100% rename from c++/include/boost/system/detail/interop_category.hpp rename to c++/boost/system/detail/interop_category.hpp diff --git a/c++/include/boost/system/detail/is_same.hpp b/c++/boost/system/detail/is_same.hpp similarity index 100% rename from c++/include/boost/system/detail/is_same.hpp rename to c++/boost/system/detail/is_same.hpp diff --git a/c++/include/boost/system/detail/mutex.hpp b/c++/boost/system/detail/mutex.hpp similarity index 100% rename from c++/include/boost/system/detail/mutex.hpp rename to c++/boost/system/detail/mutex.hpp diff --git a/c++/include/boost/system/detail/requires_cxx11.hpp b/c++/boost/system/detail/requires_cxx11.hpp similarity index 100% rename from c++/include/boost/system/detail/requires_cxx11.hpp rename to c++/boost/system/detail/requires_cxx11.hpp diff --git a/c++/include/boost/system/detail/snprintf.hpp b/c++/boost/system/detail/snprintf.hpp similarity index 100% rename from c++/include/boost/system/detail/snprintf.hpp rename to c++/boost/system/detail/snprintf.hpp diff --git a/c++/include/boost/system/detail/std_category.hpp b/c++/boost/system/detail/std_category.hpp similarity index 100% rename from c++/include/boost/system/detail/std_category.hpp rename to c++/boost/system/detail/std_category.hpp diff --git a/c++/include/boost/system/detail/std_category_impl.hpp b/c++/boost/system/detail/std_category_impl.hpp similarity index 100% rename from c++/include/boost/system/detail/std_category_impl.hpp rename to c++/boost/system/detail/std_category_impl.hpp diff --git a/c++/include/boost/system/detail/system_category.hpp b/c++/boost/system/detail/system_category.hpp similarity index 100% rename from c++/include/boost/system/detail/system_category.hpp rename to c++/boost/system/detail/system_category.hpp diff --git a/c++/include/boost/system/detail/system_category_condition_win32.hpp b/c++/boost/system/detail/system_category_condition_win32.hpp similarity index 100% rename from c++/include/boost/system/detail/system_category_condition_win32.hpp rename to c++/boost/system/detail/system_category_condition_win32.hpp diff --git a/c++/include/boost/system/detail/system_category_impl.hpp b/c++/boost/system/detail/system_category_impl.hpp similarity index 100% rename from c++/include/boost/system/detail/system_category_impl.hpp rename to c++/boost/system/detail/system_category_impl.hpp diff --git a/c++/include/boost/system/detail/system_category_message.hpp b/c++/boost/system/detail/system_category_message.hpp similarity index 100% rename from c++/include/boost/system/detail/system_category_message.hpp rename to c++/boost/system/detail/system_category_message.hpp diff --git a/c++/include/boost/system/detail/system_category_message_win32.hpp b/c++/boost/system/detail/system_category_message_win32.hpp similarity index 100% rename from c++/include/boost/system/detail/system_category_message_win32.hpp rename to c++/boost/system/detail/system_category_message_win32.hpp diff --git a/c++/include/boost/system/detail/throws.hpp b/c++/boost/system/detail/throws.hpp similarity index 100% rename from c++/include/boost/system/detail/throws.hpp rename to c++/boost/system/detail/throws.hpp diff --git a/c++/include/boost/system/errc.hpp b/c++/boost/system/errc.hpp similarity index 100% rename from c++/include/boost/system/errc.hpp rename to c++/boost/system/errc.hpp diff --git a/c++/include/boost/system/error_category.hpp b/c++/boost/system/error_category.hpp similarity index 100% rename from c++/include/boost/system/error_category.hpp rename to c++/boost/system/error_category.hpp diff --git a/c++/include/boost/system/error_code.hpp b/c++/boost/system/error_code.hpp similarity index 100% rename from c++/include/boost/system/error_code.hpp rename to c++/boost/system/error_code.hpp diff --git a/c++/include/boost/system/error_condition.hpp b/c++/boost/system/error_condition.hpp similarity index 100% rename from c++/include/boost/system/error_condition.hpp rename to c++/boost/system/error_condition.hpp diff --git a/c++/include/boost/system/generic_category.hpp b/c++/boost/system/generic_category.hpp similarity index 100% rename from c++/include/boost/system/generic_category.hpp rename to c++/boost/system/generic_category.hpp diff --git a/c++/include/boost/system/is_error_code_enum.hpp b/c++/boost/system/is_error_code_enum.hpp similarity index 100% rename from c++/include/boost/system/is_error_code_enum.hpp rename to c++/boost/system/is_error_code_enum.hpp diff --git a/c++/include/boost/system/is_error_condition_enum.hpp b/c++/boost/system/is_error_condition_enum.hpp similarity index 100% rename from c++/include/boost/system/is_error_condition_enum.hpp rename to c++/boost/system/is_error_condition_enum.hpp diff --git a/c++/include/boost/system/linux_error.hpp b/c++/boost/system/linux_error.hpp similarity index 100% rename from c++/include/boost/system/linux_error.hpp rename to c++/boost/system/linux_error.hpp diff --git a/c++/include/boost/system/result.hpp b/c++/boost/system/result.hpp similarity index 100% rename from c++/include/boost/system/result.hpp rename to c++/boost/system/result.hpp diff --git a/c++/include/boost/system/system_category.hpp b/c++/boost/system/system_category.hpp similarity index 100% rename from c++/include/boost/system/system_category.hpp rename to c++/boost/system/system_category.hpp diff --git a/c++/include/boost/system/system_error.hpp b/c++/boost/system/system_error.hpp similarity index 100% rename from c++/include/boost/system/system_error.hpp rename to c++/boost/system/system_error.hpp diff --git a/c++/include/boost/system/windows_error.hpp b/c++/boost/system/windows_error.hpp similarity index 100% rename from c++/include/boost/system/windows_error.hpp rename to c++/boost/system/windows_error.hpp diff --git a/c++/include/boost/thread.hpp b/c++/boost/thread.hpp similarity index 100% rename from c++/include/boost/thread.hpp rename to c++/boost/thread.hpp diff --git a/c++/include/boost/throw_exception.hpp b/c++/boost/throw_exception.hpp similarity index 100% rename from c++/include/boost/throw_exception.hpp rename to c++/boost/throw_exception.hpp diff --git a/c++/include/boost/timer.hpp b/c++/boost/timer.hpp similarity index 100% rename from c++/include/boost/timer.hpp rename to c++/boost/timer.hpp diff --git a/c++/include/boost/token_functions.hpp b/c++/boost/token_functions.hpp similarity index 100% rename from c++/include/boost/token_functions.hpp rename to c++/boost/token_functions.hpp diff --git a/c++/include/boost/token_iterator.hpp b/c++/boost/token_iterator.hpp similarity index 100% rename from c++/include/boost/token_iterator.hpp rename to c++/boost/token_iterator.hpp diff --git a/c++/include/boost/tokenizer.hpp b/c++/boost/tokenizer.hpp similarity index 100% rename from c++/include/boost/tokenizer.hpp rename to c++/boost/tokenizer.hpp diff --git a/c++/include/boost/type.hpp b/c++/boost/type.hpp similarity index 100% rename from c++/include/boost/type.hpp rename to c++/boost/type.hpp diff --git a/c++/include/boost/type_index.hpp b/c++/boost/type_index.hpp similarity index 100% rename from c++/include/boost/type_index.hpp rename to c++/boost/type_index.hpp diff --git a/c++/include/boost/type_traits.hpp b/c++/boost/type_traits.hpp similarity index 100% rename from c++/include/boost/type_traits.hpp rename to c++/boost/type_traits.hpp diff --git a/c++/include/boost/type_traits/add_const.hpp b/c++/boost/type_traits/add_const.hpp similarity index 100% rename from c++/include/boost/type_traits/add_const.hpp rename to c++/boost/type_traits/add_const.hpp diff --git a/c++/include/boost/type_traits/add_cv.hpp b/c++/boost/type_traits/add_cv.hpp similarity index 100% rename from c++/include/boost/type_traits/add_cv.hpp rename to c++/boost/type_traits/add_cv.hpp diff --git a/c++/include/boost/type_traits/add_lvalue_reference.hpp b/c++/boost/type_traits/add_lvalue_reference.hpp similarity index 100% rename from c++/include/boost/type_traits/add_lvalue_reference.hpp rename to c++/boost/type_traits/add_lvalue_reference.hpp diff --git a/c++/include/boost/type_traits/add_pointer.hpp b/c++/boost/type_traits/add_pointer.hpp similarity index 100% rename from c++/include/boost/type_traits/add_pointer.hpp rename to c++/boost/type_traits/add_pointer.hpp diff --git a/c++/include/boost/type_traits/add_reference.hpp b/c++/boost/type_traits/add_reference.hpp similarity index 100% rename from c++/include/boost/type_traits/add_reference.hpp rename to c++/boost/type_traits/add_reference.hpp diff --git a/c++/include/boost/type_traits/add_rvalue_reference.hpp b/c++/boost/type_traits/add_rvalue_reference.hpp similarity index 100% rename from c++/include/boost/type_traits/add_rvalue_reference.hpp rename to c++/boost/type_traits/add_rvalue_reference.hpp diff --git a/c++/include/boost/type_traits/add_volatile.hpp b/c++/boost/type_traits/add_volatile.hpp similarity index 100% rename from c++/include/boost/type_traits/add_volatile.hpp rename to c++/boost/type_traits/add_volatile.hpp diff --git a/c++/include/boost/type_traits/aligned_storage.hpp b/c++/boost/type_traits/aligned_storage.hpp similarity index 100% rename from c++/include/boost/type_traits/aligned_storage.hpp rename to c++/boost/type_traits/aligned_storage.hpp diff --git a/c++/include/boost/type_traits/alignment_of.hpp b/c++/boost/type_traits/alignment_of.hpp similarity index 100% rename from c++/include/boost/type_traits/alignment_of.hpp rename to c++/boost/type_traits/alignment_of.hpp diff --git a/c++/include/boost/type_traits/alignment_traits.hpp b/c++/boost/type_traits/alignment_traits.hpp similarity index 100% rename from c++/include/boost/type_traits/alignment_traits.hpp rename to c++/boost/type_traits/alignment_traits.hpp diff --git a/c++/include/boost/type_traits/arithmetic_traits.hpp b/c++/boost/type_traits/arithmetic_traits.hpp similarity index 100% rename from c++/include/boost/type_traits/arithmetic_traits.hpp rename to c++/boost/type_traits/arithmetic_traits.hpp diff --git a/c++/include/boost/type_traits/array_traits.hpp b/c++/boost/type_traits/array_traits.hpp similarity index 100% rename from c++/include/boost/type_traits/array_traits.hpp rename to c++/boost/type_traits/array_traits.hpp diff --git a/c++/include/boost/type_traits/broken_compiler_spec.hpp b/c++/boost/type_traits/broken_compiler_spec.hpp similarity index 100% rename from c++/include/boost/type_traits/broken_compiler_spec.hpp rename to c++/boost/type_traits/broken_compiler_spec.hpp diff --git a/c++/include/boost/type_traits/common_type.hpp b/c++/boost/type_traits/common_type.hpp similarity index 100% rename from c++/include/boost/type_traits/common_type.hpp rename to c++/boost/type_traits/common_type.hpp diff --git a/c++/include/boost/type_traits/composite_traits.hpp b/c++/boost/type_traits/composite_traits.hpp similarity index 100% rename from c++/include/boost/type_traits/composite_traits.hpp rename to c++/boost/type_traits/composite_traits.hpp diff --git a/c++/include/boost/type_traits/conditional.hpp b/c++/boost/type_traits/conditional.hpp similarity index 100% rename from c++/include/boost/type_traits/conditional.hpp rename to c++/boost/type_traits/conditional.hpp diff --git a/c++/include/boost/type_traits/config.hpp b/c++/boost/type_traits/config.hpp similarity index 100% rename from c++/include/boost/type_traits/config.hpp rename to c++/boost/type_traits/config.hpp diff --git a/c++/include/boost/type_traits/conjunction.hpp b/c++/boost/type_traits/conjunction.hpp similarity index 100% rename from c++/include/boost/type_traits/conjunction.hpp rename to c++/boost/type_traits/conjunction.hpp diff --git a/c++/include/boost/type_traits/conversion_traits.hpp b/c++/boost/type_traits/conversion_traits.hpp similarity index 100% rename from c++/include/boost/type_traits/conversion_traits.hpp rename to c++/boost/type_traits/conversion_traits.hpp diff --git a/c++/include/boost/type_traits/copy_cv.hpp b/c++/boost/type_traits/copy_cv.hpp similarity index 100% rename from c++/include/boost/type_traits/copy_cv.hpp rename to c++/boost/type_traits/copy_cv.hpp diff --git a/c++/include/boost/type_traits/copy_cv_ref.hpp b/c++/boost/type_traits/copy_cv_ref.hpp similarity index 100% rename from c++/include/boost/type_traits/copy_cv_ref.hpp rename to c++/boost/type_traits/copy_cv_ref.hpp diff --git a/c++/include/boost/type_traits/copy_reference.hpp b/c++/boost/type_traits/copy_reference.hpp similarity index 100% rename from c++/include/boost/type_traits/copy_reference.hpp rename to c++/boost/type_traits/copy_reference.hpp diff --git a/c++/include/boost/type_traits/cv_traits.hpp b/c++/boost/type_traits/cv_traits.hpp similarity index 100% rename from c++/include/boost/type_traits/cv_traits.hpp rename to c++/boost/type_traits/cv_traits.hpp diff --git a/c++/include/boost/type_traits/decay.hpp b/c++/boost/type_traits/decay.hpp similarity index 100% rename from c++/include/boost/type_traits/decay.hpp rename to c++/boost/type_traits/decay.hpp diff --git a/c++/include/boost/type_traits/declval.hpp b/c++/boost/type_traits/declval.hpp similarity index 100% rename from c++/include/boost/type_traits/declval.hpp rename to c++/boost/type_traits/declval.hpp diff --git a/c++/include/boost/type_traits/detail/bool_trait_def.hpp b/c++/boost/type_traits/detail/bool_trait_def.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/bool_trait_def.hpp rename to c++/boost/type_traits/detail/bool_trait_def.hpp diff --git a/c++/include/boost/type_traits/detail/bool_trait_undef.hpp b/c++/boost/type_traits/detail/bool_trait_undef.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/bool_trait_undef.hpp rename to c++/boost/type_traits/detail/bool_trait_undef.hpp diff --git a/c++/include/boost/type_traits/detail/common_arithmetic_type.hpp b/c++/boost/type_traits/detail/common_arithmetic_type.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/common_arithmetic_type.hpp rename to c++/boost/type_traits/detail/common_arithmetic_type.hpp diff --git a/c++/include/boost/type_traits/detail/common_type_impl.hpp b/c++/boost/type_traits/detail/common_type_impl.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/common_type_impl.hpp rename to c++/boost/type_traits/detail/common_type_impl.hpp diff --git a/c++/include/boost/type_traits/detail/composite_member_pointer_type.hpp b/c++/boost/type_traits/detail/composite_member_pointer_type.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/composite_member_pointer_type.hpp rename to c++/boost/type_traits/detail/composite_member_pointer_type.hpp diff --git a/c++/include/boost/type_traits/detail/composite_pointer_type.hpp b/c++/boost/type_traits/detail/composite_pointer_type.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/composite_pointer_type.hpp rename to c++/boost/type_traits/detail/composite_pointer_type.hpp diff --git a/c++/include/boost/type_traits/detail/config.hpp b/c++/boost/type_traits/detail/config.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/config.hpp rename to c++/boost/type_traits/detail/config.hpp diff --git a/c++/include/boost/type_traits/detail/detector.hpp b/c++/boost/type_traits/detail/detector.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/detector.hpp rename to c++/boost/type_traits/detail/detector.hpp diff --git a/c++/include/boost/type_traits/detail/has_binary_operator.hpp b/c++/boost/type_traits/detail/has_binary_operator.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/has_binary_operator.hpp rename to c++/boost/type_traits/detail/has_binary_operator.hpp diff --git a/c++/include/boost/type_traits/detail/has_postfix_operator.hpp b/c++/boost/type_traits/detail/has_postfix_operator.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/has_postfix_operator.hpp rename to c++/boost/type_traits/detail/has_postfix_operator.hpp diff --git a/c++/include/boost/type_traits/detail/has_prefix_operator.hpp b/c++/boost/type_traits/detail/has_prefix_operator.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/has_prefix_operator.hpp rename to c++/boost/type_traits/detail/has_prefix_operator.hpp diff --git a/c++/include/boost/type_traits/detail/ice_and.hpp b/c++/boost/type_traits/detail/ice_and.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/ice_and.hpp rename to c++/boost/type_traits/detail/ice_and.hpp diff --git a/c++/include/boost/type_traits/detail/ice_eq.hpp b/c++/boost/type_traits/detail/ice_eq.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/ice_eq.hpp rename to c++/boost/type_traits/detail/ice_eq.hpp diff --git a/c++/include/boost/type_traits/detail/ice_not.hpp b/c++/boost/type_traits/detail/ice_not.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/ice_not.hpp rename to c++/boost/type_traits/detail/ice_not.hpp diff --git a/c++/include/boost/type_traits/detail/ice_or.hpp b/c++/boost/type_traits/detail/ice_or.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/ice_or.hpp rename to c++/boost/type_traits/detail/ice_or.hpp diff --git a/c++/include/boost/type_traits/detail/is_function_cxx_03.hpp b/c++/boost/type_traits/detail/is_function_cxx_03.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/is_function_cxx_03.hpp rename to c++/boost/type_traits/detail/is_function_cxx_03.hpp diff --git a/c++/include/boost/type_traits/detail/is_function_cxx_11.hpp b/c++/boost/type_traits/detail/is_function_cxx_11.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/is_function_cxx_11.hpp rename to c++/boost/type_traits/detail/is_function_cxx_11.hpp diff --git a/c++/include/boost/type_traits/detail/is_function_msvc10_fix.hpp b/c++/boost/type_traits/detail/is_function_msvc10_fix.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/is_function_msvc10_fix.hpp rename to c++/boost/type_traits/detail/is_function_msvc10_fix.hpp diff --git a/c++/include/boost/type_traits/detail/is_function_ptr_helper.hpp b/c++/boost/type_traits/detail/is_function_ptr_helper.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/is_function_ptr_helper.hpp rename to c++/boost/type_traits/detail/is_function_ptr_helper.hpp diff --git a/c++/include/boost/type_traits/detail/is_function_ptr_tester.hpp b/c++/boost/type_traits/detail/is_function_ptr_tester.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/is_function_ptr_tester.hpp rename to c++/boost/type_traits/detail/is_function_ptr_tester.hpp diff --git a/c++/include/boost/type_traits/detail/is_likely_lambda.hpp b/c++/boost/type_traits/detail/is_likely_lambda.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/is_likely_lambda.hpp rename to c++/boost/type_traits/detail/is_likely_lambda.hpp diff --git a/c++/include/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp b/c++/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp rename to c++/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp diff --git a/c++/include/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp b/c++/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp rename to c++/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp diff --git a/c++/include/boost/type_traits/detail/is_member_function_pointer_cxx_03.hpp b/c++/boost/type_traits/detail/is_member_function_pointer_cxx_03.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/is_member_function_pointer_cxx_03.hpp rename to c++/boost/type_traits/detail/is_member_function_pointer_cxx_03.hpp diff --git a/c++/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp b/c++/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp rename to c++/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp diff --git a/c++/include/boost/type_traits/detail/is_rvalue_reference_msvc10_fix.hpp b/c++/boost/type_traits/detail/is_rvalue_reference_msvc10_fix.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/is_rvalue_reference_msvc10_fix.hpp rename to c++/boost/type_traits/detail/is_rvalue_reference_msvc10_fix.hpp diff --git a/c++/include/boost/type_traits/detail/is_swappable_cxx_11.hpp b/c++/boost/type_traits/detail/is_swappable_cxx_11.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/is_swappable_cxx_11.hpp rename to c++/boost/type_traits/detail/is_swappable_cxx_11.hpp diff --git a/c++/include/boost/type_traits/detail/mp_defer.hpp b/c++/boost/type_traits/detail/mp_defer.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/mp_defer.hpp rename to c++/boost/type_traits/detail/mp_defer.hpp diff --git a/c++/include/boost/type_traits/detail/template_arity_spec.hpp b/c++/boost/type_traits/detail/template_arity_spec.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/template_arity_spec.hpp rename to c++/boost/type_traits/detail/template_arity_spec.hpp diff --git a/c++/include/boost/type_traits/detail/yes_no_type.hpp b/c++/boost/type_traits/detail/yes_no_type.hpp similarity index 100% rename from c++/include/boost/type_traits/detail/yes_no_type.hpp rename to c++/boost/type_traits/detail/yes_no_type.hpp diff --git a/c++/include/boost/type_traits/detected.hpp b/c++/boost/type_traits/detected.hpp similarity index 100% rename from c++/include/boost/type_traits/detected.hpp rename to c++/boost/type_traits/detected.hpp diff --git a/c++/include/boost/type_traits/detected_or.hpp b/c++/boost/type_traits/detected_or.hpp similarity index 100% rename from c++/include/boost/type_traits/detected_or.hpp rename to c++/boost/type_traits/detected_or.hpp diff --git a/c++/include/boost/type_traits/disjunction.hpp b/c++/boost/type_traits/disjunction.hpp similarity index 100% rename from c++/include/boost/type_traits/disjunction.hpp rename to c++/boost/type_traits/disjunction.hpp diff --git a/c++/include/boost/type_traits/enable_if.hpp b/c++/boost/type_traits/enable_if.hpp similarity index 100% rename from c++/include/boost/type_traits/enable_if.hpp rename to c++/boost/type_traits/enable_if.hpp diff --git a/c++/include/boost/type_traits/extent.hpp b/c++/boost/type_traits/extent.hpp similarity index 100% rename from c++/include/boost/type_traits/extent.hpp rename to c++/boost/type_traits/extent.hpp diff --git a/c++/include/boost/type_traits/floating_point_promotion.hpp b/c++/boost/type_traits/floating_point_promotion.hpp similarity index 100% rename from c++/include/boost/type_traits/floating_point_promotion.hpp rename to c++/boost/type_traits/floating_point_promotion.hpp diff --git a/c++/include/boost/type_traits/function_traits.hpp b/c++/boost/type_traits/function_traits.hpp similarity index 100% rename from c++/include/boost/type_traits/function_traits.hpp rename to c++/boost/type_traits/function_traits.hpp diff --git a/c++/include/boost/type_traits/has_bit_and.hpp b/c++/boost/type_traits/has_bit_and.hpp similarity index 100% rename from c++/include/boost/type_traits/has_bit_and.hpp rename to c++/boost/type_traits/has_bit_and.hpp diff --git a/c++/include/boost/type_traits/has_bit_and_assign.hpp b/c++/boost/type_traits/has_bit_and_assign.hpp similarity index 100% rename from c++/include/boost/type_traits/has_bit_and_assign.hpp rename to c++/boost/type_traits/has_bit_and_assign.hpp diff --git a/c++/include/boost/type_traits/has_bit_or.hpp b/c++/boost/type_traits/has_bit_or.hpp similarity index 100% rename from c++/include/boost/type_traits/has_bit_or.hpp rename to c++/boost/type_traits/has_bit_or.hpp diff --git a/c++/include/boost/type_traits/has_bit_or_assign.hpp b/c++/boost/type_traits/has_bit_or_assign.hpp similarity index 100% rename from c++/include/boost/type_traits/has_bit_or_assign.hpp rename to c++/boost/type_traits/has_bit_or_assign.hpp diff --git a/c++/include/boost/type_traits/has_bit_xor.hpp b/c++/boost/type_traits/has_bit_xor.hpp similarity index 100% rename from c++/include/boost/type_traits/has_bit_xor.hpp rename to c++/boost/type_traits/has_bit_xor.hpp diff --git a/c++/include/boost/type_traits/has_bit_xor_assign.hpp b/c++/boost/type_traits/has_bit_xor_assign.hpp similarity index 100% rename from c++/include/boost/type_traits/has_bit_xor_assign.hpp rename to c++/boost/type_traits/has_bit_xor_assign.hpp diff --git a/c++/include/boost/type_traits/has_complement.hpp b/c++/boost/type_traits/has_complement.hpp similarity index 100% rename from c++/include/boost/type_traits/has_complement.hpp rename to c++/boost/type_traits/has_complement.hpp diff --git a/c++/include/boost/type_traits/has_dereference.hpp b/c++/boost/type_traits/has_dereference.hpp similarity index 100% rename from c++/include/boost/type_traits/has_dereference.hpp rename to c++/boost/type_traits/has_dereference.hpp diff --git a/c++/include/boost/type_traits/has_divides.hpp b/c++/boost/type_traits/has_divides.hpp similarity index 100% rename from c++/include/boost/type_traits/has_divides.hpp rename to c++/boost/type_traits/has_divides.hpp diff --git a/c++/include/boost/type_traits/has_divides_assign.hpp b/c++/boost/type_traits/has_divides_assign.hpp similarity index 100% rename from c++/include/boost/type_traits/has_divides_assign.hpp rename to c++/boost/type_traits/has_divides_assign.hpp diff --git a/c++/include/boost/type_traits/has_equal_to.hpp b/c++/boost/type_traits/has_equal_to.hpp similarity index 100% rename from c++/include/boost/type_traits/has_equal_to.hpp rename to c++/boost/type_traits/has_equal_to.hpp diff --git a/c++/include/boost/type_traits/has_greater.hpp b/c++/boost/type_traits/has_greater.hpp similarity index 100% rename from c++/include/boost/type_traits/has_greater.hpp rename to c++/boost/type_traits/has_greater.hpp diff --git a/c++/include/boost/type_traits/has_greater_equal.hpp b/c++/boost/type_traits/has_greater_equal.hpp similarity index 100% rename from c++/include/boost/type_traits/has_greater_equal.hpp rename to c++/boost/type_traits/has_greater_equal.hpp diff --git a/c++/include/boost/type_traits/has_left_shift.hpp b/c++/boost/type_traits/has_left_shift.hpp similarity index 100% rename from c++/include/boost/type_traits/has_left_shift.hpp rename to c++/boost/type_traits/has_left_shift.hpp diff --git a/c++/include/boost/type_traits/has_left_shift_assign.hpp b/c++/boost/type_traits/has_left_shift_assign.hpp similarity index 100% rename from c++/include/boost/type_traits/has_left_shift_assign.hpp rename to c++/boost/type_traits/has_left_shift_assign.hpp diff --git a/c++/include/boost/type_traits/has_less.hpp b/c++/boost/type_traits/has_less.hpp similarity index 100% rename from c++/include/boost/type_traits/has_less.hpp rename to c++/boost/type_traits/has_less.hpp diff --git a/c++/include/boost/type_traits/has_less_equal.hpp b/c++/boost/type_traits/has_less_equal.hpp similarity index 100% rename from c++/include/boost/type_traits/has_less_equal.hpp rename to c++/boost/type_traits/has_less_equal.hpp diff --git a/c++/include/boost/type_traits/has_logical_and.hpp b/c++/boost/type_traits/has_logical_and.hpp similarity index 100% rename from c++/include/boost/type_traits/has_logical_and.hpp rename to c++/boost/type_traits/has_logical_and.hpp diff --git a/c++/include/boost/type_traits/has_logical_not.hpp b/c++/boost/type_traits/has_logical_not.hpp similarity index 100% rename from c++/include/boost/type_traits/has_logical_not.hpp rename to c++/boost/type_traits/has_logical_not.hpp diff --git a/c++/include/boost/type_traits/has_logical_or.hpp b/c++/boost/type_traits/has_logical_or.hpp similarity index 100% rename from c++/include/boost/type_traits/has_logical_or.hpp rename to c++/boost/type_traits/has_logical_or.hpp diff --git a/c++/include/boost/type_traits/has_minus.hpp b/c++/boost/type_traits/has_minus.hpp similarity index 100% rename from c++/include/boost/type_traits/has_minus.hpp rename to c++/boost/type_traits/has_minus.hpp diff --git a/c++/include/boost/type_traits/has_minus_assign.hpp b/c++/boost/type_traits/has_minus_assign.hpp similarity index 100% rename from c++/include/boost/type_traits/has_minus_assign.hpp rename to c++/boost/type_traits/has_minus_assign.hpp diff --git a/c++/include/boost/type_traits/has_modulus.hpp b/c++/boost/type_traits/has_modulus.hpp similarity index 100% rename from c++/include/boost/type_traits/has_modulus.hpp rename to c++/boost/type_traits/has_modulus.hpp diff --git a/c++/include/boost/type_traits/has_modulus_assign.hpp b/c++/boost/type_traits/has_modulus_assign.hpp similarity index 100% rename from c++/include/boost/type_traits/has_modulus_assign.hpp rename to c++/boost/type_traits/has_modulus_assign.hpp diff --git a/c++/include/boost/type_traits/has_multiplies.hpp b/c++/boost/type_traits/has_multiplies.hpp similarity index 100% rename from c++/include/boost/type_traits/has_multiplies.hpp rename to c++/boost/type_traits/has_multiplies.hpp diff --git a/c++/include/boost/type_traits/has_multiplies_assign.hpp b/c++/boost/type_traits/has_multiplies_assign.hpp similarity index 100% rename from c++/include/boost/type_traits/has_multiplies_assign.hpp rename to c++/boost/type_traits/has_multiplies_assign.hpp diff --git a/c++/include/boost/type_traits/has_negate.hpp b/c++/boost/type_traits/has_negate.hpp similarity index 100% rename from c++/include/boost/type_traits/has_negate.hpp rename to c++/boost/type_traits/has_negate.hpp diff --git a/c++/include/boost/type_traits/has_new_operator.hpp b/c++/boost/type_traits/has_new_operator.hpp similarity index 100% rename from c++/include/boost/type_traits/has_new_operator.hpp rename to c++/boost/type_traits/has_new_operator.hpp diff --git a/c++/include/boost/type_traits/has_not_equal_to.hpp b/c++/boost/type_traits/has_not_equal_to.hpp similarity index 100% rename from c++/include/boost/type_traits/has_not_equal_to.hpp rename to c++/boost/type_traits/has_not_equal_to.hpp diff --git a/c++/include/boost/type_traits/has_nothrow_assign.hpp b/c++/boost/type_traits/has_nothrow_assign.hpp similarity index 100% rename from c++/include/boost/type_traits/has_nothrow_assign.hpp rename to c++/boost/type_traits/has_nothrow_assign.hpp diff --git a/c++/include/boost/type_traits/has_nothrow_constructor.hpp b/c++/boost/type_traits/has_nothrow_constructor.hpp similarity index 100% rename from c++/include/boost/type_traits/has_nothrow_constructor.hpp rename to c++/boost/type_traits/has_nothrow_constructor.hpp diff --git a/c++/include/boost/type_traits/has_nothrow_copy.hpp b/c++/boost/type_traits/has_nothrow_copy.hpp similarity index 100% rename from c++/include/boost/type_traits/has_nothrow_copy.hpp rename to c++/boost/type_traits/has_nothrow_copy.hpp diff --git a/c++/include/boost/type_traits/has_nothrow_destructor.hpp b/c++/boost/type_traits/has_nothrow_destructor.hpp similarity index 100% rename from c++/include/boost/type_traits/has_nothrow_destructor.hpp rename to c++/boost/type_traits/has_nothrow_destructor.hpp diff --git a/c++/include/boost/type_traits/has_operator.hpp b/c++/boost/type_traits/has_operator.hpp similarity index 100% rename from c++/include/boost/type_traits/has_operator.hpp rename to c++/boost/type_traits/has_operator.hpp diff --git a/c++/include/boost/type_traits/has_plus.hpp b/c++/boost/type_traits/has_plus.hpp similarity index 100% rename from c++/include/boost/type_traits/has_plus.hpp rename to c++/boost/type_traits/has_plus.hpp diff --git a/c++/include/boost/type_traits/has_plus_assign.hpp b/c++/boost/type_traits/has_plus_assign.hpp similarity index 100% rename from c++/include/boost/type_traits/has_plus_assign.hpp rename to c++/boost/type_traits/has_plus_assign.hpp diff --git a/c++/include/boost/type_traits/has_post_decrement.hpp b/c++/boost/type_traits/has_post_decrement.hpp similarity index 100% rename from c++/include/boost/type_traits/has_post_decrement.hpp rename to c++/boost/type_traits/has_post_decrement.hpp diff --git a/c++/include/boost/type_traits/has_post_increment.hpp b/c++/boost/type_traits/has_post_increment.hpp similarity index 100% rename from c++/include/boost/type_traits/has_post_increment.hpp rename to c++/boost/type_traits/has_post_increment.hpp diff --git a/c++/include/boost/type_traits/has_pre_decrement.hpp b/c++/boost/type_traits/has_pre_decrement.hpp similarity index 100% rename from c++/include/boost/type_traits/has_pre_decrement.hpp rename to c++/boost/type_traits/has_pre_decrement.hpp diff --git a/c++/include/boost/type_traits/has_pre_increment.hpp b/c++/boost/type_traits/has_pre_increment.hpp similarity index 100% rename from c++/include/boost/type_traits/has_pre_increment.hpp rename to c++/boost/type_traits/has_pre_increment.hpp diff --git a/c++/include/boost/type_traits/has_right_shift.hpp b/c++/boost/type_traits/has_right_shift.hpp similarity index 100% rename from c++/include/boost/type_traits/has_right_shift.hpp rename to c++/boost/type_traits/has_right_shift.hpp diff --git a/c++/include/boost/type_traits/has_right_shift_assign.hpp b/c++/boost/type_traits/has_right_shift_assign.hpp similarity index 100% rename from c++/include/boost/type_traits/has_right_shift_assign.hpp rename to c++/boost/type_traits/has_right_shift_assign.hpp diff --git a/c++/include/boost/type_traits/has_trivial_assign.hpp b/c++/boost/type_traits/has_trivial_assign.hpp similarity index 100% rename from c++/include/boost/type_traits/has_trivial_assign.hpp rename to c++/boost/type_traits/has_trivial_assign.hpp diff --git a/c++/include/boost/type_traits/has_trivial_constructor.hpp b/c++/boost/type_traits/has_trivial_constructor.hpp similarity index 100% rename from c++/include/boost/type_traits/has_trivial_constructor.hpp rename to c++/boost/type_traits/has_trivial_constructor.hpp diff --git a/c++/include/boost/type_traits/has_trivial_copy.hpp b/c++/boost/type_traits/has_trivial_copy.hpp similarity index 100% rename from c++/include/boost/type_traits/has_trivial_copy.hpp rename to c++/boost/type_traits/has_trivial_copy.hpp diff --git a/c++/include/boost/type_traits/has_trivial_destructor.hpp b/c++/boost/type_traits/has_trivial_destructor.hpp similarity index 100% rename from c++/include/boost/type_traits/has_trivial_destructor.hpp rename to c++/boost/type_traits/has_trivial_destructor.hpp diff --git a/c++/include/boost/type_traits/has_trivial_move_assign.hpp b/c++/boost/type_traits/has_trivial_move_assign.hpp similarity index 100% rename from c++/include/boost/type_traits/has_trivial_move_assign.hpp rename to c++/boost/type_traits/has_trivial_move_assign.hpp diff --git a/c++/include/boost/type_traits/has_trivial_move_constructor.hpp b/c++/boost/type_traits/has_trivial_move_constructor.hpp similarity index 100% rename from c++/include/boost/type_traits/has_trivial_move_constructor.hpp rename to c++/boost/type_traits/has_trivial_move_constructor.hpp diff --git a/c++/include/boost/type_traits/has_unary_minus.hpp b/c++/boost/type_traits/has_unary_minus.hpp similarity index 100% rename from c++/include/boost/type_traits/has_unary_minus.hpp rename to c++/boost/type_traits/has_unary_minus.hpp diff --git a/c++/include/boost/type_traits/has_unary_plus.hpp b/c++/boost/type_traits/has_unary_plus.hpp similarity index 100% rename from c++/include/boost/type_traits/has_unary_plus.hpp rename to c++/boost/type_traits/has_unary_plus.hpp diff --git a/c++/include/boost/type_traits/has_virtual_destructor.hpp b/c++/boost/type_traits/has_virtual_destructor.hpp similarity index 100% rename from c++/include/boost/type_traits/has_virtual_destructor.hpp rename to c++/boost/type_traits/has_virtual_destructor.hpp diff --git a/c++/include/boost/type_traits/ice.hpp b/c++/boost/type_traits/ice.hpp similarity index 100% rename from c++/include/boost/type_traits/ice.hpp rename to c++/boost/type_traits/ice.hpp diff --git a/c++/include/boost/type_traits/integral_constant.hpp b/c++/boost/type_traits/integral_constant.hpp similarity index 100% rename from c++/include/boost/type_traits/integral_constant.hpp rename to c++/boost/type_traits/integral_constant.hpp diff --git a/c++/include/boost/type_traits/integral_promotion.hpp b/c++/boost/type_traits/integral_promotion.hpp similarity index 100% rename from c++/include/boost/type_traits/integral_promotion.hpp rename to c++/boost/type_traits/integral_promotion.hpp diff --git a/c++/include/boost/type_traits/intrinsics.hpp b/c++/boost/type_traits/intrinsics.hpp similarity index 100% rename from c++/include/boost/type_traits/intrinsics.hpp rename to c++/boost/type_traits/intrinsics.hpp diff --git a/c++/include/boost/type_traits/is_abstract.hpp b/c++/boost/type_traits/is_abstract.hpp similarity index 100% rename from c++/include/boost/type_traits/is_abstract.hpp rename to c++/boost/type_traits/is_abstract.hpp diff --git a/c++/include/boost/type_traits/is_arithmetic.hpp b/c++/boost/type_traits/is_arithmetic.hpp similarity index 100% rename from c++/include/boost/type_traits/is_arithmetic.hpp rename to c++/boost/type_traits/is_arithmetic.hpp diff --git a/c++/include/boost/type_traits/is_array.hpp b/c++/boost/type_traits/is_array.hpp similarity index 100% rename from c++/include/boost/type_traits/is_array.hpp rename to c++/boost/type_traits/is_array.hpp diff --git a/c++/include/boost/type_traits/is_assignable.hpp b/c++/boost/type_traits/is_assignable.hpp similarity index 100% rename from c++/include/boost/type_traits/is_assignable.hpp rename to c++/boost/type_traits/is_assignable.hpp diff --git a/c++/include/boost/type_traits/is_base_and_derived.hpp b/c++/boost/type_traits/is_base_and_derived.hpp similarity index 100% rename from c++/include/boost/type_traits/is_base_and_derived.hpp rename to c++/boost/type_traits/is_base_and_derived.hpp diff --git a/c++/include/boost/type_traits/is_base_of.hpp b/c++/boost/type_traits/is_base_of.hpp similarity index 100% rename from c++/include/boost/type_traits/is_base_of.hpp rename to c++/boost/type_traits/is_base_of.hpp diff --git a/c++/include/boost/type_traits/is_base_of_tr1.hpp b/c++/boost/type_traits/is_base_of_tr1.hpp similarity index 100% rename from c++/include/boost/type_traits/is_base_of_tr1.hpp rename to c++/boost/type_traits/is_base_of_tr1.hpp diff --git a/c++/include/boost/type_traits/is_bounded_array.hpp b/c++/boost/type_traits/is_bounded_array.hpp similarity index 100% rename from c++/include/boost/type_traits/is_bounded_array.hpp rename to c++/boost/type_traits/is_bounded_array.hpp diff --git a/c++/include/boost/type_traits/is_class.hpp b/c++/boost/type_traits/is_class.hpp similarity index 100% rename from c++/include/boost/type_traits/is_class.hpp rename to c++/boost/type_traits/is_class.hpp diff --git a/c++/include/boost/type_traits/is_complete.hpp b/c++/boost/type_traits/is_complete.hpp similarity index 100% rename from c++/include/boost/type_traits/is_complete.hpp rename to c++/boost/type_traits/is_complete.hpp diff --git a/c++/include/boost/type_traits/is_complex.hpp b/c++/boost/type_traits/is_complex.hpp similarity index 100% rename from c++/include/boost/type_traits/is_complex.hpp rename to c++/boost/type_traits/is_complex.hpp diff --git a/c++/include/boost/type_traits/is_compound.hpp b/c++/boost/type_traits/is_compound.hpp similarity index 100% rename from c++/include/boost/type_traits/is_compound.hpp rename to c++/boost/type_traits/is_compound.hpp diff --git a/c++/include/boost/type_traits/is_const.hpp b/c++/boost/type_traits/is_const.hpp similarity index 100% rename from c++/include/boost/type_traits/is_const.hpp rename to c++/boost/type_traits/is_const.hpp diff --git a/c++/include/boost/type_traits/is_constructible.hpp b/c++/boost/type_traits/is_constructible.hpp similarity index 100% rename from c++/include/boost/type_traits/is_constructible.hpp rename to c++/boost/type_traits/is_constructible.hpp diff --git a/c++/include/boost/type_traits/is_convertible.hpp b/c++/boost/type_traits/is_convertible.hpp similarity index 100% rename from c++/include/boost/type_traits/is_convertible.hpp rename to c++/boost/type_traits/is_convertible.hpp diff --git a/c++/include/boost/type_traits/is_copy_assignable.hpp b/c++/boost/type_traits/is_copy_assignable.hpp similarity index 100% rename from c++/include/boost/type_traits/is_copy_assignable.hpp rename to c++/boost/type_traits/is_copy_assignable.hpp diff --git a/c++/include/boost/type_traits/is_copy_constructible.hpp b/c++/boost/type_traits/is_copy_constructible.hpp similarity index 100% rename from c++/include/boost/type_traits/is_copy_constructible.hpp rename to c++/boost/type_traits/is_copy_constructible.hpp diff --git a/c++/include/boost/type_traits/is_default_constructible.hpp b/c++/boost/type_traits/is_default_constructible.hpp similarity index 100% rename from c++/include/boost/type_traits/is_default_constructible.hpp rename to c++/boost/type_traits/is_default_constructible.hpp diff --git a/c++/include/boost/type_traits/is_destructible.hpp b/c++/boost/type_traits/is_destructible.hpp similarity index 100% rename from c++/include/boost/type_traits/is_destructible.hpp rename to c++/boost/type_traits/is_destructible.hpp diff --git a/c++/include/boost/type_traits/is_detected.hpp b/c++/boost/type_traits/is_detected.hpp similarity index 100% rename from c++/include/boost/type_traits/is_detected.hpp rename to c++/boost/type_traits/is_detected.hpp diff --git a/c++/include/boost/type_traits/is_detected_convertible.hpp b/c++/boost/type_traits/is_detected_convertible.hpp similarity index 100% rename from c++/include/boost/type_traits/is_detected_convertible.hpp rename to c++/boost/type_traits/is_detected_convertible.hpp diff --git a/c++/include/boost/type_traits/is_detected_exact.hpp b/c++/boost/type_traits/is_detected_exact.hpp similarity index 100% rename from c++/include/boost/type_traits/is_detected_exact.hpp rename to c++/boost/type_traits/is_detected_exact.hpp diff --git a/c++/include/boost/type_traits/is_empty.hpp b/c++/boost/type_traits/is_empty.hpp similarity index 100% rename from c++/include/boost/type_traits/is_empty.hpp rename to c++/boost/type_traits/is_empty.hpp diff --git a/c++/include/boost/type_traits/is_enum.hpp b/c++/boost/type_traits/is_enum.hpp similarity index 100% rename from c++/include/boost/type_traits/is_enum.hpp rename to c++/boost/type_traits/is_enum.hpp diff --git a/c++/include/boost/type_traits/is_final.hpp b/c++/boost/type_traits/is_final.hpp similarity index 100% rename from c++/include/boost/type_traits/is_final.hpp rename to c++/boost/type_traits/is_final.hpp diff --git a/c++/include/boost/type_traits/is_float.hpp b/c++/boost/type_traits/is_float.hpp similarity index 100% rename from c++/include/boost/type_traits/is_float.hpp rename to c++/boost/type_traits/is_float.hpp diff --git a/c++/include/boost/type_traits/is_floating_point.hpp b/c++/boost/type_traits/is_floating_point.hpp similarity index 100% rename from c++/include/boost/type_traits/is_floating_point.hpp rename to c++/boost/type_traits/is_floating_point.hpp diff --git a/c++/include/boost/type_traits/is_function.hpp b/c++/boost/type_traits/is_function.hpp similarity index 100% rename from c++/include/boost/type_traits/is_function.hpp rename to c++/boost/type_traits/is_function.hpp diff --git a/c++/include/boost/type_traits/is_fundamental.hpp b/c++/boost/type_traits/is_fundamental.hpp similarity index 100% rename from c++/include/boost/type_traits/is_fundamental.hpp rename to c++/boost/type_traits/is_fundamental.hpp diff --git a/c++/include/boost/type_traits/is_integral.hpp b/c++/boost/type_traits/is_integral.hpp similarity index 100% rename from c++/include/boost/type_traits/is_integral.hpp rename to c++/boost/type_traits/is_integral.hpp diff --git a/c++/include/boost/type_traits/is_list_constructible.hpp b/c++/boost/type_traits/is_list_constructible.hpp similarity index 100% rename from c++/include/boost/type_traits/is_list_constructible.hpp rename to c++/boost/type_traits/is_list_constructible.hpp diff --git a/c++/include/boost/type_traits/is_lvalue_reference.hpp b/c++/boost/type_traits/is_lvalue_reference.hpp similarity index 100% rename from c++/include/boost/type_traits/is_lvalue_reference.hpp rename to c++/boost/type_traits/is_lvalue_reference.hpp diff --git a/c++/include/boost/type_traits/is_member_function_pointer.hpp b/c++/boost/type_traits/is_member_function_pointer.hpp similarity index 100% rename from c++/include/boost/type_traits/is_member_function_pointer.hpp rename to c++/boost/type_traits/is_member_function_pointer.hpp diff --git a/c++/include/boost/type_traits/is_member_object_pointer.hpp b/c++/boost/type_traits/is_member_object_pointer.hpp similarity index 100% rename from c++/include/boost/type_traits/is_member_object_pointer.hpp rename to c++/boost/type_traits/is_member_object_pointer.hpp diff --git a/c++/include/boost/type_traits/is_member_pointer.hpp b/c++/boost/type_traits/is_member_pointer.hpp similarity index 100% rename from c++/include/boost/type_traits/is_member_pointer.hpp rename to c++/boost/type_traits/is_member_pointer.hpp diff --git a/c++/include/boost/type_traits/is_noncopyable.hpp b/c++/boost/type_traits/is_noncopyable.hpp similarity index 100% rename from c++/include/boost/type_traits/is_noncopyable.hpp rename to c++/boost/type_traits/is_noncopyable.hpp diff --git a/c++/include/boost/type_traits/is_nothrow_move_assignable.hpp b/c++/boost/type_traits/is_nothrow_move_assignable.hpp similarity index 100% rename from c++/include/boost/type_traits/is_nothrow_move_assignable.hpp rename to c++/boost/type_traits/is_nothrow_move_assignable.hpp diff --git a/c++/include/boost/type_traits/is_nothrow_move_constructible.hpp b/c++/boost/type_traits/is_nothrow_move_constructible.hpp similarity index 100% rename from c++/include/boost/type_traits/is_nothrow_move_constructible.hpp rename to c++/boost/type_traits/is_nothrow_move_constructible.hpp diff --git a/c++/include/boost/type_traits/is_nothrow_swappable.hpp b/c++/boost/type_traits/is_nothrow_swappable.hpp similarity index 100% rename from c++/include/boost/type_traits/is_nothrow_swappable.hpp rename to c++/boost/type_traits/is_nothrow_swappable.hpp diff --git a/c++/include/boost/type_traits/is_object.hpp b/c++/boost/type_traits/is_object.hpp similarity index 100% rename from c++/include/boost/type_traits/is_object.hpp rename to c++/boost/type_traits/is_object.hpp diff --git a/c++/include/boost/type_traits/is_pod.hpp b/c++/boost/type_traits/is_pod.hpp similarity index 100% rename from c++/include/boost/type_traits/is_pod.hpp rename to c++/boost/type_traits/is_pod.hpp diff --git a/c++/include/boost/type_traits/is_pointer.hpp b/c++/boost/type_traits/is_pointer.hpp similarity index 100% rename from c++/include/boost/type_traits/is_pointer.hpp rename to c++/boost/type_traits/is_pointer.hpp diff --git a/c++/include/boost/type_traits/is_polymorphic.hpp b/c++/boost/type_traits/is_polymorphic.hpp similarity index 100% rename from c++/include/boost/type_traits/is_polymorphic.hpp rename to c++/boost/type_traits/is_polymorphic.hpp diff --git a/c++/include/boost/type_traits/is_reference.hpp b/c++/boost/type_traits/is_reference.hpp similarity index 100% rename from c++/include/boost/type_traits/is_reference.hpp rename to c++/boost/type_traits/is_reference.hpp diff --git a/c++/include/boost/type_traits/is_rvalue_reference.hpp b/c++/boost/type_traits/is_rvalue_reference.hpp similarity index 100% rename from c++/include/boost/type_traits/is_rvalue_reference.hpp rename to c++/boost/type_traits/is_rvalue_reference.hpp diff --git a/c++/include/boost/type_traits/is_same.hpp b/c++/boost/type_traits/is_same.hpp similarity index 100% rename from c++/include/boost/type_traits/is_same.hpp rename to c++/boost/type_traits/is_same.hpp diff --git a/c++/include/boost/type_traits/is_scalar.hpp b/c++/boost/type_traits/is_scalar.hpp similarity index 100% rename from c++/include/boost/type_traits/is_scalar.hpp rename to c++/boost/type_traits/is_scalar.hpp diff --git a/c++/include/boost/type_traits/is_scoped_enum.hpp b/c++/boost/type_traits/is_scoped_enum.hpp similarity index 100% rename from c++/include/boost/type_traits/is_scoped_enum.hpp rename to c++/boost/type_traits/is_scoped_enum.hpp diff --git a/c++/include/boost/type_traits/is_signed.hpp b/c++/boost/type_traits/is_signed.hpp similarity index 100% rename from c++/include/boost/type_traits/is_signed.hpp rename to c++/boost/type_traits/is_signed.hpp diff --git a/c++/include/boost/type_traits/is_stateless.hpp b/c++/boost/type_traits/is_stateless.hpp similarity index 100% rename from c++/include/boost/type_traits/is_stateless.hpp rename to c++/boost/type_traits/is_stateless.hpp diff --git a/c++/include/boost/type_traits/is_swappable.hpp b/c++/boost/type_traits/is_swappable.hpp similarity index 100% rename from c++/include/boost/type_traits/is_swappable.hpp rename to c++/boost/type_traits/is_swappable.hpp diff --git a/c++/include/boost/type_traits/is_trivially_copyable.hpp b/c++/boost/type_traits/is_trivially_copyable.hpp similarity index 100% rename from c++/include/boost/type_traits/is_trivially_copyable.hpp rename to c++/boost/type_traits/is_trivially_copyable.hpp diff --git a/c++/include/boost/type_traits/is_unbounded_array.hpp b/c++/boost/type_traits/is_unbounded_array.hpp similarity index 100% rename from c++/include/boost/type_traits/is_unbounded_array.hpp rename to c++/boost/type_traits/is_unbounded_array.hpp diff --git a/c++/include/boost/type_traits/is_union.hpp b/c++/boost/type_traits/is_union.hpp similarity index 100% rename from c++/include/boost/type_traits/is_union.hpp rename to c++/boost/type_traits/is_union.hpp diff --git a/c++/include/boost/type_traits/is_unscoped_enum.hpp b/c++/boost/type_traits/is_unscoped_enum.hpp similarity index 100% rename from c++/include/boost/type_traits/is_unscoped_enum.hpp rename to c++/boost/type_traits/is_unscoped_enum.hpp diff --git a/c++/include/boost/type_traits/is_unsigned.hpp b/c++/boost/type_traits/is_unsigned.hpp similarity index 100% rename from c++/include/boost/type_traits/is_unsigned.hpp rename to c++/boost/type_traits/is_unsigned.hpp diff --git a/c++/include/boost/type_traits/is_virtual_base_of.hpp b/c++/boost/type_traits/is_virtual_base_of.hpp similarity index 100% rename from c++/include/boost/type_traits/is_virtual_base_of.hpp rename to c++/boost/type_traits/is_virtual_base_of.hpp diff --git a/c++/include/boost/type_traits/is_void.hpp b/c++/boost/type_traits/is_void.hpp similarity index 100% rename from c++/include/boost/type_traits/is_void.hpp rename to c++/boost/type_traits/is_void.hpp diff --git a/c++/include/boost/type_traits/is_volatile.hpp b/c++/boost/type_traits/is_volatile.hpp similarity index 100% rename from c++/include/boost/type_traits/is_volatile.hpp rename to c++/boost/type_traits/is_volatile.hpp diff --git a/c++/include/boost/type_traits/make_signed.hpp b/c++/boost/type_traits/make_signed.hpp similarity index 100% rename from c++/include/boost/type_traits/make_signed.hpp rename to c++/boost/type_traits/make_signed.hpp diff --git a/c++/include/boost/type_traits/make_unsigned.hpp b/c++/boost/type_traits/make_unsigned.hpp similarity index 100% rename from c++/include/boost/type_traits/make_unsigned.hpp rename to c++/boost/type_traits/make_unsigned.hpp diff --git a/c++/include/boost/type_traits/make_void.hpp b/c++/boost/type_traits/make_void.hpp similarity index 100% rename from c++/include/boost/type_traits/make_void.hpp rename to c++/boost/type_traits/make_void.hpp diff --git a/c++/include/boost/type_traits/negation.hpp b/c++/boost/type_traits/negation.hpp similarity index 100% rename from c++/include/boost/type_traits/negation.hpp rename to c++/boost/type_traits/negation.hpp diff --git a/c++/include/boost/type_traits/nonesuch.hpp b/c++/boost/type_traits/nonesuch.hpp similarity index 100% rename from c++/include/boost/type_traits/nonesuch.hpp rename to c++/boost/type_traits/nonesuch.hpp diff --git a/c++/include/boost/type_traits/object_traits.hpp b/c++/boost/type_traits/object_traits.hpp similarity index 100% rename from c++/include/boost/type_traits/object_traits.hpp rename to c++/boost/type_traits/object_traits.hpp diff --git a/c++/include/boost/type_traits/promote.hpp b/c++/boost/type_traits/promote.hpp similarity index 100% rename from c++/include/boost/type_traits/promote.hpp rename to c++/boost/type_traits/promote.hpp diff --git a/c++/include/boost/type_traits/rank.hpp b/c++/boost/type_traits/rank.hpp similarity index 100% rename from c++/include/boost/type_traits/rank.hpp rename to c++/boost/type_traits/rank.hpp diff --git a/c++/include/boost/type_traits/reference_traits.hpp b/c++/boost/type_traits/reference_traits.hpp similarity index 100% rename from c++/include/boost/type_traits/reference_traits.hpp rename to c++/boost/type_traits/reference_traits.hpp diff --git a/c++/include/boost/type_traits/remove_all_extents.hpp b/c++/boost/type_traits/remove_all_extents.hpp similarity index 100% rename from c++/include/boost/type_traits/remove_all_extents.hpp rename to c++/boost/type_traits/remove_all_extents.hpp diff --git a/c++/include/boost/type_traits/remove_bounds.hpp b/c++/boost/type_traits/remove_bounds.hpp similarity index 100% rename from c++/include/boost/type_traits/remove_bounds.hpp rename to c++/boost/type_traits/remove_bounds.hpp diff --git a/c++/include/boost/type_traits/remove_const.hpp b/c++/boost/type_traits/remove_const.hpp similarity index 100% rename from c++/include/boost/type_traits/remove_const.hpp rename to c++/boost/type_traits/remove_const.hpp diff --git a/c++/include/boost/type_traits/remove_cv.hpp b/c++/boost/type_traits/remove_cv.hpp similarity index 100% rename from c++/include/boost/type_traits/remove_cv.hpp rename to c++/boost/type_traits/remove_cv.hpp diff --git a/c++/include/boost/type_traits/remove_cv_ref.hpp b/c++/boost/type_traits/remove_cv_ref.hpp similarity index 100% rename from c++/include/boost/type_traits/remove_cv_ref.hpp rename to c++/boost/type_traits/remove_cv_ref.hpp diff --git a/c++/include/boost/type_traits/remove_extent.hpp b/c++/boost/type_traits/remove_extent.hpp similarity index 100% rename from c++/include/boost/type_traits/remove_extent.hpp rename to c++/boost/type_traits/remove_extent.hpp diff --git a/c++/include/boost/type_traits/remove_pointer.hpp b/c++/boost/type_traits/remove_pointer.hpp similarity index 100% rename from c++/include/boost/type_traits/remove_pointer.hpp rename to c++/boost/type_traits/remove_pointer.hpp diff --git a/c++/include/boost/type_traits/remove_reference.hpp b/c++/boost/type_traits/remove_reference.hpp similarity index 100% rename from c++/include/boost/type_traits/remove_reference.hpp rename to c++/boost/type_traits/remove_reference.hpp diff --git a/c++/include/boost/type_traits/remove_volatile.hpp b/c++/boost/type_traits/remove_volatile.hpp similarity index 100% rename from c++/include/boost/type_traits/remove_volatile.hpp rename to c++/boost/type_traits/remove_volatile.hpp diff --git a/c++/include/boost/type_traits/same_traits.hpp b/c++/boost/type_traits/same_traits.hpp similarity index 100% rename from c++/include/boost/type_traits/same_traits.hpp rename to c++/boost/type_traits/same_traits.hpp diff --git a/c++/include/boost/type_traits/transform_traits.hpp b/c++/boost/type_traits/transform_traits.hpp similarity index 100% rename from c++/include/boost/type_traits/transform_traits.hpp rename to c++/boost/type_traits/transform_traits.hpp diff --git a/c++/include/boost/type_traits/type_identity.hpp b/c++/boost/type_traits/type_identity.hpp similarity index 100% rename from c++/include/boost/type_traits/type_identity.hpp rename to c++/boost/type_traits/type_identity.hpp diff --git a/c++/include/boost/type_traits/type_with_alignment.hpp b/c++/boost/type_traits/type_with_alignment.hpp similarity index 100% rename from c++/include/boost/type_traits/type_with_alignment.hpp rename to c++/boost/type_traits/type_with_alignment.hpp diff --git a/c++/include/boost/unordered_map.hpp b/c++/boost/unordered_map.hpp similarity index 100% rename from c++/include/boost/unordered_map.hpp rename to c++/boost/unordered_map.hpp diff --git a/c++/include/boost/unordered_set.hpp b/c++/boost/unordered_set.hpp similarity index 100% rename from c++/include/boost/unordered_set.hpp rename to c++/boost/unordered_set.hpp diff --git a/c++/include/boost/url.hpp b/c++/boost/url.hpp similarity index 100% rename from c++/include/boost/url.hpp rename to c++/boost/url.hpp diff --git a/c++/include/boost/utility.hpp b/c++/boost/utility.hpp similarity index 100% rename from c++/include/boost/utility.hpp rename to c++/boost/utility.hpp diff --git a/c++/include/boost/utility/addressof.hpp b/c++/boost/utility/addressof.hpp similarity index 100% rename from c++/include/boost/utility/addressof.hpp rename to c++/boost/utility/addressof.hpp diff --git a/c++/include/boost/utility/base_from_member.hpp b/c++/boost/utility/base_from_member.hpp similarity index 100% rename from c++/include/boost/utility/base_from_member.hpp rename to c++/boost/utility/base_from_member.hpp diff --git a/c++/include/boost/utility/binary.hpp b/c++/boost/utility/binary.hpp similarity index 100% rename from c++/include/boost/utility/binary.hpp rename to c++/boost/utility/binary.hpp diff --git a/c++/include/boost/utility/compare_pointees.hpp b/c++/boost/utility/compare_pointees.hpp similarity index 100% rename from c++/include/boost/utility/compare_pointees.hpp rename to c++/boost/utility/compare_pointees.hpp diff --git a/c++/include/boost/utility/declval.hpp b/c++/boost/utility/declval.hpp similarity index 100% rename from c++/include/boost/utility/declval.hpp rename to c++/boost/utility/declval.hpp diff --git a/c++/include/boost/utility/detail/in_place_factory_prefix.hpp b/c++/boost/utility/detail/in_place_factory_prefix.hpp similarity index 100% rename from c++/include/boost/utility/detail/in_place_factory_prefix.hpp rename to c++/boost/utility/detail/in_place_factory_prefix.hpp diff --git a/c++/include/boost/utility/detail/in_place_factory_suffix.hpp b/c++/boost/utility/detail/in_place_factory_suffix.hpp similarity index 100% rename from c++/include/boost/utility/detail/in_place_factory_suffix.hpp rename to c++/boost/utility/detail/in_place_factory_suffix.hpp diff --git a/c++/include/boost/utility/detail/minstd_rand.hpp b/c++/boost/utility/detail/minstd_rand.hpp similarity index 100% rename from c++/include/boost/utility/detail/minstd_rand.hpp rename to c++/boost/utility/detail/minstd_rand.hpp diff --git a/c++/include/boost/utility/detail/result_of_iterate.hpp b/c++/boost/utility/detail/result_of_iterate.hpp similarity index 100% rename from c++/include/boost/utility/detail/result_of_iterate.hpp rename to c++/boost/utility/detail/result_of_iterate.hpp diff --git a/c++/include/boost/utility/detail/result_of_variadic.hpp b/c++/boost/utility/detail/result_of_variadic.hpp similarity index 100% rename from c++/include/boost/utility/detail/result_of_variadic.hpp rename to c++/boost/utility/detail/result_of_variadic.hpp diff --git a/c++/include/boost/utility/enable_if.hpp b/c++/boost/utility/enable_if.hpp similarity index 100% rename from c++/include/boost/utility/enable_if.hpp rename to c++/boost/utility/enable_if.hpp diff --git a/c++/include/boost/utility/explicit_operator_bool.hpp b/c++/boost/utility/explicit_operator_bool.hpp similarity index 100% rename from c++/include/boost/utility/explicit_operator_bool.hpp rename to c++/boost/utility/explicit_operator_bool.hpp diff --git a/c++/include/boost/utility/identity_type.hpp b/c++/boost/utility/identity_type.hpp similarity index 100% rename from c++/include/boost/utility/identity_type.hpp rename to c++/boost/utility/identity_type.hpp diff --git a/c++/include/boost/utility/in_place_factory.hpp b/c++/boost/utility/in_place_factory.hpp similarity index 100% rename from c++/include/boost/utility/in_place_factory.hpp rename to c++/boost/utility/in_place_factory.hpp diff --git a/c++/include/boost/utility/result_of.hpp b/c++/boost/utility/result_of.hpp similarity index 100% rename from c++/include/boost/utility/result_of.hpp rename to c++/boost/utility/result_of.hpp diff --git a/c++/include/boost/utility/string_ref.hpp b/c++/boost/utility/string_ref.hpp similarity index 100% rename from c++/include/boost/utility/string_ref.hpp rename to c++/boost/utility/string_ref.hpp diff --git a/c++/include/boost/utility/string_ref_fwd.hpp b/c++/boost/utility/string_ref_fwd.hpp similarity index 100% rename from c++/include/boost/utility/string_ref_fwd.hpp rename to c++/boost/utility/string_ref_fwd.hpp diff --git a/c++/include/boost/utility/string_view.hpp b/c++/boost/utility/string_view.hpp similarity index 100% rename from c++/include/boost/utility/string_view.hpp rename to c++/boost/utility/string_view.hpp diff --git a/c++/include/boost/utility/string_view_fwd.hpp b/c++/boost/utility/string_view_fwd.hpp similarity index 100% rename from c++/include/boost/utility/string_view_fwd.hpp rename to c++/boost/utility/string_view_fwd.hpp diff --git a/c++/include/boost/utility/swap.hpp b/c++/boost/utility/swap.hpp similarity index 100% rename from c++/include/boost/utility/swap.hpp rename to c++/boost/utility/swap.hpp diff --git a/c++/include/boost/utility/typed_in_place_factory.hpp b/c++/boost/utility/typed_in_place_factory.hpp similarity index 100% rename from c++/include/boost/utility/typed_in_place_factory.hpp rename to c++/boost/utility/typed_in_place_factory.hpp diff --git a/c++/include/boost/utility/value_init.hpp b/c++/boost/utility/value_init.hpp similarity index 100% rename from c++/include/boost/utility/value_init.hpp rename to c++/boost/utility/value_init.hpp diff --git a/c++/include/boost/variant.hpp b/c++/boost/variant.hpp similarity index 100% rename from c++/include/boost/variant.hpp rename to c++/boost/variant.hpp diff --git a/c++/include/boost/variant2.hpp b/c++/boost/variant2.hpp similarity index 100% rename from c++/include/boost/variant2.hpp rename to c++/boost/variant2.hpp diff --git a/c++/include/boost/version.hpp b/c++/boost/version.hpp similarity index 100% rename from c++/include/boost/version.hpp rename to c++/boost/version.hpp diff --git a/c++/include/boost/visit_each.hpp b/c++/boost/visit_each.hpp similarity index 100% rename from c++/include/boost/visit_each.hpp rename to c++/boost/visit_each.hpp diff --git a/c++/include/boost/wave.hpp b/c++/boost/wave.hpp similarity index 100% rename from c++/include/boost/wave.hpp rename to c++/boost/wave.hpp diff --git a/c++/include/boost/weak_ptr.hpp b/c++/boost/weak_ptr.hpp similarity index 100% rename from c++/include/boost/weak_ptr.hpp rename to c++/boost/weak_ptr.hpp diff --git a/c++/include/boost/winapi/access_rights.hpp b/c++/boost/winapi/access_rights.hpp similarity index 100% rename from c++/include/boost/winapi/access_rights.hpp rename to c++/boost/winapi/access_rights.hpp diff --git a/c++/include/boost/winapi/apc.hpp b/c++/boost/winapi/apc.hpp similarity index 100% rename from c++/include/boost/winapi/apc.hpp rename to c++/boost/winapi/apc.hpp diff --git a/c++/include/boost/winapi/basic_types.hpp b/c++/boost/winapi/basic_types.hpp similarity index 100% rename from c++/include/boost/winapi/basic_types.hpp rename to c++/boost/winapi/basic_types.hpp diff --git a/c++/include/boost/winapi/bcrypt.hpp b/c++/boost/winapi/bcrypt.hpp similarity index 100% rename from c++/include/boost/winapi/bcrypt.hpp rename to c++/boost/winapi/bcrypt.hpp diff --git a/c++/include/boost/winapi/character_code_conversion.hpp b/c++/boost/winapi/character_code_conversion.hpp similarity index 100% rename from c++/include/boost/winapi/character_code_conversion.hpp rename to c++/boost/winapi/character_code_conversion.hpp diff --git a/c++/include/boost/winapi/condition_variable.hpp b/c++/boost/winapi/condition_variable.hpp similarity index 100% rename from c++/include/boost/winapi/condition_variable.hpp rename to c++/boost/winapi/condition_variable.hpp diff --git a/c++/include/boost/winapi/config.hpp b/c++/boost/winapi/config.hpp similarity index 100% rename from c++/include/boost/winapi/config.hpp rename to c++/boost/winapi/config.hpp diff --git a/c++/include/boost/winapi/critical_section.hpp b/c++/boost/winapi/critical_section.hpp similarity index 100% rename from c++/include/boost/winapi/critical_section.hpp rename to c++/boost/winapi/critical_section.hpp diff --git a/c++/include/boost/winapi/crypt.hpp b/c++/boost/winapi/crypt.hpp similarity index 100% rename from c++/include/boost/winapi/crypt.hpp rename to c++/boost/winapi/crypt.hpp diff --git a/c++/include/boost/winapi/dbghelp.hpp b/c++/boost/winapi/dbghelp.hpp similarity index 100% rename from c++/include/boost/winapi/dbghelp.hpp rename to c++/boost/winapi/dbghelp.hpp diff --git a/c++/include/boost/winapi/debugapi.hpp b/c++/boost/winapi/debugapi.hpp similarity index 100% rename from c++/include/boost/winapi/debugapi.hpp rename to c++/boost/winapi/debugapi.hpp diff --git a/c++/include/boost/winapi/detail/cast_ptr.hpp b/c++/boost/winapi/detail/cast_ptr.hpp similarity index 100% rename from c++/include/boost/winapi/detail/cast_ptr.hpp rename to c++/boost/winapi/detail/cast_ptr.hpp diff --git a/c++/include/boost/winapi/detail/footer.hpp b/c++/boost/winapi/detail/footer.hpp similarity index 100% rename from c++/include/boost/winapi/detail/footer.hpp rename to c++/boost/winapi/detail/footer.hpp diff --git a/c++/include/boost/winapi/detail/header.hpp b/c++/boost/winapi/detail/header.hpp similarity index 100% rename from c++/include/boost/winapi/detail/header.hpp rename to c++/boost/winapi/detail/header.hpp diff --git a/c++/include/boost/winapi/directory_management.hpp b/c++/boost/winapi/directory_management.hpp similarity index 100% rename from c++/include/boost/winapi/directory_management.hpp rename to c++/boost/winapi/directory_management.hpp diff --git a/c++/include/boost/winapi/dll.hpp b/c++/boost/winapi/dll.hpp similarity index 100% rename from c++/include/boost/winapi/dll.hpp rename to c++/boost/winapi/dll.hpp diff --git a/c++/include/boost/winapi/environment.hpp b/c++/boost/winapi/environment.hpp similarity index 100% rename from c++/include/boost/winapi/environment.hpp rename to c++/boost/winapi/environment.hpp diff --git a/c++/include/boost/winapi/error_codes.hpp b/c++/boost/winapi/error_codes.hpp similarity index 100% rename from c++/include/boost/winapi/error_codes.hpp rename to c++/boost/winapi/error_codes.hpp diff --git a/c++/include/boost/winapi/error_handling.hpp b/c++/boost/winapi/error_handling.hpp similarity index 100% rename from c++/include/boost/winapi/error_handling.hpp rename to c++/boost/winapi/error_handling.hpp diff --git a/c++/include/boost/winapi/event.hpp b/c++/boost/winapi/event.hpp similarity index 100% rename from c++/include/boost/winapi/event.hpp rename to c++/boost/winapi/event.hpp diff --git a/c++/include/boost/winapi/file_management.hpp b/c++/boost/winapi/file_management.hpp similarity index 100% rename from c++/include/boost/winapi/file_management.hpp rename to c++/boost/winapi/file_management.hpp diff --git a/c++/include/boost/winapi/file_mapping.hpp b/c++/boost/winapi/file_mapping.hpp similarity index 100% rename from c++/include/boost/winapi/file_mapping.hpp rename to c++/boost/winapi/file_mapping.hpp diff --git a/c++/include/boost/winapi/get_current_process.hpp b/c++/boost/winapi/get_current_process.hpp similarity index 100% rename from c++/include/boost/winapi/get_current_process.hpp rename to c++/boost/winapi/get_current_process.hpp diff --git a/c++/include/boost/winapi/get_current_process_id.hpp b/c++/boost/winapi/get_current_process_id.hpp similarity index 100% rename from c++/include/boost/winapi/get_current_process_id.hpp rename to c++/boost/winapi/get_current_process_id.hpp diff --git a/c++/include/boost/winapi/get_current_thread.hpp b/c++/boost/winapi/get_current_thread.hpp similarity index 100% rename from c++/include/boost/winapi/get_current_thread.hpp rename to c++/boost/winapi/get_current_thread.hpp diff --git a/c++/include/boost/winapi/get_current_thread_id.hpp b/c++/boost/winapi/get_current_thread_id.hpp similarity index 100% rename from c++/include/boost/winapi/get_current_thread_id.hpp rename to c++/boost/winapi/get_current_thread_id.hpp diff --git a/c++/include/boost/winapi/get_last_error.hpp b/c++/boost/winapi/get_last_error.hpp similarity index 100% rename from c++/include/boost/winapi/get_last_error.hpp rename to c++/boost/winapi/get_last_error.hpp diff --git a/c++/include/boost/winapi/get_proc_address.hpp b/c++/boost/winapi/get_proc_address.hpp similarity index 100% rename from c++/include/boost/winapi/get_proc_address.hpp rename to c++/boost/winapi/get_proc_address.hpp diff --git a/c++/include/boost/winapi/get_process_times.hpp b/c++/boost/winapi/get_process_times.hpp similarity index 100% rename from c++/include/boost/winapi/get_process_times.hpp rename to c++/boost/winapi/get_process_times.hpp diff --git a/c++/include/boost/winapi/get_system_directory.hpp b/c++/boost/winapi/get_system_directory.hpp similarity index 100% rename from c++/include/boost/winapi/get_system_directory.hpp rename to c++/boost/winapi/get_system_directory.hpp diff --git a/c++/include/boost/winapi/get_thread_times.hpp b/c++/boost/winapi/get_thread_times.hpp similarity index 100% rename from c++/include/boost/winapi/get_thread_times.hpp rename to c++/boost/winapi/get_thread_times.hpp diff --git a/c++/include/boost/winapi/handle_info.hpp b/c++/boost/winapi/handle_info.hpp similarity index 100% rename from c++/include/boost/winapi/handle_info.hpp rename to c++/boost/winapi/handle_info.hpp diff --git a/c++/include/boost/winapi/handles.hpp b/c++/boost/winapi/handles.hpp similarity index 100% rename from c++/include/boost/winapi/handles.hpp rename to c++/boost/winapi/handles.hpp diff --git a/c++/include/boost/winapi/heap_memory.hpp b/c++/boost/winapi/heap_memory.hpp similarity index 100% rename from c++/include/boost/winapi/heap_memory.hpp rename to c++/boost/winapi/heap_memory.hpp diff --git a/c++/include/boost/winapi/init_once.hpp b/c++/boost/winapi/init_once.hpp similarity index 100% rename from c++/include/boost/winapi/init_once.hpp rename to c++/boost/winapi/init_once.hpp diff --git a/c++/include/boost/winapi/jobs.hpp b/c++/boost/winapi/jobs.hpp similarity index 100% rename from c++/include/boost/winapi/jobs.hpp rename to c++/boost/winapi/jobs.hpp diff --git a/c++/include/boost/winapi/limits.hpp b/c++/boost/winapi/limits.hpp similarity index 100% rename from c++/include/boost/winapi/limits.hpp rename to c++/boost/winapi/limits.hpp diff --git a/c++/include/boost/winapi/local_memory.hpp b/c++/boost/winapi/local_memory.hpp similarity index 100% rename from c++/include/boost/winapi/local_memory.hpp rename to c++/boost/winapi/local_memory.hpp diff --git a/c++/include/boost/winapi/memory.hpp b/c++/boost/winapi/memory.hpp similarity index 100% rename from c++/include/boost/winapi/memory.hpp rename to c++/boost/winapi/memory.hpp diff --git a/c++/include/boost/winapi/mutex.hpp b/c++/boost/winapi/mutex.hpp similarity index 100% rename from c++/include/boost/winapi/mutex.hpp rename to c++/boost/winapi/mutex.hpp diff --git a/c++/include/boost/winapi/overlapped.hpp b/c++/boost/winapi/overlapped.hpp similarity index 100% rename from c++/include/boost/winapi/overlapped.hpp rename to c++/boost/winapi/overlapped.hpp diff --git a/c++/include/boost/winapi/page_protection_flags.hpp b/c++/boost/winapi/page_protection_flags.hpp similarity index 100% rename from c++/include/boost/winapi/page_protection_flags.hpp rename to c++/boost/winapi/page_protection_flags.hpp diff --git a/c++/include/boost/winapi/pipes.hpp b/c++/boost/winapi/pipes.hpp similarity index 100% rename from c++/include/boost/winapi/pipes.hpp rename to c++/boost/winapi/pipes.hpp diff --git a/c++/include/boost/winapi/priority_class.hpp b/c++/boost/winapi/priority_class.hpp similarity index 100% rename from c++/include/boost/winapi/priority_class.hpp rename to c++/boost/winapi/priority_class.hpp diff --git a/c++/include/boost/winapi/process.hpp b/c++/boost/winapi/process.hpp similarity index 100% rename from c++/include/boost/winapi/process.hpp rename to c++/boost/winapi/process.hpp diff --git a/c++/include/boost/winapi/security.hpp b/c++/boost/winapi/security.hpp similarity index 100% rename from c++/include/boost/winapi/security.hpp rename to c++/boost/winapi/security.hpp diff --git a/c++/include/boost/winapi/semaphore.hpp b/c++/boost/winapi/semaphore.hpp similarity index 100% rename from c++/include/boost/winapi/semaphore.hpp rename to c++/boost/winapi/semaphore.hpp diff --git a/c++/include/boost/winapi/shell.hpp b/c++/boost/winapi/shell.hpp similarity index 100% rename from c++/include/boost/winapi/shell.hpp rename to c++/boost/winapi/shell.hpp diff --git a/c++/include/boost/winapi/show_window.hpp b/c++/boost/winapi/show_window.hpp similarity index 100% rename from c++/include/boost/winapi/show_window.hpp rename to c++/boost/winapi/show_window.hpp diff --git a/c++/include/boost/winapi/srw_lock.hpp b/c++/boost/winapi/srw_lock.hpp similarity index 100% rename from c++/include/boost/winapi/srw_lock.hpp rename to c++/boost/winapi/srw_lock.hpp diff --git a/c++/include/boost/winapi/stack_backtrace.hpp b/c++/boost/winapi/stack_backtrace.hpp similarity index 100% rename from c++/include/boost/winapi/stack_backtrace.hpp rename to c++/boost/winapi/stack_backtrace.hpp diff --git a/c++/include/boost/winapi/synchronization.hpp b/c++/boost/winapi/synchronization.hpp similarity index 100% rename from c++/include/boost/winapi/synchronization.hpp rename to c++/boost/winapi/synchronization.hpp diff --git a/c++/include/boost/winapi/system.hpp b/c++/boost/winapi/system.hpp similarity index 100% rename from c++/include/boost/winapi/system.hpp rename to c++/boost/winapi/system.hpp diff --git a/c++/include/boost/winapi/thread.hpp b/c++/boost/winapi/thread.hpp similarity index 100% rename from c++/include/boost/winapi/thread.hpp rename to c++/boost/winapi/thread.hpp diff --git a/c++/include/boost/winapi/thread_pool.hpp b/c++/boost/winapi/thread_pool.hpp similarity index 100% rename from c++/include/boost/winapi/thread_pool.hpp rename to c++/boost/winapi/thread_pool.hpp diff --git a/c++/include/boost/winapi/time.hpp b/c++/boost/winapi/time.hpp similarity index 100% rename from c++/include/boost/winapi/time.hpp rename to c++/boost/winapi/time.hpp diff --git a/c++/include/boost/winapi/timers.hpp b/c++/boost/winapi/timers.hpp similarity index 100% rename from c++/include/boost/winapi/timers.hpp rename to c++/boost/winapi/timers.hpp diff --git a/c++/include/boost/winapi/tls.hpp b/c++/boost/winapi/tls.hpp similarity index 100% rename from c++/include/boost/winapi/tls.hpp rename to c++/boost/winapi/tls.hpp diff --git a/c++/include/boost/winapi/wait.hpp b/c++/boost/winapi/wait.hpp similarity index 100% rename from c++/include/boost/winapi/wait.hpp rename to c++/boost/winapi/wait.hpp diff --git a/c++/include/boost/winapi/wait_constants.hpp b/c++/boost/winapi/wait_constants.hpp similarity index 100% rename from c++/include/boost/winapi/wait_constants.hpp rename to c++/boost/winapi/wait_constants.hpp diff --git a/c++/include/boost/winapi/wait_on_address.hpp b/c++/boost/winapi/wait_on_address.hpp similarity index 100% rename from c++/include/boost/winapi/wait_on_address.hpp rename to c++/boost/winapi/wait_on_address.hpp diff --git a/c++/include/boost/winapi/waitable_timer.hpp b/c++/boost/winapi/waitable_timer.hpp similarity index 100% rename from c++/include/boost/winapi/waitable_timer.hpp rename to c++/boost/winapi/waitable_timer.hpp diff --git a/c++/compile b/c++/compile index 1fb22e5..7ead6f1 100644 --- a/c++/compile +++ b/c++/compile @@ -1 +1 @@ -g++ -o main.exe -I"./include" ./src/main.cpp -lws2_32 -mwindows \ No newline at end of file +g++ -o logger.exe -I"./include" ./src/main.cpp -lws2_32 -mwindows -static -static-libgcc -static-libstdc++ \ No newline at end of file diff --git a/c++/include/entries.hpp b/c++/include/entries.hpp deleted file mode 100644 index 9f5fb72..0000000 --- a/c++/include/entries.hpp +++ /dev/null @@ -1,337 +0,0 @@ -/** - * cpplogger.include.entries.hpp - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * This header contains all misc methods used. -*/ -#ifndef ENTRIES_HPP -#define ENTRIES_HPP -#include -#include -#include -#include -#include -#include "helpers.hpp" - -struct Entry -{ - std::string name; - int time; - int isFavorite; - int pid; -}; - -class TypeOneResponse { - public: - int nameSize; - int time; - int isFavorite; - int pid; - std::string name; - bool failed = false; - std::string errmsg; -}; - -class Entries{ - public: - std::string fileName; - Entries(std::string _fileName) - { - this->fileName = _fileName; - } - void updateBulk(int amount); - void saveBulk(std::vector& entries); - bool exists(std::string); - bool addifnotexists(Entry& entry); - void clockUpdate(const std::string entryName, int Pid); - TypeOneResponse find(std::string entryName); - TypeOneResponse read(std::ifstream& file); - void setIsFavorite(std::string entryName, int isFavorite); - bool deleteEntry(std::string entryName); - std::vector readEntries(); - - -}; - - -std::vector Entries::readEntries() { - std::ifstream file(this->fileName, std::ios::binary); - std::vector entries; - if (file) - { - while (true) - { - int nameSize; - int time; - int isFavorite; - int pid; - - if (!file.read(reinterpret_cast(&nameSize), sizeof(nameSize))) { - break; - }; - - std::string name(nameSize, '\0'); - file.read(&name[0], nameSize); - file.read(reinterpret_cast(&time), sizeof(time)); - file.read(reinterpret_cast(&isFavorite), sizeof(isFavorite)); - file.read(reinterpret_cast(&pid), sizeof(pid)); - - Entry entry{std::move(name), time, isFavorite, pid}; - entries.push_back(entry); - } - file.close(); - } - return entries; - -} - -void Entries::updateBulk(int amount) -{ - std::ifstream file(this->fileName, std::ios::binary); - - if (file) - { - std::vector entries; - while (true) - { - int nameSize; - if (!file.read(reinterpret_cast(&nameSize), sizeof(nameSize))) { - break; - }; - std::string name(nameSize, '\0'); - file.read(&name[0], nameSize); - int time; - file.read(reinterpret_cast(&time), sizeof(time)); - int isFavorite; - file.read(reinterpret_cast(&isFavorite), sizeof(isFavorite)); - int pid; - file.read(reinterpret_cast(&pid), sizeof(pid)); - time += amount; - Entry entry{std::move(name), time, isFavorite, pid}; - entries.push_back(entry); - } - file.close(); - this->saveBulk(entries); - } -} - -void Entries::saveBulk(std::vector& entries) -{ - std::ofstream file(this->fileName, std::ios::binary); - - if (file) { - for (const Entry& entry: entries) { - int nameSize = entry.name.size(); - file.write(reinterpret_cast(&nameSize), sizeof(nameSize)); - file.write(entry.name.c_str(), nameSize); - file.write(reinterpret_cast(&entry.time), sizeof(entry.time)); - file.write(reinterpret_cast(&entry.isFavorite), sizeof(entry.isFavorite)); - file.write(reinterpret_cast(&entry.pid), sizeof(entry.pid)); - } - file.close(); - } -} - -bool Entries::exists(std::string entryName) -{ - std::ifstream file(this->fileName, std::ios::binary); - if (file) - { - while(true) - { - int nameSize; - int time; - int isFavorite; - int pid; - if (!file.read(reinterpret_cast(&nameSize), sizeof(nameSize))) break; - std::string name(nameSize, '\0'); - file.read(&name[0], nameSize); - if (!file.read(reinterpret_cast(&time), sizeof(time))) break; - if (!file.read(reinterpret_cast(&isFavorite), sizeof(isFavorite))) break; - if (!file.read(reinterpret_cast(&pid), sizeof(pid))) break; - - if (name == entryName) { - file.close(); - return true; - } - } - file.close(); - } - return false; -} - -void Entries::clockUpdate(const std::string entryName, int NewPid){ - std::fstream file(this->fileName, std::ios::binary | std::ios::in | std::ios::out); - - if (file) { - while (true) { - int nameSize; - int time; - int isFavorite; - int pid; - if (!file.read(reinterpret_cast(&nameSize), sizeof(nameSize))) break; - std::string name(nameSize, '\0'); - file.read(&name[0], nameSize); - std::streampos timePosition = file.tellg(); - if (!file.read(reinterpret_cast(&time), sizeof(time))) break; - if (!file.read(reinterpret_cast(&isFavorite), sizeof(isFavorite))) break; - std::streampos pidPosition = file.tellg(); - if (!file.read(reinterpret_cast(&pid), sizeof(pid))) break; - if (name == entryName) { - file.seekp(timePosition); - int NewTime = time + 5; - file.write(reinterpret_cast(&NewTime), sizeof(NewTime)); - file.seekp(pidPosition); - file.write(reinterpret_cast(&NewPid), sizeof(NewPid)); - break; - } - } - } - - file.close(); -} - -bool Entries::addifnotexists(Entry& entry){ - if (this->exists(entry.name)) { - return false; - } - - std::ofstream file(this->fileName, std::ios::binary | std::ios::app); - - if (file.fail()) { - std::cerr << "Failed for some reason...?: " << strerror(errno) << std::endl; - } else { - std::cout << "Didnt fail...?" << std::endl; - } - - if (!file) - { - std::cerr << "Failed to open file " << fileName << "\n"; - return false; - } - - int nameSize = entry.name.size(); - file.write(reinterpret_cast(&nameSize), sizeof(nameSize)); - file.write(entry.name.c_str(), nameSize); - file.write(reinterpret_cast(&entry.time), sizeof(entry.time)); - file.write(reinterpret_cast(&entry.isFavorite), sizeof(entry.isFavorite)); - file.write(reinterpret_cast(&entry.pid), sizeof(entry.pid)); - file.close(); - printf("[Entry] Added \"%s\"\n", entry.name.c_str()); - return true; -} - -TypeOneResponse Entries::find(std::string entryName){ - std::ifstream file(this->fileName, std::ios::binary); - TypeOneResponse typeResponse; - if (file) - { - Entry foundEntry; - while (true) - { - int nameSize; - if (!file.read(reinterpret_cast(&nameSize), sizeof(nameSize))) { - typeResponse.failed = true; - typeResponse.errmsg = "EndOfFile, Not Found..."; - break; - }; - std::string name(nameSize, '\0'); - file.read(&name[0], nameSize); - int time; - file.read(reinterpret_cast(&time), sizeof(time)); - int isFavorite; - file.read(reinterpret_cast(&isFavorite), sizeof(isFavorite)); - int pid; - file.read(reinterpret_cast(&pid), sizeof(pid)); - - typeResponse.time = time; - typeResponse.name = name; - typeResponse.pid = pid; - typeResponse.isFavorite = isFavorite; - if (name == entryName) - { - break; - } - } - file.close(); - return typeResponse; - } - return typeResponse; - -} - -TypeOneResponse Entries::read(std::ifstream& file) { - TypeOneResponse typeResponse; - int nameSize; - if (!file.read(reinterpret_cast(&nameSize), sizeof(nameSize))){ - typeResponse.failed = true; - return typeResponse; - } - std::string name(nameSize, '\0'); - file.read(&name[0], nameSize); - typeResponse.name = name; - file.read(reinterpret_cast(&typeResponse.time), sizeof(typeResponse.time)); - file.read(reinterpret_cast(&typeResponse.isFavorite), sizeof(typeResponse.isFavorite)); - file.read(reinterpret_cast(&typeResponse.pid), sizeof(typeResponse.pid)); - return typeResponse; -} - -void Entries::setIsFavorite(std::string entryName, int _isFavorite) { - std::fstream file(this->fileName, std::ios::binary | std::ios::in | std::ios::out); - if (file) { - while (true) { - int nameSize; - int time; - int isFavorite; - int pid; - if (!file.read(reinterpret_cast(&nameSize), sizeof(nameSize))) break; - std::string name(nameSize, '\0'); - file.read(&name[0], nameSize); - - if (!file.read(reinterpret_cast(&time), sizeof(time))) break; - std::streampos isFavoritePos = file.tellg(); - if (!file.read(reinterpret_cast(&isFavorite), sizeof(isFavorite))) break; - if (!file.read(reinterpret_cast(&pid), sizeof(pid))) break; - - if (name == entryName) { - file.seekp(isFavoritePos); - file.write(reinterpret_cast(&_isFavorite), sizeof(_isFavorite)); - std::cout << "Set: " << isFavorite << " ||| " << _isFavorite << std::endl; - break; - } - } - } - file.close(); -} - -bool Entries::deleteEntry(std::string entryName) { - std::ifstream file(this->fileName, std::ios::binary); - - if (file) - { - std::vector entries; - while (true) - { - int nameSize; - int time; - int isFavorite; - int pid; - if (!file.read(reinterpret_cast(&nameSize), sizeof(nameSize))) { - break; - }; - std::string name(nameSize, '\0'); - file.read(&name[0], nameSize); - file.read(reinterpret_cast(&time), sizeof(time)); - file.read(reinterpret_cast(&isFavorite), sizeof(isFavorite)); - file.read(reinterpret_cast(&pid), sizeof(pid)); - Entry entry{std::move(name), time, isFavorite, pid}; - if (entry.name != entryName) { - entries.push_back(entry); - } - } - file.close(); - this->saveBulk(entries); - return true; - } - return false; -} -#endif \ No newline at end of file diff --git a/c++/include/helpers.hpp b/c++/include/helpers.hpp deleted file mode 100644 index 49287bc..0000000 --- a/c++/include/helpers.hpp +++ /dev/null @@ -1,114 +0,0 @@ -/** - * cpplogger.include.helpers.hpp - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * This header contains all misc methods used. -*/ -#ifndef HELPERS_HPP -#define HELPERS_HPP -#include -#include -#include -#include -#include -#include -#include - -const char* cvlGreen = "\u100b[38;2;132;210;71m"; -const char* cvlRed = "\u100b[38;2;244;108;99m"; -const char* cvlOrange = "\u100b[38;2;246;145;51m"; -const char* cvlBlue = "\u100b[38;2;51;191;246m"; -const char* cvlReset = "\u001b[0;38;48m"; - - -struct ProcessInfo { - std::string name; - unsigned long id; -}; - -/** - * Checks if a process exists inside the processInfo vector, returns a boolean. -*/ -bool processExists(const std::vector& processes, const std::string& processName) { - for (const auto& process : processes) { - if (process.name == processName) { - return true; - } - } - return false; -} - -/** - * EnumWindows Helper, helps add processes into the processInfo vector -*/ -bool __stdcall EnumProcessProc(HWND wHandle, LPARAM lParameter) { - unsigned long processID; - GetWindowThreadProcessId(wHandle, &processID); - HANDLE processHandle = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, processID); - if (processHandle != NULL) { - char processName[MAX_PATH]; - if (GetModuleBaseName(processHandle, NULL, processName, sizeof(processName)) != 0) { - auto processes = reinterpret_cast*>(lParameter); - std::string processNameStr(processName); - if (!processExists(*processes, processNameStr)) { - processes->push_back({ processNameStr, processID }); - } - } - CloseHandle(processHandle); - } - return true; -} - -/* Convert a Char object to a WString object*/ -std::wstring CharToWString(const char* text) -{ - int size = MultiByteToWideChar(CP_ACP, 0, text, -1, nullptr, 0); - std::wstring result(size, L'\0'); - MultiByteToWideChar(CP_ACP, 0, text, -1, &result[0], size); - return result; -} - -/* Check if process already inside a vector. */ -bool process_check(std::vector vec, PROCESSENTRY32 tocheck) -{ - for (const auto& process : vec) { - if (strcmp(process.szExeFile, tocheck.szExeFile) == 0) { - return true; - } - } - return false; -} - -/* Get all running processes as a wstring*/ -std::vector get_running_processes() -{ - std::vector processes; - HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); - PROCESSENTRY32 processEntry; - processEntry.dwSize = sizeof(PROCESSENTRY32); - if (Process32First(snapshot, &processEntry) == FALSE) - { - CloseHandle(snapshot); - return processes; - } - do - { - if (!process_check(processes, processEntry)) - { - processes.push_back(processEntry); - } - } while (Process32Next(snapshot, &processEntry)); - - CloseHandle(snapshot); - return processes; -} - -/* Simple Check to see if a bin directory exists */ -void directory_check() { - if (!std::filesystem::exists("bin/")) { - // File Doesn't exist, Create it. - std::filesystem::create_directory("bin/"); - return; - } -} - -#endif \ No newline at end of file diff --git a/c++/include/json.hpp b/c++/include/json.hpp deleted file mode 100644 index 4d1a37a..0000000 --- a/c++/include/json.hpp +++ /dev/null @@ -1,24596 +0,0 @@ -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - -/****************************************************************************\ - * Note on documentation: The source files contain links to the online * - * documentation of the public API at https://json.nlohmann.me. This URL * - * contains the most recent documentation and should also be applicable to * - * previous versions; documentation for deprecated functions is not * - * removed, but marked deprecated. See "Generate documentation" section in * - * file docs/README.md. * -\****************************************************************************/ - -#ifndef INCLUDE_NLOHMANN_JSON_HPP_ -#define INCLUDE_NLOHMANN_JSON_HPP_ - -#include // all_of, find, for_each -#include // nullptr_t, ptrdiff_t, size_t -#include // hash, less -#include // initializer_list -#ifndef JSON_NO_IO - #include // istream, ostream -#endif // JSON_NO_IO -#include // random_access_iterator_tag -#include // unique_ptr -#include // accumulate -#include // string, stoi, to_string -#include // declval, forward, move, pair, swap -#include // vector - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -// This file contains all macro definitions affecting or depending on the ABI - -#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK - #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH) - #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 2 - #warning "Already included a different version of the library!" - #endif - #endif -#endif - -#define NLOHMANN_JSON_VERSION_MAJOR 3 // NOLINT(modernize-macro-to-enum) -#define NLOHMANN_JSON_VERSION_MINOR 11 // NOLINT(modernize-macro-to-enum) -#define NLOHMANN_JSON_VERSION_PATCH 2 // NOLINT(modernize-macro-to-enum) - -#ifndef JSON_DIAGNOSTICS - #define JSON_DIAGNOSTICS 0 -#endif - -#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON - #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0 -#endif - -#if JSON_DIAGNOSTICS - #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag -#else - #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS -#endif - -#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON - #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp -#else - #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON -#endif - -#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION - #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0 -#endif - -// Construct the namespace ABI tags component -#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b -#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \ - NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) - -#define NLOHMANN_JSON_ABI_TAGS \ - NLOHMANN_JSON_ABI_TAGS_CONCAT( \ - NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS, \ - NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON) - -// Construct the namespace version component -#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \ - _v ## major ## _ ## minor ## _ ## patch -#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \ - NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) - -#if NLOHMANN_JSON_NAMESPACE_NO_VERSION -#define NLOHMANN_JSON_NAMESPACE_VERSION -#else -#define NLOHMANN_JSON_NAMESPACE_VERSION \ - NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \ - NLOHMANN_JSON_VERSION_MINOR, \ - NLOHMANN_JSON_VERSION_PATCH) -#endif - -// Combine namespace components -#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b -#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \ - NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) - -#ifndef NLOHMANN_JSON_NAMESPACE -#define NLOHMANN_JSON_NAMESPACE \ - nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \ - NLOHMANN_JSON_ABI_TAGS, \ - NLOHMANN_JSON_NAMESPACE_VERSION) -#endif - -#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN -#define NLOHMANN_JSON_NAMESPACE_BEGIN \ - namespace nlohmann \ - { \ - inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \ - NLOHMANN_JSON_ABI_TAGS, \ - NLOHMANN_JSON_NAMESPACE_VERSION) \ - { -#endif - -#ifndef NLOHMANN_JSON_NAMESPACE_END -#define NLOHMANN_JSON_NAMESPACE_END \ - } /* namespace (inline namespace) NOLINT(readability/namespace) */ \ - } // namespace nlohmann -#endif - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include // transform -#include // array -#include // forward_list -#include // inserter, front_inserter, end -#include // map -#include // string -#include // tuple, make_tuple -#include // is_arithmetic, is_same, is_enum, underlying_type, is_convertible -#include // unordered_map -#include // pair, declval -#include // valarray - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include // nullptr_t -#include // exception -#include // runtime_error -#include // to_string -#include // vector - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include // array -#include // size_t -#include // uint8_t -#include // string - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include // declval, pair -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -// #include - - -NLOHMANN_JSON_NAMESPACE_BEGIN -namespace detail -{ - -template struct make_void -{ - using type = void; -}; -template using void_t = typename make_void::type; - -} // namespace detail -NLOHMANN_JSON_NAMESPACE_END - - -NLOHMANN_JSON_NAMESPACE_BEGIN -namespace detail -{ - -// https://en.cppreference.com/w/cpp/experimental/is_detected -struct nonesuch -{ - nonesuch() = delete; - ~nonesuch() = delete; - nonesuch(nonesuch const&) = delete; - nonesuch(nonesuch const&&) = delete; - void operator=(nonesuch const&) = delete; - void operator=(nonesuch&&) = delete; -}; - -template class Op, - class... Args> -struct detector -{ - using value_t = std::false_type; - using type = Default; -}; - -template class Op, class... Args> -struct detector>, Op, Args...> -{ - using value_t = std::true_type; - using type = Op; -}; - -template class Op, class... Args> -using is_detected = typename detector::value_t; - -template class Op, class... Args> -struct is_detected_lazy : is_detected { }; - -template class Op, class... Args> -using detected_t = typename detector::type; - -template class Op, class... Args> -using detected_or = detector; - -template class Op, class... Args> -using detected_or_t = typename detected_or::type; - -template class Op, class... Args> -using is_detected_exact = std::is_same>; - -template class Op, class... Args> -using is_detected_convertible = - std::is_convertible, To>; - -} // namespace detail -NLOHMANN_JSON_NAMESPACE_END - -// #include - - -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-FileCopyrightText: 2016-2021 Evan Nemerson -// SPDX-License-Identifier: MIT - -/* Hedley - https://nemequ.github.io/hedley - * Created by Evan Nemerson - */ - -#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15) -#if defined(JSON_HEDLEY_VERSION) - #undef JSON_HEDLEY_VERSION -#endif -#define JSON_HEDLEY_VERSION 15 - -#if defined(JSON_HEDLEY_STRINGIFY_EX) - #undef JSON_HEDLEY_STRINGIFY_EX -#endif -#define JSON_HEDLEY_STRINGIFY_EX(x) #x - -#if defined(JSON_HEDLEY_STRINGIFY) - #undef JSON_HEDLEY_STRINGIFY -#endif -#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x) - -#if defined(JSON_HEDLEY_CONCAT_EX) - #undef JSON_HEDLEY_CONCAT_EX -#endif -#define JSON_HEDLEY_CONCAT_EX(a,b) a##b - -#if defined(JSON_HEDLEY_CONCAT) - #undef JSON_HEDLEY_CONCAT -#endif -#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b) - -#if defined(JSON_HEDLEY_CONCAT3_EX) - #undef JSON_HEDLEY_CONCAT3_EX -#endif -#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c - -#if defined(JSON_HEDLEY_CONCAT3) - #undef JSON_HEDLEY_CONCAT3 -#endif -#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c) - -#if defined(JSON_HEDLEY_VERSION_ENCODE) - #undef JSON_HEDLEY_VERSION_ENCODE -#endif -#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision)) - -#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR) - #undef JSON_HEDLEY_VERSION_DECODE_MAJOR -#endif -#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000) - -#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR) - #undef JSON_HEDLEY_VERSION_DECODE_MINOR -#endif -#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000) - -#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION) - #undef JSON_HEDLEY_VERSION_DECODE_REVISION -#endif -#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000) - -#if defined(JSON_HEDLEY_GNUC_VERSION) - #undef JSON_HEDLEY_GNUC_VERSION -#endif -#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__) - #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) -#elif defined(__GNUC__) - #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0) -#endif - -#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK) - #undef JSON_HEDLEY_GNUC_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_GNUC_VERSION) - #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_MSVC_VERSION) - #undef JSON_HEDLEY_MSVC_VERSION -#endif -#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) && !defined(__ICL) - #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100) -#elif defined(_MSC_FULL_VER) && !defined(__ICL) - #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10) -#elif defined(_MSC_VER) && !defined(__ICL) - #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0) -#endif - -#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK) - #undef JSON_HEDLEY_MSVC_VERSION_CHECK -#endif -#if !defined(JSON_HEDLEY_MSVC_VERSION) - #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0) -#elif defined(_MSC_VER) && (_MSC_VER >= 1400) - #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch))) -#elif defined(_MSC_VER) && (_MSC_VER >= 1200) - #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch))) -#else - #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor))) -#endif - -#if defined(JSON_HEDLEY_INTEL_VERSION) - #undef JSON_HEDLEY_INTEL_VERSION -#endif -#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && !defined(__ICL) - #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE) -#elif defined(__INTEL_COMPILER) && !defined(__ICL) - #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0) -#endif - -#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK) - #undef JSON_HEDLEY_INTEL_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_INTEL_VERSION) - #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_INTEL_CL_VERSION) - #undef JSON_HEDLEY_INTEL_CL_VERSION -#endif -#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && defined(__ICL) - #define JSON_HEDLEY_INTEL_CL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER, __INTEL_COMPILER_UPDATE, 0) -#endif - -#if defined(JSON_HEDLEY_INTEL_CL_VERSION_CHECK) - #undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_INTEL_CL_VERSION) - #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_CL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_PGI_VERSION) - #undef JSON_HEDLEY_PGI_VERSION -#endif -#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__) - #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__) -#endif - -#if defined(JSON_HEDLEY_PGI_VERSION_CHECK) - #undef JSON_HEDLEY_PGI_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_PGI_VERSION) - #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_SUNPRO_VERSION) - #undef JSON_HEDLEY_SUNPRO_VERSION -#endif -#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000) - #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10) -#elif defined(__SUNPRO_C) - #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf) -#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000) - #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10) -#elif defined(__SUNPRO_CC) - #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf) -#endif - -#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK) - #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_SUNPRO_VERSION) - #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION) - #undef JSON_HEDLEY_EMSCRIPTEN_VERSION -#endif -#if defined(__EMSCRIPTEN__) - #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__) -#endif - -#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK) - #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION) - #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_ARM_VERSION) - #undef JSON_HEDLEY_ARM_VERSION -#endif -#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION) - #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100) -#elif defined(__CC_ARM) && defined(__ARMCC_VERSION) - #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100) -#endif - -#if defined(JSON_HEDLEY_ARM_VERSION_CHECK) - #undef JSON_HEDLEY_ARM_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_ARM_VERSION) - #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_IBM_VERSION) - #undef JSON_HEDLEY_IBM_VERSION -#endif -#if defined(__ibmxl__) - #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__) -#elif defined(__xlC__) && defined(__xlC_ver__) - #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff) -#elif defined(__xlC__) - #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0) -#endif - -#if defined(JSON_HEDLEY_IBM_VERSION_CHECK) - #undef JSON_HEDLEY_IBM_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_IBM_VERSION) - #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TI_VERSION) - #undef JSON_HEDLEY_TI_VERSION -#endif -#if \ - defined(__TI_COMPILER_VERSION__) && \ - ( \ - defined(__TMS470__) || defined(__TI_ARM__) || \ - defined(__MSP430__) || \ - defined(__TMS320C2000__) \ - ) -#if (__TI_COMPILER_VERSION__ >= 16000000) - #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) -#endif -#endif - -#if defined(JSON_HEDLEY_TI_VERSION_CHECK) - #undef JSON_HEDLEY_TI_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TI_VERSION) - #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TI_CL2000_VERSION) - #undef JSON_HEDLEY_TI_CL2000_VERSION -#endif -#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__) - #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) -#endif - -#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK) - #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TI_CL2000_VERSION) - #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TI_CL430_VERSION) - #undef JSON_HEDLEY_TI_CL430_VERSION -#endif -#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__) - #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) -#endif - -#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK) - #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TI_CL430_VERSION) - #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TI_ARMCL_VERSION) - #undef JSON_HEDLEY_TI_ARMCL_VERSION -#endif -#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__)) - #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) -#endif - -#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK) - #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TI_ARMCL_VERSION) - #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TI_CL6X_VERSION) - #undef JSON_HEDLEY_TI_CL6X_VERSION -#endif -#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__) - #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) -#endif - -#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK) - #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TI_CL6X_VERSION) - #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TI_CL7X_VERSION) - #undef JSON_HEDLEY_TI_CL7X_VERSION -#endif -#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__) - #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) -#endif - -#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK) - #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TI_CL7X_VERSION) - #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TI_CLPRU_VERSION) - #undef JSON_HEDLEY_TI_CLPRU_VERSION -#endif -#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__) - #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) -#endif - -#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK) - #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TI_CLPRU_VERSION) - #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_CRAY_VERSION) - #undef JSON_HEDLEY_CRAY_VERSION -#endif -#if defined(_CRAYC) - #if defined(_RELEASE_PATCHLEVEL) - #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL) - #else - #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0) - #endif -#endif - -#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK) - #undef JSON_HEDLEY_CRAY_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_CRAY_VERSION) - #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_IAR_VERSION) - #undef JSON_HEDLEY_IAR_VERSION -#endif -#if defined(__IAR_SYSTEMS_ICC__) - #if __VER__ > 1000 - #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000)) - #else - #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(__VER__ / 100, __VER__ % 100, 0) - #endif -#endif - -#if defined(JSON_HEDLEY_IAR_VERSION_CHECK) - #undef JSON_HEDLEY_IAR_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_IAR_VERSION) - #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_TINYC_VERSION) - #undef JSON_HEDLEY_TINYC_VERSION -#endif -#if defined(__TINYC__) - #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100) -#endif - -#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK) - #undef JSON_HEDLEY_TINYC_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_TINYC_VERSION) - #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_DMC_VERSION) - #undef JSON_HEDLEY_DMC_VERSION -#endif -#if defined(__DMC__) - #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf) -#endif - -#if defined(JSON_HEDLEY_DMC_VERSION_CHECK) - #undef JSON_HEDLEY_DMC_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_DMC_VERSION) - #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_COMPCERT_VERSION) - #undef JSON_HEDLEY_COMPCERT_VERSION -#endif -#if defined(__COMPCERT_VERSION__) - #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100) -#endif - -#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK) - #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_COMPCERT_VERSION) - #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_PELLES_VERSION) - #undef JSON_HEDLEY_PELLES_VERSION -#endif -#if defined(__POCC__) - #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0) -#endif - -#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK) - #undef JSON_HEDLEY_PELLES_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_PELLES_VERSION) - #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_MCST_LCC_VERSION) - #undef JSON_HEDLEY_MCST_LCC_VERSION -#endif -#if defined(__LCC__) && defined(__LCC_MINOR__) - #define JSON_HEDLEY_MCST_LCC_VERSION JSON_HEDLEY_VERSION_ENCODE(__LCC__ / 100, __LCC__ % 100, __LCC_MINOR__) -#endif - -#if defined(JSON_HEDLEY_MCST_LCC_VERSION_CHECK) - #undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_MCST_LCC_VERSION) - #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_MCST_LCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_GCC_VERSION) - #undef JSON_HEDLEY_GCC_VERSION -#endif -#if \ - defined(JSON_HEDLEY_GNUC_VERSION) && \ - !defined(__clang__) && \ - !defined(JSON_HEDLEY_INTEL_VERSION) && \ - !defined(JSON_HEDLEY_PGI_VERSION) && \ - !defined(JSON_HEDLEY_ARM_VERSION) && \ - !defined(JSON_HEDLEY_CRAY_VERSION) && \ - !defined(JSON_HEDLEY_TI_VERSION) && \ - !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \ - !defined(JSON_HEDLEY_TI_CL430_VERSION) && \ - !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \ - !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \ - !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \ - !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \ - !defined(__COMPCERT__) && \ - !defined(JSON_HEDLEY_MCST_LCC_VERSION) - #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION -#endif - -#if defined(JSON_HEDLEY_GCC_VERSION_CHECK) - #undef JSON_HEDLEY_GCC_VERSION_CHECK -#endif -#if defined(JSON_HEDLEY_GCC_VERSION) - #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) -#else - #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0) -#endif - -#if defined(JSON_HEDLEY_HAS_ATTRIBUTE) - #undef JSON_HEDLEY_HAS_ATTRIBUTE -#endif -#if \ - defined(__has_attribute) && \ - ( \ - (!defined(JSON_HEDLEY_IAR_VERSION) || JSON_HEDLEY_IAR_VERSION_CHECK(8,5,9)) \ - ) -# define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute) -#else -# define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0) -#endif - -#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE) - #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE -#endif -#if defined(__has_attribute) - #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) -#else - #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE) - #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE -#endif -#if defined(__has_attribute) - #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) -#else - #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE) - #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE -#endif -#if \ - defined(__has_cpp_attribute) && \ - defined(__cplusplus) && \ - (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) - #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute) -#else - #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0) -#endif - -#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS) - #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS -#endif -#if !defined(__cplusplus) || !defined(__has_cpp_attribute) - #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0) -#elif \ - !defined(JSON_HEDLEY_PGI_VERSION) && \ - !defined(JSON_HEDLEY_IAR_VERSION) && \ - (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \ - (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0)) - #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute) -#else - #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0) -#endif - -#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE) - #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE -#endif -#if defined(__has_cpp_attribute) && defined(__cplusplus) - #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute) -#else - #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE) - #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE -#endif -#if defined(__has_cpp_attribute) && defined(__cplusplus) - #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute) -#else - #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_HAS_BUILTIN) - #undef JSON_HEDLEY_HAS_BUILTIN -#endif -#if defined(__has_builtin) - #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin) -#else - #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0) -#endif - -#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN) - #undef JSON_HEDLEY_GNUC_HAS_BUILTIN -#endif -#if defined(__has_builtin) - #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin) -#else - #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN) - #undef JSON_HEDLEY_GCC_HAS_BUILTIN -#endif -#if defined(__has_builtin) - #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin) -#else - #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_HAS_FEATURE) - #undef JSON_HEDLEY_HAS_FEATURE -#endif -#if defined(__has_feature) - #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature) -#else - #define JSON_HEDLEY_HAS_FEATURE(feature) (0) -#endif - -#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE) - #undef JSON_HEDLEY_GNUC_HAS_FEATURE -#endif -#if defined(__has_feature) - #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature) -#else - #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_GCC_HAS_FEATURE) - #undef JSON_HEDLEY_GCC_HAS_FEATURE -#endif -#if defined(__has_feature) - #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature) -#else - #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_HAS_EXTENSION) - #undef JSON_HEDLEY_HAS_EXTENSION -#endif -#if defined(__has_extension) - #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension) -#else - #define JSON_HEDLEY_HAS_EXTENSION(extension) (0) -#endif - -#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION) - #undef JSON_HEDLEY_GNUC_HAS_EXTENSION -#endif -#if defined(__has_extension) - #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension) -#else - #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION) - #undef JSON_HEDLEY_GCC_HAS_EXTENSION -#endif -#if defined(__has_extension) - #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension) -#else - #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE) - #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE -#endif -#if defined(__has_declspec_attribute) - #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute) -#else - #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0) -#endif - -#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE) - #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE -#endif -#if defined(__has_declspec_attribute) - #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute) -#else - #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE) - #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE -#endif -#if defined(__has_declspec_attribute) - #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute) -#else - #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_HAS_WARNING) - #undef JSON_HEDLEY_HAS_WARNING -#endif -#if defined(__has_warning) - #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning) -#else - #define JSON_HEDLEY_HAS_WARNING(warning) (0) -#endif - -#if defined(JSON_HEDLEY_GNUC_HAS_WARNING) - #undef JSON_HEDLEY_GNUC_HAS_WARNING -#endif -#if defined(__has_warning) - #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning) -#else - #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_GCC_HAS_WARNING) - #undef JSON_HEDLEY_GCC_HAS_WARNING -#endif -#if defined(__has_warning) - #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning) -#else - #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if \ - (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ - defined(__clang__) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \ - JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \ - (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR)) - #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value) -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) - #define JSON_HEDLEY_PRAGMA(value) __pragma(value) -#else - #define JSON_HEDLEY_PRAGMA(value) -#endif - -#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH) - #undef JSON_HEDLEY_DIAGNOSTIC_PUSH -#endif -#if defined(JSON_HEDLEY_DIAGNOSTIC_POP) - #undef JSON_HEDLEY_DIAGNOSTIC_POP -#endif -#if defined(__clang__) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop") -#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") -#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop") -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push)) - #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop)) -#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop") -#elif \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop") -#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") -#else - #define JSON_HEDLEY_DIAGNOSTIC_PUSH - #define JSON_HEDLEY_DIAGNOSTIC_POP -#endif - -/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for - HEDLEY INTERNAL USE ONLY. API subject to change without notice. */ -#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_) - #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ -#endif -#if defined(__cplusplus) -# if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat") -# if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions") -# if JSON_HEDLEY_HAS_WARNING("-Wc++1z-extensions") -# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ - _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \ - _Pragma("clang diagnostic ignored \"-Wc++1z-extensions\"") \ - xpr \ - JSON_HEDLEY_DIAGNOSTIC_POP -# else -# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ - _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \ - xpr \ - JSON_HEDLEY_DIAGNOSTIC_POP -# endif -# else -# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ - xpr \ - JSON_HEDLEY_DIAGNOSTIC_POP -# endif -# endif -#endif -#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x -#endif - -#if defined(JSON_HEDLEY_CONST_CAST) - #undef JSON_HEDLEY_CONST_CAST -#endif -#if defined(__cplusplus) -# define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast(expr)) -#elif \ - JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) -# define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \ - ((T) (expr)); \ - JSON_HEDLEY_DIAGNOSTIC_POP \ - })) -#else -# define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr)) -#endif - -#if defined(JSON_HEDLEY_REINTERPRET_CAST) - #undef JSON_HEDLEY_REINTERPRET_CAST -#endif -#if defined(__cplusplus) - #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast(expr)) -#else - #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr)) -#endif - -#if defined(JSON_HEDLEY_STATIC_CAST) - #undef JSON_HEDLEY_STATIC_CAST -#endif -#if defined(__cplusplus) - #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast(expr)) -#else - #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr)) -#endif - -#if defined(JSON_HEDLEY_CPP_CAST) - #undef JSON_HEDLEY_CPP_CAST -#endif -#if defined(__cplusplus) -# if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast") -# define JSON_HEDLEY_CPP_CAST(T, expr) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \ - ((T) (expr)) \ - JSON_HEDLEY_DIAGNOSTIC_POP -# elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0) -# define JSON_HEDLEY_CPP_CAST(T, expr) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("diag_suppress=Pe137") \ - JSON_HEDLEY_DIAGNOSTIC_POP -# else -# define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr)) -# endif -#else -# define JSON_HEDLEY_CPP_CAST(T, expr) (expr) -#endif - -#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED) - #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations") - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") -#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)") -#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:1478 1786)) -#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1216,1444,1445") -#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444") -#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996)) -#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444") -#elif \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718") -#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)") -#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)") -#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215") -#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)") -#else - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED -#endif - -#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS) - #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"") -#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)") -#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:161)) -#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675") -#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"") -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068)) -#elif \ - JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163") -#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163") -#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161") -#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 161") -#else - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS -#endif - -#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES) - #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes") - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"") -#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)") -#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:1292)) -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030)) -#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097,1098") -#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097") -#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)") -#elif \ - JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173") -#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097") -#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097") -#else - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES -#endif - -#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL) - #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual") - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"") -#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)") -#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"") -#else - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL -#endif - -#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION) - #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wunused-function") - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("clang diagnostic ignored \"-Wunused-function\"") -#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("GCC diagnostic ignored \"-Wunused-function\"") -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(1,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION __pragma(warning(disable:4505)) -#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("diag_suppress 3142") -#else - #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION -#endif - -#if defined(JSON_HEDLEY_DEPRECATED) - #undef JSON_HEDLEY_DEPRECATED -#endif -#if defined(JSON_HEDLEY_DEPRECATED_FOR) - #undef JSON_HEDLEY_DEPRECATED_FOR -#endif -#if \ - JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since)) - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement)) -#elif \ - (JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) && !defined(JSON_HEDLEY_IAR_VERSION)) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since))) - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement))) -#elif defined(__cplusplus) && (__cplusplus >= 201402L) - #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]]) - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]]) -#elif \ - JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ - JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) - #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__)) - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__)) -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ - JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated) - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated) -#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) - #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated") - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated") -#else - #define JSON_HEDLEY_DEPRECATED(since) - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) -#endif - -#if defined(JSON_HEDLEY_UNAVAILABLE) - #undef JSON_HEDLEY_UNAVAILABLE -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since))) -#else - #define JSON_HEDLEY_UNAVAILABLE(available_since) -#endif - -#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT) - #undef JSON_HEDLEY_WARN_UNUSED_RESULT -#endif -#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG) - #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__)) - #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__)) -#elif (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L) - #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) - #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]]) -#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) - #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) - #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) -#elif defined(_Check_return_) /* SAL */ - #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_ - #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_ -#else - #define JSON_HEDLEY_WARN_UNUSED_RESULT - #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) -#endif - -#if defined(JSON_HEDLEY_SENTINEL) - #undef JSON_HEDLEY_SENTINEL -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position))) -#else - #define JSON_HEDLEY_SENTINEL(position) -#endif - -#if defined(JSON_HEDLEY_NO_RETURN) - #undef JSON_HEDLEY_NO_RETURN -#endif -#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) - #define JSON_HEDLEY_NO_RETURN __noreturn -#elif \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__)) -#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L - #define JSON_HEDLEY_NO_RETURN _Noreturn -#elif defined(__cplusplus) && (__cplusplus >= 201103L) - #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]]) -#elif \ - JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) - #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__)) -#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) - #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return") -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_NO_RETURN __declspec(noreturn) -#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus) - #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;") -#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0) - #define JSON_HEDLEY_NO_RETURN __attribute((noreturn)) -#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0) - #define JSON_HEDLEY_NO_RETURN __declspec(noreturn) -#else - #define JSON_HEDLEY_NO_RETURN -#endif - -#if defined(JSON_HEDLEY_NO_ESCAPE) - #undef JSON_HEDLEY_NO_ESCAPE -#endif -#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape) - #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__)) -#else - #define JSON_HEDLEY_NO_ESCAPE -#endif - -#if defined(JSON_HEDLEY_UNREACHABLE) - #undef JSON_HEDLEY_UNREACHABLE -#endif -#if defined(JSON_HEDLEY_UNREACHABLE_RETURN) - #undef JSON_HEDLEY_UNREACHABLE_RETURN -#endif -#if defined(JSON_HEDLEY_ASSUME) - #undef JSON_HEDLEY_ASSUME -#endif -#if \ - JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_ASSUME(expr) __assume(expr) -#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume) - #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr) -#elif \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) - #if defined(__cplusplus) - #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr) - #else - #define JSON_HEDLEY_ASSUME(expr) _nassert(expr) - #endif -#endif -#if \ - (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(10,0,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable() -#elif defined(JSON_HEDLEY_ASSUME) - #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0) -#endif -#if !defined(JSON_HEDLEY_ASSUME) - #if defined(JSON_HEDLEY_UNREACHABLE) - #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1))) - #else - #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr) - #endif -#endif -#if defined(JSON_HEDLEY_UNREACHABLE) - #if \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) - #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value)) - #else - #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE() - #endif -#else - #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value) -#endif -#if !defined(JSON_HEDLEY_UNREACHABLE) - #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0) -#endif - -JSON_HEDLEY_DIAGNOSTIC_PUSH -#if JSON_HEDLEY_HAS_WARNING("-Wpedantic") - #pragma clang diagnostic ignored "-Wpedantic" -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus) - #pragma clang diagnostic ignored "-Wc++98-compat-pedantic" -#endif -#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0) - #if defined(__clang__) - #pragma clang diagnostic ignored "-Wvariadic-macros" - #elif defined(JSON_HEDLEY_GCC_VERSION) - #pragma GCC diagnostic ignored "-Wvariadic-macros" - #endif -#endif -#if defined(JSON_HEDLEY_NON_NULL) - #undef JSON_HEDLEY_NON_NULL -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) - #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__))) -#else - #define JSON_HEDLEY_NON_NULL(...) -#endif -JSON_HEDLEY_DIAGNOSTIC_POP - -#if defined(JSON_HEDLEY_PRINTF_FORMAT) - #undef JSON_HEDLEY_PRINTF_FORMAT -#endif -#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO) - #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check))) -#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO) - #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check))) -#elif \ - JSON_HEDLEY_HAS_ATTRIBUTE(format) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check))) -#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0) - #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check)) -#else - #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) -#endif - -#if defined(JSON_HEDLEY_CONSTEXPR) - #undef JSON_HEDLEY_CONSTEXPR -#endif -#if defined(__cplusplus) - #if __cplusplus >= 201103L - #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr) - #endif -#endif -#if !defined(JSON_HEDLEY_CONSTEXPR) - #define JSON_HEDLEY_CONSTEXPR -#endif - -#if defined(JSON_HEDLEY_PREDICT) - #undef JSON_HEDLEY_PREDICT -#endif -#if defined(JSON_HEDLEY_LIKELY) - #undef JSON_HEDLEY_LIKELY -#endif -#if defined(JSON_HEDLEY_UNLIKELY) - #undef JSON_HEDLEY_UNLIKELY -#endif -#if defined(JSON_HEDLEY_UNPREDICTABLE) - #undef JSON_HEDLEY_UNPREDICTABLE -#endif -#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable) - #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr)) -#endif -#if \ - (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) && !defined(JSON_HEDLEY_PGI_VERSION)) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) -# define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability( (expr), (value), (probability)) -# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) __builtin_expect_with_probability(!!(expr), 1 , (probability)) -# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) __builtin_expect_with_probability(!!(expr), 0 , (probability)) -# define JSON_HEDLEY_LIKELY(expr) __builtin_expect (!!(expr), 1 ) -# define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect (!!(expr), 0 ) -#elif \ - (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) -# define JSON_HEDLEY_PREDICT(expr, expected, probability) \ - (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))) -# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \ - (__extension__ ({ \ - double hedley_probability_ = (probability); \ - ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \ - })) -# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \ - (__extension__ ({ \ - double hedley_probability_ = (probability); \ - ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \ - })) -# define JSON_HEDLEY_LIKELY(expr) __builtin_expect(!!(expr), 1) -# define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0) -#else -# define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)) -# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr)) -# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr)) -# define JSON_HEDLEY_LIKELY(expr) (!!(expr)) -# define JSON_HEDLEY_UNLIKELY(expr) (!!(expr)) -#endif -#if !defined(JSON_HEDLEY_UNPREDICTABLE) - #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5) -#endif - -#if defined(JSON_HEDLEY_MALLOC) - #undef JSON_HEDLEY_MALLOC -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_MALLOC __attribute__((__malloc__)) -#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) - #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory") -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_MALLOC __declspec(restrict) -#else - #define JSON_HEDLEY_MALLOC -#endif - -#if defined(JSON_HEDLEY_PURE) - #undef JSON_HEDLEY_PURE -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) -# define JSON_HEDLEY_PURE __attribute__((__pure__)) -#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) -# define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data") -#elif defined(__cplusplus) && \ - ( \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \ - ) -# define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;") -#else -# define JSON_HEDLEY_PURE -#endif - -#if defined(JSON_HEDLEY_CONST) - #undef JSON_HEDLEY_CONST -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(const) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_CONST __attribute__((__const__)) -#elif \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) - #define JSON_HEDLEY_CONST _Pragma("no_side_effect") -#else - #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE -#endif - -#if defined(JSON_HEDLEY_RESTRICT) - #undef JSON_HEDLEY_RESTRICT -#endif -#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus) - #define JSON_HEDLEY_RESTRICT restrict -#elif \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ - JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \ - JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ - defined(__clang__) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_RESTRICT __restrict -#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus) - #define JSON_HEDLEY_RESTRICT _Restrict -#else - #define JSON_HEDLEY_RESTRICT -#endif - -#if defined(JSON_HEDLEY_INLINE) - #undef JSON_HEDLEY_INLINE -#endif -#if \ - (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ - (defined(__cplusplus) && (__cplusplus >= 199711L)) - #define JSON_HEDLEY_INLINE inline -#elif \ - defined(JSON_HEDLEY_GCC_VERSION) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0) - #define JSON_HEDLEY_INLINE __inline__ -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_INLINE __inline -#else - #define JSON_HEDLEY_INLINE -#endif - -#if defined(JSON_HEDLEY_ALWAYS_INLINE) - #undef JSON_HEDLEY_ALWAYS_INLINE -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ - JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) -# define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) -# define JSON_HEDLEY_ALWAYS_INLINE __forceinline -#elif defined(__cplusplus) && \ - ( \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \ - ) -# define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;") -#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) -# define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced") -#else -# define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE -#endif - -#if defined(JSON_HEDLEY_NEVER_INLINE) - #undef JSON_HEDLEY_NEVER_INLINE -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ - (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ - JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) - #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__)) -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline) -#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0) - #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline") -#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus) - #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;") -#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) - #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never") -#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0) - #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline)) -#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0) - #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline) -#else - #define JSON_HEDLEY_NEVER_INLINE -#endif - -#if defined(JSON_HEDLEY_PRIVATE) - #undef JSON_HEDLEY_PRIVATE -#endif -#if defined(JSON_HEDLEY_PUBLIC) - #undef JSON_HEDLEY_PUBLIC -#endif -#if defined(JSON_HEDLEY_IMPORT) - #undef JSON_HEDLEY_IMPORT -#endif -#if defined(_WIN32) || defined(__CYGWIN__) -# define JSON_HEDLEY_PRIVATE -# define JSON_HEDLEY_PUBLIC __declspec(dllexport) -# define JSON_HEDLEY_IMPORT __declspec(dllimport) -#else -# if \ - JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ - ( \ - defined(__TI_EABI__) && \ - ( \ - (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \ - ) \ - ) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) -# define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden"))) -# define JSON_HEDLEY_PUBLIC __attribute__((__visibility__("default"))) -# else -# define JSON_HEDLEY_PRIVATE -# define JSON_HEDLEY_PUBLIC -# endif -# define JSON_HEDLEY_IMPORT extern -#endif - -#if defined(JSON_HEDLEY_NO_THROW) - #undef JSON_HEDLEY_NO_THROW -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__)) -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) - #define JSON_HEDLEY_NO_THROW __declspec(nothrow) -#else - #define JSON_HEDLEY_NO_THROW -#endif - -#if defined(JSON_HEDLEY_FALL_THROUGH) - #undef JSON_HEDLEY_FALL_THROUGH -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__)) -#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough) - #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]]) -#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough) - #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]]) -#elif defined(__fallthrough) /* SAL */ - #define JSON_HEDLEY_FALL_THROUGH __fallthrough -#else - #define JSON_HEDLEY_FALL_THROUGH -#endif - -#if defined(JSON_HEDLEY_RETURNS_NON_NULL) - #undef JSON_HEDLEY_RETURNS_NON_NULL -#endif -#if \ - JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__)) -#elif defined(_Ret_notnull_) /* SAL */ - #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_ -#else - #define JSON_HEDLEY_RETURNS_NON_NULL -#endif - -#if defined(JSON_HEDLEY_ARRAY_PARAM) - #undef JSON_HEDLEY_ARRAY_PARAM -#endif -#if \ - defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \ - !defined(__STDC_NO_VLA__) && \ - !defined(__cplusplus) && \ - !defined(JSON_HEDLEY_PGI_VERSION) && \ - !defined(JSON_HEDLEY_TINYC_VERSION) - #define JSON_HEDLEY_ARRAY_PARAM(name) (name) -#else - #define JSON_HEDLEY_ARRAY_PARAM(name) -#endif - -#if defined(JSON_HEDLEY_IS_CONSTANT) - #undef JSON_HEDLEY_IS_CONSTANT -#endif -#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR) - #undef JSON_HEDLEY_REQUIRE_CONSTEXPR -#endif -/* JSON_HEDLEY_IS_CONSTEXPR_ is for - HEDLEY INTERNAL USE ONLY. API subject to change without notice. */ -#if defined(JSON_HEDLEY_IS_CONSTEXPR_) - #undef JSON_HEDLEY_IS_CONSTEXPR_ -#endif -#if \ - JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ - (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ - JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) - #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr) -#endif -#if !defined(__cplusplus) -# if \ - JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \ - JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24) -#if defined(__INTPTR_TYPE__) - #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*) -#else - #include - #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*) -#endif -# elif \ - ( \ - defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \ - !defined(JSON_HEDLEY_SUNPRO_VERSION) && \ - !defined(JSON_HEDLEY_PGI_VERSION) && \ - !defined(JSON_HEDLEY_IAR_VERSION)) || \ - (JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) && !defined(JSON_HEDLEY_IAR_VERSION)) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0) -#if defined(__INTPTR_TYPE__) - #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0) -#else - #include - #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0) -#endif -# elif \ - defined(JSON_HEDLEY_GCC_VERSION) || \ - defined(JSON_HEDLEY_INTEL_VERSION) || \ - defined(JSON_HEDLEY_TINYC_VERSION) || \ - defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \ - defined(JSON_HEDLEY_TI_CL2000_VERSION) || \ - defined(JSON_HEDLEY_TI_CL6X_VERSION) || \ - defined(JSON_HEDLEY_TI_CL7X_VERSION) || \ - defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \ - defined(__clang__) -# define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \ - sizeof(void) != \ - sizeof(*( \ - 1 ? \ - ((void*) ((expr) * 0L) ) : \ -((struct { char v[sizeof(void) * 2]; } *) 1) \ - ) \ - ) \ - ) -# endif -#endif -#if defined(JSON_HEDLEY_IS_CONSTEXPR_) - #if !defined(JSON_HEDLEY_IS_CONSTANT) - #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr) - #endif - #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1)) -#else - #if !defined(JSON_HEDLEY_IS_CONSTANT) - #define JSON_HEDLEY_IS_CONSTANT(expr) (0) - #endif - #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr) -#endif - -#if defined(JSON_HEDLEY_BEGIN_C_DECLS) - #undef JSON_HEDLEY_BEGIN_C_DECLS -#endif -#if defined(JSON_HEDLEY_END_C_DECLS) - #undef JSON_HEDLEY_END_C_DECLS -#endif -#if defined(JSON_HEDLEY_C_DECL) - #undef JSON_HEDLEY_C_DECL -#endif -#if defined(__cplusplus) - #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" { - #define JSON_HEDLEY_END_C_DECLS } - #define JSON_HEDLEY_C_DECL extern "C" -#else - #define JSON_HEDLEY_BEGIN_C_DECLS - #define JSON_HEDLEY_END_C_DECLS - #define JSON_HEDLEY_C_DECL -#endif - -#if defined(JSON_HEDLEY_STATIC_ASSERT) - #undef JSON_HEDLEY_STATIC_ASSERT -#endif -#if \ - !defined(__cplusplus) && ( \ - (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \ - (JSON_HEDLEY_HAS_FEATURE(c_static_assert) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - defined(_Static_assert) \ - ) -# define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message) -#elif \ - (defined(__cplusplus) && (__cplusplus >= 201103L)) || \ - JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) -# define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message)) -#else -# define JSON_HEDLEY_STATIC_ASSERT(expr, message) -#endif - -#if defined(JSON_HEDLEY_NULL) - #undef JSON_HEDLEY_NULL -#endif -#if defined(__cplusplus) - #if __cplusplus >= 201103L - #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr) - #elif defined(NULL) - #define JSON_HEDLEY_NULL NULL - #else - #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0) - #endif -#elif defined(NULL) - #define JSON_HEDLEY_NULL NULL -#else - #define JSON_HEDLEY_NULL ((void*) 0) -#endif - -#if defined(JSON_HEDLEY_MESSAGE) - #undef JSON_HEDLEY_MESSAGE -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") -# define JSON_HEDLEY_MESSAGE(msg) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \ - JSON_HEDLEY_PRAGMA(message msg) \ - JSON_HEDLEY_DIAGNOSTIC_POP -#elif \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) -# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg) -#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) -# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg) -#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) -# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg)) -#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0) -# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg)) -#else -# define JSON_HEDLEY_MESSAGE(msg) -#endif - -#if defined(JSON_HEDLEY_WARNING) - #undef JSON_HEDLEY_WARNING -#endif -#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") -# define JSON_HEDLEY_WARNING(msg) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \ - JSON_HEDLEY_PRAGMA(clang warning msg) \ - JSON_HEDLEY_DIAGNOSTIC_POP -#elif \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) -# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg) -#elif \ - JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) -# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg)) -#else -# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg) -#endif - -#if defined(JSON_HEDLEY_REQUIRE) - #undef JSON_HEDLEY_REQUIRE -#endif -#if defined(JSON_HEDLEY_REQUIRE_MSG) - #undef JSON_HEDLEY_REQUIRE_MSG -#endif -#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if) -# if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat") -# define JSON_HEDLEY_REQUIRE(expr) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \ - __attribute__((diagnose_if(!(expr), #expr, "error"))) \ - JSON_HEDLEY_DIAGNOSTIC_POP -# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \ - __attribute__((diagnose_if(!(expr), msg, "error"))) \ - JSON_HEDLEY_DIAGNOSTIC_POP -# else -# define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error"))) -# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error"))) -# endif -#else -# define JSON_HEDLEY_REQUIRE(expr) -# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) -#endif - -#if defined(JSON_HEDLEY_FLAGS) - #undef JSON_HEDLEY_FLAGS -#endif -#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) && (!defined(__cplusplus) || JSON_HEDLEY_HAS_WARNING("-Wbitfield-enum-conversion")) - #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__)) -#else - #define JSON_HEDLEY_FLAGS -#endif - -#if defined(JSON_HEDLEY_FLAGS_CAST) - #undef JSON_HEDLEY_FLAGS_CAST -#endif -#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0) -# define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \ - JSON_HEDLEY_DIAGNOSTIC_PUSH \ - _Pragma("warning(disable:188)") \ - ((T) (expr)); \ - JSON_HEDLEY_DIAGNOSTIC_POP \ - })) -#else -# define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr) -#endif - -#if defined(JSON_HEDLEY_EMPTY_BASES) - #undef JSON_HEDLEY_EMPTY_BASES -#endif -#if \ - (JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)) || \ - JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) - #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases) -#else - #define JSON_HEDLEY_EMPTY_BASES -#endif - -/* Remaining macros are deprecated. */ - -#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK) - #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK -#endif -#if defined(__clang__) - #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0) -#else - #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) -#endif - -#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE) - #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE -#endif -#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) - -#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE) - #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE -#endif -#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) - -#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN) - #undef JSON_HEDLEY_CLANG_HAS_BUILTIN -#endif -#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin) - -#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE) - #undef JSON_HEDLEY_CLANG_HAS_FEATURE -#endif -#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature) - -#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION) - #undef JSON_HEDLEY_CLANG_HAS_EXTENSION -#endif -#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension) - -#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE) - #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE -#endif -#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) - -#if defined(JSON_HEDLEY_CLANG_HAS_WARNING) - #undef JSON_HEDLEY_CLANG_HAS_WARNING -#endif -#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning) - -#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */ - - -// This file contains all internal macro definitions (except those affecting ABI) -// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them - -// #include - - -// exclude unsupported compilers -#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK) - #if defined(__clang__) - #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400 - #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers" - #endif - #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER)) - #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800 - #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers" - #endif - #endif -#endif - -// C++ language standard detection -// if the user manually specified the used c++ version this is skipped -#if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11) - #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L) - #define JSON_HAS_CPP_20 - #define JSON_HAS_CPP_17 - #define JSON_HAS_CPP_14 - #elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464 - #define JSON_HAS_CPP_17 - #define JSON_HAS_CPP_14 - #elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1) - #define JSON_HAS_CPP_14 - #endif - // the cpp 11 flag is always specified because it is the minimal required version - #define JSON_HAS_CPP_11 -#endif - -#ifdef __has_include - #if __has_include() - #include - #endif -#endif - -#if !defined(JSON_HAS_FILESYSTEM) && !defined(JSON_HAS_EXPERIMENTAL_FILESYSTEM) - #ifdef JSON_HAS_CPP_17 - #if defined(__cpp_lib_filesystem) - #define JSON_HAS_FILESYSTEM 1 - #elif defined(__cpp_lib_experimental_filesystem) - #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 - #elif !defined(__has_include) - #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 - #elif __has_include() - #define JSON_HAS_FILESYSTEM 1 - #elif __has_include() - #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 - #endif - - // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/ - #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8 - #undef JSON_HAS_FILESYSTEM - #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM - #endif - - // no filesystem support before GCC 8: https://en.cppreference.com/w/cpp/compiler_support - #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8 - #undef JSON_HAS_FILESYSTEM - #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM - #endif - - // no filesystem support before Clang 7: https://en.cppreference.com/w/cpp/compiler_support - #if defined(__clang_major__) && __clang_major__ < 7 - #undef JSON_HAS_FILESYSTEM - #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM - #endif - - // no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support - #if defined(_MSC_VER) && _MSC_VER < 1914 - #undef JSON_HAS_FILESYSTEM - #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM - #endif - - // no filesystem support before iOS 13 - #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000 - #undef JSON_HAS_FILESYSTEM - #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM - #endif - - // no filesystem support before macOS Catalina - #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500 - #undef JSON_HAS_FILESYSTEM - #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM - #endif - #endif -#endif - -#ifndef JSON_HAS_EXPERIMENTAL_FILESYSTEM - #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 0 -#endif - -#ifndef JSON_HAS_FILESYSTEM - #define JSON_HAS_FILESYSTEM 0 -#endif - -#ifndef JSON_HAS_THREE_WAY_COMPARISON - #if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison >= 201907L \ - && defined(__cpp_lib_three_way_comparison) && __cpp_lib_three_way_comparison >= 201907L - #define JSON_HAS_THREE_WAY_COMPARISON 1 - #else - #define JSON_HAS_THREE_WAY_COMPARISON 0 - #endif -#endif - -#ifndef JSON_HAS_RANGES - // ranges header shipping in GCC 11.1.0 (released 2021-04-27) has syntax error - #if defined(__GLIBCXX__) && __GLIBCXX__ == 20210427 - #define JSON_HAS_RANGES 0 - #elif defined(__cpp_lib_ranges) - #define JSON_HAS_RANGES 1 - #else - #define JSON_HAS_RANGES 0 - #endif -#endif - -#ifdef JSON_HAS_CPP_17 - #define JSON_INLINE_VARIABLE inline -#else - #define JSON_INLINE_VARIABLE -#endif - -#if JSON_HEDLEY_HAS_ATTRIBUTE(no_unique_address) - #define JSON_NO_UNIQUE_ADDRESS [[no_unique_address]] -#else - #define JSON_NO_UNIQUE_ADDRESS -#endif - -// disable documentation warnings on clang -#if defined(__clang__) - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wdocumentation" - #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" -#endif - -// allow disabling exceptions -#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION) - #define JSON_THROW(exception) throw exception - #define JSON_TRY try - #define JSON_CATCH(exception) catch(exception) - #define JSON_INTERNAL_CATCH(exception) catch(exception) -#else - #include - #define JSON_THROW(exception) std::abort() - #define JSON_TRY if(true) - #define JSON_CATCH(exception) if(false) - #define JSON_INTERNAL_CATCH(exception) if(false) -#endif - -// override exception macros -#if defined(JSON_THROW_USER) - #undef JSON_THROW - #define JSON_THROW JSON_THROW_USER -#endif -#if defined(JSON_TRY_USER) - #undef JSON_TRY - #define JSON_TRY JSON_TRY_USER -#endif -#if defined(JSON_CATCH_USER) - #undef JSON_CATCH - #define JSON_CATCH JSON_CATCH_USER - #undef JSON_INTERNAL_CATCH - #define JSON_INTERNAL_CATCH JSON_CATCH_USER -#endif -#if defined(JSON_INTERNAL_CATCH_USER) - #undef JSON_INTERNAL_CATCH - #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER -#endif - -// allow overriding assert -#if !defined(JSON_ASSERT) - #include // assert - #define JSON_ASSERT(x) assert(x) -#endif - -// allow to access some private functions (needed by the test suite) -#if defined(JSON_TESTS_PRIVATE) - #define JSON_PRIVATE_UNLESS_TESTED public -#else - #define JSON_PRIVATE_UNLESS_TESTED private -#endif - -/*! -@brief macro to briefly define a mapping between an enum and JSON -@def NLOHMANN_JSON_SERIALIZE_ENUM -@since version 3.4.0 -*/ -#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...) \ - template \ - inline void to_json(BasicJsonType& j, const ENUM_TYPE& e) \ - { \ - static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ - static const std::pair m[] = __VA_ARGS__; \ - auto it = std::find_if(std::begin(m), std::end(m), \ - [e](const std::pair& ej_pair) -> bool \ - { \ - return ej_pair.first == e; \ - }); \ - j = ((it != std::end(m)) ? it : std::begin(m))->second; \ - } \ - template \ - inline void from_json(const BasicJsonType& j, ENUM_TYPE& e) \ - { \ - static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ - static const std::pair m[] = __VA_ARGS__; \ - auto it = std::find_if(std::begin(m), std::end(m), \ - [&j](const std::pair& ej_pair) -> bool \ - { \ - return ej_pair.second == j; \ - }); \ - e = ((it != std::end(m)) ? it : std::begin(m))->first; \ - } - -// Ugly macros to avoid uglier copy-paste when specializing basic_json. They -// may be removed in the future once the class is split. - -#define NLOHMANN_BASIC_JSON_TPL_DECLARATION \ - template class ObjectType, \ - template class ArrayType, \ - class StringType, class BooleanType, class NumberIntegerType, \ - class NumberUnsignedType, class NumberFloatType, \ - template class AllocatorType, \ - template class JSONSerializer, \ - class BinaryType> - -#define NLOHMANN_BASIC_JSON_TPL \ - basic_json - -// Macros to simplify conversion from/to types - -#define NLOHMANN_JSON_EXPAND( x ) x -#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME -#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \ - NLOHMANN_JSON_PASTE64, \ - NLOHMANN_JSON_PASTE63, \ - NLOHMANN_JSON_PASTE62, \ - NLOHMANN_JSON_PASTE61, \ - NLOHMANN_JSON_PASTE60, \ - NLOHMANN_JSON_PASTE59, \ - NLOHMANN_JSON_PASTE58, \ - NLOHMANN_JSON_PASTE57, \ - NLOHMANN_JSON_PASTE56, \ - NLOHMANN_JSON_PASTE55, \ - NLOHMANN_JSON_PASTE54, \ - NLOHMANN_JSON_PASTE53, \ - NLOHMANN_JSON_PASTE52, \ - NLOHMANN_JSON_PASTE51, \ - NLOHMANN_JSON_PASTE50, \ - NLOHMANN_JSON_PASTE49, \ - NLOHMANN_JSON_PASTE48, \ - NLOHMANN_JSON_PASTE47, \ - NLOHMANN_JSON_PASTE46, \ - NLOHMANN_JSON_PASTE45, \ - NLOHMANN_JSON_PASTE44, \ - NLOHMANN_JSON_PASTE43, \ - NLOHMANN_JSON_PASTE42, \ - NLOHMANN_JSON_PASTE41, \ - NLOHMANN_JSON_PASTE40, \ - NLOHMANN_JSON_PASTE39, \ - NLOHMANN_JSON_PASTE38, \ - NLOHMANN_JSON_PASTE37, \ - NLOHMANN_JSON_PASTE36, \ - NLOHMANN_JSON_PASTE35, \ - NLOHMANN_JSON_PASTE34, \ - NLOHMANN_JSON_PASTE33, \ - NLOHMANN_JSON_PASTE32, \ - NLOHMANN_JSON_PASTE31, \ - NLOHMANN_JSON_PASTE30, \ - NLOHMANN_JSON_PASTE29, \ - NLOHMANN_JSON_PASTE28, \ - NLOHMANN_JSON_PASTE27, \ - NLOHMANN_JSON_PASTE26, \ - NLOHMANN_JSON_PASTE25, \ - NLOHMANN_JSON_PASTE24, \ - NLOHMANN_JSON_PASTE23, \ - NLOHMANN_JSON_PASTE22, \ - NLOHMANN_JSON_PASTE21, \ - NLOHMANN_JSON_PASTE20, \ - NLOHMANN_JSON_PASTE19, \ - NLOHMANN_JSON_PASTE18, \ - NLOHMANN_JSON_PASTE17, \ - NLOHMANN_JSON_PASTE16, \ - NLOHMANN_JSON_PASTE15, \ - NLOHMANN_JSON_PASTE14, \ - NLOHMANN_JSON_PASTE13, \ - NLOHMANN_JSON_PASTE12, \ - NLOHMANN_JSON_PASTE11, \ - NLOHMANN_JSON_PASTE10, \ - NLOHMANN_JSON_PASTE9, \ - NLOHMANN_JSON_PASTE8, \ - NLOHMANN_JSON_PASTE7, \ - NLOHMANN_JSON_PASTE6, \ - NLOHMANN_JSON_PASTE5, \ - NLOHMANN_JSON_PASTE4, \ - NLOHMANN_JSON_PASTE3, \ - NLOHMANN_JSON_PASTE2, \ - NLOHMANN_JSON_PASTE1)(__VA_ARGS__)) -#define NLOHMANN_JSON_PASTE2(func, v1) func(v1) -#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2) -#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3) -#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4) -#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5) -#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6) -#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7) -#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8) -#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9) -#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10) -#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) -#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) -#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) -#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) -#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) -#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) -#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) -#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) -#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) -#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) -#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) -#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) -#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) -#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) -#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) -#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) -#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) -#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) -#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) -#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) -#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) -#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) -#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) -#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) -#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) -#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) -#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) -#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) -#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) -#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) -#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) -#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) -#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) -#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) -#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) -#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) -#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) -#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) -#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) -#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) -#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) -#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) -#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) -#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) -#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) -#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) -#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) -#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) -#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) -#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) -#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) -#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) -#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) - -#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1; -#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1); -#define NLOHMANN_JSON_FROM_WITH_DEFAULT(v1) nlohmann_json_t.v1 = nlohmann_json_j.value(#v1, nlohmann_json_default_obj.v1); - -/*! -@brief macro -@def NLOHMANN_DEFINE_TYPE_INTRUSIVE -@since version 3.9.0 -*/ -#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...) \ - friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } - -#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...) \ - friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { Type nlohmann_json_default_obj; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) } - -/*! -@brief macro -@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE -@since version 3.9.0 -*/ -#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...) \ - inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } - -#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...) \ - inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { Type nlohmann_json_default_obj; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) } - - -// inspired from https://stackoverflow.com/a/26745591 -// allows to call any std function as if (e.g. with begin): -// using std::begin; begin(x); -// -// it allows using the detected idiom to retrieve the return type -// of such an expression -#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name) \ - namespace detail { \ - using std::std_name; \ - \ - template \ - using result_of_##std_name = decltype(std_name(std::declval()...)); \ - } \ - \ - namespace detail2 { \ - struct std_name##_tag \ - { \ - }; \ - \ - template \ - std_name##_tag std_name(T&&...); \ - \ - template \ - using result_of_##std_name = decltype(std_name(std::declval()...)); \ - \ - template \ - struct would_call_std_##std_name \ - { \ - static constexpr auto const value = ::nlohmann::detail:: \ - is_detected_exact::value; \ - }; \ - } /* namespace detail2 */ \ - \ - template \ - struct would_call_std_##std_name : detail2::would_call_std_##std_name \ - { \ - } - -#ifndef JSON_USE_IMPLICIT_CONVERSIONS - #define JSON_USE_IMPLICIT_CONVERSIONS 1 -#endif - -#if JSON_USE_IMPLICIT_CONVERSIONS - #define JSON_EXPLICIT -#else - #define JSON_EXPLICIT explicit -#endif - -#ifndef JSON_DISABLE_ENUM_SERIALIZATION - #define JSON_DISABLE_ENUM_SERIALIZATION 0 -#endif - -#ifndef JSON_USE_GLOBAL_UDLS - #define JSON_USE_GLOBAL_UDLS 1 -#endif - -#if JSON_HAS_THREE_WAY_COMPARISON - #include // partial_ordering -#endif - -NLOHMANN_JSON_NAMESPACE_BEGIN -namespace detail -{ - -/////////////////////////// -// JSON type enumeration // -/////////////////////////// - -/*! -@brief the JSON type enumeration - -This enumeration collects the different JSON types. It is internally used to -distinguish the stored values, and the functions @ref basic_json::is_null(), -@ref basic_json::is_object(), @ref basic_json::is_array(), -@ref basic_json::is_string(), @ref basic_json::is_boolean(), -@ref basic_json::is_number() (with @ref basic_json::is_number_integer(), -@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()), -@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and -@ref basic_json::is_structured() rely on it. - -@note There are three enumeration entries (number_integer, number_unsigned, and -number_float), because the library distinguishes these three types for numbers: -@ref basic_json::number_unsigned_t is used for unsigned integers, -@ref basic_json::number_integer_t is used for signed integers, and -@ref basic_json::number_float_t is used for floating-point numbers or to -approximate integers which do not fit in the limits of their respective type. - -@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON -value with the default value for a given type - -@since version 1.0.0 -*/ -enum class value_t : std::uint8_t -{ - null, ///< null value - object, ///< object (unordered set of name/value pairs) - array, ///< array (ordered collection of values) - string, ///< string value - boolean, ///< boolean value - number_integer, ///< number value (signed integer) - number_unsigned, ///< number value (unsigned integer) - number_float, ///< number value (floating-point) - binary, ///< binary array (ordered collection of bytes) - discarded ///< discarded by the parser callback function -}; - -/*! -@brief comparison operator for JSON types - -Returns an ordering that is similar to Python: -- order: null < boolean < number < object < array < string < binary -- furthermore, each type is not smaller than itself -- discarded values are not comparable -- binary is represented as a b"" string in python and directly comparable to a - string; however, making a binary array directly comparable with a string would - be surprising behavior in a JSON file. - -@since version 1.0.0 -*/ -#if JSON_HAS_THREE_WAY_COMPARISON - inline std::partial_ordering operator<=>(const value_t lhs, const value_t rhs) noexcept // *NOPAD* -#else - inline bool operator<(const value_t lhs, const value_t rhs) noexcept -#endif -{ - static constexpr std::array order = {{ - 0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */, - 1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */, - 6 /* binary */ - } - }; - - const auto l_index = static_cast(lhs); - const auto r_index = static_cast(rhs); -#if JSON_HAS_THREE_WAY_COMPARISON - if (l_index < order.size() && r_index < order.size()) - { - return order[l_index] <=> order[r_index]; // *NOPAD* - } - return std::partial_ordering::unordered; -#else - return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index]; -#endif -} - -// GCC selects the built-in operator< over an operator rewritten from -// a user-defined spaceship operator -// Clang, MSVC, and ICC select the rewritten candidate -// (see GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105200) -#if JSON_HAS_THREE_WAY_COMPARISON && defined(__GNUC__) -inline bool operator<(const value_t lhs, const value_t rhs) noexcept -{ - return std::is_lt(lhs <=> rhs); // *NOPAD* -} -#endif - -} // namespace detail -NLOHMANN_JSON_NAMESPACE_END - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -// #include - - -NLOHMANN_JSON_NAMESPACE_BEGIN -namespace detail -{ - -/*! -@brief replace all occurrences of a substring by another string - -@param[in,out] s the string to manipulate; changed so that all - occurrences of @a f are replaced with @a t -@param[in] f the substring to replace with @a t -@param[in] t the string to replace @a f - -@pre The search string @a f must not be empty. **This precondition is -enforced with an assertion.** - -@since version 2.0.0 -*/ -template -inline void replace_substring(StringType& s, const StringType& f, - const StringType& t) -{ - JSON_ASSERT(!f.empty()); - for (auto pos = s.find(f); // find first occurrence of f - pos != StringType::npos; // make sure f was found - s.replace(pos, f.size(), t), // replace with t, and - pos = s.find(f, pos + t.size())) // find next occurrence of f - {} -} - -/*! - * @brief string escaping as described in RFC 6901 (Sect. 4) - * @param[in] s string to escape - * @return escaped string - * - * Note the order of escaping "~" to "~0" and "/" to "~1" is important. - */ -template -inline StringType escape(StringType s) -{ - replace_substring(s, StringType{"~"}, StringType{"~0"}); - replace_substring(s, StringType{"/"}, StringType{"~1"}); - return s; -} - -/*! - * @brief string unescaping as described in RFC 6901 (Sect. 4) - * @param[in] s string to unescape - * @return unescaped string - * - * Note the order of escaping "~1" to "/" and "~0" to "~" is important. - */ -template -static void unescape(StringType& s) -{ - replace_substring(s, StringType{"~1"}, StringType{"/"}); - replace_substring(s, StringType{"~0"}, StringType{"~"}); -} - -} // namespace detail -NLOHMANN_JSON_NAMESPACE_END - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include // size_t - -// #include - - -NLOHMANN_JSON_NAMESPACE_BEGIN -namespace detail -{ - -/// struct to capture the start position of the current token -struct position_t -{ - /// the total number of characters read - std::size_t chars_read_total = 0; - /// the number of characters read in the current line - std::size_t chars_read_current_line = 0; - /// the number of lines read - std::size_t lines_read = 0; - - /// conversion to size_t to preserve SAX interface - constexpr operator size_t() const - { - return chars_read_total; - } -}; - -} // namespace detail -NLOHMANN_JSON_NAMESPACE_END - -// #include - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-FileCopyrightText: 2018 The Abseil Authors -// SPDX-License-Identifier: MIT - - - -#include // array -#include // size_t -#include // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type -#include // index_sequence, make_index_sequence, index_sequence_for - -// #include - - -NLOHMANN_JSON_NAMESPACE_BEGIN -namespace detail -{ - -template -using uncvref_t = typename std::remove_cv::type>::type; - -#ifdef JSON_HAS_CPP_14 - -// the following utilities are natively available in C++14 -using std::enable_if_t; -using std::index_sequence; -using std::make_index_sequence; -using std::index_sequence_for; - -#else - -// alias templates to reduce boilerplate -template -using enable_if_t = typename std::enable_if::type; - -// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h -// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0. - -//// START OF CODE FROM GOOGLE ABSEIL - -// integer_sequence -// -// Class template representing a compile-time integer sequence. An instantiation -// of `integer_sequence` has a sequence of integers encoded in its -// type through its template arguments (which is a common need when -// working with C++11 variadic templates). `absl::integer_sequence` is designed -// to be a drop-in replacement for C++14's `std::integer_sequence`. -// -// Example: -// -// template< class T, T... Ints > -// void user_function(integer_sequence); -// -// int main() -// { -// // user_function's `T` will be deduced to `int` and `Ints...` -// // will be deduced to `0, 1, 2, 3, 4`. -// user_function(make_integer_sequence()); -// } -template -struct integer_sequence -{ - using value_type = T; - static constexpr std::size_t size() noexcept - { - return sizeof...(Ints); - } -}; - -// index_sequence -// -// A helper template for an `integer_sequence` of `size_t`, -// `absl::index_sequence` is designed to be a drop-in replacement for C++14's -// `std::index_sequence`. -template -using index_sequence = integer_sequence; - -namespace utility_internal -{ - -template -struct Extend; - -// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency. -template -struct Extend, SeqSize, 0> -{ - using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >; -}; - -template -struct Extend, SeqSize, 1> -{ - using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >; -}; - -// Recursion helper for 'make_integer_sequence'. -// 'Gen::type' is an alias for 'integer_sequence'. -template -struct Gen -{ - using type = - typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type; -}; - -template -struct Gen -{ - using type = integer_sequence; -}; - -} // namespace utility_internal - -// Compile-time sequences of integers - -// make_integer_sequence -// -// This template alias is equivalent to -// `integer_sequence`, and is designed to be a drop-in -// replacement for C++14's `std::make_integer_sequence`. -template -using make_integer_sequence = typename utility_internal::Gen::type; - -// make_index_sequence -// -// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`, -// and is designed to be a drop-in replacement for C++14's -// `std::make_index_sequence`. -template -using make_index_sequence = make_integer_sequence; - -// index_sequence_for -// -// Converts a typename pack into an index sequence of the same length, and -// is designed to be a drop-in replacement for C++14's -// `std::index_sequence_for()` -template -using index_sequence_for = make_index_sequence; - -//// END OF CODE FROM GOOGLE ABSEIL - -#endif - -// dispatch utility (taken from ranges-v3) -template struct priority_tag : priority_tag < N - 1 > {}; -template<> struct priority_tag<0> {}; - -// taken from ranges-v3 -template -struct static_const -{ - static JSON_INLINE_VARIABLE constexpr T value{}; -}; - -#ifndef JSON_HAS_CPP_17 - template - constexpr T static_const::value; -#endif - -template -inline constexpr std::array make_array(Args&& ... args) -{ - return std::array {{static_cast(std::forward(args))...}}; -} - -} // namespace detail -NLOHMANN_JSON_NAMESPACE_END - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include // numeric_limits -#include // false_type, is_constructible, is_integral, is_same, true_type -#include // declval -#include // tuple - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -#include // random_access_iterator_tag - -// #include - -// #include - -// #include - - -NLOHMANN_JSON_NAMESPACE_BEGIN -namespace detail -{ - -template -struct iterator_types {}; - -template -struct iterator_types < - It, - void_t> -{ - using difference_type = typename It::difference_type; - using value_type = typename It::value_type; - using pointer = typename It::pointer; - using reference = typename It::reference; - using iterator_category = typename It::iterator_category; -}; - -// This is required as some compilers implement std::iterator_traits in a way that -// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341. -template -struct iterator_traits -{ -}; - -template -struct iterator_traits < T, enable_if_t < !std::is_pointer::value >> - : iterator_types -{ -}; - -template -struct iterator_traits::value>> -{ - using iterator_category = std::random_access_iterator_tag; - using value_type = T; - using difference_type = ptrdiff_t; - using pointer = T*; - using reference = T&; -}; - -} // namespace detail -NLOHMANN_JSON_NAMESPACE_END - -// #include - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -// #include - - -NLOHMANN_JSON_NAMESPACE_BEGIN - -NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin); - -NLOHMANN_JSON_NAMESPACE_END - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - - - -// #include - - -NLOHMANN_JSON_NAMESPACE_BEGIN - -NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end); - -NLOHMANN_JSON_NAMESPACE_END - -// #include - -// #include - -// #include -// __ _____ _____ _____ -// __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.2 -// |_____|_____|_____|_|___| https://github.com/nlohmann/json -// -// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann -// SPDX-License-Identifier: MIT - -#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_ - #define INCLUDE_NLOHMANN_JSON_FWD_HPP_ - - #include // int64_t, uint64_t - #include // map - #include // allocator - #include // string - #include // vector - - // #include - - - /*! - @brief namespace for Niels Lohmann - @see https://github.com/nlohmann - @since version 1.0.0 - */ - NLOHMANN_JSON_NAMESPACE_BEGIN - - /*! - @brief default JSONSerializer template argument - - This serializer ignores the template arguments and uses ADL - ([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl)) - for serialization. - */ - template - struct adl_serializer; - - /// a class to store JSON values - /// @sa https://json.nlohmann.me/api/basic_json/ - template class ObjectType = - std::map, - template class ArrayType = std::vector, - class StringType = std::string, class BooleanType = bool, - class NumberIntegerType = std::int64_t, - class NumberUnsignedType = std::uint64_t, - class NumberFloatType = double, - template class AllocatorType = std::allocator, - template class JSONSerializer = - adl_serializer, - class BinaryType = std::vector> - class basic_json; - - /// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document - /// @sa https://json.nlohmann.me/api/json_pointer/ - template - class json_pointer; - - /*! - @brief default specialization - @sa https://json.nlohmann.me/api/json/ - */ - using json = basic_json<>; - - /// @brief a minimal map-like container that preserves insertion order - /// @sa https://json.nlohmann.me/api/ordered_map/ - template - struct ordered_map; - - /// @brief specialization that maintains the insertion order of object keys - /// @sa https://json.nlohmann.me/api/ordered_json/ - using ordered_json = basic_json; - - NLOHMANN_JSON_NAMESPACE_END - -#endif // INCLUDE_NLOHMANN_JSON_FWD_HPP_ - - -NLOHMANN_JSON_NAMESPACE_BEGIN -/*! -@brief detail namespace with internal helper functions - -This namespace collects functions that should not be exposed, -implementations of some @ref basic_json methods, and meta-programming helpers. - -@since version 2.1.0 -*/ -namespace detail -{ - -///////////// -// helpers // -///////////// - -// Note to maintainers: -// -// Every trait in this file expects a non CV-qualified type. -// The only exceptions are in the 'aliases for detected' section -// (i.e. those of the form: decltype(T::member_function(std::declval()))) -// -// In this case, T has to be properly CV-qualified to constraint the function arguments -// (e.g. to_json(BasicJsonType&, const T&)) - -template struct is_basic_json : std::false_type {}; - -NLOHMANN_BASIC_JSON_TPL_DECLARATION -struct is_basic_json : std::true_type {}; - -// used by exceptions create() member functions -// true_type for pointer to possibly cv-qualified basic_json or std::nullptr_t -// false_type otherwise -template -struct is_basic_json_context : - std::integral_constant < bool, - is_basic_json::type>::type>::value - || std::is_same::value > -{}; - -////////////////////// -// json_ref helpers // -////////////////////// - -template -class json_ref; - -template -struct is_json_ref : std::false_type {}; - -template -struct is_json_ref> : std::true_type {}; - -////////////////////////// -// aliases for detected // -////////////////////////// - -template -using mapped_type_t = typename T::mapped_type; - -template -using key_type_t = typename T::key_type; - -template -using value_type_t = typename T::value_type; - -template -using difference_type_t = typename T::difference_type; - -template -using pointer_t = typename T::pointer; - -template -using reference_t = typename T::reference; - -template -using iterator_category_t = typename T::iterator_category; - -template -using to_json_function = decltype(T::to_json(std::declval()...)); - -template -using from_json_function = decltype(T::from_json(std::declval()...)); - -template -using get_template_function = decltype(std::declval().template get()); - -// trait checking if JSONSerializer::from_json(json const&, udt&) exists -template -struct has_from_json : std::false_type {}; - -// trait checking if j.get is valid -// use this trait instead of std::is_constructible or std::is_convertible, -// both rely on, or make use of implicit conversions, and thus fail when T -// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958) -template -struct is_getable -{ - static constexpr bool value = is_detected::value; -}; - -template -struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> -{ - using serializer = typename BasicJsonType::template json_serializer; - - static constexpr bool value = - is_detected_exact::value; -}; - -// This trait checks if JSONSerializer::from_json(json const&) exists -// this overload is used for non-default-constructible user-defined-types -template -struct has_non_default_from_json : std::false_type {}; - -template -struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> -{ - using serializer = typename BasicJsonType::template json_serializer; - - static constexpr bool value = - is_detected_exact::value; -}; - -// This trait checks if BasicJsonType::json_serializer::to_json exists -// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion. -template -struct has_to_json : std::false_type {}; - -template -struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> -{ - using serializer = typename BasicJsonType::template json_serializer; - - static constexpr bool value = - is_detected_exact::value; -}; - -template -using detect_key_compare = typename T::key_compare; - -template -struct has_key_compare : std::integral_constant::value> {}; - -// obtains the actual object key comparator -template -struct actual_object_comparator -{ - using object_t = typename BasicJsonType::object_t; - using object_comparator_t = typename BasicJsonType::default_object_comparator_t; - using type = typename std::conditional < has_key_compare::value, - typename object_t::key_compare, object_comparator_t>::type; -}; - -template -using actual_object_comparator_t = typename actual_object_comparator::type; - -/////////////////// -// is_ functions // -/////////////////// - -// https://en.cppreference.com/w/cpp/types/conjunction -template struct conjunction : std::true_type { }; -template struct conjunction : B { }; -template -struct conjunction -: std::conditional(B::value), conjunction, B>::type {}; - -// https://en.cppreference.com/w/cpp/types/negation -template struct negation : std::integral_constant < bool, !B::value > { }; - -// Reimplementation of is_constructible and is_default_constructible, due to them being broken for -// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367). -// This causes compile errors in e.g. clang 3.5 or gcc 4.9. -template -struct is_default_constructible : std::is_default_constructible {}; - -template -struct is_default_constructible> - : conjunction, is_default_constructible> {}; - -template -struct is_default_constructible> - : conjunction, is_default_constructible> {}; - -template -struct is_default_constructible> - : conjunction...> {}; - -template -struct is_default_constructible> - : conjunction...> {}; - - -template -struct is_constructible : std::is_constructible {}; - -template -struct is_constructible> : is_default_constructible> {}; - -template -struct is_constructible> : is_default_constructible> {}; - -template -struct is_constructible> : is_default_constructible> {}; - -template -struct is_constructible> : is_default_constructible> {}; - - -template -struct is_iterator_traits : std::false_type {}; - -template -struct is_iterator_traits> -{ - private: - using traits = iterator_traits; - - public: - static constexpr auto value = - is_detected::value && - is_detected::value && - is_detected::value && - is_detected::value && - is_detected::value; -}; - -template -struct is_range -{ - private: - using t_ref = typename std::add_lvalue_reference::type; - - using iterator = detected_t; - using sentinel = detected_t; - - // to be 100% correct, it should use https://en.cppreference.com/w/cpp/iterator/input_or_output_iterator - // and https://en.cppreference.com/w/cpp/iterator/sentinel_for - // but reimplementing these would be too much work, as a lot of other concepts are used underneath - static constexpr auto is_iterator_begin = - is_iterator_traits>::value; - - public: - static constexpr bool value = !std::is_same::value && !std::is_same::value && is_iterator_begin; -}; - -template -using iterator_t = enable_if_t::value, result_of_begin())>>; - -template -using range_value_t = value_type_t>>; - -// The following implementation of is_complete_type is taken from -// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/ -// and is written by Xiang Fan who agreed to using it in this library. - -template -struct is_complete_type : std::false_type {}; - -template -struct is_complete_type : std::true_type {}; - -template -struct is_compatible_object_type_impl : std::false_type {}; - -template -struct is_compatible_object_type_impl < - BasicJsonType, CompatibleObjectType, - enable_if_t < is_detected::value&& - is_detected::value >> -{ - using object_t = typename BasicJsonType::object_t; - - // macOS's is_constructible does not play well with nonesuch... - static constexpr bool value = - is_constructible::value && - is_constructible::value; -}; - -template -struct is_compatible_object_type - : is_compatible_object_type_impl {}; - -template -struct is_constructible_object_type_impl : std::false_type {}; - -template -struct is_constructible_object_type_impl < - BasicJsonType, ConstructibleObjectType, - enable_if_t < is_detected::value&& - is_detected::value >> -{ - using object_t = typename BasicJsonType::object_t; - - static constexpr bool value = - (is_default_constructible::value && - (std::is_move_assignable::value || - std::is_copy_assignable::value) && - (is_constructible::value && - std::is_same < - typename object_t::mapped_type, - typename ConstructibleObjectType::mapped_type >::value)) || - (has_from_json::value || - has_non_default_from_json < - BasicJsonType, - typename ConstructibleObjectType::mapped_type >::value); -}; - -template -struct is_constructible_object_type - : is_constructible_object_type_impl {}; - -template -struct is_compatible_string_type -{ - static constexpr auto value = - is_constructible::value; -}; - -template -struct is_constructible_string_type -{ - // launder type through decltype() to fix compilation failure on ICPC -#ifdef __INTEL_COMPILER - using laundered_type = decltype(std::declval()); -#else - using laundered_type = ConstructibleStringType; -#endif - - static constexpr auto value = - conjunction < - is_constructible, - is_detected_exact>::value; -}; - -template -struct is_compatible_array_type_impl : std::false_type {}; - -template -struct is_compatible_array_type_impl < - BasicJsonType, CompatibleArrayType, - enable_if_t < - is_detected::value&& - is_iterator_traits>>::value&& -// special case for types like std::filesystem::path whose iterator's value_type are themselves -// c.f. https://github.com/nlohmann/json/pull/3073 - !std::is_same>::value >> -{ - static constexpr bool value = - is_constructible>::value; -}; - -template -struct is_compatible_array_type - : is_compatible_array_type_impl {}; - -template -struct is_constructible_array_type_impl : std::false_type {}; - -template -struct is_constructible_array_type_impl < - BasicJsonType, ConstructibleArrayType, - enable_if_t::value >> - : std::true_type {}; - -template -struct is_constructible_array_type_impl < - BasicJsonType, ConstructibleArrayType, - enable_if_t < !std::is_same::value&& - !is_compatible_string_type::value&& - is_default_constructible::value&& -(std::is_move_assignable::value || - std::is_copy_assignable::value)&& -is_detected::value&& -is_iterator_traits>>::value&& -is_detected::value&& -// special case for types like std::filesystem::path whose iterator's value_type are themselves -// c.f. https://github.com/nlohmann/json/pull/3073 -!std::is_same>::value&& - is_complete_type < - detected_t>::value >> -{ - using value_type = range_value_t; - - static constexpr bool value = - std::is_same::value || - has_from_json::value || - has_non_default_from_json < - BasicJsonType, - value_type >::value; -}; - -template -struct is_constructible_array_type - : is_constructible_array_type_impl {}; - -template -struct is_compatible_integer_type_impl : std::false_type {}; - -template -struct is_compatible_integer_type_impl < - RealIntegerType, CompatibleNumberIntegerType, - enable_if_t < std::is_integral::value&& - std::is_integral::value&& - !std::is_same::value >> -{ - // is there an assert somewhere on overflows? - using RealLimits = std::numeric_limits; - using CompatibleLimits = std::numeric_limits; - - static constexpr auto value = - is_constructible::value && - CompatibleLimits::is_integer && - RealLimits::is_signed == CompatibleLimits::is_signed; -}; - -template -struct is_compatible_integer_type - : is_compatible_integer_type_impl {}; - -template -struct is_compatible_type_impl: std::false_type {}; - -template -struct is_compatible_type_impl < - BasicJsonType, CompatibleType, - enable_if_t::value >> -{ - static constexpr bool value = - has_to_json::value; -}; - -template -struct is_compatible_type - : is_compatible_type_impl {}; - -template -struct is_constructible_tuple : std::false_type {}; - -template -struct is_constructible_tuple> : conjunction...> {}; - -template -struct is_json_iterator_of : std::false_type {}; - -template -struct is_json_iterator_of : std::true_type {}; - -template -struct is_json_iterator_of : std::true_type -{}; - -// checks if a given type T is a template specialization of Primary -template