diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42449d85..25afbebd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ Version 91:
 * Fix doc title
 * Build stand-alone doc
 * Update doc copyrights
+* Refactor test build scripts
 
 WebSocket:
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f40dd8f..378a63a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,24 +172,26 @@ if (OPENSSL_FOUND)
     include_directories (${OPENSSL_INCLUDE_DIR})
 endif()
 
-file(GLOB_RECURSE BOOST_BEAST_INCLUDES
+file (GLOB_RECURSE BOOST_BEAST_INCLUDES
     ${PROJECT_SOURCE_DIR}/include/boost/beast/*.hpp
     ${PROJECT_SOURCE_DIR}/include/boost/beast/*.ipp
 )
 
-file(GLOB_RECURSE COMMON_INCLUDES
+file (GLOB_RECURSE COMMON_INCLUDES
     ${PROJECT_SOURCE_DIR}/example/common/*.hpp
   )
 
-file(GLOB_RECURSE EXAMPLE_INCLUDES
+file (GLOB_RECURSE EXAMPLE_INCLUDES
     ${PROJECT_SOURCE_DIR}/example/*.hpp
   )
 
-file(GLOB_RECURSE EXTRAS_INCLUDES
+file (GLOB_RECURSE EXTRAS_INCLUDES
     ${PROJECT_SOURCE_DIR}/extras/boost/beast/*.hpp
     ${PROJECT_SOURCE_DIR}/extras/boost/beast/*.ipp
 )
 
+set (TEST_MAIN ${PROJECT_SOURCE_DIR}/extras/boost/beast/unit_test/main.cpp)
+
 if (Beast_BUILD_BENCH)
     add_subdirectory (bench)
 endif()
diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt
index f5a44e2a..f3a88595 100644
--- a/bench/CMakeLists.txt
+++ b/bench/CMakeLists.txt
@@ -7,22 +7,7 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(extras/boost/beast extras)
-GroupSources(include/boost/beast beast)
-GroupSources(test/benchmarks "/")
-GroupSources(test/http "/")
-
-add_executable (benchmarks
-    ${BOOST_BEAST_INCLUDES}
-    ${EXTRAS_INCLUDES}
-    Jamfile
-    ../extras/boost/beast/unit_test/main.cpp
-    ../test/http/message_fuzz.hpp
-    nodejs_parser.hpp
-    nodejs_parser.cpp
-    buffers.cpp
-    parser.cpp
-    utf8_checker.cpp
-)
-
-add_subdirectory (wstest)
+add_subdirectory (buffers)
+add_subdirectory (parser)
+add_subdirectory (utf8_checker)
+add_subdirectory (wsload)
diff --git a/bench/Jamfile b/bench/Jamfile
index 8d36edcb..89c2563c 100644
--- a/bench/Jamfile
+++ b/bench/Jamfile
@@ -6,17 +6,3 @@
 #
 # Official repository: https://github.com/boostorg/beast
 #
-
-local SOURCES =
-    buffers.cpp
-    utf8_checker.cpp # causes unnecessary dependencies
-    ;
-
-local BUILD_BENCH ; for local f in $(SOURCES)  { BUILD_BENCH += [ exe $(f:B)-bench : $(f) $(TEST_MAIN) ] ; }
-alias build-bench : $(BUILD_BENCH) ;
-
-exe parser-bench :
-    nodejs_parser.cpp
-    parser.cpp
-    $(TEST_MAIN)
-    ;
diff --git a/bench/buffers/CMakeLists.txt b/bench/buffers/CMakeLists.txt
new file mode 100644
index 00000000..e947317b
--- /dev/null
+++ b/bench/buffers/CMakeLists.txt
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/boostorg/beast
+#
+
+GroupSources(extras/boost/beast extras)
+GroupSources(include/boost/beast beast)
+GroupSources(bench/buffers "/")
+
+add_executable (bench-buffers
+    ${BOOST_BEAST_INCLUDES}
+    ${EXTRAS_INCLUDES}
+    ${TEST_MAIN}
+    Jamfile
+    bench_buffers.cpp
+)
diff --git a/bench/buffers/Jamfile b/bench/buffers/Jamfile
new file mode 100644
index 00000000..fd1e6082
--- /dev/null
+++ b/bench/buffers/Jamfile
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/boostorg/beast
+#
+
+exe bench-buffers :
+    $(TEST_MAIN)
+    bench_buffers.cpp
+    ;
diff --git a/bench/buffers.cpp b/bench/buffers/bench_buffers.cpp
similarity index 100%
rename from bench/buffers.cpp
rename to bench/buffers/bench_buffers.cpp
diff --git a/bench/parser/CMakeLists.txt b/bench/parser/CMakeLists.txt
new file mode 100644
index 00000000..efac63ad
--- /dev/null
+++ b/bench/parser/CMakeLists.txt
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/boostorg/beast
+#
+
+GroupSources(extras/boost/beast extras)
+GroupSources(include/boost/beast beast)
+GroupSources(test/beast/http "/")
+GroupSources(bench/parser "/")
+
+add_executable (bench-parser
+    ${BOOST_BEAST_INCLUDES}
+    ${EXTRAS_INCLUDES}
+    ${TEST_MAIN}
+    Jamfile
+    ${PROJECT_SOURCE_DIR}/test/beast/http/message_fuzz.hpp
+    nodejs_parser.hpp
+    nodejs_parser.cpp
+    bench_parser.cpp
+)
diff --git a/bench/parser/Jamfile b/bench/parser/Jamfile
new file mode 100644
index 00000000..1a66fb18
--- /dev/null
+++ b/bench/parser/Jamfile
@@ -0,0 +1,14 @@
+#
+# Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/boostorg/beast
+#
+
+exe bench-parser :
+    $(TEST_MAIN)
+    nodejs_parser.cpp
+    bench_parser.cpp
+    ;
diff --git a/bench/parser.cpp b/bench/parser/bench_parser.cpp
similarity index 99%
rename from bench/parser.cpp
rename to bench/parser/bench_parser.cpp
index 7fc5f0ed..c4f99a51 100644
--- a/bench/parser.cpp
+++ b/bench/parser/bench_parser.cpp
@@ -8,7 +8,8 @@
 //
 
 #include "nodejs_parser.hpp"
-#include "test/http/message_fuzz.hpp"
+
+#include "test/beast/http/message_fuzz.hpp"
 
 #include <boost/beast/http.hpp>
 #include <boost/beast/core/consuming_buffers.hpp>
diff --git a/bench/nodejs-parser/AUTHORS b/bench/parser/nodejs-parser/AUTHORS
similarity index 100%
rename from bench/nodejs-parser/AUTHORS
rename to bench/parser/nodejs-parser/AUTHORS
diff --git a/bench/nodejs-parser/LICENSE-MIT b/bench/parser/nodejs-parser/LICENSE-MIT
similarity index 100%
rename from bench/nodejs-parser/LICENSE-MIT
rename to bench/parser/nodejs-parser/LICENSE-MIT
diff --git a/bench/nodejs-parser/README.md b/bench/parser/nodejs-parser/README.md
similarity index 100%
rename from bench/nodejs-parser/README.md
rename to bench/parser/nodejs-parser/README.md
diff --git a/bench/nodejs-parser/http_parser.c b/bench/parser/nodejs-parser/http_parser.c
similarity index 100%
rename from bench/nodejs-parser/http_parser.c
rename to bench/parser/nodejs-parser/http_parser.c
diff --git a/bench/nodejs-parser/http_parser.h b/bench/parser/nodejs-parser/http_parser.h
similarity index 100%
rename from bench/nodejs-parser/http_parser.h
rename to bench/parser/nodejs-parser/http_parser.h
diff --git a/bench/nodejs_parser.cpp b/bench/parser/nodejs_parser.cpp
similarity index 100%
rename from bench/nodejs_parser.cpp
rename to bench/parser/nodejs_parser.cpp
diff --git a/bench/nodejs_parser.hpp b/bench/parser/nodejs_parser.hpp
similarity index 100%
rename from bench/nodejs_parser.hpp
rename to bench/parser/nodejs_parser.hpp
diff --git a/bench/utf8_checker/CMakeLists.txt b/bench/utf8_checker/CMakeLists.txt
new file mode 100644
index 00000000..acae959c
--- /dev/null
+++ b/bench/utf8_checker/CMakeLists.txt
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/boostorg/beast
+#
+
+GroupSources(extras/boost/beast extras)
+GroupSources(include/boost/beast beast)
+GroupSources(bench/utf8_checker "/")
+
+add_executable (bench-utf8-checker
+    ${BOOST_BEAST_INCLUDES}
+    ${EXTRAS_INCLUDES}
+    ${TEST_MAIN}
+    Jamfile
+    bench_utf8_checker.cpp
+)
diff --git a/bench/utf8_checker/Jamfile b/bench/utf8_checker/Jamfile
new file mode 100644
index 00000000..522ee9ee
--- /dev/null
+++ b/bench/utf8_checker/Jamfile
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/boostorg/beast
+#
+
+exe bench-utf8-checker :
+    $(TEST_MAIN)
+    bench_utf8_checker.cpp
+    ;
diff --git a/bench/utf8_checker.cpp b/bench/utf8_checker/bench_utf8_checker.cpp
similarity index 100%
rename from bench/utf8_checker.cpp
rename to bench/utf8_checker/bench_utf8_checker.cpp
diff --git a/bench/wstest/CMakeLists.txt b/bench/wsload/CMakeLists.txt
similarity index 86%
rename from bench/wstest/CMakeLists.txt
rename to bench/wsload/CMakeLists.txt
index b803852d..e564d885 100644
--- a/bench/wstest/CMakeLists.txt
+++ b/bench/wsload/CMakeLists.txt
@@ -10,12 +10,12 @@
 GroupSources(include/boost/beast beast)
 GroupSources(example/common common)
 GroupSources(extras/boost/beast extras)
-GroupSources(bench/wstest "/")
+GroupSources(bench/wsload "/")
 
-add_executable (wstest
+add_executable (bench-wsload
     ${BOOST_BEAST_INCLUDES}
     ${COMMON_INCLUDES}
     ${EXTRAS_INCLUDES}
     Jamfile
-    wstest.cpp
+    wsload.cpp
     )
diff --git a/bench/wstest/Jamfile b/bench/wsload/Jamfile
similarity index 91%
rename from bench/wstest/Jamfile
rename to bench/wsload/Jamfile
index f0a43406..26b30b7c 100644
--- a/bench/wstest/Jamfile
+++ b/bench/wsload/Jamfile
@@ -7,6 +7,6 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-exe wstest :
-    wstest.cpp
+exe wsload :
+    wsload.cpp
     ;
diff --git a/bench/wstest/wstest.cpp b/bench/wsload/wsload.cpp
similarity index 100%
rename from bench/wstest/wstest.cpp
rename to bench/wsload/wsload.cpp
diff --git a/scripts/build-and-test.sh b/scripts/build-and-test.sh
index da24a431..601578f3 100755
--- a/scripts/build-and-test.sh
+++ b/scripts/build-and-test.sh
@@ -65,19 +65,19 @@ echo "using BOOST_ROOT: $BOOST_ROOT"
 #################################### HELPERS ###################################
 
 function run_tests_with_debugger {
-  for x in $BOOST_ROOT/bin.v2/libs/beast/test/**/$VARIANT/**/build-fat; do
+  for x in $BOOST_ROOT/bin.v2/libs/beast/test/**/$VARIANT/**/fat-tests; do
     "$LIB_DIR/scripts/run-with-debugger.sh" "$x"
   done
 }
 
 function run_tests {
-  for x in $BOOST_ROOT/bin.v2/libs/beast/test/**/$VARIANT/**/build-fat; do
+  for x in $BOOST_ROOT/bin.v2/libs/beast/test/**/$VARIANT/**/fat-tests; do
     $x
   done
 }
 
 function run_tests_with_valgrind {
-  for x in $BOOST_ROOT/bin.v2/libs/beast/test/**/$VARIANT/**/build-fat; do
+  for x in $BOOST_ROOT/bin.v2/libs/beast/test/**/$VARIANT/**/fat-tests; do
     if [[ $(basename $x) == "bench-tests" ]]; then
       $x
     else
@@ -90,10 +90,11 @@ function run_tests_with_valgrind {
 
 function build_bjam {
   if [[ $VARIANT == "coverage" ]]; then
-    bjam libs/beast/test//build-fat toolset=$TOOLSET variant=$VARIANT address-model=$ADDRESS_MODEL -j${num_jobs}
+    bjam libs/beast/test//fat-tests toolset=$TOOLSET variant=$VARIANT address-model=$ADDRESS_MODEL -j${num_jobs}
 
   else
-    bjam libs/beast/test//build-fat toolset=$TOOLSET variant=$VARIANT address-model=$ADDRESS_MODEL -j${num_jobs}
+    bjam libs/beast/test//fat-tests toolset=$TOOLSET variant=$VARIANT address-model=$ADDRESS_MODEL -j${num_jobs}
+    bjam libs/beast/bench   toolset=$TOOLSET variant=$VARIANT address-model=$ADDRESS_MODEL -j${num_jobs}
     bjam libs/beast/example toolset=$TOOLSET variant=$VARIANT address-model=$ADDRESS_MODEL -j${num_jobs}
   fi
 }
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 925d0d1d..8eca6ace 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,37 +7,12 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-add_subdirectory (core)
-add_subdirectory (http)
-add_subdirectory (websocket)
-add_subdirectory (zlib)
-
-if ((NOT "${VARIANT}" STREQUAL "coverage") AND
-    (NOT "${VARIANT}" STREQUAL "ubasan"))
-
-    add_subdirectory (common)
-    add_subdirectory (server)
-
-    GroupSources(extras/boost/beast extras)
-    GroupSources(include/boost/beast beast)
-    
-    GroupSources(test "/")
-
-    add_executable (lib-tests
-        ${BOOST_BEAST_INCLUDES}
-        ${EXTRAS_INCLUDES}
-        Jamfile
-        ../extras/boost/beast/unit_test/main.cpp
-        config.cpp
-        core.cpp
-        exemplars.cpp
-        http.cpp
-        version.cpp
-        websocket.cpp
-        zlib.cpp
-    )
-
-    if (MINGW)
-        set_target_properties(lib-tests PROPERTIES COMPILE_FLAGS "-Wa,-mbig-obj")
-    endif()
+if (OPENSSL_FOUND)
+    link_libraries (${OPENSSL_LIBRARIES})
 endif()
+
+add_subdirectory (beast)
+add_subdirectory (doc)
+add_subdirectory (example)
+
+alias fat-tests : ;
diff --git a/test/Jamfile b/test/Jamfile
index 4fdaa1fc..047f4f50 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -7,41 +7,16 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-import os ;
-
-compile config.cpp :    <variant>coverage:<build>no <variant>ubasan:<build>no ;
-compile core.cpp :      <variant>coverage:<build>no <variant>ubasan:<build>no ;
-compile exemplars.cpp : <variant>coverage:<build>no <variant>ubasan:<build>no ;
-compile http.cpp :      <variant>coverage:<build>no <variant>ubasan:<build>no ;
-compile version.cpp :   <variant>coverage:<build>no <variant>ubasan:<build>no ;
-compile websocket.cpp : <variant>coverage:<build>no <variant>ubasan:<build>no ;
-compile zlib.cpp :      <variant>coverage:<build>no <variant>ubasan:<build>no ;
-
 alias run-tests :
-    common//run-tests
-    core//run-tests
-    http//run-tests
-    server//run-tests
-    websocket//run-tests
-    zlib//run-tests
+    beast//run-tests
+    doc//run-tests
+    example//run-tests
     ;
 
-alias run-fat :
-    common//run-fat
-    core//run-fat
-    http//run-fat
-    server//run-fat
-    websocket//run-fat
-    zlib//run-fat
+alias fat-tests :
+    beast//fat-tests
+    doc//fat-tests
+    example//fat-tests
     ;
-explicit run-fat ;
 
-alias build-fat :
-    common//build-fat
-    core//build-fat
-    http//build-fat
-    server//build-fat
-    websocket//build-fat
-    zlib//build-fat
-    ;
-explicit build-fat ;
+explicit fat-tests ;
diff --git a/test/beast/CMakeLists.txt b/test/beast/CMakeLists.txt
new file mode 100644
index 00000000..aa443d75
--- /dev/null
+++ b/test/beast/CMakeLists.txt
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/boostorg/beast
+#
+
+GroupSources(include/boost/beast beast)
+GroupSources(extras/boost/beast extras)
+GroupSources(test/beast "/")
+
+add_executable (tests-beast
+    ${BOOST_BEAST_INCLUDES}
+    ${EXTRAS_INCLUDES}
+    ${TEST_MAIN}
+    Jamfile
+    config.cpp
+    core.cpp
+    http.cpp
+    version.cpp
+    websocket.cpp
+    zlib.cpp
+)
+
+add_subdirectory (core)
+add_subdirectory (http)
+add_subdirectory (websocket)
+add_subdirectory (zlib)
diff --git a/test/beast/Jamfile b/test/beast/Jamfile
new file mode 100644
index 00000000..99d81174
--- /dev/null
+++ b/test/beast/Jamfile
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/boostorg/beast
+#
+
+alias run-tests :
+    [ compile config.cpp ]
+    [ compile core.cpp ]
+    [ compile http.cpp ]
+    [ compile version.cpp ]
+    [ compile websocket.cpp ]
+    [ compile zlib.cpp ]
+    core//run-tests
+    http//run-tests
+    websocket//run-tests
+    zlib//run-tests
+    ;
+
+alias fat-tests :
+    core//fat-tests
+    http//fat-tests
+    websocket//fat-tests
+    zlib//fat-tests
+    ;
+
+explicit fat-tests ;
diff --git a/test/config.cpp b/test/beast/config.cpp
similarity index 100%
rename from test/config.cpp
rename to test/beast/config.cpp
diff --git a/test/core.cpp b/test/beast/core.cpp
similarity index 100%
rename from test/core.cpp
rename to test/beast/core.cpp
diff --git a/test/core/CMakeLists.txt b/test/beast/core/CMakeLists.txt
similarity index 84%
rename from test/core/CMakeLists.txt
rename to test/beast/core/CMakeLists.txt
index 7786db51..0a906a56 100644
--- a/test/core/CMakeLists.txt
+++ b/test/beast/core/CMakeLists.txt
@@ -7,17 +7,15 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(example example)
 GroupSources(extras/boost/beast extras)
 GroupSources(include/boost/beast beast)
-GroupSources(test/core "/")
+GroupSources(test/beast/core "/")
 
-add_executable (core-tests
+add_executable (tests-beast-core
     ${BOOST_BEAST_INCLUDES}
-    ${EXAMPLE_INCLUDES}
     ${EXTRAS_INCLUDES}
+    ${TEST_MAIN}
     Jamfile
-    ../../extras/boost/beast/unit_test/main.cpp
     buffer_test.hpp
     file_test.hpp
     async_result.cpp
@@ -28,8 +26,6 @@ add_executable (core-tests
     buffers_adapter.cpp
     clamp.cpp
     consuming_buffers.cpp
-    doc_examples.cpp
-    doc_snippets.cpp
     drain_buffer.cpp
     error.cpp
     file.cpp
diff --git a/test/core/Jamfile b/test/beast/core/Jamfile
similarity index 79%
rename from test/core/Jamfile
rename to test/beast/core/Jamfile
index 8d97169e..42e0ba60 100644
--- a/test/core/Jamfile
+++ b/test/beast/core/Jamfile
@@ -16,8 +16,6 @@ local SOURCES =
     buffers_adapter.cpp
     clamp.cpp
     consuming_buffers.cpp
-    doc_examples.cpp
-    doc_snippets.cpp
     drain_buffer.cpp
     error.cpp
     file.cpp
@@ -44,11 +42,15 @@ local SOURCES =
     detail/varint.cpp
     ;
 
-local RUN_TESTS ; for local f in $(SOURCES)  { RUN_TESTS += [ run $(f) $(TEST_MAIN) ] ; }
+local RUN_TESTS ;
+
+for local f in $(SOURCES)
+{
+    RUN_TESTS += [ run $(f) $(TEST_MAIN) ] ;
+}
+
 alias run-tests : $(RUN_TESTS) ;
 
-unit-test run-fat : $(TEST_MAIN) $(SOURCES) ;
-explicit run-fat ;
+exe fat-tests : $(TEST_MAIN) $(SOURCES) ;
 
-exe build-fat : $(TEST_MAIN) $(SOURCES) ;
-explicit build-fat ;
+explicit fat-tests ;
diff --git a/test/core/async_result.cpp b/test/beast/core/async_result.cpp
similarity index 100%
rename from test/core/async_result.cpp
rename to test/beast/core/async_result.cpp
diff --git a/test/core/base64.cpp b/test/beast/core/base64.cpp
similarity index 100%
rename from test/core/base64.cpp
rename to test/beast/core/base64.cpp
diff --git a/test/core/bind_handler.cpp b/test/beast/core/bind_handler.cpp
similarity index 100%
rename from test/core/bind_handler.cpp
rename to test/beast/core/bind_handler.cpp
diff --git a/test/core/buffer_cat.cpp b/test/beast/core/buffer_cat.cpp
similarity index 100%
rename from test/core/buffer_cat.cpp
rename to test/beast/core/buffer_cat.cpp
diff --git a/test/core/buffer_prefix.cpp b/test/beast/core/buffer_prefix.cpp
similarity index 100%
rename from test/core/buffer_prefix.cpp
rename to test/beast/core/buffer_prefix.cpp
diff --git a/test/core/buffer_test.hpp b/test/beast/core/buffer_test.hpp
similarity index 100%
rename from test/core/buffer_test.hpp
rename to test/beast/core/buffer_test.hpp
diff --git a/test/core/buffered_read_stream.cpp b/test/beast/core/buffered_read_stream.cpp
similarity index 100%
rename from test/core/buffered_read_stream.cpp
rename to test/beast/core/buffered_read_stream.cpp
diff --git a/test/core/buffers_adapter.cpp b/test/beast/core/buffers_adapter.cpp
similarity index 100%
rename from test/core/buffers_adapter.cpp
rename to test/beast/core/buffers_adapter.cpp
diff --git a/test/core/clamp.cpp b/test/beast/core/clamp.cpp
similarity index 100%
rename from test/core/clamp.cpp
rename to test/beast/core/clamp.cpp
diff --git a/test/core/consuming_buffers.cpp b/test/beast/core/consuming_buffers.cpp
similarity index 100%
rename from test/core/consuming_buffers.cpp
rename to test/beast/core/consuming_buffers.cpp
diff --git a/test/core/detail/variant.cpp b/test/beast/core/detail/variant.cpp
similarity index 100%
rename from test/core/detail/variant.cpp
rename to test/beast/core/detail/variant.cpp
diff --git a/test/core/detail/varint.cpp b/test/beast/core/detail/varint.cpp
similarity index 100%
rename from test/core/detail/varint.cpp
rename to test/beast/core/detail/varint.cpp
diff --git a/test/core/drain_buffer.cpp b/test/beast/core/drain_buffer.cpp
similarity index 100%
rename from test/core/drain_buffer.cpp
rename to test/beast/core/drain_buffer.cpp
diff --git a/test/core/empty_base_optimization.cpp b/test/beast/core/empty_base_optimization.cpp
similarity index 100%
rename from test/core/empty_base_optimization.cpp
rename to test/beast/core/empty_base_optimization.cpp
diff --git a/test/core/error.cpp b/test/beast/core/error.cpp
similarity index 100%
rename from test/core/error.cpp
rename to test/beast/core/error.cpp
diff --git a/test/core/file.cpp b/test/beast/core/file.cpp
similarity index 100%
rename from test/core/file.cpp
rename to test/beast/core/file.cpp
diff --git a/test/core/file_posix.cpp b/test/beast/core/file_posix.cpp
similarity index 100%
rename from test/core/file_posix.cpp
rename to test/beast/core/file_posix.cpp
diff --git a/test/core/file_stdio.cpp b/test/beast/core/file_stdio.cpp
similarity index 100%
rename from test/core/file_stdio.cpp
rename to test/beast/core/file_stdio.cpp
diff --git a/test/core/file_test.hpp b/test/beast/core/file_test.hpp
similarity index 100%
rename from test/core/file_test.hpp
rename to test/beast/core/file_test.hpp
diff --git a/test/core/file_win32.cpp b/test/beast/core/file_win32.cpp
similarity index 100%
rename from test/core/file_win32.cpp
rename to test/beast/core/file_win32.cpp
diff --git a/test/core/flat_buffer.cpp b/test/beast/core/flat_buffer.cpp
similarity index 100%
rename from test/core/flat_buffer.cpp
rename to test/beast/core/flat_buffer.cpp
diff --git a/test/core/flat_static_buffer.cpp b/test/beast/core/flat_static_buffer.cpp
similarity index 100%
rename from test/core/flat_static_buffer.cpp
rename to test/beast/core/flat_static_buffer.cpp
diff --git a/test/core/handler_alloc.cpp b/test/beast/core/handler_alloc.cpp
similarity index 100%
rename from test/core/handler_alloc.cpp
rename to test/beast/core/handler_alloc.cpp
diff --git a/test/core/handler_ptr.cpp b/test/beast/core/handler_ptr.cpp
similarity index 100%
rename from test/core/handler_ptr.cpp
rename to test/beast/core/handler_ptr.cpp
diff --git a/test/core/multi_buffer.cpp b/test/beast/core/multi_buffer.cpp
similarity index 100%
rename from test/core/multi_buffer.cpp
rename to test/beast/core/multi_buffer.cpp
diff --git a/test/core/ostream.cpp b/test/beast/core/ostream.cpp
similarity index 100%
rename from test/core/ostream.cpp
rename to test/beast/core/ostream.cpp
diff --git a/test/core/prepare_buffers.cpp b/test/beast/core/prepare_buffers.cpp
similarity index 100%
rename from test/core/prepare_buffers.cpp
rename to test/beast/core/prepare_buffers.cpp
diff --git a/test/core/read_size.cpp b/test/beast/core/read_size.cpp
similarity index 100%
rename from test/core/read_size.cpp
rename to test/beast/core/read_size.cpp
diff --git a/test/core/sha1.cpp b/test/beast/core/sha1.cpp
similarity index 100%
rename from test/core/sha1.cpp
rename to test/beast/core/sha1.cpp
diff --git a/test/core/span.cpp b/test/beast/core/span.cpp
similarity index 100%
rename from test/core/span.cpp
rename to test/beast/core/span.cpp
diff --git a/test/core/static_buffer.cpp b/test/beast/core/static_buffer.cpp
similarity index 100%
rename from test/core/static_buffer.cpp
rename to test/beast/core/static_buffer.cpp
diff --git a/test/core/static_string.cpp b/test/beast/core/static_string.cpp
similarity index 100%
rename from test/core/static_string.cpp
rename to test/beast/core/static_string.cpp
diff --git a/test/core/string.cpp b/test/beast/core/string.cpp
similarity index 100%
rename from test/core/string.cpp
rename to test/beast/core/string.cpp
diff --git a/test/core/string_param.cpp b/test/beast/core/string_param.cpp
similarity index 100%
rename from test/core/string_param.cpp
rename to test/beast/core/string_param.cpp
diff --git a/test/core/type_traits.cpp b/test/beast/core/type_traits.cpp
similarity index 100%
rename from test/core/type_traits.cpp
rename to test/beast/core/type_traits.cpp
diff --git a/test/core/zlib.cpp b/test/beast/core/zlib.cpp
similarity index 100%
rename from test/core/zlib.cpp
rename to test/beast/core/zlib.cpp
diff --git a/test/http.cpp b/test/beast/http.cpp
similarity index 100%
rename from test/http.cpp
rename to test/beast/http.cpp
diff --git a/test/http/CMakeLists.txt b/test/beast/http/CMakeLists.txt
similarity index 81%
rename from test/http/CMakeLists.txt
rename to test/beast/http/CMakeLists.txt
index 993d536f..4dc482b6 100644
--- a/test/http/CMakeLists.txt
+++ b/test/beast/http/CMakeLists.txt
@@ -7,26 +7,22 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources(example example)
 GroupSources(extras/boost/beast extras)
 GroupSources(include/boost/beast beast)
-GroupSources(test/http "/")
+GroupSources(test/beast/http "/")
 
-add_executable (http-tests
+add_executable (tests-beast-http
     ${BOOST_BEAST_INCLUDES}
-    ${EXAMPLE_INCLUDES}
     ${EXTRAS_INCLUDES}
+    ${TEST_MAIN}
     Jamfile
     message_fuzz.hpp
     test_parser.hpp
-    ../../extras/boost/beast/unit_test/main.cpp
     basic_dynamic_body.cpp
     basic_file_body.cpp
     basic_parser.cpp
     buffer_body.cpp
     chunk_encode.cpp
-    doc_examples.cpp
-    doc_snippets.cpp
     dynamic_body.cpp
     empty_body.cpp
     error.cpp
diff --git a/test/http/Jamfile b/test/beast/http/Jamfile
similarity index 74%
rename from test/http/Jamfile
rename to test/beast/http/Jamfile
index ada45275..1af44c98 100644
--- a/test/http/Jamfile
+++ b/test/beast/http/Jamfile
@@ -13,8 +13,6 @@ local SOURCES =
     basic_parser.cpp
     buffer_body.cpp
     chunk_encode.cpp
-    doc_examples.cpp
-    doc_snippets.cpp
     dynamic_body.cpp
     error.cpp
     field.cpp
@@ -34,11 +32,15 @@ local SOURCES =
     write.cpp
     ;
 
-local RUN_TESTS ; for local f in $(SOURCES)  { RUN_TESTS += [ run $(f) $(TEST_MAIN) ] ; }
+local RUN_TESTS ;
+
+for local f in $(SOURCES)
+{
+    RUN_TESTS += [ run $(f) $(TEST_MAIN) ] ;
+}
+
 alias run-tests : $(RUN_TESTS) ;
 
-unit-test run-fat : $(TEST_MAIN) $(SOURCES) ;
-explicit run-fat ;
+exe fat-tests : $(TEST_MAIN) $(SOURCES) ;
 
-exe build-fat : $(TEST_MAIN) $(SOURCES) ;
-explicit build-fat ;
+explicit fat-tests ;
diff --git a/test/http/basic_dynamic_body.cpp b/test/beast/http/basic_dynamic_body.cpp
similarity index 100%
rename from test/http/basic_dynamic_body.cpp
rename to test/beast/http/basic_dynamic_body.cpp
diff --git a/test/http/basic_file_body.cpp b/test/beast/http/basic_file_body.cpp
similarity index 100%
rename from test/http/basic_file_body.cpp
rename to test/beast/http/basic_file_body.cpp
diff --git a/test/http/basic_parser.cpp b/test/beast/http/basic_parser.cpp
similarity index 100%
rename from test/http/basic_parser.cpp
rename to test/beast/http/basic_parser.cpp
diff --git a/test/http/buffer_body.cpp b/test/beast/http/buffer_body.cpp
similarity index 100%
rename from test/http/buffer_body.cpp
rename to test/beast/http/buffer_body.cpp
diff --git a/test/http/chunk_encode.cpp b/test/beast/http/chunk_encode.cpp
similarity index 100%
rename from test/http/chunk_encode.cpp
rename to test/beast/http/chunk_encode.cpp
diff --git a/test/http/dynamic_body.cpp b/test/beast/http/dynamic_body.cpp
similarity index 100%
rename from test/http/dynamic_body.cpp
rename to test/beast/http/dynamic_body.cpp
diff --git a/test/http/empty_body.cpp b/test/beast/http/empty_body.cpp
similarity index 100%
rename from test/http/empty_body.cpp
rename to test/beast/http/empty_body.cpp
diff --git a/test/http/error.cpp b/test/beast/http/error.cpp
similarity index 100%
rename from test/http/error.cpp
rename to test/beast/http/error.cpp
diff --git a/test/http/field.cpp b/test/beast/http/field.cpp
similarity index 100%
rename from test/http/field.cpp
rename to test/beast/http/field.cpp
diff --git a/test/http/fields.cpp b/test/beast/http/fields.cpp
similarity index 100%
rename from test/http/fields.cpp
rename to test/beast/http/fields.cpp
diff --git a/test/http/file_body.cpp b/test/beast/http/file_body.cpp
similarity index 100%
rename from test/http/file_body.cpp
rename to test/beast/http/file_body.cpp
diff --git a/test/http/message.cpp b/test/beast/http/message.cpp
similarity index 100%
rename from test/http/message.cpp
rename to test/beast/http/message.cpp
diff --git a/test/http/message_fuzz.hpp b/test/beast/http/message_fuzz.hpp
similarity index 100%
rename from test/http/message_fuzz.hpp
rename to test/beast/http/message_fuzz.hpp
diff --git a/test/http/parser.cpp b/test/beast/http/parser.cpp
similarity index 100%
rename from test/http/parser.cpp
rename to test/beast/http/parser.cpp
diff --git a/test/http/read.cpp b/test/beast/http/read.cpp
similarity index 100%
rename from test/http/read.cpp
rename to test/beast/http/read.cpp
diff --git a/test/http/rfc7230.cpp b/test/beast/http/rfc7230.cpp
similarity index 100%
rename from test/http/rfc7230.cpp
rename to test/beast/http/rfc7230.cpp
diff --git a/test/http/serializer.cpp b/test/beast/http/serializer.cpp
similarity index 100%
rename from test/http/serializer.cpp
rename to test/beast/http/serializer.cpp
diff --git a/test/http/span_body.cpp b/test/beast/http/span_body.cpp
similarity index 100%
rename from test/http/span_body.cpp
rename to test/beast/http/span_body.cpp
diff --git a/test/http/status.cpp b/test/beast/http/status.cpp
similarity index 100%
rename from test/http/status.cpp
rename to test/beast/http/status.cpp
diff --git a/test/http/string_body.cpp b/test/beast/http/string_body.cpp
similarity index 100%
rename from test/http/string_body.cpp
rename to test/beast/http/string_body.cpp
diff --git a/test/http/test_parser.hpp b/test/beast/http/test_parser.hpp
similarity index 100%
rename from test/http/test_parser.hpp
rename to test/beast/http/test_parser.hpp
diff --git a/test/http/type_traits.cpp b/test/beast/http/type_traits.cpp
similarity index 100%
rename from test/http/type_traits.cpp
rename to test/beast/http/type_traits.cpp
diff --git a/test/http/vector_body.cpp b/test/beast/http/vector_body.cpp
similarity index 100%
rename from test/http/vector_body.cpp
rename to test/beast/http/vector_body.cpp
diff --git a/test/http/verb.cpp b/test/beast/http/verb.cpp
similarity index 100%
rename from test/http/verb.cpp
rename to test/beast/http/verb.cpp
diff --git a/test/http/write.cpp b/test/beast/http/write.cpp
similarity index 100%
rename from test/http/write.cpp
rename to test/beast/http/write.cpp
diff --git a/test/version.cpp b/test/beast/version.cpp
similarity index 100%
rename from test/version.cpp
rename to test/beast/version.cpp
diff --git a/test/websocket.cpp b/test/beast/websocket.cpp
similarity index 100%
rename from test/websocket.cpp
rename to test/beast/websocket.cpp
diff --git a/test/websocket/CMakeLists.txt b/test/beast/websocket/CMakeLists.txt
similarity index 72%
rename from test/websocket/CMakeLists.txt
rename to test/beast/websocket/CMakeLists.txt
index 5e855dcc..1b38c7da 100644
--- a/test/websocket/CMakeLists.txt
+++ b/test/beast/websocket/CMakeLists.txt
@@ -9,17 +9,15 @@
 
 GroupSources(extras/boost/beast extras)
 GroupSources(include/boost/beast beast)
+GroupSources(test/beast/websocket "/")
 
-GroupSources(test/websocket "/")
-
-add_executable (websocket-tests
+add_executable (tests-beast-websocket
     ${BOOST_BEAST_INCLUDES}
     ${EXTRAS_INCLUDES}
+    ${TEST_MAIN}
     Jamfile
-    ../../extras/boost/beast/unit_test/main.cpp
     websocket_async_echo_server.hpp
     websocket_sync_echo_server.hpp
-    doc_snippets.cpp
     error.cpp
     option.cpp
     rfc6455.cpp
@@ -29,9 +27,3 @@ add_executable (websocket-tests
     mask.cpp
     utf8_checker.cpp
 )
-
-if (OPENSSL_FOUND)
-    target_link_libraries(websocket-tests
-        ${OPENSSL_LIBRARIES}
-        )
-endif()
diff --git a/test/websocket/Jamfile b/test/beast/websocket/Jamfile
similarity index 66%
rename from test/websocket/Jamfile
rename to test/beast/websocket/Jamfile
index b5e08ba9..877041fc 100644
--- a/test/websocket/Jamfile
+++ b/test/beast/websocket/Jamfile
@@ -8,7 +8,6 @@
 #
 
 local SOURCES =
-    doc_snippets.cpp
     error.cpp
     option.cpp
     rfc6455.cpp
@@ -19,11 +18,15 @@ local SOURCES =
     utf8_checker.cpp
     ;
 
-local RUN_TESTS ; for local f in $(SOURCES)  { RUN_TESTS += [ run $(f) $(TEST_MAIN) ] ; }
+local RUN_TESTS ;
+
+for local f in $(SOURCES)
+{
+    RUN_TESTS += [ run $(f) $(TEST_MAIN) ] ;
+}
+
 alias run-tests : $(RUN_TESTS) ;
 
-unit-test run-fat : $(TEST_MAIN) $(SOURCES) ;
-explicit run-fat ;
+exe fat-tests : $(TEST_MAIN) $(SOURCES) ;
 
-exe build-fat : $(TEST_MAIN) $(SOURCES) ;
-explicit build-fat ;
+explicit fat-tests ;
diff --git a/test/websocket/doc_snippets.cpp b/test/beast/websocket/doc_snippets.cpp
similarity index 100%
rename from test/websocket/doc_snippets.cpp
rename to test/beast/websocket/doc_snippets.cpp
diff --git a/test/websocket/error.cpp b/test/beast/websocket/error.cpp
similarity index 100%
rename from test/websocket/error.cpp
rename to test/beast/websocket/error.cpp
diff --git a/test/websocket/frame.cpp b/test/beast/websocket/frame.cpp
similarity index 100%
rename from test/websocket/frame.cpp
rename to test/beast/websocket/frame.cpp
diff --git a/test/websocket/mask.cpp b/test/beast/websocket/mask.cpp
similarity index 100%
rename from test/websocket/mask.cpp
rename to test/beast/websocket/mask.cpp
diff --git a/test/websocket/option.cpp b/test/beast/websocket/option.cpp
similarity index 100%
rename from test/websocket/option.cpp
rename to test/beast/websocket/option.cpp
diff --git a/test/websocket/rfc6455.cpp b/test/beast/websocket/rfc6455.cpp
similarity index 100%
rename from test/websocket/rfc6455.cpp
rename to test/beast/websocket/rfc6455.cpp
diff --git a/test/websocket/stream.cpp b/test/beast/websocket/stream.cpp
similarity index 100%
rename from test/websocket/stream.cpp
rename to test/beast/websocket/stream.cpp
diff --git a/test/websocket/teardown.cpp b/test/beast/websocket/teardown.cpp
similarity index 100%
rename from test/websocket/teardown.cpp
rename to test/beast/websocket/teardown.cpp
diff --git a/test/websocket/utf8_checker.cpp b/test/beast/websocket/utf8_checker.cpp
similarity index 100%
rename from test/websocket/utf8_checker.cpp
rename to test/beast/websocket/utf8_checker.cpp
diff --git a/test/websocket/websocket_async_echo_server.hpp b/test/beast/websocket/websocket_async_echo_server.hpp
similarity index 100%
rename from test/websocket/websocket_async_echo_server.hpp
rename to test/beast/websocket/websocket_async_echo_server.hpp
diff --git a/test/websocket/websocket_sync_echo_server.hpp b/test/beast/websocket/websocket_sync_echo_server.hpp
similarity index 100%
rename from test/websocket/websocket_sync_echo_server.hpp
rename to test/beast/websocket/websocket_sync_echo_server.hpp
diff --git a/test/zlib.cpp b/test/beast/zlib.cpp
similarity index 100%
rename from test/zlib.cpp
rename to test/beast/zlib.cpp
diff --git a/test/zlib/CMakeLists.txt b/test/beast/zlib/CMakeLists.txt
similarity index 94%
rename from test/zlib/CMakeLists.txt
rename to test/beast/zlib/CMakeLists.txt
index 82e4c8fe..b1074f48 100644
--- a/test/zlib/CMakeLists.txt
+++ b/test/beast/zlib/CMakeLists.txt
@@ -9,8 +9,7 @@
 
 GroupSources(extras/boost/beast extras)
 GroupSources(include/boost/beast beast)
-
-GroupSources(test/zlib "/")
+GroupSources(test/beast/zlib "/")
 
 set(ZLIB_SOURCES
     ${CMAKE_CURRENT_LIST_DIR}/zlib-1.2.11/crc32.h
@@ -39,14 +38,14 @@ if (MSVC)
     set_source_files_properties (${ZLIB_SOURCES} PROPERTIES COMPILE_FLAGS "/wd4127 /wd4131 /wd4244")
 endif()
 
-add_executable (zlib-tests
+add_executable (tests-beast-zlib
     ${BOOST_BEAST_INCLUDES}
     ${EXTRAS_INCLUDES}
     ${ZLIB_SOURCES}
+    ${TEST_MAIN}
     Jamfile
-    ../../extras/boost/beast/unit_test/main.cpp
     ztest.hpp
-    deflate_stream.cpp
     error.cpp
+    deflate_stream.cpp
     inflate_stream.cpp
 )
diff --git a/test/zlib/Jamfile b/test/beast/zlib/Jamfile
similarity index 72%
rename from test/zlib/Jamfile
rename to test/beast/zlib/Jamfile
index bf4819e8..1d917ce3 100644
--- a/test/zlib/Jamfile
+++ b/test/beast/zlib/Jamfile
@@ -22,16 +22,20 @@ local ZLIB_SOURCES =
     ;
 
 local SOURCES =
-    deflate_stream.cpp
     error.cpp
+    deflate_stream.cpp
     inflate_stream.cpp
     ;
 
-local RUN_TESTS ; for local f in $(SOURCES)  { RUN_TESTS += [ run $(f) $(TEST_MAIN) $(ZLIB_SOURCES) ] ; }
+local RUN_TESTS ;
+
+for local f in $(SOURCES)
+{
+    RUN_TESTS += [ run $(f) $(TEST_MAIN) $(ZLIB_SOURCES) ] ;
+}
+
 alias run-tests : $(RUN_TESTS) ;
 
-unit-test run-fat : $(TEST_MAIN) $(ZLIB_SOURCES)  $(SOURCES) ;
-explicit run-fat ;
+exe fat-tests : $(TEST_MAIN) $(ZLIB_SOURCES)  $(SOURCES) ;
 
-exe build-fat : $(TEST_MAIN) $(ZLIB_SOURCES)  $(SOURCES) ;
-explicit build-fat ;
+explicit fat-tests ;
diff --git a/test/zlib/deflate_stream.cpp b/test/beast/zlib/deflate_stream.cpp
similarity index 100%
rename from test/zlib/deflate_stream.cpp
rename to test/beast/zlib/deflate_stream.cpp
diff --git a/test/zlib/error.cpp b/test/beast/zlib/error.cpp
similarity index 100%
rename from test/zlib/error.cpp
rename to test/beast/zlib/error.cpp
diff --git a/test/zlib/inflate_stream.cpp b/test/beast/zlib/inflate_stream.cpp
similarity index 100%
rename from test/zlib/inflate_stream.cpp
rename to test/beast/zlib/inflate_stream.cpp
diff --git a/test/zlib/zlib-1.2.11/.gitignore b/test/beast/zlib/zlib-1.2.11/.gitignore
similarity index 100%
rename from test/zlib/zlib-1.2.11/.gitignore
rename to test/beast/zlib/zlib-1.2.11/.gitignore
diff --git a/test/zlib/zlib-1.2.11/CMakeLists.txt b/test/beast/zlib/zlib-1.2.11/CMakeLists.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/CMakeLists.txt
rename to test/beast/zlib/zlib-1.2.11/CMakeLists.txt
diff --git a/test/zlib/zlib-1.2.11/ChangeLog b/test/beast/zlib/zlib-1.2.11/ChangeLog
similarity index 100%
rename from test/zlib/zlib-1.2.11/ChangeLog
rename to test/beast/zlib/zlib-1.2.11/ChangeLog
diff --git a/test/zlib/zlib-1.2.11/FAQ b/test/beast/zlib/zlib-1.2.11/FAQ
similarity index 100%
rename from test/zlib/zlib-1.2.11/FAQ
rename to test/beast/zlib/zlib-1.2.11/FAQ
diff --git a/test/zlib/zlib-1.2.11/INDEX b/test/beast/zlib/zlib-1.2.11/INDEX
similarity index 100%
rename from test/zlib/zlib-1.2.11/INDEX
rename to test/beast/zlib/zlib-1.2.11/INDEX
diff --git a/test/zlib/zlib-1.2.11/Makefile b/test/beast/zlib/zlib-1.2.11/Makefile
similarity index 100%
rename from test/zlib/zlib-1.2.11/Makefile
rename to test/beast/zlib/zlib-1.2.11/Makefile
diff --git a/test/zlib/zlib-1.2.11/Makefile.in b/test/beast/zlib/zlib-1.2.11/Makefile.in
similarity index 100%
rename from test/zlib/zlib-1.2.11/Makefile.in
rename to test/beast/zlib/zlib-1.2.11/Makefile.in
diff --git a/test/zlib/zlib-1.2.11/README b/test/beast/zlib/zlib-1.2.11/README
similarity index 100%
rename from test/zlib/zlib-1.2.11/README
rename to test/beast/zlib/zlib-1.2.11/README
diff --git a/test/zlib/zlib-1.2.11/adler32.c b/test/beast/zlib/zlib-1.2.11/adler32.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/adler32.c
rename to test/beast/zlib/zlib-1.2.11/adler32.c
diff --git a/test/zlib/zlib-1.2.11/amiga/Makefile.pup b/test/beast/zlib/zlib-1.2.11/amiga/Makefile.pup
similarity index 100%
rename from test/zlib/zlib-1.2.11/amiga/Makefile.pup
rename to test/beast/zlib/zlib-1.2.11/amiga/Makefile.pup
diff --git a/test/zlib/zlib-1.2.11/amiga/Makefile.sas b/test/beast/zlib/zlib-1.2.11/amiga/Makefile.sas
similarity index 100%
rename from test/zlib/zlib-1.2.11/amiga/Makefile.sas
rename to test/beast/zlib/zlib-1.2.11/amiga/Makefile.sas
diff --git a/test/zlib/zlib-1.2.11/compress.c b/test/beast/zlib/zlib-1.2.11/compress.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/compress.c
rename to test/beast/zlib/zlib-1.2.11/compress.c
diff --git a/test/zlib/zlib-1.2.11/configure b/test/beast/zlib/zlib-1.2.11/configure
similarity index 100%
rename from test/zlib/zlib-1.2.11/configure
rename to test/beast/zlib/zlib-1.2.11/configure
diff --git a/test/zlib/zlib-1.2.11/contrib/README.contrib b/test/beast/zlib/zlib-1.2.11/contrib/README.contrib
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/README.contrib
rename to test/beast/zlib/zlib-1.2.11/contrib/README.contrib
diff --git a/test/zlib/zlib-1.2.11/contrib/ada/buffer_demo.adb b/test/beast/zlib/zlib-1.2.11/contrib/ada/buffer_demo.adb
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/ada/buffer_demo.adb
rename to test/beast/zlib/zlib-1.2.11/contrib/ada/buffer_demo.adb
diff --git a/test/zlib/zlib-1.2.11/contrib/ada/mtest.adb b/test/beast/zlib/zlib-1.2.11/contrib/ada/mtest.adb
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/ada/mtest.adb
rename to test/beast/zlib/zlib-1.2.11/contrib/ada/mtest.adb
diff --git a/test/zlib/zlib-1.2.11/contrib/ada/read.adb b/test/beast/zlib/zlib-1.2.11/contrib/ada/read.adb
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/ada/read.adb
rename to test/beast/zlib/zlib-1.2.11/contrib/ada/read.adb
diff --git a/test/zlib/zlib-1.2.11/contrib/ada/readme.txt b/test/beast/zlib/zlib-1.2.11/contrib/ada/readme.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/ada/readme.txt
rename to test/beast/zlib/zlib-1.2.11/contrib/ada/readme.txt
diff --git a/test/zlib/zlib-1.2.11/contrib/ada/test.adb b/test/beast/zlib/zlib-1.2.11/contrib/ada/test.adb
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/ada/test.adb
rename to test/beast/zlib/zlib-1.2.11/contrib/ada/test.adb
diff --git a/test/zlib/zlib-1.2.11/contrib/ada/zlib-streams.adb b/test/beast/zlib/zlib-1.2.11/contrib/ada/zlib-streams.adb
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/ada/zlib-streams.adb
rename to test/beast/zlib/zlib-1.2.11/contrib/ada/zlib-streams.adb
diff --git a/test/zlib/zlib-1.2.11/contrib/ada/zlib-streams.ads b/test/beast/zlib/zlib-1.2.11/contrib/ada/zlib-streams.ads
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/ada/zlib-streams.ads
rename to test/beast/zlib/zlib-1.2.11/contrib/ada/zlib-streams.ads
diff --git a/test/zlib/zlib-1.2.11/contrib/ada/zlib-thin.adb b/test/beast/zlib/zlib-1.2.11/contrib/ada/zlib-thin.adb
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/ada/zlib-thin.adb
rename to test/beast/zlib/zlib-1.2.11/contrib/ada/zlib-thin.adb
diff --git a/test/zlib/zlib-1.2.11/contrib/ada/zlib-thin.ads b/test/beast/zlib/zlib-1.2.11/contrib/ada/zlib-thin.ads
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/ada/zlib-thin.ads
rename to test/beast/zlib/zlib-1.2.11/contrib/ada/zlib-thin.ads
diff --git a/test/zlib/zlib-1.2.11/contrib/ada/zlib.adb b/test/beast/zlib/zlib-1.2.11/contrib/ada/zlib.adb
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/ada/zlib.adb
rename to test/beast/zlib/zlib-1.2.11/contrib/ada/zlib.adb
diff --git a/test/zlib/zlib-1.2.11/contrib/ada/zlib.ads b/test/beast/zlib/zlib-1.2.11/contrib/ada/zlib.ads
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/ada/zlib.ads
rename to test/beast/zlib/zlib-1.2.11/contrib/ada/zlib.ads
diff --git a/test/zlib/zlib-1.2.11/contrib/ada/zlib.gpr b/test/beast/zlib/zlib-1.2.11/contrib/ada/zlib.gpr
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/ada/zlib.gpr
rename to test/beast/zlib/zlib-1.2.11/contrib/ada/zlib.gpr
diff --git a/test/zlib/zlib-1.2.11/contrib/amd64/amd64-match.S b/test/beast/zlib/zlib-1.2.11/contrib/amd64/amd64-match.S
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/amd64/amd64-match.S
rename to test/beast/zlib/zlib-1.2.11/contrib/amd64/amd64-match.S
diff --git a/test/zlib/zlib-1.2.11/contrib/asm686/README.686 b/test/beast/zlib/zlib-1.2.11/contrib/asm686/README.686
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/asm686/README.686
rename to test/beast/zlib/zlib-1.2.11/contrib/asm686/README.686
diff --git a/test/zlib/zlib-1.2.11/contrib/asm686/match.S b/test/beast/zlib/zlib-1.2.11/contrib/asm686/match.S
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/asm686/match.S
rename to test/beast/zlib/zlib-1.2.11/contrib/asm686/match.S
diff --git a/test/zlib/zlib-1.2.11/contrib/blast/Makefile b/test/beast/zlib/zlib-1.2.11/contrib/blast/Makefile
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/blast/Makefile
rename to test/beast/zlib/zlib-1.2.11/contrib/blast/Makefile
diff --git a/test/zlib/zlib-1.2.11/contrib/blast/README b/test/beast/zlib/zlib-1.2.11/contrib/blast/README
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/blast/README
rename to test/beast/zlib/zlib-1.2.11/contrib/blast/README
diff --git a/test/zlib/zlib-1.2.11/contrib/blast/blast.c b/test/beast/zlib/zlib-1.2.11/contrib/blast/blast.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/blast/blast.c
rename to test/beast/zlib/zlib-1.2.11/contrib/blast/blast.c
diff --git a/test/zlib/zlib-1.2.11/contrib/blast/blast.h b/test/beast/zlib/zlib-1.2.11/contrib/blast/blast.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/blast/blast.h
rename to test/beast/zlib/zlib-1.2.11/contrib/blast/blast.h
diff --git a/test/zlib/zlib-1.2.11/contrib/blast/test.pk b/test/beast/zlib/zlib-1.2.11/contrib/blast/test.pk
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/blast/test.pk
rename to test/beast/zlib/zlib-1.2.11/contrib/blast/test.pk
diff --git a/test/zlib/zlib-1.2.11/contrib/blast/test.txt b/test/beast/zlib/zlib-1.2.11/contrib/blast/test.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/blast/test.txt
rename to test/beast/zlib/zlib-1.2.11/contrib/blast/test.txt
diff --git a/test/zlib/zlib-1.2.11/contrib/delphi/ZLib.pas b/test/beast/zlib/zlib-1.2.11/contrib/delphi/ZLib.pas
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/delphi/ZLib.pas
rename to test/beast/zlib/zlib-1.2.11/contrib/delphi/ZLib.pas
diff --git a/test/zlib/zlib-1.2.11/contrib/delphi/ZLibConst.pas b/test/beast/zlib/zlib-1.2.11/contrib/delphi/ZLibConst.pas
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/delphi/ZLibConst.pas
rename to test/beast/zlib/zlib-1.2.11/contrib/delphi/ZLibConst.pas
diff --git a/test/zlib/zlib-1.2.11/contrib/delphi/readme.txt b/test/beast/zlib/zlib-1.2.11/contrib/delphi/readme.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/delphi/readme.txt
rename to test/beast/zlib/zlib-1.2.11/contrib/delphi/readme.txt
diff --git a/test/zlib/zlib-1.2.11/contrib/delphi/zlibd32.mak b/test/beast/zlib/zlib-1.2.11/contrib/delphi/zlibd32.mak
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/delphi/zlibd32.mak
rename to test/beast/zlib/zlib-1.2.11/contrib/delphi/zlibd32.mak
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib.build b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib.build
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib.build
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib.build
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib.chm b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib.chm
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib.chm
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib.chm
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib.sln b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib.sln
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib.sln
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib.sln
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/AssemblyInfo.cs b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/AssemblyInfo.cs
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/AssemblyInfo.cs
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/AssemblyInfo.cs
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/ChecksumImpl.cs
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/ChecksumImpl.cs
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/ChecksumImpl.cs
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/CircularBuffer.cs b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/CircularBuffer.cs
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/CircularBuffer.cs
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/CircularBuffer.cs
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/CodecBase.cs b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/CodecBase.cs
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/CodecBase.cs
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/CodecBase.cs
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/Deflater.cs b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/Deflater.cs
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/Deflater.cs
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/Deflater.cs
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.cs b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.cs
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.cs
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.cs
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.csproj b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.csproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.csproj
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/DotZLib.csproj
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/GZipStream.cs b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/GZipStream.cs
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/GZipStream.cs
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/GZipStream.cs
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/Inflater.cs b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/Inflater.cs
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/Inflater.cs
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/Inflater.cs
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/UnitTests.cs b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/UnitTests.cs
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/UnitTests.cs
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/DotZLib/UnitTests.cs
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/LICENSE_1_0.txt b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/LICENSE_1_0.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/LICENSE_1_0.txt
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/LICENSE_1_0.txt
diff --git a/test/zlib/zlib-1.2.11/contrib/dotzlib/readme.txt b/test/beast/zlib/zlib-1.2.11/contrib/dotzlib/readme.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/dotzlib/readme.txt
rename to test/beast/zlib/zlib-1.2.11/contrib/dotzlib/readme.txt
diff --git a/test/zlib/zlib-1.2.11/contrib/gcc_gvmat64/gvmat64.S b/test/beast/zlib/zlib-1.2.11/contrib/gcc_gvmat64/gvmat64.S
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/gcc_gvmat64/gvmat64.S
rename to test/beast/zlib/zlib-1.2.11/contrib/gcc_gvmat64/gvmat64.S
diff --git a/test/zlib/zlib-1.2.11/contrib/infback9/README b/test/beast/zlib/zlib-1.2.11/contrib/infback9/README
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/infback9/README
rename to test/beast/zlib/zlib-1.2.11/contrib/infback9/README
diff --git a/test/zlib/zlib-1.2.11/contrib/infback9/infback9.c b/test/beast/zlib/zlib-1.2.11/contrib/infback9/infback9.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/infback9/infback9.c
rename to test/beast/zlib/zlib-1.2.11/contrib/infback9/infback9.c
diff --git a/test/zlib/zlib-1.2.11/contrib/infback9/infback9.h b/test/beast/zlib/zlib-1.2.11/contrib/infback9/infback9.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/infback9/infback9.h
rename to test/beast/zlib/zlib-1.2.11/contrib/infback9/infback9.h
diff --git a/test/zlib/zlib-1.2.11/contrib/infback9/inffix9.h b/test/beast/zlib/zlib-1.2.11/contrib/infback9/inffix9.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/infback9/inffix9.h
rename to test/beast/zlib/zlib-1.2.11/contrib/infback9/inffix9.h
diff --git a/test/zlib/zlib-1.2.11/contrib/infback9/inflate9.h b/test/beast/zlib/zlib-1.2.11/contrib/infback9/inflate9.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/infback9/inflate9.h
rename to test/beast/zlib/zlib-1.2.11/contrib/infback9/inflate9.h
diff --git a/test/zlib/zlib-1.2.11/contrib/infback9/inftree9.c b/test/beast/zlib/zlib-1.2.11/contrib/infback9/inftree9.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/infback9/inftree9.c
rename to test/beast/zlib/zlib-1.2.11/contrib/infback9/inftree9.c
diff --git a/test/zlib/zlib-1.2.11/contrib/infback9/inftree9.h b/test/beast/zlib/zlib-1.2.11/contrib/infback9/inftree9.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/infback9/inftree9.h
rename to test/beast/zlib/zlib-1.2.11/contrib/infback9/inftree9.h
diff --git a/test/zlib/zlib-1.2.11/contrib/inflate86/inffas86.c b/test/beast/zlib/zlib-1.2.11/contrib/inflate86/inffas86.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/inflate86/inffas86.c
rename to test/beast/zlib/zlib-1.2.11/contrib/inflate86/inffas86.c
diff --git a/test/zlib/zlib-1.2.11/contrib/inflate86/inffast.S b/test/beast/zlib/zlib-1.2.11/contrib/inflate86/inffast.S
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/inflate86/inffast.S
rename to test/beast/zlib/zlib-1.2.11/contrib/inflate86/inffast.S
diff --git a/test/zlib/zlib-1.2.11/contrib/iostream/test.cpp b/test/beast/zlib/zlib-1.2.11/contrib/iostream/test.cpp
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/iostream/test.cpp
rename to test/beast/zlib/zlib-1.2.11/contrib/iostream/test.cpp
diff --git a/test/zlib/zlib-1.2.11/contrib/iostream/zfstream.cpp b/test/beast/zlib/zlib-1.2.11/contrib/iostream/zfstream.cpp
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/iostream/zfstream.cpp
rename to test/beast/zlib/zlib-1.2.11/contrib/iostream/zfstream.cpp
diff --git a/test/zlib/zlib-1.2.11/contrib/iostream/zfstream.h b/test/beast/zlib/zlib-1.2.11/contrib/iostream/zfstream.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/iostream/zfstream.h
rename to test/beast/zlib/zlib-1.2.11/contrib/iostream/zfstream.h
diff --git a/test/zlib/zlib-1.2.11/contrib/iostream2/zstream.h b/test/beast/zlib/zlib-1.2.11/contrib/iostream2/zstream.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/iostream2/zstream.h
rename to test/beast/zlib/zlib-1.2.11/contrib/iostream2/zstream.h
diff --git a/test/zlib/zlib-1.2.11/contrib/iostream2/zstream_test.cpp b/test/beast/zlib/zlib-1.2.11/contrib/iostream2/zstream_test.cpp
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/iostream2/zstream_test.cpp
rename to test/beast/zlib/zlib-1.2.11/contrib/iostream2/zstream_test.cpp
diff --git a/test/zlib/zlib-1.2.11/contrib/iostream3/README b/test/beast/zlib/zlib-1.2.11/contrib/iostream3/README
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/iostream3/README
rename to test/beast/zlib/zlib-1.2.11/contrib/iostream3/README
diff --git a/test/zlib/zlib-1.2.11/contrib/iostream3/TODO b/test/beast/zlib/zlib-1.2.11/contrib/iostream3/TODO
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/iostream3/TODO
rename to test/beast/zlib/zlib-1.2.11/contrib/iostream3/TODO
diff --git a/test/zlib/zlib-1.2.11/contrib/iostream3/test.cc b/test/beast/zlib/zlib-1.2.11/contrib/iostream3/test.cc
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/iostream3/test.cc
rename to test/beast/zlib/zlib-1.2.11/contrib/iostream3/test.cc
diff --git a/test/zlib/zlib-1.2.11/contrib/iostream3/zfstream.cc b/test/beast/zlib/zlib-1.2.11/contrib/iostream3/zfstream.cc
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/iostream3/zfstream.cc
rename to test/beast/zlib/zlib-1.2.11/contrib/iostream3/zfstream.cc
diff --git a/test/zlib/zlib-1.2.11/contrib/iostream3/zfstream.h b/test/beast/zlib/zlib-1.2.11/contrib/iostream3/zfstream.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/iostream3/zfstream.h
rename to test/beast/zlib/zlib-1.2.11/contrib/iostream3/zfstream.h
diff --git a/test/zlib/zlib-1.2.11/contrib/masmx64/bld_ml64.bat b/test/beast/zlib/zlib-1.2.11/contrib/masmx64/bld_ml64.bat
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/masmx64/bld_ml64.bat
rename to test/beast/zlib/zlib-1.2.11/contrib/masmx64/bld_ml64.bat
diff --git a/test/zlib/zlib-1.2.11/contrib/masmx64/gvmat64.asm b/test/beast/zlib/zlib-1.2.11/contrib/masmx64/gvmat64.asm
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/masmx64/gvmat64.asm
rename to test/beast/zlib/zlib-1.2.11/contrib/masmx64/gvmat64.asm
diff --git a/test/zlib/zlib-1.2.11/contrib/masmx64/inffas8664.c b/test/beast/zlib/zlib-1.2.11/contrib/masmx64/inffas8664.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/masmx64/inffas8664.c
rename to test/beast/zlib/zlib-1.2.11/contrib/masmx64/inffas8664.c
diff --git a/test/zlib/zlib-1.2.11/contrib/masmx64/inffasx64.asm b/test/beast/zlib/zlib-1.2.11/contrib/masmx64/inffasx64.asm
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/masmx64/inffasx64.asm
rename to test/beast/zlib/zlib-1.2.11/contrib/masmx64/inffasx64.asm
diff --git a/test/zlib/zlib-1.2.11/contrib/masmx64/readme.txt b/test/beast/zlib/zlib-1.2.11/contrib/masmx64/readme.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/masmx64/readme.txt
rename to test/beast/zlib/zlib-1.2.11/contrib/masmx64/readme.txt
diff --git a/test/zlib/zlib-1.2.11/contrib/masmx86/bld_ml32.bat b/test/beast/zlib/zlib-1.2.11/contrib/masmx86/bld_ml32.bat
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/masmx86/bld_ml32.bat
rename to test/beast/zlib/zlib-1.2.11/contrib/masmx86/bld_ml32.bat
diff --git a/test/zlib/zlib-1.2.11/contrib/masmx86/inffas32.asm b/test/beast/zlib/zlib-1.2.11/contrib/masmx86/inffas32.asm
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/masmx86/inffas32.asm
rename to test/beast/zlib/zlib-1.2.11/contrib/masmx86/inffas32.asm
diff --git a/test/zlib/zlib-1.2.11/contrib/masmx86/match686.asm b/test/beast/zlib/zlib-1.2.11/contrib/masmx86/match686.asm
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/masmx86/match686.asm
rename to test/beast/zlib/zlib-1.2.11/contrib/masmx86/match686.asm
diff --git a/test/zlib/zlib-1.2.11/contrib/masmx86/readme.txt b/test/beast/zlib/zlib-1.2.11/contrib/masmx86/readme.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/masmx86/readme.txt
rename to test/beast/zlib/zlib-1.2.11/contrib/masmx86/readme.txt
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/Makefile b/test/beast/zlib/zlib-1.2.11/contrib/minizip/Makefile
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/Makefile
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/Makefile
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/Makefile.am b/test/beast/zlib/zlib-1.2.11/contrib/minizip/Makefile.am
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/Makefile.am
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/Makefile.am
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/MiniZip64_Changes.txt b/test/beast/zlib/zlib-1.2.11/contrib/minizip/MiniZip64_Changes.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/MiniZip64_Changes.txt
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/MiniZip64_Changes.txt
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/MiniZip64_info.txt b/test/beast/zlib/zlib-1.2.11/contrib/minizip/MiniZip64_info.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/MiniZip64_info.txt
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/MiniZip64_info.txt
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/configure.ac b/test/beast/zlib/zlib-1.2.11/contrib/minizip/configure.ac
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/configure.ac
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/configure.ac
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/crypt.h b/test/beast/zlib/zlib-1.2.11/contrib/minizip/crypt.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/crypt.h
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/crypt.h
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/ioapi.c b/test/beast/zlib/zlib-1.2.11/contrib/minizip/ioapi.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/ioapi.c
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/ioapi.c
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/ioapi.h b/test/beast/zlib/zlib-1.2.11/contrib/minizip/ioapi.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/ioapi.h
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/ioapi.h
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/iowin32.c b/test/beast/zlib/zlib-1.2.11/contrib/minizip/iowin32.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/iowin32.c
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/iowin32.c
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/iowin32.h b/test/beast/zlib/zlib-1.2.11/contrib/minizip/iowin32.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/iowin32.h
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/iowin32.h
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/make_vms.com b/test/beast/zlib/zlib-1.2.11/contrib/minizip/make_vms.com
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/make_vms.com
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/make_vms.com
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/miniunz.c b/test/beast/zlib/zlib-1.2.11/contrib/minizip/miniunz.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/miniunz.c
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/miniunz.c
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/miniunzip.1 b/test/beast/zlib/zlib-1.2.11/contrib/minizip/miniunzip.1
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/miniunzip.1
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/miniunzip.1
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/minizip.1 b/test/beast/zlib/zlib-1.2.11/contrib/minizip/minizip.1
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/minizip.1
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/minizip.1
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/minizip.c b/test/beast/zlib/zlib-1.2.11/contrib/minizip/minizip.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/minizip.c
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/minizip.c
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/minizip.pc.in b/test/beast/zlib/zlib-1.2.11/contrib/minizip/minizip.pc.in
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/minizip.pc.in
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/minizip.pc.in
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/mztools.c b/test/beast/zlib/zlib-1.2.11/contrib/minizip/mztools.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/mztools.c
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/mztools.c
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/mztools.h b/test/beast/zlib/zlib-1.2.11/contrib/minizip/mztools.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/mztools.h
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/mztools.h
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/unzip.c b/test/beast/zlib/zlib-1.2.11/contrib/minizip/unzip.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/unzip.c
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/unzip.c
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/unzip.h b/test/beast/zlib/zlib-1.2.11/contrib/minizip/unzip.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/unzip.h
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/unzip.h
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/zip.c b/test/beast/zlib/zlib-1.2.11/contrib/minizip/zip.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/zip.c
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/zip.c
diff --git a/test/zlib/zlib-1.2.11/contrib/minizip/zip.h b/test/beast/zlib/zlib-1.2.11/contrib/minizip/zip.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/minizip/zip.h
rename to test/beast/zlib/zlib-1.2.11/contrib/minizip/zip.h
diff --git a/test/zlib/zlib-1.2.11/contrib/pascal/example.pas b/test/beast/zlib/zlib-1.2.11/contrib/pascal/example.pas
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/pascal/example.pas
rename to test/beast/zlib/zlib-1.2.11/contrib/pascal/example.pas
diff --git a/test/zlib/zlib-1.2.11/contrib/pascal/readme.txt b/test/beast/zlib/zlib-1.2.11/contrib/pascal/readme.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/pascal/readme.txt
rename to test/beast/zlib/zlib-1.2.11/contrib/pascal/readme.txt
diff --git a/test/zlib/zlib-1.2.11/contrib/pascal/zlibd32.mak b/test/beast/zlib/zlib-1.2.11/contrib/pascal/zlibd32.mak
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/pascal/zlibd32.mak
rename to test/beast/zlib/zlib-1.2.11/contrib/pascal/zlibd32.mak
diff --git a/test/zlib/zlib-1.2.11/contrib/pascal/zlibpas.pas b/test/beast/zlib/zlib-1.2.11/contrib/pascal/zlibpas.pas
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/pascal/zlibpas.pas
rename to test/beast/zlib/zlib-1.2.11/contrib/pascal/zlibpas.pas
diff --git a/test/zlib/zlib-1.2.11/contrib/puff/Makefile b/test/beast/zlib/zlib-1.2.11/contrib/puff/Makefile
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/puff/Makefile
rename to test/beast/zlib/zlib-1.2.11/contrib/puff/Makefile
diff --git a/test/zlib/zlib-1.2.11/contrib/puff/README b/test/beast/zlib/zlib-1.2.11/contrib/puff/README
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/puff/README
rename to test/beast/zlib/zlib-1.2.11/contrib/puff/README
diff --git a/test/zlib/zlib-1.2.11/contrib/puff/puff.c b/test/beast/zlib/zlib-1.2.11/contrib/puff/puff.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/puff/puff.c
rename to test/beast/zlib/zlib-1.2.11/contrib/puff/puff.c
diff --git a/test/zlib/zlib-1.2.11/contrib/puff/puff.h b/test/beast/zlib/zlib-1.2.11/contrib/puff/puff.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/puff/puff.h
rename to test/beast/zlib/zlib-1.2.11/contrib/puff/puff.h
diff --git a/test/zlib/zlib-1.2.11/contrib/puff/pufftest.c b/test/beast/zlib/zlib-1.2.11/contrib/puff/pufftest.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/puff/pufftest.c
rename to test/beast/zlib/zlib-1.2.11/contrib/puff/pufftest.c
diff --git a/test/zlib/zlib-1.2.11/contrib/puff/zeros.raw b/test/beast/zlib/zlib-1.2.11/contrib/puff/zeros.raw
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/puff/zeros.raw
rename to test/beast/zlib/zlib-1.2.11/contrib/puff/zeros.raw
diff --git a/test/zlib/zlib-1.2.11/contrib/testzlib/testzlib.c b/test/beast/zlib/zlib-1.2.11/contrib/testzlib/testzlib.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/testzlib/testzlib.c
rename to test/beast/zlib/zlib-1.2.11/contrib/testzlib/testzlib.c
diff --git a/test/zlib/zlib-1.2.11/contrib/testzlib/testzlib.txt b/test/beast/zlib/zlib-1.2.11/contrib/testzlib/testzlib.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/testzlib/testzlib.txt
rename to test/beast/zlib/zlib-1.2.11/contrib/testzlib/testzlib.txt
diff --git a/test/zlib/zlib-1.2.11/contrib/untgz/Makefile b/test/beast/zlib/zlib-1.2.11/contrib/untgz/Makefile
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/untgz/Makefile
rename to test/beast/zlib/zlib-1.2.11/contrib/untgz/Makefile
diff --git a/test/zlib/zlib-1.2.11/contrib/untgz/Makefile.msc b/test/beast/zlib/zlib-1.2.11/contrib/untgz/Makefile.msc
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/untgz/Makefile.msc
rename to test/beast/zlib/zlib-1.2.11/contrib/untgz/Makefile.msc
diff --git a/test/zlib/zlib-1.2.11/contrib/untgz/untgz.c b/test/beast/zlib/zlib-1.2.11/contrib/untgz/untgz.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/untgz/untgz.c
rename to test/beast/zlib/zlib-1.2.11/contrib/untgz/untgz.c
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/readme.txt b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/readme.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/readme.txt
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/readme.txt
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/miniunz.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/miniunz.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/miniunz.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/miniunz.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/miniunz.vcxproj.filters b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/miniunz.vcxproj.filters
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/miniunz.vcxproj.filters
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/miniunz.vcxproj.filters
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/minizip.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/minizip.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/minizip.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/minizip.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/minizip.vcxproj.filters b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/minizip.vcxproj.filters
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/minizip.vcxproj.filters
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/minizip.vcxproj.filters
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlib.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlib.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlib.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlib.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlib.vcxproj.filters b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlib.vcxproj.filters
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlib.vcxproj.filters
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlib.vcxproj.filters
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlibdll.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlibdll.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlibdll.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlibdll.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlibdll.vcxproj.filters b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlib.rc b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlib.rc
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlib.rc
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlib.rc
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibstat.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibstat.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibstat.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibstat.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibstat.vcxproj.filters
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibstat.vcxproj.filters
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibstat.vcxproj.filters
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.def b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.def
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.def
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.def
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.sln b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.sln
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.sln
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.sln
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.vcxproj.filters
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.vcxproj.filters
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc10/zlibvc.vcxproj.filters
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc11/miniunz.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/miniunz.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc11/miniunz.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/miniunz.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc11/minizip.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/minizip.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc11/minizip.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/minizip.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc11/testzlib.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/testzlib.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc11/testzlib.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/testzlib.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc11/testzlibdll.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/testzlibdll.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc11/testzlibdll.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/testzlibdll.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlib.rc b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlib.rc
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlib.rc
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlib.rc
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibstat.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibstat.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibstat.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibstat.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.def b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.def
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.def
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.def
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.sln b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.sln
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.sln
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.sln
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc11/zlibvc.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc12/miniunz.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/miniunz.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc12/miniunz.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/miniunz.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc12/minizip.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/minizip.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc12/minizip.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/minizip.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc12/testzlib.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/testzlib.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc12/testzlib.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/testzlib.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc12/testzlibdll.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/testzlibdll.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc12/testzlibdll.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/testzlibdll.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlib.rc b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlib.rc
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlib.rc
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlib.rc
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibstat.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibstat.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibstat.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibstat.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.def b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.def
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.def
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.def
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.sln b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.sln
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.sln
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.sln
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc12/zlibvc.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc14/miniunz.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/miniunz.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc14/miniunz.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/miniunz.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc14/minizip.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/minizip.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc14/minizip.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/minizip.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc14/testzlib.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/testzlib.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc14/testzlib.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/testzlib.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc14/testzlibdll.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/testzlibdll.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc14/testzlibdll.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/testzlibdll.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlib.rc b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlib.rc
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlib.rc
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlib.rc
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibstat.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibstat.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibstat.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibstat.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.def b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.def
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.def
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.def
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.sln b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.sln
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.sln
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.sln
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.vcxproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.vcxproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.vcxproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc14/zlibvc.vcxproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc9/miniunz.vcproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/miniunz.vcproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc9/miniunz.vcproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/miniunz.vcproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc9/minizip.vcproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/minizip.vcproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc9/minizip.vcproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/minizip.vcproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc9/testzlib.vcproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/testzlib.vcproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc9/testzlib.vcproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/testzlib.vcproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc9/testzlibdll.vcproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/testzlibdll.vcproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc9/testzlibdll.vcproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/testzlibdll.vcproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlib.rc b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlib.rc
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlib.rc
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlib.rc
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibstat.vcproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibstat.vcproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibstat.vcproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibstat.vcproj
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.def b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.def
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.def
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.def
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.sln b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.sln
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.sln
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.sln
diff --git a/test/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.vcproj b/test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.vcproj
similarity index 100%
rename from test/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.vcproj
rename to test/beast/zlib/zlib-1.2.11/contrib/vstudio/vc9/zlibvc.vcproj
diff --git a/test/zlib/zlib-1.2.11/crc32.c b/test/beast/zlib/zlib-1.2.11/crc32.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/crc32.c
rename to test/beast/zlib/zlib-1.2.11/crc32.c
diff --git a/test/zlib/zlib-1.2.11/crc32.h b/test/beast/zlib/zlib-1.2.11/crc32.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/crc32.h
rename to test/beast/zlib/zlib-1.2.11/crc32.h
diff --git a/test/zlib/zlib-1.2.11/deflate.c b/test/beast/zlib/zlib-1.2.11/deflate.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/deflate.c
rename to test/beast/zlib/zlib-1.2.11/deflate.c
diff --git a/test/zlib/zlib-1.2.11/deflate.h b/test/beast/zlib/zlib-1.2.11/deflate.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/deflate.h
rename to test/beast/zlib/zlib-1.2.11/deflate.h
diff --git a/test/zlib/zlib-1.2.11/doc/algorithm.txt b/test/beast/zlib/zlib-1.2.11/doc/algorithm.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/doc/algorithm.txt
rename to test/beast/zlib/zlib-1.2.11/doc/algorithm.txt
diff --git a/test/zlib/zlib-1.2.11/doc/rfc1950.txt b/test/beast/zlib/zlib-1.2.11/doc/rfc1950.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/doc/rfc1950.txt
rename to test/beast/zlib/zlib-1.2.11/doc/rfc1950.txt
diff --git a/test/zlib/zlib-1.2.11/doc/rfc1951.txt b/test/beast/zlib/zlib-1.2.11/doc/rfc1951.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/doc/rfc1951.txt
rename to test/beast/zlib/zlib-1.2.11/doc/rfc1951.txt
diff --git a/test/zlib/zlib-1.2.11/doc/rfc1952.txt b/test/beast/zlib/zlib-1.2.11/doc/rfc1952.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/doc/rfc1952.txt
rename to test/beast/zlib/zlib-1.2.11/doc/rfc1952.txt
diff --git a/test/zlib/zlib-1.2.11/doc/txtvsbin.txt b/test/beast/zlib/zlib-1.2.11/doc/txtvsbin.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/doc/txtvsbin.txt
rename to test/beast/zlib/zlib-1.2.11/doc/txtvsbin.txt
diff --git a/test/zlib/zlib-1.2.11/examples/README.examples b/test/beast/zlib/zlib-1.2.11/examples/README.examples
similarity index 100%
rename from test/zlib/zlib-1.2.11/examples/README.examples
rename to test/beast/zlib/zlib-1.2.11/examples/README.examples
diff --git a/test/zlib/zlib-1.2.11/examples/enough.c b/test/beast/zlib/zlib-1.2.11/examples/enough.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/examples/enough.c
rename to test/beast/zlib/zlib-1.2.11/examples/enough.c
diff --git a/test/zlib/zlib-1.2.11/examples/fitblk.c b/test/beast/zlib/zlib-1.2.11/examples/fitblk.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/examples/fitblk.c
rename to test/beast/zlib/zlib-1.2.11/examples/fitblk.c
diff --git a/test/zlib/zlib-1.2.11/examples/gun.c b/test/beast/zlib/zlib-1.2.11/examples/gun.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/examples/gun.c
rename to test/beast/zlib/zlib-1.2.11/examples/gun.c
diff --git a/test/zlib/zlib-1.2.11/examples/gzappend.c b/test/beast/zlib/zlib-1.2.11/examples/gzappend.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/examples/gzappend.c
rename to test/beast/zlib/zlib-1.2.11/examples/gzappend.c
diff --git a/test/zlib/zlib-1.2.11/examples/gzjoin.c b/test/beast/zlib/zlib-1.2.11/examples/gzjoin.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/examples/gzjoin.c
rename to test/beast/zlib/zlib-1.2.11/examples/gzjoin.c
diff --git a/test/zlib/zlib-1.2.11/examples/gzlog.c b/test/beast/zlib/zlib-1.2.11/examples/gzlog.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/examples/gzlog.c
rename to test/beast/zlib/zlib-1.2.11/examples/gzlog.c
diff --git a/test/zlib/zlib-1.2.11/examples/gzlog.h b/test/beast/zlib/zlib-1.2.11/examples/gzlog.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/examples/gzlog.h
rename to test/beast/zlib/zlib-1.2.11/examples/gzlog.h
diff --git a/test/zlib/zlib-1.2.11/examples/zlib_how.html b/test/beast/zlib/zlib-1.2.11/examples/zlib_how.html
similarity index 100%
rename from test/zlib/zlib-1.2.11/examples/zlib_how.html
rename to test/beast/zlib/zlib-1.2.11/examples/zlib_how.html
diff --git a/test/zlib/zlib-1.2.11/examples/zpipe.c b/test/beast/zlib/zlib-1.2.11/examples/zpipe.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/examples/zpipe.c
rename to test/beast/zlib/zlib-1.2.11/examples/zpipe.c
diff --git a/test/zlib/zlib-1.2.11/examples/zran.c b/test/beast/zlib/zlib-1.2.11/examples/zran.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/examples/zran.c
rename to test/beast/zlib/zlib-1.2.11/examples/zran.c
diff --git a/test/zlib/zlib-1.2.11/gzclose.c b/test/beast/zlib/zlib-1.2.11/gzclose.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/gzclose.c
rename to test/beast/zlib/zlib-1.2.11/gzclose.c
diff --git a/test/zlib/zlib-1.2.11/gzguts.h b/test/beast/zlib/zlib-1.2.11/gzguts.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/gzguts.h
rename to test/beast/zlib/zlib-1.2.11/gzguts.h
diff --git a/test/zlib/zlib-1.2.11/gzlib.c b/test/beast/zlib/zlib-1.2.11/gzlib.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/gzlib.c
rename to test/beast/zlib/zlib-1.2.11/gzlib.c
diff --git a/test/zlib/zlib-1.2.11/gzread.c b/test/beast/zlib/zlib-1.2.11/gzread.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/gzread.c
rename to test/beast/zlib/zlib-1.2.11/gzread.c
diff --git a/test/zlib/zlib-1.2.11/gzwrite.c b/test/beast/zlib/zlib-1.2.11/gzwrite.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/gzwrite.c
rename to test/beast/zlib/zlib-1.2.11/gzwrite.c
diff --git a/test/zlib/zlib-1.2.11/infback.c b/test/beast/zlib/zlib-1.2.11/infback.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/infback.c
rename to test/beast/zlib/zlib-1.2.11/infback.c
diff --git a/test/zlib/zlib-1.2.11/inffast.c b/test/beast/zlib/zlib-1.2.11/inffast.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/inffast.c
rename to test/beast/zlib/zlib-1.2.11/inffast.c
diff --git a/test/zlib/zlib-1.2.11/inffast.h b/test/beast/zlib/zlib-1.2.11/inffast.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/inffast.h
rename to test/beast/zlib/zlib-1.2.11/inffast.h
diff --git a/test/zlib/zlib-1.2.11/inffixed.h b/test/beast/zlib/zlib-1.2.11/inffixed.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/inffixed.h
rename to test/beast/zlib/zlib-1.2.11/inffixed.h
diff --git a/test/zlib/zlib-1.2.11/inflate.c b/test/beast/zlib/zlib-1.2.11/inflate.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/inflate.c
rename to test/beast/zlib/zlib-1.2.11/inflate.c
diff --git a/test/zlib/zlib-1.2.11/inflate.h b/test/beast/zlib/zlib-1.2.11/inflate.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/inflate.h
rename to test/beast/zlib/zlib-1.2.11/inflate.h
diff --git a/test/zlib/zlib-1.2.11/inftrees.c b/test/beast/zlib/zlib-1.2.11/inftrees.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/inftrees.c
rename to test/beast/zlib/zlib-1.2.11/inftrees.c
diff --git a/test/zlib/zlib-1.2.11/inftrees.h b/test/beast/zlib/zlib-1.2.11/inftrees.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/inftrees.h
rename to test/beast/zlib/zlib-1.2.11/inftrees.h
diff --git a/test/zlib/zlib-1.2.11/make_vms.com b/test/beast/zlib/zlib-1.2.11/make_vms.com
similarity index 100%
rename from test/zlib/zlib-1.2.11/make_vms.com
rename to test/beast/zlib/zlib-1.2.11/make_vms.com
diff --git a/test/zlib/zlib-1.2.11/msdos/Makefile.bor b/test/beast/zlib/zlib-1.2.11/msdos/Makefile.bor
similarity index 100%
rename from test/zlib/zlib-1.2.11/msdos/Makefile.bor
rename to test/beast/zlib/zlib-1.2.11/msdos/Makefile.bor
diff --git a/test/zlib/zlib-1.2.11/msdos/Makefile.dj2 b/test/beast/zlib/zlib-1.2.11/msdos/Makefile.dj2
similarity index 100%
rename from test/zlib/zlib-1.2.11/msdos/Makefile.dj2
rename to test/beast/zlib/zlib-1.2.11/msdos/Makefile.dj2
diff --git a/test/zlib/zlib-1.2.11/msdos/Makefile.emx b/test/beast/zlib/zlib-1.2.11/msdos/Makefile.emx
similarity index 100%
rename from test/zlib/zlib-1.2.11/msdos/Makefile.emx
rename to test/beast/zlib/zlib-1.2.11/msdos/Makefile.emx
diff --git a/test/zlib/zlib-1.2.11/msdos/Makefile.msc b/test/beast/zlib/zlib-1.2.11/msdos/Makefile.msc
similarity index 100%
rename from test/zlib/zlib-1.2.11/msdos/Makefile.msc
rename to test/beast/zlib/zlib-1.2.11/msdos/Makefile.msc
diff --git a/test/zlib/zlib-1.2.11/msdos/Makefile.tc b/test/beast/zlib/zlib-1.2.11/msdos/Makefile.tc
similarity index 100%
rename from test/zlib/zlib-1.2.11/msdos/Makefile.tc
rename to test/beast/zlib/zlib-1.2.11/msdos/Makefile.tc
diff --git a/test/zlib/zlib-1.2.11/nintendods/Makefile b/test/beast/zlib/zlib-1.2.11/nintendods/Makefile
similarity index 100%
rename from test/zlib/zlib-1.2.11/nintendods/Makefile
rename to test/beast/zlib/zlib-1.2.11/nintendods/Makefile
diff --git a/test/zlib/zlib-1.2.11/nintendods/README b/test/beast/zlib/zlib-1.2.11/nintendods/README
similarity index 100%
rename from test/zlib/zlib-1.2.11/nintendods/README
rename to test/beast/zlib/zlib-1.2.11/nintendods/README
diff --git a/test/zlib/zlib-1.2.11/old/Makefile.emx b/test/beast/zlib/zlib-1.2.11/old/Makefile.emx
similarity index 100%
rename from test/zlib/zlib-1.2.11/old/Makefile.emx
rename to test/beast/zlib/zlib-1.2.11/old/Makefile.emx
diff --git a/test/zlib/zlib-1.2.11/old/Makefile.riscos b/test/beast/zlib/zlib-1.2.11/old/Makefile.riscos
similarity index 100%
rename from test/zlib/zlib-1.2.11/old/Makefile.riscos
rename to test/beast/zlib/zlib-1.2.11/old/Makefile.riscos
diff --git a/test/zlib/zlib-1.2.11/old/README b/test/beast/zlib/zlib-1.2.11/old/README
similarity index 100%
rename from test/zlib/zlib-1.2.11/old/README
rename to test/beast/zlib/zlib-1.2.11/old/README
diff --git a/test/zlib/zlib-1.2.11/old/descrip.mms b/test/beast/zlib/zlib-1.2.11/old/descrip.mms
similarity index 100%
rename from test/zlib/zlib-1.2.11/old/descrip.mms
rename to test/beast/zlib/zlib-1.2.11/old/descrip.mms
diff --git a/test/zlib/zlib-1.2.11/old/os2/Makefile.os2 b/test/beast/zlib/zlib-1.2.11/old/os2/Makefile.os2
similarity index 100%
rename from test/zlib/zlib-1.2.11/old/os2/Makefile.os2
rename to test/beast/zlib/zlib-1.2.11/old/os2/Makefile.os2
diff --git a/test/zlib/zlib-1.2.11/old/os2/zlib.def b/test/beast/zlib/zlib-1.2.11/old/os2/zlib.def
similarity index 100%
rename from test/zlib/zlib-1.2.11/old/os2/zlib.def
rename to test/beast/zlib/zlib-1.2.11/old/os2/zlib.def
diff --git a/test/zlib/zlib-1.2.11/old/visual-basic.txt b/test/beast/zlib/zlib-1.2.11/old/visual-basic.txt
similarity index 100%
rename from test/zlib/zlib-1.2.11/old/visual-basic.txt
rename to test/beast/zlib/zlib-1.2.11/old/visual-basic.txt
diff --git a/test/zlib/zlib-1.2.11/os400/README400 b/test/beast/zlib/zlib-1.2.11/os400/README400
similarity index 100%
rename from test/zlib/zlib-1.2.11/os400/README400
rename to test/beast/zlib/zlib-1.2.11/os400/README400
diff --git a/test/zlib/zlib-1.2.11/os400/bndsrc b/test/beast/zlib/zlib-1.2.11/os400/bndsrc
similarity index 100%
rename from test/zlib/zlib-1.2.11/os400/bndsrc
rename to test/beast/zlib/zlib-1.2.11/os400/bndsrc
diff --git a/test/zlib/zlib-1.2.11/os400/make.sh b/test/beast/zlib/zlib-1.2.11/os400/make.sh
similarity index 100%
rename from test/zlib/zlib-1.2.11/os400/make.sh
rename to test/beast/zlib/zlib-1.2.11/os400/make.sh
diff --git a/test/zlib/zlib-1.2.11/os400/zlib.inc b/test/beast/zlib/zlib-1.2.11/os400/zlib.inc
similarity index 100%
rename from test/zlib/zlib-1.2.11/os400/zlib.inc
rename to test/beast/zlib/zlib-1.2.11/os400/zlib.inc
diff --git a/test/zlib/zlib-1.2.11/qnx/package.qpg b/test/beast/zlib/zlib-1.2.11/qnx/package.qpg
similarity index 100%
rename from test/zlib/zlib-1.2.11/qnx/package.qpg
rename to test/beast/zlib/zlib-1.2.11/qnx/package.qpg
diff --git a/test/zlib/zlib-1.2.11/test/example.c b/test/beast/zlib/zlib-1.2.11/test/example.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/test/example.c
rename to test/beast/zlib/zlib-1.2.11/test/example.c
diff --git a/test/zlib/zlib-1.2.11/test/infcover.c b/test/beast/zlib/zlib-1.2.11/test/infcover.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/test/infcover.c
rename to test/beast/zlib/zlib-1.2.11/test/infcover.c
diff --git a/test/zlib/zlib-1.2.11/test/minigzip.c b/test/beast/zlib/zlib-1.2.11/test/minigzip.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/test/minigzip.c
rename to test/beast/zlib/zlib-1.2.11/test/minigzip.c
diff --git a/test/zlib/zlib-1.2.11/treebuild.xml b/test/beast/zlib/zlib-1.2.11/treebuild.xml
similarity index 100%
rename from test/zlib/zlib-1.2.11/treebuild.xml
rename to test/beast/zlib/zlib-1.2.11/treebuild.xml
diff --git a/test/zlib/zlib-1.2.11/trees.c b/test/beast/zlib/zlib-1.2.11/trees.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/trees.c
rename to test/beast/zlib/zlib-1.2.11/trees.c
diff --git a/test/zlib/zlib-1.2.11/trees.h b/test/beast/zlib/zlib-1.2.11/trees.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/trees.h
rename to test/beast/zlib/zlib-1.2.11/trees.h
diff --git a/test/zlib/zlib-1.2.11/uncompr.c b/test/beast/zlib/zlib-1.2.11/uncompr.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/uncompr.c
rename to test/beast/zlib/zlib-1.2.11/uncompr.c
diff --git a/test/zlib/zlib-1.2.11/watcom/watcom_f.mak b/test/beast/zlib/zlib-1.2.11/watcom/watcom_f.mak
similarity index 100%
rename from test/zlib/zlib-1.2.11/watcom/watcom_f.mak
rename to test/beast/zlib/zlib-1.2.11/watcom/watcom_f.mak
diff --git a/test/zlib/zlib-1.2.11/watcom/watcom_l.mak b/test/beast/zlib/zlib-1.2.11/watcom/watcom_l.mak
similarity index 100%
rename from test/zlib/zlib-1.2.11/watcom/watcom_l.mak
rename to test/beast/zlib/zlib-1.2.11/watcom/watcom_l.mak
diff --git a/test/zlib/zlib-1.2.11/zconf.h b/test/beast/zlib/zlib-1.2.11/zconf.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/zconf.h
rename to test/beast/zlib/zlib-1.2.11/zconf.h
diff --git a/test/zlib/zlib-1.2.11/zconf.h.cmakein b/test/beast/zlib/zlib-1.2.11/zconf.h.cmakein
similarity index 100%
rename from test/zlib/zlib-1.2.11/zconf.h.cmakein
rename to test/beast/zlib/zlib-1.2.11/zconf.h.cmakein
diff --git a/test/zlib/zlib-1.2.11/zconf.h.in b/test/beast/zlib/zlib-1.2.11/zconf.h.in
similarity index 100%
rename from test/zlib/zlib-1.2.11/zconf.h.in
rename to test/beast/zlib/zlib-1.2.11/zconf.h.in
diff --git a/test/zlib/zlib-1.2.11/zlib.3 b/test/beast/zlib/zlib-1.2.11/zlib.3
similarity index 100%
rename from test/zlib/zlib-1.2.11/zlib.3
rename to test/beast/zlib/zlib-1.2.11/zlib.3
diff --git a/test/zlib/zlib-1.2.11/zlib.3.pdf b/test/beast/zlib/zlib-1.2.11/zlib.3.pdf
similarity index 100%
rename from test/zlib/zlib-1.2.11/zlib.3.pdf
rename to test/beast/zlib/zlib-1.2.11/zlib.3.pdf
diff --git a/test/zlib/zlib-1.2.11/zlib.h b/test/beast/zlib/zlib-1.2.11/zlib.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/zlib.h
rename to test/beast/zlib/zlib-1.2.11/zlib.h
diff --git a/test/zlib/zlib-1.2.11/zlib.map b/test/beast/zlib/zlib-1.2.11/zlib.map
similarity index 100%
rename from test/zlib/zlib-1.2.11/zlib.map
rename to test/beast/zlib/zlib-1.2.11/zlib.map
diff --git a/test/zlib/zlib-1.2.11/zlib.pc.cmakein b/test/beast/zlib/zlib-1.2.11/zlib.pc.cmakein
similarity index 100%
rename from test/zlib/zlib-1.2.11/zlib.pc.cmakein
rename to test/beast/zlib/zlib-1.2.11/zlib.pc.cmakein
diff --git a/test/zlib/zlib-1.2.11/zlib.pc.in b/test/beast/zlib/zlib-1.2.11/zlib.pc.in
similarity index 100%
rename from test/zlib/zlib-1.2.11/zlib.pc.in
rename to test/beast/zlib/zlib-1.2.11/zlib.pc.in
diff --git a/test/zlib/zlib-1.2.11/zlib2ansi b/test/beast/zlib/zlib-1.2.11/zlib2ansi
similarity index 100%
rename from test/zlib/zlib-1.2.11/zlib2ansi
rename to test/beast/zlib/zlib-1.2.11/zlib2ansi
diff --git a/test/zlib/zlib-1.2.11/zutil.c b/test/beast/zlib/zlib-1.2.11/zutil.c
similarity index 100%
rename from test/zlib/zlib-1.2.11/zutil.c
rename to test/beast/zlib/zlib-1.2.11/zutil.c
diff --git a/test/zlib/zlib-1.2.11/zutil.h b/test/beast/zlib/zlib-1.2.11/zutil.h
similarity index 100%
rename from test/zlib/zlib-1.2.11/zutil.h
rename to test/beast/zlib/zlib-1.2.11/zutil.h
diff --git a/test/zlib/ztest.hpp b/test/beast/zlib/ztest.hpp
similarity index 100%
rename from test/zlib/ztest.hpp
rename to test/beast/zlib/ztest.hpp
diff --git a/test/doc/CMakeLists.txt b/test/doc/CMakeLists.txt
new file mode 100644
index 00000000..12fa2bf0
--- /dev/null
+++ b/test/doc/CMakeLists.txt
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/boostorg/beast
+#
+
+GroupSources(example example)
+GroupSources(extras/boost/beast extras)
+GroupSources(include/boost/beast beast)
+GroupSources(test/doc "/")
+
+add_executable (tests-doc
+    ${BOOST_BEAST_INCLUDES}
+    ${EXAMPLE_INCLUDES}
+    ${EXTRAS_INCLUDES}
+    ${TEST_MAIN}
+    Jamfile
+    core_examples.cpp
+    core_snippets.cpp
+    http_examples.cpp
+    http_snippets.cpp
+    websocket_snippets.cpp
+    exemplars.cpp
+)
diff --git a/test/doc/Jamfile b/test/doc/Jamfile
new file mode 100644
index 00000000..f38fb265
--- /dev/null
+++ b/test/doc/Jamfile
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/boostorg/beast
+#
+
+alias run-tests :
+    [ compile core_snippets.cpp ]
+    [ compile http_snippets.cpp ]
+    [ compile websocket_snippets.cpp ]
+    [ run core_examples.cpp $(TEST_MAIN) ]
+    [ run http_examples.cpp $(TEST_MAIN) ]
+    ;
+
+exe fat-tests :
+    $(TEST_MAIN)
+    core_examples.cpp
+    http_examples.cpp
+    ;
+
+explicit fat-tests ;
diff --git a/test/core/doc_examples.cpp b/test/doc/core_examples.cpp
similarity index 95%
rename from test/core/doc_examples.cpp
rename to test/doc/core_examples.cpp
index e2c90692..9c286d62 100644
--- a/test/core/doc_examples.cpp
+++ b/test/doc/core_examples.cpp
@@ -17,9 +17,8 @@
 
 namespace boost {
 namespace beast {
-namespace http {
 
-class doc_core_samples_test
+class examples_test
     : public beast::unit_test::suite
     , public beast::test::enable_yield_to
 {
@@ -82,8 +81,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(doc_core_samples,core,beast);
+BOOST_BEAST_DEFINE_TESTSUITE(examples,core,beast);
 
-} // http
 } // beast
 } // boost
diff --git a/test/core/doc_snippets.cpp b/test/doc/core_snippets.cpp
similarity index 100%
rename from test/core/doc_snippets.cpp
rename to test/doc/core_snippets.cpp
diff --git a/test/exemplars.cpp b/test/doc/exemplars.cpp
similarity index 100%
rename from test/exemplars.cpp
rename to test/doc/exemplars.cpp
diff --git a/test/http/doc_examples.cpp b/test/doc/http_examples.cpp
similarity index 99%
rename from test/http/doc_examples.cpp
rename to test/doc/http_examples.cpp
index d7bd5884..96413d04 100644
--- a/test/http/doc_examples.cpp
+++ b/test/doc/http_examples.cpp
@@ -33,13 +33,13 @@ namespace boost {
 namespace beast {
 namespace http {
 
-class doc_examples_test
+class examples_test
     : public beast::unit_test::suite
     , public beast::test::enable_yield_to
 {
 public:
     // two threads, for some examples using a pipe
-    doc_examples_test()
+    examples_test()
         : enable_yield_to(2)
     {
     }
@@ -451,7 +451,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(doc_examples,http,beast);
+BOOST_BEAST_DEFINE_TESTSUITE(examples,http,beast);
 
 } // http
 } // beast
diff --git a/test/http/doc_snippets.cpp b/test/doc/http_snippets.cpp
similarity index 100%
rename from test/http/doc_snippets.cpp
rename to test/doc/http_snippets.cpp
diff --git a/test/doc/websocket_snippets.cpp b/test/doc/websocket_snippets.cpp
new file mode 100644
index 00000000..751d099d
--- /dev/null
+++ b/test/doc/websocket_snippets.cpp
@@ -0,0 +1,285 @@
+//
+// Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/boostorg/beast
+//
+
+#include <boost/beast/core.hpp>
+#include <boost/asio.hpp>
+#include <boost/asio/spawn.hpp>
+#include <boost/asio/use_future.hpp>
+#include <algorithm>
+#include <future>
+#include <iostream>
+#include <thread>
+
+//[ws_snippet_1
+#include <boost/beast/websocket.hpp>
+using namespace boost::beast::websocket;
+//]
+
+using namespace boost::beast;
+
+namespace doc_ws_snippets {
+
+void fxx() {
+
+boost::asio::io_service ios;
+boost::asio::io_service::work work{ios};
+std::thread t{[&](){ ios.run(); }};
+error_code ec;
+boost::asio::ip::tcp::socket sock{ios};
+
+{
+//[ws_snippet_2
+    stream<boost::asio::ip::tcp::socket> ws{ios};
+//]
+}
+
+{
+//[ws_snippet_3
+    stream<boost::asio::ip::tcp::socket> ws{std::move(sock)};
+//]
+}
+
+{
+//[ws_snippet_4
+    stream<boost::asio::ip::tcp::socket&> ws{sock};
+//]
+
+//[ws_snippet_5
+    ws.next_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_send);
+//]
+}
+
+{
+//[ws_snippet_6
+    std::string const host = "mywebapp.com";
+    boost::asio::ip::tcp::resolver r{ios};
+    stream<boost::asio::ip::tcp::socket> ws{ios};
+    boost::asio::connect(ws.next_layer(), r.resolve({host, "ws"}));
+//]
+}
+
+{
+//[ws_snippet_7
+    boost::asio::ip::tcp::acceptor acceptor{ios};
+    stream<boost::asio::ip::tcp::socket> ws{acceptor.get_io_service()};
+    acceptor.accept(ws.next_layer());
+//]
+}
+
+{
+    stream<boost::asio::ip::tcp::socket> ws{ios};
+//[ws_snippet_8
+    ws.handshake("localhost", "/");
+//]
+
+//[ws_snippet_9
+    ws.handshake_ex("localhost", "/",
+        [](request_type& m)
+        {
+            m.insert(http::field::sec_websocket_protocol, "xmpp;ws-chat");
+        });
+//]
+
+//[ws_snippet_10
+    response_type res;
+    ws.handshake(res, "localhost", "/");
+    if(! res.count(http::field::sec_websocket_protocol))
+        throw std::invalid_argument("missing subprotocols");
+//]
+
+//[ws_snippet_11
+    ws.accept();
+//]
+
+//[ws_snippet_12
+    ws.accept_ex(
+        [](response_type& m)
+        {
+            m.insert(http::field::server, "MyServer");
+        });
+//]
+}
+
+{
+//[ws_snippet_13]
+    // Buffer required for reading HTTP messages
+    flat_buffer buffer;
+
+    // Read the HTTP request ourselves
+    http::request<http::string_body> req;
+    http::read(sock, buffer, req);
+
+    // See if its a WebSocket upgrade request
+    if(websocket::is_upgrade(req))
+    {
+        // Construct the stream, transferring ownership of the socket
+        stream<boost::asio::ip::tcp::socket> ws{std::move(sock)};
+
+        // Accept the request from our message. Clients SHOULD NOT
+        // begin sending WebSocket frames until the server has
+        // provided a response, but just in case they did, we pass
+        // any leftovers in the buffer to the accept function.
+        //
+        ws.accept(req, buffer.data());
+    }
+    else
+    {
+        // Its not a WebSocket upgrade, so
+        // handle it like a normal HTTP request.
+    }
+//]
+}
+
+{
+    stream<boost::asio::ip::tcp::socket> ws{ios};
+//[ws_snippet_14
+    // Read into our buffer until we reach the end of the HTTP request.
+    // No parsing takes place here, we are just accumulating data.
+    boost::asio::streambuf buffer;
+    boost::asio::read_until(sock, buffer, "\r\n\r\n");
+
+    // Now accept the connection, using the buffered data.
+    ws.accept(buffer.data());
+//]
+}
+{
+    stream<boost::asio::ip::tcp::socket> ws{ios};
+//[ws_snippet_15
+    multi_buffer buffer;
+    ws.read(buffer);
+
+    ws.text(ws.got_text());
+    ws.write(buffer.data());
+    buffer.consume(buffer.size());
+//]
+}
+
+{
+    stream<boost::asio::ip::tcp::socket> ws{ios};
+//[ws_snippet_16
+    multi_buffer buffer;
+    for(;;)
+        if(ws.read_some(buffer, 0))
+            break;
+    ws.binary(ws.got_binary());
+    consuming_buffers<multi_buffer::const_buffers_type> cb{buffer.data()};
+    for(;;)
+    {
+        using boost::asio::buffer_size;
+        if(buffer_size(cb) > 512)
+        {
+            ws.write_some(false, buffer_prefix(512, cb));
+            cb.consume(512);
+        }
+        else
+        {
+            ws.write_some(true, cb);
+            break;
+        }
+    }
+//]
+}
+
+{
+    stream<boost::asio::ip::tcp::socket> ws{ios};
+//[ws_snippet_17
+    auto cb =
+        [](frame_type kind, string_view payload)
+        {
+            // Do something with the payload
+            boost::ignore_unused(kind, payload);
+        };
+    ws.control_callback(cb);
+//]
+
+//[ws_snippet_18
+    ws.close(close_code::normal);
+//]
+
+//[ws_snippet_19
+    ws.auto_fragment(true);
+    ws.write_buffer_size(16384);
+//]
+
+//[ws_snippet_20
+    multi_buffer buffer;
+    ws.async_read(buffer,
+        [](error_code, std::size_t)
+        {
+            // Do something with the buffer
+        });
+//]
+}
+
+} // fxx()
+
+// workaround for https://github.com/chriskohlhoff/asio/issues/112
+#ifdef BOOST_MSVC
+//[ws_snippet_21
+void echo(stream<boost::asio::ip::tcp::socket>& ws,
+    multi_buffer& buffer, boost::asio::yield_context yield)
+{
+    ws.async_read(buffer, yield);
+    std::future<void> fut =
+        ws.async_write(buffer.data(), boost::asio::use_future);
+}
+//]
+#endif
+
+} // doc_ws_snippets
+
+//------------------------------------------------------------------------------
+
+#if BOOST_BEAST_USE_OPENSSL
+
+//[wss_snippet_1
+#include <boost/beast/websocket/ssl.hpp>
+#include <boost/asio/ssl.hpp>
+//]
+
+namespace doc_wss_snippets {
+
+void fxx() {
+
+boost::asio::io_service ios;
+boost::asio::io_service::work work{ios};
+std::thread t{[&](){ ios.run(); }};
+error_code ec;
+boost::asio::ip::tcp::socket sock{ios};
+
+{
+//[wss_snippet_2
+    boost::asio::ssl::context ctx{boost::asio::ssl::context::sslv23};
+    stream<boost::asio::ssl::stream<boost::asio::ip::tcp::socket>> wss{ios, ctx};
+//]
+}
+
+{
+//[wss_snippet_3
+    boost::asio::ip::tcp::endpoint ep;
+    boost::asio::ssl::context ctx{boost::asio::ssl::context::sslv23};
+    stream<boost::asio::ssl::stream<boost::asio::ip::tcp::socket>> ws{ios, ctx};
+
+    // connect the underlying TCP/IP socket
+    ws.next_layer().next_layer().connect(ep);
+
+    // perform SSL handshake
+    ws.next_layer().handshake(boost::asio::ssl::stream_base::client);
+
+    // perform WebSocket handshake
+    ws.handshake("localhost", "/");
+//]
+}
+
+} // fxx()
+
+} // doc_wss_snippets
+
+#endif
+
diff --git a/test/example/CMakeLists.txt b/test/example/CMakeLists.txt
new file mode 100644
index 00000000..7089152b
--- /dev/null
+++ b/test/example/CMakeLists.txt
@@ -0,0 +1,11 @@
+#
+# Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/boostorg/beast
+#
+
+add_subdirectory (common)
+add_subdirectory (server)
diff --git a/test/example/Jamfile b/test/example/Jamfile
new file mode 100644
index 00000000..f065de66
--- /dev/null
+++ b/test/example/Jamfile
@@ -0,0 +1,17 @@
+#
+# Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/boostorg/beast
+#
+
+alias run-tests :
+    common//run-tests
+    server//run-tests
+    ;
+
+alias fat-tests ;
+
+explicit fat-tests ;
diff --git a/test/common/CMakeLists.txt b/test/example/common/CMakeLists.txt
similarity index 78%
rename from test/common/CMakeLists.txt
rename to test/example/common/CMakeLists.txt
index ade29a79..e45e7b01 100644
--- a/test/common/CMakeLists.txt
+++ b/test/example/common/CMakeLists.txt
@@ -10,9 +10,9 @@
 GroupSources(example/common common)
 GroupSources(extras/boost/beast extras)
 GroupSources(include/boost/beast beast)
-GroupSources(test/common "/")
+GroupSources(test/example/common "/")
 
-add_executable (common-test
+add_executable (tests-example-common
     ${BOOST_BEAST_INCLUDES}
     ${COMMON_INCLUDES}
     Jamfile
@@ -24,8 +24,3 @@ add_executable (common-test
     write_msg.cpp
     main.cpp
 )
-if (OPENSSL_FOUND)
-    target_link_libraries (common-test
-        ${OPENSSL_LIBRARIES}
-        )
-endif()
diff --git a/test/common/Jamfile b/test/example/common/Jamfile
similarity index 53%
rename from test/common/Jamfile
rename to test/example/common/Jamfile
index 8194e0a4..5445122c 100644
--- a/test/common/Jamfile
+++ b/test/example/common/Jamfile
@@ -16,11 +16,15 @@ local SOURCES =
     write_msg.cpp
     ;
 
-local RUN_TESTS ; for local f in $(SOURCES) { RUN_TESTS += [ compile $(f) ] ; }
-alias run-tests : $(RUN_TESTS) : : : <variant>coverage:<build>no <variant>ubasan:<build>no ;
+local RUN_TESTS ;
 
-unit-test run-fat : main.cpp $(SOURCES) : : : <variant>coverage:<build>no <variant>ubasan:<build>no ;
-explicit run-fat ;
+for local f in $(SOURCES)
+{
+    RUN_TESTS += [ compile $(f) ] ;
+}
+
+alias run-tests : $(RUN_TESTS) ;
+
+alias build-fat : run-tests ;
 
-exe build-fat : $(TEST_MAIN) $(SOURCES) : : : <variant>coverage:<build>no <variant>ubasan:<build>no ;
 explicit build-fat ;
diff --git a/test/common/detect_ssl.cpp b/test/example/common/detect_ssl.cpp
similarity index 100%
rename from test/common/detect_ssl.cpp
rename to test/example/common/detect_ssl.cpp
diff --git a/test/common/main.cpp b/test/example/common/main.cpp
similarity index 100%
rename from test/common/main.cpp
rename to test/example/common/main.cpp
diff --git a/test/common/mime_types.cpp b/test/example/common/mime_types.cpp
similarity index 100%
rename from test/common/mime_types.cpp
rename to test/example/common/mime_types.cpp
diff --git a/test/common/rfc7231.cpp b/test/example/common/rfc7231.cpp
similarity index 100%
rename from test/common/rfc7231.cpp
rename to test/example/common/rfc7231.cpp
diff --git a/test/common/session_alloc.cpp b/test/example/common/session_alloc.cpp
similarity index 100%
rename from test/common/session_alloc.cpp
rename to test/example/common/session_alloc.cpp
diff --git a/test/common/ssl_stream.cpp b/test/example/common/ssl_stream.cpp
similarity index 100%
rename from test/common/ssl_stream.cpp
rename to test/example/common/ssl_stream.cpp
diff --git a/test/common/write_msg.cpp b/test/example/common/write_msg.cpp
similarity index 100%
rename from test/common/write_msg.cpp
rename to test/example/common/write_msg.cpp
diff --git a/test/server/CMakeLists.txt b/test/example/server/CMakeLists.txt
similarity index 79%
rename from test/server/CMakeLists.txt
rename to test/example/server/CMakeLists.txt
index edd38487..e85d5feb 100644
--- a/test/server/CMakeLists.txt
+++ b/test/example/server/CMakeLists.txt
@@ -11,14 +11,14 @@ GroupSources(example/server-framework framework)
 GroupSources(example/common common)
 GroupSources(extras/boost/beast extras)
 GroupSources(include/boost/beast beast)
-GroupSources(test/server "/")
+GroupSources(test/example/server "/")
 
-add_executable (server-test
+add_executable (tests-example-server
     ${BOOST_BEAST_INCLUDES}
     ${COMMON_INCLUDES}
     ${SERVER_INCLUDES}
+    ${TEST_MAIN}
     Jamfile
-    ../../extras/boost/beast/unit_test/main.cpp
     file_service.cpp
     framework.cpp
     http_async_port.cpp
@@ -35,9 +35,3 @@ add_executable (server-test
     ws_upgrade_service.cpp
     wss_ports.cpp
 )
-
-if (OPENSSL_FOUND)
-    target_link_libraries (server-test
-        ${OPENSSL_LIBRARIES}
-        )
-endif()
diff --git a/test/server/Jamfile b/test/example/server/Jamfile
similarity index 63%
rename from test/server/Jamfile
rename to test/example/server/Jamfile
index 0a5af922..80747d9b 100644
--- a/test/server/Jamfile
+++ b/test/example/server/Jamfile
@@ -18,18 +18,22 @@ local SOURCES =
     server.cpp
     service_list.cpp
     ssl_certificate.cpp
-    tests.cpp
+    #tests.cpp
     ws_async_port.cpp
     ws_sync_port.cpp
     ws_upgrade_service.cpp
     wss_ports.cpp
     ;
 
-local RUN_TESTS ; for local f in $(SOURCES) { RUN_TESTS += [ run $(f) $(TEST_MAIN) ] ; }
+local RUN_TESTS ;
+
+for local f in $(SOURCES)
+{
+    RUN_TESTS += [ compile $(f) ] ;
+}
+
 alias run-tests : $(RUN_TESTS) ;
 
-unit-test run-fat : $(TEST_MAIN) $(SOURCES) tests.cpp : : : <variant>coverage:<build>no <variant>ubasan:<build>no ;
-explicit run-fat ;
+alias fat-tests : run-tests ;
 
-exe build-fat : $(TEST_MAIN) $(SOURCES) tests.cpp : : : <variant>coverage:<build>no <variant>ubasan:<build>no ;
-explicit build-fat ;
+explicit fat-tests ;
diff --git a/test/server/file_service.cpp b/test/example/server/file_service.cpp
similarity index 100%
rename from test/server/file_service.cpp
rename to test/example/server/file_service.cpp
diff --git a/test/server/framework.cpp b/test/example/server/framework.cpp
similarity index 100%
rename from test/server/framework.cpp
rename to test/example/server/framework.cpp
diff --git a/test/server/http_async_port.cpp b/test/example/server/http_async_port.cpp
similarity index 100%
rename from test/server/http_async_port.cpp
rename to test/example/server/http_async_port.cpp
diff --git a/test/server/http_base.cpp b/test/example/server/http_base.cpp
similarity index 100%
rename from test/server/http_base.cpp
rename to test/example/server/http_base.cpp
diff --git a/test/server/http_sync_port.cpp b/test/example/server/http_sync_port.cpp
similarity index 100%
rename from test/server/http_sync_port.cpp
rename to test/example/server/http_sync_port.cpp
diff --git a/test/server/https_ports.cpp b/test/example/server/https_ports.cpp
similarity index 100%
rename from test/server/https_ports.cpp
rename to test/example/server/https_ports.cpp
diff --git a/test/server/multi_port.cpp b/test/example/server/multi_port.cpp
similarity index 100%
rename from test/server/multi_port.cpp
rename to test/example/server/multi_port.cpp
diff --git a/test/server/server.cpp b/test/example/server/server.cpp
similarity index 100%
rename from test/server/server.cpp
rename to test/example/server/server.cpp
diff --git a/test/server/service_list.cpp b/test/example/server/service_list.cpp
similarity index 100%
rename from test/server/service_list.cpp
rename to test/example/server/service_list.cpp
diff --git a/test/server/ssl_certificate.cpp b/test/example/server/ssl_certificate.cpp
similarity index 100%
rename from test/server/ssl_certificate.cpp
rename to test/example/server/ssl_certificate.cpp
diff --git a/test/server/tests.cpp b/test/example/server/tests.cpp
similarity index 100%
rename from test/server/tests.cpp
rename to test/example/server/tests.cpp
diff --git a/test/server/ws_async_port.cpp b/test/example/server/ws_async_port.cpp
similarity index 100%
rename from test/server/ws_async_port.cpp
rename to test/example/server/ws_async_port.cpp
diff --git a/test/server/ws_sync_port.cpp b/test/example/server/ws_sync_port.cpp
similarity index 100%
rename from test/server/ws_sync_port.cpp
rename to test/example/server/ws_sync_port.cpp
diff --git a/test/server/ws_upgrade_service.cpp b/test/example/server/ws_upgrade_service.cpp
similarity index 100%
rename from test/server/ws_upgrade_service.cpp
rename to test/example/server/ws_upgrade_service.cpp
diff --git a/test/server/wss_ports.cpp b/test/example/server/wss_ports.cpp
similarity index 100%
rename from test/server/wss_ports.cpp
rename to test/example/server/wss_ports.cpp