diff --git a/.travis.yml b/.travis.yml
index 84a1377..32708e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,14 +8,15 @@ before_install:
     - sudo apt-get install -qq p7zip-full
 
 install:
-    - wget -O boost_1_57_0.7z http://sourceforge.net/projects/boost/files/boost/1.57.0/boost_1_57_0.7z/download
-    - 7z x boost_1_57_0.7z > /dev/null
-    - cd boost_1_57_0
+    - wget -O boost_1_61_0.7z http://sourceforge.net/projects/boost/files/boost/1.61.0/boost_1_61_0.7z/download
+    - 7z x boost_1_61_0.7z > /dev/null
+    - cd boost_1_61_0
     - ./bootstrap.sh
-    - cp -R ../boost/* boost
-    - cp -R ../libs/* libs
+    - cp -R ../include/boost/* boost
+    - mkdir libs/process
+    - cp -R ../test libs/process/
     - cd ..
 
 script:
-    - cd boost_1_57_0/libs/process/test
+    - cd boost_1_61_0/libs/process/test
     - ../../../b2
diff --git a/libs/process/doc/Jamfile.jam b/doc/Jamfile.jam
similarity index 100%
rename from libs/process/doc/Jamfile.jam
rename to doc/Jamfile.jam
diff --git a/libs/process/doc/acknowledgements.qbk b/doc/acknowledgements.qbk
similarity index 100%
rename from libs/process/doc/acknowledgements.qbk
rename to doc/acknowledgements.qbk
diff --git a/libs/process/doc/faq.qbk b/doc/faq.qbk
similarity index 100%
rename from libs/process/doc/faq.qbk
rename to doc/faq.qbk
diff --git a/libs/process/doc/introduction.qbk b/doc/introduction.qbk
similarity index 100%
rename from libs/process/doc/introduction.qbk
rename to doc/introduction.qbk
diff --git a/libs/process/doc/posix.qbk b/doc/posix.qbk
similarity index 100%
rename from libs/process/doc/posix.qbk
rename to doc/posix.qbk
diff --git a/libs/process/doc/process.qbk b/doc/process.qbk
similarity index 100%
rename from libs/process/doc/process.qbk
rename to doc/process.qbk
diff --git a/libs/process/doc/tutorial.qbk b/doc/tutorial.qbk
similarity index 100%
rename from libs/process/doc/tutorial.qbk
rename to doc/tutorial.qbk
diff --git a/libs/process/doc/windows.qbk b/doc/windows.qbk
similarity index 100%
rename from libs/process/doc/windows.qbk
rename to doc/windows.qbk
diff --git a/libs/process/example/Jamfile.jam b/example/Jamfile.jam
similarity index 96%
rename from libs/process/example/Jamfile.jam
rename to example/Jamfile.jam
index 69b75bc..d48e42c 100644
--- a/libs/process/example/Jamfile.jam
+++ b/example/Jamfile.jam
@@ -9,7 +9,7 @@
 
 project : requirements
   <include>../../..
-  <source>/boost//headers
+  <implicit-dependency>/boost//headers
   <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
   <target-os>windows:<define>WIN32_LEAN_AND_MEAN
 ;
diff --git a/libs/process/example/args.cpp b/example/args.cpp
similarity index 100%
rename from libs/process/example/args.cpp
rename to example/args.cpp
diff --git a/libs/process/example/async_io.cpp b/example/async_io.cpp
similarity index 100%
rename from libs/process/example/async_io.cpp
rename to example/async_io.cpp
diff --git a/libs/process/example/cleanup.cpp b/example/cleanup.cpp
similarity index 100%
rename from libs/process/example/cleanup.cpp
rename to example/cleanup.cpp
diff --git a/libs/process/example/cmd_line.cpp b/example/cmd_line.cpp
similarity index 100%
rename from libs/process/example/cmd_line.cpp
rename to example/cmd_line.cpp
diff --git a/libs/process/example/env.cpp b/example/env.cpp
similarity index 100%
rename from libs/process/example/env.cpp
rename to example/env.cpp
diff --git a/libs/process/example/error_handling.cpp b/example/error_handling.cpp
similarity index 100%
rename from libs/process/example/error_handling.cpp
rename to example/error_handling.cpp
diff --git a/libs/process/example/execute.cpp b/example/execute.cpp
similarity index 100%
rename from libs/process/example/execute.cpp
rename to example/execute.cpp
diff --git a/libs/process/example/intro.cpp b/example/intro.cpp
similarity index 100%
rename from libs/process/example/intro.cpp
rename to example/intro.cpp
diff --git a/libs/process/example/posix.cpp b/example/posix.cpp
similarity index 100%
rename from libs/process/example/posix.cpp
rename to example/posix.cpp
diff --git a/libs/process/example/streams.cpp b/example/streams.cpp
similarity index 100%
rename from libs/process/example/streams.cpp
rename to example/streams.cpp
diff --git a/libs/process/example/sync_io.cpp b/example/sync_io.cpp
similarity index 100%
rename from libs/process/example/sync_io.cpp
rename to example/sync_io.cpp
diff --git a/libs/process/example/terminate.cpp b/example/terminate.cpp
similarity index 100%
rename from libs/process/example/terminate.cpp
rename to example/terminate.cpp
diff --git a/libs/process/example/wait.cpp b/example/wait.cpp
similarity index 100%
rename from libs/process/example/wait.cpp
rename to example/wait.cpp
diff --git a/libs/process/example/windows.cpp b/example/windows.cpp
similarity index 100%
rename from libs/process/example/windows.cpp
rename to example/windows.cpp
diff --git a/libs/process/example/windows_unicode.cpp b/example/windows_unicode.cpp
similarity index 100%
rename from libs/process/example/windows_unicode.cpp
rename to example/windows_unicode.cpp
diff --git a/libs/process/example/work_dir.cpp b/example/work_dir.cpp
similarity index 100%
rename from libs/process/example/work_dir.cpp
rename to example/work_dir.cpp
diff --git a/boost/process.hpp b/include/boost/process.hpp
similarity index 100%
rename from boost/process.hpp
rename to include/boost/process.hpp
diff --git a/boost/process/all.hpp b/include/boost/process/all.hpp
similarity index 100%
rename from boost/process/all.hpp
rename to include/boost/process/all.hpp
diff --git a/boost/process/child.hpp b/include/boost/process/child.hpp
similarity index 100%
rename from boost/process/child.hpp
rename to include/boost/process/child.hpp
diff --git a/boost/process/config.hpp b/include/boost/process/config.hpp
similarity index 100%
rename from boost/process/config.hpp
rename to include/boost/process/config.hpp
diff --git a/boost/process/create_pipe.hpp b/include/boost/process/create_pipe.hpp
similarity index 100%
rename from boost/process/create_pipe.hpp
rename to include/boost/process/create_pipe.hpp
diff --git a/boost/process/execute.hpp b/include/boost/process/execute.hpp
similarity index 100%
rename from boost/process/execute.hpp
rename to include/boost/process/execute.hpp
diff --git a/boost/process/executor.hpp b/include/boost/process/executor.hpp
similarity index 100%
rename from boost/process/executor.hpp
rename to include/boost/process/executor.hpp
diff --git a/boost/process/initializers.hpp b/include/boost/process/initializers.hpp
similarity index 100%
rename from boost/process/initializers.hpp
rename to include/boost/process/initializers.hpp
diff --git a/boost/process/mitigate.hpp b/include/boost/process/mitigate.hpp
similarity index 100%
rename from boost/process/mitigate.hpp
rename to include/boost/process/mitigate.hpp
diff --git a/boost/process/pipe.hpp b/include/boost/process/pipe.hpp
similarity index 100%
rename from boost/process/pipe.hpp
rename to include/boost/process/pipe.hpp
diff --git a/boost/process/posix/child.hpp b/include/boost/process/posix/child.hpp
similarity index 100%
rename from boost/process/posix/child.hpp
rename to include/boost/process/posix/child.hpp
diff --git a/boost/process/posix/create_pipe.hpp b/include/boost/process/posix/create_pipe.hpp
similarity index 100%
rename from boost/process/posix/create_pipe.hpp
rename to include/boost/process/posix/create_pipe.hpp
diff --git a/boost/process/posix/execute.hpp b/include/boost/process/posix/execute.hpp
similarity index 100%
rename from boost/process/posix/execute.hpp
rename to include/boost/process/posix/execute.hpp
diff --git a/boost/process/posix/executor.hpp b/include/boost/process/posix/executor.hpp
similarity index 100%
rename from boost/process/posix/executor.hpp
rename to include/boost/process/posix/executor.hpp
diff --git a/boost/process/posix/initializers.hpp b/include/boost/process/posix/initializers.hpp
similarity index 100%
rename from boost/process/posix/initializers.hpp
rename to include/boost/process/posix/initializers.hpp
diff --git a/boost/process/posix/initializers/bind_fd.hpp b/include/boost/process/posix/initializers/bind_fd.hpp
similarity index 100%
rename from boost/process/posix/initializers/bind_fd.hpp
rename to include/boost/process/posix/initializers/bind_fd.hpp
diff --git a/boost/process/posix/initializers/bind_stderr.hpp b/include/boost/process/posix/initializers/bind_stderr.hpp
similarity index 100%
rename from boost/process/posix/initializers/bind_stderr.hpp
rename to include/boost/process/posix/initializers/bind_stderr.hpp
diff --git a/boost/process/posix/initializers/bind_stdin.hpp b/include/boost/process/posix/initializers/bind_stdin.hpp
similarity index 100%
rename from boost/process/posix/initializers/bind_stdin.hpp
rename to include/boost/process/posix/initializers/bind_stdin.hpp
diff --git a/boost/process/posix/initializers/bind_stdout.hpp b/include/boost/process/posix/initializers/bind_stdout.hpp
similarity index 100%
rename from boost/process/posix/initializers/bind_stdout.hpp
rename to include/boost/process/posix/initializers/bind_stdout.hpp
diff --git a/boost/process/posix/initializers/close_fd.hpp b/include/boost/process/posix/initializers/close_fd.hpp
similarity index 100%
rename from boost/process/posix/initializers/close_fd.hpp
rename to include/boost/process/posix/initializers/close_fd.hpp
diff --git a/boost/process/posix/initializers/close_fds.hpp b/include/boost/process/posix/initializers/close_fds.hpp
similarity index 100%
rename from boost/process/posix/initializers/close_fds.hpp
rename to include/boost/process/posix/initializers/close_fds.hpp
diff --git a/boost/process/posix/initializers/close_fds_if.hpp b/include/boost/process/posix/initializers/close_fds_if.hpp
similarity index 100%
rename from boost/process/posix/initializers/close_fds_if.hpp
rename to include/boost/process/posix/initializers/close_fds_if.hpp
diff --git a/boost/process/posix/initializers/close_stderr.hpp b/include/boost/process/posix/initializers/close_stderr.hpp
similarity index 100%
rename from boost/process/posix/initializers/close_stderr.hpp
rename to include/boost/process/posix/initializers/close_stderr.hpp
diff --git a/boost/process/posix/initializers/close_stdin.hpp b/include/boost/process/posix/initializers/close_stdin.hpp
similarity index 100%
rename from boost/process/posix/initializers/close_stdin.hpp
rename to include/boost/process/posix/initializers/close_stdin.hpp
diff --git a/boost/process/posix/initializers/close_stdout.hpp b/include/boost/process/posix/initializers/close_stdout.hpp
similarity index 100%
rename from boost/process/posix/initializers/close_stdout.hpp
rename to include/boost/process/posix/initializers/close_stdout.hpp
diff --git a/boost/process/posix/initializers/hide_console.hpp b/include/boost/process/posix/initializers/hide_console.hpp
similarity index 100%
rename from boost/process/posix/initializers/hide_console.hpp
rename to include/boost/process/posix/initializers/hide_console.hpp
diff --git a/boost/process/posix/initializers/inherit_env.hpp b/include/boost/process/posix/initializers/inherit_env.hpp
similarity index 100%
rename from boost/process/posix/initializers/inherit_env.hpp
rename to include/boost/process/posix/initializers/inherit_env.hpp
diff --git a/boost/process/posix/initializers/initializer_base.hpp b/include/boost/process/posix/initializers/initializer_base.hpp
similarity index 100%
rename from boost/process/posix/initializers/initializer_base.hpp
rename to include/boost/process/posix/initializers/initializer_base.hpp
diff --git a/boost/process/posix/initializers/notify_io_service.hpp b/include/boost/process/posix/initializers/notify_io_service.hpp
similarity index 100%
rename from boost/process/posix/initializers/notify_io_service.hpp
rename to include/boost/process/posix/initializers/notify_io_service.hpp
diff --git a/boost/process/posix/initializers/on_exec_error.hpp b/include/boost/process/posix/initializers/on_exec_error.hpp
similarity index 100%
rename from boost/process/posix/initializers/on_exec_error.hpp
rename to include/boost/process/posix/initializers/on_exec_error.hpp
diff --git a/boost/process/posix/initializers/on_exec_setup.hpp b/include/boost/process/posix/initializers/on_exec_setup.hpp
similarity index 100%
rename from boost/process/posix/initializers/on_exec_setup.hpp
rename to include/boost/process/posix/initializers/on_exec_setup.hpp
diff --git a/boost/process/posix/initializers/on_fork_error.hpp b/include/boost/process/posix/initializers/on_fork_error.hpp
similarity index 100%
rename from boost/process/posix/initializers/on_fork_error.hpp
rename to include/boost/process/posix/initializers/on_fork_error.hpp
diff --git a/boost/process/posix/initializers/on_fork_setup.hpp b/include/boost/process/posix/initializers/on_fork_setup.hpp
similarity index 100%
rename from boost/process/posix/initializers/on_fork_setup.hpp
rename to include/boost/process/posix/initializers/on_fork_setup.hpp
diff --git a/boost/process/posix/initializers/on_fork_success.hpp b/include/boost/process/posix/initializers/on_fork_success.hpp
similarity index 100%
rename from boost/process/posix/initializers/on_fork_success.hpp
rename to include/boost/process/posix/initializers/on_fork_success.hpp
diff --git a/boost/process/posix/initializers/run_exe.hpp b/include/boost/process/posix/initializers/run_exe.hpp
similarity index 100%
rename from boost/process/posix/initializers/run_exe.hpp
rename to include/boost/process/posix/initializers/run_exe.hpp
diff --git a/boost/process/posix/initializers/set_args.hpp b/include/boost/process/posix/initializers/set_args.hpp
similarity index 100%
rename from boost/process/posix/initializers/set_args.hpp
rename to include/boost/process/posix/initializers/set_args.hpp
diff --git a/boost/process/posix/initializers/set_cmd_line.hpp b/include/boost/process/posix/initializers/set_cmd_line.hpp
similarity index 100%
rename from boost/process/posix/initializers/set_cmd_line.hpp
rename to include/boost/process/posix/initializers/set_cmd_line.hpp
diff --git a/boost/process/posix/initializers/set_env.hpp b/include/boost/process/posix/initializers/set_env.hpp
similarity index 100%
rename from boost/process/posix/initializers/set_env.hpp
rename to include/boost/process/posix/initializers/set_env.hpp
diff --git a/boost/process/posix/initializers/set_on_error.hpp b/include/boost/process/posix/initializers/set_on_error.hpp
similarity index 100%
rename from boost/process/posix/initializers/set_on_error.hpp
rename to include/boost/process/posix/initializers/set_on_error.hpp
diff --git a/boost/process/posix/initializers/start_in_dir.hpp b/include/boost/process/posix/initializers/start_in_dir.hpp
similarity index 100%
rename from boost/process/posix/initializers/start_in_dir.hpp
rename to include/boost/process/posix/initializers/start_in_dir.hpp
diff --git a/boost/process/posix/initializers/throw_on_error.hpp b/include/boost/process/posix/initializers/throw_on_error.hpp
similarity index 100%
rename from boost/process/posix/initializers/throw_on_error.hpp
rename to include/boost/process/posix/initializers/throw_on_error.hpp
diff --git a/boost/process/posix/pipe.hpp b/include/boost/process/posix/pipe.hpp
similarity index 100%
rename from boost/process/posix/pipe.hpp
rename to include/boost/process/posix/pipe.hpp
diff --git a/boost/process/posix/search_path.hpp b/include/boost/process/posix/search_path.hpp
similarity index 100%
rename from boost/process/posix/search_path.hpp
rename to include/boost/process/posix/search_path.hpp
diff --git a/boost/process/posix/shell_path.hpp b/include/boost/process/posix/shell_path.hpp
similarity index 100%
rename from boost/process/posix/shell_path.hpp
rename to include/boost/process/posix/shell_path.hpp
diff --git a/boost/process/posix/terminate.hpp b/include/boost/process/posix/terminate.hpp
similarity index 100%
rename from boost/process/posix/terminate.hpp
rename to include/boost/process/posix/terminate.hpp
diff --git a/boost/process/posix/wait_for_exit.hpp b/include/boost/process/posix/wait_for_exit.hpp
similarity index 100%
rename from boost/process/posix/wait_for_exit.hpp
rename to include/boost/process/posix/wait_for_exit.hpp
diff --git a/boost/process/search_path.hpp b/include/boost/process/search_path.hpp
similarity index 100%
rename from boost/process/search_path.hpp
rename to include/boost/process/search_path.hpp
diff --git a/boost/process/shell_path.hpp b/include/boost/process/shell_path.hpp
similarity index 100%
rename from boost/process/shell_path.hpp
rename to include/boost/process/shell_path.hpp
diff --git a/boost/process/terminate.hpp b/include/boost/process/terminate.hpp
similarity index 100%
rename from boost/process/terminate.hpp
rename to include/boost/process/terminate.hpp
diff --git a/boost/process/wait_for_exit.hpp b/include/boost/process/wait_for_exit.hpp
similarity index 100%
rename from boost/process/wait_for_exit.hpp
rename to include/boost/process/wait_for_exit.hpp
diff --git a/boost/process/windows/child.hpp b/include/boost/process/windows/child.hpp
similarity index 100%
rename from boost/process/windows/child.hpp
rename to include/boost/process/windows/child.hpp
diff --git a/boost/process/windows/create_pipe.hpp b/include/boost/process/windows/create_pipe.hpp
similarity index 100%
rename from boost/process/windows/create_pipe.hpp
rename to include/boost/process/windows/create_pipe.hpp
diff --git a/boost/process/windows/execute.hpp b/include/boost/process/windows/execute.hpp
similarity index 100%
rename from boost/process/windows/execute.hpp
rename to include/boost/process/windows/execute.hpp
diff --git a/boost/process/windows/executor.hpp b/include/boost/process/windows/executor.hpp
similarity index 100%
rename from boost/process/windows/executor.hpp
rename to include/boost/process/windows/executor.hpp
diff --git a/boost/process/windows/initializers.hpp b/include/boost/process/windows/initializers.hpp
similarity index 100%
rename from boost/process/windows/initializers.hpp
rename to include/boost/process/windows/initializers.hpp
diff --git a/boost/process/windows/initializers/bind_stderr.hpp b/include/boost/process/windows/initializers/bind_stderr.hpp
similarity index 100%
rename from boost/process/windows/initializers/bind_stderr.hpp
rename to include/boost/process/windows/initializers/bind_stderr.hpp
diff --git a/boost/process/windows/initializers/bind_stdin.hpp b/include/boost/process/windows/initializers/bind_stdin.hpp
similarity index 100%
rename from boost/process/windows/initializers/bind_stdin.hpp
rename to include/boost/process/windows/initializers/bind_stdin.hpp
diff --git a/boost/process/windows/initializers/bind_stdout.hpp b/include/boost/process/windows/initializers/bind_stdout.hpp
similarity index 100%
rename from boost/process/windows/initializers/bind_stdout.hpp
rename to include/boost/process/windows/initializers/bind_stdout.hpp
diff --git a/boost/process/windows/initializers/close_stderr.hpp b/include/boost/process/windows/initializers/close_stderr.hpp
similarity index 100%
rename from boost/process/windows/initializers/close_stderr.hpp
rename to include/boost/process/windows/initializers/close_stderr.hpp
diff --git a/boost/process/windows/initializers/close_stdin.hpp b/include/boost/process/windows/initializers/close_stdin.hpp
similarity index 100%
rename from boost/process/windows/initializers/close_stdin.hpp
rename to include/boost/process/windows/initializers/close_stdin.hpp
diff --git a/boost/process/windows/initializers/close_stdout.hpp b/include/boost/process/windows/initializers/close_stdout.hpp
similarity index 100%
rename from boost/process/windows/initializers/close_stdout.hpp
rename to include/boost/process/windows/initializers/close_stdout.hpp
diff --git a/boost/process/windows/initializers/hide_console.hpp b/include/boost/process/windows/initializers/hide_console.hpp
similarity index 100%
rename from boost/process/windows/initializers/hide_console.hpp
rename to include/boost/process/windows/initializers/hide_console.hpp
diff --git a/boost/process/windows/initializers/inherit_env.hpp b/include/boost/process/windows/initializers/inherit_env.hpp
similarity index 100%
rename from boost/process/windows/initializers/inherit_env.hpp
rename to include/boost/process/windows/initializers/inherit_env.hpp
diff --git a/boost/process/windows/initializers/initializer_base.hpp b/include/boost/process/windows/initializers/initializer_base.hpp
similarity index 100%
rename from boost/process/windows/initializers/initializer_base.hpp
rename to include/boost/process/windows/initializers/initializer_base.hpp
diff --git a/boost/process/windows/initializers/on_CreateProcess_error.hpp b/include/boost/process/windows/initializers/on_CreateProcess_error.hpp
similarity index 100%
rename from boost/process/windows/initializers/on_CreateProcess_error.hpp
rename to include/boost/process/windows/initializers/on_CreateProcess_error.hpp
diff --git a/boost/process/windows/initializers/on_CreateProcess_setup.hpp b/include/boost/process/windows/initializers/on_CreateProcess_setup.hpp
similarity index 100%
rename from boost/process/windows/initializers/on_CreateProcess_setup.hpp
rename to include/boost/process/windows/initializers/on_CreateProcess_setup.hpp
diff --git a/boost/process/windows/initializers/on_CreateProcess_success.hpp b/include/boost/process/windows/initializers/on_CreateProcess_success.hpp
similarity index 100%
rename from boost/process/windows/initializers/on_CreateProcess_success.hpp
rename to include/boost/process/windows/initializers/on_CreateProcess_success.hpp
diff --git a/boost/process/windows/initializers/run_exe.hpp b/include/boost/process/windows/initializers/run_exe.hpp
similarity index 100%
rename from boost/process/windows/initializers/run_exe.hpp
rename to include/boost/process/windows/initializers/run_exe.hpp
diff --git a/boost/process/windows/initializers/set_args.hpp b/include/boost/process/windows/initializers/set_args.hpp
similarity index 100%
rename from boost/process/windows/initializers/set_args.hpp
rename to include/boost/process/windows/initializers/set_args.hpp
diff --git a/boost/process/windows/initializers/set_cmd_line.hpp b/include/boost/process/windows/initializers/set_cmd_line.hpp
similarity index 100%
rename from boost/process/windows/initializers/set_cmd_line.hpp
rename to include/boost/process/windows/initializers/set_cmd_line.hpp
diff --git a/boost/process/windows/initializers/set_env.hpp b/include/boost/process/windows/initializers/set_env.hpp
similarity index 100%
rename from boost/process/windows/initializers/set_env.hpp
rename to include/boost/process/windows/initializers/set_env.hpp
diff --git a/boost/process/windows/initializers/set_on_error.hpp b/include/boost/process/windows/initializers/set_on_error.hpp
similarity index 100%
rename from boost/process/windows/initializers/set_on_error.hpp
rename to include/boost/process/windows/initializers/set_on_error.hpp
diff --git a/boost/process/windows/initializers/show_window.hpp b/include/boost/process/windows/initializers/show_window.hpp
similarity index 100%
rename from boost/process/windows/initializers/show_window.hpp
rename to include/boost/process/windows/initializers/show_window.hpp
diff --git a/boost/process/windows/initializers/start_in_dir.hpp b/include/boost/process/windows/initializers/start_in_dir.hpp
similarity index 100%
rename from boost/process/windows/initializers/start_in_dir.hpp
rename to include/boost/process/windows/initializers/start_in_dir.hpp
diff --git a/boost/process/windows/initializers/throw_on_error.hpp b/include/boost/process/windows/initializers/throw_on_error.hpp
similarity index 100%
rename from boost/process/windows/initializers/throw_on_error.hpp
rename to include/boost/process/windows/initializers/throw_on_error.hpp
diff --git a/boost/process/windows/pipe.hpp b/include/boost/process/windows/pipe.hpp
similarity index 100%
rename from boost/process/windows/pipe.hpp
rename to include/boost/process/windows/pipe.hpp
diff --git a/boost/process/windows/search_path.hpp b/include/boost/process/windows/search_path.hpp
similarity index 100%
rename from boost/process/windows/search_path.hpp
rename to include/boost/process/windows/search_path.hpp
diff --git a/boost/process/windows/shell_path.hpp b/include/boost/process/windows/shell_path.hpp
similarity index 100%
rename from boost/process/windows/shell_path.hpp
rename to include/boost/process/windows/shell_path.hpp
diff --git a/boost/process/windows/terminate.hpp b/include/boost/process/windows/terminate.hpp
similarity index 100%
rename from boost/process/windows/terminate.hpp
rename to include/boost/process/windows/terminate.hpp
diff --git a/boost/process/windows/wait_for_exit.hpp b/include/boost/process/windows/wait_for_exit.hpp
similarity index 100%
rename from boost/process/windows/wait_for_exit.hpp
rename to include/boost/process/windows/wait_for_exit.hpp
diff --git a/libs/process/test/Jamfile.jam b/test/Jamfile.jam
similarity index 98%
rename from libs/process/test/Jamfile.jam
rename to test/Jamfile.jam
index ff0829c..dc55a8f 100644
--- a/libs/process/test/Jamfile.jam
+++ b/test/Jamfile.jam
@@ -9,7 +9,7 @@
 
 project : requirements
   <include>../../..
-  <source>/boost//headers
+  <implicit-dependency>/boost//headers
   <source>/boost//system
   <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
   <target-os>windows:<define>WIN32_LEAN_AND_MEAN
diff --git a/libs/process/test/bind_stderr.cpp b/test/bind_stderr.cpp
similarity index 100%
rename from libs/process/test/bind_stderr.cpp
rename to test/bind_stderr.cpp
diff --git a/libs/process/test/bind_stdin.cpp b/test/bind_stdin.cpp
similarity index 100%
rename from libs/process/test/bind_stdin.cpp
rename to test/bind_stdin.cpp
diff --git a/libs/process/test/bind_stdin_stdout.cpp b/test/bind_stdin_stdout.cpp
similarity index 100%
rename from libs/process/test/bind_stdin_stdout.cpp
rename to test/bind_stdin_stdout.cpp
diff --git a/libs/process/test/bind_stdout.cpp b/test/bind_stdout.cpp
similarity index 100%
rename from libs/process/test/bind_stdout.cpp
rename to test/bind_stdout.cpp
diff --git a/libs/process/test/bind_stdout_stderr.cpp b/test/bind_stdout_stderr.cpp
similarity index 100%
rename from libs/process/test/bind_stdout_stderr.cpp
rename to test/bind_stdout_stderr.cpp
diff --git a/libs/process/test/close_stderr.cpp b/test/close_stderr.cpp
similarity index 100%
rename from libs/process/test/close_stderr.cpp
rename to test/close_stderr.cpp
diff --git a/libs/process/test/close_stdin.cpp b/test/close_stdin.cpp
similarity index 100%
rename from libs/process/test/close_stdin.cpp
rename to test/close_stdin.cpp
diff --git a/libs/process/test/close_stdout.cpp b/test/close_stdout.cpp
similarity index 100%
rename from libs/process/test/close_stdout.cpp
rename to test/close_stdout.cpp
diff --git a/libs/process/test/exit_code.cpp b/test/exit_code.cpp
similarity index 100%
rename from libs/process/test/exit_code.cpp
rename to test/exit_code.cpp
diff --git a/libs/process/test/extensions.cpp b/test/extensions.cpp
similarity index 100%
rename from libs/process/test/extensions.cpp
rename to test/extensions.cpp
diff --git a/libs/process/test/inherit_env.cpp b/test/inherit_env.cpp
similarity index 100%
rename from libs/process/test/inherit_env.cpp
rename to test/inherit_env.cpp
diff --git a/libs/process/test/posix_specific.cpp b/test/posix_specific.cpp
similarity index 100%
rename from libs/process/test/posix_specific.cpp
rename to test/posix_specific.cpp
diff --git a/libs/process/test/run_exe.cpp b/test/run_exe.cpp
similarity index 100%
rename from libs/process/test/run_exe.cpp
rename to test/run_exe.cpp
diff --git a/libs/process/test/run_exe_path.cpp b/test/run_exe_path.cpp
similarity index 100%
rename from libs/process/test/run_exe_path.cpp
rename to test/run_exe_path.cpp
diff --git a/libs/process/test/run_exe_wstring.cpp b/test/run_exe_wstring.cpp
similarity index 100%
rename from libs/process/test/run_exe_wstring.cpp
rename to test/run_exe_wstring.cpp
diff --git a/libs/process/test/search_path.cpp b/test/search_path.cpp
similarity index 100%
rename from libs/process/test/search_path.cpp
rename to test/search_path.cpp
diff --git a/libs/process/test/search_path_wstring.cpp b/test/search_path_wstring.cpp
similarity index 100%
rename from libs/process/test/search_path_wstring.cpp
rename to test/search_path_wstring.cpp
diff --git a/libs/process/test/set_args.cpp b/test/set_args.cpp
similarity index 100%
rename from libs/process/test/set_args.cpp
rename to test/set_args.cpp
diff --git a/libs/process/test/set_args_wstring.cpp b/test/set_args_wstring.cpp
similarity index 100%
rename from libs/process/test/set_args_wstring.cpp
rename to test/set_args_wstring.cpp
diff --git a/libs/process/test/set_cmd_line.cpp b/test/set_cmd_line.cpp
similarity index 100%
rename from libs/process/test/set_cmd_line.cpp
rename to test/set_cmd_line.cpp
diff --git a/libs/process/test/set_cmd_line_wstring.cpp b/test/set_cmd_line_wstring.cpp
similarity index 100%
rename from libs/process/test/set_cmd_line_wstring.cpp
rename to test/set_cmd_line_wstring.cpp
diff --git a/libs/process/test/set_env.cpp b/test/set_env.cpp
similarity index 100%
rename from libs/process/test/set_env.cpp
rename to test/set_env.cpp
diff --git a/libs/process/test/set_env_wstring.cpp b/test/set_env_wstring.cpp
similarity index 100%
rename from libs/process/test/set_env_wstring.cpp
rename to test/set_env_wstring.cpp
diff --git a/libs/process/test/set_on_error.cpp b/test/set_on_error.cpp
similarity index 100%
rename from libs/process/test/set_on_error.cpp
rename to test/set_on_error.cpp
diff --git a/libs/process/test/shell_path.cpp b/test/shell_path.cpp
similarity index 100%
rename from libs/process/test/shell_path.cpp
rename to test/shell_path.cpp
diff --git a/libs/process/test/shell_path_wstring.cpp b/test/shell_path_wstring.cpp
similarity index 100%
rename from libs/process/test/shell_path_wstring.cpp
rename to test/shell_path_wstring.cpp
diff --git a/libs/process/test/show_window.cpp b/test/show_window.cpp
similarity index 100%
rename from libs/process/test/show_window.cpp
rename to test/show_window.cpp
diff --git a/libs/process/test/sparring_partner.cpp b/test/sparring_partner.cpp
similarity index 100%
rename from libs/process/test/sparring_partner.cpp
rename to test/sparring_partner.cpp
diff --git a/libs/process/test/start_in_dir.cpp b/test/start_in_dir.cpp
similarity index 100%
rename from libs/process/test/start_in_dir.cpp
rename to test/start_in_dir.cpp
diff --git a/libs/process/test/start_in_dir_wstring.cpp b/test/start_in_dir_wstring.cpp
similarity index 100%
rename from libs/process/test/start_in_dir_wstring.cpp
rename to test/start_in_dir_wstring.cpp
diff --git a/libs/process/test/terminate.cpp b/test/terminate.cpp
similarity index 100%
rename from libs/process/test/terminate.cpp
rename to test/terminate.cpp
diff --git a/libs/process/test/throw_on_error.cpp b/test/throw_on_error.cpp
similarity index 100%
rename from libs/process/test/throw_on_error.cpp
rename to test/throw_on_error.cpp
diff --git a/libs/process/test/wait.cpp b/test/wait.cpp
similarity index 100%
rename from libs/process/test/wait.cpp
rename to test/wait.cpp
diff --git a/libs/process/test/windows_specific.cpp b/test/windows_specific.cpp
similarity index 100%
rename from libs/process/test/windows_specific.cpp
rename to test/windows_specific.cpp