diff --git a/libs/fiber/build/Jamfile.v2 b/build/Jamfile.v2
similarity index 100%
rename from libs/fiber/build/Jamfile.v2
rename to build/Jamfile.v2
diff --git a/libs/fiber/doc/Jamfile.v2 b/doc/Jamfile.v2
similarity index 100%
rename from libs/fiber/doc/Jamfile.v2
rename to doc/Jamfile.v2
diff --git a/libs/fiber/doc/acknowledgements.qbk b/doc/acknowledgements.qbk
similarity index 100%
rename from libs/fiber/doc/acknowledgements.qbk
rename to doc/acknowledgements.qbk
diff --git a/libs/fiber/doc/barrier.qbk b/doc/barrier.qbk
similarity index 100%
rename from libs/fiber/doc/barrier.qbk
rename to doc/barrier.qbk
diff --git a/libs/fiber/doc/channel.qbk b/doc/channel.qbk
similarity index 100%
rename from libs/fiber/doc/channel.qbk
rename to doc/channel.qbk
diff --git a/libs/fiber/doc/condition_variables.qbk b/doc/condition_variables.qbk
similarity index 100%
rename from libs/fiber/doc/condition_variables.qbk
rename to doc/condition_variables.qbk
diff --git a/libs/fiber/doc/event_variables.qbk b/doc/event_variables.qbk
similarity index 100%
rename from libs/fiber/doc/event_variables.qbk
rename to doc/event_variables.qbk
diff --git a/libs/fiber/doc/fiber.qbk b/doc/fiber.qbk
similarity index 100%
rename from libs/fiber/doc/fiber.qbk
rename to doc/fiber.qbk
diff --git a/libs/fiber/doc/fibers.qbk b/doc/fibers.qbk
similarity index 100%
rename from libs/fiber/doc/fibers.qbk
rename to doc/fibers.qbk
diff --git a/libs/fiber/doc/future.qbk b/doc/future.qbk
similarity index 100%
rename from libs/fiber/doc/future.qbk
rename to doc/future.qbk
diff --git a/libs/fiber/doc/mutexes.qbk b/doc/mutexes.qbk
similarity index 100%
rename from libs/fiber/doc/mutexes.qbk
rename to doc/mutexes.qbk
diff --git a/libs/fiber/doc/overview.qbk b/doc/overview.qbk
similarity index 100%
rename from libs/fiber/doc/overview.qbk
rename to doc/overview.qbk
diff --git a/libs/fiber/doc/stratified.qbk b/doc/stratified.qbk
similarity index 100%
rename from libs/fiber/doc/stratified.qbk
rename to doc/stratified.qbk
diff --git a/libs/fiber/doc/stratum.qbk b/doc/stratum.qbk
similarity index 100%
rename from libs/fiber/doc/stratum.qbk
rename to doc/stratum.qbk
diff --git a/libs/fiber/doc/synchronization.qbk b/doc/synchronization.qbk
similarity index 100%
rename from libs/fiber/doc/synchronization.qbk
rename to doc/synchronization.qbk
diff --git a/libs/fiber/doc/todo.qbk b/doc/todo.qbk
similarity index 100%
rename from libs/fiber/doc/todo.qbk
rename to doc/todo.qbk
diff --git a/libs/fiber/examples/Jamfile.v2 b/examples/Jamfile.v2
similarity index 100%
rename from libs/fiber/examples/Jamfile.v2
rename to examples/Jamfile.v2
diff --git a/libs/fiber/examples/asio/host.cpp b/examples/asio/host.cpp
similarity index 100%
rename from libs/fiber/examples/asio/host.cpp
rename to examples/asio/host.cpp
diff --git a/libs/fiber/examples/barrier.cpp b/examples/barrier.cpp
similarity index 100%
rename from libs/fiber/examples/barrier.cpp
rename to examples/barrier.cpp
diff --git a/libs/fiber/examples/future.cpp b/examples/future.cpp
similarity index 100%
rename from libs/fiber/examples/future.cpp
rename to examples/future.cpp
diff --git a/libs/fiber/examples/join.cpp b/examples/join.cpp
similarity index 100%
rename from libs/fiber/examples/join.cpp
rename to examples/join.cpp
diff --git a/libs/fiber/examples/ping_pong.cpp b/examples/ping_pong.cpp
similarity index 100%
rename from libs/fiber/examples/ping_pong.cpp
rename to examples/ping_pong.cpp
diff --git a/libs/fiber/examples/simple.cpp b/examples/simple.cpp
similarity index 100%
rename from libs/fiber/examples/simple.cpp
rename to examples/simple.cpp
diff --git a/libs/fiber/examples/wait_all.cpp b/examples/wait_all.cpp
similarity index 100%
rename from libs/fiber/examples/wait_all.cpp
rename to examples/wait_all.cpp
diff --git a/libs/fiber/examples/wait_any.cpp b/examples/wait_any.cpp
similarity index 100%
rename from libs/fiber/examples/wait_any.cpp
rename to examples/wait_any.cpp
diff --git a/libs/fiber/examples/wait_any_cancel.cpp b/examples/wait_any_cancel.cpp
similarity index 100%
rename from libs/fiber/examples/wait_any_cancel.cpp
rename to examples/wait_any_cancel.cpp
diff --git a/boost/fiber/all.hpp b/include/boost/fiber/all.hpp
similarity index 100%
rename from boost/fiber/all.hpp
rename to include/boost/fiber/all.hpp
diff --git a/boost/fiber/attributes.hpp b/include/boost/fiber/attributes.hpp
similarity index 100%
rename from boost/fiber/attributes.hpp
rename to include/boost/fiber/attributes.hpp
diff --git a/boost/fiber/auto_reset_event.hpp b/include/boost/fiber/auto_reset_event.hpp
similarity index 100%
rename from boost/fiber/auto_reset_event.hpp
rename to include/boost/fiber/auto_reset_event.hpp
diff --git a/boost/fiber/barrier.hpp b/include/boost/fiber/barrier.hpp
similarity index 100%
rename from boost/fiber/barrier.hpp
rename to include/boost/fiber/barrier.hpp
diff --git a/boost/fiber/bounded_channel.hpp b/include/boost/fiber/bounded_channel.hpp
similarity index 100%
rename from boost/fiber/bounded_channel.hpp
rename to include/boost/fiber/bounded_channel.hpp
diff --git a/boost/fiber/condition.hpp b/include/boost/fiber/condition.hpp
similarity index 100%
rename from boost/fiber/condition.hpp
rename to include/boost/fiber/condition.hpp
diff --git a/boost/fiber/count_down_event.hpp b/include/boost/fiber/count_down_event.hpp
similarity index 100%
rename from boost/fiber/count_down_event.hpp
rename to include/boost/fiber/count_down_event.hpp
diff --git a/boost/fiber/detail/config.hpp b/include/boost/fiber/detail/config.hpp
similarity index 100%
rename from boost/fiber/detail/config.hpp
rename to include/boost/fiber/detail/config.hpp
diff --git a/boost/fiber/detail/delete.hpp b/include/boost/fiber/detail/delete.hpp
similarity index 100%
rename from boost/fiber/detail/delete.hpp
rename to include/boost/fiber/detail/delete.hpp
diff --git a/boost/fiber/detail/fiber_base.hpp b/include/boost/fiber/detail/fiber_base.hpp
similarity index 100%
rename from boost/fiber/detail/fiber_base.hpp
rename to include/boost/fiber/detail/fiber_base.hpp
diff --git a/boost/fiber/detail/fiber_object.hpp b/include/boost/fiber/detail/fiber_object.hpp
similarity index 100%
rename from boost/fiber/detail/fiber_object.hpp
rename to include/boost/fiber/detail/fiber_object.hpp
diff --git a/boost/fiber/detail/flags.hpp b/include/boost/fiber/detail/flags.hpp
similarity index 100%
rename from boost/fiber/detail/flags.hpp
rename to include/boost/fiber/detail/flags.hpp
diff --git a/boost/fiber/detail/future_traits.hpp b/include/boost/fiber/detail/future_traits.hpp
similarity index 100%
rename from boost/fiber/detail/future_traits.hpp
rename to include/boost/fiber/detail/future_traits.hpp
diff --git a/boost/fiber/detail/id.hpp b/include/boost/fiber/detail/id.hpp
similarity index 100%
rename from boost/fiber/detail/id.hpp
rename to include/boost/fiber/detail/id.hpp
diff --git a/boost/fiber/detail/interrupt_flags.hpp b/include/boost/fiber/detail/interrupt_flags.hpp
similarity index 100%
rename from boost/fiber/detail/interrupt_flags.hpp
rename to include/boost/fiber/detail/interrupt_flags.hpp
diff --git a/boost/fiber/detail/move.hpp b/include/boost/fiber/detail/move.hpp
similarity index 100%
rename from boost/fiber/detail/move.hpp
rename to include/boost/fiber/detail/move.hpp
diff --git a/boost/fiber/detail/scheduler.hpp b/include/boost/fiber/detail/scheduler.hpp
similarity index 100%
rename from boost/fiber/detail/scheduler.hpp
rename to include/boost/fiber/detail/scheduler.hpp
diff --git a/boost/fiber/detail/stack_allocator_posix.hpp b/include/boost/fiber/detail/stack_allocator_posix.hpp
similarity index 100%
rename from boost/fiber/detail/stack_allocator_posix.hpp
rename to include/boost/fiber/detail/stack_allocator_posix.hpp
diff --git a/boost/fiber/detail/stack_allocator_windows.hpp b/include/boost/fiber/detail/stack_allocator_windows.hpp
similarity index 100%
rename from boost/fiber/detail/stack_allocator_windows.hpp
rename to include/boost/fiber/detail/stack_allocator_windows.hpp
diff --git a/boost/fiber/exceptions.hpp b/include/boost/fiber/exceptions.hpp
similarity index 100%
rename from boost/fiber/exceptions.hpp
rename to include/boost/fiber/exceptions.hpp
diff --git a/boost/fiber/fiber.hpp b/include/boost/fiber/fiber.hpp
similarity index 100%
rename from boost/fiber/fiber.hpp
rename to include/boost/fiber/fiber.hpp
diff --git a/boost/fiber/flags.hpp b/include/boost/fiber/flags.hpp
similarity index 100%
rename from boost/fiber/flags.hpp
rename to include/boost/fiber/flags.hpp
diff --git a/boost/fiber/future.hpp b/include/boost/fiber/future.hpp
similarity index 100%
rename from boost/fiber/future.hpp
rename to include/boost/fiber/future.hpp
diff --git a/boost/fiber/interruption.hpp b/include/boost/fiber/interruption.hpp
similarity index 100%
rename from boost/fiber/interruption.hpp
rename to include/boost/fiber/interruption.hpp
diff --git a/boost/fiber/manual_reset_event.hpp b/include/boost/fiber/manual_reset_event.hpp
similarity index 100%
rename from boost/fiber/manual_reset_event.hpp
rename to include/boost/fiber/manual_reset_event.hpp
diff --git a/boost/fiber/mutex.hpp b/include/boost/fiber/mutex.hpp
similarity index 100%
rename from boost/fiber/mutex.hpp
rename to include/boost/fiber/mutex.hpp
diff --git a/boost/fiber/operations.hpp b/include/boost/fiber/operations.hpp
similarity index 100%
rename from boost/fiber/operations.hpp
rename to include/boost/fiber/operations.hpp
diff --git a/boost/fiber/stack_allocator.hpp b/include/boost/fiber/stack_allocator.hpp
similarity index 100%
rename from boost/fiber/stack_allocator.hpp
rename to include/boost/fiber/stack_allocator.hpp
diff --git a/boost/fiber/unbounded_channel.hpp b/include/boost/fiber/unbounded_channel.hpp
similarity index 100%
rename from boost/fiber/unbounded_channel.hpp
rename to include/boost/fiber/unbounded_channel.hpp
diff --git a/libs/fiber/src/auto_reset_event.cpp b/src/auto_reset_event.cpp
similarity index 100%
rename from libs/fiber/src/auto_reset_event.cpp
rename to src/auto_reset_event.cpp
diff --git a/libs/fiber/src/barrier.cpp b/src/barrier.cpp
similarity index 100%
rename from libs/fiber/src/barrier.cpp
rename to src/barrier.cpp
diff --git a/libs/fiber/src/condition.cpp b/src/condition.cpp
similarity index 100%
rename from libs/fiber/src/condition.cpp
rename to src/condition.cpp
diff --git a/libs/fiber/src/count_down_event.cpp b/src/count_down_event.cpp
similarity index 100%
rename from libs/fiber/src/count_down_event.cpp
rename to src/count_down_event.cpp
diff --git a/libs/fiber/src/detail/fiber_base.cpp b/src/detail/fiber_base.cpp
similarity index 100%
rename from libs/fiber/src/detail/fiber_base.cpp
rename to src/detail/fiber_base.cpp
diff --git a/libs/fiber/src/detail/scheduler.cpp b/src/detail/scheduler.cpp
similarity index 100%
rename from libs/fiber/src/detail/scheduler.cpp
rename to src/detail/scheduler.cpp
diff --git a/libs/fiber/src/fiber.cpp b/src/fiber.cpp
similarity index 100%
rename from libs/fiber/src/fiber.cpp
rename to src/fiber.cpp
diff --git a/libs/fiber/src/manual_reset_event.cpp b/src/manual_reset_event.cpp
similarity index 100%
rename from libs/fiber/src/manual_reset_event.cpp
rename to src/manual_reset_event.cpp
diff --git a/libs/fiber/src/mutex.cpp b/src/mutex.cpp
similarity index 100%
rename from libs/fiber/src/mutex.cpp
rename to src/mutex.cpp
diff --git a/libs/fiber/test/Jamfile.v2 b/test/Jamfile.v2
similarity index 100%
rename from libs/fiber/test/Jamfile.v2
rename to test/Jamfile.v2
diff --git a/libs/fiber/test/test_auto_reset_event.cpp b/test/test_auto_reset_event.cpp
similarity index 100%
rename from libs/fiber/test/test_auto_reset_event.cpp
rename to test/test_auto_reset_event.cpp
diff --git a/libs/fiber/test/test_barrier.cpp b/test/test_barrier.cpp
similarity index 100%
rename from libs/fiber/test/test_barrier.cpp
rename to test/test_barrier.cpp
diff --git a/libs/fiber/test/test_condition.cpp b/test/test_condition.cpp
similarity index 100%
rename from libs/fiber/test/test_condition.cpp
rename to test/test_condition.cpp
diff --git a/libs/fiber/test/test_count_down_event.cpp b/test/test_count_down_event.cpp
similarity index 100%
rename from libs/fiber/test/test_count_down_event.cpp
rename to test/test_count_down_event.cpp
diff --git a/libs/fiber/test/test_fiber.cpp b/test/test_fiber.cpp
similarity index 100%
rename from libs/fiber/test/test_fiber.cpp
rename to test/test_fiber.cpp
diff --git a/libs/fiber/test/test_futures.cpp b/test/test_futures.cpp
similarity index 100%
rename from libs/fiber/test/test_futures.cpp
rename to test/test_futures.cpp
diff --git a/libs/fiber/test/test_generic_locks.cpp b/test/test_generic_locks.cpp
similarity index 100%
rename from libs/fiber/test/test_generic_locks.cpp
rename to test/test_generic_locks.cpp
diff --git a/libs/fiber/test/test_lock.cpp b/test/test_lock.cpp
similarity index 100%
rename from libs/fiber/test/test_lock.cpp
rename to test/test_lock.cpp
diff --git a/libs/fiber/test/test_manual_reset_event.cpp b/test/test_manual_reset_event.cpp
similarity index 100%
rename from libs/fiber/test/test_manual_reset_event.cpp
rename to test/test_manual_reset_event.cpp
diff --git a/libs/fiber/test/test_mutex.cpp b/test/test_mutex.cpp
similarity index 100%
rename from libs/fiber/test/test_mutex.cpp
rename to test/test_mutex.cpp
diff --git a/libs/fiber/test/test_unique_lock.cpp b/test/test_unique_lock.cpp
similarity index 100%
rename from libs/fiber/test/test_unique_lock.cpp
rename to test/test_unique_lock.cpp
diff --git a/libs/fiber/test/test_waitfor.cpp b/test/test_waitfor.cpp
similarity index 100%
rename from libs/fiber/test/test_waitfor.cpp
rename to test/test_waitfor.cpp