From 2ad98a025eb263d97b1942fc468937b4719becd8 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Sat, 19 Oct 2013 15:54:21 -0700
Subject: [PATCH] Squashed 'src/beast/' changes from 43e6d34..0e7bac9

0e7bac9 Fix include path
e5bb90f Fix constness of Proxy
ac0142a Use template cast
ef6e381 Add missing Url.h include
206e65c Fix constness of operator[]
695cc38 Use template instantiation for friend declaration
7b1e03a Add BaseFromMember
49bc04f Make List<>::Node not uncopyable
d5954ff Add Journal to UnitTest
58da106 Temporarily disable ServiceQueue dtor precondition asserts
fe58c1a Add missing #include
2c02580 Add PropertyStream for server state introspection
24c2315 Add ScopedWrapperContext
a3845f5 Add RelativeTime::value_type typedef
7442932 Fix missing PropertyStream members
ed5a98f More PropertyStream output for PeerFinder
fcfa10d Add PropertyStream
3cf0729 Tidy up AbstractHandler usage in HTTPClient
55171f4 Remove obsolete source files
1311ca3 Increase arity of SharedFunction
67d807d Add IPEndpoint::key_equal
ebf395e Add ErrorCode and boost library
2c3ead3 Add ServiceQueue::wrap
6c7f5d0 Move many Thread related classes
93e9d86 Measure CPU utilization in ServiceQueue
ca47d72 Move ServiceQueue, ThreadLocalValue, SpinLock
c864e4d Move WaitableEvent
ff305e6 Add CPUMeter and ScopedTimeInterval
01fd05c Add RecursiveMutex, UnlockGuard, TryLockGuard
5831a53 Remove Journal from most Stoppable overrides
b60a7f3 Add Request and Response HTTP parsers
44445ff Refactor net buffers classes
ac37c38 Beast class refactor
8b7056b Fix eof on HTTP client get
228b664 Remove obsolete beast container classes
1dfd655 Use RelativeTime from startup in DeadlineTimer
ae22d5d Add more methods to RelativeTime
c67929e Remove unhandled exception catcher
2472a90 Add 64 bit output for MurmurHash
f3d97c7 Add RelativeTime::fromStartup
b0b8660 IPEndpoint better parsing
ae551cd Add alternate form string parsing to IPEndpoint
d0a0dbf Don't break on Throw
0e46762 Add hasher functors for IPEndpoint
a1ec423 Add Thread::stopThreadAsync
4f7dca3 Add compiler, stdlib, and platform skeleton to beast/config
4394594 Tidy up some use of Error for throw
e5e0f52 Journal console output improvements
f07515e Add Stoppable prepare and start interfaces
d37dd46 Move RelativeTime to chrono, add ostream support
3f6e7aa Add console feature to Journal
ad0064a Journal option to write to Output window (MSVC)
0b7574b Add compilation test script
cc05ce1 Add ServiceQueue
e132aab Use boost for functional when the config is set
026b926 Fix is_continuation for boost version
c807a4e Fix invoked_type type reference
2ff781b Remove LockFreeStack::size
3acb474 Add SharedData::ConstAccess
7e4c834 Add LockFreeStack::empty
9c61a6d Added AbstractHandler, WrapHandler. HTTPClient Fixes.
94e40dc Fix unittest, by removing recursive call.
38bf408 Fix nonstandard C++ extension in getNullSink
1ef044d Build fixes
d5d3746 Fix missing <cmath> include for Gentoo
5f231d3 Update copyright notice and licenses
7b89bf6 Add FixedArray, IntrusiveArray, Crypto
5c5de57 Reorganize beast modules and files
9e18bb3 Merge commit '43deaaa5cf0d0178a4a6c3cb69c02a2a9a43ec7d' as 'src/beast/beast/http/impl/http-parser'
57703ac Fix BeforeBoost.h include
fbc247b Add Stoppable to beast
56496d8 IPEndpoint comparisons
9d9c822 Migrate some headers and general tidying
1a3cddc Add SharedArg and AsyncObject
373ca9c Add HTTPRequest and improvements to HTTPMessage parsing
9534516 Add some thread classes and fix SharedData with a simple mutex adapter
755ab36 Make CallQueue unit test runManual
c0ca037 Remove Beast version printing on startup
7efb6a3 Reorganize some MPL and Utility classes and files
69c26a1 Fix missing BeastConfig.h include in Net.cpp
40aa552 Disable Beast version printing in Ripple BeastConfig.h
7b1352d Add InterruptibleThread unit test
68cf759 ThreadWithCallQueue unit test adjustment
6501dea IPEndpoint parsing and tidying
72fc42b Move and add some template metaprogramming classes
2a164f0 Change filname capitalization (end)
6a14f25 Change filename capitalization
92fd417 Move integer types to beast/CStdInt.h
ebbd9ff Move TargetPlatform.h to beast/Config.h
874b524 Add IPEndpoint
14b34fc Tidy up some zlib macro undefines
34fffca Rename beast sources for consistency
4e59ab2 Add CallQueue unit test
327d7a6 Fixes for consolidated beast unity includes
d5ece4e Remove unused and broken classes
39f13be Remove unused ConcurrentObject
37624a7 Add ThreadWithCallQueue unit test
e82ec68 Remove obsolete beast_Function
90551a6 Temporarily leave sqlite3 in whatever threading mode it was already in.
43ebbb1 Fix SharedSingleton to use memoryBarrier
f343941 Tidy up SharedSingleton doc comments
001997e Fix leak on exit from Singleton dependency cycle
83b9d22 Rename to DeadlineTimer::cancel()
77874ee Use new instead of ::new for placement
2a04dcc Journal improvements
50965ca SharedFunction improvements
277e32b Add LockFreeStack iterators
d94e4c2 Fix undefined behavior in UnsignedIntegerCalc (again)
2dc25ce Fix DeadlineTimer, callback while holding lock
207ffde Fix undefined behavior in UnsignedIntegerCalc
1ad8ff9 Fix UnsignedInteger::isZero
1dd2836 Add support for multiprecision integer arithmetic and binary data encoding
a45fc47 Update .gitignore
962a95d Tidy up UnsignedInteger
ca695fa Add Time::isNull()
e96ce99 Better random number facilities in UnitTest
550b8e5 Fine tune UnsignedInteger declaration
8e7e3b7 Allow negative relative expirations in DeadlineTimer
f3dc7ce Add generic Journal class for logging
bfdda32 Make ChildProcess UnitTest manual since it malfunctions
02acf7d General refactoring of beast framework classes
84ef06e Fix ExitHook to derive from AtExitHook
f0acc9c Reduce the max threads in the Workers unit test
55447b0 New SharedSingleton, resolves destruction of objects with static storage duration.
41eb8a1 Remove deprecated SharedPtr::getObject
9eda4bc Make SharedObject members const, the counter mutable
6eda777 Remove deprecated createOnDemandOnce SingletonLifetime option
8c522aa Fix off by one in pending i/o count on HTTPClient
057344e Add HTTPMessage::toString and family
ee728e3 Add UniformResourceLocator::empty
ae324fb Move ./modules to ./src

git-subtree-dir: src/beast
git-subtree-split: 0e7bac945fae0e88ec60c1057a78d8ff6c4d17ca
---
 .gitignore                                    |    2 +
 Builds/VisualStudio2012/Beast.props           |   14 +-
 Builds/VisualStudio2012/beast.vcxproj         |  963 ++++++------
 Builds/VisualStudio2012/beast.vcxproj.filters | 1368 ++++++++++-------
 LICENSE_1_0.txt                               |   23 +
 TODO.txt                                      |   13 -
 .../Arithmetic.h                              |  101 +-
 .../memory/beast_Atomic.h => beast/Atomic.h   |   24 +-
 beast/Boost.h                                 |   31 +
 .../beast_ByteOrder.h => beast/ByteOrder.h    |  114 +-
 beast/CStdInt.h                               |   88 ++
 beast/Chrono.h                                |   27 +
 beast/Config.h                                |   60 +
 beast/Crypto.h                                |   26 +
 beast/FixedArray.h                            |  165 ++
 beast/HTTP.h                                  |   26 +
 .../beast_HeapBlock.h => beast/HeapBlock.h    |   60 +-
 beast/Intrusive.h                             |   28 +
 beast/{mpl.h => MPL.h}                        |    2 +
 .../memory/beast_Memory.h => beast/Memory.h   |   26 +-
 beast/Net.h                                   |   28 +
 .../beast_SafeBool.h => beast/SafeBool.h      |   42 +-
 beast/SmartPtr.h                              |   30 +
 .../StaticAssert.h                            |   42 +-
 beast/Strings.h                               |   27 +
 .../beast_FifoFreeStore.h => beast/Threads.h  |   31 +-
 beast/TypeTraits.h                            |   28 +
 .../beast_Uncopyable.h => beast/Uncopyable.h  |   11 +-
 beast/Utility.h                               |   33 +
 beast/Version.h                               |   40 +
 beast/boost/Boost.cpp                         |   22 +
 beast/boost/ErrorCode.h                       |   35 +
 beast/chrono/CPUMeter.h                       |  158 ++
 beast/chrono/Chrono.cpp                       |   23 +
 .../chrono/RelativeTime.h                     |  101 +-
 .../chrono/ScopedTimeInterval.h               |   47 +-
 beast/chrono/impl/CPUMeter.cpp                |   21 +
 beast/chrono/impl/RelativeTime.cpp            |  326 ++++
 .../config/CompilerConfig.h                   |   56 +-
 .../config/ConfigCheck.h                      |   12 +-
 .../config}/ContractChecks.h                  |   14 +-
 .../config/PlatformConfig.h                   |    7 +-
 beast/config/SelectCompilerConfig.h           |   44 +
 .../config/SelectPlatformConfig.h             |   65 +-
 beast/config/SelectStdlibConfig.h             |   21 +
 .../config/StandardConfig.h                   |   70 +-
 beast/config/Suffix.h                         |   25 +
 beast/config/compiler/Clang.h                 |   20 +
 beast/config/compiler/Gcc.h                   |   20 +
 beast/config/compiler/Intel.h                 |   20 +
 beast/config/compiler/VisualC.h               |   20 +
 beast/config/platform/Android.h               |   26 +
 beast/config/platform/Bsd.h                   |   20 +
 beast/config/platform/Linux.h                 |   21 +
 beast/config/platform/MacOS.h                 |   21 +
 beast/config/platform/Win32.h                 |   21 +
 beast/crypto/Crypto.cpp                       |   22 +
 beast/crypto/Sha256.h                         |  156 ++
 beast/crypto/impl/Sha256.cpp                  |  144 ++
 beast/crypto/impl/sha2/README                 |  277 ++++
 beast/crypto/impl/sha2/sha2.c                 | 1067 +++++++++++++
 beast/crypto/impl/sha2/sha2.h                 |  117 ++
 beast/crypto/impl/sha2/sha2prog.c             |  132 ++
 beast/crypto/impl/sha2/sha2speed.c            |  174 +++
 beast/crypto/impl/sha2/sha2test.pl            |  358 +++++
 beast/http/HTTP.cpp                           |   24 +
 beast/http/ParsedURL.h                        |   51 +
 .../http/URL.h                                |   45 +-
 .../http/impl/ParsedURL.cpp                   |  137 +-
 beast/http/impl/README.md                     |    3 +
 beast/http/impl/URL.cpp                       |  158 ++
 .../http/impl/http-parser}/.gitignore         |    0
 .../http/impl/http-parser}/.mailmap           |    0
 .../http/impl/http-parser}/.travis.yml        |    0
 .../http/impl/http-parser}/AUTHORS            |    0
 .../http/impl/http-parser}/CONTRIBUTIONS      |    0
 .../http/impl/http-parser}/LICENSE-MIT        |    0
 .../http/impl/http-parser}/Makefile           |    0
 .../http/impl/http-parser}/README.md          |    0
 .../impl/http-parser}/contrib/parsertrace.c   |    0
 .../impl/http-parser}/contrib/url_parser.c    |    0
 .../http/impl/http-parser}/http_parser.c      |    0
 .../http/impl/http-parser}/http_parser.gyp    |    0
 .../http/impl/http-parser}/http_parser.h      |    0
 .../http/impl/http-parser}/test.c             |    0
 beast/http/impl/http_parser.cpp               |   36 +
 beast/intrusive/ForwardList.h                 |    7 +-
 beast/intrusive/IntrusiveArray.h              |  187 +++
 .../containers => beast/intrusive}/List.h     |  201 +--
 beast/intrusive/LockFreeStack.h               |  285 ++++
 beast/intrusive/PointerTraits.h               |    2 +
 beast/mpl/AddConst.h                          |    6 +-
 .../copyconst.h => beast/mpl/CopyConst.h      |   23 +-
 beast/mpl/IfCond.h                            |    6 +-
 beast/mpl/IsCallPossible.h                    |  270 ++++
 beast/mpl/PointerToOther.h                    |    4 +-
 beast/mpl/RemoveConst.h                       |    6 +-
 beast/mpl/RemoveConstVolatile.h               |    2 +-
 beast/mpl/RemoveReference.h                   |    6 +-
 beast/mpl/RemoveVolatile.h                    |    6 +-
 .../basics => beast/net}/BufferType.h         |   14 +-
 beast/net/DynamicBuffer.h                     |  125 ++
 beast/net/IPEndpoint.h                        |  378 +++++
 beast/net/Net.cpp                             |   27 +
 beast/net/impl/DynamicBuffer.cpp              |   91 ++
 beast/net/impl/IPEndpoint.cpp                 |  717 +++++++++
 .../smart_ptr/ContainerDeletePolicy.h         |    8 +-
 .../smart_ptr/ScopedPointer.h                 |   45 +-
 .../memory => beast/smart_ptr}/SharedObject.h |   18 +-
 .../memory => beast/smart_ptr}/SharedPtr.h    |   77 +-
 beast/smart_ptr/SmartPtr.cpp                  |   25 +
 .../strings/CharPointer_ASCII.h               |   12 +-
 .../strings/CharPointer_UTF16.h               |   12 +-
 .../strings/CharPointer_UTF32.h               |   12 +-
 .../strings/CharPointer_UTF8.h                |   12 +
 .../strings/CharacterFunctions.h              |   22 +-
 .../strings/NewLine.h                         |   13 +-
 .../beast_String.h => beast/strings/String.h  |   41 +-
 .../strings}/StringCharPointerType.h          |   13 +-
 .../text => beast/strings}/StringFromNumber.h |   19 +-
 beast/strings/Strings.cpp                     |   23 +
 .../strings/impl/CharacterFunctions.cpp       |   10 +-
 .../strings/impl/String.cpp                   |   45 +-
 beast/threads/LockGuard.h                     |   50 +
 beast/threads/RecursiveMutex.h                |   84 +
 beast/threads/ScopedWrapperContext.h          |   93 ++
 beast/threads/ServiceQueue.h                  |  631 ++++++++
 beast/threads/SharedData.h                    |  272 ++++
 beast/threads/SharedLockGuard.h               |   52 +
 .../threads/SharedMutexAdapter.h              |   50 +-
 .../threads/SpinLock.h                        |   40 +-
 beast/threads/Stoppable.h                     |  327 ++++
 .../beast_Thread.h => beast/threads/Thread.h  |   22 +-
 .../threads/ThreadLocalValue.h                |   13 +-
 beast/threads/Threads.cpp                     |   27 +
 beast/threads/TryLockGuard.h                  |   55 +
 beast/threads/UnlockGuard.h                   |   50 +
 .../threads/WaitableEvent.h                   |   50 +-
 beast/threads/detail/BindHandler.h            |  276 ++++
 beast/threads/detail/DispatchedHandler.h      |  173 +++
 beast/threads/impl/Atomic.cpp                 |  133 ++
 beast/threads/impl/RecursiveMutex.cpp         |  111 ++
 beast/threads/impl/ServiceQueue.cpp           |  465 ++++++
 beast/threads/impl/Stoppable.cpp              |  198 +++
 beast/threads/impl/Thread.cpp                 |  599 ++++++++
 beast/threads/impl/WaitableEvent.cpp          |  168 ++
 beast/type_traits/IntegralConstant.h          |   40 +
 beast/type_traits/IsIntegral.h                |   42 +
 beast/type_traits/IsSigned.h                  |   40 +
 beast/type_traits/RemoveSigned.h              |   45 +
 beast/utility/BaseFromMember.h                |   71 +
 .../beast_Debug.h => beast/utility/Debug.h    |   10 +-
 beast/utility/EnableIf.h                      |   48 +
 .../beast_Error.h => beast/utility/Error.h    |   17 +-
 beast/utility/Journal.h                       |  193 +++
 .../utility/LeakChecked.h                     |   86 +-
 beast/utility/PropertyStream.h                |  297 ++++
 beast/utility/StaticObject.h                  |  113 ++
 beast/utility/Utility.cpp                     |   31 +
 .../utility/impl/Debug.cpp                    |   47 +-
 .../utility/impl/Error.cpp                    |   21 +
 beast/utility/impl/Journal.cpp                |  205 +++
 .../utility/impl/LeakChecked.cpp              |   22 +-
 beast/utility/impl/PropertyStream.cpp         |  422 +++++
 beast/utility/impl/StaticObject.cpp           |   41 +
 config/BeastConfig.h                          |  144 ++
 modules/beast_asio/async/AbstractHandler.h    |  712 +++++++++
 modules/beast_asio/async/AsyncObject.h        |   72 +
 .../beast_asio/async/ComposedAsyncOperation.h |    2 +-
 modules/beast_asio/async/SharedHandler.h      |   12 +-
 .../beast_asio/async/SharedHandlerAllocator.h |    2 +-
 modules/beast_asio/async/SharedHandlerPtr.h   |   27 +-
 modules/beast_asio/async/SharedHandlerType.h  |   23 +-
 modules/beast_asio/async/WrapHandler.h        |  209 +++
 modules/beast_asio/basics/BuffersType.h       |    2 -
 modules/beast_asio/basics/SharedArg.h         |  161 ++
 modules/beast_asio/beast_asio.cpp             |   24 +-
 modules/beast_asio/beast_asio.h               |   24 +-
 modules/beast_asio/http/HTTPClientType.cpp    |  825 ++++------
 modules/beast_asio/http/HTTPClientType.h      |   58 +-
 modules/beast_asio/http/HTTPHeaders.cpp       |   12 +
 modules/beast_asio/http/HTTPHeaders.h         |    3 +
 modules/beast_asio/http/HTTPMessage.cpp       |   12 +-
 modules/beast_asio/http/HTTPMessage.h         |    9 +-
 modules/beast_asio/http/HTTPParser.cpp        |   33 +-
 modules/beast_asio/http/HTTPParser.h          |   25 +-
 modules/beast_asio/http/HTTPParserImpl.h      |   17 +-
 modules/beast_asio/http/HTTPRequest.cpp       |   42 +
 modules/beast_asio/http/HTTPRequest.h         |   45 +
 .../http/HTTPRequestParser.cpp}               |   22 +-
 modules/beast_asio/http/HTTPRequestParser.h   |   46 +
 modules/beast_asio/http/HTTPResponse.cpp      |   11 +-
 modules/beast_asio/http/HTTPResponse.h        |    5 +-
 .../beast_asio/http/HTTPResponseParser.cpp    |   38 +
 modules/beast_asio/http/HTTPResponseParser.h  |   46 +
 modules/beast_asio/http/HTTPVersion.cpp       |    8 +-
 modules/beast_asio/http/HTTPVersion.h         |    6 +-
 modules/beast_asio/sockets/SocketWrapper.h    |  168 +-
 modules/beast_core/beast_core.cpp             |  246 ++-
 modules/beast_core/beast_core.h               |  512 ++----
 ...east_AbstractFifo.cpp => AbstractFifo.cpp} |    0
 .../{beast_AbstractFifo.h => AbstractFifo.h}  |    0
 .../containers/{beast_Array.h => Array.h}     |    0
 ...AllocationBase.h => ArrayAllocationBase.h} |    0
 .../beast_core/containers/DynamicArray.cpp    |  175 ---
 modules/beast_core/containers/DynamicArray.h  |  728 ---------
 modules/beast_core/containers/DynamicList.cpp |  327 ----
 modules/beast_core/containers/DynamicList.h   |  473 ------
 ...st_DynamicObject.cpp => DynamicObject.cpp} |    0
 ...{beast_DynamicObject.h => DynamicObject.h} |    0
 ...lementComparator.h => ElementComparator.h} |    0
 modules/beast_core/containers/HashMap.cpp     |  154 --
 modules/beast_core/containers/HashMap.h       |  856 -----------
 ...inkedListPointer.h => LinkedListPointer.h} |    0
 ...{beast_LockFreeQueue.h => LockFreeQueue.h} |   12 +-
 ...st_NamedValueSet.cpp => NamedValueSet.cpp} |    0
 ...{beast_NamedValueSet.h => NamedValueSet.h} |    0
 .../{beast_OwnedArray.h => OwnedArray.h}      |    0
 ...{beast_PropertySet.cpp => PropertySet.cpp} |    0
 .../{beast_PropertySet.h => PropertySet.h}    |    0
 ...copedValueSetter.h => ScopedValueSetter.h} |    0
 ...haredObjectArray.h => SharedObjectArray.h} |    0
 .../{beast_SortedSet.h => SortedSet.h}        |    0
 .../{beast_SparseSet.h => SparseSet.h}        |    0
 .../{beast_Variant.cpp => Variant.cpp}        |    0
 .../containers/{beast_Variant.h => Variant.h} |    0
 .../containers/beast_LockFreeStack.h          |  165 --
 .../beast_core/containers/beast_SharedTable.h |  212 ---
 .../containers/beast_SortedLookupTable.h      |  154 --
 .../{beast_FPUFlags.cpp => FPUFlags.cpp}      |    0
 .../{beast_FPUFlags.h => FPUFlags.h}          |    0
 .../{beast_FatalError.cpp => FatalError.cpp}  |   23 +-
 .../{beast_FatalError.h => FatalError.h}      |   27 +-
 ...emanticVersion.cpp => SemanticVersion.cpp} |    0
 ...st_SemanticVersion.h => SemanticVersion.h} |    0
 .../diagnostic/{beast_Throw.h => Throw.h}     |    4 +-
 .../{beast_UnitTest.cpp => UnitTest.cpp}      |   58 +-
 .../{beast_UnitTest.h => UnitTest.h}          |   36 +-
 ...estUtilities.cpp => UnitTestUtilities.cpp} |    0
 ...nitTestUtilities.h => UnitTestUtilities.h} |    0
 .../diagnostic/beast_ProtectedCall.cpp        |  360 -----
 .../diagnostic/beast_ProtectedCall.h          |  147 --
 ...toryIterator.cpp => DirectoryIterator.cpp} |    0
 ...irectoryIterator.h => DirectoryIterator.h} |    0
 .../files/{beast_File.cpp => File.cpp}        |   13 +-
 .../beast_core/files/{beast_File.h => File.h} |    0
 ...ileInputStream.cpp => FileInputStream.cpp} |    0
 ...st_FileInputStream.h => FileInputStream.h} |    0
 ...eOutputStream.cpp => FileOutputStream.cpp} |    0
 ..._FileOutputStream.h => FileOutputStream.h} |    0
 ..._FileSearchPath.cpp => FileSearchPath.cpp} |    0
 ...east_FileSearchPath.h => FileSearchPath.h} |    0
 ..._MemoryMappedFile.h => MemoryMappedFile.h} |    0
 ...domAccessFile.cpp => RandomAccessFile.cpp} |    0
 ..._RandomAccessFile.h => RandomAccessFile.h} |    0
 ...st_TemporaryFile.cpp => TemporaryFile.cpp} |    0
 ...{beast_TemporaryFile.h => TemporaryFile.h} |    0
 .../beast_core/functional/SharedFunction.h    |   99 --
 .../beast_core/functional/beast_Function.h    |  266 ----
 .../json/{beast_JSON.cpp => JSON.cpp}         |    0
 .../beast_core/json/{beast_JSON.h => JSON.h}  |    0
 .../{beast_FileLogger.cpp => FileLogger.cpp}  |    0
 .../{beast_FileLogger.h => FileLogger.h}      |    0
 .../logging/{beast_Logger.cpp => Logger.cpp}  |    2 +-
 .../logging/{beast_Logger.h => Logger.h}      |    2 +-
 .../{beast_BigInteger.cpp => BigInteger.cpp}  |    0
 .../{beast_BigInteger.h => BigInteger.h}      |    0
 .../{beast_Expression.cpp => Expression.cpp}  |    0
 .../{beast_Expression.h => Expression.h}      |    0
 .../maths/{beast_Interval.h => Interval.h}    |    0
 .../beast_core/maths/{beast_Math.h => Math.h} |    0
 .../{beast_MurmurHash.cpp => MurmurHash.cpp}  |    0
 .../{beast_MurmurHash.h => MurmurHash.h}      |   16 +
 .../maths/{beast_Random.cpp => Random.cpp}    |    0
 .../maths/{beast_Random.h => Random.h}        |    2 +-
 .../maths/{beast_Range.h => Range.h}          |    0
 .../maths/{beast_uint24.h => uint24.h}        |    0
 ...{beast_AtomicCounter.h => AtomicCounter.h} |    0
 .../{beast_AtomicFlag.h => AtomicFlag.h}      |    0
 ...{beast_AtomicPointer.h => AtomicPointer.h} |    0
 .../{beast_AtomicState.h => AtomicState.h}    |    0
 .../memory/{beast_CacheLine.h => CacheLine.h} |  184 +--
 ...st_MemoryAlignment.h => MemoryAlignment.h} |    0
 ...{beast_MemoryBlock.cpp => MemoryBlock.cpp} |    0
 .../{beast_MemoryBlock.h => MemoryBlock.h}    |    0
 ...copedPointer.h => OptionalScopedPointer.h} |    0
 ...ycledObjectPool.h => RecycledObjectPool.h} |    0
 modules/beast_core/memory/SharedFunction.h    |  334 ++++
 ...st_SharedSingleton.h => SharedSingleton.h} |  183 +--
 ...{beast_WeakReference.h => WeakReference.h} |    0
 modules/beast_core/memory/beast_AllocatedBy.h |   63 -
 modules/beast_core/memory/beast_ByteSwap.h    |  126 --
 .../memory/beast_FifoFreeStoreWithTLS.cpp     |  198 ---
 .../memory/beast_FifoFreeStoreWithTLS.h       |   69 -
 .../memory/beast_FifoFreeStoreWithoutTLS.cpp  |  241 ---
 .../memory/beast_FifoFreeStoreWithoutTLS.h    |   65 -
 .../memory/beast_PagedFreeStore.cpp           |  229 ---
 .../beast_core/memory/beast_PagedFreeStore.h  |   94 --
 .../beast_core/memory/beast_StaticObject.h    |  172 ---
 .../misc/{beast_Main.cpp => Main.cpp}         |   33 +-
 .../beast_core/misc/{beast_Main.h => Main.h}  |   13 +-
 .../misc/{beast_Result.cpp => Result.cpp}     |    2 +-
 .../misc/{beast_Result.h => Result.h}         |    0
 .../misc/{beast_Uuid.cpp => Uuid.cpp}         |    0
 .../beast_core/misc/{beast_Uuid.h => Uuid.h}  |    0
 ...st_WindowsRegistry.h => WindowsRegistry.h} |    0
 ...icNativeHeaders.h => BasicNativeHeaders.h} |    3 +-
 ...st_android_Files.cpp => android_Files.cpp} |    0
 ...roid_JNIHelpers.h => android_JNIHelpers.h} |    0
 ...east_android_Misc.cpp => android_Misc.cpp} |    0
 modules/beast_core/native/android_Network.cpp |   59 +
 ...ystemStats.cpp => android_SystemStats.cpp} |    0
 ...ndroid_Threads.cpp => android_Threads.cpp} |    2 +-
 .../native/beast_android_Network.cpp          |  170 --
 .../beast_core/native/beast_bsd_Network.cpp   |  455 ------
 .../beast_core/native/beast_linux_Network.cpp |  457 ------
 .../beast_core/native/beast_win32_Network.cpp |  464 ------
 .../{beast_bsd_Files.cpp => bsd_Files.cpp}    |    4 +-
 modules/beast_core/native/bsd_Network.cpp     |   59 +
 ...sd_SystemStats.cpp => bsd_SystemStats.cpp} |    0
 ...{beast_bsd_Threads.cpp => bsd_Threads.cpp} |    4 +-
 ...{beast_linux_Files.cpp => linux_Files.cpp} |    4 +-
 modules/beast_core/native/linux_Network.cpp   |   61 +
 ..._SystemStats.cpp => linux_SystemStats.cpp} |    0
 ...st_linux_Threads.cpp => linux_Threads.cpp} |    2 +-
 .../{beast_mac_Files.mm => mac_Files.mm}      |    0
 .../{beast_mac_Network.mm => mac_Network.mm}  |  134 +-
 .../{beast_mac_Strings.mm => mac_Strings.mm}  |    0
 ..._mac_SystemStats.mm => mac_SystemStats.mm} |    0
 .../{beast_mac_Threads.mm => mac_Threads.mm}  |    2 +-
 ...st_osx_ObjCHelpers.h => osx_ObjCHelpers.h} |    0
 ..._posix_FPUFlags.cpp => posix_FPUFlags.cpp} |    0
 ...osix_NamedPipe.cpp => posix_NamedPipe.cpp} |    0
 ..._posix_SharedCode.h => posix_SharedCode.h} |  232 ---
 ...in32_ComSmartPtr.h => win32_ComSmartPtr.h} |    0
 ..._win32_FPUFlags.cpp => win32_FPUFlags.cpp} |    0
 ...{beast_win32_Files.cpp => win32_Files.cpp} |    0
 modules/beast_core/native/win32_Network.cpp   |  172 +++
 ..._win32_Registry.cpp => win32_Registry.cpp} |    0
 ..._SystemStats.cpp => win32_SystemStats.cpp} |    0
 ...st_win32_Threads.cpp => win32_Threads.cpp} |  156 +-
 .../{beast_IPAddress.cpp => IPAddress.cpp}    |    0
 .../{beast_IPAddress.h => IPAddress.h}        |    0
 .../{beast_MACAddress.cpp => MACAddress.cpp}  |    0
 .../{beast_MACAddress.h => MACAddress.h}      |    0
 .../{beast_NamedPipe.cpp => NamedPipe.cpp}    |    0
 .../{beast_NamedPipe.h => NamedPipe.h}        |    0
 .../network/{beast_Socket.cpp => Socket.cpp}  |    0
 .../network/{beast_Socket.h => Socket.h}      |    0
 .../network/{beast_URL.cpp => URL.cpp}        |    0
 .../beast_core/network/{beast_URL.h => URL.h} |    0
 ...nputStream.cpp => BufferedInputStream.cpp} |    0
 ...redInputStream.h => BufferedInputStream.h} |    0
 ...ileInputSource.cpp => FileInputSource.cpp} |    0
 ...st_FileInputSource.h => FileInputSource.h} |    0
 .../{beast_InputSource.h => InputSource.h}    |    0
 ...{beast_InputStream.cpp => InputStream.cpp} |    0
 .../{beast_InputStream.h => InputStream.h}    |    0
 ...yInputStream.cpp => MemoryInputStream.cpp} |    0
 ...emoryInputStream.h => MemoryInputStream.h} |    0
 ...utputStream.cpp => MemoryOutputStream.cpp} |    0
 ...oryOutputStream.h => MemoryOutputStream.h} |    0
 ...east_OutputStream.cpp => OutputStream.cpp} |   17 +
 .../{beast_OutputStream.h => OutputStream.h}  |    3 +
 ...ubregionStream.cpp => SubregionStream.cpp} |    0
 ...st_SubregionStream.h => SubregionStream.h} |    0
 modules/beast_core/system/BeforeBoost.h       |   58 +-
 modules/beast_core/system/BoostIncludes.h     |    4 +-
 modules/beast_core/system/Functional.h        |  242 ---
 .../beast_core/system/FunctionalIncludes.h    |    4 +-
 modules/beast_core/system/StandardIncludes.h  |   78 +
 modules/beast_core/system/SystemStats.cpp     |   16 -
 .../{beast_Identifier.cpp => Identifier.cpp}  |    0
 .../text/{beast_Identifier.h => Identifier.h} |    0
 ...{beast_LexicalCast.cpp => LexicalCast.cpp} |    0
 .../{beast_LexicalCast.h => LexicalCast.h}    |    0
 ...alisedStrings.cpp => LocalisedStrings.cpp} |    0
 ..._LocalisedStrings.h => LocalisedStrings.h} |    0
 ...{beast_StringArray.cpp => StringArray.cpp} |    0
 .../{beast_StringArray.h => StringArray.h}    |    0
 ...tringPairArray.cpp => StringPairArray.cpp} |    0
 ...st_StringPairArray.h => StringPairArray.h} |    0
 .../{beast_StringPool.cpp => StringPool.cpp}  |    0
 .../text/{beast_StringPool.h => StringPool.h} |    0
 .../text/{beast_TextDiff.cpp => TextDiff.cpp} |    0
 .../text/{beast_TextDiff.h => TextDiff.h}     |    0
 ...st_DeadlineTimer.cpp => DeadlineTimer.cpp} |   58 +-
 ...{beast_DeadlineTimer.h => DeadlineTimer.h} |   51 +-
 .../{beast_Semaphore.cpp => Semaphore.cpp}    |    0
 .../thread/{beast_Semaphore.h => Semaphore.h} |    0
 .../thread/{beast_Workers.cpp => Workers.cpp} |    3 -
 .../thread/{beast_Workers.h => Workers.h}     |    0
 modules/beast_core/thread/beast_CallQueue.cpp |  153 --
 modules/beast_core/thread/beast_CallQueue.h   |  506 ------
 .../thread/beast_ConcurrentObject.cpp         |   76 -
 .../thread/beast_ConcurrentObject.h           |   79 -
 .../thread/beast_InterruptibleThread.cpp      |  202 ---
 .../thread/beast_InterruptibleThread.h        |  174 ---
 modules/beast_core/thread/beast_Listeners.cpp |  758 ---------
 modules/beast_core/thread/beast_Listeners.h   |  797 ----------
 .../thread/beast_ManualCallQueue.cpp          |   54 -
 .../beast_core/thread/beast_ManualCallQueue.h |  108 --
 .../beast_core/thread/beast_OncePerSecond.cpp |  111 --
 .../beast_core/thread/beast_OncePerSecond.h   |   62 -
 .../beast_core/thread/beast_ParallelFor.cpp   |   63 -
 modules/beast_core/thread/beast_ParallelFor.h |  251 ---
 modules/beast_core/thread/beast_SerialFor.h   |   71 -
 .../beast_core/thread/beast_ThreadGroup.cpp   |  105 --
 modules/beast_core/thread/beast_ThreadGroup.h |  215 ---
 .../thread/beast_ThreadWithCallQueue.cpp      |  152 --
 .../thread/beast_ThreadWithCallQueue.h        |  155 --
 .../beast_core/thread/impl/TrackedMutex.cpp   |   16 +-
 ...east_ChildProcess.cpp => ChildProcess.cpp} |   17 +-
 .../{beast_ChildProcess.h => ChildProcess.h}  |    0
 ...st_CriticalSection.h => CriticalSection.h} |    1 -
 ...east_DynamicLibrary.h => DynamicLibrary.h} |    0
 ...utionTimer.cpp => HighResolutionTimer.cpp} |    0
 ...esolutionTimer.h => HighResolutionTimer.h} |    0
 ..._InterProcessLock.h => InterProcessLock.h} |    0
 .../threads/{beast_Process.h => Process.h}    |    0
 ...st_ReadWriteLock.cpp => ReadWriteLock.cpp} |    0
 ...{beast_ReadWriteLock.h => ReadWriteLock.h} |    0
 .../{beast_ScopedLock.h => ScopedLock.h}      |    0
 ...east_ScopedReadLock.h => ScopedReadLock.h} |    0
 ...st_ScopedWriteLock.h => ScopedWriteLock.h} |    0
 .../{beast_SpinDelay.cpp => SpinDelay.cpp}    |    0
 .../{beast_SpinDelay.h => SpinDelay.h}        |    0
 .../threads/beast_ReadWriteMutex.cpp          |   98 --
 .../beast_core/threads/beast_ReadWriteMutex.h |  150 --
 modules/beast_core/threads/beast_SharedData.h |  295 ----
 modules/beast_core/threads/beast_Thread.cpp   |  365 -----
 .../beast_core/threads/beast_ThreadPool.cpp   |  371 -----
 modules/beast_core/threads/beast_ThreadPool.h |  304 ----
 .../threads/beast_TimeSliceThread.cpp         |  166 --
 .../threads/beast_TimeSliceThread.h           |  143 --
 modules/beast_core/time/AtExitHook.cpp        |  135 ++
 modules/beast_core/time/AtExitHook.h          |   88 ++
 ...anceCounter.cpp => PerformanceCounter.cpp} |    0
 ...formanceCounter.h => PerformanceCounter.h} |    0
 .../time/{beast_Time.cpp => Time.cpp}         |    0
 .../beast_core/time/{beast_Time.h => Time.h}  |   15 +
 .../beast_core/time/beast_PerformedAtExit.cpp |   74 -
 .../beast_core/time/beast_PerformedAtExit.h   |   52 -
 .../beast_core/time/beast_RelativeTime.cpp    |  134 --
 ...{beast_XmlDocument.cpp => XmlDocument.cpp} |    0
 .../{beast_XmlDocument.h => XmlDocument.h}    |    0
 .../{beast_XmlElement.cpp => XmlElement.cpp}  |    0
 .../xml/{beast_XmlElement.h => XmlElement.h}  |    0
 ...eam.cpp => GZIPCompressorOutputStream.cpp} |    0
 ...tStream.h => GZIPCompressorOutputStream.h} |    0
 ...am.cpp => GZIPDecompressorInputStream.cpp} |    4 +
 ...Stream.h => GZIPDecompressorInputStream.h} |    0
 .../zip/{beast_ZipFile.cpp => ZipFile.cpp}    |    0
 .../zip/{beast_ZipFile.h => ZipFile.h}        |    0
 modules/beast_crypto/beast_crypto.cpp         |    3 +-
 modules/beast_crypto/beast_crypto.h           |    4 +-
 modules/beast_crypto/math/BinaryEncoding.cpp  |  395 +++++
 modules/beast_crypto/math/BinaryEncoding.h    |   24 +
 modules/beast_crypto/math/UnsignedInteger.cpp |  396 +++++
 modules/beast_crypto/math/UnsignedInteger.h   |  299 ++++
 .../beast_crypto/math/UnsignedIntegerCalc.h   |  430 ++++++
 .../math/beast_UnsignedInteger.cpp            |   85 -
 .../beast_crypto/math/beast_UnsignedInteger.h |  378 -----
 modules/beast_db/beast_db.cpp                 |    2 +-
 modules/beast_db/beast_db.h                   |    2 +-
 .../{beast_KeyvaDB.cpp => KeyvaDB.cpp}        |   22 +-
 .../keyvalue/{beast_KeyvaDB.h => KeyvaDB.h}   |    0
 modules/beast_extras/beast_extras.h           |    2 +-
 ...LockableTraits.h => BoostLockableTraits.h} |    0
 modules/beast_sqdb/api/session.h              |    2 +-
 .../beast_sqdb/api/type_conversion_traits.h   |    4 +-
 modules/beast_sqdb/source/error_codes.cpp     |    4 +
 modules/beast_sqdb/source/into_type.cpp       |   15 +-
 modules/beast_sqdb/source/session.cpp         |   63 +-
 modules/beast_sqdb/source/statement_imp.cpp   |    5 +-
 modules/beast_sqdb/source/transaction.cpp     |    6 +-
 modules/beast_sqdb/source/use_type.cpp        |    5 +-
 modules/beast_sqlite/beast_sqlite.h           |    2 +-
 .../BeastConfig.h                             |    7 -
 scripts/compile.sh                            |   29 +
 480 files changed, 19599 insertions(+), 18109 deletions(-)
 create mode 100644 LICENSE_1_0.txt
 rename modules/beast_core/maths/beast_MathsFunctions.h => beast/Arithmetic.h (79%)
 rename modules/beast_core/memory/beast_Atomic.h => beast/Atomic.h (97%)
 create mode 100644 beast/Boost.h
 rename modules/beast_core/memory/beast_ByteOrder.h => beast/ByteOrder.h (78%)
 create mode 100644 beast/CStdInt.h
 create mode 100644 beast/Chrono.h
 create mode 100644 beast/Config.h
 create mode 100644 beast/Crypto.h
 create mode 100644 beast/FixedArray.h
 create mode 100644 beast/HTTP.h
 rename modules/beast_core/memory/beast_HeapBlock.h => beast/HeapBlock.h (88%)
 create mode 100644 beast/Intrusive.h
 rename beast/{mpl.h => MPL.h} (95%)
 rename modules/beast_core/memory/beast_Memory.h => beast/Memory.h (86%)
 create mode 100644 beast/Net.h
 rename modules/beast_core/diagnostic/beast_SafeBool.h => beast/SafeBool.h (93%)
 create mode 100644 beast/SmartPtr.h
 rename modules/beast_core/thread/beast_GlobalThreadGroup.h => beast/StaticAssert.h (62%)
 create mode 100644 beast/Strings.h
 rename modules/beast_core/memory/beast_FifoFreeStore.h => beast/Threads.h (67%)
 create mode 100644 beast/TypeTraits.h
 rename modules/beast_core/memory/beast_Uncopyable.h => beast/Uncopyable.h (95%)
 create mode 100644 beast/Utility.h
 create mode 100644 beast/Version.h
 create mode 100644 beast/boost/Boost.cpp
 create mode 100644 beast/boost/ErrorCode.h
 create mode 100644 beast/chrono/CPUMeter.h
 create mode 100644 beast/chrono/Chrono.cpp
 rename modules/beast_core/time/beast_RelativeTime.h => beast/chrono/RelativeTime.h (71%)
 rename modules/beast_core/memory/beast_GlobalPagedFreeStore.h => beast/chrono/ScopedTimeInterval.h (55%)
 create mode 100644 beast/chrono/impl/CPUMeter.cpp
 create mode 100644 beast/chrono/impl/RelativeTime.cpp
 rename modules/beast_core/system/PlatformDefs.h => beast/config/CompilerConfig.h (91%)
 rename modules/beast_core/system/BeastConfigCheck.h => beast/config/ConfigCheck.h (91%)
 rename {modules/beast_core/diagnostic => beast/config}/ContractChecks.h (92%)
 rename modules/beast_core/system/TargetPlatform.h => beast/config/PlatformConfig.h (98%)
 create mode 100644 beast/config/SelectCompilerConfig.h
 rename modules/beast_core/containers/detail/removecv.h => beast/config/SelectPlatformConfig.h (53%)
 create mode 100644 beast/config/SelectStdlibConfig.h
 rename modules/beast_core/system/StandardHeader.h => beast/config/StandardConfig.h (66%)
 create mode 100644 beast/config/Suffix.h
 create mode 100644 beast/config/compiler/Clang.h
 create mode 100644 beast/config/compiler/Gcc.h
 create mode 100644 beast/config/compiler/Intel.h
 create mode 100644 beast/config/compiler/VisualC.h
 create mode 100644 beast/config/platform/Android.h
 create mode 100644 beast/config/platform/Bsd.h
 create mode 100644 beast/config/platform/Linux.h
 create mode 100644 beast/config/platform/MacOS.h
 create mode 100644 beast/config/platform/Win32.h
 create mode 100644 beast/crypto/Crypto.cpp
 create mode 100644 beast/crypto/Sha256.h
 create mode 100644 beast/crypto/impl/Sha256.cpp
 create mode 100644 beast/crypto/impl/sha2/README
 create mode 100644 beast/crypto/impl/sha2/sha2.c
 create mode 100644 beast/crypto/impl/sha2/sha2.h
 create mode 100644 beast/crypto/impl/sha2/sha2prog.c
 create mode 100644 beast/crypto/impl/sha2/sha2speed.c
 create mode 100644 beast/crypto/impl/sha2/sha2test.pl
 create mode 100644 beast/http/HTTP.cpp
 create mode 100644 beast/http/ParsedURL.h
 rename modules/beast_asio/http/UniformResourceLocator.h => beast/http/URL.h (74%)
 rename modules/beast_asio/http/UniformResourceLocator.cpp => beast/http/impl/ParsedURL.cpp (59%)
 create mode 100644 beast/http/impl/README.md
 create mode 100644 beast/http/impl/URL.cpp
 rename {modules/beast_asio/parsehttp => beast/http/impl/http-parser}/.gitignore (100%)
 rename {modules/beast_asio/parsehttp => beast/http/impl/http-parser}/.mailmap (100%)
 rename {modules/beast_asio/parsehttp => beast/http/impl/http-parser}/.travis.yml (100%)
 rename {modules/beast_asio/parsehttp => beast/http/impl/http-parser}/AUTHORS (100%)
 rename {modules/beast_asio/parsehttp => beast/http/impl/http-parser}/CONTRIBUTIONS (100%)
 rename {modules/beast_asio/parsehttp => beast/http/impl/http-parser}/LICENSE-MIT (100%)
 rename {modules/beast_asio/parsehttp => beast/http/impl/http-parser}/Makefile (100%)
 rename {modules/beast_asio/parsehttp => beast/http/impl/http-parser}/README.md (100%)
 rename {modules/beast_asio/parsehttp => beast/http/impl/http-parser}/contrib/parsertrace.c (100%)
 rename {modules/beast_asio/parsehttp => beast/http/impl/http-parser}/contrib/url_parser.c (100%)
 rename {modules/beast_asio/parsehttp => beast/http/impl/http-parser}/http_parser.c (100%)
 rename {modules/beast_asio/parsehttp => beast/http/impl/http-parser}/http_parser.gyp (100%)
 rename {modules/beast_asio/parsehttp => beast/http/impl/http-parser}/http_parser.h (100%)
 rename {modules/beast_asio/parsehttp => beast/http/impl/http-parser}/test.c (100%)
 create mode 100644 beast/http/impl/http_parser.cpp
 create mode 100644 beast/intrusive/IntrusiveArray.h
 rename {modules/beast_core/containers => beast/intrusive}/List.h (71%)
 create mode 100644 beast/intrusive/LockFreeStack.h
 rename modules/beast_core/containers/detail/copyconst.h => beast/mpl/CopyConst.h (75%)
 create mode 100644 beast/mpl/IsCallPossible.h
 rename {modules/beast_asio/basics => beast/net}/BufferType.h (91%)
 create mode 100644 beast/net/DynamicBuffer.h
 create mode 100644 beast/net/IPEndpoint.h
 create mode 100644 beast/net/Net.cpp
 create mode 100644 beast/net/impl/DynamicBuffer.cpp
 create mode 100644 beast/net/impl/IPEndpoint.cpp
 rename modules/beast_core/memory/beast_ContainerDeletePolicy.h => beast/smart_ptr/ContainerDeletePolicy.h (92%)
 rename modules/beast_core/memory/beast_ScopedPointer.h => beast/smart_ptr/ScopedPointer.h (89%)
 rename {modules/beast_core/memory => beast/smart_ptr}/SharedObject.h (95%)
 rename {modules/beast_core/memory => beast/smart_ptr}/SharedPtr.h (87%)
 create mode 100644 beast/smart_ptr/SmartPtr.cpp
 rename modules/beast_core/text/beast_CharPointer_ASCII.h => beast/strings/CharPointer_ASCII.h (99%)
 rename modules/beast_core/text/beast_CharPointer_UTF16.h => beast/strings/CharPointer_UTF16.h (99%)
 rename modules/beast_core/text/beast_CharPointer_UTF32.h => beast/strings/CharPointer_UTF32.h (99%)
 rename modules/beast_core/text/beast_CharPointer_UTF8.h => beast/strings/CharPointer_UTF8.h (99%)
 rename modules/beast_core/text/beast_CharacterFunctions.h => beast/strings/CharacterFunctions.h (97%)
 rename modules/beast_core/text/beast_NewLine.h => beast/strings/NewLine.h (94%)
 rename modules/beast_core/text/beast_String.h => beast/strings/String.h (98%)
 rename {modules/beast_core/text => beast/strings}/StringCharPointerType.h (90%)
 rename {modules/beast_core/text => beast/strings}/StringFromNumber.h (94%)
 create mode 100644 beast/strings/Strings.cpp
 rename modules/beast_core/text/beast_CharacterFunctions.cpp => beast/strings/impl/CharacterFunctions.cpp (97%)
 rename modules/beast_core/text/beast_String.cpp => beast/strings/impl/String.cpp (98%)
 create mode 100644 beast/threads/LockGuard.h
 create mode 100644 beast/threads/RecursiveMutex.h
 create mode 100644 beast/threads/ScopedWrapperContext.h
 create mode 100644 beast/threads/ServiceQueue.h
 create mode 100644 beast/threads/SharedData.h
 create mode 100644 beast/threads/SharedLockGuard.h
 rename modules/beast_core/memory/beast_GlobalFifoFreeStore.h => beast/threads/SharedMutexAdapter.h (56%)
 rename modules/beast_core/threads/beast_SpinLock.h => beast/threads/SpinLock.h (82%)
 create mode 100644 beast/threads/Stoppable.h
 rename modules/beast_core/threads/beast_Thread.h => beast/threads/Thread.h (96%)
 rename modules/beast_core/threads/beast_ThreadLocalValue.h => beast/threads/ThreadLocalValue.h (97%)
 create mode 100644 beast/threads/Threads.cpp
 create mode 100644 beast/threads/TryLockGuard.h
 create mode 100644 beast/threads/UnlockGuard.h
 rename modules/beast_core/threads/beast_WaitableEvent.h => beast/threads/WaitableEvent.h (81%)
 create mode 100644 beast/threads/detail/BindHandler.h
 create mode 100644 beast/threads/detail/DispatchedHandler.h
 create mode 100644 beast/threads/impl/Atomic.cpp
 create mode 100644 beast/threads/impl/RecursiveMutex.cpp
 create mode 100644 beast/threads/impl/ServiceQueue.cpp
 create mode 100644 beast/threads/impl/Stoppable.cpp
 create mode 100644 beast/threads/impl/Thread.cpp
 create mode 100644 beast/threads/impl/WaitableEvent.cpp
 create mode 100644 beast/type_traits/IntegralConstant.h
 create mode 100644 beast/type_traits/IsIntegral.h
 create mode 100644 beast/type_traits/IsSigned.h
 create mode 100644 beast/type_traits/RemoveSigned.h
 create mode 100644 beast/utility/BaseFromMember.h
 rename modules/beast_core/diagnostic/beast_Debug.h => beast/utility/Debug.h (95%)
 create mode 100644 beast/utility/EnableIf.h
 rename modules/beast_core/diagnostic/beast_Error.h => beast/utility/Error.h (95%)
 create mode 100644 beast/utility/Journal.h
 rename modules/beast_core/diagnostic/beast_LeakChecked.h => beast/utility/LeakChecked.h (74%)
 create mode 100644 beast/utility/PropertyStream.h
 create mode 100644 beast/utility/StaticObject.h
 create mode 100644 beast/utility/Utility.cpp
 rename modules/beast_core/diagnostic/beast_Debug.cpp => beast/utility/impl/Debug.cpp (86%)
 rename modules/beast_core/diagnostic/beast_Error.cpp => beast/utility/impl/Error.cpp (96%)
 create mode 100644 beast/utility/impl/Journal.cpp
 rename modules/beast_core/diagnostic/beast_LeakChecked.cpp => beast/utility/impl/LeakChecked.cpp (88%)
 create mode 100644 beast/utility/impl/PropertyStream.cpp
 create mode 100644 beast/utility/impl/StaticObject.cpp
 create mode 100644 config/BeastConfig.h
 create mode 100644 modules/beast_asio/async/AbstractHandler.h
 create mode 100644 modules/beast_asio/async/AsyncObject.h
 create mode 100644 modules/beast_asio/async/WrapHandler.h
 create mode 100644 modules/beast_asio/basics/SharedArg.h
 create mode 100644 modules/beast_asio/http/HTTPRequest.cpp
 create mode 100644 modules/beast_asio/http/HTTPRequest.h
 rename modules/{beast_core/memory/beast_GlobalPagedFreeStore.cpp => beast_asio/http/HTTPRequestParser.cpp} (73%)
 create mode 100644 modules/beast_asio/http/HTTPRequestParser.h
 create mode 100644 modules/beast_asio/http/HTTPResponseParser.cpp
 create mode 100644 modules/beast_asio/http/HTTPResponseParser.h
 rename modules/beast_core/containers/{beast_AbstractFifo.cpp => AbstractFifo.cpp} (100%)
 rename modules/beast_core/containers/{beast_AbstractFifo.h => AbstractFifo.h} (100%)
 rename modules/beast_core/containers/{beast_Array.h => Array.h} (100%)
 rename modules/beast_core/containers/{beast_ArrayAllocationBase.h => ArrayAllocationBase.h} (100%)
 delete mode 100644 modules/beast_core/containers/DynamicArray.cpp
 delete mode 100644 modules/beast_core/containers/DynamicArray.h
 delete mode 100644 modules/beast_core/containers/DynamicList.cpp
 delete mode 100644 modules/beast_core/containers/DynamicList.h
 rename modules/beast_core/containers/{beast_DynamicObject.cpp => DynamicObject.cpp} (100%)
 rename modules/beast_core/containers/{beast_DynamicObject.h => DynamicObject.h} (100%)
 rename modules/beast_core/containers/{beast_ElementComparator.h => ElementComparator.h} (100%)
 delete mode 100644 modules/beast_core/containers/HashMap.cpp
 delete mode 100644 modules/beast_core/containers/HashMap.h
 rename modules/beast_core/containers/{beast_LinkedListPointer.h => LinkedListPointer.h} (100%)
 rename modules/beast_core/containers/{beast_LockFreeQueue.h => LockFreeQueue.h} (95%)
 rename modules/beast_core/containers/{beast_NamedValueSet.cpp => NamedValueSet.cpp} (100%)
 rename modules/beast_core/containers/{beast_NamedValueSet.h => NamedValueSet.h} (100%)
 rename modules/beast_core/containers/{beast_OwnedArray.h => OwnedArray.h} (100%)
 rename modules/beast_core/containers/{beast_PropertySet.cpp => PropertySet.cpp} (100%)
 rename modules/beast_core/containers/{beast_PropertySet.h => PropertySet.h} (100%)
 rename modules/beast_core/containers/{beast_ScopedValueSetter.h => ScopedValueSetter.h} (100%)
 rename modules/beast_core/containers/{beast_SharedObjectArray.h => SharedObjectArray.h} (100%)
 rename modules/beast_core/containers/{beast_SortedSet.h => SortedSet.h} (100%)
 rename modules/beast_core/containers/{beast_SparseSet.h => SparseSet.h} (100%)
 rename modules/beast_core/containers/{beast_Variant.cpp => Variant.cpp} (100%)
 rename modules/beast_core/containers/{beast_Variant.h => Variant.h} (100%)
 delete mode 100644 modules/beast_core/containers/beast_LockFreeStack.h
 delete mode 100644 modules/beast_core/containers/beast_SharedTable.h
 delete mode 100644 modules/beast_core/containers/beast_SortedLookupTable.h
 rename modules/beast_core/diagnostic/{beast_FPUFlags.cpp => FPUFlags.cpp} (100%)
 rename modules/beast_core/diagnostic/{beast_FPUFlags.h => FPUFlags.h} (100%)
 rename modules/beast_core/diagnostic/{beast_FatalError.cpp => FatalError.cpp} (86%)
 rename modules/beast_core/diagnostic/{beast_FatalError.h => FatalError.h} (89%)
 rename modules/beast_core/diagnostic/{beast_SemanticVersion.cpp => SemanticVersion.cpp} (100%)
 rename modules/beast_core/diagnostic/{beast_SemanticVersion.h => SemanticVersion.h} (100%)
 rename modules/beast_core/diagnostic/{beast_Throw.h => Throw.h} (93%)
 rename modules/beast_core/diagnostic/{beast_UnitTest.cpp => UnitTest.cpp} (90%)
 rename modules/beast_core/diagnostic/{beast_UnitTest.h => UnitTest.h} (94%)
 rename modules/beast_core/diagnostic/{beast_UnitTestUtilities.cpp => UnitTestUtilities.cpp} (100%)
 rename modules/beast_core/diagnostic/{beast_UnitTestUtilities.h => UnitTestUtilities.h} (100%)
 delete mode 100644 modules/beast_core/diagnostic/beast_ProtectedCall.cpp
 delete mode 100644 modules/beast_core/diagnostic/beast_ProtectedCall.h
 rename modules/beast_core/files/{beast_DirectoryIterator.cpp => DirectoryIterator.cpp} (100%)
 rename modules/beast_core/files/{beast_DirectoryIterator.h => DirectoryIterator.h} (100%)
 rename modules/beast_core/files/{beast_File.cpp => File.cpp} (99%)
 rename modules/beast_core/files/{beast_File.h => File.h} (100%)
 rename modules/beast_core/files/{beast_FileInputStream.cpp => FileInputStream.cpp} (100%)
 rename modules/beast_core/files/{beast_FileInputStream.h => FileInputStream.h} (100%)
 rename modules/beast_core/files/{beast_FileOutputStream.cpp => FileOutputStream.cpp} (100%)
 rename modules/beast_core/files/{beast_FileOutputStream.h => FileOutputStream.h} (100%)
 rename modules/beast_core/files/{beast_FileSearchPath.cpp => FileSearchPath.cpp} (100%)
 rename modules/beast_core/files/{beast_FileSearchPath.h => FileSearchPath.h} (100%)
 rename modules/beast_core/files/{beast_MemoryMappedFile.h => MemoryMappedFile.h} (100%)
 rename modules/beast_core/files/{beast_RandomAccessFile.cpp => RandomAccessFile.cpp} (100%)
 rename modules/beast_core/files/{beast_RandomAccessFile.h => RandomAccessFile.h} (100%)
 rename modules/beast_core/files/{beast_TemporaryFile.cpp => TemporaryFile.cpp} (100%)
 rename modules/beast_core/files/{beast_TemporaryFile.h => TemporaryFile.h} (100%)
 delete mode 100644 modules/beast_core/functional/SharedFunction.h
 delete mode 100644 modules/beast_core/functional/beast_Function.h
 rename modules/beast_core/json/{beast_JSON.cpp => JSON.cpp} (100%)
 rename modules/beast_core/json/{beast_JSON.h => JSON.h} (100%)
 rename modules/beast_core/logging/{beast_FileLogger.cpp => FileLogger.cpp} (100%)
 rename modules/beast_core/logging/{beast_FileLogger.h => FileLogger.h} (100%)
 rename modules/beast_core/logging/{beast_Logger.cpp => Logger.cpp} (95%)
 rename modules/beast_core/logging/{beast_Logger.h => Logger.h} (97%)
 rename modules/beast_core/maths/{beast_BigInteger.cpp => BigInteger.cpp} (100%)
 rename modules/beast_core/maths/{beast_BigInteger.h => BigInteger.h} (100%)
 rename modules/beast_core/maths/{beast_Expression.cpp => Expression.cpp} (100%)
 rename modules/beast_core/maths/{beast_Expression.h => Expression.h} (100%)
 rename modules/beast_core/maths/{beast_Interval.h => Interval.h} (100%)
 rename modules/beast_core/maths/{beast_Math.h => Math.h} (100%)
 rename modules/beast_core/maths/{beast_MurmurHash.cpp => MurmurHash.cpp} (100%)
 rename modules/beast_core/maths/{beast_MurmurHash.h => MurmurHash.h} (86%)
 rename modules/beast_core/maths/{beast_Random.cpp => Random.cpp} (100%)
 rename modules/beast_core/maths/{beast_Random.h => Random.h} (99%)
 rename modules/beast_core/maths/{beast_Range.h => Range.h} (100%)
 rename modules/beast_core/maths/{beast_uint24.h => uint24.h} (100%)
 rename modules/beast_core/memory/{beast_AtomicCounter.h => AtomicCounter.h} (100%)
 rename modules/beast_core/memory/{beast_AtomicFlag.h => AtomicFlag.h} (100%)
 rename modules/beast_core/memory/{beast_AtomicPointer.h => AtomicPointer.h} (100%)
 rename modules/beast_core/memory/{beast_AtomicState.h => AtomicState.h} (100%)
 rename modules/beast_core/memory/{beast_CacheLine.h => CacheLine.h} (73%)
 rename modules/beast_core/memory/{beast_MemoryAlignment.h => MemoryAlignment.h} (100%)
 rename modules/beast_core/memory/{beast_MemoryBlock.cpp => MemoryBlock.cpp} (100%)
 rename modules/beast_core/memory/{beast_MemoryBlock.h => MemoryBlock.h} (100%)
 rename modules/beast_core/memory/{beast_OptionalScopedPointer.h => OptionalScopedPointer.h} (100%)
 rename modules/beast_core/memory/{beast_RecycledObjectPool.h => RecycledObjectPool.h} (100%)
 create mode 100644 modules/beast_core/memory/SharedFunction.h
 rename modules/beast_core/memory/{beast_SharedSingleton.h => SharedSingleton.h} (51%)
 rename modules/beast_core/memory/{beast_WeakReference.h => WeakReference.h} (100%)
 delete mode 100644 modules/beast_core/memory/beast_AllocatedBy.h
 delete mode 100644 modules/beast_core/memory/beast_ByteSwap.h
 delete mode 100644 modules/beast_core/memory/beast_FifoFreeStoreWithTLS.cpp
 delete mode 100644 modules/beast_core/memory/beast_FifoFreeStoreWithTLS.h
 delete mode 100644 modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.cpp
 delete mode 100644 modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.h
 delete mode 100644 modules/beast_core/memory/beast_PagedFreeStore.cpp
 delete mode 100644 modules/beast_core/memory/beast_PagedFreeStore.h
 delete mode 100644 modules/beast_core/memory/beast_StaticObject.h
 rename modules/beast_core/misc/{beast_Main.cpp => Main.cpp} (85%)
 rename modules/beast_core/misc/{beast_Main.h => Main.h} (89%)
 rename modules/beast_core/misc/{beast_Result.cpp => Result.cpp} (97%)
 rename modules/beast_core/misc/{beast_Result.h => Result.h} (100%)
 rename modules/beast_core/misc/{beast_Uuid.cpp => Uuid.cpp} (100%)
 rename modules/beast_core/misc/{beast_Uuid.h => Uuid.h} (100%)
 rename modules/beast_core/misc/{beast_WindowsRegistry.h => WindowsRegistry.h} (100%)
 rename modules/beast_core/native/{beast_BasicNativeHeaders.h => BasicNativeHeaders.h} (99%)
 rename modules/beast_core/native/{beast_android_Files.cpp => android_Files.cpp} (100%)
 rename modules/beast_core/native/{beast_android_JNIHelpers.h => android_JNIHelpers.h} (100%)
 rename modules/beast_core/native/{beast_android_Misc.cpp => android_Misc.cpp} (100%)
 create mode 100644 modules/beast_core/native/android_Network.cpp
 rename modules/beast_core/native/{beast_android_SystemStats.cpp => android_SystemStats.cpp} (100%)
 rename modules/beast_core/native/{beast_android_Threads.cpp => android_Threads.cpp} (97%)
 delete mode 100644 modules/beast_core/native/beast_android_Network.cpp
 delete mode 100644 modules/beast_core/native/beast_bsd_Network.cpp
 delete mode 100644 modules/beast_core/native/beast_linux_Network.cpp
 delete mode 100644 modules/beast_core/native/beast_win32_Network.cpp
 rename modules/beast_core/native/{beast_bsd_Files.cpp => bsd_Files.cpp} (98%)
 create mode 100644 modules/beast_core/native/bsd_Network.cpp
 rename modules/beast_core/native/{beast_bsd_SystemStats.cpp => bsd_SystemStats.cpp} (100%)
 rename modules/beast_core/native/{beast_bsd_Threads.cpp => bsd_Threads.cpp} (95%)
 rename modules/beast_core/native/{beast_linux_Files.cpp => linux_Files.cpp} (98%)
 create mode 100644 modules/beast_core/native/linux_Network.cpp
 rename modules/beast_core/native/{beast_linux_SystemStats.cpp => linux_SystemStats.cpp} (100%)
 rename modules/beast_core/native/{beast_linux_Threads.cpp => linux_Threads.cpp} (97%)
 rename modules/beast_core/native/{beast_mac_Files.mm => mac_Files.mm} (100%)
 rename modules/beast_core/native/{beast_mac_Network.mm => mac_Network.mm} (66%)
 rename modules/beast_core/native/{beast_mac_Strings.mm => mac_Strings.mm} (100%)
 rename modules/beast_core/native/{beast_mac_SystemStats.mm => mac_SystemStats.mm} (100%)
 rename modules/beast_core/native/{beast_mac_Threads.mm => mac_Threads.mm} (97%)
 rename modules/beast_core/native/{beast_osx_ObjCHelpers.h => osx_ObjCHelpers.h} (100%)
 rename modules/beast_core/native/{beast_posix_FPUFlags.cpp => posix_FPUFlags.cpp} (100%)
 rename modules/beast_core/native/{beast_posix_NamedPipe.cpp => posix_NamedPipe.cpp} (100%)
 rename modules/beast_core/native/{beast_posix_SharedCode.h => posix_SharedCode.h} (83%)
 rename modules/beast_core/native/{beast_win32_ComSmartPtr.h => win32_ComSmartPtr.h} (100%)
 rename modules/beast_core/native/{beast_win32_FPUFlags.cpp => win32_FPUFlags.cpp} (100%)
 rename modules/beast_core/native/{beast_win32_Files.cpp => win32_Files.cpp} (100%)
 create mode 100644 modules/beast_core/native/win32_Network.cpp
 rename modules/beast_core/native/{beast_win32_Registry.cpp => win32_Registry.cpp} (100%)
 rename modules/beast_core/native/{beast_win32_SystemStats.cpp => win32_SystemStats.cpp} (100%)
 rename modules/beast_core/native/{beast_win32_Threads.cpp => win32_Threads.cpp} (75%)
 rename modules/beast_core/network/{beast_IPAddress.cpp => IPAddress.cpp} (100%)
 rename modules/beast_core/network/{beast_IPAddress.h => IPAddress.h} (100%)
 rename modules/beast_core/network/{beast_MACAddress.cpp => MACAddress.cpp} (100%)
 rename modules/beast_core/network/{beast_MACAddress.h => MACAddress.h} (100%)
 rename modules/beast_core/network/{beast_NamedPipe.cpp => NamedPipe.cpp} (100%)
 rename modules/beast_core/network/{beast_NamedPipe.h => NamedPipe.h} (100%)
 rename modules/beast_core/network/{beast_Socket.cpp => Socket.cpp} (100%)
 rename modules/beast_core/network/{beast_Socket.h => Socket.h} (100%)
 rename modules/beast_core/network/{beast_URL.cpp => URL.cpp} (100%)
 rename modules/beast_core/network/{beast_URL.h => URL.h} (100%)
 rename modules/beast_core/streams/{beast_BufferedInputStream.cpp => BufferedInputStream.cpp} (100%)
 rename modules/beast_core/streams/{beast_BufferedInputStream.h => BufferedInputStream.h} (100%)
 rename modules/beast_core/streams/{beast_FileInputSource.cpp => FileInputSource.cpp} (100%)
 rename modules/beast_core/streams/{beast_FileInputSource.h => FileInputSource.h} (100%)
 rename modules/beast_core/streams/{beast_InputSource.h => InputSource.h} (100%)
 rename modules/beast_core/streams/{beast_InputStream.cpp => InputStream.cpp} (100%)
 rename modules/beast_core/streams/{beast_InputStream.h => InputStream.h} (100%)
 rename modules/beast_core/streams/{beast_MemoryInputStream.cpp => MemoryInputStream.cpp} (100%)
 rename modules/beast_core/streams/{beast_MemoryInputStream.h => MemoryInputStream.h} (100%)
 rename modules/beast_core/streams/{beast_MemoryOutputStream.cpp => MemoryOutputStream.cpp} (100%)
 rename modules/beast_core/streams/{beast_MemoryOutputStream.h => MemoryOutputStream.h} (100%)
 rename modules/beast_core/streams/{beast_OutputStream.cpp => OutputStream.cpp} (95%)
 rename modules/beast_core/streams/{beast_OutputStream.h => OutputStream.h} (98%)
 rename modules/beast_core/streams/{beast_SubregionStream.cpp => SubregionStream.cpp} (100%)
 rename modules/beast_core/streams/{beast_SubregionStream.h => SubregionStream.h} (100%)
 create mode 100644 modules/beast_core/system/StandardIncludes.h
 rename modules/beast_core/text/{beast_Identifier.cpp => Identifier.cpp} (100%)
 rename modules/beast_core/text/{beast_Identifier.h => Identifier.h} (100%)
 rename modules/beast_core/text/{beast_LexicalCast.cpp => LexicalCast.cpp} (100%)
 rename modules/beast_core/text/{beast_LexicalCast.h => LexicalCast.h} (100%)
 rename modules/beast_core/text/{beast_LocalisedStrings.cpp => LocalisedStrings.cpp} (100%)
 rename modules/beast_core/text/{beast_LocalisedStrings.h => LocalisedStrings.h} (100%)
 rename modules/beast_core/text/{beast_StringArray.cpp => StringArray.cpp} (100%)
 rename modules/beast_core/text/{beast_StringArray.h => StringArray.h} (100%)
 rename modules/beast_core/text/{beast_StringPairArray.cpp => StringPairArray.cpp} (100%)
 rename modules/beast_core/text/{beast_StringPairArray.h => StringPairArray.h} (100%)
 rename modules/beast_core/text/{beast_StringPool.cpp => StringPool.cpp} (100%)
 rename modules/beast_core/text/{beast_StringPool.h => StringPool.h} (100%)
 rename modules/beast_core/text/{beast_TextDiff.cpp => TextDiff.cpp} (100%)
 rename modules/beast_core/text/{beast_TextDiff.h => TextDiff.h} (100%)
 rename modules/beast_core/thread/{beast_DeadlineTimer.cpp => DeadlineTimer.cpp} (83%)
 rename modules/beast_core/thread/{beast_DeadlineTimer.h => DeadlineTimer.h} (81%)
 rename modules/beast_core/thread/{beast_Semaphore.cpp => Semaphore.cpp} (100%)
 rename modules/beast_core/thread/{beast_Semaphore.h => Semaphore.h} (100%)
 rename modules/beast_core/thread/{beast_Workers.cpp => Workers.cpp} (98%)
 rename modules/beast_core/thread/{beast_Workers.h => Workers.h} (100%)
 delete mode 100644 modules/beast_core/thread/beast_CallQueue.cpp
 delete mode 100644 modules/beast_core/thread/beast_CallQueue.h
 delete mode 100644 modules/beast_core/thread/beast_ConcurrentObject.cpp
 delete mode 100644 modules/beast_core/thread/beast_ConcurrentObject.h
 delete mode 100644 modules/beast_core/thread/beast_InterruptibleThread.cpp
 delete mode 100644 modules/beast_core/thread/beast_InterruptibleThread.h
 delete mode 100644 modules/beast_core/thread/beast_Listeners.cpp
 delete mode 100644 modules/beast_core/thread/beast_Listeners.h
 delete mode 100644 modules/beast_core/thread/beast_ManualCallQueue.cpp
 delete mode 100644 modules/beast_core/thread/beast_ManualCallQueue.h
 delete mode 100644 modules/beast_core/thread/beast_OncePerSecond.cpp
 delete mode 100644 modules/beast_core/thread/beast_OncePerSecond.h
 delete mode 100644 modules/beast_core/thread/beast_ParallelFor.cpp
 delete mode 100644 modules/beast_core/thread/beast_ParallelFor.h
 delete mode 100644 modules/beast_core/thread/beast_SerialFor.h
 delete mode 100644 modules/beast_core/thread/beast_ThreadGroup.cpp
 delete mode 100644 modules/beast_core/thread/beast_ThreadGroup.h
 delete mode 100644 modules/beast_core/thread/beast_ThreadWithCallQueue.cpp
 delete mode 100644 modules/beast_core/thread/beast_ThreadWithCallQueue.h
 rename modules/beast_core/threads/{beast_ChildProcess.cpp => ChildProcess.cpp} (82%)
 rename modules/beast_core/threads/{beast_ChildProcess.h => ChildProcess.h} (100%)
 rename modules/beast_core/threads/{beast_CriticalSection.h => CriticalSection.h} (99%)
 rename modules/beast_core/threads/{beast_DynamicLibrary.h => DynamicLibrary.h} (100%)
 rename modules/beast_core/threads/{beast_HighResolutionTimer.cpp => HighResolutionTimer.cpp} (100%)
 rename modules/beast_core/threads/{beast_HighResolutionTimer.h => HighResolutionTimer.h} (100%)
 rename modules/beast_core/threads/{beast_InterProcessLock.h => InterProcessLock.h} (100%)
 rename modules/beast_core/threads/{beast_Process.h => Process.h} (100%)
 rename modules/beast_core/threads/{beast_ReadWriteLock.cpp => ReadWriteLock.cpp} (100%)
 rename modules/beast_core/threads/{beast_ReadWriteLock.h => ReadWriteLock.h} (100%)
 rename modules/beast_core/threads/{beast_ScopedLock.h => ScopedLock.h} (100%)
 rename modules/beast_core/threads/{beast_ScopedReadLock.h => ScopedReadLock.h} (100%)
 rename modules/beast_core/threads/{beast_ScopedWriteLock.h => ScopedWriteLock.h} (100%)
 rename modules/beast_core/threads/{beast_SpinDelay.cpp => SpinDelay.cpp} (100%)
 rename modules/beast_core/threads/{beast_SpinDelay.h => SpinDelay.h} (100%)
 delete mode 100644 modules/beast_core/threads/beast_ReadWriteMutex.cpp
 delete mode 100644 modules/beast_core/threads/beast_ReadWriteMutex.h
 delete mode 100644 modules/beast_core/threads/beast_SharedData.h
 delete mode 100644 modules/beast_core/threads/beast_Thread.cpp
 delete mode 100644 modules/beast_core/threads/beast_ThreadPool.cpp
 delete mode 100644 modules/beast_core/threads/beast_ThreadPool.h
 delete mode 100644 modules/beast_core/threads/beast_TimeSliceThread.cpp
 delete mode 100644 modules/beast_core/threads/beast_TimeSliceThread.h
 create mode 100644 modules/beast_core/time/AtExitHook.cpp
 create mode 100644 modules/beast_core/time/AtExitHook.h
 rename modules/beast_core/time/{beast_PerformanceCounter.cpp => PerformanceCounter.cpp} (100%)
 rename modules/beast_core/time/{beast_PerformanceCounter.h => PerformanceCounter.h} (100%)
 rename modules/beast_core/time/{beast_Time.cpp => Time.cpp} (100%)
 rename modules/beast_core/time/{beast_Time.h => Time.h} (97%)
 delete mode 100644 modules/beast_core/time/beast_PerformedAtExit.cpp
 delete mode 100644 modules/beast_core/time/beast_PerformedAtExit.h
 delete mode 100644 modules/beast_core/time/beast_RelativeTime.cpp
 rename modules/beast_core/xml/{beast_XmlDocument.cpp => XmlDocument.cpp} (100%)
 rename modules/beast_core/xml/{beast_XmlDocument.h => XmlDocument.h} (100%)
 rename modules/beast_core/xml/{beast_XmlElement.cpp => XmlElement.cpp} (100%)
 rename modules/beast_core/xml/{beast_XmlElement.h => XmlElement.h} (100%)
 rename modules/beast_core/zip/{beast_GZIPCompressorOutputStream.cpp => GZIPCompressorOutputStream.cpp} (100%)
 rename modules/beast_core/zip/{beast_GZIPCompressorOutputStream.h => GZIPCompressorOutputStream.h} (100%)
 rename modules/beast_core/zip/{beast_GZIPDecompressorInputStream.cpp => GZIPDecompressorInputStream.cpp} (99%)
 rename modules/beast_core/zip/{beast_GZIPDecompressorInputStream.h => GZIPDecompressorInputStream.h} (100%)
 rename modules/beast_core/zip/{beast_ZipFile.cpp => ZipFile.cpp} (100%)
 rename modules/beast_core/zip/{beast_ZipFile.h => ZipFile.h} (100%)
 create mode 100644 modules/beast_crypto/math/BinaryEncoding.cpp
 create mode 100644 modules/beast_crypto/math/BinaryEncoding.h
 create mode 100644 modules/beast_crypto/math/UnsignedInteger.cpp
 create mode 100644 modules/beast_crypto/math/UnsignedInteger.h
 create mode 100644 modules/beast_crypto/math/UnsignedIntegerCalc.h
 delete mode 100644 modules/beast_crypto/math/beast_UnsignedInteger.cpp
 delete mode 100644 modules/beast_crypto/math/beast_UnsignedInteger.h
 rename modules/beast_db/keyvalue/{beast_KeyvaDB.cpp => KeyvaDB.cpp} (97%)
 rename modules/beast_db/keyvalue/{beast_KeyvaDB.h => KeyvaDB.h} (100%)
 rename modules/beast_extras/traits/{beast_BoostLockableTraits.h => BoostLockableTraits.h} (100%)
 rename {Builds/VisualStudio2012 => scripts}/BeastConfig.h (96%)
 create mode 100755 scripts/compile.sh

diff --git a/.gitignore b/.gitignore
index d5acdb6154..1a834f299e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@ contents.xcworkspacedata
 profile
 Builds/VisualStudio2012/Debug
 Builds/VisualStudio2012/Release
+
+modules/beast_cryptopp
diff --git a/Builds/VisualStudio2012/Beast.props b/Builds/VisualStudio2012/Beast.props
index 2428672bea..792f3409ca 100644
--- a/Builds/VisualStudio2012/Beast.props
+++ b/Builds/VisualStudio2012/Beast.props
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros">
+    <RepoDir>..\..</RepoDir>
+  </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BEAST_COMPILING_STATIC_LIBARARY=1;_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoDir)\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <BuildMacro Include="RepoDir">
+      <Value>$(RepoDir)</Value>
+    </BuildMacro>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Builds/VisualStudio2012/beast.vcxproj b/Builds/VisualStudio2012/beast.vcxproj
index 422e763b14..455746b304 100644
--- a/Builds/VisualStudio2012/beast.vcxproj
+++ b/Builds/VisualStudio2012/beast.vcxproj
@@ -21,6 +21,17 @@
   <ItemGroup>
     <None Include="..\..\.gitattributes" />
     <None Include="..\..\.gitignore" />
+    <None Include="..\..\beast\crypto\impl\sha2\README" />
+    <None Include="..\..\beast\crypto\impl\sha2\sha2test.pl" />
+    <None Include="..\..\beast\http\impl\http-parser\.gitignore" />
+    <None Include="..\..\beast\http\impl\http-parser\.mailmap" />
+    <None Include="..\..\beast\http\impl\http-parser\.travis.yml" />
+    <None Include="..\..\beast\http\impl\http-parser\AUTHORS" />
+    <None Include="..\..\beast\http\impl\http-parser\CONTRIBUTIONS" />
+    <None Include="..\..\beast\http\impl\http-parser\http_parser.gyp" />
+    <None Include="..\..\beast\http\impl\http-parser\LICENSE-MIT" />
+    <None Include="..\..\beast\http\impl\http-parser\Makefile" />
+    <None Include="..\..\beast\http\impl\http-parser\README.md" />
     <None Include="..\..\CodingStyle.md" />
     <None Include="..\..\Doxyfile" />
     <None Include="..\..\modules\beast_core\beast_core.mm">
@@ -29,31 +40,31 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </None>
-    <None Include="..\..\modules\beast_core\native\beast_mac_Files.mm">
+    <None Include="..\..\modules\beast_core\native\mac_Files.mm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </None>
-    <None Include="..\..\modules\beast_core\native\beast_mac_Network.mm">
+    <None Include="..\..\modules\beast_core\native\mac_Network.mm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </None>
-    <None Include="..\..\modules\beast_core\native\beast_mac_Strings.mm">
+    <None Include="..\..\modules\beast_core\native\mac_Strings.mm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </None>
-    <None Include="..\..\modules\beast_core\native\beast_mac_SystemStats.mm">
+    <None Include="..\..\modules\beast_core\native\mac_SystemStats.mm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </None>
-    <None Include="..\..\modules\beast_core\native\beast_mac_Threads.mm">
+    <None Include="..\..\modules\beast_core\native\mac_Threads.mm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -67,28 +78,130 @@
     </None>
     <None Include="..\..\modules\beast_core\zip\zlib\README" />
     <None Include="..\..\README.md" />
+    <None Include="..\..\scripts\compile.sh" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\beast\Arithmetic.h" />
+    <ClInclude Include="..\..\beast\Atomic.h" />
+    <ClInclude Include="..\..\beast\Boost.h" />
+    <ClInclude Include="..\..\beast\boost\ErrorCode.h" />
+    <ClInclude Include="..\..\beast\ByteOrder.h" />
+    <ClInclude Include="..\..\beast\chrono\CPUMeter.h" />
+    <ClInclude Include="..\..\beast\chrono\RelativeTime.h" />
+    <ClInclude Include="..\..\beast\chrono\ScopedTimeInterval.h" />
+    <ClInclude Include="..\..\beast\Config.h" />
+    <ClInclude Include="..\..\beast\config\CompilerConfig.h" />
+    <ClInclude Include="..\..\beast\config\compiler\Clang.h" />
+    <ClInclude Include="..\..\beast\config\compiler\Gcc.h" />
+    <ClInclude Include="..\..\beast\config\compiler\Intel.h" />
+    <ClInclude Include="..\..\beast\config\compiler\VisualC.h" />
+    <ClInclude Include="..\..\beast\config\ConfigCheck.h" />
+    <ClInclude Include="..\..\beast\config\ContractChecks.h" />
+    <ClInclude Include="..\..\beast\config\PlatformConfig.h" />
+    <ClInclude Include="..\..\beast\config\platform\Android.h" />
+    <ClInclude Include="..\..\beast\config\platform\Bsd.h" />
+    <ClInclude Include="..\..\beast\config\platform\Linux.h" />
+    <ClInclude Include="..\..\beast\config\platform\MacOS.h" />
+    <ClInclude Include="..\..\beast\config\platform\Win32.h" />
+    <ClInclude Include="..\..\beast\config\SelectCompilerConfig.h" />
+    <ClInclude Include="..\..\beast\config\SelectPlatformConfig.h" />
+    <ClInclude Include="..\..\beast\config\SelectStdlibConfig.h" />
+    <ClInclude Include="..\..\beast\config\StandardConfig.h" />
+    <ClInclude Include="..\..\beast\Crypto.h" />
+    <ClInclude Include="..\..\beast\crypto\impl\sha2\sha2.h" />
+    <ClInclude Include="..\..\beast\crypto\Sha256.h" />
+    <ClInclude Include="..\..\beast\CStdInt.h" />
+    <ClInclude Include="..\..\beast\FixedArray.h" />
+    <ClInclude Include="..\..\beast\HeapBlock.h" />
+    <ClInclude Include="..\..\beast\HTTP.h" />
+    <ClInclude Include="..\..\beast\http\impl\http-parser\http_parser.h" />
+    <ClInclude Include="..\..\beast\http\ParsedURL.h" />
+    <ClInclude Include="..\..\beast\http\URL.h" />
+    <ClInclude Include="..\..\beast\Intrusive.h" />
     <ClInclude Include="..\..\beast\intrusive\ForwardList.h" />
+    <ClInclude Include="..\..\beast\intrusive\IntrusiveArray.h" />
+    <ClInclude Include="..\..\beast\intrusive\List.h" />
+    <ClInclude Include="..\..\beast\intrusive\LockFreeStack.h" />
     <ClInclude Include="..\..\beast\intrusive\PointerTraits.h" />
-    <ClInclude Include="..\..\beast\mpl.h" />
+    <ClInclude Include="..\..\beast\Memory.h" />
+    <ClInclude Include="..\..\beast\MPL.h" />
     <ClInclude Include="..\..\beast\mpl\AddConst.h" />
+    <ClInclude Include="..\..\beast\mpl\CopyConst.h" />
     <ClInclude Include="..\..\beast\mpl\IfCond.h" />
+    <ClInclude Include="..\..\beast\mpl\IsCallPossible.h" />
     <ClInclude Include="..\..\beast\mpl\PointerToOther.h" />
     <ClInclude Include="..\..\beast\mpl\RemoveConst.h" />
     <ClInclude Include="..\..\beast\mpl\RemoveConstVolatile.h" />
     <ClInclude Include="..\..\beast\mpl\RemoveReference.h" />
     <ClInclude Include="..\..\beast\mpl\RemoveVolatile.h" />
+    <ClInclude Include="..\..\beast\Net.h" />
+    <ClInclude Include="..\..\beast\net\BufferType.h" />
+    <ClInclude Include="..\..\beast\net\DynamicBuffer.h" />
+    <ClInclude Include="..\..\beast\net\IPEndpoint.h" />
+    <ClInclude Include="..\..\beast\SafeBool.h" />
+    <ClInclude Include="..\..\beast\SmartPtr.h" />
+    <ClInclude Include="..\..\beast\smart_ptr\ContainerDeletePolicy.h" />
+    <ClInclude Include="..\..\beast\smart_ptr\ScopedPointer.h" />
+    <ClInclude Include="..\..\beast\smart_ptr\SharedObject.h" />
+    <ClInclude Include="..\..\beast\smart_ptr\SharedPtr.h" />
+    <ClInclude Include="..\..\beast\StaticAssert.h" />
+    <ClInclude Include="..\..\beast\Strings.h" />
+    <ClInclude Include="..\..\beast\strings\CharacterFunctions.h" />
+    <ClInclude Include="..\..\beast\strings\CharPointer_ASCII.h" />
+    <ClInclude Include="..\..\beast\strings\CharPointer_UTF16.h" />
+    <ClInclude Include="..\..\beast\strings\CharPointer_UTF32.h" />
+    <ClInclude Include="..\..\beast\strings\CharPointer_UTF8.h" />
+    <ClInclude Include="..\..\beast\strings\NewLine.h" />
+    <ClInclude Include="..\..\beast\strings\String.h" />
+    <ClInclude Include="..\..\beast\strings\StringCharPointerType.h" />
+    <ClInclude Include="..\..\beast\strings\StringFromNumber.h" />
+    <ClInclude Include="..\..\beast\Threads.h" />
+    <ClInclude Include="..\..\beast\Chrono.h" />
+    <ClInclude Include="..\..\beast\threads\detail\BindHandler.h" />
+    <ClInclude Include="..\..\beast\threads\detail\DispatchedHandler.h" />
+    <ClInclude Include="..\..\beast\threads\LockGuard.h" />
+    <ClInclude Include="..\..\beast\threads\RecursiveMutex.h" />
+    <ClInclude Include="..\..\beast\threads\ServiceQueue.h" />
+    <ClInclude Include="..\..\beast\threads\SharedData.h" />
+    <ClInclude Include="..\..\beast\threads\SharedLockGuard.h" />
+    <ClInclude Include="..\..\beast\threads\SharedMutexAdapter.h" />
+    <ClInclude Include="..\..\beast\threads\SpinLock.h" />
+    <ClInclude Include="..\..\beast\threads\Stoppable.h" />
+    <ClInclude Include="..\..\beast\threads\Thread.h" />
+    <ClInclude Include="..\..\beast\threads\ThreadLocalValue.h" />
+    <ClInclude Include="..\..\beast\threads\TryLockGuard.h" />
+    <ClInclude Include="..\..\beast\threads\UnlockGuard.h" />
+    <ClInclude Include="..\..\beast\threads\WaitableEvent.h" />
+    <ClInclude Include="..\..\beast\threads\ScopedWrapperContext.h" />
+    <ClInclude Include="..\..\beast\TypeTraits.h" />
+    <ClInclude Include="..\..\beast\type_traits\IntegralConstant.h" />
+    <ClInclude Include="..\..\beast\type_traits\IsIntegral.h" />
+    <ClInclude Include="..\..\beast\type_traits\IsSigned.h" />
+    <ClInclude Include="..\..\beast\type_traits\RemoveSigned.h" />
+    <ClInclude Include="..\..\beast\Uncopyable.h" />
+    <ClInclude Include="..\..\beast\Utility.h" />
+    <ClInclude Include="..\..\beast\utility\BaseFromMember.h" />
+    <ClInclude Include="..\..\beast\utility\Debug.h" />
+    <ClInclude Include="..\..\beast\utility\EnableIf.h" />
+    <ClInclude Include="..\..\beast\utility\Error.h" />
+    <ClInclude Include="..\..\beast\utility\Journal.h" />
+    <ClInclude Include="..\..\beast\utility\LeakChecked.h" />
+    <ClInclude Include="..\..\beast\utility\PropertyStream.h" />
+    <ClInclude Include="..\..\beast\utility\StaticObject.h" />
+    <ClInclude Include="..\..\beast\Version.h" />
+    <ClInclude Include="..\..\config\BeastConfig.h" />
+    <ClInclude Include="..\..\modules\beast_asio\async\AbstractHandler.h" />
+    <ClInclude Include="..\..\modules\beast_asio\async\AsyncObject.h" />
     <ClInclude Include="..\..\modules\beast_asio\async\ComposedAsyncOperation.h" />
+    <ClInclude Include="..\..\modules\beast_asio\async\WrapHandler.h" />
     <ClInclude Include="..\..\modules\beast_asio\async\SharedHandler.h" />
     <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerAllocator.h" />
     <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerPtr.h" />
     <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerType.h" />
-    <ClInclude Include="..\..\modules\beast_asio\basics\BufferType.h" />
-    <ClInclude Include="..\..\modules\beast_asio\basics\ContentBodyBuffer.h" />
     <ClInclude Include="..\..\modules\beast_asio\basics\BuffersType.h" />
     <ClInclude Include="..\..\modules\beast_asio\basics\FixedInputBuffer.h" />
     <ClInclude Include="..\..\modules\beast_asio\basics\PeerRole.h" />
+    <ClInclude Include="..\..\modules\beast_asio\basics\SharedArg.h" />
     <ClInclude Include="..\..\modules\beast_asio\basics\SSLContext.h" />
     <ClInclude Include="..\..\modules\beast_asio\beast_asio.h" />
     <ClInclude Include="..\..\modules\beast_asio\http\HTTPClientType.h" />
@@ -97,10 +210,11 @@
     <ClInclude Include="..\..\modules\beast_asio\http\HTTPMessage.h" />
     <ClInclude Include="..\..\modules\beast_asio\http\HTTPParserImpl.h" />
     <ClInclude Include="..\..\modules\beast_asio\http\HTTPParser.h" />
+    <ClInclude Include="..\..\modules\beast_asio\http\HTTPRequest.h" />
+    <ClInclude Include="..\..\modules\beast_asio\http\HTTPRequestParser.h" />
     <ClInclude Include="..\..\modules\beast_asio\http\HTTPResponse.h" />
+    <ClInclude Include="..\..\modules\beast_asio\http\HTTPResponseParser.h" />
     <ClInclude Include="..\..\modules\beast_asio\http\HTTPVersion.h" />
-    <ClInclude Include="..\..\modules\beast_asio\http\UniformResourceLocator.h" />
-    <ClInclude Include="..\..\modules\beast_asio\parsehttp\http_parser.h" />
     <ClInclude Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogic.h" />
     <ClInclude Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogicPROXY.h" />
     <ClInclude Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogicSSL2.h" />
@@ -127,174 +241,108 @@
     <ClInclude Include="..\..\modules\beast_asio\tests\PeerTest.h" />
     <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerType.h" />
     <ClInclude Include="..\..\modules\beast_core\beast_core.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_AbstractFifo.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_Array.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_ArrayAllocationBase.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_DynamicObject.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_ElementComparator.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\detail\copyconst.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\detail\removecv.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\DynamicArray.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\HashMap.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_LinkedListPointer.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\List.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_LockFreeQueue.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_LockFreeStack.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_NamedValueSet.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_OwnedArray.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_PropertySet.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_SharedObjectArray.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_ScopedValueSetter.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_SharedTable.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_SortedLookupTable.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_SortedSet.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_SparseSet.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\DynamicList.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_Variant.h" />
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Debug.h" />
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Error.h" />
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_FatalError.h" />
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_ProtectedCall.h" />
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_FPUFlags.h" />
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_LeakChecked.h" />
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_SafeBool.h" />
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_SemanticVersion.h" />
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Throw.h" />
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_UnitTest.h" />
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_UnitTestUtilities.h" />
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\ContractChecks.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\AbstractFifo.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\Array.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\ArrayAllocationBase.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\DynamicObject.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\ElementComparator.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\LinkedListPointer.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\LockFreeQueue.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\NamedValueSet.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\OwnedArray.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\PropertySet.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\SharedObjectArray.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\ScopedValueSetter.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\SortedSet.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\SparseSet.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\Variant.h" />
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\FatalError.h" />
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\FPUFlags.h" />
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\SemanticVersion.h" />
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\Throw.h" />
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\UnitTest.h" />
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\UnitTestUtilities.h" />
     <ClInclude Include="..\..\modules\beast_core\diagnostic\MeasureFunctionCallTime.h" />
-    <ClInclude Include="..\..\modules\beast_core\files\beast_DirectoryIterator.h" />
-    <ClInclude Include="..\..\modules\beast_core\files\beast_File.h" />
-    <ClInclude Include="..\..\modules\beast_core\files\beast_FileInputStream.h" />
-    <ClInclude Include="..\..\modules\beast_core\files\beast_FileOutputStream.h" />
-    <ClInclude Include="..\..\modules\beast_core\files\beast_FileSearchPath.h" />
-    <ClInclude Include="..\..\modules\beast_core\files\beast_MemoryMappedFile.h" />
-    <ClInclude Include="..\..\modules\beast_core\files\beast_RandomAccessFile.h" />
-    <ClInclude Include="..\..\modules\beast_core\files\beast_TemporaryFile.h" />
-    <ClInclude Include="..\..\modules\beast_core\functional\beast_Function.h" />
-    <ClInclude Include="..\..\modules\beast_core\functional\SharedFunction.h" />
-    <ClInclude Include="..\..\modules\beast_core\json\beast_JSON.h" />
-    <ClInclude Include="..\..\modules\beast_core\logging\beast_FileLogger.h" />
-    <ClInclude Include="..\..\modules\beast_core\logging\beast_Logger.h" />
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_BigInteger.h" />
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_Expression.h" />
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_Interval.h" />
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_Math.h" />
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_MathsFunctions.h" />
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_MurmurHash.h" />
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_Random.h" />
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_Range.h" />
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_uint24.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_AllocatedBy.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_Atomic.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicCounter.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicFlag.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicPointer.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicState.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_ByteOrder.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_ByteSwap.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_CacheLine.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_ContainerDeletePolicy.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_FifoFreeStore.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_FifoFreeStoreWithoutTLS.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_FifoFreeStoreWithTLS.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_GlobalFifoFreeStore.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_GlobalPagedFreeStore.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_HeapBlock.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_Memory.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_MemoryAlignment.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_MemoryBlock.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_OptionalScopedPointer.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_PagedFreeStore.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_RecycledObjectPool.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\SharedObject.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_ScopedPointer.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_SharedSingleton.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_StaticObject.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_Uncopyable.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_WeakReference.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\SharedPtr.h" />
-    <ClInclude Include="..\..\modules\beast_core\misc\beast_Main.h" />
-    <ClInclude Include="..\..\modules\beast_core\misc\beast_Result.h" />
-    <ClInclude Include="..\..\modules\beast_core\misc\beast_Uuid.h" />
-    <ClInclude Include="..\..\modules\beast_core\misc\beast_WindowsRegistry.h" />
-    <ClInclude Include="..\..\modules\beast_core\native\beast_android_JNIHelpers.h" />
-    <ClInclude Include="..\..\modules\beast_core\native\beast_BasicNativeHeaders.h" />
-    <ClInclude Include="..\..\modules\beast_core\native\beast_osx_ObjCHelpers.h" />
-    <ClInclude Include="..\..\modules\beast_core\native\beast_posix_SharedCode.h" />
-    <ClInclude Include="..\..\modules\beast_core\native\beast_win32_ComSmartPtr.h" />
-    <ClInclude Include="..\..\modules\beast_core\network\beast_IPAddress.h" />
-    <ClInclude Include="..\..\modules\beast_core\network\beast_MACAddress.h" />
-    <ClInclude Include="..\..\modules\beast_core\network\beast_NamedPipe.h" />
-    <ClInclude Include="..\..\modules\beast_core\network\beast_Socket.h" />
-    <ClInclude Include="..\..\modules\beast_core\network\beast_URL.h" />
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_BufferedInputStream.h" />
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_FileInputSource.h" />
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_InputSource.h" />
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_InputStream.h" />
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_MemoryInputStream.h" />
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_MemoryOutputStream.h" />
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_OutputStream.h" />
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_SubregionStream.h" />
-    <ClInclude Include="..\..\modules\beast_core\system\BeastConfigCheck.h" />
+    <ClInclude Include="..\..\modules\beast_core\files\DirectoryIterator.h" />
+    <ClInclude Include="..\..\modules\beast_core\files\File.h" />
+    <ClInclude Include="..\..\modules\beast_core\files\FileInputStream.h" />
+    <ClInclude Include="..\..\modules\beast_core\files\FileOutputStream.h" />
+    <ClInclude Include="..\..\modules\beast_core\files\FileSearchPath.h" />
+    <ClInclude Include="..\..\modules\beast_core\files\MemoryMappedFile.h" />
+    <ClInclude Include="..\..\modules\beast_core\files\RandomAccessFile.h" />
+    <ClInclude Include="..\..\modules\beast_core\files\TemporaryFile.h" />
+    <ClInclude Include="..\..\modules\beast_core\json\JSON.h" />
+    <ClInclude Include="..\..\modules\beast_core\logging\FileLogger.h" />
+    <ClInclude Include="..\..\modules\beast_core\logging\Logger.h" />
+    <ClInclude Include="..\..\modules\beast_core\maths\BigInteger.h" />
+    <ClInclude Include="..\..\modules\beast_core\maths\Expression.h" />
+    <ClInclude Include="..\..\modules\beast_core\maths\Interval.h" />
+    <ClInclude Include="..\..\modules\beast_core\maths\Math.h" />
+    <ClInclude Include="..\..\modules\beast_core\maths\MurmurHash.h" />
+    <ClInclude Include="..\..\modules\beast_core\maths\Random.h" />
+    <ClInclude Include="..\..\modules\beast_core\maths\Range.h" />
+    <ClInclude Include="..\..\modules\beast_core\maths\uint24.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\AtomicCounter.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\AtomicFlag.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\AtomicPointer.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\AtomicState.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\CacheLine.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\MemoryAlignment.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\MemoryBlock.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\OptionalScopedPointer.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\RecycledObjectPool.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\SharedFunction.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\SharedSingleton.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\WeakReference.h" />
+    <ClInclude Include="..\..\modules\beast_core\misc\Main.h" />
+    <ClInclude Include="..\..\modules\beast_core\misc\Result.h" />
+    <ClInclude Include="..\..\modules\beast_core\misc\Uuid.h" />
+    <ClInclude Include="..\..\modules\beast_core\misc\WindowsRegistry.h" />
+    <ClInclude Include="..\..\modules\beast_core\native\android_JNIHelpers.h" />
+    <ClInclude Include="..\..\modules\beast_core\native\BasicNativeHeaders.h" />
+    <ClInclude Include="..\..\modules\beast_core\native\osx_ObjCHelpers.h" />
+    <ClInclude Include="..\..\modules\beast_core\native\posix_SharedCode.h" />
+    <ClInclude Include="..\..\modules\beast_core\native\win32_ComSmartPtr.h" />
+    <ClInclude Include="..\..\modules\beast_core\network\IPAddress.h" />
+    <ClInclude Include="..\..\modules\beast_core\network\MACAddress.h" />
+    <ClInclude Include="..\..\modules\beast_core\network\NamedPipe.h" />
+    <ClInclude Include="..\..\modules\beast_core\network\Socket.h" />
+    <ClInclude Include="..\..\modules\beast_core\streams\BufferedInputStream.h" />
+    <ClInclude Include="..\..\modules\beast_core\streams\FileInputSource.h" />
+    <ClInclude Include="..\..\modules\beast_core\streams\InputSource.h" />
+    <ClInclude Include="..\..\modules\beast_core\streams\InputStream.h" />
+    <ClInclude Include="..\..\modules\beast_core\streams\MemoryInputStream.h" />
+    <ClInclude Include="..\..\modules\beast_core\streams\MemoryOutputStream.h" />
+    <ClInclude Include="..\..\modules\beast_core\streams\OutputStream.h" />
+    <ClInclude Include="..\..\modules\beast_core\streams\SubregionStream.h" />
     <ClInclude Include="..\..\modules\beast_core\system\Functional.h" />
-    <ClInclude Include="..\..\modules\beast_core\system\PlatformDefs.h" />
-    <ClInclude Include="..\..\modules\beast_core\system\StandardHeader.h" />
+    <ClInclude Include="..\..\modules\beast_core\system\StandardIncludes.h" />
     <ClInclude Include="..\..\modules\beast_core\system\SystemStats.h" />
-    <ClInclude Include="..\..\modules\beast_core\system\TargetPlatform.h" />
     <ClInclude Include="..\..\modules\beast_core\system\BeforeBoost.h" />
     <ClInclude Include="..\..\modules\beast_core\system\BoostIncludes.h" />
     <ClInclude Include="..\..\modules\beast_core\system\BoostPlaceholdersFix.h" />
     <ClInclude Include="..\..\modules\beast_core\system\FunctionalIncludes.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\beast_CharacterFunctions.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\beast_CharPointer_ASCII.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\beast_CharPointer_UTF16.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\beast_CharPointer_UTF32.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\beast_CharPointer_UTF8.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\beast_Identifier.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\beast_LexicalCast.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\beast_LocalisedStrings.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\beast_NewLine.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\beast_String.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\beast_StringArray.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\beast_StringPairArray.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\beast_StringPool.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\beast_TextDiff.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\StringCharPointerType.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\StringFromNumber.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ChildProcess.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_CriticalSection.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_DynamicLibrary.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_HighResolutionTimer.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_InterProcessLock.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_Process.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ReadWriteLock.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ReadWriteMutex.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ScopedLock.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ScopedReadLock.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ScopedWriteLock.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_SharedData.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_SpinDelay.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_SpinLock.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_Thread.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ThreadLocalValue.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ThreadPool.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_TimeSliceThread.h" />
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_WaitableEvent.h" />
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_CallQueue.h" />
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_ConcurrentObject.h" />
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_DeadlineTimer.h" />
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_GlobalThreadGroup.h" />
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_InterruptibleThread.h" />
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_Listeners.h" />
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_ManualCallQueue.h" />
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_ParallelFor.h" />
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_Semaphore.h" />
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_SerialFor.h" />
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_ThreadGroup.h" />
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_ThreadWithCallQueue.h" />
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_Workers.h" />
+    <ClInclude Include="..\..\modules\beast_core\text\Identifier.h" />
+    <ClInclude Include="..\..\modules\beast_core\text\LexicalCast.h" />
+    <ClInclude Include="..\..\modules\beast_core\text\LocalisedStrings.h" />
+    <ClInclude Include="..\..\modules\beast_core\text\StringArray.h" />
+    <ClInclude Include="..\..\modules\beast_core\text\StringPairArray.h" />
+    <ClInclude Include="..\..\modules\beast_core\text\StringPool.h" />
+    <ClInclude Include="..\..\modules\beast_core\text\TextDiff.h" />
+    <ClInclude Include="..\..\modules\beast_core\threads\ChildProcess.h" />
+    <ClInclude Include="..\..\modules\beast_core\threads\CriticalSection.h" />
+    <ClInclude Include="..\..\modules\beast_core\threads\DynamicLibrary.h" />
+    <ClInclude Include="..\..\modules\beast_core\threads\HighResolutionTimer.h" />
+    <ClInclude Include="..\..\modules\beast_core\threads\InterProcessLock.h" />
+    <ClInclude Include="..\..\modules\beast_core\threads\Process.h" />
+    <ClInclude Include="..\..\modules\beast_core\threads\ReadWriteLock.h" />
+    <ClInclude Include="..\..\modules\beast_core\threads\ScopedLock.h" />
+    <ClInclude Include="..\..\modules\beast_core\threads\ScopedReadLock.h" />
+    <ClInclude Include="..\..\modules\beast_core\threads\ScopedWriteLock.h" />
+    <ClInclude Include="..\..\modules\beast_core\threads\SpinDelay.h" />
+    <ClInclude Include="..\..\modules\beast_core\thread\DeadlineTimer.h" />
+    <ClInclude Include="..\..\modules\beast_core\thread\Semaphore.h" />
+    <ClInclude Include="..\..\modules\beast_core\thread\Workers.h" />
     <ClInclude Include="..\..\modules\beast_core\thread\detail\ScopedLock.h" />
     <ClInclude Include="..\..\modules\beast_core\thread\detail\TrackedMutex.h" />
     <ClInclude Include="..\..\modules\beast_core\thread\impl\TrackedMutex.h" />
@@ -302,15 +350,14 @@
     <ClInclude Include="..\..\modules\beast_core\thread\impl\UntrackedMutexType.h" />
     <ClInclude Include="..\..\modules\beast_core\thread\MutexTraits.h" />
     <ClInclude Include="..\..\modules\beast_core\thread\TrackedMutex.h" />
-    <ClInclude Include="..\..\modules\beast_core\time\beast_PerformanceCounter.h" />
-    <ClInclude Include="..\..\modules\beast_core\time\beast_PerformedAtExit.h" />
-    <ClInclude Include="..\..\modules\beast_core\time\beast_RelativeTime.h" />
-    <ClInclude Include="..\..\modules\beast_core\time\beast_Time.h" />
-    <ClInclude Include="..\..\modules\beast_core\xml\beast_XmlDocument.h" />
-    <ClInclude Include="..\..\modules\beast_core\xml\beast_XmlElement.h" />
-    <ClInclude Include="..\..\modules\beast_core\zip\beast_GZIPCompressorOutputStream.h" />
-    <ClInclude Include="..\..\modules\beast_core\zip\beast_GZIPDecompressorInputStream.h" />
-    <ClInclude Include="..\..\modules\beast_core\zip\beast_ZipFile.h" />
+    <ClInclude Include="..\..\modules\beast_core\time\PerformanceCounter.h" />
+    <ClInclude Include="..\..\modules\beast_core\time\AtExitHook.h" />
+    <ClInclude Include="..\..\modules\beast_core\time\Time.h" />
+    <ClInclude Include="..\..\modules\beast_core\xml\XmlDocument.h" />
+    <ClInclude Include="..\..\modules\beast_core\xml\XmlElement.h" />
+    <ClInclude Include="..\..\modules\beast_core\zip\GZIPCompressorOutputStream.h" />
+    <ClInclude Include="..\..\modules\beast_core\zip\GZIPDecompressorInputStream.h" />
+    <ClInclude Include="..\..\modules\beast_core\zip\ZipFile.h" />
     <ClInclude Include="..\..\modules\beast_core\zip\zlib\crc32.h" />
     <ClInclude Include="..\..\modules\beast_core\zip\zlib\deflate.h" />
     <ClInclude Include="..\..\modules\beast_core\zip\zlib\inffast.h" />
@@ -323,11 +370,13 @@
     <ClInclude Include="..\..\modules\beast_core\zip\zlib\zlib.h" />
     <ClInclude Include="..\..\modules\beast_core\zip\zlib\zutil.h" />
     <ClInclude Include="..\..\modules\beast_crypto\beast_crypto.h" />
-    <ClInclude Include="..\..\modules\beast_crypto\math\beast_UnsignedInteger.h" />
+    <ClInclude Include="..\..\modules\beast_crypto\math\BinaryEncoding.h" />
+    <ClInclude Include="..\..\modules\beast_crypto\math\UnsignedInteger.h" />
+    <ClInclude Include="..\..\modules\beast_crypto\math\UnsignedIntegerCalc.h" />
     <ClInclude Include="..\..\modules\beast_db\beast_db.h" />
-    <ClInclude Include="..\..\modules\beast_db\keyvalue\beast_KeyvaDB.h" />
+    <ClInclude Include="..\..\modules\beast_db\keyvalue\KeyvaDB.h" />
     <ClInclude Include="..\..\modules\beast_extras\beast_extras.h" />
-    <ClInclude Include="..\..\modules\beast_extras\traits\beast_BoostLockableTraits.h" />
+    <ClInclude Include="..\..\modules\beast_extras\traits\BoostLockableTraits.h" />
     <ClInclude Include="..\..\modules\beast_sqdb\api\backend.h" />
     <ClInclude Include="..\..\modules\beast_sqdb\api\blob.h" />
     <ClInclude Include="..\..\modules\beast_sqdb\api\into.h" />
@@ -351,16 +400,192 @@
     <ClInclude Include="..\..\modules\beast_sqlite\beast_sqlite.h" />
     <ClInclude Include="..\..\modules\beast_sqlite\sqlite\sqlite3.h" />
     <ClInclude Include="..\..\modules\beast_sqlite\sqlite\sqlite3ext.h" />
-    <ClInclude Include="BeastConfig.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\modules\beast_asio\async\SharedHandler.cpp">
+    <ClCompile Include="..\..\beast\boost\Boost.cpp" />
+    <ClCompile Include="..\..\beast\chrono\Chrono.cpp" />
+    <ClCompile Include="..\..\beast\chrono\impl\CPUMeter.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\basics\ContentBodyBuffer.cpp">
+    <ClCompile Include="..\..\beast\chrono\impl\RelativeTime.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\crypto\Crypto.cpp" />
+    <ClCompile Include="..\..\beast\crypto\impl\Sha256.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\crypto\impl\sha2\sha2.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\crypto\impl\sha2\sha2prog.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\crypto\impl\sha2\sha2speed.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\HTTP.cpp" />
+    <ClCompile Include="..\..\beast\http\impl\http_parser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\impl\http-parser\contrib\parsertrace.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\impl\http-parser\contrib\url_parser.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\impl\http-parser\http_parser.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\impl\http-parser\test.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\impl\ParsedURL.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\impl\URL.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\net\impl\DynamicBuffer.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\net\impl\IPEndpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\net\Net.cpp" />
+    <ClCompile Include="..\..\beast\smart_ptr\SmartPtr.cpp" />
+    <ClCompile Include="..\..\beast\strings\impl\CharacterFunctions.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\strings\impl\String.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\strings\Strings.cpp" />
+    <ClCompile Include="..\..\beast\threads\impl\Atomic.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\threads\impl\RecursiveMutex.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\threads\impl\ServiceQueue.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\threads\impl\Stoppable.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\threads\impl\Thread.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\threads\impl\WaitableEvent.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\threads\Threads.cpp" />
+    <ClCompile Include="..\..\beast\utility\impl\Debug.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\impl\Error.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\impl\Journal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\impl\LeakChecked.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\impl\PropertyStream.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\impl\StaticObject.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\Utility.cpp" />
+    <ClCompile Include="..\..\modules\beast_asio\async\SharedHandler.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -407,30 +632,36 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\http\HTTPRequest.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\http\HTTPRequestParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\modules\beast_asio\http\HTTPResponse.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\http\HTTPResponseParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\modules\beast_asio\http\HTTPVersion.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\http\UniformResourceLocator.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\parsehttp\http_parser.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogicPROXY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -510,431 +741,359 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\modules\beast_core\beast_core.cpp" />
-    <ClCompile Include="..\..\modules\beast_core\containers\beast_AbstractFifo.cpp">
+    <ClCompile Include="..\..\modules\beast_core\containers\AbstractFifo.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\beast_DynamicObject.cpp">
+    <ClCompile Include="..\..\modules\beast_core\containers\DynamicObject.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\beast_NamedValueSet.cpp">
+    <ClCompile Include="..\..\modules\beast_core\containers\NamedValueSet.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\beast_PropertySet.cpp">
+    <ClCompile Include="..\..\modules\beast_core\containers\PropertySet.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\beast_Variant.cpp">
+    <ClCompile Include="..\..\modules\beast_core\containers\Variant.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\DynamicArray.cpp">
+    <ClCompile Include="..\..\modules\beast_core\diagnostic\FatalError.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\DynamicList.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\HashMap.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_Debug.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_Error.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_FatalError.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_ProtectedCall.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_FPUFlags.cpp">
+    <ClCompile Include="..\..\modules\beast_core\diagnostic\FPUFlags.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_LeakChecked.cpp">
+    <ClCompile Include="..\..\modules\beast_core\diagnostic\SemanticVersion.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_SemanticVersion.cpp">
+    <ClCompile Include="..\..\modules\beast_core\diagnostic\UnitTest.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_UnitTest.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_UnitTestUtilities.cpp">
+    <ClCompile Include="..\..\modules\beast_core\diagnostic\UnitTestUtilities.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\files\beast_DirectoryIterator.cpp">
+    <ClCompile Include="..\..\modules\beast_core\files\DirectoryIterator.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\files\beast_File.cpp">
+    <ClCompile Include="..\..\modules\beast_core\files\File.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\files\beast_FileInputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\files\FileInputStream.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\files\beast_FileOutputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\files\FileOutputStream.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\files\beast_FileSearchPath.cpp">
+    <ClCompile Include="..\..\modules\beast_core\files\FileSearchPath.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\files\beast_RandomAccessFile.cpp">
+    <ClCompile Include="..\..\modules\beast_core\files\RandomAccessFile.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\files\beast_TemporaryFile.cpp">
+    <ClCompile Include="..\..\modules\beast_core\files\TemporaryFile.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\json\beast_JSON.cpp">
+    <ClCompile Include="..\..\modules\beast_core\json\JSON.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\logging\beast_FileLogger.cpp">
+    <ClCompile Include="..\..\modules\beast_core\logging\FileLogger.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\logging\beast_Logger.cpp">
+    <ClCompile Include="..\..\modules\beast_core\logging\Logger.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\maths\beast_BigInteger.cpp">
+    <ClCompile Include="..\..\modules\beast_core\maths\BigInteger.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\maths\beast_Expression.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\maths\beast_MurmurHash.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\maths\beast_Random.cpp">
+    <ClCompile Include="..\..\modules\beast_core\maths\Expression.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\memory\beast_FifoFreeStoreWithoutTLS.cpp">
+    <ClCompile Include="..\..\modules\beast_core\maths\MurmurHash.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\memory\beast_FifoFreeStoreWithTLS.cpp">
+    <ClCompile Include="..\..\modules\beast_core\maths\Random.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\memory\beast_GlobalPagedFreeStore.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\memory\beast_MemoryBlock.cpp">
+    <ClCompile Include="..\..\modules\beast_core\memory\MemoryBlock.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\memory\beast_PagedFreeStore.cpp">
+    <ClCompile Include="..\..\modules\beast_core\misc\Main.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\misc\beast_Main.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\misc\beast_Result.cpp">
+    <ClCompile Include="..\..\modules\beast_core\misc\Result.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\misc\beast_Uuid.cpp">
+    <ClCompile Include="..\..\modules\beast_core\misc\Uuid.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_android_Files.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\android_Files.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_android_Misc.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\android_Misc.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_android_Network.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\android_Network.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_android_SystemStats.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\android_SystemStats.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_android_Threads.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\android_Threads.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_bsd_Files.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\bsd_Files.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_bsd_Network.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\bsd_Network.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_bsd_SystemStats.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\bsd_SystemStats.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_bsd_Threads.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\bsd_Threads.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_linux_Files.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\linux_Files.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_linux_Network.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\linux_Network.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_linux_SystemStats.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\linux_SystemStats.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_linux_Threads.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\linux_Threads.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_posix_FPUFlags.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\posix_FPUFlags.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_posix_NamedPipe.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\posix_NamedPipe.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_win32_Files.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\win32_Files.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_win32_FPUFlags.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\win32_FPUFlags.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_win32_Network.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_win32_Registry.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\win32_Network.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_win32_SystemStats.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\win32_Registry.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_win32_Threads.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\win32_SystemStats.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\network\beast_IPAddress.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\win32_Threads.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\network\beast_MACAddress.cpp">
+    <ClCompile Include="..\..\modules\beast_core\network\IPAddress.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\network\beast_NamedPipe.cpp">
+    <ClCompile Include="..\..\modules\beast_core\network\MACAddress.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\network\beast_Socket.cpp">
+    <ClCompile Include="..\..\modules\beast_core\network\NamedPipe.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\network\beast_URL.cpp">
+    <ClCompile Include="..\..\modules\beast_core\network\Socket.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\streams\beast_BufferedInputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\streams\BufferedInputStream.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\streams\beast_FileInputSource.cpp">
+    <ClCompile Include="..\..\modules\beast_core\streams\FileInputSource.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\streams\beast_InputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\streams\InputStream.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\streams\beast_MemoryInputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\streams\MemoryInputStream.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\streams\beast_MemoryOutputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\streams\MemoryOutputStream.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\streams\beast_OutputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\streams\OutputStream.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\streams\beast_SubregionStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\streams\SubregionStream.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -952,169 +1111,85 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_CharacterFunctions.cpp">
+    <ClCompile Include="..\..\modules\beast_core\text\Identifier.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_Identifier.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_LexicalCast.cpp">
+    <ClCompile Include="..\..\modules\beast_core\text\LexicalCast.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_LocalisedStrings.cpp">
+    <ClCompile Include="..\..\modules\beast_core\text\LocalisedStrings.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_String.cpp">
+    <ClCompile Include="..\..\modules\beast_core\text\StringArray.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_StringArray.cpp">
+    <ClCompile Include="..\..\modules\beast_core\text\StringPairArray.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_StringPairArray.cpp">
+    <ClCompile Include="..\..\modules\beast_core\text\StringPool.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_StringPool.cpp">
+    <ClCompile Include="..\..\modules\beast_core\text\TextDiff.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_TextDiff.cpp">
+    <ClCompile Include="..\..\modules\beast_core\threads\ChildProcess.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_ChildProcess.cpp">
+    <ClCompile Include="..\..\modules\beast_core\threads\HighResolutionTimer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_HighResolutionTimer.cpp">
+    <ClCompile Include="..\..\modules\beast_core\threads\ReadWriteLock.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_ReadWriteLock.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_ReadWriteMutex.cpp">
+    <ClCompile Include="..\..\modules\beast_core\threads\SpinDelay.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_SpinDelay.cpp">
+    <ClCompile Include="..\..\modules\beast_core\thread\DeadlineTimer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_Thread.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_ThreadPool.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_TimeSliceThread.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_CallQueue.cpp">
+    <ClCompile Include="..\..\modules\beast_core\thread\Semaphore.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_ConcurrentObject.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_DeadlineTimer.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_InterruptibleThread.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_Listeners.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_ManualCallQueue.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_ParallelFor.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_Semaphore.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_ThreadGroup.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_ThreadWithCallQueue.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_Workers.cpp">
+    <ClCompile Include="..\..\modules\beast_core\thread\Workers.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -1126,55 +1201,49 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\time\beast_PerformanceCounter.cpp">
+    <ClCompile Include="..\..\modules\beast_core\time\PerformanceCounter.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\time\beast_PerformedAtExit.cpp">
+    <ClCompile Include="..\..\modules\beast_core\time\AtExitHook.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\time\beast_RelativeTime.cpp">
+    <ClCompile Include="..\..\modules\beast_core\time\Time.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\time\beast_Time.cpp">
+    <ClCompile Include="..\..\modules\beast_core\xml\XmlDocument.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\xml\beast_XmlDocument.cpp">
+    <ClCompile Include="..\..\modules\beast_core\xml\XmlElement.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\xml\beast_XmlElement.cpp">
+    <ClCompile Include="..\..\modules\beast_core\zip\GZIPCompressorOutputStream.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\zip\beast_GZIPCompressorOutputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\zip\GZIPDecompressorInputStream.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\zip\beast_GZIPDecompressorInputStream.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\zip\beast_ZipFile.cpp">
+    <ClCompile Include="..\..\modules\beast_core\zip\ZipFile.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1247,14 +1316,20 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\modules\beast_crypto\beast_crypto.cpp" />
-    <ClCompile Include="..\..\modules\beast_crypto\math\beast_UnsignedInteger.cpp">
+    <ClCompile Include="..\..\modules\beast_crypto\math\BinaryEncoding.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_crypto\math\UnsignedInteger.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\modules\beast_db\beast_db.cpp" />
-    <ClCompile Include="..\..\modules\beast_db\keyvalue\beast_KeyvaDB.cpp">
+    <ClCompile Include="..\..\modules\beast_db\keyvalue\KeyvaDB.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
diff --git a/Builds/VisualStudio2012/beast.vcxproj.filters b/Builds/VisualStudio2012/beast.vcxproj.filters
index a10f8600c3..077df7635a 100644
--- a/Builds/VisualStudio2012/beast.vcxproj.filters
+++ b/Builds/VisualStudio2012/beast.vcxproj.filters
@@ -1,24 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <None Include="..\..\README.md" />
-    <None Include="..\..\CodingStyle.md" />
-    <None Include="..\..\modules\beast_core\beast_core.mm">
-      <Filter>beast_core</Filter>
-    </None>
-    <None Include="..\..\modules\beast_core\native\beast_mac_Files.mm">
+    <None Include="..\..\modules\beast_core\native\mac_Files.mm">
       <Filter>beast_core\native</Filter>
     </None>
-    <None Include="..\..\modules\beast_core\native\beast_mac_Network.mm">
+    <None Include="..\..\modules\beast_core\native\mac_Network.mm">
       <Filter>beast_core\native</Filter>
     </None>
-    <None Include="..\..\modules\beast_core\native\beast_mac_Strings.mm">
+    <None Include="..\..\modules\beast_core\native\mac_Strings.mm">
       <Filter>beast_core\native</Filter>
     </None>
-    <None Include="..\..\modules\beast_core\native\beast_mac_SystemStats.mm">
+    <None Include="..\..\modules\beast_core\native\mac_SystemStats.mm">
       <Filter>beast_core\native</Filter>
     </None>
-    <None Include="..\..\modules\beast_core\native\beast_mac_Threads.mm">
+    <None Include="..\..\modules\beast_core\native\mac_Threads.mm">
       <Filter>beast_core\native</Filter>
     </None>
     <None Include="..\..\modules\beast_core\zip\zlib\README">
@@ -27,9 +22,60 @@
     <None Include="..\..\modules\beast_core\native\java\BeastAppActivity.java">
       <Filter>beast_core\native\java</Filter>
     </None>
-    <None Include="..\..\Doxyfile" />
-    <None Include="..\..\.gitattributes" />
-    <None Include="..\..\.gitignore" />
+    <None Include="..\..\.gitattributes">
+      <Filter>_meta</Filter>
+    </None>
+    <None Include="..\..\.gitignore">
+      <Filter>_meta</Filter>
+    </None>
+    <None Include="..\..\CodingStyle.md">
+      <Filter>_meta</Filter>
+    </None>
+    <None Include="..\..\Doxyfile">
+      <Filter>_meta</Filter>
+    </None>
+    <None Include="..\..\README.md">
+      <Filter>_meta</Filter>
+    </None>
+    <None Include="..\..\beast\http\impl\http-parser\.gitignore">
+      <Filter>beast\http\impl\http-parser</Filter>
+    </None>
+    <None Include="..\..\beast\http\impl\http-parser\.mailmap">
+      <Filter>beast\http\impl\http-parser</Filter>
+    </None>
+    <None Include="..\..\beast\http\impl\http-parser\.travis.yml">
+      <Filter>beast\http\impl\http-parser</Filter>
+    </None>
+    <None Include="..\..\beast\http\impl\http-parser\AUTHORS">
+      <Filter>beast\http\impl\http-parser</Filter>
+    </None>
+    <None Include="..\..\beast\http\impl\http-parser\CONTRIBUTIONS">
+      <Filter>beast\http\impl\http-parser</Filter>
+    </None>
+    <None Include="..\..\beast\http\impl\http-parser\http_parser.gyp">
+      <Filter>beast\http\impl\http-parser</Filter>
+    </None>
+    <None Include="..\..\beast\http\impl\http-parser\LICENSE-MIT">
+      <Filter>beast\http\impl\http-parser</Filter>
+    </None>
+    <None Include="..\..\beast\http\impl\http-parser\Makefile">
+      <Filter>beast\http\impl\http-parser</Filter>
+    </None>
+    <None Include="..\..\beast\http\impl\http-parser\README.md">
+      <Filter>beast\http\impl\http-parser</Filter>
+    </None>
+    <None Include="..\..\modules\beast_core\beast_core.mm">
+      <Filter>beast_core</Filter>
+    </None>
+    <None Include="..\..\beast\crypto\impl\sha2\README">
+      <Filter>beast\crypto\impl\sha2</Filter>
+    </None>
+    <None Include="..\..\beast\crypto\impl\sha2\sha2test.pl">
+      <Filter>beast\crypto\impl\sha2</Filter>
+    </None>
+    <None Include="..\..\scripts\compile.sh">
+      <Filter>scripts</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="beast_core">
@@ -149,17 +195,20 @@
     <Filter Include="beast_core\thread\impl">
       <UniqueIdentifier>{91538dcf-b219-4c80-9861-bb4949089775}</UniqueIdentifier>
     </Filter>
-    <Filter Include="beast_core\functional">
-      <UniqueIdentifier>{5df65855-1ccd-4997-97c1-f9788924ee2b}</UniqueIdentifier>
-    </Filter>
     <Filter Include="beast_extras">
       <UniqueIdentifier>{2f5b95a8-1adf-4319-8464-ddc2b2e03f0b}</UniqueIdentifier>
     </Filter>
     <Filter Include="beast_extras\traits">
       <UniqueIdentifier>{bf498396-2e1f-4903-be68-3053ba439af5}</UniqueIdentifier>
     </Filter>
-    <Filter Include="beast_core\containers\detail">
-      <UniqueIdentifier>{08ec13ba-4058-4ad7-afbb-cbb1c6e2fc4a}</UniqueIdentifier>
+    <Filter Include="beast_asio\protocol">
+      <UniqueIdentifier>{c0724499-ab69-40c3-90e2-65242dbd2eaa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast_asio\http">
+      <UniqueIdentifier>{f7252567-a5bb-4be2-bbd0-c9d9b62298de}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="_meta">
+      <UniqueIdentifier>{27052a76-e315-4725-9d9a-1233c7d71aba}</UniqueIdentifier>
     </Filter>
     <Filter Include="beast">
       <UniqueIdentifier>{92d1bb42-289a-4444-85c7-cb87540f2fff}</UniqueIdentifier>
@@ -170,300 +219,306 @@
     <Filter Include="beast\mpl">
       <UniqueIdentifier>{5904368f-a0f2-4d26-a031-8cbe4448dc3f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="beast_asio\parsehttp">
-      <UniqueIdentifier>{ac367054-ddbf-4118-a41a-07bea34d32c8}</UniqueIdentifier>
+    <Filter Include="beast\net">
+      <UniqueIdentifier>{5faa76ea-5691-4e63-8833-577f92991356}</UniqueIdentifier>
     </Filter>
-    <Filter Include="beast_asio\protocol">
-      <UniqueIdentifier>{c0724499-ab69-40c3-90e2-65242dbd2eaa}</UniqueIdentifier>
+    <Filter Include="beast\net\impl">
+      <UniqueIdentifier>{93670bc9-a748-42bd-8118-8de30c468b16}</UniqueIdentifier>
     </Filter>
-    <Filter Include="beast_asio\http">
-      <UniqueIdentifier>{f7252567-a5bb-4be2-bbd0-c9d9b62298de}</UniqueIdentifier>
+    <Filter Include="beast\type_traits">
+      <UniqueIdentifier>{85158eb2-9340-4b3d-a136-f7631c7f1b7c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\utility">
+      <UniqueIdentifier>{56d34c67-7027-44ba-9f09-4591ce4afb36}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\utility\impl">
+      <UniqueIdentifier>{775ab0d6-aa5f-43d7-ab3b-3c01652a9ef1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\http">
+      <UniqueIdentifier>{56ef157f-ad92-4da7-8fbf-00723f769732}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\http\impl">
+      <UniqueIdentifier>{565f012b-42b7-42c9-81b7-9e93aa378000}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\http\impl\http-parser">
+      <UniqueIdentifier>{7eead15d-f9dc-4b4d-a653-57d9c090e697}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\http\impl\http-parser\contrib">
+      <UniqueIdentifier>{233e3c4d-e398-4c11-a42c-3483107eb8e9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\strings">
+      <UniqueIdentifier>{8d80e304-a42d-411a-9528-811eddff3191}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\strings\impl">
+      <UniqueIdentifier>{eabf472c-e198-409a-a65b-7c087ae911d0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\config">
+      <UniqueIdentifier>{1fff3bd8-44ae-41df-8dd4-8bb6f07b2908}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\crypto">
+      <UniqueIdentifier>{9c1ef4c4-5623-4500-859f-12d6ce5ae362}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\crypto\impl">
+      <UniqueIdentifier>{fc3d3f14-9ba1-43e4-b086-cbbd2f63b944}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\crypto\impl\sha2">
+      <UniqueIdentifier>{44489531-f44a-439a-a6ea-d32c252b1e8b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\chrono">
+      <UniqueIdentifier>{57dc7059-cbb2-437c-9c52-79825d9a4cf5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\chrono\impl">
+      <UniqueIdentifier>{39886e0f-1607-4b7a-81cf-011d83dadee3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="scripts">
+      <UniqueIdentifier>{c65af439-8c23-46c3-9b95-7da15651e5f6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\config\compiler">
+      <UniqueIdentifier>{8d88283b-24ec-49ca-a94b-cb6271bc14f9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\config\platform">
+      <UniqueIdentifier>{38c81e1f-f831-4632-af45-6340683f3346}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\config\stdlib">
+      <UniqueIdentifier>{7243e5e5-ad7e-4d81-8444-d545919e850c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\smart_ptr">
+      <UniqueIdentifier>{4e9c54da-1581-41d7-ac75-48140e4a13d4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\threads">
+      <UniqueIdentifier>{f864ff58-1055-4c56-805f-9f181c4f0aa1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\threads\impl">
+      <UniqueIdentifier>{386a8cd8-6be3-4cac-9bca-7a01fdb5327a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\threads\detail">
+      <UniqueIdentifier>{b116764e-1ad5-4854-a549-73c5beb5ae37}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\boost">
+      <UniqueIdentifier>{d7ec873a-d1e7-4341-9d20-a1be8f8ddd88}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\modules\beast_core\beast_core.h">
       <Filter>beast_core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_AbstractFifo.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\AbstractFifo.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_Array.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\Array.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_ArrayAllocationBase.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\ArrayAllocationBase.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_DynamicObject.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\DynamicObject.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_ElementComparator.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\ElementComparator.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_LinkedListPointer.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\LinkedListPointer.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_NamedValueSet.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\NamedValueSet.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_OwnedArray.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\OwnedArray.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_PropertySet.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\PropertySet.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_ScopedValueSetter.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\ScopedValueSetter.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_SortedSet.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\SortedSet.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_SparseSet.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\SparseSet.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_Variant.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\Variant.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\files\beast_DirectoryIterator.h">
+    <ClInclude Include="..\..\modules\beast_core\files\DirectoryIterator.h">
       <Filter>beast_core\files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\files\beast_File.h">
+    <ClInclude Include="..\..\modules\beast_core\files\File.h">
       <Filter>beast_core\files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\files\beast_FileInputStream.h">
+    <ClInclude Include="..\..\modules\beast_core\files\FileInputStream.h">
       <Filter>beast_core\files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\files\beast_FileOutputStream.h">
+    <ClInclude Include="..\..\modules\beast_core\files\FileOutputStream.h">
       <Filter>beast_core\files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\files\beast_FileSearchPath.h">
+    <ClInclude Include="..\..\modules\beast_core\files\FileSearchPath.h">
       <Filter>beast_core\files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\files\beast_MemoryMappedFile.h">
+    <ClInclude Include="..\..\modules\beast_core\files\MemoryMappedFile.h">
       <Filter>beast_core\files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\files\beast_TemporaryFile.h">
+    <ClInclude Include="..\..\modules\beast_core\files\TemporaryFile.h">
       <Filter>beast_core\files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\json\beast_JSON.h">
+    <ClInclude Include="..\..\modules\beast_core\json\JSON.h">
       <Filter>beast_core\json</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\logging\beast_FileLogger.h">
+    <ClInclude Include="..\..\modules\beast_core\logging\FileLogger.h">
       <Filter>beast_core\logging</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\logging\beast_Logger.h">
+    <ClInclude Include="..\..\modules\beast_core\logging\Logger.h">
       <Filter>beast_core\logging</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_BigInteger.h">
+    <ClInclude Include="..\..\modules\beast_core\maths\BigInteger.h">
       <Filter>beast_core\maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_Expression.h">
+    <ClInclude Include="..\..\modules\beast_core\maths\Expression.h">
       <Filter>beast_core\maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_MathsFunctions.h">
+    <ClInclude Include="..\..\modules\beast_core\maths\Random.h">
       <Filter>beast_core\maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_Random.h">
+    <ClInclude Include="..\..\modules\beast_core\maths\Range.h">
       <Filter>beast_core\maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_Range.h">
-      <Filter>beast_core\maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_Atomic.h">
+    <ClInclude Include="..\..\modules\beast_core\memory\MemoryBlock.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_ByteOrder.h">
+    <ClInclude Include="..\..\modules\beast_core\memory\OptionalScopedPointer.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_HeapBlock.h">
+    <ClInclude Include="..\..\modules\beast_core\memory\WeakReference.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_Memory.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_MemoryBlock.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_OptionalScopedPointer.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_ScopedPointer.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_WeakReference.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\misc\beast_Result.h">
+    <ClInclude Include="..\..\modules\beast_core\misc\Result.h">
       <Filter>beast_core\misc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\misc\beast_Uuid.h">
+    <ClInclude Include="..\..\modules\beast_core\misc\Uuid.h">
       <Filter>beast_core\misc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\misc\beast_WindowsRegistry.h">
+    <ClInclude Include="..\..\modules\beast_core\misc\WindowsRegistry.h">
       <Filter>beast_core\misc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\native\beast_android_JNIHelpers.h">
+    <ClInclude Include="..\..\modules\beast_core\native\android_JNIHelpers.h">
       <Filter>beast_core\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\native\beast_BasicNativeHeaders.h">
+    <ClInclude Include="..\..\modules\beast_core\native\BasicNativeHeaders.h">
       <Filter>beast_core\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\native\beast_osx_ObjCHelpers.h">
+    <ClInclude Include="..\..\modules\beast_core\native\osx_ObjCHelpers.h">
       <Filter>beast_core\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\native\beast_posix_SharedCode.h">
+    <ClInclude Include="..\..\modules\beast_core\native\posix_SharedCode.h">
       <Filter>beast_core\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\native\beast_win32_ComSmartPtr.h">
+    <ClInclude Include="..\..\modules\beast_core\native\win32_ComSmartPtr.h">
       <Filter>beast_core\native</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\network\beast_IPAddress.h">
+    <ClInclude Include="..\..\modules\beast_core\network\IPAddress.h">
       <Filter>beast_core\network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\network\beast_MACAddress.h">
+    <ClInclude Include="..\..\modules\beast_core\network\MACAddress.h">
       <Filter>beast_core\network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\network\beast_NamedPipe.h">
+    <ClInclude Include="..\..\modules\beast_core\network\NamedPipe.h">
       <Filter>beast_core\network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\network\beast_Socket.h">
+    <ClInclude Include="..\..\modules\beast_core\network\Socket.h">
       <Filter>beast_core\network</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\network\beast_URL.h">
-      <Filter>beast_core\network</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_BufferedInputStream.h">
+    <ClInclude Include="..\..\modules\beast_core\streams\BufferedInputStream.h">
       <Filter>beast_core\streams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_FileInputSource.h">
+    <ClInclude Include="..\..\modules\beast_core\streams\FileInputSource.h">
       <Filter>beast_core\streams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_InputSource.h">
+    <ClInclude Include="..\..\modules\beast_core\streams\InputSource.h">
       <Filter>beast_core\streams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_InputStream.h">
+    <ClInclude Include="..\..\modules\beast_core\streams\InputStream.h">
       <Filter>beast_core\streams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_MemoryInputStream.h">
+    <ClInclude Include="..\..\modules\beast_core\streams\MemoryInputStream.h">
       <Filter>beast_core\streams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_MemoryOutputStream.h">
+    <ClInclude Include="..\..\modules\beast_core\streams\MemoryOutputStream.h">
       <Filter>beast_core\streams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_OutputStream.h">
+    <ClInclude Include="..\..\modules\beast_core\streams\OutputStream.h">
       <Filter>beast_core\streams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\streams\beast_SubregionStream.h">
+    <ClInclude Include="..\..\modules\beast_core\streams\SubregionStream.h">
       <Filter>beast_core\streams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\beast_CharacterFunctions.h">
+    <ClInclude Include="..\..\modules\beast_core\text\Identifier.h">
       <Filter>beast_core\text</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\beast_CharPointer_ASCII.h">
+    <ClInclude Include="..\..\modules\beast_core\text\LocalisedStrings.h">
       <Filter>beast_core\text</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\beast_CharPointer_UTF8.h">
+    <ClInclude Include="..\..\modules\beast_core\text\StringArray.h">
       <Filter>beast_core\text</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\beast_CharPointer_UTF16.h">
+    <ClInclude Include="..\..\modules\beast_core\text\StringPairArray.h">
       <Filter>beast_core\text</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\beast_CharPointer_UTF32.h">
+    <ClInclude Include="..\..\modules\beast_core\text\StringPool.h">
       <Filter>beast_core\text</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\beast_Identifier.h">
+    <ClInclude Include="..\..\modules\beast_core\text\TextDiff.h">
       <Filter>beast_core\text</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\beast_LocalisedStrings.h">
-      <Filter>beast_core\text</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\beast_NewLine.h">
-      <Filter>beast_core\text</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\beast_String.h">
-      <Filter>beast_core\text</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\beast_StringArray.h">
-      <Filter>beast_core\text</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\beast_StringPairArray.h">
-      <Filter>beast_core\text</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\beast_StringPool.h">
-      <Filter>beast_core\text</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\beast_TextDiff.h">
-      <Filter>beast_core\text</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ChildProcess.h">
+    <ClInclude Include="..\..\modules\beast_core\threads\ChildProcess.h">
       <Filter>beast_core\threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_CriticalSection.h">
+    <ClInclude Include="..\..\modules\beast_core\threads\CriticalSection.h">
       <Filter>beast_core\threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_DynamicLibrary.h">
+    <ClInclude Include="..\..\modules\beast_core\threads\DynamicLibrary.h">
       <Filter>beast_core\threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_HighResolutionTimer.h">
+    <ClInclude Include="..\..\modules\beast_core\threads\HighResolutionTimer.h">
       <Filter>beast_core\threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_InterProcessLock.h">
+    <ClInclude Include="..\..\modules\beast_core\threads\InterProcessLock.h">
       <Filter>beast_core\threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_Process.h">
+    <ClInclude Include="..\..\modules\beast_core\threads\Process.h">
       <Filter>beast_core\threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ReadWriteLock.h">
+    <ClInclude Include="..\..\modules\beast_core\threads\ReadWriteLock.h">
       <Filter>beast_core\threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ScopedLock.h">
+    <ClInclude Include="..\..\modules\beast_core\threads\ScopedLock.h">
       <Filter>beast_core\threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ScopedReadLock.h">
+    <ClInclude Include="..\..\modules\beast_core\threads\ScopedReadLock.h">
       <Filter>beast_core\threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ScopedWriteLock.h">
+    <ClInclude Include="..\..\modules\beast_core\threads\ScopedWriteLock.h">
       <Filter>beast_core\threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_SpinLock.h">
-      <Filter>beast_core\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_Thread.h">
-      <Filter>beast_core\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ThreadLocalValue.h">
-      <Filter>beast_core\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ThreadPool.h">
-      <Filter>beast_core\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_TimeSliceThread.h">
-      <Filter>beast_core\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_WaitableEvent.h">
-      <Filter>beast_core\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\time\beast_PerformanceCounter.h">
+    <ClInclude Include="..\..\modules\beast_core\time\PerformanceCounter.h">
       <Filter>beast_core\time</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\time\beast_RelativeTime.h">
+    <ClInclude Include="..\..\modules\beast_core\time\Time.h">
       <Filter>beast_core\time</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\time\beast_Time.h">
-      <Filter>beast_core\time</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\xml\beast_XmlDocument.h">
+    <ClInclude Include="..\..\modules\beast_core\xml\XmlDocument.h">
       <Filter>beast_core\xml</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\xml\beast_XmlElement.h">
+    <ClInclude Include="..\..\modules\beast_core\xml\XmlElement.h">
       <Filter>beast_core\xml</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\zip\beast_GZIPCompressorOutputStream.h">
+    <ClInclude Include="..\..\modules\beast_core\zip\GZIPCompressorOutputStream.h">
       <Filter>beast_core\zip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\zip\beast_GZIPDecompressorInputStream.h">
+    <ClInclude Include="..\..\modules\beast_core\zip\GZIPDecompressorInputStream.h">
       <Filter>beast_core\zip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\zip\beast_ZipFile.h">
+    <ClInclude Include="..\..\modules\beast_core\zip\ZipFile.h">
       <Filter>beast_core\zip</Filter>
     </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\zip\zlib\crc32.h">
@@ -499,98 +554,61 @@
     <ClInclude Include="..\..\modules\beast_core\zip\zlib\zutil.h">
       <Filter>beast_core\zip\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="BeastConfig.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_CacheLine.h">
+    <ClInclude Include="..\..\modules\beast_core\memory\CacheLine.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_MemoryAlignment.h">
+    <ClInclude Include="..\..\modules\beast_core\memory\MemoryAlignment.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicCounter.h">
+    <ClInclude Include="..\..\modules\beast_core\memory\AtomicCounter.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicFlag.h">
+    <ClInclude Include="..\..\modules\beast_core\memory\AtomicFlag.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicPointer.h">
+    <ClInclude Include="..\..\modules\beast_core\memory\AtomicPointer.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicState.h">
+    <ClInclude Include="..\..\modules\beast_core\memory\AtomicState.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_LockFreeQueue.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\LockFreeQueue.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_LockFreeStack.h">
-      <Filter>beast_core\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_SpinDelay.h">
+    <ClInclude Include="..\..\modules\beast_core\threads\SpinDelay.h">
       <Filter>beast_core\threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_StaticObject.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_SharedTable.h">
-      <Filter>beast_core\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_SortedLookupTable.h">
-      <Filter>beast_core\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Debug.h">
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\FPUFlags.h">
       <Filter>beast_core\diagnostic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Error.h">
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\Throw.h">
       <Filter>beast_core\diagnostic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_FPUFlags.h">
-      <Filter>beast_core\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_LeakChecked.h">
-      <Filter>beast_core\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_SafeBool.h">
-      <Filter>beast_core\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Throw.h">
-      <Filter>beast_core\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_Uncopyable.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_SharedSingleton.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_Interval.h">
+    <ClInclude Include="..\..\modules\beast_core\maths\Interval.h">
       <Filter>beast_core\maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\time\beast_PerformedAtExit.h">
-      <Filter>beast_core\time</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_UnitTest.h">
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\UnitTest.h">
       <Filter>beast_core\diagnostic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_crypto\math\beast_UnsignedInteger.h">
-      <Filter>beast_crypto\math</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_crypto\beast_crypto.h">
       <Filter>beast_crypto</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\beast_SharedObjectArray.h">
+    <ClInclude Include="..\..\modules\beast_core\containers\SharedObjectArray.h">
       <Filter>beast_core\containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\files\beast_RandomAccessFile.h">
+    <ClInclude Include="..\..\modules\beast_core\files\RandomAccessFile.h">
       <Filter>beast_core\files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_UnitTestUtilities.h">
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\UnitTestUtilities.h">
       <Filter>beast_core\diagnostic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_RecycledObjectPool.h">
+    <ClInclude Include="..\..\modules\beast_core\memory\RecycledObjectPool.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
     <ClInclude Include="..\..\modules\beast_db\beast_db.h">
       <Filter>beast_db</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_db\keyvalue\beast_KeyvaDB.h">
+    <ClInclude Include="..\..\modules\beast_db\keyvalue\KeyvaDB.h">
       <Filter>beast_db\keyvalue</Filter>
     </ClInclude>
     <ClInclude Include="..\..\modules\beast_sqlite\beast_sqlite.h">
@@ -662,42 +680,21 @@
     <ClInclude Include="..\..\modules\beast_sqdb\detail\use_type.h">
       <Filter>beast_sqdb\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_MurmurHash.h">
+    <ClInclude Include="..\..\modules\beast_core\maths\MurmurHash.h">
       <Filter>beast_core\maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_ProtectedCall.h">
-      <Filter>beast_core\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\misc\beast_Main.h">
-      <Filter>beast_core\misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\beast_LexicalCast.h">
+    <ClInclude Include="..\..\modules\beast_core\text\LexicalCast.h">
       <Filter>beast_core\text</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_FatalError.h">
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\SemanticVersion.h">
       <Filter>beast_core\diagnostic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_SemanticVersion.h">
-      <Filter>beast_core\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_uint24.h">
+    <ClInclude Include="..\..\modules\beast_core\maths\uint24.h">
       <Filter>beast_core\maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_ByteSwap.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_ContainerDeletePolicy.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\diagnostic\MeasureFunctionCallTime.h">
       <Filter>beast_core\diagnostic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_ReadWriteMutex.h">
-      <Filter>beast_core\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\threads\beast_SharedData.h">
-      <Filter>beast_core\threads</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\thread\MutexTraits.h">
       <Filter>beast_core\thread</Filter>
     </ClInclude>
@@ -719,72 +716,18 @@
     <ClInclude Include="..\..\modules\beast_core\thread\impl\UntrackedMutexType.h">
       <Filter>beast_core\thread\impl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_DeadlineTimer.h">
+    <ClInclude Include="..\..\modules\beast_core\thread\DeadlineTimer.h">
       <Filter>beast_core\thread</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_CallQueue.h">
+    <ClInclude Include="..\..\modules\beast_core\thread\Semaphore.h">
       <Filter>beast_core\thread</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_ConcurrentObject.h">
+    <ClInclude Include="..\..\modules\beast_core\thread\Workers.h">
       <Filter>beast_core\thread</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_GlobalThreadGroup.h">
-      <Filter>beast_core\thread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_InterruptibleThread.h">
-      <Filter>beast_core\thread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_Listeners.h">
-      <Filter>beast_core\thread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_ManualCallQueue.h">
-      <Filter>beast_core\thread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_ParallelFor.h">
-      <Filter>beast_core\thread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_Semaphore.h">
-      <Filter>beast_core\thread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_SerialFor.h">
-      <Filter>beast_core\thread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_ThreadGroup.h">
-      <Filter>beast_core\thread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_ThreadWithCallQueue.h">
-      <Filter>beast_core\thread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\thread\beast_Workers.h">
-      <Filter>beast_core\thread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\maths\beast_Math.h">
+    <ClInclude Include="..\..\modules\beast_core\maths\Math.h">
       <Filter>beast_core\maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\functional\beast_Function.h">
-      <Filter>beast_core\functional</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_AllocatedBy.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_FifoFreeStore.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_FifoFreeStoreWithoutTLS.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_FifoFreeStoreWithTLS.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_GlobalFifoFreeStore.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_GlobalPagedFreeStore.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_PagedFreeStore.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_asio\sockets\SocketWrapperStrand.h">
       <Filter>beast_asio\sockets</Filter>
     </ClInclude>
@@ -797,7 +740,7 @@
     <ClInclude Include="..\..\modules\beast_asio\system\BoostIncludes.h">
       <Filter>beast_asio\system</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_extras\traits\beast_BoostLockableTraits.h">
+    <ClInclude Include="..\..\modules\beast_extras\traits\BoostLockableTraits.h">
       <Filter>beast_extras\traits</Filter>
     </ClInclude>
     <ClInclude Include="..\..\modules\beast_extras\beast_extras.h">
@@ -812,51 +755,15 @@
     <ClInclude Include="..\..\modules\beast_core\system\BoostIncludes.h">
       <Filter>beast_core\system</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\system\BeastConfigCheck.h">
-      <Filter>beast_core\system</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\system\FunctionalIncludes.h">
       <Filter>beast_core\system</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\system\StandardHeader.h">
-      <Filter>beast_core\system</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\system\PlatformDefs.h">
-      <Filter>beast_core\system</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\system\Functional.h">
       <Filter>beast_core\system</Filter>
     </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\system\SystemStats.h">
       <Filter>beast_core\system</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\system\TargetPlatform.h">
-      <Filter>beast_core\system</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\DynamicList.h">
-      <Filter>beast_core\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\DynamicArray.h">
-      <Filter>beast_core\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\HashMap.h">
-      <Filter>beast_core\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\List.h">
-      <Filter>beast_core\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\detail\copyconst.h">
-      <Filter>beast_core\containers\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\detail\removecv.h">
-      <Filter>beast_core\containers\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\StringCharPointerType.h">
-      <Filter>beast_core\text</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\StringFromNumber.h">
-      <Filter>beast_core\text</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\beast\intrusive\ForwardList.h">
       <Filter>beast\intrusive</Filter>
     </ClInclude>
@@ -878,24 +785,9 @@
     <ClInclude Include="..\..\beast\mpl\AddConst.h">
       <Filter>beast\mpl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\beast\mpl.h">
-      <Filter>beast</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\beast\mpl\PointerToOther.h">
       <Filter>beast\mpl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\SharedPtr.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\SharedObject.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\diagnostic\ContractChecks.h">
-      <Filter>beast_core\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\parsehttp\http_parser.h">
-      <Filter>beast_asio\parsehttp</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_asio\async\ComposedAsyncOperation.h">
       <Filter>beast_asio\async</Filter>
     </ClInclude>
@@ -986,12 +878,6 @@
     <ClInclude Include="..\..\modules\beast_asio\protocol\PrefilledReadStream.h">
       <Filter>beast_asio\protocol</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\functional\SharedFunction.h">
-      <Filter>beast_core\functional</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\basics\ContentBodyBuffer.h">
-      <Filter>beast_asio\basics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_asio\http\HTTPResponse.h">
       <Filter>beast_asio\http</Filter>
     </ClInclude>
@@ -1016,228 +902,544 @@
     <ClInclude Include="..\..\modules\beast_asio\http\HTTPParserImpl.h">
       <Filter>beast_asio\http</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\http\UniformResourceLocator.h">
-      <Filter>beast_asio\http</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\beast\mpl\IfCond.h">
       <Filter>beast\mpl</Filter>
     </ClInclude>
     <ClInclude Include="..\..\modules\beast_asio\basics\BuffersType.h">
       <Filter>beast_asio\basics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\basics\BufferType.h">
+    <ClInclude Include="..\..\modules\beast_core\memory\SharedSingleton.h">
+      <Filter>beast_core\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\time\AtExitHook.h">
+      <Filter>beast_core\time</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\misc\Main.h">
+      <Filter>beast_core\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\FatalError.h">
+      <Filter>beast_core\diagnostic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_crypto\math\UnsignedInteger.h">
+      <Filter>beast_crypto\math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_crypto\math\UnsignedIntegerCalc.h">
+      <Filter>beast_crypto\math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_crypto\math\BinaryEncoding.h">
+      <Filter>beast_crypto\math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\memory\SharedFunction.h">
+      <Filter>beast_core\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\net\IPEndpoint.h">
+      <Filter>beast\net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\Config.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\CStdInt.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\MPL.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\Net.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\TypeTraits.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\type_traits\IsSigned.h">
+      <Filter>beast\type_traits</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\type_traits\IntegralConstant.h">
+      <Filter>beast\type_traits</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\type_traits\IsIntegral.h">
+      <Filter>beast\type_traits</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\type_traits\RemoveSigned.h">
+      <Filter>beast\type_traits</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\utility\EnableIf.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\utility\Journal.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\Utility.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\mpl\IsCallPossible.h">
+      <Filter>beast\mpl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\Uncopyable.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\http\HTTPRequest.h">
+      <Filter>beast_asio\http</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\async\AsyncObject.h">
+      <Filter>beast_asio\async</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\basics\SharedArg.h">
       <Filter>beast_asio\basics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\beast\Intrusive.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\Atomic.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\intrusive\LockFreeStack.h">
+      <Filter>beast\intrusive</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\intrusive\List.h">
+      <Filter>beast\intrusive</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\mpl\CopyConst.h">
+      <Filter>beast\mpl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\http\impl\http-parser\http_parser.h">
+      <Filter>beast\http\impl\http-parser</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\HTTP.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\strings\CharacterFunctions.h">
+      <Filter>beast\strings</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\strings\CharPointer_ASCII.h">
+      <Filter>beast\strings</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\strings\CharPointer_UTF8.h">
+      <Filter>beast\strings</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\strings\CharPointer_UTF16.h">
+      <Filter>beast\strings</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\strings\CharPointer_UTF32.h">
+      <Filter>beast\strings</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\strings\NewLine.h">
+      <Filter>beast\strings</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\strings\String.h">
+      <Filter>beast\strings</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\strings\StringCharPointerType.h">
+      <Filter>beast\strings</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\strings\StringFromNumber.h">
+      <Filter>beast\strings</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\Strings.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\CompilerConfig.h">
+      <Filter>beast\config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\PlatformConfig.h">
+      <Filter>beast\config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\StandardConfig.h">
+      <Filter>beast\config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\Version.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\ConfigCheck.h">
+      <Filter>beast\config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\ContractChecks.h">
+      <Filter>beast\config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\StaticAssert.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\Arithmetic.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\Memory.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\ByteOrder.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\HeapBlock.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\system\StandardIncludes.h">
+      <Filter>beast_core\system</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\http\URL.h">
+      <Filter>beast\http</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\http\ParsedURL.h">
+      <Filter>beast\http</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\FixedArray.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\intrusive\IntrusiveArray.h">
+      <Filter>beast\intrusive</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\Crypto.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\crypto\impl\sha2\sha2.h">
+      <Filter>beast\crypto\impl\sha2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\crypto\Sha256.h">
+      <Filter>beast\crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\async\WrapHandler.h">
+      <Filter>beast_asio\async</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\async\AbstractHandler.h">
+      <Filter>beast_asio\async</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\Chrono.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\chrono\RelativeTime.h">
+      <Filter>beast\chrono</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\SafeBool.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\config\BeastConfig.h" />
+    <ClInclude Include="..\..\beast\utility\Error.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\utility\Debug.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\compiler\Clang.h">
+      <Filter>beast\config\compiler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\compiler\Gcc.h">
+      <Filter>beast\config\compiler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\compiler\Intel.h">
+      <Filter>beast\config\compiler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\compiler\VisualC.h">
+      <Filter>beast\config\compiler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\platform\Android.h">
+      <Filter>beast\config\platform</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\platform\Bsd.h">
+      <Filter>beast\config\platform</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\platform\Linux.h">
+      <Filter>beast\config\platform</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\platform\MacOS.h">
+      <Filter>beast\config\platform</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\platform\Win32.h">
+      <Filter>beast\config\platform</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\SelectCompilerConfig.h">
+      <Filter>beast\config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\SelectPlatformConfig.h">
+      <Filter>beast\config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\config\SelectStdlibConfig.h">
+      <Filter>beast\config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\smart_ptr\ContainerDeletePolicy.h">
+      <Filter>beast\smart_ptr</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\smart_ptr\ScopedPointer.h">
+      <Filter>beast\smart_ptr</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\SmartPtr.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\net\DynamicBuffer.h">
+      <Filter>beast\net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\net\BufferType.h">
+      <Filter>beast\net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\http\HTTPRequestParser.h">
+      <Filter>beast_asio\http</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\http\HTTPResponseParser.h">
+      <Filter>beast_asio\http</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\chrono\ScopedTimeInterval.h">
+      <Filter>beast\chrono</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\chrono\CPUMeter.h">
+      <Filter>beast\chrono</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\smart_ptr\SharedObject.h">
+      <Filter>beast\smart_ptr</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\smart_ptr\SharedPtr.h">
+      <Filter>beast\smart_ptr</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\Threads.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\LockGuard.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\RecursiveMutex.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\ServiceQueue.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\SharedData.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\SharedLockGuard.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\SharedMutexAdapter.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\SpinLock.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\Thread.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\ThreadLocalValue.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\TryLockGuard.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\UnlockGuard.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\WaitableEvent.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\utility\LeakChecked.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\utility\StaticObject.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\Stoppable.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\detail\DispatchedHandler.h">
+      <Filter>beast\threads\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\detail\BindHandler.h">
+      <Filter>beast\threads\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\boost\ErrorCode.h">
+      <Filter>beast\boost</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\Boost.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\utility\PropertyStream.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\ScopedWrapperContext.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\utility\BaseFromMember.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
-      <Filter>beast_core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\beast_AbstractFifo.cpp">
+    <ClCompile Include="..\..\modules\beast_core\containers\AbstractFifo.cpp">
       <Filter>beast_core\containers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\beast_DynamicObject.cpp">
+    <ClCompile Include="..\..\modules\beast_core\containers\DynamicObject.cpp">
       <Filter>beast_core\containers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\beast_NamedValueSet.cpp">
+    <ClCompile Include="..\..\modules\beast_core\containers\NamedValueSet.cpp">
       <Filter>beast_core\containers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\beast_PropertySet.cpp">
+    <ClCompile Include="..\..\modules\beast_core\containers\PropertySet.cpp">
       <Filter>beast_core\containers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\beast_Variant.cpp">
+    <ClCompile Include="..\..\modules\beast_core\containers\Variant.cpp">
       <Filter>beast_core\containers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\files\beast_DirectoryIterator.cpp">
+    <ClCompile Include="..\..\modules\beast_core\files\DirectoryIterator.cpp">
       <Filter>beast_core\files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\files\beast_File.cpp">
+    <ClCompile Include="..\..\modules\beast_core\files\File.cpp">
       <Filter>beast_core\files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\files\beast_FileInputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\files\FileInputStream.cpp">
       <Filter>beast_core\files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\files\beast_FileOutputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\files\FileOutputStream.cpp">
       <Filter>beast_core\files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\files\beast_FileSearchPath.cpp">
+    <ClCompile Include="..\..\modules\beast_core\files\FileSearchPath.cpp">
       <Filter>beast_core\files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\files\beast_TemporaryFile.cpp">
+    <ClCompile Include="..\..\modules\beast_core\files\TemporaryFile.cpp">
       <Filter>beast_core\files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\json\beast_JSON.cpp">
+    <ClCompile Include="..\..\modules\beast_core\json\JSON.cpp">
       <Filter>beast_core\json</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\logging\beast_FileLogger.cpp">
+    <ClCompile Include="..\..\modules\beast_core\logging\FileLogger.cpp">
       <Filter>beast_core\logging</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\logging\beast_Logger.cpp">
+    <ClCompile Include="..\..\modules\beast_core\logging\Logger.cpp">
       <Filter>beast_core\logging</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\maths\beast_BigInteger.cpp">
+    <ClCompile Include="..\..\modules\beast_core\maths\BigInteger.cpp">
       <Filter>beast_core\maths</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\maths\beast_Expression.cpp">
+    <ClCompile Include="..\..\modules\beast_core\maths\Expression.cpp">
       <Filter>beast_core\maths</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\maths\beast_Random.cpp">
+    <ClCompile Include="..\..\modules\beast_core\maths\Random.cpp">
       <Filter>beast_core\maths</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\memory\beast_MemoryBlock.cpp">
+    <ClCompile Include="..\..\modules\beast_core\memory\MemoryBlock.cpp">
       <Filter>beast_core\memory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\misc\beast_Result.cpp">
+    <ClCompile Include="..\..\modules\beast_core\misc\Result.cpp">
       <Filter>beast_core\misc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\misc\beast_Uuid.cpp">
+    <ClCompile Include="..\..\modules\beast_core\misc\Uuid.cpp">
       <Filter>beast_core\misc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_android_Files.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\android_Files.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_android_Misc.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\android_Misc.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_android_Network.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\android_Network.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_android_SystemStats.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\android_SystemStats.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_android_Threads.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\android_Threads.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_linux_Files.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\linux_Files.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_linux_Network.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\linux_Network.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_linux_SystemStats.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\linux_SystemStats.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_linux_Threads.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\linux_Threads.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_posix_NamedPipe.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\posix_NamedPipe.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_win32_Files.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\win32_Files.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_win32_Network.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\win32_Network.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_win32_Registry.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\win32_Registry.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_win32_SystemStats.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\win32_SystemStats.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_win32_Threads.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\win32_Threads.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\network\beast_IPAddress.cpp">
+    <ClCompile Include="..\..\modules\beast_core\network\IPAddress.cpp">
       <Filter>beast_core\network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\network\beast_MACAddress.cpp">
+    <ClCompile Include="..\..\modules\beast_core\network\MACAddress.cpp">
       <Filter>beast_core\network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\network\beast_NamedPipe.cpp">
+    <ClCompile Include="..\..\modules\beast_core\network\NamedPipe.cpp">
       <Filter>beast_core\network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\network\beast_Socket.cpp">
+    <ClCompile Include="..\..\modules\beast_core\network\Socket.cpp">
       <Filter>beast_core\network</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\network\beast_URL.cpp">
-      <Filter>beast_core\network</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\streams\beast_BufferedInputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\streams\BufferedInputStream.cpp">
       <Filter>beast_core\streams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\streams\beast_FileInputSource.cpp">
+    <ClCompile Include="..\..\modules\beast_core\streams\FileInputSource.cpp">
       <Filter>beast_core\streams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\streams\beast_InputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\streams\InputStream.cpp">
       <Filter>beast_core\streams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\streams\beast_MemoryInputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\streams\MemoryInputStream.cpp">
       <Filter>beast_core\streams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\streams\beast_MemoryOutputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\streams\MemoryOutputStream.cpp">
       <Filter>beast_core\streams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\streams\beast_OutputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\streams\OutputStream.cpp">
       <Filter>beast_core\streams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\streams\beast_SubregionStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\streams\SubregionStream.cpp">
       <Filter>beast_core\streams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_CharacterFunctions.cpp">
+    <ClCompile Include="..\..\modules\beast_core\text\Identifier.cpp">
       <Filter>beast_core\text</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_Identifier.cpp">
+    <ClCompile Include="..\..\modules\beast_core\text\LocalisedStrings.cpp">
       <Filter>beast_core\text</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_LocalisedStrings.cpp">
+    <ClCompile Include="..\..\modules\beast_core\text\StringArray.cpp">
       <Filter>beast_core\text</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_String.cpp">
+    <ClCompile Include="..\..\modules\beast_core\text\StringPairArray.cpp">
       <Filter>beast_core\text</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_StringArray.cpp">
+    <ClCompile Include="..\..\modules\beast_core\text\StringPool.cpp">
       <Filter>beast_core\text</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_StringPairArray.cpp">
+    <ClCompile Include="..\..\modules\beast_core\text\TextDiff.cpp">
       <Filter>beast_core\text</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_StringPool.cpp">
-      <Filter>beast_core\text</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_TextDiff.cpp">
-      <Filter>beast_core\text</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_ChildProcess.cpp">
+    <ClCompile Include="..\..\modules\beast_core\threads\ChildProcess.cpp">
       <Filter>beast_core\threads</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_HighResolutionTimer.cpp">
+    <ClCompile Include="..\..\modules\beast_core\threads\HighResolutionTimer.cpp">
       <Filter>beast_core\threads</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_ReadWriteLock.cpp">
+    <ClCompile Include="..\..\modules\beast_core\threads\ReadWriteLock.cpp">
       <Filter>beast_core\threads</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_Thread.cpp">
-      <Filter>beast_core\threads</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_ThreadPool.cpp">
-      <Filter>beast_core\threads</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_TimeSliceThread.cpp">
-      <Filter>beast_core\threads</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\time\beast_PerformanceCounter.cpp">
+    <ClCompile Include="..\..\modules\beast_core\time\PerformanceCounter.cpp">
       <Filter>beast_core\time</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\time\beast_RelativeTime.cpp">
+    <ClCompile Include="..\..\modules\beast_core\time\Time.cpp">
       <Filter>beast_core\time</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\time\beast_Time.cpp">
-      <Filter>beast_core\time</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\xml\beast_XmlDocument.cpp">
+    <ClCompile Include="..\..\modules\beast_core\xml\XmlDocument.cpp">
       <Filter>beast_core\xml</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\xml\beast_XmlElement.cpp">
+    <ClCompile Include="..\..\modules\beast_core\xml\XmlElement.cpp">
       <Filter>beast_core\xml</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\zip\beast_GZIPCompressorOutputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\zip\GZIPCompressorOutputStream.cpp">
       <Filter>beast_core\zip</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\zip\beast_GZIPDecompressorInputStream.cpp">
+    <ClCompile Include="..\..\modules\beast_core\zip\GZIPDecompressorInputStream.cpp">
       <Filter>beast_core\zip</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\zip\beast_ZipFile.cpp">
+    <ClCompile Include="..\..\modules\beast_core\zip\ZipFile.cpp">
       <Filter>beast_core\zip</Filter>
     </ClCompile>
     <ClCompile Include="..\..\modules\beast_core\zip\zlib\adler32.c">
@@ -1273,61 +1475,43 @@
     <ClCompile Include="..\..\modules\beast_core\zip\zlib\zutil.c">
       <Filter>beast_core\zip\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_bsd_SystemStats.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\bsd_SystemStats.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_bsd_Files.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\bsd_Files.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_bsd_Network.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\bsd_Network.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_bsd_Threads.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\bsd_Threads.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_Debug.cpp">
+    <ClCompile Include="..\..\modules\beast_core\diagnostic\FPUFlags.cpp">
       <Filter>beast_core\diagnostic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_Error.cpp">
-      <Filter>beast_core\diagnostic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_FPUFlags.cpp">
-      <Filter>beast_core\diagnostic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_LeakChecked.cpp">
-      <Filter>beast_core\diagnostic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_SpinDelay.cpp">
+    <ClCompile Include="..\..\modules\beast_core\threads\SpinDelay.cpp">
       <Filter>beast_core\threads</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_posix_FPUFlags.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\posix_FPUFlags.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\native\beast_win32_FPUFlags.cpp">
+    <ClCompile Include="..\..\modules\beast_core\native\win32_FPUFlags.cpp">
       <Filter>beast_core\native</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\time\beast_PerformedAtExit.cpp">
-      <Filter>beast_core\time</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_UnitTest.cpp">
+    <ClCompile Include="..\..\modules\beast_core\diagnostic\UnitTest.cpp">
       <Filter>beast_core\diagnostic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_crypto\beast_crypto.cpp">
-      <Filter>beast_crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_crypto\math\beast_UnsignedInteger.cpp">
-      <Filter>beast_crypto\math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\files\beast_RandomAccessFile.cpp">
+    <ClCompile Include="..\..\modules\beast_core\files\RandomAccessFile.cpp">
       <Filter>beast_core\files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_UnitTestUtilities.cpp">
+    <ClCompile Include="..\..\modules\beast_core\diagnostic\UnitTestUtilities.cpp">
       <Filter>beast_core\diagnostic</Filter>
     </ClCompile>
     <ClCompile Include="..\..\modules\beast_db\beast_db.cpp">
       <Filter>beast_db</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_db\keyvalue\beast_KeyvaDB.cpp">
+    <ClCompile Include="..\..\modules\beast_db\keyvalue\KeyvaDB.cpp">
       <Filter>beast_db\keyvalue</Filter>
     </ClCompile>
     <ClCompile Include="..\..\modules\beast_sqlite\beast_sqlite.c">
@@ -1375,102 +1559,36 @@
     <ClCompile Include="..\..\modules\beast_sqdb\source\use_type.cpp">
       <Filter>beast_sqdb\source</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\maths\beast_MurmurHash.cpp">
+    <ClCompile Include="..\..\modules\beast_core\maths\MurmurHash.cpp">
       <Filter>beast_core\maths</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_ProtectedCall.cpp">
-      <Filter>beast_core\diagnostic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\misc\beast_Main.cpp">
-      <Filter>beast_core\misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\beast_LexicalCast.cpp">
+    <ClCompile Include="..\..\modules\beast_core\text\LexicalCast.cpp">
       <Filter>beast_core\text</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_FatalError.cpp">
+    <ClCompile Include="..\..\modules\beast_core\diagnostic\SemanticVersion.cpp">
       <Filter>beast_core\diagnostic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_SemanticVersion.cpp">
-      <Filter>beast_core\diagnostic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\beast_asio.cpp">
-      <Filter>beast_asio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\threads\beast_ReadWriteMutex.cpp">
-      <Filter>beast_core\threads</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\beast_core\thread\impl\TrackedMutex.cpp">
       <Filter>beast_core\thread\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_DeadlineTimer.cpp">
+    <ClCompile Include="..\..\modules\beast_core\thread\DeadlineTimer.cpp">
       <Filter>beast_core\thread</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_CallQueue.cpp">
+    <ClCompile Include="..\..\modules\beast_core\thread\Semaphore.cpp">
       <Filter>beast_core\thread</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_ConcurrentObject.cpp">
+    <ClCompile Include="..\..\modules\beast_core\thread\Workers.cpp">
       <Filter>beast_core\thread</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_InterruptibleThread.cpp">
-      <Filter>beast_core\thread</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_Listeners.cpp">
-      <Filter>beast_core\thread</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_ManualCallQueue.cpp">
-      <Filter>beast_core\thread</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_ParallelFor.cpp">
-      <Filter>beast_core\thread</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_Semaphore.cpp">
-      <Filter>beast_core\thread</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_ThreadGroup.cpp">
-      <Filter>beast_core\thread</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_ThreadWithCallQueue.cpp">
-      <Filter>beast_core\thread</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\beast_Workers.cpp">
-      <Filter>beast_core\thread</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\memory\beast_FifoFreeStoreWithoutTLS.cpp">
-      <Filter>beast_core\memory</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\memory\beast_FifoFreeStoreWithTLS.cpp">
-      <Filter>beast_core\memory</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\memory\beast_GlobalPagedFreeStore.cpp">
-      <Filter>beast_core\memory</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\memory\beast_PagedFreeStore.cpp">
-      <Filter>beast_core\memory</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\beast_asio\basics\SSLContext.cpp">
       <Filter>beast_asio\basics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_extras\beast_extras.cpp">
-      <Filter>beast_extras</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\beast_core\system\BoostPlaceholdersFix.cpp">
       <Filter>beast_core\system</Filter>
     </ClCompile>
     <ClCompile Include="..\..\modules\beast_core\system\SystemStats.cpp">
       <Filter>beast_core\system</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\DynamicArray.cpp">
-      <Filter>beast_core\containers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\DynamicList.cpp">
-      <Filter>beast_core\containers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\containers\HashMap.cpp">
-      <Filter>beast_core\containers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\parsehttp\http_parser.c">
-      <Filter>beast_asio\parsehttp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\beast_asio\async\SharedHandler.cpp">
       <Filter>beast_asio\async</Filter>
     </ClCompile>
@@ -1516,9 +1634,6 @@
     <ClCompile Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogicPROXY.cpp">
       <Filter>beast_asio\protocol</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\basics\ContentBodyBuffer.cpp">
-      <Filter>beast_asio\basics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\beast_asio\http\HTTPResponse.cpp">
       <Filter>beast_asio\http</Filter>
     </ClCompile>
@@ -1540,11 +1655,160 @@
     <ClCompile Include="..\..\modules\beast_asio\http\HTTPParser.cpp">
       <Filter>beast_asio\http</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\http\UniformResourceLocator.cpp">
+    <ClCompile Include="..\..\modules\beast_crypto\beast_crypto.cpp">
+      <Filter>beast_crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
+      <Filter>beast_core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\beast_asio.cpp">
+      <Filter>beast_asio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\time\AtExitHook.cpp">
+      <Filter>beast_core\time</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\misc\Main.cpp">
+      <Filter>beast_core\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\diagnostic\FatalError.cpp">
+      <Filter>beast_core\diagnostic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_crypto\math\UnsignedInteger.cpp">
+      <Filter>beast_crypto\math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_crypto\math\BinaryEncoding.cpp">
+      <Filter>beast_crypto\math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_extras\beast_extras.cpp">
+      <Filter>beast_extras</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\net\impl\IPEndpoint.cpp">
+      <Filter>beast\net\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\net\Net.cpp">
+      <Filter>beast\net</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\Utility.cpp">
+      <Filter>beast\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\impl\Journal.cpp">
+      <Filter>beast\utility\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\http\HTTPRequest.cpp">
       <Filter>beast_asio\http</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\beast\http\impl\http-parser\http_parser.c">
+      <Filter>beast\http\impl\http-parser</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\impl\http-parser\test.c">
+      <Filter>beast\http\impl\http-parser</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\impl\http-parser\contrib\parsertrace.c">
+      <Filter>beast\http\impl\http-parser\contrib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\impl\http-parser\contrib\url_parser.c">
+      <Filter>beast\http\impl\http-parser\contrib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\HTTP.cpp">
+      <Filter>beast\http</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\impl\http_parser.cpp">
+      <Filter>beast\http\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\strings\impl\CharacterFunctions.cpp">
+      <Filter>beast\strings\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\strings\impl\String.cpp">
+      <Filter>beast\strings\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\strings\Strings.cpp">
+      <Filter>beast\strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\impl\URL.cpp">
+      <Filter>beast\http\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\impl\ParsedURL.cpp">
+      <Filter>beast\http\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\crypto\impl\sha2\sha2.c">
+      <Filter>beast\crypto\impl\sha2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\crypto\impl\sha2\sha2prog.c">
+      <Filter>beast\crypto\impl\sha2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\crypto\impl\sha2\sha2speed.c">
+      <Filter>beast\crypto\impl\sha2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\crypto\Crypto.cpp">
+      <Filter>beast\crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\crypto\impl\Sha256.cpp">
+      <Filter>beast\crypto\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\chrono\impl\RelativeTime.cpp">
+      <Filter>beast\chrono\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\chrono\Chrono.cpp">
+      <Filter>beast\chrono</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\impl\Debug.cpp">
+      <Filter>beast\utility\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\impl\Error.cpp">
+      <Filter>beast\utility\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\net\impl\DynamicBuffer.cpp">
+      <Filter>beast\net\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\http\HTTPRequestParser.cpp">
+      <Filter>beast_asio\http</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\http\HTTPResponseParser.cpp">
+      <Filter>beast_asio\http</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\chrono\impl\CPUMeter.cpp">
+      <Filter>beast\chrono\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\smart_ptr\SmartPtr.cpp">
+      <Filter>beast\smart_ptr</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\threads\impl\Atomic.cpp">
+      <Filter>beast\threads\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\threads\impl\RecursiveMutex.cpp">
+      <Filter>beast\threads\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\threads\impl\ServiceQueue.cpp">
+      <Filter>beast\threads\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\threads\impl\WaitableEvent.cpp">
+      <Filter>beast\threads\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\threads\Threads.cpp">
+      <Filter>beast\threads</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\threads\impl\Thread.cpp">
+      <Filter>beast\threads\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\impl\LeakChecked.cpp">
+      <Filter>beast\utility\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\impl\StaticObject.cpp">
+      <Filter>beast\utility\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\threads\impl\Stoppable.cpp">
+      <Filter>beast\threads\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\boost\Boost.cpp">
+      <Filter>beast\boost</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\impl\PropertyStream.cpp">
+      <Filter>beast\utility\impl</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Text Include="..\..\TODO.txt" />
+    <Text Include="..\..\TODO.txt">
+      <Filter>_meta</Filter>
+    </Text>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/LICENSE_1_0.txt b/LICENSE_1_0.txt
new file mode 100644
index 0000000000..36b7cd93cd
--- /dev/null
+++ b/LICENSE_1_0.txt
@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/TODO.txt b/TODO.txt
index bf1437e8e0..965d1721e4 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -2,10 +2,6 @@
 BEAST TODO
 --------------------------------------------------------------------------------
 
-- Use new file naming convention
-
-- Rename ReadWriteMutex to SharedMutex
-
 - Use SemanticVersion for beast version numbers to replace BEAST_VERSION
 
 - add support for a __PRETTY_FUNCTION__ equivalent for all environments
@@ -14,13 +10,6 @@ BEAST TODO
 
 - Import secp256k1 from sipa
 
-- HashMap work:
-  - Add unit test
-  - Return size_t from hash function, take out upperLimit, move mod % to caller
-  - Make hash function a functor using operator()
-  - Implement HardenedHashFunctions
-  - Fix problem with assigning to the result of operator[] maybe use a proxy?
-
 - Set sqlite thread safety model to '2' in beast_sqlite
 
 - Document and rename all the sqdb files and classes
@@ -57,8 +46,6 @@ BEAST TODO
 
 - Rename malloc/calloc JUCE members that conflict with the debug CRT from MSVC
 
-- Make beast::HashMap support assignment via operator[]
-
 - Reformat every Doxygen comment
 - Fix Doxygen metatags
 - update Beast Doxyfile
diff --git a/modules/beast_core/maths/beast_MathsFunctions.h b/beast/Arithmetic.h
similarity index 79%
rename from modules/beast_core/maths/beast_MathsFunctions.h
rename to beast/Arithmetic.h
index 6532951c4b..8aba10345d 100644
--- a/modules/beast_core/maths/beast_MathsFunctions.h
+++ b/beast/Arithmetic.h
@@ -21,104 +21,48 @@
 */
 //==============================================================================
 
-#ifndef BEAST_MATHSFUNCTIONS_H_INCLUDED
-#define BEAST_MATHSFUNCTIONS_H_INCLUDED
+#ifndef BEAST_ARITHMETIC_H_INCLUDED
+#define BEAST_ARITHMETIC_H_INCLUDED
 
-//==============================================================================
-/*
-    This file sets up some handy mathematical typdefs and functions.
-*/
+#include "Config.h"
+#include "CStdInt.h"
 
-//==============================================================================
-// Definitions for the int8, int16, int32, int64 and pointer_sized_int types.
+#include <cmath>
+#include <algorithm>
 
-/** A platform-independent 8-bit signed integer type. */
-typedef signed char                 int8;
-/** A platform-independent 8-bit unsigned integer type. */
-typedef unsigned char               uint8;
-/** A platform-independent 16-bit signed integer type. */
-typedef signed short                int16;
-/** A platform-independent 16-bit unsigned integer type. */
-typedef unsigned short              uint16;
-/** A platform-independent 32-bit signed integer type. */
-typedef signed int                  int32;
-/** A platform-independent 32-bit unsigned integer type. */
-typedef unsigned int                uint32;
+namespace beast {
 
-#if BEAST_MSVC
-  /** A platform-independent 64-bit integer type. */
-  typedef __int64                   int64;
-  /** A platform-independent 64-bit unsigned integer type. */
-  typedef unsigned __int64          uint64;
-  /** A platform-independent macro for writing 64-bit literals, needed because
-      different compilers have different syntaxes for this.
-
-      E.g. writing literal64bit (0x1000000000) will translate to 0x1000000000LL for
-      GCC, or 0x1000000000 for MSVC.
-  */
-  #define literal64bit(longLiteral)     ((__int64) longLiteral)
-#else
-  /** A platform-independent 64-bit integer type. */
-  typedef long long                 int64;
-  /** A platform-independent 64-bit unsigned integer type. */
-  typedef unsigned long long        uint64;
-  /** A platform-independent macro for writing 64-bit literals, needed because
-      different compilers have different syntaxes for this.
-
-      E.g. writing literal64bit (0x1000000000) will translate to 0x1000000000LL for
-      GCC, or 0x1000000000 for MSVC.
-  */
-  #define literal64bit(longLiteral)     (longLiteral##LL)
-#endif
-
-
-#if BEAST_64BIT
-  /** A signed integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
-  typedef int64                     pointer_sized_int;
-  /** An unsigned integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
-  typedef uint64                    pointer_sized_uint;
-#elif BEAST_MSVC
-  /** A signed integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
-  typedef _W64 int                  pointer_sized_int;
-  /** An unsigned integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
-  typedef _W64 unsigned int         pointer_sized_uint;
-#else
-  /** A signed integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
-  typedef int                       pointer_sized_int;
-  /** An unsigned integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
-  typedef unsigned int              pointer_sized_uint;
-#endif
-
-#if BEAST_MSVC
-  typedef pointer_sized_int ssize_t;
-#endif
-
-//==============================================================================
 // Some indispensible min/max functions
 
 /** Returns the larger of two values. */
 template <typename Type>
-inline Type bmax (const Type a, const Type b)                                               { return (a < b) ? b : a; }
+inline Type bmax (const Type a, const Type b)
+    { return (a < b) ? b : a; }
 
 /** Returns the larger of three values. */
 template <typename Type>
-inline Type bmax (const Type a, const Type b, const Type c)                                 { return (a < b) ? ((b < c) ? c : b) : ((a < c) ? c : a); }
+inline Type bmax (const Type a, const Type b, const Type c)
+    { return (a < b) ? ((b < c) ? c : b) : ((a < c) ? c : a); }
 
 /** Returns the larger of four values. */
 template <typename Type>
-inline Type bmax (const Type a, const Type b, const Type c, const Type d)                   { return bmax (a, bmax (b, c, d)); }
+inline Type bmax (const Type a, const Type b, const Type c, const Type d)
+    { return bmax (a, bmax (b, c, d)); }
 
 /** Returns the smaller of two values. */
 template <typename Type>
-inline Type bmin (const Type a, const Type b)                                               { return (b < a) ? b : a; }
+inline Type bmin (const Type a, const Type b)
+    { return (b < a) ? b : a; }
 
 /** Returns the smaller of three values. */
 template <typename Type>
-inline Type bmin (const Type a, const Type b, const Type c)                                 { return (b < a) ? ((c < b) ? c : b) : ((c < a) ? c : a); }
+inline Type bmin (const Type a, const Type b, const Type c)
+    { return (b < a) ? ((c < b) ? c : b) : ((c < a) ? c : a); }
 
 /** Returns the smaller of four values. */
 template <typename Type>
-inline Type bmin (const Type a, const Type b, const Type c, const Type d)                   { return bmin (a, bmin (b, c, d)); }
+inline Type bmin (const Type a, const Type b, const Type c, const Type d)
+    { return bmin (a, bmin (b, c, d)); }
 
 /** Scans an array of values, returning the minimum value that it contains. */
 template <typename Type>
@@ -183,7 +127,6 @@ void findMinAndMax (const Type* values, int numValues, Type& lowest, Type& highe
     }
 }
 
-
 //==============================================================================
 /** Constrains a value to keep it within a given range.
 
@@ -268,7 +211,7 @@ inline void swapVariables (Type& variable1, Type& variable2)
     @endcode
 */
 template <typename Type, int N>
-inline int numElementsInArray (Type (&array)[N])
+int numElementsInArray (Type (&array)[N])
 {
     (void) array; // (required to avoid a spurious warning in MS compilers)
     (void) sizeof (0[array]); // This line should cause an error if you pass an object with a user-defined subscript operator
@@ -509,7 +452,7 @@ namespace TypeHelpers
     template <>              struct SmallestFloatType <double>    { typedef double type; };
 }
 
+}
 
-//==============================================================================
+#endif
 
-#endif   // BEAST_MATHSFUNCTIONS_H_INCLUDED
diff --git a/modules/beast_core/memory/beast_Atomic.h b/beast/Atomic.h
similarity index 97%
rename from modules/beast_core/memory/beast_Atomic.h
rename to beast/Atomic.h
index 9fcc92fcfa..cd54d75ad0 100644
--- a/modules/beast_core/memory/beast_Atomic.h
+++ b/beast/Atomic.h
@@ -24,6 +24,11 @@
 #ifndef BEAST_ATOMIC_H_INCLUDED
 #define BEAST_ATOMIC_H_INCLUDED
 
+#include "Config.h"
+#include "CStdInt.h"
+#include "StaticAssert.h"
+
+namespace beast {
 
 //==============================================================================
 /**
@@ -65,13 +70,16 @@ public:
     Type get() const noexcept;
 
     /** Copies another value onto this one (atomically). */
-    inline Atomic& operator= (const Atomic& other) noexcept         { exchange (other.get()); return *this; }
+     Atomic& operator= (const Atomic& other) noexcept
+      { exchange (other.get()); return *this; }
 
     /** Copies another value onto this one (atomically). */
-    inline Atomic& operator= (const Type newValue) noexcept         { exchange (newValue); return *this; }
+     Atomic& operator= (const Type newValue) noexcept
+      { exchange (newValue); return *this; }
 
     /** Atomically sets the current value. */
-    void set (Type newValue) noexcept                               { exchange (newValue); }
+    void set (Type newValue) noexcept
+      { exchange (newValue); }
 
     /** Atomically sets the current value, returning the value that was replaced. */
     Type exchange (Type value) noexcept;
@@ -131,9 +139,6 @@ public:
     */
     Type compareAndSetValue (Type newValue, Type valueToCompare) noexcept;
 
-    /** Implements a memory read/write barrier. */
-    static void memoryBarrier() noexcept;
-
     //==============================================================================
    #if BEAST_64BIT
     BEAST_ALIGN (8)
@@ -373,8 +378,7 @@ inline Type Atomic<Type>::compareAndSetValue (const Type newValue, const Type va
   #endif
 }
 
-template <typename Type>
-inline void Atomic<Type>::memoryBarrier() noexcept
+inline void memoryBarrier() noexcept
 {
   #if BEAST_ATOMICS_MAC
     OSMemoryBarrier();
@@ -389,4 +393,6 @@ inline void Atomic<Type>::memoryBarrier() noexcept
   #pragma warning (pop)
 #endif
 
-#endif   // BEAST_ATOMIC_H_INCLUDED
+}
+
+#endif
diff --git a/beast/Boost.h b/beast/Boost.h
new file mode 100644
index 0000000000..295eca5a58
--- /dev/null
+++ b/beast/Boost.h
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_BOOST_H_INCLUDED
+#define BEAST_BOOST_H_INCLUDED
+
+// These classes require boost in order to be used.
+
+#include "boost/ErrorCode.h"
+
+#endif
diff --git a/modules/beast_core/memory/beast_ByteOrder.h b/beast/ByteOrder.h
similarity index 78%
rename from modules/beast_core/memory/beast_ByteOrder.h
rename to beast/ByteOrder.h
index 191de0d943..0e40616e7d 100644
--- a/modules/beast_core/memory/beast_ByteOrder.h
+++ b/beast/ByteOrder.h
@@ -24,11 +24,17 @@
 #ifndef BEAST_BYTEORDER_H_INCLUDED
 #define BEAST_BYTEORDER_H_INCLUDED
 
+#include "Config.h"
+#include "CStdInt.h"
+#include "Uncopyable.h"
+
+namespace beast {
+
 //==============================================================================
 /** Contains static methods for converting the byte order between different
     endiannesses.
 */
-class BEAST_API ByteOrder : public Uncopyable
+class ByteOrder : public Uncopyable
 {
 public:
     //==============================================================================
@@ -182,5 +188,109 @@ inline int  ByteOrder::bigEndian24Bit (const char* const bytes)
 inline void ByteOrder::littleEndian24BitToChars (const int value, char* const destBytes)    { destBytes[0] = (char)(value & 0xff); destBytes[1] = (char)((value >> 8) & 0xff); destBytes[2] = (char)((value >> 16) & 0xff); }
 inline void ByteOrder::bigEndian24BitToChars (const int value, char* const destBytes)       { destBytes[0] = (char)((value >> 16) & 0xff); destBytes[1] = (char)((value >> 8) & 0xff); destBytes[2] = (char)(value & 0xff); }
 
-#endif
+namespace detail
+{
 
+/** Specialized helper class template for swapping bytes.
+    
+    Normally you won't use this directly, use the helper function
+    byteSwap instead. You can specialize this class for your
+    own user defined types, as was done for uint24.
+
+    @see swapBytes, uint24
+*/
+template <typename IntegralType>
+struct SwapBytes
+{
+    inline IntegralType operator() (IntegralType value) const noexcept 
+    {
+        return ByteOrder::swap (value);
+    }
+};
+
+// Specializations for signed integers
+
+template <>
+struct SwapBytes <int16>
+{
+    inline int16 operator() (int16 value) const noexcept 
+    {
+        return static_cast <int16> (ByteOrder::swap (static_cast <uint16> (value)));
+    }
+};
+
+template <>
+struct SwapBytes <int32>
+{
+    inline int32 operator() (int32 value) const noexcept 
+    {
+        return static_cast <int32> (ByteOrder::swap (static_cast <uint32> (value)));
+    }
+};
+
+template <>
+struct SwapBytes <int64>
+{
+    inline int64 operator() (int64 value) const noexcept 
+    {
+        return static_cast <int64> (ByteOrder::swap (static_cast <uint64> (value)));
+    }
+};
+
+}
+
+//------------------------------------------------------------------------------
+
+/** Returns a type with the bytes swapped.
+    Little endian becomes big endian and vice versa. The underlying
+    type must be an integral type or behave like one.
+*/
+template <class IntegralType>
+inline IntegralType swapBytes (IntegralType value) noexcept
+{
+    return detail::SwapBytes <IntegralType> () (value);
+}
+
+/** Returns the machine byte-order value to little-endian byte order. */
+template <typename IntegralType>
+inline IntegralType toLittleEndian (IntegralType value) noexcept
+{
+#if BEAST_LITTLE_ENDIAN
+    return value;
+#else
+    return swapBytes (value);
+#endif
+}
+
+/** Returns the machine byte-order value to big-endian byte order. */
+template <typename IntegralType>
+inline IntegralType toBigEndian (IntegralType value) noexcept
+{
+#if BEAST_LITTLE_ENDIAN
+    return swapBytes (value);
+#else
+    return value;
+#endif
+}
+
+/** Returns the machine byte-order value to network byte order. */
+template <typename IntegralType>
+inline IntegralType toNetworkByteOrder (IntegralType value) noexcept
+{
+    return toBigEndian (value);
+}
+
+/** Converts from network byte order to machine byte order. */
+template <typename IntegralType>
+inline IntegralType fromNetworkByteOrder (IntegralType value) noexcept
+{
+#if BEAST_LITTLE_ENDIAN
+    return swapBytes (value);
+#else
+    return value;
+#endif
+}
+
+}
+
+#endif
diff --git a/beast/CStdInt.h b/beast/CStdInt.h
new file mode 100644
index 0000000000..265f3d9f19
--- /dev/null
+++ b/beast/CStdInt.h
@@ -0,0 +1,88 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CSTDINT_H_INCLUDED
+#define BEAST_CSTDINT_H_INCLUDED
+
+#include "Config.h"
+
+namespace beast {
+
+typedef signed char                 int8;
+typedef signed short                int16;
+typedef signed int                  int32;
+typedef unsigned char               uint8;
+typedef unsigned short              uint16;
+typedef unsigned int                uint32;
+
+#if BEAST_MSVC
+  typedef __int64                   int64;
+  typedef unsigned __int64          uint64;
+
+  /** A platform-independent macro for writing 64-bit literals, needed because
+      different compilers have different syntaxes for this.
+
+      E.g. writing literal64bit (0x1000000000) will translate to 0x1000000000LL for
+      GCC, or 0x1000000000 for MSVC.
+  */
+  #define literal64bit(longLiteral)     ((__int64) longLiteral)
+
+#else
+  /** A platform-independent 64-bit integer type. */
+  typedef long long                 int64;
+  /** A platform-independent 64-bit unsigned integer type. */
+  typedef unsigned long long        uint64;
+  /** A platform-independent macro for writing 64-bit literals, needed because
+      different compilers have different syntaxes for this.
+
+      E.g. writing literal64bit (0x1000000000) will translate to 0x1000000000LL for
+      GCC, or 0x1000000000 for MSVC.
+  */
+  #define literal64bit(longLiteral)     (longLiteral##LL)
+
+#endif
+
+#if BEAST_64BIT
+  /** A signed integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
+  typedef int64                     pointer_sized_int;
+  /** An unsigned integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
+  typedef uint64                    pointer_sized_uint;
+#elif BEAST_MSVC
+  /** A signed integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
+  typedef _W64 int                  pointer_sized_int;
+  /** An unsigned integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
+  typedef _W64 unsigned int         pointer_sized_uint;
+#else
+  /** A signed integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
+  typedef int                       pointer_sized_int;
+  /** An unsigned integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
+  typedef unsigned int              pointer_sized_uint;
+#endif
+
+#if BEAST_MSVC
+  typedef pointer_sized_int ssize_t;
+#endif
+
+}
+
+#endif
diff --git a/beast/Chrono.h b/beast/Chrono.h
new file mode 100644
index 0000000000..027b1f5f32
--- /dev/null
+++ b/beast/Chrono.h
@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CHRONO_H_INCLUDED
+#define BEAST_CHRONO_H_INCLUDED
+
+#include "chrono/CPUMeter.h"
+#include "chrono/RelativeTime.h"
+#include "chrono/ScopedTimeInterval.h"
+
+#endif
diff --git a/beast/Config.h b/beast/Config.h
new file mode 100644
index 0000000000..32164e7103
--- /dev/null
+++ b/beast/Config.h
@@ -0,0 +1,60 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONFIG_H_INCLUDED
+#define BEAST_CONFIG_H_INCLUDED
+
+// VFALCO NOTE this is analogous to <boost/config.hpp>
+
+#if !defined(BEAST_COMPILER_CONFIG) && !defined(BEAST_NO_COMPILER_CONFIG) && !defined(BEAST_NO_CONFIG)
+#include "config/SelectCompilerConfig.h"
+#endif
+#ifdef   BEAST_COMPILER_CONFIG
+#include BEAST_COMPILER_CONFIG
+#endif
+
+#if !defined(BEAST_STDLIB_CONFIG) && !defined(BEAST_NO_STDLIB_CONFIG) && !defined(BEAST_NO_CONFIG) && defined(__cplusplus)
+#include "config/SelectStdlibConfig.h"
+#endif
+#ifdef   BEAST_STDLIB_CONFIG
+#include BEAST_STDLIB_CONFIG
+#endif
+
+#if !defined(BEAST_PLATFORM_CONFIG) && !defined(BEAST_NO_PLATFORM_CONFIG) && !defined(BEAST_NO_CONFIG)
+#include "config/SelectCompilerConfig.h"
+#endif
+#ifdef   BEAST_PLATFORM_CONFIG
+#include BEAST_PLATFORM_CONFIG
+#endif
+
+// Legacy
+#include "Version.h"
+#include "config/PlatformConfig.h"
+#include "config/CompilerConfig.h"
+#include "config/StandardConfig.h"
+#include "config/ConfigCheck.h"
+
+// Suffix
+#include "config/Suffix.h"
+    
+#endif
diff --git a/beast/Crypto.h b/beast/Crypto.h
new file mode 100644
index 0000000000..50d8204661
--- /dev/null
+++ b/beast/Crypto.h
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CRYPTO_H_INCLUDED
+#define BEAST_CRYPTO_H_INCLUDED
+
+#include "crypto/Sha256.h"
+
+#endif
+
diff --git a/beast/FixedArray.h b/beast/FixedArray.h
new file mode 100644
index 0000000000..e9d50488af
--- /dev/null
+++ b/beast/FixedArray.h
@@ -0,0 +1,165 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_FIXEDARRAY_H_INCLUDED
+#define BEAST_FIXEDARRAY_H_INCLUDED
+
+#include "Config.h"
+
+#include <cstddef>
+#include <iterator>
+#include <stdexcept>
+
+namespace beast {
+
+// Ideas from Boost
+
+/** An array whose size is determined at compile-time.
+    The interface tries to follow std::vector as closely as possible within
+    the limitations of having a fixed size.
+*/
+template <class T, std::size_t N>
+class FixedArray
+{
+public:
+    T values [N];
+
+    typedef T                value_type;
+    typedef T*               iterator;
+    typedef T const*         const_iterator;
+    typedef T&               reference;
+    typedef T const&         const_reference;
+    typedef std::size_t      size_type;
+    typedef std::ptrdiff_t   difference_type;
+
+    // iterators
+    iterator        begin()       { return values; }
+    const_iterator  begin() const { return values; }
+    const_iterator cbegin() const { return values; }
+    iterator        end()       { return values+N; }
+    const_iterator  end() const { return values+N; }
+    const_iterator cend() const { return values+N; }
+
+    typedef std::reverse_iterator <iterator> reverse_iterator;
+    typedef std::reverse_iterator <const_iterator> const_reverse_iterator;
+
+    reverse_iterator rbegin() { return reverse_iterator(end()); }
+    const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); }
+    const_reverse_iterator crbegin() const { return const_reverse_iterator(end()); }
+    reverse_iterator rend() { return reverse_iterator(begin()); }
+    const_reverse_iterator rend() const { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crend() const { return const_reverse_iterator(begin()); }
+
+    reference operator[](size_type i)
+    {
+        bassert (i < N);
+        return values[i];
+    }
+
+    const_reference operator[](size_type i) const
+    {
+        bassert (i < N);
+        return values[i];
+    }
+
+    reference at(size_type i) { rangecheck(i); return values[i]; }
+    const_reference at(size_type i) const { rangecheck(i); return values[i]; }
+
+    reference front() { return values[0]; }
+    reference back()  { return values[N-1]; }
+    const_reference front () const { return values[0]; }
+    const_reference back()   const { return values[N-1]; }
+
+    static size_type size() { return N; }
+    static bool empty() { return false; }
+    static size_type max_size() { return N; }
+    
+    enum { static_size = N };
+
+    T const* data() const { return values; }
+    T* data() { return values; }
+    T* c_array() { return values; }
+
+    template <typename T2>
+    FixedArray<T,N>& operator= (FixedArray<T2,N> const& rhs)
+    {
+        std::copy (rhs.begin(), rhs.end(), begin());
+        return *this;
+    }
+
+    void assign (T const& value) { fill (value); }
+
+    void fill (T const& value)
+    {
+        std::fill_n (begin(), size(), value);
+    }
+
+    void clear ()
+    {
+        fill (T ());
+    }
+
+    static void rangecheck (size_type i)
+    {
+        if (i >= size())
+            throw std::out_of_range ("FixedArray<>: index out of range");
+    }
+};
+
+//------------------------------------------------------------------------------
+
+template <class T, std::size_t N>
+bool operator== (FixedArray <T, N> const& lhs, FixedArray <T, N> const& rhs)
+{
+    return std::equal (lhs.begin(), lhs.end(), rhs.begin());
+}
+
+template <class T, std::size_t N>
+bool operator!= (FixedArray <T, N> const& lhs, FixedArray <T, N> const& rhs)
+{
+    return !(lhs==rhs);
+}
+
+template <class T, std::size_t N>
+bool operator< (FixedArray <T, N> const& lhs, FixedArray <T, N> const& rhs)
+{
+    return std::lexicographical_compare (lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
+}
+
+template <class T, std::size_t N>
+bool operator> (FixedArray <T, N> const& lhs, FixedArray <T, N> const& rhs)
+{
+    return rhs<lhs;
+}
+
+template <class T, std::size_t N>
+bool operator<= (FixedArray <T, N> const& lhs, FixedArray <T, N> const& rhs)
+{
+    return !(rhs<lhs);
+}
+
+template <class T, std::size_t N>
+bool operator>= (FixedArray <T, N> const& lhs, FixedArray <T, N> const& rhs)
+{
+    return !(lhs<rhs);
+}
+
+}
+
+#endif
diff --git a/beast/HTTP.h b/beast/HTTP.h
new file mode 100644
index 0000000000..400191ed25
--- /dev/null
+++ b/beast/HTTP.h
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_HTTP_H_INCLUDED
+#define BEAST_HTTP_H_INCLUDED
+
+#include "http/URL.h"
+#include "http/ParsedURL.h"
+
+#endif
diff --git a/modules/beast_core/memory/beast_HeapBlock.h b/beast/HeapBlock.h
similarity index 88%
rename from modules/beast_core/memory/beast_HeapBlock.h
rename to beast/HeapBlock.h
index 8d4dfc92f8..875dae0e47 100644
--- a/modules/beast_core/memory/beast_HeapBlock.h
+++ b/beast/HeapBlock.h
@@ -24,6 +24,46 @@
 #ifndef BEAST_HEAPBLOCK_H_INCLUDED
 #define BEAST_HEAPBLOCK_H_INCLUDED
 
+#include <cstddef>
+#include <cstdlib>
+#include <stdexcept>
+
+#include "Memory.h"
+#include "Uncopyable.h"
+
+// If the MSVC debug heap headers were included, disable
+// the macros during the juce include since they conflict.
+#ifdef _CRTDBG_MAP_ALLOC
+#pragma push_macro("calloc")
+#pragma push_macro("free")
+#pragma push_macro("malloc")
+#pragma push_macro("realloc")
+#pragma push_macro("_recalloc")
+#pragma push_macro("_aligned_free")
+#pragma push_macro("_aligned_malloc")
+#pragma push_macro("_aligned_offset_malloc")
+#pragma push_macro("_aligned_realloc")
+#pragma push_macro("_aligned_recalloc")
+#pragma push_macro("_aligned_offset_realloc")
+#pragma push_macro("_aligned_offset_recalloc")
+#pragma push_macro("_aligned_msize")
+#undef calloc
+#undef free
+#undef malloc
+#undef realloc
+#undef _recalloc
+#undef _aligned_free
+#undef _aligned_malloc
+#undef _aligned_offset_malloc
+#undef _aligned_realloc
+#undef _aligned_recalloc
+#undef _aligned_offset_realloc
+#undef _aligned_offset_recalloc
+#undef _aligned_msize
+#endif
+
+namespace beast {
+
 #ifndef DOXYGEN
 namespace HeapBlockHelper
 {
@@ -305,5 +345,23 @@ private:
    #endif
 };
 
+}
+
+#ifdef _CRTDBG_MAP_ALLOC
+#pragma pop_macro("_aligned_msize")
+#pragma pop_macro("_aligned_offset_recalloc")
+#pragma pop_macro("_aligned_offset_realloc")
+#pragma pop_macro("_aligned_recalloc")
+#pragma pop_macro("_aligned_realloc")
+#pragma pop_macro("_aligned_offset_malloc")
+#pragma pop_macro("_aligned_malloc")
+#pragma pop_macro("_aligned_free")
+#pragma pop_macro("_recalloc")
+#pragma pop_macro("realloc")
+#pragma pop_macro("malloc")
+#pragma pop_macro("free")
+#pragma pop_macro("calloc")
+#endif
+
+#endif
 
-#endif   // BEAST_HEAPBLOCK_H_INCLUDED
diff --git a/beast/Intrusive.h b/beast/Intrusive.h
new file mode 100644
index 0000000000..065b92c9dd
--- /dev/null
+++ b/beast/Intrusive.h
@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_INTRUSIVE_H_INCLUDED
+#define BEAST_INTRUSIVE_H_INCLUDED
+
+#include "intrusive/ForwardList.h"
+#include "intrusive/IntrusiveArray.h"
+#include "intrusive/List.h"
+#include "intrusive/LockFreeStack.h"
+
+#endif
diff --git a/beast/mpl.h b/beast/MPL.h
similarity index 95%
rename from beast/mpl.h
rename to beast/MPL.h
index 051931e688..3be24c673a 100644
--- a/beast/mpl.h
+++ b/beast/MPL.h
@@ -21,7 +21,9 @@
 #define BEAST_MPL_H_INCLUDED
 
 #include "mpl/AddConst.h"
+#include "mpl/CopyConst.h"
 #include "mpl/IfCond.h"
+#include "mpl/IsCallPossible.h"
 #include "mpl/PointerToOther.h"
 #include "mpl/RemoveConst.h"
 #include "mpl/RemoveConstVolatile.h"
diff --git a/modules/beast_core/memory/beast_Memory.h b/beast/Memory.h
similarity index 86%
rename from modules/beast_core/memory/beast_Memory.h
rename to beast/Memory.h
index b67ec0cd7a..538e82e5a0 100644
--- a/modules/beast_core/memory/beast_Memory.h
+++ b/beast/Memory.h
@@ -24,13 +24,21 @@
 #ifndef BEAST_MEMORY_H_INCLUDED
 #define BEAST_MEMORY_H_INCLUDED
 
+#include <cstring>
+    
+#include "Config.h"
+
+namespace beast {
+
 //==============================================================================
 /** Fills a block of memory with zeros. */
-inline void zeromem (void* memory, size_t numBytes) noexcept        { memset (memory, 0, numBytes); }
+inline void zeromem (void* memory, size_t numBytes) noexcept
+    { memset (memory, 0, numBytes); }
 
 /** Overwrites a structure or object with zeros. */
 template <typename Type>
-inline void zerostruct (Type& structure) noexcept                   { memset (&structure, 0, sizeof (structure)); }
+void zerostruct (Type& structure) noexcept
+    { memset (&structure, 0, sizeof (structure)); }
 
 /** Delete an object pointer, and sets the pointer to null.
 
@@ -38,26 +46,30 @@ inline void zerostruct (Type& structure) noexcept                   { memset (&s
     or other automatic lifetime-management system rather than resorting to deleting raw pointers!
 */
 template <typename Type>
-inline void deleteAndZero (Type& pointer)                           { delete pointer; pointer = nullptr; }
+void deleteAndZero (Type& pointer)
+    { delete pointer; pointer = nullptr; }
 
 /** A handy function which adds a number of bytes to any type of pointer and returns the result.
     This can be useful to avoid casting pointers to a char* and back when you want to move them by
     a specific number of bytes,
 */
 template <typename Type, typename IntegerType>
-inline Type* addBytesToPointer (Type* pointer, IntegerType bytes) noexcept  { return (Type*) (((char*) pointer) + bytes); }
+Type* addBytesToPointer (Type* pointer, IntegerType bytes) noexcept
+    { return (Type*) (((char*) pointer) + bytes); }
 
 /** A handy function which returns the difference between any two pointers, in bytes.
     The address of the second pointer is subtracted from the first, and the difference in bytes is returned.
 */
 template <typename Type1, typename Type2>
-inline int getAddressDifference (Type1* pointer1, Type2* pointer2) noexcept  { return (int) (((const char*) pointer1) - (const char*) pointer2); }
+int getAddressDifference (Type1* pointer1, Type2* pointer2) noexcept
+    { return (int) (((const char*) pointer1) - (const char*) pointer2); }
 
 /** If a pointer is non-null, this returns a new copy of the object that it points to, or safely returns
     nullptr if the pointer is null.
 */
 template <class Type>
-inline Type* createCopyIfNotNull (const Type* pointer)     { return pointer != nullptr ? new Type (*pointer) : nullptr; }
+Type* createCopyIfNotNull (const Type* pointer)
+    { return pointer != nullptr ? new Type (*pointer) : nullptr; }
 
 //==============================================================================
 #if BEAST_MAC || BEAST_IOS || DOXYGEN
@@ -90,5 +102,7 @@ inline Type* createCopyIfNotNull (const Type* pointer)     { return pointer != n
  #define BEAST_AUTORELEASEPOOL
 #endif
 
+}
+
 #endif
 
diff --git a/beast/Net.h b/beast/Net.h
new file mode 100644
index 0000000000..091c940f05
--- /dev/null
+++ b/beast/Net.h
@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_NET_H_INCLUDED
+#define BEAST_NET_H_INCLUDED
+
+#include "net/BufferType.h"
+#include "net/DynamicBuffer.h"
+
+#include "net/IPEndpoint.h"
+
+#endif
diff --git a/modules/beast_core/diagnostic/beast_SafeBool.h b/beast/SafeBool.h
similarity index 93%
rename from modules/beast_core/diagnostic/beast_SafeBool.h
rename to beast/SafeBool.h
index 1b6dfad0e3..fbae195923 100644
--- a/modules/beast_core/diagnostic/beast_SafeBool.h
+++ b/beast/SafeBool.h
@@ -20,23 +20,11 @@
 #ifndef BEAST_SAFEBOOL_H_INCLUDED
 #define BEAST_SAFEBOOL_H_INCLUDED
 
-/** Safe evaluation of class as `bool`.
+namespace beast {
 
-    This allows a class to be safely evaluated as a bool without the usual
-    harmful side effects of the straightforward operator conversion approach.
-    To use it, derive your class from SafeBool and implement `asBoolean()` as:
+namespace detail {
 
-    @code
-
-    bool asBoolean () const;
-
-    @endcode
-
-    Ideas from http://www.artima.com/cppsource/safebool.html
-
-    @class SafeBool
-*/
-class BEAST_API SafeBoolBase
+class SafeBoolBase
 {
 private:
     void disallowed () const { }
@@ -56,11 +44,29 @@ protected:
     ~SafeBoolBase () { }
 };
 
+}
+
+/** Safe evaluation of class as `bool`.
+
+    This allows a class to be safely evaluated as a bool without the usual
+    harmful side effects of the straightforward operator conversion approach.
+    To use it, derive your class from SafeBool and implement `asBoolean()` as:
+
+    @code
+
+    bool asBoolean () const;
+
+    @endcode
+
+    Ideas from http://www.artima.com/cppsource/safebool.html
+
+    @class SafeBool
+*/
 template <typename T = void>
-class SafeBool : public SafeBoolBase
+class SafeBool : public detail::SafeBoolBase
 {
 public:
-    operator boolean_t () const
+    operator detail::SafeBoolBase::boolean_t () const
     {
         return (static_cast <T const*> (this))->asBoolean ()
                ? &SafeBoolBase::allowed : 0;
@@ -82,6 +88,8 @@ void operator!= (SafeBool <T> const& lhs, SafeBool <U> const& rhs)
     lhs.disallowed ();
 }
 
+}
+
 #endif
 
 
diff --git a/beast/SmartPtr.h b/beast/SmartPtr.h
new file mode 100644
index 0000000000..13aab726a8
--- /dev/null
+++ b/beast/SmartPtr.h
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_SMARTPTR_H_INCLUDED
+#define BEAST_SMARTPTR_H_INCLUDED
+
+#include "Config.h"
+
+#include "smart_ptr/ContainerDeletePolicy.h"
+#include "smart_ptr/SharedObject.h"
+#include "smart_ptr/SharedPtr.h"
+#include "smart_ptr/ScopedPointer.h"
+
+#endif
diff --git a/modules/beast_core/thread/beast_GlobalThreadGroup.h b/beast/StaticAssert.h
similarity index 62%
rename from modules/beast_core/thread/beast_GlobalThreadGroup.h
rename to beast/StaticAssert.h
index 689b258b9c..1c36d0bd1c 100644
--- a/modules/beast_core/thread/beast_GlobalThreadGroup.h
+++ b/beast/StaticAssert.h
@@ -17,33 +17,29 @@
 */
 //==============================================================================
 
-#ifndef BEAST_GLOBALTHREADGROUP_H_INCLUDED
-#define BEAST_GLOBALTHREADGROUP_H_INCLUDED
+#ifndef BEAST_STATICASSERT_H_INCLUDED
+#define BEAST_STATICASSERT_H_INCLUDED
 
-/*============================================================================*/
-/**
-  A ThreadGroup singleton.
-
-  @see ThreadGroup
-
-  @ingroup beast_concurrent
-*/
-class BEAST_API GlobalThreadGroup : public ThreadGroup,
-    public SharedSingleton <GlobalThreadGroup>
+#ifndef DOXYGEN
+namespace beast
 {
-private:
-    friend class SharedSingleton <GlobalThreadGroup>;
+    template <bool b>
+    struct BeastStaticAssert;
 
-    GlobalThreadGroup ()
-        : SharedSingleton <GlobalThreadGroup> (
-            SingletonLifetime::persistAfterCreation)
+    template <>
+    struct BeastStaticAssert <true>
     {
-    }
+        static void dummy() {}
+    };
+}
+#endif
 
-    static GlobalThreadGroup* createInstance ()
-    {
-        return new GlobalThreadGroup;
-    }
-};
+/** A compile-time assertion macro.
+    If the expression parameter is false, the macro will cause a compile error.
+    (The actual error message that the compiler generates may be completely
+    bizarre and seem to have no relation to the place where you put the
+    static_assert though!)
+*/
+#define static_bassert(expression) beast::BeastStaticAssert<expression>::dummy();
 
 #endif
diff --git a/beast/Strings.h b/beast/Strings.h
new file mode 100644
index 0000000000..5b76162400
--- /dev/null
+++ b/beast/Strings.h
@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_STRINGS_H_INCLUDED
+#define BEAST_STRINGS_H_INCLUDED
+
+#include "strings/String.h"
+#include "strings/NewLine.h"
+
+#endif
+
diff --git a/modules/beast_core/memory/beast_FifoFreeStore.h b/beast/Threads.h
similarity index 67%
rename from modules/beast_core/memory/beast_FifoFreeStore.h
rename to beast/Threads.h
index 1acbbf79d9..6c3859d9a6 100644
--- a/modules/beast_core/memory/beast_FifoFreeStore.h
+++ b/beast/Threads.h
@@ -17,22 +17,21 @@
 */
 //==============================================================================
 
-#ifndef BEAST_FIFOFREESTORE_H_INCLUDED
-#define BEAST_FIFOFREESTORE_H_INCLUDED
+#ifndef BEAST_THREADS_H_INCLUDED
+#define BEAST_THREADS_H_INCLUDED
 
-/** Selected free store based on compilation settings.
-
-    @ingroup beast_concurrent
-*/
-// VFALCO NOTE Disabled this because it seems that the TLS
-//             implementation has a leak. Although the other
-//             one also seems to have a leak.
-//
-//#if BEAST_USE_BOOST_FEATURES
-#if 0
-typedef FifoFreeStoreWithTLS FifoFreeStoreType;
-#else
-typedef FifoFreeStoreWithoutTLS FifoFreeStoreType;
-#endif
+#include "threads/LockGuard.h"
+#include "threads/UnlockGuard.h"
+#include "threads/TryLockGuard.h"
+#include "threads/SharedLockGuard.h"
+#include "threads/SharedMutexAdapter.h"
+#include "threads/SharedData.h"
+#include "threads/ServiceQueue.h"
+#include "threads/SpinLock.h"
+#include "threads/Stoppable.h"
+#include "threads/Thread.h"
+#include "threads/ThreadLocalValue.h"
+#include "threads/WaitableEvent.h"
+#include "threads/ScopedWrapperContext.h"
 
 #endif
diff --git a/beast/TypeTraits.h b/beast/TypeTraits.h
new file mode 100644
index 0000000000..6af5fedc1a
--- /dev/null
+++ b/beast/TypeTraits.h
@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_TYPETRAITS_H_INCLUDED
+#define BEAST_TYPETRAITS_H_INCLUDED
+
+#include "type_traits/IntegralConstant.h"
+#include "type_traits/IsIntegral.h"
+#include "type_traits/IsSigned.h"
+#include "type_traits/RemoveSigned.h"
+
+#endif
diff --git a/modules/beast_core/memory/beast_Uncopyable.h b/beast/Uncopyable.h
similarity index 95%
rename from modules/beast_core/memory/beast_Uncopyable.h
rename to beast/Uncopyable.h
index 0ddf154c4e..20a41770ba 100644
--- a/modules/beast_core/memory/beast_Uncopyable.h
+++ b/beast/Uncopyable.h
@@ -20,6 +20,11 @@
 #ifndef BEAST_UNCOPYABLE_H_INCLUDED
 #define BEAST_UNCOPYABLE_H_INCLUDED
 
+namespace beast
+{
+
+// Ideas from boost
+
 /** Prevent copy construction and assignment.
 
     This is used to suppress warnings and prevent unsafe operations on
@@ -59,12 +64,14 @@
 class Uncopyable
 {
 protected:
-    inline Uncopyable () { }
-    inline ~Uncopyable () { }
+    Uncopyable () { }
+    ~Uncopyable () { }
 
 private:
     Uncopyable (Uncopyable const&);
     Uncopyable const& operator= (Uncopyable const&);
 };
 
+}
+
 #endif
diff --git a/beast/Utility.h b/beast/Utility.h
new file mode 100644
index 0000000000..b7cd0854ce
--- /dev/null
+++ b/beast/Utility.h
@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_UTILITY_H_INCLUDED
+#define BEAST_UTILITY_H_INCLUDED
+
+#include "utility/BaseFromMember.h"
+#include "utility/Debug.h"
+#include "utility/EnableIf.h"
+#include "utility/Error.h"
+#include "utility/Journal.h"
+#include "utility/LeakChecked.h"
+#include "utility/PropertyStream.h"
+#include "utility/StaticObject.h"
+
+#endif
+
diff --git a/beast/Version.h b/beast/Version.h
new file mode 100644
index 0000000000..e409692fb6
--- /dev/null
+++ b/beast/Version.h
@@ -0,0 +1,40 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_VERSION_H_INCLUDED
+#define BEAST_VERSION_H_INCLUDED
+
+/** Current BEAST version number.
+    See also SystemStats::getBeastVersion() for a string version.
+*/
+// VFALCO TODO Replace this with SemanticVerson
+#define BEAST_MAJOR_VERSION      1
+#define BEAST_MINOR_VERSION      0
+#define BEAST_BUILDNUMBER        0
+
+/** Current Beast version number.
+    Bits 16 to 32 = major version.
+    Bits 8 to 16 = minor version.
+    Bits 0 to 8 = point release.
+    See also SystemStats::getBeastVersion() for a string version.
+*/
+#define BEAST_VERSION ((BEAST_MAJOR_VERSION << 16) + (BEAST_MINOR_VERSION << 8) + BEAST_BUILDNUMBER)
+
+#endif
+
diff --git a/beast/boost/Boost.cpp b/beast/boost/Boost.cpp
new file mode 100644
index 0000000000..7e26631060
--- /dev/null
+++ b/beast/boost/Boost.cpp
@@ -0,0 +1,22 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "ErrorCode.h"
diff --git a/beast/boost/ErrorCode.h b/beast/boost/ErrorCode.h
new file mode 100644
index 0000000000..ea2fb8436b
--- /dev/null
+++ b/beast/boost/ErrorCode.h
@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_BOOST_ERRORCODE_H_INCLUDED
+#define BEAST_BOOST_ERRORCODE_H_INCLUDED
+
+#include <boost/system/error_code.hpp>
+
+namespace beast {
+
+// Lift this into our namespace. For now we will
+// use boost, and then switch to std::error_code when
+// it is available on all our supported platforms.
+//
+typedef boost::system::error_code ErrorCode;
+
+}
+
+#endif
diff --git a/beast/chrono/CPUMeter.h b/beast/chrono/CPUMeter.h
new file mode 100644
index 0000000000..b78da25d74
--- /dev/null
+++ b/beast/chrono/CPUMeter.h
@@ -0,0 +1,158 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CHRONO_CPUMETER_H_INCLUDED
+#define BEAST_CHRONO_CPUMETER_H_INCLUDED
+
+#include "RelativeTime.h"
+#include "ScopedTimeInterval.h"
+#include "../threads/SharedData.h"
+#include "../Atomic.h"
+
+namespace beast {
+
+/** Measurements of CPU utilization. */
+class CPUMeter
+{
+private:
+    struct MeasureIdle
+    {
+        explicit MeasureIdle (CPUMeter& meter)
+            : m_meter (&meter)
+            { }
+        void operator() (RelativeTime const& interval) const
+            { m_meter->addIdleTime (interval); }
+        CPUMeter* m_meter;
+    };
+
+    struct MeasureActive
+    {
+        explicit MeasureActive (CPUMeter& meter)
+            : m_meter (&meter)
+            { }
+        void operator() (RelativeTime const& interval) const
+            { m_meter->addActiveTime (interval); }
+        CPUMeter* m_meter;
+    };
+
+    enum
+    {
+        // The amount of time an aggregate must accrue before a swap
+        secondsPerAggregate     = 3
+
+        // The number of aggregates in the rolling history buffer
+        ,numberOfAggregates     = 20
+    };
+
+    // Aggregated sample data
+    struct Aggregate
+    {
+        RelativeTime idle;
+        RelativeTime active;
+
+        // Returns the total number of seconds in the aggregate
+        double seconds () const
+            { return idle.inSeconds() + active.inSeconds(); }
+
+        // Reset the accumulated times
+        void clear ()
+            { idle = RelativeTime (0); active = RelativeTime (0); }
+
+        Aggregate& operator+= (Aggregate const& other)
+            { idle += other.idle; active += other.active; return *this; }
+
+        Aggregate& operator-= (Aggregate const& other)
+            { idle -= other.idle; active -= other.active; return *this; }
+    };
+
+    struct State
+    {
+        State () : index (0)
+        {
+        }
+
+        // Returns a reference to the current aggregate
+        Aggregate& front ()
+        {
+            return history [index];
+        }
+
+        // Checks the current aggregate to see if we should advance
+        void update()
+        {
+            if (front().seconds() >= secondsPerAggregate)
+                advance();
+        }
+
+        // Advance the index in the rolling history
+        void advance ()
+        {
+            usage += history [index];
+            index = (index+1) % numberOfAggregates;
+            usage -= history [index];
+            history [index].clear ();
+        }
+
+        // Index of the current aggregate we are accumulating
+        int index;
+
+        // Delta summed usage over the entire history buffer
+        Aggregate usage;
+
+        // The rolling history buffer
+        Aggregate history [numberOfAggregates];
+    };
+
+    typedef SharedData <State> SharedState;
+
+    SharedState m_state;
+
+    void addIdleTime (RelativeTime const& interval)
+    {
+        SharedState::Access state (m_state);
+        state->front().idle += interval;
+        state->update();
+    }
+
+    void addActiveTime (RelativeTime const& interval)
+    {
+        SharedState::Access state (m_state);
+        state->front().active += interval;
+        state->update();
+    }
+
+public:
+    /** The type of container that measures idle time. */
+    typedef ScopedTimeInterval <MeasureIdle>    ScopedIdleTime;
+    typedef ScopedTimeInterval <MeasureActive>  ScopedActiveTime;
+
+    /** Returns the fraction of time that the CPU is being used. */
+    double getUtilizaton () const
+    {
+        SharedState::ConstAccess state (m_state);
+        double const seconds (state->usage.seconds());
+        if (seconds > 0)
+            return (state->usage.active.inSeconds() / seconds);
+        return 0;
+    }
+};
+
+}
+
+#endif
diff --git a/beast/chrono/Chrono.cpp b/beast/chrono/Chrono.cpp
new file mode 100644
index 0000000000..5ce5772e66
--- /dev/null
+++ b/beast/chrono/Chrono.cpp
@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "impl/CPUMeter.cpp"
+#include "impl/RelativeTime.cpp"
diff --git a/modules/beast_core/time/beast_RelativeTime.h b/beast/chrono/RelativeTime.h
similarity index 71%
rename from modules/beast_core/time/beast_RelativeTime.h
rename to beast/chrono/RelativeTime.h
index ed8c1f3ff2..41a65df625 100644
--- a/modules/beast_core/time/beast_RelativeTime.h
+++ b/beast/chrono/RelativeTime.h
@@ -21,8 +21,16 @@
 */
 //==============================================================================
 
-#ifndef BEAST_RELATIVETIME_H_INCLUDED
-#define BEAST_RELATIVETIME_H_INCLUDED
+#ifndef BEAST_CHRONO_RELATIVETIME_H_INCLUDED
+#define BEAST_CHRONO_RELATIVETIME_H_INCLUDED
+
+#include "../Config.h"
+#include "../strings/String.h"
+
+#include <string>
+#include <sstream>
+
+namespace beast {
 
 //==============================================================================
 /** A relative measure of time.
@@ -35,13 +43,22 @@
 class BEAST_API  RelativeTime
 {
 public:
+    //==============================================================================
+    /** The underlying data type used by RelativeTime.
+
+        If you need to get to the underlying time and manipulate it
+        you can use this to declare a type that is guaranteed to
+        work cleanly.
+    */
+    typedef double value_type;
+
     //==============================================================================
     /** Creates a RelativeTime.
 
         @param seconds  the number of seconds, which may be +ve or -ve.
         @see milliseconds, minutes, hours, days, weeks
     */
-    explicit RelativeTime (double seconds = 0.0) noexcept;
+    explicit RelativeTime (value_type seconds = 0.0) noexcept;
 
     /** Copies another relative time. */
     RelativeTime (const RelativeTime& other) noexcept;
@@ -52,6 +69,15 @@ public:
     /** Destructor. */
     ~RelativeTime() noexcept;
 
+    bool isZero() const
+        { return numSeconds == 0; }
+
+    bool isNotZero() const
+        { return numSeconds != 0; }
+
+    /** Returns the amount of time since the process was started. */
+    static RelativeTime fromStartup ();
+
     //==============================================================================
     /** Creates a new RelativeTime object representing a number of milliseconds.
         @see seconds, minutes, hours, days, weeks
@@ -66,27 +92,27 @@ public:
     /** Creates a new RelativeTime object representing a number of seconds.
         @see milliseconds, minutes, hours, days, weeks
     */
-    static RelativeTime seconds (double seconds) noexcept;
+    static RelativeTime seconds (value_type seconds) noexcept;
 
     /** Creates a new RelativeTime object representing a number of minutes.
         @see milliseconds, hours, days, weeks
     */
-    static RelativeTime minutes (double numberOfMinutes) noexcept;
+    static RelativeTime minutes (value_type numberOfMinutes) noexcept;
 
     /** Creates a new RelativeTime object representing a number of hours.
         @see milliseconds, minutes, days, weeks
     */
-    static RelativeTime hours (double numberOfHours) noexcept;
+    static RelativeTime hours (value_type numberOfHours) noexcept;
 
     /** Creates a new RelativeTime object representing a number of days.
         @see milliseconds, minutes, hours, weeks
     */
-    static RelativeTime days (double numberOfDays) noexcept;
+    static RelativeTime days (value_type numberOfDays) noexcept;
 
     /** Creates a new RelativeTime object representing a number of weeks.
         @see milliseconds, minutes, hours, days
     */
-    static RelativeTime weeks (double numberOfWeeks) noexcept;
+    static RelativeTime weeks (value_type numberOfWeeks) noexcept;
 
     //==============================================================================
     /** Returns the number of milliseconds this time represents.
@@ -97,27 +123,27 @@ public:
     /** Returns the number of seconds this time represents.
         @see inMilliseconds, inMinutes, inHours, inDays, inWeeks
     */
-    double inSeconds() const noexcept       { return numSeconds; }
+    value_type inSeconds() const noexcept       { return numSeconds; }
 
     /** Returns the number of minutes this time represents.
         @see inMilliseconds, inSeconds, inHours, inDays, inWeeks
     */
-    double inMinutes() const noexcept;
+    value_type inMinutes() const noexcept;
 
     /** Returns the number of hours this time represents.
         @see inMilliseconds, inSeconds, inMinutes, inDays, inWeeks
     */
-    double inHours() const noexcept;
+    value_type inHours() const noexcept;
 
     /** Returns the number of days this time represents.
         @see inMilliseconds, inSeconds, inMinutes, inHours, inWeeks
     */
-    double inDays() const noexcept;
+    value_type inDays() const noexcept;
 
     /** Returns the number of weeks this time represents.
         @see inMilliseconds, inSeconds, inMinutes, inHours, inDays
     */
-    double inWeeks() const noexcept;
+    value_type inWeeks() const noexcept;
 
     /** Returns a readable textual description of the time.
 
@@ -135,42 +161,55 @@ public:
         @see inMilliseconds, inSeconds, inMinutes, inHours, inDays, inWeeks
     */
     String getDescription (const String& returnValueForZeroTime = "0") const;
+    std::string to_string () const;
 
+    template <typename Number>
+    RelativeTime operator+ (Number seconds) const noexcept
+        { return RelativeTime (numSeconds + seconds); }
+
+    template <typename Number>
+    RelativeTime operator- (Number seconds) const noexcept
+        { return RelativeTime (numSeconds - seconds); }
 
-    //==============================================================================
     /** Adds another RelativeTime to this one. */
     RelativeTime operator+= (RelativeTime timeToAdd) noexcept;
+
     /** Subtracts another RelativeTime from this one. */
     RelativeTime operator-= (RelativeTime timeToSubtract) noexcept;
 
     /** Adds a number of seconds to this time. */
-    RelativeTime operator+= (double secondsToAdd) noexcept;
+    RelativeTime operator+= (value_type secondsToAdd) noexcept;
+
     /** Subtracts a number of seconds from this time. */
-    RelativeTime operator-= (double secondsToSubtract) noexcept;
+    RelativeTime operator-= (value_type secondsToSubtract) noexcept;
 
 private:
-    //==============================================================================
-    double numSeconds;
+    value_type numSeconds;
 };
 
-//==============================================================================
-/** Compares two RelativeTimes. */
+//------------------------------------------------------------------------------
+
 bool operator== (RelativeTime t1, RelativeTime t2) noexcept;
-/** Compares two RelativeTimes. */
 bool operator!= (RelativeTime t1, RelativeTime t2) noexcept;
-/** Compares two RelativeTimes. */
 bool operator>  (RelativeTime t1, RelativeTime t2) noexcept;
-/** Compares two RelativeTimes. */
 bool operator<  (RelativeTime t1, RelativeTime t2) noexcept;
-/** Compares two RelativeTimes. */
 bool operator>= (RelativeTime t1, RelativeTime t2) noexcept;
-/** Compares two RelativeTimes. */
 bool operator<= (RelativeTime t1, RelativeTime t2) noexcept;
 
-//==============================================================================
-/** Adds two RelativeTimes together. */
-RelativeTime  operator+  (RelativeTime t1, RelativeTime t2) noexcept;
-/** Subtracts two RelativeTimes. */
-RelativeTime  operator-  (RelativeTime t1, RelativeTime t2) noexcept;
+//------------------------------------------------------------------------------
 
-#endif   // BEAST_RELATIVETIME_H_INCLUDED
+/** Adds two RelativeTimes together. */
+RelativeTime operator+ (RelativeTime t1, RelativeTime t2) noexcept;
+
+/** Subtracts two RelativeTimes. */
+RelativeTime operator- (RelativeTime t1, RelativeTime t2) noexcept;
+
+inline std::ostream& operator<< (std::ostream& os, RelativeTime const& diff)
+{
+    os << diff.to_string();
+    return os;
+}
+
+}
+
+#endif
diff --git a/modules/beast_core/memory/beast_GlobalPagedFreeStore.h b/beast/chrono/ScopedTimeInterval.h
similarity index 55%
rename from modules/beast_core/memory/beast_GlobalPagedFreeStore.h
rename to beast/chrono/ScopedTimeInterval.h
index 5e2d4e3ca4..53b85b7427 100644
--- a/modules/beast_core/memory/beast_GlobalPagedFreeStore.h
+++ b/beast/chrono/ScopedTimeInterval.h
@@ -17,43 +17,46 @@
 */
 //==============================================================================
 
-#ifndef BEAST_GLOBALPAGEDFREESTORE_H_INCLUDED
-#define BEAST_GLOBALPAGEDFREESTORE_H_INCLUDED
+#ifndef BEAST_CHRONO_SCOPEDTIMEINTERVAL_H_INCLUDED
+#define BEAST_CHRONO_SCOPEDTIMEINTERVAL_H_INCLUDED
 
-/*============================================================================*/
-/**
-  A PagedFreeStore singleton.
+#include "../Uncopyable.h"
+#include "RelativeTime.h"
 
-  @ingroup beast_concurrent
+namespace beast {
+
+/** Time measurement using scoped RAII container. 
+    UnaryFunction will be called with this signature:
+        void (RelativeTime const& interval);
 */
-class BEAST_API GlobalPagedFreeStore
-    : public SharedSingleton <GlobalPagedFreeStore>
-    , LeakChecked <GlobalPagedFreeStore>
+template <class UnaryFunction>
+class ScopedTimeInterval : public Uncopyable
 {
 public:
-    GlobalPagedFreeStore ();
-    ~GlobalPagedFreeStore ();
-
-public:
-    inline size_t getPageBytes ()
+    /** Create the measurement with a default-constructed UnaryFunction. */
+    ScopedTimeInterval ()
+        : m_start (RelativeTime::fromStartup())
     {
-        return m_allocator.getPageBytes ();
     }
 
-    inline void* allocate ()
+    /** Create the measurement with UnaryFunction constructed from one argument. */
+    template <typename Arg>
+    explicit ScopedTimeInterval (Arg& arg)
+        : m_func (arg)
+        , m_start (RelativeTime::fromStartup ())
     {
-        return m_allocator.allocate ();
     }
 
-    static inline void deallocate (void* const p)
+    ~ScopedTimeInterval ()
     {
-        PagedFreeStore::deallocate (p);
+        m_func (RelativeTime::fromStartup() - m_start);
     }
 
-    static GlobalPagedFreeStore* createInstance ();
-
 private:
-    PagedFreeStore m_allocator;
+    UnaryFunction m_func;
+    RelativeTime m_start;
 };
 
+}
+
 #endif
diff --git a/beast/chrono/impl/CPUMeter.cpp b/beast/chrono/impl/CPUMeter.cpp
new file mode 100644
index 0000000000..b5a67f4d1b
--- /dev/null
+++ b/beast/chrono/impl/CPUMeter.cpp
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../CPUMeter.h"
+
diff --git a/beast/chrono/impl/RelativeTime.cpp b/beast/chrono/impl/RelativeTime.cpp
new file mode 100644
index 0000000000..c18bc8f864
--- /dev/null
+++ b/beast/chrono/impl/RelativeTime.cpp
@@ -0,0 +1,326 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../RelativeTime.h"
+
+// VFALCO TODO Migrate the localizable strings interfaces for this file
+
+#ifndef NEEDS_TRANS
+#define NEEDS_TRANS(s) (s)
+#endif
+
+#ifndef TRANS
+#define TRANS(s) (s)
+#endif
+
+namespace beast {
+
+RelativeTime::RelativeTime (const RelativeTime::value_type secs) noexcept
+    : numSeconds (secs)
+{
+}
+
+RelativeTime::RelativeTime (const RelativeTime& other) noexcept
+    : numSeconds (other.numSeconds)
+{
+}
+
+RelativeTime::~RelativeTime() noexcept {}
+
+//==============================================================================
+
+RelativeTime RelativeTime::milliseconds (const int milliseconds) noexcept
+{
+    return RelativeTime (milliseconds * 0.001);
+}
+
+RelativeTime RelativeTime::milliseconds (const int64 milliseconds) noexcept
+{
+    return RelativeTime (milliseconds * 0.001);
+}
+
+RelativeTime RelativeTime::seconds (RelativeTime::value_type s) noexcept
+{
+    return RelativeTime (s);
+}
+
+RelativeTime RelativeTime::minutes (const RelativeTime::value_type numberOfMinutes) noexcept
+{
+    return RelativeTime (numberOfMinutes * 60.0);
+}
+
+RelativeTime RelativeTime::hours (const RelativeTime::value_type numberOfHours) noexcept
+{
+    return RelativeTime (numberOfHours * (60.0 * 60.0));
+}
+
+RelativeTime RelativeTime::days (const RelativeTime::value_type numberOfDays) noexcept
+{
+    return RelativeTime (numberOfDays  * (60.0 * 60.0 * 24.0));
+}
+
+RelativeTime RelativeTime::weeks (const RelativeTime::value_type numberOfWeeks) noexcept
+{
+    return RelativeTime (numberOfWeeks * (60.0 * 60.0 * 24.0 * 7.0));
+}
+
+//==============================================================================
+
+int64 RelativeTime::inMilliseconds() const noexcept
+{
+    return (int64) (numSeconds * 1000.0);
+}
+
+RelativeTime::value_type RelativeTime::inMinutes() const noexcept
+{
+    return numSeconds / 60.0;
+}
+
+RelativeTime::value_type RelativeTime::inHours() const noexcept
+{
+    return numSeconds / (60.0 * 60.0);
+}
+
+RelativeTime::value_type RelativeTime::inDays() const noexcept
+{
+    return numSeconds / (60.0 * 60.0 * 24.0);
+}
+
+RelativeTime::value_type RelativeTime::inWeeks() const noexcept
+{
+    return numSeconds / (60.0 * 60.0 * 24.0 * 7.0);
+}
+
+//==============================================================================
+
+RelativeTime& RelativeTime::operator= (const RelativeTime& other) noexcept      { numSeconds = other.numSeconds; return *this; }
+
+RelativeTime RelativeTime::operator+= (RelativeTime t) noexcept
+{
+    numSeconds += t.numSeconds; return *this;
+}
+
+RelativeTime RelativeTime::operator-= (RelativeTime t) noexcept
+{
+    numSeconds -= t.numSeconds; return *this;
+}
+
+RelativeTime RelativeTime::operator+= (const RelativeTime::value_type secs) noexcept
+{
+    numSeconds += secs; return *this;
+}
+
+RelativeTime RelativeTime::operator-= (const RelativeTime::value_type secs) noexcept
+{
+    numSeconds -= secs; return *this;
+}
+
+RelativeTime operator+ (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1 += t2;
+}
+
+RelativeTime operator- (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1 -= t2;
+}
+
+bool operator== (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1.inSeconds() == t2.inSeconds();
+}
+
+bool operator!= (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1.inSeconds() != t2.inSeconds();
+}
+
+bool operator>  (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1.inSeconds() >  t2.inSeconds();
+}
+
+bool operator<  (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1.inSeconds() <  t2.inSeconds();
+}
+
+bool operator>= (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1.inSeconds() >= t2.inSeconds();
+}
+
+bool operator<= (RelativeTime t1, RelativeTime t2) noexcept
+{
+    return t1.inSeconds() <= t2.inSeconds();
+}
+
+//==============================================================================
+
+static void translateTimeField (String& result, int n, const char* singular, const char* plural)
+{
+    result << TRANS (String((n == 1) ? singular : plural))
+                .replace (n == 1 ? "1" : "2", String (n))
+           << ' ';
+}
+
+String RelativeTime::getDescription (const String& returnValueForZeroTime) const
+{
+    if (numSeconds < 0.001 && numSeconds > -0.001)
+        return returnValueForZeroTime;
+
+    String result;
+    result.preallocateBytes (32);
+
+    if (numSeconds < 0)
+        result << '-';
+
+    int fieldsShown = 0;
+    int n = std::abs ((int) inWeeks());
+    if (n > 0)
+    {
+        translateTimeField (result, n, NEEDS_TRANS("1 week"), NEEDS_TRANS("2 weeks"));
+        ++fieldsShown;
+    }
+
+    n = std::abs ((int) inDays()) % 7;
+    if (n > 0)
+    {
+        translateTimeField (result, n, NEEDS_TRANS("1 day"), NEEDS_TRANS("2 days"));
+        ++fieldsShown;
+    }
+
+    if (fieldsShown < 2)
+    {
+        n = std::abs ((int) inHours()) % 24;
+        if (n > 0)
+        {
+            translateTimeField (result, n, NEEDS_TRANS("1 hour"), NEEDS_TRANS("2 hours"));
+            ++fieldsShown;
+        }
+
+        if (fieldsShown < 2)
+        {
+            n = std::abs ((int) inMinutes()) % 60;
+            if (n > 0)
+            {
+                translateTimeField (result, n, NEEDS_TRANS("1 minute"), NEEDS_TRANS("2 minutes"));
+                ++fieldsShown;
+            }
+
+            if (fieldsShown < 2)
+            {
+                n = std::abs ((int) inSeconds()) % 60;
+                if (n > 0)
+                {
+                    translateTimeField (result, n, NEEDS_TRANS("1 seconds"), NEEDS_TRANS("2 seconds"));
+                    ++fieldsShown;
+                }
+
+                if (fieldsShown == 0)
+                {
+                    n = std::abs ((int) inMilliseconds()) % 1000;
+                    if (n > 0)
+                        result << n << ' ' << TRANS ("ms");
+                }
+            }
+        }
+    }
+
+    return result.trimEnd();
+}
+
+std::string RelativeTime::to_string () const
+{
+    return getDescription ().toStdString();
+}
+
+}
+
+#if BEAST_WINDOWS
+
+#include <Windows.h>
+
+namespace beast {
+
+RelativeTime RelativeTime::fromStartup ()
+{
+    ULONGLONG ticks (GetTickCount64());
+
+    return RelativeTime (ticks / 1000.0);
+}
+
+}
+
+#else
+
+#include <time.h>
+
+namespace beast {
+
+namespace detail {
+
+// Converts a timespec to a RelativeTme
+static RelativeTime toRelativeTime (timespec const& ts)
+{
+    return RelativeTime (ts.tv_sec +
+        ts.tv_nsec / 1000000000.0);
+}
+
+// Records and returns the time from process startup
+static RelativeTime getStartupTime()
+{
+    struct StartupTime
+    {
+        StartupTime ()
+            { clock_gettime (CLOCK_MONOTONIC, &ts); }
+        timespec ts;
+    };
+
+    static StartupTime startupTime;
+
+    return toRelativeTime (startupTime.ts);
+}
+
+// Used to call getStartupTime as early as possible
+struct StartupTimeStaticInitializer
+{
+    StartupTimeStaticInitializer ()
+        { getStartupTime(); }
+};
+
+static StartupTimeStaticInitializer startupTimeStaticInitializer;
+
+}
+
+RelativeTime RelativeTime::fromStartup ()
+{
+    timespec ts;
+    clock_gettime (CLOCK_MONOTONIC, &ts);
+
+    return detail::toRelativeTime (ts) - detail::getStartupTime();
+}
+
+}
+
+#endif
diff --git a/modules/beast_core/system/PlatformDefs.h b/beast/config/CompilerConfig.h
similarity index 91%
rename from modules/beast_core/system/PlatformDefs.h
rename to beast/config/CompilerConfig.h
index f9bd910a1d..46e3afbfa5 100644
--- a/modules/beast_core/system/PlatformDefs.h
+++ b/beast/config/CompilerConfig.h
@@ -21,16 +21,20 @@
 */
 //==============================================================================
 
-#ifndef BEAST_PLATFORMDEFS_H_INCLUDED
-#define BEAST_PLATFORMDEFS_H_INCLUDED
+#ifndef BEAST_CONFIG_COMPILERCONFIG_H_INCLUDED
+#define BEAST_CONFIG_COMPILERCONFIG_H_INCLUDED
+
+// This file has to work when included in a C source file.
+
+#ifndef BEAST_CONFIG_PLATFORMCONFIG_H_INCLUDED
+#error "PlatformConfig.h must come first!"
+#endif
 
 // This file defines miscellaneous macros for debugging, assertions, etc.
 
-#ifdef BEAST_FORCE_DEBUG
+#if BEAST_FORCE_DEBUG
 # undef BEAST_DEBUG
-# if BEAST_FORCE_DEBUG
-#  define BEAST_DEBUG 1
-# endif
+# define BEAST_DEBUG 1
 #endif
 
 /** This macro defines the C calling convention used as the standard for Beast calls.
@@ -86,6 +90,17 @@
 
 //------------------------------------------------------------------------------
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+/** Report a fatal error message and terminate the application.
+    Normally you won't call this directly.
+*/
+extern void beast_reportFatalError (char const* message, char const* fileName, int lineNumber);
+#ifdef __cplusplus
+}
+#endif
+
 #if BEAST_DEBUG || DOXYGEN
 
 /** Writes a string to the standard error stream.
@@ -101,17 +116,12 @@
 #define bassertfalse          { beast_LogCurrentAssertion; if (beast::beast_isRunningUnderDebugger()) beast_breakDebugger; BEAST_ANALYZER_NORETURN }
 
 /** Platform-independent assertion macro.
-
     This macro gets turned into a no-op when you're building with debugging turned off, so be
     careful that the expression you pass to it doesn't perform any actions that are vital for the
     correct behaviour of your program!
     @see bassertfalse
   */
-#if 0
-#define bassert(expression)   { if (! (expression)) bassertfalse; }
-#else
-#define bassert(expression)   { if (! (expression)) fatal_error(#expression); }
-#endif
+#define bassert(expression)   { if (! (expression)) beast_reportFatalError(#expression,__FILE__,__LINE__); }
 
 #else
 
@@ -130,21 +140,6 @@
 
 //------------------------------------------------------------------------------
 
-#ifndef DOXYGEN
-namespace beast
-{
-template <bool b> struct BeastStaticAssert;
-template <> struct BeastStaticAssert <true> { static void dummy() {} };
-}
-#endif
-
-/** A compile-time assertion macro.
-    If the expression parameter is false, the macro will cause a compile error. (The actual error
-    message that the compiler generates may be completely bizarre and seem to have no relation to
-    the place where you put the static_assert though!)
-*/
-#define static_bassert(expression)      beast::BeastStaticAssert<expression>::dummy();
-
 /** This macro can be added to class definitions to disable the use of new/delete to
     allocate the object on the heap, forcing it to only be used as a stack or member variable.
 */
@@ -300,4 +295,11 @@ template <> struct BeastStaticAssert <true> { static void dummy() {} };
 #define override
 #endif
 
+#ifdef __cplusplus
+namespace beast {
+bool beast_isRunningUnderDebugger();
+void logAssertion (char const* file, int line) noexcept;
+}
+#endif
+
 #endif
diff --git a/modules/beast_core/system/BeastConfigCheck.h b/beast/config/ConfigCheck.h
similarity index 91%
rename from modules/beast_core/system/BeastConfigCheck.h
rename to beast/config/ConfigCheck.h
index 2ce310578d..7ee5955762 100644
--- a/modules/beast_core/system/BeastConfigCheck.h
+++ b/beast/config/ConfigCheck.h
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CORE_SYSTEM_BEASTCONFIGCHECK_H_INCLUDED
-#define BEAST_CORE_SYSTEM_BEASTCONFIGCHECK_H_INCLUDED
+#ifndef BEAST_CONFIG_CONFIGCHECK_H_INCLUDED
+#define BEAST_CONFIG_CONFIGCHECK_H_INCLUDED
 
 // This file makes sure that BeastConfig.h was included.
 // It also sets defaults for all config options.
@@ -55,10 +55,6 @@
 # endif
 #endif
 
-#ifndef BEAST_CATCH_UNHANDLED_EXCEPTIONS
-#define BEAST_CATCH_UNHANDLED_EXCEPTIONS 0
-#endif
-
 #if BEAST_DEBUG && ! defined (BEAST_CHECK_MEMORY_LEAKS)
 #define BEAST_CHECK_MEMORY_LEAKS 1
 #endif
@@ -73,10 +69,6 @@
 
 //------------------------------------------------------------------------------
 
-#ifndef BEAST_DISABLE_BEAST_VERSION_PRINTING
-#define BEAST_DISABLE_BEAST_VERSION_PRINTING 0
-#endif
-
 #ifndef BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
 #define BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0
 #endif
diff --git a/modules/beast_core/diagnostic/ContractChecks.h b/beast/config/ContractChecks.h
similarity index 92%
rename from modules/beast_core/diagnostic/ContractChecks.h
rename to beast/config/ContractChecks.h
index b7d9e09a0f..59cad4231c 100644
--- a/modules/beast_core/diagnostic/ContractChecks.h
+++ b/beast/config/ContractChecks.h
@@ -17,8 +17,10 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CONTRACTCHECKS_H_INCLUDED
-#define BEAST_CONTRACTCHECKS_H_INCLUDED
+#ifndef BEAST_CONFIG_CONTRACTCHECKS_H_INCLUDED
+#define BEAST_CONFIG_CONTRACTCHECKS_H_INCLUDED
+
+// This file has to work when included in a C source file.
 
 #if defined (fatal_error) || \
     defined (fatal_condition) || \
@@ -33,15 +35,13 @@
 #error "Programming by contract macros cannot be overriden!"
 #endif
 
-extern void reportFatalError (char const* message, char const* fileName, int lineNumber);
-
 /** Report a fatal error message and terminate the application.
     This macro automatically fills in the file and line number
     Meets this declaration syntax:
     @code inline void fatal_error (char const* message); @endif
     @see FatalError
 */
-#define fatal_error(message) reportFatalError (message, __FILE__, __LINE__)
+#define fatal_error(message) beast_reportFatalError (message, __FILE__, __LINE__)
 
 /** Reports a fatal error message type if the condition is false
     The condition is always evaluated regardless of settings.
@@ -49,7 +49,7 @@ extern void reportFatalError (char const* message, char const* fileName, int lin
     @code inline void fatal_condition (bool condition, char const* category); @endcode
 */
 #define fatal_condition(condition,category) static_cast <void> \
-    (((!!(condition)) || (reportFatalError ( \
+    (((!!(condition)) || (beast_reportFatalError ( \
         category " '" BEAST_STRINGIFY(condition) "' failed.", __FILE__, __LINE__), 0)))
 
 /** Replacement for assert which generates a fatal error if the condition is false.
@@ -65,7 +65,7 @@ extern void reportFatalError (char const* message, char const* fileName, int lin
     @code inline void fatal_condition (bool condition, char const* category); @endcode
 */
 #define meets_condition(condition,category) static_cast <bool> \
-    (((!!(condition)) || (reportFatalError ( \
+    (((!!(condition)) || (beast_reportFatalError ( \
         category " '" BEAST_STRINGIFY(condition) "' failed.", __FILE__, __LINE__), false)))
 
 /** Condition tests for programming by contract.
diff --git a/modules/beast_core/system/TargetPlatform.h b/beast/config/PlatformConfig.h
similarity index 98%
rename from modules/beast_core/system/TargetPlatform.h
rename to beast/config/PlatformConfig.h
index 4e60bf1d6d..ec59dab8d7 100644
--- a/modules/beast_core/system/TargetPlatform.h
+++ b/beast/config/PlatformConfig.h
@@ -21,8 +21,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_TARGETPLATFORM_H_INCLUDED
-#define BEAST_TARGETPLATFORM_H_INCLUDED
+#ifndef BEAST_CONFIG_PLATFORMCONFIG_H_INCLUDED
+#define BEAST_CONFIG_PLATFORMCONFIG_H_INCLUDED
 
 //==============================================================================
 /*  This file figures out which platform is being built, and defines some macros
@@ -213,4 +213,5 @@
 #define BEAST_PP_STR1_(x) BEAST_PP_STR2_(x)
 #define BEAST_FILEANDLINE_ __FILE__ "(" BEAST_PP_STR1_(__LINE__) "): warning:"
 
-#endif   // BEAST_TARGETPLATFORM_H_INCLUDED
+#endif
+
diff --git a/beast/config/SelectCompilerConfig.h b/beast/config/SelectCompilerConfig.h
new file mode 100644
index 0000000000..addf083bbe
--- /dev/null
+++ b/beast/config/SelectCompilerConfig.h
@@ -0,0 +1,44 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Ideas from boost
+
+// Intel
+#if defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
+#define BEAST_COMPILER_CONFIG "config/compiler/Intel.h"
+
+// Clang C++ emulates GCC, so it has to appear early.
+#elif defined __clang__
+#define BEAST_COMPILER_CONFIG "config/compiler/Clang.h"
+
+//  GNU C++:
+#elif defined __GNUC__
+#define BEAST_COMPILER_CONFIG "config/compiler/Gcc.h"
+
+//  Microsoft Visual C++
+//
+//  Must remain the last #elif since some other vendors (Metrowerks, for
+//  example) also #define _MSC_VER
+#elif defined _MSC_VER
+#define BEAST_COMPILER_CONFIG "config/compiler/VisualC.h"
+
+#else
+#error "Unsupported compiler."
+#endif
+
diff --git a/modules/beast_core/containers/detail/removecv.h b/beast/config/SelectPlatformConfig.h
similarity index 53%
rename from modules/beast_core/containers/detail/removecv.h
rename to beast/config/SelectPlatformConfig.h
index 19b3d3bc45..eb00e630bc 100644
--- a/modules/beast_core/containers/detail/removecv.h
+++ b/beast/config/SelectPlatformConfig.h
@@ -17,57 +17,28 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CORE_CONTAINERS_DETAIL_REMOVECV_H_INCLUDED
-#define BEAST_CORE_CONTAINERS_DETAIL_REMOVECV_H_INCLUDED
+// Ideas from boost
 
-namespace detail
-{
+// Android, which must be manually set by defining BEAST_ANDROID
+#if defined(BEAST_ANDROID)
+#define BEAST_PLATFORM_CONFIG "config/platform/Android.h"
 
-// Strip all cv qualifiers from T
-template <typename T>
-struct removecv
-{
-	typedef T type;
-};
+// linux, also other platforms (Hurd etc) that use GLIBC
+#elif (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && !defined(_CRAYC)
+#define BEAST_PLATFORM_CONFIG "config/platform/Linux.h"
 
-template <typename T>
-struct removecv <const T>
-{
-	typedef typename removecv <T>::type type;
-};
+// BSD
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#define BEAST_PLATFORM_CONFIG "config/platform/Bsd.h"
 
-template <typename T>
-struct removecv <volatile T>
-{
-	typedef typename removecv <T>::type type;
-};
+// win32
+#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(_WIN64)
+#define BEAST_PLATFORM_CONFIG "config/platform/Win32.h"
 
-template <typename T>
-struct removecv <const volatile T>
-{
-	typedef typename removecv <T>::type type;
-};
-
-template <typename T>
-struct removecv <T*>
-{
-	typedef typename removecv <T>::type type;
-};
-
-template <typename T>
-struct removecv <T&>
-{
-	typedef typename removecv <T>::type type;
-};
-
-#if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
-template <typename T>
-struct removecv <T&&>
-{
-	typedef typename removecv <T>::type type;
-};
-#endif
-
-}
+// MacOS
+#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__APPLE_CPP__)
+#define BEAST_PLATFORM_CONFIG "config/platform/MacOS.h"
 
+#else
+#error "Unsupported platform."
 #endif
diff --git a/beast/config/SelectStdlibConfig.h b/beast/config/SelectStdlibConfig.h
new file mode 100644
index 0000000000..ccc99a2a56
--- /dev/null
+++ b/beast/config/SelectStdlibConfig.h
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Ideas from boost
+
diff --git a/modules/beast_core/system/StandardHeader.h b/beast/config/StandardConfig.h
similarity index 66%
rename from modules/beast_core/system/StandardHeader.h
rename to beast/config/StandardConfig.h
index 43415b9659..6f2a67c875 100644
--- a/modules/beast_core/system/StandardHeader.h
+++ b/beast/config/StandardConfig.h
@@ -21,33 +21,12 @@
 */
 //==============================================================================
 
-#ifndef BEAST_STANDARDHEADER_H_INCLUDED
-#define BEAST_STANDARDHEADER_H_INCLUDED
+#ifndef BEAST_CONFIG_STANDARDCONFIG_H_INCLUDED
+#define BEAST_CONFIG_STANDARDCONFIG_H_INCLUDED
 
-//------------------------------------------------------------------------------
-
-/** Current BEAST version number.
-
-    See also SystemStats::getBeastVersion() for a string version.
-*/
-// VFALCO TODO Replace this with SemanticVerson
-#define BEAST_MAJOR_VERSION      1
-#define BEAST_MINOR_VERSION      0
-#define BEAST_BUILDNUMBER        0
-
-/** Current Beast version number.
-
-    Bits 16 to 32 = major version.
-    Bits 8 to 16 = minor version.
-    Bits 0 to 8 = point release.
-
-    See also SystemStats::getBeastVersion() for a string version.
-*/
-#define BEAST_VERSION   ((BEAST_MAJOR_VERSION << 16) + (BEAST_MINOR_VERSION << 8) + BEAST_BUILDNUMBER)
-
-//------------------------------------------------------------------------------
-
-#include "PlatformDefs.h"
+#ifndef BEAST_CONFIG_COMPILERCONFIG_H_INCLUDED
+#error "CompilerConfig.h must be included first"
+#endif
 
 // Now we'll include some common OS headers..
 #if BEAST_MSVC
@@ -55,45 +34,6 @@
 #pragma warning (disable: 4514 4245 4100)
 #endif
 
-#include <algorithm>
-#include <cfloat>
-#include <climits>
-#include <cmath>
-#include <cstdarg>
-#include <cstddef>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <cwchar>
-#include <exception>
-#include <iostream>
-#include <istream>
-#include <iterator>
-#include <limits>
-#include <list>
-#include <map>
-#include <new>
-#include <numeric>
-#include <ostream>
-#include <sstream>
-#include <stdexcept>
-#include <string>
-#include <typeinfo>
-#include <vector>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <float.h>
-#include <locale.h>
-#include <math.h>
-#include <memory.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #if BEAST_USE_INTRINSICS
 # include <intrin.h>
 #endif
diff --git a/beast/config/Suffix.h b/beast/config/Suffix.h
new file mode 100644
index 0000000000..1a85d4b63e
--- /dev/null
+++ b/beast/config/Suffix.h
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONFIG_SUFFIX_H_INCLUDED
+#define BEAST_CONFIG_SUFFIX_H_INCLUDED
+
+// Included at the end of Config.h
+
+#endif
diff --git a/beast/config/compiler/Clang.h b/beast/config/compiler/Clang.h
new file mode 100644
index 0000000000..25896af5b7
--- /dev/null
+++ b/beast/config/compiler/Clang.h
@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Clang compiler configuration
diff --git a/beast/config/compiler/Gcc.h b/beast/config/compiler/Gcc.h
new file mode 100644
index 0000000000..7b594b0858
--- /dev/null
+++ b/beast/config/compiler/Gcc.h
@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// GNU C++ compiler configuration
diff --git a/beast/config/compiler/Intel.h b/beast/config/compiler/Intel.h
new file mode 100644
index 0000000000..3e5d3cdbc7
--- /dev/null
+++ b/beast/config/compiler/Intel.h
@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Intel compiler configuration
diff --git a/beast/config/compiler/VisualC.h b/beast/config/compiler/VisualC.h
new file mode 100644
index 0000000000..1a238f0607
--- /dev/null
+++ b/beast/config/compiler/VisualC.h
@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Microsoft Visual C++ compiler configuration
diff --git a/beast/config/platform/Android.h b/beast/config/platform/Android.h
new file mode 100644
index 0000000000..9c61ebe105
--- /dev/null
+++ b/beast/config/platform/Android.h
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Android platform configuration
+
+#ifdef BEAST_ANDROID
+#undef BEAST_ANDROID
+#endif
+#define BEAST_ANDROID 1
+
diff --git a/beast/config/platform/Bsd.h b/beast/config/platform/Bsd.h
new file mode 100644
index 0000000000..af96cfdba8
--- /dev/null
+++ b/beast/config/platform/Bsd.h
@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// BSD, FreeBSD platform configuration
diff --git a/beast/config/platform/Linux.h b/beast/config/platform/Linux.h
new file mode 100644
index 0000000000..3d38e9164e
--- /dev/null
+++ b/beast/config/platform/Linux.h
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Linux-compatible platform configuration
+
diff --git a/beast/config/platform/MacOS.h b/beast/config/platform/MacOS.h
new file mode 100644
index 0000000000..a9243f983a
--- /dev/null
+++ b/beast/config/platform/MacOS.h
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// MacOS and iOS platform configuration
+
diff --git a/beast/config/platform/Win32.h b/beast/config/platform/Win32.h
new file mode 100644
index 0000000000..912613df4c
--- /dev/null
+++ b/beast/config/platform/Win32.h
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Win32 platform configuration
+
diff --git a/beast/crypto/Crypto.cpp b/beast/crypto/Crypto.cpp
new file mode 100644
index 0000000000..e2b5228a7e
--- /dev/null
+++ b/beast/crypto/Crypto.cpp
@@ -0,0 +1,22 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "impl/Sha256.cpp"
diff --git a/beast/crypto/Sha256.h b/beast/crypto/Sha256.h
new file mode 100644
index 0000000000..a3f4c5c528
--- /dev/null
+++ b/beast/crypto/Sha256.h
@@ -0,0 +1,156 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CRYPTO_SHA256_H_INCLUDED
+#define BEAST_CRYPTO_SHA256_H_INCLUDED
+
+#include "../Config.h"
+#include "../CStdInt.h"
+#include "../FixedArray.h"
+
+//------------------------------------------------------------------------------
+
+namespace beast {
+namespace Sha256 {
+
+enum
+{
+    digestLength = 32,
+    blockLength = 64
+};
+
+/** A container suitable for holding the resulting hash. */
+typedef FixedArray <uint8, digestLength> digest_type;
+
+namespace detail {
+struct Context
+{
+	beast::uint32 state[8];
+	beast::uint64 bitcount;
+	beast::uint8  buffer[Sha256::blockLength];
+};
+}
+
+/** Computes the Sha256 hash of data. */
+class Context
+{
+public:
+    /** Create a new hasher prepared for input. */
+    Context();
+
+    /** Update the hashing context with the input sequence. */
+    /** @{ */
+    void update (void const* buffer, std::size_t bytes);
+
+    void update (int8 const* begin, int8 const* end)
+    {
+        update (begin, end - begin);
+    }
+
+    void update (uint8 const* begin, uint8 const* end)
+    {
+        update (begin, end - begin);
+    }
+
+    template <typename T>
+    void update (T const& t)
+    {
+        update (&t, sizeof(T));
+    }
+    /** @} */
+
+    /** Finalize the hash process and store the digest.
+        The memory pointed to by `digest` must be at least digestLength
+        bytes. This object may not be re-used after calling finish.
+        @return A pointer to the passed hash buffer.
+    */
+    /** @{ */
+    void* finish (void* digest);
+
+    digest_type& finish (digest_type& digest)
+    {
+        finish (digest.c_array());
+        return digest;
+    }
+
+    digest_type finish ()
+    {
+        digest_type digest;
+        finish (digest);
+        return digest;
+    }
+    /** @} */
+
+private:
+    detail::Context m_context;
+};
+
+//------------------------------------------------------------------------------
+
+/** Returns the hash produced by a single octet equal to zero. */
+digest_type const& empty_digest();
+
+/** Performs an entire hashing operation in a single step.
+    A zero length input sequence produces the empty_digest().
+    @return The resulting digest depending on the arguments.
+*/
+/** @{ */
+void* hash (void const* buffer, std::size_t bytes, void* digest);
+digest_type& hash ( void const* buffer, std::size_t bytes, digest_type& digest);
+digest_type hash (void const* buffer, std::size_t bytes);
+void* hash (int8 const* begin, int8 const* end, void* digest);
+void* hash (uint8 const* begin, uint8 const* end, void* digest);
+digest_type hash (int8 const* begin, int8 const* end);
+digest_type hash (uint8 const* begin, uint8 const* end);
+
+template <typename T>
+void* hash (T const& t, void* digest)
+{
+    return hash (&t, sizeof(T), digest);
+}
+
+template <typename T>
+digest_type& hash (T const& t, digest_type& digest)
+{
+    return hash (&t, sizeof(T), digest);
+}
+
+template <typename T>
+digest_type hash (T const& t)
+{
+    digest_type digest;
+    hash (&t, sizeof(T), digest);
+    return digest;
+}
+/** @} */
+
+/** Calculate the hash of a hash in one step.
+    The memory pointed to by source_digest must be at
+    least digestLength bytes or undefined behavior results.
+*/
+/** @{ */
+void* hash (void const* source_digest, void* digest);
+digest_type& hash (void const* source_digest, digest_type& digest);
+digest_type hash (void const* source_digest);;
+/** @} */
+
+}
+}
+
+#endif
diff --git a/beast/crypto/impl/Sha256.cpp b/beast/crypto/impl/Sha256.cpp
new file mode 100644
index 0000000000..7542c189d1
--- /dev/null
+++ b/beast/crypto/impl/Sha256.cpp
@@ -0,0 +1,144 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../Sha256.h"
+
+namespace beast {
+namespace Sha256 {
+
+#ifndef  LITTLE_ENDIAN
+# define LITTLE_ENDIAN 1234
+#endif
+#ifndef  BIG_ENDIAN
+# define BIG_ENDIAN 4321
+#endif
+#if !defined(BYTE_ORDER)
+# if BEAST_BIG_ENDIAN
+#  define BYTE_ORDER BIG_ENDIAN
+# else
+#  define BYTE_ORDER LITTLE_ENDIAN
+# endif
+#endif
+
+//#define SHA2_USE_INTTYPES_H
+
+namespace detail {
+#include "sha2/sha2.c"
+}
+
+Context::Context ()
+{
+    detail::SHA256_Init (&m_context);
+}
+
+void Context::update (void const* buffer, std::size_t bytes)
+{
+    detail::SHA256_Update (&m_context, static_cast <uint8 const*> (buffer), bytes);
+}
+
+void* Context::finish (void* hash)
+{
+    detail::SHA256_Final (static_cast <uint8*> (hash), &m_context);
+    return hash;
+}
+
+//------------------------------------------------------------------------------
+
+digest_type const& empty_digest()
+{
+    struct Holder
+    {
+        Holder ()
+        {
+            uint8 zero (0);
+            hash (zero, digest);
+        }
+
+        digest_type digest;
+    };
+
+    static Holder const holder;
+
+    return holder.digest;
+}
+
+void* hash (void const* buffer, std::size_t bytes, void* digest)
+{
+    Context h;
+    h.update (buffer, bytes);
+    h.finish (digest);
+    return digest;
+}
+
+digest_type& hash (void const* buffer, std::size_t bytes, digest_type& digest)
+{
+    hash (buffer, bytes, digest.c_array());
+    return digest;
+}
+
+digest_type hash (void const* buffer, std::size_t bytes)
+{
+    digest_type digest;
+    hash (buffer, bytes, digest);
+    return digest;
+}
+
+void* hash (int8 const* begin, int8 const* end, void* digest)
+{
+    return hash (begin, end - begin, digest);
+}
+
+void* hash (uint8 const* begin, uint8 const* end, void* digest)
+{
+    return hash (begin, end - begin, digest);
+}
+
+digest_type hash (int8 const* begin, int8 const* end)
+{
+    digest_type digest;
+    hash (begin, end - begin, digest);
+    return digest;
+}
+
+digest_type hash (uint8 const* begin, uint8 const* end)
+{
+    digest_type digest;
+    hash (begin, end - begin, digest);
+    return digest;
+}
+
+void* hash (void const* source_digest, void* digest)
+{
+    return hash (source_digest, digestLength, digest);
+}
+
+digest_type& hash (void const* source_digest, digest_type& digest)
+{
+    return hash (source_digest, digestLength, digest);
+}
+
+digest_type hash (void const* source_digest)
+{
+    digest_type digest;
+    hash (source_digest, digestLength, digest);
+    return digest;
+}
+
+}
+}
diff --git a/beast/crypto/impl/sha2/README b/beast/crypto/impl/sha2/README
new file mode 100644
index 0000000000..a1b684d1e0
--- /dev/null
+++ b/beast/crypto/impl/sha2/README
@@ -0,0 +1,277 @@
+VERSION:
+
+This is version 1.0.1 RELEASE
+
+While this is my "release" version, due to lack of additional
+official test vectors against which to verify this implementation's
+correctness, beware that there may be implementation bugs.  Also,
+it has not yet been tested on very many other architectures,
+big-endian machines in particular.
+
+
+LICENSE:
+
+This implementation is released freely under an open-source BSD
+license which appears at the top of each source code file.
+
+
+WHAT IT IS:
+
+The files sha2.h and sha2.c implement the SHA-256, SHA-384, and SHA-512
+hash algorithms as described in the PDF document found at the following
+web address:
+
+  http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf
+
+The interface is similar to the interface to SHA-1 found in the OpenSSL
+library.
+
+The file sha2prog.c is a simple program that accepts input from either
+STDIN or reads one or more files specified on the command line, and then
+generates the specified hash (either SHA-256, SHA-384, SHA-512, or any
+combination thereof, including all three at once).
+
+
+LIMITATIONS:
+
+This implementation has several limitations:
+
+ * Input data is only accepted in octet-length increments.  No sub-byte
+   data is handled.  The NIST document describes how to handle sub-byte
+   input data, but for ease of implementation this version will only
+   accept message data in multiples of bytes.
+ * This implementation utilizes 64-bit integer data types.  If your
+   system and compiler does not have a 64-bit integer data type, this
+   implementation will not work.
+ * Because of the use of 64-bit operations, many 32-bit architectures
+   that do have 64-bit data types but do operations most efficiently
+   on 32-bit words, this implementation may be slower than an
+   implementation designed to use only 32-bit words (emulating the
+   64-bit operations).
+ * On platforms with 128-bit integer data types, the SHA-384 and SHA-512
+   bit counters used by this implementation might be better off using
+   the 128-bit type instead of simulating it with two 64-bit integers.
+ * This implementation was written in C in hopes of portability and for
+   the fun of it during my spare time.  It is probably not the most
+   efficient or fastest C implementation.  I welcome suggestions,
+   however, that suggest ways to speed things up without breaking
+   portability.  I also welcome suggestions to improve portability.
+ * As mentioned above, this code has NOT been thoroughly tested.
+   This is perhaps the most severe limitation.
+
+
+BEFORE YOU COMPILE (OPTIONS):
+
+Each of the options described below may either be defined in the sha2.h
+header file (or in the sha2.c file in some cases), or on the command
+line at compile time if your compiler supports such things.  For
+example:
+
+  #define SHA2_USE_INTTYPES_H
+  #define SHA2_UNROLL_TRANSFORM
+
+Or:
+
+  cc -c -DSHA2_UNROLL_TRANSFORM sha2.c
+  cc -c -DBYTE_ORDER=4321 -DBIG_ENDIAN=4321 sha2.c
+
+Here are the available options.  Read on below for a description of
+each one:
+
+  SHA2_USE_INTTYPES_H
+  SHA2_USE_MEMSET_MEMCPY/SHA2_USE_BZERO_BCOPY
+  SHA2_UNROLL_TRANSFORM
+  BYTE_ORDER (LITTLE_ENDIAN/BIG_ENDIAN)
+
+* SHA2_USE_INTTYPES_H option:
+By default, this code uses u_intXX_t data types for 8 bit, 32 bit, and
+64 bit unsigned integer type definitions.  Most BSD systems define these,
+as does Linux.  However, some (like Compaq's Tru64 Unix) may instead
+use uintXX_t data types as defined by recent ANSI C standards and as
+included in the inttypes.h header file.  Those wanting to use inttypes.h
+need to define this either in sha.h or at compile time.
+
+On those systems where NEITHER definitions are available, you will need
+to edit both sha2.h and sha2.c and define things by hand in the appropriate
+sections.
+
+* BYTE_ORDER definitions:
+This code assumes that BYTE_ORDER will be defined by the system during
+compile to either equal LITTLE_ENDIAN or BIG_ENDIAN.  If your system
+does not define these, you may need to define them by hand in the sha.c
+file according to the byte ordering conventions of your system.
+
+* SHA2_USE_MEMSET_MEMCPY or SHA2_USE_BZERO_BCOPY
+The code in sha2.c can use either memset()/memcpy() for memory block
+operations, or bzero()/mcopy().  If you define neither of these, the
+code will default to memset()/memcpy().  You can define either at the
+command line or in sha2.h or in sha2.c.
+
+* SHA2_UNROLL_TRANSFORM
+By defining this either on the command line or in sha2.h or sha2.c,
+the code will use macros to partially "unroll" the SHA transform
+function.  This usually generates bigger executables.  It CAN (but
+not necessarily WILL) generate faster code when you tell your compiler
+to optimize things.  For example, on the FreeBSD and Linux x86 systems
+I tested things on (using gcc), when I optimized with just -O2 and
+unrolled the transform, the hash transform was faster by 15-30%.  On
+these same systems, if I did NO optimization, the unrolled transform
+was SLOWER, much slower (I'm guessing because the code was breaking
+the cache, but I'm not sure).  Your mileage may vary.
+
+
+PORTABILITY:
+
+The code in sha2.c and sha2.h is intended to be portable.  It may
+require that you do a few #definitions in the .h file.  I've successfully
+compiled and tested the sha2.c and sha2.h code on Apple's OS X (on
+a PPC), FreeBSD 4.1.1 on Intel, Linux on Intel, FreeBSD on the Alpha,
+and even under Windows98SE using Metrowerks C.  The utility/example
+programs (sha2prog.c, sha2test.c, and sha2speed.c) will very likely
+have more trouble in portability since they do I/O.
+
+To get sha2.c/sha2.h working under Windows, I had to define
+SHA2_USE_INTTYPES_H, BYTE_ORDER, LITTLE_ENDIAN, and had to comment
+out the include of <sys/types.h> in sha2.h.  With a bit more work
+I got the test program to run and verified that all the test
+cases passed.
+
+
+SUGGESTIONS/BUG FIXES:
+
+If you make changes to get it working on other architectures, if you fix
+any bugs, or if you make changes that improve this implementation's
+efficiency that would be relatively portable and you're willing to release
+your changes under the same license, please send them to me for possible
+inclusion in future versions.
+
+If you know where I can find some additional test vectors, please let me
+know.
+
+
+CHANGE HISTORY:
+
+0.8 to 0.9 	- Fixed spelling errors, changed to u_intXX_t type usage,
+		  removed names from prototypes, added prototypes to sha2.c,
+		  and a few things I can't recall.
+
+0.9 to 0.9.5	- Add a new define in sha2.c that permits one to compile
+		  it to either use memcpy()/memset() or bcopy()/bzero()
+		  for memory block copying and zeroing.  Added support
+		  for unrolled SHA-256/384/512 transform loops.  Just
+		  compile with SHA2_UNROLL_TRANSFORM to enable.  It takes
+		  longer to compile, but I hope it is a bit faster.  I
+		  need to do some test to see whether or not it is. Oh,
+		  in sha2.c, you either need to define SHA2_USE_BZERO_BCOPY
+		  or SHA2_USE_MEMSET_MEMCPY to choose which way you want
+		  to compile.  *Whew*  It's amazing how quickly something
+		  simple starts to grow more complex even in the span of
+		  just a few hours.  I didn't really intend to do this much.
+0.9.5 to 0.9.6  - Added a test program (sha2test) which tests against several
+                  known test vectors.  WARNING: Some of the test output
+                  hashes are NOT from NIST's documentation and are the
+                  output of this implementation and so may be incorrect.
+0.9.6 to 0.9.7  - Fixed a bug that could cause invalid output in certain
+		  cases and added an assumed scenario where zero-length
+		  data is hashed.  Also changed the rotation macros to use
+		  a temporary variable as this reduces the number of operations.
+		  When data is fed in blocks of the right length, copying of
+		  data is reduced in this version.  Added SHAYXZ_Data()
+		  functions for ease of hashing a set of data.  Added another
+		  file sha2speed.c for doing speed testing.  Added another test
+		  vector with a larger data size (16KB).  Fixed u_intXX_t and
+		  uintXX_t handling by adding a define for SHA2_USE_INTTYPES_H
+		  as well as made a few other minor changes to get rid of
+		  warnings when compiling on Compaq's Tru64 Unix.
+0.9.7 to 0.9.8  - The bug fix in 0.9.7 was incomplete and in some cases made
+                  things worse.  I believe that 0.9.8 fixes the bug completely
+                  so that output is correct.  I cannot verify this, however,
+                  because of the lack of test vectors against which to do such
+                  verification.  All versions correctly matched the very few
+                  NIST-provided vectors, but unfortunately the bug only
+                  appeared in longer message data sets.
+0.9.8 to 0.9.9  - Fixed some really bad typos and mistakes on my part that
+                  only affected big-endian systems.  I didn't have direct
+                  access for testing before this version.  Thanks to
+                  Lucas Marshall for giving me access to his OS X system.
+0.9.9 to 1.0.0b1  Added a few more test samples and made a few changes to
+                  make things easier compiling on several other platforms.
+                  Also I experimented with alternate macro definitions
+                  in the SHA2_UNROLL_TRANSFORM version (see sha2.slower.c)
+                  and eliminated the T1 temporary variable (the compiler
+                  would of course still use internal temporary storage
+                  during expression evaluation, but I'd hoped the compiler
+                  would be more efficient), but unfortunately under FreeBSD
+                  4.1.1-STABLE on an x86 platform, the change slowed things
+                  down.
+1.0.0b1 to 1.0 RELEASE  Fixed an off-by-one implementation bug that affected
+                  SHA-256 when hashed data length L = 55 + 64 * X where X is
+                  either zero or a positive integer, and another (basically
+                  the same bug) bug in SHA-384 and SHA-512 that showed up when
+                  hashed data lengths L = 111 + 128 * X.  Thanks to Rogier
+		  van de Pol for sending me test data that revealed the bug.
+                  The fix was very simple (just two tiny changes).  Also,
+                  I finally put the files into RCS so future changes will be
+                  easier to manage.  The sha2prog.c file was rewritten to
+                  be more useful to me, and I got rid of the old C testing
+                  program and now use a perl script with a subdirectory full
+                  of test data.  It's a more flexible test system.
+
+1.0 to 1.0.1    - Specified the specific *_CTX structure in the MEMSET_BZERO
+                  macro doing clean-up after hashing.  This should eliminate
+                  some warnings using Clang in version 3.0 (trunk 135348).
+                  Thanks, Stephane Leon for reporting this.
+
+
+LATEST VERSION:
+
+The latest version and documentation (if any ;) should always be available
+on the web at:
+
+  http://www.aarongifford.com/computers/sha.html
+
+
+CONTACT ME:
+
+I can be reached via email at:
+
+  Aaron Gifford   <m e @ a a r o n g i f f o r d . c o m>
+
+Please don't send support questions.  I don't have the time to answer and
+they'll probably be ignored.  Bug fixes, or patches that add something useful
+will be gratefully accepted, however.
+
+If you use this implementation, I would enjoy getting a brief email message
+letting me know who you are and what use to which it is being put.  There
+is no requirement to do so.  I just think it would be fun.
+
+
+EXAMPLES:
+
+Here's an example of compiling and using the sha2 program (in this example
+I build it using the unrolled transform version with -O2 optimizations),
+and then running the perl testing script:
+
+  cc -O2 -DSHA2_UNROLL_TRANSFORM -Wall -o sha2 sha2prog.c sha2.c
+  % ./sha2test.pl
+
+  [most of the perl script output deleted for brevity]
+
+  ===== RESULTS (18 VECTOR DATA FILES HASHED) =====
+
+  HASH TYPE       NO. OF TESTS    PASSED  FAILED
+  ---------       ------------    ------  ------
+  SHA-256                   18        18       0
+  SHA-384                   18        18       0
+  SHA-512                   18        18       0
+  ----------------------------------------------
+  TOTAL:                    54        54       0
+
+  NO ERRORS!  ALL TESTS WERE SUCCESSFUL!
+
+  ALL TEST VECTORS PASSED!
+
+That's all folks!  Have fun!
+
+Aaron out.
+
diff --git a/beast/crypto/impl/sha2/sha2.c b/beast/crypto/impl/sha2/sha2.c
new file mode 100644
index 0000000000..125aae2cae
--- /dev/null
+++ b/beast/crypto/impl/sha2/sha2.c
@@ -0,0 +1,1067 @@
+/*
+ * FILE:	sha2.c
+ * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
+ * 
+ * Copyright (c) 2000-2001, Aaron D. Gifford
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include <string.h>	/* memcpy()/memset() or bcopy()/bzero() */
+#include <assert.h>	/* assert() */
+#include "sha2.h"
+
+/*
+ * ASSERT NOTE:
+ * Some sanity checking code is included using assert().  On my FreeBSD
+ * system, this additional code can be removed by compiling with NDEBUG
+ * defined.  Check your own systems manpage on assert() to see how to
+ * compile WITHOUT the sanity checking code on your system.
+ *
+ * UNROLLED TRANSFORM LOOP NOTE:
+ * You can define SHA2_UNROLL_TRANSFORM to use the unrolled transform
+ * loop version for the hash transform rounds (defined using macros
+ * later in this file).  Either define on the command line, for example:
+ *
+ *   cc -DSHA2_UNROLL_TRANSFORM -o sha2 sha2.c sha2prog.c
+ *
+ * or define below:
+ *
+ *   #define SHA2_UNROLL_TRANSFORM
+ *
+ */
+
+
+/*** SHA-256/384/512 Machine Architecture Definitions *****************/
+/*
+ * BYTE_ORDER NOTE:
+ *
+ * Please make sure that your system defines BYTE_ORDER.  If your
+ * architecture is little-endian, make sure it also defines
+ * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are
+ * equivilent.
+ *
+ * If your system does not define the above, then you can do so by
+ * hand like this:
+ *
+ *   #define LITTLE_ENDIAN 1234
+ *   #define BIG_ENDIAN    4321
+ *
+ * And for little-endian machines, add:
+ *
+ *   #define BYTE_ORDER LITTLE_ENDIAN 
+ *
+ * Or for big-endian machines:
+ *
+ *   #define BYTE_ORDER BIG_ENDIAN
+ *
+ * The FreeBSD machine this was written on defines BYTE_ORDER
+ * appropriately by including <sys/types.h> (which in turn includes
+ * <machine/endian.h> where the appropriate definitions are actually
+ * made).
+ */
+#if !defined(BYTE_ORDER) || (BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN)
+#error Define BYTE_ORDER to be equal to either LITTLE_ENDIAN or BIG_ENDIAN
+#endif
+
+/*
+ * Define the followingsha2_* types to types of the correct length on
+ * the native archtecture.   Most BSD systems and Linux define u_intXX_t
+ * types.  Machines with very recent ANSI C headers, can use the
+ * uintXX_t definintions from inttypes.h by defining SHA2_USE_INTTYPES_H
+ * during compile or in the sha.h header file.
+ *
+ * Machines that support neither u_intXX_t nor inttypes.h's uintXX_t
+ * will need to define these three typedefs below (and the appropriate
+ * ones in sha.h too) by hand according to their system architecture.
+ *
+ * Thank you, Jun-ichiro itojun Hagino, for suggesting using u_intXX_t
+ * types and pointing out recent ANSI C support for uintXX_t in inttypes.h.
+ */
+
+typedef uint8  sha2_byte;	/* Exactly 1 byte */
+typedef uint32 sha2_word32;	/* Exactly 4 bytes */
+typedef uint64 sha2_word64;	/* Exactly 8 bytes */
+
+/*** SHA-256/384/512 Various Length Definitions ***********************/
+/* NOTE: Most of these are in sha2.h */
+#define SHA256_SHORT_BLOCK_LENGTH	(Sha256::blockLength - 8)
+#define SHA384_SHORT_BLOCK_LENGTH	(SHA384_BLOCK_LENGTH - 16)
+#define SHA512_SHORT_BLOCK_LENGTH	(SHA512_BLOCK_LENGTH - 16)
+
+/*** ENDIAN REVERSAL MACROS *******************************************/
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define REVERSE32(w,x)	{ \
+	sha2_word32 tmp = (w); \
+	tmp = (tmp >> 16) | (tmp << 16); \
+	(x) = ((tmp & 0xff00ff00UL) >> 8) | ((tmp & 0x00ff00ffUL) << 8); \
+}
+#define REVERSE64(w,x)	{ \
+	sha2_word64 tmp = (w); \
+	tmp = (tmp >> 32) | (tmp << 32); \
+	tmp = ((tmp & 0xff00ff00ff00ff00ULL) >> 8) | \
+	      ((tmp & 0x00ff00ff00ff00ffULL) << 8); \
+	(x) = ((tmp & 0xffff0000ffff0000ULL) >> 16) | \
+	      ((tmp & 0x0000ffff0000ffffULL) << 16); \
+}
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+/*
+ * Macro for incrementally adding the unsigned 64-bit integer n to the
+ * unsigned 128-bit integer (represented using a two-element array of
+ * 64-bit words):
+ */
+#define ADDINC128(w,n)	{ \
+	(w)[0] += (sha2_word64)(n); \
+	if ((w)[0] < (n)) { \
+		(w)[1]++; \
+	} \
+}
+
+/*
+ * Macros for copying blocks of memory and for zeroing out ranges
+ * of memory.  Using these macros makes it easy to switch from
+ * using memset()/memcpy() and using bzero()/bcopy().
+ *
+ * Please define either SHA2_USE_MEMSET_MEMCPY or define
+ * SHA2_USE_BZERO_BCOPY depending on which function set you
+ * choose to use:
+ */
+#if !defined(SHA2_USE_MEMSET_MEMCPY) && !defined(SHA2_USE_BZERO_BCOPY)
+/* Default to memset()/memcpy() if no option is specified */
+#define	SHA2_USE_MEMSET_MEMCPY	1
+#endif
+#if defined(SHA2_USE_MEMSET_MEMCPY) && defined(SHA2_USE_BZERO_BCOPY)
+/* Abort with an error if BOTH options are defined */
+#error Define either SHA2_USE_MEMSET_MEMCPY or SHA2_USE_BZERO_BCOPY, not both!
+#endif
+
+#ifdef SHA2_USE_MEMSET_MEMCPY
+#define MEMSET_BZERO(p,l)	memset((p), 0, (l))
+#define MEMCPY_BCOPY(d,s,l)	memcpy((d), (s), (l))
+#endif
+#ifdef SHA2_USE_BZERO_BCOPY
+#define MEMSET_BZERO(p,l)	bzero((p), (l))
+#define MEMCPY_BCOPY(d,s,l)	bcopy((s), (d), (l))
+#endif
+
+
+/*** THE SIX LOGICAL FUNCTIONS ****************************************/
+/*
+ * Bit shifting and rotation (used by the six SHA-XYZ logical functions:
+ *
+ *   NOTE:  The naming of R and S appears backwards here (R is a SHIFT and
+ *   S is a ROTATION) because the SHA-256/384/512 description document
+ *   (see http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf) uses this
+ *   same "backwards" definition.
+ */
+/* Shift-right (used in SHA-256, SHA-384, and SHA-512): */
+#define R(b,x) 		((x) >> (b))
+
+/* 32-bit Rotate-right (used in SHA-256): */
+#define S32(b,x)	(((x) >> (b)) | ((x) << (32 - (b))))
+/* 64-bit Rotate-right (used in SHA-384 and SHA-512): */
+#define S64(b,x)	(((x) >> (b)) | ((x) << (64 - (b))))
+
+/* Two of six logical functions used in SHA-256, SHA-384, and SHA-512: */
+#define Ch(x,y,z)	(((x) & (y)) ^ ((~(x)) & (z)))
+#define Maj(x,y,z)	(((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+
+/* Four of six logical functions used in SHA-256: */
+#define Sigma0_256(x)	(S32(2,  (x)) ^ S32(13, (x)) ^ S32(22, (x)))
+#define Sigma1_256(x)	(S32(6,  (x)) ^ S32(11, (x)) ^ S32(25, (x)))
+#define sigma0_256(x)	(S32(7,  (x)) ^ S32(18, (x)) ^ R(3 ,   (x)))
+#define sigma1_256(x)	(S32(17, (x)) ^ S32(19, (x)) ^ R(10,   (x)))
+
+/* Four of six logical functions used in SHA-384 and SHA-512: */
+#define Sigma0_512(x)	(S64(28, (x)) ^ S64(34, (x)) ^ S64(39, (x)))
+#define Sigma1_512(x)	(S64(14, (x)) ^ S64(18, (x)) ^ S64(41, (x)))
+#define sigma0_512(x)	(S64( 1, (x)) ^ S64( 8, (x)) ^ R( 7,   (x)))
+#define sigma1_512(x)	(S64(19, (x)) ^ S64(61, (x)) ^ R( 6,   (x)))
+
+/*** INTERNAL FUNCTION PROTOTYPES *************************************/
+/* NOTE: These should not be accessed directly from outside this
+ * library -- they are intended for private internal visibility/use
+ * only.
+ */
+void SHA512_Last(SHA512_CTX*);
+void SHA256_Transform(Sha256::detail::Context*, const sha2_word32*);
+void SHA512_Transform(SHA512_CTX*, const sha2_word64*);
+
+
+/*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/
+/* Hash constant words K for SHA-256: */
+const static sha2_word32 K256[64] = {
+	0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL,
+	0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL,
+	0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL,
+	0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, 0xc19bf174UL,
+	0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
+	0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL,
+	0x983e5152UL, 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL,
+	0xc6e00bf3UL, 0xd5a79147UL, 0x06ca6351UL, 0x14292967UL,
+	0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, 0x53380d13UL,
+	0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
+	0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL,
+	0xd192e819UL, 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL,
+	0x19a4c116UL, 0x1e376c08UL, 0x2748774cUL, 0x34b0bcb5UL,
+	0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, 0x682e6ff3UL,
+	0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
+	0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
+};
+
+/* Initial hash value H for SHA-256: */
+const static sha2_word32 sha256_initial_hash_value[8] = {
+	0x6a09e667UL,
+	0xbb67ae85UL,
+	0x3c6ef372UL,
+	0xa54ff53aUL,
+	0x510e527fUL,
+	0x9b05688cUL,
+	0x1f83d9abUL,
+	0x5be0cd19UL
+};
+
+/* Hash constant words K for SHA-384 and SHA-512: */
+const static sha2_word64 K512[80] = {
+	0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL,
+	0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
+	0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
+	0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
+	0xd807aa98a3030242ULL, 0x12835b0145706fbeULL,
+	0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
+	0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL,
+	0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
+	0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
+	0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
+	0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL,
+	0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
+	0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL,
+	0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
+	0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
+	0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
+	0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL,
+	0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
+	0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL,
+	0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
+	0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
+	0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
+	0xd192e819d6ef5218ULL, 0xd69906245565a910ULL,
+	0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
+	0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL,
+	0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
+	0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
+	0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
+	0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL,
+	0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
+	0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL,
+	0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
+	0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
+	0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
+	0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL,
+	0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
+	0x28db77f523047d84ULL, 0x32caab7b40c72493ULL,
+	0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
+	0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
+	0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
+};
+
+/* Initial hash value H for SHA-384 */
+const static sha2_word64 sha384_initial_hash_value[8] = {
+	0xcbbb9d5dc1059ed8ULL,
+	0x629a292a367cd507ULL,
+	0x9159015a3070dd17ULL,
+	0x152fecd8f70e5939ULL,
+	0x67332667ffc00b31ULL,
+	0x8eb44a8768581511ULL,
+	0xdb0c2e0d64f98fa7ULL,
+	0x47b5481dbefa4fa4ULL
+};
+
+/* Initial hash value H for SHA-512 */
+const static sha2_word64 sha512_initial_hash_value[8] = {
+	0x6a09e667f3bcc908ULL,
+	0xbb67ae8584caa73bULL,
+	0x3c6ef372fe94f82bULL,
+	0xa54ff53a5f1d36f1ULL,
+	0x510e527fade682d1ULL,
+	0x9b05688c2b3e6c1fULL,
+	0x1f83d9abfb41bd6bULL,
+	0x5be0cd19137e2179ULL
+};
+
+/*
+ * Constant used by SHA256/384/512_End() functions for converting the
+ * digest to a readable hexadecimal character string:
+ */
+static const char *sha2_hex_digits = "0123456789abcdef";
+
+
+/*** SHA-256: *********************************************************/
+void SHA256_Init(Sha256::detail::Context* context) {
+	if (context == (Sha256::detail::Context*)0) {
+		return;
+	}
+	MEMCPY_BCOPY(context->state, sha256_initial_hash_value, Sha256::digestLength);
+	MEMSET_BZERO(context->buffer, Sha256::blockLength);
+	context->bitcount = 0;
+}
+
+#ifdef SHA2_UNROLL_TRANSFORM
+
+/* Unrolled SHA-256 round macros: */
+
+#if BYTE_ORDER == LITTLE_ENDIAN
+
+#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h)	\
+	REVERSE32(*data++, W256[j]); \
+	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
+             K256[j] + W256[j]; \
+	(d) += T1; \
+	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
+	j++
+
+
+#else /* BYTE_ORDER == LITTLE_ENDIAN */
+
+#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h)	\
+	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
+	     K256[j] + (W256[j] = *data++); \
+	(d) += T1; \
+	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
+	j++
+
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+#define ROUND256(a,b,c,d,e,f,g,h)	\
+	s0 = W256[(j+1)&0x0f]; \
+	s0 = sigma0_256(s0); \
+	s1 = W256[(j+14)&0x0f]; \
+	s1 = sigma1_256(s1); \
+	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + K256[j] + \
+	     (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0); \
+	(d) += T1; \
+	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
+	j++
+
+void SHA256_Transform(Sha256::detail::Context* context, const sha2_word32* data) {
+	sha2_word32	a, b, c, d, e, f, g, h, s0, s1;
+	sha2_word32	T1, *W256;
+	int		j;
+
+	W256 = (sha2_word32*)context->buffer;
+
+	/* Initialize registers with the prev. intermediate value */
+	a = context->state[0];
+	b = context->state[1];
+	c = context->state[2];
+	d = context->state[3];
+	e = context->state[4];
+	f = context->state[5];
+	g = context->state[6];
+	h = context->state[7];
+
+	j = 0;
+	do {
+		/* Rounds 0 to 15 (unrolled): */
+		ROUND256_0_TO_15(a,b,c,d,e,f,g,h);
+		ROUND256_0_TO_15(h,a,b,c,d,e,f,g);
+		ROUND256_0_TO_15(g,h,a,b,c,d,e,f);
+		ROUND256_0_TO_15(f,g,h,a,b,c,d,e);
+		ROUND256_0_TO_15(e,f,g,h,a,b,c,d);
+		ROUND256_0_TO_15(d,e,f,g,h,a,b,c);
+		ROUND256_0_TO_15(c,d,e,f,g,h,a,b);
+		ROUND256_0_TO_15(b,c,d,e,f,g,h,a);
+	} while (j < 16);
+
+	/* Now for the remaining rounds to 64: */
+	do {
+		ROUND256(a,b,c,d,e,f,g,h);
+		ROUND256(h,a,b,c,d,e,f,g);
+		ROUND256(g,h,a,b,c,d,e,f);
+		ROUND256(f,g,h,a,b,c,d,e);
+		ROUND256(e,f,g,h,a,b,c,d);
+		ROUND256(d,e,f,g,h,a,b,c);
+		ROUND256(c,d,e,f,g,h,a,b);
+		ROUND256(b,c,d,e,f,g,h,a);
+	} while (j < 64);
+
+	/* Compute the current intermediate hash value */
+	context->state[0] += a;
+	context->state[1] += b;
+	context->state[2] += c;
+	context->state[3] += d;
+	context->state[4] += e;
+	context->state[5] += f;
+	context->state[6] += g;
+	context->state[7] += h;
+
+	/* Clean up */
+	a = b = c = d = e = f = g = h = T1 = 0;
+}
+
+#else /* SHA2_UNROLL_TRANSFORM */
+
+void SHA256_Transform(Sha256::detail::Context* context, const sha2_word32* data) {
+	sha2_word32	a, b, c, d, e, f, g, h, s0, s1;
+	sha2_word32	T1, T2, *W256;
+	int		j;
+
+	W256 = (sha2_word32*)context->buffer;
+
+	/* Initialize registers with the prev. intermediate value */
+	a = context->state[0];
+	b = context->state[1];
+	c = context->state[2];
+	d = context->state[3];
+	e = context->state[4];
+	f = context->state[5];
+	g = context->state[6];
+	h = context->state[7];
+
+	j = 0;
+	do {
+#if BYTE_ORDER == LITTLE_ENDIAN
+		/* Copy data while converting to host byte order */
+		REVERSE32(*data++,W256[j]);
+		/* Apply the SHA-256 compression function to update a..h */
+		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + W256[j];
+#else /* BYTE_ORDER == LITTLE_ENDIAN */
+		/* Apply the SHA-256 compression function to update a..h with copy */
+		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + (W256[j] = *data++);
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+		T2 = Sigma0_256(a) + Maj(a, b, c);
+		h = g;
+		g = f;
+		f = e;
+		e = d + T1;
+		d = c;
+		c = b;
+		b = a;
+		a = T1 + T2;
+
+		j++;
+	} while (j < 16);
+
+	do {
+		/* Part of the message block expansion: */
+		s0 = W256[(j+1)&0x0f];
+		s0 = sigma0_256(s0);
+		s1 = W256[(j+14)&0x0f];	
+		s1 = sigma1_256(s1);
+
+		/* Apply the SHA-256 compression function to update a..h */
+		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + 
+		     (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0);
+		T2 = Sigma0_256(a) + Maj(a, b, c);
+		h = g;
+		g = f;
+		f = e;
+		e = d + T1;
+		d = c;
+		c = b;
+		b = a;
+		a = T1 + T2;
+
+		j++;
+	} while (j < 64);
+
+	/* Compute the current intermediate hash value */
+	context->state[0] += a;
+	context->state[1] += b;
+	context->state[2] += c;
+	context->state[3] += d;
+	context->state[4] += e;
+	context->state[5] += f;
+	context->state[6] += g;
+	context->state[7] += h;
+
+	/* Clean up */
+	a = b = c = d = e = f = g = h = T1 = T2 = 0;
+}
+
+#endif /* SHA2_UNROLL_TRANSFORM */
+
+void SHA256_Update(Sha256::detail::Context* context, const sha2_byte *data, size_t len) {
+	unsigned int	freespace, usedspace;
+
+	if (len == 0) {
+		/* Calling with no data is valid - we do nothing */
+		return;
+	}
+
+	/* Sanity check: */
+	assert(context != (Sha256::detail::Context*)0 && data != (sha2_byte*)0);
+
+	usedspace = (context->bitcount >> 3) % Sha256::blockLength;
+	if (usedspace > 0) {
+		/* Calculate how much free space is available in the buffer */
+		freespace = Sha256::blockLength - usedspace;
+
+		if (len >= freespace) {
+			/* Fill the buffer completely and process it */
+			MEMCPY_BCOPY(&context->buffer[usedspace], data, freespace);
+			context->bitcount += freespace << 3;
+			len -= freespace;
+			data += freespace;
+			SHA256_Transform(context, (sha2_word32*)context->buffer);
+		} else {
+			/* The buffer is not yet full */
+			MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
+			context->bitcount += len << 3;
+			/* Clean up: */
+			usedspace = freespace = 0;
+			return;
+		}
+	}
+	while (len >= Sha256::blockLength) {
+		/* Process as many complete blocks as we can */
+		SHA256_Transform(context, (sha2_word32*)data);
+		context->bitcount += Sha256::blockLength << 3;
+		len -= Sha256::blockLength;
+		data += Sha256::blockLength;
+	}
+	if (len > 0) {
+		/* There's left-overs, so save 'em */
+		MEMCPY_BCOPY(context->buffer, data, len);
+		context->bitcount += len << 3;
+	}
+	/* Clean up: */
+	usedspace = freespace = 0;
+}
+
+void SHA256_Final(sha2_byte digest[], Sha256::detail::Context* context) {
+	sha2_word32	*d = (sha2_word32*)digest;
+	unsigned int	usedspace;
+
+	/* Sanity check: */
+	assert(context != (Sha256::detail::Context*)0);
+
+	/* If no digest buffer is passed, we don't bother doing this: */
+	if (digest != (sha2_byte*)0) {
+		usedspace = (context->bitcount >> 3) % Sha256::blockLength;
+#if BYTE_ORDER == LITTLE_ENDIAN
+		/* Convert FROM host byte order */
+		REVERSE64(context->bitcount,context->bitcount);
+#endif
+		if (usedspace > 0) {
+			/* Begin padding with a 1 bit: */
+			context->buffer[usedspace++] = 0x80;
+
+			if (usedspace <= SHA256_SHORT_BLOCK_LENGTH) {
+				/* Set-up for the last transform: */
+				MEMSET_BZERO(&context->buffer[usedspace], SHA256_SHORT_BLOCK_LENGTH - usedspace);
+			} else {
+				if (usedspace < Sha256::blockLength) {
+					MEMSET_BZERO(&context->buffer[usedspace], Sha256::blockLength - usedspace);
+				}
+				/* Do second-to-last transform: */
+				SHA256_Transform(context, (sha2_word32*)context->buffer);
+
+				/* And set-up for the last transform: */
+				MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
+			}
+		} else {
+			/* Set-up for the last transform: */
+			MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
+
+			/* Begin padding with a 1 bit: */
+			*context->buffer = 0x80;
+		}
+		/* Set the bit count: */
+		*(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount;
+
+		/* Final transform: */
+		SHA256_Transform(context, (sha2_word32*)context->buffer);
+
+#if BYTE_ORDER == LITTLE_ENDIAN
+		{
+			/* Convert TO host byte order */
+			int	j;
+			for (j = 0; j < 8; j++) {
+				REVERSE32(context->state[j],context->state[j]);
+				*d++ = context->state[j];
+			}
+		}
+#else
+		MEMCPY_BCOPY(d, context->state, Sha256::digestLength);
+#endif
+	}
+
+	/* Clean up state data: */
+	MEMSET_BZERO(context, sizeof(Sha256::detail::Context));
+	usedspace = 0;
+}
+
+char *SHA256_End(Sha256::detail::Context* context, char buffer[]) {
+	sha2_byte	digest[Sha256::digestLength], *d = digest;
+	int		i;
+
+	/* Sanity check: */
+	assert(context != (Sha256::detail::Context*)0);
+
+	if (buffer != (char*)0) {
+		SHA256_Final(digest, context);
+
+		for (i = 0; i < Sha256::digestLength; i++) {
+			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
+			*buffer++ = sha2_hex_digits[*d & 0x0f];
+			d++;
+		}
+		*buffer = (char)0;
+	} else {
+		MEMSET_BZERO(context, sizeof(Sha256::detail::Context));
+	}
+	MEMSET_BZERO(digest, Sha256::digestLength);
+	return buffer;
+}
+
+char* SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_STRING_LENGTH]) {
+	Sha256::detail::Context	context;
+
+	SHA256_Init(&context);
+	SHA256_Update(&context, data, len);
+	return SHA256_End(&context, digest);
+}
+
+
+/*** SHA-512: *********************************************************/
+void SHA512_Init(SHA512_CTX* context) {
+	if (context == (SHA512_CTX*)0) {
+		return;
+	}
+	MEMCPY_BCOPY(context->state, sha512_initial_hash_value, SHA512_DIGEST_LENGTH);
+	MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH);
+	context->bitcount[0] = context->bitcount[1] =  0;
+}
+
+#ifdef SHA2_UNROLL_TRANSFORM
+
+/* Unrolled SHA-512 round macros: */
+#if BYTE_ORDER == LITTLE_ENDIAN
+
+#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h)	\
+	REVERSE64(*data++, W512[j]); \
+	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
+             K512[j] + W512[j]; \
+	(d) += T1, \
+	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)), \
+	j++
+
+
+#else /* BYTE_ORDER == LITTLE_ENDIAN */
+
+#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h)	\
+	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
+             K512[j] + (W512[j] = *data++); \
+	(d) += T1; \
+	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
+	j++
+
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+#define ROUND512(a,b,c,d,e,f,g,h)	\
+	s0 = W512[(j+1)&0x0f]; \
+	s0 = sigma0_512(s0); \
+	s1 = W512[(j+14)&0x0f]; \
+	s1 = sigma1_512(s1); \
+	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + K512[j] + \
+             (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0); \
+	(d) += T1; \
+	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
+	j++
+
+void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
+	sha2_word64	a, b, c, d, e, f, g, h, s0, s1;
+	sha2_word64	T1, *W512 = (sha2_word64*)context->buffer;
+	int		j;
+
+	/* Initialize registers with the prev. intermediate value */
+	a = context->state[0];
+	b = context->state[1];
+	c = context->state[2];
+	d = context->state[3];
+	e = context->state[4];
+	f = context->state[5];
+	g = context->state[6];
+	h = context->state[7];
+
+	j = 0;
+	do {
+		ROUND512_0_TO_15(a,b,c,d,e,f,g,h);
+		ROUND512_0_TO_15(h,a,b,c,d,e,f,g);
+		ROUND512_0_TO_15(g,h,a,b,c,d,e,f);
+		ROUND512_0_TO_15(f,g,h,a,b,c,d,e);
+		ROUND512_0_TO_15(e,f,g,h,a,b,c,d);
+		ROUND512_0_TO_15(d,e,f,g,h,a,b,c);
+		ROUND512_0_TO_15(c,d,e,f,g,h,a,b);
+		ROUND512_0_TO_15(b,c,d,e,f,g,h,a);
+	} while (j < 16);
+
+	/* Now for the remaining rounds up to 79: */
+	do {
+		ROUND512(a,b,c,d,e,f,g,h);
+		ROUND512(h,a,b,c,d,e,f,g);
+		ROUND512(g,h,a,b,c,d,e,f);
+		ROUND512(f,g,h,a,b,c,d,e);
+		ROUND512(e,f,g,h,a,b,c,d);
+		ROUND512(d,e,f,g,h,a,b,c);
+		ROUND512(c,d,e,f,g,h,a,b);
+		ROUND512(b,c,d,e,f,g,h,a);
+	} while (j < 80);
+
+	/* Compute the current intermediate hash value */
+	context->state[0] += a;
+	context->state[1] += b;
+	context->state[2] += c;
+	context->state[3] += d;
+	context->state[4] += e;
+	context->state[5] += f;
+	context->state[6] += g;
+	context->state[7] += h;
+
+	/* Clean up */
+	a = b = c = d = e = f = g = h = T1 = 0;
+}
+
+#else /* SHA2_UNROLL_TRANSFORM */
+
+void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
+	sha2_word64	a, b, c, d, e, f, g, h, s0, s1;
+	sha2_word64	T1, T2, *W512 = (sha2_word64*)context->buffer;
+	int		j;
+
+	/* Initialize registers with the prev. intermediate value */
+	a = context->state[0];
+	b = context->state[1];
+	c = context->state[2];
+	d = context->state[3];
+	e = context->state[4];
+	f = context->state[5];
+	g = context->state[6];
+	h = context->state[7];
+
+	j = 0;
+	do {
+#if BYTE_ORDER == LITTLE_ENDIAN
+		/* Convert TO host byte order */
+		REVERSE64(*data++, W512[j]);
+		/* Apply the SHA-512 compression function to update a..h */
+		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + W512[j];
+#else /* BYTE_ORDER == LITTLE_ENDIAN */
+		/* Apply the SHA-512 compression function to update a..h with copy */
+		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + (W512[j] = *data++);
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+		T2 = Sigma0_512(a) + Maj(a, b, c);
+		h = g;
+		g = f;
+		f = e;
+		e = d + T1;
+		d = c;
+		c = b;
+		b = a;
+		a = T1 + T2;
+
+		j++;
+	} while (j < 16);
+
+	do {
+		/* Part of the message block expansion: */
+		s0 = W512[(j+1)&0x0f];
+		s0 = sigma0_512(s0);
+		s1 = W512[(j+14)&0x0f];
+		s1 =  sigma1_512(s1);
+
+		/* Apply the SHA-512 compression function to update a..h */
+		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] +
+		     (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0);
+		T2 = Sigma0_512(a) + Maj(a, b, c);
+		h = g;
+		g = f;
+		f = e;
+		e = d + T1;
+		d = c;
+		c = b;
+		b = a;
+		a = T1 + T2;
+
+		j++;
+	} while (j < 80);
+
+	/* Compute the current intermediate hash value */
+	context->state[0] += a;
+	context->state[1] += b;
+	context->state[2] += c;
+	context->state[3] += d;
+	context->state[4] += e;
+	context->state[5] += f;
+	context->state[6] += g;
+	context->state[7] += h;
+
+	/* Clean up */
+	a = b = c = d = e = f = g = h = T1 = T2 = 0;
+}
+
+#endif /* SHA2_UNROLL_TRANSFORM */
+
+void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
+	unsigned int	freespace, usedspace;
+
+	if (len == 0) {
+		/* Calling with no data is valid - we do nothing */
+		return;
+	}
+
+	/* Sanity check: */
+	assert(context != (SHA512_CTX*)0 && data != (sha2_byte*)0);
+
+	usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
+	if (usedspace > 0) {
+		/* Calculate how much free space is available in the buffer */
+		freespace = SHA512_BLOCK_LENGTH - usedspace;
+
+		if (len >= freespace) {
+			/* Fill the buffer completely and process it */
+			MEMCPY_BCOPY(&context->buffer[usedspace], data, freespace);
+			ADDINC128(context->bitcount, freespace << 3);
+			len -= freespace;
+			data += freespace;
+			SHA512_Transform(context, (sha2_word64*)context->buffer);
+		} else {
+			/* The buffer is not yet full */
+			MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
+			ADDINC128(context->bitcount, len << 3);
+			/* Clean up: */
+			usedspace = freespace = 0;
+			return;
+		}
+	}
+	while (len >= SHA512_BLOCK_LENGTH) {
+		/* Process as many complete blocks as we can */
+		SHA512_Transform(context, (sha2_word64*)data);
+		ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
+		len -= SHA512_BLOCK_LENGTH;
+		data += SHA512_BLOCK_LENGTH;
+	}
+	if (len > 0) {
+		/* There's left-overs, so save 'em */
+		MEMCPY_BCOPY(context->buffer, data, len);
+		ADDINC128(context->bitcount, len << 3);
+	}
+	/* Clean up: */
+	usedspace = freespace = 0;
+}
+
+void SHA512_Last(SHA512_CTX* context) {
+	unsigned int	usedspace;
+
+	usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
+#if BYTE_ORDER == LITTLE_ENDIAN
+	/* Convert FROM host byte order */
+	REVERSE64(context->bitcount[0],context->bitcount[0]);
+	REVERSE64(context->bitcount[1],context->bitcount[1]);
+#endif
+	if (usedspace > 0) {
+		/* Begin padding with a 1 bit: */
+		context->buffer[usedspace++] = 0x80;
+
+		if (usedspace <= SHA512_SHORT_BLOCK_LENGTH) {
+			/* Set-up for the last transform: */
+			MEMSET_BZERO(&context->buffer[usedspace], SHA512_SHORT_BLOCK_LENGTH - usedspace);
+		} else {
+			if (usedspace < SHA512_BLOCK_LENGTH) {
+				MEMSET_BZERO(&context->buffer[usedspace], SHA512_BLOCK_LENGTH - usedspace);
+			}
+			/* Do second-to-last transform: */
+			SHA512_Transform(context, (sha2_word64*)context->buffer);
+
+			/* And set-up for the last transform: */
+			MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH - 2);
+		}
+	} else {
+		/* Prepare for final transform: */
+		MEMSET_BZERO(context->buffer, SHA512_SHORT_BLOCK_LENGTH);
+
+		/* Begin padding with a 1 bit: */
+		*context->buffer = 0x80;
+	}
+	/* Store the length of input data (in bits): */
+	*(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1];
+	*(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0];
+
+	/* Final transform: */
+	SHA512_Transform(context, (sha2_word64*)context->buffer);
+}
+
+void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
+	sha2_word64	*d = (sha2_word64*)digest;
+
+	/* Sanity check: */
+	assert(context != (SHA512_CTX*)0);
+
+	/* If no digest buffer is passed, we don't bother doing this: */
+	if (digest != (sha2_byte*)0) {
+		SHA512_Last(context);
+
+		/* Save the hash data for output: */
+#if BYTE_ORDER == LITTLE_ENDIAN
+		{
+			/* Convert TO host byte order */
+			int	j;
+			for (j = 0; j < 8; j++) {
+				REVERSE64(context->state[j],context->state[j]);
+				*d++ = context->state[j];
+			}
+		}
+#else
+		MEMCPY_BCOPY(d, context->state, SHA512_DIGEST_LENGTH);
+#endif
+	}
+
+	/* Zero out state data */
+	MEMSET_BZERO(context, sizeof(SHA512_CTX));
+}
+
+char *SHA512_End(SHA512_CTX* context, char buffer[]) {
+	sha2_byte	digest[SHA512_DIGEST_LENGTH], *d = digest;
+	int		i;
+
+	/* Sanity check: */
+	assert(context != (SHA512_CTX*)0);
+
+	if (buffer != (char*)0) {
+		SHA512_Final(digest, context);
+
+		for (i = 0; i < SHA512_DIGEST_LENGTH; i++) {
+			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
+			*buffer++ = sha2_hex_digits[*d & 0x0f];
+			d++;
+		}
+		*buffer = (char)0;
+	} else {
+		MEMSET_BZERO(context, sizeof(SHA512_CTX));
+	}
+	MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH);
+	return buffer;
+}
+
+char* SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_STRING_LENGTH]) {
+	SHA512_CTX	context;
+
+	SHA512_Init(&context);
+	SHA512_Update(&context, data, len);
+	return SHA512_End(&context, digest);
+}
+
+
+/*** SHA-384: *********************************************************/
+void SHA384_Init(SHA384_CTX* context) {
+	if (context == (SHA384_CTX*)0) {
+		return;
+	}
+	MEMCPY_BCOPY(context->state, sha384_initial_hash_value, SHA512_DIGEST_LENGTH);
+	MEMSET_BZERO(context->buffer, SHA384_BLOCK_LENGTH);
+	context->bitcount[0] = context->bitcount[1] = 0;
+}
+
+void SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) {
+	SHA512_Update((SHA512_CTX*)context, data, len);
+}
+
+void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
+	sha2_word64	*d = (sha2_word64*)digest;
+
+	/* Sanity check: */
+	assert(context != (SHA384_CTX*)0);
+
+	/* If no digest buffer is passed, we don't bother doing this: */
+	if (digest != (sha2_byte*)0) {
+		SHA512_Last((SHA512_CTX*)context);
+
+		/* Save the hash data for output: */
+#if BYTE_ORDER == LITTLE_ENDIAN
+		{
+			/* Convert TO host byte order */
+			int	j;
+			for (j = 0; j < 6; j++) {
+				REVERSE64(context->state[j],context->state[j]);
+				*d++ = context->state[j];
+			}
+		}
+#else
+		MEMCPY_BCOPY(d, context->state, SHA384_DIGEST_LENGTH);
+#endif
+	}
+
+	/* Zero out state data */
+	MEMSET_BZERO(context, sizeof(SHA384_CTX));
+}
+
+char *SHA384_End(SHA384_CTX* context, char buffer[]) {
+	sha2_byte	digest[SHA384_DIGEST_LENGTH], *d = digest;
+	int		i;
+
+	/* Sanity check: */
+	assert(context != (SHA384_CTX*)0);
+
+	if (buffer != (char*)0) {
+		SHA384_Final(digest, context);
+
+		for (i = 0; i < SHA384_DIGEST_LENGTH; i++) {
+			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
+			*buffer++ = sha2_hex_digits[*d & 0x0f];
+			d++;
+		}
+		*buffer = (char)0;
+	} else {
+		MEMSET_BZERO(context, sizeof(SHA384_CTX));
+	}
+	MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH);
+	return buffer;
+}
+
+char* SHA384_Data(const sha2_byte* data, size_t len, char digest[SHA384_DIGEST_STRING_LENGTH]) {
+	SHA384_CTX	context;
+
+	SHA384_Init(&context);
+	SHA384_Update(&context, data, len);
+	return SHA384_End(&context, digest);
+}
+
+#undef R
+#undef S32
+#undef S64
+#undef Ch
+#undef Maj
+#undef Sigma0_256
+#undef Sigma1_256
+#undef sigma0_256
+#undef sigma1_256
+#undef Sigma0_512
+#undef Sigma1_512
+#undef sigma0_512
+#undef sigma1_512
diff --git a/beast/crypto/impl/sha2/sha2.h b/beast/crypto/impl/sha2/sha2.h
new file mode 100644
index 0000000000..1728d86306
--- /dev/null
+++ b/beast/crypto/impl/sha2/sha2.h
@@ -0,0 +1,117 @@
+/*
+ * FILE:	sha2.h
+ * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
+ * 
+ * Copyright (c) 2000-2001, Aaron D. Gifford
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $
+ */
+
+#ifndef __SHA2_H__
+#define __SHA2_H__
+
+//#ifdef __cplusplus
+//extern "C" {
+//#endif
+
+/*
+ * Import u_intXX_t size_t type definitions from system headers.  You
+ * may need to change this, or define these things yourself in this
+ * file.
+ */
+#include <sys/types.h>
+
+
+/*** SHA-256/384/512 Various Length Definitions ***********************/
+#define SHA256_DIGEST_STRING_LENGTH	(Sha256::digestLength * 2 + 1)
+#define SHA384_BLOCK_LENGTH   128
+#define SHA384_DIGEST_LENGTH   48
+#define SHA384_DIGEST_STRING_LENGTH	(SHA384_DIGEST_LENGTH * 2 + 1)
+#define SHA512_BLOCK_LENGTH	 128
+#define SHA512_DIGEST_LENGTH  64
+#define SHA512_DIGEST_STRING_LENGTH	(SHA512_DIGEST_LENGTH * 2 + 1)
+
+/*** SHA-256/384/512 Context Structures *******************************/
+typedef struct _SHA512_CTX {
+	uint64	state[8];
+	uint64	bitcount[2];
+	uint8	buffer[SHA512_BLOCK_LENGTH];
+} SHA512_CTX;
+
+typedef SHA512_CTX SHA384_CTX;
+
+
+/*** SHA-256/384/512 Function Prototypes ******************************/
+#ifndef NOPROTO
+
+void SHA256_Init(Sha256::detail::Context *);
+void SHA256_Update(Sha256::detail::Context*, const uint8*, size_t);
+void SHA256_Final(uint8[Sha256::digestLength], Sha256::detail::Context*);
+char* SHA256_End(Sha256::detail::Context*, char[SHA256_DIGEST_STRING_LENGTH]);
+char* SHA256_Data(const uint8*, size_t, char[SHA256_DIGEST_STRING_LENGTH]);
+
+void SHA384_Init(SHA384_CTX*);
+void SHA384_Update(SHA384_CTX*, const uint8*, size_t);
+void SHA384_Final(uint8[SHA384_DIGEST_LENGTH], SHA384_CTX*);
+char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]);
+char* SHA384_Data(const uint8*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
+
+void SHA512_Init(SHA512_CTX*);
+void SHA512_Update(SHA512_CTX*, const uint8*, size_t);
+void SHA512_Final(uint8[SHA512_DIGEST_LENGTH], SHA512_CTX*);
+char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]);
+char* SHA512_Data(const uint8*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
+
+#else /* NOPROTO */
+
+void SHA256_Init();
+void SHA256_Update();
+void SHA256_Final();
+char* SHA256_End();
+char* SHA256_Data();
+
+void SHA384_Init();
+void SHA384_Update();
+void SHA384_Final();
+char* SHA384_End();
+char* SHA384_Data();
+
+void SHA512_Init();
+void SHA512_Update();
+void SHA512_Final();
+char* SHA512_End();
+char* SHA512_Data();
+
+#endif /* NOPROTO */
+
+//#ifdef	__cplusplus
+//}
+//#endif /* __cplusplus */
+
+#endif /* __SHA2_H__ */
+
diff --git a/beast/crypto/impl/sha2/sha2prog.c b/beast/crypto/impl/sha2/sha2prog.c
new file mode 100644
index 0000000000..012701e898
--- /dev/null
+++ b/beast/crypto/impl/sha2/sha2prog.c
@@ -0,0 +1,132 @@
+/*
+ * FILE:	sha2prog.c
+ * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
+ * 
+ * Copyright (c) 2000-2001, Aaron D. Gifford
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sysexits.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
+
+#include "sha2.h"
+
+void usage(char *prog, char *msg) {
+	fprintf(stderr, "%s\nUsage:\t%s [options] [<file>]\nOptions:\n\t-256\tGenerate SHA-256 hash\n\t-384\tGenerate SHA-284 hash\n\t-512\tGenerate SHA-512 hash\n\t-ALL\tGenerate all three hashes\n\t-q\tQuiet mode - only output hexadecimal hashes, one per line\n\n", msg, prog);
+	exit(-1);
+}
+
+#define BUFLEN 16384
+
+int main(int argc, char **argv) {
+	int		kl, l, fd, ac;
+	int		quiet = 0, hash = 0;
+	char		*av, *file = (char*)0;
+	FILE		*IN = (FILE*)0;
+	SHA256_CTX	ctx256;
+	SHA384_CTX	ctx384;
+	SHA512_CTX	ctx512;
+	unsigned char	buf[BUFLEN];
+
+	SHA256_Init(&ctx256);
+	SHA384_Init(&ctx384);
+	SHA512_Init(&ctx512);
+
+	/* Read data from STDIN by default */
+	fd = fileno(stdin);
+
+	ac = 1;
+	while (ac < argc) {
+		if (*argv[ac] == '-') {
+			av = argv[ac] + 1;
+			if (!strcmp(av, "q")) {
+				quiet = 1;
+			} else if (!strcmp(av, "256")) {
+				hash |= 1;
+			} else if (!strcmp(av, "384")) {
+				hash |= 2;
+			} else if (!strcmp(av, "512")) {
+				hash |= 4;
+			} else if (!strcmp(av, "ALL")) {
+				hash = 7;
+			} else {
+				usage(argv[0], "Invalid option.");
+			}
+			ac++;
+		} else {
+			file = argv[ac++];
+			if (ac != argc) {
+				usage(argv[0], "Too many arguments.");
+			}
+			if ((IN = fopen(file, "r")) == NULL) {
+				perror(argv[0]);
+				exit(-1);
+			}
+			fd = fileno(IN);
+		}
+	}
+	if (hash == 0)
+		hash = 7;	/* Default to ALL */
+
+	kl = 0;
+	while ((l = read(fd,buf,BUFLEN)) > 0) {
+		kl += l;
+		SHA256_Update(&ctx256, (unsigned char*)buf, l);
+		SHA384_Update(&ctx384, (unsigned char*)buf, l);
+		SHA512_Update(&ctx512, (unsigned char*)buf, l);
+	}
+	if (file) {
+		fclose(IN);
+	}
+
+	if (hash & 1) {
+		SHA256_End(&ctx256, buf);
+		if (!quiet)
+			printf("SHA-256 (%s) = ", file);
+		printf("%s\n", buf);
+	}
+	if (hash & 2) {
+		SHA384_End(&ctx384, buf);
+		if (!quiet)
+			printf("SHA-384 (%s) = ", file);
+		printf("%s\n", buf);
+	}
+	if (hash & 4) {
+		SHA512_End(&ctx512, buf);
+		if (!quiet)
+			printf("SHA-512 (%s) = ", file);
+		printf("%s\n", buf);
+	}
+
+	return 1;
+}
+
diff --git a/beast/crypto/impl/sha2/sha2speed.c b/beast/crypto/impl/sha2/sha2speed.c
new file mode 100644
index 0000000000..2e135750fa
--- /dev/null
+++ b/beast/crypto/impl/sha2/sha2speed.c
@@ -0,0 +1,174 @@
+/*
+ * FILE:	sha2speed.c
+ * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
+ * 
+ * Copyright (c) 2000-2001, Aaron D. Gifford
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id: sha2speed.c,v 1.1 2001/11/08 00:02:23 adg Exp adg $
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+
+#include "sha2.h"
+
+#define BUFSIZE	16384
+
+void usage(char *prog) {
+	fprintf(stderr, "Usage:\t%s [<num-of-bytes>] [<num-of-loops>] [<fill-byte>]\n", prog);
+	exit(-1);
+}
+
+void printspeed(char *caption, unsigned long bytes, double time) {
+	if (bytes / 1073741824UL > 0) {
+                printf("%s %.4f sec (%.3f GBps)\n", caption, time, (double)bytes/1073741824UL/time);
+        } else if (bytes / 1048576 > 0) {
+                printf("%s %.4f (%.3f MBps)\n", caption, time, (double)bytes/1048576/time);
+        } else if (bytes / 1024 > 0) {
+                printf("%s %.4f (%.3f KBps)\n", caption, time, (double)bytes/1024/time);
+        } else {
+		printf("%s %.4f (%f Bps)\n", caption, time, (double)bytes/time);
+	}
+}
+
+
+int main(int argc, char **argv) {
+	SHA256_CTX	c256;
+	SHA384_CTX	c384;
+	SHA512_CTX	c512;
+	char		buf[BUFSIZE];
+	char		md[SHA512_DIGEST_STRING_LENGTH];
+	int		bytes, blocks, rep, i, j;
+	struct timeval	start, end;
+	double		t, ave256, ave384, ave512;
+	double		best256, best384, best512;
+
+	if (argc > 4) {
+		usage(argv[0]);
+	}
+
+	/* Default to 1024 16K blocks (16 MB) */
+	bytes = 1024 * 1024 * 16;
+	if (argc > 1) {
+		blocks = atoi(argv[1]);
+	}
+	blocks = bytes / BUFSIZE;
+
+	/* Default to 10 repetitions */
+	rep = 10;
+	if (argc > 2) {
+		rep = atoi(argv[2]);
+	}
+
+	/* Set up the input data */
+	if (argc > 3) {
+		memset(buf, atoi(argv[2]), BUFSIZE);
+	} else {
+		memset(buf, 0xb7, BUFSIZE);
+	}
+
+	ave256 = ave384 = ave512 = 0;
+	best256 = best384 = best512 = 100000;
+	for (i = 0; i < rep; i++) {
+		SHA256_Init(&c256);
+		SHA384_Init(&c384);
+		SHA512_Init(&c512);
+	
+		gettimeofday(&start, (struct timezone*)0);
+		for (j = 0; j < blocks; j++) {
+			SHA256_Update(&c256, (unsigned char*)buf, BUFSIZE);
+		}
+		if (bytes % BUFSIZE) {
+			SHA256_Update(&c256, (unsigned char*)buf, bytes % BUFSIZE);
+		}
+		SHA256_End(&c256, md);
+		gettimeofday(&end, (struct timezone*)0);
+		t = ((end.tv_sec - start.tv_sec) * 1000000.0 + (end.tv_usec - start.tv_usec)) / 1000000.0;
+		ave256 += t;
+		if (t < best256) {
+			best256 = t;
+		}
+		printf("SHA-256[%d] (%.4f/%.4f/%.4f seconds) = 0x%s\n", i+1, t, ave256/(i+1), best256, md);
+
+		gettimeofday(&start, (struct timezone*)0);
+		for (j = 0; j < blocks; j++) {
+			SHA384_Update(&c384, (unsigned char*)buf, BUFSIZE);
+		}
+		if (bytes % BUFSIZE) {
+			SHA384_Update(&c384, (unsigned char*)buf, bytes % BUFSIZE);
+		}
+		SHA384_End(&c384, md);
+		gettimeofday(&end, (struct timezone*)0);
+		t = ((end.tv_sec - start.tv_sec) * 1000000.0 + (end.tv_usec - start.tv_usec)) / 1000000.0;
+		ave384 += t;
+		if (t < best384) {
+			best384 = t;
+		}
+		printf("SHA-384[%d] (%.4f/%.4f/%.4f seconds) = 0x%s\n", i+1, t, ave384/(i+1), best384, md);
+
+		gettimeofday(&start, (struct timezone*)0);
+		for (j = 0; j < blocks; j++) {
+			SHA512_Update(&c512, (unsigned char*)buf, BUFSIZE);
+		}
+		if (bytes % BUFSIZE) {
+			SHA512_Update(&c512, (unsigned char*)buf, bytes % BUFSIZE);
+		}
+		SHA512_End(&c512, md);
+		gettimeofday(&end, (struct timezone*)0);
+		t = ((end.tv_sec - start.tv_sec) * 1000000.0 + (end.tv_usec - start.tv_usec)) / 1000000.0;
+		ave512 += t;
+		if (t < best512) {
+			best512 = t;
+		}
+		printf("SHA-512[%d] (%.4f/%.4f/%.4f seconds) = 0x%s\n", i+1, t, ave512/(i+1), best512, md);
+	}
+	ave256 /= rep;
+	ave384 /= rep;
+	ave512 /= rep;
+	printf("\nTEST RESULTS SUMMARY:\nTEST REPETITIONS: %d\n", rep);
+	if (bytes / 1073741824UL > 0) {
+		printf("TEST SET SIZE: %.3f GB\n", (double)bytes/1073741824UL);
+	} else if (bytes / 1048576 > 0) {
+		printf("TEST SET SIZE: %.3f MB\n", (double)bytes/1048576);
+	} else if (bytes /1024 > 0) {
+		printf("TEST SET SIZE: %.3f KB\n", (double)bytes/1024);
+	} else {
+		printf("TEST SET SIZE: %d B\n", bytes);
+	}
+	printspeed("SHA-256 average:", bytes, ave256);
+	printspeed("SHA-256 best:   ", bytes, best256);
+	printspeed("SHA-384 average:", bytes, ave384);
+	printspeed("SHA-384 best:   ", bytes, best384);
+	printspeed("SHA-512 average:", bytes, ave512);
+	printspeed("SHA-512 best:   ", bytes, best512);
+
+	return 1;
+}
+
diff --git a/beast/crypto/impl/sha2/sha2test.pl b/beast/crypto/impl/sha2/sha2test.pl
new file mode 100644
index 0000000000..dc884d8c17
--- /dev/null
+++ b/beast/crypto/impl/sha2/sha2test.pl
@@ -0,0 +1,358 @@
+#!/usr/bin/perl
+#
+# FILE:		sha2test.pl
+# AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
+# 
+# Copyright (c) 2001, Aaron D. Gifford
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the copyright holder nor the names of contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $Id: sha2test.pl,v 1.1 2001/11/08 00:02:37 adg Exp adg $
+#
+
+sub usage {
+	my ($err) = shift(@_);
+
+	print <<EOM;
+Error:
+	$err
+Usage:
+	$0 [<options>] [<test-vector-info-file> [<test-vector-info-file> ...]]
+
+Options:
+	-256	Use SHA-256 hashes during testing
+	-384	Use SHA-384 hashes during testing
+	-512	Use SHA-512 hashes during testing
+	-ALL	Use all three hashes during testing
+	-c256 <command-spec>	Specify a command to execute to generate a
+				SHA-256 hash.  Be sure to include a '%'
+				character which will be replaced by the
+				test vector data filename containing the
+				data to be hashed.  This command implies
+				the -256 option.
+	-c384 <command-spec>	Specify a command to execute to generate a
+				SHA-384 hash.  See above.  Implies -384.
+	-c512 <command-spec>	Specify a command to execute to generate a
+				SHA-512 hash.  See above.  Implies -512.
+	-cALL <command-spec>	Specify a command to execute that will
+				generate all three hashes at once and output
+				the data in hexadecimal.  See above for
+				information about the <command-spec>.
+				This option implies the -ALL option, and
+				also overrides any other command options if
+				present.
+
+By default, this program expects to execute the command ./sha2 within the
+current working directory to generate all hashes.  If no test vector
+information files are specified, this program expects to read a series of
+files ending in ".info" within a subdirectory of the current working
+directory called "testvectors".
+
+EOM
+	exit(-1);
+}
+
+$c256 = $c384 = $c512 = $cALL = "";
+$hashes = 0;
+@FILES = ();
+
+# Read all command-line options and files:
+while ($opt = shift(@ARGV)) {
+	if ($opt =~ s/^\-//) {
+		if ($opt eq "256") {
+			$hashes |= 1;
+		} elsif ($opt eq "384") {
+			$hashes |= 2;
+		} elsif ($opt eq "512") {
+			$hashes |= 4;
+		} elsif ($opt =~ /^ALL$/i) {
+			$hashes = 7;
+		} elsif ($opt =~ /^c256$/i) {
+			$hashes |= 1;
+			$opt = $c256 = shift(@ARGV);
+			$opt =~ s/\s+.*$//;
+			if (!$c256 || $c256 !~ /\%/ || !-x $opt) {
+				usage("Missing or invalid command specification for option -c256: $opt\n");
+			}
+		} elsif ($opt =~ /^c384$/i) {
+			$hashes |= 2;
+			$opt = $c384 = shift(@ARGV);
+			$opt =~ s/\s+.*$//;
+			if (!$c384 || $c384 !~ /\%/ || !-x $opt) {
+				usage("Missing or invalid command specification for option -c384: $opt\n");
+			}
+		} elsif ($opt =~ /^c512$/i) {
+			$hashes |= 4;
+			$opt = $c512 = shift(@ARGV);
+			$opt =~ s/\s+.*$//;
+			if (!$c512 || $c512 !~ /\%/ || !-x $opt) {
+				usage("Missing or invalid command specification for option -c512: $opt\n");
+			}
+		} elsif ($opt =~ /^cALL$/i) {
+			$hashes = 7;
+			$opt = $cALL = shift(@ARGV);
+			$opt =~ s/\s+.*$//;
+			if (!$cALL || $cALL !~ /\%/ || !-x $opt) {
+				usage("Missing or invalid command specification for option -cALL: $opt\n");
+			}
+		} else {
+			usage("Unknown/invalid option '$opt'\n");
+		}
+	} else {
+		usage("Invalid, nonexistent, or unreadable file '$opt': $!\n") if (!-f $opt);
+		push(@FILES, $opt);
+	}
+}
+
+# Set up defaults:
+if (!$cALL && !$c256 && !$c384 && !$c512) {
+	$cALL = "./sha2 -ALL %";
+	usage("Required ./sha2 binary executable not found.\n") if (!-x "./sha2");
+}
+$hashes = 7 if (!$hashes);
+
+# Do some sanity checks:
+usage("No command was supplied to generate SHA-256 hashes.\n") if ($hashes & 1 == 1 && !$cALL && !$c256);
+usage("No command was supplied to generate SHA-384 hashes.\n") if ($hashes & 2 == 2 && !$cALL && !$c384);
+usage("No command was supplied to generate SHA-512 hashes.\n") if ($hashes & 4 == 4 && !$cALL && !$c512);
+
+# Default .info files:
+if (scalar(@FILES) < 1) {
+	opendir(DIR, "testvectors") || usage("Unable to scan directory 'testvectors' for vector information files: $!\n");
+	@FILES = grep(/\.info$/, readdir(DIR));
+	closedir(DIR);
+	@FILES = map { s/^/testvectors\//; $_; } @FILES;
+	@FILES = sort(@FILES);
+}
+
+# Now read in each test vector information file:
+foreach $file (@FILES) {
+	$dir = $file;
+	if ($file !~ /\//) {
+		$dir = "./";
+	} else {
+		$dir =~ s/\/[^\/]+$//;
+		$dir .= "/";
+	}
+	open(FILE, "<" . $file) ||
+		usage("Unable to open test vector information file '$file' for reading: $!\n");
+	$vec = { desc => "", file => "", sha256 => "", sha384 => "", sha512 => "" };
+	$data = $field = "";
+	$line = 0;
+	while(<FILE>) {
+		$line++;
+		s/\s*[\r\n]+$//;
+		next if ($field && $field ne "DESCRIPTION" && !$_);
+		if (/^(DESCRIPTION|FILE|SHA256|SHA384|SHA512):$/) {
+			if ($field eq "DESCRIPTION") {
+				$vec->{desc} = $data;
+			} elsif ($field eq "FILE") {
+				$data = $dir . $data if ($data !~ /^\//);
+				$vec->{file} = $data;
+			} elsif ($field eq "SHA256") {
+				$vec->{sha256} = $data;
+			} elsif ($field eq "SHA384") {
+				$vec->{sha384} = $data;
+			} elsif ($field eq "SHA512") {
+				$vec->{sha512} = $data;
+			}
+			$data = "";
+			$field = $1;
+		} elsif ($field eq "DESCRIPTION") {
+			s/^    //;
+			$data .= $_ . "\n";
+		} elsif ($field =~ /^SHA\d\d\d$/) {
+			s/^\s+//;
+			if (!/^([a-f0-9]{32}|[a-f0-9]{64})$/) {
+				usage("Invalid SHA-256/384/512 test vector information " .
+				      "file format at line $line of file '$file'\n");
+			}
+			$data .= $_;
+		} elsif ($field eq "FILE") {
+			s/^    //;
+			$data .= $_;
+		} else {
+			usage("Invalid SHA-256/384/512 test vector information file " .
+			      "format at line $line of file '$file'\n");
+		}
+	}
+	if ($field eq "DESCRIPTION") {
+		$data = $dir . $data if ($data !~ /^\//);
+		$vec->{desc} = $data;
+	} elsif ($field eq "FILE") {
+		$vec->{file} = $data;
+	} elsif ($field eq "SHA256") {
+		$vec->{sha256} = $data;
+	} elsif ($field eq "SHA384") {
+		$vec->{sha384} = $data;
+	} elsif ($field eq "SHA512") {
+		$vec->{sha512} = $data;
+	} else {
+		usage("Invalid SHA-256/384/512 test vector information file " .
+		      "format.  Missing required fields in file '$file'\n");
+	}
+
+	# Sanity check all entries:
+	if (!$vec->{desc}) {
+		usage("Invalid SHA-256/384/512 test vector information file " .
+		      "format.  Missing required DESCRIPTION field in file '$file'\n");
+	}
+	if (!$vec->{file}) {
+		usage("Invalid SHA-256/384/512 test vector information file " .
+		      "format.  Missing required FILE field in file '$file'\n");
+	}
+	if (! -f $vec->{file}) {
+		usage("The test vector data file (field FILE) name " .
+		      "'$vec->{file}' is not a readable file.  Check the FILE filed in " .
+		      "file '$file'.\n");
+	}
+	if (!($vec->{sha256} || $vec->{sha384} || $vec->{sha512})) {
+		usage("Invalid SHA-256/384/512 test vector information file " .
+		      "format.  There must be at least one SHA256, SHA384, or SHA512 " .
+		      "field specified in file '$file'.\n");
+	}
+	if ($vec->{sha256} !~ /^(|[a-f0-9]{64})$/) {
+		usage("Invalid SHA-256/384/512 test vector information file " .
+		      "format.  The SHA256 field is invalid in file '$file'.\n");
+	}
+	if ($vec->{sha384} !~ /^(|[a-f0-9]{96})$/) {
+		usage("Invalid SHA-256/384/512 test vector information file " .
+		      "format.  The SHA384 field is invalid in file '$file'.\n");
+	}
+	if ($vec->{sha512} !~ /^(|[a-f0-9]{128})$/) {
+		usage("Invalid SHA-256/384/512 test vector information file " .
+		      "format.  The SHA512 field is invalid in file '$file'.\n");
+	}
+	close(FILE);
+	if ($hashes & (($vec->{sha256} ? 1 : 0) | ($vec->{sha384} ? 2 : 0) | ($vec->{sha512} ? 4 : 0))) {
+		push(@VECTORS, $vec);
+	}
+}
+
+usage("There were no test vectors for the specified hash(es) in any of the test vector information files you specified.\n") if (scalar(@VECTORS) < 1);
+
+$num = $errors = $error256 = $error384 = $error512 = $tests = $test256 = $test384 = $test512 = 0;
+foreach $vec (@VECTORS) {
+	$num++;
+	print "TEST VECTOR #$num:\n";
+	print "\t" . join("\n\t", split(/\n/, $vec->{desc})) . "\n";
+	print "VECTOR DATA FILE:\n\t$vec->{file}\n";
+	$sha256 = $sha384 = $sha512 = "";
+	if ($cALL) {
+		$prog = $cALL;
+		$prog =~ s/\%/'$vec->{file}'/g;
+		@SHA = grep(/[a-fA-f0-9]{64,128}/, split(/\n/, `$prog`));
+		($sha256) = grep(/(^[a-fA-F0-9]{64}$|^[a-fA-F0-9]{64}[^a-fA-F0-9]|[^a-fA-F0-9][a-fA-F0-9]{64}$|[^a-fA-F0-9][a-fA-F0-9]{64}[^a-fA-F0-9])/, @SHA);
+		($sha384) = grep(/(^[a-fA-F0-9]{96}$|^[a-fA-F0-9]{96}[^a-fA-F0-9]|[^a-fA-F0-9][a-fA-F0-9]{96}$|[^a-fA-F0-9][a-fA-F0-9]{96}[^a-fA-F0-9])/, @SHA);
+		($sha512) = grep(/(^[a-fA-F0-9]{128}$|^[a-fA-F0-9]{128}[^a-fA-F0-9]|[^a-fA-F0-9][a-fA-F0-9]{128}$|[^a-fA-F0-9][a-fA-F0-9]{128}[^a-fA-F0-9])/, @SHA);
+	} else {
+		if ($c256) {
+			$prog = $c256;
+			$prog =~ s/\%/'$vec->{file}'/g;
+			@SHA = grep(/[a-fA-f0-9]{64,128}/, split(/\n/, `$prog`));
+			($sha256) = grep(/(^[a-fA-F0-9]{64}$|^[a-fA-F0-9]{64}[^a-fA-F0-9]|[^a-fA-F0-9][a-fA-F0-9]{64}$|[^a-fA-F0-9][a-fA-F0-9]{64}[^a-fA-F0-9])/, @SHA);
+		}
+		if ($c384) {
+			$prog = $c384;
+			$prog =~ s/\%/'$vec->{file}'/g;
+			@SHA = grep(/[a-fA-f0-9]{64,128}/, split(/\n/, `$prog`));
+			($sha384) = grep(/(^[a-fA-F0-9]{96}$|^[a-fA-F0-9]{96}[^a-fA-F0-9]|[^a-fA-F0-9][a-fA-F0-9]{96}$|[^a-fA-F0-9][a-fA-F0-9]{96}[^a-fA-F0-9])/, @SHA);
+		}
+		if ($c512) {
+			$prog = $c512;
+			$prog =~ s/\%/'$vec->{file}'/g;
+			@SHA = grep(/[a-fA-f0-9]{64,128}/, split(/\n/, `$prog`));
+			($sha512) = grep(/(^[a-fA-F0-9]{128}$|^[a-fA-F0-9]{128}[^a-fA-F0-9]|[^a-fA-F0-9][a-fA-F0-9]{128}$|[^a-fA-F0-9][a-fA-F0-9]{128}[^a-fA-F0-9])/, @SHA);
+		}
+	}
+	usage("Unable to generate any hashes for file '$vec->{file}'!\n") if (!$sha256 && !$sha384 && $sha512);
+	$sha256 =~ tr/A-F/a-f/;
+	$sha384 =~ tr/A-F/a-f/;
+	$sha512 =~ tr/A-F/a-f/;
+	$sha256 =~ s/^.*([a-f0-9]{64}).*$/$1/;
+	$sha384 =~ s/^.*([a-f0-9]{96}).*$/$1/;
+	$sha512 =~ s/^.*([a-f0-9]{128}).*$/$1/;
+
+	if ($sha256 && $hashes & 1 == 1) {
+		if ($vec->{sha256} eq $sha256) {
+			print "SHA256 MATCHES:\n\t$sha256\n"
+		} else {
+			print "SHA256 DOES NOT MATCH:\n\tEXPECTED:\n\t\t$vec->{sha256}\n" .
+			      "\tGOT:\n\t\t$sha256\n\n";
+			$error256++;
+		}
+		$test256++;
+	}
+	if ($sha384 && $hashes & 2 == 2) {
+		if ($vec->{sha384} eq $sha384) {
+			print "SHA384 MATCHES:\n\t" . substr($sha384, 0, 64) . "\n\t" .
+			      substr($sha384, -32) . "\n";
+		} else {
+			print "SHA384 DOES NOT MATCH:\n\tEXPECTED:\n\t\t" .
+			      substr($vec->{sha384}, 0, 64) . "\n\t\t" .
+			      substr($vec->{sha384}, -32) . "\n\tGOT:\n\t\t" .
+			      substr($sha384, 0, 64) . "\n\t\t" . substr($sha384, -32) . "\n\n";
+			$error384++;
+		}
+		$test384++;
+	}
+	if ($sha512 && $hashes & 4 == 4) {
+		if ($vec->{sha512} eq $sha512) {
+			print "SHA512 MATCHES:\n\t" . substr($sha512, 0, 64) . "\n\t" .
+			      substr($sha512, -64) . "\n";
+		} else {
+			print "SHA512 DOES NOT MATCH:\n\tEXPECTED:\n\t\t" .
+			      substr($vec->{sha512}, 0, 64) . "\n\t\t" .
+			      substr($vec->{sha512}, -32) . "\n\tGOT:\n\t\t" .
+			      substr($sha512, 0, 64) . "\n\t\t" . substr($sha512, -64) . "\n\n";
+			$error512++;
+		}
+		$test512++;
+	}
+}
+
+$errors = $error256 + $error384 + $error512;
+$tests = $test256 + $test384 + $test512;
+print "\n\n===== RESULTS ($num VECTOR DATA FILES HASHED) =====\n\n";
+print "HASH TYPE\tNO. OF TESTS\tPASSED\tFAILED\n";
+print "---------\t------------\t------\t------\n";
+if ($test256) {
+	$pass = $test256 - $error256;
+	print "SHA-256\t\t".substr("           $test256", -12)."\t".substr("     $pass", -6)."\t".substr("     $error256", -6)."\n";
+}
+if ($test384) {
+	$pass = $test384 - $error384;
+	print "SHA-384\t\t".substr("           $test384", -12)."\t".substr("     $pass", -6)."\t".substr("     $error384", -6)."\n";
+}
+if ($test512) {
+	$pass = $test512 - $error512;
+	print "SHA-512\t\t".substr("           $test512", -12)."\t".substr("     $pass", -6)."\t".substr("     $error512", -6)."\n";
+}
+print "----------------------------------------------\n";
+$pass = $tests - $errors;
+print "TOTAL:          ".substr("           $tests", -12)."\t".substr("     $pass", -6)."\t".substr("     $errors", -6)."\n\n";
+print "NO ERRORS!  ALL TESTS WERE SUCCESSFUL!\n\n" if (!$errors);
+
diff --git a/beast/http/HTTP.cpp b/beast/http/HTTP.cpp
new file mode 100644
index 0000000000..a4913b0381
--- /dev/null
+++ b/beast/http/HTTP.cpp
@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "impl/URL.cpp"
+#include "impl/ParsedURL.cpp"
+#include "impl/http_parser.cpp"
diff --git a/beast/http/ParsedURL.h b/beast/http/ParsedURL.h
new file mode 100644
index 0000000000..69ca4a0746
--- /dev/null
+++ b/beast/http/ParsedURL.h
@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_HTTP_PARSEDURL_H_INCLUDED
+#define BEAST_HTTP_PARSEDURL_H_INCLUDED
+
+#include "../Strings.h"
+#include "URL.h"
+
+namespace beast {
+
+/** Parses a String containing a URL. */
+class ParsedURL
+{
+public:
+    ParsedURL ();
+    explicit ParsedURL (String const& url);
+    ParsedURL (int error, URL const& url);
+    ParsedURL (ParsedURL const& other);
+    ParsedURL& operator= (ParsedURL const& other);
+
+    /** Zero for success, else a non zero value indicating failure. */
+    int error () const;
+
+    /** The parsed URL if there was no error. */
+    URL url () const;
+
+private:
+    int m_error;
+    URL m_url;
+};
+
+}
+
+#endif
diff --git a/modules/beast_asio/http/UniformResourceLocator.h b/beast/http/URL.h
similarity index 74%
rename from modules/beast_asio/http/UniformResourceLocator.h
rename to beast/http/URL.h
index 557cadfb86..5d80bd809c 100644
--- a/modules/beast_asio/http/UniformResourceLocator.h
+++ b/beast/http/URL.h
@@ -17,20 +17,24 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ASIO_PROTOCOL_UNIFORMRESOURCELOCATOR_H_INCLUDED
-#define BEAST_ASIO_PROTOCOL_UNIFORMRESOURCELOCATOR_H_INCLUDED
+#ifndef BEAST_HTTP_URL_H_INCLUDED
+#define BEAST_HTTP_URL_H_INCLUDED
+
+#include "../strings/String.h"
+
+namespace beast {
 
 /** A URL.
     The accompanying robust parser is hardened against all forms of attack.
 */
-class UniformResourceLocator
+class URL
 {
 public:
     /** Construct an empty URL. */
-    explicit UniformResourceLocator ();
+    explicit URL ();
 
     /** Construct a URL from it's components. */
-    UniformResourceLocator (
+    URL (
         String schema_,
         String host_,
         uint16 port_,
@@ -41,10 +45,13 @@ public:
         String userinfo_ = "");
 
     /** Copy construct a URL. */
-    UniformResourceLocator (UniformResourceLocator const& other);
+    URL (URL const& other);
 
     /** Copy assign a URL. */
-    UniformResourceLocator& operator= (UniformResourceLocator const& other);
+    URL& operator= (URL const& other);
+
+    /** Returns `true` if this is an empty URL. */
+    bool empty () const;
 
     /** Returns the scheme of the URL.
         If no scheme was specified, the string will be empty.
@@ -96,28 +103,6 @@ private:
     String m_userinfo;
 };
 
-//------------------------------------------------------------------------------
-
-/** Parses a String containing a URL.    
-*/
-class ParsedURL
-{
-public:
-    ParsedURL ();
-    explicit ParsedURL (String const& url);
-    ParsedURL (int error, UniformResourceLocator const& url);
-    ParsedURL (ParsedURL const& other);
-    ParsedURL& operator= (ParsedURL const& other);
-
-    /** Zero for success, else a non zero value indicating failure. */
-    int error () const;
-
-    /** The parsed URL if there was no error. */
-    UniformResourceLocator url () const;
-
-private:
-    int m_error;
-    UniformResourceLocator m_url;
-};
+}
 
 #endif
diff --git a/modules/beast_asio/http/UniformResourceLocator.cpp b/beast/http/impl/ParsedURL.cpp
similarity index 59%
rename from modules/beast_asio/http/UniformResourceLocator.cpp
rename to beast/http/impl/ParsedURL.cpp
index 7324c0c297..b76f1df676 100644
--- a/modules/beast_asio/http/UniformResourceLocator.cpp
+++ b/beast/http/impl/ParsedURL.cpp
@@ -17,134 +17,13 @@
 */
 //==============================================================================
 
-UniformResourceLocator::UniformResourceLocator ()
-    : m_port (0)
-{
-}
+#include "../ParsedURL.h"
 
-UniformResourceLocator::UniformResourceLocator (
-    String scheme_,
-    String host_,
-    uint16 port_,
-    String port_string_,
-    String path_,
-    String query_,
-    String fragment_,
-    String userinfo_)
-    : m_scheme (scheme_)
-    , m_host (host_)
-    , m_port (port_)
-    , m_port_string (port_string_)
-    , m_path (path_)
-    , m_query (query_)
-    , m_fragment (fragment_)
-    , m_userinfo (userinfo_)
-{
-}
+#include "http-parser/http_parser.h"
 
-UniformResourceLocator::UniformResourceLocator (UniformResourceLocator const& other)
-    : m_scheme (other.m_scheme)
-    , m_host (other.m_host)
-    , m_port (other.m_port)
-    , m_port_string (other.m_port_string)
-    , m_path (other.m_path)
-    , m_query (other.m_query)
-    , m_fragment (other.m_fragment)
-    , m_userinfo (other.m_userinfo)
-{
-}
+#include "../../../modules/beast_core/beast_core.h" // for UnitTest
 
-UniformResourceLocator& UniformResourceLocator::operator= (UniformResourceLocator const& other)
-{
-    m_scheme = other.m_scheme;
-    m_host = other.m_host;
-    m_port = other.m_port;
-    m_port_string = other.m_port_string;
-    m_path = other.m_path;
-    m_query = other.m_query;
-    m_fragment = other.m_fragment;
-    m_userinfo = other.m_userinfo;
-    return *this;
-}
-
-//------------------------------------------------------------------------------
-
-String UniformResourceLocator::scheme () const
-{
-    return m_scheme;
-}
-
-String UniformResourceLocator::host () const
-{
-    return m_host;
-}
-
-String UniformResourceLocator::port_string () const
-{
-    return m_port_string;
-}
-
-uint16 UniformResourceLocator::port () const
-{
-    return m_port;
-}
-
-String UniformResourceLocator::path () const
-{
-    return m_path;
-}
-
-String UniformResourceLocator::query () const
-{
-    return m_query;
-}
-
-String UniformResourceLocator::fragment () const
-{
-    return m_fragment;
-}
-
-String UniformResourceLocator::userinfo () const
-{
-    return m_userinfo;
-}
-
-//------------------------------------------------------------------------------
-/*
-    From
-        http://en.wikipedia.org/wiki/URI_scheme
-
-    <scheme name> : <hierarchical part> [ ? <query> ] [ # <fragment> ]
-
-    e.g.
-
-    foo://username:password@example.com:8042/over/there/index.dtb?type=animal&name=narwhal#nose
-*/
-String UniformResourceLocator::full () const
-{
-    String s;
-
-    s = scheme () + "://";
-    
-    if (userinfo () != String::empty)
-        s = userinfo () + "@";
-
-    s = s + host ();
-
-    if (port () != 0)
-        s = s + ":" + String::fromNumber (port ());
-
-    s = s + path ();
-
-    if (query () != String::empty)
-        s = "?" + query ();
-
-    if (fragment () != String::empty)
-        s = "#" + fragment ();
-
-    return s;
-}
-//------------------------------------------------------------------------------
+namespace beast {
 
 ParsedURL::ParsedURL ()
     : m_error (0)
@@ -226,7 +105,7 @@ ParsedURL::ParsedURL (String const& url)
                     u.field_data [UF_USERINFO].len);
         }
 
-        m_url = UniformResourceLocator (
+        m_url = URL (
             scheme_,
             host_,
             port_,
@@ -238,7 +117,7 @@ ParsedURL::ParsedURL (String const& url)
     }
 }
 
-ParsedURL::ParsedURL (int error, UniformResourceLocator const& url)
+ParsedURL::ParsedURL (int error, URL const& url)
     : m_error (error)
     , m_url (url)
 {
@@ -262,7 +141,7 @@ int ParsedURL::error () const
     return m_error;
 }
 
-UniformResourceLocator ParsedURL::url () const
+URL ParsedURL::url () const
 {
     return m_url;
 }
@@ -297,3 +176,5 @@ public:
 };
 
 static ParsedURLTests parsedURLTests;
+
+}
diff --git a/beast/http/impl/README.md b/beast/http/impl/README.md
new file mode 100644
index 0000000000..ab82bbba99
--- /dev/null
+++ b/beast/http/impl/README.md
@@ -0,0 +1,3 @@
+git-subtree: "http-parser"
+remote: https://github.com/joyent/http-parser.git
+branch: master
diff --git a/beast/http/impl/URL.cpp b/beast/http/impl/URL.cpp
new file mode 100644
index 0000000000..d0ddfe74a0
--- /dev/null
+++ b/beast/http/impl/URL.cpp
@@ -0,0 +1,158 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../URL.h"
+
+namespace beast {
+
+URL::URL ()
+    : m_port (0)
+{
+}
+
+URL::URL (
+    String scheme_,
+    String host_,
+    uint16 port_,
+    String port_string_,
+    String path_,
+    String query_,
+    String fragment_,
+    String userinfo_)
+    : m_scheme (scheme_)
+    , m_host (host_)
+    , m_port (port_)
+    , m_port_string (port_string_)
+    , m_path (path_)
+    , m_query (query_)
+    , m_fragment (fragment_)
+    , m_userinfo (userinfo_)
+{
+}
+
+URL::URL (URL const& other)
+    : m_scheme (other.m_scheme)
+    , m_host (other.m_host)
+    , m_port (other.m_port)
+    , m_port_string (other.m_port_string)
+    , m_path (other.m_path)
+    , m_query (other.m_query)
+    , m_fragment (other.m_fragment)
+    , m_userinfo (other.m_userinfo)
+{
+}
+
+URL& URL::operator= (URL const& other)
+{
+    m_scheme = other.m_scheme;
+    m_host = other.m_host;
+    m_port = other.m_port;
+    m_port_string = other.m_port_string;
+    m_path = other.m_path;
+    m_query = other.m_query;
+    m_fragment = other.m_fragment;
+    m_userinfo = other.m_userinfo;
+    return *this;
+}
+
+//------------------------------------------------------------------------------
+
+bool URL::empty () const
+{
+    return m_scheme == String::empty;
+}
+
+String URL::scheme () const
+{
+    return m_scheme;
+}
+
+String URL::host () const
+{
+    return m_host;
+}
+
+String URL::port_string () const
+{
+    return m_port_string;
+}
+
+uint16 URL::port () const
+{
+    return m_port;
+}
+
+String URL::path () const
+{
+    return m_path;
+}
+
+String URL::query () const
+{
+    return m_query;
+}
+
+String URL::fragment () const
+{
+    return m_fragment;
+}
+
+String URL::userinfo () const
+{
+    return m_userinfo;
+}
+
+//------------------------------------------------------------------------------
+/*
+    From
+        http://en.wikipedia.org/wiki/URI_scheme
+
+    <scheme name> : <hierarchical part> [ ? <query> ] [ # <fragment> ]
+
+    e.g.
+
+    foo://username:password@example.com:8042/over/there/index.dtb?type=animal&name=narwhal#nose
+*/
+String URL::full () const
+{
+    String s;
+
+    s = scheme () + "://";
+    
+    if (userinfo () != String::empty)
+        s = userinfo () + "@";
+
+    s = s + host ();
+
+    if (port () != 0)
+        s = s + ":" + String::fromNumber (port ());
+
+    s = s + path ();
+
+    if (query () != String::empty)
+        s = "?" + query ();
+
+    if (fragment () != String::empty)
+        s = "#" + fragment ();
+
+    return s;
+}
+
+}
+
diff --git a/modules/beast_asio/parsehttp/.gitignore b/beast/http/impl/http-parser/.gitignore
similarity index 100%
rename from modules/beast_asio/parsehttp/.gitignore
rename to beast/http/impl/http-parser/.gitignore
diff --git a/modules/beast_asio/parsehttp/.mailmap b/beast/http/impl/http-parser/.mailmap
similarity index 100%
rename from modules/beast_asio/parsehttp/.mailmap
rename to beast/http/impl/http-parser/.mailmap
diff --git a/modules/beast_asio/parsehttp/.travis.yml b/beast/http/impl/http-parser/.travis.yml
similarity index 100%
rename from modules/beast_asio/parsehttp/.travis.yml
rename to beast/http/impl/http-parser/.travis.yml
diff --git a/modules/beast_asio/parsehttp/AUTHORS b/beast/http/impl/http-parser/AUTHORS
similarity index 100%
rename from modules/beast_asio/parsehttp/AUTHORS
rename to beast/http/impl/http-parser/AUTHORS
diff --git a/modules/beast_asio/parsehttp/CONTRIBUTIONS b/beast/http/impl/http-parser/CONTRIBUTIONS
similarity index 100%
rename from modules/beast_asio/parsehttp/CONTRIBUTIONS
rename to beast/http/impl/http-parser/CONTRIBUTIONS
diff --git a/modules/beast_asio/parsehttp/LICENSE-MIT b/beast/http/impl/http-parser/LICENSE-MIT
similarity index 100%
rename from modules/beast_asio/parsehttp/LICENSE-MIT
rename to beast/http/impl/http-parser/LICENSE-MIT
diff --git a/modules/beast_asio/parsehttp/Makefile b/beast/http/impl/http-parser/Makefile
similarity index 100%
rename from modules/beast_asio/parsehttp/Makefile
rename to beast/http/impl/http-parser/Makefile
diff --git a/modules/beast_asio/parsehttp/README.md b/beast/http/impl/http-parser/README.md
similarity index 100%
rename from modules/beast_asio/parsehttp/README.md
rename to beast/http/impl/http-parser/README.md
diff --git a/modules/beast_asio/parsehttp/contrib/parsertrace.c b/beast/http/impl/http-parser/contrib/parsertrace.c
similarity index 100%
rename from modules/beast_asio/parsehttp/contrib/parsertrace.c
rename to beast/http/impl/http-parser/contrib/parsertrace.c
diff --git a/modules/beast_asio/parsehttp/contrib/url_parser.c b/beast/http/impl/http-parser/contrib/url_parser.c
similarity index 100%
rename from modules/beast_asio/parsehttp/contrib/url_parser.c
rename to beast/http/impl/http-parser/contrib/url_parser.c
diff --git a/modules/beast_asio/parsehttp/http_parser.c b/beast/http/impl/http-parser/http_parser.c
similarity index 100%
rename from modules/beast_asio/parsehttp/http_parser.c
rename to beast/http/impl/http-parser/http_parser.c
diff --git a/modules/beast_asio/parsehttp/http_parser.gyp b/beast/http/impl/http-parser/http_parser.gyp
similarity index 100%
rename from modules/beast_asio/parsehttp/http_parser.gyp
rename to beast/http/impl/http-parser/http_parser.gyp
diff --git a/modules/beast_asio/parsehttp/http_parser.h b/beast/http/impl/http-parser/http_parser.h
similarity index 100%
rename from modules/beast_asio/parsehttp/http_parser.h
rename to beast/http/impl/http-parser/http_parser.h
diff --git a/modules/beast_asio/parsehttp/test.c b/beast/http/impl/http-parser/test.c
similarity index 100%
rename from modules/beast_asio/parsehttp/test.c
rename to beast/http/impl/http-parser/test.c
diff --git a/beast/http/impl/http_parser.cpp b/beast/http/impl/http_parser.cpp
new file mode 100644
index 0000000000..42b5b8eb24
--- /dev/null
+++ b/beast/http/impl/http_parser.cpp
@@ -0,0 +1,36 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "../../Config.h"
+
+namespace beast {
+
+#ifdef _MSC_VER
+#pragma warning (push)
+#pragma warning (disable: 4127) // conditional expression is constant
+#pragma warning (disable: 4244) // integer conversion, possible loss of data
+#endif
+#include "http-parser/http_parser.c"
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
+
+}
diff --git a/beast/intrusive/ForwardList.h b/beast/intrusive/ForwardList.h
index 2a88225b97..86264d0d2f 100644
--- a/beast/intrusive/ForwardList.h
+++ b/beast/intrusive/ForwardList.h
@@ -20,10 +20,13 @@
 #ifndef BEAST_INTRUSIVE_FORWARDLIST_H_INCLUDED
 #define BEAST_INTRUSIVE_FORWARDLIST_H_INCLUDED
 
-#include <iterator>
+#include "../Config.h"
 
 #include "PointerTraits.h"
-#include "../mpl.h"
+
+#include "../MPL.h"
+
+#include <iterator>
 
 // Ideas based on boost
 
diff --git a/beast/intrusive/IntrusiveArray.h b/beast/intrusive/IntrusiveArray.h
new file mode 100644
index 0000000000..53fbe0b057
--- /dev/null
+++ b/beast/intrusive/IntrusiveArray.h
@@ -0,0 +1,187 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_INTRUSIVE_INTRUSIVEARRAY_H_INCLUDED
+#define BEAST_INTRUSIVE_INTRUSIVEARRAY_H_INCLUDED
+
+#include "../Config.h"
+
+#include <cstddef>
+#include <iterator>
+#include <stdexcept>
+#include <vector>
+
+namespace beast {
+
+/** A run-time fixed size array that references outside storage.
+    The interface tries to follow std::vector as closely as possible within
+    the limitations of a fixed size and unowned storage.
+*/
+template <class T>
+class IntrusiveArray
+{
+private:
+    T* m_begin;
+    T* m_end;
+
+public:
+    typedef T                value_type;
+    typedef T*               iterator;
+    typedef T const*         const_iterator;
+    typedef T&               reference;
+    typedef T const&         const_reference;
+    typedef std::size_t      size_type;
+    typedef std::ptrdiff_t   difference_type;
+
+    // Calling methods on a default constructed
+    // array results in undefined behavior!
+    //
+    IntrusiveArray ()
+        : m_begin (nullptr), m_end (nullptr)
+        { }
+    IntrusiveArray (T* begin, T* end)
+        : m_begin (begin), m_end (end)
+        { }
+    IntrusiveArray (IntrusiveArray const& other)
+        : m_begin (other.m_begin), m_end (other.m_end)
+        { }
+    IntrusiveArray (std::vector <T> const& v)
+        : m_begin (&v.front()), m_end (&v.back()+1)
+        { }
+    IntrusiveArray (std::vector <T>& v)
+        : m_begin (&v.front()), m_end (&v.back()+1)
+        { }
+    IntrusiveArray& operator= (IntrusiveArray const& other)
+    {
+        m_begin = other.m_begin;
+        m_end = other.m_end;
+        return *this;
+    }
+
+    // iterators
+    iterator        begin()       { return m_begin; }
+    const_iterator  begin() const { return m_begin; }
+    const_iterator cbegin() const { return m_begin; }
+    iterator        end()       { return m_end; }
+    const_iterator  end() const { return m_end; }
+    const_iterator cend() const { return m_end; }
+
+    typedef std::reverse_iterator <iterator> reverse_iterator;
+    typedef std::reverse_iterator <const_iterator> const_reverse_iterator;
+
+    reverse_iterator rbegin() { return reverse_iterator(end()); }
+    const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); }
+    const_reverse_iterator crbegin() const { return const_reverse_iterator(end()); }
+    reverse_iterator rend() { return reverse_iterator(begin()); }
+    const_reverse_iterator rend() const { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crend() const { return const_reverse_iterator(begin()); }
+
+    reference operator[](size_type i)
+    {
+        bassert (i < size());
+        return m_begin[i];
+    }
+
+    const_reference operator[](size_type i) const
+    {
+        bassert (i < size());
+        return m_begin[i];
+    }
+
+    reference at(size_type i) { rangecheck(i); return m_begin[i]; }
+    const_reference at(size_type i) const { rangecheck(i); return m_begin[i]; }
+
+    reference front() { return m_begin[0]; }
+    reference back()  { return m_end[-1]; }
+    const_reference front () const { return m_begin; }
+    const_reference back()   const { return m_end[-1]; }
+
+    size_type size() const { return std::distance (m_begin, m_end); }
+    bool empty() const { return m_begin == m_end; }
+
+    T const* data() const { return m_begin; }
+    T* data() { return m_begin; }
+    T* c_array() { return m_begin; }
+
+    void assign (T const& value) { fill (value); }
+
+    void fill (T const& value)
+    {
+        std::fill_n (begin(), size(), value);
+    }
+
+    void clear ()
+    {
+        fill (T ());
+    }
+
+    void rangecheck (size_type i)
+    {
+        if (i >= size())
+            throw std::out_of_range ("IntrusiveArray<>: index out of range");
+    }
+};
+
+//------------------------------------------------------------------------------
+
+template <class T>
+bool operator== (IntrusiveArray <T> const& lhs, IntrusiveArray <T> const& rhs)
+{
+    if ((lhs.begin() == rhs.begin()) && (lhs.end() == rhs.end()))
+        return true;
+    if (lhs.size() != rhs.size())
+        return false;
+    return std::equal (lhs.begin(), lhs.end(), rhs.begin());
+}
+
+template <class T>
+bool operator!= (IntrusiveArray <T> const& lhs, IntrusiveArray <T> const& rhs)
+{
+    return !(lhs==rhs);
+}
+
+template <class T>
+bool operator< (IntrusiveArray <T> const& lhs, IntrusiveArray <T> const& rhs)
+{
+    if ((lhs.begin() == rhs.begin()) && (lhs.end() == rhs.end()))
+        return false;
+    return std::lexicographical_compare (lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
+}
+
+template <class T>
+bool operator> (IntrusiveArray <T> const& lhs, IntrusiveArray <T> const& rhs)
+{
+    return rhs<lhs;
+}
+
+template <class T>
+bool operator<= (IntrusiveArray <T> const& lhs, IntrusiveArray <T> const& rhs)
+{
+    return !(rhs<lhs);
+}
+
+template <class T>
+bool operator>= (IntrusiveArray <T> const& lhs, IntrusiveArray <T> const& rhs)
+{
+    return !(lhs<rhs);
+}
+
+}
+
+#endif
diff --git a/modules/beast_core/containers/List.h b/beast/intrusive/List.h
similarity index 71%
rename from modules/beast_core/containers/List.h
rename to beast/intrusive/List.h
index 2a125ff7da..0b64fb6e43 100644
--- a/modules/beast_core/containers/List.h
+++ b/beast/intrusive/List.h
@@ -17,180 +17,18 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CORE_CONTAINERS_LIST_H_INCLUDED
-#define BEAST_CORE_CONTAINERS_LIST_H_INCLUDED
+#ifndef BEAST_INTRUSIVE_LIST_H_INCLUDED
+#define BEAST_INTRUSIVE_LIST_H_INCLUDED
 
-/** Intrusive Containers
+#include "../Config.h"
 
-    # Introduction
+#include "../mpl/CopyConst.h"
 
-    Intrusive containers are special containers that offer better performance
-    and exception safety guarantees than non-intrusive containers (like the
-    STL containers). They are useful building blocks for high performance
-    concurrent systems or other purposes where allocations are restricted
-    (such as the AudioIODeviceCallback object), because intrusive list
-    operations do not allocate or free memory.
+#include "../Uncopyable.h"
 
-    While intrusive containers were and are widely used in C, they became more
-    and more forgotten in C++ due to the presence of the standard containers
-    which don't support intrusive techniques. VFLib not only reintroduces this
-    technique to C++ for lists, it also encapsulates the implementation in a
-    mostly compliant STL interface. Hence anyone familiar with standard
-    containers can easily use them.
+#include <iterator>
 
-    # Interface
-
-    The interface for intrusive elements in this library is unified for all
-    containers. Unlike STL containers, objects placed into intrusive containers
-    are not copied. Instead, a pointer to the object is stored. All
-    responsibility for object lifetime is the responsibility of the caller;
-    the intrusive container just keeps track of what is in it.
-
-    Summary of intrusive container differences:
-
-    - Holds pointers to existing objects instead of copies.
-
-    - Does not allocate or free any objects.
-
-    - Requires a element's class declaration to be modified.
-
-    - Methods never throw exceptions when called with valid arguments.
-
-    # Usage
-
-    Like STL containers, intrusive containers are all template based, where the
-    template argument specifies the type of object that the container will hold.
-    These declarations specify a doubly linked list where each element points
-    to a user defined class:
-
-    @code
-
-    struct Object; // Forward declaration
-
-    List <Object> list; // Doubly-linked list of Object
-
-    @endcode
-
-    Because intrusive containers allocate no memory, allowing objects to be
-    placed inside requires a modification to their class declaration. Each
-    intrusive container declares a nested class `Node` which elements must be
-    derived from, using the Curiously Recurring Template Pattern (CRTP). We
-    will continue to fully declare the Object type from the previous example
-    to support emplacement into an intrusive container:
-
-    @code
-
-    struct Object : public List <Object>::Node // Required for List
-    {
-        void performAction ();
-    };
-
-    @endcode
-
-    Usage of a typedef eliminates redundant specification of the template
-    arguments but requires a forward declaration. The following code is
-    equivalent.
-
-    @code
-
-    struct Object; // Forward declaration
-
-    // Specify template parameters just once
-    typedef List <Object> ListType;
-
-    struct Object : public ListType::Node
-    {
-        void performAction ();
-    };
-
-    ListType::Node list;
-
-    @endcode
-
-    With these declarations we may proceed to create our objects, add them to
-    the list, and perform operations:
-
-    @code
-
-    // Create a few objects and put them in the list
-    for (i = 0; i < 5; ++i)
-        list.push_back (*new Object);
-
-    // Call a method on each list
-    for (ListType::iterator iter = list.begin(); iter != list.end (); ++iter)
-        iter->performAction ();
-
-    @endcode
-
-    Unlike regular STL containers, an object derived from an intrusive container
-    node cannot exist in more than one instance of that list at a time. This is
-    because the bookkeeping information for maintaining the list is kept in
-    the object rather than the list.
-
-    To support objects existing in multiple containers, templates variations
-    are instantiated by distinguishing them with an empty structure, called a
-    tag. The object is derived from multiple instances of Node, where each
-    instance specifies a unique tag. The tag is passed as the second template
-    argument. When the second argument is unspecified, the default tag is used.
-
-    This declaration example shows the usage of tags to allow an object to exist
-    simultaneously in two separate lists:
-
-    @code
-
-    struct GlobalListTag { }; // list of all objects
-    struct ActiveListTag { }; // subset of all objects that are active
-
-    class Object : public List <Object, GlobalListTag>
-                , public List <Object, ActiveListTag>
-    {
-    public:
-    Object () : m_isActive (false)
-    {
-        // Add ourselves to the global list
-        s_globalList.push_front (*this);
-    }
-
-    ~Object ()
-    {
-        deactivate ();
-    }
-
-    void becomeActive ()
-    {
-        // Add ourselves to the active list
-        if (!m_isActive)
-        {
-            s_activeList.push_front (*this);
-            m_isActive = true;
-        }
-    }
-
-    void deactivate ()
-    {
-        if (m_isActive)
-        {
-            // Doesn't delete the object
-            s_activeList.erase (s_activeList.iterator_to (this));
-
-            m_isActive = false;
-        }
-    }
-
-    private:
-        bool m_isActive;
-
-        static List <Object, GlobalListTag> s_globalList;
-        static List <Object, ActiveListTag> s_activeList;
-    }
-
-    @endcode
-
-    @defgroup intrusive intrusive
-    @ingroup beast_core
-*/
- 
-//------------------------------------------------------------------------------
+namespace beast {
 
 template <typename, typename>
 class List;
@@ -203,13 +41,12 @@ namespace detail
 // concurrently is required.
 //
 template <typename T, typename Tag>
-class ListNode : public Uncopyable
+class ListNode
 {
 private:
     typedef T value_type;
 
-    template <typename, typename>
-    friend class List;
+    friend class List<T, Tag>;
 
     template <typename>
     friend class ListIterator;
@@ -225,8 +62,7 @@ class ListIterator : public std::iterator <
     std::bidirectional_iterator_tag, std::size_t>
 {
 public:
-    typedef typename copyconst <N, typename N::value_type>::type
-    
+    typedef typename mpl::CopyConst<N, typename N::value_type>::type
                                    value_type;
     typedef value_type*            pointer;
     typedef value_type&            reference;
@@ -243,14 +79,6 @@ public:
     {
     }
 
-#if 0
-    template <typename M>
-    ListIterator& operator= (ListIterator <M> const& other) noexcept
-    {
-        m_node = other.m_node;
-        return *this;
-    }
-#endif
     template <typename M>
     bool operator== (ListIterator <M> const& other) const noexcept
     {
@@ -307,14 +135,11 @@ private:
 
     void increment () noexcept
     {
-        bassert (m_node->m_next);
         m_node = m_node->m_next;
     }
 
     void decrement () noexcept
     {
-        bassert (m_node->m_prev &&
-                 m_node->m_prev->m_prev != nullptr);
         m_node = m_node->m_prev;
     }
 
@@ -323,8 +148,7 @@ private:
 
 }
 
-/**
-    Intrusive doubly linked list.
+/** Intrusive doubly linked list.
   
     This intrusive List is a container similar in operation to std::list in the
     Standard Template Library (STL). Like all @ref intrusive containers, List
@@ -583,7 +407,6 @@ public:
         @param pos The location to insert after.
         @param other The list to insert.
     */
-
     void insert (iterator pos, List& other) noexcept
     {
         if (!other.empty ())
@@ -717,4 +540,6 @@ private:
     Node m_tail;
 };
 
+}
+
 #endif
diff --git a/beast/intrusive/LockFreeStack.h b/beast/intrusive/LockFreeStack.h
new file mode 100644
index 0000000000..9d64662e54
--- /dev/null
+++ b/beast/intrusive/LockFreeStack.h
@@ -0,0 +1,285 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_INTRUSIVE_LOCKFREESTACK_H_INCLUDED
+#define BEAST_INTRUSIVE_LOCKFREESTACK_H_INCLUDED
+
+#include <iterator>
+#include "../mpl/IfCond.h"
+#include "../Atomic.h"
+#include "../Uncopyable.h"
+
+namespace beast {
+
+//------------------------------------------------------------------------------
+
+template <class Container, bool IsConst>
+class LockFreeStackIterator
+    : public std::iterator <
+        std::forward_iterator_tag,
+        typename Container::value_type,
+        typename Container::difference_type,
+        typename mpl::IfCond <IsConst,
+            typename Container::const_pointer,
+            typename Container::pointer>::type,
+        typename mpl::IfCond <IsConst,
+            typename Container::const_reference,
+            typename Container::reference>::type>
+{
+protected:
+    typedef typename Container::Node Node;
+    typedef typename mpl::IfCond <IsConst, Node const*, Node*>::type NodePtr;
+
+public:
+    typedef typename Container::value_type value_type;
+    typedef typename mpl::IfCond <IsConst,
+        typename Container::const_pointer,
+        typename Container::pointer>::type pointer;
+    typedef typename mpl::IfCond <IsConst,
+        typename Container::const_reference,
+        typename Container::reference>::type reference;
+
+    LockFreeStackIterator ()
+        : m_node ()
+    {
+    }
+
+    LockFreeStackIterator (NodePtr node)
+        : m_node (node)
+    {
+    }
+
+    template <bool OtherIsConst>
+    explicit LockFreeStackIterator (LockFreeStackIterator <Container, OtherIsConst> const& other)
+        : m_node (other.m_node)
+    {
+    }
+
+    LockFreeStackIterator& operator= (NodePtr node)
+    {
+        m_node = node;
+        return static_cast <LockFreeStackIterator&> (*this);
+    }
+
+    LockFreeStackIterator& operator++ ()
+    {
+        m_node = m_node->m_next.get();
+        return static_cast <LockFreeStackIterator&> (*this);
+    }
+
+    LockFreeStackIterator operator++ (int)
+    {
+        LockFreeStackIterator result (*this);
+        m_node = m_node->m_next;
+        return result;
+    }
+
+    NodePtr node() const
+    {
+        return m_node;
+    }
+
+    reference operator* () const
+    {
+        return *this->operator-> ();
+    }
+
+    pointer operator-> () const
+    {
+        return static_cast <pointer> (m_node);
+    }
+
+private:
+    NodePtr m_node;
+};
+
+//------------------------------------------------------------------------------
+
+template <class Container, bool LhsIsConst, bool RhsIsConst>
+bool operator== (LockFreeStackIterator <Container, LhsIsConst> const& lhs,
+                 LockFreeStackIterator <Container, RhsIsConst> const& rhs)
+{
+    return lhs.node() == rhs.node();
+}
+
+template <class Container, bool LhsIsConst, bool RhsIsConst>
+bool operator!= (LockFreeStackIterator <Container, LhsIsConst> const& lhs,
+                 LockFreeStackIterator <Container, RhsIsConst> const& rhs)
+{
+    return lhs.node() != rhs.node();
+}
+
+//------------------------------------------------------------------------------
+
+/** Multiple Producer, Multiple Consumer (MPMC) intrusive stack.
+
+    This stack is implemented using the same intrusive interface as List.
+    All mutations are lock-free.
+
+    The caller is responsible for preventing the "ABA" problem:
+        http://en.wikipedia.org/wiki/ABA_problem
+
+    @param Tag  A type name used to distinguish lists and nodes, for
+                putting objects in multiple lists. If this parameter is
+                omitted, the default tag is used.
+*/
+template <class Element, class Tag = void>
+class LockFreeStack : public Uncopyable
+{
+public:
+    class Node : public Uncopyable
+    {
+    public:
+        Node ()
+        {
+        }
+
+        explicit Node (Node* next) : m_next (next)
+        {
+        }
+
+    private:
+        friend class LockFreeStack;
+        
+        template <class Container, bool IsConst>
+        friend class LockFreeStackIterator;
+
+        Atomic <Node*> m_next;
+    };
+
+public:
+    typedef Element                             value_type;
+    typedef Element*                            pointer;
+    typedef Element&                            reference;
+    typedef Element const*                      const_pointer;
+    typedef Element const&                      const_reference;
+    typedef std::size_t                         size_type;
+    typedef std::ptrdiff_t                      difference_type;
+    typedef LockFreeStackIterator <
+        LockFreeStack <Element, Tag>, false>    iterator;
+    typedef LockFreeStackIterator <
+        LockFreeStack <Element, Tag>, true>     const_iterator;
+
+    LockFreeStack ()
+        : m_end (nullptr)
+        , m_head (&m_end)
+    {
+    }
+
+    /** Returns true if the stack is empty. */
+    bool empty() const
+    {
+        return m_head.get() == &m_end;
+    }
+
+    /** Push a node onto the stack.
+        The caller is responsible for preventing the ABA problem.
+        This operation is lock-free.
+        Thread safety:
+            Safe to call from any thread.
+
+        @param node The node to push.
+
+        @return `true` if the stack was previously empty. If multiple threads
+                are attempting to push, only one will receive `true`.
+    */
+    bool push_front (Node* node)
+    {
+        bool first;
+        Node* head;
+        do
+        {
+            head = m_head.get ();
+            first = head == &m_end;
+            node->m_next = head;
+        }
+        while (!m_head.compareAndSetBool (node, head));
+        return first;
+    }
+
+    /** Pop an element off the stack.
+        The caller is responsible for preventing the ABA problem.
+        This operation is lock-free.
+        Thread safety:
+            Safe to call from any thread.
+
+        @return The element that was popped, or `nullptr` if the stack
+                was empty.
+    */
+    Element* pop_front ()
+    {
+        Node* node;
+        Node* head;
+        do
+        {
+            node = m_head.get ();
+            if (node == &m_end)
+                return nullptr;
+            head = node->m_next.get ();
+        }
+        while (!m_head.compareAndSetBool (head, node));
+        return static_cast <Element*> (node);
+    }
+
+    /** Return a forward iterator to the beginning or end of the stack.
+        Undefined behavior results if push_front or pop_front is called
+        while an iteration is in progress.
+        Thread safety:
+            Caller is responsible for synchronization.
+    */
+    /** @{ */
+    iterator begin ()
+    {
+        return iterator (m_head.get ());
+    }
+
+    iterator end ()
+    {
+        return iterator (&m_end);
+    }
+    
+    const_iterator begin () const
+    {
+        return const_iterator (m_head.get ());
+    }
+
+    const_iterator end () const
+    {
+        return const_iterator (&m_end);
+    }
+    
+    const_iterator cbegin () const
+    {
+        return const_iterator (m_head.get ());
+    }
+
+    const_iterator cend () const
+    {
+        return const_iterator (&m_end);
+    }
+    /** @} */
+
+private:
+    Node m_end;
+    Atomic <Node*> m_head;
+};
+
+}
+
+#endif
diff --git a/beast/intrusive/PointerTraits.h b/beast/intrusive/PointerTraits.h
index e4e733e38b..ccba95f91e 100644
--- a/beast/intrusive/PointerTraits.h
+++ b/beast/intrusive/PointerTraits.h
@@ -20,6 +20,8 @@
 #ifndef BEAST_INTRUSIVE_POINTERTRAITS_H_INCLUDED
 #define BEAST_INTRUSIVE_POINTERTRAITS_H_INCLUDED
 
+#include <cstddef>
+
 namespace beast {
 namespace intrusive {
 
diff --git a/beast/mpl/AddConst.h b/beast/mpl/AddConst.h
index 4b25ecd0bd..3ab16e6b7d 100644
--- a/beast/mpl/AddConst.h
+++ b/beast/mpl/AddConst.h
@@ -20,16 +20,18 @@
 #ifndef BEAST_MPL_ADDCONST_H_INCLUDED
 #define BEAST_MPL_ADDCONST_H_INCLUDED
 
+#include "RemoveConst.h"
+
 // Ideas based on boost
 
 namespace beast {
 namespace mpl {
 
-/// Add the `const` qualifier to a type.
+/** Add the `const` qualifier to a type. */
 template <typename T>
 struct AddConst
 {
-    typedef T const type;
+    typedef typename RemoveConst<T>::type const type;
 };
 
 }
diff --git a/modules/beast_core/containers/detail/copyconst.h b/beast/mpl/CopyConst.h
similarity index 75%
rename from modules/beast_core/containers/detail/copyconst.h
rename to beast/mpl/CopyConst.h
index ac8d74d5c0..a733ded884 100644
--- a/modules/beast_core/containers/detail/copyconst.h
+++ b/beast/mpl/CopyConst.h
@@ -17,25 +17,30 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CORE_CONTAINERS_DETAIL_COPYCONST_H_INCLUDED
-#define BEAST_CORE_CONTAINERS_DETAIL_COPYCONST_H_INCLUDED
+#ifndef BEAST_MPL_COPYCONST_H_INCLUDED
+#define BEAST_MPL_COPYCONST_H_INCLUDED
 
-namespace detail
-{
+#include "RemoveConst.h"
 
-// Copy const attribute from T to U if present
+namespace beast {
+namespace mpl {
+
+/** Copy `const` attribute from T to U if present. */
+/** @{ */
 template <typename T, typename U>
-struct copyconst
+struct CopyConst
 {
-    typedef typename removecv <U>::type type;
+    typedef typename RemoveConst<U>::type type;
 };
 
 template <typename T, typename U>
-struct copyconst <T const, U>
+struct CopyConst <T const, U>
 {
-    typedef typename removecv <U>::type const type;
+    typedef typename RemoveConst<U>::type const type;
 };
+/** @} */
 
+}
 }
 
 #endif
diff --git a/beast/mpl/IfCond.h b/beast/mpl/IfCond.h
index 499dfced76..44aad16137 100644
--- a/beast/mpl/IfCond.h
+++ b/beast/mpl/IfCond.h
@@ -25,8 +25,8 @@ namespace mpl {
 
 // Ideas based on boost
 
-/// Select between T1 or T2 depending on Condition.
-/// @{
+/** Select between T1 or T2 depending on Condition. */
+/** @{ */
 template <bool Condition, typename T1, typename T2>
 struct IfCond
 {
@@ -38,7 +38,7 @@ struct IfCond <false, T1, T2>
 {
     typedef T2 type;
 };
-/// @}
+/** @} */
 
 }
 }
diff --git a/beast/mpl/IsCallPossible.h b/beast/mpl/IsCallPossible.h
new file mode 100644
index 0000000000..d6a6ffb108
--- /dev/null
+++ b/beast/mpl/IsCallPossible.h
@@ -0,0 +1,270 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_MPL_ISCALLPOSSIBLE_H_INCLUDED
+#define BEAST_MPL_ISCALLPOSSIBLE_H_INCLUDED
+
+namespace beast {
+namespace mpl {
+
+// inspired by Roman Perepelitsa's presentation from comp.lang.c++.moderated
+// based on the implementation here: http://www.rsdn.ru/forum/cpp/2759773.1.aspx
+//
+namespace is_call_possible_detail
+{
+    template<typename T>
+    struct add_reference
+    {
+      typedef T& type;
+    };
+
+    template<typename T>
+    struct add_reference<T&>
+    {
+      typedef T& type;
+    };
+
+   template <typename T> class void_exp_result {}; 
+
+   template <typename T, typename U> 
+   U const& operator,(U const&, void_exp_result<T>); 
+
+   template <typename T, typename U> 
+   U& operator,(U&, void_exp_result<T>); 
+
+   template <typename src_type, typename dest_type> 
+   struct clone_constness 
+   { 
+     typedef dest_type type; 
+   }; 
+
+   template <typename src_type, typename dest_type> 
+   struct clone_constness<const src_type, dest_type> 
+   { 
+     typedef const dest_type type; 
+   }; 
+}
+
+#define BEAST_DEFINE_HAS_MEMBER_FUNCTION(trait_name, member_function_name)                                   \
+template<typename T, typename Signature> class trait_name;                                                   \
+                                                                                                             \
+template<typename T, typename Result>                                                                        \
+class trait_name<T, Result(void)>                                                                            \
+{                                                                                                            \
+   class yes { char m; };                                                                                    \
+   class no { yes m[2]; };                                                                                   \
+   struct base_mixin                                                                                         \
+   {                                                                                                         \
+     Result member_function_name();                                                                          \
+   };                                                                                                        \
+   struct base : public T, public base_mixin { private: base(); };                                           \
+   template <typename U, U t>  class helper{};                                                               \
+   template <typename U>                                                                                     \
+   static no deduce(U*, helper<Result (base_mixin::*)(), &U::member_function_name>* = 0);                    \
+   static yes deduce(...);                                                                                   \
+public:                                                                                                      \
+   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
+};                                                                                                           \
+                                                                                                             \
+template<typename T, typename Result, typename Arg>                                                          \
+class trait_name<T, Result(Arg)>                                                                             \
+{                                                                                                            \
+   class yes { char m; };                                                                                    \
+   class no { yes m[2]; };                                                                                   \
+   struct base_mixin                                                                                         \
+   {                                                                                                         \
+     Result member_function_name(Arg);                                                                       \
+   };                                                                                                        \
+   struct base : public T, public base_mixin { private: base(); };                                           \
+   template <typename U, U t>  class helper{};                                                               \
+   template <typename U>                                                                                     \
+   static no deduce(U*, helper<Result (base_mixin::*)(Arg), &U::member_function_name>* = 0);                 \
+   static yes deduce(...);                                                                                   \
+public:                                                                                                      \
+   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
+};                                                                                                           \
+                                                                                                             \
+template<typename T, typename Result, typename Arg1, typename Arg2>                                          \
+class trait_name<T, Result(Arg1,Arg2)>                                                                       \
+{                                                                                                            \
+   class yes { char m; };                                                                                    \
+   class no { yes m[2]; };                                                                                   \
+   struct base_mixin                                                                                         \
+   {                                                                                                         \
+     Result member_function_name(Arg1,Arg2);                                                                 \
+   };                                                                                                        \
+   struct base : public T, public base_mixin { private: base(); };                                           \
+   template <typename U, U t>  class helper{};                                                               \
+   template <typename U>                                                                                     \
+   static no deduce(U*, helper<Result (base_mixin::*)(Arg1,Arg2), &U::member_function_name>* = 0);           \
+   static yes deduce(...);                                                                                   \
+public:                                                                                                      \
+   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
+};                                                                                                           \
+                                                                                                             \
+template<typename T, typename Result, typename Arg1, typename Arg2, typename Arg3>                           \
+class trait_name<T, Result(Arg1,Arg2,Arg3)>                                                                  \
+{                                                                                                            \
+   class yes { char m; };                                                                                    \
+   class no { yes m[2]; };                                                                                   \
+   struct base_mixin                                                                                         \
+   {                                                                                                         \
+     Result member_function_name(Arg1,Arg2,Arg3);                                                            \
+   };                                                                                                        \
+   struct base : public T, public base_mixin { private: base(); };                                           \
+   template <typename U, U t>  class helper{};                                                               \
+   template <typename U>                                                                                     \
+   static no deduce(U*, helper<Result (base_mixin::*)(Arg1,Arg2,Arg3), &U::member_function_name>* = 0);      \
+   static yes deduce(...);                                                                                   \
+public:                                                                                                      \
+   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
+};                                                                                                           \
+                                                                                                             \
+template<typename T, typename Result, typename Arg1, typename Arg2, typename Arg3, typename Arg4>            \
+class trait_name<T, Result(Arg1,Arg2,Arg3,Arg4)>                                                             \
+{                                                                                                            \
+   class yes { char m; };                                                                                    \
+   class no { yes m[2]; };                                                                                   \
+   struct base_mixin                                                                                         \
+   {                                                                                                         \
+     Result member_function_name(Arg1,Arg2,Arg3,Arg4);                                                       \
+   };                                                                                                        \
+   struct base : public T, public base_mixin { private: base(); };                                           \
+   template <typename U, U t>  class helper{};                                                               \
+   template <typename U>                                                                                     \
+   static no deduce(U*, helper<Result (base_mixin::*)(Arg1,Arg2,Arg3,Arg4), &U::member_function_name>* = 0); \
+   static yes deduce(...);                                                                                   \
+public:                                                                                                      \
+   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
+}                                                                                                           
+
+#define BEAST_DEFINE_IS_CALL_POSSIBLE(trait_name, member_function_name)                                                 \
+struct trait_name##_detail                                                                                              \
+{                                                                                                                       \
+BEAST_DEFINE_HAS_MEMBER_FUNCTION(has_member, member_function_name);                                                     \
+};                                                                                                                      \
+                                                                                                                        \
+template <typename T, typename Signature>                                                                               \
+struct trait_name                                                                                                       \
+{                                                                                                                       \
+  private:                                                                                                              \
+   class yes {};                                                                                                        \
+   class no { yes m[2]; };                                                                                              \
+   struct derived : public T                                                                                            \
+   {                                                                                                                    \
+     using T::member_function_name;                                                                                     \
+     no member_function_name(...) const;                                                                                \
+     private: derived ();                                                                                               \
+   };                                                                                                                   \
+                                                                                                                        \
+   typedef typename beast::mpl::is_call_possible_detail::clone_constness<T, derived>::type derived_type;                \
+                                                                                                                        \
+   template <typename U, typename Result>                                                                               \
+   struct return_value_check                                                                                            \
+   {                                                                                                                    \
+     static yes deduce(Result);                                                                                         \
+     static no deduce(...);                                                                                             \
+     static no deduce(no);                                                                                              \
+     static no deduce(beast::mpl::is_call_possible_detail::void_exp_result<T>);                                         \
+   };                                                                                                                   \
+                                                                                                                        \
+   template <typename U>                                                                                                \
+   struct return_value_check<U, void>                                                                                   \
+   {                                                                                                                    \
+     static yes deduce(...);                                                                                            \
+     static no deduce(no);                                                                                              \
+   };                                                                                                                   \
+                                                                                                                        \
+   template <bool has_the_member_of_interest, typename F>                                                               \
+   struct impl                                                                                                          \
+   {                                                                                                                    \
+     static const bool value = false;                                                                                   \
+   };                                                                                                                   \
+                                                                                                                        \
+   template <typename Result, typename Arg>                                                                             \
+   struct impl<true, Result(Arg)>                                                                                       \
+   {                                                                                                                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<derived_type>::type test_me;                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg>::type          arg;                        \
+                                                                                                                        \
+     static const bool value =                                                                                          \
+       sizeof(                                                                                                          \
+            return_value_check<T, Result>::deduce(                                                                      \
+             (test_me.member_function_name(arg), beast::mpl::is_call_possible_detail::void_exp_result<T>())             \
+                         )                                                                                              \
+            ) == sizeof(yes);                                                                                           \
+   };                                                                                                                   \
+                                                                                                                        \
+   template <typename Result, typename Arg1, typename Arg2>                                                             \
+   struct impl<true, Result(Arg1,Arg2)>                                                                                 \
+   {                                                                                                                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<derived_type>::type test_me;                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg1>::type         arg1;                       \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg2>::type         arg2;                       \
+                                                                                                                        \
+     static const bool value =                                                                                          \
+       sizeof(                                                                                                          \
+            return_value_check<T, Result>::deduce(                                                                      \
+             (test_me.member_function_name(arg1,arg2), beast::mpl::is_call_possible_detail::void_exp_result<T>())       \
+                         )                                                                                              \
+            ) == sizeof(yes);                                                                                           \
+   };                                                                                                                   \
+                                                                                                                        \
+   template <typename Result, typename Arg1, typename Arg2, typename Arg3>                                              \
+   struct impl<true, Result(Arg1,Arg2,Arg3)>                                                                            \
+   {                                                                                                                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<derived_type>::type test_me;                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg1>::type         arg1;                       \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg2>::type         arg2;                       \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg3>::type         arg3;                       \
+                                                                                                                        \
+     static const bool value =                                                                                          \
+       sizeof(                                                                                                          \
+            return_value_check<T, Result>::deduce(                                                                      \
+             (test_me.member_function_name(arg1,arg2,arg3), beast::mpl::is_call_possible_detail::void_exp_result<T>())  \
+                         )                                                                                              \
+            ) == sizeof(yes);                                                                                           \
+   };                                                                                                                   \
+                                                                                                                        \
+   template <typename Result, typename Arg1, typename Arg2, typename Arg3, typename Arg4>                               \
+   struct impl<true, Result(Arg1,Arg2,Arg3,Arg4)>                                                                       \
+   {                                                                                                                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<derived_type>::type test_me;                    \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg1>::type         arg1;                       \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg2>::type         arg2;                       \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg3>::type         arg3;                       \
+     static typename beast::mpl::is_call_possible_detail::add_reference<Arg4>::type         arg4;                       \
+                                                                                                                        \
+     static const bool value =                                                                                          \
+       sizeof(                                                                                                          \
+            return_value_check<T, Result>::deduce(                                                                      \
+             (test_me.member_function_name(arg1,arg2,arg3,arg4),                                                        \
+                beast::mpl::is_call_possible_detail::void_exp_result<T>())                                              \
+                         )                                                                                              \
+            ) == sizeof(yes);                                                                                           \
+   };                                                                                                                   \
+                                                                                                                        \
+  public:                                                                                                               \
+    static const bool value = impl<trait_name##_detail::has_member<T,Signature>::value, Signature>::value;              \
+}
+
+}
+}
+
+#endif
diff --git a/beast/mpl/PointerToOther.h b/beast/mpl/PointerToOther.h
index 868d46bb0f..8a82274f30 100644
--- a/beast/mpl/PointerToOther.h
+++ b/beast/mpl/PointerToOther.h
@@ -30,7 +30,7 @@ namespace mpl {
     parameters. More specializations can be added for containers with
     more than three template parameters.
 */
-/// @{
+/** @{ */
 template <class T, class U>
 struct PointerToOther;
 
@@ -60,7 +60,7 @@ struct PointerToOther <T*, U>
 {
    typedef U* type;
 };
-/// @}
+/** @} */
 
 }
 }
diff --git a/beast/mpl/RemoveConst.h b/beast/mpl/RemoveConst.h
index 4f555f26a8..86f58b9f36 100644
--- a/beast/mpl/RemoveConst.h
+++ b/beast/mpl/RemoveConst.h
@@ -25,8 +25,8 @@
 namespace beast {
 namespace mpl {
 
-/// Remove the `const` qualifier from a type.
-/// @{
+/** Remove the `const` qualifier from a type. */
+/** @{ */
 template <typename T>
 struct RemoveConst
 {
@@ -38,7 +38,7 @@ struct RemoveConst <T const>
 {
     typedef T type;
 };
-/// @}
+/** @} */
 
 }
 }
diff --git a/beast/mpl/RemoveConstVolatile.h b/beast/mpl/RemoveConstVolatile.h
index 361f0255ac..b320d507b6 100644
--- a/beast/mpl/RemoveConstVolatile.h
+++ b/beast/mpl/RemoveConstVolatile.h
@@ -28,7 +28,7 @@
 namespace beast {
 namespace mpl {
 
-/// Remove both the `const` and `volatile` qualifiers from a type.
+/** Remove both the `const` and `volatile` qualifiers from a type. */
 template <typename T>
 struct RemoveConstVolatile
 {
diff --git a/beast/mpl/RemoveReference.h b/beast/mpl/RemoveReference.h
index 239addcca7..c7b8d6d651 100644
--- a/beast/mpl/RemoveReference.h
+++ b/beast/mpl/RemoveReference.h
@@ -25,8 +25,8 @@ namespace mpl {
 
 // Ideas based on boost
 
-/// Remove the reference qualifier from a type.
-/// @{
+/** Remove the reference qualifier from a type. */
+/** @{ */
 template <class T>
 struct RemoveReference
 {
@@ -38,7 +38,7 @@ struct RemoveReference <T&>
 {
    typedef T type;
 };
-/// @}
+/** @} */
 
 }
 }
diff --git a/beast/mpl/RemoveVolatile.h b/beast/mpl/RemoveVolatile.h
index 26a848724e..5057a16bdd 100644
--- a/beast/mpl/RemoveVolatile.h
+++ b/beast/mpl/RemoveVolatile.h
@@ -25,8 +25,8 @@
 namespace beast {
 namespace mpl {
 
-/// Remove the `volatile` qualifier from a type.
-/// @{
+/** Remove the `volatile` qualifier from a type. */
+/** @{ */
 template <typename T>
 struct RemoveVolatile
 {
@@ -38,7 +38,7 @@ struct RemoveVolatile <T volatile>
 {
     typedef T type;
 };
-/// @}
+/** @} */
 
 }
 }
diff --git a/modules/beast_asio/basics/BufferType.h b/beast/net/BufferType.h
similarity index 91%
rename from modules/beast_asio/basics/BufferType.h
rename to beast/net/BufferType.h
index 722fe4befc..a94990a3bf 100644
--- a/modules/beast_asio/basics/BufferType.h
+++ b/beast/net/BufferType.h
@@ -17,8 +17,12 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ASIO_BASICS_BUFFERTYPE_H_INCLUDED
-#define BEAST_ASIO_BASICS_BUFFERTYPE_H_INCLUDED
+#ifndef BEAST_NET_BASICS_BUFFERTYPE_H_INCLUDED
+#define BEAST_NET_BASICS_BUFFERTYPE_H_INCLUDED
+
+#include "../mpl/IfCond.h"
+
+namespace beast {
 
 /** General linear memory buffer.
     This wraps the underlying buffer type and provides additional methods
@@ -49,7 +53,7 @@ public:
 
     template <bool OtherIsConst>
     BufferType (BufferType <OtherIsConst> const& other)
-        : m_data (other.cast <pointer_type> ())
+        : m_data (other.template cast <pointer_type> ())
         , m_size (other.size ())
     {
     }
@@ -71,7 +75,7 @@ public:
     BufferType& operator= (
         BufferType <OtherIsConst> const& other) noexcept
     {
-        m_data = other.cast <pointer_type> ();
+        m_data = other.template cast <pointer_type> ();
         m_size = other.size ();
         return *this;
     }
@@ -99,4 +103,6 @@ private:
 };
 /** @} */
 
+}
+
 #endif
diff --git a/beast/net/DynamicBuffer.h b/beast/net/DynamicBuffer.h
new file mode 100644
index 0000000000..34d2a6d749
--- /dev/null
+++ b/beast/net/DynamicBuffer.h
@@ -0,0 +1,125 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_NET_DYNAMICBUFFER_H_INCLUDED
+#define BEAST_NET_DYNAMICBUFFER_H_INCLUDED
+
+#include <vector>
+
+namespace beast {
+
+/** Disjoint, but efficient buffer storage for network operations.
+    This is designed to not require asio in order to compile.
+*/
+class DynamicBuffer
+{
+public:
+    enum
+    {
+        defaultBlocksize = 32 * 1024
+    };
+
+    typedef std::size_t             size_type;
+
+    /** Create the dynamic buffer with the specified block size. */
+    explicit DynamicBuffer (size_type blocksize = defaultBlocksize);
+    
+    DynamicBuffer (DynamicBuffer const& other);
+
+    ~DynamicBuffer ();
+
+    DynamicBuffer& operator= (DynamicBuffer const& other);
+
+    /** Swap the contents of this buffer with another.
+        This is the preferred way to transfer ownership.
+    */
+    void swapWith (DynamicBuffer& other);
+
+    /** Returns the size of the input sequence. */
+    size_type size () const;
+
+    /** Returns a buffer to the input sequence.
+        ConstBufferType must be constructible with this signature:
+            ConstBufferType (void const* buffer, size_type bytes);
+    */
+    template <typename ConstBufferType>
+    std::vector <ConstBufferType> data () const
+    {
+        std::vector <ConstBufferType> buffers;
+        buffers.reserve (m_buffers.size());
+        size_type amount (m_size);
+        for (typename Buffers::const_iterator iter (m_buffers.begin());
+            amount > 0 && iter != m_buffers.end(); ++iter)
+        {
+            size_type const n (std::min (amount, m_blocksize));
+            buffers.push_back (ConstBufferType (*iter, n));
+            amount -= n;
+        }
+        return buffers;
+    }
+
+    /** Reserve space in the output sequence.
+        This also returns a buffer suitable for writing.
+        MutableBufferType must be constructible with this signature:
+            MutableBufferType (void* buffer, size_type bytes);
+    */
+    template <typename MutableBufferType>
+    std::vector <MutableBufferType> prepare (size_type amount)
+    {
+        std::vector <MutableBufferType> buffers;
+        buffers.reserve (m_buffers.size());
+        reserve (amount);
+        size_type offset (m_size % m_blocksize);
+        for (Buffers::iterator iter = m_buffers.begin () + (m_size / m_blocksize);
+            amount > 0 && iter != m_buffers.end (); ++iter)
+        {
+            size_type const n (std::min (amount, m_blocksize - offset));
+            buffers.push_back (MutableBufferType (
+                ((static_cast <char*> (*iter)) + offset), n));
+            amount -= n;
+            offset = 0;
+        }
+        return buffers;
+    }
+
+    /** Reserve space in the output sequence. */
+    void reserve (size_type n);
+
+    /** Move bytes from the output to the input sequence. */
+    void commit (size_type n);
+
+    /** Release memory while preserving the input sequence. */
+    void shrink_to_fit ();
+
+    /** Convert the entire buffer into a single string.
+        This is mostly for diagnostics, it defeats the purpose of the class!
+    */
+    std::string to_string () const;
+
+private:
+    typedef std::vector <void*> Buffers;
+
+    size_type m_blocksize;
+    size_type m_size;
+    Buffers m_buffers;
+};
+
+}
+
+#endif
diff --git a/beast/net/IPEndpoint.h b/beast/net/IPEndpoint.h
new file mode 100644
index 0000000000..1852297179
--- /dev/null
+++ b/beast/net/IPEndpoint.h
@@ -0,0 +1,378 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_NET_IPENDPOINT_H_INCLUDED
+#define BEAST_NET_IPENDPOINT_H_INCLUDED
+
+#include <string>
+#include <ios>
+#include <sstream>
+    
+#include "../CStdInt.h"
+#include "../mpl/IfCond.h"
+
+namespace beast
+{
+
+/** Represents an IP address (v4 or v6) and port combination. */
+class IPEndpoint
+{
+public:
+    enum Type
+    {
+        none,
+        ipv4,
+        ipv6
+    };
+
+    template <typename Number>
+    static std::string numberToString (Number n)
+    {
+        std::ostringstream os;
+        os << std::dec << n;
+        return std::string (os.str());
+    }
+
+    //--------------------------------------------------------------------------
+
+    /** Used for IPv4 formats. */
+    struct V4
+    {
+        /** Construct the "any" address. */
+        V4 ();
+
+        /** Construct from a 32-bit unsigned.
+            @note Octets are formed in order from the MSB to the LSB.       
+        */
+        explicit V4 (uint32 value_);
+
+        /** Construct from four individual octets..
+            @note The resulting address is a.b.c.d
+        */
+        V4 (uint8 a, uint8 b, uint8 c, uint8 d);
+
+        /** Construct a copy of another address. */
+        V4 (V4 const& other);
+
+        /** Assign a copy of another address. */
+        V4& operator= (V4 const& other);
+
+        /** Returns a V4 address representing the local broadcast address. */
+        static V4 localBroadcastAddress ();
+
+        /** Returns the directed broadcast address for the network implied by this address. */
+        V4 broadcastAddress () const;
+
+        /** Returns the IPv4 address class as 'A', 'B', 'C', or 'D'.
+            @note Class 'D' represents multicast addresses (224.*.*.*).
+        */
+        char getClass () const;
+
+        /** Returns `true` if this is a public routable address. */
+        bool isPublic () const;
+
+        /** Returns `true` if this is a private, non-routable address. */
+        bool isPrivate () const;
+
+        /** Returns `true` if this is a broadcast address. */
+        bool isBroadcast () const;
+
+        /** Returns `true` if this is a multicast address. */
+        bool isMulticast () const;
+
+        /** Returns `true` if this refers to any loopback adapter address. */
+        bool isLoopback () const;
+
+        /** Supports access via operator[]. */
+        template <bool IsConst>
+        class Proxy
+        {
+        public:
+            typedef typename mpl::IfCond <IsConst, uint32 const*, uint32*>::type Pointer;
+
+            Proxy (int shift, Pointer value)
+                : m_shift (shift)
+                , m_value (value)
+            {
+            }
+
+            operator uint8() const
+            {
+                return ((*m_value)>>m_shift)&0xff;
+            }
+
+            template <typename IntegralType>
+            Proxy& operator= (IntegralType v)
+            {
+                (*m_value)=
+                    (*m_value)&(!((0xff)<<m_shift)) |
+                    ((v&0xff)<<m_shift);
+
+                return *this;
+            }
+
+        private:
+            int m_shift;
+            Pointer m_value;
+        };
+
+        /** Provides read access to individual octets of the IPv4 address. */
+        Proxy <true> operator[] (std::size_t index) const;
+
+        /** Provides read/write access to individual octets of the IPv4 address. */
+        Proxy <false> operator[] (std::size_t index);
+
+        /** Convert the address to a human readable string. */
+        /** @{ */
+        std::string to_string () const;
+        operator std::string () const;
+        /** @} */
+
+        struct hasher
+        {
+            std::size_t operator() (V4 const& v) const
+            {
+                return v.value;
+            }
+        };
+
+        /** The value as a 32 bit unsigned. */
+        uint32 value;
+    };
+
+    //--------------------------------------------------------------------------
+
+    /** Used for IPv6 formats. */
+    struct V6
+    {
+        /** Returns `true` if this is a public routable address. */
+        bool isPublic () const
+        {
+            return false;
+        }
+
+        /** Returns `true` if this is a private, non-routable address. */
+        bool isPrivate () const
+        {
+            return false;
+        }
+
+        /** Returns `true` if this is a broadcast address. */
+        bool isBroadcast () const
+        {
+            return false;
+        }
+
+        /** Returns `true` if this is a multicast address. */
+        bool isMulticast () const
+        {
+            return false;
+        }
+
+        /** Returns `true` if this refers to any loopback adapter address. */
+        bool isLoopback () const
+        {
+            return false;
+        }
+
+        /** Convert the address to a human readable string. */
+        /** @{ */
+        std::string to_string () const
+        {
+            return std::string();
+        }
+
+        operator std::string () const
+        {
+            return to_string();
+        }
+        /** @} */
+
+        struct hasher
+        {
+            std::size_t operator() (V6 const&) const
+            {
+                return 0;
+            }
+        };
+    };
+
+    //--------------------------------------------------------------------------
+
+    /** Create an empty address. */
+    IPEndpoint ();
+
+    /** Create an IPv4 address with optional port. */
+    IPEndpoint (V4 const& v4, uint16 port = 0);
+
+    /** Create an IPv6 address with optional port. */
+    IPEndpoint (V6 const& v6, uint16 port = 0);
+
+    /** Create a copy of another IPEndpoint. */
+    IPEndpoint (IPEndpoint const& other);
+
+    /** Copy assign another IPEndpoint. */
+    IPEndpoint& operator= (IPEndpoint const& other);
+
+    /** Create an IPEndpoint from a string.
+        If a parsing error occurs, the endpoint will be empty.
+    */
+    static IPEndpoint from_string (std::string const& s);
+
+    /** Create an IPEndpoint from a string.
+        If a parsing error occurs, the endpoint will be empty.
+        This recognizes an alternate form of the text. Instead of a colon
+        separating the optional port specification, any amount of whitespace
+        is allowed.
+    */
+    static IPEndpoint from_string_altform (std::string const& s);
+
+    /** Copy assign an IPv4 address.
+        The port is set to zero.
+    */
+    IPEndpoint& operator= (V4 const& address);
+
+    /** Copy assign an IPv6 address.
+        The port is set to zero.
+    */
+    IPEndpoint& operator= (V6 const& address);
+
+    /** Returns a new IPEndpoint with this address, and the given port. */
+    IPEndpoint withPort (uint16 port) const;
+
+    /** Returns `true` if this IPEndpoint refers to nothing. */
+    bool empty () const;
+
+    /** Returns `true` if this IPEndpoint refers to nothing. */
+    bool isNull () const;
+
+    /** Returns `true` if this IPEndpoint refers to something. */
+    bool isNotNull () const;
+
+    /** Returns the type of this IPEndpoint. */
+    Type type () const;
+
+    /** Returns `true` if this IPEndpoint represents an IPv4 address. */
+    bool isV4 () const;
+
+    /** Returns `true` if this IPEndpoint represents an IPv6 address. */
+    bool isV6 () const;
+
+    /** Returns the IPv4 address.
+        Undefined behavior results if type() != ipv4.
+    */
+    V4 const& v4 () const;
+
+    /** Returns the IPv6 address.
+        Undefined behavior results if type() != ipv4.
+    */
+    V6 const& v6 () const;
+
+    /** Returns the port number.
+        Undefined if type() == none.
+    */
+    uint16 port () const;
+
+    /** Returns `true` if this is a public routable address. */
+    bool isPublic () const;
+
+    /** Returns `true` if this is a private, non-routable address. */
+    bool isPrivate () const;
+
+    /** Returns `true` if this is a broadcast address. */
+    bool isBroadcast () const;
+
+    /** Returns `true` if this is a multicast address. */
+    bool isMulticast () const;
+
+    /** Returns `true` if this refers to any loopback adapter address. */
+    bool isLoopback () const;
+
+    /** Convert the address to a human readable string. */
+    /** @{ */
+    std::string to_string () const;
+    operator std::string () const;
+    /** @} */
+
+    struct hasher
+    {
+        std::size_t operator() (IPEndpoint const& value) const
+        {
+            std::size_t hash (0);
+            if (value.isV4())
+                hash = V4::hasher() (value.v4());
+            else if (value.isV6())
+                hash = V6::hasher() (value.v6());
+            hash += value.port();
+            return hash;
+        }
+    };
+
+    struct key_equal;
+
+private:
+    Type m_type;
+    uint16 m_port;
+    V4 m_v4;
+    V6 m_v6;
+};
+
+/** Comparison. */
+/** @{ */
+int  compare    (IPEndpoint::V4 const& lhs, IPEndpoint::V4 const& rhs);
+bool operator== (IPEndpoint::V4 const& lhs, IPEndpoint::V4 const& rhs);
+bool operator!= (IPEndpoint::V4 const& lhs, IPEndpoint::V4 const& rhs);
+bool operator<  (IPEndpoint::V4 const& lhs, IPEndpoint::V4 const& rhs);
+bool operator<= (IPEndpoint::V4 const& lhs, IPEndpoint::V4 const& rhs);
+bool operator>  (IPEndpoint::V4 const& lhs, IPEndpoint::V4 const& rhs);
+bool operator>= (IPEndpoint::V4 const& lhs, IPEndpoint::V4 const& rhs);
+
+int  compare    (IPEndpoint const& lhs, IPEndpoint const& rhs);
+bool operator== (IPEndpoint const& lhs, IPEndpoint const& rhs);
+bool operator!= (IPEndpoint const& lhs, IPEndpoint const& rhs);
+bool operator<  (IPEndpoint const& lhs, IPEndpoint const& rhs);
+bool operator<= (IPEndpoint const& lhs, IPEndpoint const& rhs);
+bool operator>  (IPEndpoint const& lhs, IPEndpoint const& rhs);
+bool operator>= (IPEndpoint const& lhs, IPEndpoint const& rhs);
+
+/** Output stream conversions. */
+/** @{ */
+std::ostream& operator<< (std::ostream& os, IPEndpoint::V4 const& addr);
+std::ostream& operator<< (std::ostream& os, IPEndpoint::V6 const& addr);
+std::ostream& operator<< (std::ostream& os, IPEndpoint const& ep);
+/** @} */
+
+/** Input stream conversions. */
+/** @{ */
+std::istream& operator>> (std::istream& is, IPEndpoint::V4& addr);
+std::istream& operator>> (std::istream& is, IPEndpoint& ep);
+//std::istream& operator>> (std::istream &is, IPEndpoint::V6&);
+/** @} */
+
+struct IPEndpoint::key_equal
+{
+    bool operator() (IPEndpoint const& lhs, IPEndpoint const& rhs) const
+    {
+        return lhs == rhs;
+    }
+};
+
+}
+
+#endif
diff --git a/beast/net/Net.cpp b/beast/net/Net.cpp
new file mode 100644
index 0000000000..6a84e21858
--- /dev/null
+++ b/beast/net/Net.cpp
@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "../Config.h"
+
+#include "../../modules/beast_core/beast_core.h" // for UnitTest
+
+#include "impl/DynamicBuffer.cpp"
+#include "impl/IPEndpoint.cpp"
diff --git a/beast/net/impl/DynamicBuffer.cpp b/beast/net/impl/DynamicBuffer.cpp
new file mode 100644
index 0000000000..4dec2d5dfb
--- /dev/null
+++ b/beast/net/impl/DynamicBuffer.cpp
@@ -0,0 +1,91 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include <memory>
+
+#include "../DynamicBuffer.h"
+
+namespace beast {
+
+DynamicBuffer::DynamicBuffer (size_type blocksize)
+    : m_blocksize (blocksize)
+    , m_size (0)
+{
+}
+
+DynamicBuffer::~DynamicBuffer ()
+{
+    for (Buffers::iterator iter (m_buffers.begin());
+        iter != m_buffers.end(); ++iter)
+        free (*iter);
+}
+
+void DynamicBuffer::swapWith (DynamicBuffer& other)
+{
+    std::swap (m_blocksize, other.m_blocksize);
+    std::swap (m_size, other.m_size);
+    m_buffers.swap (other.m_buffers);
+}
+
+void DynamicBuffer::commit (size_type n)
+{
+    m_size += n;
+    bassert (m_size <= m_buffers.size () * m_blocksize);
+}
+
+DynamicBuffer::size_type DynamicBuffer::size () const
+{
+    return m_size;
+}
+
+void DynamicBuffer::reserve (size_type n)
+{
+    size_type count ((m_size + n + m_blocksize - 1) / m_blocksize);
+    if (count > m_buffers.size ())
+        for (count -= m_buffers.size (); count-- > 0;)
+            m_buffers.push_back (malloc (m_blocksize));
+}
+
+void DynamicBuffer::shrink_to_fit ()
+{
+    size_type const count ((m_size + m_blocksize - 1) / m_blocksize);
+    while (m_buffers.size () > count)
+    {
+        free (m_buffers.back ());
+        m_buffers.erase (m_buffers.end () - 1);
+    }   
+}
+
+std::string DynamicBuffer::to_string () const
+{
+    std::string (s);
+    s.reserve (m_size);
+    std::size_t amount (m_size);
+    for (Buffers::const_iterator iter (m_buffers.begin());
+        amount > 0 && iter != m_buffers.end(); ++iter)
+    {
+        char const* p (static_cast <char const*> (*iter));
+        size_type const n (std::min (amount, m_blocksize));
+        s.append (p, p + n);
+        amount -= n;
+    }
+    return s;
+}
+
+}
diff --git a/beast/net/impl/IPEndpoint.cpp b/beast/net/impl/IPEndpoint.cpp
new file mode 100644
index 0000000000..ffa2bf77bf
--- /dev/null
+++ b/beast/net/impl/IPEndpoint.cpp
@@ -0,0 +1,717 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../IPEndpoint.h"
+
+namespace beast
+{
+
+IPEndpoint::V4::V4 ()
+    : value (0)
+{
+}
+
+IPEndpoint::V4::V4 (uint32 value_)
+    : value (value_)
+{
+}
+
+IPEndpoint::V4::V4 (uint8 a, uint8 b, uint8 c, uint8 d)
+    : value ((a<<24)|(b<<16)|(c<<8)|d)
+{
+}
+
+IPEndpoint::V4::V4 (V4 const& other)
+    : value (other.value)
+{
+}
+
+IPEndpoint::V4& IPEndpoint::V4::operator= (V4 const& other)
+{
+    value = other.value;
+    return *this;
+}
+
+IPEndpoint::V4 IPEndpoint::V4::localBroadcastAddress ()
+{
+    return V4 (0xffffffff);
+}
+
+IPEndpoint::V4 IPEndpoint::V4::broadcastAddress () const
+{
+    switch (getClass())
+    {
+    case 'A': return V4 ((value&0xff000000)|0x00ffffff);
+    case 'B': return V4 ((value&0xffff0000)|0x0000ffff);
+    case 'C': return V4 ((value&0xffffff00)|0x000000ff);
+    default:
+    case 'D':
+        bassertfalse;
+        break;
+    }
+    return V4();
+}
+
+char IPEndpoint::V4::getClass () const
+{
+    static char const* table = "AAAABBCD";
+    return table[(value&0xE0000000)>>29];
+}
+
+bool IPEndpoint::V4::isPublic () const
+{
+    return !isPrivate() && !isBroadcast() && !isMulticast();
+}
+
+bool IPEndpoint::V4::isPrivate () const
+{
+    return
+        ((value&0xff000000)==0x0a000000) || // Prefix /8,    10.##.#.#
+        ((value&0xfff00000)==0xac100000) || // Prefix /12   172.16.#.# - 172.31.#.#
+        ((value&0xffff0000)==0xc0a80000) || // Prefix /16   192.168.#.#
+        isLoopback();
+}
+
+bool IPEndpoint::V4::isBroadcast () const
+{
+    return (value == broadcastAddress().value);
+}
+
+bool IPEndpoint::V4::isMulticast () const
+{
+    return getClass() == 'D';
+}
+
+bool IPEndpoint::V4::isLoopback () const
+{
+    return (value&0xff000000)==0x7f000000;
+}
+
+IPEndpoint::V4::Proxy <true> IPEndpoint::V4::operator[] (std::size_t index) const
+{
+    switch (index)
+    {
+    default:
+        bassertfalse;
+    case 0: return Proxy <true> (24, &value);
+    case 1: return Proxy <true> (16, &value);
+    case 2: return Proxy <true> ( 8, &value);
+    case 3: return Proxy <true> ( 0, &value);
+    };
+};
+
+IPEndpoint::V4::Proxy <false> IPEndpoint::V4::operator[] (std::size_t index)
+{
+    switch (index)
+    {
+    default:
+        bassertfalse;
+    case 0: return Proxy <false> (24, &value);
+    case 1: return Proxy <false> (16, &value);
+    case 2: return Proxy <false> ( 8, &value);
+    case 3: return Proxy <false> ( 0, &value);
+    };
+};
+
+std::string IPEndpoint::V4::to_string () const
+{
+    std::string s;
+    s.reserve (15);
+    s.append (numberToString ((int)((*this)[0]))); s.push_back ('.');
+    s.append (numberToString ((int)((*this)[1]))); s.push_back ('.');
+    s.append (numberToString ((int)((*this)[2]))); s.push_back ('.');
+    s.append (numberToString ((int)((*this)[3])));
+    return s;
+}
+
+IPEndpoint::V4::operator std::string () const
+{
+    return to_string();
+}
+
+//------------------------------------------------------------------------------
+
+IPEndpoint::IPEndpoint ()
+    : m_type (none)
+{
+}
+
+IPEndpoint::IPEndpoint (V4 const& v4, uint16 port)
+    : m_type (ipv4)
+    , m_port (port)
+    , m_v4 (v4)
+{
+}
+
+IPEndpoint::IPEndpoint (V6 const& v6, uint16 port)
+    : m_type (ipv6)
+    , m_port (port)
+    , m_v6 (v6)
+{
+}
+
+IPEndpoint::IPEndpoint (IPEndpoint const& other)
+    : m_type (other.m_type)
+    , m_port (other.m_port)
+{
+    switch (m_type)
+    {
+    case ipv4: m_v4 = other.m_v4; break;
+    case ipv6: m_v6 = other.m_v6; break;
+    default:
+    case none:
+        break;
+    };
+}
+
+IPEndpoint& IPEndpoint::operator= (IPEndpoint const& other)
+{
+    m_type = other.m_type;
+    m_port = other.m_port;
+    switch (m_type)
+    {
+    case ipv4: m_v4 = other.m_v4; break;
+    case ipv6: m_v6 = other.m_v6; break;
+    default:
+    case none:
+        break;
+    };
+    return *this;
+}
+
+IPEndpoint IPEndpoint::from_string (std::string const& s)
+{
+    std::stringstream is (s);
+    IPEndpoint ep;
+    is >> ep;
+    if (! is.fail() && is.rdbuf()->in_avail() == 0)
+        return ep;
+    return IPEndpoint();
+}
+
+IPEndpoint& IPEndpoint::operator= (V4 const& address)
+{
+    m_type = ipv4;
+    m_port = 0;
+    m_v4 = address;
+    return *this;
+}
+
+IPEndpoint& IPEndpoint::operator= (V6 const& address)
+{
+    m_type = ipv6;
+    m_port = 0;
+    m_v6 = address;
+    return *this;
+}
+
+IPEndpoint IPEndpoint::withPort (uint16 port) const
+{
+    switch (m_type)
+    {
+    case ipv4: return IPEndpoint (m_v4, port);
+    case ipv6: return IPEndpoint (m_v6, port);
+    default:
+    case none:
+        bassertfalse;
+        break;
+    };
+    return IPEndpoint();
+}
+
+bool IPEndpoint::empty () const
+{
+    return m_type == none;
+}
+
+bool IPEndpoint::isNull () const
+{
+    return empty ();
+}
+
+bool IPEndpoint::isNotNull () const
+{
+    return ! empty ();
+}
+
+IPEndpoint::Type IPEndpoint::type () const
+{
+    return m_type;
+}
+
+bool IPEndpoint::isV4 () const
+{
+    return m_type == ipv4;
+}
+
+bool IPEndpoint::isV6 () const
+{
+    return m_type == ipv6;
+}
+
+IPEndpoint::V4 const& IPEndpoint::v4 () const
+{
+    return m_v4;
+}
+
+IPEndpoint::V6 const& IPEndpoint::v6 () const
+{
+    return m_v6;
+}
+
+uint16 IPEndpoint::port () const
+{
+    return m_port;
+}
+
+bool IPEndpoint::isPublic () const
+{
+    switch (m_type)
+    {
+    case ipv4: return m_v4.isPublic();
+    case ipv6: return m_v6.isPublic();
+    default:
+        bassertfalse;
+    case none:
+        break;
+    };
+    return false;
+}
+
+bool IPEndpoint::isPrivate () const
+{
+    switch (m_type)
+    {
+    case ipv4: return m_v4.isPrivate();
+    case ipv6: return m_v6.isPrivate();
+    default:
+        bassertfalse;
+    case none:
+        break;
+    };
+    return false;
+}
+
+bool IPEndpoint::isBroadcast () const
+{
+    switch (m_type)
+    {
+    case ipv4: return m_v4.isBroadcast();
+    case ipv6: return m_v6.isBroadcast();
+    default:
+        bassertfalse;
+    case none:
+        break;
+    };
+    return false;
+}
+
+bool IPEndpoint::isMulticast () const
+{
+    switch (m_type)
+    {
+    case ipv4: return m_v4.isMulticast();
+    case ipv6: return m_v6.isMulticast();
+    default:
+        bassertfalse;
+    case none:
+        break;
+    };
+    return false;
+}
+
+bool IPEndpoint::isLoopback () const
+{
+    switch (m_type)
+    {
+    case ipv4: return m_v4.isLoopback();
+    case ipv6: return m_v6.isLoopback();
+    default:
+        bassertfalse;
+    case none:
+        break;
+    };
+    return false;
+}
+
+std::string IPEndpoint::to_string () const
+{
+    switch (m_type)
+    {
+    case ipv4:
+        {
+            std::string s (m_v4.to_string());
+            if (m_port != 0)
+            {
+                s.append (":");
+                s.append (numberToString (m_port));
+            }
+            return s;
+        }
+
+    case ipv6:
+        return m_v6.to_string();
+
+    default:
+    case none:
+        bassertfalse;
+        break;
+    };
+    return std::string();
+}
+
+IPEndpoint::operator std::string () const
+{
+    return to_string();
+}
+
+//------------------------------------------------------------------------------
+
+namespace parse
+{
+
+/** Require and consume the specified character from the input.
+    @return `true` if the character matched.
+*/
+bool expect (std::istream& is, char v)
+{
+    char c;
+    if (is.get(c) && v == c)
+        return true;
+
+    is.unget();
+    is.setstate (std::ios_base::failbit);
+    return false;
+}
+
+namespace detail
+{
+
+/** Used to disambiguate 8-bit integers from characters. */
+template <typename IntType>
+struct integer_holder
+{
+    IntType* pi;
+    explicit integer_holder (IntType& i)
+        : pi (&i)
+    {
+    }
+    template <typename OtherIntType>
+    IntType& operator= (OtherIntType o) const
+    {
+        *pi = o;
+        return *pi;
+    }
+};
+
+/** Parse 8-bit unsigned integer. */
+std::istream& operator>> (std::istream& is, integer_holder <uint8> const& i)
+{
+    uint16 v;
+    is >> v;
+    if (! (v>=0 && v<=255))
+    {
+        is.setstate (std::ios_base::failbit);
+        return is;
+    }
+    i = uint8(v);
+    return is;
+}
+
+}
+
+/** Free function for template argument deduction. */
+template <typename IntType>
+detail::integer_holder <IntType> integer (IntType& i)
+{
+    return detail::integer_holder <IntType> (i);
+}
+
+}
+
+/** Parse IPv4 address. */
+std::istream& operator>> (std::istream &is, IPEndpoint::V4& addr)
+{
+    uint8 octets [4];
+    is >> parse::integer (octets [0]);
+    for (int i = 1; i < 4; ++i)
+    {
+        if (!is || !parse::expect (is, '.'))
+            return is;
+        is >> parse::integer (octets [i]);
+        if (!is)
+            return is;
+    }
+    addr = IPEndpoint::V4 (octets[0], octets[1], octets[2], octets[3]);
+    return is;
+}
+
+/** Parse an IPEndpoint.
+    @note Currently only IPv4 addresses are supported.
+*/
+std::istream& operator>> (std::istream &is, IPEndpoint& ep)
+{
+    IPEndpoint::V4 v4;
+    is >> v4;
+    if (is.fail())
+        return is;
+
+    if (is.rdbuf()->in_avail()>0)
+    {
+        char c;
+        is.get(c);
+        if (c != ':')
+        {
+            is.unget();
+            ep = IPEndpoint (v4);
+            return is;
+        }
+
+        uint16 port;
+        is >> port;
+        if (is.fail())
+            return is;
+
+        ep = IPEndpoint (v4, port);
+    }
+    else
+    {
+        ep = IPEndpoint (v4);
+    }
+    
+    return is;
+}
+
+//------------------------------------------------------------------------------
+
+IPEndpoint IPEndpoint::from_string_altform (std::string const& s)
+{
+    // Accept the regular form if it parses
+    {
+        IPEndpoint ep (IPEndpoint::from_string (s));
+        if (! ep.empty())
+            return ep;
+    }
+
+    // Now try the alt form
+    std::stringstream is (s);
+
+    IPEndpoint::V4 v4;
+    is >> v4;
+    if (! is.fail())
+    {
+        IPEndpoint ep (v4);
+
+        if (is.rdbuf()->in_avail()>0)
+        {
+            if (! parse::expect (is, ' '))
+                return IPEndpoint();
+
+            while (is.rdbuf()->in_avail()>0)
+            {
+                char c;
+                is.get(c);
+                if (c != ' ')
+                {
+                    is.unget();
+                    break;
+                }
+            }
+
+            uint16 port;
+            is >> port;
+            if (is.fail())
+                return IPEndpoint();
+
+            return ep.withPort (port);
+        }
+        else
+        {
+            // Just an address with no port
+            return ep;
+        }
+    }
+
+    // Could be V6 here...
+
+    return IPEndpoint();
+}
+
+//------------------------------------------------------------------------------
+
+int compare (IPEndpoint::V4 const& lhs, IPEndpoint::V4 const& rhs)
+{
+    if (lhs.value < rhs.value)
+        return -1;
+    else if (lhs.value > rhs.value)
+        return 1;
+    return 0;
+}
+
+bool operator== (IPEndpoint::V4 const& lhs, IPEndpoint::V4 const& rhs) { return compare (lhs, rhs) == 0; }
+bool operator!= (IPEndpoint::V4 const& lhs, IPEndpoint::V4 const& rhs) { return compare (lhs, rhs) != 0; }
+bool operator<  (IPEndpoint::V4 const& lhs, IPEndpoint::V4 const& rhs) { return compare (lhs, rhs) <  0; }
+bool operator<= (IPEndpoint::V4 const& lhs, IPEndpoint::V4 const& rhs) { return compare (lhs, rhs) <= 0; }
+bool operator>  (IPEndpoint::V4 const& lhs, IPEndpoint::V4 const& rhs) { return compare (lhs, rhs) >  0; }
+bool operator>= (IPEndpoint::V4 const& lhs, IPEndpoint::V4 const& rhs) { return compare (lhs, rhs) >= 0; }
+
+static int type_compare (IPEndpoint const& lhs, IPEndpoint const& rhs)
+{
+    if (lhs.type() < rhs.type())
+        return -1;
+    else if (lhs.type() > rhs.type())
+        return 1;
+    return 0;
+}
+
+int compare (IPEndpoint const& lhs, IPEndpoint const& rhs)
+{
+    int const tc (type_compare (lhs, rhs));
+
+    if (tc < 0)
+        return -1;
+    else if (tc > 0)
+        return 1;
+
+    switch (lhs.type())
+    {
+    case IPEndpoint::none: return 0;
+    case IPEndpoint::ipv4: return compare (lhs.v4(), rhs.v4());
+    default:
+    case IPEndpoint::ipv6:
+        break;
+    };
+    bassertfalse;
+    return 0;
+}
+
+bool operator== (IPEndpoint const& lhs, IPEndpoint const& rhs) { return compare (lhs, rhs) == 0; }
+bool operator!= (IPEndpoint const& lhs, IPEndpoint const& rhs) { return compare (lhs, rhs) != 0; }
+bool operator<  (IPEndpoint const& lhs, IPEndpoint const& rhs) { return compare (lhs, rhs) <  0; }
+bool operator<= (IPEndpoint const& lhs, IPEndpoint const& rhs) { return compare (lhs, rhs) <= 0; }
+bool operator>  (IPEndpoint const& lhs, IPEndpoint const& rhs) { return compare (lhs, rhs) >  0; }
+bool operator>= (IPEndpoint const& lhs, IPEndpoint const& rhs) { return compare (lhs, rhs) >= 0; }
+
+std::ostream& operator<< (std::ostream &os, IPEndpoint::V4 const& addr)
+{
+    os << addr.to_string();
+    return os;
+}
+
+std::ostream& operator<< (std::ostream &os, IPEndpoint::V6 const& addr)
+{
+    os << addr.to_string();
+    return os;
+}
+
+std::ostream& operator<< (std::ostream &os, IPEndpoint const& ep)
+{
+    os << ep.to_string();
+    return os;
+}
+
+//------------------------------------------------------------------------------
+
+class IPEndpointTests : public UnitTest
+{
+public:
+    bool parse (char const* text, IPEndpoint& ep)
+    {
+        std::string input (text);
+        std::istringstream stream (input);
+        stream >> ep;
+        return !stream.fail();
+    }
+
+    void shouldPass (char const* text)
+    {
+        IPEndpoint ep;
+        expect (parse (text, ep));
+        expect (ep.to_string() == std::string(text));
+    }
+
+    void shouldFail (char const* text)
+    {
+        IPEndpoint ep;
+        unexpected (parse (text, ep));
+    }
+
+    void testParse ()
+    {
+        beginTestCase ("parse");
+
+        shouldPass ("0.0.0.0");
+        shouldPass ("192.168.0.1");
+        shouldPass ("168.127.149.132");
+        shouldPass ("168.127.149.132:80");
+        shouldPass ("168.127.149.132:54321");
+
+        shouldFail ("");
+        shouldFail ("255");
+        shouldFail ("512");
+        shouldFail ("1.2.3.256");
+        shouldFail ("1.2.3:80");
+    }
+
+    void testPrint ()
+    {
+        beginTestCase ("addresses");
+
+        IPEndpoint ep;
+
+        ep = IPEndpoint(IPEndpoint::V4(127,0,0,1)).withPort (80);
+        expect (!ep.isPublic());
+        expect ( ep.isPrivate());
+        expect (!ep.isBroadcast());
+        expect (!ep.isMulticast());
+        expect ( ep.isLoopback());
+        expect (ep.to_string() == "127.0.0.1:80");
+
+        ep = IPEndpoint::V4(10,0,0,1);
+        expect ( ep.v4().getClass() == 'A');
+        expect (!ep.isPublic());
+        expect ( ep.isPrivate());
+        expect (!ep.isBroadcast());
+        expect (!ep.isMulticast());
+        expect (!ep.isLoopback());
+        expect (ep.to_string() == "10.0.0.1");
+
+        ep = IPEndpoint::V4(166,78,151,147);
+        expect ( ep.isPublic());
+        expect (!ep.isPrivate());
+        expect (!ep.isBroadcast());
+        expect (!ep.isMulticast());
+        expect (!ep.isLoopback());
+        expect (ep.to_string() == "166.78.151.147");
+    }
+
+    void runTest ()
+    {
+        testPrint();
+        testParse();
+    }
+
+    IPEndpointTests () : UnitTest ("IPEndpoint", "beast")
+    {
+    }
+};
+
+static IPEndpointTests ipEndpointTests;
+
+}
diff --git a/modules/beast_core/memory/beast_ContainerDeletePolicy.h b/beast/smart_ptr/ContainerDeletePolicy.h
similarity index 92%
rename from modules/beast_core/memory/beast_ContainerDeletePolicy.h
rename to beast/smart_ptr/ContainerDeletePolicy.h
index 2a282b2940..9d65bf11af 100644
--- a/modules/beast_core/memory/beast_ContainerDeletePolicy.h
+++ b/beast/smart_ptr/ContainerDeletePolicy.h
@@ -17,8 +17,10 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CONTAINERDELETEPOLICY_H_INCLUDED
-#define BEAST_CONTAINERDELETEPOLICY_H_INCLUDED
+#ifndef BEAST_SMARTPTR_CONTAINERDELETEPOLICY_H_INCLUDED
+#define BEAST_SMARTPTR_CONTAINERDELETEPOLICY_H_INCLUDED
+
+namespace beast {
 
 /** The DeletePolicy provides a way to destroy objects stored in containers.
 
@@ -45,4 +47,6 @@ struct ContainerDeletePolicy
     }
 };
 
+}
+
 #endif
diff --git a/modules/beast_core/memory/beast_ScopedPointer.h b/beast/smart_ptr/ScopedPointer.h
similarity index 89%
rename from modules/beast_core/memory/beast_ScopedPointer.h
rename to beast/smart_ptr/ScopedPointer.h
index 09906874cb..5e16c64511 100644
--- a/modules/beast_core/memory/beast_ScopedPointer.h
+++ b/beast/smart_ptr/ScopedPointer.h
@@ -21,8 +21,16 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SCOPEDPOINTER_H_INCLUDED
-#define BEAST_SCOPEDPOINTER_H_INCLUDED
+#ifndef BEAST_SMARTPTR_SCOPEDPOINTER_H_INCLUDED
+#define BEAST_SMARTPTR_SCOPEDPOINTER_H_INCLUDED
+
+#include "../Config.h"
+#include "../Uncopyable.h"
+#include "../StaticAssert.h"
+
+#include "ContainerDeletePolicy.h"
+    
+namespace beast {
 
 //==============================================================================
 /**
@@ -67,13 +75,13 @@ class ScopedPointer : public Uncopyable
 public:
     //==============================================================================
     /** Creates a ScopedPointer containing a null pointer. */
-    inline ScopedPointer() noexcept
+    inline ScopedPointer()
         : object (nullptr)
     {
     }
 
     /** Creates a ScopedPointer that owns the specified object. */
-    inline ScopedPointer (ObjectType* const objectToTakePossessionOf) noexcept
+    inline ScopedPointer (ObjectType* const objectToTakePossessionOf)
         : object (objectToTakePossessionOf)
     {
     }
@@ -84,7 +92,7 @@ public:
         the pointer from the other object to this one, and the other object is reset to
         be a null pointer.
     */
-    ScopedPointer (ScopedPointer& objectToTransferFrom) noexcept
+    ScopedPointer (ScopedPointer& objectToTransferFrom)
         : object (objectToTransferFrom.object)
     {
         objectToTransferFrom.object = nullptr;
@@ -144,13 +152,13 @@ public:
     }
 
    #if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
-    ScopedPointer (ScopedPointer&& other) noexcept
+    ScopedPointer (ScopedPointer&& other)
         : object (other.object)
     {
         other.object = nullptr;
     }
 
-    ScopedPointer& operator= (ScopedPointer&& other) noexcept
+    ScopedPointer& operator= (ScopedPointer&& other)
     {
         object = other.object;
         other.object = nullptr;
@@ -160,28 +168,28 @@ public:
 
     //==============================================================================
     /** Returns the object that this ScopedPointer refers to. */
-    inline operator ObjectType*() const noexcept                                    { return object; }
+    inline operator ObjectType*() const                                    { return object; }
 
     /** Returns the object that this ScopedPointer refers to. */
-    inline ObjectType* get() const noexcept                                         { return object; }
+    inline ObjectType* get() const                                         { return object; }
 
     /** Returns the object that this ScopedPointer refers to. */
-    inline ObjectType& operator*() const noexcept                                   { return *object; }
+    inline ObjectType& operator*() const                                   { return *object; }
 
     /** Lets you access methods and properties of the object that this ScopedPointer refers to. */
-    inline ObjectType* operator->() const noexcept                                  { return object; }
+    inline ObjectType* operator->() const                                  { return object; }
 
     //==============================================================================
     /** Removes the current object from this ScopedPointer without deleting it.
         This will return the current object, and set the ScopedPointer to a null pointer.
     */
-    ObjectType* release() noexcept                                                  { ObjectType* const o = object; object = nullptr; return o; }
+    ObjectType* release()                                                  { ObjectType* const o = object; object = nullptr; return o; }
 
     //==============================================================================
     /** Swaps this object with that of another ScopedPointer.
         The two objects simply exchange their pointers.
     */
-    void swapWith (ScopedPointer <ObjectType>& other) noexcept
+    void swapWith (ScopedPointer <ObjectType>& other)
     {
         // Two ScopedPointers should never be able to refer to the same object - if
         // this happens, you must have done something dodgy!
@@ -200,7 +208,7 @@ private:
     ObjectType* object;
 
     // (Required as an alternative to the overloaded & operator).
-    const ScopedPointer* getAddress() const noexcept                                { return this; }
+    const ScopedPointer* getAddress() const                                { return this; }
 
   #if ! BEAST_MSVC  // (MSVC can't deal with multiple copy constructors)
     /* The copy constructors are private to stop people accidentally copying a const ScopedPointer
@@ -227,7 +235,7 @@ private:
     This can be handy for checking whether this is a null pointer.
 */
 template <class ObjectType>
-bool operator== (const ScopedPointer<ObjectType>& pointer1, ObjectType* const pointer2) noexcept
+bool operator== (const ScopedPointer<ObjectType>& pointer1, ObjectType* const pointer2)
 {
     return static_cast <ObjectType*> (pointer1) == pointer2;
 }
@@ -236,7 +244,7 @@ bool operator== (const ScopedPointer<ObjectType>& pointer1, ObjectType* const po
     This can be handy for checking whether this is a null pointer.
 */
 template <class ObjectType>
-bool operator!= (const ScopedPointer<ObjectType>& pointer1, ObjectType* const pointer2) noexcept
+bool operator!= (const ScopedPointer<ObjectType>& pointer1, ObjectType* const pointer2)
 {
     return static_cast <ObjectType*> (pointer1) != pointer2;
 }
@@ -248,4 +256,7 @@ template <typename Type>
 void deleteAndZero (ScopedPointer<Type>&)  { static_bassert (sizeof (Type) == 12345); }
 #endif
 
-#endif   // BEAST_SCOPEDPOINTER_H_INCLUDED
+}
+
+#endif
+
diff --git a/modules/beast_core/memory/SharedObject.h b/beast/smart_ptr/SharedObject.h
similarity index 95%
rename from modules/beast_core/memory/SharedObject.h
rename to beast/smart_ptr/SharedObject.h
index c2853db0a6..53de02c7a7 100644
--- a/modules/beast_core/memory/SharedObject.h
+++ b/beast/smart_ptr/SharedObject.h
@@ -24,6 +24,12 @@
 #ifndef BEAST_SHAREDOBJECT_H_INCLUDED
 #define BEAST_SHAREDOBJECT_H_INCLUDED
 
+#include "../Config.h"
+#include "../Atomic.h"
+#include "../Uncopyable.h"
+
+namespace beast {
+
 //==============================================================================
 /**
     Adds reference-counting to an object.
@@ -65,7 +71,7 @@ public:
         This is done automatically by the smart pointer, but is public just
         in case it's needed for nefarious purposes.
     */
-    inline void incReferenceCount() noexcept
+    inline void incReferenceCount() const noexcept
     {
         ++refCount;
     }
@@ -79,7 +85,7 @@ public:
         The return value indicates if the reference count dropped to zero,
         so callers who know the derived type can use the ContainerDeletePolicy.
     */
-    void decReferenceCount ()
+    void decReferenceCount () const
     {
         bassert (getReferenceCount() > 0);
         if (--refCount == 0)
@@ -109,7 +115,7 @@ protected:
     /** Destroy the object.
         Derived classes can override this for different behaviors.
     */
-    virtual void destroy ()
+    virtual void destroy () const
     {
         delete this;
     }
@@ -124,7 +130,7 @@ protected:
 
 private:
     //==============================================================================
-    Atomic <int> refCount;
+    Atomic <int> mutable refCount;
 };
 
 //==============================================================================
@@ -184,7 +190,7 @@ protected:
         bassert (getReferenceCount() == 0);
     }
 
-    virtual void destroy ()
+    virtual void destroy () const
     {
         delete this;
     }
@@ -194,4 +200,6 @@ private:
     int refCount;
 };
 
+}
+
 #endif
diff --git a/modules/beast_core/memory/SharedPtr.h b/beast/smart_ptr/SharedPtr.h
similarity index 87%
rename from modules/beast_core/memory/SharedPtr.h
rename to beast/smart_ptr/SharedPtr.h
index 68333e93c4..36370897f6 100644
--- a/modules/beast_core/memory/SharedPtr.h
+++ b/beast/smart_ptr/SharedPtr.h
@@ -21,8 +21,13 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CORE_SHAREDPTR_H_INCLUDED
-#define BEAST_CORE_SHAREDPTR_H_INCLUDED
+#ifndef BEAST_SMARTPTR_SHAREDPTR_H_INCLUDED
+#define BEAST_SMARTPTR_SHAREDPTR_H_INCLUDED
+
+#include "../Config.h"
+#include "SharedObject.h"
+
+namespace beast {
 
 // Visual Studio doesn't seem to do very well when it comes
 // to templated constructors and assignments so we provide
@@ -74,7 +79,7 @@ public:
         Requirement:
             U* must be convertible to T*
     */
-    /// @{
+    /** @{ */
     SharedPtr (T* t) noexcept
         : m_p (acquire (t))
     {
@@ -85,14 +90,14 @@ public:
         : m_p (acquire (u))
     {
     }
-    /// @}
+    /** @} */
 
     /** Construct a container holding an object from another container.
         This will increment the object's reference-count (if it is non-null).
         Requirement:
             U* must be convertible to T*
     */
-    /// @{
+    /** @{ */
 #if BEAST_SHAREDPTR_PROVIDE_COMPILER_WORKAROUNDS
     SharedPtr (SharedPtr const& sp) noexcept
         : m_p (acquire (sp.get ()))
@@ -105,7 +110,7 @@ public:
         : m_p (acquire (sp.get ()))
     {
     }
-    /// @}
+    /** @} */
 
     /** Assign a different object to the container.
         The previous object beind held, if any, loses a reference count and
@@ -113,7 +118,7 @@ public:
         Requirement:
             U* must be convertible to T*
     */
-    /// @{
+    /** @{ */
 #if BEAST_SHAREDPTR_PROVIDE_COMPILER_WORKAROUNDS
     SharedPtr& operator= (T* t)
     {
@@ -126,10 +131,10 @@ public:
     {
         return assign (u);
     }
-    /// @}
+    /** @} */
 
     /** Assign an object from another container to this one. */
-    /// @{
+    /** @{ */
     SharedPtr& operator= (SharedPtr const& sp)
     {
         return assign (sp.get ());
@@ -141,7 +146,7 @@ public:
     {
         return assign (sp.get ());
     }
-    /// @}
+    /** @} */
 
 #if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
     /** Construct a container with an object transferred from another container.
@@ -149,7 +154,7 @@ public:
         Requires:
             U* must be convertible to T*
     */
-    /// @{
+    /** @{ */
 #if BEAST_SHAREDPTR_PROVIDE_COMPILER_WORKAROUNDS
     SharedPtr (SharedPtr && sp) noexcept
         : m_p (sp.swap <T> (nullptr))
@@ -159,17 +164,17 @@ public:
 
     template <class U>
     SharedPtr (SharedPtr <U>&& sp) noexcept
-        : m_p (sp.swap <U> (nullptr))
+        : m_p (sp.template swap <U> (nullptr))
     {
     }
-    /// @}
+    /** @} */
 
     /** Transfer ownership of another object to this container.
         The originating container loses its reference to the object.
         Requires:
             U* must be convertible to T*
     */
-    /// @{
+    /** @{ */
 #if BEAST_SHAREDPTR_PROVIDE_COMPILER_WORKAROUNDS
     SharedPtr& operator= (SharedPtr && sp)
     {
@@ -180,9 +185,9 @@ public:
     template <class U>
     SharedPtr& operator= (SharedPtr <U>&& sp)
     {
-        return assign (sp.swap <U> (nullptr));
+        return assign (sp.template swap <U> (nullptr));
     }
-    /// @}
+    /** @} */
 #endif
 
     /** Destroy the container and release the held reference, if any.
@@ -216,14 +221,6 @@ public:
         return m_p;
     }
 
-    /** Returns the object that this pointer references if any, else nullptr.
-        DEPRECATED
-    */
-    T* getObject () const noexcept
-    {
-        return m_p;
-    }
-
 private:
     // Acquire a reference to u for the caller.
     //
@@ -270,8 +267,24 @@ private:
 
 //------------------------------------------------------------------------------
 
-/// SharedPtr comparisons.
-/// @{
+// bind() helpers for pointer to member function
+
+template <class T>
+const T* get_pointer (SharedPtr<T> const& ptr)
+{
+    return ptr.get();
+}
+
+template <class T>
+T* get_pointer (SharedPtr<T>& ptr)
+{
+    return ptr.get();
+}
+
+//------------------------------------------------------------------------------
+
+/** SharedPtr comparisons. */
+/** @{ */
 template <class T, class U>
 bool operator== (SharedPtr <T> const& lhs, U* const rhs) noexcept
 {
@@ -285,28 +298,30 @@ bool operator== (SharedPtr <T> const& lhs, SharedPtr <U> const& rhs) noexcept
 }
 
 template <class T, class U>
-bool operator== (T const* lhs, SharedPtr<T> const& rhs) noexcept
+bool operator== (T const* lhs, SharedPtr <U> const& rhs) noexcept
 {
     return lhs == rhs.get();
 }
 
 template <class T, class U>
-bool operator!= (SharedPtr <T> const& lhs, T const* rhs) noexcept
+bool operator!= (SharedPtr <T> const& lhs, U const* rhs) noexcept
 {
     return lhs.get() != rhs;
 }
 
 template <class T, class U>
-bool operator!= (SharedPtr <T> const& lhs, SharedPtr <T> const& rhs) noexcept
+bool operator!= (SharedPtr <T> const& lhs, SharedPtr <U> const& rhs) noexcept
 {
     return lhs.get() != rhs.get();
 }
 
 template <class T, class U>
-bool operator!= (T const* lhs, SharedPtr<T> const& rhs) noexcept
+bool operator!= (T const* lhs, SharedPtr <U> const& rhs) noexcept
 {
     return lhs != rhs.get();
 }
-/// @}
+/** @} */
+
+}
 
 #endif
diff --git a/beast/smart_ptr/SmartPtr.cpp b/beast/smart_ptr/SmartPtr.cpp
new file mode 100644
index 0000000000..02700c5642
--- /dev/null
+++ b/beast/smart_ptr/SmartPtr.cpp
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "ContainerDeletePolicy.h"
+#include "ScopedPointer.h"
+#include "SharedObject.h"
+#include "SharedPtr.h"
diff --git a/modules/beast_core/text/beast_CharPointer_ASCII.h b/beast/strings/CharPointer_ASCII.h
similarity index 99%
rename from modules/beast_core/text/beast_CharPointer_ASCII.h
rename to beast/strings/CharPointer_ASCII.h
index 7fc76609d2..4275471140 100644
--- a/modules/beast_core/text/beast_CharPointer_ASCII.h
+++ b/beast/strings/CharPointer_ASCII.h
@@ -24,6 +24,14 @@
 #ifndef BEAST_CHARPOINTER_ASCII_H_INCLUDED
 #define BEAST_CHARPOINTER_ASCII_H_INCLUDED
 
+#include "../Config.h"
+
+#include "CharacterFunctions.h"
+
+#include <cstdlib>
+#include <cstring>
+
+namespace beast {
 
 //==============================================================================
 /**
@@ -378,5 +386,7 @@ private:
     CharType* data;
 };
 
+}
+
+#endif
 
-#endif   // BEAST_CHARPOINTER_ASCII_H_INCLUDED
diff --git a/modules/beast_core/text/beast_CharPointer_UTF16.h b/beast/strings/CharPointer_UTF16.h
similarity index 99%
rename from modules/beast_core/text/beast_CharPointer_UTF16.h
rename to beast/strings/CharPointer_UTF16.h
index 6279e48c61..b34ed4e9e0 100644
--- a/modules/beast_core/text/beast_CharPointer_UTF16.h
+++ b/beast/strings/CharPointer_UTF16.h
@@ -24,6 +24,13 @@
 #ifndef BEAST_CHARPOINTER_UTF16_H_INCLUDED
 #define BEAST_CHARPOINTER_UTF16_H_INCLUDED
 
+#include "../Config.h"
+#include "../Atomic.h"
+#include "../CStdInt.h"
+
+#include "CharacterFunctions.h"
+
+namespace beast {
 
 //==============================================================================
 /**
@@ -516,4 +523,7 @@ private:
     }
 };
 
-#endif   // BEAST_CHARPOINTER_UTF16_H_INCLUDED
+}
+
+#endif
+
diff --git a/modules/beast_core/text/beast_CharPointer_UTF32.h b/beast/strings/CharPointer_UTF32.h
similarity index 99%
rename from modules/beast_core/text/beast_CharPointer_UTF32.h
rename to beast/strings/CharPointer_UTF32.h
index 879d9e22cc..d5dfa082d0 100644
--- a/modules/beast_core/text/beast_CharPointer_UTF32.h
+++ b/beast/strings/CharPointer_UTF32.h
@@ -24,6 +24,14 @@
 #ifndef BEAST_CHARPOINTER_UTF32_H_INCLUDED
 #define BEAST_CHARPOINTER_UTF32_H_INCLUDED
 
+#include "../Config.h"
+#include "../Atomic.h"
+    
+#include "CharacterFunctions.h"
+
+#include <cwchar>
+
+namespace beast {
 
 //==============================================================================
 /**
@@ -369,5 +377,7 @@ private:
     CharType* data;
 };
 
+}
+
+#endif
 
-#endif   // BEAST_CHARPOINTER_UTF32_H_INCLUDED
diff --git a/modules/beast_core/text/beast_CharPointer_UTF8.h b/beast/strings/CharPointer_UTF8.h
similarity index 99%
rename from modules/beast_core/text/beast_CharPointer_UTF8.h
rename to beast/strings/CharPointer_UTF8.h
index 99ef9a03d9..f729c984b1 100644
--- a/modules/beast_core/text/beast_CharPointer_UTF8.h
+++ b/beast/strings/CharPointer_UTF8.h
@@ -24,6 +24,16 @@
 #ifndef BEAST_CHARPOINTER_UTF8_H_INCLUDED
 #define BEAST_CHARPOINTER_UTF8_H_INCLUDED
 
+#include "../Config.h"
+#include "../Atomic.h"
+    
+#include "CharacterFunctions.h"
+
+#include <cstdlib>
+#include <cstring>
+
+namespace beast {
+
 //==============================================================================
 /**
     Wraps a pointer to a null-terminated UTF-8 character string, and provides
@@ -570,5 +580,7 @@ private:
     CharType* data;
 };
 
+}
+
 #endif
 
diff --git a/modules/beast_core/text/beast_CharacterFunctions.h b/beast/strings/CharacterFunctions.h
similarity index 97%
rename from modules/beast_core/text/beast_CharacterFunctions.h
rename to beast/strings/CharacterFunctions.h
index 2ce3139fca..4c17e44633 100644
--- a/modules/beast_core/text/beast_CharacterFunctions.h
+++ b/beast/strings/CharacterFunctions.h
@@ -21,9 +21,16 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CHARACTERFUNCTIONS_H_INCLUDED
-#define BEAST_CHARACTERFUNCTIONS_H_INCLUDED
+#ifndef BEAST_STRINGS_CHARACTERFUNCTIONS_H_INCLUDED
+#define BEAST_STRINGS_CHARACTERFUNCTIONS_H_INCLUDED
 
+#include <limits>
+
+#include "../Config.h"
+#include "../CStdInt.h"
+#include "../Memory.h"
+
+namespace beast {
 
 //==============================================================================
 #if BEAST_WINDOWS && ! DOXYGEN
@@ -325,8 +332,11 @@ public:
     static size_t copyWithDestByteLimit (DestCharPointerType& dest, SrcCharPointerType src, size_t maxBytesToWrite) noexcept
     {
         typename DestCharPointerType::CharType const* const startAddress = dest.getAddress();
-        ssize_t maxBytes = (ssize_t) maxBytesToWrite;
-        maxBytes -= sizeof (typename DestCharPointerType::CharType); // (allow for a terminating null)
+        size_t maxBytes = maxBytesToWrite;
+        if (maxBytes >= sizeof (typename DestCharPointerType::CharType))
+            maxBytes -= sizeof (typename DestCharPointerType::CharType); // (allow for a terminating null)
+        else
+            maxBytes = 0;
 
         for (;;)
         {
@@ -581,5 +591,7 @@ private:
     static double mulexp10 (const double value, int exponent) noexcept;
 };
 
+}
+
+#endif
 
-#endif   // BEAST_CHARACTERFUNCTIONS_H_INCLUDED
diff --git a/modules/beast_core/text/beast_NewLine.h b/beast/strings/NewLine.h
similarity index 94%
rename from modules/beast_core/text/beast_NewLine.h
rename to beast/strings/NewLine.h
index d5cf0fae39..23dfb0c058 100644
--- a/modules/beast_core/text/beast_NewLine.h
+++ b/beast/strings/NewLine.h
@@ -21,9 +21,14 @@
 */
 //==============================================================================
 
-#ifndef BEAST_NEWLINE_H_INCLUDED
-#define BEAST_NEWLINE_H_INCLUDED
+#ifndef BEAST_STRINGS_NEWLINE_H_INCLUDED
+#define BEAST_STRINGS_NEWLINE_H_INCLUDED
 
+#include "../Config.h"
+
+#include "String.h"
+
+namespace beast {
 
 //==============================================================================
 /** This class is used for represent a new-line character sequence.
@@ -69,5 +74,7 @@ extern NewLine newLine;
 */
 BEAST_API String& BEAST_CALLTYPE operator<< (String& string1, const NewLine&);
 
+}
+
+#endif
 
-#endif   // BEAST_NEWLINE_H_INCLUDED
diff --git a/modules/beast_core/text/beast_String.h b/beast/strings/String.h
similarity index 98%
rename from modules/beast_core/text/beast_String.h
rename to beast/strings/String.h
index cda3173fee..03d26ca77c 100644
--- a/modules/beast_core/text/beast_String.h
+++ b/beast/strings/String.h
@@ -21,8 +21,40 @@
 */
 //==============================================================================
 
-#ifndef BEAST_STRING_H_INCLUDED
-#define BEAST_STRING_H_INCLUDED
+#ifndef BEAST_STRINGS_STRING_H_INCLUDED
+#define BEAST_STRINGS_STRING_H_INCLUDED
+
+#include "../Config.h"
+#include "../CStdInt.h"
+#include "../Memory.h"
+
+#include "CharacterFunctions.h"
+#if BEAST_MSVC
+# pragma warning (push)
+# pragma warning (disable: 4514 4996)
+#endif
+#include "CharPointer_UTF8.h"
+#include "CharPointer_UTF16.h"
+#include "CharPointer_UTF32.h"
+#include "CharPointer_ASCII.h"
+#if BEAST_MSVC
+# pragma warning (pop)
+#endif
+#include "StringCharPointerType.h"
+#include "StringFromNumber.h"
+#include "String.h"
+
+#include <ostream>
+
+namespace beast {
+
+#if BEAST_NATIVE_WCHAR_IS_UTF8
+ typedef CharPointer_UTF8          CharPointer_wchar_t;
+#elif BEAST_NATIVE_WCHAR_IS_UTF16
+ typedef CharPointer_UTF16         CharPointer_wchar_t;
+#else
+ typedef CharPointer_UTF32         CharPointer_wchar_t;
+#endif
 
 //==============================================================================
 /**
@@ -1348,8 +1380,7 @@ std::basic_ostream <wchar_t, traits>& BEAST_CALLTYPE operator<< (std::basic_ostr
     return stream << stringToWrite.toWideCharPointer();
 }
 
-/** Writes a string to an OutputStream as UTF8. */
-BEAST_API OutputStream& BEAST_CALLTYPE operator<< (OutputStream& stream, const String& stringToWrite);
+}
 
+#endif
 
-#endif   // BEAST_STRING_H_INCLUDED
diff --git a/modules/beast_core/text/StringCharPointerType.h b/beast/strings/StringCharPointerType.h
similarity index 90%
rename from modules/beast_core/text/StringCharPointerType.h
rename to beast/strings/StringCharPointerType.h
index 37e82b7b25..ef2de5ec32 100644
--- a/modules/beast_core/text/StringCharPointerType.h
+++ b/beast/strings/StringCharPointerType.h
@@ -21,8 +21,15 @@
 */
 //==============================================================================
 
-#ifndef BEAST_STRINGCHARPOINTERTYPE_H_INCLUDED
-#define BEAST_STRINGCHARPOINTERTYPE_H_INCLUDED
+#ifndef BEAST_STRINGS_STRINGCHARPOINTERTYPE_H_INCLUDED
+#define BEAST_STRINGS_STRINGCHARPOINTERTYPE_H_INCLUDED
+
+#include "../Config.h"
+#include "CharPointer_UTF8.h"
+#include "CharPointer_UTF16.h"
+#include "CharPointer_UTF32.h"
+
+namespace beast {
 
 /** This is the character encoding type used internally to store the string.
 
@@ -50,5 +57,7 @@ typedef CharPointer_UTF8  StringCharPointerType;
 
 #endif
 
+}
+
 #endif
 
diff --git a/modules/beast_core/text/StringFromNumber.h b/beast/strings/StringFromNumber.h
similarity index 94%
rename from modules/beast_core/text/StringFromNumber.h
rename to beast/strings/StringFromNumber.h
index b5f58fca81..3534f27b02 100644
--- a/modules/beast_core/text/StringFromNumber.h
+++ b/beast/strings/StringFromNumber.h
@@ -21,10 +21,21 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CORE_STRINGFROMNUMBER_H_INCLUDED
-#define BEAST_CORE_STRINGFROMNUMBER_H_INCLUDED
+#ifndef BEAST_STRINGS_STRINGFROMNUMBER_H_INCLUDED
+#define BEAST_STRINGS_STRINGFROMNUMBER_H_INCLUDED
 
-// This is private!
+#include "../Config.h"
+#include "../Arithmetic.h"
+
+#include "StringCharPointerType.h"
+
+#include <limits>
+#include <ostream>
+#include <streambuf>
+
+namespace beast {
+
+// VFALCO TODO Put this in namespace detail
 //
 class NumberToStringConverters
 {
@@ -156,4 +167,6 @@ public:
     }
 };
 
+}
+
 #endif
diff --git a/beast/strings/Strings.cpp b/beast/strings/Strings.cpp
new file mode 100644
index 0000000000..d76435f800
--- /dev/null
+++ b/beast/strings/Strings.cpp
@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "impl/CharacterFunctions.cpp"
+#include "impl/String.cpp"
diff --git a/modules/beast_core/text/beast_CharacterFunctions.cpp b/beast/strings/impl/CharacterFunctions.cpp
similarity index 97%
rename from modules/beast_core/text/beast_CharacterFunctions.cpp
rename to beast/strings/impl/CharacterFunctions.cpp
index 0f70a0a9b8..6158f70ae9 100644
--- a/modules/beast_core/text/beast_CharacterFunctions.cpp
+++ b/beast/strings/impl/CharacterFunctions.cpp
@@ -21,7 +21,13 @@
 */
 //==============================================================================
 
-//==============================================================================
+#include "../CharacterFunctions.h"
+
+#include <cctype>
+#include <cwctype>
+
+namespace beast {
+
 #if BEAST_MSVC
  #pragma warning (push)
  #pragma warning (disable: 4514 4996)
@@ -147,3 +153,5 @@ double CharacterFunctions::mulexp10 (const double value, int exponent) noexcept
 
     return negative ? (value / result) : (value * result);
 }
+
+}
diff --git a/modules/beast_core/text/beast_String.cpp b/beast/strings/impl/String.cpp
similarity index 98%
rename from modules/beast_core/text/beast_String.cpp
rename to beast/strings/impl/String.cpp
index 5b667b14f5..5f281dcaa9 100644
--- a/modules/beast_core/text/beast_String.cpp
+++ b/beast/strings/impl/String.cpp
@@ -21,6 +21,21 @@
 */
 //==============================================================================
 
+#include <stdarg.h>
+
+#include "../String.h"
+#include "../NewLine.h"
+
+#include "../../ByteOrder.h"
+#include "../../Memory.h"
+#include "../../StaticAssert.h"
+#include "../../Arithmetic.h"
+#include "../../HeapBlock.h"
+
+#include "../../../modules/beast_core/beast_core.h" // for UnitTest
+
+namespace beast {
+
 #if BEAST_MSVC
  #pragma warning (push)
  #pragma warning (disable: 4514 4996)
@@ -32,14 +47,6 @@ NewLine newLine;
  #error "BEAST_STRINGS_ARE_UNICODE is deprecated! All strings are now unicode by default."
 #endif
 
-#if BEAST_NATIVE_WCHAR_IS_UTF8
- typedef CharPointer_UTF8          CharPointer_wchar_t;
-#elif BEAST_NATIVE_WCHAR_IS_UTF16
- typedef CharPointer_UTF16         CharPointer_wchar_t;
-#else
- typedef CharPointer_UTF32         CharPointer_wchar_t;
-#endif
-
 static inline CharPointer_wchar_t castToCharPointer_wchar_t (const void* t) noexcept
 {
     return CharPointer_wchar_t (static_cast <const CharPointer_wchar_t::CharType*> (t));
@@ -632,23 +639,6 @@ BEAST_API String& BEAST_CALLTYPE operator<< (String& s1, const int64 number)
 BEAST_API String& BEAST_CALLTYPE operator<< (String& s1, const float number)        { return s1 += String (number); }
 BEAST_API String& BEAST_CALLTYPE operator<< (String& s1, const double number)       { return s1 += String (number); }
 
-BEAST_API OutputStream& BEAST_CALLTYPE operator<< (OutputStream& stream, const String& text)
-{
-    const size_t numBytes = text.getNumBytesAsUTF8();
-
-   #if (BEAST_STRING_UTF_TYPE == 8)
-    stream.write (text.getCharPointer().getAddress(), numBytes);
-   #else
-    // (This avoids using toUTF8() to prevent the memory bloat that it would leave behind
-    // if lots of large, persistent strings were to be written to streams).
-    HeapBlock<char> temp (numBytes + 1);
-    CharPointer_UTF8 (temp).writeAll (text.getCharPointer());
-    stream.write (temp, numBytes);
-   #endif
-
-    return stream;
-}
-
 BEAST_API String& BEAST_CALLTYPE operator<< (String& string1, const NewLine&)
 {
     return string1 += NewLine::getDefault();
@@ -1973,6 +1963,8 @@ String String::fromUTF8 (const char* const buffer, int bufferSizeBytes)
 //==============================================================================
 //==============================================================================
 
+#ifdef BEAST_UNITTEST_H_INCLUDED
+
 class StringTests  : public UnitTest
 {
 public:
@@ -2326,3 +2318,6 @@ public:
 
 static StringTests stringUnitTests;
 
+#endif
+
+}
diff --git a/beast/threads/LockGuard.h b/beast/threads/LockGuard.h
new file mode 100644
index 0000000000..a90895ae05
--- /dev/null
+++ b/beast/threads/LockGuard.h
@@ -0,0 +1,50 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_THREADS_LOCKGUARD_H_INCLUDED
+#define BEAST_THREADS_LOCKGUARD_H_INCLUDED
+
+#include "../Uncopyable.h"
+
+namespace beast {
+
+template <typename Mutex>
+class LockGuard : public Uncopyable
+{
+public:
+    typedef Mutex MutexType;
+
+    explicit LockGuard (Mutex const& mutex)
+        : m_mutex (mutex)
+    {
+        m_mutex.lock();
+    }
+
+    ~LockGuard ()
+    {
+        m_mutex.unlock();
+    }
+
+private:
+    Mutex const& m_mutex;
+};
+
+}
+
+#endif
diff --git a/beast/threads/RecursiveMutex.h b/beast/threads/RecursiveMutex.h
new file mode 100644
index 0000000000..15a2330589
--- /dev/null
+++ b/beast/threads/RecursiveMutex.h
@@ -0,0 +1,84 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_THREADS_RECURSIVEMUTEX_H_INCLUDED
+#define BEAST_THREADS_RECURSIVEMUTEX_H_INCLUDED
+
+#include "../Config.h"
+#include "LockGuard.h"
+#include "UnlockGuard.h"
+#include "TryLockGuard.h"
+
+#if ! BEAST_WINDOWS
+#include <pthread.h>
+#endif
+
+namespace beast {
+
+class RecursiveMutex
+{
+public:
+    typedef LockGuard <RecursiveMutex>      ScopedLockType;
+    typedef UnlockGuard <RecursiveMutex>    ScopedUnlockType;
+    typedef TryLockGuard <RecursiveMutex>   ScopedTryLockType;
+
+    /** Create the mutex.
+        The mutux is initially unowned.
+    */
+    RecursiveMutex ();
+
+    /** Destroy the mutex.
+        If the lock is owned, the result is undefined.
+    */
+    ~RecursiveMutex ();
+
+    // Boost concept compatibility:
+    // http://www.boost.org/doc/libs/1_54_0/doc/html/thread/synchronization.html#thread.synchronization.mutex_concepts
+
+    /** BasicLockable */
+    /** @{ */
+    void lock () const;
+    void unlock () const;
+    /** @} */
+
+    /** Lockable */
+    bool try_lock () const;
+
+private:
+// To avoid including windows.h in the public Beast headers, we'll just
+// reserve storage here that's big enough to be used internally as a windows
+// CRITICAL_SECTION structure.
+#if BEAST_WINDOWS
+# if BEAST_64BIT
+    char section[44];
+# else
+    char section[24];
+# endif
+#else
+    mutable pthread_mutex_t mutex;
+#endif
+};
+
+}
+
+#endif
diff --git a/beast/threads/ScopedWrapperContext.h b/beast/threads/ScopedWrapperContext.h
new file mode 100644
index 0000000000..6a0b88324e
--- /dev/null
+++ b/beast/threads/ScopedWrapperContext.h
@@ -0,0 +1,93 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_THREADS_WRAPSCOPED_H_INCLUDED
+#define BEAST_THREADS_WRAPSCOPED_H_INCLUDED
+
+namespace beast {
+
+/** Wraps a function object so invocation happens during a scoped container lifetime. */
+/** @{ */
+namespace detail {
+
+template <typename ScopedType, typename Context, typename Handler>
+class ScopedWrapper
+{
+public:
+    ScopedWrapper (Context const& context, Handler const& handler)
+        : m_context (context)
+        , m_handler (handler)
+        { }
+
+    void operator() ()
+    {
+        ScopedType const scope (m_context);
+        m_handler();
+    }
+
+private:
+    Context const& m_context;
+    Handler m_handler;
+};
+
+}
+
+//------------------------------------------------------------------------------
+
+/** Helper to eliminate the template argument at call sites. */
+template <typename Context, typename ScopedType>
+class ScopedWrapperContext
+{
+public:
+    typedef Context             context_type;
+    typedef ScopedType          scoped_type;
+
+    class Scope
+    {
+    public:
+        explicit Scope (ScopedWrapperContext const& owner)
+            : m_scope (owner.m_context)
+            { }
+    private:
+        scoped_type m_scope;
+    };
+
+    ScopedWrapperContext ()
+        { }
+
+    template <typename Arg>
+    explicit ScopedWrapperContext (Arg& arg)
+        : m_context (arg)
+        { }
+
+    template <typename Handler>
+    detail::ScopedWrapper <ScopedType, Context, Handler> wrap (
+        Handler const& handler)
+    {
+        return detail::ScopedWrapper <ScopedType, Context, Handler> (
+            m_context, handler);
+    }
+
+private:
+    Context m_context;
+};
+
+}
+
+#endif
diff --git a/beast/threads/ServiceQueue.h b/beast/threads/ServiceQueue.h
new file mode 100644
index 0000000000..2de4e44e04
--- /dev/null
+++ b/beast/threads/ServiceQueue.h
@@ -0,0 +1,631 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_THREADS_SERVICEQUEUE_H_INCLUDED
+#define BEAST_THREADS_SERVICEQUEUE_H_INCLUDED
+
+#include "../chrono/CPUMeter.h"
+#include "../intrusive/List.h"
+#include "../intrusive/LockFreeStack.h"
+#include "SharedData.h"
+#include "ThreadLocalValue.h"
+#include "WaitableEvent.h"
+
+#include "detail/DispatchedHandler.h"
+
+namespace beast {
+
+namespace detail {
+
+//------------------------------------------------------------------------------
+
+// VFALCO NOTE This allocator is a work in progress
+
+#if 0
+
+class ServiceQueueAllocatorArena : public SharedObject
+{
+public:
+    typedef std::size_t size_type;
+
+    class Page : public LockFreeStack <Page>::Node
+    {
+    public:
+        size_type const m_pageBytes;
+        Atomic <int> m_refs;
+        char* m_pos;
+        bool m_full;
+        size_type m_count;
+
+        static std::size_t overhead()
+            { return sizeof (Page); }
+        
+        static std::size_t pointer_overhead()
+            { return sizeof (Page*); }
+
+        // pageBytes doesn't include the Page structure
+        explicit Page (size_type pageBytes)
+            : m_pageBytes (pageBytes)
+            , m_pos (begin())
+            , m_full (false)
+            , m_count (0)
+        {
+        }
+
+        ~Page ()
+        {
+            // This means someone forgot to deallocate something
+            bassert (!m_full && m_refs.get() == 0);
+        }
+
+        static Page* create (size_type pageBytes)
+        {
+            return new (new uint8[pageBytes + overhead()]) Page (pageBytes);
+        }
+
+        static void destroy (Page* page)
+        {
+            page->~Page();
+            delete[] ((uint8*)page);
+        }
+
+        void reset ()
+        {
+            m_refs.set (0);
+            m_pos = begin();
+            m_full = false;
+            m_count = 0;
+        }
+
+        bool full() const
+        {
+            return m_full;
+        }
+
+        void* allocate (size_type n)
+        {
+            size_type const needed (n + pointer_overhead());
+            char* pos = m_pos + needed;
+            if (pos > end())
+            {
+                m_full = true;
+                return nullptr;
+            }
+            ++m_refs;
+            void* p (m_pos + pointer_overhead());
+            get_page(p) = this;
+            m_pos = pos;
+            ++m_count;
+            return p;
+        }
+
+        char* begin() const
+        {
+            return const_cast <char*> (
+                reinterpret_cast <char const*> (this) + overhead());
+        }
+
+        char const* end() const
+        {
+            return begin() + m_pageBytes;
+        }
+
+        // Returns true if the page can be recycled
+        bool deallocate (void* p, size_type)
+        {
+            bool const unused ((--m_refs) == 0);
+            return unused && m_full;
+        }
+
+        // Returns a reference to the per-allocation overhead area
+        static Page*& get_page (void* p)
+        {
+            return *reinterpret_cast <Page**>(
+                static_cast <char*>(p) - pointer_overhead());
+        }
+    };
+
+    struct State
+    {
+        State()
+        {
+        }
+
+        ~State()
+        {
+            // If this goes off, someone forgot to call deallocate!
+            bassert (full.get() == 0);
+
+            destroy (active);
+            destroy (recycle);
+        }
+
+        void destroy (LockFreeStack <Page>& stack)
+        {
+            for(;;)
+            {
+                Page* const page (stack.pop_front());
+                if (page == nullptr)
+                    break;
+                Page::destroy (page);
+            }
+        }
+
+        Atomic <int> full;
+        Atomic <int> page_count;
+        LockFreeStack <Page> active;
+        LockFreeStack <Page> recycle;
+    };
+
+    typedef SharedData <State> SharedState;
+
+    size_type const m_maxBytes;
+    SharedState m_state;
+
+    explicit ServiceQueueAllocatorArena (size_type maxBytes = 16 * 1024)
+        : m_maxBytes (maxBytes)
+    {
+    }
+
+    ~ServiceQueueAllocatorArena()
+    {
+    }
+
+    void* allocate (size_type n)
+    {
+        SharedState::UnlockedAccess state (m_state);
+
+        // Loop until we satisfy the allocation from an
+        // active page, or we run out of active pages.
+        //
+        for (;;)
+        {
+            // Acquire ownership of an active page
+            // This prevents other threads from seeing it.
+            Page* page (state->active.pop_front());
+            if (page == nullptr)
+                break;
+
+            void* p = page->allocate (n);
+            if (p != nullptr)
+            {
+                // Put the page back so other threads can use it
+                state->active.push_front (page);
+                return p;
+            }
+
+            // Page is full, count it for diagnostics
+            ++state->full;
+        }
+
+        // No active page, get a recycled page or create a new page.
+        //
+        Page* page (state->recycle.pop_front());
+        if (page == nullptr)
+        {
+            page = Page::create (std::max (m_maxBytes, n));
+            ++state->page_count;
+        }
+
+        void* p = page->allocate (n);
+        bassert (p != nullptr);
+        // Throw page into the active list so other threads can use it
+        state->active.push_front (page);
+        return p;
+    }
+
+    void deallocate (void* p, size_type n)
+    {
+        SharedState::UnlockedAccess state (m_state);
+        Page* const page (Page::get_page(p));
+        if (page->deallocate (p, n))
+        {
+            --state->full;
+            page->reset();
+            Page::destroy (page);
+            //state->recycle.push_front (page);
+        }
+    }
+};
+
+//------------------------------------------------------------------------------
+
+template <typename T>
+struct ServiceQueueAllocator
+{
+    typedef T               value_type;
+    typedef T*              pointer;
+    typedef T&              reference;
+    typedef T const*        const_pointer;
+    typedef T const&        const_reference;
+    typedef std::size_t     size_type;
+    typedef std::ptrdiff_t  difference_type;
+
+    ServiceQueueAllocator ()
+        : m_arena (new ServiceQueueAllocatorArena)
+    {
+    }
+
+    ServiceQueueAllocator (ServiceQueueAllocator const& other)
+        : m_arena (other.m_arena)
+    {
+    }
+
+    template <typename U>
+    ServiceQueueAllocator (ServiceQueueAllocator <U> const& other)
+        : m_arena (other.m_arena)
+    {
+    }
+
+    template <typename U>
+    struct rebind
+    {
+        typedef ServiceQueueAllocator <U> other;
+    };
+
+    pointer address (reference x) const
+    {
+        return &x;
+    }
+
+    const_pointer address (const_reference x) const
+    {
+        return &x;
+    }
+
+    pointer allocate (size_type n,
+        std::allocator<void>::const_pointer = nullptr) const
+    {
+        size_type const bytes (n * sizeof (value_type));
+        pointer const p (static_cast <pointer> (
+            m_arena->allocate (bytes)));
+        return p;
+    }
+
+    void deallocate (pointer p, size_type n) const
+    {
+        size_type const bytes = (n * sizeof (value_type));
+        m_arena->deallocate (p, bytes);
+    }
+
+    size_type max_size () const
+    {
+        return std::numeric_limits <size_type>::max () / sizeof (value_type);
+    }
+
+    void construct (pointer p, const_reference val) const
+    {
+        new ((void *)p) value_type (val);
+    }
+
+    void destroy (pointer p) const
+    {
+        p->~value_type ();
+    }
+
+private:
+    template <typename>
+    friend struct ServiceQueueAllocator;
+
+    SharedPtr <ServiceQueueAllocatorArena> m_arena;
+};
+
+#endif
+
+//------------------------------------------------------------------------------
+
+class ServiceQueueBase
+{
+public:
+    ServiceQueueBase();
+    ~ServiceQueueBase();
+
+    std::size_t poll();
+    std::size_t poll_one();
+    std::size_t run();
+    std::size_t run_one();
+    void stop();
+    bool stopped() const
+        { return m_stopped.get() != 0; }
+    void reset();
+
+protected:
+    class Item;
+    class Waiter;
+    class ScopedServiceThread;
+
+    void wait();
+    void enqueue (Item* item);
+
+    virtual std::size_t dequeue() = 0;
+    virtual Waiter* new_waiter() = 0;
+
+    //--------------------------------------------------------------------------
+
+    class Item : public List <Item>::Node
+    {
+    public:
+        virtual ~Item() { }
+        virtual void operator()() = 0;
+        virtual std::size_t size() const = 0;
+    };
+
+    //--------------------------------------------------------------------------
+
+    class Waiter : public LockFreeStack <Waiter>::Node
+    {
+    public:
+        Waiter()
+            { }
+        void wait()
+            { m_event.wait(); }
+        void signal()
+            { m_event.signal(); }
+    private:
+        WaitableEvent m_event;
+    };
+
+    //--------------------------------------------------------------------------
+
+    struct State
+    {
+        // handlers
+        List <Item> handlers;
+        LockFreeStack <Waiter> waiting;
+        LockFreeStack <Waiter> unused;
+    };
+
+    typedef SharedData <State> SharedState;
+    SharedState m_state;
+    CPUMeter m_cpuMeter;
+    Atomic <int> m_stopped;
+
+    static ThreadLocalValue <ServiceQueueBase*> s_service;
+};
+
+}
+
+//------------------------------------------------------------------------------
+
+/** A queue for disatching function calls on other threads.
+    Handlers are guaranteed to be called only from threads that are currently
+    calling run, run_one, poll, or poll_one.
+*/
+template <class Allocator = std::allocator <char> >
+class ServiceQueueType : public detail::ServiceQueueBase
+{
+private:
+    using ServiceQueueBase::Item;
+    using ServiceQueueBase::Waiter;
+
+    template <typename Handler>
+    class ItemType : public Item
+    {
+    public:
+        explicit ItemType (BEAST_MOVE_ARG(Handler) handler)
+            : m_handler (BEAST_MOVE_CAST(Handler)(handler))
+            { }
+        void operator() ()
+            { m_handler(); }
+        std::size_t size() const
+            { return sizeof (*this); }
+    private:
+        Handler m_handler;
+    };
+
+public:
+    typedef Allocator allocator_type; // for std::uses_allocator<>
+
+    explicit ServiceQueueType (int expectedConcurrency = 1,
+        Allocator alloc = Allocator())
+        : m_alloc (alloc)
+    {
+        typename Allocator::template rebind <Waiter>::other a (m_alloc);
+        SharedState::Access state (m_state);
+        while (expectedConcurrency--)
+        {
+            state->unused.push_front (new (a.allocate (1)) Waiter);
+        }
+    }
+
+    ~ServiceQueueType()
+    {
+        SharedState::Access state (m_state);
+
+        // Must be empty
+        //bassert (state->handlers.empty());
+
+        // Cannot destroy while threads are waiting
+        bassert (state->waiting.empty());
+
+        typename Allocator::template rebind <Waiter>::other a (m_alloc);
+        for(;;)
+        {
+            Waiter* const waiter (state->unused.pop_front());
+            if (waiter == nullptr)
+                break;
+            a.destroy (waiter);
+            a.deallocate (waiter, 1);
+        }
+    }
+
+    /** Returns the percentage of time the queue is using the CPU. */
+    double getUtilizaton () const
+        { return m_cpuMeter.getUtilizaton(); }
+
+    /** Returns the allocator associated with the container. */
+    allocator_type get_allocator() const
+    {
+        return m_alloc;
+    }
+
+    /** Returns `true` if the current thread is processing events.
+        If the current thread of execution is inside a call to run,
+        run_one, poll, or poll_one, this function returns `true`.
+    */
+    bool is_service_thread() const
+        { return s_service.get() == this; }
+
+    /** Run the handler on a service thread.
+        If the current thread of execution is a service thread then this
+        function wil dispatch the handler on the caller's thread before
+        returning.       
+        The function signature of the handler must be:
+        @code
+            void handler(); 
+        @endcode
+    */
+    template <typename Handler>
+    void dispatch (BEAST_MOVE_ARG(Handler) handler)
+    {
+        if (is_service_thread())
+        {
+            handler();
+        }
+        else
+        {
+            typename Allocator::template rebind <ItemType <Handler> >::other a (m_alloc);
+            enqueue (new (a.allocate (1))
+                ItemType <Handler> (BEAST_MOVE_CAST(Handler)(handler)));
+        }
+    }
+
+    /** Request the handler to run on a service thread.
+        This returns immediately, even if the current thread of execution is
+        a service thread.
+        The function signature of the handler must be:
+        @code
+            void handler(); 
+        @endcode
+    */
+    template <typename Handler>
+    void post (BEAST_MOVE_ARG(Handler) handler)
+    {
+        typename Allocator::template rebind <ItemType <Handler> >::other a (m_alloc);
+        enqueue (new (a.allocate (1))
+            ItemType <Handler> (BEAST_MOVE_CAST(Handler)(handler)));
+    }
+
+    /** Return a new handler that dispatches the wrapped handler on the queue. */
+    template <typename Handler>
+    detail::DispatchedHandler <ServiceQueueType&, Handler> wrap (
+        BEAST_MOVE_ARG(Handler) handler)
+    {
+        return detail::DispatchedHandler <ServiceQueueType&, Handler> (
+            *this, BEAST_MOVE_CAST(Handler)(handler));
+    }
+
+    /** Run the event loop to execute ready handlers.
+        This runs handlers that are ready to run, without blocking, until
+        there are no more handlers ready or the service queue has been stopped.
+        @return The number of handlers that were executed.
+    */
+    std::size_t poll ()
+        { return ServiceQueueBase::poll(); }
+
+    /** Run the event loop to execute at most one ready handler.
+        This will run zero or one handlers, without blocking, depending on
+        whether or not there is handler immediately ready to run.
+        @return The number of handlers that were executed.
+    */
+    std::size_t poll_one ()
+        { return ServiceQueueBase::poll_one(); }
+
+    /** Runs the queue's processing loop.
+        The current thread of execution becomes a service thread. This call
+        blocks until there is no more work remaining.
+        @return The number of handlers that were executed.
+    */
+    std::size_t run ()
+        { return ServiceQueueBase::run(); }
+
+    /** Runs the queue's processing loop to execute at most one handler.
+        @return The number of handlers that were executed.
+    */
+    std::size_t run_one ()
+        { return ServiceQueueBase::run_one(); }
+
+    /** Stop the queue's processing loop.
+        All threads executing run or run_one will return as soon as possible.
+        Future calls to run, run_one, poll, or poll_one will return immediately
+        until reset is called.
+        @see reset
+    */
+    void stop()
+        { return ServiceQueueBase::stop(); }
+
+    /** Returns `true` if the queue has been stopped.
+        When a queue is stopped, calls to run, run_one, poll, or poll_one will
+        return immediately without invoking any handlers.
+    */
+    bool stopped() const
+        { return ServiceQueueBase::stopped(); }
+
+    /** Reset the queue after a stop.
+        This allows the event loop to be restarted. This may not be called while
+        there are any threads currently executing the run, run_one, poll, or
+        poll_one functions, or undefined behavior will result.
+    */
+    void reset()
+        { return ServiceQueueBase::reset(); }
+
+private:
+    // Dispatch a single queued handler if possible.
+    // Returns the number of handlers dispatched (0 or 1)
+    //
+    std::size_t dequeue ()
+    {
+        if (stopped())
+            return 0;
+
+        Item* item (nullptr);
+
+        {
+            SharedState::Access state (m_state);
+            if (state->handlers.empty())
+                return 0;
+            item = &state->handlers.front();
+            state->handlers.erase (
+                state->handlers.iterator_to (*item));
+        }
+
+        (*item)();
+
+        typename Allocator::template rebind <uint8>::other a (m_alloc);
+        std::size_t const size (item->size());
+        item->~Item();
+        a.deallocate (reinterpret_cast<uint8*>(item), size);
+        return 1;
+    }
+
+    // Create a new Waiter
+    Waiter* new_waiter()
+    {
+        typename Allocator::template rebind <Waiter>::other a (m_alloc);
+        return new (a.allocate (1)) Waiter;
+    }
+
+    Allocator m_alloc;
+};
+
+typedef ServiceQueueType <std::allocator <char> > ServiceQueue;
+
+}
+
+#endif
diff --git a/beast/threads/SharedData.h b/beast/threads/SharedData.h
new file mode 100644
index 0000000000..62e1defe72
--- /dev/null
+++ b/beast/threads/SharedData.h
@@ -0,0 +1,272 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_THREADS_SHAREDDATA_H_INCLUDED
+#define BEAST_THREADS_SHAREDDATA_H_INCLUDED
+
+#include "RecursiveMutex.h"
+#include "SharedMutexAdapter.h"
+
+namespace beast {
+
+/** Structured, multi-threaded access to a shared state.
+
+    This container combines locking semantics with data access semantics to
+    create an alternative to the typical synchronization method of first
+    acquiring a lock and then accessing data members.
+
+    With this container, access to the underlying data is only possible after
+    first acquiring a lock. The steps of acquiring the lock and obtaining
+    a const or non-const reference to the data are combined into one
+    RAII style operation.
+
+    There are three types of access:
+
+    - Access
+        Provides access to the shared state via a non-const reference or pointer.
+        Access acquires a unique lock on the mutex associated with the
+        container.
+
+    - ConstAccess
+        Provides access to the shared state via a const reference or pointer.
+        ConstAccess acquires a shared lock on the mutex associated with the
+        container.
+
+    - ConstUnlockedAccess
+        Provides access to the shared state via a const reference or pointer.
+        No locking is performed. It is the callers responsibility to ensure that
+        the operation is synchronized. This can be useful for diagnostics or
+        assertions, or for when it is known that no other threads can access
+        the data.
+
+    - UnlockedAccess
+        Provides access to the shared state via a reference or pointer.
+        No locking is performed. It is the callers responsibility to ensure that
+        the operation is synchronized. This can be useful for diagnostics or
+        assertions, or for when it is known that no other threads can access
+        the data.
+
+    Usage example:
+
+    @code
+
+    struct State
+    {
+        int value1;
+        String value2;
+    };
+
+    typedef SharedData <State> SharedState;
+
+    SharedState m_state;
+
+    void readExample ()
+    {
+        SharedState::ConstAccess state (m_state);
+
+        print (state->value1);   // read access
+        print (state->value2);   // read access
+
+        state->value1 = 42;      // write disallowed: compile error
+    }
+
+    void writeExample ()
+    {
+        SharedState::Access state (m_state);
+
+        state->value2 = "Label"; // write access, allowed
+    }
+
+    @endcode
+
+    Requirements for Value:
+        Constructible
+        Destructible
+
+    Requirements for SharedMutexType:
+        X is SharedMutexType, a is an instance of X:
+        X a;                    DefaultConstructible
+        X::LockGuardType        Names a type that implements the LockGuard concept.
+        X::SharedLockGuardType  Names a type that implements the SharedLockGuard concept.
+
+    @tparam Value The type which the container holds.
+    @tparam SharedMutexType The type of shared mutex to use.
+*/
+template <typename Value, class SharedMutexType =
+    SharedMutexAdapter <RecursiveMutex> >
+class SharedData : public Uncopyable
+{
+private:
+    typedef typename SharedMutexType::LockGuardType LockGuardType;
+    typedef typename SharedMutexType::SharedLockGuardType SharedLockGuardType;
+
+public:
+    typedef Value ValueType;
+
+    class Access;
+    class ConstAccess;
+    class UnlockedAccess;
+    class ConstUnlockedAccess;
+
+    /** Create a shared data container.
+        Up to 8 parameters can be specified in the constructor. These parameters
+        are forwarded to the corresponding constructor in Data. If no
+        constructor in Data matches the parameter list, a compile error is
+        generated.
+    */
+    /** @{ */
+    SharedData () { }
+
+    template <class T1>
+    explicit SharedData (T1 t1)
+        : m_value (t1) { }
+
+    template <class T1, class T2>
+    SharedData (T1 t1, T2 t2)
+        : m_value (t1, t2) { }
+
+    template <class T1, class T2, class T3>
+    SharedData (T1 t1, T2 t2, T3 t3)
+        : m_value (t1, t2, t3) { }
+
+    template <class T1, class T2, class T3, class T4>
+    SharedData (T1 t1, T2 t2, T3 t3, T4 t4)
+        : m_value (t1, t2, t3, t4) { }
+
+    template <class T1, class T2, class T3, class T4, class T5>
+    SharedData (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
+        : m_value (t1, t2, t3, t4, t5) { }
+
+    template <class T1, class T2, class T3, class T4, class T5, class T6>
+    SharedData (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
+        : m_value (t1, t2, t3, t4, t5, t6) { }
+
+    template <class T1, class T2, class T3, class T4, class T5, class T6, class T7>
+    SharedData (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) : m_value (t1, t2, t3, t4, t5, t6, t7) { }
+
+    template <class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
+    SharedData (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
+        : m_value (t1, t2, t3, t4, t5, t6, t7, t8) { }
+    /** @} */
+
+private:
+    Value m_value;
+    SharedMutexType m_mutex;
+};
+
+//------------------------------------------------------------------------------
+
+/** Provides non-const access to the contents of a SharedData.
+    This acquires a unique lock on the underlying mutex.
+*/
+template <class Data, class SharedMutexType>
+class SharedData <Data, SharedMutexType>::Access : public Uncopyable
+{
+public:
+    explicit Access (SharedData& state)
+        : m_state (state)
+        , m_lock (m_state.m_mutex)
+        { }
+
+    Data const& get () const { return m_state.m_value; }
+    Data const& operator* () const { return get (); }
+    Data const* operator-> () const { return &get (); }
+    Data& get () { return m_state.m_value; }
+    Data& operator* () { return get (); }
+    Data* operator-> () { return &get (); }
+
+private:
+    SharedData& m_state;
+    typename SharedData::LockGuardType m_lock;
+};
+
+//------------------------------------------------------------------------------
+
+/** Provides const access to the contents of a SharedData.
+    This acquires a shared lock on the underlying mutex.
+*/
+template <class Data, class SharedMutexType>
+class SharedData <Data, SharedMutexType>::ConstAccess : public Uncopyable
+{
+public:
+    /** Create a ConstAccess from the specified SharedData */
+    explicit ConstAccess (SharedData const volatile& state)
+        : m_state (const_cast <SharedData const&> (state))
+        , m_lock (m_state.m_mutex)
+        { }
+
+    Data const& get () const { return m_state.m_value; }
+    Data const& operator* () const { return get (); }
+    Data const* operator-> () const { return &get (); }
+
+private:
+    SharedData const& m_state;
+    typename SharedData::SharedLockGuardType m_lock;
+};
+
+//------------------------------------------------------------------------------
+
+/** Provides const access to the contents of a SharedData.
+    This acquires a shared lock on the underlying mutex.
+*/
+template <class Data, class SharedMutexType>
+class SharedData <Data, SharedMutexType>::ConstUnlockedAccess : public Uncopyable
+{
+public:
+    /** Create an UnlockedAccess from the specified SharedData */
+    explicit ConstUnlockedAccess (SharedData const volatile& state)
+        : m_state (const_cast <SharedData const&> (state))
+        { }
+
+    Data const& get () const { return m_state.m_value; }
+    Data const& operator* () const { return get (); }
+    Data const* operator-> () const { return &get (); }
+
+private:
+    SharedData const& m_state;
+};
+
+//------------------------------------------------------------------------------
+
+/** Provides access to the contents of a SharedData.
+    This acquires a shared lock on the underlying mutex.
+*/
+template <class Data, class SharedMutexType>
+class SharedData <Data, SharedMutexType>::UnlockedAccess : public Uncopyable
+{
+public:
+    /** Create an UnlockedAccess from the specified SharedData */
+    explicit UnlockedAccess (SharedData& state)
+        : m_state (state)
+        { }
+
+    Data const& get () const { return m_state.m_value; }
+    Data const& operator* () const { return get (); }
+    Data const* operator-> () const { return &get (); }
+    Data& get () { return m_state.m_value; }
+    Data& operator* () { return get (); }
+    Data* operator-> () { return &get (); }
+
+private:
+    SharedData& m_state;
+};
+
+}
+
+#endif
diff --git a/beast/threads/SharedLockGuard.h b/beast/threads/SharedLockGuard.h
new file mode 100644
index 0000000000..82fdbd0812
--- /dev/null
+++ b/beast/threads/SharedLockGuard.h
@@ -0,0 +1,52 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_THREADS_SHAREDLOCKGUARD_H_INCLUDED
+#define BEAST_THREADS_SHAREDLOCKGUARD_H_INCLUDED
+
+#include "../Uncopyable.h"
+
+namespace beast
+{
+
+/** A scoped container that acquires a shared lock. */   
+template <typename Mutex>
+class SharedLockGuard : public Uncopyable
+{
+public:
+    typedef Mutex MutexType;
+
+    explicit SharedLockGuard (Mutex const& mutex)
+        : m_mutex (mutex)
+    {
+        m_mutex.lock_shared();
+    }
+
+    ~SharedLockGuard ()
+    {
+        m_mutex.unlock_shared();
+    }
+
+private:
+    Mutex const& m_mutex;
+};
+
+}
+
+#endif
diff --git a/modules/beast_core/memory/beast_GlobalFifoFreeStore.h b/beast/threads/SharedMutexAdapter.h
similarity index 56%
rename from modules/beast_core/memory/beast_GlobalFifoFreeStore.h
rename to beast/threads/SharedMutexAdapter.h
index 1c43cc15e7..cb28ea51ab 100644
--- a/modules/beast_core/memory/beast_GlobalFifoFreeStore.h
+++ b/beast/threads/SharedMutexAdapter.h
@@ -17,47 +17,51 @@
 */
 //==============================================================================
 
-#ifndef BEAST_GLOBALFIFOFREESTORE_H_INCLUDED
-#define BEAST_GLOBALFIFOFREESTORE_H_INCLUDED
+#ifndef BEAST_THREADS_SHAREDMUTEXADAPTER_H_INCLUDED
+#define BEAST_THREADS_SHAREDMUTEXADAPTER_H_INCLUDED
 
-/*============================================================================*/
-/**
-  A @ref FifoFreeStoreType singleton.
+#include "LockGuard.h"
+#include "SharedLockGuard.h"
 
-  @ingroup beast_concurrent
+namespace beast {
+   
+/** Adapts a regular Lockable to conform to the SharedMutex concept.
+    Shared locks become unique locks with this interface. Two threads may not
+    simultaneously acquire ownership of the lock. Typically the Mutex template
+    parameter will be a CriticalSection.
 */
-template <class Tag>
-class GlobalFifoFreeStore : public SharedSingleton <GlobalFifoFreeStore <Tag> >
+template <class Mutex>
+class SharedMutexAdapter
 {
 public:
-    inline void* allocate (size_t bytes)
+    typedef Mutex MutexType;
+    typedef LockGuard <SharedMutexAdapter> LockGuardType;
+    typedef SharedLockGuard <SharedMutexAdapter> SharedLockGuardType;
+    
+    void lock() const
     {
-        return m_allocator.allocate (bytes);
+        m_mutex.lock();
     }
 
-    static inline void deallocate (void* const p)
+    void unlock() const
     {
-        FifoFreeStoreType::deallocate (p);
+        m_mutex.unlock();
     }
 
-    static GlobalFifoFreeStore* createInstance ()
+    void lock_shared() const
     {
-        return new GlobalFifoFreeStore;
+        m_mutex.lock();
     }
 
-public:
-    GlobalFifoFreeStore ()
-        : SharedSingleton <GlobalFifoFreeStore <Tag> >
-        (SingletonLifetime::persistAfterCreation)
-    {
-    }
-
-    ~GlobalFifoFreeStore ()
+    void unlock_shared() const
     {
+        m_mutex.unlock();
     }
 
 private:
-    FifoFreeStoreType m_allocator;
+    Mutex mutable m_mutex;
 };
 
+}
+
 #endif
diff --git a/modules/beast_core/threads/beast_SpinLock.h b/beast/threads/SpinLock.h
similarity index 82%
rename from modules/beast_core/threads/beast_SpinLock.h
rename to beast/threads/SpinLock.h
index 87b9c2abd2..cbc6e0e959 100644
--- a/modules/beast_core/threads/beast_SpinLock.h
+++ b/beast/threads/SpinLock.h
@@ -21,8 +21,14 @@
 */
 //==============================================================================
 
-#ifndef BEAST_SPINLOCK_H_INCLUDED
-#define BEAST_SPINLOCK_H_INCLUDED
+#ifndef BEAST_THREADS_SPINLOCK_H_INCLUDED
+#define BEAST_THREADS_SPINLOCK_H_INCLUDED
+
+#include "../Atomic.h"
+#include "LockGuard.h"
+#include "UnlockGuard.h"
+
+namespace beast {
 
 //==============================================================================
 /**
@@ -40,6 +46,12 @@
 class BEAST_API SpinLock : public Uncopyable
 {
 public:
+    /** Provides the type of scoped lock to use for locking a SpinLock. */
+    typedef LockGuard <SpinLock>       ScopedLockType;
+
+    /** Provides the type of scoped unlocker to use with a SpinLock. */
+    typedef UnlockGuard <SpinLock>     ScopedUnlockType;
+
     inline SpinLock() noexcept {}
     inline ~SpinLock() noexcept {}
 
@@ -57,27 +69,29 @@ public:
     /** Attempts to acquire the lock, returning true if this was successful. */
     inline bool tryEnter() const noexcept
     {
-        return lock.compareAndSetBool (1, 0);
+        return m_lock.compareAndSetBool (1, 0);
     }
 
     /** Releases the lock. */
     inline void exit() const noexcept
     {
-        bassert (lock.value == 1); // Agh! Releasing a lock that isn't currently held!
-        lock = 0;
+        bassert (m_lock.value == 1); // Agh! Releasing a lock that isn't currently held!
+        m_lock = 0;
     }
 
-    //==============================================================================
-    /** Provides the type of scoped lock to use for locking a SpinLock. */
-    typedef GenericScopedLock <SpinLock>       ScopedLockType;
-
-    /** Provides the type of scoped unlocker to use with a SpinLock. */
-    typedef GenericScopedUnlock <SpinLock>     ScopedUnlockType;
+    void lock () const
+        { enter(); }
+    void unlock () const
+        { exit(); }
+    bool try_lock () const
+        { return tryEnter(); }
 
 private:
     //==============================================================================
-    mutable Atomic<int> lock;
+    mutable Atomic<int> m_lock;
 };
 
+}
+
+#endif
 
-#endif   // BEAST_SPINLOCK_H_INCLUDED
diff --git a/beast/threads/Stoppable.h b/beast/threads/Stoppable.h
new file mode 100644
index 0000000000..637b078c0f
--- /dev/null
+++ b/beast/threads/Stoppable.h
@@ -0,0 +1,327 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_THREADS_STOPPABLE_H_INCLUDED
+#define BEAST_THREADS_STOPPABLE_H_INCLUDED
+
+#include "../Atomic.h"
+#include "../intrusive/LockFreeStack.h"
+#include "../utility/Journal.h"
+
+#include "WaitableEvent.h"
+
+namespace beast {
+
+class RootStoppable;
+
+/** Provides an interface for starting and stopping.
+
+    A common method of structuring server or peer to peer code is to isolate
+    conceptual portions of functionality into individual classes, aggregated
+    into some larger "application" or "core" object which holds all the parts.
+    Frequently, these components are dependent on each other in unavoidably
+    complex ways. They also often use threads and perform asynchronous i/o
+    operations involving sockets or other operating system objects. The process
+    of starting and stopping such a system can be complex. This interface
+    provides a set of behaviors for ensuring that the start and stop of a
+    composite application-style object is well defined.
+
+    Upon the initialization of the composite object these steps are peformed:
+
+    1.  Construct sub-components.
+
+        These are all typically derived from Stoppable. There can be a deep
+        hierarchy: Stoppable objects may themselves have Stoppable child
+        objects. This captures the relationship of dependencies.
+
+    2.  prepare()
+
+        Because some components may depend on others, preparatory steps require
+        that all objects be first constructed. The prepare step calls all
+        Stoppable objects in the tree starting from the leaves and working up
+        to the root. In this stage we are guaranteed that all objects have been
+        constructed and are in a well-defined state.
+
+    3.  onPrepare()
+
+        This override is called for all Stoppable objects in the hierarchy
+        during the prepare stage. Objects are called from the bottom up.
+        It is guaranteed that all child Stoppable objects have already been
+        prepared when this is called.
+
+    4.  start()
+
+        At this point all sub-components have been constructed and prepared,
+        so it should be safe for them to be started. While some Stoppable
+        objects may do nothing in their start function, others will start
+        threads or call asynchronous i/o initiating functions like timers or
+        sockets.
+
+    5.  onStart()
+
+        This override is called for all Stoppable objects in the hierarchy
+        during the start stage. Objects are called from the bottom up.
+        It is guaranteed that all child Stoppable objects have already been
+        started when this is called.
+
+    This is the sequence of events involved in stopping:
+
+    6.  stopAsync() [optional]
+
+        This notifies the root Stoppable and all its children that a stop is
+        requested.
+
+    7.  stop()
+
+        This first calls stopAsync(), and then blocks on each child Stoppable in
+        the in the tree from the bottom up, until the Stoppable indicates it has
+        stopped. This will usually be called from the main thread of execution
+        when some external signal indicates that the process should stop. For
+        example, an RPC 'stop' command, or a SIGINT POSIX signal.
+
+    8.  onStop()
+
+        This override is called for the root Stoppable and all its children when
+        stopAsync() is called. Derived classes should cancel pending I/O and
+        timers, signal that threads should exit, queue cleanup jobs, and perform
+        any other necessary final actions in preparation for exit.
+
+    9.  onChildrenStopped()
+
+        This override is called when all the children have stopped. This informs
+        the Stoppable that there should not be any more dependents making calls
+        into its member functions. A Stoppable that has no children will still
+        have this function called.
+
+    10. stopped()
+
+        The derived class calls this function to inform the Stoppable API that
+        it has completed the stop. This unblocks the caller of stop().
+
+        For stoppables which are only considered stopped when all of their
+        children have stopped, and their own internal logic indicates a stop, it
+        will be necessary to perform special actions in onChildrenStopped(). The
+        funtion areChildrenStopped() can be used after children have stopped,
+        but before the Stoppable logic itself has stopped, to determine if the
+        stoppable's logic is a true stop.
+        
+        Pseudo code for this process is as follows:
+
+        @code
+
+        // Returns `true` if derived logic has stopped.
+        //
+        // When the logic stops, logicProcessingStop() is no longer called.
+        // If children are still active we need to wait until we get a
+        // notification that the children have stopped.
+        //
+        bool logicHasStopped ();
+
+        // Called when children have stopped
+        void onChildrenStopped ()
+        {
+            // We have stopped when the derived logic stops and children stop.
+            if (logicHasStopped)
+                stopped();
+        }
+
+        // derived-specific logic that executes periodically
+        void logicProcessingStep ()
+        {
+            // process
+            // ...
+
+            // now see if we've stopped
+            if (logicHasStopped() && areChildrenStopped())
+                stopped();
+        }
+
+        @endcode
+
+        Derived class that manage one or more threads should typically notify
+        those threads in onStop that they should exit. In the thread function,
+        when the last thread is about to exit it would call stopped().
+
+    @note A Stoppable may not be restarted.
+*/
+/** @{ */
+class Stoppable
+{
+protected:
+    Stoppable (char const* name, RootStoppable& root);
+
+public:
+    /** Create the Stoppable. */
+    Stoppable (char const* name, Stoppable& parent);
+
+    /** Destroy the Stoppable. */
+    virtual ~Stoppable ();
+
+    /** Returns `true` if the stoppable should stop. */
+    bool isStopping () const;
+
+    /** Returns `true` if the requested stop has completed. */
+    bool isStopped () const;
+
+    /** Returns `true` if all children have stopped. */
+    bool areChildrenStopped () const;
+
+    /** Called by derived classes to indicate that the stoppable has stopped. */
+    void stopped ();
+
+    /** Override called during preparation.
+        Since all other Stoppable objects in the tree have already been
+        constructed, this provides an opportunity to perform initialization which
+        depends on calling into other Stoppable objects.
+        This call is made on the same thread that called prepare().
+        The default implementation does nothing.
+        Guaranteed to only be called once.
+    */
+    virtual void onPrepare ();
+
+    /** Override called during start. */
+    virtual void onStart ();
+
+    /** Override called when the stop notification is issued.
+
+        The call is made on an unspecified, implementation-specific thread.
+        onStop and onChildrenStopped will never be called concurrently, across
+        all Stoppable objects descended from the same root, inclusive of the
+        root.
+
+        It is safe to call isStopping, isStopped, and  areChildrenStopped from
+        within this function; The values returned will always be valid and never
+        change during the callback.
+
+        The default implementation simply calls stopped(). This is applicable
+        when the Stoppable has a trivial stop operation (or no stop operation),
+        and we are merely using the Stoppable API to position it as a dependency
+        of some parent service.
+
+        Thread safety:
+            May not block for long periods.
+            Guaranteed only to be called once.
+            Must be safe to call from any thread at any time.
+    */
+    virtual void onStop ();
+
+    /** Override called when all children have stopped.
+
+        The call is made on an unspecified, implementation-specific thread.
+        onStop and onChildrenStopped will never be called concurrently, across
+        all Stoppable objects descended from the same root, inclusive of the
+        root.
+        
+        It is safe to call isStopping, isStopped, and  areChildrenStopped from
+        within this function; The values returned will always be valid and never
+        change during the callback.
+
+        The default implementation does nothing.
+
+        Thread safety:
+            May not block for long periods.
+            Guaranteed only to be called once.
+            Must be safe to call from any thread at any time.
+    */
+    virtual void onChildrenStopped ();
+
+private:
+    friend class RootStoppable;
+
+    struct Child;
+    typedef LockFreeStack <Child> Children;
+
+    struct Child : Children::Node
+    {
+        Child (Stoppable* stoppable_) : stoppable (stoppable_)
+        {
+        }
+
+        Stoppable* stoppable;
+    };
+
+    void prepareRecursive ();
+    void startRecursive ();
+    void stopAsyncRecursive ();
+    void stopRecursive (Journal journal);
+
+protected:
+    char const* m_name;
+    RootStoppable& m_root;
+    Child m_child;
+    bool volatile m_stopped;
+    bool volatile m_childrenStopped;
+    Children m_children;
+    WaitableEvent m_stoppedEvent;
+};
+
+//------------------------------------------------------------------------------
+
+class RootStoppable : public Stoppable
+{
+public:
+    explicit RootStoppable (char const* name);
+
+    ~RootStoppable ();
+
+    bool isStopping() const;
+
+    /** Prepare all contained Stoppable objects.
+        This calls onPrepare for all Stoppable objects in the tree.
+        Calls made after the first have no effect.
+        Thread safety:
+            May be called from any thread.
+    */
+    void prepare ();
+
+    /** Start all contained Stoppable objects.
+        The default implementation does nothing.
+        Calls made after the first have no effect.
+        Thread safety:
+            May be called from any thread.
+    */
+    void start ();
+
+    /** Notify a root stoppable and children to stop, and block until stopped.
+        Has no effect if the stoppable was already notified.
+        This blocks until the stoppable and all of its children have stopped.
+        Thread safety:
+            Safe to call from any thread not associated with a Stoppable.
+    */
+    void stop (Journal journal = Journal());
+
+    /** Notify a root stoppable and children to stop, without waiting.
+        Has no effect if the stoppable was already notified.
+
+        Thread safety:
+            Safe to call from any thread at any time.
+    */
+    void stopAsync ();
+
+private:
+    Atomic <int> m_prepared;
+    Atomic <int> m_started;
+    Atomic <int> m_calledStop;
+    Atomic <int> m_calledStopAsync;
+};
+/** @} */
+
+}
+
+#endif
diff --git a/modules/beast_core/threads/beast_Thread.h b/beast/threads/Thread.h
similarity index 96%
rename from modules/beast_core/threads/beast_Thread.h
rename to beast/threads/Thread.h
index c1e7de8743..1ea34f7c14 100644
--- a/modules/beast_core/threads/beast_Thread.h
+++ b/beast/threads/Thread.h
@@ -21,8 +21,14 @@
 */
 //==============================================================================
 
-#ifndef BEAST_THREAD_H_INCLUDED
-#define BEAST_THREAD_H_INCLUDED
+#ifndef BEAST_THREADS_THREAD_H_INCLUDED
+#define BEAST_THREADS_THREAD_H_INCLUDED
+
+#include "../utility/LeakChecked.h"
+#include "RecursiveMutex.h"
+#include "WaitableEvent.h"
+
+namespace beast {
 
 //==============================================================================
 /**
@@ -110,6 +116,11 @@ public:
     */
     bool stopThread (int timeOutMilliseconds = -1);
 
+    /** Stop the thread without blocking.
+        This calls signalThreadShouldExit followed by notify.
+    */
+    void stopThreadAsync ();
+
     //==============================================================================
     /** Returns true if the thread is currently active */
     bool isThreadRunning() const;
@@ -260,7 +271,7 @@ private:
     const String threadName;
     void* volatile threadHandle;
     ThreadID threadId;
-    CriticalSection startStopLock;
+    RecursiveMutex startStopLock;
     WaitableEvent startSuspensionEvent, defaultEvent;
     int threadPriority;
     uint32 affinityMask;
@@ -277,4 +288,7 @@ private:
     static bool setThreadPriority (void*, int);
 };
 
-#endif   // BEAST_THREAD_H_INCLUDED
+}
+
+#endif
+
diff --git a/modules/beast_core/threads/beast_ThreadLocalValue.h b/beast/threads/ThreadLocalValue.h
similarity index 97%
rename from modules/beast_core/threads/beast_ThreadLocalValue.h
rename to beast/threads/ThreadLocalValue.h
index af623adbed..751062efe4 100644
--- a/modules/beast_core/threads/beast_ThreadLocalValue.h
+++ b/beast/threads/ThreadLocalValue.h
@@ -21,8 +21,14 @@
 */
 //==============================================================================
 
-#ifndef BEAST_THREADLOCALVALUE_H_INCLUDED
-#define BEAST_THREADLOCALVALUE_H_INCLUDED
+#ifndef BEAST_THREADS_THREADLOCALVALUE_H_INCLUDED
+#define BEAST_THREADS_THREADLOCALVALUE_H_INCLUDED
+
+#include "../Config.h"
+#include "SpinLock.h"
+#include "Thread.h"
+
+namespace beast {
 
 // (NB: on win32, native thread-locals aren't possible in a dynamically loaded DLL in XP).
 #if ! ((BEAST_MSVC && (BEAST_64BIT || ! defined (BeastPlugin_PluginCode))) \
@@ -186,5 +192,6 @@ private:
    #endif
 };
 
+}
 
-#endif   // BEAST_THREADLOCALVALUE_H_INCLUDED
+#endif
diff --git a/beast/threads/Threads.cpp b/beast/threads/Threads.cpp
new file mode 100644
index 0000000000..a941c1e848
--- /dev/null
+++ b/beast/threads/Threads.cpp
@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "impl/Atomic.cpp"
+#include "impl/RecursiveMutex.cpp"
+#include "impl/ServiceQueue.cpp"
+#include "impl/Stoppable.cpp"
+#include "impl/Thread.cpp"
+#include "impl/WaitableEvent.cpp"
diff --git a/beast/threads/TryLockGuard.h b/beast/threads/TryLockGuard.h
new file mode 100644
index 0000000000..f61f8bb6e1
--- /dev/null
+++ b/beast/threads/TryLockGuard.h
@@ -0,0 +1,55 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_THREADS_TRYLOCKGUARD_H_INCLUDED
+#define BEAST_THREADS_TRYLOCKGUARD_H_INCLUDED
+
+#include "../Uncopyable.h"
+
+namespace beast {
+
+template <typename Mutex>
+class TryLockGuard : public Uncopyable
+{
+public:
+    typedef Mutex MutexType;
+
+    explicit TryLockGuard (Mutex const& mutex)
+        : m_mutex (mutex)
+        , m_owns_lock (m_mutex.try_lock())
+    {
+    }
+
+    ~TryLockGuard ()
+    {
+        if (m_owns_lock)
+            m_mutex.unlock();
+    }
+
+    bool owns_lock() const
+        { return m_owns_lock; }
+
+private:
+    Mutex const& m_mutex;
+    bool m_owns_lock;
+};
+
+}
+
+#endif
diff --git a/beast/threads/UnlockGuard.h b/beast/threads/UnlockGuard.h
new file mode 100644
index 0000000000..ea412765f6
--- /dev/null
+++ b/beast/threads/UnlockGuard.h
@@ -0,0 +1,50 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_THREADS_UNLOCKGUARD_H_INCLUDED
+#define BEAST_THREADS_UNLOCKGUARD_H_INCLUDED
+
+#include "../Uncopyable.h"
+
+namespace beast {
+
+template <typename Mutex>
+class UnlockGuard : public Uncopyable
+{
+public:
+    typedef Mutex MutexType;
+
+    explicit UnlockGuard (Mutex const& mutex)
+        : m_mutex (mutex)
+    {
+        m_mutex.unlock();
+    }
+
+    ~UnlockGuard ()
+    {
+        m_mutex.lock();
+    }
+
+private:
+    Mutex const& m_mutex;
+};
+
+}
+
+#endif
diff --git a/modules/beast_core/threads/beast_WaitableEvent.h b/beast/threads/WaitableEvent.h
similarity index 81%
rename from modules/beast_core/threads/beast_WaitableEvent.h
rename to beast/threads/WaitableEvent.h
index 8cbb68c840..1e8b2a2cba 100644
--- a/modules/beast_core/threads/beast_WaitableEvent.h
+++ b/beast/threads/WaitableEvent.h
@@ -21,18 +21,26 @@
 */
 //==============================================================================
 
-#ifndef BEAST_WAITABLEEVENT_H_INCLUDED
-#define BEAST_WAITABLEEVENT_H_INCLUDED
+#ifndef BEAST_THREADS_WAITABLEEVENT_H_INCLUDED
+#define BEAST_THREADS_WAITABLEEVENT_H_INCLUDED
 
-//==============================================================================
-/**
-    Allows threads to wait for events triggered by other threads.
+#include "../Config.h"
+#include "../Uncopyable.h"
 
-    A thread can call wait() on a WaitableObject, and this will suspend the
+#if ! BEAST_WINDOWS
+#include <pthread.h>
+#endif
+
+namespace beast {
+
+/** Allows threads to wait for events triggered by other threads.
+    A thread can call wait() on a WaitableEvent, and this will suspend the
     calling thread until another thread wakes it up by calling the signal()
     method.
 */
-class BEAST_API WaitableEvent : LeakChecked <WaitableEvent>, public Uncopyable
+class WaitableEvent
+    : public Uncopyable
+    //, LeakChecked <WaitableEvent> // VFALCO TODO Move LeakChecked to beast/
 {
 public:
     //==============================================================================
@@ -45,14 +53,14 @@ public:
         @param initiallySignaled If this is true then the event will be signaled when
                                  the constructor returns.
     */
-    explicit WaitableEvent (bool manualReset = false, bool initiallySignaled = false) noexcept;
+    explicit WaitableEvent (bool manualReset = false, bool initiallySignaled = false);
 
     /** Destructor.
 
         If other threads are waiting on this object when it gets deleted, this
         can cause nasty errors, so be careful!
     */
-    ~WaitableEvent() noexcept;
+    ~WaitableEvent();
 
     //==============================================================================
     /** Suspends the calling thread until the event has been signalled.
@@ -69,7 +77,11 @@ public:
         @returns    true if the object has been signalled, false if the timeout expires first.
         @see signal, reset
     */
-    bool wait (int timeOutMilliseconds = -1) const noexcept;
+    /** @{ */
+    bool wait () const;                             // wait forever
+    // VFALCO TODO Change wait() to seconds instead of millis
+    bool wait (int timeOutMilliseconds) const; // DEPRECATED
+    /** @} */
 
     //==============================================================================
     /** Wakes up any threads that are currently waiting on this object.
@@ -87,26 +99,26 @@ public:
 
         @see wait, reset
     */
-    void signal() const noexcept;
+    void signal() const;
 
     //==============================================================================
     /** Resets the event to an unsignalled state.
 
         If it's not already signalled, this does nothing.
     */
-    void reset() const noexcept;
-
+    void reset() const;
 
 private:
-    //==============================================================================
-   #if BEAST_WINDOWS
+#if BEAST_WINDOWS
     void* handle;
-   #else
+#else
     mutable pthread_cond_t condition;
     mutable pthread_mutex_t mutex;
-    mutable bool triggered, manualReset;
-   #endif
+    mutable bool triggered;
+    mutable bool manualReset;
+#endif
 };
 
+}
 
-#endif   // BEAST_WAITABLEEVENT_H_INCLUDED
+#endif
diff --git a/beast/threads/detail/BindHandler.h b/beast/threads/detail/BindHandler.h
new file mode 100644
index 0000000000..32199b73fd
--- /dev/null
+++ b/beast/threads/detail/BindHandler.h
@@ -0,0 +1,276 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_THREADS_BINDHANDLER_H_INCLUDED
+#define BEAST_THREADS_BINDHANDLER_H_INCLUDED
+
+namespace beast {
+namespace detail {
+
+/** Overloaded function that re-binds arguments to a handler. */
+/** @{ */
+template <class Handler, class P1>
+class BindHandler1
+{
+private:
+    Handler handler;
+    P1 p1;
+
+public:
+    BindHandler1 (Handler const& handler_, P1 const& p1_)
+        : handler (handler_)
+        , p1 (p1_)
+        { }
+
+    BindHandler1 (Handler& handler_, P1 const& p1_)
+        : handler (BEAST_MOVE_CAST(Handler)(handler_))
+        , p1 (p1_)
+        { }
+
+    void operator()()
+    {
+        handler (
+            static_cast <P1 const&> (p1)
+            );
+    }
+    
+    void operator()() const
+    {
+        handler (p1);
+    }
+};
+
+template <class Handler, class P1>
+BindHandler1 <Handler, P1> bindHandler (Handler handler, P1 const& p1)
+{
+    return BindHandler1 <Handler, P1> (handler, p1);
+}
+
+//------------------------------------------------------------------------------
+
+template <class Handler, class P1, class P2>
+class BindHandler2
+{
+private:
+    Handler handler;
+    P1 p1; P2 p2;
+
+public:
+    BindHandler2 (Handler const& handler_,
+        P1 const& p1_, P2 const& p2_)
+        : handler (handler_)
+        , p1 (p1_), p2 (p2_)
+        { }
+
+    BindHandler2 (Handler& handler_,
+        P1 const& p1_, P2 const& p2_)
+        : handler (BEAST_MOVE_CAST(Handler)(handler_))
+        , p1 (p1_), p2 (p2_)
+        { }
+
+    void operator()()
+    {
+        handler (
+            static_cast <P1 const&> (p1), static_cast <P2 const&> (p2));
+    }
+
+    void operator()() const
+        { handler (p1, p2); }
+};
+
+template <class Handler, class P1, class P2>
+BindHandler2 <Handler, P1, P2> bindHandler (Handler handler,
+    P1 const& p1, P2 const& p2)
+{
+    return BindHandler2 <Handler, P1, P2> (
+        handler, p1, p2);
+}
+
+//------------------------------------------------------------------------------
+
+template <class Handler, class P1, class P2, class P3>
+class BindHandler3
+{
+private:
+    Handler handler;
+    P1 p1; P2 p2; P3 p3;
+
+public:
+    BindHandler3 (Handler const& handler_,
+        P1 const& p1_, P2 const& p2_, P3 const& p3_)
+        : handler (handler_)
+        , p1 (p1_), p2 (p2_), p3 (p3_)
+        { }
+
+    BindHandler3 (Handler& handler_,
+        P1 const& p1_, P2 const& p2_, P3 const& p3_)
+        : handler (BEAST_MOVE_CAST(Handler)(handler_))
+        , p1 (p1_), p2 (p2_), p3 (p3_)
+        { }
+
+    void operator()()
+    {
+        handler (
+            static_cast <P1 const&> (p1), static_cast <P2 const&> (p2), static_cast <P3 const&> (p3));
+    }
+
+    void operator()() const
+        { handler (p1, p2, p3); }
+};
+
+template <class Handler, class P1, class P2, class P3>
+BindHandler3 <Handler, P1, P2, P3> bindHandler (Handler handler,
+    P1 const& p1, P2 const& p2, P3 const& p3)
+{
+    return BindHandler3 <Handler, P1, P2, P3> (
+        handler, p1, p2, p3);
+}
+
+//------------------------------------------------------------------------------
+
+template <class Handler, class P1, class P2, class P3, class P4>
+class BindHandler4
+{
+private:
+    Handler handler;
+    P1 p1; P2 p2; P3 p3; P4 p4;
+
+public:
+    BindHandler4 (Handler const& handler_,
+        P1 const& p1_, P2 const& p2_, P3 const& p3_, P4 const& p4_)
+        : handler (handler_)
+        , p1 (p1_), p2 (p2_), p3 (p3_), p4 (p4_)
+        { }
+
+    BindHandler4 (Handler& handler_,
+        P1 const& p1_, P2 const& p2_, P3 const& p3_, P4 const& p4_)
+        : handler (BEAST_MOVE_CAST(Handler)(handler_))
+        , p1 (p1_), p2 (p2_), p3 (p3_), p4 (p4_)
+        { }
+
+    void operator()()
+    {
+        handler (
+            static_cast <P1 const&> (p1), static_cast <P2 const&> (p2), static_cast <P3 const&> (p3), 
+            static_cast <P4 const&> (p4)
+            );
+    }
+
+    void operator()() const
+        { handler (p1, p2, p3, p4); }
+};
+
+template <class Handler, class P1, class P2, class P3, class P4>
+BindHandler4 <Handler, P1, P2, P3, P4> bindHandler (Handler handler,
+    P1 const& p1, P2 const& p2, P3 const& p3, P4 const& p4)
+{
+    return BindHandler4 <Handler, P1, P2, P3, P4> (
+        handler, p1, p2, p3, p4);
+}
+
+//------------------------------------------------------------------------------
+
+template <class Handler, class P1, class P2, class P3, class P4, class P5>
+class BindHandler5
+{
+private:
+    Handler handler;
+    P1 p1; P2 p2; P3 p3; P4 p4; P5 p5;
+
+public:
+    BindHandler5 (Handler const& handler_,
+        P1 const& p1_, P2 const& p2_, P3 const& p3_, P4 const& p4_, P5 const& p5_)
+        : handler (handler_)
+        , p1 (p1_), p2 (p2_), p3 (p3_), p4 (p4_), p5 (p5_)
+        { }
+
+    BindHandler5 (Handler& handler_,
+        P1 const& p1_, P2 const& p2_, P3 const& p3_, P4 const& p4_, P5 const& p5_)
+        : handler (BEAST_MOVE_CAST(Handler)(handler_))
+        , p1 (p1_), p2 (p2_), p3 (p3_), p4 (p4_), p5 (p5_)
+        { }
+
+    void operator()()
+    {
+        handler (
+            static_cast <P1 const&> (p1), static_cast <P2 const&> (p2), static_cast <P3 const&> (p3), 
+            static_cast <P4 const&> (p4), static_cast <P5 const&> (p5)
+            );
+    }
+
+    void operator()() const
+        { handler (p1, p2, p3, p4, p5); }
+};
+
+template <class Handler, class P1, class P2, class P3, class P4, class P5>
+BindHandler5 <Handler, P1, P2, P3, P4, P5> bindHandler (Handler handler,
+    P1 const& p1, P2 const& p2, P3 const& p3, P4 const& p4, P5 const& p5)
+{
+    return BindHandler5 <Handler, P1, P2, P3, P4, P5> (
+        handler, p1, p2, p3, p4, p5);
+}
+
+//------------------------------------------------------------------------------
+
+template <class Handler, class P1, class P2, class P3, class P4, class P5, class P6>
+class BindHandler6
+{
+private:
+    Handler handler;
+    P1 p1; P2 p2; P3 p3; P4 p4; P5 p5; P6 p6;
+
+public:
+    BindHandler6 (Handler const& handler_,
+        P1 const& p1_, P2 const& p2_, P3 const& p3_, P4 const& p4_, P5 const& p5_, P6 const& p6_)
+        : handler (handler_)
+        , p1 (p1_), p2 (p2_), p3 (p3_), p4 (p4_), p5 (p5_), p6 (p6_)
+        { }
+
+    BindHandler6 (Handler& handler_,
+        P1 const& p1_, P2 const& p2_, P3 const& p3_, P4 const& p4_, P5 const& p5_, P6 const& p6_)
+        : handler (BEAST_MOVE_CAST(Handler)(handler_))
+        , p1 (p1_), p2 (p2_), p3 (p3_), p4 (p4_), p5 (p5_), p6 (p6_)
+        { }
+
+    void operator()()
+    {
+        handler (
+            static_cast <P1 const&> (p1), static_cast <P2 const&> (p2), static_cast <P3 const&> (p3), 
+            static_cast <P4 const&> (p4), static_cast <P5 const&> (p5), static_cast <P6 const&> (p6)
+            );
+    }
+
+    void operator()() const
+        { handler (p1, p2, p3, p4, p5, p6); }
+};
+
+template <class Handler, class P1, class P2, class P3, class P4, class P5, class P6>
+BindHandler6 <Handler, P1, P2, P3, P4, P5, P6> bindHandler (Handler handler,
+    P1 const& p1, P2 const& p2, P3 const& p3, P4 const& p4, P5 const& p5, P6 const& p6)
+{
+    return BindHandler6 <Handler, P1, P2, P3, P4, P5, P6> (
+        handler, p1, p2, p3, p4, p5, p6);
+}
+
+/** @} */
+
+}
+}
+
+#endif
diff --git a/beast/threads/detail/DispatchedHandler.h b/beast/threads/detail/DispatchedHandler.h
new file mode 100644
index 0000000000..8cd1897e49
--- /dev/null
+++ b/beast/threads/detail/DispatchedHandler.h
@@ -0,0 +1,173 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_THREADS_DISPATCHEDHANDLER_H_INCLUDED
+#define BEAST_THREADS_DISPATCHEDHANDLER_H_INCLUDED
+
+#include "BindHandler.h"
+
+namespace beast {
+namespace detail {
+
+/** A wrapper that packages function call arguments into a dispatch. */
+template <typename Dispatcher, typename Handler>
+class DispatchedHandler
+{
+private:
+    Dispatcher m_dispatcher;
+    Handler m_handler;
+
+public:
+    typedef void result_type;
+
+    DispatchedHandler (Dispatcher dispatcher, Handler& handler)
+        : m_dispatcher (dispatcher)
+        , m_handler (BEAST_MOVE_CAST(Handler)(handler))
+    {
+    }
+
+#if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
+    DispatchedHandler (DispatchedHandler const& other)
+        : m_dispatcher (other.m_dispatcher)
+        , m_handler (other.m_handler)
+    {
+    }
+
+    DispatchedHandler (DispatchedHandler&& other)
+        : m_dispatcher (other.m_dispatcher)
+        , m_handler (BEAST_MOVE_CAST(Handler)(other.m_handler))
+    {
+    }
+#endif
+
+    void operator()()
+    {
+        m_dispatcher.dispatch (m_handler);
+    }
+
+    void operator()() const
+    {
+        m_dispatcher.dispatch (m_handler);
+    }
+
+    template <class P1>
+    void operator() (P1 const& p1)
+    {
+        m_dispatcher.dispatch (
+            detail::bindHandler (m_handler,
+                p1));
+    }
+
+    template <class P1>
+    void operator() (P1 const& p1) const
+    {
+        m_dispatcher.dispatch (
+            detail::bindHandler (m_handler,
+                p1));
+    }
+
+    template <class P1, class P2>
+    void operator() (P1 const& p1, P2 const& p2)
+    {
+        m_dispatcher.dispatch (
+            detail::bindHandler (m_handler,
+                p1, p2));
+    }
+
+    template <class P1, class P2>
+    void operator() (P1 const& p1, P2 const& p2) const
+    {
+        m_dispatcher.dispatch (
+            detail::bindHandler (m_handler,
+                p1, p2));
+    }
+
+    template <class P1, class P2, class P3>
+    void operator() (P1 const& p1, P2 const& p2, P3 const& p3)
+    {
+        m_dispatcher.dispatch (
+            detail::bindHandler (m_handler,
+                p1, p2, p3));
+    }
+
+    template <class P1, class P2, class P3>
+    void operator() (P1 const& p1, P2 const& p2, P3 const& p3) const
+    {
+        m_dispatcher.dispatch (
+            detail::bindHandler (m_handler,
+                p1, p2, p3));
+    }
+
+    template <class P1, class P2, class P3, class P4>
+    void operator() (P1 const& p1, P2 const& p2, P3 const& p3,  P4 const& p4)
+    {
+        m_dispatcher.dispatch (
+            detail::bindHandler (m_handler,
+                p1, p2, p3, p4));
+    }
+
+    template <class P1, class P2, class P3, class P4>
+    void operator() (P1 const& p1, P2 const& p2, P3 const& p3,  P4 const& p4) const
+    {
+        m_dispatcher.dispatch (
+            detail::bindHandler (m_handler,
+                p1, p2, p3, p4));
+    }
+
+    template <class P1, class P2, class P3, class P4, class P5>
+    void operator() (P1 const& p1, P2 const& p2, P3 const& p3, 
+                     P4 const& p4, P5 const& p5)
+    {
+        m_dispatcher.dispatch (
+            detail::bindHandler (m_handler,
+                p1, p2, p3, p4, p5));
+    }
+
+    template <class P1, class P2, class P3, class P4, class P5>
+    void operator() (P1 const& p1, P2 const& p2, P3 const& p3, 
+                     P4 const& p4, P5 const& p5) const
+    {
+        m_dispatcher.dispatch (
+            detail::bindHandler (m_handler,
+                p1, p2, p3, p4, p5));
+    }
+
+    template <class P1, class P2, class P3, class P4, class P5, class P6>
+    void operator() (P1 const& p1, P2 const& p2, P3 const& p3, 
+                     P4 const& p4, P5 const& p5, P6 const& p6)
+    {
+        m_dispatcher.dispatch (
+            detail::bindHandler (m_handler,
+                p1, p2, p3, p4, p5, p6));
+    }
+
+    template <class P1, class P2, class P3, class P4, class P5, class P6>
+    void operator() (P1 const& p1, P2 const& p2, P3 const& p3, 
+                     P4 const& p4, P5 const& p5, P6 const& p6) const
+    {
+        m_dispatcher.dispatch (
+            detail::bindHandler (m_handler,
+                p1, p2, p3, p4, p5, p6));
+    }
+};
+
+}
+}
+
+#endif
diff --git a/beast/threads/impl/Atomic.cpp b/beast/threads/impl/Atomic.cpp
new file mode 100644
index 0000000000..5f1790fd48
--- /dev/null
+++ b/beast/threads/impl/Atomic.cpp
@@ -0,0 +1,133 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../../../modules/beast_core/beast_core.h" // for UnitTest
+
+namespace beast {
+
+class AtomicTests : public UnitTest
+{
+public:
+    AtomicTests() : UnitTest ("Atomic", "beast") {}
+
+    template <typename Type>
+    void testFloat ()
+    {
+        Atomic<Type> a, b;
+        a = (Type) 21;
+        memoryBarrier();
+
+        /*  These are some simple test cases to check the atomics - let me know
+            if any of these assertions fail on your system!
+        */
+        expect (a.get() == (Type) 21);
+        expect (a.compareAndSetValue ((Type) 100, (Type) 50) == (Type) 21);
+        expect (a.get() == (Type) 21);
+        expect (a.compareAndSetValue ((Type) 101, a.get()) == (Type) 21);
+        expect (a.get() == (Type) 101);
+        expect (! a.compareAndSetBool ((Type) 300, (Type) 200));
+        expect (a.get() == (Type) 101);
+        expect (a.compareAndSetBool ((Type) 200, a.get()));
+        expect (a.get() == (Type) 200);
+
+        expect (a.exchange ((Type) 300) == (Type) 200);
+        expect (a.get() == (Type) 300);
+
+        b = a;
+        expect (b.get() == a.get());
+    }
+
+    template <typename Type>
+    void testInteger ()
+    {
+        Atomic<Type> a, b;
+        a.set ((Type) 10);
+        expect (a.value == (Type) 10);
+        expect (a.get() == (Type) 10);
+        a += (Type) 15;
+        expect (a.get() == (Type) 25);
+        memoryBarrier();
+        a -= (Type) 5;
+        expect (a.get() == (Type) 20);
+        expect (++a == (Type) 21);
+        ++a;
+        expect (--a == (Type) 21);
+        expect (a.get() == (Type) 21);
+        memoryBarrier();
+
+        testFloat <Type> ();
+    }
+
+    void runTest()
+    {
+        beginTestCase ("Misc");
+
+        char a1[7];
+        expect (numElementsInArray(a1) == 7);
+        int a2[3];
+        expect (numElementsInArray(a2) == 3);
+
+        expect (ByteOrder::swap ((uint16) 0x1122) == 0x2211);
+        expect (ByteOrder::swap ((uint32) 0x11223344) == 0x44332211);
+        expect (ByteOrder::swap ((uint64) literal64bit (0x1122334455667788)) == literal64bit (0x8877665544332211));
+
+        beginTestCase ("int");
+        testInteger <int> ();
+
+        beginTestCase ("unsigned int");
+        testInteger <unsigned int> ();
+
+        beginTestCase ("int32");
+        testInteger <int32> ();
+
+        beginTestCase ("uint32");
+        testInteger <uint32> ();
+
+        beginTestCase ("long");
+        testInteger <long> ();
+
+        beginTestCase ("void*");
+        testInteger <void*> ();
+
+        beginTestCase ("int*");
+        testInteger <int*> ();
+
+        beginTestCase ("float");
+        testFloat <float> ();
+
+    #if ! BEAST_64BIT_ATOMICS_UNAVAILABLE  // 64-bit intrinsics aren't available on some old platforms
+        beginTestCase ("int64");
+        testInteger <int64> ();
+
+        beginTestCase ("uint64");
+        testInteger <uint64> ();
+
+        beginTestCase ("double");
+        testFloat <double> ();
+    #endif
+    }
+};
+
+static AtomicTests atomicTests;
+
+}
diff --git a/beast/threads/impl/RecursiveMutex.cpp b/beast/threads/impl/RecursiveMutex.cpp
new file mode 100644
index 0000000000..414f883c91
--- /dev/null
+++ b/beast/threads/impl/RecursiveMutex.cpp
@@ -0,0 +1,111 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../RecursiveMutex.h"
+
+#if BEAST_WINDOWS
+
+#include "../StaticAssert.h"
+
+#include <Windows.h>
+#undef check
+#undef direct
+#undef max
+#undef min
+#undef TYPE_BOOL
+
+namespace beast {
+
+RecursiveMutex::RecursiveMutex()
+{
+    // (just to check the MS haven't changed this structure and broken things...)
+#if BEAST_VC7_OR_EARLIER
+    static_bassert (sizeof (CRITICAL_SECTION) <= 24);
+#else
+    static_bassert (sizeof (CRITICAL_SECTION) <= sizeof (section));
+#endif
+
+    InitializeCriticalSection ((CRITICAL_SECTION*) section);
+}
+
+RecursiveMutex::~RecursiveMutex()
+{
+    DeleteCriticalSection ((CRITICAL_SECTION*) section);
+}
+
+void RecursiveMutex::lock() const
+{
+    EnterCriticalSection ((CRITICAL_SECTION*) section);
+}
+
+void RecursiveMutex::unlock() const
+{
+    LeaveCriticalSection ((CRITICAL_SECTION*) section);
+}
+
+bool RecursiveMutex::try_lock() const
+{
+    return TryEnterCriticalSection ((CRITICAL_SECTION*) section) != FALSE;
+}
+
+}
+
+#else
+
+namespace beast {
+
+RecursiveMutex::RecursiveMutex()
+{
+    pthread_mutexattr_t atts;
+    pthread_mutexattr_init (&atts);
+    pthread_mutexattr_settype (&atts, PTHREAD_MUTEX_RECURSIVE);
+#if ! BEAST_ANDROID
+    pthread_mutexattr_setprotocol (&atts, PTHREAD_PRIO_INHERIT);
+#endif
+    pthread_mutex_init (&mutex, &atts);
+    pthread_mutexattr_destroy (&atts);
+}
+
+RecursiveMutex::~RecursiveMutex()
+{
+    pthread_mutex_destroy (&mutex);
+}
+
+void RecursiveMutex::lock() const
+{
+    pthread_mutex_lock (&mutex);
+}
+
+void RecursiveMutex::unlock() const
+{
+    pthread_mutex_unlock (&mutex);
+}
+
+bool RecursiveMutex::try_lock() const
+{
+    return pthread_mutex_trylock (&mutex) == 0;
+}
+
+}
+
+#endif
diff --git a/beast/threads/impl/ServiceQueue.cpp b/beast/threads/impl/ServiceQueue.cpp
new file mode 100644
index 0000000000..f82368c49a
--- /dev/null
+++ b/beast/threads/impl/ServiceQueue.cpp
@@ -0,0 +1,465 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../ServiceQueue.h"
+
+#include "../../../modules/beast_core/beast_core.h" // for UnitTest
+
+namespace beast {
+
+namespace detail {
+
+//------------------------------------------------------------------------------
+
+class ServiceQueueBase::ScopedServiceThread : public List <ScopedServiceThread>::Node
+{
+public:
+    explicit ScopedServiceThread (ServiceQueueBase* queue)
+        : m_saved (ServiceQueueBase::s_service.get())
+    {
+        ServiceQueueBase::s_service.get() = queue;
+    }
+
+    ~ScopedServiceThread()
+    {
+        ServiceQueueBase::s_service.get() = m_saved;
+    }
+
+private:
+    ServiceQueueBase* m_saved;
+};
+
+//------------------------------------------------------------------------------
+
+ServiceQueueBase::ServiceQueueBase()
+{
+}
+
+ServiceQueueBase::~ServiceQueueBase()
+{
+}
+
+std::size_t ServiceQueueBase::poll ()
+{
+    CPUMeter::ScopedActiveTime interval (m_cpuMeter);
+
+    std::size_t total (0);
+    ScopedServiceThread thread (this);
+    for (;;)
+    {
+        std::size_t const n (dequeue());
+        if (! n)
+            break;
+        total += n;
+    }
+    return total;
+}
+
+std::size_t ServiceQueueBase::poll_one ()
+{
+    CPUMeter::ScopedActiveTime interval (m_cpuMeter);
+
+    ScopedServiceThread thread (this);
+    return dequeue();
+}
+
+std::size_t ServiceQueueBase::run ()
+{
+    std::size_t total (0);
+    ScopedServiceThread thread (this);
+    while (! stopped())
+    {
+        {
+            CPUMeter::ScopedActiveTime interval (m_cpuMeter);
+            total += poll ();
+        }
+
+        {
+            CPUMeter::ScopedIdleTime interval (m_cpuMeter);
+            wait ();
+        }
+    }
+    return total;
+}
+
+std::size_t ServiceQueueBase::run_one ()
+{
+    std::size_t n;
+    ScopedServiceThread (this);
+    for (;;)
+    {
+        {
+            CPUMeter::ScopedActiveTime interval (m_cpuMeter);
+            n = poll_one();
+            if (n != 0)
+                break;
+        }
+
+        {
+            CPUMeter::ScopedIdleTime interval (m_cpuMeter);
+            wait();
+        }
+    }
+    return n;
+}
+
+void ServiceQueueBase::stop ()
+{
+    SharedState::Access state (m_state);
+    m_stopped.set (1);
+    for(;;)
+    {
+        Waiter* waiting (state->waiting.pop_front());
+        if (waiting == nullptr)
+            break;
+        waiting->signal();
+    }
+}
+
+void ServiceQueueBase::reset()
+{
+    // Must be stopped
+    bassert (m_stopped.get () != 0);
+    m_stopped.set (0);
+}
+
+// Block on the event if there are no items
+// in the queue and we are not stopped.
+//
+void ServiceQueueBase::wait ()
+{
+    Waiter* waiter (nullptr);
+
+    {
+        SharedState::Access state (m_state);
+        if (stopped ())
+            return;
+        if (! state->handlers.empty())
+            return;
+        waiter = state->unused.pop_front();
+        if (! waiter)
+            waiter = new_waiter();
+        state->waiting.push_front (waiter);
+    }
+
+    waiter->wait();
+
+    // Waiter got taken off the waiting list
+
+    {
+        SharedState::Access state (m_state);
+        state->unused.push_front (waiter);
+    }
+}
+
+void ServiceQueueBase::enqueue (Item* item)
+{
+    Waiter* waiter;
+
+    {
+        SharedState::Access state (m_state);
+        state->handlers.push_back (*item);
+        // Signal a Waiter if one exists
+        waiter = state->waiting.pop_front();
+    }
+
+    if (waiter != nullptr)
+        waiter->signal();
+}
+
+// A thread can only be blocked on one ServiceQueue so we store the pointer
+// to which ServiceQueue it is blocked on to determine if the thread belongs
+// to that queue.
+//
+ThreadLocalValue <ServiceQueueBase*> ServiceQueueBase::s_service;
+
+}
+
+//------------------------------------------------------------------------------
+
+namespace detail
+{
+
+//------------------------------------------------------------------------------
+
+class ServiceQueueTimingTests
+    : public UnitTest
+{
+public:
+    class Stopwatch
+    {
+    public:
+        Stopwatch () { start(); }
+        void start () { m_startTime = Time::getHighResolutionTicks (); }
+        double getElapsed ()
+        {
+            int64 const now = Time::getHighResolutionTicks();
+            return Time::highResolutionTicksToSeconds (now - m_startTime);
+        }
+    private:
+        int64 m_startTime;
+    };
+
+    static int const callsPerThread = 50000;
+
+    //--------------------------------------------------------------------------
+
+    template <typename ServiceType>
+    struct Consumer : Thread
+    {
+        ServiceType& m_service;
+        Random m_random;
+        String m_string;
+
+        Consumer (int id, int64 seedValue, ServiceType& service)
+            : Thread ("C#" + String::fromNumber (id))
+            , m_service (service)
+            , m_random (seedValue)
+            { startThread(); }
+
+        ~Consumer ()
+            { stopThread(); }
+
+        static Consumer*& thread()
+        {
+            static ThreadLocalValue <Consumer*> local;
+            return local.get();
+        }
+
+        static void stop_one ()
+            { thread()->signalThreadShouldExit(); }
+
+        static void handler ()
+            { thread()->do_handler(); }
+
+        void do_handler()
+        {
+            String const s (String::fromNumber (m_random.nextInt()));
+            m_string += s;
+            if (m_string.length() > 100)
+                m_string = String::empty;
+        }
+
+        void run ()
+        {
+            thread() = this;
+            while (! threadShouldExit())
+                m_service.run_one();
+        }
+    };
+
+    //--------------------------------------------------------------------------
+
+    template <typename ServiceType>
+    struct Producer : Thread
+    {
+        ServiceType& m_service;
+        Random m_random;
+        String m_string;
+
+        Producer (int id, int64 seedValue, ServiceType& service)
+            : Thread ("P#" + String::fromNumber (id))
+            , m_service (service)
+            , m_random (seedValue)
+            { }
+
+        ~Producer ()
+            { stopThread(); }
+
+        void run ()
+        {
+            for (std::size_t i = 0; i < callsPerThread; ++i)
+            {
+                String const s (String::fromNumber (m_random.nextInt()));
+                m_string += s;
+                if (m_string.length() > 100)
+                    m_string = String::empty;
+                m_service.dispatch (bind (&Consumer<ServiceType>::handler));
+            }
+        }
+    };
+
+    //--------------------------------------------------------------------------
+
+    template <typename Allocator>
+    void testThreads (std::size_t nConsumers, std::size_t nProducers)
+    {
+        beginTestCase (String::fromNumber (nConsumers) + " consumers, " +
+                       String::fromNumber (nProducers) + " producers, " +
+                       "Allocator = " + std::string(typeid(Allocator).name()));
+
+        typedef ServiceQueueType <Allocator> ServiceType;
+
+        ServiceType service (nConsumers);
+        std::vector <ScopedPointer <Consumer <ServiceType> > > consumers;
+        std::vector <ScopedPointer <Producer <ServiceType> > > producers;
+        consumers.reserve (nConsumers);
+        producers.reserve (nProducers);
+
+        for (std::size_t i = 0; i < nConsumers; ++i)
+            consumers.push_back (new Consumer <ServiceType> (i + 1,
+                random().nextInt64(), service));
+
+        for (std::size_t i = 0; i < nProducers; ++i)
+            producers.push_back (new Producer <ServiceType> (i + 1,
+                random().nextInt64(), service));
+
+        Stopwatch t;
+        
+        for (std::size_t i = 0; i < producers.size(); ++i)
+            producers[i]->startThread();
+        
+        for (std::size_t i = 0; i < producers.size(); ++i)
+            producers[i]->waitForThreadToExit();
+
+        for (std::size_t i = 0; i < consumers.size(); ++i)
+            service.dispatch (bind (&Consumer <ServiceType>::stop_one));
+
+        for (std::size_t i = 0; i < consumers.size(); ++i)
+            consumers[i]->waitForThreadToExit();
+
+        double const seconds (t.getElapsed());
+        logMessage (String (seconds, 2) + " seconds");
+
+        pass();
+    }
+
+    void runTest()
+    {
+#if 1
+        testThreads <std::allocator<char> > (1, 1);
+        testThreads <std::allocator<char> > (1, 4);
+        testThreads <std::allocator<char> > (1, 16);
+        testThreads <std::allocator<char> > (4, 1);
+        testThreads <std::allocator<char> > (8, 16);
+#endif
+
+#if 0
+        testThreads <detail::ServiceQueueAllocator<char> > (1, 1);
+        testThreads <detail::ServiceQueueAllocator<char> > (1, 4);
+        testThreads <detail::ServiceQueueAllocator<char> > (1, 16);
+        testThreads <detail::ServiceQueueAllocator<char> > (4, 1);
+        testThreads <detail::ServiceQueueAllocator<char> > (8, 16);
+#endif
+    }
+
+    ServiceQueueTimingTests () : UnitTest ("ServiceQueueTiming", "beast", runManual)
+    {
+    }
+};
+
+static ServiceQueueTimingTests serviceQueueTimingTests;
+
+//------------------------------------------------------------------------------
+
+class ServiceQueueTests
+    : public UnitTest
+{
+public:
+    struct ServiceThread : Thread
+    {
+        Random m_random;
+        ServiceQueue& m_service;
+        String m_string;
+
+        ServiceThread (int id, int64 seedValue,
+            ServiceQueue& service)
+            : Thread ("#" + String::fromNumber (id))
+            , m_random (seedValue)
+            , m_service (service)
+        {
+            startThread();
+        }
+
+        ~ServiceThread ()
+        {
+            stopThread();
+        }
+
+        static ServiceThread*& thread()
+        {
+            static ThreadLocalValue <ServiceThread*> local;
+            return local.get();
+        }
+
+        static void stop_one ()
+        {
+            thread()->signalThreadShouldExit();
+        }
+
+        static void handler ()
+        {
+            thread()->do_handler();
+        }
+
+        void do_handler()
+        {
+#if 1
+            String const s (String::fromNumber (m_random.nextInt()));
+            m_string += s;
+            if (m_string.length() > 100)
+                m_string = String::empty;
+#endif
+        }
+
+        void run ()
+        {
+            thread() = this;
+            while (! threadShouldExit())
+                m_service.run_one();
+        }
+    };
+
+    static int const callsPerThread = 10000;
+
+    void testThreads (std::size_t n)
+    {
+        beginTestCase (String::fromNumber (n) + " threads");
+        ServiceQueue service (n);
+        std::vector <ScopedPointer <ServiceThread> > threads;
+        threads.reserve (n);
+        for (std::size_t i = 0; i < n; ++i)
+            threads.push_back (new ServiceThread (i + 1,
+                random().nextInt64(), service));
+        for (std::size_t i = n * callsPerThread; i; --i)
+            service.dispatch (bind (&ServiceThread::handler));
+        for (std::size_t i = 0; i < threads.size(); ++i)
+            service.dispatch (bind (&ServiceThread::stop_one));
+        for (std::size_t i = 0; i < threads.size(); ++i)
+            threads[i]->waitForThreadToExit();
+        pass();
+    }
+
+    void runTest()
+    {
+        testThreads (1);
+        testThreads (4);
+        testThreads (16);
+    }
+
+    ServiceQueueTests () : UnitTest ("ServiceQueue", "beast")
+    {
+    }
+};
+
+static ServiceQueueTests serviceQueueTests;
+
+}
+
+}
diff --git a/beast/threads/impl/Stoppable.cpp b/beast/threads/impl/Stoppable.cpp
new file mode 100644
index 0000000000..75e01986aa
--- /dev/null
+++ b/beast/threads/impl/Stoppable.cpp
@@ -0,0 +1,198 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of rippled: https://github.com/ripple/rippled
+    Copyright (c) 2012, 2013 Ripple Labs Inc.
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../Stoppable.h"
+
+namespace beast {
+
+Stoppable::Stoppable (char const* name, RootStoppable& root)
+    : m_name (name)
+    , m_root (root)
+    , m_child (this)
+    , m_stopped (false)
+    , m_childrenStopped (false)
+{
+}
+
+Stoppable::Stoppable (char const* name, Stoppable& parent)
+    : m_name (name)
+    , m_root (parent.m_root)
+    , m_child (this)
+    , m_stopped (false)
+    , m_childrenStopped (false)
+{
+    // Must not have stopping parent.
+    bassert (! parent.isStopping());
+
+    parent.m_children.push_front (&m_child);
+}
+
+Stoppable::~Stoppable ()
+{
+    // Children must be stopped.
+    bassert (m_childrenStopped);
+}
+
+bool Stoppable::isStopping() const
+{
+    return m_root.isStopping();
+}
+
+bool Stoppable::isStopped () const
+{
+    return m_stopped;
+}
+
+bool Stoppable::areChildrenStopped () const
+{
+    return m_childrenStopped;
+}
+
+void Stoppable::stopped ()
+{
+    m_stoppedEvent.signal();
+}
+
+void Stoppable::onPrepare ()
+{
+}
+
+void Stoppable::onStart ()
+{
+}
+
+void Stoppable::onStop ()
+{
+    stopped();
+}
+
+void Stoppable::onChildrenStopped ()
+{
+}
+
+//------------------------------------------------------------------------------
+
+void Stoppable::prepareRecursive ()
+{
+    for (Children::const_iterator iter (m_children.cbegin ());
+        iter != m_children.cend(); ++iter)
+        iter->stoppable->prepareRecursive ();
+    onPrepare ();
+}
+
+void Stoppable::startRecursive ()
+{
+    onStart ();
+    for (Children::const_iterator iter (m_children.cbegin ());
+        iter != m_children.cend(); ++iter)
+        iter->stoppable->startRecursive ();
+}
+
+void Stoppable::stopAsyncRecursive ()
+{
+    onStop ();
+    for (Children::const_iterator iter (m_children.cbegin ());
+        iter != m_children.cend(); ++iter)
+        iter->stoppable->stopAsyncRecursive ();
+}
+
+void Stoppable::stopRecursive (Journal journal)
+{
+    // Block on each child from the bottom of the tree up.
+    //
+    for (Children::const_iterator iter (m_children.cbegin ());
+        iter != m_children.cend(); ++iter)
+        iter->stoppable->stopRecursive (journal);
+
+    // if we get here then all children have stopped
+    //
+    memoryBarrier ();
+    m_childrenStopped = true;
+    onChildrenStopped ();
+
+    // Now block on this Stoppable.
+    //
+    bool const timedOut (! m_stoppedEvent.wait (1 * 1000)); // milliseconds
+    if (timedOut)
+    {
+        journal.warning << "Waiting for '" << m_name << "' to stop";
+        m_stoppedEvent.wait ();
+    }
+
+    // once we get here, we know the stoppable has stopped.
+    m_stopped = true;
+}
+
+//------------------------------------------------------------------------------
+
+RootStoppable::RootStoppable (char const* name)
+    : Stoppable (name, *this)
+{
+}
+
+RootStoppable::~RootStoppable ()
+{
+}
+
+bool RootStoppable::isStopping() const
+{
+    return m_calledStopAsync.get() != 0;
+}
+
+void RootStoppable::prepare ()
+{
+    if (! m_prepared.compareAndSetBool (1, 0))
+        return;
+
+    prepareRecursive ();
+}
+
+void RootStoppable::start ()
+{
+    // Courtesy call to prepare.
+    if (m_prepared.compareAndSetBool (1, 0))
+        prepareRecursive ();
+
+    if (! m_started.compareAndSetBool (1, 0))
+        return;
+
+    startRecursive ();
+}
+
+void RootStoppable::stop (Journal journal)
+{
+    if (! m_calledStop.compareAndSetBool (1, 0))
+    {
+        journal.warning << "Stoppable::stop called again";
+        return;
+    }
+
+    stopAsync ();
+    stopRecursive (journal);
+}
+
+void RootStoppable::stopAsync ()
+{
+    if (! m_calledStopAsync.compareAndSetBool (1, 0))
+        return;
+
+    stopAsyncRecursive ();
+}
+
+}
diff --git a/beast/threads/impl/Thread.cpp b/beast/threads/impl/Thread.cpp
new file mode 100644
index 0000000000..d6969552b5
--- /dev/null
+++ b/beast/threads/impl/Thread.cpp
@@ -0,0 +1,599 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../Thread.h"
+
+namespace beast {
+
+Thread::Thread (const String& threadName_)
+    : threadName (threadName_),
+      threadHandle (nullptr),
+      threadId (0),
+      threadPriority (5),
+      affinityMask (0),
+      shouldExit (false)
+{
+}
+
+Thread::~Thread()
+{
+    /* If your thread class's destructor has been called without first stopping the thread, that
+       means that this partially destructed object is still performing some work - and that's
+       probably a Bad Thing!
+
+       To avoid this type of nastiness, always make sure you call stopThread() before or during
+       your subclass's destructor.
+    */
+    check_precondition (! isThreadRunning());
+
+    stopThread ();
+}
+
+//==============================================================================
+// Use a ref-counted object to hold this shared data, so that it can outlive its static
+// shared pointer when threads are still running during static shutdown.
+struct CurrentThreadHolder : public SharedObject
+{
+    CurrentThreadHolder() noexcept {}
+
+    typedef SharedPtr <CurrentThreadHolder> Ptr;
+    ThreadLocalValue<Thread*> value;
+};
+
+static char currentThreadHolderLock [sizeof (SpinLock)]; // (statically initialised to zeros).
+
+static SpinLock* castToSpinLockWithoutAliasingWarning (void* s)
+{
+    return static_cast<SpinLock*> (s);
+}
+
+static CurrentThreadHolder::Ptr getCurrentThreadHolder()
+{
+    static CurrentThreadHolder::Ptr currentThreadHolder;
+    SpinLock::ScopedLockType lock (*castToSpinLockWithoutAliasingWarning (currentThreadHolderLock));
+
+    if (currentThreadHolder == nullptr)
+        currentThreadHolder = new CurrentThreadHolder();
+
+    return currentThreadHolder;
+}
+
+void Thread::threadEntryPoint()
+{
+    const CurrentThreadHolder::Ptr currentThreadHolder (getCurrentThreadHolder());
+    currentThreadHolder->value = this;
+
+    if (threadName.isNotEmpty())
+        setCurrentThreadName (threadName);
+
+    if (startSuspensionEvent.wait (10000))
+    {
+        bassert (getCurrentThreadId() == threadId);
+
+        if (affinityMask != 0)
+            setCurrentThreadAffinityMask (affinityMask);
+
+        run();
+    }
+
+    currentThreadHolder->value.releaseCurrentThreadStorage();
+    closeThreadHandle();
+}
+
+// used to wrap the incoming call from the platform-specific code
+void BEAST_API beast_threadEntryPoint (void* userData)
+{
+    static_cast <Thread*> (userData)->threadEntryPoint();
+}
+
+//==============================================================================
+void Thread::startThread()
+{
+    const RecursiveMutex::ScopedLockType  sl (startStopLock);
+
+    shouldExit = false;
+
+    if (threadHandle == nullptr)
+    {
+        launchThread();
+        setThreadPriority (threadHandle, threadPriority);
+        startSuspensionEvent.signal();
+    }
+}
+
+void Thread::startThread (const int priority)
+{
+    const RecursiveMutex::ScopedLockType sl (startStopLock);
+
+    if (threadHandle == nullptr)
+    {
+        threadPriority = priority;
+        startThread();
+    }
+    else
+    {
+        setPriority (priority);
+    }
+}
+
+bool Thread::isThreadRunning() const
+{
+    return threadHandle != nullptr;
+}
+
+Thread* Thread::getCurrentThread()
+{
+    return getCurrentThreadHolder()->value.get();
+}
+
+//==============================================================================
+void Thread::signalThreadShouldExit()
+{
+    shouldExit = true;
+}
+
+bool Thread::waitForThreadToExit (const int timeOutMilliseconds) const
+{
+    // Doh! So how exactly do you expect this thread to wait for itself to stop??
+    bassert (getThreadId() != getCurrentThreadId() || getCurrentThreadId() == 0);
+
+    const uint32 timeoutEnd = Time::getMillisecondCounter() + (uint32) timeOutMilliseconds;
+
+    while (isThreadRunning())
+    {
+        if (timeOutMilliseconds >= 0 && Time::getMillisecondCounter() > timeoutEnd)
+            return false;
+
+        sleep (2);
+    }
+
+    return true;
+}
+
+bool Thread::stopThread (const int timeOutMilliseconds)
+{
+    bool cleanExit = true;
+
+    // agh! You can't stop the thread that's calling this method! How on earth
+    // would that work??
+    bassert (getCurrentThreadId() != getThreadId());
+
+    const RecursiveMutex::ScopedLockType sl (startStopLock);
+
+    if (isThreadRunning())
+    {
+        signalThreadShouldExit();
+        notify();
+
+        if (timeOutMilliseconds != 0)
+        {
+            cleanExit = waitForThreadToExit (timeOutMilliseconds);
+        }
+
+        if (isThreadRunning())
+        {
+            bassert (! cleanExit);
+
+            // very bad karma if this point is reached, as there are bound to be
+            // locks and events left in silly states when a thread is killed by force..
+            killThread();
+
+            threadHandle = nullptr;
+            threadId = 0;
+
+            cleanExit = false;
+        }
+        else
+        {
+            cleanExit = true;
+        }
+    }
+
+    return cleanExit;
+}
+
+void Thread::stopThreadAsync ()
+{
+    const RecursiveMutex::ScopedLockType sl (startStopLock);
+
+    if (isThreadRunning())
+    {
+        signalThreadShouldExit();
+        notify();
+    }
+}
+
+//==============================================================================
+bool Thread::setPriority (const int newPriority)
+{
+    // NB: deadlock possible if you try to set the thread prio from the thread itself,
+    // so using setCurrentThreadPriority instead in that case.
+    if (getCurrentThreadId() == getThreadId())
+        return setCurrentThreadPriority (newPriority);
+
+    const RecursiveMutex::ScopedLockType sl (startStopLock);
+
+    if (setThreadPriority (threadHandle, newPriority))
+    {
+        threadPriority = newPriority;
+        return true;
+    }
+
+    return false;
+}
+
+bool Thread::setCurrentThreadPriority (const int newPriority)
+{
+    return setThreadPriority (0, newPriority);
+}
+
+void Thread::setAffinityMask (const uint32 newAffinityMask)
+{
+    affinityMask = newAffinityMask;
+}
+
+//==============================================================================
+bool Thread::wait (const int timeOutMilliseconds) const
+{
+    return defaultEvent.wait (timeOutMilliseconds);
+}
+
+void Thread::notify() const
+{
+    defaultEvent.signal();
+}
+
+//==============================================================================
+
+// This is here so we dont have circular includes
+//
+void SpinLock::enter() const noexcept
+{
+    if (! tryEnter())
+    {
+        for (int i = 20; --i >= 0;)
+            if (tryEnter())
+                return;
+
+        while (! tryEnter())
+            Thread::yield();
+    }
+}
+
+}
+
+//------------------------------------------------------------------------------
+
+#if BEAST_WINDOWS
+
+#include <windows.h>
+#include <process.h>
+#include <tchar.h>
+
+namespace beast {
+
+HWND beast_messageWindowHandle = 0;  // (this is used by other parts of the codebase)
+
+void BEAST_API beast_threadEntryPoint (void*);
+
+static unsigned int __stdcall threadEntryProc (void* userData)
+{
+    if (beast_messageWindowHandle != 0)
+        AttachThreadInput (GetWindowThreadProcessId (beast_messageWindowHandle, 0),
+                           GetCurrentThreadId(), TRUE);
+
+    beast_threadEntryPoint (userData);
+
+    _endthreadex (0);
+    return 0;
+}
+
+void Thread::launchThread()
+{
+    unsigned int newThreadId;
+    threadHandle = (void*) _beginthreadex (0, 0, &threadEntryProc, this, 0, &newThreadId);
+    threadId = (ThreadID) newThreadId;
+}
+
+void Thread::closeThreadHandle()
+{
+    CloseHandle ((HANDLE) threadHandle);
+    threadId = 0;
+    threadHandle = 0;
+}
+
+void Thread::killThread()
+{
+    if (threadHandle != 0)
+    {
+       #if BEAST_DEBUG
+        OutputDebugStringA ("** Warning - Forced thread termination **\n");
+       #endif
+        TerminateThread (threadHandle, 0);
+    }
+}
+
+void Thread::setCurrentThreadName (const String& name)
+{
+   #if BEAST_DEBUG && BEAST_MSVC
+    struct
+    {
+        DWORD dwType;
+        LPCSTR szName;
+        DWORD dwThreadID;
+        DWORD dwFlags;
+    } info;
+
+    info.dwType = 0x1000;
+    info.szName = name.toUTF8();
+    info.dwThreadID = GetCurrentThreadId();
+    info.dwFlags = 0;
+
+    __try
+    {
+        RaiseException (0x406d1388 /*MS_VC_EXCEPTION*/, 0, sizeof (info) / sizeof (ULONG_PTR), (ULONG_PTR*) &info);
+    }
+    __except (EXCEPTION_CONTINUE_EXECUTION)
+    {}
+   #else
+    (void) name;
+   #endif
+}
+
+Thread::ThreadID Thread::getCurrentThreadId()
+{
+    return (ThreadID) (pointer_sized_int) GetCurrentThreadId();
+}
+
+bool Thread::setThreadPriority (void* handle, int priority)
+{
+    int pri = THREAD_PRIORITY_TIME_CRITICAL;
+
+    if (priority < 1)       pri = THREAD_PRIORITY_IDLE;
+    else if (priority < 2)  pri = THREAD_PRIORITY_LOWEST;
+    else if (priority < 5)  pri = THREAD_PRIORITY_BELOW_NORMAL;
+    else if (priority < 7)  pri = THREAD_PRIORITY_NORMAL;
+    else if (priority < 9)  pri = THREAD_PRIORITY_ABOVE_NORMAL;
+    else if (priority < 10) pri = THREAD_PRIORITY_HIGHEST;
+
+    if (handle == 0)
+        handle = GetCurrentThread();
+
+    return SetThreadPriority (handle, pri) != FALSE;
+}
+
+void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask)
+{
+    SetThreadAffinityMask (GetCurrentThread(), affinityMask);
+}
+
+struct SleepEvent
+{
+    SleepEvent() noexcept
+        : handle (CreateEvent (nullptr, FALSE, FALSE,
+                              #if BEAST_DEBUG
+                               _T("BEAST Sleep Event")))
+                              #else
+                               nullptr))
+                              #endif
+    {}
+
+    ~SleepEvent() noexcept
+    {
+        CloseHandle (handle);
+        handle = 0;
+    }
+
+    HANDLE handle;
+};
+
+static SleepEvent sleepEvent;
+
+void BEAST_CALLTYPE Thread::sleep (const int millisecs)
+{
+    if (millisecs >= 10 || sleepEvent.handle == 0)
+    {
+        Sleep ((DWORD) millisecs);
+    }
+    else
+    {
+        // unlike Sleep() this is guaranteed to return to the current thread after
+        // the time expires, so we'll use this for short waits, which are more likely
+        // to need to be accurate
+        WaitForSingleObject (sleepEvent.handle, (DWORD) millisecs);
+    }
+}
+
+void Thread::yield()
+{
+    Sleep (0);
+}
+
+}
+
+//------------------------------------------------------------------------------
+
+#else
+
+#include <time.h>
+#if BEAST_BSD
+ // ???
+#else
+# include <sys/prctl.h>
+#endif
+
+namespace beast {
+
+void BEAST_CALLTYPE Thread::sleep (int millisecs)
+{
+    struct timespec time;
+    time.tv_sec = millisecs / 1000;
+    time.tv_nsec = (millisecs % 1000) * 1000000;
+    nanosleep (&time, nullptr);
+}
+
+void BEAST_API beast_threadEntryPoint (void*);
+
+extern "C" void* threadEntryProc (void*);
+extern "C" void* threadEntryProc (void* userData)
+{
+    BEAST_AUTORELEASEPOOL
+    {
+       #if BEAST_ANDROID
+        struct AndroidThreadScope
+        {
+            AndroidThreadScope()   { threadLocalJNIEnvHolder.attach(); }
+            ~AndroidThreadScope()  { threadLocalJNIEnvHolder.detach(); }
+        };
+
+        const AndroidThreadScope androidEnv;
+       #endif
+
+        beast_threadEntryPoint (userData);
+    }
+
+    return nullptr;
+}
+
+void Thread::launchThread()
+{
+    threadHandle = 0;
+    pthread_t handle = 0;
+
+    if (pthread_create (&handle, 0, threadEntryProc, this) == 0)
+    {
+        pthread_detach (handle);
+        threadHandle = (void*) handle;
+        threadId = (ThreadID) threadHandle;
+    }
+}
+
+void Thread::closeThreadHandle()
+{
+    threadId = 0;
+    threadHandle = 0;
+}
+
+void Thread::killThread()
+{
+    if (threadHandle != 0)
+    {
+       #if BEAST_ANDROID
+        bassertfalse; // pthread_cancel not available!
+       #else
+        pthread_cancel ((pthread_t) threadHandle);
+       #endif
+    }
+}
+
+void Thread::setCurrentThreadName (const String& name)
+{
+   #if BEAST_IOS || (BEAST_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
+    BEAST_AUTORELEASEPOOL
+    {
+        [[NSThread currentThread] setName: beastStringToNS (name)];
+    }
+   #elif BEAST_LINUX
+    #if (__GLIBC__ * 1000 + __GLIBC_MINOR__) >= 2012
+     pthread_setname_np (pthread_self(), name.toRawUTF8());
+    #else
+     prctl (PR_SET_NAME, name.toRawUTF8(), 0, 0, 0);
+    #endif
+   #endif
+}
+
+bool Thread::setThreadPriority (void* handle, int priority)
+{
+    struct sched_param param;
+    int policy;
+    priority = blimit (0, 10, priority);
+
+    if (handle == nullptr)
+        handle = (void*) pthread_self();
+
+    if (pthread_getschedparam ((pthread_t) handle, &policy, &param) != 0)
+        return false;
+
+    policy = priority == 0 ? SCHED_OTHER : SCHED_RR;
+
+    const int minPriority = sched_get_priority_min (policy);
+    const int maxPriority = sched_get_priority_max (policy);
+
+    param.sched_priority = ((maxPriority - minPriority) * priority) / 10 + minPriority;
+    return pthread_setschedparam ((pthread_t) handle, policy, &param) == 0;
+}
+
+Thread::ThreadID Thread::getCurrentThreadId()
+{
+    return (ThreadID) pthread_self();
+}
+
+void Thread::yield()
+{
+    sched_yield();
+}
+
+//==============================================================================
+/* Remove this macro if you're having problems compiling the cpu affinity
+   calls (the API for these has changed about quite a bit in various Linux
+   versions, and a lot of distros seem to ship with obsolete versions)
+*/
+#if defined (CPU_ISSET) && ! defined (SUPPORT_AFFINITIES)
+ #define SUPPORT_AFFINITIES 1
+#endif
+
+void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask)
+{
+   #if SUPPORT_AFFINITIES
+    cpu_set_t affinity;
+    CPU_ZERO (&affinity);
+
+    for (int i = 0; i < 32; ++i)
+        if ((affinityMask & (1 << i)) != 0)
+            CPU_SET (i, &affinity);
+
+    /*
+       N.B. If this line causes a compile error, then you've probably not got the latest
+       version of glibc installed.
+
+       If you don't want to update your copy of glibc and don't care about cpu affinities,
+       then you can just disable all this stuff by setting the SUPPORT_AFFINITIES macro to 0.
+    */
+    sched_setaffinity (getpid(), sizeof (cpu_set_t), &affinity);
+    sched_yield();
+
+   #else
+    /* affinities aren't supported because either the appropriate header files weren't found,
+       or the SUPPORT_AFFINITIES macro was turned off
+    */
+    bassertfalse;
+    (void) affinityMask;
+   #endif
+}
+
+}
+
+//------------------------------------------------------------------------------
+
+#endif
+
diff --git a/beast/threads/impl/WaitableEvent.cpp b/beast/threads/impl/WaitableEvent.cpp
new file mode 100644
index 0000000000..9e882c499b
--- /dev/null
+++ b/beast/threads/impl/WaitableEvent.cpp
@@ -0,0 +1,168 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../WaitableEvent.h"
+
+#if BEAST_WINDOWS
+
+#include <Windows.h>
+#undef check
+#undef direct
+#undef max
+#undef min
+#undef TYPE_BOOL
+
+namespace beast {
+
+WaitableEvent::WaitableEvent (const bool manualReset, bool initiallySignaled)
+    : handle (CreateEvent (0, manualReset ? TRUE : FALSE, initiallySignaled ? TRUE : FALSE, 0))
+{
+}
+
+WaitableEvent::~WaitableEvent()
+{
+    CloseHandle (handle);
+}
+
+void WaitableEvent::signal() const
+{
+    SetEvent (handle);
+}
+
+void WaitableEvent::reset() const
+{
+    ResetEvent (handle);
+}
+
+bool WaitableEvent::wait () const
+{
+    return WaitForSingleObject (handle, INFINITE) == WAIT_OBJECT_0;
+}
+
+bool WaitableEvent::wait (const int timeOutMs) const
+{
+    if (timeOutMs >= 0)
+        return WaitForSingleObject (handle,
+            (DWORD) timeOutMs) == WAIT_OBJECT_0;
+    return wait ();
+}
+
+}
+
+#else
+
+namespace beast {
+
+WaitableEvent::WaitableEvent (const bool useManualReset, bool initiallySignaled)
+    : triggered (false), manualReset (useManualReset)
+{
+    pthread_cond_init (&condition, 0);
+
+    pthread_mutexattr_t atts;
+    pthread_mutexattr_init (&atts);
+   #if ! BEAST_ANDROID
+    pthread_mutexattr_setprotocol (&atts, PTHREAD_PRIO_INHERIT);
+   #endif
+    pthread_mutex_init (&mutex, &atts);
+
+    if (initiallySignaled)
+        signal ();
+}
+
+WaitableEvent::~WaitableEvent()
+{
+    pthread_cond_destroy (&condition);
+    pthread_mutex_destroy (&mutex);
+}
+
+bool WaitableEvent::wait () const
+{
+    return wait (-1);
+}
+
+bool WaitableEvent::wait (const int timeOutMillisecs) const
+{
+    pthread_mutex_lock (&mutex);
+
+    if (! triggered)
+    {
+        if (timeOutMillisecs < 0)
+        {
+            do
+            {
+                pthread_cond_wait (&condition, &mutex);
+            }
+            while (! triggered);
+        }
+        else
+        {
+            struct timeval now;
+            gettimeofday (&now, 0);
+
+            struct timespec time;
+            time.tv_sec  = now.tv_sec  + (timeOutMillisecs / 1000);
+            time.tv_nsec = (now.tv_usec + ((timeOutMillisecs % 1000) * 1000)) * 1000;
+
+            if (time.tv_nsec >= 1000000000)
+            {
+                time.tv_nsec -= 1000000000;
+                time.tv_sec++;
+            }
+
+            do
+            {
+                if (pthread_cond_timedwait (&condition, &mutex, &time) == ETIMEDOUT)
+                {
+                    pthread_mutex_unlock (&mutex);
+                    return false;
+                }
+            }
+            while (! triggered);
+        }
+    }
+
+    if (! manualReset)
+        triggered = false;
+
+    pthread_mutex_unlock (&mutex);
+    return true;
+}
+
+void WaitableEvent::signal() const
+{
+    pthread_mutex_lock (&mutex);
+    triggered = true;
+    pthread_cond_broadcast (&condition);
+    pthread_mutex_unlock (&mutex);
+}
+
+void WaitableEvent::reset() const
+{
+    pthread_mutex_lock (&mutex);
+    triggered = false;
+    pthread_mutex_unlock (&mutex);
+}
+
+}
+
+#endif
diff --git a/beast/type_traits/IntegralConstant.h b/beast/type_traits/IntegralConstant.h
new file mode 100644
index 0000000000..2ccc55a1e4
--- /dev/null
+++ b/beast/type_traits/IntegralConstant.h
@@ -0,0 +1,40 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_TYPE_TRAITS_INTEGRALCONSTANT_H_INCLUDED
+#define BEAST_TYPE_TRAITS_INTEGRALCONSTANT_H_INCLUDED
+
+namespace beast {
+
+// ideas from boost
+
+template <class T, T val>
+struct IntegralConstant
+{
+   typedef IntegralConstant <T, val> type;
+   typedef T                         value_type;
+   static const T value = val;
+};
+
+typedef IntegralConstant <bool, true>  TrueType;
+typedef IntegralConstant <bool, false> FalseType;
+
+}
+
+#endif
diff --git a/beast/type_traits/IsIntegral.h b/beast/type_traits/IsIntegral.h
new file mode 100644
index 0000000000..96b8840328
--- /dev/null
+++ b/beast/type_traits/IsIntegral.h
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_TYPE_TRAITS_ISINTEGRAL_H_INCLUDED
+#define BEAST_TYPE_TRAITS_ISINTEGRAL_H_INCLUDED
+
+#include "../CStdInt.h"
+#include "IntegralConstant.h"
+
+namespace beast {
+
+template <typename T> struct IsIntegral : FalseType { };
+
+template <> struct IsIntegral <int8>    : TrueType { };
+template <> struct IsIntegral <int16>   : TrueType { };
+template <> struct IsIntegral <int32>   : TrueType { };
+template <> struct IsIntegral <int64>   : TrueType { };
+template <> struct IsIntegral <uint8>   : TrueType { };
+template <> struct IsIntegral <uint16>  : TrueType { };
+template <> struct IsIntegral <uint32>  : TrueType { };
+template <> struct IsIntegral <uint64>  : TrueType { };
+template <> struct IsIntegral <wchar_t> : TrueType { };
+
+}
+
+#endif
diff --git a/beast/type_traits/IsSigned.h b/beast/type_traits/IsSigned.h
new file mode 100644
index 0000000000..908dd62e09
--- /dev/null
+++ b/beast/type_traits/IsSigned.h
@@ -0,0 +1,40 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_TYPE_TRAITS_ISSIGNED_H_INCLUDED
+#define BEAST_TYPE_TRAITS_ISSIGNED_H_INCLUDED
+
+#include "IntegralConstant.h"
+#include "../CStdInt.h"
+
+namespace beast {
+
+template <typename T> struct IsSigned : FalseType { };
+
+template <> struct IsSigned <int8>    : TrueType { };
+template <> struct IsSigned <int16>   : TrueType { };
+template <> struct IsSigned <int32>   : TrueType { };
+template <> struct IsSigned <int64>   : TrueType { };
+template <> struct IsSigned <float>   : TrueType { };
+template <> struct IsSigned <double>  : TrueType { };
+template <> struct IsSigned <wchar_t> : TrueType { };
+
+}
+
+#endif
diff --git a/beast/type_traits/RemoveSigned.h b/beast/type_traits/RemoveSigned.h
new file mode 100644
index 0000000000..e159d4d4bb
--- /dev/null
+++ b/beast/type_traits/RemoveSigned.h
@@ -0,0 +1,45 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_TYPE_TRAITS_REMOVESIGNED_H_INCLUDED
+#define BEAST_TYPE_TRAITS_REMOVESIGNED_H_INCLUDED
+
+#include "IntegralConstant.h"
+#include "../CStdInt.h"
+
+namespace beast {
+
+/** Returns an equally sized, unsigned type.
+    Requires:
+        IsIntegral<T>::value == true
+*/
+template <typename T>
+struct RemoveSigned
+{
+    typedef T type;
+};
+
+template <> struct RemoveSigned <int8>   { typedef uint8  type; };
+template <> struct RemoveSigned <int16>  { typedef uint16 type; };
+template <> struct RemoveSigned <int32>  { typedef uint32 type; };
+template <> struct RemoveSigned <int64>  { typedef uint64 type; };
+
+}
+
+#endif
diff --git a/beast/utility/BaseFromMember.h b/beast/utility/BaseFromMember.h
new file mode 100644
index 0000000000..e2103b6493
--- /dev/null
+++ b/beast/utility/BaseFromMember.h
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of rippled: https://github.com/ripple/rippled
+    Copyright (c) 2012, 2013 Ripple Labs Inc.
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_UTILITY_BASEFROMMEMBER_H_INCLUDED
+#define BEAST_UTILITY_BASEFROMMEMBER_H_INCLUDED
+
+namespace beast {
+
+template <typename T, int UniqueID = 0>
+class BaseFromMember
+{
+private:
+    T m_t;
+
+public:
+    BaseFromMember ()
+        : m_t (T())
+    {
+    }
+
+    template <class P1>
+    explicit BaseFromMember (P1 const& p1)
+        : m_t (p1)
+        { }
+
+    template <class P1, class P2>
+    BaseFromMember (P1 const& p1, P2 const& p2)
+        : m_t (p1, p2)
+        { }
+
+    template <class P1, class P2, class P3>
+    BaseFromMember (P1 const& p1, P2 const& p2, P3 const& p3)
+        : m_t (p1, p2, p3)
+        { }
+
+    template <class P1, class P2, class P3, class P4>
+    BaseFromMember (P1 const& p1, P2 const& p2, P3 const& p3, P4 const& p4)
+        : m_t (p1, p2, p3, p4)
+        { }
+
+    template <class P1, class P2, class P3, class P4, class P5>
+    BaseFromMember (P1 const& p1, P2 const& p2, P3 const& p3, P4 const& p4, P5 const& p5)
+        : m_t (p1, p2, p3, p4, p5)
+        { }
+
+    T& member()
+        { return m_t; }
+
+    T const& member() const
+        { return m_t; }
+};
+
+}
+
+#endif
diff --git a/modules/beast_core/diagnostic/beast_Debug.h b/beast/utility/Debug.h
similarity index 95%
rename from modules/beast_core/diagnostic/beast_Debug.h
rename to beast/utility/Debug.h
index e80418e042..0a1d5e3e0f 100644
--- a/modules/beast_core/diagnostic/beast_Debug.h
+++ b/beast/utility/Debug.h
@@ -17,8 +17,12 @@
 */
 //==============================================================================
 
-#ifndef BEAST_DEBUG_H_INCLUDED
-#define BEAST_DEBUG_H_INCLUDED
+#ifndef BEAST_UTILITY_DEBUG_H_INCLUDED
+#define BEAST_UTILITY_DEBUG_H_INCLUDED
+
+#include "../strings/String.h"
+    
+namespace beast {
 
 // Auxiliary outines for debugging
 
@@ -83,4 +87,6 @@ extern void checkHeap ();
 
 }
 
+}
+
 #endif
diff --git a/beast/utility/EnableIf.h b/beast/utility/EnableIf.h
new file mode 100644
index 0000000000..51087fa41f
--- /dev/null
+++ b/beast/utility/EnableIf.h
@@ -0,0 +1,48 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_UTILITY_ENABLEIF_H_INCLUDED
+#define BEAST_UTILITY_ENABLEIF_H_INCLUDED
+
+#include "../type_traits/IntegralConstant.h"
+
+namespace beast
+{
+
+template <bool Enable, class T = void>
+struct EnableIfBool : TrueType { typedef T type; };
+
+template <class T>
+struct EnableIfBool <false, T> : FalseType { };
+
+template <class Cond, class T = void>
+struct EnableIf : public EnableIfBool <Cond::value, T> { };
+
+template <bool Enable, class T = void>
+struct DisableIfBool : FalseType { typedef T type; };
+
+template <class T>
+struct DisableIfBool <true, T> { };
+
+template <class Cond, class T = void>
+struct DisableIf : public DisableIfBool <Cond::value, T> { };
+
+}
+
+#endif
diff --git a/modules/beast_core/diagnostic/beast_Error.h b/beast/utility/Error.h
similarity index 95%
rename from modules/beast_core/diagnostic/beast_Error.h
rename to beast/utility/Error.h
index 946270b758..f9b188925e 100644
--- a/modules/beast_core/diagnostic/beast_Error.h
+++ b/beast/utility/Error.h
@@ -17,8 +17,17 @@
 */
 //==============================================================================
 
-#ifndef BEAST_ERROR_H_INCLUDED
-#define BEAST_ERROR_H_INCLUDED
+#ifndef BEAST_UTILITY_ERROR_H_INCLUDED
+#define BEAST_UTILITY_ERROR_H_INCLUDED
+
+#include "../Config.h"
+
+#include "../SafeBool.h"
+#include "../strings/String.h"
+
+#include <stdexcept>
+
+namespace beast {
 
 /** A concise error report.
 
@@ -32,7 +41,7 @@
 
     @ingroup beast_core
 */
-class BEAST_API Error
+class Error
     : public std::exception
     , public SafeBool <Error>
 {
@@ -119,4 +128,6 @@ private:
     mutable char const* m_szWhat;
 };
 
+}
+
 #endif
diff --git a/beast/utility/Journal.h b/beast/utility/Journal.h
new file mode 100644
index 0000000000..e262d98a45
--- /dev/null
+++ b/beast/utility/Journal.h
@@ -0,0 +1,193 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_UTILITY_JOURNAL_H_INCLUDED
+#define BEAST_UTILITY_JOURNAL_H_INCLUDED
+
+#include <sstream>
+
+namespace beast
+{
+
+/** A generic endpoint for log messages. */
+class Journal
+{
+public:
+    class Sink;
+
+private:
+    Sink* m_sink;
+
+public:
+    /** Severity level of the message. */
+    enum Severity
+    {
+        kLowestSeverity = 0,
+        kTrace = kLowestSeverity,
+        kDebug,
+        kInfo,
+        kWarning,
+        kError,
+        kFatal,
+
+        kDisabled
+    };
+
+    //--------------------------------------------------------------------------
+
+    /** Abstraction for the underlying message destination. */
+    class Sink
+    {
+    public:
+        virtual ~Sink () { }
+
+        /** Write text to the sink at the specified severity. */
+        virtual void write (Severity severity, std::string const& text) = 0;
+
+        /** Returns `true` if text at the passed severity produces output. */
+        virtual bool active (Severity severity) = 0;
+
+        /** Returns `true` if a message is also written to the Output Window (MSVC). */
+        virtual bool console () = 0;
+
+        /** Set the minimum severity this sink will report. */
+        virtual void set_severity (Severity severity) = 0;
+
+        /** Set whether messages are also written to the Output Window (MSVC). */
+        virtual void set_console (bool to_console) = 0;
+    };
+
+    /** Returns a Sink which does nothing. */
+    static Sink& getNullSink ();
+
+    //--------------------------------------------------------------------------
+    
+    class Stream;
+
+    /** Scoped ostream-based container for writing messages to a Journal. */
+    class ScopedStream
+    {
+    public:
+        explicit ScopedStream (Stream const& stream);
+        ScopedStream (ScopedStream const& other);
+
+        template <typename T>
+        ScopedStream (Stream const& stream, T const& t)
+            : m_sink (stream.sink())
+            , m_severity (stream.severity())
+        {
+            m_ostream << t;
+        }
+
+        ScopedStream (Stream const& stream, std::ostream& manip (std::ostream&));
+
+        ~ScopedStream ();
+
+        std::ostringstream& ostream () const;
+
+        std::ostream& operator<< (std::ostream& manip (std::ostream&)) const;
+
+        template <typename T>
+        std::ostream& operator<< (T const& t) const
+        {
+            return m_ostream << t;
+        }
+
+    private:
+        ScopedStream& operator= (ScopedStream const&); // disallowed
+
+        Sink& m_sink;
+        Severity const m_severity;
+        std::ostringstream mutable m_ostream;
+        bool m_toOutputWindow;
+    };
+
+    //--------------------------------------------------------------------------
+
+    class Stream
+    {
+    public:
+        /** Construct a stream which produces no logging output. */
+        Stream ();
+
+        /** Construct a stream that writes to the Sink at the given Severity. */
+        Stream (Sink& sink, Severity severity);
+
+        /** Construct or copy another Stream. */
+        /** @{ */
+        Stream (Stream const& other);
+        Stream& operator= (Stream const& other);
+        /** @} */
+
+        /** Returns the Sink that this Stream writes to. */
+        Sink& sink() const;
+
+        /** Returns the Severity of messages this Stream reports. */
+        Severity severity() const;
+
+        /** Returns `true` if sink logs anything at this stream's severity. */
+        bool active() const;
+
+        /** Output stream support. */
+        /** @{ */
+        ScopedStream operator<< (std::ostream& manip (std::ostream&)) const;
+
+        template <typename T>
+        ScopedStream operator<< (T const& t) const
+        {
+            return ScopedStream (*this, t);
+        }
+        /** @} */
+
+    private:
+        Sink* m_sink;
+        Severity m_severity;
+    };
+
+    //--------------------------------------------------------------------------
+
+    Journal ();
+    explicit Journal (Sink& sink);
+    Journal (Journal const& other);
+    ~Journal ();
+
+    /** Returns the Sink associated with this Journal. */
+    Sink& sink() const;
+
+    /** Returns a stream for this sink, with the specified severity. */
+    Stream stream (Severity severity) const;
+
+    /** Returns `true` if any message would be logged at this severity level. */
+    bool active (Severity severity) const;
+
+    /** Convenience sink streams for each severity level. */
+    Stream const trace;
+    Stream const debug;
+    Stream const info;
+    Stream const warning;
+    Stream const error;
+    Stream const fatal;
+
+private:
+    Journal& operator= (Journal const& other); // disallowed
+};
+
+}
+
+#endif
diff --git a/modules/beast_core/diagnostic/beast_LeakChecked.h b/beast/utility/LeakChecked.h
similarity index 74%
rename from modules/beast_core/diagnostic/beast_LeakChecked.h
rename to beast/utility/LeakChecked.h
index 4d84722422..296d315efb 100644
--- a/modules/beast_core/diagnostic/beast_LeakChecked.h
+++ b/beast/utility/LeakChecked.h
@@ -17,21 +17,32 @@
 */
 //==============================================================================
 
-#ifndef BEAST_LEAKCHECKED_H_INCLUDED
-#define BEAST_LEAKCHECKED_H_INCLUDED
+#ifndef BEAST_UTILITY_LEAKCHECKED_H_INCLUDED
+#define BEAST_UTILITY_LEAKCHECKED_H_INCLUDED
 
-namespace Implemented
-{
+#include "../Config.h"
+#include "../Atomic.h"
+#include "../intrusive/LockFreeStack.h"
+#include "StaticObject.h"
 
-class BEAST_API LeakCheckedBase
+namespace beast {
+
+namespace detail {
+
+class LeakCheckedBase
 {
+public:
+    static void checkForLeaks ();
+
 protected:
-    class CounterBase : public LockFreeStack <CounterBase>::Node
+    class LeakCounterBase : public LockFreeStack <LeakCounterBase>::Node
     {
     public:
-        CounterBase ();
+        LeakCounterBase ();
 
-        virtual ~CounterBase () { }
+        virtual ~LeakCounterBase ()
+        {
+        }
 
         inline int increment ()
         {
@@ -47,24 +58,15 @@ protected:
 
     private:
         void checkForLeaks ();
-
         virtual void checkPureVirtual () const = 0;
 
-    private:
-        friend class LeakCheckedBase;
-
         class Singleton;
+        friend class LeakCheckedBase;
 
         Atomic <int> m_count;
     };
 
-protected:
     static void reportDanglingPointer (char const* objectName);
-
-private:
-    friend class PerformedAtExit::ExitHook;
-
-    static void checkForLeaks ();
 };
 
 //------------------------------------------------------------------------------
@@ -99,10 +101,10 @@ protected:
 private:
     // Singleton that maintains the count of this object
     //
-    class Counter : public CounterBase
+    class LeakCounter : public LeakCounterBase
     {
     public:
-        Counter () noexcept
+        LeakCounter () noexcept
         {
         }
 
@@ -127,20 +129,9 @@ private:
 
     // Retrieve the singleton for this object
     //
-    static Counter& getCounter () noexcept
+    static LeakCounter& getCounter () noexcept
     {
-        static Counter* volatile s_instance;
-        static Static::Initializer s_initializer;
-
-        if (s_initializer.beginConstruction ())
-        {
-            static char s_storage [sizeof (Counter)];
-            s_instance = new (s_storage) Counter;
-
-            s_initializer.endConstruction ();
-        }
-
-        return *s_instance;
+        return StaticObject <LeakCounter>::get();
     }
 };
 
@@ -148,35 +139,42 @@ private:
 
 //------------------------------------------------------------------------------
 
-namespace Dummy
+namespace detail
 {
 
-class BEAST_API LeakCheckedBase
+namespace disabled
 {
-private:
-    friend class PerformedAtExit;
 
+class LeakCheckedBase
+{
 public:
-    static void checkForLeaks () { }
+    static void checkForLeaks ()
+    {
+    }
 };
 
 template <class Object>
-struct LeakChecked : LeakCheckedBase
+class LeakChecked : public LeakCheckedBase
 {
+public:
 };
 
 }
 
+}
+
 //------------------------------------------------------------------------------
 
-// Lift the corresponding implementation
+// Lift the appropriate implementation into our namespace
 //
 #if BEAST_CHECK_MEMORY_LEAKS
-using Implemented::LeakChecked;
-using Implemented::LeakCheckedBase;
+using detail::LeakChecked;
+using detail::LeakCheckedBase;
 #else
-using Dummy::LeakChecked;
-using Dummy::LeakCheckedBase;
+using detail::disabled::LeakChecked;
+using detail::disabled::LeakCheckedBase;
 #endif
 
+}
+
 #endif
diff --git a/beast/utility/PropertyStream.h b/beast/utility/PropertyStream.h
new file mode 100644
index 0000000000..2871499718
--- /dev/null
+++ b/beast/utility/PropertyStream.h
@@ -0,0 +1,297 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_UTILITY_PROPERTYSTREAM_H_INCLUDED
+#define BEAST_UTILITY_PROPERTYSTREAM_H_INCLUDED
+
+#include "../CStdInt.h"
+#include "../Uncopyable.h"
+#include "../intrusive/List.h"
+#include "../threads/SharedData.h"
+
+#include <sstream>
+#include <string>
+#include <utility>
+
+namespace beast {
+
+//------------------------------------------------------------------------------
+
+/** Abstract stream with RAII containers that produce a property tree. */
+class PropertyStream
+{
+public:
+    class Map;
+    class Set;
+    class Source;
+
+    PropertyStream ();
+    virtual ~PropertyStream ();
+
+protected:
+    virtual void map_begin () = 0;
+    virtual void map_begin (std::string const& key) = 0;
+    virtual void map_end () = 0;
+
+    virtual void add (std::string const& key, std::string const& value) = 0;
+
+    template <typename Value>
+    void lexical_add (std::string const &key, Value value)
+    {
+        std::stringstream ss;
+        ss << value;
+        add (key, ss.str());
+    }
+    virtual void add (std::string const& key,   int32 value);
+    virtual void add (std::string const& key,  uint32 value);
+    virtual void add (std::string const& key,   int64 value);
+    virtual void add (std::string const& key,  uint64 value);
+
+    virtual void array_begin () = 0;
+    virtual void array_begin (std::string const& key) = 0;
+    virtual void array_end () = 0;
+
+    virtual void add (std::string const& value) = 0;
+
+    template <typename Value>
+    void lexical_add (Value value)
+    {
+        std::stringstream ss;
+        ss << value;
+        add (ss.str());
+    }
+    virtual void add ( int32 value);
+    virtual void add (uint32 value);
+    virtual void add ( int64 value);
+    virtual void add (uint64 value);
+
+private:
+    class Item;
+    class Proxy;
+};
+
+//------------------------------------------------------------------------------
+//
+// Item
+//
+
+class PropertyStream::Item : public List <Item>::Node
+{
+public:
+    explicit Item (Source* source);
+    Source& source() const;
+    Source* operator-> () const;
+    Source& operator* () const;
+private:
+    Source* m_source;
+};
+
+//------------------------------------------------------------------------------
+//
+// Proxy
+//
+
+class PropertyStream::Proxy
+{
+private:
+	Map const* m_map;
+    std::string m_key;
+
+public:
+    Proxy (Map const& map, std::string const& key);
+
+    template <typename Value>
+    Proxy& operator= (Value value);
+};
+
+//------------------------------------------------------------------------------
+//
+// Map
+//
+
+class PropertyStream::Map : public Uncopyable
+{
+private:
+    PropertyStream& m_stream;
+
+public:
+    explicit Map (PropertyStream& stream);
+    explicit Map (Set& parent);
+    Map (std::string const& key, Map& parent);
+    Map (std::string const& key, PropertyStream& stream);
+    ~Map ();
+
+    PropertyStream& stream();
+    PropertyStream const& stream() const;
+
+    template <typename Value>
+    void add (std::string const& key, Value value) const
+    {
+        m_stream.add (key, value);
+    }
+
+    template <typename Key, typename Value>
+    void add (Key key, Value value) const
+    {
+        std::stringstream ss;
+        ss << key;
+        add (ss.str(), value);
+    }
+
+    Proxy operator[] (std::string const& key);    
+
+    Proxy operator[] (char const* key)
+        { return Proxy (*this, key); }
+
+    template <typename Key>
+    Proxy operator[] (Key key) const
+    {
+        std::stringstream ss;
+        ss << key;
+        return Proxy (*this, ss.str());
+    }
+};
+
+//--------------------------------------------------------------------------
+
+template <typename Value>
+PropertyStream::Proxy& PropertyStream::Proxy::operator= (Value value)
+{
+    m_map->add (m_key, value);
+    return *this;
+}
+
+//--------------------------------------------------------------------------
+//
+// Set
+//
+
+class PropertyStream::Set : public Uncopyable
+{
+private:
+    PropertyStream& m_stream;
+
+public:
+    explicit Set (Set& set);
+    Set (std::string const& key, Map& map);
+    Set (std::string const& key, PropertyStream& stream);
+    ~Set ();
+
+    PropertyStream& stream();
+    PropertyStream const& stream() const;
+
+    template <typename Value>
+    void add (Value value) const
+        { m_stream.add (value); }
+};
+
+//------------------------------------------------------------------------------
+//
+// Source
+//
+
+/** Subclasses can be called to write to a stream and have children. */
+class PropertyStream::Source : public Uncopyable
+{
+private:
+    struct State
+    {
+        explicit State (Source* source)
+            : item (source)
+            , parent (nullptr)
+            { }
+
+        Item item;
+        Source* parent;
+        List <Item> children;
+    };
+
+    typedef SharedData <State> SharedState;
+
+    std::string const m_name;
+    SharedState m_state;
+
+    //--------------------------------------------------------------------------
+
+    void remove    (SharedState::Access& state,
+                    SharedState::Access& childState);
+
+    void removeAll (SharedState::Access& state);
+
+    void write     (SharedState::Access& state, PropertyStream& stream);
+
+public:
+    explicit Source (std::string const& name);
+    ~Source ();
+
+    /** Returns the name of this source. */
+    std::string const& name() const;
+
+    /** Add a child source. */
+    void add (Source& source);
+
+    /** Add a child source by pointer.
+        The source pointer is returned so it can be used in ctor-initializers.
+    */
+    template <class Derived>
+    Derived* add (Derived* child)
+    {
+        add (*static_cast <Source*>(child));
+        return child;
+    }
+
+    /** Remove a child source from this Source. */
+    void remove (Source& child);
+
+    /** Remove all child sources of this Source. */
+    void removeAll ();
+
+    /** Write only this Source to the stream. */
+    void write_one  (PropertyStream& stream);
+
+    /** write this source and all its children recursively to the stream. */
+    void write      (PropertyStream& stream);
+
+    /** Parse the path and write the corresponding Source and optional children.
+        If the source is found, it is written. If the wildcard character '*'
+        exists as the last character in the path, then all the children are
+        written recursively.
+    */
+    void write      (PropertyStream& stream, std::string const& path);
+
+    /** Parse the dot-delimited Source path and return the result.
+        The first value will be a pointer to the Source object corresponding
+        to the given path. If no Source object exists, then the first value
+        will be nullptr and the second value will be undefined.
+        The second value is a boolean indicating whether or not the path string
+        specifies the wildcard character '*' as the last character.
+    */
+    std::pair <Source*, bool> find (std::string const& path);
+
+    //--------------------------------------------------------------------------
+
+    /** Subclass override.
+        The default version does nothing.
+    */
+    virtual void onWrite (Map&);
+};
+
+}
+
+#endif
diff --git a/beast/utility/StaticObject.h b/beast/utility/StaticObject.h
new file mode 100644
index 0000000000..30ab11cb9d
--- /dev/null
+++ b/beast/utility/StaticObject.h
@@ -0,0 +1,113 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_UTILITY_STATICOBJECT_H_INCLUDED
+#define BEAST_UTILITY_STATICOBJECT_H_INCLUDED
+
+namespace beast {
+
+// Spec: N2914=09-0104
+//
+// [3.6.2] Initialization of non-local objects
+//
+//         Objects with static storage duration (3.7.1) or thread storage
+//         duration (3.7.2) shall be zero-initialized (8.5) before any
+//         other initialization takes place.
+//
+
+namespace detail {
+
+extern void staticObjectWait (std::size_t n);
+
+}
+
+/** Wrapper to produce an object with static storage duration.
+    
+    The object is constructed in a thread-safe fashion when the get function
+    is first called. Note that the destructor for Object is never called. To
+    invoke the destructor, use the AtExitHook facility (with caution).
+
+    The Tag parameter allows multiple instances of the same Object type, by
+    using different tags.
+
+    Object must meet these requirements:
+        DefaultConstructible
+
+    @see AtExitHook
+*/
+template <class Object, typename Tag = void>
+class StaticObject
+{
+public:
+    static Object& get ()
+    {
+        StaticData& staticData (StaticData::get());
+
+        if (staticData.state.get() != initialized)
+        {
+            if (staticData.state.compareAndSetBool (initializing, uninitialized))
+            {
+                // Initialize the object.
+                new (&staticData.object) Object;
+                staticData.state = initialized;
+            }
+            else
+            {
+                for (std::size_t n = 0; staticData.state.get() != initialized; ++n)
+                {
+                    detail::staticObjectWait (n);
+                }
+            }
+        }
+
+        return staticData.object;
+    }
+
+private:
+    enum
+    {
+        uninitialized = 0,          // must be zero to function properly
+        initializing,
+        initialized
+    };
+
+    // This structure gets zero-filled at static initialization time.
+    // No constructors are called.
+    //
+    class StaticData : public Uncopyable
+    {
+    public:
+        Atomic <int> state;
+        Object object;
+
+        static StaticData& get ()
+        {
+            static uint8 storage [sizeof (StaticData)];
+            return *(reinterpret_cast <StaticData*> (&storage [0]));
+        }
+
+    private:
+        StaticData();
+        ~StaticData();
+    };
+};
+
+}
+
+#endif
diff --git a/beast/utility/Utility.cpp b/beast/utility/Utility.cpp
new file mode 100644
index 0000000000..e2b254bfdb
--- /dev/null
+++ b/beast/utility/Utility.cpp
@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "impl/Error.cpp"
+
+// For Journal and Debug
+#include "../../modules/beast_core/beast_core.h"
+
+#include "impl/Debug.cpp"
+#include "impl/Journal.cpp"
+#include "impl/LeakChecked.cpp"
+#include "impl/StaticObject.cpp"
+#include "impl/PropertyStream.cpp"
diff --git a/modules/beast_core/diagnostic/beast_Debug.cpp b/beast/utility/impl/Debug.cpp
similarity index 86%
rename from modules/beast_core/diagnostic/beast_Debug.cpp
rename to beast/utility/impl/Debug.cpp
index 3580b04540..d3a26e0aad 100644
--- a/modules/beast_core/diagnostic/beast_Debug.cpp
+++ b/beast/utility/impl/Debug.cpp
@@ -17,8 +17,9 @@
 */
 //==============================================================================
 
-namespace Debug
-{
+namespace beast {
+
+namespace Debug {
 
 void breakPoint ()
 {
@@ -296,19 +297,57 @@ String commandLineToString (const String& commandLine)
 
 //------------------------------------------------------------------------------
 
+// A simple unit test to determine the diagnostic settings in a build.
+//
 class DebugTests : public UnitTest
 {
 public:
-    DebugTests () : UnitTest ("Debug", "beast", runManual)
+    static int envDebug ()
     {
+    #ifdef _DEBUG
+        return 1;
+    #else
+        return 0;
+    #endif
+    }
+
+    static int beastDebug ()
+    {
+    #ifdef BEAST_DEBUG
+        return BEAST_DEBUG;
+    #else
+        return 0;
+    #endif
+    }
+
+    static int beastForceDebug ()
+    {
+    #ifdef BEAST_FORCE_DEBUG
+        return BEAST_FORCE_DEBUG;
+    #else
+        return 0;
+    #endif
     }
 
     void runTest ()
     {
-        beginTestCase ("bassert");
+        beginTestCase ("diagnostics");
+
+        logMessage ("operatingSystemName              = '" + SystemStats::getOperatingSystemName () + "'");
+        logMessage ("_DEBUG                           = " + String::fromNumber (envDebug ()));
+        logMessage ("BEAST_DEBUG                      = " + String::fromNumber (beastDebug ()));
+        logMessage ("BEAST_FORCE_DEBUG                = " + String::fromNumber (beastForceDebug ()));
+        logMessage ("sizeof(std::size_t)              = " + String::fromNumber (sizeof(std::size_t)));
         bassertfalse;
+
         fail ();
     }
+
+    DebugTests () : UnitTest ("Debug", "beast", runManual)
+    {
+    }
 };
 
 static DebugTests debugTests;
+
+}
diff --git a/modules/beast_core/diagnostic/beast_Error.cpp b/beast/utility/impl/Error.cpp
similarity index 96%
rename from modules/beast_core/diagnostic/beast_Error.cpp
rename to beast/utility/impl/Error.cpp
index 055d89a09a..9083413fed 100644
--- a/modules/beast_core/diagnostic/beast_Error.cpp
+++ b/beast/utility/impl/Error.cpp
@@ -17,6 +17,19 @@
 */
 //==============================================================================
 
+#include "../Error.h"
+#include "../Debug.h"
+
+#include <ostream>
+
+// VFALCO TODO Localizable strings
+#ifndef TRANS
+#define TRANS(s) (s)
+#define UNDEF_TRANS
+#endif
+
+namespace beast {
+
 Error::Error ()
     : m_code (success)
     , m_lineNumber (0)
@@ -241,3 +254,11 @@ String const Error::getReasonTextForCode (Code code)
 
     return s;
 }
+
+#ifdef UNDEF_TRANS
+#undef TRANs
+#undef UNDEF_TRANS
+#endif
+
+}
+
diff --git a/beast/utility/impl/Journal.cpp b/beast/utility/impl/Journal.cpp
new file mode 100644
index 0000000000..868e5ad64d
--- /dev/null
+++ b/beast/utility/impl/Journal.cpp
@@ -0,0 +1,205 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../Journal.h"
+
+namespace beast
+{
+
+//------------------------------------------------------------------------------
+
+// A Sink that does nothing.
+class NullJournalSink : public Journal::Sink
+{
+public:
+    void write (Journal::Severity, std::string const&)
+    {
+    }
+
+    bool active (Journal::Severity)
+    {
+        return false;
+    }
+
+    bool console ()
+    {
+        return false;
+    }
+
+    void set_severity (Journal::Severity)
+    {
+    }
+
+    void set_console (bool)
+    {
+    }
+};
+
+//------------------------------------------------------------------------------
+
+Journal::Sink& Journal::getNullSink ()
+{
+    return *SharedSingleton <NullJournalSink>::get (
+        SingletonLifetime::neverDestroyed);
+}
+
+//------------------------------------------------------------------------------
+
+Journal::ScopedStream::ScopedStream (Stream const& stream)
+    : m_sink (stream.sink())
+    , m_severity (stream.severity())
+{
+}
+
+Journal::ScopedStream::ScopedStream (ScopedStream const& other)
+    : m_sink (other.m_sink)
+    , m_severity (other.m_severity)
+{
+}
+
+Journal::ScopedStream::ScopedStream (Stream const& stream, std::ostream& manip (std::ostream&))
+    : m_sink (stream.sink())
+    , m_severity (stream.severity())
+{
+    m_ostream << manip;
+}
+
+Journal::ScopedStream::~ScopedStream ()
+{
+    if (! m_ostream.str().empty())
+    {
+        if (m_sink.active (m_severity))
+            m_sink.write (m_severity, m_ostream.str());
+    }
+}
+
+std::ostream& Journal::ScopedStream::operator<< (std::ostream& manip (std::ostream&)) const
+{
+    return m_ostream << manip;
+}
+
+std::ostringstream& Journal::ScopedStream::ostream () const
+{
+    return m_ostream;
+}
+
+//------------------------------------------------------------------------------
+
+Journal::Stream::Stream ()
+    : m_sink (&getNullSink ())
+    , m_severity (kDisabled)
+{
+}
+
+Journal::Stream::Stream (Sink& sink, Severity severity)
+    : m_sink (&sink)
+    , m_severity (severity)
+{
+    bassert (severity != kDisabled);
+}
+
+Journal::Stream::Stream (Stream const& other)
+    : m_sink (other.m_sink)
+    , m_severity (other.m_severity)
+{
+}
+
+Journal::Sink& Journal::Stream::sink () const
+{
+    return *m_sink;
+}
+
+Journal::Severity Journal::Stream::severity () const
+{
+    return m_severity;
+}
+
+bool Journal::Stream::active () const
+{
+    return m_sink->active (m_severity);
+}
+
+Journal::Stream& Journal::Stream::operator= (Stream const& other)
+{
+    m_sink = other.m_sink;
+    m_severity = other.m_severity;
+    return *this;
+}
+
+Journal::ScopedStream Journal::Stream::operator<< (std::ostream& manip (std::ostream&)) const
+{
+    return ScopedStream (*this, manip);
+}
+
+//------------------------------------------------------------------------------
+
+Journal::Journal ()
+    : m_sink  (&getNullSink())
+    , trace   (stream (kTrace))
+    , debug   (stream (kDebug))
+    , info    (stream (kInfo))
+    , warning (stream (kWarning))
+    , error   (stream (kError))
+    , fatal   (stream (kFatal))
+{
+}
+
+Journal::Journal (Sink& sink)
+    : m_sink  (&sink)
+    , trace   (stream (kTrace))
+    , debug   (stream (kDebug))
+    , info    (stream (kInfo))
+    , warning (stream (kWarning))
+    , error   (stream (kError))
+    , fatal   (stream (kFatal))
+{
+}
+
+Journal::Journal (Journal const& other)
+    : m_sink  (other.m_sink)
+    , trace   (stream (kTrace))
+    , debug   (stream (kDebug))
+    , info    (stream (kInfo))
+    , warning (stream (kWarning))
+    , error   (stream (kError))
+    , fatal   (stream (kFatal))
+{
+}
+
+Journal::~Journal ()
+{
+}
+
+Journal::Sink& Journal::sink() const
+{
+    return *m_sink;
+}
+
+Journal::Stream Journal::stream (Severity severity) const
+{
+    return Stream (*m_sink, severity);
+}
+
+bool Journal::active (Severity severity) const
+{
+    bassert (severity != kDisabled);
+    return m_sink->active (severity);
+}
+
+}
diff --git a/modules/beast_core/diagnostic/beast_LeakChecked.cpp b/beast/utility/impl/LeakChecked.cpp
similarity index 88%
rename from modules/beast_core/diagnostic/beast_LeakChecked.cpp
rename to beast/utility/impl/LeakChecked.cpp
index b70e41697a..2209995e68 100644
--- a/modules/beast_core/diagnostic/beast_LeakChecked.cpp
+++ b/beast/utility/impl/LeakChecked.cpp
@@ -17,13 +17,17 @@
 */
 //==============================================================================
 
-namespace Implemented
+#include "../LeakChecked.h"
+
+namespace beast {
+
+namespace detail
 {
 
-class LeakCheckedBase::CounterBase::Singleton
+class LeakCheckedBase::LeakCounterBase::Singleton
 {
 public:
-    void push_back (CounterBase* counter)
+    void push_back (LeakCounterBase* counter)
     {
         m_list.push_front (counter);
     }
@@ -32,7 +36,7 @@ public:
     {
         for (;;)
         {
-            CounterBase* const counter = m_list.pop_front ();
+            LeakCounterBase* const counter = m_list.pop_front ();
 
             if (!counter)
                 break;
@@ -51,17 +55,17 @@ public:
 private:
     friend class LeakCheckedBase;
 
-    LockFreeStack <CounterBase> m_list;
+    LockFreeStack <LeakCounterBase> m_list;
 };
 
 //------------------------------------------------------------------------------
 
-LeakCheckedBase::CounterBase::CounterBase ()
+LeakCheckedBase::LeakCounterBase::LeakCounterBase ()
 {
     Singleton::getInstance ().push_back (this);
 }
 
-void LeakCheckedBase::CounterBase::checkForLeaks ()
+void LeakCheckedBase::LeakCounterBase::checkForLeaks ()
 {
     // If there's a runtime error from this line, it means there's
     // an order of destruction problem between different translation units!
@@ -120,7 +124,9 @@ void LeakCheckedBase::reportDanglingPointer (char const*)
 
 void LeakCheckedBase::checkForLeaks ()
 {
-    CounterBase::Singleton::getInstance ().checkForLeaks ();
+    LeakCounterBase::Singleton::getInstance ().checkForLeaks ();
+}
+
 }
 
 }
diff --git a/beast/utility/impl/PropertyStream.cpp b/beast/utility/impl/PropertyStream.cpp
new file mode 100644
index 0000000000..7afab58f36
--- /dev/null
+++ b/beast/utility/impl/PropertyStream.cpp
@@ -0,0 +1,422 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../PropertyStream.h"
+
+#include <limits>
+
+namespace beast {
+
+//------------------------------------------------------------------------------
+//
+// Item
+//
+//------------------------------------------------------------------------------
+
+PropertyStream::Item::Item (Source* source)
+    : m_source (source)
+{
+}
+
+PropertyStream::Source& PropertyStream::Item::source() const
+{
+    return *m_source;
+}
+
+PropertyStream::Source* PropertyStream::Item::operator-> () const
+{
+    return &source();
+}
+
+PropertyStream::Source& PropertyStream::Item::operator* () const
+{
+    return source();
+}
+
+//------------------------------------------------------------------------------
+//
+// Proxy
+//
+//------------------------------------------------------------------------------
+
+PropertyStream::Proxy::Proxy (
+    Map const& map, std::string const& key)
+    : m_map (&map)
+    , m_key (key)
+{
+}
+
+//------------------------------------------------------------------------------
+//
+// Map
+//
+//------------------------------------------------------------------------------
+
+PropertyStream::Map::Map (PropertyStream& stream)
+    : m_stream (stream)
+{
+}
+
+PropertyStream::Map::Map (Set& parent)
+    : m_stream (parent.stream())
+{
+    m_stream.map_begin ();
+}
+
+PropertyStream::Map::Map (std::string const& key, Map& map)
+    : m_stream (map.stream())
+{
+    m_stream.map_begin (key);
+}
+
+PropertyStream::Map::Map (std::string const& key, PropertyStream& stream)
+    : m_stream (stream)
+{
+    m_stream.map_begin (key);
+}
+
+PropertyStream::Map::~Map ()
+{
+    m_stream.map_end ();
+}
+
+PropertyStream& PropertyStream::Map::stream()
+{
+    return m_stream;
+}
+
+PropertyStream const& PropertyStream::Map::stream() const
+{
+    return m_stream;
+}
+
+PropertyStream::Proxy PropertyStream::Map::operator[] (std::string const& key)
+{
+    return Proxy (*this, key);
+}
+
+//------------------------------------------------------------------------------
+//
+// Set
+//
+//------------------------------------------------------------------------------
+
+PropertyStream::Set::Set (Set& set)
+    : m_stream (set.m_stream)
+{
+    m_stream.array_begin ();
+}
+
+PropertyStream::Set::Set (std::string const& key, Map& map)
+    : m_stream (map.stream())
+{
+    m_stream.array_begin (key);
+}
+
+PropertyStream::Set::Set (std::string const& key, PropertyStream& stream)
+    : m_stream (stream)
+{
+    m_stream.array_begin (key);
+}
+
+PropertyStream::Set::~Set ()
+{
+    m_stream.array_end ();
+}
+
+PropertyStream& PropertyStream::Set::stream()
+{
+    return m_stream;
+}
+
+PropertyStream const& PropertyStream::Set::stream() const
+{
+    return m_stream;
+}
+
+//------------------------------------------------------------------------------
+//
+// Source
+//
+//------------------------------------------------------------------------------
+
+PropertyStream::Source::Source (std::string const& name)
+    : m_name (name)
+    , m_state (this)
+{
+}
+
+PropertyStream::Source::~Source ()
+{
+    SharedState::Access state (m_state);
+    if (state->parent != nullptr)
+        state->parent->remove (*this);
+    removeAll (state);
+}
+
+std::string const& PropertyStream::Source::name () const
+{
+    return m_name;
+}
+
+void PropertyStream::Source::add (Source& source)
+{
+    SharedState::Access state (m_state);
+    SharedState::Access childState (source.m_state);
+    bassert (childState->parent == nullptr);
+    state->children.push_back (childState->item);
+    childState->parent = this;
+}
+
+void PropertyStream::Source::remove (Source& child)
+{
+    SharedState::Access state (m_state);
+    SharedState::Access childState (child.m_state);
+    remove (state, childState);
+}
+
+void PropertyStream::Source::removeAll ()
+{
+    SharedState::Access state (m_state);
+    removeAll (state);
+}
+
+//------------------------------------------------------------------------------
+
+void PropertyStream::Source::write (
+    SharedState::Access& state, PropertyStream &stream)
+{
+    for (List <Item>::iterator iter (state->children.begin());
+        iter != state->children.end(); ++iter)
+    {
+        Source& source (iter->source());
+        Map map (source.name(), stream);
+        source.write (stream);
+    }
+}
+
+//------------------------------------------------------------------------------
+
+void PropertyStream::Source::write_one (PropertyStream& stream)
+{
+    Map map (m_name, stream);
+    //onWrite (map);
+}
+
+void PropertyStream::Source::write (PropertyStream& stream)
+{
+    Map map (m_name, stream);
+    onWrite (map);
+
+    SharedState::Access state (m_state);
+
+    for (List <Item>::iterator iter (state->children.begin());
+        iter != state->children.end(); ++iter)
+    {
+        Source& source (iter->source());
+        source.write (stream);
+    }
+}
+
+void PropertyStream::Source::write (PropertyStream& stream, std::string const& path)
+{
+    std::pair <Source*, bool> result (find (path));
+
+    if (result.first == nullptr)
+        return;
+
+    if (result.second)
+        result.first->write (stream);
+    else
+        result.first->write_one (stream);
+}
+
+std::pair <PropertyStream::Source*, bool> PropertyStream::Source::find (std::string const& path)
+{
+    struct Parser
+    {
+        Parser (std::string const& path)
+            : m_first (path.begin())
+            , m_last (path.end())
+        {
+        }
+
+        std::string next ()
+        {
+            std::string::const_iterator pos (
+                std::find (m_first, m_last, '.'));
+            std::string const s (m_first, pos);
+            if (pos != m_last)
+                m_first = pos + 1;
+            else
+                m_first = pos;
+            return s;
+        }
+
+        std::string::const_iterator m_first;
+        std::string::const_iterator m_last;
+    };
+
+    if (path.empty ())
+        return std::make_pair (this, false);
+
+    Parser p (path);
+    Source* source (this);
+    if (p.next() != this->m_name)
+        return std::make_pair (nullptr, false);
+
+    for (;;)
+    {
+        std::string const s (p.next());
+
+        if (s.empty())
+            return std::make_pair (source, false);
+
+        if (s == "*")
+            return std::make_pair (source, true);
+
+        SharedState::Access state (source->m_state);
+        for (List <Item>::iterator iter (state->children.begin());;)
+        {
+            if (iter->source().m_name == s)
+            {
+                source = &iter->source();
+                break;
+            }
+
+            if (++iter == state->children.end())
+                return std::make_pair (nullptr, false);
+        }
+    }
+}
+
+void PropertyStream::Source::onWrite (Map&)
+{
+}
+
+//------------------------------------------------------------------------------
+
+void PropertyStream::Source::remove (
+    SharedState::Access& state, SharedState::Access& childState)
+{
+    bassert (childState->parent == this);
+    state->children.erase (
+        state->children.iterator_to (
+            childState->item));
+    childState->parent = nullptr;
+}
+
+void PropertyStream::Source::removeAll (SharedState::Access& state)
+{
+    for (List <Item>::iterator iter (state->children.begin());
+        iter != state->children.end();)
+    {
+        SharedState::Access childState ((*iter)->m_state);
+        remove (state, childState);
+    }
+}
+
+//------------------------------------------------------------------------------
+//
+// PropertyStream
+//
+//------------------------------------------------------------------------------
+
+PropertyStream::PropertyStream ()
+{
+}
+
+PropertyStream::~PropertyStream ()
+{
+}
+
+void PropertyStream::add (std::string const& key, int32 value)
+{
+    lexical_add (key, value);
+}
+
+void PropertyStream::add (std::string const& key, uint32 value)
+{
+    lexical_add (key, value);
+}
+
+void PropertyStream::add (std::string const& key, int64 value)
+{
+    if (value <= std::numeric_limits <int32>::max() &&
+        value >= std::numeric_limits <int32>::min())
+    {
+        add (key, int32(value));
+    }
+    else
+    {
+        lexical_add(key, value);
+    }
+}
+
+void PropertyStream::add (std::string const& key, uint64 value)
+{
+    if (value <= std::numeric_limits <uint32>::max() &&
+        value >= std::numeric_limits <uint32>::min())
+    {
+        add (key, uint32(value));
+    }
+    else
+    {
+        lexical_add (key, value);
+    }
+}
+
+void PropertyStream::add (int32 value)
+{
+    lexical_add (value);
+}
+
+void PropertyStream::add (uint32 value)
+{
+    lexical_add (value);
+}
+
+void PropertyStream::add (int64 value)
+{
+    if (value <= std::numeric_limits <int32>::max() &&
+        value >= std::numeric_limits <int32>::min())
+    {
+        add (int32(value));
+    }
+    else
+    {
+        lexical_add (value);
+    }
+}
+
+void PropertyStream::add (uint64 value)
+{
+    if (value <= std::numeric_limits <uint32>::max() &&
+        value >= std::numeric_limits <uint32>::min())
+    {
+        add (uint32(value));
+    }
+    else
+    {
+        lexical_add (value);
+    }
+}
+
+
+}
diff --git a/beast/utility/impl/StaticObject.cpp b/beast/utility/impl/StaticObject.cpp
new file mode 100644
index 0000000000..5b44bb0dd7
--- /dev/null
+++ b/beast/utility/impl/StaticObject.cpp
@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../StaticObject.h"
+#include "../../threads/Thread.h"
+
+namespace beast {
+
+namespace detail
+{
+
+// This is here so we don't need the Thread class declaration
+void staticObjectWait (std::size_t n)
+{
+    // Wait for initialization
+    Thread::yield ();
+    if (n > 10)
+        Thread::sleep (1);
+    else if (n > 100)
+        Thread::sleep (10);
+}
+
+}
+
+}
diff --git a/config/BeastConfig.h b/config/BeastConfig.h
new file mode 100644
index 0000000000..ee6a48375a
--- /dev/null
+++ b/config/BeastConfig.h
@@ -0,0 +1,144 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_BEASTCONFIG_H_INCLUDED
+#define BEAST_BEASTCONFIG_H_INCLUDED
+
+/** Configuration file for Beast.
+    This sets various configurable options for Beast. In order to compile you
+    must place a copy of this file in a location where your build environment
+    can find it, and then customize its contents to suit your needs.
+    @file BeastConfig.h
+*/
+
+//------------------------------------------------------------------------------
+//
+// Diagnostics
+//
+//------------------------------------------------------------------------------
+
+/** Config: BEAST_FORCE_DEBUG
+    Normally, BEAST_DEBUG is set to 1 or 0 based on compiler and project
+    settings, but if you define this value, you can override this to force it
+    to be true or false.
+*/
+#ifndef   BEAST_FORCE_DEBUG
+//#define BEAST_FORCE_DEBUG 1
+#endif
+
+/** Config: BEAST_LOG_ASSERTIONS
+    If this flag is enabled, the the bassert and bassertfalse macros will always
+    use Logger::writeToLog() to write a message when an assertion happens.
+    Enabling it will also leave this turned on in release builds. When it's
+    disabled, however, the bassert and bassertfalse macros will not be compiled
+    in a release build.
+    @see bassert, bassertfalse, Logger
+*/
+#ifndef   BEAST_LOG_ASSERTIONS
+//#define BEAST_LOG_ASSERTIONS 1
+#endif
+
+/** Config: BEAST_CHECK_MEMORY_LEAKS
+    Enables a memory-leak check for certain objects when the app terminates.
+    See the LeakChecked class for more details about enabling leak checking for
+    specific classes.
+*/
+#ifndef   BEAST_CHECK_MEMORY_LEAKS
+//#define BEAST_CHECK_MEMORY_LEAKS 0
+#endif
+
+/** Config: BEAST_COMPILER_CHECKS_SOCKET_OVERRIDES
+    Setting this option makes Socket-derived classes generate compile errors
+    if they forget any of the virtual overrides As some Socket-derived classes
+    intentionally omit member functions that are not applicable, this macro
+    should only be enabled temporarily when writing your own Socket-derived
+    class, to make sure that the function signatures match as expected.
+*/
+#ifndef   BEAST_COMPILER_CHECKS_SOCKET_OVERRIDES
+//#define BEAST_COMPILER_CHECKS_SOCKET_OVERRIDES 1
+#endif
+
+//------------------------------------------------------------------------------
+//
+// Libraries
+//
+//------------------------------------------------------------------------------
+
+/** Config: BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+    In a Visual C++  build, this can be used to stop the required system libs
+    being automatically added to the link stage.
+*/
+#ifndef   BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+//#define BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES 1
+#endif
+
+/** Config: BEAST_INCLUDE_ZLIB_CODE
+    This can be used to disable Beast's embedded 3rd-party zlib code.
+    You might need to tweak this if you're linking to an external zlib library
+    in your app, but for normal apps, this option should be left alone.
+
+    If you disable this, you might also want to set a value for
+    BEAST_ZLIB_INCLUDE_PATH, to specify the path where your zlib headers live.
+*/
+#ifndef   BEAST_INCLUDE_ZLIB_CODE
+//#define BEAST_INCLUDE_ZLIB_CODE 1
+#endif
+
+/** Config: BEAST_ZLIB_INCLUDE_PATH
+    This is included when BEAST_INCLUDE_ZLIB_CODE is set to zero.
+*/
+#ifndef BEAST_ZLIB_INCLUDE_PATH
+#define BEAST_ZLIB_INCLUDE_PATH <zlib.h>
+#endif
+
+/** Config: BEAST_FUNCTIONAL_USES_###
+    <functional> source configuration.
+    Set one of these to manually force a particular implementation of bind().
+    If nothing is chosen then beast will use whatever is appropriate for your
+    environment based on what is available.
+    If you override these, set ONE to 1 and the rest to 0
+*/
+#ifndef   BEAST_FUNCTIONAL_USES_STD
+//#define BEAST_FUNCTIONAL_USES_STD    0
+#endif
+#ifndef   BEAST_FUNCTIONAL_USES_TR1
+//#define BEAST_FUNCTIONAL_USES_TR1    0
+#endif
+#ifndef   BEAST_FUNCTIONAL_USES_BOOST
+//#define BEAST_FUNCTIONAL_USES_BOOST  0
+#endif
+
+//------------------------------------------------------------------------------
+//
+// Boost
+//
+//------------------------------------------------------------------------------
+
+/** Config: BEAST_USE_BOOST_FEATURES
+    This activates boost specific features and improvements. If this is
+    turned on, the include paths for your build environment must be set
+    correctly to find the boost headers.
+*/
+#ifndef   BEAST_USE_BOOST_FEATURES
+//#define BEAST_USE_BOOST_FEATURES 1
+#endif
+
+//------------------------------------------------------------------------------
+
+#endif
diff --git a/modules/beast_asio/async/AbstractHandler.h b/modules/beast_asio/async/AbstractHandler.h
new file mode 100644
index 0000000000..f999b9e5d4
--- /dev/null
+++ b/modules/beast_asio/async/AbstractHandler.h
@@ -0,0 +1,712 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_ASIO_ABSTRACTHANDLER_H_INCLUDED
+#define BEAST_ASIO_ABSTRACTHANDLER_H_INCLUDED
+
+namespace beast {
+
+namespace detail {
+
+struct AbstractHandlerCallBase : SharedObject
+{
+    //typedef SharedFunction <void(void),
+    //    AbstractHandlerAllocator <char> > invoked_type;
+
+    typedef SharedFunction <void(void)> invoked_type;
+
+    virtual void* allocate (std::size_t size) = 0;
+    virtual void deallocate (void* p, std::size_t size) = 0;
+    virtual bool is_continuation () = 0;
+    virtual void invoke (invoked_type& invoked) = 0;
+
+    template <typename Function>
+    void invoke (BEAST_MOVE_ARG(Function) f)
+    {
+        invoked_type invoked (BEAST_MOVE_CAST(Function)(f)
+            //, AbstractHandlerAllocator<char>(this)
+            );
+        invoke (invoked);
+    }
+};
+
+/*
+template <typename T>
+struct AbstractHandlerAllocator
+{
+    typedef T value_type;
+    typedef T* pointer;
+    typedef T& reference;
+    typedef T const* const_pointer;
+    typedef T const& const_reference;
+    typedef std::size_t size_type;
+    typedef std::ptrdiff_t difference_type;
+
+    AbstractHandlerAllocator (AbstractHandler* handler) noexcept
+        : m_ptr (handler)
+    {
+    }
+
+    AbstractHandlerAllocator (SharedPtr <AbstractHandler> const& ptr) noexcept
+        : m_ptr (ptr)
+    {
+    }
+
+    template <typename U>
+    AbstractHandlerAllocator (AbstractHandlerAllocator <U> const& other)
+        : m_ptr (other.m_ptr)
+    {
+    }
+
+    template <typename U>
+    struct rebind
+    {
+        typedef AbstractHandlerAllocator <U> other;
+    };
+
+    pointer address (reference x) const
+    {
+        return &x;
+    }
+
+    const_pointer address (const_reference x) const
+    {
+        return &x;
+    }
+
+    pointer allocate (size_type n) const
+    {
+        size_type const bytes = n * sizeof (value_type);
+        return static_cast <pointer> (m_ptr->allocate (bytes));
+    }
+
+    void deallocate (pointer p, size_type n) const
+    {
+        size_type const bytes = n * sizeof (value_type);
+        m_ptr->deallocate (p, bytes);
+    }
+
+    size_type max_size () const noexcept
+    {
+        return std::numeric_limits <size_type>::max () / sizeof (value_type);
+    }
+
+    void construct (pointer p, const_reference val) const
+    {
+        new ((void *)p) value_type (val);
+    }
+
+    void destroy (pointer p) const
+    {
+        p->~value_type ();
+    }
+
+private:
+    template <typename>
+    friend struct AbstractHandlerAllocator;
+    friend class AbstractHandler;
+
+    SharedPtr <AbstractHandler> m_ptr;
+};
+*/
+
+}
+
+/** A reference counted, abstract completion handler. */
+template <typename Signature, class Allocator = std::allocator <char> >
+class AbstractHandler;
+
+//------------------------------------------------------------------------------
+
+// arity 0
+template <class R, class A>
+struct AbstractHandler <R (void), A>
+{
+    typedef R result_type;
+    struct Call : detail::AbstractHandlerCallBase
+        { virtual R operator() () = 0; };
+
+    template <typename H>
+    struct CallType : public Call
+    {
+        typedef typename A:: template rebind <CallType <H> >::other Allocator;
+        CallType (BEAST_MOVE_ARG(H) h, A a = A ())
+            : m_h (BEAST_MOVE_CAST(H)(h)), m_alloc (a)
+            { }
+        R operator()()
+            { return (m_h)(); }
+        R operator()() const
+            { return (m_h)(); }
+        void* allocate (std::size_t size)
+            { return boost_asio_handler_alloc_helpers::allocate(size, m_h); }
+        void deallocate (void* pointer, std::size_t size)
+            { boost_asio_handler_alloc_helpers::deallocate( pointer, size, m_h); }
+        bool is_continuation ()
+#if BEAST_ASIO_HAS_CONTINUATION_HOOKS
+            { return boost_asio_handler_cont_helpers::is_continuation(m_h); }
+#else
+            { return false; }
+#endif
+        void invoke (typename detail::AbstractHandlerCallBase::invoked_type& invoked)
+            { boost_asio_handler_invoke_helpers::invoke <
+                typename detail::AbstractHandlerCallBase::invoked_type, H> (invoked, m_h); }
+    private:
+        H m_h;
+        Allocator m_alloc;
+    };
+
+    template <typename H>
+    AbstractHandler (BEAST_MOVE_ARG(H) h, A a = A ())
+        : m_call (new (
+            typename A:: template rebind <CallType <H> >::other (a)
+                .allocate (1)) CallType <H> (BEAST_MOVE_CAST(H)(h), a))
+        { }
+    R operator() ()
+        { return (*m_call)(); }
+    R operator() () const
+        { return (*m_call)(); }
+    void* allocate (std::size_t size) const { return m_call->allocate(size); }
+    void deallocate (void* pointer, std::size_t size) const { m_call->deallocate(pointer,size); }
+    bool is_continuation () const { return m_call->is_continuation(); }
+    template <typename Function>
+    void invoke (Function& function) const
+    {
+        m_call->invoke(function);
+    }
+    template <typename Function>
+    void invoke (Function const& function) const
+    {
+        m_call->invoke(function);
+    }
+
+private:
+    SharedPtr <Call> m_call;
+};
+
+template <class R, class A>
+void* asio_handler_allocate (std::size_t size,
+    AbstractHandler <R (void), A>* handler)
+{
+    return handler->allocate (size);
+}
+
+template <class R, class A>
+void asio_handler_deallocate (void* pointer, std::size_t size,
+    AbstractHandler <R (void), A>* handler)
+{
+    handler->deallocate (pointer, size);
+}
+
+template <class R, class A>
+bool asio_handler_is_continuation(
+    AbstractHandler <R (void), A>* handler)
+{
+    return handler->is_continuation();
+}
+
+template <typename Function, class R, class A>
+void asio_handler_invoke (BEAST_MOVE_ARG(Function) function,
+    AbstractHandler <R (void), A>* handler)
+{
+    handler->invoke (BEAST_MOVE_CAST(Function)(function));
+}
+
+//------------------------------------------------------------------------------
+
+// arity 1
+template <class R, class P1, class A>
+struct AbstractHandler <R (P1), A>
+{
+    typedef R result_type;
+    struct Call : detail::AbstractHandlerCallBase
+        { virtual R operator() (P1) = 0; };
+
+    template <typename H>
+    struct CallType : public Call
+    {
+        typedef typename A:: template rebind <CallType <H> >::other Allocator;
+        CallType (H h, A a = A ())
+            : m_h (h)
+            , m_alloc (a)
+        {
+        }
+
+        R operator()(P1 p1)
+            { return (m_h)(p1); }
+        R operator()(P1 p1) const
+            { return (m_h)(p1); }
+        void* allocate (std::size_t size)
+            { return boost_asio_handler_alloc_helpers::allocate(size, m_h); }
+        void deallocate (void* pointer, std::size_t size)
+            { boost_asio_handler_alloc_helpers::deallocate( pointer, size, m_h); }
+        bool is_continuation ()
+#if BEAST_ASIO_HAS_CONTINUATION_HOOKS
+            { return boost_asio_handler_cont_helpers::is_continuation(m_h); }
+#else
+            { return false; }
+#endif
+        void invoke (typename detail::AbstractHandlerCallBase::invoked_type& invoked)
+            { boost_asio_handler_invoke_helpers::invoke <
+                typename detail::AbstractHandlerCallBase::invoked_type, H> (invoked, m_h); }
+    private:
+        H m_h;
+        Allocator m_alloc;
+    };
+
+    template <typename H>
+    AbstractHandler (H h, A a = A ())
+        : m_call (new (
+            typename A:: template rebind <CallType <H> >::other (a)
+                .allocate (1)) CallType <H> (h, a))
+    {
+    }
+
+    R operator() (P1 p1)
+        { return (*m_call)(p1); }
+    R operator() (P1 p1) const
+        { return (*m_call)(p1); }
+    void* allocate (std::size_t size) const { return m_call->allocate(size); }
+    void deallocate (void* pointer, std::size_t size) const { m_call->deallocate(pointer,size); }
+    bool is_continuation () const { return m_call->is_continuation(); }
+    template <typename Function>
+    void invoke (Function& function) const
+    {
+        m_call->invoke(function);
+    }
+    template <typename Function>
+    void invoke (Function const& function) const
+    {
+        m_call->invoke(function);
+    }
+
+private:
+    SharedPtr <Call> m_call;
+};
+
+template <class R, class P1, class A>
+void* asio_handler_allocate (std::size_t size,
+    AbstractHandler <R (P1), A>* handler)
+{
+    return handler->allocate (size);
+}
+
+template <class R, class P1, class A>
+void asio_handler_deallocate (void* pointer, std::size_t size,
+    AbstractHandler <R (P1), A>* handler)
+{
+    handler->deallocate (pointer, size);
+}
+
+template <class R, class P1, class A>
+bool asio_handler_is_continuation(
+    AbstractHandler <R (P1), A>* handler)
+{
+    return handler->is_continuation();
+}
+
+template <typename Function, class R, class P1, class A>
+void asio_handler_invoke (BEAST_MOVE_ARG(Function) function,
+    AbstractHandler <R (P1), A>* handler)
+{
+    handler->invoke (BEAST_MOVE_CAST(Function)(function));
+}
+
+//------------------------------------------------------------------------------
+
+// arity 2
+template <class R, class P1, class P2, class A>
+struct AbstractHandler <R (P1, P2), A>
+{
+    typedef R result_type;
+    struct Call : detail::AbstractHandlerCallBase
+        { virtual R operator() (P1, P2) = 0; };
+
+    template <typename H>
+    struct CallType : public Call
+    {
+        typedef typename A:: template rebind <CallType <H> >::other Allocator;
+        CallType (BEAST_MOVE_ARG(H) h, A a = A ())
+            : m_h (BEAST_MOVE_CAST(H)(h)), m_alloc (a)
+            { }
+        R operator()(P1 p1, P2 p2)
+            { return (m_h)(p1, p2); }
+        R operator()(P1 p1, P2 p2) const
+            { return (m_h)(p1, p2); }
+        void* allocate (std::size_t size)
+            { return boost_asio_handler_alloc_helpers::allocate(size, m_h); }
+        void deallocate (void* pointer, std::size_t size)
+            { boost_asio_handler_alloc_helpers::deallocate( pointer, size, m_h); }
+        bool is_continuation ()
+#if BEAST_ASIO_HAS_CONTINUATION_HOOKS
+            { return boost_asio_handler_cont_helpers::is_continuation(m_h); }
+#else
+            { return false; }
+#endif
+        void invoke (typename detail::AbstractHandlerCallBase::invoked_type& invoked)
+            { boost_asio_handler_invoke_helpers::invoke <
+                typename detail::AbstractHandlerCallBase::invoked_type, H> (invoked, m_h); }
+    private:
+        H m_h;
+        Allocator m_alloc;
+    };
+
+    template <typename H>
+    AbstractHandler (BEAST_MOVE_ARG(H) h, A a = A ())
+        : m_call (new (
+            typename A:: template rebind <CallType <H> >::other (a)
+                .allocate (1)) CallType <H> (BEAST_MOVE_CAST(H)(h), a))
+        { }
+    R operator() (P1 p1, P2 p2)
+        { return (*m_call)(p1, p2); }
+    R operator() (P1 p1, P2 p2) const
+        { return (*m_call)(p1, p2); }
+    void* allocate (std::size_t size) const { return m_call->allocate(size); }
+    void deallocate (void* pointer, std::size_t size) const { m_call->deallocate(pointer,size); }
+    bool is_continuation () const { return m_call->is_continuation(); }
+    template <typename Function>
+    void invoke (Function& function) const
+    {
+        m_call->invoke(function);
+    }
+    template <typename Function>
+    void invoke (Function const& function) const
+    {
+        m_call->invoke(function);
+    }
+
+private:
+    SharedPtr <Call> m_call;
+};
+
+template <class R, class P1, class P2, class A>
+void* asio_handler_allocate (std::size_t size,
+    AbstractHandler <R (P1, P2), A>* handler)
+{
+    return handler->allocate (size);
+}
+
+template <class R, class P1, class P2, class A>
+void asio_handler_deallocate (void* pointer, std::size_t size,
+    AbstractHandler <R (P1, P2), A>* handler)
+{
+    handler->deallocate (pointer, size);
+}
+
+template <class R, class P1, class P2, class A>
+bool asio_handler_is_continuation(
+    AbstractHandler <R (P1, P2), A>* handler)
+{
+    return handler->is_continuation();
+}
+
+template <typename Function, class R, class P1, class P2, class A>
+void asio_handler_invoke (BEAST_MOVE_ARG(Function) function,
+    AbstractHandler <R (P1, P2), A>* handler)
+{
+    handler->invoke (BEAST_MOVE_CAST(Function)(function));
+}
+
+//------------------------------------------------------------------------------
+
+// arity 3
+template <class R, class P1, class P2, class P3, class A>
+struct AbstractHandler <R (P1, P2, P3), A>
+{
+    typedef R result_type;
+    struct Call : detail::AbstractHandlerCallBase
+        { virtual R operator() (P1, P2, P3) = 0; };
+
+    template <typename H>
+    struct CallType : public Call
+    {
+        typedef typename A:: template rebind <CallType <H> >::other Allocator;
+        CallType (BEAST_MOVE_ARG(H) h, A a = A ())
+            : m_h (BEAST_MOVE_CAST(H)(h)), m_alloc (a)
+            { }
+        R operator()(P1 p1, P2 p2, P3 p3)
+            { return (m_h)(p1, p2, p3); }
+        R operator()(P1 p1, P2 p2, P3 p3) const
+            { return (m_h)(p1, p2, p3); }
+        void* allocate (std::size_t size)
+            { return boost_asio_handler_alloc_helpers::allocate(size, m_h); }
+        void deallocate (void* pointer, std::size_t size)
+            { boost_asio_handler_alloc_helpers::deallocate( pointer, size, m_h); }
+        bool is_continuation ()
+#if BEAST_ASIO_HAS_CONTINUATION_HOOKS
+            { return boost_asio_handler_cont_helpers::is_continuation(m_h); }
+#else
+            { return false; }
+#endif
+        void invoke (typename detail::AbstractHandlerCallBase::invoked_type& invoked)
+            { boost_asio_handler_invoke_helpers::invoke <
+                typename detail::AbstractHandlerCallBase::invoked_type, H> (invoked, m_h); }
+    private:
+        H m_h;
+        Allocator m_alloc;
+    };
+
+    template <typename H>
+    AbstractHandler (BEAST_MOVE_ARG(H) h, A a = A ())
+        : m_call (new (
+            typename A:: template rebind <CallType <H> >::other (a)
+                .allocate (1)) CallType <H> (BEAST_MOVE_CAST(H)(h), a))
+        { }
+    R operator() (P1 p1, P2 p2, P3 p3)
+        { return (*m_call)(p1, p2, p3); }
+    R operator() (P1 p1, P2 p2, P3 p3) const
+        { return (*m_call)(p1, p2, p3); }
+    void* allocate (std::size_t size) const { return m_call->allocate(size); }
+    void deallocate (void* pointer, std::size_t size) const { m_call->deallocate(pointer,size); }
+    bool is_continuation () const { return m_call->is_continuation(); }
+    template <typename Function>
+    void invoke (Function& function) const
+    {
+        m_call->invoke(function);
+    }
+    template <typename Function>
+    void invoke (Function const& function) const
+    {
+        m_call->invoke(function);
+    }
+
+private:
+    SharedPtr <Call> m_call;
+};
+
+template <class R, class P1, class P2, class P3, class A>
+void* asio_handler_allocate (std::size_t size,
+    AbstractHandler <R (P1, P2, P3), A>* handler)
+{
+    return handler->allocate (size);
+}
+
+template <class R, class P1, class P2, class P3, class A>
+void asio_handler_deallocate (void* pointer, std::size_t size,
+    AbstractHandler <R (P1, P2, P3), A>* handler)
+{
+    handler->deallocate (pointer, size);
+}
+
+template <class R, class P1, class P2, class P3, class A>
+bool asio_handler_is_continuation(
+    AbstractHandler <R (P1, P2, P3), A>* handler)
+{
+    return handler->is_continuation();
+}
+
+template <typename Function, class R, class P1, class P2, class P3, class A>
+void asio_handler_invoke (BEAST_MOVE_ARG(Function) function,
+    AbstractHandler <R (P1, P2, P3), A>* handler)
+{
+    handler->invoke (BEAST_MOVE_CAST(Function)(function));
+}
+
+//------------------------------------------------------------------------------
+
+// arity 4
+template <class R, class P1, class P2, class P3, class P4, class A>
+struct AbstractHandler <R (P1, P2, P3, P4), A>
+{
+    typedef R result_type;
+    struct Call : detail::AbstractHandlerCallBase
+        { virtual R operator() (P1, P2, P3, P4) = 0; };
+
+    template <typename H>
+    struct CallType : public Call
+    {
+        typedef typename A:: template rebind <CallType <H> >::other Allocator;
+        CallType (BEAST_MOVE_ARG(H) h, A a = A ())
+            : m_h (BEAST_MOVE_CAST(H)(h)), m_alloc (a)
+            { }
+        R operator()(P1 p1, P2 p2, P3 p3, P4 p4)
+            { return (m_h)(p1, p2, p3, p4); }
+        R operator()(P1 p1, P2 p2, P3 p3, P4 p4) const
+            { return (m_h)(p1, p2, p3, p4); }
+        void* allocate (std::size_t size)
+            { return boost_asio_handler_alloc_helpers::allocate(size, m_h); }
+        void deallocate (void* pointer, std::size_t size)
+            { boost_asio_handler_alloc_helpers::deallocate( pointer, size, m_h); }
+        bool is_continuation ()
+#if BEAST_ASIO_HAS_CONTINUATION_HOOKS
+            { return boost_asio_handler_cont_helpers::is_continuation(m_h); }
+#else
+            { return false; }
+#endif
+        void invoke (typename detail::AbstractHandlerCallBase::invoked_type& invoked)
+            { boost_asio_handler_invoke_helpers::invoke <
+                typename detail::AbstractHandlerCallBase::invoked_type, H> (invoked, m_h); }
+    private:
+        H m_h;
+        Allocator m_alloc;
+    };
+
+    template <typename H>
+    AbstractHandler (BEAST_MOVE_ARG(H) h, A a = A ())
+        : m_call (new (
+            typename A:: template rebind <CallType <H> >::other (a)
+                .allocate (1)) CallType <H> (BEAST_MOVE_CAST(H)(h), a))
+        { }
+    R operator() (P1 p1, P2 p2, P3 p3, P4 p4)
+        { return (*m_call)(p1, p2, p3, p4); }
+    R operator() (P1 p1, P2 p2, P3 p3, P4 p4) const
+        { return (*m_call)(p1, p2, p3, p4); }
+    void* allocate (std::size_t size) const { return m_call->allocate(size); }
+    void deallocate (void* pointer, std::size_t size) const { m_call->deallocate(pointer,size); }
+    bool is_continuation () const { return m_call->is_continuation(); }
+    template <typename Function>
+    void invoke (Function& function) const
+    {
+        m_call->invoke(function);
+    }
+    template <typename Function>
+    void invoke (Function const& function) const
+    {
+        m_call->invoke(function);
+    }
+
+private:
+    SharedPtr <Call> m_call;
+};
+
+template <class R, class P1, class P2, class P3, class P4, class A>
+void* asio_handler_allocate (std::size_t size,
+    AbstractHandler <R (P1, P2, P3, P4), A>* handler)
+{
+    return handler->allocate (size);
+}
+
+template <class R, class P1, class P2, class P3, class P4, class A>
+void asio_handler_deallocate (void* pointer, std::size_t size,
+    AbstractHandler <R (P1, P2, P3, P4), A>* handler)
+{
+    handler->deallocate (pointer, size);
+}
+
+template <class R, class P1, class P2, class P3, class P4, class A>
+bool asio_handler_is_continuation(
+    AbstractHandler <R (P1, P2, P3, P4), A>* handler)
+{
+    return handler->is_continuation();
+}
+
+template <typename Function, class R, class P1, class P2, class P3, class P4, class A>
+void asio_handler_invoke (BEAST_MOVE_ARG(Function) function,
+    AbstractHandler <R (P1, P2, P3, P4), A>* handler)
+{
+    handler->invoke (BEAST_MOVE_CAST(Function)(function));
+}
+
+//------------------------------------------------------------------------------
+
+// arity 5
+template <class R, class P1, class P2, class P3, class P4, class P5, class A>
+struct AbstractHandler <R (P1, P2, P3, P4, P5), A>
+{
+    typedef R result_type;
+    struct Call : detail::AbstractHandlerCallBase
+        { virtual R operator() (P1, P2, P3, P4, P5) = 0; };
+
+    template <typename H>
+    struct CallType : public Call
+    {
+        typedef typename A:: template rebind <CallType <H> >::other Allocator;
+        CallType (BEAST_MOVE_ARG(H) h, A a = A ())
+            : m_h (BEAST_MOVE_CAST(H)(h)), m_alloc (a)
+            { }
+        R operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5)
+            { return (m_h)(p1, p2, p3, p4, p5); }
+        R operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) const
+            { return (m_h)(p1, p2, p3, p4, p5); }
+        void* allocate (std::size_t size)
+            { return boost_asio_handler_alloc_helpers::allocate(size, m_h); }
+        void deallocate (void* pointer, std::size_t size)
+            { boost_asio_handler_alloc_helpers::deallocate( pointer, size, m_h); }
+        bool is_continuation ()
+#if BEAST_ASIO_HAS_CONTINUATION_HOOKS
+            { return boost_asio_handler_cont_helpers::is_continuation(m_h); }
+#else
+            { return false; }
+#endif
+        void invoke (typename detail::AbstractHandlerCallBase::invoked_type& invoked)
+            { boost_asio_handler_invoke_helpers::invoke <
+                typename detail::AbstractHandlerCallBase::invoked_type, H> (invoked, m_h); }
+    private:
+        H m_h;
+        Allocator m_alloc;
+    };
+
+    template <typename H>
+    AbstractHandler (BEAST_MOVE_ARG(H) h, A a = A ())
+        : m_call (new (
+            typename A:: template rebind <CallType <H> >::other (a)
+                .allocate (1)) CallType <H> (BEAST_MOVE_CAST(H)(h), a))
+        { }
+    R operator() (P1 p1, P2 p2, P3 p3, P4 p4, P5 p5)
+        { return (*m_call)(p1, p2, p3, p4, p5); }
+    R operator() (P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) const
+        { return (*m_call)(p1, p2, p3, p4, p5); }
+    void* allocate (std::size_t size) const { return m_call->allocate(size); }
+    void deallocate (void* pointer, std::size_t size) const { m_call->deallocate(pointer,size); }
+    bool is_continuation () const { return m_call->is_continuation(); }
+    template <typename Function>
+    void invoke (Function& function) const
+    {
+        m_call->invoke(function);
+    }
+    template <typename Function>
+    void invoke (Function const& function) const
+    {
+        m_call->invoke(function);
+    }
+
+private:
+    SharedPtr <Call> m_call;
+};
+
+template <class R, class P1, class P2, class P3, class P4, class P5, class A>
+void* asio_handler_allocate (std::size_t size,
+    AbstractHandler <R (P1, P2, P3, P4, P5), A>* handler)
+{
+    return handler->allocate (size);
+}
+
+template <class R, class P1, class P2, class P3, class P4, class P5, class A>
+void asio_handler_deallocate (void* pointer, std::size_t size,
+    AbstractHandler <R (P1, P2, P3, P4, P5), A>* handler)
+{
+    handler->deallocate (pointer, size);
+}
+
+template <class R, class P1, class P2, class P3, class P4, class P5, class A>
+bool asio_handler_is_continuation(
+    AbstractHandler <R (P1, P2, P3, P4, P5), A>* handler)
+{
+    return handler->is_continuation();
+}
+
+template <typename Function, class R, class P1, class P2, class P3, class P4, class P5, class A>
+void asio_handler_invoke (BEAST_MOVE_ARG(Function) function,
+    AbstractHandler <R (P1, P2, P3, P4, P5), A>* handler)
+{
+    handler->invoke (BEAST_MOVE_CAST(Function)(function));
+}
+
+}
+
+#endif
diff --git a/modules/beast_asio/async/AsyncObject.h b/modules/beast_asio/async/AsyncObject.h
new file mode 100644
index 0000000000..12606ffaf5
--- /dev/null
+++ b/modules/beast_asio/async/AsyncObject.h
@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_ASIO_ASYNCOBJECT_H_INCLUDED
+#define BEAST_ASIO_ASYNCOBJECT_H_INCLUDED
+
+/** Mix-in to track when all pending I/O is complete.
+    Derived classes must be callable with this signature:
+        void asyncHandlersComplete()
+*/
+template <class Derived>
+class AsyncObject
+{
+public:
+    ~AsyncObject ()
+    {
+        // Destroying the object with I/O pending? Not a clean exit!
+        bassert (m_pending.get() == 0);
+    }
+
+    /** RAII container that maintains the count of pending I/O.
+        Bind this into the argument list of every handler passed
+        to an initiating function.
+    */
+    class CompletionCounter
+    {
+    public:
+        explicit CompletionCounter (Derived* owner)
+            : m_owner (owner)
+        {
+            ++m_owner->m_pending;
+        }
+
+        CompletionCounter (CompletionCounter const& other)
+            : m_owner (other.m_owner)
+        {
+            ++m_owner->m_pending;
+        }
+
+        ~CompletionCounter ()
+        {
+            if (--m_owner->m_pending == 0)
+                m_owner->asyncHandlersComplete ();
+        }
+
+    private:
+        CompletionCounter& operator= (CompletionCounter const&);
+        Derived* m_owner;
+    };
+
+private:
+    // The number of handlers pending.
+    Atomic <int> m_pending;
+};
+
+#endif
diff --git a/modules/beast_asio/async/ComposedAsyncOperation.h b/modules/beast_asio/async/ComposedAsyncOperation.h
index 54fffe055f..a5884ccb16 100644
--- a/modules/beast_asio/async/ComposedAsyncOperation.h
+++ b/modules/beast_asio/async/ComposedAsyncOperation.h
@@ -87,7 +87,7 @@ protected:
 #endif
     }
 
-    void destroy ()
+    void destroy () const
     {
         delete this;
     }
diff --git a/modules/beast_asio/async/SharedHandler.h b/modules/beast_asio/async/SharedHandler.h
index cd6543c9f0..9a1c58ed18 100644
--- a/modules/beast_asio/async/SharedHandler.h
+++ b/modules/beast_asio/async/SharedHandler.h
@@ -45,11 +45,9 @@ class SharedHandler : public SharedObject
 {
 protected:
     typedef boost::system::error_code error_code;
-#if 0
-    typedef boost::function <void(void)> invoked_type;
-#else
-    typedef SharedFunction <void(void), SharedHandlerAllocator <char> > invoked_type;
-#endif
+
+    typedef SharedFunction <void(void),
+        SharedHandlerAllocator <char> > invoked_type;
 
     SharedHandler () noexcept { }
 
@@ -65,9 +63,6 @@ public:
 
     template <typename Function>
     void invoke (BOOST_ASIO_MOVE_ARG(Function) f)
-#if 0
-        ;
-#else
     {
         // The allocator will hold a reference to the SharedHandler
         // so that we can safely destroy the function object.
@@ -75,7 +70,6 @@ public:
             SharedHandlerAllocator <char> (this));
         invoke (invoked);
     }
-#endif
 
     virtual void  invoke (invoked_type& invoked) = 0;
     virtual void* allocate (std::size_t size) = 0;
diff --git a/modules/beast_asio/async/SharedHandlerAllocator.h b/modules/beast_asio/async/SharedHandlerAllocator.h
index 86d894e951..41606f4562 100644
--- a/modules/beast_asio/async/SharedHandlerAllocator.h
+++ b/modules/beast_asio/async/SharedHandlerAllocator.h
@@ -94,7 +94,7 @@ struct SharedHandlerAllocator
 
     void construct (pointer p, const_reference val) const
     {
-        ::new ((void *)p) value_type (val);
+        new ((void *)p) value_type (val);
     }
 
     void destroy (pointer p) const
diff --git a/modules/beast_asio/async/SharedHandlerPtr.h b/modules/beast_asio/async/SharedHandlerPtr.h
index d864ca8cc9..b2ef86e441 100644
--- a/modules/beast_asio/async/SharedHandlerPtr.h
+++ b/modules/beast_asio/async/SharedHandlerPtr.h
@@ -43,7 +43,7 @@ public:
 
         @see isNull, isNotNull
     */
-    inline SharedHandlerPtr () noexcept
+    inline SharedHandlerPtr ()
     {
     }
 
@@ -55,15 +55,14 @@ public:
     {
     }
 
-    /** Construct a reference from an existing container.
-    */
-    inline SharedHandlerPtr (SharedHandlerPtr const& other) noexcept
+    /** Construct a reference from an existing container. */
+    inline SharedHandlerPtr (SharedHandlerPtr const& other)
         : m_ptr (other.m_ptr)
     {
     }
 
     /** Assign a reference from an existing container. */
-    inline SharedHandlerPtr& operator= (SharedHandlerPtr const& other) noexcept
+    inline SharedHandlerPtr& operator= (SharedHandlerPtr const& other)
     {
         m_ptr = other.m_ptr;
         return *this;
@@ -73,7 +72,7 @@ public:
     /** Move-construct a reference from an existing container.
         The other container is set to a null handler.
     */
-    inline SharedHandlerPtr (SharedHandlerPtr&& other) noexcept
+    inline SharedHandlerPtr (SharedHandlerPtr&& other)
         : m_ptr (other.m_ptr)
     {
         other.m_ptr = nullptr;
@@ -82,7 +81,7 @@ public:
     /** Move-assign a reference from an existing container.
         The other container is set to a null handler.
     */
-    inline SharedHandlerPtr& operator= (SharedHandlerPtr&& other) noexcept
+    inline SharedHandlerPtr& operator= (SharedHandlerPtr&& other)
     {
         m_ptr = other.m_ptr;
         other.m_ptr = nullptr;
@@ -91,13 +90,13 @@ public:
 #endif
 
     /** Returns true if the handler is a null handler. */
-    inline bool isNull () const noexcept
+    inline bool isNull () const
     {
         return m_ptr == nullptr;
     }
 
     /** Returns true if the handler is not a null handler. */
-    inline bool isNotNull () const noexcept
+    inline bool isNotNull () const
     {
         return m_ptr != nullptr;
     }
@@ -105,7 +104,7 @@ public:
     /** Dereference the container.
         This returns a reference to the underlying SharedHandler object.
     */
-    inline SharedHandler& operator* () const noexcept
+    inline SharedHandler& operator* () const
     {
         return *m_ptr;
     }
@@ -113,7 +112,7 @@ public:
     /** SharedHandler member access.
         This lets you call functions directly on the SharedHandler.
     */
-    inline SharedHandler* operator-> () const noexcept
+    inline SharedHandler* operator-> () const
     {
         return m_ptr.get ();
     }
@@ -132,7 +131,7 @@ public:
 
         @endcode
     */
-    inline SharedHandler* get () const noexcept
+    inline SharedHandler* get () const
     {
         return m_ptr.get ();
     }
@@ -144,7 +143,7 @@ public:
     {
         (*m_ptr)();
     }
-    
+
     /** Invoke the SharedHandler with signature void(error_code)
         Normally this is called by a dispatcher, you shouldn't call it directly.
     */
@@ -180,7 +179,7 @@ private:
 //
 
 template <class Function>
-inline void asio_handler_invoke (BOOST_ASIO_MOVE_ARG(Function) f, SharedHandlerPtr* ptr)
+void asio_handler_invoke (BOOST_ASIO_MOVE_ARG(Function) f, SharedHandlerPtr* ptr)
 {
     boost_asio_handler_invoke_helpers::
         invoke <Function, SharedHandler>
diff --git a/modules/beast_asio/async/SharedHandlerType.h b/modules/beast_asio/async/SharedHandlerType.h
index 40de9f3262..7ff937962c 100644
--- a/modules/beast_asio/async/SharedHandlerType.h
+++ b/modules/beast_asio/async/SharedHandlerType.h
@@ -21,7 +21,6 @@
 #define BEAST_ASIO_ASYNC_SHAREDHANDLERTYPE_H_INCLUDED
 
 /** An instance of SharedHandler that wraps an existing Handler.
-
     The wrapped handler will meet all the execution guarantees of
     the original Handler object.
 */
@@ -85,31 +84,21 @@ protected:
     // the size from the original allocation, which we saved at
     // the time of construction.
     //
-    void destroy ()
+    void destroy () const
     {
         Handler local (BOOST_ASIO_MOVE_CAST(Handler)(m_handler));
         std::size_t const size (m_size);
-        SharedHandler* const shared (static_cast <SharedHandler*>(this));
+        SharedHandler* const shared (
+            const_cast <SharedHandler*> (
+                static_cast <SharedHandler const*>(this)));
         shared->~SharedHandler ();
         boost_asio_handler_alloc_helpers::
             deallocate <Handler> (shared, size, local);
     }
 
-    // If these somehow get called, bad things will happen
-    //
-    void* operator new (std::size_t)
-    {
-        return pure_virtual_called (__FILE__, __LINE__);
-    }
-
-    void operator delete (void*)
-    {
-        return pure_virtual_called (__FILE__, __LINE__);
-    }
-
 protected:
     std::size_t const m_size;
-    Handler m_handler;
+    Handler mutable m_handler;
 };
 
 //--------------------------------------------------------------------------
@@ -216,7 +205,7 @@ Container <Handler>* newSharedHandlerContainer (BOOST_ASIO_MOVE_ARG(Handler) han
     Handler local (BOOST_ASIO_MOVE_CAST(Handler)(handler));
     void* const p (boost_asio_handler_alloc_helpers::
         allocate <Handler> (size, local));
-    return ::new (p) ContainerType (size, BOOST_ASIO_MOVE_CAST(Handler)(local));
+    return new (p) ContainerType (size, BOOST_ASIO_MOVE_CAST(Handler)(local));
 }
 
 #endif
diff --git a/modules/beast_asio/async/WrapHandler.h b/modules/beast_asio/async/WrapHandler.h
new file mode 100644
index 0000000000..7134d2bc79
--- /dev/null
+++ b/modules/beast_asio/async/WrapHandler.h
@@ -0,0 +1,209 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_ASIO_WRAPHANDLER_H_INCLUDED
+#define BEAST_ASIO_WRAPHANDLER_H_INCLUDED
+
+namespace beast {
+namespace detail {
+
+// Wrapper returned by wrapHandler, calls the Handler in the given Context
+//
+template <typename Handler, typename Context>
+class WrappedHandler
+{
+public:
+    typedef void result_type; // for result_of
+
+    WrappedHandler (Handler& handler, Context const& context)
+    : m_handler (handler)
+    , m_context (context)
+    {
+    }
+
+    WrappedHandler (Handler const& handler, Context const& context)
+    : m_handler (handler)
+    , m_context (context)
+    {
+    }
+
+#if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
+    WrappedHandler (WrappedHandler const& other)
+        : m_handler (other.m_handler)
+        , m_context (other.m_context)
+    {
+    }
+
+    WrappedHandler (BEAST_MOVE_ARG(WrappedHandler) other)
+        : m_handler (BEAST_MOVE_CAST(Handler)(other.m_handler))
+        , m_context (BEAST_MOVE_CAST(Context)(other.m_context))
+    {
+    }
+#endif
+
+    Handler& handler()
+        { return m_handler; }
+
+    Handler const& handler() const
+        { return m_handler; }
+
+    Context& context()
+        { return m_context; }
+
+    Context const& context() const
+        { return m_context; }
+
+    void operator() ()
+        { m_handler(); }
+
+    void operator() () const
+        { m_handler(); }
+
+    template <class P1>
+    void operator() (P1 const& p1)
+        { m_handler(p1); }
+
+    template <class P1>
+    void operator() (P1 const& p1) const
+        { m_handler(p1); }
+
+    template <class P1, class P2>
+    void operator() (P1 const& p1, P2 const& p2)
+        { m_handler(p1, p2); }
+
+    template <class P1, class P2>
+    void operator() (P1 const& p1, P2 const& p2) const
+        { m_handler(p1, p2); }
+
+    template <class P1, class P2, class P3>
+    void operator() (P1 const& p1, P2 const& p2, P3 const& p3)
+        { m_handler(p1, p2, p3); }
+
+    template <class P1, class P2, class P3>
+    void operator() (P1 const& p1, P2 const& p2, P3 const& p3) const
+        { m_handler(p1, p2, p3); }
+
+    template <class P1, class P2, class P3, class P4>
+    void operator() 
+        (P1 const& p1, P2 const& p2, P3 const& p3, P4 const& p4)
+        { m_handler(p1, p2, p3, p4); }
+
+    template <class P1, class P2, class P3, class P4>
+    void operator() 
+        (P1 const& p1, P2 const& p2, P3 const& p3, P4 const& p4) const
+        { m_handler(p1, p2, p3, p4); }
+
+    template <class P1, class P2, class P3,
+              class P4, class P5>
+    void operator() (P1 const& p1, P2 const& p2, P3 const& p3,
+                     P4 const& p4, P5 const& p5)
+        { m_handler(p1, p2, p3, p4, p5); }
+
+    template <class P1, class P2, class P3,
+              class P4, class P5>
+    void operator() (P1 const& p1, P2 const& p2, P3 const& p3,
+                     P4 const& p4, P5 const& p5) const
+        { m_handler(p1, p2, p3, p4, p5); }
+
+    template <class P1, class P2, class P3,
+              class P4, class P5, class P6>
+    void operator() (P1 const& p1, P2 const& p2, P3 const& p3,
+                     P4 const& p4, P5 const& p5, P6 const& p6)
+        { m_handler(p1, p2, p3, p4, p5, p6); }
+
+    template <class P1, class P2, class P3,
+              class P4, class P5, class P6>
+    void operator() (P1 const& p1, P2 const& p2, P3 const& p3,
+                     P4 const& p4, P5 const& p5, P6 const& p6) const
+        { m_handler(p1, p2, p3, p4, p5, p6); }
+
+private:
+    Handler m_handler;
+    Context m_context;
+};
+
+//------------------------------------------------------------------------------
+
+template <typename Handler, typename Context>
+void* asio_handler_allocate (std::size_t size,
+    WrappedHandler <Handler, Context>* this_handler)
+{
+    return boost_asio_handler_alloc_helpers::allocate(
+        size, this_handler->context());
+}
+
+template <typename Handler, typename Context>
+void asio_handler_deallocate (void* pointer, std::size_t size,
+    WrappedHandler <Handler, Context>* this_handler)
+{
+    boost_asio_handler_alloc_helpers::deallocate(
+        pointer, size, this_handler->context());
+}
+
+template <typename Handler, typename Context>
+bool asio_handler_is_continuation(
+    WrappedHandler <Handler, Context>* this_handler)
+{
+#if BEAST_ASIO_HAS_CONTINUATION_HOOKS
+    return boost_asio_handler_cont_helpers::is_continuation(
+        this_handler->handler());
+#else
+    return false;
+#endif
+}
+
+template <typename Function, typename Handler, typename Context>
+void asio_handler_invoke (Function& function,
+    WrappedHandler <Handler, Context>* handler)
+{
+    boost_asio_handler_invoke_helpers::invoke(
+        function, handler->context());
+}
+
+template <typename Function, typename Handler, typename Context>
+void asio_handler_invoke (Function const& function,
+    WrappedHandler <Handler, Context>* handler)
+{
+    boost_asio_handler_invoke_helpers::invoke(
+        function, handler->context());
+}
+
+}
+
+//------------------------------------------------------------------------------
+
+/** Returns a handler that calls Handler using Context hooks.
+    This is useful when implementing composed asynchronous operations that
+    need to call their own intermediate handlers before issuing the final
+    completion to the original handler.
+*/
+template <typename Handler, typename Context>
+detail::WrappedHandler <Handler, Context>
+    wrapHandler (
+        BEAST_MOVE_ARG(Handler) handler,
+            BEAST_MOVE_ARG(Context) context)
+{
+    return detail::WrappedHandler <Handler, Context> (
+        BEAST_MOVE_CAST(Handler)(handler),
+            BEAST_MOVE_CAST(Context)(context));
+}
+
+}
+
+#endif
diff --git a/modules/beast_asio/basics/BuffersType.h b/modules/beast_asio/basics/BuffersType.h
index 770c1b47ab..a14890e1b6 100644
--- a/modules/beast_asio/basics/BuffersType.h
+++ b/modules/beast_asio/basics/BuffersType.h
@@ -121,11 +121,9 @@ private:
 //------------------------------------------------------------------------------
 
 /** A single linear read-only buffer. */
-//typedef BufferType <true> ConstBuffer;
 typedef boost::asio::const_buffer ConstBuffer;
 
 /** A single linear writable buffer. */
-//typedef BufferType <false> MutableBuffer;
 typedef boost::asio::mutable_buffer MutableBuffer;
 
 /** Meets the requirements of ConstBufferSequence */
diff --git a/modules/beast_asio/basics/SharedArg.h b/modules/beast_asio/basics/SharedArg.h
new file mode 100644
index 0000000000..95f05c891a
--- /dev/null
+++ b/modules/beast_asio/basics/SharedArg.h
@@ -0,0 +1,161 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_ASIO_SHAREDARG_H_INCLUDED
+#define BEAST_ASIO_SHAREDARG_H_INCLUDED
+
+/** A container that turns T into a SharedObject.
+    We use this to manage the lifetime of objects passed to handlers.
+*/
+template <typename T>
+struct SharedArg
+{
+private:
+    struct Arg : SharedObject
+    {
+        Arg ()
+        {
+        }
+
+        explicit Arg (BEAST_MOVE_ARG(T) t)
+            : value (BEAST_MOVE_CAST(T)(t))
+        {
+        }
+
+        template <class P1>
+        explicit Arg (P1 p1)
+            : value (p1)
+        {
+        }
+
+        template <class P1, class P2>
+        Arg (P1 p1, P2 p2)
+            : value (p1, p2)
+        {
+        }
+
+        template <class P1, class P2, class P3>
+        Arg (P1 p1, P2 p2, P3 p3)
+            : value (p1, p2, p3)
+        {
+        }
+
+        template <class P1, class P2, class P3, class P4>
+        Arg (P1 p1, P2 p2, P3 p3, P4 p4)
+            : value (p1, p2, p3, p4)
+        {
+        }
+
+        ~Arg ()
+        {
+        }
+
+        T value;
+    };
+
+public:
+    SharedArg ()
+    {
+    }
+
+    explicit SharedArg (BEAST_MOVE_ARG(T) t)
+        : m_arg (new Arg (BEAST_MOVE_CAST(T)(t)))
+    {
+    }
+
+    template <class P1>
+    explicit SharedArg (P1 p1)
+        : m_arg (new Arg (p1))
+    {
+    }
+
+    template <class P1, class P2>
+    SharedArg (P1 p1, P2 p2)
+        : m_arg (new Arg (p1, p2))
+    {
+    }
+
+    template <class P1, class P2, class P3>
+    SharedArg (P1 p1, P2 p2, P3 p3)
+        : m_arg (new Arg (p1, p2, p3))
+    {
+    }
+
+    template <class P1, class P2, class P3, class P4>
+    SharedArg (P1 p1, P2 p2, P3 p3, P4 p4)
+        : m_arg (new Arg (p1, p2, p3, p4))
+    {
+    }
+
+    SharedArg (SharedArg const& other)
+        : m_arg (other.m_arg)
+    {
+    }
+
+    SharedArg& operator= (SharedArg const& other)
+    {
+        m_arg = other.m_arg;
+        return *this;
+    }
+
+    T& get ()
+    {
+        return m_arg->value;
+    }
+
+    T const& get () const
+    {
+        return m_arg->value;
+    }
+
+    T& operator* ()
+    {
+        return get();
+    }
+
+    T const& operator* () const
+    {
+        return get();
+    }
+
+    T* operator-> ()
+    {
+        return &get();
+    }
+
+    T const* operator-> () const
+    {
+        return &get();
+    }
+
+    operator T& ()
+    {
+        return m_arg->value;
+    }
+
+    operator T const& () const
+    {
+        return m_arg->value;
+    }
+
+private:
+    SharedPtr <Arg> m_arg;
+};
+
+#endif
diff --git a/modules/beast_asio/beast_asio.cpp b/modules/beast_asio/beast_asio.cpp
index 6301c1c2e6..e088b895bf 100644
--- a/modules/beast_asio/beast_asio.cpp
+++ b/modules/beast_asio/beast_asio.cpp
@@ -23,12 +23,12 @@
 
 #include "beast_asio.h"
 
-namespace beast
-{
+namespace beast {
+
+# include "../../beast/http/impl/http-parser/http_parser.h"
 
 #include "async/SharedHandler.cpp"
 
-#include "basics/ContentBodyBuffer.cpp"
 #include "basics/PeerRole.cpp"
 #include "basics/SSLContext.cpp"
 
@@ -37,14 +37,12 @@ namespace beast
 
 #include "protocol/HandshakeDetectLogicPROXY.cpp"
 
-# include "parsehttp/http_parser.h"
 # include "http/HTTPParserImpl.h"
-#include "http/HTTPParser.cpp"
-#include "http/UniformResourceLocator.cpp"
 #include "http/HTTPClientType.cpp"
 #include "http/HTTPField.cpp"
 #include "http/HTTPHeaders.cpp"
 #include "http/HTTPMessage.cpp"
+#include "http/HTTPRequest.cpp"
 #include "http/HTTPResponse.cpp"
 #include "http/HTTPVersion.cpp"
 
@@ -60,16 +58,8 @@ namespace beast
 
 #include "system/BoostUnitTests.cpp"
 
-#ifdef _MSC_VER
-#pragma warning (push)
-#pragma warning (disable: 4127) // conditional expression is constant
-#pragma warning (disable: 4244) // integer conversion, possible loss of data
-#endif
-#include "parsehttp/http_parser.c"
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
-
 }
 
-//------------------------------------------------------------------------------
+#include "http/HTTPParser.cpp"
+#include "http/HTTPRequestParser.cpp"
+#include "http/HTTPResponseParser.cpp"
diff --git a/modules/beast_asio/beast_asio.h b/modules/beast_asio/beast_asio.h
index 3d514f0fdc..f66d966e22 100644
--- a/modules/beast_asio/beast_asio.h
+++ b/modules/beast_asio/beast_asio.h
@@ -53,8 +53,14 @@
 # define BEAST_SOCKET_VIRTUAL
 #endif
 
-namespace beast
-{
+#include "../../beast/MPL.h"
+#include "../../beast/Utility.h"
+#include "../../beast/HTTP.h"
+
+#include "async/AbstractHandler.h"
+#include "async/WrapHandler.h"
+
+namespace beast {
 
 // Order matters
 #  include "async/SharedHandler.h"
@@ -62,13 +68,13 @@ namespace beast
 # include "async/SharedHandlerPtr.h"
 # include "async/ComposedAsyncOperation.h"
 #include "async/SharedHandlerAllocator.h"
+#include "async/AsyncObject.h"
 
-#  include "basics/BufferType.h"
 # include "basics/BuffersType.h"
-#include "basics/ContentBodyBuffer.h"
 #include "basics/FixedInputBuffer.h"
 #include "basics/PeerRole.h"
 #include "basics/SSLContext.h"
+#include "basics/SharedArg.h"
 
 #   include "sockets/SocketBase.h"
 #  include "sockets/Socket.h"
@@ -79,11 +85,19 @@ namespace beast
 #   include "http/HTTPField.h"
 #   include "http/HTTPHeaders.h"
 #  include "http/HTTPMessage.h"
+# include "http/HTTPRequest.h"
 # include "http/HTTPResponse.h"
+
+}
+
 # include "http/HTTPParser.h"
-# include "http/UniformResourceLocator.h"
+#include "http/HTTPRequestParser.h"
+#include "http/HTTPResponseParser.h"
+
 #include "http/HTTPClientType.h"
 
+namespace beast {
+
 #  include "protocol/InputParser.h"
 # include "protocol/HandshakeDetectLogic.h"
 #include "protocol/HandshakeDetectLogicPROXY.h"
diff --git a/modules/beast_asio/http/HTTPClientType.cpp b/modules/beast_asio/http/HTTPClientType.cpp
index 143b19fdbe..6a85eb77f0 100644
--- a/modules/beast_asio/http/HTTPClientType.cpp
+++ b/modules/beast_asio/http/HTTPClientType.cpp
@@ -19,121 +19,108 @@
 
 class HTTPClientType : public HTTPClientBase, public Uncopyable
 {
-private:
-    using HTTPClientBase::Listener;
+public:
+    class Session;
 
-    typedef boost::system::error_code error_code;
-
-    class ListenerHandler
+    struct State
     {
-    public:
-        ListenerHandler ()
-            : m_owner (nullptr)
-            , m_listener (nullptr)
-        {
-        }
-
-        ListenerHandler (HTTPClientType* owner, Listener* listener = nullptr)
-            : m_owner (owner)
-            , m_listener (listener)
-        {
-        }
-
-        ListenerHandler (ListenerHandler const& other)
-            : m_owner (other.m_owner)
-            , m_listener (other.m_listener)
-        {
-        }
-
-        ListenerHandler& operator= (ListenerHandler const& other)
-        {
-            m_owner = other.m_owner;
-            m_listener = other.m_listener;
-            return *this;
-        }
-
-        void operator() (error_code)
-        {
-            if (m_listener != nullptr)
-                m_listener->onHTTPRequestComplete (
-                    *m_owner, m_owner->result ());
-        }
-
-    private:
-        HTTPClientType* m_owner;
-        Listener* m_listener;
+        List <Session> list;
     };
 
-public:
+    typedef SharedData <State> SharedState;
+
+    SharedState m_state;
+    Journal m_journal;
+    double m_timeoutSeconds;
+    std::size_t m_messageLimitBytes;
+    std::size_t m_bufferSize;
+    boost::asio::io_service m_io_service;
+    WaitableEvent m_stopped;
+
     //--------------------------------------------------------------------------
 
     HTTPClientType (
+        Journal journal,
         double timeoutSeconds,
         std::size_t messageLimitBytes,
         std::size_t bufferSize)
-        : m_timeoutSeconds (timeoutSeconds)
+        : m_journal (journal)
+        , m_timeoutSeconds (timeoutSeconds)
         , m_messageLimitBytes (messageLimitBytes)
         , m_bufferSize (bufferSize)
+        , m_stopped (true, true) // manual reset, initially signaled
     {
     }
 
     ~HTTPClientType ()
     {
-        m_async_op = nullptr;
+        cancel();
+        wait();
     }
 
-    Result const& result () const
-    {
-        return m_result;
-    }
-
-    Result const& get (UniformResourceLocator const& url)
+    result_type get (URL const& url)
     {
+        result_type result;
         boost::asio::io_service io_service;
-        async_get (io_service, nullptr, url);
+        async_get (io_service, url, beast::bind (
+            &HTTPClientType::handle_get, beast::placeholders::_1, &result));
         io_service.run ();
-        cancel ();
-        return result ();
+        return result;
     }
 
-    //--------------------------------------------------------------------------
-
-    void async_get (boost::asio::io_service& io_service, Listener* listener,
-        UniformResourceLocator const& url)
+    void async_get (boost::asio::io_service& io_service, URL const& url,
+        AbstractHandler <void (result_type)> handler)
     {
-        async_get (io_service, url, ListenerHandler (this, listener));
-    }
-
-    // Handler signature is void(error_code)
-    //
-    template <typename Handler>
-    void async_get (boost::asio::io_service& io_service,
-        UniformResourceLocator const& url,
-            BOOST_ASIO_MOVE_ARG(Handler) handler)
-    {
-        async_get (io_service, url, newErrorHandler (
-            BOOST_ASIO_MOVE_CAST(Handler)(handler)));
-    }
-
-    void async_get (boost::asio::io_service& io_service,
-        UniformResourceLocator const& url, SharedHandlerPtr handler)
-    {
-        // This automatically dispatches
-        m_async_op = new AsyncGetOp (
-            *this, io_service, url, handler,
-            m_timeoutSeconds, m_messageLimitBytes, m_bufferSize);
+        new Session (*this, io_service, url,
+            handler, m_timeoutSeconds, m_messageLimitBytes, m_bufferSize);
     }
 
     void cancel ()
     {
-        if (m_async_op != nullptr)
-        {
-            m_async_op->cancel ();
-            m_async_op = nullptr;
-        }
+        SharedState::Access state (m_state);
+        for (List <Session>::iterator iter (state->list.begin());
+            iter != state->list.end(); ++iter)
+            iter->cancel();
+    }
+
+    void wait()
+    {
+        m_stopped.wait();
+    }
+
+    //--------------------------------------------------------------------------
+
+    void add (Session& session)
+    {
+        SharedState::Access state (m_state);
+        if (state->list.empty())
+            m_stopped.reset();
+        state->list.push_back (session);
+    }
+
+    void remove (Session& session)
+    {
+        SharedState::Access state (m_state);
+        state->list.erase (state->list.iterator_to (session));
+        if (state->list.empty())
+            m_stopped.signal();
+    }
+
+    static void handle_get (result_type const& result, result_type* dest)
+    {
+        *dest = result;
+    }
+
+    Journal journal() const
+    {
+        return m_journal;
+    }
+
+    boost::asio::io_service& get_io_service()
+    {
+        return m_io_service;
     }
 
-private:
     //--------------------------------------------------------------------------
 
     /** Helper function to get a const_buffer from a String. */
@@ -144,7 +131,7 @@ private:
 
     /** Helper function to fill out a Query from a URL. */
     template <typename Query>
-    static Query queryFromURL (UniformResourceLocator const& url)
+    static Query queryFromURL (URL const& url)
     {
         if (url.port () != 0)
         {
@@ -161,74 +148,82 @@ private:
 
     //--------------------------------------------------------------------------
 
-    class AsyncGetOp : public ComposedAsyncOperation
+    class Session
+        : public SharedObject
+        , public AsyncObject <Session>
+        , public List <Session>::Node
     {
-    private:
-        typedef boost::asio::ip::tcp Protocol;
-        typedef boost::system::error_code error_code;
-
-        typedef Protocol::resolver     resolver;
-        typedef resolver::query        query;
-        typedef resolver::iterator     iterator;
-        typedef iterator::value_type   resolver_entry;
-        typedef Protocol::socket       socket;
-
-        //----------------------------------------------------------------------
-
-        enum State
-        {
-            stateStart,
-            stateResolveComplete,
-            stateConnectComplete,
-            stateHandshakeComplete,
-            stateWriteComplete,
-            stateShutdownComplete
-        };
-
-        //----------------------------------------------------------------------
-
-        struct TimerHandler : SharedHandlerPtr
-        {
-            explicit TimerHandler (AsyncGetOp* owner)
-                : SharedHandlerPtr (owner)
-                , m_owner (owner)
-            {
-            }
-            void operator() (error_code const& ec)
-            {
-                m_owner->timerCompletion (ec);
-            }
-
-            AsyncGetOp* m_owner;
-        };
-
-        //----------------------------------------------------------------------
-
     public:
-        AsyncGetOp (HTTPClientType& owner,
-                    boost::asio::io_service& io_service,
-                    UniformResourceLocator const& url,
-                    SharedHandlerPtr const& handler,
-                    double timeoutSeconds,
-                    std::size_t messageLimitBytes,
-                    std::size_t bufferSize)
-            : ComposedAsyncOperation (sizeof (*this), handler)
-            , m_owner (owner)
+        typedef SharedPtr <Session>         Ptr;
+        typedef boost::asio::ip::tcp        Protocol;
+        typedef boost::system::error_code   error_code;
+        typedef HTTPClientBase::error_type  error_type;
+        typedef HTTPClientBase::value_type  value_type;
+        typedef HTTPClientBase::result_type result_type;
+
+        typedef Protocol::resolver          resolver;
+        typedef Protocol::socket            socket;
+        typedef resolver::query             query;
+        typedef resolver::iterator          iterator;
+        typedef iterator::value_type        resolver_entry;
+
+        HTTPClientType& m_owner;
+        boost::asio::io_service& m_io_service;
+        boost::asio::io_service::strand m_strand;
+        boost::asio::deadline_timer m_timer;
+        resolver m_resolver;
+        socket m_socket;
+        AbstractHandler <void (result_type)> m_handler;
+
+        URL m_url;
+        boost::asio::ssl::context m_context;
+        MemoryBlock m_buffer;
+        HTTPResponseParser m_parser;
+        std::size_t m_messageLimitBytes;
+        std::size_t m_bytesReceived;
+
+        String m_get_string;
+        WaitableEvent m_done;
+        ScopedPointer <Socket> m_stream;
+
+        struct State
+        {
+            State () : complete (false)
+            {
+            }
+
+            bool complete;
+            error_code error;
+            SharedPtr <HTTPResponse> response;
+        };
+        typedef SharedData <State> SharedState;
+        SharedState m_state;
+
+        //----------------------------------------------------------------------
+
+        Session (HTTPClientType& owner,
+                 boost::asio::io_service& io_service,
+                 URL const& url,
+                 AbstractHandler <void (result_type)> const& handler,
+                 double timeoutSeconds,
+                 std::size_t messageLimitBytes,
+                 std::size_t bufferSize)
+            : m_owner (owner)
             , m_io_service (io_service)
-            , m_strand (m_io_service)
-            , m_url (url)
-            , m_handler (handler)
+            , m_strand (io_service)
             , m_timer (io_service)
             , m_resolver (io_service)
             , m_socket (io_service)
+            , m_handler (handler)
+            , m_url (url)
             , m_context (boost::asio::ssl::context::sslv23)
             , m_buffer (bufferSize)
-            , m_parser (HTTPParser::typeResponse)
-            , m_timer_canceled (false)
-            , m_timer_expired (false)
             , m_messageLimitBytes (messageLimitBytes)
             , m_bytesReceived (0)
         {
+            m_owner.add (*this);
+
+            // Configure the SSL context for certificate verification
             m_context.set_default_verify_paths ();
             m_context.set_options (
                 boost::asio::ssl::context::no_sslv2 |
@@ -236,314 +231,163 @@ private:
                 boost::asio::ssl::context::default_workarounds);
             //m_context.set_verify_mode (boost::asio::ssl::verify_peer);
 
+            // Set the timer if a timeout is requested
             if (timeoutSeconds > 0)
             {
                 m_timer.expires_from_now (
                     boost::posix_time::milliseconds (
                         long (timeoutSeconds * 1000)));
 
-                ++m_io_pending;
-                m_timer.async_wait (TimerHandler (this));
+                m_timer.async_wait (m_strand.wrap (wrapHandler (
+                    boost::bind (&Session::handle_timer, Ptr(this),
+                        boost::asio::placeholders::error,
+                            CompletionCounter(this)), m_handler)));
             }
 
-            // Count as pending i/o
-            ++m_io_pending;
-            m_io_service.dispatch (
-                m_strand.wrap (StartHandler (this)));
+            // Start the operation on an io_service thread
+            io_service.dispatch (m_strand.wrap (wrapHandler (
+                boost::bind (&Session::handle_start, Ptr(this),
+                    CompletionCounter(this)), m_handler)));
         }
 
-        ~AsyncGetOp ()
+        ~Session ()
         {
+            State result;
+            {
+                SharedState::ConstAccess state (m_state);
+                result = *state;
+            }
+
+            m_io_service.wrap (m_handler) (std::make_pair (
+                result.error, result.response));
+
+            m_owner.remove (*this);
         }
 
-        // Cancel all pending I/O, if any, and block until
-        // there are no more completion handler calls pending.
-        //
+        //----------------------------------------------------------------------
+
+        // Called by the owner to cancel pending i/o.
         void cancel ()
         {
-            cancel_all ();
-            m_done.wait ();
-        }
-
-    private:
-        //----------------------------------------------------------------------
-
-        // Counts a pending i/o as canceled
-        //
-        void cancel_io ()
-        {
-            bassert (m_io_pending.get () > 0);
-            if (--m_io_pending == 0)
-                m_done.signal ();
-        }
-
-        // Cancels the deadline timer.
-        //
-        void cancel_timer ()
-        {
-            m_timer_canceled = true;
-            error_code ec;
-            m_timer.cancel (ec);
-        }
-
-        // Called to notify the original handler the operation is complete.
-        //
-        void complete (error_code const& ec)
-        {
-            m_owner.m_result.error = ec;
-
-            cancel_timer ();
-
-            bassert (m_io_pending.get () > 0);
-
-            cancel_io ();
-
-            // We call the handler directly since we know
-            // we are already in the right context, and
-            // because we need to do some things afterwards.
-            //
-            m_handler->operator() (ec);
-        }
-
-        // Called every time an async operation completes.
-        // The return value indicates if the handler should
-        // stop additional activity and return immediately.
-        //
-        bool io_complete (error_code const& ec)
-        {
-            if (m_timer_expired ||
-                ec == boost::asio::error::operation_aborted)
             {
-                cancel_io ();
-                return true;
-            }
-            else if (ec != 0 && ec != boost::asio::error::eof)
-            {
-                complete (ec);
-                return true;
+                SharedState::Access state (m_state);
+                if (! state->complete)
+                {
+                    state->complete = true;
+                    state->error = boost::asio::error::operation_aborted;
+                }
             }
 
-            return false;
+            cancel_all();
         }
 
-        // Cancels/closes all i/o objects.
-        //
+        // Cancel all pending I/O
         void cancel_all ()
         {
-            cancel_timer ();
-            m_resolver.cancel ();
             error_code ec;
-            m_socket.close (ec);
+            m_timer.cancel (ec);
+            m_resolver.cancel ();
+            m_socket.cancel (ec);
+            m_socket.shutdown (socket::shutdown_both);
         }
 
-        // Called when the deadline timer expires or is canceled.
-        //
-        void timerCompletion (error_code ec)
+        // Called by a completion handler when error is not eof or aborted.
+        void failed (error_code ec)
         {
-            if (ec == boost::asio::error::operation_aborted)
             {
-                bassert (m_timer_canceled);
-                return cancel_io ();
+                SharedState::Access state (m_state);
+                if (! state->complete)
+                {
+                    state->complete = true;
+                    state->error = ec;
+                    state->response = nullptr;
+                }
             }
 
-            check_invariant (ec == 0);
-
-            // Handle the case where the timer completion has already
-            // been queued for dispatch but we have finished the operation
-            // and queued the completion handler for dispatch.
-            //
-            if (! m_timer_canceled)
-            {
-                m_timer_expired = true;
-
-                ec = error_code (boost::asio::error::timed_out,
-                    boost::asio::error::get_system_category ());
-
-                complete (ec);
-
-                io_complete (ec);
-
-                m_resolver.cancel ();
-                m_socket.close (ec);
-            }
-            else
-            {
-                cancel_io ();
-            }
+            cancel_all();
         }
 
-        //----------------------------------------------------------------------
-
-        struct StartHandler : SharedHandlerPtr
-        {
-            explicit StartHandler (AsyncGetOp* owner)
-                : SharedHandlerPtr (owner)
-                , m_owner (owner)
-            {
-            }
-
-            void operator() ()
-            {
-                m_owner->start_complete ();
-            }
-
-            AsyncGetOp* m_owner;
-        };
-
-        struct ResolveHandler : SharedHandlerPtr
-        {
-            explicit ResolveHandler (AsyncGetOp* owner)
-                : SharedHandlerPtr (owner)
-                , m_owner (owner)
-            {
-            }
-
-            void operator() (error_code const& ec, iterator iter)
-            {
-                m_owner->resolve_complete (ec, iter);
-            }
-
-            AsyncGetOp* m_owner;
-        };
-
-        struct ConnectHandler : SharedHandlerPtr
-        {
-            explicit ConnectHandler (AsyncGetOp* owner)
-                : SharedHandlerPtr (owner)
-                , m_owner (owner)
-            {
-            }
-
-            void operator() (error_code const& ec)
-            {
-                m_owner->connect_complete (ec);
-            }
-
-            AsyncGetOp* m_owner;
-        };
-
-        struct HandshakeHandler : SharedHandlerPtr
-        {
-            explicit HandshakeHandler (AsyncGetOp* owner)
-                : SharedHandlerPtr (owner)
-                , m_owner (owner)
-            {
-            }
-
-            void operator() (error_code const& ec)
-            {
-                m_owner->handshake_complete (ec);
-            }
-
-            AsyncGetOp* m_owner;
-        };
-
-        struct WriteHandler : SharedHandlerPtr
-        {
-            explicit WriteHandler (AsyncGetOp* owner)
-                : SharedHandlerPtr (owner)
-                , m_owner (owner)
-            {
-            }
-
-            void operator() (error_code const& ec, std::size_t bytes_transferred)
-            {
-                m_owner->write_complete (ec, bytes_transferred);
-            }
-
-            AsyncGetOp* m_owner;
-        };
-
-        struct ReadHandler : SharedHandlerPtr
-        {
-            explicit ReadHandler (AsyncGetOp* owner)
-                : SharedHandlerPtr (owner)
-                , m_owner (owner)
-            {
-            }
-
-            void operator() (error_code const& ec, std::size_t bytes_transferred)
-            {
-                m_owner->read_complete (ec, bytes_transferred);
-            }
-
-            AsyncGetOp* m_owner;
-        };
-
-        struct ShutdownHandler : SharedHandlerPtr
-        {
-            explicit ShutdownHandler (AsyncGetOp* owner)
-                : SharedHandlerPtr (owner)
-                , m_owner (owner)
-            {
-            }
-
-            void operator() (error_code const& ec)
-            {
-                m_owner->shutdown_complete (ec);
-            }
-
-            AsyncGetOp* m_owner;
-        };
-
-        //----------------------------------------------------------------------
-
         void async_read_some ()
         {
             boost::asio::mutable_buffers_1 buf (
                 m_buffer.getData (), m_buffer.getSize ());
 
-            m_stream->async_read_some (buf,
-                m_strand.wrap (ReadHandler (this)));
-        }
-
-        // Called when the HTTP parser returns an error
-        void parse_error ()
-        {
-            //unsigned char const http_errno (m_parser.error ());
-            String const http_errmsg (m_parser.message ());
-
-            // VFALCO TODO put the parser error in ec
-            error_code ec (
-                boost::system::errc::invalid_argument,
-                    boost::system::system_category ());
-
-            complete (ec);
-        }
-
-        // Called to create an error when the message is over the limit
-        error_code message_limit_error ()
-        {
-            // VFALCO TODO Make a suitable error code
-            return error_code (
-                boost::system::errc::invalid_argument,
-                    boost::system::system_category ());
+            m_stream->async_read_some (buf, m_strand.wrap (
+                wrapHandler (boost::bind (&Session::handle_read,
+                    Ptr(this), boost::asio::placeholders::error,
+                        boost::asio::placeholders::bytes_transferred,
+                            CompletionCounter(this)), m_handler)));
         }
 
         //----------------------------------------------------------------------
+        //
+        // Completion handlers
+        //
 
-        void start_complete ()
+        // Called when there are no more pending i/o completions
+        void asyncHandlersComplete()
+        {
+        }
+
+        // Called when the operation starts
+        void handle_start (CompletionCounter)
         {
             query q (queryFromURL <query> (m_url));
-            m_resolver.async_resolve (q,
-                m_strand.wrap (ResolveHandler (this)));
+
+            m_resolver.async_resolve (q, m_strand.wrap (
+                wrapHandler (boost::bind (&Session::handle_resolve,
+                    Ptr(this), boost::asio::placeholders::error,
+                        boost::asio::placeholders::iterator,
+                            CompletionCounter(this)), m_handler)));
         }
 
-        void resolve_complete (error_code ec, iterator iter)
+        // Called when the timer completes
+        void handle_timer (error_code ec, CompletionCounter)
         {
-            if (io_complete (ec))
+            if (ec == boost::asio::error::operation_aborted)
                 return;
 
+            if (ec != 0)
+            {
+                failed (ec);
+                return;
+            }
+
+            failed (boost::system::errc::make_error_code (
+                boost::system::errc::timed_out));
+        }
+
+        // Called when the resolver completes
+        void handle_resolve (error_code ec, iterator iter, CompletionCounter)
+        {
+            if (ec == boost::asio::error::operation_aborted)
+                return;
+
+            if (ec != 0)
+            {
+                failed (ec);
+                return;
+            }
+
             resolver_entry const entry (*iter);
-            m_socket.async_connect (entry.endpoint (),
-                m_strand.wrap (ConnectHandler (this)));
+            m_socket.async_connect (entry.endpoint (), m_strand.wrap (
+                wrapHandler (boost::bind (&Session::handle_connect,
+                    Ptr(this), boost::asio::placeholders::error,
+                        CompletionCounter(this)), m_handler)));
         }
 
-        void connect_complete (error_code ec)
+        // Called when the connection attempt completes
+        void handle_connect (error_code ec, CompletionCounter)
         {
-            if (io_complete (ec))
+            if (ec == boost::asio::error::operation_aborted)
                 return;
 
+            if (ec != 0)
+            {
+                failed (ec);
+                return;
+            }
+
             if (m_url.scheme () == "https")
             {
                 typedef boost::asio::ssl::stream <socket&> ssl_stream;
@@ -553,153 +397,163 @@ private:
                     boost::asio::ssl::verify_peer |
                     boost::asio::ssl::verify_fail_if_no_peer_cert);
                 */
-                m_stream->async_handshake (
-                    Socket::client, HandshakeHandler (this));
+                m_stream->async_handshake (Socket::client, m_strand.wrap (
+                    wrapHandler (boost::bind (&Session::handle_handshake,
+                        Ptr(this), boost::asio::placeholders::error,
+                            CompletionCounter(this)), m_handler)));
                 return;
             }
 
             m_stream = new SocketWrapper <socket&> (m_socket);
-            handshake_complete (ec);
+            handle_handshake (ec, CompletionCounter(this));
         }
 
-        void handshake_complete (error_code ec)
+        // Called when the SSL handshake completes
+        void handle_handshake (error_code ec, CompletionCounter)
         {
-            if (io_complete (ec))
+            if (ec == boost::asio::error::operation_aborted)
                 return;
 
+            if (ec != 0)
+            {
+                failed (ec);
+                return;
+            }
+
             m_get_string =
                 "GET " + m_url.path() + " HTTP/1.1\r\n" +
                 "Host: " + m_url.host() + "\r\n" +
                 "Accept: */*\r\n" +
                 "Connection: close\r\n\r\n";
 
-            boost::asio::async_write (
-                *m_stream, stringBuffer (m_get_string),
-                    m_strand.wrap (WriteHandler (this)));
-            ++m_io_pending;
+            boost::asio::async_write (*m_stream, stringBuffer (
+                m_get_string), m_strand.wrap (wrapHandler (
+                    boost::bind (&Session::handle_write, Ptr(this),
+                        boost::asio::placeholders::error,
+                            boost::asio::placeholders::bytes_transferred,
+                                CompletionCounter(this)), m_handler)));
 
             async_read_some ();
         }
 
-        void write_complete (error_code ec, std::size_t)
+        // Called when the write operation completes
+        void handle_write (error_code ec, std::size_t, CompletionCounter)
         {
-            if (io_complete (ec))
+            if (ec == boost::asio::error::operation_aborted)
                 return;
 
-            if (! m_stream->needs_handshake ())
+            if (ec != 0)
             {
-                m_socket.shutdown (socket::shutdown_send, ec);
-                if (ec != 0)
-                    return complete (ec);
+                failed (ec);
+                return;
             }
 
-            // deduct one i/o since we aren't issuing any new one
-            cancel_io ();
+            if (! m_stream->needs_handshake ())
+                m_socket.shutdown (socket::shutdown_send, ec);
         }
 
-        void read_complete (error_code ec, std::size_t bytes_transferred)
+        void handle_read (error_code ec,
+            std::size_t bytes_transferred, CompletionCounter)
         {
+            if (ec == boost::asio::error::operation_aborted)
+                return;
+
+            if (ec != 0)
+            {
+                failed (ec);
+                return;
+            }
+
             m_bytesReceived += bytes_transferred;
             if (m_bytesReceived > m_messageLimitBytes)
-                ec = message_limit_error ();
-
-            if (io_complete (ec))
+            {
+                failed (error_code (
+                    boost::system::errc::invalid_argument,
+                    boost::system::system_category ()));
                 return;
+            }
 
             std::size_t const bytes_parsed (m_parser.process (
                 m_buffer.getData (), bytes_transferred));
 
             if (m_parser.error ())
             {
-                parse_error ();
+                failed (error_code (
+                    boost::system::errc::invalid_argument,
+                    boost::system::system_category ()));
                 return;
             }
 
             if (bytes_parsed != bytes_transferred)
             {
-                // VFALCO TODO put an appropriate error in ec
-                ec = error_code (
+                failed (error_code (
                     boost::system::errc::invalid_argument,
-                        boost::system::system_category ());
-                return complete (ec);
+                    boost::system::system_category ()));
+                return;
             }
 
             if (ec == boost::asio::error::eof)
-            {
                 m_parser.process_eof ();
-            }
 
             if (m_parser.finished ())
             {
-                m_state = stateShutdownComplete;
                 if (m_stream->needs_handshake ())
-                    m_stream->async_shutdown (ShutdownHandler (this));
+                {
+                    m_stream->async_shutdown (m_strand.wrap (wrapHandler (
+                        boost::bind (&Session::handle_shutdown, Ptr(this),
+                            boost::asio::placeholders::error,
+                                CompletionCounter(this)), m_handler)));
+                }
                 else
-                    shutdown_complete (error_code ());
+                {
+                    handle_shutdown (error_code (), CompletionCounter(this));
+                }
                 return;
             }
 
             async_read_some ();
         }
 
-        void shutdown_complete (error_code ec)
+        void handle_shutdown (error_code ec, CompletionCounter)
         {
-            if (io_complete (ec))
+            if (ec == boost::asio::error::operation_aborted)
                 return;
 
-            m_owner.m_result.response = m_parser.response ();
             if (ec == boost::asio::error::eof)
-                ec = error_code ();
+                ec = error_code();
 
-            return complete (ec);
+            if (ec != 0)
+            {
+                failed (ec);
+                return;
+            }
+
+            {
+                SharedState::Access state (m_state);
+                if (! state->complete)
+                {
+                    state->complete = true;
+                    state->response = m_parser.response();
+                }
+            }
+
+            cancel_all();
         }
-
-    private:
-        WaitableEvent m_done;
-        Atomic <int> m_io_pending;
-        HTTPClientType& m_owner;
-        boost::asio::io_service& m_io_service;
-        boost::asio::io_service& m_strand;
-        UniformResourceLocator m_url;
-        SharedHandlerPtr m_handler;
-        boost::asio::deadline_timer m_timer;
-        resolver m_resolver;
-        socket m_socket;
-        ScopedPointer <Socket> m_stream;
-        boost::asio::ssl::context m_context;
-        MemoryBlock m_buffer;
-        State m_state;
-        HTTPParser m_parser;
-        String m_get_string;
-        bool m_timer_canceled;
-        bool m_timer_expired;
-        std::size_t m_messageLimitBytes;
-        std::size_t m_bytesReceived;
     };
-
-    double m_timeoutSeconds;
-    std::size_t m_messageLimitBytes;
-    std::size_t m_bufferSize;
-    boost::asio::io_service  m_io_service;
-    SharedPtr <AsyncGetOp> m_async_op;
-    Result m_result;
 };
 
 //------------------------------------------------------------------------------
 
-HTTPClientBase* HTTPClientBase::New (
+HTTPClientBase* HTTPClientBase::New (Journal journal,
     double timeoutSeconds, std::size_t messageLimitBytes, std::size_t bufferSize)
 {
-    ScopedPointer <HTTPClientBase> object (new HTTPClientType
-        (timeoutSeconds, messageLimitBytes, bufferSize));
-    return object.release ();
+    return new HTTPClientType (
+        journal, timeoutSeconds, messageLimitBytes, bufferSize);
 }
 
 //------------------------------------------------------------------------------
 
-class HTTPClientTests
-    : public UnitTest
-    , public HTTPClientBase::Listener
+class HTTPClientTests : public UnitTest
 {
 public:
     typedef boost::system::error_code error_code;
@@ -758,19 +612,19 @@ public:
         }
     }
 
-    void log (HTTPClientBase::Result const& result)
+    void log (HTTPClientBase::error_type error, HTTPClientBase::value_type const& response)
     {
-        if (result.error != 0)
+        if (error != 0)
         {
             logMessage (String (
-                "HTTPClient error: '" + result.error.message() + "'"));
+                "HTTPClient error: '" + error.message() + "'"));
         }
-        else if (! result.response.empty ())
+        else if (! response.empty ())
         {
             logMessage (String ("Status: ") +
-                String::fromNumber (result.response->status()));
-            
-            log (*result.response);
+                String::fromNumber (response->status()));
+
+            log (*response);
         }
         else
         {
@@ -780,28 +634,31 @@ public:
 
     //--------------------------------------------------------------------------
 
-    void onHTTPRequestComplete (
-        HTTPClientBase const&, HTTPClientBase::Result const& result)
+    void handle_get (HTTPClientBase::result_type result)
     {
-        log (result);
+        log (result.first, result.second);
     }
 
     void testSync (String const& s, double timeoutSeconds)
     {
         ScopedPointer <HTTPClientBase> client (
-            HTTPClientBase::New (timeoutSeconds));
+            HTTPClientBase::New (Journal(), timeoutSeconds));
 
-        log (client->get (ParsedURL (s).url ()));
+        HTTPClientBase::result_type const& result (
+            client->get (ParsedURL (s).url ()));
+
+        log (result.first, result.second);
     }
 
     void testAsync (String const& s, double timeoutSeconds)
     {
         IoServiceThread t;
         ScopedPointer <HTTPClientBase> client (
-            HTTPClientBase::New (timeoutSeconds));
+            HTTPClientBase::New (Journal(), timeoutSeconds));
 
-        client->async_get (t.get_io_service (), this,
-            ParsedURL (s).url ());
+        client->async_get (t.get_io_service (), ParsedURL (s).url (),
+            beast::bind (&HTTPClientTests::handle_get, this,
+                beast::_1));
 
         t.start ();
         t.join ();
diff --git a/modules/beast_asio/http/HTTPClientType.h b/modules/beast_asio/http/HTTPClientType.h
index 5922813f38..364b409000 100644
--- a/modules/beast_asio/http/HTTPClientType.h
+++ b/modules/beast_asio/http/HTTPClientType.h
@@ -20,46 +20,54 @@
 #ifndef BEAST_ASIO_HTTPCLIENTTYPE_H_INCLUDED
 #define BEAST_ASIO_HTTPCLIENTTYPE_H_INCLUDED
 
+#include <utility>
+
+namespace beast {
+
 class HTTPClientBase
 {
 public:
-    struct Result
-    {
-        boost::system::error_code error;
-        SharedPtr <HTTPResponse> response;
-    };
-
-    class Listener
-    {
-    public:
-        virtual void onHTTPRequestComplete (
-            HTTPClientBase const& client,
-                Result const& result) = 0;
-    };
+    typedef boost::system::error_code           error_type;
+    typedef SharedPtr <HTTPResponse>            value_type;
+    typedef std::pair <error_type, value_type>  result_type;
 
     static HTTPClientBase* New (
+        Journal journal = Journal(),
         double timeoutSeconds = 30,
         std::size_t messageLimitBytes = 256 * 1024,
         std::size_t bufferSize = 16 * 1024);
 
+    /** Destroy the client.
+        This will cancel any pending i/o and block until all completion
+        handlers have been called.
+    */
     virtual ~HTTPClientBase () { }
 
-    virtual Result const& result () const = 0;
+    virtual result_type get (URL const& url) = 0;
 
-    virtual Result const& get (
-        UniformResourceLocator const& url) = 0;
+    /** Perform an asynchronous get on the specified URL.
+        Handler will be called with this signature:
+            void (result_type)
+    */
+    template <typename Handler>
+    void async_get (boost::asio::io_service& io_service,
+        URL const& url, BEAST_MOVE_ARG(Handler) handler)
+    {
+        async_get (io_service, url,
+            AbstractHandler <void (result_type)> (
+                BEAST_MOVE_CAST(Handler)(handler)));
+    }
 
     virtual void async_get (boost::asio::io_service& io_service,
-                            Listener* listener,
-                            UniformResourceLocator const& url) = 0;
+        URL const& url, AbstractHandler <void (result_type)> handler) = 0;
 
-    /** Cancel any pending asynchronous operations.
-        This must be called before destroying the container if there are
-        any pending asynchronous operations. This routine does nothing if
-        there are no pending operations. The call will block until all
-        pending i/o is canceled.
-    */
-    virtual void cancel () = 0;
+    /** Cancel all pending asynchronous operations. */
+    virtual void cancel() = 0;
+
+    /** Block until all asynchronous i/o completes. */
+    virtual void wait() = 0;
 };
 
+}
+
 #endif
diff --git a/modules/beast_asio/http/HTTPHeaders.cpp b/modules/beast_asio/http/HTTPHeaders.cpp
index f28f5113f2..48c460026d 100644
--- a/modules/beast_asio/http/HTTPHeaders.cpp
+++ b/modules/beast_asio/http/HTTPHeaders.cpp
@@ -72,3 +72,15 @@ String HTTPHeaders::operator[] (String const& field) const
 {
     return get (field);
 }
+
+String HTTPHeaders::toString () const
+{
+    String s;
+    for (int i = 0; i < m_fields.size (); ++i)
+    {
+        HTTPField const field (at(i));
+        s << field.name() << ": " << field.value() << newLine;
+    }
+    return s;
+}
+
diff --git a/modules/beast_asio/http/HTTPHeaders.h b/modules/beast_asio/http/HTTPHeaders.h
index d2a1a4cad1..6cf7e7e2aa 100644
--- a/modules/beast_asio/http/HTTPHeaders.h
+++ b/modules/beast_asio/http/HTTPHeaders.h
@@ -61,6 +61,9 @@ public:
     String operator[] (String const& field) const;
     /** @} */
 
+    /** Outputs all the headers into one string. */
+    String toString () const;
+
 private:
     StringPairArray m_fields;
 };
diff --git a/modules/beast_asio/http/HTTPMessage.cpp b/modules/beast_asio/http/HTTPMessage.cpp
index aeb743843e..698ec0dcc9 100644
--- a/modules/beast_asio/http/HTTPMessage.cpp
+++ b/modules/beast_asio/http/HTTPMessage.cpp
@@ -19,7 +19,7 @@
 
 HTTPMessage::HTTPMessage (HTTPVersion const& version_,
                           StringPairArray& fields,
-                          ContentBodyBuffer& body)
+                          DynamicBuffer& body)
     : m_version (version_)
     , m_headers (fields)
 {
@@ -36,7 +36,15 @@ HTTPHeaders const& HTTPMessage::headers () const
     return m_headers;
 }
 
-ContentBodyBuffer const& HTTPMessage::body () const
+DynamicBuffer const& HTTPMessage::body () const
 {
     return m_body;
 }
+
+String HTTPMessage::toString () const
+{
+    String s;
+    s << "HTTP " << version().toString() << newLine;
+    s << m_headers.toString ();
+    return s;
+}
diff --git a/modules/beast_asio/http/HTTPMessage.h b/modules/beast_asio/http/HTTPMessage.h
index 549d7d43c1..f2ca3e5756 100644
--- a/modules/beast_asio/http/HTTPMessage.h
+++ b/modules/beast_asio/http/HTTPMessage.h
@@ -40,7 +40,7 @@ public:
     */
     HTTPMessage (HTTPVersion const& version_,
                  StringPairArray& fields,
-                 ContentBodyBuffer& body);
+                 DynamicBuffer& body);
 
     /** Returns the HTTP version of this message. */
     HTTPVersion const& version () const;
@@ -49,12 +49,15 @@ public:
     HTTPHeaders const& headers () const;
 
     /** Returns the content-body. */
-    ContentBodyBuffer const& body () const;
+    DynamicBuffer const& body () const;
 
+    /** Outputs all the HTTPMessage data excluding the body into a string. */
+    String toString () const;
+        
 private:
     HTTPVersion m_version;
     HTTPHeaders m_headers;
-    ContentBodyBuffer m_body;
+    DynamicBuffer m_body;
 };
 
 #endif
diff --git a/modules/beast_asio/http/HTTPParser.cpp b/modules/beast_asio/http/HTTPParser.cpp
index 5ca1c9ed83..db11fda651 100644
--- a/modules/beast_asio/http/HTTPParser.cpp
+++ b/modules/beast_asio/http/HTTPParser.cpp
@@ -17,6 +17,8 @@
 */
 //==============================================================================
 
+namespace beast {
+
 HTTPParser::HTTPParser (Type type)
     : m_type (type)
     , m_impl (new HTTPParserImpl (
@@ -44,7 +46,15 @@ std::size_t HTTPParser::process (void const* buf, std::size_t bytes)
 
     if (m_impl->finished ())
     {
-        if (m_type == typeResponse)
+        if (m_type == typeRequest)
+        {
+            m_request = new HTTPRequest (
+                m_impl->version (),
+                m_impl->fields (),
+                m_impl->body (),
+                m_impl->method ());
+        }
+        else if (m_type == typeResponse)
         {
             m_response = new HTTPResponse (
                 m_impl->version (),
@@ -54,7 +64,7 @@ std::size_t HTTPParser::process (void const* buf, std::size_t bytes)
         }
         else
         {
-            // m_request = new HTTPRequest (
+            bassertfalse;
         }
     }
 
@@ -71,9 +81,28 @@ bool HTTPParser::finished () const
     return m_impl->finished();
 }
 
+StringPairArray const& HTTPParser::fields () const
+{
+    return m_impl->fields();
+}
+
+bool HTTPParser::headersComplete () const
+{
+    return m_impl->headers_complete();
+}
+
+SharedPtr <HTTPRequest> const& HTTPParser::request ()
+{
+    bassert (m_type == typeRequest);
+
+    return m_request;
+}
+
 SharedPtr <HTTPResponse> const& HTTPParser::response ()
 {
     bassert (m_type == typeResponse);
 
     return m_response;
 }
+
+}
diff --git a/modules/beast_asio/http/HTTPParser.h b/modules/beast_asio/http/HTTPParser.h
index d6e3a287e2..4295310616 100644
--- a/modules/beast_asio/http/HTTPParser.h
+++ b/modules/beast_asio/http/HTTPParser.h
@@ -20,6 +20,8 @@
 #ifndef BEAST_ASIO_HTTPPARSER_H_INCLUDED
 #define BEAST_ASIO_HTTPPARSER_H_INCLUDED
 
+namespace beast {
+
 class HTTPParserImpl;
 
 /** A parser for HTTPRequest and HTTPResponse objects. */
@@ -57,18 +59,31 @@ public:
     /** Returns `true` when parsing is successful and complete. */
     bool finished () const;
 
-    /** Return the HTTPResponse object produce from the parsing.
+    /** Peek at the header fields as they are being built.
+        Only complete pairs will show up, never partial strings.
+    */
+    StringPairArray const& fields () const;
+
+    /** Returns `true` if all the HTTP headers have been received. */
+    bool headersComplete () const;
+
+    /** Return the HTTPRequest object produced from the parsiing.
+        Only valid after finished returns `true`.
+    */
+    SharedPtr <HTTPRequest> const& request ();
+
+    /** Return the HTTPResponse object produced from the parsing.
         Only valid after finished returns `true`.
     */
     SharedPtr <HTTPResponse> const& response ();
 
-    //SharedPtr <HTTPRequest> const& request ();
-
-private:
+protected:
     Type m_type;
     ScopedPointer <HTTPParserImpl> m_impl;
+    SharedPtr <HTTPRequest> m_request;
     SharedPtr <HTTPResponse> m_response;
-    //SharedPtr <HTTPRequest> m_request;
 };
 
+}
+
 #endif
diff --git a/modules/beast_asio/http/HTTPParserImpl.h b/modules/beast_asio/http/HTTPParserImpl.h
index c01fd58114..dfd8b1d8ee 100644
--- a/modules/beast_asio/http/HTTPParserImpl.h
+++ b/modules/beast_asio/http/HTTPParserImpl.h
@@ -31,6 +31,7 @@ public:
     explicit HTTPParserImpl (enum http_parser_type type)
         : m_finished (false)
         , m_was_value (false)
+        , m_headersComplete (false)
     {
         m_settings.on_message_begin     = &HTTPParserImpl::on_message_begin;
         m_settings.on_url               = &HTTPParserImpl::on_url;
@@ -119,7 +120,12 @@ public:
         return m_fields;
     }
 
-    ContentBodyBuffer& body ()
+    bool headers_complete () const
+    {
+        return m_headersComplete;
+    }
+
+    DynamicBuffer& body ()
     {
         return m_body;
     }
@@ -174,6 +180,7 @@ private:
 
     int onHeadersComplete ()
     {
+        m_headersComplete = true;
         int ec (0);
         addFieldValue ();
         return ec;
@@ -181,8 +188,9 @@ private:
 
     int onBody (char const* at, std::size_t length)
     {
-        m_body.commit (boost::asio::buffer_copy (m_body.prepare (length),
-            boost::asio::buffer (at, length)));
+        m_body.commit (boost::asio::buffer_copy (
+            m_body.prepare <boost::asio::mutable_buffer> (length),
+                boost::asio::buffer (at, length)));
         return 0;
     }
 
@@ -250,7 +258,8 @@ private:
     bool m_was_value;
     std::string m_field;
     std::string m_value;
-    ContentBodyBuffer m_body;
+    bool m_headersComplete;
+    DynamicBuffer m_body;
 };
 
 #endif
diff --git a/modules/beast_asio/http/HTTPRequest.cpp b/modules/beast_asio/http/HTTPRequest.cpp
new file mode 100644
index 0000000000..f5a61c947e
--- /dev/null
+++ b/modules/beast_asio/http/HTTPRequest.cpp
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+HTTPRequest::HTTPRequest (
+    HTTPVersion const& version_,
+    StringPairArray& fields,
+    DynamicBuffer& body,
+    unsigned short method_)
+    : HTTPMessage (version_, fields, body)
+    , m_method (method_)
+{
+}
+
+unsigned short HTTPRequest::method () const
+{
+    return m_method;
+}
+
+String HTTPRequest::toString () const
+{
+    String s;
+    s << "Method: " << String::fromNumber (method ()) << newLine;
+    s << this->HTTPMessage::toString ();
+    return s;
+}
+
diff --git a/modules/beast_asio/http/HTTPRequest.h b/modules/beast_asio/http/HTTPRequest.h
new file mode 100644
index 0000000000..f21c30879a
--- /dev/null
+++ b/modules/beast_asio/http/HTTPRequest.h
@@ -0,0 +1,45 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_ASIO_HTTPREQUEST_H_INCLUDED
+#define BEAST_ASIO_HTTPREQUEST_H_INCLUDED
+
+class HTTPRequest : public HTTPMessage
+{
+public:
+    /** Construct a complete response from values.
+        Ownership of the fields and body parameters are
+        transferred from the caller.
+    */
+    HTTPRequest (
+        HTTPVersion const& version_,
+        StringPairArray& fields,
+        DynamicBuffer& body,
+        unsigned short method_);
+
+    unsigned short method () const;
+
+    /** Convert the request into a string, excluding the body. */
+    String toString () const;
+
+private:
+    unsigned short m_method;
+};
+
+#endif
diff --git a/modules/beast_core/memory/beast_GlobalPagedFreeStore.cpp b/modules/beast_asio/http/HTTPRequestParser.cpp
similarity index 73%
rename from modules/beast_core/memory/beast_GlobalPagedFreeStore.cpp
rename to modules/beast_asio/http/HTTPRequestParser.cpp
index 1074728c51..0647bf5016 100644
--- a/modules/beast_core/memory/beast_GlobalPagedFreeStore.cpp
+++ b/modules/beast_asio/http/HTTPRequestParser.cpp
@@ -17,26 +17,22 @@
 */
 //==============================================================================
 
-namespace
-{
+//#include "HTTPRequestParser.h"
 
-// Size of a page
-//
-static const size_t globalPageBytes = 8 * 1024;
+namespace beast {
 
-}
-
-GlobalPagedFreeStore::GlobalPagedFreeStore ()
-    : SharedSingleton <GlobalPagedFreeStore> (SingletonLifetime::persistAfterCreation)
-    , m_allocator (globalPageBytes)
+HTTPRequestParser::HTTPRequestParser ()
+    : HTTPParser (typeRequest)
 {
 }
 
-GlobalPagedFreeStore::~GlobalPagedFreeStore ()
+HTTPRequestParser::~HTTPRequestParser ()
 {
 }
 
-GlobalPagedFreeStore* GlobalPagedFreeStore::createInstance ()
+SharedPtr <HTTPRequest> const& HTTPRequestParser::request ()
 {
-    return new GlobalPagedFreeStore;
+    return m_request;
+}
+
 }
diff --git a/modules/beast_asio/http/HTTPRequestParser.h b/modules/beast_asio/http/HTTPRequestParser.h
new file mode 100644
index 0000000000..00cda4135f
--- /dev/null
+++ b/modules/beast_asio/http/HTTPRequestParser.h
@@ -0,0 +1,46 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_HTTP_REQUESTPARSER_H_INCLUDED
+#define BEAST_HTTP_REQUESTPARSER_H_INCLUDED
+
+#include "HTTPParser.h"
+
+namespace beast {
+
+/** A parser for HTTPRequest objects. */
+class HTTPRequestParser : public HTTPParser
+{
+public:
+    /** Construct a new parser for the specified HTTPMessage type. */
+    HTTPRequestParser ();
+
+    /** Destroy the parser. */
+    ~HTTPRequestParser ();
+
+    /** Return the HTTPRequest object produced from the parsing. */
+    SharedPtr <HTTPRequest> const& request ();
+
+private:
+    //SharedPtr <HTTPRequest> m_request;
+};
+
+}
+
+#endif
diff --git a/modules/beast_asio/http/HTTPResponse.cpp b/modules/beast_asio/http/HTTPResponse.cpp
index 7396127b5c..503a2eb208 100644
--- a/modules/beast_asio/http/HTTPResponse.cpp
+++ b/modules/beast_asio/http/HTTPResponse.cpp
@@ -20,7 +20,7 @@
 HTTPResponse::HTTPResponse (
     HTTPVersion const& version_,
     StringPairArray& fields,
-    ContentBodyBuffer& body,
+    DynamicBuffer& body,
     unsigned short status_)
     : HTTPMessage (version_, fields, body)
     , m_status (status_)
@@ -31,3 +31,12 @@ unsigned short HTTPResponse::status () const
 {
     return m_status;
 }
+
+String HTTPResponse::toString () const
+{
+    String s;
+    s << "Status: " << String::fromNumber (status ()) << newLine;
+    s << this->HTTPMessage::toString ();
+    return s;
+}
+
diff --git a/modules/beast_asio/http/HTTPResponse.h b/modules/beast_asio/http/HTTPResponse.h
index bb3f89cb11..2edfc99f17 100644
--- a/modules/beast_asio/http/HTTPResponse.h
+++ b/modules/beast_asio/http/HTTPResponse.h
@@ -30,11 +30,14 @@ public:
     HTTPResponse (
         HTTPVersion const& version_,
         StringPairArray& fields,
-        ContentBodyBuffer& body,
+        DynamicBuffer& body,
         unsigned short status_);
 
     unsigned short status () const;
 
+    /** Convert the response into a string, excluding the body. */
+    String toString () const;
+
 private:
     unsigned short m_status;
 };
diff --git a/modules/beast_asio/http/HTTPResponseParser.cpp b/modules/beast_asio/http/HTTPResponseParser.cpp
new file mode 100644
index 0000000000..b5e5857428
--- /dev/null
+++ b/modules/beast_asio/http/HTTPResponseParser.cpp
@@ -0,0 +1,38 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+//#include "HTTPResponseParser.h"
+
+namespace beast {
+
+HTTPResponseParser::HTTPResponseParser ()
+    : HTTPParser (typeResponse)
+{
+}
+
+HTTPResponseParser::~HTTPResponseParser ()
+{
+}
+
+SharedPtr <HTTPResponse> const& HTTPResponseParser::response ()
+{
+    return m_response;
+}
+
+}
diff --git a/modules/beast_asio/http/HTTPResponseParser.h b/modules/beast_asio/http/HTTPResponseParser.h
new file mode 100644
index 0000000000..422c9f0b26
--- /dev/null
+++ b/modules/beast_asio/http/HTTPResponseParser.h
@@ -0,0 +1,46 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_HTTP_RESPONSEPARSER_H_INCLUDED
+#define BEAST_HTTP_RESPONSEPARSER_H_INCLUDED
+
+#include "HTTPParser.h"
+
+namespace beast {
+
+/** A parser for HTTPResponse objects. */
+class HTTPResponseParser : public HTTPParser
+{
+public:
+    /** Construct a new parser for the specified HTTPMessage type. */
+    HTTPResponseParser ();
+
+    /** Destroy the parser. */
+    ~HTTPResponseParser ();
+
+    /** Return the HTTPResponse object produced from the parsing. */
+    SharedPtr <HTTPResponse> const& response ();
+
+private:
+    //SharedPtr <HTTPResponse> m_response;
+};
+
+}
+
+#endif
diff --git a/modules/beast_asio/http/HTTPVersion.cpp b/modules/beast_asio/http/HTTPVersion.cpp
index 7fcf4dc5ad..b6e9dfd8b0 100644
--- a/modules/beast_asio/http/HTTPVersion.cpp
+++ b/modules/beast_asio/http/HTTPVersion.cpp
@@ -44,16 +44,16 @@ HTTPVersion& HTTPVersion::operator= (HTTPVersion const& other)
 
 String HTTPVersion::toString () const
 {
-    return String::fromNumber (major ()) + "." +
-           String::fromNumber (minor ());
+    return String::fromNumber (vmajor ()) + "." +
+           String::fromNumber (vminor ());
 }
 
-unsigned short HTTPVersion::major () const
+unsigned short HTTPVersion::vmajor () const
 {
     return m_major;
 }
 
-unsigned short HTTPVersion::minor () const
+unsigned short HTTPVersion::vminor () const
 {
     return m_minor;
 }
diff --git a/modules/beast_asio/http/HTTPVersion.h b/modules/beast_asio/http/HTTPVersion.h
index c3e2a196c3..408e637944 100644
--- a/modules/beast_asio/http/HTTPVersion.h
+++ b/modules/beast_asio/http/HTTPVersion.h
@@ -29,8 +29,8 @@ public:
     HTTPVersion (HTTPVersion const& other);
     HTTPVersion& operator= (HTTPVersion const& other);
     String toString () const;
-    unsigned short major () const;
-    unsigned short minor () const;
+    unsigned short vmajor () const;
+    unsigned short vminor () const;
     bool operator== (HTTPVersion const& rhs) const;
     bool operator!= (HTTPVersion const& rhs) const;
     bool operator>  (HTTPVersion const& rhs) const;
@@ -40,7 +40,7 @@ public:
 
 private:
     unsigned short m_major;
-    unsigned short m_minor;;
+    unsigned short m_minor;
 };
 
 #endif
diff --git a/modules/beast_asio/sockets/SocketWrapper.h b/modules/beast_asio/sockets/SocketWrapper.h
index b93ee8ea9f..7c80eff28a 100644
--- a/modules/beast_asio/sockets/SocketWrapper.h
+++ b/modules/beast_asio/sockets/SocketWrapper.h
@@ -51,12 +51,6 @@ namespace detail
 
 namespace SocketWrapperMemberChecks
 {
-    template <bool Enable>
-    struct EnableIf : boost::false_type { };
-
-    template <>
-    struct EnableIf <true> : boost::true_type { };
-
     BEAST_DEFINE_IS_CALL_POSSIBLE(has_get_io_service, get_io_service);
 
     BEAST_DEFINE_IS_CALL_POSSIBLE(has_lowest_layer, lowest_layer);
@@ -133,6 +127,12 @@ class SocketWrapper
     , public Uncopyable
 {
 public:
+    // Converts a static bool constexpr member named 'value' into
+    // an IntegralConstant for SFINAE overload resolution.
+    //
+    template <class Cond>
+    struct Enabled : public IntegralConstant <bool, Cond::value> { };
+
     template <typename Arg>
     explicit SocketWrapper (Arg& arg)
         : m_object (arg)
@@ -232,11 +232,11 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         return native_handle (type_name, dest,
-            EnableIf <has_type_native_handle_type <this_layer_type>::value> ());
+            Enabled <has_type_native_handle_type <this_layer_type> > ());
     }
 
     bool native_handle (char const* type_name, void* dest,
-        boost::true_type)
+        TrueType)
     {
         char const* const name (typeid (typename this_layer_type::native_handle_type).name ());
         if (strcmp (name, type_name) == 0)
@@ -249,7 +249,7 @@ public:
     }
 
     bool native_handle (char const*, void*,
-        boost::false_type)
+        FalseType)
     {
         pure_virtual_called (__FILE__, __LINE__);
         return false;
@@ -266,21 +266,21 @@ public:
         // Apparently has_get_io_service always results in false
         using namespace detail::SocketWrapperMemberChecks;
         return get_io_service (
-            EnableIf <has_get_io_service <this_layer_type,
-                boost::asio::io_service&()>::value> ());
+            Enabled <has_get_io_service <this_layer_type,
+                boost::asio::io_service&()> > ());
 #else
-        return get_io_service (boost::true_type ());
+        return get_io_service (TrueType ());
 #endif
     }
 
     boost::asio::io_service& get_io_service (
-        boost::true_type)
+        TrueType)
     {
         return m_object.get_io_service ();
     }
 
     boost::asio::io_service& get_io_service (
-        boost::false_type)
+        FalseType)
     {
         pure_virtual_called (__FILE__, __LINE__);
         return *static_cast <boost::asio::io_service*>(nullptr);
@@ -334,11 +334,11 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         return lowest_layer_ptr (type_name,
-            EnableIf <has_type_lowest_layer_type <this_layer_type>::value> ());
+            Enabled <has_type_lowest_layer_type <this_layer_type> > ());
     }
 
     void* lowest_layer_ptr (char const* type_name,
-        boost::true_type) const
+        TrueType) const
     {
         char const* const name (typeid (typename this_layer_type::lowest_layer_type).name ());
         if (strcmp (name, type_name) == 0)
@@ -347,7 +347,7 @@ public:
     }
 
     void* lowest_layer_ptr (char const*,
-        boost::false_type) const
+        FalseType) const
     {
         pure_virtual_called (__FILE__, __LINE__);
         return nullptr;
@@ -359,18 +359,18 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         return cancel (ec,
-            EnableIf <has_cancel <this_layer_type,
-                error_code (error_code&)>::value> ());
+            Enabled <has_cancel <this_layer_type,
+                error_code (error_code&)> > ());
     }
    
     error_code cancel (error_code& ec,
-        boost::true_type)
+        TrueType)
     {
         return m_object.cancel (ec);
     }
 
     error_code cancel (error_code& ec,
-        boost::false_type)
+        FalseType)
     {
         return pure_virtual_error (ec, __FILE__, __LINE__);
     }
@@ -381,19 +381,19 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         return shutdown (what, ec,
-            EnableIf <has_shutdown <this_layer_type,
-                error_code (shutdown_type, error_code&)>::value> ());
+            Enabled <has_shutdown <this_layer_type,
+                error_code (shutdown_type, error_code&)> > ());
     }
 
 
     error_code shutdown (shutdown_type what, error_code& ec,
-        boost::true_type)
+        TrueType)
     {
         return m_object.shutdown (what, ec);
     }
 
     error_code shutdown (shutdown_type, error_code& ec,
-        boost::false_type)
+        FalseType)
     {
         return pure_virtual_error (ec, __FILE__, __LINE__);
     }
@@ -404,18 +404,18 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         return close (ec,
-            EnableIf <has_close <this_layer_type,
-                error_code (error_code&)>::value> ());
+            Enabled <has_close <this_layer_type,
+                error_code (error_code&)> > ());
     }
 
     error_code close (error_code& ec,
-        boost::true_type)
+        TrueType)
     {
         return m_object.close (ec);
     }
 
     error_code close (error_code& ec,
-        boost::false_type)
+        FalseType)
     {
         return pure_virtual_error (ec, __FILE__, __LINE__);
     }
@@ -430,12 +430,12 @@ public:
         using namespace detail::SocketWrapperMemberChecks;
         typedef typename native_socket <this_layer_type>::socket_type socket_type;
         return accept (peer, ec,
-            EnableIf <has_accept <this_layer_type,
-                error_code (socket_type&, error_code&)>::value> ());
+            Enabled <has_accept <this_layer_type,
+                error_code (socket_type&, error_code&)> > ());
     }
 
     error_code accept (Socket& peer, error_code& ec,
-        boost::true_type)
+        TrueType)
     {
         using namespace detail::SocketWrapperMemberChecks;
         return m_object.accept (
@@ -443,7 +443,7 @@ public:
     }
 
     error_code accept (Socket&, error_code& ec,
-        boost::false_type)
+        FalseType)
     {
         return pure_virtual_error (ec, __FILE__, __LINE__);
     }
@@ -455,12 +455,12 @@ public:
         using namespace detail::SocketWrapperMemberChecks;
         typedef typename native_socket <this_layer_type>::socket_type socket_type;
         async_accept (peer, BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler),
-            EnableIf <has_async_accept <this_layer_type,
-                void (socket_type&, BOOST_ASIO_MOVE_ARG(SharedHandlerPtr))>::value> ());
+            Enabled <has_async_accept <this_layer_type,
+                void (socket_type&, BOOST_ASIO_MOVE_ARG(SharedHandlerPtr))> > ());
     }
 
     void async_accept (Socket& peer, BOOST_ASIO_MOVE_ARG(SharedHandlerPtr) handler,
-        boost::true_type)
+        TrueType)
     {
         using namespace detail::SocketWrapperMemberChecks;
         m_object.async_accept (
@@ -469,7 +469,7 @@ public:
     }
 
     void async_accept (Socket&, BOOST_ASIO_MOVE_ARG(SharedHandlerPtr) handler,
-        boost::false_type)
+        FalseType)
     {
         get_io_service ().wrap (
             BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler))
@@ -485,20 +485,20 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         return read_some (buffers, ec,
-            EnableIf <has_read_some <this_layer_type,
-                std::size_t (MutableBuffers const&, error_code&)>::value> ());
+            Enabled <has_read_some <this_layer_type,
+                std::size_t (MutableBuffers const&, error_code&)> > ());
     }
 
     template <typename MutableBufferSequence>
     std::size_t read_some (MutableBufferSequence const& buffers, error_code& ec,
-        boost::true_type)
+        TrueType)
     {
         return m_object.read_some (buffers, ec);
     }
 
     template <typename MutableBufferSequence>
     std::size_t read_some (MutableBufferSequence const&, error_code& ec,
-        boost::false_type)
+        FalseType)
     {
         pure_virtual_called (__FILE__, __LINE__);
         ec = pure_virtual_error ();
@@ -511,20 +511,20 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         return write_some (buffers, ec,
-            EnableIf <has_write_some <this_layer_type,
-                std::size_t (ConstBuffers const&, error_code&)>::value> ());
+            Enabled <has_write_some <this_layer_type,
+                std::size_t (ConstBuffers const&, error_code&)> > ());
     }
 
     template <typename ConstBufferSequence>
     std::size_t write_some (ConstBufferSequence const& buffers, error_code& ec,
-        boost::true_type)
+        TrueType)
     {
         return m_object.write_some (buffers, ec);
     }
 
     template <typename ConstBufferSequence>
     std::size_t write_some (ConstBufferSequence const&, error_code& ec,
-        boost::false_type)
+        FalseType)
     {
         pure_virtual_called (__FILE__, __LINE__);
         ec = pure_virtual_error ();
@@ -537,13 +537,13 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         async_read_some (buffers, BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler),
-            EnableIf <has_async_read_some <this_layer_type,
-                void (MutableBuffers const&, BOOST_ASIO_MOVE_ARG(SharedHandlerPtr))>::value> ());
+            Enabled <has_async_read_some <this_layer_type,
+                void (MutableBuffers const&, BOOST_ASIO_MOVE_ARG(SharedHandlerPtr))> > ());
     }
 
     void async_read_some (MutableBuffers const& buffers,
             BOOST_ASIO_MOVE_ARG(SharedHandlerPtr) handler,
-                boost::true_type)
+                TrueType)
     {
         m_object.async_read_some (buffers,
             BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler));
@@ -551,7 +551,7 @@ public:
 
     void async_read_some (MutableBuffers const&,
         BOOST_ASIO_MOVE_ARG(SharedHandlerPtr) handler,
-            boost::false_type)
+            FalseType)
     {
         get_io_service ().wrap (
             BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler))
@@ -564,13 +564,13 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         async_write_some (buffers, BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler),
-            EnableIf <has_async_write_some <this_layer_type,
-                void (ConstBuffers const&, BOOST_ASIO_MOVE_ARG(SharedHandlerPtr))>::value> ());
+            Enabled <has_async_write_some <this_layer_type,
+                void (ConstBuffers const&, BOOST_ASIO_MOVE_ARG(SharedHandlerPtr))> > ());
     }
 
     void async_write_some (ConstBuffers const& buffers,
         BOOST_ASIO_MOVE_ARG(SharedHandlerPtr) handler,
-            boost::true_type)
+            TrueType)
     {
         m_object.async_write_some (buffers,
             BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler));
@@ -578,7 +578,7 @@ public:
 
     void async_write_some (ConstBuffers const&,
         BOOST_ASIO_MOVE_ARG(SharedHandlerPtr) handler,
-            boost::false_type)
+            FalseType)
     {
         get_io_service ().wrap (
             BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler))
@@ -624,11 +624,11 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         return next_layer_ptr (type_name,
-            EnableIf <has_type_next_layer_type <this_layer_type>::value> ());
+            Enabled <has_type_next_layer_type <this_layer_type> > ());
     }
 
     void* next_layer_ptr (char const* type_name,
-        boost::true_type) const
+        TrueType) const
     {
         char const* const name (typeid (typename this_layer_type::next_layer_type).name ());
         if (strcmp (name, type_name) == 0)
@@ -637,7 +637,7 @@ public:
     }
 
     void* next_layer_ptr (char const*,
-        boost::false_type) const
+        FalseType) const
     {
         pure_virtual_called (__FILE__, __LINE__);
         return nullptr;
@@ -661,19 +661,19 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         set_verify_mode (verify_mode,
-            EnableIf <has_set_verify_mode <this_layer_type,
-                void (int)>::value> ());
+            Enabled <has_set_verify_mode <this_layer_type,
+                void (int)> > ());
  
     }
 
     void set_verify_mode (int verify_mode,
-        boost::true_type)
+        TrueType)
     {
         m_object.set_verify_mode (verify_mode);
     }
 
     void set_verify_mode (int,
-        boost::false_type)
+        FalseType)
     {
         pure_virtual_called (__FILE__, __LINE__);
     }
@@ -684,18 +684,18 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         return handshake (type, ec,
-            EnableIf <has_handshake <this_layer_type,
-                error_code (handshake_type, error_code&)>::value> ());
+            Enabled <has_handshake <this_layer_type,
+                error_code (handshake_type, error_code&)> > ());
     }
 
     error_code handshake (handshake_type type, error_code& ec,
-        boost::true_type)
+        TrueType)
     {
         return m_object.handshake (type, ec);
     }
 
     error_code handshake (handshake_type, error_code& ec,
-        boost::false_type)
+        FalseType)
     {
         return pure_virtual_error (ec, __FILE__, __LINE__);
     }
@@ -706,20 +706,20 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         async_handshake (type, BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler),
-            EnableIf <has_async_handshake <this_layer_type,
-                void (handshake_type, BOOST_ASIO_MOVE_ARG(SharedHandlerPtr))>::value> ());
+            Enabled <has_async_handshake <this_layer_type,
+                void (handshake_type, BOOST_ASIO_MOVE_ARG(SharedHandlerPtr))> > ());
     }
 
     void async_handshake (handshake_type type,
         BOOST_ASIO_MOVE_ARG(SharedHandlerPtr) handler,
-            boost::true_type)
+            TrueType)
     {
         m_object.async_handshake (type,
             BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler));
     }
 
     void async_handshake (handshake_type, BOOST_ASIO_MOVE_ARG(SharedHandlerPtr) handler,
-        boost::false_type)
+        FalseType)
     {
         get_io_service ().wrap (
             BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler))
@@ -735,19 +735,19 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         return handshake (type, buffers, ec,
-            EnableIf <has_handshake <this_layer_type,
-                error_code (handshake_type, ConstBuffers const&, error_code&)>::value> ());
+            Enabled <has_handshake <this_layer_type,
+                error_code (handshake_type, ConstBuffers const&, error_code&)> > ());
     }
 
     error_code handshake (handshake_type type,
         ConstBuffers const& buffers, error_code& ec,
-            boost::true_type)
+            TrueType)
     {
         return m_object.handshake (type, buffers, ec);
     }
 
     error_code handshake (handshake_type, ConstBuffers const&, error_code& ec,
-        boost::false_type)
+        FalseType)
     {
         return pure_virtual_error (ec, __FILE__, __LINE__);
     }
@@ -760,14 +760,14 @@ public:
         using namespace detail::SocketWrapperMemberChecks;
         async_handshake (type, buffers,
             BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler),
-                EnableIf <has_async_handshake <this_layer_type,
+                Enabled <has_async_handshake <this_layer_type,
                     void (handshake_type, ConstBuffers const&,
-                        BOOST_ASIO_MOVE_ARG(SharedHandlerPtr))>::value> ());
+                        BOOST_ASIO_MOVE_ARG(SharedHandlerPtr))> > ());
     }
 
     void async_handshake (handshake_type type, ConstBuffers const& buffers,
         BOOST_ASIO_MOVE_ARG(SharedHandlerPtr) handler,
-            boost::true_type)
+            TrueType)
     {
         m_object.async_handshake (type, buffers,
             BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler));
@@ -775,7 +775,7 @@ public:
 
     void async_handshake (handshake_type, ConstBuffers const&,
         BOOST_ASIO_MOVE_ARG(SharedHandlerPtr) handler,
-            boost::false_type)
+            FalseType)
     {
         get_io_service ().wrap (
             BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler))
@@ -790,18 +790,18 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         return shutdown (ec,
-            EnableIf <has_shutdown <this_layer_type,
-                error_code (error_code&)>::value> ());
+            Enabled <has_shutdown <this_layer_type,
+                error_code (error_code&)> > ());
     }
 
     error_code shutdown (error_code& ec,
-        boost::true_type)
+        TrueType)
     {
         return m_object.shutdown (ec);
     }
 
     error_code shutdown (error_code& ec,
-        boost::false_type)
+        FalseType)
     {
         return pure_virtual_error (ec, __FILE__, __LINE__);
     }
@@ -812,19 +812,19 @@ public:
     {
         using namespace detail::SocketWrapperMemberChecks;
         async_shutdown (BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler),
-            EnableIf <has_async_shutdown <this_layer_type,
-                void (BOOST_ASIO_MOVE_ARG(SharedHandlerPtr))>::value> ());
+            Enabled <has_async_shutdown <this_layer_type,
+                void (BOOST_ASIO_MOVE_ARG(SharedHandlerPtr))> > ());
     }
 
     void async_shutdown (BOOST_ASIO_MOVE_ARG(SharedHandlerPtr) handler,
-        boost::true_type)
+        TrueType)
     {
         m_object.async_shutdown (
             BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler));
     }
 
     void async_shutdown (BOOST_ASIO_MOVE_ARG(SharedHandlerPtr) handler,
-        boost::false_type)
+        FalseType)
     {
         get_io_service ().wrap (
             BOOST_ASIO_MOVE_CAST(SharedHandlerPtr)(handler))
diff --git a/modules/beast_core/beast_core.cpp b/modules/beast_core/beast_core.cpp
index e837f976d7..8608e180d1 100644
--- a/modules/beast_core/beast_core.cpp
+++ b/modules/beast_core/beast_core.cpp
@@ -21,21 +21,12 @@
 */
 //==============================================================================
 
-#if defined BEAST_CORE_H_INCLUDED
- /* When you add this cpp file to your project, you mustn't include it in a file where you've
-    already included any other headers - just put it inside a file on its own, possibly with your config
-    flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
-    header files that the compiler may be using.
- */
- #error "Incorrect use of BEAST cpp file"
-#endif
-
 // Your project must contain a BeastConfig.h file with your project-specific settings in it,
 // and your header search path must make it accessible to the module's files.
 #include "BeastConfig.h"
 
 //==============================================================================
-#include "native/beast_BasicNativeHeaders.h"
+#include "native/BasicNativeHeaders.h"
 #include "beast_core.h"
 
 #include <locale>
@@ -138,170 +129,155 @@
 namespace beast
 {
 
-#include "containers/beast_AbstractFifo.cpp"
-#include "containers/beast_DynamicObject.cpp"
-#include "containers/beast_NamedValueSet.cpp"
-#include "containers/beast_PropertySet.cpp"
-#include "containers/beast_Variant.cpp"
-#include "containers/DynamicArray.cpp"
-#include "containers/DynamicList.cpp"
-#include "containers/HashMap.cpp"
+#include "containers/AbstractFifo.cpp"
+#include "containers/DynamicObject.cpp"
+#include "containers/NamedValueSet.cpp"
+#include "containers/PropertySet.cpp"
+#include "containers/Variant.cpp"
 
-#include "diagnostic/beast_Debug.cpp"
-#include "diagnostic/beast_Error.cpp"
-#include "diagnostic/beast_FatalError.cpp"
-#include "diagnostic/beast_FPUFlags.cpp"
-#include "diagnostic/beast_LeakChecked.cpp"
-#include "diagnostic/beast_ProtectedCall.cpp"
-#include "diagnostic/beast_SemanticVersion.cpp"
-#include "diagnostic/beast_UnitTest.cpp"
-#include "diagnostic/beast_UnitTestUtilities.cpp"
+#include "diagnostic/FatalError.cpp"
+#include "diagnostic/FPUFlags.cpp"
+#include "diagnostic/SemanticVersion.cpp"
+#include "diagnostic/UnitTest.cpp"
+#include "diagnostic/UnitTestUtilities.cpp"
 
-#include "files/beast_DirectoryIterator.cpp"
-#include "files/beast_File.cpp"
-#include "files/beast_FileInputStream.cpp"
-#include "files/beast_FileOutputStream.cpp"
-#include "files/beast_FileSearchPath.cpp"
-#include "files/beast_RandomAccessFile.cpp"
-#include "files/beast_TemporaryFile.cpp"
+#include "files/DirectoryIterator.cpp"
+#include "files/File.cpp"
+#include "files/FileInputStream.cpp"
+#include "files/FileOutputStream.cpp"
+#include "files/FileSearchPath.cpp"
+#include "files/RandomAccessFile.cpp"
+#include "files/TemporaryFile.cpp"
 
-#include "json/beast_JSON.cpp"
+#include "json/JSON.cpp"
 
-#include "logging/beast_FileLogger.cpp"
-#include "logging/beast_Logger.cpp"
+#include "logging/FileLogger.cpp"
+#include "logging/Logger.cpp"
 
-#include "maths/beast_BigInteger.cpp"
-#include "maths/beast_Expression.cpp"
-#include "maths/beast_MurmurHash.cpp"
-#include "maths/beast_Random.cpp"
+#include "maths/BigInteger.cpp"
+#include "maths/Expression.cpp"
+#include "maths/MurmurHash.cpp"
+#include "maths/Random.cpp"
 
-#include "memory/beast_MemoryBlock.cpp"
-#include "memory/beast_FifoFreeStoreWithTLS.cpp"
-#include "memory/beast_FifoFreeStoreWithoutTLS.cpp"
-#include "memory/beast_GlobalPagedFreeStore.cpp"
-#include "memory/beast_PagedFreeStore.cpp"
+#include "memory/MemoryBlock.cpp"
 
-#include "misc/beast_Main.cpp"
-#include "misc/beast_Result.cpp"
-#include "misc/beast_Uuid.cpp"
+#include "misc/Main.cpp"
+#include "misc/Result.cpp"
+#include "misc/Uuid.cpp"
 
-#include "network/beast_MACAddress.cpp"
-#include "network/beast_NamedPipe.cpp"
-#include "network/beast_Socket.cpp"
-#include "network/beast_URL.cpp"
-#include "network/beast_IPAddress.cpp"
+#include "network/MACAddress.cpp"
+#include "network/NamedPipe.cpp"
+#include "network/Socket.cpp"
+#include "network/IPAddress.cpp"
 
-#include "streams/beast_BufferedInputStream.cpp"
-#include "streams/beast_FileInputSource.cpp"
-#include "streams/beast_InputStream.cpp"
-#include "streams/beast_MemoryInputStream.cpp"
-#include "streams/beast_MemoryOutputStream.cpp"
-#include "streams/beast_OutputStream.cpp"
-#include "streams/beast_SubregionStream.cpp"
+#include "streams/BufferedInputStream.cpp"
+#include "streams/FileInputSource.cpp"
+#include "streams/InputStream.cpp"
+#include "streams/MemoryInputStream.cpp"
+#include "streams/MemoryOutputStream.cpp"
+#include "streams/OutputStream.cpp"
+#include "streams/SubregionStream.cpp"
 
 #include "system/SystemStats.cpp"
 
-#include "text/beast_CharacterFunctions.cpp"
-#include "text/beast_LexicalCast.cpp"
-#include "text/beast_Identifier.cpp"
-#include "text/beast_LocalisedStrings.cpp"
-#include "text/beast_String.cpp"
-#include "text/beast_StringArray.cpp"
-#include "text/beast_StringPairArray.cpp"
-#include "text/beast_StringPool.cpp"
-#include "text/beast_TextDiff.cpp"
+#include "text/LexicalCast.cpp"
+#include "text/Identifier.cpp"
+#include "text/LocalisedStrings.cpp"
+#include "text/StringArray.cpp"
+#include "text/StringPairArray.cpp"
+#include "text/StringPool.cpp"
+#include "text/TextDiff.cpp"
 
 #include "thread/impl/TrackedMutex.cpp"
-#include "thread/beast_DeadlineTimer.cpp"
-#include "thread/beast_InterruptibleThread.cpp"
-#include "thread/beast_Semaphore.cpp"
-#include "thread/beast_CallQueue.cpp"
-#include "thread/beast_Listeners.cpp"
-#include "thread/beast_ManualCallQueue.cpp"
-#include "thread/beast_ParallelFor.cpp"
-#include "thread/beast_ThreadGroup.cpp"
-#include "thread/beast_ThreadWithCallQueue.cpp"
-#include "thread/beast_Workers.cpp"
+#include "thread/DeadlineTimer.cpp"
+#include "thread/Semaphore.cpp"
+#include "thread/Workers.cpp"
 
-#include "threads/beast_ChildProcess.cpp"
-#include "threads/beast_ReadWriteLock.cpp"
-#include "threads/beast_ReadWriteMutex.cpp"
-#include "threads/beast_SpinDelay.cpp"
-#include "threads/beast_Thread.cpp"
-#include "threads/beast_ThreadPool.cpp"
-#include "threads/beast_TimeSliceThread.cpp"
+#include "threads/ChildProcess.cpp"
+#include "threads/ReadWriteLock.cpp"
+#include "threads/SpinDelay.cpp"
 
-#include "time/beast_PerformanceCounter.cpp"
-#include "time/beast_PerformedAtExit.cpp"
-#include "time/beast_RelativeTime.cpp"
-#include "time/beast_Time.cpp"
+#include "time/PerformanceCounter.cpp"
+#include "time/AtExitHook.cpp"
+#include "time/Time.cpp"
 
-#include "xml/beast_XmlDocument.cpp"
-#include "xml/beast_XmlElement.cpp"
+#include "xml/XmlDocument.cpp"
+#include "xml/XmlElement.cpp"
 
-#include "zip/beast_GZIPDecompressorInputStream.cpp"
-#include "zip/beast_GZIPCompressorOutputStream.cpp"
-#include "zip/beast_ZipFile.cpp"
+#include "zip/GZIPDecompressorInputStream.cpp"
+#include "zip/GZIPCompressorOutputStream.cpp"
+#include "zip/ZipFile.cpp"
 
 #if BEAST_MAC || BEAST_IOS
-#include "native/beast_osx_ObjCHelpers.h"
+#include "native/osx_ObjCHelpers.h"
 #endif
 
 #if BEAST_WINDOWS
-#include "native/beast_win32_FPUFlags.cpp"
+#include "native/win32_FPUFlags.cpp"
 #else
-#include "native/beast_posix_FPUFlags.cpp"
+#include "native/posix_FPUFlags.cpp"
 #endif
 
 #if BEAST_ANDROID
-#include "native/beast_android_JNIHelpers.h"
+#include "native/android_JNIHelpers.h"
 #endif
 
 #if ! BEAST_WINDOWS
-#include "native/beast_posix_SharedCode.h"
-#include "native/beast_posix_NamedPipe.cpp"
+#include "native/posix_SharedCode.h"
+#include "native/posix_NamedPipe.cpp"
 #endif
 
 #if BEAST_MAC || BEAST_IOS
-#include "native/beast_mac_Files.mm"
-#include "native/beast_mac_Network.mm"
-#include "native/beast_mac_Strings.mm"
-#include "native/beast_mac_SystemStats.mm"
-#include "native/beast_mac_Threads.mm"
+#include "native/mac_Files.mm"
+#include "native/mac_Network.mm"
+#include "native/mac_Strings.mm"
+#include "native/mac_SystemStats.mm"
+#include "native/mac_Threads.mm"
 
 #elif BEAST_WINDOWS
-#include "native/beast_win32_ComSmartPtr.h"
-#include "native/beast_win32_Files.cpp"
-#include "native/beast_win32_Network.cpp"
-#include "native/beast_win32_Registry.cpp"
-#include "native/beast_win32_SystemStats.cpp"
-#include "native/beast_win32_Threads.cpp"
+#include "native/win32_ComSmartPtr.h"
+#include "native/win32_Files.cpp"
+#include "native/win32_Network.cpp"
+#include "native/win32_Registry.cpp"
+#include "native/win32_SystemStats.cpp"
+#include "native/win32_Threads.cpp"
 
 #elif BEAST_LINUX
-#include "native/beast_linux_Files.cpp"
-#include "native/beast_linux_Network.cpp"
-#include "native/beast_linux_SystemStats.cpp"
-#include "native/beast_linux_Threads.cpp"
+#include "native/linux_Files.cpp"
+#include "native/linux_Network.cpp"
+#include "native/linux_SystemStats.cpp"
+#include "native/linux_Threads.cpp"
 
 #elif BEAST_BSD
-#include "native/beast_bsd_Files.cpp"
-#include "native/beast_bsd_Network.cpp"
-#include "native/beast_bsd_SystemStats.cpp"
-#include "native/beast_bsd_Threads.cpp"
+#include "native/bsd_Files.cpp"
+#include "native/bsd_Network.cpp"
+#include "native/bsd_SystemStats.cpp"
+#include "native/bsd_Threads.cpp"
 
 #elif BEAST_ANDROID
-#include "native/beast_android_Files.cpp"
-#include "native/beast_android_Misc.cpp"
-#include "native/beast_android_Network.cpp"
-#include "native/beast_android_SystemStats.cpp"
-#include "native/beast_android_Threads.cpp"
+#include "native/android_Files.cpp"
+#include "native/android_Misc.cpp"
+#include "native/android_Network.cpp"
+#include "native/android_SystemStats.cpp"
+#include "native/android_Threads.cpp"
 
 #endif
 
-#include "threads/beast_HighResolutionTimer.cpp"
+#include "threads/HighResolutionTimer.cpp"
 
 }
 
+// Has to be outside the beast namespace
+extern "C" {
+void beast_reportFatalError (char const* message, char const* fileName, int lineNumber)
+{
+    if (beast::beast_isRunningUnderDebugger())
+        beast_breakDebugger;
+    beast::FatalError (message, fileName, lineNumber);
+    BEAST_ANALYZER_NORETURN
+}
+}
+
 #ifdef _CRTDBG_MAP_ALLOC
 #pragma pop_macro("calloc")
 #pragma pop_macro("free")
@@ -320,5 +296,21 @@ namespace beast
 
 //------------------------------------------------------------------------------
 
+// When we compile the static library, which is really just for browsing the
+// sources in the Visual Studio IDE, we want to compile each individual unity
+// .cpp in order to make sure that it builds by itself. An application that
+// uses beast will typically include all of these .cpp files in one of its
+// own unity .cpp
+#if ! BEAST_COMPILING_STATIC_LIBARARY
+/*
+#include "../../beast/chrono/Chrono.cpp"
+#include "../../beast/crypto/Crypto.cpp"
+#include "../../beast/http/HTTP.cpp"
+#include "../../beast/net/Net.cpp"
+#include "../../beast/strings/Strings.cpp"
+#include "../../beast/utility/Utility.cpp"
+*/
+#endif
+
 // Must be outside the namespace
 #include "system/BoostPlaceholdersFix.cpp"
diff --git a/modules/beast_core/beast_core.h b/modules/beast_core/beast_core.h
index 1e0e7a0527..fff039ba9f 100644
--- a/modules/beast_core/beast_core.h
+++ b/modules/beast_core/beast_core.h
@@ -24,160 +24,14 @@
 #ifndef BEAST_CORE_H_INCLUDED
 #define BEAST_CORE_H_INCLUDED
 
-//------------------------------------------------------------------------------
-/**
-
-@mainpage Beast: A C++ library for peer to peer and client server development.
-
-### Version 1.0
-
-Copyright 2008, 2013 by Vinnie Falco \<vinnie.falco@gmail.com\> ([e-mail][0])
-
-Beast is a source code collection of individual modules containing
-functionality for a variety of applications, with an emphasis on building
-concurrent systems. Beast incorporates parts of [JUCE][3] (Jules' Utility
-Class Extensions), available from [Raw Material Software][4]. Beast has no
-external dependencies 
-
-Beast is hosted on Github at [https://github.com/vinniefalco/Beast][1]
-
-The online documentation is at [http://vinniefalco.github.com/Beast][2]
-
-## Platforms
-
-All platforms supported by JUCE are also supported by Beast. Currently these
-platforms include:
-
-- **Windows**: Applications and VST/RTAS/NPAPI/ActiveX plugins can be built
-using MS Visual Studio. The results are all fully compatible with Windows
-XP, Vista or Windows 7.
-
-- **Mac OS X**: Applications and VST/AudioUnit/RTAS/NPAPI plugins with Xcode.
-
-- **GNU/Linux**: Applications and plugins can be built for any kernel 2.6 or
-later.
-
-- **FreeBSD**: Kernel version 8.4 or higher required.
-
-- **iOS**: Native iPhone and iPad apps.
-
-- **Android**: Supported.
-
-## Prerequisites
-
-This documentation assumes that the reader has a working knowledge of JUCE.
-Some modules built on external libraries assume that the reader understands
-the operation of those external libraries. Certain modules assume that the
-reader understands additional domain-specific information. Modules with
-additional prerequisites are marked in the documentation.
-
-## External Modules
-
-Some modules bring in functionality provided by external libraries. For
-example, the @ref beast_bzip2 module provides the compression and decompression
-algorithms in [bZip2][7]. Usage of these external library modules is optional.
-They come with complete source code, as well as options for using either
-system or user provided variants of the external libraries: it is not
-necessary to download additional source code packages to use these modules.
-
-External code incorporated into Beast is covered by separate licenses. See
-the licensing information and notes in the corresponding source files for
-copyright information and terms of use.
-
-## Integration
-
-Beast requires recent versions of JUCE. It won't work with versions 1.53 or
-earlier. To use the library it is necessary to first download JUCE to a
-location where your development environment can find it. Or, you can use your
-existing installation of JUCE.
-
-This library uses the same modularized organizational structure as JUCE. To
-use a module, first add a path to the list of includes searched by your
-development environment or project, which points to the Beast directory. Then,
-add the single corresponding .c or .cpp file to your existing project which
-already uses JUCE. For example, to use the @ref beast_core module, add the file
-beast_core.cpp to your project. Some modules depend on other modules.
-
-To use a module, include the appropriate header from within your source code.
-For example, to access classes in the @ref beast_concurrent module, use this:
-
-@code
-
-#include "modules/beast_concurrent/beast_concurrent.h"
-
-@endcode
-
-Then add the corresponding file beast_concurrent.cpp to your build.
-
-## AppConfig
-
-Some Beast features can be controlled at compilation time through
-preprocessor directives. The available choices of compilation options are
-described in AppConfig.h, located in the AppConfigTemplate directory. Copy
-the provided settings into your existing AppConfig.h (a file used by JUCE
-convention).
-
-## License
-
-This library contains portions of other open source products covered by
-separate licenses. Please see the corresponding source files for specific
-terms.
-
-Beast is provided under the terms of The ISC License:
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose  with  or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Some files contain portions of these external projects, licensed separately:
-
-- [bZip2][7] is Copyright (C) 1996-2010 Julian R Seward. All rights
-    reserved. See the corresponding file LICENSE for licensing terms.
-
-- [Soci][13] is Copyright (C) 2004-2008 Maciej Sobczak, Stephen Hutton, and
-    various others noted in the corresponding source files. Soci is distributed
-    under the [Boost Software License, Version 1.0][14].
-
-- [SQLite][15], placed in the public domain.
-
-[0]: mailto:vinnie.falco@gmail.com "Vinnie Falco (Email)"
-[1]: https://github.com/vinniefalco/Beast "Beast Project"
-[2]: http://vinniefalco.github.com/Beast/ "Beast Documentation"
-[3]: http://rawmaterialsoftware.com/juce.php "JUCE"
-[4]: http://rawmaterialsoftware.com/ "Raw Material Software"
-[5]: http://www.gnu.org/licenses/gpl-2.0.html "GNU General Public License, version 2"
-[6]: http://rawmaterialsoftware.com/jucelicense.php "JUCE Licenses"
-[7]: http://www.bzip.org/ "bZip2: Home"
-[8]: http://freetype.org/ "The FreeType Project"
-[9]: http://www.freetype.org/FTL.TXT "The FreeType Project License"
-[10]: http://www.lua.org/ "The Programming Language Lua"
-[11]: http://opensource.org/licenses/ISC "The ISC License"
-[12]: https://github.com/vinniefalco/LuaBridge
-[13]: http://soci.sourceforge.net/ "SOCI"
-[14]: http://www.boost.org/LICENSE_1_0.txt "Boost Software License, Version 1.0"
-[15]: http://sqlite.org/ "SQLite Home Page"
-[16]: http://developer.kde.org/~wheeler/taglib.html "TagLib"
-[17]: http://www.gnu.org/licenses/lgpl-2.1.html "Gnu Lesser General Public License, version 2.1"
-[18]: http://www.mozilla.org/MPL/1.1/ "Mozilla Public License"
-
-@copyright Copyright 2008-2013 by Vinnie Falco \<vinnie.falco@gmail.com\> ([e-mail][0])
-@copyright Provided under the [ISC LIcense][11]
-*/
+// TargetPlatform.h should not use anything from BeastConfig.h
+#include "../../beast/Config.h"
+#include "../../beast/config/ContractChecks.h"
 
 # include "system/BeforeBoost.h"
 # include "system/BoostIncludes.h"
 #include "system/FunctionalIncludes.h"
 
-#include "system/StandardHeader.h"
-
 #if BEAST_MSVC
 # pragma warning (disable: 4251) // (DLL build warning, must be disabled before pushing the warning state)
 # pragma warning (push)
@@ -187,6 +41,53 @@ Some files contain portions of these external projects, licensed separately:
 # endif
 #endif
 
+//------------------------------------------------------------------------------
+
+// New header-only library modeled more closely according to boost
+#include "../../beast/CStdInt.h"
+#include "../../beast/SmartPtr.h"
+#include "../../beast/StaticAssert.h"
+#include "../../beast/Uncopyable.h"
+#include "../../beast/Atomic.h"
+#include "../../beast/Arithmetic.h"
+#include "../../beast/ByteOrder.h"
+#include "../../beast/HeapBlock.h"
+#include "../../beast/Memory.h"
+#include "../../beast/Intrusive.h"
+#include "../../beast/Net.h"
+#include "../../beast/SafeBool.h"
+#include "../../beast/Strings.h"
+#include "../../beast/TypeTraits.h"
+#include "../../beast/Threads.h"
+#include "../../beast/Utility.h"
+#include "../../beast/Chrono.h"
+
+#include "system/StandardIncludes.h"
+
+namespace beast {
+
+class InputStream;
+class OutputStream;
+class FileInputStream;
+class FileOutputStream;
+
+// Order matters, since headers don't have their own #include lines.
+// Add new includes to the bottom.
+
+#include "diagnostic/Throw.h"
+#include "system/Functional.h"
+#include "memory/AtomicCounter.h"
+#include "memory/AtomicFlag.h"
+#include "memory/AtomicPointer.h"
+#include "memory/AtomicState.h"
+#include "threads/SpinDelay.h"
+
+#include "time/AtExitHook.h"
+#include "time/Time.h"
+#include "threads/ScopedLock.h"
+#include "threads/CriticalSection.h"
+#include "containers/ElementComparator.h"
+
 // If the MSVC debug heap headers were included, disable
 // the macros during the juce include since they conflict.
 #ifdef _CRTDBG_MAP_ALLOC
@@ -217,219 +118,7 @@ Some files contain portions of these external projects, licensed separately:
 #undef _aligned_offset_recalloc
 #undef _aligned_msize
 #endif
-
-//------------------------------------------------------------------------------
-
-// New header-only library modeled more closely according to boost
-#include "../../beast/intrusive/ForwardList.h"
-
-//------------------------------------------------------------------------------
-
-namespace beast
-{
-
-class InputStream;
-class OutputStream;
-class FileInputStream;
-class FileOutputStream;
-
-extern BEAST_API bool BEAST_CALLTYPE beast_isRunningUnderDebugger();
-extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) noexcept;
-
-// Order matters, since headers don't have their own #include lines.
-// Add new includes to the bottom.
-
-#include "diagnostic/ContractChecks.h"
-#include "memory/beast_Uncopyable.h"
-#include "memory/beast_Memory.h"
-#include "maths/beast_MathsFunctions.h"
-#include "memory/beast_ByteOrder.h"
-#include "memory/beast_Atomic.h"
-#include "text/beast_CharacterFunctions.h"
-
-#if BEAST_MSVC
-# pragma warning (push)
-# pragma warning (disable: 4514 4996)
-#endif
-#include "text/beast_CharPointer_UTF8.h"
-#include "text/beast_CharPointer_UTF16.h"
-#include "text/beast_CharPointer_UTF32.h"
-#include "text/beast_CharPointer_ASCII.h"
-#if BEAST_MSVC
-# pragma warning (pop)
-#endif
-
-# include "containers/detail/removecv.h"
-#include "containers/detail/copyconst.h"
-#include "system/PlatformDefs.h"
-#include "system/TargetPlatform.h"
-#include "diagnostic/beast_Throw.h"
-#include "system/Functional.h"
-#include "memory/beast_AtomicCounter.h"
-#include "memory/beast_AtomicFlag.h"
-#include "memory/beast_AtomicPointer.h"
-#include "memory/beast_AtomicState.h"
-#include "containers/List.h"
-#include "containers/beast_LockFreeStack.h"
-#include "threads/beast_SpinDelay.h"
-#include "memory/beast_StaticObject.h"
-
-#include "text/StringCharPointerType.h"
-#include "text/StringFromNumber.h"
-#include "text/beast_String.h"
-#include "time/beast_PerformedAtExit.h"
-#include "diagnostic/beast_LeakChecked.h"
-#include "time/beast_RelativeTime.h"
-#include "time/beast_Time.h"
-#include "memory/beast_HeapBlock.h"
-#include "threads/beast_ScopedLock.h"
-#include "threads/beast_CriticalSection.h"
-#include "containers/beast_ElementComparator.h"
-#include "containers/beast_ArrayAllocationBase.h"
-#include "containers/beast_Array.h"
-#include "misc/beast_Result.h"
-#include "text/beast_StringArray.h"
-#include "memory/beast_MemoryBlock.h"
-#include "files/beast_File.h"
-#include "time/beast_PerformanceCounter.h"
-
-#include "memory/beast_MemoryAlignment.h"
-#include "memory/beast_CacheLine.h"
-#include "threads/beast_ReadWriteMutex.h"
-#include "threads/beast_SharedData.h"
-#include "diagnostic/beast_SafeBool.h"
-#include "threads/beast_WaitableEvent.h"
-#include "threads/beast_Thread.h"
-#include "threads/beast_SpinLock.h"
-#include "threads/beast_ThreadLocalValue.h"
-#include "thread/MutexTraits.h"
-#include "thread/TrackedMutex.h"
-#include "diagnostic/beast_FatalError.h"
-#include "diagnostic/beast_Error.h"
-#include "diagnostic/beast_Debug.h"
-#include "text/beast_LexicalCast.h"
-#include "memory/beast_ContainerDeletePolicy.h"
-#include "memory/beast_ByteSwap.h"
-#include "maths/beast_Math.h"
-#include "maths/beast_uint24.h"
-#include "logging/beast_Logger.h"
-#include "diagnostic/beast_FPUFlags.h"
-#include "memory/SharedObject.h"
-#include "memory/SharedPtr.h"
-#include "functional/SharedFunction.h"
-#include "diagnostic/beast_ProtectedCall.h"
-#include "containers/beast_AbstractFifo.h"
-#include "text/beast_Identifier.h"
-#include "containers/beast_Variant.h"
-#include "containers/beast_LinkedListPointer.h"
-#include "containers/beast_NamedValueSet.h"
-#include "containers/beast_DynamicObject.h"
-#include "maths/beast_BigInteger.h"
-#include "maths/beast_Random.h"
-#include "containers/beast_LockFreeQueue.h"
-#include "containers/beast_OwnedArray.h"
-#include "text/beast_StringPairArray.h"
-#include "containers/beast_PropertySet.h"
-#include "containers/beast_SharedObjectArray.h"
-#include "containers/beast_ScopedValueSetter.h"
-#include "containers/beast_SharedTable.h"
-#include "containers/beast_SortedLookupTable.h"
-#include "containers/beast_SortedSet.h"
-#include "maths/beast_Range.h"
-#include "containers/beast_SparseSet.h"
-# include "containers/DynamicList.h"
-# include "containers/DynamicArray.h"
-#include "containers/HashMap.h"
-#include "memory/beast_ScopedPointer.h"
-#include "files/beast_DirectoryIterator.h"
-#include "streams/beast_InputStream.h"
-#include "files/beast_FileInputStream.h"
-#include "streams/beast_InputSource.h"
-#include "streams/beast_FileInputSource.h"
-#include "text/beast_NewLine.h"
-#include "streams/beast_OutputStream.h"
-#include "files/beast_FileOutputStream.h"
-#include "files/beast_FileSearchPath.h"
-#include "files/beast_MemoryMappedFile.h"
-#include "files/beast_RandomAccessFile.h"
-#include "files/beast_TemporaryFile.h"
-#include "json/beast_JSON.h"
-#include "logging/beast_FileLogger.h"
-#include "logging/beast_Logger.h"
-#include "maths/beast_Expression.h"
-#include "maths/beast_Interval.h"
-#include "maths/beast_MathsFunctions.h"
-#include "maths/beast_MurmurHash.h"
-#include "memory/beast_ByteOrder.h"
-#include "memory/beast_Memory.h"
-#include "memory/beast_OptionalScopedPointer.h"
-#include "memory/beast_SharedSingleton.h"
-#include "memory/beast_WeakReference.h"
-#include "memory/beast_RecycledObjectPool.h"
-#include "misc/beast_Main.h"
-#include "misc/beast_Uuid.h"
-#include "misc/beast_WindowsRegistry.h"
-#include "network/beast_IPAddress.h"
-#include "network/beast_MACAddress.h"
-#include "threads/beast_ReadWriteLock.h"
-#include "network/beast_NamedPipe.h"
-#include "network/beast_Socket.h"
-#include "network/beast_URL.h"
-#include "streams/beast_BufferedInputStream.h"
-#include "streams/beast_MemoryInputStream.h"
-#include "streams/beast_MemoryOutputStream.h"
-#include "streams/beast_SubregionStream.h"
-
-#include "system/SystemStats.h"
-#include "text/beast_LocalisedStrings.h"
-#include "diagnostic/beast_SemanticVersion.h"
-#include "text/beast_StringPool.h"
-#include "text/beast_TextDiff.h"
-#include "threads/beast_ChildProcess.h"
-#include "threads/beast_DynamicLibrary.h"
-#include "threads/beast_HighResolutionTimer.h"
-#include "threads/beast_InterProcessLock.h"
-#include "threads/beast_Process.h"
-#include "threads/beast_ScopedReadLock.h"
-#include "threads/beast_ScopedWriteLock.h"
-#include "threads/beast_ThreadPool.h"
-#include "threads/beast_TimeSliceThread.h"
-#include "diagnostic/beast_UnitTest.h"
-#include "xml/beast_XmlDocument.h"
-#include "xml/beast_XmlElement.h"
-#include "diagnostic/beast_UnitTestUtilities.h"
-#include "zip/beast_GZIPCompressorOutputStream.h"
-#include "zip/beast_GZIPDecompressorInputStream.h"
-#include "zip/beast_ZipFile.h"
-
-#include "diagnostic/MeasureFunctionCallTime.h"
-
-#include "functional/beast_Function.h"
-
-#include "thread/beast_DeadlineTimer.h"
-
-#include "memory/beast_AllocatedBy.h"
-#include "memory/beast_PagedFreeStore.h"
-#include "memory/beast_GlobalPagedFreeStore.h"
-#include "memory/beast_FifoFreeStoreWithTLS.h"
-#include "memory/beast_FifoFreeStoreWithoutTLS.h"
-#include "memory/beast_FifoFreeStore.h"
-#include "memory/beast_GlobalFifoFreeStore.h"
-
-#include "thread/beast_Semaphore.h"
-#include "thread/beast_SerialFor.h"
-#include "thread/beast_InterruptibleThread.h"
-#include "thread/beast_ThreadGroup.h"
-#include "thread/beast_CallQueue.h"
-#include "thread/beast_GlobalThreadGroup.h"
-#include "thread/beast_Listeners.h"
-#include "thread/beast_ManualCallQueue.h"
-#include "thread/beast_ParallelFor.h"
-#include "thread/beast_ThreadWithCallQueue.h"
-#include "thread/beast_Workers.h"
-
-}
-
+#include "containers/ArrayAllocationBase.h"
 #ifdef _CRTDBG_MAP_ALLOC
 #pragma pop_macro("_aligned_msize")
 #pragma pop_macro("_aligned_offset_recalloc")
@@ -446,6 +135,105 @@ extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) n
 #pragma pop_macro("calloc")
 #endif
 
+#include "containers/Array.h"
+
+#include "misc/Result.h"
+#include "text/StringArray.h"
+#include "memory/MemoryBlock.h"
+#include "files/File.h"
+#include "time/PerformanceCounter.h"
+
+#include "memory/MemoryAlignment.h"
+#include "memory/CacheLine.h"
+#include "thread/MutexTraits.h"
+#include "thread/TrackedMutex.h"
+#include "diagnostic/FatalError.h"
+#include "text/LexicalCast.h"
+#include "maths/Math.h"
+#include "maths/uint24.h"
+#include "logging/Logger.h"
+#include "diagnostic/FPUFlags.h"
+#include "memory/SharedFunction.h"
+#include "containers/AbstractFifo.h"
+#include "text/Identifier.h"
+#include "containers/Variant.h"
+#include "containers/LinkedListPointer.h"
+#include "containers/NamedValueSet.h"
+#include "containers/DynamicObject.h"
+#include "maths/BigInteger.h"
+#include "maths/Random.h"
+#include "containers/LockFreeQueue.h"
+#include "containers/OwnedArray.h"
+#include "text/StringPairArray.h"
+#include "containers/PropertySet.h"
+#include "containers/SharedObjectArray.h"
+#include "containers/ScopedValueSetter.h"
+#include "containers/SortedSet.h"
+#include "maths/Range.h"
+#include "containers/SparseSet.h"
+#include "files/DirectoryIterator.h"
+#include "streams/InputStream.h"
+#include "files/FileInputStream.h"
+#include "streams/InputSource.h"
+#include "streams/FileInputSource.h"
+#include "streams/OutputStream.h"
+#include "files/FileOutputStream.h"
+#include "files/FileSearchPath.h"
+#include "files/MemoryMappedFile.h"
+#include "files/RandomAccessFile.h"
+#include "files/TemporaryFile.h"
+#include "json/JSON.h"
+#include "logging/FileLogger.h"
+#include "logging/Logger.h"
+#include "maths/Expression.h"
+#include "maths/Interval.h"
+#include "maths/MurmurHash.h"
+#include "memory/OptionalScopedPointer.h"
+#include "memory/SharedSingleton.h"
+#include "memory/WeakReference.h"
+#include "memory/RecycledObjectPool.h"
+#include "misc/Main.h"
+#include "misc/Uuid.h"
+#include "misc/WindowsRegistry.h"
+#include "network/IPAddress.h"
+#include "network/MACAddress.h"
+#include "threads/ReadWriteLock.h"
+#include "network/NamedPipe.h"
+#include "network/Socket.h"
+#include "streams/BufferedInputStream.h"
+#include "streams/MemoryInputStream.h"
+#include "streams/MemoryOutputStream.h"
+#include "streams/SubregionStream.h"
+
+#include "system/SystemStats.h"
+#include "text/LocalisedStrings.h"
+#include "diagnostic/SemanticVersion.h"
+#include "text/StringPool.h"
+#include "text/TextDiff.h"
+#include "threads/ChildProcess.h"
+#include "threads/DynamicLibrary.h"
+#include "threads/HighResolutionTimer.h"
+#include "threads/InterProcessLock.h"
+#include "threads/Process.h"
+#include "threads/ScopedReadLock.h"
+#include "threads/ScopedWriteLock.h"
+#include "diagnostic/UnitTest.h"
+#include "xml/XmlDocument.h"
+#include "xml/XmlElement.h"
+#include "diagnostic/UnitTestUtilities.h"
+#include "zip/GZIPCompressorOutputStream.h"
+#include "zip/GZIPDecompressorInputStream.h"
+#include "zip/ZipFile.h"
+
+#include "diagnostic/MeasureFunctionCallTime.h"
+
+#include "thread/DeadlineTimer.h"
+
+#include "thread/Semaphore.h"
+#include "thread/Workers.h"
+
+}
+
 #if BEAST_MSVC
 #pragma warning (pop)
 #endif
diff --git a/modules/beast_core/containers/beast_AbstractFifo.cpp b/modules/beast_core/containers/AbstractFifo.cpp
similarity index 100%
rename from modules/beast_core/containers/beast_AbstractFifo.cpp
rename to modules/beast_core/containers/AbstractFifo.cpp
diff --git a/modules/beast_core/containers/beast_AbstractFifo.h b/modules/beast_core/containers/AbstractFifo.h
similarity index 100%
rename from modules/beast_core/containers/beast_AbstractFifo.h
rename to modules/beast_core/containers/AbstractFifo.h
diff --git a/modules/beast_core/containers/beast_Array.h b/modules/beast_core/containers/Array.h
similarity index 100%
rename from modules/beast_core/containers/beast_Array.h
rename to modules/beast_core/containers/Array.h
diff --git a/modules/beast_core/containers/beast_ArrayAllocationBase.h b/modules/beast_core/containers/ArrayAllocationBase.h
similarity index 100%
rename from modules/beast_core/containers/beast_ArrayAllocationBase.h
rename to modules/beast_core/containers/ArrayAllocationBase.h
diff --git a/modules/beast_core/containers/DynamicArray.cpp b/modules/beast_core/containers/DynamicArray.cpp
deleted file mode 100644
index bd67b2c009..0000000000
--- a/modules/beast_core/containers/DynamicArray.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-class DynamicArrayTests : public UnitTest
-{
-public:
-    struct T
-    {
-        T ()
-        {
-        }
-
-        explicit T (String what)
-            : msg (what)
-        {
-        }
-
-        T& operator= (T const& other)
-        {
-            msg = other.msg;
-            return *this;
-        }
-
-        String msg;
-    };
-
-    enum
-    {
-        numberToAssign = 1000 * 1000,
-        numberToReserve = 1000 * 1000,
-        numberToMutate = 12139
-
-    };
-
-    void testAssign ()
-    {
-        String s;
-        s << "assign (" << String::fromNumber <int> (numberToAssign) << ")";
-        beginTestCase (s);
-
-        DynamicArray <T> v;
-        v.assign (numberToAssign);
-
-        pass ();
-    }
-
-    void testReserve ()
-    {
-        String s;
-        s << "reserve (" << String::fromNumber <int> (numberToReserve) << ")";
-        beginTestCase (s);
-
-        DynamicArray <T> v;
-        v.reserve (numberToReserve);
-
-        v.assign (numberToReserve);
-
-        pass ();
-    }
-
-    void testMutate ()
-    {
-        String s;
-        DynamicArray <T> v;
-
-        s = "push_back (" + String::fromNumber <int> (numberToMutate) + ")";
-        beginTestCase (s);
-        for (std::size_t i = 0; i < numberToMutate; ++i)
-            v.push_back (T (String::fromNumber (i)));
-        pass ();
-
-        s = "read [] (" + String::fromNumber <int> (numberToMutate) + ")";
-        beginTestCase (s);
-        for (std::size_t i = 0; i < numberToMutate; ++i)
-            expect (v [i].msg == String::fromNumber (i));
-
-        s = "write [] (" + String::fromNumber <int> (numberToMutate) + ")";
-        beginTestCase (s);
-        for (std::size_t i = 0; i < numberToMutate; ++i)
-            v [i].msg = "+" + String::fromNumber (i);
-        pass ();
-
-        s = "verify [] (" + String::fromNumber <int> (numberToMutate) + ")";
-        beginTestCase (s);
-        for (std::size_t i = 0; i < numberToMutate; ++i)
-            expect (v [i].msg == String ("+") + String::fromNumber (i));
-    }
-
-    void testIterate ()
-    {
-        typedef DynamicArray <T> V;
-
-        V v;
-        for (std::size_t i = 0; i < numberToMutate; ++i)
-            v.push_back (T (String::fromNumber (i)));
-
-        {
-            int step = 1;
-            beginTestCase ("iterator");
-            V::iterator iter;
-            for (iter = v.begin (); iter + step < v.end (); iter += step)
-            {
-                step ++;
-                V::difference_type d = iter - v.begin ();
-                expect (iter->msg == String::fromNumber (d));
-            }
-        }
-
-        {
-            int step = 1;
-            beginTestCase ("const_iterator");
-            V::const_iterator iter;
-            for (iter = v.begin (); iter + step < v.end (); iter += step)
-            {
-                step ++;
-                V::difference_type d = iter - v.begin ();
-                expect (iter->msg == String::fromNumber (d));
-            }
-        }
-
-        {
-            int step = 1;
-            beginTestCase ("reverse_iterator");
-            V::reverse_iterator iter;
-            for (iter = v.rbegin (); iter + step < v.rend (); iter += step)
-            {
-                step ++;
-                iter - v.rend ();
-            }
-            pass ();
-        }
-
-        {
-            int step = 1;
-            beginTestCase ("const_reverse_iterator");
-            V::const_reverse_iterator iter;
-            for (iter = v.crbegin (); iter + step < v.crend (); iter += step)
-            {
-                step ++;
-                iter - v.crend ();
-            }
-            pass ();
-        }
-    }
-
-    void runTest ()
-    {
-        testAssign ();
-        testReserve ();
-        testMutate ();
-        testIterate ();
-    }
-
-    DynamicArrayTests () : UnitTest ("DynamicArray", "beast")
-    {
-    }
-};
-
-static DynamicArrayTests dynamicArrayTests;
diff --git a/modules/beast_core/containers/DynamicArray.h b/modules/beast_core/containers/DynamicArray.h
deleted file mode 100644
index 70a079cae1..0000000000
--- a/modules/beast_core/containers/DynamicArray.h
+++ /dev/null
@@ -1,728 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_CORE_CONTAINERS_DYNAMICARRAY_H_INCLUDED
-#define BEAST_CORE_CONTAINERS_DYNAMICARRAY_H_INCLUDED
-
-template <typename, typename>
-class DynamicArray;
-
-namespace detail
-{
-
-template <typename V>
-class DynamicArrayIterator
-    : public std::iterator <std::random_access_iterator_tag,
-        typename V::size_type>
-{
-public:
-    typedef typename copyconst <V, typename V::value_type>::type
-
-                              value_type;
-    typedef value_type*       pointer;
-    typedef value_type&       reference;
-    typedef std::ptrdiff_t    difference_type;
-    typedef typename V::size_type size_type;
-
-    DynamicArrayIterator (V* v = nullptr, size_type pos = 0) noexcept
-        : m_v (v)
-        , m_pos (pos)
-    {
-    }
-
-    template <typename W>
-    DynamicArrayIterator (DynamicArrayIterator <W> const& u) noexcept
-        : m_v (u.m_v)
-        , m_pos (u.m_pos)
-    {
-    }
-
-    template <typename W>
-    DynamicArrayIterator& operator= (DynamicArrayIterator <W> const& u) noexcept
-    {
-        m_v = u.m_v;
-        m_pos = u.m_pos;
-        return *this;
-    }
-
-    template <typename W>
-    bool operator== (DynamicArrayIterator <W> const& u) const noexcept
-    {
-        return (m_v == u.m_v) && (m_pos == u.m_pos);
-    }
-
-    template <typename W>
-    bool operator!= (DynamicArrayIterator <W> const& u) const noexcept
-    {
-        return ! ((*this) == u);
-    }
-
-    reference operator* () const noexcept
-    {
-        return dereference ();
-    }
-
-    pointer operator-> () const noexcept
-    {
-        return &dereference ();
-    }
-
-    DynamicArrayIterator& operator++ () noexcept
-    {
-        increment (1);
-        return *this;
-    }
-
-    DynamicArrayIterator operator++ (int) noexcept
-    {
-        DynamicArrayIterator const result (*this);
-        increment (1);
-        return result;
-    }
-
-    DynamicArrayIterator& operator-- () noexcept
-    {
-        decrement (1);
-        return *this;
-    }
-
-    DynamicArrayIterator operator-- (int) noexcept
-    {
-        DynamicArrayIterator const result (*this);
-        decrement (1);
-        return result;
-    }
-
-    DynamicArrayIterator& operator+= (difference_type n) noexcept
-    {
-        increment (n);
-        return *this;
-    }
-
-    DynamicArrayIterator& operator-= (difference_type n) noexcept
-    {
-        decrement (n);
-        return *this;
-    }
-
-    DynamicArrayIterator operator+ (difference_type n) noexcept
-    {
-        return DynamicArrayIterator (m_v, m_pos + n);
-    }
-
-    DynamicArrayIterator operator- (difference_type n) noexcept
-    {
-        return DynamicArrayIterator (m_v, m_pos - n);
-    }
-
-    template <typename W>
-    difference_type operator- (DynamicArrayIterator <W> const& rhs) const noexcept
-    {
-        return m_pos - rhs.m_pos;
-    }
-
-    template <typename W>
-    bool operator< (DynamicArrayIterator <W> const& rhs) const noexcept
-    {
-        return m_pos < rhs.m_pos;
-    }
-
-    template <typename W>
-    bool operator> (DynamicArrayIterator <W> const& rhs) const noexcept
-    {
-        return m_pos > rhs.m_pos;
-    }
-
-    template <typename W>
-    bool operator<= (DynamicArrayIterator <W> const& rhs) const noexcept
-    {
-        return m_pos <= rhs.m_pos;
-    }
-
-    template <typename W>
-    bool operator>= (DynamicArrayIterator <W> const& rhs) const noexcept
-    {
-        return m_pos >= rhs.m_pos;
-    }
-
-    reference operator[] (difference_type n) noexcept
-    {
-        return (*m_v)[m_pos + n];
-    }
-
-private:
-    reference dereference () const noexcept
-    {
-        return (*m_v) [m_pos];
-    }
-
-    void increment (difference_type n) noexcept
-    {
-        m_pos += n;
-    }
-
-    void decrement (difference_type n) noexcept
-    {
-        m_pos -= n;
-    }
-
-private:
-    template <typename>
-    friend class DynamicArrayIterator;
-
-    V* m_v;
-    size_type m_pos;
-};
-
-//------------------------------------------------------------------------------
-
-template <typename V>
-DynamicArrayIterator <V> operator+ (
-    typename DynamicArrayIterator <V>::difference_type n,
-        DynamicArrayIterator <V> iter) noexcept
-{
-    return iter + n;
-}
-
-template <typename V>
-DynamicArrayIterator <V> operator- (
-    typename DynamicArrayIterator <V>::difference_type n,
-        DynamicArrayIterator <V> iter) noexcept
-{
-    return iter - n;
-}
-
-//------------------------------------------------------------------------------
-
-template <typename V>
-class DynamicArrayReverseIterator
-    : public std::iterator <std::random_access_iterator_tag,
-        typename V::size_type>
-{
-public:
-    typedef typename copyconst <V, typename V::value_type>::type
-
-                              value_type;
-    typedef value_type*       pointer;
-    typedef value_type&       reference;
-    typedef std::ptrdiff_t    difference_type;
-    typedef typename V::size_type size_type;
-
-    DynamicArrayReverseIterator (V* v = nullptr, difference_type pos = 0) noexcept
-        : m_v (v)
-        , m_pos (pos)
-    {
-    }
-
-    template <typename W>
-    DynamicArrayReverseIterator (DynamicArrayReverseIterator <W> const& u) noexcept
-        : m_v (u.m_v)
-        , m_pos (u.m_pos)
-    {
-    }
-
-    template <typename W>
-    DynamicArrayReverseIterator& operator= (DynamicArrayReverseIterator <W> const& u) noexcept
-    {
-        m_v = u.m_v;
-        m_pos = u.m_pos;
-        return *this;
-    }
-
-    template <typename W>
-    bool operator== (DynamicArrayReverseIterator <W> const& u) const noexcept
-    {
-        return (m_v == u.m_v) && (m_pos == u.m_pos);
-    }
-
-    template <typename W>
-    bool operator!= (DynamicArrayReverseIterator <W> const& u) const noexcept
-    {
-        return ! ((*this) == u);
-    }
-
-    reference operator* () const noexcept
-    {
-        return dereference ();
-    }
-
-    pointer operator-> () const noexcept
-    {
-        return &dereference ();
-    }
-
-    DynamicArrayReverseIterator& operator++ () noexcept
-    {
-        increment (1);
-        return *this;
-    }
-
-    DynamicArrayReverseIterator operator++ (int) noexcept
-    {
-        DynamicArrayReverseIterator const result (*this);
-        increment (1);
-        return result;
-    }
-
-    DynamicArrayReverseIterator& operator-- () noexcept
-    {
-        decrement (1);
-        return *this;
-    }
-
-    DynamicArrayReverseIterator operator-- (int) noexcept
-    {
-        DynamicArrayReverseIterator const result (*this);
-        decrement (1);
-        return result;
-    }
-
-    DynamicArrayReverseIterator& operator+= (difference_type n) noexcept
-    {
-        increment (n);
-        return *this;
-    }
-
-    DynamicArrayReverseIterator& operator-= (difference_type n) noexcept
-    {
-        decrement (n);
-        return *this;
-    }
-
-    DynamicArrayReverseIterator operator+ (difference_type n) noexcept
-    {
-        return DynamicArrayReverseIterator (m_v, m_pos - n);
-    }
-
-    DynamicArrayReverseIterator operator- (difference_type n) noexcept
-    {
-        return DynamicArrayReverseIterator (m_v, m_pos + n);
-    }
-
-    template <typename W>
-    difference_type operator- (DynamicArrayReverseIterator <W> const& rhs) const noexcept
-    {
-        return rhs.m_pos - m_pos;
-    }
-
-    template <typename W>
-    bool operator< (DynamicArrayReverseIterator <W> const& rhs) const noexcept
-    {
-        return m_pos > rhs.m_pos;
-    }
-
-    template <typename W>
-    bool operator> (DynamicArrayReverseIterator <W> const& rhs) const noexcept
-    {
-        return m_pos < rhs.m_pos;
-    }
-
-    template <typename W>
-    bool operator<= (DynamicArrayReverseIterator <W> const& rhs) const noexcept
-    {
-        return m_pos >= rhs.m_pos;
-    }
-
-    template <typename W>
-    bool operator>= (DynamicArrayReverseIterator <W> const& rhs) const noexcept
-    {
-        return m_pos <= rhs.m_pos;
-    }
-
-    reference operator[] (difference_type n) noexcept
-    {
-        return (*m_v)[(m_pos - 1) - n];
-    }
-
-private:
-    template <typename>
-    friend class DynamicArrayReverseIterator;
-
-    reference dereference () const noexcept
-    {
-        return (*m_v) [m_pos - 1];
-    }
-
-    void increment (difference_type n) noexcept
-    {
-        m_pos -= n;
-    }
-
-    void decrement (difference_type n) noexcept
-    {
-        m_pos += n;
-    }
-
-    V* m_v;
-    difference_type m_pos;
-};
-
-//------------------------------------------------------------------------------
-
-template <typename V>
-DynamicArrayReverseIterator <V> operator+ (
-    typename DynamicArrayReverseIterator <V>::difference_type n,
-        DynamicArrayReverseIterator <V> iter) noexcept
-{
-    return iter + n;
-}
-
-template <typename V>
-DynamicArrayReverseIterator <V> operator- (
-    typename DynamicArrayReverseIterator <V>::difference_type n,
-        DynamicArrayReverseIterator <V> iter) noexcept
-{
-    return iter - n;
-}
-
-}
-
-//------------------------------------------------------------------------------
-
-template <typename T,
-          typename Allocator = std::allocator <char> >
-class DynamicArray
-{
-private:
-    typedef PARAMETER_TYPE (T) TParam;
-
-    typedef std::vector <T*> handles_t;
-
-public:
-    enum
-    {
-        defaultBlocksize = 1000,
-        growthPercentage = 10
-    };
-
-    typedef T                 value_type;
-    typedef Allocator         allocator_type;
-    typedef std::size_t       size_type;
-    typedef std::ptrdiff_t    difference_type;
-    typedef value_type*       pointer;
-    typedef value_type&       reference;
-    typedef value_type const* const_pointer;
-    typedef value_type const& const_reference;
-
-    typedef detail::DynamicArrayIterator <DynamicArray <T> > iterator;
-
-    typedef detail::DynamicArrayIterator <DynamicArray <T> const> const_iterator;
-
-    typedef detail::DynamicArrayReverseIterator <DynamicArray <T> > reverse_iterator;
-
-    typedef detail::DynamicArrayReverseIterator <DynamicArray <T> const> const_reverse_iterator;
-
-    //--------------------------------------------------------------------------
-
-    explicit DynamicArray (size_type blocksize = defaultBlocksize) noexcept
-        : m_blocksize (blocksize)
-        , m_capacity (0)
-        , m_size (0)
-    {
-    }
-
-    ~DynamicArray()
-    {
-        clear ();
-        shrink_to_fit ();
-    }
-
-    /** Replace the array with 'count' copies of a default-constructed T.
-    */
-    void assign (size_type count)
-    {
-        clear ();
-        resize (count);
-    }
-
-    //--------------------------------------------------------------------------
-
-    reference at (size_type pos)
-    {
-        if (pos >= size ())
-            Throw (std::out_of_range ("bad pos"), __FILE__, __LINE__);
-        return get (pos);
-    }
-
-    const_reference at (size_type pos) const
-    {
-        if (pos >= size ())
-            Throw (std::out_of_range ("bad pos"), __FILE__, __LINE__);
-        return get (pos);
-    }
-
-    reference operator[] (size_type pos) noexcept
-    {
-        return get (pos);
-    }
-
-    const_reference operator[] (size_type pos) const noexcept
-    {
-        return get (pos);
-    }
-
-    reference front () noexcept
-    {
-        return get (0);
-    }
-
-    const_reference front () const noexcept
-    {
-        return get (0);
-    }
-
-    reference back () noexcept
-    {
-        return get (size () - 1);
-    }
-
-    const_reference back () const noexcept
-    {
-        return get (size () - 1);
-    }
-
-    //--------------------------------------------------------------------------
-
-    iterator begin () noexcept
-    {
-        return iterator (this, 0);
-    }
-
-    const_iterator begin () const noexcept
-    {
-        return const_iterator (this, 0);
-    }
-
-    const_iterator cbegin () const noexcept
-    {
-        return const_iterator (this, 0);
-    }
-
-    iterator end () noexcept
-    {
-        return iterator (this, size ());
-    }
-
-    const_iterator end () const noexcept
-    {
-        return const_iterator (this, size ());
-    }
-
-    const_iterator cend () const noexcept
-    {
-        return const_iterator (this, size ());
-    }
-
-    reverse_iterator rbegin () noexcept
-    {
-        return reverse_iterator (this, size ());
-    }
-
-    const_reverse_iterator rbegin () const noexcept
-    {
-        return const_reverse_iterator (this, size ());
-    }
-
-    const_reverse_iterator crbegin () const noexcept
-    {
-        return const_reverse_iterator (this, size ());
-    }
-
-    reverse_iterator rend () noexcept
-    {
-        return reverse_iterator (this, 0);
-    }
-
-    const_reverse_iterator rend () const noexcept
-    {
-        return const_reverse_iterator (this, 0);
-    }
-
-    const_reverse_iterator crend () const noexcept
-    {
-        return const_reverse_iterator (this, 0);
-    }
-
-    //--------------------------------------------------------------------------
-
-    bool empty () const noexcept
-    {
-        return m_size == 0;
-    }
-
-    size_type size () const noexcept
-    {
-        return m_size;
-    }
-
-    size_type max_size () const noexcept
-    {
-        return std::numeric_limits <size_type>::max ();
-    }
-
-    void reserve (size_type new_cap)
-    {
-        new_cap = m_blocksize * (
-            (new_cap + m_blocksize - 1) / m_blocksize);
-        if (new_cap > max_size ())
-            Throw (std::length_error ("new_cap > max_size"), __FILE__, __LINE__);
-        if (new_cap <= m_capacity)
-            return;
-        size_type const n (new_cap / m_blocksize);
-        m_handles.reserve (n);
-        for (size_type i = m_handles.size (); i < n; ++i)
-            m_handles.push_back (static_cast <T*> (std::malloc (
-                m_blocksize * sizeof (T))));
-        m_capacity = new_cap;
-    }
-
-    size_type capacity () const noexcept
-    {
-        return m_capacity;
-    }
-
-    void shrink_to_fit ()
-    {
-        size_type const handles (
-            (size () + m_blocksize - 1) / m_blocksize);
-        m_capacity = handles * m_blocksize;
-        for (size_type i = m_handles.size (); i-- > handles;)
-        {
-            std::free (m_handles [i]);
-            m_handles.erase (m_handles.begin () + i);
-        }
-    }
-
-    //--------------------------------------------------------------------------
-
-    void clear ()
-    {
-        resize (0);
-    }
-
-    iterator push_back (TParam value)
-    {
-        ::new (alloc ()) T (value);
-        return iterator (this, size () - 1);
-    }
-
-    iterator emplace_back ()
-    {
-        ::new (alloc ()) T ();
-        return iterator (this, size () - 1);
-    }
-
-    template <class A1>
-    iterator emplace_back (A1 a1)
-    {
-        ::new (alloc ()) T (a1);
-        return iterator (this, size () - 1);
-    }
-
-    template <class A1, class A2>
-    iterator emplace_back (A1 a1, A2 a2)
-    {
-        ::new (alloc ()) T (a1, a2);
-        return iterator (this, size () - 1);
-    }
-    
-    template <class A1, class A2, class A3>
-    iterator emplace_back (A1 a1, A2 a2, A3 a3)
-    {
-        ::new (alloc ()) T (a1, a2, a3);
-        return iterator (this, size () - 1);
-    }
-    
-    template <class A1, class A2, class A3, class A4>
-    iterator emplace_back (A1 a1, A2 a2, A3 a3, A4 a4)
-    {
-        ::new (alloc ()) T (a1, a2, a3, a4);
-        return iterator (this, size () - 1);
-    }
-
-    template <class A1, class A2, class A3, class A4, class A5>
-    iterator emplace_back (A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
-    {
-        ::new (alloc ()) T (a1, a2, a3, a4, a5);
-        return iterator (this, size () - 1);
-    }
-   
-    void pop_back ()
-    {
-        resize (size () - 1);
-    }
-
-    void resize (size_type count)
-    {
-        while (count > size ())
-            ::new (alloc ()) T;
-
-        while (count < size ())
-            get (--m_size).~T ();
-    }
-
-    void resize (size_type count, TParam value)
-    {
-        while (count > size ())
-            ::new (alloc ()) T (value);
-
-        while (count < size ())
-            get (--m_size).~T ();
-    }
-
-    void swap (DynamicArray& other)
-    {
-        std::swap (m_blocksize, other.m_blocksize);
-        std::swap (m_size,      other.m_size);
-        std::swap (m_capacity,  other.m_capacity);
-        std::swap (m_handles,   other.m_handles);
-    }
-
-private:
-    reference get (size_type pos) noexcept
-    {
-        size_type const index (pos / m_blocksize);
-        size_type const offset (pos % m_blocksize);
-        return m_handles [index] [offset];
-    }
-
-    const_reference get (size_type pos) const noexcept
-    {
-        size_type const index (pos / m_blocksize);
-        size_type const offset (pos % m_blocksize);
-        return m_handles [index] [offset];
-    }
-
-    T* alloc () noexcept
-    {
-        size_type const needed (size () + 1);
-        if (capacity () < needed)
-            reserve ((needed * (100 + growthPercentage) + 99) / 100);
-        return &get (m_size++);
-    }
-
-private:
-    Allocator m_allocator;
-    size_type m_blocksize;
-    size_type m_capacity;
-    size_type m_size;
-    handles_t m_handles;
-};
-
-#endif
diff --git a/modules/beast_core/containers/DynamicList.cpp b/modules/beast_core/containers/DynamicList.cpp
deleted file mode 100644
index 35d2ac15c5..0000000000
--- a/modules/beast_core/containers/DynamicList.cpp
+++ /dev/null
@@ -1,327 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-namespace ContainerTests
-{
-
-//------------------------------------------------------------------------------
-
-/** Counts the number of occurrences of each type of operation. */
-class Counts
-{
-public:
-    typedef std::size_t count_type;
-
-    Counts ()
-        : default_ctor (0)
-        , copy_ctor    (0)
-        , copy_assign  (0)
-    #if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
-        , move_ctor    (0)
-        , move_assign  (0)
-    #endif
-    {
-    }
-
-    Counts (Counts const& other)
-        : default_ctor (other.default_ctor)
-        , copy_ctor    (other.copy_ctor)
-        , copy_assign  (other.copy_assign)
-    #if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
-        , move_ctor    (other.move_ctor)
-        , move_assign  (other.move_assign)
-    #endif
-    {
-    }
-
-    Counts& operator= (Counts const& other)
-    {
-        default_ctor = other.default_ctor;
-        copy_ctor    = other.copy_ctor;
-        copy_assign  = other.copy_assign;
-    #if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
-        move_ctor    = other.move_ctor;
-        move_assign  = other.move_assign;
-    #endif
-        return *this;
-    }
-
-    friend inline Counts operator- (Counts const& lhs, Counts const& rhs)
-    {
-        Counts result;
-        result.default_ctor = lhs.default_ctor  - rhs.default_ctor;
-        result.copy_ctor    = lhs.copy_ctor     - rhs.copy_ctor;
-        result.copy_assign  = lhs.copy_assign   - rhs.copy_assign;
-    #if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
-        result.move_ctor    = lhs.move_ctor     - rhs.move_ctor;
-        result.move_assign  = lhs.move_assign   - rhs.move_assign;
-    #endif
-        return result;
-    }
-
-    String toString () const
-    {
-        return String()
-            + "default_ctor(" +    String::fromNumber (default_ctor) + ") "
-            + ", copy_ctor(" +   String::fromNumber (copy_ctor) + ")"
-            + ", copy_assign(" + String::fromNumber (copy_assign) + ")"
-    #if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
-            + ", move_ctor(" +   String::fromNumber (move_ctor) + ")"
-            + ", move_assign(" + String::fromNumber (move_assign) + ")"
-    #endif
-            ;
-    }
-
-    count_type default_ctor;
-    count_type copy_ctor;
-    count_type copy_assign;
-#if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
-    count_type move_ctor;
-    count_type move_assign;
-#endif
-};
-
-//------------------------------------------------------------------------------
-
-/** Counts the number of element operations performed in a scope. */
-class ScopedCounts : public Uncopyable
-{
-public:
-    ScopedCounts (Counts const& counts)
-        : m_start (counts)
-        , m_counts (counts)
-    {
-    }
-
-    Counts get () const
-    {
-        return m_counts - m_start;
-    }
-
-private:
-    Counts const m_start;
-    Counts const& m_counts;
-};
-
-//------------------------------------------------------------------------------
-
-/* Base for element configurations. */
-class ElementConfigBase : public Uncopyable
-{
-public:
-    typedef std::size_t IdType;
-};
-
-/** Provides the element-specific configuration members. */
-template <class Params>
-class ElementConfig : public ElementConfigBase
-{
-public:
-    static Counts& getCounts ()
-    {
-        static Counts counts;
-        return counts;
-    }
-};
-
-//------------------------------------------------------------------------------
-
-/** Base for elements used in container unit tests. */
-class ElementBase
-{
-public:
-};
-
-/** An object placed into a container for unit testing. */
-template <class Config>
-class Element : public ElementBase
-{
-public:
-    typedef typename Config::IdType   IdType;
-
-    Element ()
-        : m_id (0)
-        , m_msg (String::empty)
-    {
-        ++Config::getCounts ().default_ctor;
-    }
-
-    explicit Element (IdType id)
-        : m_id (id)
-        , m_msg (String::fromNumber (id))
-    {
-    }
-
-    Element (Element const& other)
-        : m_id (other.m_id)
-        , m_msg (other.m_msg)
-    {
-        ++Config::getCounts ().copy_ctor;
-    }
-
-    Element& operator= (Element const& other)
-    {
-        m_id = other.m_id;
-        m_msg = other.m_msg;
-        ++Config::getCounts ().copy_assign;
-    }
-
-#if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
-    Element (Element&& other)
-        : m_id (other.m_id)
-        , m_msg (other.m_msg)
-    {
-        other.m_msg = String::empty;
-        ++Config::getCounts ().move_ctor;
-    }
-
-    Element& operator= (Element&& other)
-    {
-        m_id = other.m_id;
-        m_msg = other.m_msg;
-        other.m_msg = String::empty;
-        ++Config::getCounts ().move_assign;
-    }
-#endif
-
-    IdType id () const
-    {
-        return m_id;
-    }
-
-    String msg () const
-    {
-        return m_msg;
-    }
-
-private:
-    IdType m_id;
-    String m_msg;
-};
-
-//------------------------------------------------------------------------------
-
-/** Base for test state parameters. */
-class StateBase : public Uncopyable
-{
-public:
-    typedef int64 SeedType;
-};
-
-/** Provides configuration-specific test state parameters. */
-template <class Params>
-class State : public StateBase
-{
-public:
-    static Random& random ()
-    {
-        static Random generator (Params::seedValue);
-        return generator;
-    }
-};
-
-//------------------------------------------------------------------------------
-
-class ConfigBase
-{
-};
-
-template <template <typename, class> class Container,
-          class Params>
-class Config
-    : public State <Params>
-    , public ElementConfig <Params>
-{
-public:
-    typedef Config                              ConfigType;
-    typedef Params                              ParamsType;
-    typedef State <Params>                      StateType;
-    typedef ElementConfig <Params>              ElementConfigType;
-    typedef Element <ElementConfigType>         ElementType;
-    typedef Container <
-        ElementType,
-        std::allocator <char> >                 ContainerType;
-
-    typedef StateBase::SeedType SeedType;
-
-    // default seed
-    static SeedType const seedValue = 69;
-};
-
-//------------------------------------------------------------------------------
-
-/** A generic container test. */
-template <class Params>
-class Test : public Params
-{
-public:
-    typedef typename Params::StateType          StateType;
-    typedef typename Params::ElementConfigType  ElementConfigType;
-    typedef typename Params::ContainerType      ContainerType;
-
-    void doInsert ()
-    {
-        m_container.reserve (Params::elementCount);
-        for (typename ContainerType::size_type i = 0;
-            i < Params::elementCount; ++i)
-        {
-            m_container.push_back (typename Params::ElementType ());
-        }
-    }
-
-private:
-    typename Params::ContainerType m_container;
-};
-
-//------------------------------------------------------------------------------
-
-class DynamicListTests : public UnitTest
-{
-public:
-    struct Params : Config <DynamicList, Params>
-    {
-        static SeedType const seedValue = 42;
-        static ContainerType::size_type const elementCount = 100 * 1000;
-    };
-
-    typedef Test <Params> TestType;
-
-    void runTest ()
-    {
-        TestType test;
-
-        beginTestCase ("insert");
-
-        {
-            ScopedCounts counts (TestType::getCounts ());
-            test.doInsert ();
-            this->logMessage (counts.get ().toString ());
-        }
-
-        pass ();
-    }
-
-    DynamicListTests () : UnitTest ("DynamicList", "beast")
-    {
-    }
-};
-
-static DynamicListTests dynamicListTests;
-
-}
diff --git a/modules/beast_core/containers/DynamicList.h b/modules/beast_core/containers/DynamicList.h
deleted file mode 100644
index e048774c7b..0000000000
--- a/modules/beast_core/containers/DynamicList.h
+++ /dev/null
@@ -1,473 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_CORE_CONTAINERS_DYNAMICLIST_H_INCLUDED
-#define BEAST_CORE_CONTAINERS_DYNAMICLIST_H_INCLUDED
-
-template <typename, typename>
-class DynamicList;
-
-template <class Container, bool IsConst>
-class DynamicListIterator
-    : public std::iterator <
-        std::bidirectional_iterator_tag,
-        typename Container::value_type,
-        typename Container::difference_type,
-        typename mpl::IfCond <IsConst,
-            typename Container::const_pointer,
-            typename Container::pointer>::type,
-        typename mpl::IfCond <IsConst,
-            typename Container::const_reference,
-            typename Container::reference>::type>
-{
-private:
-    typedef typename mpl::IfCond <IsConst,
-        typename List <typename Container::Item>::const_iterator,
-        typename List <typename Container::Item>::iterator>::type iterator_type;
-
-    typedef typename mpl::IfCond <IsConst,
-        typename Container::const_pointer,
-        typename Container::pointer>::type pointer;
-
-    typedef typename mpl::IfCond <IsConst,
-        typename Container::const_reference,
-        typename Container::reference>::type reference;
-
-public:
-    DynamicListIterator ()
-    {
-    }
-
-    DynamicListIterator (iterator_type iter)
-        : m_iter (iter)
-    {
-    }
-
-    DynamicListIterator (DynamicListIterator const& other)
-        : m_iter (other.m_iter)
-    {
-    }
-
-    template <bool OtherIsConst>
-    DynamicListIterator (DynamicListIterator <Container, OtherIsConst> const& other)
-        : m_iter (other.m_iter)
-    {
-    }
-
-    DynamicListIterator& operator= (DynamicListIterator const& other)
-    {
-        m_iter = other.m_iter;
-        return *this;
-    }
-
-    template <bool OtherIsConst>
-    DynamicListIterator& operator= (DynamicListIterator <
-        Container, OtherIsConst> const& other)
-    {
-        m_iter = other.m_iter;
-        return *this;
-    }
-
-    template <bool OtherIsConst>
-    bool operator== (DynamicListIterator <Container, OtherIsConst> const& other) const
-    {
-        return m_iter == other.m_iter;
-    }
-
-    template <bool OtherIsConst>
-    bool operator!= (DynamicListIterator <Container, OtherIsConst> const& other) const
-    {
-        return ! ((*this) == other);
-    }
-
-    reference operator* () const
-    {
-        return dereference ();
-    }
-
-    pointer operator-> () const
-    {
-        return &dereference ();
-    }
-
-    DynamicListIterator& operator++ ()
-    {
-        increment ();
-        return *this;
-    }
-
-    DynamicListIterator operator++ (int)
-    {
-        DynamicListIterator const result (*this);
-        increment ();
-        return result;
-    }
-
-    DynamicListIterator& operator-- ()
-    {
-        decrement ();
-        return *this;
-    }
-
-    DynamicListIterator operator-- (int)
-    {
-        DynamicListIterator const result (*this);
-        decrement ();
-        return result;
-    }
-
-private:
-    template <typename, typename>
-    friend class DynamicList;
-
-    reference dereference () const
-    {
-        return *(m_iter->get ());
-    }
-
-    void increment ()
-    {
-        ++m_iter;
-    }
-
-    void decrement ()
-    {
-        --m_iter;
-    }
-
-    iterator_type m_iter;
-};
-
-//------------------------------------------------------------------------------
-
-/** A list that uses a very small number of dynamic allocations.
-
-    Once an element is allocated, its address does not change. Elements
-    can be erased, and they are placed onto a deleted list for re-use.
-    Allocations occur in configurable batches.
-
-    Iterators to elements never become invalid, they can be safely
-    stored elsewhere, as long as the underlying element is not erased.
-
-    T may support these concepts:
-        DefaultConstructible
-        MoveConstructible (C++11)
-
-    T must support these concepts:
-        Destructible
-*/
-template <typename T,
-          class Allocator = std::allocator <char> >
-class DynamicList
-{
-private:
-    typedef PARAMETER_TYPE (T) TParam;
-
-public:
-    enum
-    {
-        defaultBlocksize = 1000
-    };
-
-    typedef T              value_type;
-    typedef Allocator      allocator_type;
-    typedef std::size_t    size_type;
-    typedef std::ptrdiff_t difference_type;
-    typedef T*             pointer;
-    typedef T&             reference;
-    typedef T const*       const_pointer;
-    typedef T const&       const_reference;
-    
-    typedef DynamicList <
-        T,
-        Allocator>         container_type;
-
-    typedef DynamicListIterator <container_type, false> iterator;
-    typedef DynamicListIterator <container_type, true>  const_iterator;
-
-public:
-    explicit DynamicList (
-        size_type blocksize = defaultBlocksize,
-        Allocator const& allocator = Allocator ())
-        : m_allocator (allocator)
-        , m_blocksize (blocksize)
-        , m_capacity (0)
-    {
-    }
-
-    ~DynamicList ()
-    {
-        clear ();
-        shrink_to_fit ();
-    }
-
-    allocator_type get_allocator () const noexcept
-    {
-        return m_allocator;
-    }
-
-    //--------------------------------------------------------------------------
-
-    reference front () noexcept
-    {
-        return *m_items.front ().get ();
-    }
-
-    const_reference front () const noexcept
-    {
-        return *m_items.front ().get ();
-    }
-
-    reference back () noexcept
-    {
-        return *m_items.back ().get ();
-    }
-
-    const_reference back () const noexcept
-    {
-        return *m_items.back ().get ();
-    }
-
-    //--------------------------------------------------------------------------
-
-    iterator begin () noexcept
-    {
-        return iterator (m_items.begin ());
-    }
-
-    const_iterator begin () const noexcept
-    {
-        return const_iterator (m_items.begin ());
-    }
-
-    const_iterator cbegin () const noexcept
-    {
-        return const_iterator (m_items.cbegin ());
-    }
-
-    iterator end () noexcept
-    {
-        return iterator (m_items.end ());
-    }
-
-    const_iterator end () const noexcept
-    {
-        return const_iterator (m_items.end ());
-    }
-
-    const_iterator cend () const noexcept
-    {
-        return const_iterator (m_items.cend ());
-    }
-
-    iterator iterator_to (T& value) noexcept
-    {
-        std::ptrdiff_t const offset (
-            (std::ptrdiff_t)(((Item const*)0)->get ()));
-        Item& item (*addBytesToPointer (((Item*)&value), -offset));
-        return iterator (m_items.iterator_to (item));
-    }
-
-    const_iterator const_iterator_to (T const& value) const noexcept
-    {
-        std::ptrdiff_t const offset (
-            (std::ptrdiff_t)(((Item const*)0)->get ()));
-        Item const& item (*addBytesToPointer (((Item const*)&value), -offset));
-        return const_iterator (m_items.const_iterator_to (item));
-    }
-
-    //--------------------------------------------------------------------------
-
-    bool empty () const noexcept
-    {
-        return m_items.empty ();
-    }
-
-    size_type size () const noexcept
-    {
-        return m_items.size ();
-    }
-
-    size_type max_size () const noexcept
-    {
-        return std::numeric_limits <size_type>::max ();
-    }
-
-    void reserve (size_type new_cap) noexcept
-    {
-        new_cap = m_blocksize * (
-            (new_cap + m_blocksize - 1) / m_blocksize);
-        if (new_cap > max_size ())
-            Throw (std::length_error ("new_cap > max_size"), __FILE__, __LINE__);
-        if (new_cap <= m_capacity)
-            return;
-        size_type const n (new_cap / m_blocksize);
-        m_handles.reserve (n);
-        for (size_type i = m_handles.size (); i < n; ++i)
-            m_handles.push_back (static_cast <Item*> (std::malloc (
-                m_blocksize * sizeof (Item))));
-        m_capacity = new_cap;
-    }
-
-    size_type capacity () const noexcept
-    {
-        return m_capacity;
-    }
-
-    void shrink_to_fit ()
-    {
-        // Special case when all allocated
-        // items are part of the free list.
-        if (m_items.empty ())
-            m_free.clear ();
-
-        size_type const used (m_items.size () + m_free.size ());
-        size_type const handles ((used + m_blocksize - 1) / m_blocksize);
-        m_capacity = handles * m_blocksize;
-        for (size_type i = m_handles.size (); i-- > handles;)
-        {
-            std::free (m_handles [i]);
-            m_handles.erase (m_handles.begin () + i);
-        }
-    }
-
-    //--------------------------------------------------------------------------
-
-    void clear ()
-    {
-        // Might want to skip this if is_pod<T> is true
-        for (typename List <Item>::iterator iter = m_items.begin ();
-            iter != m_items.end ();)
-        {
-            Item& item (*iter++);
-            item.get ()->~T ();
-            m_free.push_back (item);
-        }
-    }
-
-    /** Allocate a new default-constructed element and return the iterator.
-        If there are deleted elements in the free list, the new element
-        may not be created at the end of the storage area.
-    */
-    iterator emplace_back ()
-    {
-        return iterator_to (*::new (alloc ()->get ()) T ());
-    }
-
-    template <class A1>
-    iterator emplace_back (A1 a1)
-    {
-        return iterator_to (*::new (alloc ()->get ()) T (a1));
-    }
-
-    template <class A1, class A2>
-    iterator emplace_back (A1 a1, A2 a2)
-    {
-        return iterator_to (*::new (alloc ()->get ()) T (a1, a2));
-    }
-
-    template <class A1, class A2, class A3>
-    iterator emplace_back (A1 a1, A2 a2, A3 a3)
-    {
-        return iterator_to (*::new (alloc ()->get ()) T (a1, a2, a3));
-    }
-
-    template <class A1, class A2, class A3, class A4>
-    iterator emplace_back (A1 a1, A2 a2, A3 a3, A4 a4)
-    {
-        return iterator_to (*::new (alloc ()->get ()) T (a1, a2, a3, a4));
-    }
-
-    template <class A1, class A2, class A3, class A4, class A5>
-    iterator emplace_back (A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
-    {
-        return iterator_to (*::new (alloc ()->get ()) T (a1, a2, a3, a4, a5));
-    }
-
-    /** Allocate a new copy-constructed element and return the index. */
-    iterator push_back (TParam value) noexcept
-    {
-        return iterator_to (*::new (alloc ()->get ()) T (value));
-    }
-
-    /** Erase the element at the specified position. */
-    iterator erase (iterator pos)
-    {
-        Item& item (*pos.m_iter);
-        item.get ()->~T ();
-        pos = m_items.erase (m_items.iterator_to (item));
-        m_free.push_front (item);
-        return pos;
-    }
-
-private:
-    template <class, bool>
-    friend class DynamicListIterator;
-
-    struct Item : List <Item>::Node
-    {
-        typedef T value_type;
-
-        T* get () noexcept
-        {
-            return reinterpret_cast <T*> (&storage [0]);
-        }
-
-        T const* get () const noexcept
-        {
-            return reinterpret_cast <T const*> (&storage [0]);
-        }
-
-    private:
-        // Lets hope this is padded correctly
-        uint8 storage [sizeof (T)];
-    };
-
-    Item* alloc () noexcept
-    {
-        Item* item;
-        if (m_free.empty ())
-        {
-            if (m_capacity <= m_items.size ())
-                reserve (m_items.size () + 1);
-
-            size_type const index (m_items.size () / m_blocksize);
-            size_type const offset (m_items.size () - index * m_blocksize);
-            item = m_handles [index] + offset;
-        }
-        else
-        {
-            item = &m_free.pop_front ();
-        }
-
-        m_items.push_back (*item);
-        return item;
-    }
-
-    typedef std::vector <Item*> blocks_t;
-
-    Allocator m_allocator;
-    size_type m_blocksize;
-    size_type m_capacity;
-    std::vector <Item*> m_handles;
-    List <Item> m_items;
-    List <Item> m_free;
-};
-
-#endif
diff --git a/modules/beast_core/containers/beast_DynamicObject.cpp b/modules/beast_core/containers/DynamicObject.cpp
similarity index 100%
rename from modules/beast_core/containers/beast_DynamicObject.cpp
rename to modules/beast_core/containers/DynamicObject.cpp
diff --git a/modules/beast_core/containers/beast_DynamicObject.h b/modules/beast_core/containers/DynamicObject.h
similarity index 100%
rename from modules/beast_core/containers/beast_DynamicObject.h
rename to modules/beast_core/containers/DynamicObject.h
diff --git a/modules/beast_core/containers/beast_ElementComparator.h b/modules/beast_core/containers/ElementComparator.h
similarity index 100%
rename from modules/beast_core/containers/beast_ElementComparator.h
rename to modules/beast_core/containers/ElementComparator.h
diff --git a/modules/beast_core/containers/HashMap.cpp b/modules/beast_core/containers/HashMap.cpp
deleted file mode 100644
index 451a316d26..0000000000
--- a/modules/beast_core/containers/HashMap.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-class HashMapTests : public UnitTest
-{
-public:
-    enum
-    {
-        numberOfItems = 100 * 1000
-    };
-
-    template <int keyBytes>
-    class TestTraits
-    {
-    public:
-        struct Value
-        {
-            int unused;
-        };
-
-        struct Key
-        {
-            class Equal
-            {
-            public:
-                bool operator() (Key const& lhs, Key const& rhs) const noexcept
-                {
-                    return memcmp (lhs.data, rhs.data, keyBytes) == 0;
-                }
-            };
-
-            // stateful hardened hash
-            class Hash
-            {
-            public:
-                explicit Hash (HashValue seedToUse = Random::getSystemRandom ().nextInt ())
-                    : m_seed (seedToUse)
-                {
-                }
-
-                HashValue generateHash (Key const& key) const noexcept
-                {
-                    HashValue hash;
-                    Murmur::Hash (key.data, keyBytes, m_seed, &hash);
-                    return hash;
-                }
-
-            private:
-                HashValue m_seed;
-            };
-
-            /*
-            Key ()
-                : std::memset (data, 0, keyBytes)
-            {
-            }
-            */
-
-            uint8 data [keyBytes];
-        };
-
-        typedef Key                 key_type;
-        typedef Value               value_type;
-        typedef typename Key::Hash  hasher;
-        typedef typename Key::Equal key_equal;
-        typedef std::size_t         size_type;
-
-        TestTraits (size_type const numberOfKeys, Random& random)
-        {
-            // need to static_bassert keyBytes can represent numberOfKeys. Log base 256 or something?
-
-            m_keys.reserve (numberOfKeys);
-            m_shuffled_keys.reserve (numberOfKeys);
-            for (size_type i = 0; i < numberOfKeys; ++i)
-            {
-                // VFALCO NOTE std::vector is garbage..want to emplace_back() here
-                Key key;
-                memset (key.data, 0, sizeof (key.data));
-                memcpy (& key.data [0], &i, std::min (sizeof (key.data), sizeof (i)));
-                m_keys.push_back (key);
-                m_shuffled_keys.push_back (&m_keys [i]);
-            }
-
-            UnitTestUtilities::repeatableShuffle (numberOfKeys, m_shuffled_keys, random);
-        }
-
-        Key const& getKey (size_type index) const noexcept
-        {
-            return *m_shuffled_keys [index]; 
-        }
-
-    private:
-        std::vector <Key>  m_keys;
-        std::vector <Key*> m_shuffled_keys;
-    };
-
-    template <int keyBytes>
-    void testInsert (std::size_t numberOfKeys, Random& random)
-    {
-        beginTestCase (String
-            ("insertion, numberOfKeys = ") + String::fromNumber (numberOfKeys) +
-            ", keyBytes = " + String::fromNumber (keyBytes));
-
-        typedef TestTraits <keyBytes> Traits;
-        Traits traits (numberOfKeys, random);
-
-        typedef HashMap <
-            typename Traits::key_type,
-            typename Traits::value_type,
-            typename Traits::hasher,
-            typename Traits::key_equal> Map;
-        Map map;
-
-        for (std::size_t i = 0; i < numberOfKeys; ++i)
-            map.insert (traits.getKey (i));
-
-        String s (
-            "load_factor = " + String::fromNumber (map.load_factor (), 2) +
-            ", bucket_count = " + String::fromNumber (map.bucket_count ()));
-        this->logMessage (s);
-
-        expect (map.size () == numberOfKeys);
-    }
-
-    void runTest ()
-    {
-        int64 const seedValue = 072472;
-        Random random (seedValue);
-        testInsert <4> (numberOfItems, random);
-        testInsert <20> (numberOfItems, random);
-    }
-
-    HashMapTests () : UnitTest ("HashMap", "beast")
-    {
-    }
-};
-
-static HashMapTests hashMapTests;
diff --git a/modules/beast_core/containers/HashMap.h b/modules/beast_core/containers/HashMap.h
deleted file mode 100644
index e1f46f5a07..0000000000
--- a/modules/beast_core/containers/HashMap.h
+++ /dev/null
@@ -1,856 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Portions of this file are from JUCE.
-    Copyright (c) 2013 - Raw Material Software Ltd.
-    Please visit http://www.juce.com
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_HASHMAP_H_INCLUDED
-#define BEAST_HASHMAP_H_INCLUDED
-
-/** The integral type for holding a non cryptographic hash.
-    HashValue is used for fast comparisons, bloom filters, and hash maps.
-*/
-typedef uint32 HashValue;
-
-//------------------------------------------------------------------------------
-
-/** Simple hash functions for use with HashMap.
-
-    @see HashMap
-*/
-// VFALCO TODO Rewrite the hash functions to return a uint32, and not
-//             take the upperLimit parameter. Just do the mod in the
-//             calling function for simplicity.
-class DefaultHashFunctions
-{
-public:
-    /** Generates a simple hash from an integer. */
-    HashValue generateHash (const int key) const noexcept
-    {
-        return HashValue (std::abs (key));
-    }
-
-    /** Generates a simple hash from an int64. */
-    HashValue generateHash (const int64 key) const noexcept
-    {
-        return HashValue (key);
-    }
-
-    /** Generates a simple hash from a string. */
-    HashValue generateHash (const String& key) const noexcept
-    {
-        return HashValue (key.hashCode ());
-    }
-
-    /** Generates a simple hash from a variant. */
-    HashValue generateHash (const var& key) const noexcept
-    {
-        return generateHash (key.toString ());
-    }
-};
-
-#if 0
-/** Hardened hash functions for use with HashMap.
-
-    The seed is used to make the hash unpredictable. This prevents
-    attackers from exploiting crafted inputs to produce degenerate
-    containers.
-*/
-class HardenedHashFunctions
-{
-public:
-    /** Construct a hash function.
-
-        If a seed is specified it will be used, else a random seed
-        will be generated from the system.
-
-        @param seedToUse An optional seed to use.
-    */
-    explicit HardenedHashFunctions (int seedToUse = Random::getSystemRandom ().nextInt ())
-        : m_seed (seedToUse)
-    {
-    }
-
-    // VFALCO TODO Need hardened versions of these functions which use the seed!
-
-private:
-    int m_seed;
-};
-#endif
-
-//------------------------------------------------------------------------------
-
-namespace detail
-{
-
-struct BucketTag { };
-
-template <typename M, typename I>
-class HashMapLocalIterator
-    : public std::iterator <std::forward_iterator_tag, typename M::size_type>
-{
-public:
-    typedef typename M::Pair      value_type;
-    typedef value_type*           pointer;
-    typedef value_type&           reference;
-    typedef typename M::size_type size_type;
-
-    HashMapLocalIterator (M* map = nullptr, I iter = I ())
-        : m_map (map)
-        , m_iter (iter)
-    {
-    }
-
-    template <typename N, typename J>
-    HashMapLocalIterator (HashMapLocalIterator <N, J> const& other)
-        : m_map (other.m_map)
-        , m_iter (other.m_iter)
-    {
-    }
-
-    template <typename N, typename J>
-    HashMapLocalIterator& operator= (HashMapLocalIterator <N, J> const& other)
-    {
-        m_map = other.m_map;
-        m_iter = other.m_iter;
-        return *this;
-    }
-
-    template <typename N, typename J>
-    bool operator== (HashMapLocalIterator <N, J> const& other)
-    {
-        return m_map == other.m_map && m_iter == other.m_iter;
-    }
-
-    template <typename N, typename J>
-    bool operator!= (HashMapLocalIterator <N, J> const& other)
-    {
-        return ! ((*this)==other);
-    }
-
-    reference operator* () const noexcept
-    {
-        return dereference ();
-    }
-
-    pointer operator-> () const noexcept
-    {
-        return &dereference ();
-    }
-
-    HashMapLocalIterator& operator++ () noexcept
-    {
-        increment ();
-        return *this;
-    }
-
-    HashMapLocalIterator operator++ (int) noexcept
-    {
-        HashMapLocalIterator const result (*this);
-        increment ();
-        return result;
-    }
-
-private:
-    reference dereference () const noexcept
-    {
-        return m_iter->pair ();
-    }
-
-    void increment () noexcept
-    {
-        ++m_iter;
-    }
-
-    M* m_map;
-    I m_iter;
-};
-
-//------------------------------------------------------------------------------
-
-
-template <typename M>
-class HashMapIterator
-    : public std::iterator <std::forward_iterator_tag, typename M::size_type>
-{
-private:
-    typedef typename M::Item Item;
-    typedef typename M::Bucket Bucket;
-    typedef detail::ListIterator <typename detail::copyconst <M,
-        typename List <Bucket>::Node>::type> bucket_iterator;
-    typedef detail::ListIterator <typename detail::copyconst <M,
-        typename List <Item, detail::BucketTag>::Node>::type> item_iterator;
-
-public:
-    typedef typename M::Pair      value_type;
-    typedef value_type*           pointer;
-    typedef value_type&           reference;
-    typedef typename M::size_type size_type;
-
-    HashMapIterator ()
-        : m_map (nullptr)
-        , m_bucket (bucket_iterator ())
-        , m_local (item_iterator ())
-    {
-    }
-
-    // represents end()
-    explicit HashMapIterator (M* map)
-        : m_map (map)
-        , m_bucket (bucket_iterator ())
-        , m_local (item_iterator ())
-    {
-    }
-
-    HashMapIterator (M* map, bucket_iterator const& bucket, item_iterator const& local)
-        : m_map (map)
-        , m_bucket (bucket)
-        , m_local (local)
-    {
-    }
-
-#if 0
-    HashMapIterator (HashMapIterator const& other) noexcept
-        : m_map (other.m_map)
-        , m_bucket (other.m_bucket)
-        , m_local (other.m_local)
-    {
-    }
-
-    template <typename N>
-    HashMapIterator (HashMapIterator <N> const& other) noexcept
-        : m_map (other.m_map)
-        , m_bucket (other.m_bucket)
-        , m_local (other.m_local)
-    {
-    }
-#endif
-    template <typename N>
-    HashMapIterator& operator= (HashMapIterator <N> const& other) noexcept
-    {
-        m_map = other.m_map;
-        m_bucket = other.m_bucket;
-        m_local = other.m_local;
-        return *this;
-    }
-
-    template <typename N>
-    bool operator== (HashMapIterator <N> const& other) noexcept
-    {
-        return m_map == other.m_map &&
-               m_bucket == other.m_bucket &&
-               m_local == other.m_local;
-    }
-
-    template <typename N>
-    bool operator!= (HashMapIterator <N> const& other) noexcept
-    {
-        return ! ((*this) == other);
-    }
-
-    reference operator* () const noexcept
-    {
-        return dereference ();
-    }
-
-    pointer operator-> () const noexcept
-    {
-        return &dereference ();
-    }
-
-    HashMapIterator& operator++ () noexcept
-    {
-        increment ();
-        return *this;
-    }
-
-    HashMapIterator operator++ (int) noexcept
-    {
-        HashMapIterator const result (*this);
-        increment ();
-        return result;
-    }
-
-private:
-    template <typename, typename, typename, typename, typename>
-    friend class HashMap;
-
-    reference dereference () const noexcept
-    {
-        return m_local->pair ();
-    }
-
-    void increment () noexcept
-    {
-        ++m_local;
-        if (m_local == m_bucket->items.end ())
-        {
-            ++m_bucket;
-            if (m_bucket != m_map->m_bucketlist.end ())
-                m_local = m_bucket->items.begin ();
-        }
-    }
-
-    M* m_map;
-    bucket_iterator m_bucket;
-    item_iterator m_local;
-};
-
-}
-
-//------------------------------------------------------------------------------
-
-/** Associative container mapping Key to T pairs.
-*/
-template <typename Key,
-          typename T,
-          typename Hash = DefaultHashFunctions,
-          typename KeyEqual = std::equal_to <Key>,
-          typename Allocator = std::allocator <char> >
-class HashMap
-{
-private:
-    typedef PARAMETER_TYPE (Key) KeyParam;
-    typedef PARAMETER_TYPE (T)   TParam;
-
-public:
-    struct Pair
-    {
-        explicit Pair (Key key)
-            : m_key (key)
-        {
-        }
-
-        Pair (Key key, T t)
-            : m_key (key)
-            , m_t (t)
-        {
-        }
-
-        Key const& key () const noexcept
-        {
-            return m_key;
-        }
-
-        T& value () noexcept
-        {
-            return m_t;
-        }
-
-        T const& value () const noexcept
-        {
-            return m_t;
-        }
-
-    private:
-        Key m_key;
-        T m_t;
-    };
-
-private:
-    template <typename M, typename I>
-    friend class detail::HashMapLocalIterator;
-
-    class Item;
-
-    // Each non-empty bucket is in the linked list.
-    struct Bucket : List <Bucket>::Node
-    {
-        Bucket ()
-        {
-        }
-
-        inline bool empty () const noexcept
-        {
-            return items.empty ();
-        }
-
-        List <Item, detail::BucketTag> items;
-
-    private:
-        Bucket& operator= (Bucket const&);
-        Bucket (Bucket const&);
-    };
-
-    // Every item in the map is in one linked list
-    struct Item 
-        : List <Item>::Node
-        , List <Item, detail::BucketTag>::Node
-    {
-        Item (Pair const& pair_)
-            : m_pair (pair_)
-        {
-        }
-
-        Pair& pair () noexcept
-        {
-            return m_pair;
-        }
-
-        Pair const& pair () const noexcept
-        {
-            return m_pair;
-        }
-
-    private:
-        Pair m_pair;
-    };
-
-public:
-    typedef Key               key_type;
-    typedef T                 mapped_type;
-    typedef Pair              value_type;
-    typedef std::size_t       size_type;
-    typedef std::ptrdiff_t    difference_type;
-    typedef Hash              hasher;
-    typedef KeyEqual          key_equal;
-    typedef Allocator         allocator_type;
-    typedef value_type*       pointer;
-    typedef value_type&       reference;
-    typedef value_type const* const_pointer;
-    typedef value_type const& const_reference;
-    
-    typedef HashMap <Key, T, Hash, KeyEqual, Allocator> container_type;
-
-    typedef detail::HashMapIterator <container_type> iterator;
-    typedef detail::HashMapIterator <container_type const> const_iterator;
-
-    typedef detail::HashMapLocalIterator <container_type,
-        typename List <Item, detail::BucketTag>::iterator> local_iterator;
-
-    typedef detail::HashMapLocalIterator <container_type const,
-        typename List <Item, detail::BucketTag>::const_iterator> const_local_iterator;
-
-    //--------------------------------------------------------------------------
-
-    enum
-    {
-        initialBucketCount = 101,
-        percentageIncrease = 25
-    };
-
-    static float getDefaultLoadFactor () noexcept
-    {
-        return 1.2f;
-    }
-
-    explicit HashMap (
-        size_type bucket_count = initialBucketCount,
-        KeyEqual const& equal = KeyEqual (),
-        Hash const& hash = Hash (),
-        Allocator const& allocator = Allocator ())
-       : m_hash (hash)
-       , m_equal (equal)
-       , m_allocator (allocator)
-       , m_max_load_factor (getDefaultLoadFactor ())
-    {
-        rehash (bucket_count);
-    }
-
-    HashMap (
-        size_type bucket_count,
-        Allocator const& allocator = Allocator ())
-       : m_allocator (allocator)
-       , m_max_load_factor (getDefaultLoadFactor ())
-    {
-        rehash (bucket_count);
-    }
-
-    HashMap (
-        size_type bucket_count,
-        Hash const& hash = Hash (),
-        Allocator const& allocator = Allocator ())
-       : m_hash (hash)
-       , m_allocator (allocator)
-       , m_max_load_factor (getDefaultLoadFactor ())
-    {
-        rehash (bucket_count);
-    }
-
-    explicit HashMap (Allocator const& allocator)
-       : m_allocator (allocator)
-       , m_max_load_factor (getDefaultLoadFactor ())
-    {
-        rehash (initialBucketCount);
-    }
-
-    ~HashMap()
-    {
-        clear ();
-    }
-
-    HashMap& operator= (HashMap const& other)
-    {
-        clear ();
-        for (iterator iter = other.begin (); iter != other.end (); ++iter)
-            (*this)[iter->key ()] = iter->value ();
-        return *this;
-    }
-
-    allocator_type get_allocator () const noexcept
-    {
-        return m_allocator;
-    }
-
-    //--------------------------------------------------------------------------
-
-    iterator begin () noexcept
-    {
-        if (m_bucketlist.size () > 0)
-            return iterator (this, m_bucketlist.begin (),
-                m_bucketlist.front ().items.begin ());
-        return end ();
-    }
-
-    const_iterator begin () const noexcept
-    {
-        if (m_bucketlist.size () > 0)
-            return const_iterator (this, m_bucketlist.begin (),
-                m_bucketlist.front ().items.begin ());
-        return end ();
-    }
-
-    const_iterator cbegin () const noexcept
-    {
-        if (m_bucketlist.size () > 0)
-            return const_iterator (this, m_bucketlist.begin (),
-                m_bucketlist.front ().items.begin ());
-        return end ();
-    }
-
-    iterator end () noexcept
-    {
-        return iterator (static_cast <container_type*> (this));
-    }
-
-    const_iterator end () const noexcept
-    {
-        return const_iterator (this);
-    }
-
-    const_iterator cend () const noexcept
-    {
-        return const_iterator (this);
-    }
-
-    //--------------------------------------------------------------------------
-
-    bool empty () const noexcept
-    {
-        return size () == 0;
-    }
-
-    size_type size () const noexcept
-    {
-        return m_itemlist.size ();
-    }
-
-    size_type max_size () const noexcept
-    {
-        return std::numeric_limits <size_type>::max ();
-    }
-
-    //--------------------------------------------------------------------------
-
-    void clear()
-    {
-        for (typename DynamicList <Item>::iterator iter = m_items.begin ();
-            iter != m_items.end ();)
-        {
-            typename DynamicList <Item>::iterator const cur (iter++);
-            m_items.erase (cur);
-        }
-
-        m_itemlist.clear ();
-        m_bucketlist.clear ();
-        size_type const count (m_buckets.size ());
-        m_buckets.assign (count);
-    }
-
-    struct Result
-    {
-        Result (iterator iter_ = iterator (), bool inserted_ = false)
-            : iter (iter_)
-            , inserted (inserted_)
-        {
-        }
-
-        iterator iter;
-        bool inserted;
-    };
-
-    Result insert (Pair const& p)
-    {
-        size_type const n (bucket (p.key ()));
-        iterator iter (find (p.key (), n));
-        if (iter != end ())
-            return Result (iter, false);
-        check_load ();
-        return Result (store (*m_items.emplace_back (p), n), true);
-    }
-
-    Result insert (KeyParam key)
-    {
-        return insert (Pair (key));
-    }
-
-    iterator erase (const_iterator pos)
-    {
-        iterator iter = pos;
-        ++iter;
-        Bucket& b (*pos.m_iter);
-        erase (b, pos->m_local);
-        return iter;
-    }
-
-    size_type erase (KeyParam key)
-    {
-        size_type found (0);
-        Bucket& b (m_buckets [bucket (key)]);
-        for (typename List <Item, detail::BucketTag>::iterator iter (b.items.begin ());
-            iter != b.items.end ();)
-        {
-            typename List <Item, detail::BucketTag>::iterator cur (iter++);
-            if (m_equal (cur->pair ().key (), key))
-            {
-                erase (b, cur);
-                ++found;
-            }
-        }
-        return found;
-    }
-
-    //--------------------------------------------------------------------------
-
-    T& at (KeyParam key)
-    {
-        iterator const iter (find (key));
-        if (iter == end ())
-            Throw (std::out_of_range ("key not found"), __FILE__, __LINE__);
-        return iter->value ();
-    }
-
-    T const& at (KeyParam key) const
-    {
-        const_iterator const iter (find (key));
-        if (iter == end ())
-            Throw (std::out_of_range ("key not found"), __FILE__, __LINE__);
-        return iter->value ();
-    }
-
-    T& operator[] (KeyParam key) noexcept
-    {
-        return insert (key).iter->value ();
-    }
-
-    size_type count (KeyParam key) const noexcept
-    {
-        size_type n = 0;
-        Bucket const& b (m_buckets [bucket (key)]);
-        for (typename List <Item, detail::BucketTag>::iterator iter = b.items.begin ();
-            iter != b.items.end (); ++iter)
-            if (m_equal (iter->key (), key))
-                ++n;
-        return n;
-    }
-
-    iterator find (KeyParam key) noexcept
-    {
-        return find (key, bucket (key));
-    }
-
-    const_iterator find (KeyParam key) const noexcept
-    {
-        return find (key, bucket (key));
-    }
-
-    //--------------------------------------------------------------------------
-
-    local_iterator begin (size_type n) noexcept
-    {
-        return local_iterator (this, m_buckets [n].items.begin ());
-    }
-
-    const_local_iterator begin (size_type n) const noexcept
-    {
-        return const_local_iterator (this, m_buckets [n].items.begin ());
-    }
-
-    const_local_iterator cbegin (size_type n) const noexcept
-    {
-        return const_local_iterator (this, m_buckets [n].items.cbegin ());
-    }
-
-    local_iterator end (size_type n) noexcept
-    {
-        return local_iterator (this, m_buckets [n].items.end ());
-    }
-
-    const_local_iterator end (size_type n) const noexcept
-    {
-        return const_local_iterator (this, m_buckets [n].items.end ());
-    }
-
-    const_local_iterator cend (size_type n) const noexcept
-    {
-        return const_local_iterator (this, m_buckets [n].items.cend ());
-    }
-
-    size_type bucket_count () const noexcept
-    {
-        return m_buckets.size ();
-    }
-
-    size_type max_bucket_count () const noexcept
-    {
-        return std::numeric_limits <size_type>::max ();
-    }
-
-    size_type bucket_size (size_type n) const noexcept
-    {
-        return m_buckets [n].items.size ();
-    }
-
-    size_type bucket (KeyParam key) const noexcept
-    {
-        HashValue const hash (m_hash.generateHash (key));
-        return hash % bucket_count ();
-    }
-
-    //--------------------------------------------------------------------------
-
-    float load_factor () const noexcept
-    {
-        return float (m_items.size ()) / float (m_buckets.size ());
-    }
-
-    float max_load_factor () const noexcept
-    {
-        return m_max_load_factor;
-    }
-
-    void max_load_factor (float ml) noexcept
-    {
-        m_max_load_factor = ml;
-        check_load ();
-    }
-
-    void rehash (size_type const count)
-    {
-        m_bucketlist.clear ();
-        m_buckets.assign (count);
-        for (typename List <Item>::iterator iter = m_itemlist.begin ();
-            iter != m_itemlist.end (); ++iter)
-        {
-            Item& item (*iter);
-            size_type const n (bucket (item.pair ().key ()));
-            Bucket& b (m_buckets [n]);
-            if (b.empty ())
-                m_bucketlist.push_front (b);
-            b.items.push_front (item);
-        }
-    }
-
-    void reserve (size_type count)
-    {
-        m_items.reserve (count);
-        rehash (std::ceil (count / max_load_factor ()));
-    }
-
-private:
-    // rehashes if adding one more item would put us over
-    void check_load () noexcept
-    {
-        if ( (float (m_items.size () + 1) /
-              float (m_buckets.size ())) >=
-              max_load_factor ())
-        {
-            grow_buckets ();
-        }
-    }
-
-    void grow_buckets ()
-    {
-        double const scale = 1. + (double (percentageIncrease) / 100.);
-        size_type const count (size_type (std::ceil (
-            (double (size ()) / double (max_load_factor ())) * scale)));
-        rehash (count);
-    }
-
-    iterator find (KeyParam key, size_type n) noexcept
-    {
-        Bucket& b (m_buckets [n]);
-        for (typename List <Item, detail::BucketTag>::iterator iter =
-            b.items.begin (); iter != b.items.end (); ++iter)
-            if (m_equal (iter->pair ().key (), key))
-                return iterator (this, m_bucketlist.iterator_to (b), iter);
-        return end ();
-    }
-
-    const_iterator find (KeyParam key, size_type n) const noexcept
-    {
-        Bucket const& b (m_buckets [n]);
-        for (typename List <Item, detail::BucketTag>::const_iterator iter =
-            b.items.begin (); iter != b.items.end (); ++iter)
-            if (m_equal (iter->pair ().key (), key))
-                return const_iterator (this,
-                    m_bucketlist.const_iterator_to (b), iter);
-        return end ();
-    }
-
-    iterator store (Item& item, size_type n)
-    {
-        check_load ();
-        Bucket& b (m_buckets [n]);
-        if (b.empty ())
-            m_bucketlist.push_front (b);
-        b.items.push_front (item);
-        m_itemlist.push_front (item);
-        return iterator (this,
-            m_bucketlist.iterator_to (b),
-                b.items.begin ());
-    }
-
-    void erase (Bucket& b, typename List <Item, detail::BucketTag>::iterator pos)
-    {
-        Item& item (*pos);
-        b.items.erase (b.items.iterator_to (item));
-        if (b.empty ())
-            m_bucketlist.erase (m_bucketlist.iterator_to (b));
-        m_itemlist.erase (m_itemlist.iterator_to (item));
-        m_items.erase (m_items.iterator_to (item));
-    }
-
-private:
-    template <typename M>
-    friend class detail::HashMapIterator;
-
-    Hash m_hash;
-    KeyEqual m_equal;
-    Allocator m_allocator;
-    DynamicList <Item> m_items;
-    DynamicArray <Bucket> m_buckets;
-    List <Item> m_itemlist;
-    List <Bucket> m_bucketlist;
-    float m_max_load_factor;
-};
-
-#endif
-
diff --git a/modules/beast_core/containers/beast_LinkedListPointer.h b/modules/beast_core/containers/LinkedListPointer.h
similarity index 100%
rename from modules/beast_core/containers/beast_LinkedListPointer.h
rename to modules/beast_core/containers/LinkedListPointer.h
diff --git a/modules/beast_core/containers/beast_LockFreeQueue.h b/modules/beast_core/containers/LockFreeQueue.h
similarity index 95%
rename from modules/beast_core/containers/beast_LockFreeQueue.h
rename to modules/beast_core/containers/LockFreeQueue.h
index 7c3e0e5999..b01519ef80 100644
--- a/modules/beast_core/containers/beast_LockFreeQueue.h
+++ b/modules/beast_core/containers/LockFreeQueue.h
@@ -17,14 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_LOCKFREEQUEUE_H_INCLUDED
-#define BEAST_LOCKFREEQUEUE_H_INCLUDED
-
-/** Default tag for LockFreeQueue
-
-    @ingroup beast_core intrusive
-*/
-struct LockFreeQueueDefaultTag { };
+#ifndef BEAST_INTRUSIVE_LOCKFREEQUEUE_H_INCLUDED
+#define BEAST_INTRUSIVE_LOCKFREEQUEUE_H_INCLUDED
 
 /** Multiple Producer, Single Consumer (MPSC) intrusive FIFO.
 
@@ -46,7 +40,7 @@ struct LockFreeQueueDefaultTag { };
 
     @ingroup beast_core intrusive
 */
-template <class Element, class Tag = LockFreeQueueDefaultTag>
+template <class Element, class Tag = void>
 class LockFreeQueue
 {
 public:
diff --git a/modules/beast_core/containers/beast_NamedValueSet.cpp b/modules/beast_core/containers/NamedValueSet.cpp
similarity index 100%
rename from modules/beast_core/containers/beast_NamedValueSet.cpp
rename to modules/beast_core/containers/NamedValueSet.cpp
diff --git a/modules/beast_core/containers/beast_NamedValueSet.h b/modules/beast_core/containers/NamedValueSet.h
similarity index 100%
rename from modules/beast_core/containers/beast_NamedValueSet.h
rename to modules/beast_core/containers/NamedValueSet.h
diff --git a/modules/beast_core/containers/beast_OwnedArray.h b/modules/beast_core/containers/OwnedArray.h
similarity index 100%
rename from modules/beast_core/containers/beast_OwnedArray.h
rename to modules/beast_core/containers/OwnedArray.h
diff --git a/modules/beast_core/containers/beast_PropertySet.cpp b/modules/beast_core/containers/PropertySet.cpp
similarity index 100%
rename from modules/beast_core/containers/beast_PropertySet.cpp
rename to modules/beast_core/containers/PropertySet.cpp
diff --git a/modules/beast_core/containers/beast_PropertySet.h b/modules/beast_core/containers/PropertySet.h
similarity index 100%
rename from modules/beast_core/containers/beast_PropertySet.h
rename to modules/beast_core/containers/PropertySet.h
diff --git a/modules/beast_core/containers/beast_ScopedValueSetter.h b/modules/beast_core/containers/ScopedValueSetter.h
similarity index 100%
rename from modules/beast_core/containers/beast_ScopedValueSetter.h
rename to modules/beast_core/containers/ScopedValueSetter.h
diff --git a/modules/beast_core/containers/beast_SharedObjectArray.h b/modules/beast_core/containers/SharedObjectArray.h
similarity index 100%
rename from modules/beast_core/containers/beast_SharedObjectArray.h
rename to modules/beast_core/containers/SharedObjectArray.h
diff --git a/modules/beast_core/containers/beast_SortedSet.h b/modules/beast_core/containers/SortedSet.h
similarity index 100%
rename from modules/beast_core/containers/beast_SortedSet.h
rename to modules/beast_core/containers/SortedSet.h
diff --git a/modules/beast_core/containers/beast_SparseSet.h b/modules/beast_core/containers/SparseSet.h
similarity index 100%
rename from modules/beast_core/containers/beast_SparseSet.h
rename to modules/beast_core/containers/SparseSet.h
diff --git a/modules/beast_core/containers/beast_Variant.cpp b/modules/beast_core/containers/Variant.cpp
similarity index 100%
rename from modules/beast_core/containers/beast_Variant.cpp
rename to modules/beast_core/containers/Variant.cpp
diff --git a/modules/beast_core/containers/beast_Variant.h b/modules/beast_core/containers/Variant.h
similarity index 100%
rename from modules/beast_core/containers/beast_Variant.h
rename to modules/beast_core/containers/Variant.h
diff --git a/modules/beast_core/containers/beast_LockFreeStack.h b/modules/beast_core/containers/beast_LockFreeStack.h
deleted file mode 100644
index f09261d022..0000000000
--- a/modules/beast_core/containers/beast_LockFreeStack.h
+++ /dev/null
@@ -1,165 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_LOCKFREESTACK_H_INCLUDED
-#define BEAST_LOCKFREESTACK_H_INCLUDED
-
-struct LockFreeStackDefaultTag;
-
-/*============================================================================*/
-/**
-  Multiple Producer, Multiple Consumer (MPMC) intrusive stack.
-
-  This stack is implemented using the same intrusive interface as List. All
-  operations are lock-free.
-
-  The caller is responsible for preventing the "ABA" problem
-  (http://en.wikipedia.org/wiki/ABA_problem)
-
-  @param Tag  A type name used to distinguish lists and nodes, for
-  putting objects in multiple lists. If this parameter is
-  omitted, the default tag is used.
-
-  @ingroup beast_core intrusive
-*/
-template <class Element, class Tag = LockFreeStackDefaultTag>
-class LockFreeStack : public Uncopyable
-{
-public:
-    class Node : public Uncopyable
-    {
-    public:
-        Node ()
-        {
-        }
-
-        explicit Node (Node* next) : m_next (next)
-        {
-        }
-
-    private:
-        friend class LockFreeStack;
-
-        // VFALCO TODO Use regular Atomic<>
-        AtomicPointer <Node> m_next;
-    };
-
-public:
-    LockFreeStack () : m_head (0)
-    {
-    }
-
-    /** Create a LockFreeStack from another stack.
-
-        The contents of the other stack are atomically acquired.
-        The other stack is cleared.
-
-        @param other  The other stack to acquire.
-    */
-    explicit LockFreeStack (LockFreeStack& other)
-    {
-        Node* head;
-
-        do
-        {
-            head = other.m_head.get ();
-        }
-        while (!other.m_head.compareAndSet (0, head));
-
-        m_head = head;
-    }
-
-    /** Push a node onto the stack.
-
-        The caller is responsible for preventing the ABA problem. This operation
-        is lock-free.
-
-        @param node The node to push.
-
-        @return     True if the stack was previously empty. If multiple threads
-                    are attempting to push, only one will receive true.
-    */
-    bool push_front (Node* node)
-    {
-        bool first;
-        Node* head;
-
-        do
-        {
-            head = m_head.get ();
-            first = head == 0;
-            node->m_next = head;
-        }
-        while (!m_head.compareAndSet (node, head));
-
-        return first;
-    }
-
-    /** Pop an element off the stack.
-
-        The caller is responsible for preventing the ABA problem. This operation
-        is lock-free.
-
-        @return   The element that was popped, or nullptr if the stack was empty.
-    */
-    Element* pop_front ()
-    {
-        Node* node;
-        Node* head;
-
-        do
-        {
-            node = m_head.get ();
-
-            if (node == 0)
-                break;
-
-            head = node->m_next.get ();
-        }
-        while (!m_head.compareAndSet (head, node));
-
-        return node ? static_cast <Element*> (node) : nullptr;
-    }
-
-    /** Swap the contents of this stack with another stack.
-
-        This call is not thread safe or atomic. The caller is responsible for
-        synchronizing access.
-
-        @param other  The other stack to swap contents with.
-    */
-    void swap (LockFreeStack& other)
-    {
-        Node* temp = other.m_head.get ();
-        other.m_head.set (m_head.get ());
-        m_head.set (temp);
-    }
-
-private:
-    AtomicPointer <Node> m_head;
-};
-
-/*============================================================================*/
-/** Default tag for LockFreeStack
-
-    @ingroup beast_core intrusive
-*/
-struct LockFreeStackDefaultTag { };
-
-#endif
diff --git a/modules/beast_core/containers/beast_SharedTable.h b/modules/beast_core/containers/beast_SharedTable.h
deleted file mode 100644
index 11d5179617..0000000000
--- a/modules/beast_core/containers/beast_SharedTable.h
+++ /dev/null
@@ -1,212 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_SHAREDTABLE_H_INCLUDED
-#define BEAST_SHAREDTABLE_H_INCLUDED
-
-/** Handle to a reference counted fixed size table.
-
-    @note Currently, ElementType must be an aggregate of POD.
-
-    @tparam ElementType The type of element.
-
-    @ingroup beast_basics
-*/
-template <class ElementType>
-class SharedTable
-{
-public:
-    typedef ElementType Entry;
-
-    static SharedTable <ElementType> const null;
-
-    /** Creates a null table.
-    */
-    SharedTable ()
-    {
-    }
-
-    /** Creates a table with the specified number of entries.
-
-        The entries are uninitialized.
-
-        @param numEntries The number of entries in the table.
-
-        @todo Initialize the data if ElementType is not POD.
-    */
-    explicit SharedTable (int numEntries)
-        : m_data (new Data (numEntries))
-    {
-    }
-
-    /** Creates a shared reference to another table.
-    */
-    SharedTable (SharedTable const& other)
-        : m_data (other.m_data)
-    {
-    }
-
-    /** Makes this table refer to another table.
-    */
-    SharedTable& operator= (SharedTable const& other)
-    {
-        m_data = other.m_data;
-        return *this;
-    }
-
-#if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
-    SharedTable (SharedTable&& other) noexcept
-        : m_data (static_cast < typename Data::Ptr&& > (other.m_data))
-    {
-    }
-
-    SharedTable& operator= (SharedTable && other) noexcept
-    {
-        m_data = static_cast < typename Data::Ptr && > (other.m_data);
-        return *this;
-    }
-#endif
-
-    /** Destructor.
-    */
-    ~SharedTable ()
-    {
-    }
-
-    /** Returns true if the two tables share the same set of entries.
-    */
-    bool operator== (SharedTable const& other) const noexcept
-    {
-        return m_data == other.m_data;
-    }
-
-    /** Returns true if the two tables do not share the same set of entries.
-    */
-    bool operator!= (SharedTable const& other) const noexcept
-    {
-        return m_data != other.m_data;
-    }
-
-    /** Returns true if the table is not null.
-    */
-    inline bool isValid () const noexcept
-    {
-        return m_data != nullptr;
-    }
-
-    /** Returns true if the table is null.
-    */
-    inline bool isNull () const noexcept
-    {
-        return m_data == nullptr;
-    }
-
-    /** Returns the number of tables referring to the same shared entries.
-    */
-    int getReferenceCount () const noexcept
-    {
-        return m_data == nullptr ? 0 : m_data->getReferenceCount ();
-    }
-
-    /** Create a physical duplicate of the table.
-    */
-    SharedTable createCopy () const
-    {
-        return SharedTable (m_data != nullptr ? m_data->clone () : nullptr);
-    }
-
-    /** Makes sure no other tables share the same entries as this table.
-    */
-    void duplicateIfShared ()
-    {
-        if (m_data != nullptr && m_data->getReferenceCount () > 1)
-            m_data = m_data->clone ();
-    }
-
-    /** Return the number of entries in this table.
-    */
-    inline int getNumEntries () const noexcept
-    {
-        return m_data->getNumEntries ();
-    }
-
-    /** Retrieve a table entry.
-
-        @param index The index of the entry, from 0 to getNumEntries ().
-    */
-    inline ElementType& operator [] (int index) const noexcept
-    {
-        return m_data->getReference (index);
-    }
-
-private:
-    class Data : public SharedObject
-    {
-    public:
-        typedef SharedPtr <Data> Ptr;
-
-        explicit Data (int numEntries)
-            : m_numEntries (numEntries)
-            , m_table (numEntries)
-        {
-        }
-
-        inline Data* clone () const
-        {
-            Data* data = new Data (m_numEntries);
-
-            memcpy (
-                data->m_table.getData (),
-                m_table.getData (),
-                m_numEntries * sizeof (ElementType));
-
-            return data;
-        }
-
-        inline int getNumEntries () const
-        {
-            return m_numEntries;
-        }
-
-        inline ElementType& getReference (int index) const
-        {
-            bassert (index >= 0 && index < m_numEntries);
-            return m_table [index];
-        }
-
-    private:
-        int const m_numEntries;
-        HeapBlock <ElementType> const m_table;
-    };
-
-    explicit SharedTable (Data* data)
-        : m_data (data)
-    {
-    }
-
-    SharedPtr <Data> m_data;
-};
-
-template <class ElementType>
-SharedTable <ElementType> const SharedTable <ElementType>::null;
-
-#endif
-
-//------------------------------------------------------------------------------
-
diff --git a/modules/beast_core/containers/beast_SortedLookupTable.h b/modules/beast_core/containers/beast_SortedLookupTable.h
deleted file mode 100644
index e45185bb79..0000000000
--- a/modules/beast_core/containers/beast_SortedLookupTable.h
+++ /dev/null
@@ -1,154 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_SORTEDLOOKUPTABLE_H_INCLUDED
-#define BEAST_SORTEDLOOKUPTABLE_H_INCLUDED
-
-/** Sorted map for fast lookups.
-
-    This container is optimized for a data set with fixed elements.
-
-    SchemaType obeys this concept:
-
-    @code
-
-    struct SchemaType
-    {
-        typename KeyType;
-        typename ValueType;
-
-        // Retrieve the key for a specified value.
-        KeyType getKey (Value const& value);
-    };
-
-    @endcode
-
-    To use the table, reserve space with reserveSpaceForValues() if the number
-    of elements is known ahead of time. Then, call insert() for  all the your
-    elements. Call prepareForLookups() once then call lookupValueByKey ()
-*/
-template <class SchemaType>
-class SortedLookupTable
-{
-private:
-    typedef typename SchemaType::KeyType KeyType;
-    typedef typename SchemaType::ValueType ValueType;
-    typedef std::vector <ValueType> values_t;
-
-private:
-    struct SortCompare
-    {
-        bool operator () (ValueType const& lhs, ValueType const& rhs) const
-        {
-            return SchemaType ().getKey (lhs) < SchemaType ().getKey (rhs);
-        }
-    };
-
-    struct FindCompare
-    {
-        bool operator () (ValueType const& lhs, ValueType const& rhs)
-        {
-            return SchemaType ().getKey (lhs) < SchemaType ().getKey (rhs);
-        }
-
-        bool operator () (KeyType const& key, ValueType const& rhs)
-        {
-            return key < SchemaType ().getKey (rhs);
-        }
-
-        bool operator () (ValueType const& lhs, KeyType const& key)
-        {
-            return SchemaType ().getKey (lhs) < key;
-        }
-    };
-
-public:
-    typedef typename values_t::size_type size_type;
-
-    /** Reserve space for values.
-
-        Although not necessary, this can help with memory usage if the
-        number of values is known ahead of time.
-
-        @param numberOfValues The amount of space to reserve.
-    */
-    void reserveSpaceForValues (size_type numberOfValues)
-    {
-        m_values.reserve (numberOfValues);
-    }
-
-    /** Insert a value into the index.
-
-        @invariant The value must not already exist in the index.
-
-        @param valueToInsert The value to insert.
-    */
-    void insert (ValueType const& valueToInsert)
-    {
-        m_values.push_back (valueToInsert);
-    }
-
-    /** Prepare the index for lookups.
-
-        This must be called at least once after calling insert()
-        and before calling find().
-    */
-    void prepareForLookups ()
-    {
-        std::sort (m_values.begin (), m_values.end (), SortCompare ());
-    }
-
-    /** Find the value for a key.
-
-        Quickly locates a value matching the key, or returns false
-        indicating no value was found.
-
-        @invariant You must call prepareForLookups() once, after all
-                   insertions, before calling this function.
-
-        @param key         The key to locate.
-        @param pFoundValue Pointer to store the value if a matching
-                           key was found.
-        @return `true` if the value was found.
-    */
-    bool lookupValueByKey (KeyType const& key, ValueType* pFoundValue)
-    {
-        bool found;
-
-        std::pair <typename values_t::iterator, typename values_t::iterator> result =
-            std::equal_range (m_values.begin (), m_values.end (), key, FindCompare ());
-
-        if (result.first != result.second)
-        {
-            *pFoundValue = *result.first;
-            found = true;
-        }
-        else
-        {
-            found = false;
-        }
-
-        return found;
-    }
-
-private:
-    values_t m_values;
-};
-
-#endif
diff --git a/modules/beast_core/diagnostic/beast_FPUFlags.cpp b/modules/beast_core/diagnostic/FPUFlags.cpp
similarity index 100%
rename from modules/beast_core/diagnostic/beast_FPUFlags.cpp
rename to modules/beast_core/diagnostic/FPUFlags.cpp
diff --git a/modules/beast_core/diagnostic/beast_FPUFlags.h b/modules/beast_core/diagnostic/FPUFlags.h
similarity index 100%
rename from modules/beast_core/diagnostic/beast_FPUFlags.h
rename to modules/beast_core/diagnostic/FPUFlags.h
diff --git a/modules/beast_core/diagnostic/beast_FatalError.cpp b/modules/beast_core/diagnostic/FatalError.cpp
similarity index 86%
rename from modules/beast_core/diagnostic/beast_FatalError.cpp
rename to modules/beast_core/diagnostic/FatalError.cpp
index 393e744327..df21573531 100644
--- a/modules/beast_core/diagnostic/beast_FatalError.cpp
+++ b/modules/beast_core/diagnostic/FatalError.cpp
@@ -66,16 +66,19 @@ String FatalError::Reporter::formatFilePath (char const* filePath)
 
 //------------------------------------------------------------------------------
 
-Static::Storage <Atomic <FatalError::Reporter*>, FatalError> FatalError::s_reporter;
+FatalError::Reporter *FatalError::s_reporter;
 
-void FatalError::setReporter (Reporter& reporter)
+/** Returns the current fatal error reporter. */
+FatalError::Reporter* FatalError::getReporter ()
 {
-    s_reporter->compareAndSetBool (&reporter, nullptr);
+    return s_reporter;
 }
 
-void FatalError::resetReporter (Reporter& reporter)
+FatalError::Reporter* FatalError::setReporter (Reporter* reporter)
 {
-    s_reporter->compareAndSetBool (nullptr, &reporter);
+    Reporter* const previous (s_reporter);
+    s_reporter = reporter;
+    return previous;
 }
 
 FatalError::FatalError (char const* message, char const* fileName, int lineNumber)
@@ -94,7 +97,7 @@ FatalError::FatalError (char const* message, char const* fileName, int lineNumbe
 
     char const* const szFileName = fileNameString.toRawUTF8 ();
 
-    Reporter* const reporter = s_reporter->get ();
+    Reporter* const reporter (s_reporter);
 
     if (reporter != nullptr)
     {
@@ -104,14 +107,6 @@ FatalError::FatalError (char const* message, char const* fileName, int lineNumbe
     Process::terminate ();
 }
 
-void reportFatalError (char const* message, char const* fileName, int lineNumber)
-{
-    if (beast::beast_isRunningUnderDebugger())
-        beast_breakDebugger;
-    FatalError (message, fileName, lineNumber);
-    BEAST_ANALYZER_NORETURN
-}
-
 //------------------------------------------------------------------------------
 
 // Yes even this class can have a unit test. It's manually triggered though.
diff --git a/modules/beast_core/diagnostic/beast_FatalError.h b/modules/beast_core/diagnostic/FatalError.h
similarity index 89%
rename from modules/beast_core/diagnostic/beast_FatalError.h
rename to modules/beast_core/diagnostic/FatalError.h
index 87222d244c..861575b314 100644
--- a/modules/beast_core/diagnostic/beast_FatalError.h
+++ b/modules/beast_core/diagnostic/FatalError.h
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_FATALERROR_H_INCLUDED
-#define BEAST_FATALERROR_H_INCLUDED
+#ifndef BEAST_CORE_FATALERROR_H_INCLUDED
+#define BEAST_CORE_FATALERROR_H_INCLUDED
 
 /** Signal a fatal error.
 
@@ -109,6 +109,9 @@ public:
         virtual String formatFilePath (char const* filePath);
     };
 
+    /** Returns the current fatal error reporter. */
+    static Reporter* getReporter ();
+
     /** Set the fatal error reporter.
 
         Note that if a fatal error is raised during the construction of
@@ -122,16 +125,11 @@ public:
 
         If a reporter was previously set, this routine will do nothing.
 
+        @return The previous Reporter (Which may be null).
+
         @see SharedSingleton, Reporter
     */
-    static void setReporter (Reporter& reporter);
-
-    /** Clear the fatal error reporter.
-
-        If the current reporter is the same as the one passed in, this
-        will remove the reporter.
-    */
-    static void resetReporter (Reporter& reporter);
+    static Reporter* setReporter (Reporter* reporter);
 
     /** Raise a fatal error.
 
@@ -145,14 +143,7 @@ public:
     FatalError (char const* message, char const* filePath, int lineNumber);
 
 private:
-    static Static::Storage <Atomic <Reporter*>, FatalError> s_reporter;
+    static Reporter* s_reporter;
 };
 
-//------------------------------------------------------------------------------
-
-/** Report a fatal error message and terminate the application.
-    Normally you won't call this directly.
-*/
-extern void reportFatalError (char const* message, char const* fileName, int lineNumber);
-
 #endif
diff --git a/modules/beast_core/diagnostic/beast_SemanticVersion.cpp b/modules/beast_core/diagnostic/SemanticVersion.cpp
similarity index 100%
rename from modules/beast_core/diagnostic/beast_SemanticVersion.cpp
rename to modules/beast_core/diagnostic/SemanticVersion.cpp
diff --git a/modules/beast_core/diagnostic/beast_SemanticVersion.h b/modules/beast_core/diagnostic/SemanticVersion.h
similarity index 100%
rename from modules/beast_core/diagnostic/beast_SemanticVersion.h
rename to modules/beast_core/diagnostic/SemanticVersion.h
diff --git a/modules/beast_core/diagnostic/beast_Throw.h b/modules/beast_core/diagnostic/Throw.h
similarity index 93%
rename from modules/beast_core/diagnostic/beast_Throw.h
rename to modules/beast_core/diagnostic/Throw.h
index 314c5b1047..e5c86f1b4a 100644
--- a/modules/beast_core/diagnostic/beast_Throw.h
+++ b/modules/beast_core/diagnostic/Throw.h
@@ -31,10 +31,8 @@ extern void breakPoint ();
 };
 
 template <class Exception>
-inline void Throw (Exception const& e, char const* = "", int = 0)
+void Throw (Exception const& e, char const* = "", int = 0)
 {
-    Debug::breakPoint ();
-
     throw e;
 }
 
diff --git a/modules/beast_core/diagnostic/beast_UnitTest.cpp b/modules/beast_core/diagnostic/UnitTest.cpp
similarity index 90%
rename from modules/beast_core/diagnostic/beast_UnitTest.cpp
rename to modules/beast_core/diagnostic/UnitTest.cpp
index b988595746..edcd7a903a 100644
--- a/modules/beast_core/diagnostic/beast_UnitTest.cpp
+++ b/modules/beast_core/diagnostic/UnitTest.cpp
@@ -54,6 +54,11 @@ String const& UnitTest::getPackageName() const noexcept
     return m_packageName;
 }
 
+Journal UnitTest::journal () const
+{
+    return m_runner->journal();
+}
+
 UnitTest::TestList& UnitTest::getAllTests()
 {
     static TestList s_tests;
@@ -69,10 +74,12 @@ void UnitTest::shutdown()
 {
 }
 
-ScopedPointer <UnitTest::Suite>& UnitTest::run (UnitTests* const runner)
+ScopedPointer <UnitTest::Suite>& UnitTest::run (
+    UnitTests* const runner)
 {
     bassert (runner != nullptr);
     m_runner = runner;
+    m_random = m_runner->m_random;
 
     m_suite = new Suite (m_className, m_packageName);
 
@@ -191,6 +198,14 @@ void UnitTest::failException ()
     m_runner->onFailure ();
 }
 
+Random& UnitTest::random()
+{
+    // This method's only valid while the test is being run!
+    bassert (m_runner != nullptr);
+
+    return m_random;
+}
+
 //------------------------------------------------------------------------------
 
 void UnitTest::finishCase ()
@@ -214,8 +229,39 @@ void UnitTest::finishCase ()
 
 //==============================================================================
 
+UnitTests::JournalSink::JournalSink (UnitTests& tests)
+    : m_tests (tests)
+{
+}
+
+void UnitTests::JournalSink::write (Journal::Severity, std::string const& text)
+{
+    m_tests.logMessage (text);
+}
+
+bool UnitTests::JournalSink::active (Journal::Severity)
+{
+    return true;
+}
+
+bool UnitTests::JournalSink::console ()
+{
+    return false;
+}
+
+void UnitTests::JournalSink::set_severity (Journal::Severity)
+{
+}
+
+void UnitTests::JournalSink::set_console (bool)
+{
+}
+
+//==============================================================================
+
 UnitTests::UnitTests()
     : m_assertOnFailure (false)
+    , m_sink (*this)
 {
 }
 
@@ -339,13 +385,17 @@ UnitTests::TestList UnitTests::selectStartupTests (TestList const& tests) const
     return list;
 }
 
-void UnitTests::runSelectedTests (String const& match, TestList const& tests)
+void UnitTests::runSelectedTests (String const& match, TestList const& tests, int64 randomSeed)
 {
-    runTests (selectTests (match, tests));
+    runTests (selectTests (match, tests), randomSeed);
 }
 
-void UnitTests::runTests (TestList const& tests)
+void UnitTests::runTests (TestList const& tests, int64 randomSeed)
 {
+    if (randomSeed == 0)
+        randomSeed = Random().nextInt (0x7fffffff);
+    m_random = Random (randomSeed);
+
     m_results = new Results;
     for (int i = 0; i < tests.size (); ++i)
     {
diff --git a/modules/beast_core/diagnostic/beast_UnitTest.h b/modules/beast_core/diagnostic/UnitTest.h
similarity index 94%
rename from modules/beast_core/diagnostic/beast_UnitTest.h
rename to modules/beast_core/diagnostic/UnitTest.h
index aa5e6a5422..59e5ce7697 100644
--- a/modules/beast_core/diagnostic/beast_UnitTest.h
+++ b/modules/beast_core/diagnostic/UnitTest.h
@@ -170,8 +170,7 @@ public:
         }
     };
 
-    /** The type of a list of tests.
-    */
+    /** The type of a list of tests. */
     typedef Array <UnitTest*, CriticalSection> TestList;
 
     //--------------------------------------------------------------------------
@@ -211,6 +210,9 @@ public:
     /** Returns the run option of the test. */
     When getWhen () const noexcept { return m_when; }
 
+    /** Returns a Journal that logs to the UnitTests. */
+    Journal journal () const;
+
     /** Runs the test, using the specified UnitTests.
         You shouldn't need to call this method directly - use
         UnitTests::runTests() instead.
@@ -311,6 +313,9 @@ public:
 
     void logReport (StringArray const& report);
 
+    /** Returns a shared RNG that all unit tests should use. */
+    Random& random();
+
 private:
     void finishCase ();
 
@@ -322,6 +327,7 @@ private:
     UnitTests* m_runner;
     ScopedPointer <Suite> m_suite;
     ScopedPointer <Case> m_case;
+    Random m_random;
 };
 
 //==============================================================================
@@ -467,13 +473,19 @@ public:
         @param tests An optional parameter containing a list of tests to match.
     */
     void runSelectedTests (String const& match = "",
-                           TestList const& tests = UnitTest::getAllTests ());
+                           TestList const& tests = UnitTest::getAllTests (),
+                           int64 randomSeed = 0);
 
     /** Runs the specified list of tests.
         @note The tests are run regardless of the run settings.
         @param tests The list of tests to run.
     */
-    void runTests (TestList const& tests);
+    void runTests (TestList const& tests, int64 randomSeed = 0);
+
+    Journal journal ()
+    {
+        return Journal (m_sink);
+    }
 
 protected:
     friend class UnitTest;
@@ -501,8 +513,24 @@ private:
     void runTest (UnitTest& test);
 
 private:
+    class JournalSink : public Journal::Sink, public Uncopyable
+    {
+    public:
+        explicit JournalSink (UnitTests& tests);
+        void write (Journal::Severity severity, std::string const& text);
+        bool active (Journal::Severity severity);
+        bool console ();
+        void set_severity (Journal::Severity severity);
+        void set_console (bool);
+
+    private:
+        UnitTests& m_tests;
+    };
+
     bool m_assertOnFailure;
     ScopedPointer <Results> m_results;
+    Random m_random;
+    JournalSink m_sink;
 };
 
 #endif
diff --git a/modules/beast_core/diagnostic/beast_UnitTestUtilities.cpp b/modules/beast_core/diagnostic/UnitTestUtilities.cpp
similarity index 100%
rename from modules/beast_core/diagnostic/beast_UnitTestUtilities.cpp
rename to modules/beast_core/diagnostic/UnitTestUtilities.cpp
diff --git a/modules/beast_core/diagnostic/beast_UnitTestUtilities.h b/modules/beast_core/diagnostic/UnitTestUtilities.h
similarity index 100%
rename from modules/beast_core/diagnostic/beast_UnitTestUtilities.h
rename to modules/beast_core/diagnostic/UnitTestUtilities.h
diff --git a/modules/beast_core/diagnostic/beast_ProtectedCall.cpp b/modules/beast_core/diagnostic/beast_ProtectedCall.cpp
deleted file mode 100644
index 6b40d4bbb0..0000000000
--- a/modules/beast_core/diagnostic/beast_ProtectedCall.cpp
+++ /dev/null
@@ -1,360 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#if 0
-#include <iostream>
-
-//------------------------------------------------------------------------------
-//
-// Windows structured exception handling
-//
-#if BEAST_MSVC
-
-#include <windows.h>
-
-namespace vf
-{
-
-namespace
-{
-
-//
-// While this object is in scope, any Windows SEH
-// exceptions will be caught and re-thrown as an Error object.
-//
-class ScopedPlatformExceptionCatcher : public Uncopyable
-{
-public:
-    ScopedPlatformExceptionCatcher ()
-    {
-        //s_mutex.enter ();
-
-        if (++s_count == 1)
-            s_sehPrev = ::SetUnhandledExceptionFilter (sehFilter);
-
-        //s_mutex.exit ();
-    }
-
-    ~ScopedPlatformExceptionCatcher ()
-    {
-        //s_mutex.enter ();
-
-        if (--s_count == 0)
-            SetUnhandledExceptionFilter (s_sehPrev);
-
-        //s_mutex.exit ();
-    }
-
-    static LONG WINAPI sehFilter (_EXCEPTION_POINTERS* ei)
-    {
-        EXCEPTION_RECORD* er = ei->ExceptionRecord;
-
-        if (er->ExceptionCode == EXCEPTION_BREAKPOINT ||
-                er->ExceptionCode == EXCEPTION_SINGLE_STEP)
-        {
-            // pass through
-        }
-        else
-        {
-            String s;
-
-            switch (er->ExceptionCode)
-            {
-            case EXCEPTION_ACCESS_VIOLATION:
-                s = TRANS ("an access violation occurred");
-                break;
-
-            case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
-                s = TRANS ("array bounds were exceeded");
-                break;
-
-            case EXCEPTION_DATATYPE_MISALIGNMENT:
-                s = TRANS ("memory access was unaligned");
-                break;
-
-            case EXCEPTION_FLT_DENORMAL_OPERAND:
-                s = TRANS ("a floating point operation produced a denormal");
-                break;
-
-            case EXCEPTION_FLT_DIVIDE_BY_ZERO:
-                s = TRANS ("a floating point divide by zero was attempted");
-                break;
-
-            case EXCEPTION_FLT_INEXACT_RESULT:
-                s = TRANS ("the floating point operation was unrepresentable");
-                break;
-
-            case EXCEPTION_FLT_INVALID_OPERATION:
-                s = TRANS ("the floating point operation was invalid");
-                break;
-
-            case EXCEPTION_FLT_OVERFLOW:
-                s = TRANS ("the floating point operation overflowed");
-                break;
-
-            case EXCEPTION_FLT_STACK_CHECK:
-                s = TRANS ("a stack check resulted from a floating point operation");
-                break;
-
-            case EXCEPTION_FLT_UNDERFLOW:
-                s = TRANS ("the floating point operation underflowed");
-                break;
-
-            case EXCEPTION_ILLEGAL_INSTRUCTION:
-                s = TRANS ("an invalid instruction was received");
-                break;
-
-            case EXCEPTION_IN_PAGE_ERROR:
-                s = TRANS ("a virtual paging error occurred");
-                break;
-
-            case EXCEPTION_INT_DIVIDE_BY_ZERO:
-                s = TRANS ("an integer divide by zero was attempted");
-                break;
-
-            case EXCEPTION_INT_OVERFLOW:
-                s = TRANS ("an integer operation overflowed");
-                break;
-
-            case EXCEPTION_INVALID_DISPOSITION:
-                s = TRANS ("the exception handler returned an invalid disposition");
-                break;
-
-            case EXCEPTION_NONCONTINUABLE_EXCEPTION:
-                s = TRANS ("a non-continuable exception occurred");
-                break;
-
-            case EXCEPTION_PRIV_INSTRUCTION:
-                s = TRANS ("a privileged instruction was attempted");
-                break;
-
-            case EXCEPTION_STACK_OVERFLOW:
-                s = TRANS ("the stack overflowed");
-                break;
-
-            default:
-                s = TRANS ("an unknown system exception of code ");
-                s << String ((unsigned int)er->ExceptionCode);
-                s << " " << TRANS ("occurred");
-                break;
-            }
-
-            Throw (Error ().fail (__FILE__, __LINE__, s, Error::platform));
-        }
-
-        return s_sehPrev (ei);
-    }
-
-private:
-    static int s_count;
-    static CriticalSection s_mutex;
-    static LPTOP_LEVEL_EXCEPTION_FILTER s_sehPrev;
-};
-
-CriticalSection ScopedPlatformExceptionCatcher::s_mutex;
-int ScopedPlatformExceptionCatcher::s_count = 0;
-LPTOP_LEVEL_EXCEPTION_FILTER ScopedPlatformExceptionCatcher::s_sehPrev = 0;
-
-}
-
-}
-
-//------------------------------------------------------------------------------
-
-#else
-
-// TODO: POSIX SIGNAL HANDLER
-
-#pragma message(BEAST_FILEANDLINE_ "Missing class ScopedPlatformExceptionCatcher")
-
-namespace vf
-{
-
-namespace
-{
-
-class ScopedPlatformExceptionCatcher
-{
-public:
-    // Missing
-};
-
-}
-
-END_BEAST_NAMESPACE
-
-#endif
-
-#endif
-
-//------------------------------------------------------------------------------
-
-#if 0
-bool CatchAny (Function <void (void)> f, bool returnFromException)
-{
-    bool caughtException = true; // assume the worst
-
-    try
-    {
-        //ScopedPlatformExceptionCatcher platformExceptionCatcher;
-
-        f ();
-
-        caughtException = false;
-    }
-    catch (Error& e)
-    {
-        if (!returnFromException)
-        {
-            JUCEApplication* app = JUCEApplication::getInstance ();
-
-            if (app)
-            {
-                app->unhandledException (
-                    &e,
-                    e.getSourceFilename (),
-                    e.getLineNumber ());
-            }
-            else
-            {
-                std::cout << e.what ();
-                std::unexpected ();
-            }
-        }
-    }
-    catch (std::exception& e)
-    {
-        if (!returnFromException)
-        {
-            JUCEApplication* app = JUCEApplication::getInstance ();
-
-            if (app)
-            {
-                app->unhandledException (&e, __FILE__, __LINE__);
-            }
-            else
-            {
-                std::cout << e.what ();
-                std::unexpected ();
-            }
-        }
-    }
-    catch (...)
-    {
-        if (!returnFromException)
-        {
-            JUCEApplication* app = JUCEApplication::getInstance ();
-
-            if (app)
-            {
-                app->unhandledException (0, __FILE__, __LINE__);
-            }
-            else
-            {
-                std::unexpected ();
-            }
-        }
-    }
-    return caughtException;
-}
-#endif
-
-//------------------------------------------------------------------------------
-
-class ProtectedCall::DefaultHandler : public Handler
-{
-public:
-    void onException (Exception const&) const
-    {
-        ScopedLockType lock (s_mutex);
-        fatal_error ("An unhandled exception was thrown");
-    }
-
-private:
-    typedef CriticalSection LockType;
-    typedef CriticalSection::ScopedLockType ScopedLockType;
-
-    static LockType s_mutex;
-};
-
-ProtectedCall::DefaultHandler::LockType ProtectedCall::DefaultHandler::s_mutex;
-
-//------------------------------------------------------------------------------
-
-Static::Storage <Atomic <ProtectedCall::Handler const*>, ProtectedCall>
-    ProtectedCall::s_handler;
-
-void ProtectedCall::setHandler (Handler const& handler)
-{
-    s_handler->set (&handler);
-}
-
-void ProtectedCall::call (Call& c)
-{
-    static DefaultHandler defaultHandler;
-
-    Handler const* handler = s_handler->get ();
-
-    if (handler == nullptr)
-        handler = &defaultHandler;
-
-#if BEAST_CATCH_UNHANDLED_EXCEPTIONS
-    try
-    {
-        c ();
-    }
-    catch (...)
-    {
-        Exception e;
-
-        handler->onException (e);
-    }
-
-#else
-    c ();
-
-#endif
-}
-
-//------------------------------------------------------------------------------
-
-class ProtectedCallTests : public UnitTest
-{
-public:
-    ProtectedCallTests () : UnitTest ("ProtectedCall", "beast", runManual)
-    {
-    }
-
-    void testThrow ()
-    {
-        throw std::runtime_error ("uncaught exception");
-    }
-
-    void runTest ()
-    {
-        beginTestCase ("throw");
-
-        ProtectedCall (&ProtectedCallTests::testThrow, this);
-
-        // If we get here then we failed
-        fail ();
-    }
-};
-
-static ProtectedCallTests protectedCallTests;
diff --git a/modules/beast_core/diagnostic/beast_ProtectedCall.h b/modules/beast_core/diagnostic/beast_ProtectedCall.h
deleted file mode 100644
index 8d5533633d..0000000000
--- a/modules/beast_core/diagnostic/beast_ProtectedCall.h
+++ /dev/null
@@ -1,147 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_PROTECTEDCALL_H_INCLUDED
-#define BEAST_PROTECTEDCALL_H_INCLUDED
-
-/** Call a function in a protected exception context.
-
-    This is for intercepting unhandled exceptions, reporting on the extended
-    information provided by @ref Throw, and calling a customizable unhandled
-    exception callback. Some implementations will also catch native exceptions
-    such as memory violations or segmentation faults.
-
-    An unhandled exception should terminate the process with a non zero
-    return code.
-
-    To use this, construct an instance with your funtion and arguments as
-    parameters. For example:
-
-    @code
-
-    extern void funcThatMightThrow (int numberOfTimes);
-
-    ProtectedCall (&funcThatMightThrow, 3);
-
-    @endcode
-
-    Every Beast Thread object's @ref Thread::run method is wrapped in a
-    @ProtectedCall
-
-    @see Thread, Throw
-*/
-class ProtectedCall
-{
-public:
-    struct Exception
-    {
-    };
-
-    /** This receives the unhandled exception. */
-    struct Handler
-    {
-        /** Called when an uhandled exception is thrown.
-
-            @note This can be called from multiple threads, which is
-                  why it is const.
-        */
-        virtual void onException (Exception const& e) const = 0;
-    };
-
-    /** The default handler writes to std::cerr makes the process exit. */
-    class DefaultHandler;
-
-    static void setHandler (Handler const& handler);
-
-public:
-#if BEAST_VARIADIC_MAX >= 1
-    template <class Fn>
-    explicit ProtectedCall (Fn f)
-    { callf (functional::bind (f)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 2
-    template <class Fn, class T1>
-    ProtectedCall (Fn f, T1 t1)
-    { callf  (functional::bind (f, t1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 3
-    template <class Fn, class T1, class T2>
-    ProtectedCall (Fn f, T1 t1, T2 t2)
-    { callf  (functional::bind (f, t1, t2)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 4
-    template <class Fn, class T1, class T2, class T3>
-    ProtectedCall (Fn f, T1 t1, T2 t2, T3 t3)
-    { callf  (functional::bind (f, t1, t2, t3)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 5
-    template <class Fn, class T1, class T2, class T3, class T4>
-    ProtectedCall (Fn f, T1 t1, T2 t2, T3 t3, T4 t4)
-    { callf  (functional::bind (f, t1, t2, t3, t4)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 6
-    template <class Fn, class T1, class T2, class T3, class T4, class T5>
-    ProtectedCall (Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
-    { callf  (functional::bind (f, t1, t2, t3, t4, t5)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 7
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6>
-    ProtectedCall (Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
-    { callf  (functional::bind (f, t1, t2, t3, t4, t5, t6)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 8
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-    ProtectedCall (Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
-    { callf  (functional::bind (f, t1, t2, t3, t4, t5, t6, t7)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 9
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-    ProtectedCall (Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
-    { callf  (functional::bind (f, t1, t2, t3, t4, t5, t6, t7, t8)); }
-#endif
-
-private:
-    typedef SharedFunction <void (void)> FunctionType;
-    typedef FunctionType::Call Call;
-
-    template <class Function>
-    void callf (Function f)
-    {
-        //CallType <Functor> wrapper (f);
-        FunctionType::CallType <Function> wrapper (
-            BEAST_MOVE_CAST(Function)(f));
-
-        call (wrapper);
-    }
-
-    void call (Call& call);
-
-private:
-    static Static::Storage <Atomic <Handler const*>, ProtectedCall> s_handler;
-};
-
-#endif
diff --git a/modules/beast_core/files/beast_DirectoryIterator.cpp b/modules/beast_core/files/DirectoryIterator.cpp
similarity index 100%
rename from modules/beast_core/files/beast_DirectoryIterator.cpp
rename to modules/beast_core/files/DirectoryIterator.cpp
diff --git a/modules/beast_core/files/beast_DirectoryIterator.h b/modules/beast_core/files/DirectoryIterator.h
similarity index 100%
rename from modules/beast_core/files/beast_DirectoryIterator.h
rename to modules/beast_core/files/DirectoryIterator.h
diff --git a/modules/beast_core/files/beast_File.cpp b/modules/beast_core/files/File.cpp
similarity index 99%
rename from modules/beast_core/files/beast_File.cpp
rename to modules/beast_core/files/File.cpp
index 319f4ab965..9717dca5da 100644
--- a/modules/beast_core/files/beast_File.cpp
+++ b/modules/beast_core/files/File.cpp
@@ -24,20 +24,15 @@
 // We need to make a shared singleton or else there are
 // issues with the leak detector and order of detruction.
 //
-class NonexistentHolder : public SharedSingleton <NonexistentHolder>
+class NonexistentHolder
 {
 public:
-    NonexistentHolder ()
-        : SharedSingleton <NonexistentHolder> (SingletonLifetime::persistAfterCreation)
+    static NonexistentHolder* getInstance()
     {
+        return SharedSingleton <NonexistentHolder>::getInstance();
     }
 
-    static NonexistentHolder* createInstance ()
-    {
-        return new NonexistentHolder;
-    }
-
-    File const file;
+    File file;
 };
 
 File const& File::nonexistent ()
diff --git a/modules/beast_core/files/beast_File.h b/modules/beast_core/files/File.h
similarity index 100%
rename from modules/beast_core/files/beast_File.h
rename to modules/beast_core/files/File.h
diff --git a/modules/beast_core/files/beast_FileInputStream.cpp b/modules/beast_core/files/FileInputStream.cpp
similarity index 100%
rename from modules/beast_core/files/beast_FileInputStream.cpp
rename to modules/beast_core/files/FileInputStream.cpp
diff --git a/modules/beast_core/files/beast_FileInputStream.h b/modules/beast_core/files/FileInputStream.h
similarity index 100%
rename from modules/beast_core/files/beast_FileInputStream.h
rename to modules/beast_core/files/FileInputStream.h
diff --git a/modules/beast_core/files/beast_FileOutputStream.cpp b/modules/beast_core/files/FileOutputStream.cpp
similarity index 100%
rename from modules/beast_core/files/beast_FileOutputStream.cpp
rename to modules/beast_core/files/FileOutputStream.cpp
diff --git a/modules/beast_core/files/beast_FileOutputStream.h b/modules/beast_core/files/FileOutputStream.h
similarity index 100%
rename from modules/beast_core/files/beast_FileOutputStream.h
rename to modules/beast_core/files/FileOutputStream.h
diff --git a/modules/beast_core/files/beast_FileSearchPath.cpp b/modules/beast_core/files/FileSearchPath.cpp
similarity index 100%
rename from modules/beast_core/files/beast_FileSearchPath.cpp
rename to modules/beast_core/files/FileSearchPath.cpp
diff --git a/modules/beast_core/files/beast_FileSearchPath.h b/modules/beast_core/files/FileSearchPath.h
similarity index 100%
rename from modules/beast_core/files/beast_FileSearchPath.h
rename to modules/beast_core/files/FileSearchPath.h
diff --git a/modules/beast_core/files/beast_MemoryMappedFile.h b/modules/beast_core/files/MemoryMappedFile.h
similarity index 100%
rename from modules/beast_core/files/beast_MemoryMappedFile.h
rename to modules/beast_core/files/MemoryMappedFile.h
diff --git a/modules/beast_core/files/beast_RandomAccessFile.cpp b/modules/beast_core/files/RandomAccessFile.cpp
similarity index 100%
rename from modules/beast_core/files/beast_RandomAccessFile.cpp
rename to modules/beast_core/files/RandomAccessFile.cpp
diff --git a/modules/beast_core/files/beast_RandomAccessFile.h b/modules/beast_core/files/RandomAccessFile.h
similarity index 100%
rename from modules/beast_core/files/beast_RandomAccessFile.h
rename to modules/beast_core/files/RandomAccessFile.h
diff --git a/modules/beast_core/files/beast_TemporaryFile.cpp b/modules/beast_core/files/TemporaryFile.cpp
similarity index 100%
rename from modules/beast_core/files/beast_TemporaryFile.cpp
rename to modules/beast_core/files/TemporaryFile.cpp
diff --git a/modules/beast_core/files/beast_TemporaryFile.h b/modules/beast_core/files/TemporaryFile.h
similarity index 100%
rename from modules/beast_core/files/beast_TemporaryFile.h
rename to modules/beast_core/files/TemporaryFile.h
diff --git a/modules/beast_core/functional/SharedFunction.h b/modules/beast_core/functional/SharedFunction.h
deleted file mode 100644
index 9f2b416139..0000000000
--- a/modules/beast_core/functional/SharedFunction.h
+++ /dev/null
@@ -1,99 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_CORE_SHAREDFUNCTION_H_INCLUDED
-#define BEAST_CORE_SHAREDFUNCTION_H_INCLUDED
-
-/** A reference counted, abstract function object.
-*/
-template <typename Signature, class Allocator = std::allocator <char> >
-class SharedFunction;
-
-// nullary function
-//
-template <typename R, class A>
-class SharedFunction <R (void), A>
-{
-public:
-    class Call : public SharedObject
-    {
-    public:
-        virtual R operator() () = 0;
-    };
-
-    template <typename F>
-    class CallType : public Call
-    {
-    public:
-        typedef typename A:: template rebind <CallType <F> >::other Allocator;
-
-        CallType (BEAST_MOVE_ARG(F) f, A a = A ())
-            : m_f (BEAST_MOVE_CAST(F)(f))
-            , m_a (a)
-        {
-        }
-
-        R operator() ()
-        {
-            return m_f ();
-        }
-
-    private:
-        F m_f;
-        Allocator m_a;
-    };
-
-    //--------------------------------------------------------------------------
-
-    template <typename F>
-    SharedFunction (F f, A a = A ())
-        : m_ptr (::new (
-            typename CallType <F>::Allocator (a)
-                .allocate (sizeof (CallType <F>)))
-                    CallType <F> (BEAST_MOVE_CAST(F)(f), a))
-    {
-    }
-
-    SharedFunction (SharedFunction const& other)
-        : m_ptr (other.m_ptr)
-    {
-    }
-
-    SharedFunction (SharedFunction const& other, A)
-        : m_ptr (other.m_ptr)
-    {
-    }
-
-    SharedFunction& operator= (SharedFunction const& other)
-    {
-        m_ptr = other.m_ptr;
-        return *this;
-    }
-
-    R operator() ()
-    {
-        return (*m_ptr)();
-    }
-
-private:
-    SharedPtr <Call> m_ptr;
-};
-
-
-#endif
diff --git a/modules/beast_core/functional/beast_Function.h b/modules/beast_core/functional/beast_Function.h
deleted file mode 100644
index bf3653d994..0000000000
--- a/modules/beast_core/functional/beast_Function.h
+++ /dev/null
@@ -1,266 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_FUNCTION_H_INCLUDED
-#define BEAST_FUNCTION_H_INCLUDED
-
-//
-// Strong replacement for boost::function:
-//
-// #1 Bounded memory requirement, avoids the free store.
-//
-// #2 Always refers to a functor (i.e. is never invalid)
-//
-// #3 Default value (None) is a function that
-//    returns a default object (the result type
-//    constructed with a default constructor).
-//
-
-template <typename Signature, int Bytes = 128>
-class Function;
-
-//
-// nullary function
-//
-
-template <typename R, int Bytes>
-class Function <R (void), Bytes>
-{
-public:
-    typedef R result_type;
-    typedef Function self_type;
-
-    struct None
-    {
-        typedef R result_type;
-        result_type operator () () const
-        {
-            return result_type ();
-        }
-    };
-
-    Function ()
-    {
-        constructCopyOf (None ());
-    }
-
-    Function (Function const& f)
-    {
-        f.getCall ().constructCopyInto (m_storage);
-    }
-
-    template <class Functor>
-    Function (Functor const& f)
-    {
-        constructCopyOf (f);
-    }
-
-    ~Function ()
-    {
-        getCall ().~Call ();
-    }
-
-    Function& operator= (Function const& f)
-    {
-        getCall ().~Call ();
-        f.getCall ().constructCopyInto (m_storage);
-        return *this;
-    }
-
-    template <class Functor>
-    Function& operator= (Functor const& f)
-    {
-        getCall ().~Call ();
-        constructCopyOf (f);
-        return *this;
-    }
-
-    result_type operator () ()
-    {
-        return getCall ().operator () ();
-    }
-
-private:
-    template <class Functor>
-    void constructCopyOf (Functor const& f)
-    {
-        // If this generates a compile error it means that
-        // the functor is too large for the static buffer.
-        // Increase the storage template parameter until
-        // the error message goes away. This might cause
-        // changes throughout the application with other
-        // template classes that depend on the size.
-        static_bassert (sizeof (StoredCall <Functor>) <= Bytes);
-        new (m_storage) StoredCall <Functor> (f);
-    }
-
-private:
-    struct Call
-    {
-        virtual ~Call () {}
-        virtual void constructCopyInto (void* p) const = 0;
-        virtual result_type operator () () = 0;
-    };
-
-    template <class Functor>
-    struct StoredCall : Call
-    {
-        explicit StoredCall (Functor const& f) : m_f (f) { }
-        StoredCall (const StoredCall& c) : m_f (c.m_f) { }
-        void constructCopyInto (void* p) const
-        {
-            new (p) StoredCall (m_f);
-        }
-        result_type operator () ()
-        {
-            return m_f ();
-        }
-    private:
-        Functor m_f;
-    };
-
-    Call& getCall ()
-    {
-        return *reinterpret_cast <Call*> (&m_storage[0]);
-    }
-
-    Call const& getCall () const
-    {
-        return *reinterpret_cast <Call const*> (&m_storage[0]);
-    }
-
-    char m_storage [Bytes]; // should be enough
-};
-
-//------------------------------------------------------------------------------
-
-//
-// unary function
-//
-
-template <typename R, typename T1, int Bytes>
-class Function <R (T1 t1), Bytes>
-{
-public:
-    typedef R result_type;
-    typedef Function self_type;
-
-    struct None
-    {
-        typedef R result_type;
-        result_type operator () (T1) const
-        {
-            return result_type ();
-        }
-    };
-
-    Function ()
-    {
-        constructCopyOf (None ());
-    }
-
-    Function (const Function& f)
-    {
-        f.getCall ().constructCopyInto (m_storage);
-    }
-
-    template <class Functor>
-    Function (Functor const& f)
-    {
-        constructCopyOf (f);
-    }
-
-    ~Function ()
-    {
-        getCall ().~Call ();
-    }
-
-    Function& operator= (const Function& f)
-    {
-        getCall ().~Call ();
-        f.getCall ().constructCopyInto (m_storage);
-        return *this;
-    }
-
-    template <class Functor>
-    Function& operator= (Functor const& f)
-    {
-        getCall ().~Call ();
-        constructCopyOf (f);
-        return *this;
-    }
-
-    result_type operator () (T1 t1)
-    {
-        return getCall ().operator () (t1);
-    }
-
-private:
-    template <class Functor>
-    void constructCopyOf (Functor const& f)
-    {
-        // If this generates a compile error it means that
-        // the functor is too large for the static buffer.
-        // Increase the storage template parameter until
-        // the error message goes away. This might cause
-        // changes throughout the application with other
-        // template classes that depend on the size.
-        static_bassert (sizeof (StoredCall <Functor>) <= Bytes);
-        new (m_storage) StoredCall <Functor> (f);
-    }
-
-private:
-    struct Call
-    {
-        virtual ~Call () {}
-        virtual void constructCopyInto (void* p) const = 0;
-        virtual result_type operator () (T1 t1) = 0;
-    };
-
-    template <class Functor>
-    struct StoredCall : Call
-    {
-        explicit StoredCall (Functor const& f) : m_f (f) { }
-        StoredCall (const StoredCall& c) : m_f (c.m_f) { }
-        void constructCopyInto (void* p) const
-        {
-            new (p) StoredCall (m_f);
-        }
-        result_type operator () (T1 t1)
-        {
-            return m_f (t1);
-        }
-    private:
-        Functor m_f;
-    };
-
-    Call& getCall ()
-    {
-        return *reinterpret_cast <Call*> (&m_storage[0]);
-    }
-
-    Call const& getCall () const
-    {
-        return *reinterpret_cast <Call const*> (&m_storage[0]);
-    }
-
-    char m_storage [Bytes]; // should be enough
-};
-
-#endif
diff --git a/modules/beast_core/json/beast_JSON.cpp b/modules/beast_core/json/JSON.cpp
similarity index 100%
rename from modules/beast_core/json/beast_JSON.cpp
rename to modules/beast_core/json/JSON.cpp
diff --git a/modules/beast_core/json/beast_JSON.h b/modules/beast_core/json/JSON.h
similarity index 100%
rename from modules/beast_core/json/beast_JSON.h
rename to modules/beast_core/json/JSON.h
diff --git a/modules/beast_core/logging/beast_FileLogger.cpp b/modules/beast_core/logging/FileLogger.cpp
similarity index 100%
rename from modules/beast_core/logging/beast_FileLogger.cpp
rename to modules/beast_core/logging/FileLogger.cpp
diff --git a/modules/beast_core/logging/beast_FileLogger.h b/modules/beast_core/logging/FileLogger.h
similarity index 100%
rename from modules/beast_core/logging/beast_FileLogger.h
rename to modules/beast_core/logging/FileLogger.h
diff --git a/modules/beast_core/logging/beast_Logger.cpp b/modules/beast_core/logging/Logger.cpp
similarity index 95%
rename from modules/beast_core/logging/beast_Logger.cpp
rename to modules/beast_core/logging/Logger.cpp
index d8ac98e66d..06d252f42a 100644
--- a/modules/beast_core/logging/beast_Logger.cpp
+++ b/modules/beast_core/logging/Logger.cpp
@@ -44,7 +44,7 @@ void Logger::writeToLog (const String& message)
 }
 
 #if BEAST_LOG_ASSERTIONS || BEAST_DEBUG
-void BEAST_API BEAST_CALLTYPE logAssertion (const char* const filename, const int lineNum) noexcept
+void logAssertion (const char* const filename, const int lineNum) noexcept
 {
     String m ("BEAST Assertion failure in ");
     m << File::createFileWithoutCheckingPath (filename).getFileName() << ':' << lineNum;
diff --git a/modules/beast_core/logging/beast_Logger.h b/modules/beast_core/logging/Logger.h
similarity index 97%
rename from modules/beast_core/logging/beast_Logger.h
rename to modules/beast_core/logging/Logger.h
index f7336c4e0b..a9935d5f77 100644
--- a/modules/beast_core/logging/beast_Logger.h
+++ b/modules/beast_core/logging/Logger.h
@@ -69,7 +69,7 @@ public:
     /** Writes a message to the standard error stream.
 
         This can be called directly, or by using the DBG() macro in
-        PlatformDefs.h (which will avoid calling the method in non-debug builds).
+        CompilerConfig.h (which will avoid calling the method in non-debug builds).
     */
     static void BEAST_CALLTYPE outputDebugString (const String& text);
 
diff --git a/modules/beast_core/maths/beast_BigInteger.cpp b/modules/beast_core/maths/BigInteger.cpp
similarity index 100%
rename from modules/beast_core/maths/beast_BigInteger.cpp
rename to modules/beast_core/maths/BigInteger.cpp
diff --git a/modules/beast_core/maths/beast_BigInteger.h b/modules/beast_core/maths/BigInteger.h
similarity index 100%
rename from modules/beast_core/maths/beast_BigInteger.h
rename to modules/beast_core/maths/BigInteger.h
diff --git a/modules/beast_core/maths/beast_Expression.cpp b/modules/beast_core/maths/Expression.cpp
similarity index 100%
rename from modules/beast_core/maths/beast_Expression.cpp
rename to modules/beast_core/maths/Expression.cpp
diff --git a/modules/beast_core/maths/beast_Expression.h b/modules/beast_core/maths/Expression.h
similarity index 100%
rename from modules/beast_core/maths/beast_Expression.h
rename to modules/beast_core/maths/Expression.h
diff --git a/modules/beast_core/maths/beast_Interval.h b/modules/beast_core/maths/Interval.h
similarity index 100%
rename from modules/beast_core/maths/beast_Interval.h
rename to modules/beast_core/maths/Interval.h
diff --git a/modules/beast_core/maths/beast_Math.h b/modules/beast_core/maths/Math.h
similarity index 100%
rename from modules/beast_core/maths/beast_Math.h
rename to modules/beast_core/maths/Math.h
diff --git a/modules/beast_core/maths/beast_MurmurHash.cpp b/modules/beast_core/maths/MurmurHash.cpp
similarity index 100%
rename from modules/beast_core/maths/beast_MurmurHash.cpp
rename to modules/beast_core/maths/MurmurHash.cpp
diff --git a/modules/beast_core/maths/beast_MurmurHash.h b/modules/beast_core/maths/MurmurHash.h
similarity index 86%
rename from modules/beast_core/maths/beast_MurmurHash.h
rename to modules/beast_core/maths/MurmurHash.h
index 9ed0b0c582..7cdf570f7b 100644
--- a/modules/beast_core/maths/beast_MurmurHash.h
+++ b/modules/beast_core/maths/MurmurHash.h
@@ -44,11 +44,27 @@ inline void Hash (const void* key, int len, uint32 seed, HashType* out)
         break;
 
 #if BEAST_64BIT
+    case 64:
+        {
+            HashType tmp[2];
+            MurmurHash3_x64_128 (key, len, seed, &tmp[0]);
+            *out = tmp[0];
+        }
+        break;
+
     case 128:
         MurmurHash3_x64_128 (key, len, seed, out);
         break;
 
 #else
+    case 64:
+        {
+            HashType tmp[2];
+            MurmurHash3_x86_128 (key, len, seed, &tmp[0]);
+            *out = tmp[0];
+        }
+        break;
+
     case 128:
         MurmurHash3_x86_128 (key, len, seed, out);
         break;
diff --git a/modules/beast_core/maths/beast_Random.cpp b/modules/beast_core/maths/Random.cpp
similarity index 100%
rename from modules/beast_core/maths/beast_Random.cpp
rename to modules/beast_core/maths/Random.cpp
diff --git a/modules/beast_core/maths/beast_Random.h b/modules/beast_core/maths/Random.h
similarity index 99%
rename from modules/beast_core/maths/beast_Random.h
rename to modules/beast_core/maths/Random.h
index ff6df7e58b..88af60b485 100644
--- a/modules/beast_core/maths/beast_Random.h
+++ b/modules/beast_core/maths/Random.h
@@ -30,7 +30,7 @@
 
     You can create a Random object and use it to generate a sequence of random numbers.
 */
-class BEAST_API Random : LeakChecked <Random>
+class Random
 {
 public:
     //==============================================================================
diff --git a/modules/beast_core/maths/beast_Range.h b/modules/beast_core/maths/Range.h
similarity index 100%
rename from modules/beast_core/maths/beast_Range.h
rename to modules/beast_core/maths/Range.h
diff --git a/modules/beast_core/maths/beast_uint24.h b/modules/beast_core/maths/uint24.h
similarity index 100%
rename from modules/beast_core/maths/beast_uint24.h
rename to modules/beast_core/maths/uint24.h
diff --git a/modules/beast_core/memory/beast_AtomicCounter.h b/modules/beast_core/memory/AtomicCounter.h
similarity index 100%
rename from modules/beast_core/memory/beast_AtomicCounter.h
rename to modules/beast_core/memory/AtomicCounter.h
diff --git a/modules/beast_core/memory/beast_AtomicFlag.h b/modules/beast_core/memory/AtomicFlag.h
similarity index 100%
rename from modules/beast_core/memory/beast_AtomicFlag.h
rename to modules/beast_core/memory/AtomicFlag.h
diff --git a/modules/beast_core/memory/beast_AtomicPointer.h b/modules/beast_core/memory/AtomicPointer.h
similarity index 100%
rename from modules/beast_core/memory/beast_AtomicPointer.h
rename to modules/beast_core/memory/AtomicPointer.h
diff --git a/modules/beast_core/memory/beast_AtomicState.h b/modules/beast_core/memory/AtomicState.h
similarity index 100%
rename from modules/beast_core/memory/beast_AtomicState.h
rename to modules/beast_core/memory/AtomicState.h
diff --git a/modules/beast_core/memory/beast_CacheLine.h b/modules/beast_core/memory/CacheLine.h
similarity index 73%
rename from modules/beast_core/memory/beast_CacheLine.h
rename to modules/beast_core/memory/CacheLine.h
index dea39ebbb4..fbc9c1914e 100644
--- a/modules/beast_core/memory/beast_CacheLine.h
+++ b/modules/beast_core/memory/CacheLine.h
@@ -30,10 +30,7 @@ namespace CacheLine
 
 #if GLOBAL_PADDING_ENABLED
 
-// Pads an object so that it starts on a cache line boundary.
-//
 /** Pad an object to start on a cache line boundary.
-
     Up to 8 constructor parameters are passed through.
 */
 template <typename T>
@@ -42,83 +39,83 @@ class Aligned
 public:
     Aligned ()
     {
-        new (ptr ()) T;
+        new (&get()) T;
     }
 
     template <class T1>
     Aligned (T1 t1)
     {
-        new (ptr ()) T (t1);
+        new (&get()) T (t1);
     }
 
     template <class T1, class T2>
     Aligned (T1 t1, T2 t2)
     {
-        new (ptr ()) T (t1, t2);
+        new (&get()) T (t1, t2);
     }
 
     template <class T1, class T2, class T3>
     Aligned (T1 t1, T2 t2, T3 t3)
     {
-        new (ptr ()) T (t1, t2, t3);
+        new (&get()) T (t1, t2, t3);
     }
 
     template <class T1, class T2, class T3, class T4>
     Aligned (T1 t1, T2 t2, T3 t3, T4 t4)
     {
-        new (ptr ()) T (t1, t2, t3, t4);
+        new (&get()) T (t1, t2, t3, t4);
     }
 
     template <class T1, class T2, class T3, class T4, class T5>
     Aligned (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
     {
-        new (ptr ()) T (t1, t2, t3, t4, t5);
+        new (&get()) T (t1, t2, t3, t4, t5);
     }
 
     template <class T1, class T2, class T3, class T4, class T5, class T6>
     Aligned (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
     {
-        new (ptr ()) T (t1, t2, t3, t4, t5, t6);
+        new (&get()) T (t1, t2, t3, t4, t5, t6);
     }
 
     template <class T1, class T2, class T3, class T4, class T5, class T6, class T7>
     Aligned (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
     {
-        new (ptr ()) T (t1, t2, t3, t4, t5, t6, t7);
+        new (&get()) T (t1, t2, t3, t4, t5, t6, t7);
     }
 
     template <class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
     Aligned (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
     {
-        new (ptr ()) T (t1, t2, t3, t4, t5, t6, t7, t8);
+        new (&get()) T (t1, t2, t3, t4, t5, t6, t7, t8);
     }
 
     ~Aligned ()
     {
-        ptr ()->~T ();
+        get().~T ();
     }
 
     T& operator= (T const& other)
     {
-        *ptr () = other;
-        return *ptr ();
+        return (get() = other);
     }
 
-    inline T& operator*  () noexcept { return *ptr (); }
-    inline T* operator-> () noexcept { return  ptr (); }
-    inline operator T&   () noexcept { return *ptr (); }
-    inline operator T*   () noexcept { return  ptr (); }
-
-    inline const T& operator*  () const noexcept { return *ptr (); }
-    inline const T* operator-> () const noexcept { return  ptr (); }
-    inline operator T const&   () const noexcept { return *ptr (); }
-    inline operator T const*   () const noexcept { return  ptr (); }
+    T& get () noexcept { return *ptr(); }
+    T& operator*  () noexcept { return  get(); }
+    T* operator-> () noexcept { return &get(); }
+    operator T&   () noexcept { return  get(); }
+    operator T*   () noexcept { return &get(); }
+    T const& get () const noexcept { return *ptr(); }
+    const T& operator*  () const noexcept { return  get(); }
+    const T* operator-> () const noexcept { return &get(); }
+    operator T const&   () const noexcept { return  get(); }
+    operator T const*   () const noexcept { return &get(); }
 
 private:
-    inline T* ptr () noexcept
+    T* ptr () const noexcept
     {
         return (T*) ((uintptr_t (m_storage) + Memory::cacheLineAlignMask)
-        & ~Memory::cacheLineAlignMask);
+            & ~Memory::cacheLineAlignMask);
         /*
         return reinterpret_cast <T*> (Memory::pointerAdjustedForAlignment (
                                       m_storage, Memory::cacheLineBytes));
@@ -128,8 +125,9 @@ private:
     char m_storage [ (sizeof (T) + Memory::cacheLineAlignMask) & ~Memory::cacheLineAlignMask];
 };
 
-/** End-pads an object to completely fill straddling CPU cache lines.
+//------------------------------------------------------------------------------
 
+/** End-pads an object to completely fill straddling CPU cache lines.
     The caller must ensure that this object starts at the beginning
     of a cache line.
 */
@@ -195,15 +193,16 @@ public:
         return m_t;
     }
 
-    T& operator*  () noexcept { return m_t; }
-    T* operator-> () noexcept { return &m_t; }
-    operator T&   () noexcept { return m_t; }
-    operator T*   () noexcept { return &m_t; }
-
-    const T& operator*  () const noexcept { return  m_t; }
-    const T* operator-> () const noexcept { return &m_t; }
-    operator T const&   () const noexcept { return  m_t; }
-    operator T const*   () const noexcept { return &m_t; }
+    T& get() noexcept { return m_t;}
+    T& operator*  () noexcept { return  get(); }
+    T* operator-> () noexcept { return &get(); }
+    operator T&   () noexcept { return  get(); }
+    operator T*   () noexcept { return &get(); }
+    T const& get () const noexcept { return m_t; }
+    const T& operator*  () const noexcept { return  get(); }
+    const T* operator-> () const noexcept { return &get(); }
+    operator T const&   () const noexcept { return  get(); }
+    operator T const*   () const noexcept { return &get(); }
 
 private:
     T m_t;
@@ -257,32 +256,21 @@ public:
               const T5& t5, const T6& t6, const T7& t7, const T8& t8)
         : m_t (t1, t2, t3, t4, t5, t6, t7, t8) { }
 
-    void operator= (const T& other)
+    T& operator= (const T& other)
     {
-        m_t = other;
+        reutrn (m_t = other);
     }
 
-    T& operator*  () noexcept { return  m_t; }
-    T* operator-> () noexcept { return &m_t; }
-    operator T&   () noexcept { return  m_t; }
-    operator T*   () noexcept { return &m_t; }
-
-    const T& operator*  () const noexcept
-    {
-        return  m_t;
-    }
-    const T* operator-> () const noexcept
-    {
-        return &m_t;
-    }
-    operator const T&   () const noexcept
-    {
-        return  m_t;
-    }
-    operator const T*   () const noexcept
-    {
-        return &m_t;
-    }
+    T& get () noexcept { return m_t; }
+    T& operator*  () noexcept { return  get(); }
+    T* operator-> () noexcept { return &get(); }
+    operator T&   () noexcept { return  get(); }
+    operator T*   () noexcept { return &get(); }
+    T const& get () const noexcept { return m_t; }
+    const T& operator*  () const noexcept { return  get(); }
+    const T* operator-> () const noexcept { return &get(); }
+    operator T const&   () const noexcept { return  get(); }
+    operator T const*   () const noexcept { return &get(); }
 
 private:
     T m_t;
@@ -338,27 +326,16 @@ public:
         m_t = other;
     }
 
-    T& operator*  () noexcept { return  m_t; }
-    T* operator-> () noexcept { return &m_t; }
-    operator T&   () noexcept { return  m_t; }
-    operator T*   () noexcept { return &m_t; }
-
-    const T& operator*  () const noexcept
-    {
-        return  m_t;
-    }
-    const T* operator-> () const noexcept
-    {
-        return &m_t;
-    }
-    operator const T&   () const noexcept
-    {
-        return  m_t;
-    }
-    operator const T*   () const noexcept
-    {
-        return &m_t;
-    }
+    T& get () noexcept { return m_t; }
+    T& operator*  () noexcept { return  get(); }
+    T* operator-> () noexcept { return &get(); }
+    operator T&   () noexcept { return  get(); }
+    operator T*   () noexcept { return &get(); }
+    T const& get () const noexcept { return m_t; }
+    const T& operator*  () const noexcept { return  get(); }
+    const T* operator-> () const noexcept { return &get(); }
+    operator T const&   () const noexcept { return  get(); }
+    operator T const*   () const noexcept { return &get(); }
 
 private:
     T m_t;
@@ -415,44 +392,21 @@ public:
               const T5& t5, const T6& t6, const T7& t7, const T8& t8)
         : m_t (t1, t2, t3, t4, t5, t6, t7, t8) { }
 
-    void operator= (const T& other)
+    T* operator= (const T& other)
     {
-        m_t = other;
+        return (m_t = other);
     }
 
-    T& operator*  ()
-    {
-        return  m_t;
-    }
-    T* operator-> ()
-    {
-        return &m_t;
-    }
-    operator T&   ()
-    {
-        return  m_t;
-    }
-    operator T*   ()
-    {
-        return &m_t;
-    }
-
-    const T& operator*  () const
-    {
-        return  m_t;
-    }
-    const T* operator-> () const
-    {
-        return &m_t;
-    }
-    operator const T&   () const
-    {
-        return  m_t;
-    }
-    operator const T*   () const
-    {
-        return &m_t;
-    }
+    T& get () noexcept { return m_t; }
+    T& operator*  () noexcept { return  get(); }
+    T* operator-> () noexcept { return &get(); }
+    operator T&   () noexcept { return  get(); }
+    operator T*   () noexcept { return &get(); }
+    T const& get () const noexcept { return m_t; }
+    const T& operator*  () const noexcept { return  get(); }
+    const T* operator-> () const noexcept { return &get(); }
+    operator T const&   () const noexcept { return  get(); }
+    operator T const*   () const noexcept { return &get(); }
 
 private:
     T m_t;
diff --git a/modules/beast_core/memory/beast_MemoryAlignment.h b/modules/beast_core/memory/MemoryAlignment.h
similarity index 100%
rename from modules/beast_core/memory/beast_MemoryAlignment.h
rename to modules/beast_core/memory/MemoryAlignment.h
diff --git a/modules/beast_core/memory/beast_MemoryBlock.cpp b/modules/beast_core/memory/MemoryBlock.cpp
similarity index 100%
rename from modules/beast_core/memory/beast_MemoryBlock.cpp
rename to modules/beast_core/memory/MemoryBlock.cpp
diff --git a/modules/beast_core/memory/beast_MemoryBlock.h b/modules/beast_core/memory/MemoryBlock.h
similarity index 100%
rename from modules/beast_core/memory/beast_MemoryBlock.h
rename to modules/beast_core/memory/MemoryBlock.h
diff --git a/modules/beast_core/memory/beast_OptionalScopedPointer.h b/modules/beast_core/memory/OptionalScopedPointer.h
similarity index 100%
rename from modules/beast_core/memory/beast_OptionalScopedPointer.h
rename to modules/beast_core/memory/OptionalScopedPointer.h
diff --git a/modules/beast_core/memory/beast_RecycledObjectPool.h b/modules/beast_core/memory/RecycledObjectPool.h
similarity index 100%
rename from modules/beast_core/memory/beast_RecycledObjectPool.h
rename to modules/beast_core/memory/RecycledObjectPool.h
diff --git a/modules/beast_core/memory/SharedFunction.h b/modules/beast_core/memory/SharedFunction.h
new file mode 100644
index 0000000000..5d8da5f571
--- /dev/null
+++ b/modules/beast_core/memory/SharedFunction.h
@@ -0,0 +1,334 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CORE_SHAREDFUNCTION_H_INCLUDED
+#define BEAST_CORE_SHAREDFUNCTION_H_INCLUDED
+
+/** A reference counted, abstract function object. */
+template <typename Signature, class Allocator = std::allocator <char> >
+class SharedFunction;
+
+//------------------------------------------------------------------------------
+
+template <class R, class A>
+class SharedFunction <R (void), A>
+{
+public:
+    struct Call : SharedObject
+        { virtual R operator() () = 0; };
+
+    template <typename F>
+    struct CallType : Call
+    {
+        typedef typename A:: template rebind <CallType <F> >::other Allocator;
+        CallType (BEAST_MOVE_ARG(F) f, A a = A ())
+            : m_f (BEAST_MOVE_CAST(F)(f)), m_a (a)
+            { }
+        R operator() ()
+            { return (m_f)(); }
+    private:
+        F m_f;
+        Allocator m_a;
+    };
+
+    typedef R result_type;
+    template <typename F>
+    explicit SharedFunction (F f, A a = A ())
+        : m_ptr (new (typename CallType <F>::Allocator (a).allocate (1))
+            CallType <F> (BEAST_MOVE_CAST(F)(f), a))
+        { }
+    SharedFunction (SharedFunction const& other, A)
+        : m_ptr (other.m_ptr)
+        { }
+    SharedFunction ()
+        { }
+    bool empty () const
+        { return m_ptr == nullptr; }
+    R operator() () const
+        { return (*m_ptr)(); }
+
+private:
+    SharedPtr <Call> m_ptr;
+};
+
+//------------------------------------------------------------------------------
+
+template <class R, class P1, class A>
+class SharedFunction <R (P1), A>
+{
+public:
+    struct Call : public SharedObject
+        { virtual R operator() (P1 const& p1) = 0; };
+
+    template <typename F>
+    struct CallType : Call
+    {
+        typedef typename A:: template rebind <CallType <F> >::other Allocator;
+        CallType (BEAST_MOVE_ARG(F) f, A a = A ())
+            : m_f (BEAST_MOVE_CAST(F)(f)), m_a (a)
+            { }
+        R operator() (P1 const& p1)
+            { return (m_f)(p1); }
+    private:
+        F m_f;
+        Allocator m_a;
+    };
+
+    typedef R result_type;
+    template <typename F>
+    SharedFunction (F f, A a = A ())
+        : m_ptr (new (typename CallType <F>::Allocator (a).allocate (1))
+            CallType <F> (BEAST_MOVE_CAST(F)(f), a))
+        { }
+    SharedFunction (SharedFunction const& other, A)
+        : m_ptr (other.m_ptr)
+        { }
+    SharedFunction ()
+        { }
+    bool empty () const
+        { return m_ptr == nullptr; }
+    R operator() (P1 const& p1) const
+        { return (*m_ptr)(p1); }
+
+private:
+    SharedPtr <Call> m_ptr;
+};
+
+//------------------------------------------------------------------------------
+
+template <class R, class P1, class P2, class A>
+class SharedFunction <R (P1, P2), A>
+{
+public:
+    struct Call : public SharedObject
+        { virtual R operator() (P1 const& p1, P2 const& p2) = 0; };
+
+    template <typename F>
+    struct CallType : Call
+    {
+        typedef typename A:: template rebind <CallType <F> >::other Allocator;
+        CallType (BEAST_MOVE_ARG(F) f, A a = A ())
+            : m_f (BEAST_MOVE_CAST(F)(f)), m_a (a)
+            { }
+        R operator() (P1 const& p1, P2 const& p2)
+            { return (m_f)(p1, p2); }
+    private:
+        F m_f;
+        Allocator m_a;
+    };
+
+    typedef R result_type;
+    template <typename F>
+    SharedFunction (F f, A a = A ())
+        : m_ptr (new (typename CallType <F>::Allocator (a).allocate (1))
+            CallType <F> (BEAST_MOVE_CAST(F)(f), a))
+        { }
+    SharedFunction (SharedFunction const& other, A)
+        : m_ptr (other.m_ptr)
+        { }
+    SharedFunction ()
+        { }
+    bool empty () const
+        { return m_ptr == nullptr; }
+    R operator() (P1 const& p1, P2 const& p2) const
+        { return (*m_ptr)(p1, p2); }
+
+private:
+    SharedPtr <Call> m_ptr;
+};
+
+//------------------------------------------------------------------------------
+
+template <class R, class P1, class P2, class P3, class A>
+class SharedFunction <R (P1, P2, P3), A>
+{
+public:
+    struct Call : public SharedObject
+        { virtual R operator() (P1 const& p1, P2 const& p2, P3 const& p3) = 0; };
+
+    template <typename F>
+    struct CallType : Call
+    {
+        typedef typename A:: template rebind <CallType <F> >::other Allocator;
+        CallType (BEAST_MOVE_ARG(F) f, A a = A ())
+            : m_f (BEAST_MOVE_CAST(F)(f)), m_a (a)
+            { }
+        R operator() (P1 const& p1, P2 const& p2, P3 const& p3)
+            { return (m_f)(p1, p2, p3); }
+    private:
+        F m_f;
+        Allocator m_a;
+    };
+
+    typedef R result_type;
+    template <typename F>
+    SharedFunction (F f, A a = A ())
+        : m_ptr (new (typename CallType <F>::Allocator (a).allocate (1))
+            CallType <F> (BEAST_MOVE_CAST(F)(f), a))
+        { }
+    SharedFunction (SharedFunction const& other, A)
+        : m_ptr (other.m_ptr)
+        { }
+    SharedFunction ()
+        { }
+    bool empty () const
+        { return m_ptr == nullptr; }
+    R operator() (P1 const& p1, P2 const& p2, P3 const& p3) const
+        { return (*m_ptr)(p1, p2, p3); }
+
+private:
+    SharedPtr <Call> m_ptr;
+};
+
+//------------------------------------------------------------------------------
+
+template <class R, class P1, class P2, class P3, class P4, class A>
+class SharedFunction <R (P1, P2, P3, P4), A>
+{
+public:
+    struct Call : public SharedObject
+        { virtual R operator() (P1 const& p1, P2 const& p2, P3 const& p3, P4 const& p4) = 0; };
+
+    template <typename F>
+    struct CallType : Call
+    {
+        typedef typename A:: template rebind <CallType <F> >::other Allocator;
+        CallType (BEAST_MOVE_ARG(F) f, A a = A ())
+            : m_f (BEAST_MOVE_CAST(F)(f)), m_a (a)
+            { }
+        R operator() (P1 const& p1, P2 const& p2, P3 const& p3, P4 const& p4)
+            { return (m_f)(p1, p2, p3, p4); }
+    private:
+        F m_f;
+        Allocator m_a;
+    };
+
+    typedef R result_type;
+    template <typename F>
+    SharedFunction (F f, A a = A ())
+        : m_ptr (new (typename CallType <F>::Allocator (a).allocate (1))
+            CallType <F> (BEAST_MOVE_CAST(F)(f), a))
+        { }
+    SharedFunction (SharedFunction const& other, A)
+        : m_ptr (other.m_ptr)
+        { }
+    SharedFunction ()
+        { }
+    bool empty () const
+        { return m_ptr == nullptr; }
+    R operator() (P1 const& p1, P2 const& p2, P3 const& p3, P4 const& p4) const
+        { return (*m_ptr)(p1, p2, p3, p4); }
+
+private:
+    SharedPtr <Call> m_ptr;
+};
+
+//------------------------------------------------------------------------------
+
+template <class R, class P1, class P2, class P3, class P4, class P5, class A>
+class SharedFunction <R (P1, P2, P3, P4, P5), A>
+{
+public:
+    struct Call : public SharedObject
+        { virtual R operator() (P1 const& p1, P2 const& p2, P3 const& p3,
+                                P4 const& p4, P5 const& p5) = 0; };
+
+    template <typename F>
+    struct CallType : Call
+    {
+        typedef typename A:: template rebind <CallType <F> >::other Allocator;
+        CallType (BEAST_MOVE_ARG(F) f, A a = A ())
+            : m_f (BEAST_MOVE_CAST(F)(f)), m_a (a)
+            { }
+        R operator() (P1 const& p1, P2 const& p2, P3 const& p3,
+                      P4 const& p4, P5 const& p5)
+            { return (m_f)(p1, p2, p3, p4, p5); }
+    private:
+        F m_f;
+        Allocator m_a;
+    };
+
+    typedef R result_type;
+    template <typename F>
+    SharedFunction (F f, A a = A ())
+        : m_ptr (new (typename CallType <F>::Allocator (a).allocate (1))
+            CallType <F> (BEAST_MOVE_CAST(F)(f), a))
+        { }
+    SharedFunction (SharedFunction const& other, A)
+        : m_ptr (other.m_ptr)
+        { }
+    SharedFunction ()
+        { }
+    bool empty () const
+        { return m_ptr == nullptr; }
+    R operator() (P1 const& p1, P2 const& p2, P3 const& p3,
+                  P4 const& p4, P5 const& p5) const
+        { return (*m_ptr)(p1, p2, p3, p4, p5); }
+
+private:
+    SharedPtr <Call> m_ptr;
+};
+
+//------------------------------------------------------------------------------
+
+template <class R, class P1, class P2, class P3, class P4, class P5, class P6, class A>
+class SharedFunction <R (P1, P2, P3, P4, P5, P6), A>
+{
+public:
+    struct Call : public SharedObject
+        { virtual R operator() (P1 const& p1, P2 const& p2, P3 const& p3,
+                                P4 const& p4, P5 const& p5, P6 const& p6) = 0; };
+
+    template <typename F>
+    struct CallType : Call
+    {
+        typedef typename A:: template rebind <CallType <F> >::other Allocator;
+        CallType (BEAST_MOVE_ARG(F) f, A a = A ())
+            : m_f (BEAST_MOVE_CAST(F)(f)), m_a (a)
+            { }
+        R operator() (P1 const& p1, P2 const& p2, P3 const& p3,
+                      P4 const& p4, P5 const& p5, P6 const& p6)
+            { return (m_f)(p1, p2, p3, p4, p5, p6); }
+    private:
+        F m_f;
+        Allocator m_a;
+    };
+
+    typedef R result_type;
+    template <typename F>
+    SharedFunction (F f, A a = A ())
+        : m_ptr (new (typename CallType <F>::Allocator (a).allocate (1))
+            CallType <F> (BEAST_MOVE_CAST(F)(f), a))
+        { }
+    SharedFunction (SharedFunction const& other, A)
+        : m_ptr (other.m_ptr)
+        { }
+    SharedFunction ()
+        { }
+    bool empty () const
+        { return m_ptr == nullptr; }
+    R operator() (P1 const& p1, P2 const& p2, P3 const& p3,
+                  P4 const& p4, P5 const& p5, P6 const& p6) const
+        { return (*m_ptr)(p1, p2, p3, p4, p5, p6); }
+
+private:
+    SharedPtr <Call> m_ptr;
+};
+
+#endif
diff --git a/modules/beast_core/memory/beast_SharedSingleton.h b/modules/beast_core/memory/SharedSingleton.h
similarity index 51%
rename from modules/beast_core/memory/beast_SharedSingleton.h
rename to modules/beast_core/memory/SharedSingleton.h
index 093976a757..4e019cb0d8 100644
--- a/modules/beast_core/memory/beast_SharedSingleton.h
+++ b/modules/beast_core/memory/SharedSingleton.h
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_REFERENCECOUNTEDSINGLETON_H_INCLUDED
-#define BEAST_REFERENCECOUNTEDSINGLETON_H_INCLUDED
+#ifndef BEAST_SHAREDSINGLETON_H_INCLUDED
+#define BEAST_SHAREDSINGLETON_H_INCLUDED
 
 /** Thread-safe singleton which comes into existence on first use. Use this
     instead of creating objects with static storage duration. These singletons
@@ -26,7 +26,10 @@
     object that depends on it, the order of destruction of objects is assured
     to be correct.
 
-    class Object must provide the function `Object* Object::createInstance()`
+    Object Requirements:
+        DefaultConstructible
+        TriviallyDestructible (when lifetime == neverDestroyed)
+        Destructible
 
     @class SharedSingleton
     @ingroup beast_core
@@ -52,11 +55,6 @@ public:
         */
         createOnDemand,
 
-        /** Like createOnDemand, but after the Singleton is destroyed an
-            exception will be thrown if an attempt is made to create it again.
-        */
-        createOnDemandOnce,
-
         /** The singleton is created on first use and persists until program exit.
         */
         persistAfterCreation,
@@ -71,142 +69,125 @@ public:
 
 //------------------------------------------------------------------------------
 
+/** Wraps object to produce a reference counted singleton. */
 template <class Object>
 class SharedSingleton
-    : public SingletonLifetime
-    , private PerformedAtExit
+    : public Object
+    , private SharedObject
 {
-protected:
-    typedef SpinLock LockType;
-
-    /** Create the singleton.
-
-        @param lifetime The lifetime management option.
-    */
-    explicit SharedSingleton (Lifetime const lifetime)
-        : m_lifetime (lifetime)
-    {
-        bassert (s_instance == nullptr);
-
-        if (m_lifetime == persistAfterCreation ||
-            m_lifetime == neverDestroyed)
-        {
-            incReferenceCount ();
-        }
-        else if (m_lifetime == createOnDemandOnce && *s_created)
-        {
-            Throw (Error ().fail (__FILE__, __LINE__));
-        }
-
-        *s_created = true;
-    }
-
-    virtual ~SharedSingleton ()
-    {
-        bassert (s_instance == nullptr);
-    }
-
 public:
-    typedef SharedPtr <Object> Ptr;
+    typedef SharedPtr <SharedSingleton <Object> > Ptr;
 
-    /** Retrieve a reference to the singleton.
-    */
-    static Ptr getInstance ()
+    static Ptr get (SingletonLifetime::Lifetime lifetime
+        = SingletonLifetime::persistAfterCreation)
     {
-        Ptr instance;
-
-        instance = s_instance;
-
+        StaticData& staticData (getStaticData ());
+        SharedSingleton* instance = staticData.instance;
         if (instance == nullptr)
         {
-            LockType::ScopedLockType lock (*s_mutex);
-
-            instance = s_instance;
-
+            LockType::ScopedLockType lock (staticData.mutex);
+            instance = staticData.instance;
             if (instance == nullptr)
             {
-                s_instance = Object::createInstance ();
-
-                instance = s_instance;
+                bassert (lifetime == SingletonLifetime::createOnDemand || ! staticData.destructorCalled);
+                staticData.instance = &staticData.object;
+                new (staticData.instance) SharedSingleton (lifetime);
+                memoryBarrier();
+                instance = staticData.instance;
             }
         }
-
         return instance;
     }
 
-    inline void incReferenceCount () noexcept
+    // DEPRECATED LEGACY FUNCTION NAME
+    static Ptr getInstance (SingletonLifetime::Lifetime lifetime
+        = SingletonLifetime::persistAfterCreation)
     {
-        ++m_refCount;
-    }
-
-    inline void decReferenceCount () noexcept
-    {
-        if (--m_refCount == 0)
-            destroySingleton ();
-    }
-
-    // Caller must synchronize.
-    inline bool isBeingReferenced () const
-    {
-        return m_refCount.get () != 0;
+        return get (lifetime);
     }
 
 private:
-    void performAtExit ()
+    explicit SharedSingleton (SingletonLifetime::Lifetime lifetime)
+        : m_lifetime (lifetime)
+        , m_exitHook (this)
     {
-        if (m_lifetime == SingletonLifetime::persistAfterCreation)
-            decReferenceCount ();
+        if (m_lifetime == SingletonLifetime::persistAfterCreation ||
+            m_lifetime == SingletonLifetime::neverDestroyed)
+            this->incReferenceCount ();
     }
 
-    void destroySingleton ()
+    ~SharedSingleton ()
     {
-        bool destroy;
+    }
+
+    void onExit ()
+    {
+        if (m_lifetime == SingletonLifetime::persistAfterCreation)
+            this->decReferenceCount ();
+    }
+
+    void destroy () const
+    {
+        bool callDestructor;
 
         // Handle the condition where one thread is releasing the last
         // reference just as another thread is trying to acquire it.
         //
         {
-            LockType::ScopedLockType lock (*s_mutex);
+            StaticData& staticData (getStaticData ());
+            LockType::ScopedLockType lock (staticData.mutex);
 
-            if (isBeingReferenced ())
+            if (this->getReferenceCount() != 0)
             {
-                destroy = false;
+                callDestructor = false;
             }
             else
             {
-                destroy = true;
-                s_instance = 0;
+                callDestructor = true;
+                staticData.instance = nullptr;
+                staticData.destructorCalled = true;
             }
         }
 
-        if (destroy)
+        if (callDestructor)
         {
-            bassert (m_lifetime != neverDestroyed);
+            bassert (m_lifetime != SingletonLifetime::neverDestroyed);
 
-            delete static_cast <Object*> (this);
+            this->~SharedSingleton();
         }
     }
 
-private:
-    Lifetime const m_lifetime;
-    Atomic <int> m_refCount;
+    typedef SpinLock LockType;
 
-private:
-    static Object* s_instance;
-    static Static::Storage <LockType, SharedSingleton <Object> > s_mutex;
-    static Static::Storage <bool, SharedSingleton <Object> > s_created;
+    // This structure gets zero-filled at static initialization time.
+    // No constructors are called.
+    //
+    class StaticData : public Uncopyable
+    {
+    public:
+        LockType mutex;
+        SharedSingleton* instance;
+        SharedSingleton  object;
+        bool destructorCalled;
+
+    private:
+        StaticData();
+        ~StaticData();
+    };
+
+    static StaticData& getStaticData ()
+    {
+        static uint8 storage [sizeof (StaticData)];
+        return *(reinterpret_cast <StaticData*> (&storage [0]));
+    }
+
+    friend class SharedPtr <SharedSingleton>;
+    friend class AtExitMemberHook <SharedSingleton>;
+
+    SingletonLifetime::Lifetime m_lifetime;
+    AtExitMemberHook <SharedSingleton> m_exitHook;
 };
-/** @{ */
 
-template <class Object>
-Object* SharedSingleton <Object>::s_instance;
-
-template <class Object>
-Static::Storage <typename SharedSingleton <Object>::LockType, SharedSingleton <Object> >
-SharedSingleton <Object>::s_mutex;
-
-template <class Object>
-Static::Storage <bool, SharedSingleton <Object> >
-SharedSingleton <Object>::s_created;
+//------------------------------------------------------------------------------
 
 #endif
diff --git a/modules/beast_core/memory/beast_WeakReference.h b/modules/beast_core/memory/WeakReference.h
similarity index 100%
rename from modules/beast_core/memory/beast_WeakReference.h
rename to modules/beast_core/memory/WeakReference.h
diff --git a/modules/beast_core/memory/beast_AllocatedBy.h b/modules/beast_core/memory/beast_AllocatedBy.h
deleted file mode 100644
index c790b6f587..0000000000
--- a/modules/beast_core/memory/beast_AllocatedBy.h
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_ALLOCATEDBY_H_INCLUDED
-#define BEAST_ALLOCATEDBY_H_INCLUDED
-
-/*============================================================================*/
-/**
-  Customized allocation for heap objects.
-
-  Derived classes will use the specified allocator for new and delete.
-
-  @param AllocatorType The type of allocator to use.
-
-  @ingroup beast_concurrent
-*/
-template <class AllocatorType>
-class AllocatedBy
-{
-public:
-    static inline void* operator new (size_t bytes, AllocatorType& allocator) noexcept
-    {
-        return allocator.allocate (bytes);
-    }
-
-    static inline void* operator new (size_t bytes, AllocatorType* allocator) noexcept
-    {
-        return allocator->allocate (bytes);
-    }
-
-    static inline void operator delete (void* p, AllocatorType&) noexcept
-    {
-        AllocatorType::deallocate (p);
-    }
-
-    static inline void operator delete (void* p, AllocatorType*) noexcept
-    {
-        AllocatorType::deallocate (p);
-    }
-
-    static inline void operator delete (void* p) noexcept
-    {
-        AllocatorType::deallocate (p);
-    }
-};
-
-#endif
diff --git a/modules/beast_core/memory/beast_ByteSwap.h b/modules/beast_core/memory/beast_ByteSwap.h
deleted file mode 100644
index 94384eacd2..0000000000
--- a/modules/beast_core/memory/beast_ByteSwap.h
+++ /dev/null
@@ -1,126 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_BYTESWAP_H_INCLUDED
-#define BEAST_BYTESWAP_H_INCLUDED
-
-namespace detail
-{
-
-/** Specialized helper class template for swapping bytes.
-    
-    Normally you won't use this directly, use the helper function
-    byteSwap instead. You can specialize this class for your
-    own user defined types, as was done for uint24.
-
-    @see swapBytes, uint24
-*/
-template <typename IntegralType>
-struct SwapBytes
-{
-    inline IntegralType operator() (IntegralType value) const noexcept 
-    {
-        return ByteOrder::swap (value);
-    }
-};
-
-// Specializations for signed integers
-
-template <>
-struct SwapBytes <int16>
-{
-    inline int16 operator() (int16 value) const noexcept 
-    {
-        return static_cast <int16> (ByteOrder::swap (static_cast <uint16> (value)));
-    }
-};
-
-template <>
-struct SwapBytes <int32>
-{
-    inline int32 operator() (int32 value) const noexcept 
-    {
-        return static_cast <int32> (ByteOrder::swap (static_cast <uint32> (value)));
-    }
-};
-
-template <>
-struct SwapBytes <int64>
-{
-    inline int64 operator() (int64 value) const noexcept 
-    {
-        return static_cast <int64> (ByteOrder::swap (static_cast <uint64> (value)));
-    }
-};
-
-}
-
-//------------------------------------------------------------------------------
-
-/** Returns a type with the bytes swapped.
-    Little endian becomes big endian and vice versa. The underlying
-    type must be an integral type or behave like one.
-*/
-template <class IntegralType>
-inline IntegralType swapBytes (IntegralType value) noexcept
-{
-    return detail::SwapBytes <IntegralType> () (value);
-}
-
-/** Returns the machine byte-order value to little-endian byte order. */
-template <typename IntegralType>
-inline IntegralType toLittleEndian (IntegralType value) noexcept
-{
-#if BEAST_LITTLE_ENDIAN
-    return value;
-#else
-    return swapBytes (value);
-#endif
-}
-
-/** Returns the machine byte-order value to big-endian byte order. */
-template <typename IntegralType>
-inline IntegralType toBigEndian (IntegralType value) noexcept
-{
-#if BEAST_LITTLE_ENDIAN
-    return swapBytes (value);
-#else
-    return value;
-#endif
-}
-
-/** Returns the machine byte-order value to network byte order. */
-template <typename IntegralType>
-inline IntegralType toNetworkByteOrder (IntegralType value) noexcept
-{
-    return toBigEndian (value);
-}
-
-/** Converts from network byte order to machine byte order. */
-template <typename IntegralType>
-inline IntegralType fromNetworkByteOrder (IntegralType value) noexcept
-{
-#if BEAST_LITTLE_ENDIAN
-    return swapBytes (value);
-#else
-    return value;
-#endif
-}
-
-#endif
diff --git a/modules/beast_core/memory/beast_FifoFreeStoreWithTLS.cpp b/modules/beast_core/memory/beast_FifoFreeStoreWithTLS.cpp
deleted file mode 100644
index f01ffab693..0000000000
--- a/modules/beast_core/memory/beast_FifoFreeStoreWithTLS.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-// Implementation notes
-//
-// - A Page is a large allocation from a global PageAllocator.
-//
-// - Each thread maintains an 'active' page from which it makes allocations.
-//
-// - When the active page is full, a new one takes it's place.
-//
-// - Page memory is deallocated when it is not active and no longer referenced.
-//
-// - Each instance of FifoFreeStoreWithTLS maintains its own set of per-thread active pages,
-//   but uses a global PageAllocator. This reduces memory consumption without
-//   affecting performance.
-//
-
-#if BEAST_USE_BOOST_FEATURES
-
-// This precedes every allocation
-//
-struct FifoFreeStoreWithTLS::Header
-{
-    FifoFreeStoreWithTLS::Page* page;
-};
-
-//------------------------------------------------------------------------------
-
-class FifoFreeStoreWithTLS::Page : LeakChecked <Page>, public Uncopyable
-{
-public:
-    explicit Page (const size_t bytes) : m_refs (1)
-    {
-        m_end = reinterpret_cast <char*> (this) + bytes;
-        m_free = reinterpret_cast <char*> (
-                     Memory::pointerAdjustedForAlignment (this + 1));
-    }
-
-    ~Page ()
-    {
-        bassert (! m_refs.isSignaled ());
-    }
-
-    inline bool release ()
-    {
-        bassert (! m_refs.isSignaled ());
-
-        return m_refs.release ();
-    }
-
-    void* allocate (size_t bytes)
-    {
-        bassert (bytes > 0);
-
-        char* p = Memory::pointerAdjustedForAlignment (m_free);
-        char* free = p + bytes;
-
-        if (free <= m_end)
-        {
-            m_free = free;
-
-            m_refs.addref ();
-        }
-        else
-        {
-            p = 0;
-        }
-
-        return p;
-    }
-
-private:
-    AtomicCounter m_refs; // reference count
-    char* m_free;           // next free byte
-    char* m_end;            // last free byte + 1
-};
-
-//------------------------------------------------------------------------------
-
-class FifoFreeStoreWithTLS::PerThreadData : LeakChecked <PerThreadData>, public Uncopyable
-{
-public:
-    explicit PerThreadData (FifoFreeStoreWithTLS* allocator)
-        : m_allocator (*allocator)
-        , m_active (m_allocator.newPage ())
-    {
-    }
-
-    ~PerThreadData ()
-    {
-        if (m_active->release ())
-            m_allocator.deletePage (m_active);
-    }
-
-    inline void* allocate (const size_t bytes)
-    {
-        const size_t headerBytes = Memory::sizeAdjustedForAlignment (sizeof (Header));
-        const size_t bytesNeeded = headerBytes + bytes;
-
-        if (bytesNeeded > m_allocator.m_pages->getPageBytes ())
-            Throw (Error ().fail (__FILE__, __LINE__, TRANS ("the memory request was too large")));
-
-        Header* header;
-
-        header = reinterpret_cast <Header*> (m_active->allocate (bytesNeeded));
-
-        if (!header)
-        {
-            if (m_active->release ())
-                deletePage (m_active);
-
-            m_active = m_allocator.newPage ();
-
-            header = reinterpret_cast <Header*> (m_active->allocate (bytesNeeded));
-        }
-
-        header->page = m_active;
-
-        return reinterpret_cast <char*> (header) + headerBytes;
-    }
-
-private:
-    FifoFreeStoreWithTLS& m_allocator;
-    Page* m_active;
-};
-
-//------------------------------------------------------------------------------
-
-inline FifoFreeStoreWithTLS::Page* FifoFreeStoreWithTLS::newPage ()
-{
-    return new (m_pages->allocate ()) Page (m_pages->getPageBytes ());
-}
-
-inline void FifoFreeStoreWithTLS::deletePage (Page* page)
-{
-    // Safe, because each thread maintains its own active page.
-    page->~Page ();
-    PagedFreeStoreType::deallocate (page);
-}
-
-FifoFreeStoreWithTLS::FifoFreeStoreWithTLS ()
-    : m_pages (PagedFreeStoreType::getInstance ())
-{
-    //bassert (m_pages->getPageBytes () >= sizeof (Page) + Memory::allocAlignBytes);
-}
-
-FifoFreeStoreWithTLS::~FifoFreeStoreWithTLS ()
-{
-    // Clean up this thread's data before we release
-    // the reference to the global page allocator.
-    m_tsp.reset (0);
-}
-
-//------------------------------------------------------------------------------
-
-void* FifoFreeStoreWithTLS::allocate (const size_t bytes)
-{
-    PerThreadData* data = m_tsp.get ();
-
-    if (!data)
-    {
-        data = new PerThreadData (this);
-        m_tsp.reset (data);
-    }
-
-    return data->allocate (bytes);
-}
-
-//------------------------------------------------------------------------------
-
-void FifoFreeStoreWithTLS::deallocate (void* p)
-{
-    const size_t headerBytes = Memory::sizeAdjustedForAlignment (sizeof (Header));
-    Header* const header = reinterpret_cast <Header*> (reinterpret_cast <char*> (p) - headerBytes);
-    Page* const page = header->page;
-
-    if (page->release ())
-        deletePage (page);
-}
-
-#endif
diff --git a/modules/beast_core/memory/beast_FifoFreeStoreWithTLS.h b/modules/beast_core/memory/beast_FifoFreeStoreWithTLS.h
deleted file mode 100644
index 7de09a653e..0000000000
--- a/modules/beast_core/memory/beast_FifoFreeStoreWithTLS.h
+++ /dev/null
@@ -1,69 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_FIFOFREESTOREWITHTLS_H_INCLUDED
-#define BEAST_FIFOFREESTOREWITHTLS_H_INCLUDED
-
-#if BEAST_USE_BOOST_FEATURES
-
-/*============================================================================*/
-/**
-  Lock-free and mostly wait-free FIFO memory allocator.
-
-  This allocator is suitable for use with CallQueue and Listeners. It is
-  expected that over time, deallocations will occur in roughly the same order
-  as allocations.
-
-  @note This implementation uses Thread Local Storage to further improve
-        performance. However, it requires boost style thread_specific_ptr.
-
-  @invariant allocate() and deallocate() are fully concurrent.
-
-  @invariant The ABA problem is handled automatically.
-
-  @ingroup beast_concurrent
-*/
-class BEAST_API FifoFreeStoreWithTLS
-{
-public:
-    FifoFreeStoreWithTLS ();
-    ~FifoFreeStoreWithTLS ();
-
-    void* allocate (const size_t bytes);
-    static void deallocate (void* const p);
-
-private:
-    typedef GlobalPagedFreeStore PagedFreeStoreType;
-    struct Header;
-
-    class Page;
-
-    inline Page* newPage ();
-    static inline void deletePage (Page* page);
-
-private:
-    class PerThreadData;
-    boost::thread_specific_ptr <PerThreadData> m_tsp;
-
-    PagedFreeStoreType::Ptr m_pages;
-};
-
-#endif
-
-#endif
diff --git a/modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.cpp b/modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.cpp
deleted file mode 100644
index 07502eefdf..0000000000
--- a/modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-// This precedes every allocation
-struct FifoFreeStoreWithoutTLS::Header
-{
-    union
-    {
-        FifoFreeStoreWithoutTLS::Block* block; // backpointer to the page
-
-        char pad [Memory::allocAlignBytes];
-    };
-};
-
-//------------------------------------------------------------------------------
-
-class FifoFreeStoreWithoutTLS::Block : public Uncopyable
-{
-public:
-    explicit Block (const size_t bytes) : m_refs (1)
-    {
-        m_end = reinterpret_cast <char*> (this) + bytes;
-        m_free = reinterpret_cast <char*> (
-                     Memory::pointerAdjustedForAlignment (this + 1));
-    }
-
-    ~Block ()
-    {
-        bassert (!m_refs.isSignaled ());
-    }
-
-    inline void addref ()
-    {
-        m_refs.addref ();
-    }
-
-    inline bool release ()
-    {
-        return m_refs.release ();
-    }
-
-    enum Result
-    {
-        success,  // successful allocation
-        ignore,   // disregard the block
-        consumed  // block is consumed (1 thread sees this)
-    };
-
-    Result allocate (size_t bytes, void* pBlock)
-    {
-        bassert (bytes > 0);
-
-        Result result;
-
-        for (;;)
-        {
-            char* base = m_free.get ();
-
-            if (base)
-            {
-                char* p = Memory::pointerAdjustedForAlignment (base);
-                char* free = p + bytes;
-
-                if (free <= m_end)
-                {
-                    // Try to commit the allocation
-                    if (m_free.compareAndSet (free, base))
-                    {
-                        * (reinterpret_cast <void**> (pBlock)) = p;
-                        result = success;
-                        break;
-                    }
-                    else
-                    {
-                        // Someone changed m_free, retry.
-                    }
-                }
-                else
-                {
-                    // Mark the block consumed.
-                    if (m_free.compareAndSet (0, base))
-                    {
-                        // Only one caller sees this, the rest get 'ignore'
-                        result = consumed;
-                        break;
-                    }
-                    else
-                    {
-                        // Happens with another concurrent allocate(), retry.
-                    }
-                }
-            }
-            else
-            {
-                // Block is consumed, ignore it.
-                result = ignore;
-                break;
-            }
-        }
-
-        return result;
-    }
-
-private:
-    AtomicCounter m_refs;        // reference count
-    AtomicPointer <char> m_free; // next free byte or 0 if inactive.
-    char* m_end;                 // last free byte + 1
-};
-
-//------------------------------------------------------------------------------
-
-inline FifoFreeStoreWithoutTLS::Block* FifoFreeStoreWithoutTLS::newBlock ()
-{
-    return new (m_pages->allocate ()) Block (m_pages->getPageBytes ());
-}
-
-inline void FifoFreeStoreWithoutTLS::deleteBlock (Block* b)
-{
-    // It is critical that we do not call the destructor,
-    // because due to the lock-free implementation, a Block
-    // can be accessed for a short time after it is deleted.
-    /* b->~Block (); */ // DO NOT CALL!!!
-
-    PagedFreeStoreType::deallocate (b);
-}
-
-FifoFreeStoreWithoutTLS::FifoFreeStoreWithoutTLS ()
-    : m_pages (GlobalPagedFreeStore::getInstance ())
-{
-    if (m_pages->getPageBytes () < sizeof (Block) + 256)
-        Throw (Error ().fail (__FILE__, __LINE__, TRANS ("the block size is too small")));
-
-    m_active = newBlock ();
-}
-
-FifoFreeStoreWithoutTLS::~FifoFreeStoreWithoutTLS ()
-{
-    deleteBlock (m_active);
-}
-
-//------------------------------------------------------------------------------
-
-void* FifoFreeStoreWithoutTLS::allocate (const size_t bytes)
-{
-    const size_t actual = sizeof (Header) + bytes;
-
-    if (actual > m_pages->getPageBytes ())
-        Throw (Error ().fail (__FILE__, __LINE__, TRANS ("the memory request was too large")));
-
-    Header* h;
-
-    for (;;)
-    {
-        // Get an active block.
-        Block* b = m_active;
-
-        while (!b)
-        {
-            Thread::yield ();
-            b = m_active;
-        }
-
-        // (*) It is possible for the block to get a final release here
-        //     In this case it will have been put in the garbage, and
-        //     m_active will not match.
-
-        // Acquire a reference.
-        b->addref ();
-
-        // Is it still active?
-        if (m_active == b)
-        {
-            // Yes so try to allocate from it.
-            const Block::Result result = b->allocate (actual, &h);
-
-            if (result == Block::success)
-            {
-                // Keep the reference and return the allocation.
-                h->block = b;
-                break;
-            }
-            else if (result == Block::consumed)
-            {
-                // Remove block from active.
-                m_active = 0;
-
-                // Take away the reference we added
-                b->release ();
-
-                // Take away the original active reference.
-                if (b->release ())
-                    deleteBlock (b);
-
-                // Install a fresh empty active block.
-                m_active = newBlock ();
-            }
-            else
-            {
-                if (b->release ())
-                    deleteBlock (b);
-            }
-
-            // Try again.
-        }
-        else
-        {
-            // Block became inactive, so release our reference.
-            b->release ();
-
-            // (*) It is possible for this to be a duplicate final release.
-        }
-    }
-
-    return h + 1;
-}
-
-//------------------------------------------------------------------------------
-
-void FifoFreeStoreWithoutTLS::deallocate (void* p)
-{
-    Block* const b = (reinterpret_cast <Header*> (p) - 1)->block;
-
-    if (b->release ())
-        deleteBlock (b);
-}
diff --git a/modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.h b/modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.h
deleted file mode 100644
index 85a4334cfc..0000000000
--- a/modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.h
+++ /dev/null
@@ -1,65 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_FIFOFREESTOREWITHOUTTLS_H_INCLUDED
-#define BEAST_FIFOFREESTOREWITHOUTTLS_H_INCLUDED
-
-/*============================================================================*/
-/**
-  Lock-free FIFO memory allocator.
-
-  This allocator is suitable for use with CallQueue and Listeners. It is
-  expected that over time, deallocations will occur in roughly the same order
-  as allocations.
-
-  @note This version of the fifo free store uses less memory and doesn't require
-        thread specific storage. However, it runs slower. The performance
-  differences are negligible for desktop class applications.
-
-  @invariant allocate() and deallocate() are fully concurrent.
-
-  @invariant The ABA problem is handled automatically.
-
-  @ingroup beast_concurrent
-*/
-class BEAST_API FifoFreeStoreWithoutTLS
-{
-public:
-    explicit FifoFreeStoreWithoutTLS ();
-    ~FifoFreeStoreWithoutTLS ();
-
-    void* allocate (const size_t bytes);
-    static void deallocate (void* const p);
-
-private:
-    typedef GlobalPagedFreeStore PagedFreeStoreType;
-
-    struct Header;
-
-    class Block;
-
-    inline Block* newBlock ();
-    static inline void deleteBlock (Block* b);
-
-private:
-    Block* volatile m_active;
-    PagedFreeStoreType::Ptr m_pages;
-};
-
-#endif
diff --git a/modules/beast_core/memory/beast_PagedFreeStore.cpp b/modules/beast_core/memory/beast_PagedFreeStore.cpp
deleted file mode 100644
index fe022ecfc9..0000000000
--- a/modules/beast_core/memory/beast_PagedFreeStore.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#define LOG_GC 0
-
-namespace
-{
-
-// This is the upper limit on the amount of physical memory an instance of the
-// allocator will allow. Going over this limit means that consumers cannot keep
-// up with producers, and application logic should be re-examined.
-//
-// TODO: ENFORCE THIS GLOBALLY? MEASURE IN KILOBYTES AND FORCE KILOBYTE PAGE SIZES
-#define HARD_LIMIT 1
-const size_t hardLimitMegaBytes = 256;
-
-}
-
-/*
-
-Implementation notes
-
-- There are two pools, the 'hot' pool and the 'cold' pool.
-
-- When a new page is needed we pop from the 'fresh' stack of the hot pool.
-
-- When a page is deallocated it is pushed to the 'garbage' stack of the hot pool.
-
-- Every so often, a garbage collection is performed on a separate thread.
-  During collection, fresh and garbage are swapped in the cold pool.
-  Then, the hot and cold pools are atomically swapped.
-
-*/
-//------------------------------------------------------------------------------
-
-struct PagedFreeStore::Page : Pages::Node, LeakChecked <Page>
-{
-    explicit Page (PagedFreeStore* const allocator)
-        : m_allocator (*allocator)
-    {
-    }
-
-    PagedFreeStore& getAllocator () const
-    {
-        return m_allocator;
-    }
-
-private:
-    PagedFreeStore& m_allocator;
-};
-
-inline void* PagedFreeStore::fromPage (Page* const p)
-{
-    return reinterpret_cast <char*> (p) +
-           Memory::sizeAdjustedForAlignment (sizeof (Page));
-}
-
-inline PagedFreeStore::Page* PagedFreeStore::toPage (void* const p)
-{
-    return reinterpret_cast <Page*> (
-               (reinterpret_cast <char*> (p) -
-                Memory::sizeAdjustedForAlignment (sizeof (Page))));
-}
-
-//------------------------------------------------------------------------------
-
-PagedFreeStore::PagedFreeStore (const size_t pageBytes)
-    : m_timer (this)
-    , m_pageBytes (pageBytes)
-    , m_pageBytesAvailable (pageBytes - Memory::sizeAdjustedForAlignment (sizeof (Page)))
-    , m_newPagesLeft (int ((hardLimitMegaBytes * 1024 * 1024) / m_pageBytes))
-#if LOG_GC
-    , m_swaps (0)
-#endif
-{
-    m_hot  = m_pool1;
-    m_cold = m_pool2;
-
-    m_timer.setExpiration (1.0);
-}
-
-PagedFreeStore::~PagedFreeStore ()
-{
-    m_timer.reset ();
-
-#if LOG_GC
-    bassert (!m_used.isSignaled ());
-#endif
-
-    dispose (m_pool1);
-    dispose (m_pool2);
-
-#if LOG_GC
-    bassert (!m_total.isSignaled ());
-#endif
-}
-
-//------------------------------------------------------------------------------
-
-void* PagedFreeStore::allocate ()
-{
-    Page* page = m_hot->fresh->pop_front ();
-
-    if (!page)
-    {
-#if HARD_LIMIT
-        const bool exhausted = m_newPagesLeft.release ();
-
-        if (exhausted)
-            Throw (Error ().fail (__FILE__, __LINE__,
-                                  TRANS ("the limit of memory allocations was reached")));
-
-#endif
-
-        void* storage = ::malloc (m_pageBytes);
-
-        if (!storage)
-            Throw (Error ().fail (__FILE__, __LINE__,
-                                  TRANS ("a memory allocation failed")));
-
-        page = new (storage) Page (this);
-
-#if LOG_GC
-        m_total.addref ();
-#endif
-    }
-
-#if LOG_GC
-    m_used.addref ();
-#endif
-
-    return fromPage (page);
-}
-
-void PagedFreeStore::deallocate (void* const p)
-{
-    Page* const page = toPage (p);
-    PagedFreeStore& allocator = page->getAllocator ();
-
-    allocator.m_hot->garbage->push_front (page);
-
-#if LOG_GC
-    allocator.m_used.release ();
-#endif
-}
-
-//
-// Perform garbage collection.
-//
-void PagedFreeStore::onDeadlineTimer (DeadlineTimer&)
-{
-    // Physically free one page.
-    // This will reduce the working set over time after a spike.
-    {
-        Page* page = m_cold->garbage->pop_front ();
-
-        if (page)
-        {
-            page->~Page ();
-            ::free (page);
-            m_newPagesLeft.addref ();
-#ifdef LOG_GC
-            m_total.release ();
-#endif
-        }
-    }
-
-    m_cold->fresh->swap (m_cold->garbage);
-
-    // Swap atomically with respect to m_hot
-    Pool* temp = m_hot;
-    m_hot = m_cold; // atomic
-    m_cold = temp;
-
-#if LOG_GC
-    String s;
-    s << "swap " << String (++m_swaps);
-    s << " (" << String (m_used.get ()) << "/"
-      << String (m_total.get ()) << " of "
-      << String (m_newPagesLeft.get ()) << ")";
-    Logger::outputDebugString (s);
-#endif
-
-    m_timer.setExpiration (1.0);
-}
-
-void PagedFreeStore::dispose (Pages& pages)
-{
-    for (;;)
-    {
-        Page* const page = pages.pop_front ();
-
-        if (page)
-        {
-            page->~Page ();
-            ::free (page);
-
-#if LOG_GC
-            m_total.release ();
-#endif
-        }
-        else
-        {
-            break;
-        }
-    }
-}
-
-void PagedFreeStore::dispose (Pool& pool)
-{
-    dispose (pool.fresh);
-    dispose (pool.garbage);
-}
diff --git a/modules/beast_core/memory/beast_PagedFreeStore.h b/modules/beast_core/memory/beast_PagedFreeStore.h
deleted file mode 100644
index 8bfd8045e2..0000000000
--- a/modules/beast_core/memory/beast_PagedFreeStore.h
+++ /dev/null
@@ -1,94 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_PAGEDFREESTORE_H_INCLUDED
-#define BEAST_PAGEDFREESTORE_H_INCLUDED
-
-/*============================================================================*/
-/**
-  Lock-free memory allocator for fixed size pages.
-
-  The ABA problem (http://en.wikipedia.org/wiki/ABA_problem) is avoided by
-  treating freed pages as garbage, and performing a collection every second.
-
-  @ingroup beast_concurrent
-*/
-class BEAST_API PagedFreeStore : private DeadlineTimer::Listener
-{
-public:
-    explicit PagedFreeStore (const size_t pageBytes);
-    ~PagedFreeStore ();
-
-    // The available bytes per page is a little bit less
-    // than requested in the constructor, due to overhead.
-    //
-    inline size_t getPageBytes () const
-    {
-        return m_pageBytesAvailable;
-    }
-
-    inline void* allocate (const size_t bytes)
-    {
-        if (bytes > m_pageBytes)
-            Throw (Error ().fail (__FILE__, __LINE__, "the size is too large"));
-
-        return allocate ();
-    }
-
-    void* allocate ();
-    static void deallocate (void* const p);
-
-private:
-    void* newPage ();
-    void  onDeadlineTimer (DeadlineTimer&);
-
-private:
-    struct Page;
-    typedef LockFreeStack <Page> Pages;
-
-    struct Pool
-    {
-        CacheLine::Padded <Pages> fresh;
-        CacheLine::Padded <Pages> garbage;
-    };
-
-    static inline void* fromPage (Page* const p);
-    static inline Page* toPage (void* const p);
-
-    void dispose (Pages& pages);
-    void dispose (Pool& pool);
-
-private:
-    DeadlineTimer m_timer;
-    const size_t m_pageBytes;
-    const size_t m_pageBytesAvailable;
-    CacheLine::Aligned <Pool> m_pool1;  // pair of pools
-    CacheLine::Aligned <Pool> m_pool2;
-    Pool* volatile m_cold;            // pool which is cooling down
-    Pool* volatile m_hot;             // pool we are currently using
-    AtomicCounter m_newPagesLeft; // limit of system allocations
-
-#if 1
-    int m_swaps;
-    AtomicCounter m_total;
-    AtomicCounter m_used;
-#endif
-};
-
-#endif
diff --git a/modules/beast_core/memory/beast_StaticObject.h b/modules/beast_core/memory/beast_StaticObject.h
deleted file mode 100644
index 4019245a9f..0000000000
--- a/modules/beast_core/memory/beast_StaticObject.h
+++ /dev/null
@@ -1,172 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_STATICOBJECT_H_INCLUDED
-#define BEAST_STATICOBJECT_H_INCLUDED
-
-//
-// A full suite of thread-safe objects designed for static storage duration.
-//
-// Wraps an object with a thread-safe initialization preamble so that it can
-// properly exist with static storage duration.
-//
-// Implementation notes:
-//
-//   This is accomplished by omitting the constructor and relying on the C++
-//   specification that plain data types with static storage duration are filled
-//   with zeroes before any other initialization code executes.
-//
-// Spec: N2914=09-0104
-//
-// [3.6.2] Initialization of non-local objects
-//
-//         Objects with static storage duration (3.7.1) or thread storage
-//         duration (3.7.2) shall be zero-initialized (8.5) before any
-//         other initialization takes place.
-//
-// Requirements:
-//
-//  Object must be constructible without parameters.
-//  The StaticObject must be declared with static storage duration or
-//    the behavior is undefined.
-//
-// Usage example:
-//
-// Object* getInstance ()
-// {
-//   static StaticObject <Object> instance;
-//   return instance->getObject ();
-// }
-//
-
-namespace Static
-{
-
-//------------------------------------------------------------------------------
-
-// Holds an object with static storage duration.
-// The owner determines if and when the object is constructed and destroyed.
-// Caller is responsible for synchronization.
-//
-template <class ObjectType, class Tag>
-class Storage
-{
-public:
-    static inline void construct ()
-    {
-        new (getObjectPtr ()) ObjectType;
-    }
-
-    static inline void destroy ()
-    {
-        getObjectPtr ()->~ObjectType ();
-    }
-
-    static inline ObjectType* getObjectPtr ()
-    {
-        return reinterpret_cast <ObjectType*> (s_storage);
-    }
-
-    static inline ObjectType& getObject ()
-    {
-        return *getObjectPtr ();
-    }
-
-    inline ObjectType* operator-> () const
-    {
-        return getObjectPtr ();
-    }
-
-    inline ObjectType& operator* () const
-    {
-        return getObject ();
-    }
-
-    inline operator ObjectType* () const
-    {
-        return getObjectPtr ();
-    }
-
-    // TODO: Crashes on iOS if not accessed before usage
-    static char s_storage [sizeof (ObjectType)];
-
-private:
-};
-
-template <class ObjectType, class Tag>
-char Storage <ObjectType, Tag>::s_storage [sizeof (ObjectType)];
-
-//------------------------------------------------------------------------------
-
-// Provides a thread safe flag for indicating if and when
-// initialization is required for an object with static storage duration.
-//
-class Initializer
-{
-public:
-    // If the condition is not initialized, the first caller will
-    // receive true, while concurrent callers get blocked until
-    // initialization completes.
-    //
-    bool beginConstruction ()
-    {
-        bool needsInitialization = false;
-
-        if (m_state.get () != stateInitialized)
-        {
-            if (m_state.compareAndSetBool (stateInitializing, stateUninitialized))
-            {
-                needsInitialization = true;
-            }
-            else
-            {
-                SpinDelay delay;
-
-                do
-                {
-                    delay.pause ();
-                }
-                while (m_state.get () != stateInitialized);
-            }
-        }
-
-        return needsInitialization;
-    }
-
-    // Called to signal that the initialization is complete
-    //
-    void endConstruction ()
-    {
-        m_state.set (stateInitialized);
-    }
-
-private:
-    enum
-    {
-        stateUninitialized = 0, // must be zero
-        stateInitializing,
-        stateInitialized
-    };
-
-    Atomic <int> m_state;
-};
-
-}
-
-#endif
diff --git a/modules/beast_core/misc/beast_Main.cpp b/modules/beast_core/misc/Main.cpp
similarity index 85%
rename from modules/beast_core/misc/beast_Main.cpp
rename to modules/beast_core/misc/Main.cpp
index 029e480b29..e9ccaf4d8b 100644
--- a/modules/beast_core/misc/beast_Main.cpp
+++ b/modules/beast_core/misc/Main.cpp
@@ -17,31 +17,33 @@
 */
 //==============================================================================
 
-Static::Storage <Atomic <Main*>, Main> Main::s_instance;
+Main* Main::s_instance;
 
 Main::Main ()
 {
-    bool const replaced = s_instance->compareAndSetBool (this, nullptr);
-
     // If this happens it means there are two instances of Main!
-    if (! replaced)
-        FatalError ("Multiple instances of Main", __FILE__, __LINE__);
+    check_precondition (s_instance == nullptr);
+
+    s_instance = this;
+
 }
 
 Main::~Main ()
 {
-    s_instance->set (nullptr);
+    s_instance = nullptr;
 }
 
 Main& Main::getInstance ()
 {
-    bassert (s_instance->get () != nullptr);
+    bassert (s_instance != nullptr);
 
-    return *s_instance->get ();
+    return *s_instance;
 }
 
-void Main::runStartupUnitTests ()
+int Main::runStartupUnitTests ()
 {
+    int exitCode = EXIT_SUCCESS;
+
     struct StartupUnitTests : UnitTests
     {
         void logMessage (String const&)
@@ -105,15 +107,20 @@ void Main::runStartupUnitTests ()
     {
         tests.reportResults  ();
 
-        tests.log ("Terminating due to failed startup tests");
+        tests.log ("Terminating with an error due to failed startup tests.");
 
-        Process::terminate ();
+        exitCode = EXIT_FAILURE;
     }
+
+    return exitCode;
 }
 
 int Main::runFromMain (int argc, char const* const* argv)
 {
-    runStartupUnitTests ();
+    int exitCode (runStartupUnitTests ());
 
-    return run (argc, argv);
+    if (exitCode == EXIT_SUCCESS)
+        exitCode = run (argc, argv);
+
+    return exitCode;
 }
diff --git a/modules/beast_core/misc/beast_Main.h b/modules/beast_core/misc/Main.h
similarity index 89%
rename from modules/beast_core/misc/beast_Main.h
rename to modules/beast_core/misc/Main.h
index f167116855..0059b9cc92 100644
--- a/modules/beast_core/misc/beast_Main.h
+++ b/modules/beast_core/misc/Main.h
@@ -17,15 +17,14 @@
 */
 //==============================================================================
 
-#ifndef BEAST_MAIN_H_INCLUDED
-#define BEAST_MAIN_H_INCLUDED
-
-/** Represents a command line program's entry point.
+#ifndef BEAST_CORE_MAIN_H_INCLUDED
+#define BEAST_CORE_MAIN_H_INCLUDED
 
+/** Represents a command line program's entry point
     To use this, derive your class from @ref Main and implement the
     function run ();
 */
-class BEAST_API Main : public Uncopyable
+class Main : public Uncopyable
 {
 public:
     Main ();
@@ -70,10 +69,10 @@ protected:
     virtual int run (int argc, char const* const* argv) = 0;
 
 private:
-    void runStartupUnitTests ();
+    int runStartupUnitTests ();
 
 private:
-    static Static::Storage <Atomic <Main*>, Main> s_instance;
+    static Main* s_instance;
 };
 
 #endif
diff --git a/modules/beast_core/misc/beast_Result.cpp b/modules/beast_core/misc/Result.cpp
similarity index 97%
rename from modules/beast_core/misc/beast_Result.cpp
rename to modules/beast_core/misc/Result.cpp
index a3ad744474..cf04bbc07b 100644
--- a/modules/beast_core/misc/beast_Result.cpp
+++ b/modules/beast_core/misc/Result.cpp
@@ -64,7 +64,7 @@ bool Result::operator!= (const Result& other) const noexcept
 
 Result Result::fail (const String& errorMessage) noexcept
 {
-    return Result (errorMessage.isEmpty() ? "Unknown Error" : errorMessage);
+    return Result (errorMessage.isEmpty() ? "Unknown error" : errorMessage);
 }
 
 const String& Result::getErrorMessage() const noexcept
diff --git a/modules/beast_core/misc/beast_Result.h b/modules/beast_core/misc/Result.h
similarity index 100%
rename from modules/beast_core/misc/beast_Result.h
rename to modules/beast_core/misc/Result.h
diff --git a/modules/beast_core/misc/beast_Uuid.cpp b/modules/beast_core/misc/Uuid.cpp
similarity index 100%
rename from modules/beast_core/misc/beast_Uuid.cpp
rename to modules/beast_core/misc/Uuid.cpp
diff --git a/modules/beast_core/misc/beast_Uuid.h b/modules/beast_core/misc/Uuid.h
similarity index 100%
rename from modules/beast_core/misc/beast_Uuid.h
rename to modules/beast_core/misc/Uuid.h
diff --git a/modules/beast_core/misc/beast_WindowsRegistry.h b/modules/beast_core/misc/WindowsRegistry.h
similarity index 100%
rename from modules/beast_core/misc/beast_WindowsRegistry.h
rename to modules/beast_core/misc/WindowsRegistry.h
diff --git a/modules/beast_core/native/beast_BasicNativeHeaders.h b/modules/beast_core/native/BasicNativeHeaders.h
similarity index 99%
rename from modules/beast_core/native/beast_BasicNativeHeaders.h
rename to modules/beast_core/native/BasicNativeHeaders.h
index dae1b669a4..e20e4fd0bc 100644
--- a/modules/beast_core/native/beast_BasicNativeHeaders.h
+++ b/modules/beast_core/native/BasicNativeHeaders.h
@@ -24,7 +24,8 @@
 #ifndef BEAST_BASICNATIVEHEADERS_H_INCLUDED
 #define BEAST_BASICNATIVEHEADERS_H_INCLUDED
 
-#include "../system/TargetPlatform.h"
+#include "../../../beast/Config.h"
+
 #undef T
 
 //==============================================================================
diff --git a/modules/beast_core/native/beast_android_Files.cpp b/modules/beast_core/native/android_Files.cpp
similarity index 100%
rename from modules/beast_core/native/beast_android_Files.cpp
rename to modules/beast_core/native/android_Files.cpp
diff --git a/modules/beast_core/native/beast_android_JNIHelpers.h b/modules/beast_core/native/android_JNIHelpers.h
similarity index 100%
rename from modules/beast_core/native/beast_android_JNIHelpers.h
rename to modules/beast_core/native/android_JNIHelpers.h
diff --git a/modules/beast_core/native/beast_android_Misc.cpp b/modules/beast_core/native/android_Misc.cpp
similarity index 100%
rename from modules/beast_core/native/beast_android_Misc.cpp
rename to modules/beast_core/native/android_Misc.cpp
diff --git a/modules/beast_core/native/android_Network.cpp b/modules/beast_core/native/android_Network.cpp
new file mode 100644
index 0000000000..ec2ba4964e
--- /dev/null
+++ b/modules/beast_core/native/android_Network.cpp
@@ -0,0 +1,59 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+//==============================================================================
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
+ METHOD (constructor, "<init>", "()V") \
+ METHOD (toString, "toString", "()Ljava/lang/String;") \
+
+DECLARE_JNI_CLASS (StringBuffer, "java/lang/StringBuffer");
+#undef JNI_CLASS_MEMBERS
+
+//==============================================================================
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
+ METHOD (release, "release", "()V") \
+ METHOD (read, "read", "([BI)I") \
+ METHOD (getPosition, "getPosition", "()J") \
+ METHOD (getTotalLength, "getTotalLength", "()J") \
+ METHOD (isExhausted, "isExhausted", "()Z") \
+ METHOD (setPosition, "setPosition", "(J)Z") \
+
+DECLARE_JNI_CLASS (HTTPStream, BEAST_ANDROID_ACTIVITY_CLASSPATH "$HTTPStream");
+#undef JNI_CLASS_MEMBERS
+
+
+//==============================================================================
+void MACAddress::findAllAddresses (Array<MACAddress>& result)
+{
+    // TODO
+}
+
+
+bool Process::openEmailWithAttachments (const String& targetEmailAddress,
+                                        const String& emailSubject,
+                                        const String& bodyText,
+                                        const StringArray& filesToAttach)
+{
+    // TODO
+    return false;
+}
diff --git a/modules/beast_core/native/beast_android_SystemStats.cpp b/modules/beast_core/native/android_SystemStats.cpp
similarity index 100%
rename from modules/beast_core/native/beast_android_SystemStats.cpp
rename to modules/beast_core/native/android_SystemStats.cpp
diff --git a/modules/beast_core/native/beast_android_Threads.cpp b/modules/beast_core/native/android_Threads.cpp
similarity index 97%
rename from modules/beast_core/native/beast_android_Threads.cpp
rename to modules/beast_core/native/android_Threads.cpp
index fe0e7aaf9b..e36cdf8252 100644
--- a/modules/beast_core/native/beast_android_Threads.cpp
+++ b/modules/beast_core/native/android_Threads.cpp
@@ -57,7 +57,7 @@ void Process::setPriority (ProcessPriority prior)
     pthread_setschedparam (pthread_self(), policy, &param);
 }
 
-BEAST_API bool BEAST_CALLTYPE beast_isRunningUnderDebugger()
+bool beast_isRunningUnderDebugger()
 {
     return false;
 }
diff --git a/modules/beast_core/native/beast_android_Network.cpp b/modules/beast_core/native/beast_android_Network.cpp
deleted file mode 100644
index 86ea9596b2..0000000000
--- a/modules/beast_core/native/beast_android_Network.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Portions of this file are from JUCE.
-    Copyright (c) 2013 - Raw Material Software Ltd.
-    Please visit http://www.juce.com
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-//==============================================================================
-#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
- METHOD (constructor, "<init>", "()V") \
- METHOD (toString, "toString", "()Ljava/lang/String;") \
-
-DECLARE_JNI_CLASS (StringBuffer, "java/lang/StringBuffer");
-#undef JNI_CLASS_MEMBERS
-
-//==============================================================================
-#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
- METHOD (release, "release", "()V") \
- METHOD (read, "read", "([BI)I") \
- METHOD (getPosition, "getPosition", "()J") \
- METHOD (getTotalLength, "getTotalLength", "()J") \
- METHOD (isExhausted, "isExhausted", "()Z") \
- METHOD (setPosition, "setPosition", "(J)Z") \
-
-DECLARE_JNI_CLASS (HTTPStream, BEAST_ANDROID_ACTIVITY_CLASSPATH "$HTTPStream");
-#undef JNI_CLASS_MEMBERS
-
-
-//==============================================================================
-void MACAddress::findAllAddresses (Array<MACAddress>& result)
-{
-    // TODO
-}
-
-
-bool Process::openEmailWithAttachments (const String& targetEmailAddress,
-                                        const String& emailSubject,
-                                        const String& bodyText,
-                                        const StringArray& filesToAttach)
-{
-    // TODO
-    return false;
-}
-
-
-//==============================================================================
-class WebInputStream
-    : public InputStream
-    , LeakChecked <WebInputStream>
-{
-public:
-    //==============================================================================
-    WebInputStream (String address, bool isPost, const MemoryBlock& postData,
-                    URL::OpenStreamProgressCallback* progressCallback, void* progressCallbackContext,
-                    const String& headers, int timeOutMs, StringPairArray* responseHeaders)
-    {
-        if (! address.contains ("://"))
-            address = "http://" + address;
-
-        JNIEnv* env = getEnv();
-
-        jbyteArray postDataArray = 0;
-
-        if (postData.getSize() > 0)
-        {
-            postDataArray = env->NewByteArray (postData.getSize());
-            env->SetByteArrayRegion (postDataArray, 0, postData.getSize(), (const jbyte*) postData.getData());
-        }
-
-        LocalRef<jobject> responseHeaderBuffer (env->NewObject (StringBuffer, StringBuffer.constructor));
-
-        stream = GlobalRef (env->CallStaticObjectMethod (BeastAppActivity,
-                                                         BeastAppActivity.createHTTPStream,
-                                                         javaString (address).get(),
-                                                         (jboolean) isPost,
-                                                         postDataArray,
-                                                         javaString (headers).get(),
-                                                         (jint) timeOutMs,
-                                                         responseHeaderBuffer.get()));
-
-        if (postDataArray != 0)
-            env->DeleteLocalRef (postDataArray);
-
-        if (stream != 0)
-        {
-            StringArray headerLines;
-
-            {
-                LocalRef<jstring> headersString ((jstring) env->CallObjectMethod (responseHeaderBuffer.get(),
-                                                                                  StringBuffer.toString));
-                headerLines.addLines (beastString (env, headersString));
-            }
-
-            if (responseHeaders != 0)
-            {
-                for (int i = 0; i < headerLines.size(); ++i)
-                {
-                    const String& header = headerLines[i];
-                    const String key (header.upToFirstOccurrenceOf (": ", false, false));
-                    const String value (header.fromFirstOccurrenceOf (": ", false, false));
-                    const String previousValue ((*responseHeaders) [key]);
-
-                    responseHeaders->set (key, previousValue.isEmpty() ? value : (previousValue + "," + value));
-                }
-            }
-        }
-    }
-
-    ~WebInputStream()
-    {
-        if (stream != 0)
-            stream.callVoidMethod (HTTPStream.release);
-    }
-
-    //==============================================================================
-    bool isExhausted()                  { return stream != nullptr && stream.callBooleanMethod (HTTPStream.isExhausted); }
-    int64 getTotalLength()              { return stream != nullptr ? stream.callLongMethod (HTTPStream.getTotalLength) : 0; }
-    int64 getPosition()                 { return stream != nullptr ? stream.callLongMethod (HTTPStream.getPosition) : 0; }
-    bool setPosition (int64 wantedPos)  { return stream != nullptr && stream.callBooleanMethod (HTTPStream.setPosition, (jlong) wantedPos); }
-
-    int read (void* buffer, int bytesToRead)
-    {
-        bassert (buffer != nullptr && bytesToRead >= 0);
-
-        if (stream == nullptr)
-            return 0;
-
-        JNIEnv* env = getEnv();
-
-        jbyteArray javaArray = env->NewByteArray (bytesToRead);
-
-        int numBytes = stream.callIntMethod (HTTPStream.read, javaArray, (jint) bytesToRead);
-
-        if (numBytes > 0)
-            env->GetByteArrayRegion (javaArray, 0, numBytes, static_cast <jbyte*> (buffer));
-
-        env->DeleteLocalRef (javaArray);
-        return numBytes;
-    }
-
-    //==============================================================================
-    GlobalRef stream;
-};
-
-InputStream* URL::createNativeStream (const String& address, bool isPost, const MemoryBlock& postData,
-                                      OpenStreamProgressCallback* progressCallback, void* progressCallbackContext,
-                                      const String& headers, const int timeOutMs, StringPairArray* responseHeaders)
-{
-    ScopedPointer <WebInputStream> wi (new WebInputStream (address, isPost, postData,
-                                                           progressCallback, progressCallbackContext,
-                                                           headers, timeOutMs, responseHeaders));
-
-    return wi->stream != 0 ? wi.release() : nullptr;
-}
diff --git a/modules/beast_core/native/beast_bsd_Network.cpp b/modules/beast_core/native/beast_bsd_Network.cpp
deleted file mode 100644
index 45167cd463..0000000000
--- a/modules/beast_core/native/beast_bsd_Network.cpp
+++ /dev/null
@@ -1,455 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Portions of this file are from JUCE.
-    Copyright (c) 2013 - Raw Material Software Ltd.
-    Please visit http://www.juce.com
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-void MACAddress::findAllAddresses (Array<MACAddress>& result)
-{
-    ifaddrs* addrs = nullptr;
-
-    if (getifaddrs (&addrs) == 0)
-    {
-        for (const ifaddrs* cursor = addrs; cursor != nullptr; cursor = cursor->ifa_next)
-        {
-            sockaddr_storage* sto = (sockaddr_storage*) cursor->ifa_addr;
-            if (sto->ss_family == AF_LINK)
-            {
-                const sockaddr_dl* const sadd = (const sockaddr_dl*) cursor->ifa_addr;
-
-                #ifndef IFT_ETHER
-                 #define IFT_ETHER 6
-                #endif
-
-                if (sadd->sdl_type == IFT_ETHER)
-                    result.addIfNotAlreadyThere (MACAddress (((const uint8*) sadd->sdl_data) + sadd->sdl_nlen));
-            }
-        }
-
-        freeifaddrs (addrs);
-    }
-}
-
-
-bool Process::openEmailWithAttachments (const String& /* targetEmailAddress */,
-                                        const String& /* emailSubject */,
-                                        const String& /* bodyText */,
-                                        const StringArray& /* filesToAttach */)
-{
-    bassertfalse;    // xxx todo
-
-    return false;
-}
-
-
-//==============================================================================
-class WebInputStream
-    : public InputStream
-    , LeakChecked <WebInputStream>
-{
-public:
-    WebInputStream (const String& address_, bool isPost_, const MemoryBlock& postData_,
-                    URL::OpenStreamProgressCallback* progressCallback, void* progressCallbackContext,
-                    const String& headers_, int timeOutMs_, StringPairArray* responseHeaders)
-      : socketHandle (-1), levelsOfRedirection (0),
-        address (address_), headers (headers_), postData (postData_), position (0),
-        finished (false), isPost (isPost_), timeOutMs (timeOutMs_)
-    {
-        createConnection (progressCallback, progressCallbackContext);
-
-        if (responseHeaders != nullptr && ! isError())
-        {
-            for (int i = 0; i < headerLines.size(); ++i)
-            {
-                const String& headersEntry = headerLines[i];
-                const String key (headersEntry.upToFirstOccurrenceOf (": ", false, false));
-                const String value (headersEntry.fromFirstOccurrenceOf (": ", false, false));
-                const String previousValue ((*responseHeaders) [key]);
-                responseHeaders->set (key, previousValue.isEmpty() ? value : (previousValue + "," + value));
-            }
-        }
-    }
-
-    ~WebInputStream()
-    {
-        closeSocket();
-    }
-
-    //==============================================================================
-    bool isError() const        { return socketHandle < 0; }
-    bool isExhausted()          { return finished; }
-    int64 getPosition()         { return position; }
-
-    int64 getTotalLength()
-    {
-        //xxx to do
-        return -1;
-    }
-
-    int read (void* buffer, int bytesToRead)
-    {
-        if (finished || isError())
-            return 0;
-
-        fd_set readbits;
-        FD_ZERO (&readbits);
-        FD_SET (socketHandle, &readbits);
-
-        struct timeval tv;
-        tv.tv_sec = bmax (1, timeOutMs / 1000);
-        tv.tv_usec = 0;
-
-        if (select (socketHandle + 1, &readbits, 0, 0, &tv) <= 0)
-            return 0;   // (timeout)
-
-        const int bytesRead = bmax (0, (int) recv (socketHandle, buffer, bytesToRead, MSG_WAITALL));
-        if (bytesRead == 0)
-            finished = true;
-        position += bytesRead;
-        return bytesRead;
-    }
-
-    bool setPosition (int64 wantedPos)
-    {
-        if (isError())
-            return false;
-
-        if (wantedPos != position)
-        {
-            finished = false;
-
-            if (wantedPos < position)
-            {
-                closeSocket();
-                position = 0;
-                createConnection (0, 0);
-            }
-
-            skipNextBytes (wantedPos - position);
-        }
-
-        return true;
-    }
-
-    //==============================================================================
-private:
-    int socketHandle, levelsOfRedirection;
-    StringArray headerLines;
-    String address, headers;
-    MemoryBlock postData;
-    int64 position;
-    bool finished;
-    const bool isPost;
-    const int timeOutMs;
-
-    void closeSocket()
-    {
-        if (socketHandle >= 0)
-            close (socketHandle);
-
-        socketHandle = -1;
-        levelsOfRedirection = 0;
-    }
-
-    void createConnection (URL::OpenStreamProgressCallback* progressCallback, void* progressCallbackContext)
-    {
-        closeSocket();
-
-        uint32 timeOutTime = Time::getMillisecondCounter();
-
-        if (timeOutMs == 0)
-            timeOutTime += 60000;
-        else if (timeOutMs < 0)
-            timeOutTime = 0xffffffff;
-        else
-            timeOutTime += timeOutMs;
-
-        String hostName, hostPath;
-        int hostPort;
-        if (! decomposeURL (address, hostName, hostPath, hostPort))
-            return;
-
-        String serverName, proxyName, proxyPath;
-        int proxyPort = 0;
-        int port = 0;
-
-        const String proxyURL (getenv ("http_proxy"));
-        if (proxyURL.startsWithIgnoreCase ("http://"))
-        {
-            if (! decomposeURL (proxyURL, proxyName, proxyPath, proxyPort))
-                return;
-
-            serverName = proxyName;
-            port = proxyPort;
-        }
-        else
-        {
-            serverName = hostName;
-            port = hostPort;
-        }
-
-        struct addrinfo hints;
-        zerostruct (hints);
-
-        hints.ai_family = AF_UNSPEC;
-        hints.ai_socktype = SOCK_STREAM;
-        hints.ai_flags = AI_NUMERICSERV;
-
-        struct addrinfo* result = nullptr;
-        if (getaddrinfo (serverName.toUTF8(), String (port).toUTF8(), &hints, &result) != 0 || result == 0)
-            return;
-
-        socketHandle = socket (result->ai_family, result->ai_socktype, 0);
-
-        if (socketHandle == -1)
-        {
-            freeaddrinfo (result);
-            return;
-        }
-
-        int receiveBufferSize = 16384;
-        setsockopt (socketHandle, SOL_SOCKET, SO_RCVBUF, (char*) &receiveBufferSize, sizeof (receiveBufferSize));
-        setsockopt (socketHandle, SOL_SOCKET, SO_KEEPALIVE, 0, 0);
-
-      #if BEAST_MAC
-        setsockopt (socketHandle, SOL_SOCKET, SO_NOSIGPIPE, 0, 0);
-      #endif
-
-        if (connect (socketHandle, result->ai_addr, result->ai_addrlen) == -1)
-        {
-            closeSocket();
-            freeaddrinfo (result);
-            return;
-        }
-
-        freeaddrinfo (result);
-
-        {
-            const MemoryBlock requestHeader (createRequestHeader (hostName, hostPort, proxyName, proxyPort,
-                                                                  hostPath, address, headers, postData, isPost));
-
-            if (! sendHeader (socketHandle, requestHeader, timeOutTime, progressCallback, progressCallbackContext))
-            {
-                closeSocket();
-                return;
-            }
-        }
-
-        String responseHeader (readResponse (socketHandle, timeOutTime));
-
-        if (responseHeader.isNotEmpty())
-        {
-            headerLines = StringArray::fromLines (responseHeader);
-
-            const int statusCode = responseHeader.fromFirstOccurrenceOf (" ", false, false)
-                                                 .substring (0, 3).getIntValue();
-
-            //int contentLength = findHeaderItem (lines, "Content-Length:").getIntValue();
-            //bool isChunked = findHeaderItem (lines, "Transfer-Encoding:").equalsIgnoreCase ("chunked");
-
-            String location (findHeaderItem (headerLines, "Location:"));
-
-            if (statusCode >= 300 && statusCode < 400 && location.isNotEmpty())
-            {
-                if (! location.startsWithIgnoreCase ("http://"))
-                    location = "http://" + location;
-
-                if (++levelsOfRedirection <= 3)
-                {
-                    address = location;
-                    createConnection (progressCallback, progressCallbackContext);
-                    return;
-                }
-            }
-            else
-            {
-                levelsOfRedirection = 0;
-                return;
-            }
-        }
-
-        closeSocket();
-    }
-
-    //==============================================================================
-    static String readResponse (const int socketHandle, const uint32 timeOutTime)
-    {
-        int bytesRead = 0, numConsecutiveLFs  = 0;
-        MemoryBlock buffer (1024, true);
-
-        while (numConsecutiveLFs < 2 && bytesRead < 32768
-                && Time::getMillisecondCounter() <= timeOutTime)
-        {
-            fd_set readbits;
-            FD_ZERO (&readbits);
-            FD_SET (socketHandle, &readbits);
-
-            struct timeval tv;
-            tv.tv_sec = bmax (1, (int) (timeOutTime - Time::getMillisecondCounter()) / 1000);
-            tv.tv_usec = 0;
-
-            if (select (socketHandle + 1, &readbits, 0, 0, &tv) <= 0)
-                return String::empty;  // (timeout)
-
-            buffer.ensureSize (bytesRead + 8, true);
-            char* const dest = (char*) buffer.getData() + bytesRead;
-
-            if (recv (socketHandle, dest, 1, 0) == -1)
-                return String::empty;
-
-            const char lastByte = *dest;
-            ++bytesRead;
-
-            if (lastByte == '\n')
-                ++numConsecutiveLFs;
-            else if (lastByte != '\r')
-                numConsecutiveLFs = 0;
-        }
-
-        const String header (CharPointer_UTF8 ((const char*) buffer.getData()));
-
-        if (header.startsWithIgnoreCase ("HTTP/"))
-            return header.trimEnd();
-
-        return String::empty;
-    }
-
-    static void writeValueIfNotPresent (MemoryOutputStream& dest, const String& headers, const String& key, const String& value)
-    {
-        if (! headers.containsIgnoreCase (key))
-            dest << "\r\n" << key << ' ' << value;
-    }
-
-    static void writeHost (MemoryOutputStream& dest, const bool isPost, const String& path, const String& host, const int port)
-    {
-        dest << (isPost ? "POST " : "GET ") << path << " HTTP/1.0\r\nHost: " << host;
-
-        if (port > 0)
-            dest << ':' << port;
-    }
-
-    static MemoryBlock createRequestHeader (const String& hostName, const int hostPort,
-                                            const String& proxyName, const int proxyPort,
-                                            const String& hostPath, const String& originalURL,
-                                            const String& userHeaders, const MemoryBlock& postData,
-                                            const bool isPost)
-    {
-        MemoryOutputStream header;
-
-        if (proxyName.isEmpty())
-            writeHost (header, isPost, hostPath, hostName, hostPort);
-        else
-            writeHost (header, isPost, originalURL, proxyName, proxyPort);
-
-        writeValueIfNotPresent (header, userHeaders, "User-Agent:", "BEAST/" BEAST_STRINGIFY(BEAST_MAJOR_VERSION)
-                                                                        "." BEAST_STRINGIFY(BEAST_MINOR_VERSION)
-                                                                        "." BEAST_STRINGIFY(BEAST_BUILDNUMBER));
-        writeValueIfNotPresent (header, userHeaders, "Connection:", "Close");
-
-        if (isPost)
-            writeValueIfNotPresent (header, userHeaders, "Content-Length:", String ((int) postData.getSize()));
-
-        header << "\r\n" << userHeaders
-               << "\r\n" << postData;
-
-        return header.getMemoryBlock();
-    }
-
-    static bool sendHeader (int socketHandle, const MemoryBlock& requestHeader, const uint32 timeOutTime,
-                            URL::OpenStreamProgressCallback* progressCallback, void* progressCallbackContext)
-    {
-        size_t totalHeaderSent = 0;
-
-        while (totalHeaderSent < requestHeader.getSize())
-        {
-            if (Time::getMillisecondCounter() > timeOutTime)
-                return false;
-
-            const int numToSend = bmin (1024, (int) (requestHeader.getSize() - totalHeaderSent));
-
-            if (send (socketHandle, static_cast <const char*> (requestHeader.getData()) + totalHeaderSent, numToSend, 0) != numToSend)
-                return false;
-
-            totalHeaderSent += numToSend;
-
-            if (progressCallback != nullptr && ! progressCallback (progressCallbackContext, totalHeaderSent, requestHeader.getSize()))
-                return false;
-        }
-
-        return true;
-    }
-
-    static bool decomposeURL (const String& url, String& host, String& path, int& port)
-    {
-        if (! url.startsWithIgnoreCase ("http://"))
-            return false;
-
-        const int nextSlash = url.indexOfChar (7, '/');
-        int nextColon = url.indexOfChar (7, ':');
-        if (nextColon > nextSlash && nextSlash > 0)
-            nextColon = -1;
-
-        if (nextColon >= 0)
-        {
-            host = url.substring (7, nextColon);
-
-            if (nextSlash >= 0)
-                port = url.substring (nextColon + 1, nextSlash).getIntValue();
-            else
-                port = url.substring (nextColon + 1).getIntValue();
-        }
-        else
-        {
-            port = 80;
-
-            if (nextSlash >= 0)
-                host = url.substring (7, nextSlash);
-            else
-                host = url.substring (7);
-        }
-
-        if (nextSlash >= 0)
-            path = url.substring (nextSlash);
-        else
-            path = "/";
-
-        return true;
-    }
-
-    static String findHeaderItem (const StringArray& lines, const String& itemName)
-    {
-        for (int i = 0; i < lines.size(); ++i)
-            if (lines[i].startsWithIgnoreCase (itemName))
-                return lines[i].substring (itemName.length()).trim();
-
-        return String::empty;
-    }
-};
-
-InputStream* URL::createNativeStream (const String& address, bool isPost, const MemoryBlock& postData,
-                                      OpenStreamProgressCallback* progressCallback, void* progressCallbackContext,
-                                      const String& headers, const int timeOutMs, StringPairArray* responseHeaders)
-{
-    ScopedPointer <WebInputStream> wi (new WebInputStream (address, isPost, postData,
-                                                           progressCallback, progressCallbackContext,
-                                                           headers, timeOutMs, responseHeaders));
-
-    return wi->isError() ? nullptr : wi.release();
-}
diff --git a/modules/beast_core/native/beast_linux_Network.cpp b/modules/beast_core/native/beast_linux_Network.cpp
deleted file mode 100644
index 137718093c..0000000000
--- a/modules/beast_core/native/beast_linux_Network.cpp
+++ /dev/null
@@ -1,457 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Portions of this file are from JUCE.
-    Copyright (c) 2013 - Raw Material Software Ltd.
-    Please visit http://www.juce.com
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-void MACAddress::findAllAddresses (Array<MACAddress>& result)
-{
-    const int s = socket (AF_INET, SOCK_DGRAM, 0);
-    if (s != -1)
-    {
-        char buf [1024];
-        struct ifconf ifc;
-        ifc.ifc_len = sizeof (buf);
-        ifc.ifc_buf = buf;
-        ioctl (s, SIOCGIFCONF, &ifc);
-
-        for (unsigned int i = 0; i < ifc.ifc_len / sizeof (struct ifreq); ++i)
-        {
-            struct ifreq ifr;
-            strcpy (ifr.ifr_name, ifc.ifc_req[i].ifr_name);
-
-            if (ioctl (s, SIOCGIFFLAGS, &ifr) == 0
-                 && (ifr.ifr_flags & IFF_LOOPBACK) == 0
-                 && ioctl (s, SIOCGIFHWADDR, &ifr) == 0)
-            {
-                result.addIfNotAlreadyThere (MACAddress ((const uint8*) ifr.ifr_hwaddr.sa_data));
-            }
-        }
-
-        close (s);
-    }
-}
-
-
-bool Process::openEmailWithAttachments (const String& /* targetEmailAddress */,
-                                        const String& /* emailSubject */,
-                                        const String& /* bodyText */,
-                                        const StringArray& /* filesToAttach */)
-{
-    bassertfalse;    // xxx todo
-
-    return false;
-}
-
-
-//==============================================================================
-class WebInputStream
-    : public InputStream
-    , LeakChecked <WebInputStream>
-{
-public:
-    WebInputStream (const String& address_, bool isPost_, const MemoryBlock& postData_,
-                    URL::OpenStreamProgressCallback* progressCallback, void* progressCallbackContext,
-                    const String& headers_, int timeOutMs_, StringPairArray* responseHeaders)
-      : socketHandle (-1), levelsOfRedirection (0),
-        address (address_), headers (headers_), postData (postData_), position (0),
-        finished (false), isPost (isPost_), timeOutMs (timeOutMs_)
-    {
-        createConnection (progressCallback, progressCallbackContext);
-
-        if (responseHeaders != nullptr && ! isError())
-        {
-            for (int i = 0; i < headerLines.size(); ++i)
-            {
-                const String& headersEntry = headerLines[i];
-                const String key (headersEntry.upToFirstOccurrenceOf (": ", false, false));
-                const String value (headersEntry.fromFirstOccurrenceOf (": ", false, false));
-                const String previousValue ((*responseHeaders) [key]);
-                responseHeaders->set (key, previousValue.isEmpty() ? value : (previousValue + "," + value));
-            }
-        }
-    }
-
-    ~WebInputStream()
-    {
-        closeSocket();
-    }
-
-    //==============================================================================
-    bool isError() const        { return socketHandle < 0; }
-    bool isExhausted()          { return finished; }
-    int64 getPosition()         { return position; }
-
-    int64 getTotalLength()
-    {
-        //xxx to do
-        return -1;
-    }
-
-    int read (void* buffer, int bytesToRead)
-    {
-        if (finished || isError())
-            return 0;
-
-        fd_set readbits;
-        FD_ZERO (&readbits);
-        FD_SET (socketHandle, &readbits);
-
-        struct timeval tv;
-        tv.tv_sec = bmax (1, timeOutMs / 1000);
-        tv.tv_usec = 0;
-
-        if (select (socketHandle + 1, &readbits, 0, 0, &tv) <= 0)
-            return 0;   // (timeout)
-
-        const int bytesRead = bmax (0, (int) recv (socketHandle, buffer, bytesToRead, MSG_WAITALL));
-        if (bytesRead == 0)
-            finished = true;
-        position += bytesRead;
-        return bytesRead;
-    }
-
-    bool setPosition (int64 wantedPos)
-    {
-        if (isError())
-            return false;
-
-        if (wantedPos != position)
-        {
-            finished = false;
-
-            if (wantedPos < position)
-            {
-                closeSocket();
-                position = 0;
-                createConnection (0, 0);
-            }
-
-            skipNextBytes (wantedPos - position);
-        }
-
-        return true;
-    }
-
-    //==============================================================================
-private:
-    int socketHandle, levelsOfRedirection;
-    StringArray headerLines;
-    String address, headers;
-    MemoryBlock postData;
-    int64 position;
-    bool finished;
-    const bool isPost;
-    const int timeOutMs;
-
-    void closeSocket()
-    {
-        if (socketHandle >= 0)
-            close (socketHandle);
-
-        socketHandle = -1;
-        levelsOfRedirection = 0;
-    }
-
-    void createConnection (URL::OpenStreamProgressCallback* progressCallback, void* progressCallbackContext)
-    {
-        closeSocket();
-
-        uint32 timeOutTime = Time::getMillisecondCounter();
-
-        if (timeOutMs == 0)
-            timeOutTime += 60000;
-        else if (timeOutMs < 0)
-            timeOutTime = 0xffffffff;
-        else
-            timeOutTime += timeOutMs;
-
-        String hostName, hostPath;
-        int hostPort;
-        if (! decomposeURL (address, hostName, hostPath, hostPort))
-            return;
-
-        String serverName, proxyName, proxyPath;
-        int proxyPort = 0;
-        int port = 0;
-
-        const String proxyURL (getenv ("http_proxy"));
-        if (proxyURL.startsWithIgnoreCase ("http://"))
-        {
-            if (! decomposeURL (proxyURL, proxyName, proxyPath, proxyPort))
-                return;
-
-            serverName = proxyName;
-            port = proxyPort;
-        }
-        else
-        {
-            serverName = hostName;
-            port = hostPort;
-        }
-
-        struct addrinfo hints;
-        zerostruct (hints);
-
-        hints.ai_family = AF_UNSPEC;
-        hints.ai_socktype = SOCK_STREAM;
-        hints.ai_flags = AI_NUMERICSERV;
-
-        struct addrinfo* result = nullptr;
-        if (getaddrinfo (serverName.toUTF8(), String (port).toUTF8(), &hints, &result) != 0 || result == 0)
-            return;
-
-        socketHandle = socket (result->ai_family, result->ai_socktype, 0);
-
-        if (socketHandle == -1)
-        {
-            freeaddrinfo (result);
-            return;
-        }
-
-        int receiveBufferSize = 16384;
-        setsockopt (socketHandle, SOL_SOCKET, SO_RCVBUF, (char*) &receiveBufferSize, sizeof (receiveBufferSize));
-        setsockopt (socketHandle, SOL_SOCKET, SO_KEEPALIVE, 0, 0);
-
-      #if BEAST_MAC
-        setsockopt (socketHandle, SOL_SOCKET, SO_NOSIGPIPE, 0, 0);
-      #endif
-
-        if (connect (socketHandle, result->ai_addr, result->ai_addrlen) == -1)
-        {
-            closeSocket();
-            freeaddrinfo (result);
-            return;
-        }
-
-        freeaddrinfo (result);
-
-        {
-            const MemoryBlock requestHeader (createRequestHeader (hostName, hostPort, proxyName, proxyPort,
-                                                                  hostPath, address, headers, postData, isPost));
-
-            if (! sendHeader (socketHandle, requestHeader, timeOutTime, progressCallback, progressCallbackContext))
-            {
-                closeSocket();
-                return;
-            }
-        }
-
-        String responseHeader (readResponse (socketHandle, timeOutTime));
-
-        if (responseHeader.isNotEmpty())
-        {
-            headerLines = StringArray::fromLines (responseHeader);
-
-            const int statusCode = responseHeader.fromFirstOccurrenceOf (" ", false, false)
-                                                 .substring (0, 3).getIntValue();
-
-            //int contentLength = findHeaderItem (lines, "Content-Length:").getIntValue();
-            //bool isChunked = findHeaderItem (lines, "Transfer-Encoding:").equalsIgnoreCase ("chunked");
-
-            String location (findHeaderItem (headerLines, "Location:"));
-
-            if (statusCode >= 300 && statusCode < 400 && location.isNotEmpty())
-            {
-                if (! location.startsWithIgnoreCase ("http://"))
-                    location = "http://" + location;
-
-                if (++levelsOfRedirection <= 3)
-                {
-                    address = location;
-                    createConnection (progressCallback, progressCallbackContext);
-                    return;
-                }
-            }
-            else
-            {
-                levelsOfRedirection = 0;
-                return;
-            }
-        }
-
-        closeSocket();
-    }
-
-    //==============================================================================
-    static String readResponse (const int socketHandle, const uint32 timeOutTime)
-    {
-        int bytesRead = 0, numConsecutiveLFs  = 0;
-        MemoryBlock buffer (1024, true);
-
-        while (numConsecutiveLFs < 2 && bytesRead < 32768
-                && Time::getMillisecondCounter() <= timeOutTime)
-        {
-            fd_set readbits;
-            FD_ZERO (&readbits);
-            FD_SET (socketHandle, &readbits);
-
-            struct timeval tv;
-            tv.tv_sec = bmax (1, (int) (timeOutTime - Time::getMillisecondCounter()) / 1000);
-            tv.tv_usec = 0;
-
-            if (select (socketHandle + 1, &readbits, 0, 0, &tv) <= 0)
-                return String::empty;  // (timeout)
-
-            buffer.ensureSize (bytesRead + 8, true);
-            char* const dest = (char*) buffer.getData() + bytesRead;
-
-            if (recv (socketHandle, dest, 1, 0) == -1)
-                return String::empty;
-
-            const char lastByte = *dest;
-            ++bytesRead;
-
-            if (lastByte == '\n')
-                ++numConsecutiveLFs;
-            else if (lastByte != '\r')
-                numConsecutiveLFs = 0;
-        }
-
-        const String header (CharPointer_UTF8 ((const char*) buffer.getData()));
-
-        if (header.startsWithIgnoreCase ("HTTP/"))
-            return header.trimEnd();
-
-        return String::empty;
-    }
-
-    static void writeValueIfNotPresent (MemoryOutputStream& dest, const String& headers, const String& key, const String& value)
-    {
-        if (! headers.containsIgnoreCase (key))
-            dest << "\r\n" << key << ' ' << value;
-    }
-
-    static void writeHost (MemoryOutputStream& dest, const bool isPost, const String& path, const String& host, const int port)
-    {
-        dest << (isPost ? "POST " : "GET ") << path << " HTTP/1.0\r\nHost: " << host;
-
-        if (port > 0)
-            dest << ':' << port;
-    }
-
-    static MemoryBlock createRequestHeader (const String& hostName, const int hostPort,
-                                            const String& proxyName, const int proxyPort,
-                                            const String& hostPath, const String& originalURL,
-                                            const String& userHeaders, const MemoryBlock& postData,
-                                            const bool isPost)
-    {
-        MemoryOutputStream header;
-
-        if (proxyName.isEmpty())
-            writeHost (header, isPost, hostPath, hostName, hostPort);
-        else
-            writeHost (header, isPost, originalURL, proxyName, proxyPort);
-
-        writeValueIfNotPresent (header, userHeaders, "User-Agent:", "BEAST/" BEAST_STRINGIFY(BEAST_MAJOR_VERSION)
-                                                                        "." BEAST_STRINGIFY(BEAST_MINOR_VERSION)
-                                                                        "." BEAST_STRINGIFY(BEAST_BUILDNUMBER));
-        writeValueIfNotPresent (header, userHeaders, "Connection:", "Close");
-
-        if (isPost)
-            writeValueIfNotPresent (header, userHeaders, "Content-Length:", String ((int) postData.getSize()));
-
-        header << "\r\n" << userHeaders
-               << "\r\n" << postData;
-
-        return header.getMemoryBlock();
-    }
-
-    static bool sendHeader (int socketHandle, const MemoryBlock& requestHeader, const uint32 timeOutTime,
-                            URL::OpenStreamProgressCallback* progressCallback, void* progressCallbackContext)
-    {
-        size_t totalHeaderSent = 0;
-
-        while (totalHeaderSent < requestHeader.getSize())
-        {
-            if (Time::getMillisecondCounter() > timeOutTime)
-                return false;
-
-            const int numToSend = bmin (1024, (int) (requestHeader.getSize() - totalHeaderSent));
-
-            if (send (socketHandle, static_cast <const char*> (requestHeader.getData()) + totalHeaderSent, numToSend, 0) != numToSend)
-                return false;
-
-            totalHeaderSent += numToSend;
-
-            if (progressCallback != nullptr && ! progressCallback (progressCallbackContext, totalHeaderSent, requestHeader.getSize()))
-                return false;
-        }
-
-        return true;
-    }
-
-    static bool decomposeURL (const String& url, String& host, String& path, int& port)
-    {
-        if (! url.startsWithIgnoreCase ("http://"))
-            return false;
-
-        const int nextSlash = url.indexOfChar (7, '/');
-        int nextColon = url.indexOfChar (7, ':');
-        if (nextColon > nextSlash && nextSlash > 0)
-            nextColon = -1;
-
-        if (nextColon >= 0)
-        {
-            host = url.substring (7, nextColon);
-
-            if (nextSlash >= 0)
-                port = url.substring (nextColon + 1, nextSlash).getIntValue();
-            else
-                port = url.substring (nextColon + 1).getIntValue();
-        }
-        else
-        {
-            port = 80;
-
-            if (nextSlash >= 0)
-                host = url.substring (7, nextSlash);
-            else
-                host = url.substring (7);
-        }
-
-        if (nextSlash >= 0)
-            path = url.substring (nextSlash);
-        else
-            path = "/";
-
-        return true;
-    }
-
-    static String findHeaderItem (const StringArray& lines, const String& itemName)
-    {
-        for (int i = 0; i < lines.size(); ++i)
-            if (lines[i].startsWithIgnoreCase (itemName))
-                return lines[i].substring (itemName.length()).trim();
-
-        return String::empty;
-    }
-};
-
-InputStream* URL::createNativeStream (const String& address, bool isPost, const MemoryBlock& postData,
-                                      OpenStreamProgressCallback* progressCallback, void* progressCallbackContext,
-                                      const String& headers, const int timeOutMs, StringPairArray* responseHeaders)
-{
-    ScopedPointer <WebInputStream> wi (new WebInputStream (address, isPost, postData,
-                                                           progressCallback, progressCallbackContext,
-                                                           headers, timeOutMs, responseHeaders));
-
-    return wi->isError() ? nullptr : wi.release();
-}
diff --git a/modules/beast_core/native/beast_win32_Network.cpp b/modules/beast_core/native/beast_win32_Network.cpp
deleted file mode 100644
index f239d190c7..0000000000
--- a/modules/beast_core/native/beast_win32_Network.cpp
+++ /dev/null
@@ -1,464 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Portions of this file are from JUCE.
-    Copyright (c) 2013 - Raw Material Software Ltd.
-    Please visit http://www.juce.com
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef INTERNET_FLAG_NEED_FILE
- #define INTERNET_FLAG_NEED_FILE 0x00000010
-#endif
-
-#ifndef INTERNET_OPTION_DISABLE_AUTODIAL
- #define INTERNET_OPTION_DISABLE_AUTODIAL 70
-#endif
-
-//==============================================================================
-class WebInputStream
-    : public InputStream
-    , LeakChecked <WebInputStream>
-{
-public:
-    WebInputStream (const String& address_, bool isPost_, const MemoryBlock& postData_,
-                    URL::OpenStreamProgressCallback* progressCallback, void* progressCallbackContext,
-                    const String& headers_, int timeOutMs_, StringPairArray* responseHeaders)
-      : connection (0), request (0),
-        address (address_), headers (headers_), postData (postData_), position (0),
-        finished (false), isPost (isPost_), timeOutMs (timeOutMs_)
-    {
-        createConnection (progressCallback, progressCallbackContext);
-
-        if (responseHeaders != nullptr && ! isError())
-        {
-            DWORD bufferSizeBytes = 4096;
-
-            for (;;)
-            {
-                HeapBlock<char> buffer ((size_t) bufferSizeBytes);
-
-                if (HttpQueryInfo (request, HTTP_QUERY_RAW_HEADERS_CRLF, buffer.getData(), &bufferSizeBytes, 0))
-                {
-                    StringArray headersArray;
-                    headersArray.addLines (reinterpret_cast <const WCHAR*> (buffer.getData()));
-
-                    for (int i = 0; i < headersArray.size(); ++i)
-                    {
-                        const String& header = headersArray[i];
-                        const String key (header.upToFirstOccurrenceOf (": ", false, false));
-                        const String value (header.fromFirstOccurrenceOf (": ", false, false));
-                        const String previousValue ((*responseHeaders) [key]);
-
-                        responseHeaders->set (key, previousValue.isEmpty() ? value : (previousValue + "," + value));
-                    }
-
-                    break;
-                }
-
-                if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-                    break;
-            }
-        }
-    }
-
-    ~WebInputStream()
-    {
-        close();
-    }
-
-    //==============================================================================
-    bool isError() const        { return request == 0; }
-    bool isExhausted()          { return finished; }
-    int64 getPosition()         { return position; }
-
-    int64 getTotalLength()
-    {
-        if (! isError())
-        {
-            DWORD index = 0, result = 0, size = sizeof (result);
-
-            if (HttpQueryInfo (request, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &result, &size, &index))
-                return (int64) result;
-        }
-
-        return -1;
-    }
-
-    int read (void* buffer, int bytesToRead)
-    {
-        bassert (buffer != nullptr && bytesToRead >= 0);
-        DWORD bytesRead = 0;
-
-        if (! (finished || isError()))
-        {
-            InternetReadFile (request, buffer, (DWORD) bytesToRead, &bytesRead);
-            position += bytesRead;
-
-            if (bytesRead == 0)
-                finished = true;
-        }
-
-        return (int) bytesRead;
-    }
-
-    bool setPosition (int64 wantedPos)
-    {
-        if (isError())
-            return false;
-
-        if (wantedPos != position)
-        {
-            finished = false;
-            position = (int64) InternetSetFilePointer (request, (LONG) wantedPos, 0, FILE_BEGIN, 0);
-
-            if (position == wantedPos)
-                return true;
-
-            if (wantedPos < position)
-            {
-                close();
-                position = 0;
-                createConnection (0, 0);
-            }
-
-            skipNextBytes (wantedPos - position);
-        }
-
-        return true;
-    }
-
-private:
-    //==============================================================================
-    HINTERNET connection, request;
-    String address, headers;
-    MemoryBlock postData;
-    int64 position;
-    bool finished;
-    const bool isPost;
-    int timeOutMs;
-
-    void close()
-    {
-        if (request != 0)
-        {
-            InternetCloseHandle (request);
-            request = 0;
-        }
-
-        if (connection != 0)
-        {
-            InternetCloseHandle (connection);
-            connection = 0;
-        }
-    }
-
-    void createConnection (URL::OpenStreamProgressCallback* progressCallback,
-                           void* progressCallbackContext)
-    {
-        static HINTERNET sessionHandle = InternetOpen (_T("beast"), INTERNET_OPEN_TYPE_PRECONFIG, 0, 0, 0);
-
-        close();
-
-        if (sessionHandle != 0)
-        {
-            // break up the url..
-            const int fileNumChars = 65536;
-            const int serverNumChars = 2048;
-            const int usernameNumChars = 1024;
-            const int passwordNumChars = 1024;
-            HeapBlock<TCHAR> file (fileNumChars), server (serverNumChars),
-                             username (usernameNumChars), password (passwordNumChars);
-
-            URL_COMPONENTS uc = { 0 };
-            uc.dwStructSize = sizeof (uc);
-            uc.lpszUrlPath = file;
-            uc.dwUrlPathLength = fileNumChars;
-            uc.lpszHostName = server;
-            uc.dwHostNameLength = serverNumChars;
-            uc.lpszUserName = username;
-            uc.dwUserNameLength = usernameNumChars;
-            uc.lpszPassword = password;
-            uc.dwPasswordLength = passwordNumChars;
-
-            if (InternetCrackUrl (address.toWideCharPointer(), 0, 0, &uc))
-                openConnection (uc, sessionHandle, progressCallback, progressCallbackContext);
-        }
-    }
-
-    void openConnection (URL_COMPONENTS& uc, HINTERNET sessionHandle,
-                         URL::OpenStreamProgressCallback* progressCallback,
-                         void* progressCallbackContext)
-    {
-        int disable = 1;
-        InternetSetOption (sessionHandle, INTERNET_OPTION_DISABLE_AUTODIAL, &disable, sizeof (disable));
-
-        if (timeOutMs == 0)
-            timeOutMs = 30000;
-        else if (timeOutMs < 0)
-            timeOutMs = -1;
-
-        applyTimeout (sessionHandle, INTERNET_OPTION_CONNECT_TIMEOUT);
-        applyTimeout (sessionHandle, INTERNET_OPTION_RECEIVE_TIMEOUT);
-        applyTimeout (sessionHandle, INTERNET_OPTION_SEND_TIMEOUT);
-        applyTimeout (sessionHandle, INTERNET_OPTION_DATA_RECEIVE_TIMEOUT);
-        applyTimeout (sessionHandle, INTERNET_OPTION_DATA_SEND_TIMEOUT);
-
-        const bool isFtp = address.startsWithIgnoreCase ("ftp:");
-
-        connection = InternetConnect (sessionHandle, uc.lpszHostName, uc.nPort,
-                                      uc.lpszUserName, uc.lpszPassword,
-                                      isFtp ? (DWORD) INTERNET_SERVICE_FTP
-                                            : (DWORD) INTERNET_SERVICE_HTTP,
-                                      0, 0);
-        if (connection != 0)
-        {
-            if (isFtp)
-                request = FtpOpenFile (connection, uc.lpszUrlPath, GENERIC_READ,
-                                       FTP_TRANSFER_TYPE_BINARY | INTERNET_FLAG_NEED_FILE, 0);
-            else
-                openHTTPConnection (uc, progressCallback, progressCallbackContext);
-        }
-    }
-
-    void applyTimeout (HINTERNET sessionHandle, const DWORD option)
-    {
-        InternetSetOption (sessionHandle, option, &timeOutMs, sizeof (timeOutMs));
-    }
-
-    void openHTTPConnection (URL_COMPONENTS& uc, URL::OpenStreamProgressCallback* progressCallback,
-                             void* progressCallbackContext)
-    {
-        const TCHAR* mimeTypes[] = { _T("*/*"), nullptr };
-
-        DWORD flags = INTERNET_FLAG_RELOAD | INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_NO_COOKIES;
-
-        if (address.startsWithIgnoreCase ("https:"))
-            flags |= INTERNET_FLAG_SECURE;  // (this flag only seems necessary if the OS is running IE6 -
-                                            //  IE7 seems to automatically work out when it's https)
-
-        request = HttpOpenRequest (connection, isPost ? _T("POST") : _T("GET"),
-                                   uc.lpszUrlPath, 0, 0, mimeTypes, flags, 0);
-
-        if (request != 0)
-        {
-            INTERNET_BUFFERS buffers = { 0 };
-            buffers.dwStructSize = sizeof (INTERNET_BUFFERS);
-            buffers.lpcszHeader = headers.toWideCharPointer();
-            buffers.dwHeadersLength = (DWORD) headers.length();
-            buffers.dwBufferTotal = (DWORD) postData.getSize();
-
-            if (HttpSendRequestEx (request, &buffers, 0, HSR_INITIATE, 0))
-            {
-                int bytesSent = 0;
-
-                for (;;)
-                {
-                    const int bytesToDo = bmin (1024, (int) postData.getSize() - bytesSent);
-                    DWORD bytesDone = 0;
-
-                    if (bytesToDo > 0
-                         && ! InternetWriteFile (request,
-                                                 static_cast <const char*> (postData.getData()) + bytesSent,
-                                                 (DWORD) bytesToDo, &bytesDone))
-                    {
-                        break;
-                    }
-
-                    if (bytesToDo == 0 || (int) bytesDone < bytesToDo)
-                    {
-                        if (HttpEndRequest (request, 0, 0, 0))
-                            return;
-
-                        break;
-                    }
-
-                    bytesSent += bytesDone;
-
-                    if (progressCallback != nullptr
-                          && ! progressCallback (progressCallbackContext, bytesSent, (int) postData.getSize()))
-                        break;
-                }
-            }
-        }
-
-        close();
-    }
-};
-
-InputStream* URL::createNativeStream (const String& address, bool isPost, const MemoryBlock& postData,
-                                      OpenStreamProgressCallback* progressCallback, void* progressCallbackContext,
-                                      const String& headers, const int timeOutMs, StringPairArray* responseHeaders)
-{
-    ScopedPointer <WebInputStream> wi (new WebInputStream (address, isPost, postData,
-                                                           progressCallback, progressCallbackContext,
-                                                           headers, timeOutMs, responseHeaders));
-
-    return wi->isError() ? nullptr : wi.release();
-}
-
-
-//==============================================================================
-struct GetAdaptersInfoHelper
-{
-    bool callGetAdaptersInfo()
-    {
-        DynamicLibrary dll ("iphlpapi.dll");
-        BEAST_LOAD_WINAPI_FUNCTION (dll, GetAdaptersInfo, getAdaptersInfo, DWORD, (PIP_ADAPTER_INFO, PULONG))
-
-        if (getAdaptersInfo == nullptr)
-            return false;
-
-        adapterInfo.malloc (1);
-        ULONG len = sizeof (IP_ADAPTER_INFO);
-
-        if (getAdaptersInfo (adapterInfo, &len) == ERROR_BUFFER_OVERFLOW)
-            adapterInfo.malloc (len, 1);
-
-        return getAdaptersInfo (adapterInfo, &len) == NO_ERROR;
-    }
-
-    HeapBlock<IP_ADAPTER_INFO> adapterInfo;
-};
-
-namespace MACAddressHelpers
-{
-    void getViaGetAdaptersInfo (Array<MACAddress>& result)
-    {
-        GetAdaptersInfoHelper gah;
-
-        if (gah.callGetAdaptersInfo())
-        {
-            for (PIP_ADAPTER_INFO adapter = gah.adapterInfo; adapter != nullptr; adapter = adapter->Next)
-                if (adapter->AddressLength >= 6)
-                    result.addIfNotAlreadyThere (MACAddress (adapter->Address));
-        }
-    }
-
-    void getViaNetBios (Array<MACAddress>& result)
-    {
-        DynamicLibrary dll ("netapi32.dll");
-        BEAST_LOAD_WINAPI_FUNCTION (dll, Netbios, NetbiosCall, UCHAR, (PNCB))
-
-        if (NetbiosCall != 0)
-        {
-            LANA_ENUM enums = { 0 };
-
-            {
-                NCB ncb = { 0 };
-                ncb.ncb_command = NCBENUM;
-                ncb.ncb_buffer = (unsigned char*) &enums;
-                ncb.ncb_length = sizeof (LANA_ENUM);
-                NetbiosCall (&ncb);
-            }
-
-            for (int i = 0; i < enums.length; ++i)
-            {
-                NCB ncb2 = { 0 };
-                ncb2.ncb_command = NCBRESET;
-                ncb2.ncb_lana_num = enums.lana[i];
-
-                if (NetbiosCall (&ncb2) == 0)
-                {
-                    NCB ncb = { 0 };
-                    memcpy (ncb.ncb_callname, "*                   ", NCBNAMSZ);
-                    ncb.ncb_command = NCBASTAT;
-                    ncb.ncb_lana_num = enums.lana[i];
-
-                    struct ASTAT
-                    {
-                        ADAPTER_STATUS adapt;
-                        NAME_BUFFER    NameBuff [30];
-                    };
-
-                    ASTAT astat;
-                    zerostruct (astat);
-                    ncb.ncb_buffer = (unsigned char*) &astat;
-                    ncb.ncb_length = sizeof (ASTAT);
-
-                    if (NetbiosCall (&ncb) == 0 && astat.adapt.adapter_type == 0xfe)
-                        result.addIfNotAlreadyThere (MACAddress (astat.adapt.adapter_address));
-                }
-            }
-        }
-    }
-}
-
-void MACAddress::findAllAddresses (Array<MACAddress>& result)
-{
-    MACAddressHelpers::getViaGetAdaptersInfo (result);
-    MACAddressHelpers::getViaNetBios (result);
-}
-
-void IPAddress::findAllAddresses (Array<IPAddress>& result)
-{
-    result.addIfNotAlreadyThere (IPAddress::local());
-
-    GetAdaptersInfoHelper gah;
-
-    if (gah.callGetAdaptersInfo())
-    {
-        for (PIP_ADAPTER_INFO adapter = gah.adapterInfo; adapter != nullptr; adapter = adapter->Next)
-        {
-            IPAddress ip (adapter->IpAddressList.IpAddress.String);
-
-            if (ip != IPAddress::any())
-                result.addIfNotAlreadyThere (ip);
-        }
-    }
-}
-
-//==============================================================================
-bool Process::openEmailWithAttachments (const String& targetEmailAddress,
-                                        const String& emailSubject,
-                                        const String& bodyText,
-                                        const StringArray& filesToAttach)
-{
-    DynamicLibrary dll ("MAPI32.dll");
-    BEAST_LOAD_WINAPI_FUNCTION (dll, MAPISendMail, mapiSendMail,
-                               ULONG, (LHANDLE, ULONG, lpMapiMessage, ::FLAGS, ULONG))
-
-    if (mapiSendMail == nullptr)
-        return false;
-
-    MapiMessage message = { 0 };
-    message.lpszSubject = (LPSTR) emailSubject.toRawUTF8();
-    message.lpszNoteText = (LPSTR) bodyText.toRawUTF8();
-
-    MapiRecipDesc recip = { 0 };
-    recip.ulRecipClass = MAPI_TO;
-    String targetEmailAddress_ (targetEmailAddress);
-    if (targetEmailAddress_.isEmpty())
-        targetEmailAddress_ = " "; // (Windows Mail can't deal with a blank address)
-    recip.lpszName = (LPSTR) targetEmailAddress_.toRawUTF8();
-    message.nRecipCount = 1;
-    message.lpRecips = &recip;
-
-    HeapBlock <MapiFileDesc> files;
-    files.calloc ((size_t) filesToAttach.size());
-
-    message.nFileCount = (ULONG) filesToAttach.size();
-    message.lpFiles = files;
-
-    for (int i = 0; i < filesToAttach.size(); ++i)
-    {
-        files[i].nPosition = (ULONG) -1;
-        files[i].lpszPathName = (LPSTR) filesToAttach[i].toRawUTF8();
-    }
-
-    return mapiSendMail (0, 0, &message, MAPI_DIALOG | MAPI_LOGON_UI, 0) == SUCCESS_SUCCESS;
-}
diff --git a/modules/beast_core/native/beast_bsd_Files.cpp b/modules/beast_core/native/bsd_Files.cpp
similarity index 98%
rename from modules/beast_core/native/beast_bsd_Files.cpp
rename to modules/beast_core/native/bsd_Files.cpp
index dc6c2dd0a2..109b947f15 100644
--- a/modules/beast_core/native/beast_bsd_Files.cpp
+++ b/modules/beast_core/native/bsd_Files.cpp
@@ -329,9 +329,7 @@ bool Process::openDocument (const String& fileName, const String& parameters)
     String cmdString (fileName.replace (" ", "\\ ",false));
     cmdString << " " << parameters;
 
-    if (URL::isProbablyAWebsiteURL (fileName)
-         || cmdString.startsWithIgnoreCase ("file:")
-         || URL::isProbablyAnEmailAddress (fileName)
+    if (    cmdString.startsWithIgnoreCase ("file:")
          || File::createFileWithoutCheckingPath (fileName).isDirectory()
          || ! isFileExecutable (fileName))
     {
diff --git a/modules/beast_core/native/bsd_Network.cpp b/modules/beast_core/native/bsd_Network.cpp
new file mode 100644
index 0000000000..9fb630149d
--- /dev/null
+++ b/modules/beast_core/native/bsd_Network.cpp
@@ -0,0 +1,59 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+void MACAddress::findAllAddresses (Array<MACAddress>& result)
+{
+    ifaddrs* addrs = nullptr;
+
+    if (getifaddrs (&addrs) == 0)
+    {
+        for (const ifaddrs* cursor = addrs; cursor != nullptr; cursor = cursor->ifa_next)
+        {
+            sockaddr_storage* sto = (sockaddr_storage*) cursor->ifa_addr;
+            if (sto->ss_family == AF_LINK)
+            {
+                const sockaddr_dl* const sadd = (const sockaddr_dl*) cursor->ifa_addr;
+
+                #ifndef IFT_ETHER
+                 #define IFT_ETHER 6
+                #endif
+
+                if (sadd->sdl_type == IFT_ETHER)
+                    result.addIfNotAlreadyThere (MACAddress (((const uint8*) sadd->sdl_data) + sadd->sdl_nlen));
+            }
+        }
+
+        freeifaddrs (addrs);
+    }
+}
+
+
+bool Process::openEmailWithAttachments (const String& /* targetEmailAddress */,
+                                        const String& /* emailSubject */,
+                                        const String& /* bodyText */,
+                                        const StringArray& /* filesToAttach */)
+{
+    bassertfalse;    // xxx todo
+
+    return false;
+}
diff --git a/modules/beast_core/native/beast_bsd_SystemStats.cpp b/modules/beast_core/native/bsd_SystemStats.cpp
similarity index 100%
rename from modules/beast_core/native/beast_bsd_SystemStats.cpp
rename to modules/beast_core/native/bsd_SystemStats.cpp
diff --git a/modules/beast_core/native/beast_bsd_Threads.cpp b/modules/beast_core/native/bsd_Threads.cpp
similarity index 95%
rename from modules/beast_core/native/beast_bsd_Threads.cpp
rename to modules/beast_core/native/bsd_Threads.cpp
index c6160ca056..5573fc48db 100644
--- a/modules/beast_core/native/beast_bsd_Threads.cpp
+++ b/modules/beast_core/native/bsd_Threads.cpp
@@ -47,10 +47,10 @@ void Process::setPriority (const ProcessPriority prior)
     pthread_setschedparam (pthread_self(), policy, &param);
 }
 
-BEAST_API bool BEAST_CALLTYPE beast_isRunningUnderDebugger()
+bool beast_isRunningUnderDebugger()
 {
     // XXX not implemented for FreeBSD!
-    bassertfalse;
+    // bassertfalse; // commented out since it calls isRunningUnderDebugger recursively
     return false;
 }
 
diff --git a/modules/beast_core/native/beast_linux_Files.cpp b/modules/beast_core/native/linux_Files.cpp
similarity index 98%
rename from modules/beast_core/native/beast_linux_Files.cpp
rename to modules/beast_core/native/linux_Files.cpp
index e2370c91e3..3a9aa88cf3 100644
--- a/modules/beast_core/native/beast_linux_Files.cpp
+++ b/modules/beast_core/native/linux_Files.cpp
@@ -329,9 +329,7 @@ bool Process::openDocument (const String& fileName, const String& parameters)
     String cmdString (fileName.replace (" ", "\\ ",false));
     cmdString << " " << parameters;
 
-    if (URL::isProbablyAWebsiteURL (fileName)
-         || cmdString.startsWithIgnoreCase ("file:")
-         || URL::isProbablyAnEmailAddress (fileName)
+    if (    cmdString.startsWithIgnoreCase ("file:")
          || File::createFileWithoutCheckingPath (fileName).isDirectory()
          || ! isFileExecutable (fileName))
     {
diff --git a/modules/beast_core/native/linux_Network.cpp b/modules/beast_core/native/linux_Network.cpp
new file mode 100644
index 0000000000..38046c496d
--- /dev/null
+++ b/modules/beast_core/native/linux_Network.cpp
@@ -0,0 +1,61 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+void MACAddress::findAllAddresses (Array<MACAddress>& result)
+{
+    const int s = socket (AF_INET, SOCK_DGRAM, 0);
+    if (s != -1)
+    {
+        char buf [1024];
+        struct ifconf ifc;
+        ifc.ifc_len = sizeof (buf);
+        ifc.ifc_buf = buf;
+        ioctl (s, SIOCGIFCONF, &ifc);
+
+        for (unsigned int i = 0; i < ifc.ifc_len / sizeof (struct ifreq); ++i)
+        {
+            struct ifreq ifr;
+            strcpy (ifr.ifr_name, ifc.ifc_req[i].ifr_name);
+
+            if (ioctl (s, SIOCGIFFLAGS, &ifr) == 0
+                 && (ifr.ifr_flags & IFF_LOOPBACK) == 0
+                 && ioctl (s, SIOCGIFHWADDR, &ifr) == 0)
+            {
+                result.addIfNotAlreadyThere (MACAddress ((const uint8*) ifr.ifr_hwaddr.sa_data));
+            }
+        }
+
+        close (s);
+    }
+}
+
+
+bool Process::openEmailWithAttachments (const String& /* targetEmailAddress */,
+                                        const String& /* emailSubject */,
+                                        const String& /* bodyText */,
+                                        const StringArray& /* filesToAttach */)
+{
+    bassertfalse;    // xxx todo
+
+    return false;
+}
diff --git a/modules/beast_core/native/beast_linux_SystemStats.cpp b/modules/beast_core/native/linux_SystemStats.cpp
similarity index 100%
rename from modules/beast_core/native/beast_linux_SystemStats.cpp
rename to modules/beast_core/native/linux_SystemStats.cpp
diff --git a/modules/beast_core/native/beast_linux_Threads.cpp b/modules/beast_core/native/linux_Threads.cpp
similarity index 97%
rename from modules/beast_core/native/beast_linux_Threads.cpp
rename to modules/beast_core/native/linux_Threads.cpp
index 9dafe89df4..795bebc047 100644
--- a/modules/beast_core/native/beast_linux_Threads.cpp
+++ b/modules/beast_core/native/linux_Threads.cpp
@@ -47,7 +47,7 @@ void Process::setPriority (const ProcessPriority prior)
     pthread_setschedparam (pthread_self(), policy, &param);
 }
 
-BEAST_API bool BEAST_CALLTYPE beast_isRunningUnderDebugger()
+bool beast_isRunningUnderDebugger()
 {
     static char testResult = 0;
 
diff --git a/modules/beast_core/native/beast_mac_Files.mm b/modules/beast_core/native/mac_Files.mm
similarity index 100%
rename from modules/beast_core/native/beast_mac_Files.mm
rename to modules/beast_core/native/mac_Files.mm
diff --git a/modules/beast_core/native/beast_mac_Network.mm b/modules/beast_core/native/mac_Network.mm
similarity index 66%
rename from modules/beast_core/native/beast_mac_Network.mm
rename to modules/beast_core/native/mac_Network.mm
index c549b5d443..4002e97ab0 100644
--- a/modules/beast_core/native/beast_mac_Network.mm
+++ b/modules/beast_core/native/mac_Network.mm
@@ -21,6 +21,8 @@
 */
 //==============================================================================
 
+#include "../network/URL.h"
+
 void MACAddress::findAllAddresses (Array<MACAddress>& result)
 {
     ifaddrs* addrs = nullptr;
@@ -294,135 +296,3 @@ private:
         }
     };
 };
-
-
-//==============================================================================
-class WebInputStream
- : public InputStream
- , LeakChecked <WebInputStream>
-{
-public:
-    WebInputStream (const String& address_, bool isPost_, const MemoryBlock& postData_,
-                    URL::OpenStreamProgressCallback* progressCallback, void* progressCallbackContext,
-                    const String& headers_, int timeOutMs_, StringPairArray* responseHeaders)
-      : address (address_), headers (headers_), postData (postData_), position (0),
-        finished (false), isPost (isPost_), timeOutMs (timeOutMs_)
-    {
-        BEAST_AUTORELEASEPOOL
-        {
-            createConnection (progressCallback, progressCallbackContext);
-
-            if (responseHeaders != nullptr && connection != nullptr && connection->headers != nil)
-            {
-                NSEnumerator* enumerator = [connection->headers keyEnumerator];
-                NSString* key;
-
-                while ((key = [enumerator nextObject]) != nil)
-                    responseHeaders->set (nsStringToBeast (key),
-                                          nsStringToBeast ((NSString*) [connection->headers objectForKey: key]));
-            }
-        }
-    }
-
-    //==============================================================================
-    bool isError() const        { return connection == nullptr; }
-    int64 getTotalLength()      { return connection == nullptr ? -1 : connection->contentLength; }
-    bool isExhausted()          { return finished; }
-    int64 getPosition()         { return position; }
-
-    int read (void* buffer, int bytesToRead)
-    {
-        bassert (buffer != nullptr && bytesToRead >= 0);
-
-        if (finished || isError())
-            return 0;
-
-        BEAST_AUTORELEASEPOOL
-        {
-            const int bytesRead = connection->read (static_cast <char*> (buffer), bytesToRead);
-            position += bytesRead;
-
-            if (bytesRead == 0)
-                finished = true;
-
-            return bytesRead;
-        }
-    }
-
-    bool setPosition (int64 wantedPos)
-    {
-        if (wantedPos != position)
-        {
-            finished = false;
-
-            if (wantedPos < position)
-            {
-                connection = nullptr;
-                position = 0;
-                createConnection (0, 0);
-            }
-
-            skipNextBytes (wantedPos - position);
-        }
-
-        return true;
-    }
-
-private:
-    ScopedPointer<URLConnectionState> connection;
-    String address, headers;
-    MemoryBlock postData;
-    int64 position;
-    bool finished;
-    const bool isPost;
-    const int timeOutMs;
-
-    void createConnection (URL::OpenStreamProgressCallback* progressCallback,
-                           void* progressCallbackContext)
-    {
-        bassert (connection == nullptr);
-
-        NSMutableURLRequest* req = [NSMutableURLRequest  requestWithURL: [NSURL URLWithString: beastStringToNS (address)]
-                                                            cachePolicy: NSURLRequestReloadIgnoringLocalCacheData
-                                                        timeoutInterval: timeOutMs <= 0 ? 60.0 : (timeOutMs / 1000.0)];
-
-        if (req != nil)
-        {
-            [req setHTTPMethod: nsStringLiteral (isPost ? "POST" : "GET")];
-            //[req setCachePolicy: NSURLRequestReloadIgnoringLocalAndRemoteCacheData];
-
-            StringArray headerLines;
-            headerLines.addLines (headers);
-            headerLines.removeEmptyStrings (true);
-
-            for (int i = 0; i < headerLines.size(); ++i)
-            {
-                const String key (headerLines[i].upToFirstOccurrenceOf (":", false, false).trim());
-                const String value (headerLines[i].fromFirstOccurrenceOf (":", false, false).trim());
-
-                if (key.isNotEmpty() && value.isNotEmpty())
-                    [req addValue: beastStringToNS (value) forHTTPHeaderField: beastStringToNS (key)];
-            }
-
-            if (isPost && postData.getSize() > 0)
-                [req setHTTPBody: [NSData dataWithBytes: postData.getData()
-                                                 length: postData.getSize()]];
-
-            connection = new URLConnectionState (req);
-
-            if (! connection->start (progressCallback, progressCallbackContext))
-                connection = nullptr;
-        }
-    }
-};
-
-InputStream* URL::createNativeStream (const String& address, bool isPost, const MemoryBlock& postData,
-                                      OpenStreamProgressCallback* progressCallback, void* progressCallbackContext,
-                                      const String& headers, const int timeOutMs, StringPairArray* responseHeaders)
-{
-    ScopedPointer <WebInputStream> wi (new WebInputStream (address, isPost, postData,
-                                                           progressCallback, progressCallbackContext,
-                                                           headers, timeOutMs, responseHeaders));
-
-    return wi->isError() ? nullptr : wi.release();
-}
diff --git a/modules/beast_core/native/beast_mac_Strings.mm b/modules/beast_core/native/mac_Strings.mm
similarity index 100%
rename from modules/beast_core/native/beast_mac_Strings.mm
rename to modules/beast_core/native/mac_Strings.mm
diff --git a/modules/beast_core/native/beast_mac_SystemStats.mm b/modules/beast_core/native/mac_SystemStats.mm
similarity index 100%
rename from modules/beast_core/native/beast_mac_SystemStats.mm
rename to modules/beast_core/native/mac_SystemStats.mm
diff --git a/modules/beast_core/native/beast_mac_Threads.mm b/modules/beast_core/native/mac_Threads.mm
similarity index 97%
rename from modules/beast_core/native/beast_mac_Threads.mm
rename to modules/beast_core/native/mac_Threads.mm
index fad59a4e22..f40d7b2593 100644
--- a/modules/beast_core/native/beast_mac_Threads.mm
+++ b/modules/beast_core/native/mac_Threads.mm
@@ -59,7 +59,7 @@ void Process::setPriority (ProcessPriority)
 }
 
 //==============================================================================
-BEAST_API bool BEAST_CALLTYPE beast_isRunningUnderDebugger()
+bool beast_isRunningUnderDebugger()
 {
     static char testResult = 0;
 
diff --git a/modules/beast_core/native/beast_osx_ObjCHelpers.h b/modules/beast_core/native/osx_ObjCHelpers.h
similarity index 100%
rename from modules/beast_core/native/beast_osx_ObjCHelpers.h
rename to modules/beast_core/native/osx_ObjCHelpers.h
diff --git a/modules/beast_core/native/beast_posix_FPUFlags.cpp b/modules/beast_core/native/posix_FPUFlags.cpp
similarity index 100%
rename from modules/beast_core/native/beast_posix_FPUFlags.cpp
rename to modules/beast_core/native/posix_FPUFlags.cpp
diff --git a/modules/beast_core/native/beast_posix_NamedPipe.cpp b/modules/beast_core/native/posix_NamedPipe.cpp
similarity index 100%
rename from modules/beast_core/native/beast_posix_NamedPipe.cpp
rename to modules/beast_core/native/posix_NamedPipe.cpp
diff --git a/modules/beast_core/native/beast_posix_SharedCode.h b/modules/beast_core/native/posix_SharedCode.h
similarity index 83%
rename from modules/beast_core/native/beast_posix_SharedCode.h
rename to modules/beast_core/native/posix_SharedCode.h
index 6b9cb1672f..4d72928d40 100644
--- a/modules/beast_core/native/beast_posix_SharedCode.h
+++ b/modules/beast_core/native/posix_SharedCode.h
@@ -39,99 +39,6 @@ bool CriticalSection::tryEnter() const noexcept { return pthread_mutex_trylock (
 void CriticalSection::exit() const noexcept     { pthread_mutex_unlock (&mutex); }
 
 //==============================================================================
-WaitableEvent::WaitableEvent (const bool useManualReset, bool initiallySignaled) noexcept
-    : triggered (false), manualReset (useManualReset)
-{
-    pthread_cond_init (&condition, 0);
-
-    pthread_mutexattr_t atts;
-    pthread_mutexattr_init (&atts);
-   #if ! BEAST_ANDROID
-    pthread_mutexattr_setprotocol (&atts, PTHREAD_PRIO_INHERIT);
-   #endif
-    pthread_mutex_init (&mutex, &atts);
-
-    if (initiallySignaled)
-        signal ();
-}
-
-WaitableEvent::~WaitableEvent() noexcept
-{
-    pthread_cond_destroy (&condition);
-    pthread_mutex_destroy (&mutex);
-}
-
-bool WaitableEvent::wait (const int timeOutMillisecs) const noexcept
-{
-    pthread_mutex_lock (&mutex);
-
-    if (! triggered)
-    {
-        if (timeOutMillisecs < 0)
-        {
-            do
-            {
-                pthread_cond_wait (&condition, &mutex);
-            }
-            while (! triggered);
-        }
-        else
-        {
-            struct timeval now;
-            gettimeofday (&now, 0);
-
-            struct timespec time;
-            time.tv_sec  = now.tv_sec  + (timeOutMillisecs / 1000);
-            time.tv_nsec = (now.tv_usec + ((timeOutMillisecs % 1000) * 1000)) * 1000;
-
-            if (time.tv_nsec >= 1000000000)
-            {
-                time.tv_nsec -= 1000000000;
-                time.tv_sec++;
-            }
-
-            do
-            {
-                if (pthread_cond_timedwait (&condition, &mutex, &time) == ETIMEDOUT)
-                {
-                    pthread_mutex_unlock (&mutex);
-                    return false;
-                }
-            }
-            while (! triggered);
-        }
-    }
-
-    if (! manualReset)
-        triggered = false;
-
-    pthread_mutex_unlock (&mutex);
-    return true;
-}
-
-void WaitableEvent::signal() const noexcept
-{
-    pthread_mutex_lock (&mutex);
-    triggered = true;
-    pthread_cond_broadcast (&condition);
-    pthread_mutex_unlock (&mutex);
-}
-
-void WaitableEvent::reset() const noexcept
-{
-    pthread_mutex_lock (&mutex);
-    triggered = false;
-    pthread_mutex_unlock (&mutex);
-}
-
-//==============================================================================
-void BEAST_CALLTYPE Thread::sleep (int millisecs)
-{
-    struct timespec time;
-    time.tv_sec = millisecs / 1000;
-    time.tv_nsec = (millisecs % 1000) * 1000000;
-    nanosleep (&time, nullptr);
-}
 
 void Process::terminate()
 {
@@ -999,146 +906,7 @@ void InterProcessLock::exit()
 }
 
 //==============================================================================
-void BEAST_API beast_threadEntryPoint (void*);
 
-extern "C" void* threadEntryProc (void*);
-extern "C" void* threadEntryProc (void* userData)
-{
-    BEAST_AUTORELEASEPOOL
-    {
-       #if BEAST_ANDROID
-        struct AndroidThreadScope
-        {
-            AndroidThreadScope()   { threadLocalJNIEnvHolder.attach(); }
-            ~AndroidThreadScope()  { threadLocalJNIEnvHolder.detach(); }
-        };
-
-        const AndroidThreadScope androidEnv;
-       #endif
-
-        beast_threadEntryPoint (userData);
-    }
-
-    return nullptr;
-}
-
-void Thread::launchThread()
-{
-    threadHandle = 0;
-    pthread_t handle = 0;
-
-    if (pthread_create (&handle, 0, threadEntryProc, this) == 0)
-    {
-        pthread_detach (handle);
-        threadHandle = (void*) handle;
-        threadId = (ThreadID) threadHandle;
-    }
-}
-
-void Thread::closeThreadHandle()
-{
-    threadId = 0;
-    threadHandle = 0;
-}
-
-void Thread::killThread()
-{
-    if (threadHandle != 0)
-    {
-       #if BEAST_ANDROID
-        bassertfalse; // pthread_cancel not available!
-       #else
-        pthread_cancel ((pthread_t) threadHandle);
-       #endif
-    }
-}
-
-void Thread::setCurrentThreadName (const String& name)
-{
-   #if BEAST_IOS || (BEAST_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
-    BEAST_AUTORELEASEPOOL
-    {
-        [[NSThread currentThread] setName: beastStringToNS (name)];
-    }
-   #elif BEAST_LINUX
-    #if (__GLIBC__ * 1000 + __GLIBC_MINOR__) >= 2012
-     pthread_setname_np (pthread_self(), name.toRawUTF8());
-    #else
-     prctl (PR_SET_NAME, name.toRawUTF8(), 0, 0, 0);
-    #endif
-   #endif
-}
-
-bool Thread::setThreadPriority (void* handle, int priority)
-{
-    struct sched_param param;
-    int policy;
-    priority = blimit (0, 10, priority);
-
-    if (handle == nullptr)
-        handle = (void*) pthread_self();
-
-    if (pthread_getschedparam ((pthread_t) handle, &policy, &param) != 0)
-        return false;
-
-    policy = priority == 0 ? SCHED_OTHER : SCHED_RR;
-
-    const int minPriority = sched_get_priority_min (policy);
-    const int maxPriority = sched_get_priority_max (policy);
-
-    param.sched_priority = ((maxPriority - minPriority) * priority) / 10 + minPriority;
-    return pthread_setschedparam ((pthread_t) handle, policy, &param) == 0;
-}
-
-Thread::ThreadID Thread::getCurrentThreadId()
-{
-    return (ThreadID) pthread_self();
-}
-
-void Thread::yield()
-{
-    sched_yield();
-}
-
-//==============================================================================
-/* Remove this macro if you're having problems compiling the cpu affinity
-   calls (the API for these has changed about quite a bit in various Linux
-   versions, and a lot of distros seem to ship with obsolete versions)
-*/
-#if defined (CPU_ISSET) && ! defined (SUPPORT_AFFINITIES)
- #define SUPPORT_AFFINITIES 1
-#endif
-
-void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask)
-{
-   #if SUPPORT_AFFINITIES
-    cpu_set_t affinity;
-    CPU_ZERO (&affinity);
-
-    for (int i = 0; i < 32; ++i)
-        if ((affinityMask & (1 << i)) != 0)
-            CPU_SET (i, &affinity);
-
-    /*
-       N.B. If this line causes a compile error, then you've probably not got the latest
-       version of glibc installed.
-
-       If you don't want to update your copy of glibc and don't care about cpu affinities,
-       then you can just disable all this stuff by setting the SUPPORT_AFFINITIES macro to 0.
-    */
-    sched_setaffinity (getpid(), sizeof (cpu_set_t), &affinity);
-    sched_yield();
-
-   #else
-    /* affinities aren't supported because either the appropriate header files weren't found,
-       or the SUPPORT_AFFINITIES macro was turned off
-    */
-    bassertfalse;
-    (void) affinityMask;
-   #endif
-}
-
-//==============================================================================
 bool DynamicLibrary::open (const String& name)
 {
     close();
diff --git a/modules/beast_core/native/beast_win32_ComSmartPtr.h b/modules/beast_core/native/win32_ComSmartPtr.h
similarity index 100%
rename from modules/beast_core/native/beast_win32_ComSmartPtr.h
rename to modules/beast_core/native/win32_ComSmartPtr.h
diff --git a/modules/beast_core/native/beast_win32_FPUFlags.cpp b/modules/beast_core/native/win32_FPUFlags.cpp
similarity index 100%
rename from modules/beast_core/native/beast_win32_FPUFlags.cpp
rename to modules/beast_core/native/win32_FPUFlags.cpp
diff --git a/modules/beast_core/native/beast_win32_Files.cpp b/modules/beast_core/native/win32_Files.cpp
similarity index 100%
rename from modules/beast_core/native/beast_win32_Files.cpp
rename to modules/beast_core/native/win32_Files.cpp
diff --git a/modules/beast_core/native/win32_Network.cpp b/modules/beast_core/native/win32_Network.cpp
new file mode 100644
index 0000000000..d85cc01de2
--- /dev/null
+++ b/modules/beast_core/native/win32_Network.cpp
@@ -0,0 +1,172 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+struct GetAdaptersInfoHelper
+{
+    bool callGetAdaptersInfo()
+    {
+        DynamicLibrary dll ("iphlpapi.dll");
+        BEAST_LOAD_WINAPI_FUNCTION (dll, GetAdaptersInfo, getAdaptersInfo, DWORD, (PIP_ADAPTER_INFO, PULONG))
+
+        if (getAdaptersInfo == nullptr)
+            return false;
+
+        adapterInfo.malloc (1);
+        ULONG len = sizeof (IP_ADAPTER_INFO);
+
+        if (getAdaptersInfo (adapterInfo, &len) == ERROR_BUFFER_OVERFLOW)
+            adapterInfo.malloc (len, 1);
+
+        return getAdaptersInfo (adapterInfo, &len) == NO_ERROR;
+    }
+
+    HeapBlock<IP_ADAPTER_INFO> adapterInfo;
+};
+
+namespace MACAddressHelpers
+{
+    void getViaGetAdaptersInfo (Array<MACAddress>& result)
+    {
+        GetAdaptersInfoHelper gah;
+
+        if (gah.callGetAdaptersInfo())
+        {
+            for (PIP_ADAPTER_INFO adapter = gah.adapterInfo; adapter != nullptr; adapter = adapter->Next)
+                if (adapter->AddressLength >= 6)
+                    result.addIfNotAlreadyThere (MACAddress (adapter->Address));
+        }
+    }
+
+    void getViaNetBios (Array<MACAddress>& result)
+    {
+        DynamicLibrary dll ("netapi32.dll");
+        BEAST_LOAD_WINAPI_FUNCTION (dll, Netbios, NetbiosCall, UCHAR, (PNCB))
+
+        if (NetbiosCall != 0)
+        {
+            LANA_ENUM enums = { 0 };
+
+            {
+                NCB ncb = { 0 };
+                ncb.ncb_command = NCBENUM;
+                ncb.ncb_buffer = (unsigned char*) &enums;
+                ncb.ncb_length = sizeof (LANA_ENUM);
+                NetbiosCall (&ncb);
+            }
+
+            for (int i = 0; i < enums.length; ++i)
+            {
+                NCB ncb2 = { 0 };
+                ncb2.ncb_command = NCBRESET;
+                ncb2.ncb_lana_num = enums.lana[i];
+
+                if (NetbiosCall (&ncb2) == 0)
+                {
+                    NCB ncb = { 0 };
+                    memcpy (ncb.ncb_callname, "*                   ", NCBNAMSZ);
+                    ncb.ncb_command = NCBASTAT;
+                    ncb.ncb_lana_num = enums.lana[i];
+
+                    struct ASTAT
+                    {
+                        ADAPTER_STATUS adapt;
+                        NAME_BUFFER    NameBuff [30];
+                    };
+
+                    ASTAT astat;
+                    zerostruct (astat);
+                    ncb.ncb_buffer = (unsigned char*) &astat;
+                    ncb.ncb_length = sizeof (ASTAT);
+
+                    if (NetbiosCall (&ncb) == 0 && astat.adapt.adapter_type == 0xfe)
+                        result.addIfNotAlreadyThere (MACAddress (astat.adapt.adapter_address));
+                }
+            }
+        }
+    }
+}
+
+void MACAddress::findAllAddresses (Array<MACAddress>& result)
+{
+    MACAddressHelpers::getViaGetAdaptersInfo (result);
+    MACAddressHelpers::getViaNetBios (result);
+}
+
+void IPAddress::findAllAddresses (Array<IPAddress>& result)
+{
+    result.addIfNotAlreadyThere (IPAddress::local());
+
+    GetAdaptersInfoHelper gah;
+
+    if (gah.callGetAdaptersInfo())
+    {
+        for (PIP_ADAPTER_INFO adapter = gah.adapterInfo; adapter != nullptr; adapter = adapter->Next)
+        {
+            IPAddress ip (adapter->IpAddressList.IpAddress.String);
+
+            if (ip != IPAddress::any())
+                result.addIfNotAlreadyThere (ip);
+        }
+    }
+}
+
+//==============================================================================
+bool Process::openEmailWithAttachments (const String& targetEmailAddress,
+                                        const String& emailSubject,
+                                        const String& bodyText,
+                                        const StringArray& filesToAttach)
+{
+    DynamicLibrary dll ("MAPI32.dll");
+    BEAST_LOAD_WINAPI_FUNCTION (dll, MAPISendMail, mapiSendMail,
+                               ULONG, (LHANDLE, ULONG, lpMapiMessage, ::FLAGS, ULONG))
+
+    if (mapiSendMail == nullptr)
+        return false;
+
+    MapiMessage message = { 0 };
+    message.lpszSubject = (LPSTR) emailSubject.toRawUTF8();
+    message.lpszNoteText = (LPSTR) bodyText.toRawUTF8();
+
+    MapiRecipDesc recip = { 0 };
+    recip.ulRecipClass = MAPI_TO;
+    String targetEmailAddress_ (targetEmailAddress);
+    if (targetEmailAddress_.isEmpty())
+        targetEmailAddress_ = " "; // (Windows Mail can't deal with a blank address)
+    recip.lpszName = (LPSTR) targetEmailAddress_.toRawUTF8();
+    message.nRecipCount = 1;
+    message.lpRecips = &recip;
+
+    HeapBlock <MapiFileDesc> files;
+    files.calloc ((size_t) filesToAttach.size());
+
+    message.nFileCount = (ULONG) filesToAttach.size();
+    message.lpFiles = files;
+
+    for (int i = 0; i < filesToAttach.size(); ++i)
+    {
+        files[i].nPosition = (ULONG) -1;
+        files[i].lpszPathName = (LPSTR) filesToAttach[i].toRawUTF8();
+    }
+
+    return mapiSendMail (0, 0, &message, MAPI_DIALOG | MAPI_LOGON_UI, 0) == SUCCESS_SUCCESS;
+}
diff --git a/modules/beast_core/native/beast_win32_Registry.cpp b/modules/beast_core/native/win32_Registry.cpp
similarity index 100%
rename from modules/beast_core/native/beast_win32_Registry.cpp
rename to modules/beast_core/native/win32_Registry.cpp
diff --git a/modules/beast_core/native/beast_win32_SystemStats.cpp b/modules/beast_core/native/win32_SystemStats.cpp
similarity index 100%
rename from modules/beast_core/native/beast_win32_SystemStats.cpp
rename to modules/beast_core/native/win32_SystemStats.cpp
diff --git a/modules/beast_core/native/beast_win32_Threads.cpp b/modules/beast_core/native/win32_Threads.cpp
similarity index 75%
rename from modules/beast_core/native/beast_win32_Threads.cpp
rename to modules/beast_core/native/win32_Threads.cpp
index a8d0e18fca..019a6d900e 100644
--- a/modules/beast_core/native/beast_win32_Threads.cpp
+++ b/modules/beast_core/native/win32_Threads.cpp
@@ -21,8 +21,6 @@
 */
 //==============================================================================
 
-HWND beast_messageWindowHandle = 0;  // (this is used by other parts of the codebase)
-
 void* getUser32Function (const char* functionName)
 {
     HMODULE module = GetModuleHandleA ("user32.dll");
@@ -72,158 +70,6 @@ void CriticalSection::enter() const noexcept { EnterCriticalSection ((CRITICAL_S
 bool CriticalSection::tryEnter() const noexcept { return TryEnterCriticalSection ((CRITICAL_SECTION*) section) != FALSE; }
 void CriticalSection::exit() const noexcept { LeaveCriticalSection ((CRITICAL_SECTION*) section); }
 
-//==============================================================================
-
-WaitableEvent::WaitableEvent (const bool manualReset, bool initiallySignaled) noexcept
-    : handle (CreateEvent (0, manualReset ? TRUE : FALSE, initiallySignaled ? TRUE : FALSE, 0)) {}
-
-WaitableEvent::~WaitableEvent() noexcept { CloseHandle (handle); }
-
-void WaitableEvent::signal() const noexcept { SetEvent (handle); }
-void WaitableEvent::reset() const noexcept { ResetEvent (handle); }
-
-bool WaitableEvent::wait (const int timeOutMs) const noexcept
-{
-    return WaitForSingleObject (handle, (DWORD) timeOutMs) == WAIT_OBJECT_0;
-}
-
-//==============================================================================
-void BEAST_API beast_threadEntryPoint (void*);
-
-static unsigned int __stdcall threadEntryProc (void* userData)
-{
-    if (beast_messageWindowHandle != 0)
-        AttachThreadInput (GetWindowThreadProcessId (beast_messageWindowHandle, 0),
-                           GetCurrentThreadId(), TRUE);
-
-    beast_threadEntryPoint (userData);
-
-    _endthreadex (0);
-    return 0;
-}
-
-void Thread::launchThread()
-{
-    unsigned int newThreadId;
-    threadHandle = (void*) _beginthreadex (0, 0, &threadEntryProc, this, 0, &newThreadId);
-    threadId = (ThreadID) newThreadId;
-}
-
-void Thread::closeThreadHandle()
-{
-    CloseHandle ((HANDLE) threadHandle);
-    threadId = 0;
-    threadHandle = 0;
-}
-
-void Thread::killThread()
-{
-    if (threadHandle != 0)
-    {
-       #if BEAST_DEBUG
-        OutputDebugStringA ("** Warning - Forced thread termination **\n");
-       #endif
-        TerminateThread (threadHandle, 0);
-    }
-}
-
-void Thread::setCurrentThreadName (const String& name)
-{
-   #if BEAST_DEBUG && BEAST_MSVC
-    struct
-    {
-        DWORD dwType;
-        LPCSTR szName;
-        DWORD dwThreadID;
-        DWORD dwFlags;
-    } info;
-
-    info.dwType = 0x1000;
-    info.szName = name.toUTF8();
-    info.dwThreadID = GetCurrentThreadId();
-    info.dwFlags = 0;
-
-    __try
-    {
-        RaiseException (0x406d1388 /*MS_VC_EXCEPTION*/, 0, sizeof (info) / sizeof (ULONG_PTR), (ULONG_PTR*) &info);
-    }
-    __except (EXCEPTION_CONTINUE_EXECUTION)
-    {}
-   #else
-    (void) name;
-   #endif
-}
-
-Thread::ThreadID Thread::getCurrentThreadId()
-{
-    return (ThreadID) (pointer_sized_int) GetCurrentThreadId();
-}
-
-bool Thread::setThreadPriority (void* handle, int priority)
-{
-    int pri = THREAD_PRIORITY_TIME_CRITICAL;
-
-    if (priority < 1)       pri = THREAD_PRIORITY_IDLE;
-    else if (priority < 2)  pri = THREAD_PRIORITY_LOWEST;
-    else if (priority < 5)  pri = THREAD_PRIORITY_BELOW_NORMAL;
-    else if (priority < 7)  pri = THREAD_PRIORITY_NORMAL;
-    else if (priority < 9)  pri = THREAD_PRIORITY_ABOVE_NORMAL;
-    else if (priority < 10) pri = THREAD_PRIORITY_HIGHEST;
-
-    if (handle == 0)
-        handle = GetCurrentThread();
-
-    return SetThreadPriority (handle, pri) != FALSE;
-}
-
-void Thread::setCurrentThreadAffinityMask (const uint32 affinityMask)
-{
-    SetThreadAffinityMask (GetCurrentThread(), affinityMask);
-}
-
-//==============================================================================
-struct SleepEvent
-{
-    SleepEvent() noexcept
-        : handle (CreateEvent (nullptr, FALSE, FALSE,
-                              #if BEAST_DEBUG
-                               _T("BEAST Sleep Event")))
-                              #else
-                               nullptr))
-                              #endif
-    {}
-
-    ~SleepEvent() noexcept
-    {
-        CloseHandle (handle);
-        handle = 0;
-    }
-
-    HANDLE handle;
-};
-
-static SleepEvent sleepEvent;
-
-void BEAST_CALLTYPE Thread::sleep (const int millisecs)
-{
-    if (millisecs >= 10 || sleepEvent.handle == 0)
-    {
-        Sleep ((DWORD) millisecs);
-    }
-    else
-    {
-        // unlike Sleep() this is guaranteed to return to the current thread after
-        // the time expires, so we'll use this for short waits, which are more likely
-        // to need to be accurate
-        WaitForSingleObject (sleepEvent.handle, (DWORD) millisecs);
-    }
-}
-
-void Thread::yield()
-{
-    Sleep (0);
-}
-
 //==============================================================================
 static int lastProcessPriority = -1;
 
@@ -257,7 +103,7 @@ void Process::setPriority (ProcessPriority prior)
     }
 }
 
-BEAST_API bool BEAST_CALLTYPE beast_isRunningUnderDebugger()
+bool beast_isRunningUnderDebugger()
 {
     return IsDebuggerPresent() != FALSE;
 }
diff --git a/modules/beast_core/network/beast_IPAddress.cpp b/modules/beast_core/network/IPAddress.cpp
similarity index 100%
rename from modules/beast_core/network/beast_IPAddress.cpp
rename to modules/beast_core/network/IPAddress.cpp
diff --git a/modules/beast_core/network/beast_IPAddress.h b/modules/beast_core/network/IPAddress.h
similarity index 100%
rename from modules/beast_core/network/beast_IPAddress.h
rename to modules/beast_core/network/IPAddress.h
diff --git a/modules/beast_core/network/beast_MACAddress.cpp b/modules/beast_core/network/MACAddress.cpp
similarity index 100%
rename from modules/beast_core/network/beast_MACAddress.cpp
rename to modules/beast_core/network/MACAddress.cpp
diff --git a/modules/beast_core/network/beast_MACAddress.h b/modules/beast_core/network/MACAddress.h
similarity index 100%
rename from modules/beast_core/network/beast_MACAddress.h
rename to modules/beast_core/network/MACAddress.h
diff --git a/modules/beast_core/network/beast_NamedPipe.cpp b/modules/beast_core/network/NamedPipe.cpp
similarity index 100%
rename from modules/beast_core/network/beast_NamedPipe.cpp
rename to modules/beast_core/network/NamedPipe.cpp
diff --git a/modules/beast_core/network/beast_NamedPipe.h b/modules/beast_core/network/NamedPipe.h
similarity index 100%
rename from modules/beast_core/network/beast_NamedPipe.h
rename to modules/beast_core/network/NamedPipe.h
diff --git a/modules/beast_core/network/beast_Socket.cpp b/modules/beast_core/network/Socket.cpp
similarity index 100%
rename from modules/beast_core/network/beast_Socket.cpp
rename to modules/beast_core/network/Socket.cpp
diff --git a/modules/beast_core/network/beast_Socket.h b/modules/beast_core/network/Socket.h
similarity index 100%
rename from modules/beast_core/network/beast_Socket.h
rename to modules/beast_core/network/Socket.h
diff --git a/modules/beast_core/network/beast_URL.cpp b/modules/beast_core/network/URL.cpp
similarity index 100%
rename from modules/beast_core/network/beast_URL.cpp
rename to modules/beast_core/network/URL.cpp
diff --git a/modules/beast_core/network/beast_URL.h b/modules/beast_core/network/URL.h
similarity index 100%
rename from modules/beast_core/network/beast_URL.h
rename to modules/beast_core/network/URL.h
diff --git a/modules/beast_core/streams/beast_BufferedInputStream.cpp b/modules/beast_core/streams/BufferedInputStream.cpp
similarity index 100%
rename from modules/beast_core/streams/beast_BufferedInputStream.cpp
rename to modules/beast_core/streams/BufferedInputStream.cpp
diff --git a/modules/beast_core/streams/beast_BufferedInputStream.h b/modules/beast_core/streams/BufferedInputStream.h
similarity index 100%
rename from modules/beast_core/streams/beast_BufferedInputStream.h
rename to modules/beast_core/streams/BufferedInputStream.h
diff --git a/modules/beast_core/streams/beast_FileInputSource.cpp b/modules/beast_core/streams/FileInputSource.cpp
similarity index 100%
rename from modules/beast_core/streams/beast_FileInputSource.cpp
rename to modules/beast_core/streams/FileInputSource.cpp
diff --git a/modules/beast_core/streams/beast_FileInputSource.h b/modules/beast_core/streams/FileInputSource.h
similarity index 100%
rename from modules/beast_core/streams/beast_FileInputSource.h
rename to modules/beast_core/streams/FileInputSource.h
diff --git a/modules/beast_core/streams/beast_InputSource.h b/modules/beast_core/streams/InputSource.h
similarity index 100%
rename from modules/beast_core/streams/beast_InputSource.h
rename to modules/beast_core/streams/InputSource.h
diff --git a/modules/beast_core/streams/beast_InputStream.cpp b/modules/beast_core/streams/InputStream.cpp
similarity index 100%
rename from modules/beast_core/streams/beast_InputStream.cpp
rename to modules/beast_core/streams/InputStream.cpp
diff --git a/modules/beast_core/streams/beast_InputStream.h b/modules/beast_core/streams/InputStream.h
similarity index 100%
rename from modules/beast_core/streams/beast_InputStream.h
rename to modules/beast_core/streams/InputStream.h
diff --git a/modules/beast_core/streams/beast_MemoryInputStream.cpp b/modules/beast_core/streams/MemoryInputStream.cpp
similarity index 100%
rename from modules/beast_core/streams/beast_MemoryInputStream.cpp
rename to modules/beast_core/streams/MemoryInputStream.cpp
diff --git a/modules/beast_core/streams/beast_MemoryInputStream.h b/modules/beast_core/streams/MemoryInputStream.h
similarity index 100%
rename from modules/beast_core/streams/beast_MemoryInputStream.h
rename to modules/beast_core/streams/MemoryInputStream.h
diff --git a/modules/beast_core/streams/beast_MemoryOutputStream.cpp b/modules/beast_core/streams/MemoryOutputStream.cpp
similarity index 100%
rename from modules/beast_core/streams/beast_MemoryOutputStream.cpp
rename to modules/beast_core/streams/MemoryOutputStream.cpp
diff --git a/modules/beast_core/streams/beast_MemoryOutputStream.h b/modules/beast_core/streams/MemoryOutputStream.h
similarity index 100%
rename from modules/beast_core/streams/beast_MemoryOutputStream.h
rename to modules/beast_core/streams/MemoryOutputStream.h
diff --git a/modules/beast_core/streams/beast_OutputStream.cpp b/modules/beast_core/streams/OutputStream.cpp
similarity index 95%
rename from modules/beast_core/streams/beast_OutputStream.cpp
rename to modules/beast_core/streams/OutputStream.cpp
index e11249b8e5..26b91d8e02 100644
--- a/modules/beast_core/streams/beast_OutputStream.cpp
+++ b/modules/beast_core/streams/OutputStream.cpp
@@ -414,3 +414,20 @@ BEAST_API bool OutputStream::writeTypeBigEndian <float> (float v) { return write
 
 template <>
 BEAST_API bool OutputStream::writeTypeBigEndian <double> (double v) { return writeDoubleBigEndian (v); }
+
+BEAST_API OutputStream& BEAST_CALLTYPE operator<< (OutputStream& stream, const String& text)
+{
+    const size_t numBytes = text.getNumBytesAsUTF8();
+
+   #if (BEAST_STRING_UTF_TYPE == 8)
+    stream.write (text.getCharPointer().getAddress(), numBytes);
+   #else
+    // (This avoids using toUTF8() to prevent the memory bloat that it would leave behind
+    // if lots of large, persistent strings were to be written to streams).
+    HeapBlock<char> temp (numBytes + 1);
+    CharPointer_UTF8 (temp).writeAll (text.getCharPointer());
+    stream.write (temp, numBytes);
+   #endif
+
+    return stream;
+}
diff --git a/modules/beast_core/streams/beast_OutputStream.h b/modules/beast_core/streams/OutputStream.h
similarity index 98%
rename from modules/beast_core/streams/beast_OutputStream.h
rename to modules/beast_core/streams/OutputStream.h
index f896568906..89ca7ca478 100644
--- a/modules/beast_core/streams/beast_OutputStream.h
+++ b/modules/beast_core/streams/OutputStream.h
@@ -293,4 +293,7 @@ BEAST_API OutputStream& BEAST_CALLTYPE operator<< (OutputStream& stream, InputSt
 */
 BEAST_API OutputStream& BEAST_CALLTYPE operator<< (OutputStream& stream, const NewLine&);
 
+/** Writes a string to an OutputStream as UTF8. */
+BEAST_API OutputStream& BEAST_CALLTYPE operator<< (OutputStream& stream, const String& stringToWrite);
+
 #endif
diff --git a/modules/beast_core/streams/beast_SubregionStream.cpp b/modules/beast_core/streams/SubregionStream.cpp
similarity index 100%
rename from modules/beast_core/streams/beast_SubregionStream.cpp
rename to modules/beast_core/streams/SubregionStream.cpp
diff --git a/modules/beast_core/streams/beast_SubregionStream.h b/modules/beast_core/streams/SubregionStream.h
similarity index 100%
rename from modules/beast_core/streams/beast_SubregionStream.h
rename to modules/beast_core/streams/SubregionStream.h
diff --git a/modules/beast_core/system/BeforeBoost.h b/modules/beast_core/system/BeforeBoost.h
index eb26e5f9c3..ce9c2bc5e3 100644
--- a/modules/beast_core/system/BeforeBoost.h
+++ b/modules/beast_core/system/BeforeBoost.h
@@ -20,63 +20,13 @@
 #ifndef BEAST_CORE_SYSTEM_BEFOREBOOST_H_INCLUDED
 #define BEAST_CORE_SYSTEM_BEFOREBOOST_H_INCLUDED
 
+// TargetPlatform.h should not use anything from BeastConfig.h
+#include "../../../beast/Config.h"
+
 // This file should be included before including any boost headers.
 // If you don't include this file, and you include boost headers,
 // Beast will generate a compile error with an explanation of why.
 
-#include "TargetPlatform.h"
-
-#include "BeastConfigCheck.h"
-
-#if BEAST_USE_BOOST_FEATURES
-
-// Prevent <boost/bind/placeholders.hpp> from being included
-#ifdef BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED
-# error "boost/bind.hpp must not be included before this file"
-#else
-# define BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED
-#endif
-
-#include <boost/bind.hpp>
-#include <boost/bind/arg.hpp>
-#include <boost/config.hpp>
-#include <boost/function.hpp>
-#include <boost/thread/tss.hpp>         // for FifoFreeStoreWithTLS
-#include <boost/version.hpp>
-
-#if BOOST_VERSION > 105499
-# error "This hasnt been tested with boost versions above 1.54"
-#endif
-
-// This is a hack to fix boost's goofy placeholders going into the global
-// namespace. First we prevent the user from including boost/bind.hpp
-// before us. Then we define the include guard macro and include
-// boost/bind.hpp ourselves to get the declarations. Finally we repeat
-// the missing placeholder declarations but put them in a proper namespace.
-//
-// We put the placeholders in boost::placeholders so they can be accessed
-// explicitly to handle the common case of a "using namespace oost" directive
-// being in effect.
-//
-// Declarations based on boost/bind/placeholders.cpp
-//
-namespace boost {
-namespace placeholders {
-extern boost::arg<1> _1;
-extern boost::arg<2> _2;
-extern boost::arg<3> _3;
-extern boost::arg<4> _4;
-extern boost::arg<5> _5;
-extern boost::arg<6> _6;
-extern boost::arg<7> _7;
-extern boost::arg<8> _8;
-extern boost::arg<9> _9;
-}
-using namespace placeholders;
-}
-
-#endif
-
-//------------------------------------------------------------------------------
+#include "BoostPlaceholdersFix.h"
 
 #endif
diff --git a/modules/beast_core/system/BoostIncludes.h b/modules/beast_core/system/BoostIncludes.h
index 1d4862490a..dc4416feb9 100644
--- a/modules/beast_core/system/BoostIncludes.h
+++ b/modules/beast_core/system/BoostIncludes.h
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_CORE_SYSTEM_BOOSTINCLUDES_H_INCLUDED
-#define BEAST_CORE_SYSTEM_BOOSTINCLUDES_H_INCLUDED
+#ifndef BEAST_CORE_BOOSTINCLUDES_H_INCLUDED
+#define BEAST_CORE_BOOSTINCLUDES_H_INCLUDED
 
 #if BEAST_USE_BOOST_FEATURES
 
diff --git a/modules/beast_core/system/Functional.h b/modules/beast_core/system/Functional.h
index 7788e04e8e..173b93519b 100644
--- a/modules/beast_core/system/Functional.h
+++ b/modules/beast_core/system/Functional.h
@@ -22,248 +22,6 @@
 
 //------------------------------------------------------------------------------
 
-// inspired by Roman Perepelitsa's presentation from comp.lang.c++.moderated
-// based on the implementation here: http://www.rsdn.ru/forum/cpp/2759773.1.aspx
-//
-namespace is_call_possible_detail
-{
-    template<typename T>
-    struct add_reference
-    {
-      typedef T& type;
-    };
-
-    template<typename T>
-    struct add_reference<T&>
-    {
-      typedef T& type;
-    };
-
-   template <typename T> class void_exp_result {}; 
-
-   template <typename T, typename U> 
-   U const& operator,(U const&, void_exp_result<T>); 
-
-   template <typename T, typename U> 
-   U& operator,(U&, void_exp_result<T>); 
-
-   template <typename src_type, typename dest_type> 
-   struct clone_constness 
-   { 
-     typedef dest_type type; 
-   }; 
-
-   template <typename src_type, typename dest_type> 
-   struct clone_constness<const src_type, dest_type> 
-   { 
-     typedef const dest_type type; 
-   }; 
-}
-
-#define BEAST_DEFINE_HAS_MEMBER_FUNCTION(trait_name, member_function_name)                                   \
-template<typename T, typename Signature> class trait_name;                                                   \
-                                                                                                             \
-template<typename T, typename Result>                                                                        \
-class trait_name<T, Result(void)>                                                                            \
-{                                                                                                            \
-   class yes { char m; };                                                                                    \
-   class no { yes m[2]; };                                                                                   \
-   struct base_mixin                                                                                         \
-   {                                                                                                         \
-     Result member_function_name();                                                                          \
-   };                                                                                                        \
-   struct base : public T, public base_mixin { private: base(); };                                           \
-   template <typename U, U t>  class helper{};                                                               \
-   template <typename U>                                                                                     \
-   static no deduce(U*, helper<Result (base_mixin::*)(), &U::member_function_name>* = 0);                    \
-   static yes deduce(...);                                                                                   \
-public:                                                                                                      \
-   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
-};                                                                                                           \
-                                                                                                             \
-template<typename T, typename Result, typename Arg>                                                          \
-class trait_name<T, Result(Arg)>                                                                             \
-{                                                                                                            \
-   class yes { char m; };                                                                                    \
-   class no { yes m[2]; };                                                                                   \
-   struct base_mixin                                                                                         \
-   {                                                                                                         \
-     Result member_function_name(Arg);                                                                       \
-   };                                                                                                        \
-   struct base : public T, public base_mixin { private: base(); };                                           \
-   template <typename U, U t>  class helper{};                                                               \
-   template <typename U>                                                                                     \
-   static no deduce(U*, helper<Result (base_mixin::*)(Arg), &U::member_function_name>* = 0);                 \
-   static yes deduce(...);                                                                                   \
-public:                                                                                                      \
-   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
-};                                                                                                           \
-                                                                                                             \
-template<typename T, typename Result, typename Arg1, typename Arg2>                                          \
-class trait_name<T, Result(Arg1,Arg2)>                                                                       \
-{                                                                                                            \
-   class yes { char m; };                                                                                    \
-   class no { yes m[2]; };                                                                                   \
-   struct base_mixin                                                                                         \
-   {                                                                                                         \
-     Result member_function_name(Arg1,Arg2);                                                                 \
-   };                                                                                                        \
-   struct base : public T, public base_mixin { private: base(); };                                           \
-   template <typename U, U t>  class helper{};                                                               \
-   template <typename U>                                                                                     \
-   static no deduce(U*, helper<Result (base_mixin::*)(Arg1,Arg2), &U::member_function_name>* = 0);           \
-   static yes deduce(...);                                                                                   \
-public:                                                                                                      \
-   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
-};                                                                                                           \
-                                                                                                             \
-template<typename T, typename Result, typename Arg1, typename Arg2, typename Arg3>                           \
-class trait_name<T, Result(Arg1,Arg2,Arg3)>                                                                  \
-{                                                                                                            \
-   class yes { char m; };                                                                                    \
-   class no { yes m[2]; };                                                                                   \
-   struct base_mixin                                                                                         \
-   {                                                                                                         \
-     Result member_function_name(Arg1,Arg2,Arg3);                                                            \
-   };                                                                                                        \
-   struct base : public T, public base_mixin { private: base(); };                                           \
-   template <typename U, U t>  class helper{};                                                               \
-   template <typename U>                                                                                     \
-   static no deduce(U*, helper<Result (base_mixin::*)(Arg1,Arg2,Arg3), &U::member_function_name>* = 0);      \
-   static yes deduce(...);                                                                                   \
-public:                                                                                                      \
-   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
-};                                                                                                           \
-                                                                                                             \
-template<typename T, typename Result, typename Arg1, typename Arg2, typename Arg3, typename Arg4>            \
-class trait_name<T, Result(Arg1,Arg2,Arg3,Arg4)>                                                             \
-{                                                                                                            \
-   class yes { char m; };                                                                                    \
-   class no { yes m[2]; };                                                                                   \
-   struct base_mixin                                                                                         \
-   {                                                                                                         \
-     Result member_function_name(Arg1,Arg2,Arg3,Arg4);                                                       \
-   };                                                                                                        \
-   struct base : public T, public base_mixin { private: base(); };                                           \
-   template <typename U, U t>  class helper{};                                                               \
-   template <typename U>                                                                                     \
-   static no deduce(U*, helper<Result (base_mixin::*)(Arg1,Arg2,Arg3,Arg4), &U::member_function_name>* = 0); \
-   static yes deduce(...);                                                                                   \
-public:                                                                                                      \
-   static const bool value = sizeof(yes) == sizeof(deduce(static_cast<base*>(0)));                           \
-}                                                                                                           
-
-#define BEAST_DEFINE_IS_CALL_POSSIBLE(trait_name, member_function_name)                                                 \
-struct trait_name##_detail                                                                                              \
-{                                                                                                                       \
-BEAST_DEFINE_HAS_MEMBER_FUNCTION(has_member, member_function_name);                                                     \
-};                                                                                                                      \
-                                                                                                                        \
-template <typename T, typename Signature>                                                                               \
-struct trait_name                                                                                                       \
-{                                                                                                                       \
-  private:                                                                                                              \
-   class yes {};                                                                                                        \
-   class no { yes m[2]; };                                                                                              \
-   struct derived : public T                                                                                            \
-   {                                                                                                                    \
-     using T::member_function_name;                                                                                     \
-     no member_function_name(...) const;                                                                                \
-     private: derived ();                                                                                               \
-   };                                                                                                                   \
-                                                                                                                        \
-   typedef typename is_call_possible_detail::clone_constness<T, derived>::type derived_type;                            \
-                                                                                                                        \
-   template <typename U, typename Result>                                                                               \
-   struct return_value_check                                                                                            \
-   {                                                                                                                    \
-     static yes deduce(Result);                                                                                         \
-     static no deduce(...);                                                                                             \
-     static no deduce(no);                                                                                              \
-     static no deduce(is_call_possible_detail::void_exp_result<T>);                                                     \
-   };                                                                                                                   \
-                                                                                                                        \
-   template <typename U>                                                                                                \
-   struct return_value_check<U, void>                                                                                   \
-   {                                                                                                                    \
-     static yes deduce(...);                                                                                            \
-     static no deduce(no);                                                                                              \
-   };                                                                                                                   \
-                                                                                                                        \
-   template <bool has_the_member_of_interest, typename F>                                                               \
-   struct impl                                                                                                          \
-   {                                                                                                                    \
-     static const bool value = false;                                                                                   \
-   };                                                                                                                   \
-                                                                                                                        \
-   template <typename Result, typename Arg>                                                                             \
-   struct impl<true, Result(Arg)>                                                                                       \
-   {                                                                                                                    \
-     static typename is_call_possible_detail::add_reference<derived_type>::type test_me;                                \
-     static typename is_call_possible_detail::add_reference<Arg>::type          arg;                                    \
-                                                                                                                        \
-     static const bool value =                                                                                          \
-       sizeof(                                                                                                          \
-            return_value_check<T, Result>::deduce(                                                                      \
-             (test_me.member_function_name(arg), is_call_possible_detail::void_exp_result<T>())                         \
-                         )                                                                                              \
-            ) == sizeof(yes);                                                                                           \
-   };                                                                                                                   \
-                                                                                                                        \
-   template <typename Result, typename Arg1, typename Arg2>                                                             \
-   struct impl<true, Result(Arg1,Arg2)>                                                                                 \
-   {                                                                                                                    \
-     static typename is_call_possible_detail::add_reference<derived_type>::type test_me;                                \
-     static typename is_call_possible_detail::add_reference<Arg1>::type         arg1;                                   \
-     static typename is_call_possible_detail::add_reference<Arg2>::type         arg2;                                   \
-                                                                                                                        \
-     static const bool value =                                                                                          \
-       sizeof(                                                                                                          \
-            return_value_check<T, Result>::deduce(                                                                      \
-             (test_me.member_function_name(arg1,arg2), is_call_possible_detail::void_exp_result<T>())                   \
-                         )                                                                                              \
-            ) == sizeof(yes);                                                                                           \
-   };                                                                                                                   \
-                                                                                                                        \
-   template <typename Result, typename Arg1, typename Arg2, typename Arg3>                                              \
-   struct impl<true, Result(Arg1,Arg2,Arg3)>                                                                            \
-   {                                                                                                                    \
-     static typename is_call_possible_detail::add_reference<derived_type>::type test_me;                                \
-     static typename is_call_possible_detail::add_reference<Arg1>::type         arg1;                                   \
-     static typename is_call_possible_detail::add_reference<Arg2>::type         arg2;                                   \
-     static typename is_call_possible_detail::add_reference<Arg3>::type         arg3;                                   \
-                                                                                                                        \
-     static const bool value =                                                                                          \
-       sizeof(                                                                                                          \
-            return_value_check<T, Result>::deduce(                                                                      \
-             (test_me.member_function_name(arg1,arg2,arg3), is_call_possible_detail::void_exp_result<T>())              \
-                         )                                                                                              \
-            ) == sizeof(yes);                                                                                           \
-   };                                                                                                                   \
-                                                                                                                        \
-   template <typename Result, typename Arg1, typename Arg2, typename Arg3, typename Arg4>                               \
-   struct impl<true, Result(Arg1,Arg2,Arg3,Arg4)>                                                                       \
-   {                                                                                                                    \
-     static typename is_call_possible_detail::add_reference<derived_type>::type test_me;                                \
-     static typename is_call_possible_detail::add_reference<Arg1>::type         arg1;                                   \
-     static typename is_call_possible_detail::add_reference<Arg2>::type         arg2;                                   \
-     static typename is_call_possible_detail::add_reference<Arg3>::type         arg3;                                   \
-     static typename is_call_possible_detail::add_reference<Arg4>::type         arg4;                                   \
-                                                                                                                        \
-     static const bool value =                                                                                          \
-       sizeof(                                                                                                          \
-            return_value_check<T, Result>::deduce(                                                                      \
-             (test_me.member_function_name(arg1,arg2,arg3,arg4), is_call_possible_detail::void_exp_result<T>())         \
-                         )                                                                                              \
-            ) == sizeof(yes);                                                                                           \
-   };                                                                                                                   \
-                                                                                                                        \
-  public:                                                                                                               \
-    static const bool value = impl<trait_name##_detail::has_member<T,Signature>::value, Signature>::value;              \
-}
-
-//------------------------------------------------------------------------------
-
 /*  Brings functional support into our namespace, based on environment.
 
     Notes on bind
diff --git a/modules/beast_core/system/FunctionalIncludes.h b/modules/beast_core/system/FunctionalIncludes.h
index e8215f7db4..b7d4b370ba 100644
--- a/modules/beast_core/system/FunctionalIncludes.h
+++ b/modules/beast_core/system/FunctionalIncludes.h
@@ -23,7 +23,9 @@
 // Choose a source of bind, placeholders, and function
 
 #if !BEAST_FUNCTIONAL_USES_STD && !BEAST_FUNCTIONAL_USES_TR1 && !BEAST_FUNCTIONAL_USES_BOOST
-# if BEAST_MSVC
+# if BEAST_USE_BOOST_FEATURES
+#  define BEAST_FUNCTIONAL_USES_BOOST 1
+# elif BEAST_MSVC
 #  define BEAST_FUNCTIONAL_USES_STD 1
 # elif BEAST_IOS || BEAST_MAC
 #  include <ciso646>                        // detect version of std::lib
diff --git a/modules/beast_core/system/StandardIncludes.h b/modules/beast_core/system/StandardIncludes.h
new file mode 100644
index 0000000000..39994fa1a7
--- /dev/null
+++ b/modules/beast_core/system/StandardIncludes.h
@@ -0,0 +1,78 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Portions of this file are from JUCE.
+    Copyright (c) 2013 - Raw Material Software Ltd.
+    Please visit http://www.juce.com
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_STANDARDINCLUDES_H_INCLUDED
+#define BEAST_STANDARDINCLUDES_H_INCLUDED
+
+// Include some common OS headers..
+#if BEAST_MSVC
+#pragma warning (push)
+#pragma warning (disable: 4514 4245 4100)
+#endif
+
+#include <algorithm>
+#include <cfloat>
+#include <climits>
+#include <cmath>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cwchar>
+#include <exception>
+#include <iostream>
+#include <istream>
+#include <iterator>
+#include <limits>
+#include <list>
+#include <map>
+#include <new>
+#include <numeric>
+#include <ostream>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <typeinfo>
+#include <vector>
+
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <float.h>
+#include <locale.h>
+#include <math.h>
+#include <memory.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+// undef symbols that are sometimes set by misguided 3rd-party headers..
+#undef check
+#undef TYPE_BOOL
+#undef max
+#undef min
+
+#endif
diff --git a/modules/beast_core/system/SystemStats.cpp b/modules/beast_core/system/SystemStats.cpp
index 0098e33d0b..cb600a3697 100644
--- a/modules/beast_core/system/SystemStats.cpp
+++ b/modules/beast_core/system/SystemStats.cpp
@@ -40,22 +40,6 @@ String SystemStats::getBeastVersion()
                 "." BEAST_STRINGIFY(BEAST_BUILDNUMBER);
 }
 
-#if BEAST_ANDROID && ! defined (BEAST_DISABLE_BEAST_VERSION_PRINTING)
- #define BEAST_DISABLE_BEAST_VERSION_PRINTING 1
-#endif
-
-#if BEAST_DEBUG && ! BEAST_DISABLE_BEAST_VERSION_PRINTING
- struct BeastVersionPrinter
- {
-     BeastVersionPrinter()
-     {
-         DBG (SystemStats::getBeastVersion());
-     }
- };
-
- static BeastVersionPrinter beastVersionPrinter;
-#endif
-
 //==============================================================================
 struct CPUInformation
 {
diff --git a/modules/beast_core/text/beast_Identifier.cpp b/modules/beast_core/text/Identifier.cpp
similarity index 100%
rename from modules/beast_core/text/beast_Identifier.cpp
rename to modules/beast_core/text/Identifier.cpp
diff --git a/modules/beast_core/text/beast_Identifier.h b/modules/beast_core/text/Identifier.h
similarity index 100%
rename from modules/beast_core/text/beast_Identifier.h
rename to modules/beast_core/text/Identifier.h
diff --git a/modules/beast_core/text/beast_LexicalCast.cpp b/modules/beast_core/text/LexicalCast.cpp
similarity index 100%
rename from modules/beast_core/text/beast_LexicalCast.cpp
rename to modules/beast_core/text/LexicalCast.cpp
diff --git a/modules/beast_core/text/beast_LexicalCast.h b/modules/beast_core/text/LexicalCast.h
similarity index 100%
rename from modules/beast_core/text/beast_LexicalCast.h
rename to modules/beast_core/text/LexicalCast.h
diff --git a/modules/beast_core/text/beast_LocalisedStrings.cpp b/modules/beast_core/text/LocalisedStrings.cpp
similarity index 100%
rename from modules/beast_core/text/beast_LocalisedStrings.cpp
rename to modules/beast_core/text/LocalisedStrings.cpp
diff --git a/modules/beast_core/text/beast_LocalisedStrings.h b/modules/beast_core/text/LocalisedStrings.h
similarity index 100%
rename from modules/beast_core/text/beast_LocalisedStrings.h
rename to modules/beast_core/text/LocalisedStrings.h
diff --git a/modules/beast_core/text/beast_StringArray.cpp b/modules/beast_core/text/StringArray.cpp
similarity index 100%
rename from modules/beast_core/text/beast_StringArray.cpp
rename to modules/beast_core/text/StringArray.cpp
diff --git a/modules/beast_core/text/beast_StringArray.h b/modules/beast_core/text/StringArray.h
similarity index 100%
rename from modules/beast_core/text/beast_StringArray.h
rename to modules/beast_core/text/StringArray.h
diff --git a/modules/beast_core/text/beast_StringPairArray.cpp b/modules/beast_core/text/StringPairArray.cpp
similarity index 100%
rename from modules/beast_core/text/beast_StringPairArray.cpp
rename to modules/beast_core/text/StringPairArray.cpp
diff --git a/modules/beast_core/text/beast_StringPairArray.h b/modules/beast_core/text/StringPairArray.h
similarity index 100%
rename from modules/beast_core/text/beast_StringPairArray.h
rename to modules/beast_core/text/StringPairArray.h
diff --git a/modules/beast_core/text/beast_StringPool.cpp b/modules/beast_core/text/StringPool.cpp
similarity index 100%
rename from modules/beast_core/text/beast_StringPool.cpp
rename to modules/beast_core/text/StringPool.cpp
diff --git a/modules/beast_core/text/beast_StringPool.h b/modules/beast_core/text/StringPool.h
similarity index 100%
rename from modules/beast_core/text/beast_StringPool.h
rename to modules/beast_core/text/StringPool.h
diff --git a/modules/beast_core/text/beast_TextDiff.cpp b/modules/beast_core/text/TextDiff.cpp
similarity index 100%
rename from modules/beast_core/text/beast_TextDiff.cpp
rename to modules/beast_core/text/TextDiff.cpp
diff --git a/modules/beast_core/text/beast_TextDiff.h b/modules/beast_core/text/TextDiff.h
similarity index 100%
rename from modules/beast_core/text/beast_TextDiff.h
rename to modules/beast_core/text/TextDiff.h
diff --git a/modules/beast_core/thread/beast_DeadlineTimer.cpp b/modules/beast_core/thread/DeadlineTimer.cpp
similarity index 83%
rename from modules/beast_core/thread/beast_DeadlineTimer.cpp
rename to modules/beast_core/thread/DeadlineTimer.cpp
index fc8bef5a65..88bbc9e822 100644
--- a/modules/beast_core/thread/beast_DeadlineTimer.cpp
+++ b/modules/beast_core/thread/DeadlineTimer.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 class DeadlineTimer::Manager
-    : public SharedSingleton <DeadlineTimer::Manager>
+    : public LeakChecked <Manager>
     , protected Thread
 {
 private:
@@ -26,9 +26,7 @@ private:
     typedef List <DeadlineTimer> Items;
 
 public:
-    Manager ()
-        : SharedSingleton <Manager> (SingletonLifetime::persistAfterCreation)
-        , Thread ("DeadlineTimer::Manager")
+    Manager () : Thread ("DeadlineTimer::Manager")
     {
         startThread ();
     }
@@ -44,7 +42,8 @@ public:
     // Okay to call on an active timer.
     // However, an extra notification may still happen due to concurrency.
     //
-    void activate (DeadlineTimer& timer, double secondsRecurring, Time const& when)
+    void activate (DeadlineTimer& timer,
+        double secondsRecurring, RelativeTime const& when)
     {
         bassert (secondsRecurring >= 0);
 
@@ -87,7 +86,8 @@ public:
     {
         while (! threadShouldExit ())
         {
-            Time const currentTime = Time::getCurrentTime ();
+            RelativeTime const currentTime (
+                RelativeTime::fromStartup ());
 
             double seconds (0);
             DeadlineTimer* timer (nullptr);
@@ -112,7 +112,7 @@ public:
                         {
                             // Yes so set the timer again.
                             timer->m_notificationTime =
-                                currentTime + RelativeTime (timer->m_secondsRecurring);
+                                currentTime + timer->m_secondsRecurring;
 
                             // Put it back into the list as active
                             insertSorted (*timer);
@@ -123,8 +123,10 @@ public:
                             timer->m_isActive = false;
                         }
 
-                        // Listener will be called later and we will
-                        // go through the loop again without waiting.
+                        timer->m_listener->onDeadlineTimer (*timer);
+
+                        // re-loop
+                        seconds = -1;
                     }
                     else
                     {
@@ -142,11 +144,7 @@ public:
 
             // Note that we have released the lock here.
 
-            if (timer != nullptr)
-            {
-                timer->m_listener->onDeadlineTimer (*timer);
-            }
-            else if (seconds > 0)
+            if (seconds > 0)
             {
                 // Wait until interrupt or next timer.
                 //
@@ -200,11 +198,6 @@ public:
         }
     }
 
-    static Manager* createInstance ()
-    {
-        return new Manager;
-    }
-
 private:
     CriticalSection m_mutex;
     Items m_items;
@@ -214,7 +207,7 @@ private:
 
 DeadlineTimer::DeadlineTimer (Listener* listener)
     : m_listener (listener)
-    , m_manager (Manager::getInstance ())
+    , m_manager (SharedSingleton <Manager>::getInstance ())
     , m_isActive (false)
 {
 }
@@ -224,30 +217,27 @@ DeadlineTimer::~DeadlineTimer ()
     m_manager->deactivate (*this);
 }
 
+void DeadlineTimer::cancel ()
+{
+    m_manager->deactivate (*this);
+}
+
 void DeadlineTimer::setExpiration (double secondsUntilDeadline)
 {
-    bassert (secondsUntilDeadline > 0);
+    bassert (secondsUntilDeadline != 0);
 
-    Time const when = Time::getCurrentTime () + RelativeTime (secondsUntilDeadline);
+    RelativeTime const when (
+        RelativeTime::fromStartup() + secondsUntilDeadline);
 
     m_manager->activate (*this, 0, when);
 }
 
 void DeadlineTimer::setRecurringExpiration (double secondsUntilDeadline)
 {
-    bassert (secondsUntilDeadline > 0);
+    bassert (secondsUntilDeadline != 0);
 
-    Time const when = Time::getCurrentTime () + RelativeTime (secondsUntilDeadline);
+    RelativeTime const when (
+        RelativeTime::fromStartup() + secondsUntilDeadline);
 
     m_manager->activate (*this, secondsUntilDeadline, when);
 }
-
-void DeadlineTimer::setExpirationTime (Time const& when)
-{
-    m_manager->activate (*this, 0, when);
-}
-
-void DeadlineTimer::reset ()
-{
-    m_manager->deactivate (*this);
-}
diff --git a/modules/beast_core/thread/beast_DeadlineTimer.h b/modules/beast_core/thread/DeadlineTimer.h
similarity index 81%
rename from modules/beast_core/thread/beast_DeadlineTimer.h
rename to modules/beast_core/thread/DeadlineTimer.h
index a34e5903e4..3fe462adef 100644
--- a/modules/beast_core/thread/beast_DeadlineTimer.h
+++ b/modules/beast_core/thread/DeadlineTimer.h
@@ -22,7 +22,9 @@
 
 /** Provides periodic or one time notifications at a specified time interval.
 */
-class DeadlineTimer : public List <DeadlineTimer>::Node
+class DeadlineTimer
+    : public List <DeadlineTimer>::Node
+    , public Uncopyable
 {
 public:
     /** Listener for a deadline timer.
@@ -30,8 +32,9 @@ public:
         The listener is called on an auxiliary thread. It is suggested
         not to perform any time consuming operations during the call.
     */
-    // VFALCO TODO Allow construction with a specific ThreadWithCallQueue&
-    //             on which to notify the listener.
+    // VFALCO TODO Perhaps allow construction using a ServiceQueue to use
+    //             for notifications.
+    //
     class Listener
     {
     public:
@@ -45,13 +48,17 @@ public:
 
     ~DeadlineTimer ();
 
+    /** Cancel all notifications.
+        It is okay to call this on an inactive timer.
+        @note It is guaranteed that no notifications will occur after this
+              function returns.
+    */
+    void cancel ();
+
     /** Set the timer to go off once in the future.
-
         If the timer is already active, this will reset it.
-
         @note If the timer is already active, the old one might go off
               before this function returns.
-
         @param secondsUntilDeadline The number of seconds until the timer
                                     will send a notification. This must be
                                     greater than zero.
@@ -59,41 +66,16 @@ public:
     void setExpiration (double secondsUntilDeadline);
 
     /** Set the timer to go off repeatedly with the specified frequency.
-
         If the timer is already active, this will reset it.
-
         @note If the timer is already active, the old one might go off
               before this function returns.
-
         @param secondsUntilDeadline The number of seconds until the timer
                                     will send a notification. This must be
                                     greater than zero.
     */
     void setRecurringExpiration (double secondsUntilDeadline);
 
-    /** Set the timer to go off at a specific time.
-
-        If the timer is already active, this will reset it.
-
-        @note If the timer is already active, the old one might go off
-              before this function returns.
-
-        @note If the time is in the past, the timer will go off
-              immediately.
-    */
-    void setExpirationTime (Time const& when);
-
-    /** Reset the timer so that no more notifications are sent.
-
-        It is okay to call this on an inactive timer.
-
-        @note It is guaranteed that no notifications will occur after this
-              function returns.
-    */
-    void reset ();
-
     /** Equality comparison.
-
         Timers are equal if they have the same address.
     */
     inline bool operator== (DeadlineTimer const& other) const
@@ -101,8 +83,7 @@ public:
         return this == &other;
     }
 
-    /** Inequality comparison.
-    */
+    /** Inequality comparison. */
     inline bool operator!= (DeadlineTimer const& other) const
     {
         return this != &other;
@@ -112,9 +93,9 @@ private:
     class Manager;
 
     Listener* const m_listener;
-    SharedPtr <Manager> m_manager;
+    SharedPtr <SharedSingleton <Manager> > m_manager;
     bool m_isActive;
-    Time m_notificationTime;
+    RelativeTime m_notificationTime;
     double m_secondsRecurring; // non zero if recurring
 };
 
diff --git a/modules/beast_core/thread/beast_Semaphore.cpp b/modules/beast_core/thread/Semaphore.cpp
similarity index 100%
rename from modules/beast_core/thread/beast_Semaphore.cpp
rename to modules/beast_core/thread/Semaphore.cpp
diff --git a/modules/beast_core/thread/beast_Semaphore.h b/modules/beast_core/thread/Semaphore.h
similarity index 100%
rename from modules/beast_core/thread/beast_Semaphore.h
rename to modules/beast_core/thread/Semaphore.h
diff --git a/modules/beast_core/thread/beast_Workers.cpp b/modules/beast_core/thread/Workers.cpp
similarity index 98%
rename from modules/beast_core/thread/beast_Workers.cpp
rename to modules/beast_core/thread/Workers.cpp
index 4137462d1c..e856b06d3c 100644
--- a/modules/beast_core/thread/beast_Workers.cpp
+++ b/modules/beast_core/thread/Workers.cpp
@@ -282,9 +282,6 @@ public:
         testThreads (4);
         testThreads (16);
         testThreads (64);
-        testThreads (128);
-        testThreads (256);
-        testThreads (512);
     }
 };
 
diff --git a/modules/beast_core/thread/beast_Workers.h b/modules/beast_core/thread/Workers.h
similarity index 100%
rename from modules/beast_core/thread/beast_Workers.h
rename to modules/beast_core/thread/Workers.h
diff --git a/modules/beast_core/thread/beast_CallQueue.cpp b/modules/beast_core/thread/beast_CallQueue.cpp
deleted file mode 100644
index 438c6beec3..0000000000
--- a/modules/beast_core/thread/beast_CallQueue.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-CallQueue::CallQueue (String name)
-    : m_name (name)
-{
-}
-
-CallQueue::~CallQueue ()
-{
-    // Someone forget to close the queue.
-    bassert (m_closed.isSignaled ());
-
-    // Can't destroy queue with unprocessed calls.
-    bassert (m_queue.empty ());
-}
-
-bool CallQueue::isAssociatedWithCurrentThread () const
-{
-    return Thread::getCurrentThreadId () == m_id;
-}
-
-// Adds a call to the queue of execution.
-void CallQueue::queuep (Work* c)
-{
-    // If this goes off it means calls are being made after the
-    // queue is closed, and probably there is no one around to
-    // process it.
-    bassert (!m_closed.isSignaled ());
-
-    if (m_queue.push_back (c))
-        signal ();
-}
-
-// Append the Work to the queue. If this call is made from the same
-// thread as the last thread that called synchronize(), then the call
-// will execute synchronously.
-//
-void CallQueue::callp (Work* c)
-{
-    queuep (c);
-
-    // If we are called on the process thread and we are not
-    // recursed into doSynchronize, then process the queue. This
-    // makes calls from the process thread synchronous.
-    //
-    // NOTE: The value of isBeingSynchronized is invalid/volatile unless
-    // this thread is the last process thread.
-    //
-    // NOTE: There is a small window of opportunity where we
-    // might get an undesired synchronization if new thread
-    // calls synchronize() concurrently.
-    //
-    if (isAssociatedWithCurrentThread () &&
-            m_isBeingSynchronized.trySignal ())
-    {
-        doSynchronize ();
-
-        m_isBeingSynchronized.reset ();
-    }
-}
-
-bool CallQueue::synchronize ()
-{
-    bool did_something;
-
-    // Detect recursion into doSynchronize(), and
-    // break ties for concurrent calls atomically.
-    //
-    if (m_isBeingSynchronized.trySignal ())
-    {
-        // Remember this thread.
-        m_id = Thread::getCurrentThreadId ();
-
-        did_something = doSynchronize ();
-
-        m_isBeingSynchronized.reset ();
-    }
-    else
-    {
-        did_something = false;
-    }
-
-    return did_something;
-}
-
-// Can still have pending calls, just can't put new ones in.
-void CallQueue::close ()
-{
-    m_closed.signal ();
-
-    synchronize ();
-}
-
-// Process everything in the queue. The list of pending calls is
-// acquired atomically. New calls may enter the queue while we are
-// processing.
-//
-// Returns true if any functors were called.
-//
-bool CallQueue::doSynchronize ()
-{
-    bool did_something;
-
-    // Reset since we are emptying the queue. Since we loop
-    // until the queue is empty, it is possible for us to exit
-    // this function with an empty queue and signaled state.
-    //
-    reset ();
-
-    Work* call = m_queue.pop_front ();
-
-    if (call)
-    {
-        did_something = true;
-
-        // This method of processing one at a time has the desired
-        // side effect of synchronizing nested calls to us from a functor.
-        //
-        for (;;)
-        {
-            call->operator () ();
-            delete call;
-
-            call = m_queue.pop_front ();
-
-            if (call == 0)
-                break;
-        }
-    }
-    else
-    {
-        did_something = false;
-    }
-
-    return did_something;
-}
diff --git a/modules/beast_core/thread/beast_CallQueue.h b/modules/beast_core/thread/beast_CallQueue.h
deleted file mode 100644
index 352844e028..0000000000
--- a/modules/beast_core/thread/beast_CallQueue.h
+++ /dev/null
@@ -1,506 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_CALLQUEUE_H_INCLUDED
-#define BEAST_CALLQUEUE_H_INCLUDED
-
-/*============================================================================*/
-/**
-  A FIFO for calling functors asynchronously.
-
-  This object is an alternative to traditional locking techniques used to
-  implement concurrent systems. Instead of acquiring a mutex to change shared
-  data, a functor is queued for later execution (usually on another thread). The
-  execution of the functor applies the transformation to the shared state that
-  was formerly performed within a lock (i.e. CriticalSection).
-
-  For read operations on shared data, instead of acquiring a mutex and
-  accessing the data directly, copies are made (one for each thread), and the
-  thread accesses its copy without acquiring a lock. One thread owns the master
-  copy of the shared state. Requests for changing shared state are made by other
-  threads by posting functors to the master thread's CallQueue. The master
-  thread notifies other threads of changes by posting functors to their
-  respective associated CallQueue, using the Listeners interface.
-
-  The purpose of the functor is to encapsulate one mutation of shared state to
-  guarantee progress towards a consensus of the concurrent data among
-  participating threads. Functors should execute quickly, ideally in constant
-  time. Dynamically allocated objects of class type passed as functor parameters
-  should, in general, be reference counted. The ConcurrentObject class is ideal
-  for meeting this requirement, and has the additional benefit that the workload
-  of deletion is performed on a separate, provided thread. This queue is not a
-  replacement for a thread pool or job queue type system.
-
-  A CallQueue is considered signaled when one or more functors are present.
-  Functors are executed during a call to synchronize(). The operation of
-  executing functors via the call to synchronize() is called synchronizing
-  the queue. It can more generally be thought of as synchronizing multiple
-  copies of shared data between threads.
-
-  Although there is some extra work required to set up and maintain this
-  system, the benefits are significant. Since shared data is only synchronized
-  at well defined times, the programmer can reason and make strong statements
-  about the correctness of the concurrent system. For example, if an
-  AudioIODeviceCallback synchronizes the CallQueue only at the beginning of its
-  execution, it is guaranteed that shared data will remain the same throughout
-  the remainder of the function.
-
-  Because shared data is accessed for reading without a lock, upper bounds
-  on the run time performance can easily be calculated and assured. Compare
-  this with the use of a mutex - the run time performance experiences a
-  combinatorial explosion of possibilities depending on the complex interaction
-  of multiple threads.
-
-  Since a CallQueue is almost always used to invoke parameterized member
-  functions of objects, the call() function comes in a variety of convenient
-  forms to make usage easy:
-
-  @code
-
-  void func1 (int);
-
-  struct Object
-  {
-    void func2 (void);
-    void func3 (String name);
-
-    static void func4 ();
-  };
-
-  CallQueue fifo ("Example");
-
-  void example ()
-  {
-    fifo.call (func1, 42);               // same as: func1 (42)
-
-    Object* object = new Object;
-
-    fifo.call (&Object::func2, object);  // same as: object->func2 ()
-
-    fifo.call (&Object::func3,           // same as: object->funcf ("Label")
-                object,
-                "Label");
-
-    fifo.call (&Object::func4);          // even static members can be called.
-
-    fifo.callf (functional::bind (&Object::func2,    // same as: object->func2 ()
-                      object));
-  }
-
-  @endcode
-
-  @invariant Functors can be added from any thread at any time, to any queue
-              which is not closed.
-
-  @invariant When synchronize() is called, functors are called and deleted.
-
-  @invariant The thread from which synchronize() is called is considered the
-              thread associated with the CallQueue.
-
-  @invariant Functors queued by the same thread always execute in the same
-              order they were queued.
-
-  @invariant Functors are guaranteed to execute. It is an error if the
-              CallQueue is deleted while there are functors in it.
-
-  Normally, you will not use CallQueue directly, but one of its subclasses
-  instead. The CallQueue is one of a handful of objects that work together to
-  implement this system of concurrent data access.
-
-  For performance considerations, this implementation is wait-free for
-  producers and mostly wait-free for consumers. It also uses a lock-free
-  and wait-free (in the fast path) custom memory allocator.
-
-  @see GuiCallQueue, ManualCallQueue, MessageThread, ThreadWithCallQueue
-
-  @ingroup beast_concurrent
-*/
-class BEAST_API CallQueue
-{
-public:
-    //============================================================================
-
-    /** Type of allocator to use.
-
-        @internal
-    */
-    typedef FifoFreeStoreType AllocatorType;
-
-    /** Abstract nullary functor in a @ref CallQueue.
-
-        Custom implementations may derive from this object for efficiency instead
-        of using the automatic binding functions.
-    */
-    class Work : public LockFreeQueue <Work>::Node,
-        public AllocatedBy <AllocatorType>
-    {
-    public:
-        virtual ~Work () { }
-
-        /** Calls the functor.
-
-            This executes during the queue's call to synchronize().
-        */
-        virtual void operator () () = 0;
-    };
-
-    //============================================================================
-
-    /** Create the CallQueue.
-
-        The queue starts out open and empty.
-
-        @param name A string to identify the queue during debugging.
-    */
-    explicit CallQueue (String name);
-
-    /** Destroy the CallQueue.
-
-        @invariant Destroying a queue that contains functors results in undefined
-                   behavior.
-
-        @note It is customary to call close() on the CallQueue early in the
-              shutdown process to catch functors going into the queue late.
-    */
-    virtual ~CallQueue ();
-
-    //============================================================================
-
-    /** Add a functor and possibly synchronize.
-
-        Use this when you want to perform the bind yourself.
-
-        @param f The functor to add, typically the return value of a call
-                 to bind().
-
-        @see call
-    */
-    template <class Functor>
-    void callf (Functor f)
-    {
-        callp (new (m_allocator) CallType <Functor> (f));
-    }
-
-    /** Add a function call and possibly synchronize.
-
-        Parameters are evaluated immediately and added to the queue as a packaged
-        functor. If the current thread of execution is the same as the thread
-        associated with the CallQueue, synchronize() is called automatically. This
-        behavior can be avoided by using queue() instead.
-
-        @param f The function to call followed by up to eight parameters,
-                 evaluated immediately. The parameter list must match the function
-        signature. For class member functions, the first argument must be a
-        pointer to the class object.
-
-        @see queue
-
-        @todo Provide an example of when synchronize() is needed in call().
-    */
-    /** @{ */
-#if BEAST_VARIADIC_MAX >= 1
-    template <class Fn>
-    void call (Fn f)
-    { callf (functional::bind (f)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 2
-    template <class Fn, class T1>
-    void call (Fn f, T1 t1)
-    { callf (functional::bind (f, t1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 3
-    template <class Fn, class T1, class T2>
-    void call (Fn f, T1 t1, T2 t2)
-    { callf (functional::bind (f, t1, t2)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 4
-    template <class Fn, class T1, class T2, class T3>
-    void call (Fn f, T1 t1, T2 t2, T3 t3)
-    { callf (functional::bind (f, t1, t2, t3)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 5
-    template <class Fn, class T1, class T2, class T3, class T4>
-    void call (Fn f, T1 t1, T2 t2, T3 t3, T4 t4)
-    { callf (functional::bind (f, t1, t2, t3, t4)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 6
-    template <class Fn, class T1, class T2, class T3, class T4, class T5>
-    void call (Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
-    { callf (functional::bind (f, t1, t2, t3, t4, t5)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 7
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6>
-    void call (Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
-    { callf (functional::bind (f, t1, t2, t3, t4, t5, t6)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 8
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-    void call (Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
-    { callf (functional::bind (f, t1, t2, t3, t4, t5, t6, t7)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 9
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-    void call (Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
-    { callf (functional::bind (f, t1, t2, t3, t4, t5, t6, t7, t8)); }
-#endif
-    /** @} */
-
-    /** Add a functor without synchronizing.
-
-        Use this when you want to perform the bind yourself.
-
-        @param f The functor to add, typically the return value of a call
-                  to bind().
-
-        @see queue
-    */
-    template <class Functor>
-    void queuef (Functor f)
-    {
-        queuep (new (m_allocator) CallType <Functor> (f));
-    }
-
-    /** Add a function call without synchronizing.
-
-        Parameters are evaluated immediately, then the resulting functor is added
-        to the queue. This is used to postpone the call to synchronize() when
-        there would be adverse side effects to executing the function immediately.
-        In this example, we use queue() instead of call() to avoid a deadlock:
-
-        @code
-
-        struct SharedState;           // contains data shared between threads
-
-        SharedData <SharedState> sharedState;
-
-        void stateChanged ()
-        {
-          SharedData <SharedState>::ReadAccess state (sharedState);
-
-          // (read state)
-        }
-
-        CallQueue fifo;
-
-        void changeState ()
-        {
-          SharedData <State>::WriteAccess state (sharedState);
-
-          // (read and write state)
-
-          fifo.call (&stateChanged);  // BUG: DEADLOCK because of the implicit synchronize().
-
-          fifo.queue (&stateChanged); // Okay, synchronize() will be called later,
-                                      // after the write lock is released.
-        }
-
-        @endcode
-
-        @param f The function to call followed by up to eight parameters,
-                  evaluated immediately. The parameter list must match the
-                  function signature. For non-static class member functions,
-                  the first argument must be a pointer an instance of the class.
-
-        @see call
-    */
-    /** @{ */
-#if BEAST_VARIADIC_MAX >= 1
-    template <class Fn>
-    void queue (Fn f)
-    { queuef (functional::bind (f)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 2
-    template <class Fn, class T1>
-    void queue (Fn f, T1 t1)
-    { queuef (functional::bind (f, t1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 3
-    template <class Fn, class T1, class T2>
-    void queue (Fn f, T1 t1, T2 t2)
-    { queuef (functional::bind (f, t1, t2)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 4
-    template <class Fn, class T1, class T2, class T3>
-    void queue (Fn f, T1 t1, T2 t2, T3 t3)
-    { queuef (functional::bind (f, t1, t2, t3)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 5
-    template <class Fn, class T1, class T2, class T3, class T4>
-    void queue (Fn f, T1 t1, T2 t2, T3 t3, T4 t4)
-    { queuef (functional::bind (f, t1, t2, t3, t4)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 6
-    template <class Fn, class T1, class T2, class T3, class T4, class T5>
-    void queue (Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
-    { queuef (functional::bind (f, t1, t2, t3, t4, t5)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 7
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6>
-    void queue (Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
-    { queuef (functional::bind (f, t1, t2, t3, t4, t5, t6)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 8
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-    void queue (Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
-    { queuef (functional::bind (f, t1, t2, t3, t4, t5, t6, t7)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 9
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-    void queue (Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
-    { queuef (functional::bind (f, t1, t2, t3, t4, t5, t6, t7, t8)); }
-#endif
-    /** @} */
-
-protected:
-    //============================================================================
-    /** Synchronize the queue.
-
-        A synchronize operation calls all functors in the queue.  If a functor
-        causes additional functors to be added, they are eventually executed
-        before synchronize() returns. Derived class call this when the queue is
-        signaled, and optionally at any other time. Calling this function from
-        more than one thread simultaneously is undefined.
-
-        @return  true if any functors were executed.
-    */
-    bool synchronize ();
-
-    /** Close the queue.
-
-        Functors may not be added after this routine is called. This is used for
-        diagnostics, to track down spurious calls during application shutdown
-        or exit. Derived classes may call this if the appropriate time is known.
-
-        The queue is synchronized after it is closed.
-    */
-    void close ();
-
-    /** Called when the queue becomes signaled.
-
-        A queue is signaled on the transition from empty to non-empty. Derived
-        classes implement this function to perform a notification so that
-        synchronize() will be called. For example, by triggering a WaitableEvent.
-
-        @note Due to the implementation the queue can remain signaled for one
-              extra cycle. This does not happen under load and is not an issue
-              in practice.
-    */
-    virtual void signal () = 0;
-
-    /** Called when the queue is reset.
-
-        A queue is reset when it was previously signaled and then becomes empty
-        as a result of a call to synchronize.
-    */
-    virtual void reset () = 0;
-
-public:
-    //============================================================================
-
-    /** Add a raw call.
-
-        @internal
-
-        Custom implementations use this to control the allocation.
-
-        @param c The call to add. The memory must come from the allocator.
-    */
-    void callp (Work* c);
-
-    /** Queue a raw call.
-
-        Custom implementations use this to control the allocation.
-
-        @param c The call to add. The memory must come from the allocator.
-    */
-    void queuep (Work* c);
-
-    /** Retrieve the allocator.
-
-        @return The allocator to use when allocating a raw Work object.
-     */
-    inline AllocatorType& getAllocator ()
-    {
-        return m_allocator;
-    }
-
-    /** See if the caller is on the association thread.
-
-        @return `true` if the calling thread of execution is associated with the
-                queue.
-    */
-    bool isAssociatedWithCurrentThread () const;
-
-    /** See if the queue is being synchronized.
-
-        This is used for diagnostics.
-
-        @note This must be called from the associated thread or else the return
-              value is undefined.
-
-        @return `true` if the call stack contains synchronize() for this queue.
-    */
-    bool isBeingSynchronized () const
-    {
-        return m_isBeingSynchronized.isSignaled ();
-    }
-
-private:
-    template <class Functor>
-    class CallType : public Work
-    {
-    public:
-        explicit CallType (Functor f) : m_f (f) { }
-        void operator () ()
-        {
-            m_f ();
-        }
-
-    private:
-        Functor m_f;
-    };
-
-    bool doSynchronize ();
-
-private:
-    String const m_name;
-    Thread::ThreadID m_id;
-    LockFreeQueue <Work> m_queue;
-    AtomicFlag m_closed;
-    AtomicFlag m_isBeingSynchronized;
-    AllocatorType m_allocator;
-};
-
-#endif
diff --git a/modules/beast_core/thread/beast_ConcurrentObject.cpp b/modules/beast_core/thread/beast_ConcurrentObject.cpp
deleted file mode 100644
index 91c0c53e30..0000000000
--- a/modules/beast_core/thread/beast_ConcurrentObject.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-class ConcurrentObject::Deleter : private ThreadWithCallQueue::EntryPoints
-{
-private:
-    Deleter () : m_thread ("AsyncDeleter")
-    {
-        m_thread.start (this);
-    }
-
-    ~Deleter ()
-    {
-        m_thread.stop (true);
-    }
-
-    void performAtExit ()
-    {
-        //delete this;
-    }
-
-    static void doDelete (ConcurrentObject* sharedObject)
-    {
-        delete sharedObject;
-    }
-
-public:
-    void destroy (ConcurrentObject* sharedObject)
-    {
-        if (m_thread.isAssociatedWithCurrentThread ())
-            delete sharedObject;
-        else
-            m_thread.call (&Deleter::doDelete, sharedObject);
-    }
-
-    static Deleter& getInstance ()
-    {
-        static Deleter instance;
-
-        return instance;
-    }
-
-private:
-    ThreadWithCallQueue m_thread;
-};
-
-//------------------------------------------------------------------------------
-
-ConcurrentObject::ConcurrentObject ()
-{
-}
-
-ConcurrentObject::~ConcurrentObject ()
-{
-}
-
-void ConcurrentObject::destroyConcurrentObject ()
-{
-    Deleter::getInstance ().destroy (this);
-}
diff --git a/modules/beast_core/thread/beast_ConcurrentObject.h b/modules/beast_core/thread/beast_ConcurrentObject.h
deleted file mode 100644
index e298e900f6..0000000000
--- a/modules/beast_core/thread/beast_ConcurrentObject.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_CONCURRENTOBJECT_H_INCLUDED
-#define BEAST_CONCURRENTOBJECT_H_INCLUDED
-
-/*============================================================================*/
-/**
-  A reference counted object with overridable destroy behavior.
-
-  This is a reference counted object compatible with
-  ReferenceCountedObjectPtr. When the last reference is removed, the
-  object is queued for deletion on a separate, provided thread. On
-  program exit the thread will clean itself up - no other action is
-  required.
-
-  This class is useful for offloading the deletion work of "deep" objects
-  shared by multiple threads: objects containing complex members, or a
-  hierarchy of allocated structures. For example, a ValueTree. The problem
-  of performing heavyweight memory or cleanup operations from either an
-  AudioIODeviceCallback or the message thread is avoided.
-
-  The deletion behavior can be overriden by providing a replacement
-  for destroyConcurrentObject().
-
-  @ingroup beast_concurrent
-*/
-class BEAST_API ConcurrentObject : Uncopyable
-{
-public:
-    inline void incReferenceCount () noexcept
-    {
-        m_refs.addref ();
-    }
-
-    inline void decReferenceCount () noexcept
-    {
-        if (m_refs.release ())
-            destroyConcurrentObject ();
-    }
-
-protected:
-    ConcurrentObject ();
-
-    virtual ~ConcurrentObject ();
-
-    /** Delete the object.
-
-        This function is called when the reference count drops to zero. The
-        default implementation performs the delete on a separate, provided thread
-        that cleans up after itself on exit.
-    */
-    virtual void destroyConcurrentObject ();
-
-protected:
-    class Deleter;
-
-private:
-    AtomicCounter m_refs;
-};
-
-#endif
-
diff --git a/modules/beast_core/thread/beast_InterruptibleThread.cpp b/modules/beast_core/thread/beast_InterruptibleThread.cpp
deleted file mode 100644
index 3f3c233b3f..0000000000
--- a/modules/beast_core/thread/beast_InterruptibleThread.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-InterruptibleThread::ThreadHelper::ThreadHelper (String name,
-        InterruptibleThread* owner)
-    : Thread (name)
-    , m_owner (owner)
-{
-}
-
-InterruptibleThread* InterruptibleThread::ThreadHelper::getOwner () const
-{
-    return m_owner;
-}
-
-void InterruptibleThread::ThreadHelper::run ()
-{
-    m_owner->run ();
-}
-
-//------------------------------------------------------------------------------
-
-InterruptibleThread::InterruptibleThread (String name)
-    : m_thread (name, this)
-    , m_entryPoint (nullptr)
-    , m_state (stateRun)
-{
-}
-
-InterruptibleThread::~InterruptibleThread ()
-{
-    m_runEvent.signal ();
-
-    join ();
-}
-
-void InterruptibleThread::start (EntryPoint* const entryPoint)
-{
-    m_entryPoint = entryPoint;
-
-    m_thread.startThread ();
-
-    // Prevent data race with member variables
-    //
-    m_runEvent.signal ();
-}
-
-void InterruptibleThread::join ()
-{
-    m_thread.stopThread (-1);
-}
-
-// Block until there is an interruption.
-// This counts as an interruption point.
-//
-void InterruptibleThread::wait ()
-{
-    // Can only be called from the thread of execution.
-    bassert (isTheCurrentThread ());
-
-    for (;;)
-    {
-        // Impossible for us to already be in the wait state.
-        bassert (m_state != stateWait);
-
-        // See if we are interrupted.
-        if (m_state.tryChangeState (stateInterrupt, stateRun))
-        {
-            // We were interrupted, so the wait is satisfied.
-            return;
-        }
-        else
-        {
-            // Try to get into the wait state.
-            if (m_state.tryChangeState (stateRun, stateWait))
-            {
-                bassert (m_state == stateWait);
-
-                // Got into the wait state so block until interrupt.
-                m_thread.wait ();
-
-                // Event is signalled means we were
-                // interrupted, so the wait is satisfied.
-                bassert (m_state != stateWait || m_thread.threadShouldExit ());
-                return;
-            }
-        }
-    }
-}
-
-void InterruptibleThread::interrupt ()
-{
-    for (;;)
-    {
-        int const state (m_state);
-
-        if (state == stateInterrupt ||
-            m_state.tryChangeState (stateRun, stateInterrupt))
-        {
-            // We got into the interrupt state, the thead
-            // will see this at the next interruption point.
-            //
-            // Thread will see this at next interruption point.
-            //
-            break;
-        }
-        else if (m_state.tryChangeState (stateWait, stateRun))
-        {
-            m_thread.notify ();
-            break;
-        }
-    }
-}
-
-// Returns true if the thead function should stop
-// its activities as soon as possible and return.
-//
-bool InterruptibleThread::interruptionPoint ()
-{
-    // Can only be called from the thread of execution.
-    bassert (isTheCurrentThread ());
-
-    // Impossible for this to be called in the wait state.
-    bassert (m_state != stateWait);
-
-    bool const interrupted (m_state.tryChangeState (stateInterrupt, stateRun));
-
-    return interrupted;
-}
-
-InterruptibleThread::id InterruptibleThread::getId () const
-{
-    return m_threadId;
-}
-
-bool InterruptibleThread::isTheCurrentThread () const
-{
-    return m_thread.getCurrentThreadId () == m_threadId;
-}
-
-void InterruptibleThread::setPriority (int priority)
-{
-    m_thread.setPriority (priority);
-}
-
-InterruptibleThread* InterruptibleThread::getCurrentThread ()
-{
-    InterruptibleThread* result = nullptr;
-
-    Thread* const thread = Thread::getCurrentThread ();
-
-    if (thread != nullptr)
-    {
-        ThreadHelper* const helper = dynamic_cast <ThreadHelper*> (thread);
-
-        bassert (helper != nullptr);
-
-        result = helper->getOwner ();
-    }
-
-    return result;
-}
-
-void InterruptibleThread::run ()
-{
-    m_threadId = m_thread.getThreadId ();
-
-    m_runEvent.wait ();
-
-    m_entryPoint->threadRun ();
-}
-
-//------------------------------------------------------------------------------
-
-bool CurrentInterruptibleThread::interruptionPoint ()
-{
-    bool interrupted = false;
-
-    InterruptibleThread* const interruptibleThread (InterruptibleThread::getCurrentThread ());
-
-    bassert (interruptibleThread != nullptr);
-
-    interrupted = interruptibleThread->interruptionPoint ();
-
-    return interrupted;
-}
diff --git a/modules/beast_core/thread/beast_InterruptibleThread.h b/modules/beast_core/thread/beast_InterruptibleThread.h
deleted file mode 100644
index 658d486543..0000000000
--- a/modules/beast_core/thread/beast_InterruptibleThread.h
+++ /dev/null
@@ -1,174 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_INTERRUPTIBLETHREAD_H_INCLUDED
-#define BEAST_INTERRUPTIBLETHREAD_H_INCLUDED
-
-//==============================================================================
-/**
-    A thread with soft interruption support.
-
-    The thread must periodically call interruptionPoint(), which returns `true`
-    the first time an interruption has occurred since the last call to
-    interruptionPoint().
-
-    To create a thread, derive your class from InterruptibleThread::EntryPoint
-    and implement the threadRun() function. Then, call run() with your object.
-
-    @ingroup beast_core
-*/
-class BEAST_API InterruptibleThread
-{
-public:
-    /** InterruptibleThread entry point.
-    */
-    class EntryPoint
-    {
-    public:
-        virtual ~EntryPoint () { }
-
-        virtual void threadRun () = 0;
-    };
-
-public:
-    typedef Thread::ThreadID id;
-
-    /** Construct an interruptible thread.
-
-        The name is used for debugger diagnostics.
-
-        @param name The name of the thread.
-    */
-    explicit InterruptibleThread (String name);
-
-    /** Destroy the interruptible thread.
-
-        This will signal an interrupt and wait until the thread exits.
-    */
-    ~InterruptibleThread ();
-
-    /** Start the thread.
-    */
-    void start (EntryPoint* const entryPoint);
-
-    /** Wait for the thread to exit.
-    */
-    void join ();
-
-    /** Wait for interrupt.
-        This call blocks until the thread is interrupted.
-        May only be called by the thread of execution.
-    */
-    void wait ();
-
-    /** Interrupt the thread of execution.
-
-        This can be called from any thread.
-    */
-    void interrupt ();
-
-    /** Determine if an interruption is requested.
-
-        After the function returns `true`, the interrupt status is cleared.
-        Subsequent calls will return `false` until another interrupt is requested.
-
-        May only be called by the thread of execution.
-
-        @see CurrentInterruptibleThread::interruptionPoint
-
-        @return `true` if an interrupt was requested.
-    */
-    bool interruptionPoint ();
-
-    /** Get the ID of the associated thread.
-
-        @return The ID of the thread.
-    */
-    id getId () const;
-
-    /** Determine if this is the thread of execution.
-
-        @note The return value is undefined if the thread is not running.
-
-        @return `true` if the caller is this thread of execution.
-    */
-    bool isTheCurrentThread () const;
-
-    /** Adjust the thread priority.
-
-        @note This only affects some platforms.
-
-        @param priority A number from 0..10
-    */
-    void setPriority (int priority);
-
-    /** Get the InterruptibleThread for the thread of execution.
-
-        This will return `nullptr` when called from the message thread, or from
-        a thread of execution that is not an InterruptibleThread.
-    */
-    static InterruptibleThread* getCurrentThread ();
-
-private:
-    class ThreadHelper : public Thread
-    {
-    public:
-        ThreadHelper (String name, InterruptibleThread* owner);
-
-        InterruptibleThread* getOwner () const;
-
-        void run ();
-
-    private:
-        InterruptibleThread* const m_owner;
-    };
-
-    void run ();
-
-    ThreadHelper m_thread;
-    EntryPoint* m_entryPoint;
-    WaitableEvent m_runEvent;
-    id m_threadId;
-
-    enum
-    {
-        stateRun,
-        stateInterrupt,
-        stateWait
-    };
-
-    AtomicState m_state;
-};
-
-//------------------------------------------------------------------------------
-
-/** Global operations on the current InterruptibleThread.
-
-    Calling members of the class from a thread of execution which is not an
-    InterruptibleThread results in undefined behavior.
-*/
-class CurrentInterruptibleThread
-{
-public:
-    /** Call the current thread's interrupt point function.
-    */
-    static bool interruptionPoint ();
-};
-
-#endif
diff --git a/modules/beast_core/thread/beast_Listeners.cpp b/modules/beast_core/thread/beast_Listeners.cpp
deleted file mode 100644
index 6854217313..0000000000
--- a/modules/beast_core/thread/beast_Listeners.cpp
+++ /dev/null
@@ -1,758 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-// CallQueue item to process a Call for a particular listener.
-// This is used to avoid bind overhead.
-//
-class ListenersBase::CallWork : public CallQueue::Work
-{
-public:
-    inline CallWork (ListenersBase::Call* const c, void* const listener)
-        : m_call (c), m_listener (listener)
-    {
-    }
-
-    void operator () ()
-    {
-        m_call->operator () (m_listener);
-    }
-
-private:
-    ListenersBase::Call::Ptr m_call;
-    void* const m_listener;
-};
-
-//------------------------------------------------------------------------------
-
-// CallQueue item to process a Call for a group.
-// This is used to avoid bind overhead.
-//
-class ListenersBase::GroupWork : public CallQueue::Work
-{
-public:
-    inline GroupWork (Group* group,
-                      ListenersBase::Call* c,
-                      const timestamp_t timestamp)
-        : m_group (group)
-        , m_call (c)
-        , m_timestamp (timestamp)
-    {
-    }
-
-    void operator () ()
-    {
-        m_group->do_call (m_call, m_timestamp);
-    }
-
-private:
-    Group::Ptr m_group;
-    ListenersBase::Call::Ptr m_call;
-    const timestamp_t m_timestamp;
-};
-
-//------------------------------------------------------------------------------
-
-// CallQueue item to process a call for a particular listener.
-// This is used to avoid bind overhead.
-//
-class ListenersBase::GroupWork1 : public CallQueue::Work
-{
-public:
-    inline GroupWork1 (Group* group,
-                       ListenersBase::Call* c,
-                       const timestamp_t timestamp,
-                       void* const listener)
-        : m_group (group)
-        , m_call (c)
-        , m_timestamp (timestamp)
-        , m_listener (listener)
-    {
-    }
-
-    void operator () ()
-    {
-        m_group->do_call1 (m_call, m_timestamp, m_listener);
-    }
-
-private:
-    Group::Ptr m_group;
-    ListenersBase::Call::Ptr m_call;
-    const timestamp_t m_timestamp;
-    void* const m_listener;
-};
-
-//------------------------------------------------------------------------------
-
-// A Proxy maintains a list of Entry.
-// Each Entry holds a group and the current Call (which can be updated).
-//
-struct ListenersBase::Proxy::Entry : Entries::Node,
-        SharedObject,
-        AllocatedBy <AllocatorType>
-{
-    typedef SharedPtr <Entry> Ptr;
-
-    explicit Entry (Group* g)
-        : group (g)
-    {
-    }
-
-    ~Entry ()
-    {
-        bassert (call.get () == 0);
-    }
-
-    Group::Ptr group;
-    AtomicPointer <Call> call;
-};
-
-//------------------------------------------------------------------------------
-
-// A Group maintains a list of Entry.
-//
-struct ListenersBase::Group::Entry : List <Entry>::Node,
-        AllocatedBy <AllocatorType>
-{
-    Entry (void* const l, const timestamp_t t)
-        : listener (l)
-        , timestamp (t)
-    {
-    }
-
-    void* const listener;
-    const timestamp_t timestamp;
-};
-
-//------------------------------------------------------------------------------
-//
-// Group
-//
-//------------------------------------------------------------------------------
-
-// - A list of listeners associated with the same CallQueue.
-//
-// - The list is only iterated on the CallQueue's thread.
-//
-// - It is safe to add or remove listeners from the group
-//   at any time.
-//
-
-ListenersBase::Group::Group (CallQueue& callQueue)
-    : m_fifo (callQueue)
-    , m_listener (0)
-{
-}
-
-ListenersBase::Group::~Group ()
-{
-    // If this goes off it means a Listener forgot to remove itself.
-    bassert (m_list.empty ());
-
-    // shouldn't be deleting group during a call
-    bassert (m_listener == 0);
-}
-
-// Add the listener with the given timestamp.
-// The listener will only get calls with higher timestamps.
-// The caller must prevent duplicates.
-//
-void ListenersBase::Group::add (void* listener,
-                                const timestamp_t timestamp,
-                                AllocatorType& allocator)
-{
-    ReadWriteMutex::ScopedWriteLockType lock (m_mutex);
-
-    bassert (!contains (listener));
-
-    // Should never be able to get here while in call()
-    bassert (m_listener == 0);
-
-    // Add the listener and remember the time stamp so we don't
-    // send it calls that were queued earlier than the add().
-    m_list.push_back (*new (allocator) Entry (listener, timestamp));
-}
-
-// Removes the listener from the group if it exists.
-// Returns true if the listener was removed.
-//
-bool ListenersBase::Group::remove (void* listener)
-{
-    bool found = false;
-
-    ReadWriteMutex::ScopedWriteLockType lock (m_mutex);
-
-    // Should never be able to get here while in call()
-    bassert (m_listener == 0);
-
-    for (List <Entry>::iterator iter = m_list.begin (); iter != m_list.end (); ++iter)
-    {
-        Entry* entry = & (*iter);
-
-        if (entry->listener == listener)
-        {
-            m_list.erase (m_list.iterator_to (*entry));
-            delete entry;
-            found = true;
-            break;
-        }
-    }
-
-    return found;
-}
-
-// Used for assertions.
-// The caller must synchronize.
-//
-bool ListenersBase::Group::contains (void* const listener) /*const*/
-{
-    for (List <Entry>::iterator iter = m_list.begin (); iter != m_list.end (); iter++)
-        if (iter->listener == listener)
-            return true;
-
-    return false;
-}
-
-void ListenersBase::Group::call (Call* const c, const timestamp_t timestamp)
-{
-    bassert (!empty ());
-    m_fifo.callp (new (m_fifo.getAllocator ()) GroupWork (this, c, timestamp));
-}
-
-void ListenersBase::Group::queue (Call* const c, const timestamp_t timestamp)
-{
-    bassert (!empty ());
-    m_fifo.queuep (new (m_fifo.getAllocator ()) GroupWork (this, c, timestamp));
-}
-
-void ListenersBase::Group::call1 (Call* const c,
-                                  const timestamp_t timestamp,
-                                  void* const listener)
-{
-    m_fifo.callp (new (m_fifo.getAllocator ()) GroupWork1 (
-                      this, c, timestamp, listener));
-}
-
-void ListenersBase::Group::queue1 (Call* const c,
-                                   const timestamp_t timestamp,
-                                   void* const listener)
-{
-    m_fifo.queuep (new (m_fifo.getAllocator ()) GroupWork1 (
-                       this, c, timestamp, listener));
-}
-
-// Queues a reference to the Call on the thread queue of each listener
-// that is currently in our list. The thread queue must be in the
-// stack's call chain, either directly from CallQueue::synchronize(),
-// or from Proxy::do_call() called from CallQueue::synchronize().
-//
-void ListenersBase::Group::do_call (Call* const c, const timestamp_t timestamp)
-{
-    if (!empty ())
-    {
-        ReadWriteMutex::ScopedReadLockType lock (m_mutex);
-
-        // Recursion not allowed.
-        bassert (m_listener == 0);
-
-        // The body of the loop MUST NOT cause listeners to get called.
-        // Therefore, we don't have to worry about listeners removing
-        // themselves while iterating the list.
-        //
-        for (List <Entry>::iterator iter = m_list.begin (); iter != m_list.end ();)
-        {
-            Entry* entry = & (*iter++);
-
-            // Since it is possible for a listener to be added after a
-            // Call gets queued but before it executes, this prevents listeners
-            // from seeing Calls created before they were added.
-            //
-            if (timestamp > entry->timestamp)
-            {
-                m_listener = entry->listener;
-
-                // The thread queue's synchronize() function MUST be in our call
-                // stack to guarantee that these calls will not execute immediately.
-                // They will be handled by the tail recusion unrolling in the
-                // thread queue.
-                bassert (m_fifo.isBeingSynchronized ());
-
-                m_fifo.callp (new (m_fifo.getAllocator ()) CallWork (c, m_listener));
-
-                m_listener = 0;
-            }
-        }
-    }
-    else
-    {
-        // last listener was removed before we got here,
-        // and the parent listener list may have been deleted.
-    }
-}
-
-void ListenersBase::Group::do_call1 (Call* const c, const timestamp_t timestamp,
-                                     void* const listener)
-{
-    if (!empty ())
-    {
-        ReadWriteMutex::ScopedReadLockType lock (m_mutex);
-
-        // Recursion not allowed.
-        bassert (m_listener == 0);
-
-        for (List <Entry>::iterator iter = m_list.begin (); iter != m_list.end ();)
-        {
-            Entry* entry = & (*iter++);
-
-            if (entry->listener == listener)
-            {
-                if (timestamp > entry->timestamp)
-                {
-                    m_listener = entry->listener;
-
-                    bassert (m_fifo.isBeingSynchronized ());
-
-                    m_fifo.callp (new (m_fifo.getAllocator ()) CallWork (c, m_listener));
-
-                    m_listener = 0;
-                }
-            }
-        }
-    }
-    else
-    {
-        // Listener was removed
-    }
-}
-
-//------------------------------------------------------------------------------
-//
-// Proxy
-//
-//------------------------------------------------------------------------------
-
-// CallQueue item for processing a an Entry for a Proxy.
-// This is used to avoid bind overhead.
-//
-class ListenersBase::Proxy::Work : public CallQueue::Work
-{
-public:
-    inline Work (Entry* const entry, const timestamp_t timestamp)
-        : m_entry (entry)
-        , m_timestamp (timestamp)
-    {
-    }
-
-    void operator () ()
-    {
-        ListenersBase::Call* c = m_entry->call.exchange (0);
-        Group* group = m_entry->group;
-        if (!group->empty ())
-            group->do_call (c, m_timestamp);
-        c->decReferenceCount ();
-    }
-
-private:
-    Entry::Ptr m_entry;
-    const timestamp_t m_timestamp;
-};
-
-// Holds a Call, and gets put in the CallQueue in place of the Call.
-// The Call may be replaced if it hasn't been processed yet.
-// A Proxy exists for the lifetime of the Listeners.
-//
-ListenersBase::Proxy::Proxy (void const* const member, const size_t bytes)
-    : m_bytes (bytes)
-{
-    if (bytes > maxMemberBytes)
-        Throw (Error ().fail (__FILE__, __LINE__, "the Proxy member is too large"));
-
-    memcpy (m_member, member, bytes);
-}
-
-ListenersBase::Proxy::~Proxy ()
-{
-    // If the proxy is getting destroyed it means:
-    // - the listeners object is getting destroyed
-    // - all listeners must have removed themselves
-    // - all thread queues have been fully processed
-    // Therefore, our entries should be gone.
-
-    // NO it is possible for an empty Group, for which
-    // the parent listeners object has been destroyed,
-    // to still exist in a thread queue!!!
-
-    // But all listeners should have removed themselves
-    // so our list of groups should still be empty.
-    bassert (m_entries.empty ());
-}
-
-// Adds the group to the Proxy.
-// Caller must have the proxies mutex.
-// Caller is responsible for preventing duplicates.
-//
-void ListenersBase::Proxy::add (Group* group, AllocatorType& allocator)
-{
-    Entry* entry (new (allocator) Entry (group));
-
-    // Manual addref and put raw pointer in list
-    entry->incReferenceCount ();
-    m_entries.push_back (*entry);
-}
-
-// Removes the group from the Proxy.
-// Caller must have the proxies mutex.
-// Caller is responsible for making sure the group exists.
-void ListenersBase::Proxy::remove (Group* group)
-{
-    for (Entries::iterator iter = m_entries.begin (); iter != m_entries.end ();)
-    {
-        Entry* entry = & (*iter++);
-
-        if (entry->group == group)
-        {
-            // remove from list and manual release
-            m_entries.erase (m_entries.iterator_to (*entry));
-            entry->decReferenceCount ();
-
-            // Entry might still be in the empty group's thread queue
-            break;
-        }
-    }
-}
-
-// For each group, updates the call.
-// Queues each group that isn't already queued.
-// Caller must acquire the group read lock.
-//
-void ListenersBase::Proxy::update (Call* const c, const timestamp_t timestamp)
-{
-    // why would we even want to be called?
-    bassert (!m_entries.empty ());
-
-    // With the read lock, this list can't change on us unless someone
-    // adds a listener to a new thread queue in response to a call.
-    for (Entries::iterator iter = m_entries.begin (); iter != m_entries.end ();)
-    {
-        Entry* entry = & (*iter++);
-
-        // Manually add a reference since we use a raw pointer
-        c->incReferenceCount ();
-
-        // Atomically exchange the new call for the old one
-        Call* old = entry->call.exchange (c);
-
-        // If no old call then they need to be queued
-        if (!old)
-        {
-            CallQueue& callQueue = entry->group->getCallQueue ();
-            callQueue.callp (new (callQueue.getAllocator ()) Work (entry, timestamp));
-        }
-        else
-        {
-            old->decReferenceCount ();
-        }
-    }
-}
-
-bool ListenersBase::Proxy::match (void const* const member, const size_t bytes) const
-{
-    return m_bytes == bytes && memcmp (member, m_member, bytes) == 0;
-}
-
-//------------------------------------------------------------------------------
-//
-// ListenersBase
-//
-//------------------------------------------------------------------------------
-
-ListenersBase::ListenersBase ()
-    : m_timestamp (0)
-    , m_allocator (AllocatorType::getInstance ())
-    , m_callAllocator (CallAllocatorType::getInstance ())
-{
-}
-
-ListenersBase::~ListenersBase ()
-{
-    for (Groups::iterator iter = m_groups.begin (); iter != m_groups.end ();)
-    {
-        Group* group = & (*iter++);
-
-        // If this goes off it means a Listener forgot to remove.
-        bassert (group->empty ());
-
-        group->decReferenceCount ();
-    }
-
-    // Proxies are never deleted until here.
-    for (Proxies::iterator iter = m_proxies.begin (); iter != m_proxies.end ();)
-        delete & (*iter++);
-}
-
-void ListenersBase::add_void (void* const listener, CallQueue& callQueue)
-{
-    ReadWriteMutex::ScopedWriteLockType lock (m_groups_mutex);
-
-#if BEAST_DEBUG
-
-    // Make sure the listener has not already been added
-    // SHOULD USE const_iterator!
-    for (Groups::iterator iter = m_groups.begin (); iter != m_groups.end ();)
-    {
-        Group* group = & (*iter++);
-
-        // We can be in do_call() on another thread now, but it
-        // doesn't modify the list, and we have the write lock.
-        bassert (!group->contains (listener));
-    }
-
-#endif
-
-    // See if we already have a Group for this thread queue.
-    Group::Ptr group;
-
-    // SHOULD USE const_iterator
-    for (Groups::iterator iter = m_groups.begin (); iter != m_groups.end ();)
-    {
-        Group::Ptr cur = & (*iter++);
-
-        if (&cur->getCallQueue () == &callQueue)
-        {
-            group = cur;
-            break;
-        }
-    }
-
-    if (!group)
-    {
-        group = new (m_allocator) Group (callQueue);
-
-        // Add it to the list, and give it a manual ref
-        // since the list currently uses raw pointers.
-        group->incReferenceCount ();
-        m_groups.push_back (*group);
-
-        // Tell existing proxies to add the group
-        ReadWriteMutex::ScopedReadLockType lock (m_proxies_mutex);
-
-        for (Proxies::iterator iter = m_proxies.begin (); iter != m_proxies.end ();)
-            (iter++)->add (group, *m_allocator);
-    }
-
-    // Add the listener to the group with the current timestamp
-    group->add (listener, m_timestamp, *m_allocator);
-
-    // Increment the timestamp within the mutex so
-    // future calls will be newer than this listener.
-    ++m_timestamp;
-}
-
-void ListenersBase::remove_void (void* const listener)
-{
-    ReadWriteMutex::ScopedWriteLockType lock (m_groups_mutex);
-
-    // Make sure the listener exists
-#if BEAST_DEBUG
-    {
-        bool exists = false;
-
-        for (Groups::iterator iter = m_groups.begin (); iter != m_groups.end ();)
-        {
-            Group* group = & (*iter++);
-
-            // this should never happen while we hold the mutex
-            bassert (!group->empty ());
-
-            if (group->contains (listener))
-            {
-                bassert (!exists); // added twice?
-
-                exists = true;
-                // keep going to make sure there are no empty groups
-            }
-        }
-
-        bassert (exists);
-    }
-#endif
-
-    // Find the group and remove
-    for (Groups::iterator iter = m_groups.begin (); iter != m_groups.end ();)
-    {
-        Group::Ptr group = & (*iter++);
-
-        // If the listener is in there, take it out.
-        if (group->remove (listener))
-        {
-            // Are we the last listener?
-            if (group->empty ())
-            {
-                // Tell proxies to remove the group
-                {
-                    ReadWriteMutex::ScopedWriteLockType lock (m_proxies_mutex);
-
-                    for (Proxies::iterator iter = m_proxies.begin (); iter != m_proxies.end ();)
-                    {
-                        Proxy* proxy = & (*iter++);
-                        proxy->remove (group);
-                    }
-                }
-
-                // Remove it from the list and manually release
-                // the reference since the list uses raw pointers.
-                m_groups.erase (m_groups.iterator_to (*group.getObject ()));
-                group->decReferenceCount ();
-
-                // It is still possible for the group to exist at this
-                // point in a thread queue but it will get processed,
-                // do nothing, and release its own final reference.
-            }
-
-            break;
-        }
-    }
-}
-
-void ListenersBase::callp (Call::Ptr cp)
-{
-    Call* c = cp;
-
-    ReadWriteMutex::ScopedReadLockType lock (m_groups_mutex);
-
-    // can't be const iterator because queue() might cause called functors
-    // to modify the list.
-    for (Groups::iterator iter = m_groups.begin (); iter != m_groups.end ();)
-        (iter++)->call (c, m_timestamp);
-}
-
-void ListenersBase::queuep (Call::Ptr cp)
-{
-    Call* c = cp;
-
-    ReadWriteMutex::ScopedReadLockType lock (m_groups_mutex);
-
-    // can't be const iterator because queue() might cause called functors
-    // to modify the list.
-    for (Groups::iterator iter = m_groups.begin (); iter != m_groups.end ();)
-        (iter++)->queue (c, m_timestamp);
-}
-
-void ListenersBase::call1p_void (void* const listener, Call* c)
-{
-    ReadWriteMutex::ScopedReadLockType lock (m_groups_mutex);
-
-    // can't be const iterator because queue() might cause called functors
-    // to modify the list.
-    for (Groups::iterator iter = m_groups.begin (); iter != m_groups.end ();)
-    {
-        Group* group = & (*iter++);
-
-        if (group->contains (listener))
-        {
-            group->call1 (c, m_timestamp, listener);
-            break;
-        }
-    }
-}
-
-void ListenersBase::queue1p_void (void* const listener, Call* c)
-{
-    ReadWriteMutex::ScopedReadLockType lock (m_groups_mutex);
-
-    // can't be const iterator because queue() might cause called functors
-    // to modify the list.
-    for (Groups::iterator iter = m_groups.begin (); iter != m_groups.end ();)
-    {
-        Group* group = & (*iter++);
-
-        if (group->contains (listener))
-        {
-            group->queue1 (c, m_timestamp, listener);
-            break;
-        }
-    }
-}
-
-// Search for an existing Proxy that matches the pointer to
-// member and replace it's Call, or create a new Proxy for it.
-//
-void ListenersBase::updatep (void const* const member,
-                             const size_t bytes, Call::Ptr cp)
-{
-    Call* c = cp;
-
-    ReadWriteMutex::ScopedReadLockType lock (m_groups_mutex);
-
-    if (!m_groups.empty ())
-    {
-        Proxy* proxy;
-
-        {
-            ReadWriteMutex::ScopedReadLockType lock (m_proxies_mutex);
-
-            // See if there's already a proxy
-            proxy = find_proxy (member, bytes);
-        }
-
-        // Possibly create one
-        if (!proxy)
-        {
-            ReadWriteMutex::ScopedWriteLockType lock (m_proxies_mutex);
-
-            // Have to search for it again in case someone else added it
-            proxy = find_proxy (member, bytes);
-
-            if (!proxy)
-            {
-                // Create a new empty proxy
-                proxy = new (m_allocator) Proxy (member, bytes);
-
-                // Add all current groups to the Proxy.
-                // We need the group read lock for this (caller provided).
-                for (Groups::iterator iter = m_groups.begin (); iter != m_groups.end ();)
-                {
-                    Group* group = & (*iter++);
-                    proxy->add (group, *m_allocator);
-                }
-
-                // Add it to the list.
-                m_proxies.push_front (*proxy);
-            }
-        }
-
-        // Requires the group read lock
-        proxy->update (c, m_timestamp);
-    }
-}
-
-// Searches for a proxy that matches the pointer to member.
-// Caller synchronizes.
-//
-ListenersBase::Proxy* ListenersBase::find_proxy (const void* member, size_t bytes)
-{
-    for (Proxies::iterator iter = m_proxies.begin (); iter != m_proxies.end ();)
-    {
-        Proxy* proxy = & (*iter++);
-
-        if (proxy->match (member, bytes))
-            return proxy;
-    }
-
-    return 0;
-}
diff --git a/modules/beast_core/thread/beast_Listeners.h b/modules/beast_core/thread/beast_Listeners.h
deleted file mode 100644
index e6f33ecb3b..0000000000
--- a/modules/beast_core/thread/beast_Listeners.h
+++ /dev/null
@@ -1,797 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_LISTENERS_H_INCLUDED
-#define BEAST_LISTENERS_H_INCLUDED
-
-/*============================================================================*/
-/**
-  A group of concurrent Listeners.
-
-  A Listener is an object of class type which inherits from a defined
-  interface, and registers on a provided instance of Listeners to receive
-  asynchronous notifications of changes to concurrent states. Another way of
-  defining Listeners, is that it is similar to a Juce ListenerList but with
-  the provision that the Listener registers with the CallQueue upon which the
-  notification should be made.
-
-  Listeners makes extensive use of CallQueue for providing the notifications,
-  and provides a higher level facility for implementing the concurrent
-  synchronization strategy outlined in CallQueue. Therefore, the same notes
-  which apply to functors in CallQueue also apply to Listener member
-  invocations. Their execution time should be brief, limited in scope to
-  updating the recipient's view of a shared state, and use reference counting
-  for parameters of class type.
-
-  To use this system, first declare your Listener interface:
-
-  @code
-
-  struct Listener
-  {
-    // Sent on every output block
-    virtual void onOutputLevelChanged (const float outputLevel) { }
-  };
-
-  @endcode
-
-  Now set up the place where you want to send the notifications. In this
-  example, we will set up the AudioIODeviceCallback to notify anyone who is
-  interested about changes in the current audio output level. We will use
-  this to implement a VU meter:
-
-  @code
-
-  Listeners <Listener> listeners;
-
-  // (Process audio data)
-
-  // Calculate output level
-  float outputLevel = calcOutputLevel ();
-
-  // Notify listeners
-  listeners.call (&Listener::onOutputLevelChanged, outputLevel);
-
-  @endcode
-
-  To receive notifications, derive from Listener and then add yourself to the
-  Listeners object using the desired CallQueue.
-
-  @code
-
-  // We want notifications on the message thread
-  GuiCallQueue fifo;
-
-  struct VUMeter : public Listener, public Component
-  {
-    VUMeter () : m_outputLevel (0)
-    {
-      listeners.add (this, fifo);
-    }
-
-    ~VUMeter ()
-    {
-      listeners.remove (this);
-    }
-
-    void onOutputLevelChanged (float outputLevel)
-    {
-      // Update our copy of the output level shared state.
-      m_outputLevel = outputLevel;
-
-      // Now trigger a redraw of the control.
-      repaint ();
-    }
-
-    float m_outputLevel;
-  };
-
-  @endcode
-
-  In this example, the VUMeter constructs with the output level set to zero,
-  and must wait for a notification before it shows up to date data. For a
-  simple VU meter, this is likely not a problem. But if the shared state
-  contains complex information, such as dynamically allocated objects with
-  rich data, then we need a more solid system.
-
-  We will add some classes to create a complete robust example of the use of
-  Listeners to synchronize shared state:
-
-  @code
-
-  // Handles audio device output.
-  class AudioDeviceOutput : public AudioIODeviceCallback
-  {
-  public:
-    struct Listener
-    {
-      // Sent on every output block.
-      virtual void onOutputLevelChanged (float outputLevel) { }
-    };
-
-    AudioDeviceOutput () : AudioDeviceOutput ("Audio CallQueue")
-    {
-    }
-
-    ~AudioDeviceOutput ()
-    {
-      m_fifo.close ();
-    }
-
-    void addListener (Listener* listener, CallQueue& callQueue)
-    {
-      // Acquire read access to the shared state.
-      SharedData <State>::ReadAccess state (m_state);
-
-      // Add the listener.
-      m_listeners.add (listener, callQueue);
-
-      // Queue an update for the listener to receive the initial state.
-      m_listeners.queue1 (listener,
-                          &Listener::onOutputLevelChanged,
-                          state->outputLevel);
-    }
-
-    void removeListener (Listener* listener)
-    {
-      m_listeners.remove (listener);
-    }
-
-  protected:
-    void audioDeviceIOCallback (const float** inputChannelData,
-                          int numInputChannels,
-                          float** outputChannelData,
-                          int numOutputChannels,
-                          int numSamples)
-    {
-      // Synchronize our call queue. Not needed for this example but
-      // included here as a best-practice for audio device I/O callbacks.
-      m_fifo.synchronize ();
-
-      // (Process audio data)
-
-      // Calculate output level.
-      float newOutputLevel = calcOutputLevel ();
-
-      // Update shared state.
-      {
-        SharedData <State>::WriteAccess state (m_state);
-
-        m_state->outputLevel = newOutputLevel;
-      }
-
-      // Notify listeners.
-      listeners.call (&Listener::onOutputLevelChanged, newOutputLevel);
-    }
-
-  private:
-    struct State
-    {
-      State () : outputLevel (0) { }
-
-      float outputLevel;
-    };
-
-    SharedData <State> m_state;
-
-    ManualCallQueue m_fifo;
-  };
-
-  @endcode
-
-  Although the rigor demonstrated in the example above is not strictly
-  required when the shared state consists only of a single float, it
-  becomes necessary when there are dynamically allocated objects with complex
-  interactions in the shared state.
-
-  @see CallQueue
-
-  @class Listeners
-  @ingroup beast_concurrent
-*/
-class BEAST_API ListenersBase
-{
-public:
-    struct ListenersStructureTag { };
-
-    typedef GlobalFifoFreeStore <ListenersStructureTag> AllocatorType;
-
-    typedef GlobalFifoFreeStore <ListenersBase> CallAllocatorType;
-
-    class Call : public SharedObject,
-        public AllocatedBy <CallAllocatorType>
-    {
-    public:
-        typedef SharedPtr <Call> Ptr;
-        virtual void operator () (void* const listener) = 0;
-    };
-
-private:
-    typedef unsigned long timestamp_t;
-
-    class Group;
-    typedef List <Group> Groups;
-
-    class Proxy;
-    typedef List <Proxy> Proxies;
-
-    class CallWork;
-    class GroupWork;
-    class GroupWork1;
-
-    // Maintains a list of listeners registered on the same CallQueue
-    //
-    class Group : public Groups::Node,
-        public SharedObject,
-        public AllocatedBy <AllocatorType>
-    {
-    public:
-        typedef SharedPtr <Group> Ptr;
-
-        explicit Group    (CallQueue& callQueue);
-        ~Group            ();
-        void add          (void* listener, const timestamp_t timestamp,
-                           AllocatorType& allocator);
-        bool remove       (void* listener);
-        bool contains     (void* const listener);
-        void call         (Call* const c, const timestamp_t timestamp);
-        void queue        (Call* const c, const timestamp_t timestamp);
-        void call1        (Call* const c, const timestamp_t timestamp,
-                           void* const listener);
-        void queue1       (Call* const c, const timestamp_t timestamp,
-                           void* const listener);
-        void do_call      (Call* const c, const timestamp_t timestamp);
-        void do_call1     (Call* const c, const timestamp_t timestamp,
-                           void* const listener);
-
-        bool empty        () const
-        {
-            return m_list.empty ();
-        }
-        CallQueue& getCallQueue () const
-        {
-            return m_fifo;
-        }
-
-    private:
-        struct Entry;
-
-        CallQueue& m_fifo;
-        List <Entry> m_list;
-        void* m_listener;
-        CacheLine::Aligned <ReadWriteMutex> m_mutex;
-    };
-
-    // A Proxy is keyed to a unique pointer-to-member of a
-    // ListenerClass and is used to consolidate multiple unprocessed
-    // Calls into a single call to prevent excess messaging. It is up
-    // to the user of the class to decide when this behavior is appropriate.
-    //
-    class Proxy : public Proxies::Node,
-        public AllocatedBy <AllocatorType>
-    {
-    public:
-        enum
-        {
-            maxMemberBytes = 16
-        };
-
-        Proxy (void const* const member, const size_t bytes);
-        ~Proxy ();
-
-        void add    (Group* group, AllocatorType& allocator);
-        void remove (Group* group);
-        void update (Call* const c, const timestamp_t timestamp);
-
-        bool match  (void const* const member, const size_t bytes) const;
-
-    private:
-        class Work;
-        struct Entry;
-        typedef List <Entry> Entries;
-        char m_member [maxMemberBytes];
-        const size_t m_bytes;
-        Entries m_entries;
-    };
-
-protected:
-    ListenersBase ();
-    ~ListenersBase ();
-
-    inline CallAllocatorType& getCallAllocator ()
-    {
-        return *m_callAllocator;
-    }
-
-    void add_void     (void* const listener, CallQueue& callQueue);
-    void remove_void  (void* const listener);
-
-    void callp        (Call::Ptr c);
-    void queuep       (Call::Ptr c);
-    void call1p_void  (void* const listener, Call* c);
-    void queue1p_void (void* const listener, Call* c);
-    void updatep      (void const* const member,
-                       const size_t bytes, Call::Ptr cp);
-
-private:
-    Proxy* find_proxy (const void* member, size_t bytes);
-
-private:
-    Groups m_groups;
-    Proxies m_proxies;
-    timestamp_t m_timestamp;
-    CacheLine::Aligned <ReadWriteMutex> m_groups_mutex;
-    CacheLine::Aligned <ReadWriteMutex> m_proxies_mutex;
-    AllocatorType::Ptr m_allocator;
-    CallAllocatorType::Ptr m_callAllocator;
-};
-
-/*============================================================================*/
-
-template <class ListenerClass>
-class Listeners : public ListenersBase
-{
-private:
-    template <class Functor>
-    class CallType : public Call
-    {
-    public:
-        CallType (Functor f) : m_f (f)
-        {
-        }
-
-        void operator () (void* const listener)
-        {
-            ListenerClass* object = static_cast <ListenerClass*> (listener);
-            m_f.operator () (object);
-        }
-
-    private:
-        Functor m_f;
-    };
-
-    template <class Functor>
-    inline void callf (Functor f)
-    {
-        callp (new (getCallAllocator ()) CallType <Functor> (f));
-    }
-
-    template <class Functor>
-    inline void queuef (Functor f)
-    {
-        queuep (new (getCallAllocator ()) CallType <Functor> (f));
-    }
-
-    inline void call1p (ListenerClass* const listener, Call::Ptr c)
-    {
-        call1p_void (listener, c);
-    }
-
-    inline void queue1p (ListenerClass* const listener, Call::Ptr c)
-    {
-        queue1p_void (listener, c);
-    }
-
-    template <class Functor>
-    inline void call1f (ListenerClass* const listener, Functor f)
-    {
-        call1p (listener, new (getCallAllocator ()) CallType <Functor> (f));
-    }
-
-    template <class Functor>
-    inline void queue1f (ListenerClass* const listener, Functor f)
-    {
-        queue1p (listener, new (getCallAllocator ()) CallType <Functor> (f));
-    }
-
-    template <class Member, class Functor>
-    inline void updatef (Member member, Functor f)
-    {
-        updatep (reinterpret_cast <void*> (&member), sizeof (Member),
-                 new (getCallAllocator ()) CallType <Functor> (f));
-    }
-
-public:
-    /** Add a listener.
-
-        The specified listener is associated with the specified CallQueue and
-        added to the list.
-
-        Invariants:
-
-        - All other members of Listeners are blocked during add().
-
-        - The listener is guaranteed to receive every subsequent call.
-
-        - The listener must not already exist in the list.
-
-        - Safe to call from any thread.
-
-        @param listener   The listener to add.
-
-        @param callQueue  The CallQueue to associate with the listener.
-    */
-    void add (ListenerClass* const listener, CallQueue& callQueue)
-    {
-        add_void (listener, callQueue);
-    }
-
-    /** Remove a listener.
-
-        The specified listener, which must have been previously added, is removed
-        from the list. A listener always needs to remove itself before the
-        associated CallQueue is closed.
-
-        Invariants:
-
-        - All other members of Listeners are blocked during remove().
-
-        - The listener is guaranteed not to receive calls after remove() returns.
-
-        - Safe to call from any thread.
-
-        @param listener The listener to remove.
-    */
-    void remove (ListenerClass* const listener)
-    {
-        remove_void (listener);
-    }
-
-    /** Call a member function on every added listener, on its associated
-        CallQueue.
-
-        A listener's CallQueue will be synchronized if this function is called
-        from it's associated thread.
-
-        Invariants:
-
-        - A listener that later removes itself afterwards may not get called.
-
-        - Calls from the same thread always execute in order.
-
-        - A listener can remove itself even if it has a pending call.
-
-        @param mf The member function to call. This may be followed by up to 8
-                  arguments.
-    */
-    /** @{ */
-#if BEAST_VARIADIC_MAX >= 1
-    template <class Mf>
-    inline void call (Mf mf)
-    { callf (functional::bind (mf, placeholders::_1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 2
-    template <class Mf, class T1>
-    void call (Mf mf, T1 t1)
-    { callf (functional::bind (mf, placeholders::_1, t1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 3
-    template <class Mf, class T1, class T2>
-    void call (Mf mf, T1 t1, T2 t2)
-    { callf (functional::bind (mf, placeholders::_1, t1, t2)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 4
-    template <class Mf, class T1, class T2, class T3>
-    void call (Mf mf, T1 t1, T2 t2, T3 t3)
-    { callf (functional::bind (mf, placeholders::_1, t1, t2, t3)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 5
-    template <class Mf, class T1, class T2, class T3, class T4>
-    void call (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4)
-    { callf (functional::bind (mf, placeholders::_1, t1, t2, t3, t4)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 6
-    template <class Mf, class T1, class T2, class T3, class T4, class T5>
-    void call (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
-    { callf (functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 7
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6>
-    void call (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
-    { callf (functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 8
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-    void call (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
-    { callf (functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6, t7)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 9
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-    void call (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
-    { callf (functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6, t7, t8)); }
-#endif
-    /** @} */
-
-    /** Queue a member function on every added listener, without synchronizing.
-
-        Operates like call(), but no CallQueue synchronization takes place. This
-        can be necessary when the call to queue() is made inside a held lock.
-
-        @param mf The member function to call. This may be followed by up to 8
-                  arguments.
-    */
-    /** @{ */
-#if BEAST_VARIADIC_MAX >= 1
-    template <class Mf>
-    inline void queue (Mf mf)
-    { queuef (functional::bind (mf, placeholders::_1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 2
-    template <class Mf, class T1>
-    void queue (Mf mf, T1 t1)
-    { queuef (functional::bind (mf, placeholders::_1, t1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 3
-    template <class Mf, class T1, class T2>
-    void queue (Mf mf, T1 t1, T2 t2)
-    { queuef (functional::bind (mf, placeholders::_1, t1, t2)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 4
-    template <class Mf, class T1, class T2, class T3>
-    void queue (Mf mf, T1 t1, T2 t2, T3 t3)
-    { queuef (functional::bind (mf, placeholders::_1, t1, t2, t3)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 5
-    template <class Mf, class T1, class T2, class T3, class T4>
-    void queue (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4)
-    { queuef (functional::bind (mf, placeholders::_1, t1, t2, t3, t4)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 6
-    template <class Mf, class T1, class T2, class T3, class T4, class T5>
-    void queue (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
-    { queuef (functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 7
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6>
-    void queue (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
-    { queuef (functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 8
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-    void queue (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
-    { queuef (functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6, t7)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 9
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-    void queue (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
-    { queuef (functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6, t7, t8)); }
-#endif
-    /** @} */
-
-    /** Call a member function on every added listener, replacing pending
-        calls to the same member.
-
-        This operates like call(), except that if there are pending unprocessed
-        calls to the same member function,they will be replaced, with the previous
-        parameters destroyed normally. This functionality is useful for
-        high frequency notifications of non critical data, where the recipient
-        may not catch up often enough. For example, the output level of the
-        AudioIODeviceCallback in the example is a candidate for the use of
-        update().
-
-        @param mf The member function to call. This may be followed by up to 8
-                  arguments.
-    */
-    /** @{ */
-#if BEAST_VARIADIC_MAX >= 1
-    template <class Mf>
-    inline void update (Mf mf)
-    { updatef (mf, functional::bind (mf, placeholders::_1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 2
-    template <class Mf, class T1>
-    void update (Mf mf, T1 t1)
-    { updatef (mf, functional::bind (mf, placeholders::_1, t1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 3
-    template <class Mf, class T1, class T2>
-    void update (Mf mf, T1 t1, T2 t2)
-    { updatef (mf, functional::bind (mf, placeholders::_1, t1, t2)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 4
-    template <class Mf, class T1, class T2, class T3>
-    void update (Mf mf, T1 t1, T2 t2, T3 t3)
-    { updatef (mf, functional::bind (mf, placeholders::_1, t1, t2, t3)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 5
-    template <class Mf, class T1, class T2, class T3, class T4>
-    void update (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4)
-    { updatef (mf, functional::bind (mf, placeholders::_1, t1, t2, t3, t4)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 6
-    template <class Mf, class T1, class T2, class T3, class T4, class T5>
-    void update (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
-    { updatef (mf, functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 7
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6>
-    void update (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
-    { updatef (mf, functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 8
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-    void update (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
-    { updatef (mf, functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6, t7)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 9
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-    void update (Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
-    { updatef (mf, functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6, t7, t8)); }
-#endif
-    /** @} */
-
-    /** Call a member function on a specific listener.
-
-        Like call(), except that one listener is targeted only. This is useful when
-        builing complex behaviors during the addition of a listener, such as
-        providing an initial state.
-
-        @param listener The listener to call.
-
-        @param mf       The member function to call. This may be followed by up
-                        to 8 arguments.
-    */
-    /** @{ */
-#if BEAST_VARIADIC_MAX >= 1
-    template <class Mf>
-    inline void call1 (ListenerClass* const listener, Mf mf)
-    { call1f (listener, functional::bind (mf, placeholders::_1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 2
-    template <class Mf, class T1>
-    void call1 (ListenerClass* const listener, Mf mf, T1 t1)
-    { call1f (listener, functional::bind (mf, placeholders::_1, t1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 3
-    template <class Mf, class T1, class T2>
-    void call1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2)
-    { call1f (listener, functional::bind (mf, placeholders::_1, t1, t2)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 4
-    template <class Mf, class T1, class T2, class T3>
-    void call1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3)
-    { call1f (listener, functional::bind (mf, placeholders::_1, t1, t2, t3)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 5
-    template <class Mf, class T1, class T2, class T3, class T4>
-    void call1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4)
-    { call1f (listener, functional::bind (mf, placeholders::_1, t1, t2, t3, t4)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 6
-    template <class Mf, class T1, class T2, class T3, class T4, class T5>
-    void call1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
-    { call1f (listener, functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 7
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6>
-    void call1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
-    { call1f (listener, functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 8
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-    void call1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
-    { call1f (listener, functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6, t7)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 9
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-    void call1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
-    { call1f (listener, functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6, t7, t8)); }
-#endif
-    /** @} */
-
-    /** Queue a member function on a specific listener.
-
-        Like call1(), except that no CallQueue synchronization takes place.
-
-        @param listener The listener to call.
-
-        @param mf       The member function to call. This may be followed by up
-                        to 8 arguments.
-    */
-    /** @{ */
-#if BEAST_VARIADIC_MAX >= 1
-    template <class Mf>
-    inline void queue1 (ListenerClass* const listener, Mf mf)
-    { queue1f (listener, functional::bind (mf, placeholders::_1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 2
-    template <class Mf, class T1>
-    void queue1 (ListenerClass* const listener, Mf mf, T1 t1)
-    { queue1f (listener, functional::bind (mf, placeholders::_1, t1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 3
-    template <class Mf, class T1, class T2>
-    void queue1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2)
-    { queue1f (listener, functional::bind (mf, placeholders::_1, t1, t2)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 4
-    template <class Mf, class T1, class T2, class T3>
-    void queue1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3)
-    { queue1f (listener, functional::bind (mf, placeholders::_1, t1, t2, t3)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 5
-    template <class Mf, class T1, class T2, class T3, class T4>
-    void queue1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4)
-    { queue1f (listener, functional::bind (mf, placeholders::_1, t1, t2, t3, t4)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 6
-    template <class Mf, class T1, class T2, class T3, class T4, class T5>
-    void queue1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
-    { queue1f (listener, functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 7
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6>
-    void queue1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
-    { queue1f (listener, functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 8
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-    void queue1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
-    { queue1f (listener, functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6, t7)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 9
-    template <class Mf, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-    void queue1 (ListenerClass* const listener, Mf mf, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
-    { queue1f (listener, functional::bind (mf, placeholders::_1, t1, t2, t3, t4, t5, t6, t7, t8)); }
-#endif
-    /** @} */
-};
-/** @} */
-
-#endif
diff --git a/modules/beast_core/thread/beast_ManualCallQueue.cpp b/modules/beast_core/thread/beast_ManualCallQueue.cpp
deleted file mode 100644
index cd03818be3..0000000000
--- a/modules/beast_core/thread/beast_ManualCallQueue.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*============================================================================*/
-/*
-  VFLib: https://github.com/vinniefalco/VFLib
-
-  Copyright (C) 2008 by Vinnie Falco <vinnie.falco@gmail.com>
-
-  This library contains portions of other open source products covered by
-  separate licenses. Please see the corresponding source files for specific
-  terms.
-
-  VFLib is provided under the terms of The MIT License (MIT):
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-  IN THE SOFTWARE.
-*/
-/*============================================================================*/
-
-ManualCallQueue::ManualCallQueue (String name)
-    : CallQueue (name)
-{
-}
-
-void ManualCallQueue::close ()
-{
-    CallQueue::close ();
-}
-
-bool ManualCallQueue::synchronize ()
-{
-    return CallQueue::synchronize ();
-}
-
-void ManualCallQueue::signal ()
-{
-}
-
-void ManualCallQueue::reset ()
-{
-}
diff --git a/modules/beast_core/thread/beast_ManualCallQueue.h b/modules/beast_core/thread/beast_ManualCallQueue.h
deleted file mode 100644
index 67cc0940ab..0000000000
--- a/modules/beast_core/thread/beast_ManualCallQueue.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*============================================================================*/
-/*
-  VFLib: https://github.com/vinniefalco/VFLib
-
-  Copyright (C) 2008 by Vinnie Falco <vinnie.falco@gmail.com>
-
-  This library contains portions of other open source products covered by
-  separate licenses. Please see the corresponding source files for specific
-  terms.
-
-  VFLib is provided under the terms of The MIT License (MIT):
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-  IN THE SOFTWARE.
-*/
-/*============================================================================*/
-
-#ifndef VF_MANUALCALLQUEUE_VFHEADER
-#define VF_MANUALCALLQUEUE_VFHEADER
-
-/*============================================================================*/
-/**
-    A CallQueue that requires periodic manual synchronization.
-
-    To use this, declare an instance and then place calls into it as usual.
-    Every so often, you must call synchronize() from the thread you want to
-    associate with the queue. Typically this is done within an
-    AudioIODeviceCallback:
-
-    @code
-
-    class AudioIODeviceCallbackWithCallQueue
-      : public AudioIODeviceCallback
-      , public CallQueue
-    {
-    public:
-      AudioIODeviceCallbackWithCallQueue () : m_fifo ("Audio CallQueue")
-      {
-      }
-
-      void audioDeviceIOCallback (const float** inputChannelData,
-                                  int numInputChannels,
-                                  float** outputChannelData,
-                                  int numOutputChannels,
-                                  int numSamples)
-      {
-        CallQueue::synchronize ();
-
-        // do audio i/o
-      }
-
-      void signal () { } // No action required
-      void reset () { }  // No action required
-    };
-
-    @endcode
-
-    The close() function is provided for diagnostics. Call it as early as
-    possible based on the exit or shutdown logic of your application. If calls
-    are put into the queue after it is closed, it will generate an exception so
-    you can track it down.
-
-    @see CallQueue
-
-    @ingroup vf_concurrent
-*/
-class ManualCallQueue : public CallQueue
-{
-public:
-    /** Create a ManualCallQueue.
-
-      @param name           A string used to help identify the associated
-                              thread for debugging.
-    */
-    explicit ManualCallQueue (String name);
-
-    /** Close the queue. If calls are placed into a closed queue, an exception
-      is thrown.
-    */
-    void close ();
-
-    /** Synchronize the queue by calling all pending functors.
-
-        @return `true` if any functors were called.
-    */
-    bool synchronize ();
-
-private:
-    void signal ();
-    void reset ();
-};
-
-#endif
diff --git a/modules/beast_core/thread/beast_OncePerSecond.cpp b/modules/beast_core/thread/beast_OncePerSecond.cpp
deleted file mode 100644
index 0fed5ec806..0000000000
--- a/modules/beast_core/thread/beast_OncePerSecond.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-class OncePerSecond::TimerSingleton
-    : public SharedSingleton <OncePerSecond::TimerSingleton>
-    , private InterruptibleThread::EntryPoint
-{
-public:
-    TimerSingleton ()
-        : SharedSingleton <OncePerSecond::TimerSingleton> (
-            SingletonLifetime::persistAfterCreation)
-        , m_thread ("Once Per Second")
-    {
-        m_thread.start (this);
-    }
-
-    ~TimerSingleton ()
-    {
-        m_thread.join ();
-
-        bassert (m_list.empty ());
-    }
-
-    void threadRun ()
-    {
-        for (;;)
-        {
-            bool const interrupted = m_thread.wait (1000);
-
-            if (interrupted)
-                break;
-
-            notify ();
-        }
-    }
-
-    void notify ()
-    {
-        CriticalSection::ScopedLockType lock (m_mutex);
-
-        for (List <Elem>::iterator iter = m_list.begin (); iter != m_list.end ();)
-        {
-            OncePerSecond* object = iter->object;
-            ++iter;
-            object->doOncePerSecond ();
-        }
-    }
-
-public:
-    void insert (Elem* elem)
-    {
-        CriticalSection::ScopedLockType lock (m_mutex);
-
-        m_list.push_back (*elem);
-    }
-
-    void remove (Elem* elem)
-    {
-        CriticalSection::ScopedLockType lock (m_mutex);
-
-        m_list.erase (m_list.iterator_to (*elem));
-    }
-
-    static TimerSingleton* createInstance ()
-    {
-        return new TimerSingleton;
-    }
-
-private:
-    InterruptibleThread m_thread;
-    CriticalSection m_mutex;
-    List <Elem> m_list;
-};
-
-//------------------------------------------------------------------------------
-
-OncePerSecond::OncePerSecond ()
-{
-    m_elem.instance = TimerSingleton::getInstance ();
-    m_elem.object = this;
-}
-
-OncePerSecond::~OncePerSecond ()
-{
-}
-
-void OncePerSecond::startOncePerSecond ()
-{
-    m_elem.instance->insert (&m_elem);
-}
-
-void OncePerSecond::endOncePerSecond ()
-{
-    m_elem.instance->remove (&m_elem);
-}
diff --git a/modules/beast_core/thread/beast_OncePerSecond.h b/modules/beast_core/thread/beast_OncePerSecond.h
deleted file mode 100644
index bd13bcddc3..0000000000
--- a/modules/beast_core/thread/beast_OncePerSecond.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_ONCEPERSECOND_H_INCLUDED
-#define BEAST_ONCEPERSECOND_H_INCLUDED
-
-/*============================================================================*/
-/**
-    Provides a once per second notification.
-
-    Derive your class from OncePerSecond and override doOncePerSecond(). Then,
-    call startOncePerSecond() to begin receiving the notifications. No clean-up
-    or other actions are required.
-
-    @ingroup beast_core
-*/
-class BEAST_API OncePerSecond : public Uncopyable
-{
-public:
-    OncePerSecond ();
-    virtual ~OncePerSecond ();
-
-    /** Begin receiving notifications. */
-    void startOncePerSecond ();
-
-    /** Stop receiving notifications. */
-    void endOncePerSecond ();
-
-protected:
-    /** Called once per second. */
-    virtual void doOncePerSecond () = 0;
-
-private:
-    class TimerSingleton;
-    typedef SharedPtr <TimerSingleton> TimerPtr;
-
-    struct Elem : List <Elem>::Node
-    {
-        TimerPtr instance;
-        OncePerSecond* object;
-    };
-
-    Elem m_elem;
-};
-
-#endif
diff --git a/modules/beast_core/thread/beast_ParallelFor.cpp b/modules/beast_core/thread/beast_ParallelFor.cpp
deleted file mode 100644
index 62a9b9e6eb..0000000000
--- a/modules/beast_core/thread/beast_ParallelFor.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-ParallelFor::ParallelFor (ThreadGroup& pool)
-    : m_pool (pool)
-    , m_finishedEvent (false) // auto-reset
-{
-}
-
-int ParallelFor::getNumberOfThreads () const
-{
-    return m_pool.getNumberOfThreads ();
-}
-
-void ParallelFor::doLoop (int numberOfIterations, Iteration& iteration)
-{
-    if (numberOfIterations > 1)
-    {
-        int const numberOfThreads = m_pool.getNumberOfThreads ();
-
-        // The largest number of pool threads we need is one less than the number
-        // of iterations, because we also run the loop body on the caller's thread.
-        //
-        int const maxThreads = numberOfIterations - 1;
-
-        // Calculate the number of parallel instances as the smaller of the number
-        // of threads available (including the caller's) and the number of iterations.
-        //
-        int const numberOfParallelInstances = std::min (
-                numberOfThreads + 1, numberOfIterations);
-
-        LoopState* loopState (new (m_pool.getAllocator ()) LoopState (
-                                  iteration, m_finishedEvent, numberOfIterations, numberOfParallelInstances));
-
-        m_pool.call (maxThreads, &LoopState::forLoopBody, loopState);
-
-        // Also use the caller's thread to run the loop body.
-        loopState->forLoopBody ();
-
-        m_finishedEvent.wait ();
-    }
-    else if (numberOfIterations == 1)
-    {
-        // Just one iteration, so do it.
-        iteration (0);
-    }
-}
diff --git a/modules/beast_core/thread/beast_ParallelFor.h b/modules/beast_core/thread/beast_ParallelFor.h
deleted file mode 100644
index f6634357b0..0000000000
--- a/modules/beast_core/thread/beast_ParallelFor.h
+++ /dev/null
@@ -1,251 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_PARALLELFOR_H_INCLUDED
-#define BEAST_PARALLELFOR_H_INCLUDED
-
-/*============================================================================*/
-/**
-  Parallel for loop.
-
-  This uses a ThreadGroup to iterate through a for loop in parallel. The
-  following two pieces of code perform identical operations:
-
-  @code
-
-  extern void function (int loopIndex);
-
-  // Serial computation
-  //
-  for (int i = 0; i < numberOfIterations; ++i)
-    function (i);
-
-  // Parallel computation
-  //
-  ParallelFor().loop (numberOfIterations, &function);
-
-  @endcode
-
-  `function` is a caller provided functor. Convenience functions are provided
-  for automatic binding to member or non member functions with up to 8
-  arguments (not including the loop index).
-
-  @note The last argument to function () is always the loop index.
-
-  @see ThreadGroup
-
-  @ingroup beast_concurrent
-*/
-class BEAST_API ParallelFor : public Uncopyable
-{
-public:
-    /** Create a parallel for loop.
-
-        It is best to keep this object around instead of creating and destroying
-        it every time you need to run a loop.
-
-        @param pool The ThreadGroup to use. If this is omitted then a singleton
-                    ThreadGroup is used which contains one thread per CPU.
-    */
-    explicit ParallelFor (ThreadGroup& pool = *GlobalThreadGroup::getInstance ());
-
-    /** Determine the number of threads in the group.
-
-        @return The number of threads in the group.
-    */
-    int getNumberOfThreads () const;
-
-    /** Execute parallel for loop.
-
-        Functor is called once for each value in the range
-        [0, numberOfIterations), using the ThreadGroup.
-
-        @param numberOfIterations The number of times to loop.
-
-        @param f The functor to call for each loop index.
-    */
-    /** @{ */
-    template <class Functor>
-    void loopf (int numberOfIterations, Functor const& f)
-    {
-        IterationType <Functor> iteration (f);
-
-        doLoop (numberOfIterations, iteration);
-    }
-
-#if BEAST_VARIADIC_MAX >= 1
-    template <class Fn>
-    void loop (int n, Fn f)
-    { loopf (n, functional::bind (f, placeholders::_1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 2
-    template <class Fn, class T1>
-    void loop (int n, Fn f, T1 t1)
-    { loopf (n, functional::bind (f, t1, placeholders::_1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 3
-    template <class Fn, class T1, class T2>
-    void loop (int n, Fn f, T1 t1, T2 t2)
-    { loopf (n, functional::bind (f, t1, t2, placeholders::_1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 4
-    template <class Fn, class T1, class T2, class T3>
-    void loop (int n, Fn f, T1 t1, T2 t2, T3 t3)
-    { loopf (n, functional::bind (f, t1, t2, t3, placeholders::_1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 5
-    template <class Fn, class T1, class T2, class T3, class T4>
-    void loop (int n, Fn f, T1 t1, T2 t2, T3 t3, T4 t4)
-    { loopf (n, functional::bind (f, t1, t2, t3, t4, placeholders::_1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 6
-    template <class Fn, class T1, class T2, class T3, class T4, class T5>
-    void loop (int n, Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
-    { loopf (n, functional::bind (f, t1, t2, t3, t4, t5, placeholders::_1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 7
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6>
-    void loop (int n, Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
-    { loopf (n, functional::bind (f, t1, t2, t3, t4, t5, t6, placeholders::_1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 8
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-    void loop (int n, Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
-    { loopf (n, functional::bind (f, t1, t2, t3, t4, t5, t6, t7, placeholders::_1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 9
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-    void loop (int n, Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
-    { loopf (n, functional::bind (f, t1, t2, t3, t4, t5, t6, t7, t8, placeholders::_1)); }
-#endif
-    /** @} */
-
-private:
-    class Iteration
-    {
-    public:
-        virtual ~Iteration () { }
-        virtual void operator () (int loopIndex) = 0;
-    };
-
-    template <class Functor>
-    class IterationType : public Iteration, public Uncopyable
-    {
-    public:
-        explicit IterationType (Functor const& f) : m_f (f)
-        {
-        }
-
-        void operator () (int loopIndex)
-        {
-            m_f (loopIndex);
-        }
-
-    private:
-        Functor m_f;
-    };
-
-private:
-    class LoopState
-        : public AllocatedBy <ThreadGroup::AllocatorType>
-        , public Uncopyable
-    {
-    private:
-        Iteration& m_iteration;
-        WaitableEvent& m_finishedEvent;
-        int const m_numberOfIterations;
-        Atomic <int> m_loopIndex;
-        Atomic <int> m_iterationsRemaining;
-        Atomic <int> m_numberOfParallelInstances;
-
-    public:
-        LoopState (Iteration& iteration,
-                   WaitableEvent& finishedEvent,
-                   int numberOfIterations,
-                   int numberOfParallelInstances)
-            : m_iteration (iteration)
-            , m_finishedEvent (finishedEvent)
-            , m_numberOfIterations (numberOfIterations)
-            , m_loopIndex (-1)
-            , m_iterationsRemaining (numberOfIterations)
-            , m_numberOfParallelInstances (numberOfParallelInstances)
-        {
-        }
-
-        ~LoopState ()
-        {
-        }
-
-        void forLoopBody ()
-        {
-            for (;;)
-            {
-                // Request a loop index to process.
-                int const loopIndex = ++m_loopIndex;
-
-                // Is it in range?
-                if (loopIndex < m_numberOfIterations)
-                {
-                    // Yes, so process it.
-                    m_iteration (loopIndex);
-
-                    // Was this the last work item to complete?
-                    if (--m_iterationsRemaining == 0)
-                    {
-                        // Yes, signal.
-                        m_finishedEvent.signal ();
-                        break;
-                    }
-                }
-                else
-                {
-                    // Out of range, all work is complete or assigned.
-                    break;
-                }
-            }
-
-            release ();
-        }
-
-        void release ()
-        {
-            if (--m_numberOfParallelInstances == 0)
-                delete this;
-        }
-    };
-
-private:
-    void doLoop (int numberOfIterations, Iteration& iteration);
-
-private:
-    ThreadGroup& m_pool;
-    WaitableEvent m_finishedEvent;
-    Atomic <int> m_currentIndex;
-    Atomic <int> m_numberOfInstances;
-};
-
-#endif
diff --git a/modules/beast_core/thread/beast_SerialFor.h b/modules/beast_core/thread/beast_SerialFor.h
deleted file mode 100644
index 91de0178f2..0000000000
--- a/modules/beast_core/thread/beast_SerialFor.h
+++ /dev/null
@@ -1,71 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_SERIALFOR_H_INCLUDED
-#define BEAST_SERIALFOR_H_INCLUDED
-
-/*============================================================================*/
-
-/** Serial for loop.
-
-    Iterates a for loop sequentially. This is a drop in replacement for
-    ParallelFor.
-
-    @see ParallelFor
-
-    @ingroup beast_core
-*/
-class BEAST_API SerialFor : public Uncopyable
-{
-public:
-    /** Create a serial for loop.
-    */
-    inline SerialFor ()
-    {
-    }
-
-    /** Determine the number of threads used to process loops.
-
-        @return Always 1.
-    */
-    inline int getNumberOfThreads () const
-    {
-        return 1;
-    }
-
-    template <class F>
-    inline void operator () (int numberOfIterations)
-    {
-        F f;
-
-        for (int i = 0; i < numberOfIterations; ++i)
-            f (i);
-    }
-
-    template <class F, class T1>
-    inline void operator () (int numberOfIterations, T1 t1)
-    {
-        F f (t1);
-
-        for (int i = 0; i < numberOfIterations; ++i)
-            f (i);
-    }
-};
-
-#endif
diff --git a/modules/beast_core/thread/beast_ThreadGroup.cpp b/modules/beast_core/thread/beast_ThreadGroup.cpp
deleted file mode 100644
index 1cce72781b..0000000000
--- a/modules/beast_core/thread/beast_ThreadGroup.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-void ThreadGroup::QuitType::operator () (Worker* worker)
-{
-    worker->setShouldExit ();
-}
-
-//==============================================================================
-
-ThreadGroup::Worker::Worker (String name, ThreadGroup& group)
-    : Thread (name)
-    , m_group (group)
-    , m_shouldExit (false)
-{
-    startThread ();
-}
-
-ThreadGroup::Worker::~Worker ()
-{
-    // Make sure the thread is stopped.
-    stopThread (-1);
-}
-
-void ThreadGroup::Worker::setShouldExit ()
-{
-    m_shouldExit = true;
-}
-
-void ThreadGroup::Worker::run ()
-{
-    do
-    {
-        m_group.m_semaphore.wait ();
-
-        Work* work = m_group.m_queue.pop_front ();
-
-        bassert (work != nullptr);
-
-        work->operator () (this);
-
-        delete work;
-    }
-    while (!m_shouldExit);
-}
-
-//==============================================================================
-
-ThreadGroup::ThreadGroup (int numberOfThreads)
-    : m_numberOfThreads (numberOfThreads)
-    , m_semaphore (0)
-{
-    for (int i = 0; i++ < numberOfThreads; )
-    {
-        String s;
-        s << "ThreadGroup (" << i << ")";
-
-        m_threads.push_front (new Worker (s, *this));
-    }
-}
-
-ThreadGroup::~ThreadGroup ()
-{
-    // Put one quit item in the queue for each worker to stop.
-    for (int i = 0; i < m_numberOfThreads; ++i)
-    {
-        m_queue.push_front (new (getAllocator ()) QuitType);
-
-        m_semaphore.signal ();
-    }
-
-    for (;;)
-    {
-        Worker* worker = m_threads.pop_front ();
-
-        if (worker != nullptr)
-            delete worker;
-        else
-            break;
-    }
-
-    // There must not be pending work!
-    bassert (m_queue.pop_front () == nullptr);
-}
-
-int ThreadGroup::getNumberOfThreads () const
-{
-    return m_numberOfThreads;
-}
diff --git a/modules/beast_core/thread/beast_ThreadGroup.h b/modules/beast_core/thread/beast_ThreadGroup.h
deleted file mode 100644
index 5e9a3e9650..0000000000
--- a/modules/beast_core/thread/beast_ThreadGroup.h
+++ /dev/null
@@ -1,215 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_THREADGROUP_H_INCLUDED
-#define BEAST_THREADGROUP_H_INCLUDED
-
-/*============================================================================*/
-/**
-  @ingroup beast_concurrent
-
-  @brief A group of threads for parallelizing tasks.
-
-  @see ParallelFor
-*/
-class BEAST_API ThreadGroup
-{
-public:
-    typedef FifoFreeStoreType AllocatorType;
-
-    /** Creates the specified number of threads.
-
-        @param numberOfThreads The number of threads in the group. This must be
-                               greater than zero. If this parameter is omitted,
-                               one thread is created per available CPU.
-    */
-    explicit ThreadGroup (int numberOfThreads = SystemStats::getNumCpus ());
-
-    ~ThreadGroup ();
-
-    /** Allocator access.
-    */
-    inline AllocatorType& getAllocator ()
-    {
-        return m_allocator;
-    }
-
-    /** Determine the number of threads in the group.
-
-        @return The number of threads in the group.
-    */
-    int getNumberOfThreads () const;
-
-    /** Calls a functor on multiple threads.
-
-        The specified functor is executed on some or all available threads at once.
-        A call is always guaranteed to execute.
-
-        @param maxThreads The maximum number of threads to use, or -1 for all.
-
-        @param f The functor to call for each thread.
-    */
-    /** @{ */
-    template <class Functor>
-    void callf (int maxThreads, Functor f)
-    {
-        bassert (maxThreads > 0 || maxThreads == -1);
-
-        int numberOfThreads = getNumberOfThreads ();
-
-        if (maxThreads != -1 && maxThreads < numberOfThreads)
-            numberOfThreads = maxThreads;
-
-        while (numberOfThreads--)
-        {
-            m_queue.push_front (new (getAllocator ()) WorkType <Functor> (f));
-            m_semaphore.signal ();
-        }
-    }
-
-#if BEAST_VARIADIC_MAX >= 1
-    template <class Fn>
-    void call (int maxThreads, Fn f)
-    { callf (maxThreads, functional::bind (f)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 2
-    template <class Fn, class T1>
-    void call (int maxThreads, Fn f, T1 t1)
-    { callf (maxThreads, functional::bind (f, t1)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 3
-    template <class Fn, class T1, class T2>
-    void call (int maxThreads, Fn f, T1 t1, T2 t2)
-    { callf (maxThreads, functional::bind (f, t1, t2)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 4
-    template <class Fn, class T1, class T2, class T3>
-    void call (int maxThreads, Fn f, T1 t1, T2 t2, T3 t3)
-    { callf (maxThreads, functional::bind (f, t1, t2, t3)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 5
-    template <class Fn, class T1, class T2, class T3, class T4>
-    void call (int maxThreads, Fn f, T1 t1, T2 t2, T3 t3, T4 t4)
-    { callf (maxThreads, functional::bind (f, t1, t2, t3, t4)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 6
-    template <class Fn, class T1, class T2, class T3, class T4, class T5>
-    void call (int maxThreads, Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
-    { callf (maxThreads, functional::bind (f, t1, t2, t3, t4, t5)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 7
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6>
-    void call (int maxThreads, Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
-    { callf (maxThreads, functional::bind (f, t1, t2, t3, t4, t5, t6)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 8
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-    void call (int maxThreads, Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)
-    { callf (maxThreads, functional::bind (f, t1, t2, t3, t4, t5, t6, t7)); }
-#endif
-
-#if BEAST_VARIADIC_MAX >= 9
-    template <class Fn, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-    void call (int maxThreads, Fn f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
-    { callf (maxThreads, functional::bind (f, t1, t2, t3, t4, t5, t6, t7, t8)); }
-#endif
-    /** @} */
-
-private:
-    void stopThreads (int numberOfThreadsToStop);
-
-    //============================================================================
-private:
-    /** A thread in the group.
-    */
-    class Worker
-        : public LockFreeStack <Worker>::Node
-        , public Thread
-        , LeakChecked <Worker>
-    {
-    public:
-        Worker (String name, ThreadGroup& group);
-        ~Worker ();
-
-        void setShouldExit ();
-
-    private:
-        void run ();
-
-    private:
-        ThreadGroup& m_group;
-        bool m_shouldExit;
-    };
-
-    //============================================================================
-private:
-    /** Abstract work item.
-    */
-    class Work : public LockFreeStack <Work>::Node
-        , public AllocatedBy <AllocatorType>
-    {
-    public:
-        virtual ~Work () { }
-
-        /* The worker is passed in so we can make it quit later.
-        */
-        virtual void operator () (Worker* worker) = 0;
-    };
-
-    template <class Functor>
-    class WorkType : public Work, LeakChecked <WorkType <Functor> >
-    {
-    public:
-        explicit WorkType (Functor const& f) : m_f (f) { }
-        ~WorkType () { }
-        void operator () (Worker*)
-        {
-            m_f ();
-        }
-
-    private:
-        Functor m_f;
-    };
-
-    /** Used to make a Worker stop
-    */
-    class QuitType
-        : public Work
-        , LeakChecked <QuitType>
-    {
-    public:
-        void operator () (Worker* worker);
-    };
-
-private:
-    int const m_numberOfThreads;
-    Semaphore m_semaphore;
-    AllocatorType m_allocator;
-    LockFreeStack <Work> m_queue;
-    LockFreeStack <Worker> m_threads;
-};
-
-#endif
diff --git a/modules/beast_core/thread/beast_ThreadWithCallQueue.cpp b/modules/beast_core/thread/beast_ThreadWithCallQueue.cpp
deleted file mode 100644
index c946e8e82b..0000000000
--- a/modules/beast_core/thread/beast_ThreadWithCallQueue.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-ThreadWithCallQueue::ThreadWithCallQueue (String name)
-    : CallQueue (name)
-    , m_thread (name)
-    , m_entryPoints (nullptr)
-    , m_calledStart (false)
-    , m_calledStop (false)
-    , m_shouldStop (false)
-{
-}
-
-ThreadWithCallQueue::~ThreadWithCallQueue ()
-{
-    stop (true);
-}
-
-ThreadWithCallQueue::EntryPoints* ThreadWithCallQueue::getDefaultEntryPoints () noexcept
-{
-    static EntryPoints entryPoints;
-
-    return &entryPoints;
-}
-
-void ThreadWithCallQueue::start (EntryPoints* const entryPoints)
-{
-    {
-        // This is mostly for diagnostics
-        // TODO: Atomic flag for this whole thing
-        CriticalSection::ScopedLockType lock (m_mutex);
-
-        // start() MUST be called.
-        bassert (!m_calledStart);
-        m_calledStart = true;
-    }
-
-    m_entryPoints = entryPoints;
-
-    m_thread.start (this);
-}
-
-void ThreadWithCallQueue::stop (bool const wait)
-{
-    // can't call stop(true) from within a thread function
-    bassert (!wait || !m_thread.isTheCurrentThread ());
-
-    {
-        CriticalSection::ScopedLockType lock (m_mutex);
-
-        // start() MUST be called.
-        bassert (m_calledStart);
-
-        // TODO: Atomic for this
-        if (!m_calledStop)
-        {
-            m_calledStop = true;
-
-            {
-                CriticalSection::ScopedUnlockType unlock (m_mutex); // getting fancy
-
-                call (&ThreadWithCallQueue::doStop, this);
-
-                // in theory something could slip in here
-
-                close ();
-            }
-        }
-    }
-
-    if (wait)
-        m_thread.join ();
-}
-
-// Should be called periodically by the idle function.
-// There are three possible results:
-//
-// #1 Returns false. The idle function may continue or return.
-// #2 Returns true. The idle function should return as soon as possible.
-// #3 Throws a Thread::Interruption exception.
-//
-// If interruptionPoint returns true or throws, it must
-// not be called again before the thread has the opportunity to reset.
-//
-bool ThreadWithCallQueue::interruptionPoint ()
-{
-    return m_thread.interruptionPoint ();
-}
-
-// Interrupts the idle function by queueing a call that does nothing.
-void ThreadWithCallQueue::interrupt ()
-{
-    call (&ThreadWithCallQueue::doNothing);
-}
-
-void ThreadWithCallQueue::doNothing ()
-{
-    // Intentionally empty
-}
-
-void ThreadWithCallQueue::signal ()
-{
-    m_thread.interrupt ();
-}
-
-void ThreadWithCallQueue::reset ()
-{
-}
-
-void ThreadWithCallQueue::doStop ()
-{
-    m_shouldStop = true;
-}
-
-void ThreadWithCallQueue::threadRun ()
-{
-    m_entryPoints->threadInit ();
-
-    for (;;)
-    {
-        CallQueue::synchronize ();
-
-        if (m_shouldStop)
-            break;
-
-        bool interrupted = m_entryPoints->threadIdle ();
-
-        if (!interrupted)
-            interrupted = interruptionPoint ();
-
-        if (!interrupted)
-            m_thread.wait ();
-    }
-
-    m_entryPoints->threadExit ();
-}
diff --git a/modules/beast_core/thread/beast_ThreadWithCallQueue.h b/modules/beast_core/thread/beast_ThreadWithCallQueue.h
deleted file mode 100644
index b417927e5a..0000000000
--- a/modules/beast_core/thread/beast_ThreadWithCallQueue.h
+++ /dev/null
@@ -1,155 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_THREADWITHCALLQUEUE_H_INCLUDED
-#define BEAST_THREADWITHCALLQUEUE_H_INCLUDED
-
-/** An InterruptibleThread with a CallQueue.
-
-    This combines an InterruptibleThread with a CallQueue, allowing functors to
-    be queued for asynchronous execution on the thread.
-
-    The thread runs an optional user-defined idle function, which must regularly
-    check for an interruption using the InterruptibleThread interface. When an
-    interruption is signaled, the idle function returns and the CallQueue is
-    synchronized. Then, the idle function is resumed.
-
-    When the ThreadWithCallQueue first starts up, an optional user-defined
-    initialization function is executed on the thread. When the thread exits,
-    a user-defined exit function may be executed on the thread.
-
-    @see CallQueue
-
-    @ingroup beast_concurrent
-*/
-class BEAST_API ThreadWithCallQueue
-    : public CallQueue
-    , private InterruptibleThread::EntryPoint
-    , LeakChecked <ThreadWithCallQueue>
-{
-public:
-    /** Entry points for a ThreadWithCallQueue.
-    */
-    class EntryPoints
-    {
-    public:
-        virtual ~EntryPoints () { }
-
-        virtual void threadInit () { }
-
-        virtual void threadExit () { }
-
-        virtual bool threadIdle ()
-        {
-            bool interrupted = false;
-
-            return interrupted;
-        }
-    };
-
-    /** Create a thread.
-
-        @param name The name of the InterruptibleThread and CallQueue, used
-                    for diagnostics when debugging.
-    */
-    explicit ThreadWithCallQueue (String name);
-
-    /** Retrieve the default entry points.
-
-        The default entry points do nothing.
-    */
-    static EntryPoints* getDefaultEntryPoints () noexcept;
-
-    /** Destroy a ThreadWithCallQueue.
-
-        If the thread is still running it is stopped. The destructor blocks
-        until the thread exits cleanly.
-    */
-    ~ThreadWithCallQueue ();
-
-    /** Start the thread, with optional entry points.
-
-        If `entryPoints` is specified then the thread runs using those
-        entry points. If ommitted, the default entry simply do nothing.
-        This is useful for creating a thread whose sole activities are
-        performed through the call queue.
-
-        @param entryPoints An optional pointer to @ref EntryPoints.
-    */
-    void start (EntryPoints* const entryPoints = getDefaultEntryPoints ());
-
-    /* Stop the thread.
-
-       Stops the thread and optionally wait until it exits. It is safe to call
-       this function at any time and as many times as desired.
-
-       After a call to stop () the CallQueue is closed, and attempts to queue new
-       functors will throw a runtime exception. Existing functors will still
-       execute.
-
-       Any listeners registered on the CallQueue need to be removed
-       before stop is called
-
-       @invariant The caller is not on the associated thread.
-
-       @param wait `true` if the function should wait until the thread exits
-                   before returning.
-    */
-
-    void stop (bool const wait);
-
-    /** Determine if the thread needs interruption.
-
-        Should be called periodically by the idle function. If interruptionPoint
-        returns true or throws, it must not be called again until the idle function
-        returns and is re-entered.
-
-        @invariant No previous calls to interruptionPoint() made after the idle
-                   function entry point returned `true`.
-
-        @return `false` if the idle function may continue, or `true` if the
-                idle function must return as soon as possible.
-    */
-    bool interruptionPoint ();
-
-    /* Interrupts the idle function.
-    */
-    void interrupt ();
-
-private:
-    static void doNothing ();
-
-    void signal ();
-
-    void reset ();
-
-    void doStop ();
-
-    void threadRun ();
-
-private:
-    InterruptibleThread m_thread;
-    EntryPoints* m_entryPoints;
-    bool m_calledStart;
-    bool m_calledStop;
-    bool m_shouldStop;
-    CriticalSection m_mutex;
-};
-
-#endif
diff --git a/modules/beast_core/thread/impl/TrackedMutex.cpp b/modules/beast_core/thread/impl/TrackedMutex.cpp
index d37a148812..98da8cf0d5 100644
--- a/modules/beast_core/thread/impl/TrackedMutex.cpp
+++ b/modules/beast_core/thread/impl/TrackedMutex.cpp
@@ -50,7 +50,7 @@ TrackedMutexBasics::PerThreadData& TrackedMutexBasics::getPerThreadData ()
     // Manually call the constructor with placement new if needed
     if (! thread.id)
     {
-        ::new (&thread) PerThreadData ();
+        new (&thread) PerThreadData ();
         bassert (thread.id != 0);
     }
 
@@ -205,7 +205,7 @@ bool TrackedMutex::Agent::getLockedList (Array <Record>& output)
         {
             TrackedMutex const& mutex = *iter;
             {
-                TrackedMutex::SharedState::ReadAccess state (mutex.m_state);
+                TrackedMutex::SharedState::ConstAccess state (mutex.m_state);
                 output.add (state->owner);
             }
         }
@@ -237,7 +237,7 @@ String TrackedMutex::getName () const noexcept
 TrackedMutex::Record TrackedMutex::getOwnerRecord () const noexcept
 {
     {
-        SharedState::ReadAccess state (m_state);
+        SharedState::ConstAccess state (m_state);
         return state->owner;
     }
 }
@@ -245,7 +245,7 @@ TrackedMutex::Record TrackedMutex::getOwnerRecord () const noexcept
 TrackedMutex::Agent TrackedMutex::getOwnerAgent () const noexcept
 {
     {
-        SharedState::ReadAccess state (m_state);
+        SharedState::ConstAccess state (m_state);
         if (state->thread != nullptr)
             return Agent (state->thread);
     }
@@ -298,7 +298,7 @@ void TrackedMutex::generateGlobalBlockedReport (StringArray& report)
                 {
                     String s;
                     TrackedMutex const& mutex (*iter);
-                    TrackedMutex::SharedState::ReadAccess state (mutex.m_state);
+                    TrackedMutex::SharedState::ConstAccess state (mutex.m_state);
                     s << "      " << mutex.getName () <<
                          " from " << state->owner.getSourceLocation ();
                     report.add (s);
@@ -372,7 +372,7 @@ void TrackedMutex::acquired (char const* fileName, int lineNumber) const noexcep
 
             {
                 // Take a state lock.
-                SharedState::WriteAccess state (m_state);
+                SharedState::Access state (m_state);
 
                 // Set the mutex ownership record
                 state->owner = Record (getName (), threadName, sourceLocation);
@@ -395,7 +395,7 @@ void TrackedMutex::acquired (char const* fileName, int lineNumber) const noexcep
     else
     {
         // Thread already had ownership of the mutex.
-        bassert (SharedState::UnlockedAccess (m_state)->thread == &thread);
+        bassert (SharedState::ConstUnlockedAccess (m_state)->thread == &thread);
 
         // If this goes off it means we counted wrong.
         bassert (thread.refCount >= m_count);
@@ -428,7 +428,7 @@ void TrackedMutex::release () const noexcept
 
         {
             // Take the mutex' state lock
-            SharedState::WriteAccess state (m_state);
+            SharedState::Access state (m_state);
 
             // Clear the mutex ownership record
             state->owner = Record ();
diff --git a/modules/beast_core/threads/beast_ChildProcess.cpp b/modules/beast_core/threads/ChildProcess.cpp
similarity index 82%
rename from modules/beast_core/threads/beast_ChildProcess.cpp
rename to modules/beast_core/threads/ChildProcess.cpp
index 24618f1e05..3aafba1b66 100644
--- a/modules/beast_core/threads/beast_ChildProcess.cpp
+++ b/modules/beast_core/threads/ChildProcess.cpp
@@ -61,8 +61,6 @@ String ChildProcess::readAllProcessOutput()
 class ChildProcessTests  : public UnitTest
 {
 public:
-    ChildProcessTests() : UnitTest ("ChildProcess", "beast") {}
-
     void runTest()
     {
         beginTestCase ("Child Processes");
@@ -76,10 +74,25 @@ public:
         expect (p.start ("ls /"));
        #endif
 
+        if (! p.waitForProcessToFinish (10 * 1000))
+        {
+            if (p.kill ())
+                p.waitForProcessToFinish (-1);
+        }
+
         //String output (p.readAllProcessOutput());
         //expect (output.isNotEmpty());
       #endif
     }
+
+    // VFALCO NOTE I had to disable this test because it was leaving
+    //             behind a zombie process and making other unit tests fail.
+    //             It doesnt happen with a debugger attached, or if the
+    //             unit test is run individually.
+    //
+    ChildProcessTests() : UnitTest ("ChildProcess", "beast", runManual)
+    {
+    }
 };
 
 static ChildProcessTests childProcessTests;
diff --git a/modules/beast_core/threads/beast_ChildProcess.h b/modules/beast_core/threads/ChildProcess.h
similarity index 100%
rename from modules/beast_core/threads/beast_ChildProcess.h
rename to modules/beast_core/threads/ChildProcess.h
diff --git a/modules/beast_core/threads/beast_CriticalSection.h b/modules/beast_core/threads/CriticalSection.h
similarity index 99%
rename from modules/beast_core/threads/beast_CriticalSection.h
rename to modules/beast_core/threads/CriticalSection.h
index 0ccef10423..a130cb318b 100644
--- a/modules/beast_core/threads/beast_CriticalSection.h
+++ b/modules/beast_core/threads/CriticalSection.h
@@ -82,7 +82,6 @@ public:
     */
     void exit() const noexcept;
 
-
     //==============================================================================
     /** Provides the type of scoped lock to use with a CriticalSection. */
     typedef GenericScopedLock <CriticalSection>       ScopedLockType;
diff --git a/modules/beast_core/threads/beast_DynamicLibrary.h b/modules/beast_core/threads/DynamicLibrary.h
similarity index 100%
rename from modules/beast_core/threads/beast_DynamicLibrary.h
rename to modules/beast_core/threads/DynamicLibrary.h
diff --git a/modules/beast_core/threads/beast_HighResolutionTimer.cpp b/modules/beast_core/threads/HighResolutionTimer.cpp
similarity index 100%
rename from modules/beast_core/threads/beast_HighResolutionTimer.cpp
rename to modules/beast_core/threads/HighResolutionTimer.cpp
diff --git a/modules/beast_core/threads/beast_HighResolutionTimer.h b/modules/beast_core/threads/HighResolutionTimer.h
similarity index 100%
rename from modules/beast_core/threads/beast_HighResolutionTimer.h
rename to modules/beast_core/threads/HighResolutionTimer.h
diff --git a/modules/beast_core/threads/beast_InterProcessLock.h b/modules/beast_core/threads/InterProcessLock.h
similarity index 100%
rename from modules/beast_core/threads/beast_InterProcessLock.h
rename to modules/beast_core/threads/InterProcessLock.h
diff --git a/modules/beast_core/threads/beast_Process.h b/modules/beast_core/threads/Process.h
similarity index 100%
rename from modules/beast_core/threads/beast_Process.h
rename to modules/beast_core/threads/Process.h
diff --git a/modules/beast_core/threads/beast_ReadWriteLock.cpp b/modules/beast_core/threads/ReadWriteLock.cpp
similarity index 100%
rename from modules/beast_core/threads/beast_ReadWriteLock.cpp
rename to modules/beast_core/threads/ReadWriteLock.cpp
diff --git a/modules/beast_core/threads/beast_ReadWriteLock.h b/modules/beast_core/threads/ReadWriteLock.h
similarity index 100%
rename from modules/beast_core/threads/beast_ReadWriteLock.h
rename to modules/beast_core/threads/ReadWriteLock.h
diff --git a/modules/beast_core/threads/beast_ScopedLock.h b/modules/beast_core/threads/ScopedLock.h
similarity index 100%
rename from modules/beast_core/threads/beast_ScopedLock.h
rename to modules/beast_core/threads/ScopedLock.h
diff --git a/modules/beast_core/threads/beast_ScopedReadLock.h b/modules/beast_core/threads/ScopedReadLock.h
similarity index 100%
rename from modules/beast_core/threads/beast_ScopedReadLock.h
rename to modules/beast_core/threads/ScopedReadLock.h
diff --git a/modules/beast_core/threads/beast_ScopedWriteLock.h b/modules/beast_core/threads/ScopedWriteLock.h
similarity index 100%
rename from modules/beast_core/threads/beast_ScopedWriteLock.h
rename to modules/beast_core/threads/ScopedWriteLock.h
diff --git a/modules/beast_core/threads/beast_SpinDelay.cpp b/modules/beast_core/threads/SpinDelay.cpp
similarity index 100%
rename from modules/beast_core/threads/beast_SpinDelay.cpp
rename to modules/beast_core/threads/SpinDelay.cpp
diff --git a/modules/beast_core/threads/beast_SpinDelay.h b/modules/beast_core/threads/SpinDelay.h
similarity index 100%
rename from modules/beast_core/threads/beast_SpinDelay.h
rename to modules/beast_core/threads/SpinDelay.h
diff --git a/modules/beast_core/threads/beast_ReadWriteMutex.cpp b/modules/beast_core/threads/beast_ReadWriteMutex.cpp
deleted file mode 100644
index 6118e4e26a..0000000000
--- a/modules/beast_core/threads/beast_ReadWriteMutex.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-ReadWriteMutex::ReadWriteMutex () noexcept
-{
-}
-
-ReadWriteMutex::~ReadWriteMutex () noexcept
-{
-}
-
-void ReadWriteMutex::enterRead () const noexcept
-{
-    for (;;)
-    {
-        // attempt the lock optimistically
-        // THIS IS NOT CACHE-FRIENDLY!
-        m_readers->addref ();
-
-        // is there a writer?
-        // THIS IS NOT CACHE-FRIENDLY!
-        if (m_writes->isSignaled ())
-        {
-            // a writer exists, give up the read lock
-            m_readers->release ();
-
-            // block until the writer is done
-            {
-                CriticalSection::ScopedLockType lock (m_mutex);
-            }
-
-            // now try the loop again
-        }
-        else
-        {
-            break;
-        }
-    }
-}
-
-void ReadWriteMutex::exitRead () const noexcept
-{
-    m_readers->release ();
-}
-
-void ReadWriteMutex::enterWrite () const noexcept
-{
-    // Optimistically acquire the write lock.
-    m_writes->addref ();
-
-    // Go for the mutex.
-    // Another writer might block us here.
-    m_mutex.enter ();
-
-    // Only one competing writer will get here,
-    // but we don't know who, so we have to drain
-    // readers no matter what. New readers will be
-    // blocked by the mutex.
-    //
-    if (m_readers->isSignaled ())
-    {
-        SpinDelay delay;
-
-        do
-        {
-            delay.pause ();
-        }
-        while (m_readers->isSignaled ());
-    }
-}
-
-void ReadWriteMutex::exitWrite () const noexcept
-{
-    // Releasing the mutex first and then decrementing the
-    // writer count allows another waiting writer to atomically
-    // acquire the lock, thus starving readers. This fulfills
-    // the write-preferencing requirement.
-
-    m_mutex.exit ();
-
-    m_writes->release ();
-}
diff --git a/modules/beast_core/threads/beast_ReadWriteMutex.h b/modules/beast_core/threads/beast_ReadWriteMutex.h
deleted file mode 100644
index 05b87750ce..0000000000
--- a/modules/beast_core/threads/beast_ReadWriteMutex.h
+++ /dev/null
@@ -1,150 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_READWRITEMUTEX_H_INCLUDED
-#define BEAST_READWRITEMUTEX_H_INCLUDED
-
-/*============================================================================*/
-/**
-  Multiple consumer, single producer (MCSP) synchronization.
-
-  This is an optimized lock for the multiple reader, single writer
-  scenario. It provides only a subset of features of the more general
-  traditional read/write lock. Specifically, these rules apply:
-
-  - A caller cannot hold a read lock while acquiring a write lock.
-
-  - Write locks are only recursive with respect to write locks.
-
-  - Read locks are only recursive with respect to read locks.
-
-  - A write lock cannot be downgraded.
-
-  - Writes are preferenced over reads.
-
-  For real-time applications, these restrictions are often not an issue.
-
-  The implementation is wait-free in the fast path: acquiring read access
-  for a lock without contention - just one interlocked increment!
-
-  @class ReadWriteMutex
-  @ingroup beast_concurrent
-*/
-
-//------------------------------------------------------------------------------
-
-/**
-  Scoped read lock for ReadWriteMutex.
-
-  @ingroup beast_concurrent
-*/
-template <class LockType>
-struct GenericScopedReadLock : public Uncopyable
-{
-    inline explicit GenericScopedReadLock (LockType const& lock) noexcept
-:
-    m_lock (lock)
-    {
-        m_lock.enterRead ();
-    }
-
-    inline ~GenericScopedReadLock () noexcept
-    {
-        m_lock.exitRead ();
-    }
-
-private:
-    LockType const& m_lock;
-};
-
-//------------------------------------------------------------------------------
-
-/**
-  Scoped write lock for ReadWriteMutex.
-
-  @ingroup beast_concurrent
-*/
-template <class LockType>
-struct GenericScopedWriteLock : public Uncopyable
-{
-    inline explicit GenericScopedWriteLock (LockType const& lock) noexcept
-:
-    m_lock (lock)
-    {
-        m_lock.enterWrite ();
-    }
-
-    inline ~GenericScopedWriteLock () noexcept
-    {
-        m_lock.exitWrite ();
-    }
-
-private:
-    LockType const& m_lock;
-};
-
-//------------------------------------------------------------------------------
-
-class BEAST_API ReadWriteMutex
-{
-public:
-    /** Provides the type of scoped read lock to use with a ReadWriteMutex. */
-    typedef GenericScopedReadLock <ReadWriteMutex> ScopedReadLockType;
-
-    /** Provides the type of scoped write lock to use with a ReadWriteMutex. */
-    typedef GenericScopedWriteLock <ReadWriteMutex> ScopedWriteLockType;
-
-    /** Create a ReadWriteMutex */
-    ReadWriteMutex () noexcept;
-
-    /** Destroy a ReadWriteMutex
-
-        If the object is destroyed while a lock is held, the result is
-        undefined behavior.
-    */
-    ~ReadWriteMutex () noexcept;
-
-    /** Acquire a read lock.
-
-        This is recursive with respect to other read locks. Calling this while
-        holding a write lock is undefined.
-    */
-    void enterRead () const noexcept;
-
-    /** Release a previously acquired read lock */
-    void exitRead () const noexcept;
-
-    /** Acquire a write lock.
-
-        This is recursive with respect to other write locks. Calling this while
-        holding a read lock is undefined.
-    */
-    void enterWrite () const noexcept;
-
-    /** Release a previously acquired write lock */
-    void exitWrite () const noexcept;
-
-private:
-    CriticalSection m_mutex;
-
-    mutable CacheLine::Padded <AtomicCounter> m_writes;
-    mutable CacheLine::Padded <AtomicCounter> m_readers;
-};
-
-#endif
diff --git a/modules/beast_core/threads/beast_SharedData.h b/modules/beast_core/threads/beast_SharedData.h
deleted file mode 100644
index 3afc5b123a..0000000000
--- a/modules/beast_core/threads/beast_SharedData.h
+++ /dev/null
@@ -1,295 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_SHAREDDATA_H_INCLUDED
-#define BEAST_SHAREDDATA_H_INCLUDED
-
-/** Structured access to a shared state.
-
-    This template wraps an object containing members representing state
-    information shared between multiple threads of execution, where any thread
-    may need to read or write as needed. Synchronized access to the concurrent
-    state is enforced at compile time through strongly typed accessor classes.
-    This interface design facilitates source code pattern matching to find all
-    areas where a concurrent state is accessed.
-
-    There are three types of access:
-
-    - ReadAccess
-
-        Allows read access to the underlying object as `const`. ReadAccess may
-        be granted to one or more threads simultaneously. If one or more
-        threads have ReadAccess, requests to obtain WriteAccess are blocked.
-
-    - WriteAccess
-
-        Allows exclusive read/write access the underlying object. A WriteAccess
-        request blocks until all existing ReadAccess and WriteAccess requests
-        are released. While a WriteAccess exists, requests for ReadAccess
-        will block.
-
-    - UnlockedAccess
-
-        Allows read access to the underlying object without using the lock.
-        This can be helpful when designing concurrent structures through
-        composition. It also makes it easier to search for places in code
-        which use unlocked access.
-
-    This code example demonstrates various forms of access to a SharedData:
-
-    @code
-
-    struct SharedData
-    {
-        int value1;
-        String value2;
-    };
-
-    typedef SharedData <SharedData> SharedState;
-
-    SharedState sharedState;
-
-    void readExample ()
-    {
-        SharedState::ReadAccess state (sharedState);
-
-        print (state->value1);   // read access
-        print (state->value2);   // read access
-
-        state->value1 = 42;      // write disallowed: compile error
-    }
-
-    void writeExample ()
-    {
-        SharedState::WriteAccess state (sharedState);
-
-        state->value2 = "Label"; // write access
-    }
-
-    @endcode
-
-    Forwarding constructors with up to eight parameters are provided. This lets
-    you write constructors into the underlying data object. For example:
-
-    @code
-
-    struct SharedData
-    {
-        explicit SharedData (int numSlots)
-        {
-            m_array.reserve (numSlots);
-        }
-
-        std::vector <AudioSampleBuffer*> m_array;
-    };
-
-    // Construct SharedData with one parameter
-    SharedData <SharedData> sharedState (16);
-
-    @endcode
-
-    @param Object The type of object to encapsulate.
-
-    @warning Recursive calls are not supported. It is generally not possible for
-             a thread of execution to acquire write access while it already has
-             read access. Such an attempt will result in undefined behavior.
-             Calling into unknown code while holding a lock can cause deadlock.
-             See @ref CallQueue::queue().
-*/
-template <class Object>
-class SharedData : public Uncopyable
-{
-public:
-    class ReadAccess;
-    class WriteAccess;
-    class UnlockedAccess;
-
-    /** Create a concurrent state.
-
-        Up to 8 parameters can be specified in the constructor. These parameters
-        are forwarded to the corresponding constructor in Object. If no
-        constructor in Object matches the parameter list, a compile error is
-        generated.
-    */
-    /** @{ */
-    SharedData () { }
-
-    template <class T1>
-    explicit SharedData (T1 t1)
-        : m_obj (t1) { }
-
-    template <class T1, class T2>
-    SharedData (T1 t1, T2 t2)
-        : m_obj (t1, t2) { }
-
-    template <class T1, class T2, class T3>
-    SharedData (T1 t1, T2 t2, T3 t3)
-        : m_obj (t1, t2, t3) { }
-
-    template <class T1, class T2, class T3, class T4>
-    SharedData (T1 t1, T2 t2, T3 t3, T4 t4)
-        : m_obj (t1, t2, t3, t4) { }
-
-    template <class T1, class T2, class T3, class T4, class T5>
-    SharedData (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
-        : m_obj (t1, t2, t3, t4, t5) { }
-
-    template <class T1, class T2, class T3, class T4, class T5, class T6>
-    SharedData (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
-        : m_obj (t1, t2, t3, t4, t5, t6) { }
-
-    template <class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-    SharedData (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) : m_obj (t1, t2, t3, t4, t5, t6, t7) { }
-
-    template <class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-    SharedData (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
-        : m_obj (t1, t2, t3, t4, t5, t6, t7, t8) { }
-    /** @} */
-
-private:
-    typedef ReadWriteMutex ReadWriteMutexType;
-
-    Object m_obj;
-    ReadWriteMutexType m_mutex;
-};
-
-//------------------------------------------------------------------------------
-
-/** Unlocked access to a SharedData.
-
-    Use sparingly.
-*/
-template <class Object>
-class SharedData <Object>::UnlockedAccess : public Uncopyable
-{
-public:
-    explicit UnlockedAccess (SharedData const& state)
-        : m_state (state)
-    {
-    }
-
-    Object const& getObject () const
-    {
-        return m_state.m_obj;
-    }
-    Object const& operator* () const
-    {
-        return getObject ();
-    }
-    Object const* operator-> () const
-    {
-        return &getObject ();
-    }
-
-private:
-    SharedData const& m_state;
-};
-
-//------------------------------------------------------------------------------
-
-/** Read only access to a SharedData */
-template <class Object>
-class SharedData <Object>::ReadAccess : public Uncopyable
-{
-public:
-    /** Create a ReadAccess from the specified SharedData */
-    explicit ReadAccess (SharedData const volatile& state)
-        : m_state (const_cast <SharedData const&> (state))
-        , m_lock (m_state.m_mutex)
-    {
-    }
-
-    /** Obtain a read only reference to Object */
-    Object const& getObject () const
-    {
-        return m_state.m_obj;
-    }
-
-    /** Obtain a read only reference to Object */
-    Object const& operator* () const
-    {
-        return getObject ();
-    }
-
-    /** Obtain a read only smart pointer to Object */
-    Object const* operator-> () const
-    {
-        return &getObject ();
-    }
-
-private:
-    SharedData const& m_state;
-    ReadWriteMutexType::ScopedReadLockType m_lock;
-};
-
-//------------------------------------------------------------------------------
-
-/** Read/write access to a SharedData */
-template <class Object>
-class SharedData <Object>::WriteAccess : public Uncopyable
-{
-public:
-    explicit WriteAccess (SharedData& state)
-        : m_state (state)
-        , m_lock (m_state.m_mutex)
-    {
-    }
-
-    /** Obtain a read only reference to Object */
-    Object const* getObject () const
-    {
-        return m_state.m_obj;
-    }
-
-    /** Obtain a read only reference to Object */
-    Object const& operator* () const
-    {
-        return getObject ();
-    }
-
-    /** Obtain a read only smart pointer to Object */
-    Object const* operator-> () const
-    {
-        return &getObject ();
-    }
-
-    /** Obtain a read/write pointer to Object */
-    Object& getObject ()
-    {
-        return m_state.m_obj;
-    }
-
-    /** Obtain a read/write reference to Object */
-    Object& operator* ()
-    {
-        return getObject ();
-    }
-
-    /** Obtain a read/write smart pointer to Object */
-    Object* operator-> ()
-    {
-        return &getObject ();
-    }
-
-private:
-    SharedData& m_state;
-    ReadWriteMutexType::ScopedWriteLockType m_lock;
-};
-
-#endif
diff --git a/modules/beast_core/threads/beast_Thread.cpp b/modules/beast_core/threads/beast_Thread.cpp
deleted file mode 100644
index fbc5fa5c19..0000000000
--- a/modules/beast_core/threads/beast_Thread.cpp
+++ /dev/null
@@ -1,365 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Portions of this file are from JUCE.
-    Copyright (c) 2013 - Raw Material Software Ltd.
-    Please visit http://www.juce.com
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-Thread::Thread (const String& threadName_)
-    : threadName (threadName_),
-      threadHandle (nullptr),
-      threadId (0),
-      threadPriority (5),
-      affinityMask (0),
-      shouldExit (false)
-{
-}
-
-Thread::~Thread()
-{
-    /* If your thread class's destructor has been called without first stopping the thread, that
-       means that this partially destructed object is still performing some work - and that's
-       probably a Bad Thing!
-
-       To avoid this type of nastiness, always make sure you call stopThread() before or during
-       your subclass's destructor.
-    */
-    check_precondition (! isThreadRunning());
-
-    stopThread ();
-}
-
-//==============================================================================
-// Use a ref-counted object to hold this shared data, so that it can outlive its static
-// shared pointer when threads are still running during static shutdown.
-struct CurrentThreadHolder : public SharedObject
-{
-    CurrentThreadHolder() noexcept {}
-
-    typedef SharedPtr <CurrentThreadHolder> Ptr;
-    ThreadLocalValue<Thread*> value;
-};
-
-static char currentThreadHolderLock [sizeof (SpinLock)]; // (statically initialised to zeros).
-
-static SpinLock* castToSpinLockWithoutAliasingWarning (void* s)
-{
-    return static_cast<SpinLock*> (s);
-}
-
-static CurrentThreadHolder::Ptr getCurrentThreadHolder()
-{
-    static CurrentThreadHolder::Ptr currentThreadHolder;
-    SpinLock::ScopedLockType lock (*castToSpinLockWithoutAliasingWarning (currentThreadHolderLock));
-
-    if (currentThreadHolder == nullptr)
-        currentThreadHolder = new CurrentThreadHolder();
-
-    return currentThreadHolder;
-}
-
-void Thread::threadEntryPoint()
-{
-    const CurrentThreadHolder::Ptr currentThreadHolder (getCurrentThreadHolder());
-    currentThreadHolder->value = this;
-
-    if (threadName.isNotEmpty())
-        setCurrentThreadName (threadName);
-
-    if (startSuspensionEvent.wait (10000))
-    {
-        bassert (getCurrentThreadId() == threadId);
-
-        if (affinityMask != 0)
-            setCurrentThreadAffinityMask (affinityMask);
-
-        run();
-    }
-
-    currentThreadHolder->value.releaseCurrentThreadStorage();
-    closeThreadHandle();
-}
-
-// used to wrap the incoming call from the platform-specific code
-void BEAST_API beast_threadEntryPoint (void* userData)
-{
-    ProtectedCall (&Thread::threadEntryPoint, static_cast <Thread*> (userData));
-}
-
-//==============================================================================
-void Thread::startThread()
-{
-    const ScopedLock sl (startStopLock);
-
-    shouldExit = false;
-
-    if (threadHandle == nullptr)
-    {
-        launchThread();
-        setThreadPriority (threadHandle, threadPriority);
-        startSuspensionEvent.signal();
-    }
-}
-
-void Thread::startThread (const int priority)
-{
-    const ScopedLock sl (startStopLock);
-
-    if (threadHandle == nullptr)
-    {
-        threadPriority = priority;
-        startThread();
-    }
-    else
-    {
-        setPriority (priority);
-    }
-}
-
-bool Thread::isThreadRunning() const
-{
-    return threadHandle != nullptr;
-}
-
-Thread* Thread::getCurrentThread()
-{
-    return getCurrentThreadHolder()->value.get();
-}
-
-//==============================================================================
-void Thread::signalThreadShouldExit()
-{
-    shouldExit = true;
-}
-
-bool Thread::waitForThreadToExit (const int timeOutMilliseconds) const
-{
-    // Doh! So how exactly do you expect this thread to wait for itself to stop??
-    bassert (getThreadId() != getCurrentThreadId() || getCurrentThreadId() == 0);
-
-    const uint32 timeoutEnd = Time::getMillisecondCounter() + (uint32) timeOutMilliseconds;
-
-    while (isThreadRunning())
-    {
-        if (timeOutMilliseconds >= 0 && Time::getMillisecondCounter() > timeoutEnd)
-            return false;
-
-        sleep (2);
-    }
-
-    return true;
-}
-
-bool Thread::stopThread (const int timeOutMilliseconds)
-{
-    bool cleanExit = true;
-
-    // agh! You can't stop the thread that's calling this method! How on earth
-    // would that work??
-    bassert (getCurrentThreadId() != getThreadId());
-
-    const ScopedLock sl (startStopLock);
-
-    if (isThreadRunning())
-    {
-        signalThreadShouldExit();
-        notify();
-
-        if (timeOutMilliseconds != 0)
-        {
-            cleanExit = waitForThreadToExit (timeOutMilliseconds);
-        }
-
-        if (isThreadRunning())
-        {
-            bassert (! cleanExit);
-
-            // very bad karma if this point is reached, as there are bound to be
-            // locks and events left in silly states when a thread is killed by force..
-            killThread();
-
-            threadHandle = nullptr;
-            threadId = 0;
-
-            cleanExit = false;
-        }
-        else
-        {
-            cleanExit = true;
-        }
-    }
-
-    return cleanExit;
-}
-
-//==============================================================================
-bool Thread::setPriority (const int newPriority)
-{
-    // NB: deadlock possible if you try to set the thread prio from the thread itself,
-    // so using setCurrentThreadPriority instead in that case.
-    if (getCurrentThreadId() == getThreadId())
-        return setCurrentThreadPriority (newPriority);
-
-    const ScopedLock sl (startStopLock);
-
-    if (setThreadPriority (threadHandle, newPriority))
-    {
-        threadPriority = newPriority;
-        return true;
-    }
-
-    return false;
-}
-
-bool Thread::setCurrentThreadPriority (const int newPriority)
-{
-    return setThreadPriority (0, newPriority);
-}
-
-void Thread::setAffinityMask (const uint32 newAffinityMask)
-{
-    affinityMask = newAffinityMask;
-}
-
-//==============================================================================
-bool Thread::wait (const int timeOutMilliseconds) const
-{
-    return defaultEvent.wait (timeOutMilliseconds);
-}
-
-void Thread::notify() const
-{
-    defaultEvent.signal();
-}
-
-//==============================================================================
-void SpinLock::enter() const noexcept
-{
-    if (! tryEnter())
-    {
-        for (int i = 20; --i >= 0;)
-            if (tryEnter())
-                return;
-
-        while (! tryEnter())
-            Thread::yield();
-    }
-}
-
-//==============================================================================
-
-class AtomicTests : public UnitTest
-{
-public:
-    AtomicTests() : UnitTest ("Atomic", "beast") {}
-
-    void runTest()
-    {
-        beginTestCase ("Misc");
-
-        char a1[7];
-        expect (numElementsInArray(a1) == 7);
-        int a2[3];
-        expect (numElementsInArray(a2) == 3);
-
-        expect (ByteOrder::swap ((uint16) 0x1122) == 0x2211);
-        expect (ByteOrder::swap ((uint32) 0x11223344) == 0x44332211);
-        expect (ByteOrder::swap ((uint64) literal64bit (0x1122334455667788)) == literal64bit (0x8877665544332211));
-
-        beginTestCase ("int");
-        AtomicTester <int>::testInteger (*this);
-        beginTestCase ("unsigned int");
-        AtomicTester <unsigned int>::testInteger (*this);
-        beginTestCase ("int32");
-        AtomicTester <int32>::testInteger (*this);
-        beginTestCase ("uint32");
-        AtomicTester <uint32>::testInteger (*this);
-        beginTestCase ("long");
-        AtomicTester <long>::testInteger (*this);
-        beginTestCase ("void*");
-        AtomicTester <void*>::testInteger (*this);
-        beginTestCase ("int*");
-        AtomicTester <int*>::testInteger (*this);
-        beginTestCase ("float");
-        AtomicTester <float>::testFloat (*this);
-      #if ! BEAST_64BIT_ATOMICS_UNAVAILABLE  // 64-bit intrinsics aren't available on some old platforms
-        beginTestCase ("int64");
-        AtomicTester <int64>::testInteger (*this);
-        beginTestCase ("uint64");
-        AtomicTester <uint64>::testInteger (*this);
-        beginTestCase ("double");
-        AtomicTester <double>::testFloat (*this);
-      #endif
-    }
-
-    template <typename Type>
-    class AtomicTester
-    {
-    public:
-        AtomicTester() {}
-
-        static void testInteger (UnitTest& test)
-        {
-            Atomic<Type> a, b;
-            a.set ((Type) 10);
-            test.expect (a.value == (Type) 10);
-            test.expect (a.get() == (Type) 10);
-            a += (Type) 15;
-            test.expect (a.get() == (Type) 25);
-            a.memoryBarrier();
-            a -= (Type) 5;
-            test.expect (a.get() == (Type) 20);
-            test.expect (++a == (Type) 21);
-            ++a;
-            test.expect (--a == (Type) 21);
-            test.expect (a.get() == (Type) 21);
-            a.memoryBarrier();
-
-            testFloat (test);
-        }
-
-        static void testFloat (UnitTest& test)
-        {
-            Atomic<Type> a, b;
-            a = (Type) 21;
-            a.memoryBarrier();
-
-            /*  These are some simple test cases to check the atomics - let me know
-                if any of these assertions fail on your system!
-            */
-            test.expect (a.get() == (Type) 21);
-            test.expect (a.compareAndSetValue ((Type) 100, (Type) 50) == (Type) 21);
-            test.expect (a.get() == (Type) 21);
-            test.expect (a.compareAndSetValue ((Type) 101, a.get()) == (Type) 21);
-            test.expect (a.get() == (Type) 101);
-            test.expect (! a.compareAndSetBool ((Type) 300, (Type) 200));
-            test.expect (a.get() == (Type) 101);
-            test.expect (a.compareAndSetBool ((Type) 200, a.get()));
-            test.expect (a.get() == (Type) 200);
-
-            test.expect (a.exchange ((Type) 300) == (Type) 200);
-            test.expect (a.get() == (Type) 300);
-
-            b = a;
-            test.expect (b.get() == a.get());
-        }
-    };
-};
-
-static AtomicTests atomicTests;
diff --git a/modules/beast_core/threads/beast_ThreadPool.cpp b/modules/beast_core/threads/beast_ThreadPool.cpp
deleted file mode 100644
index 71354bad00..0000000000
--- a/modules/beast_core/threads/beast_ThreadPool.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Portions of this file are from JUCE.
-    Copyright (c) 2013 - Raw Material Software Ltd.
-    Please visit http://www.juce.com
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-ThreadPoolJob::ThreadPoolJob (const String& name)
-    : jobName (name),
-      pool (nullptr),
-      shouldStop (false),
-      isActive (false),
-      shouldBeDeleted (false)
-{
-}
-
-ThreadPoolJob::~ThreadPoolJob()
-{
-    // you mustn't delete a job while it's still in a pool! Use ThreadPool::removeJob()
-    // to remove it first!
-    bassert (pool == nullptr || ! pool->contains (this));
-}
-
-String ThreadPoolJob::getJobName() const
-{
-    return jobName;
-}
-
-void ThreadPoolJob::setJobName (const String& newName)
-{
-    jobName = newName;
-}
-
-void ThreadPoolJob::signalJobShouldExit()
-{
-    shouldStop = true;
-}
-
-//==============================================================================
-class ThreadPool::ThreadPoolThread
-    : public Thread
-    , LeakChecked <ThreadPoolThread>
-{
-public:
-    ThreadPoolThread (ThreadPool& pool_)
-        : Thread ("Pool"),
-          pool (pool_)
-    {
-    }
-
-    void run() override
-    {
-        while (! threadShouldExit())
-        {
-            if (! pool.runNextJob())
-                wait (500);
-        }
-    }
-
-private:
-    ThreadPool& pool;
-};
-
-//==============================================================================
-ThreadPool::ThreadPool (const int numThreads)
-{
-    bassert (numThreads > 0); // not much point having a pool without any threads!
-
-    createThreads (numThreads);
-}
-
-ThreadPool::ThreadPool()
-{
-    createThreads (SystemStats::getNumCpus());
-}
-
-ThreadPool::~ThreadPool()
-{
-    removeAllJobs (true, 5000);
-    stopThreads();
-}
-
-void ThreadPool::createThreads (int numThreads)
-{
-    for (int i = bmax (1, numThreads); --i >= 0;)
-        threads.add (new ThreadPoolThread (*this));
-
-    for (int i = threads.size(); --i >= 0;)
-        threads.getUnchecked(i)->startThread();
-}
-
-void ThreadPool::stopThreads()
-{
-    for (int i = threads.size(); --i >= 0;)
-        threads.getUnchecked(i)->signalThreadShouldExit();
-
-    for (int i = threads.size(); --i >= 0;)
-        threads.getUnchecked(i)->stopThread (500);
-}
-
-void ThreadPool::addJob (ThreadPoolJob* const job, const bool deleteJobWhenFinished)
-{
-    bassert (job != nullptr);
-    bassert (job->pool == nullptr);
-
-    if (job->pool == nullptr)
-    {
-        job->pool = this;
-        job->shouldStop = false;
-        job->isActive = false;
-        job->shouldBeDeleted = deleteJobWhenFinished;
-
-        {
-            const ScopedLock sl (lock);
-            jobs.add (job);
-        }
-
-        for (int i = threads.size(); --i >= 0;)
-            threads.getUnchecked(i)->notify();
-    }
-}
-
-int ThreadPool::getNumJobs() const
-{
-    return jobs.size();
-}
-
-ThreadPoolJob* ThreadPool::getJob (const int index) const
-{
-    const ScopedLock sl (lock);
-    return jobs [index];
-}
-
-bool ThreadPool::contains (const ThreadPoolJob* const job) const
-{
-    const ScopedLock sl (lock);
-    return jobs.contains (const_cast <ThreadPoolJob*> (job));
-}
-
-bool ThreadPool::isJobRunning (const ThreadPoolJob* const job) const
-{
-    const ScopedLock sl (lock);
-    return jobs.contains (const_cast <ThreadPoolJob*> (job)) && job->isActive;
-}
-
-bool ThreadPool::waitForJobToFinish (const ThreadPoolJob* const job,
-                                     const int timeOutMs) const
-{
-    if (job != nullptr)
-    {
-        const uint32 start = Time::getMillisecondCounter();
-
-        while (contains (job))
-        {
-            if (timeOutMs >= 0 && Time::getMillisecondCounter() >= start + (uint32) timeOutMs)
-                return false;
-
-            jobFinishedSignal.wait (2);
-        }
-    }
-
-    return true;
-}
-
-bool ThreadPool::removeJob (ThreadPoolJob* const job,
-                            const bool interruptIfRunning,
-                            const int timeOutMs)
-{
-    bool dontWait = true;
-    OwnedArray<ThreadPoolJob> deletionList;
-
-    if (job != nullptr)
-    {
-        const ScopedLock sl (lock);
-
-        if (jobs.contains (job))
-        {
-            if (job->isActive)
-            {
-                if (interruptIfRunning)
-                    job->signalJobShouldExit();
-
-                dontWait = false;
-            }
-            else
-            {
-                jobs.removeFirstMatchingValue (job);
-                addToDeleteList (deletionList, job);
-            }
-        }
-    }
-
-    return dontWait || waitForJobToFinish (job, timeOutMs);
-}
-
-bool ThreadPool::removeAllJobs (const bool interruptRunningJobs, const int timeOutMs,
-                                ThreadPool::JobSelector* selectedJobsToRemove)
-{
-    Array <ThreadPoolJob*> jobsToWaitFor;
-
-    {
-        OwnedArray<ThreadPoolJob> deletionList;
-
-        {
-            const ScopedLock sl (lock);
-
-            for (int i = jobs.size(); --i >= 0;)
-            {
-                ThreadPoolJob* const job = jobs.getUnchecked(i);
-
-                if (selectedJobsToRemove == nullptr || selectedJobsToRemove->isJobSuitable (job))
-                {
-                    if (job->isActive)
-                    {
-                        jobsToWaitFor.add (job);
-
-                        if (interruptRunningJobs)
-                            job->signalJobShouldExit();
-                    }
-                    else
-                    {
-                        jobs.remove (i);
-                        addToDeleteList (deletionList, job);
-                    }
-                }
-            }
-        }
-    }
-
-    const uint32 start = Time::getMillisecondCounter();
-
-    for (;;)
-    {
-        for (int i = jobsToWaitFor.size(); --i >= 0;)
-        {
-            ThreadPoolJob* const job = jobsToWaitFor.getUnchecked (i);
-
-            if (! isJobRunning (job))
-                jobsToWaitFor.remove (i);
-        }
-
-        if (jobsToWaitFor.size() == 0)
-            break;
-
-        if (timeOutMs >= 0 && Time::getMillisecondCounter() >= start + (uint32) timeOutMs)
-            return false;
-
-        jobFinishedSignal.wait (20);
-    }
-
-    return true;
-}
-
-StringArray ThreadPool::getNamesOfAllJobs (const bool onlyReturnActiveJobs) const
-{
-    StringArray s;
-    const ScopedLock sl (lock);
-
-    for (int i = 0; i < jobs.size(); ++i)
-    {
-        const ThreadPoolJob* const job = jobs.getUnchecked(i);
-        if (job->isActive || ! onlyReturnActiveJobs)
-            s.add (job->getJobName());
-    }
-
-    return s;
-}
-
-bool ThreadPool::setThreadPriorities (const int newPriority)
-{
-    bool ok = true;
-
-    for (int i = threads.size(); --i >= 0;)
-        if (! threads.getUnchecked(i)->setPriority (newPriority))
-            ok = false;
-
-    return ok;
-}
-
-ThreadPoolJob* ThreadPool::pickNextJobToRun()
-{
-    OwnedArray<ThreadPoolJob> deletionList;
-
-    {
-        const ScopedLock sl (lock);
-
-        for (int i = 0; i < jobs.size(); ++i)
-        {
-            ThreadPoolJob* job = jobs[i];
-
-            if (job != nullptr && ! job->isActive)
-            {
-                if (job->shouldStop)
-                {
-                    jobs.remove (i);
-                    addToDeleteList (deletionList, job);
-                    --i;
-                    continue;
-                }
-
-                job->isActive = true;
-                return job;
-            }
-        }
-    }
-
-    return nullptr;
-}
-
-bool ThreadPool::runNextJob()
-{
-    ThreadPoolJob* const job = pickNextJobToRun();
-
-    if (job == nullptr)
-        return false;
-
-    ThreadPoolJob::JobStatus result = ThreadPoolJob::jobHasFinished;
-
-    result = job->runJob();
-
-    OwnedArray<ThreadPoolJob> deletionList;
-
-    {
-        const ScopedLock sl (lock);
-
-        if (jobs.contains (job))
-        {
-            job->isActive = false;
-
-            if (result != ThreadPoolJob::jobNeedsRunningAgain || job->shouldStop)
-            {
-                jobs.removeFirstMatchingValue (job);
-                addToDeleteList (deletionList, job);
-
-                jobFinishedSignal.signal();
-            }
-            else
-            {
-                // move the job to the end of the queue if it wants another go
-                jobs.move (jobs.indexOf (job), -1);
-            }
-        }
-    }
-
-    return true;
-}
-
-void ThreadPool::addToDeleteList (OwnedArray<ThreadPoolJob>& deletionList, ThreadPoolJob* const job) const
-{
-    job->shouldStop = true;
-    job->pool = nullptr;
-
-    if (job->shouldBeDeleted)
-        deletionList.add (job);
-}
diff --git a/modules/beast_core/threads/beast_ThreadPool.h b/modules/beast_core/threads/beast_ThreadPool.h
deleted file mode 100644
index c2c27783a8..0000000000
--- a/modules/beast_core/threads/beast_ThreadPool.h
+++ /dev/null
@@ -1,304 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Portions of this file are from JUCE.
-    Copyright (c) 2013 - Raw Material Software Ltd.
-    Please visit http://www.juce.com
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_THREADPOOL_H_INCLUDED
-#define BEAST_THREADPOOL_H_INCLUDED
-
-class ThreadPool;
-class ThreadPoolThread;
-
-//==============================================================================
-/**
-    A task that is executed by a ThreadPool object.
-
-    A ThreadPool keeps a list of ThreadPoolJob objects which are executed by
-    its threads.
-
-    The runJob() method needs to be implemented to do the task, and if the code that
-    does the work takes a significant time to run, it must keep checking the shouldExit()
-    method to see if something is trying to interrupt the job. If shouldExit() returns
-    true, the runJob() method must return immediately.
-
-    @see ThreadPool, Thread
-*/
-class BEAST_API ThreadPoolJob : LeakChecked <ThreadPoolJob>, public Uncopyable
-{
-public:
-    //==============================================================================
-    /** Creates a thread pool job object.
-        After creating your job, add it to a thread pool with ThreadPool::addJob().
-    */
-    explicit ThreadPoolJob (const String& name);
-
-    /** Destructor. */
-    virtual ~ThreadPoolJob();
-
-    //==============================================================================
-    /** Returns the name of this job.
-        @see setJobName
-    */
-    String getJobName() const;
-
-    /** Changes the job's name.
-        @see getJobName
-    */
-    void setJobName (const String& newName);
-
-    //==============================================================================
-    /** These are the values that can be returned by the runJob() method.
-    */
-    enum JobStatus
-    {
-        jobHasFinished = 0,     /**< indicates that the job has finished and can be
-                                     removed from the pool. */
-
-        jobNeedsRunningAgain    /**< indicates that the job would like to be called
-                                     again when a thread is free. */
-    };
-
-    /** Peforms the actual work that this job needs to do.
-
-        Your subclass must implement this method, in which is does its work.
-
-        If the code in this method takes a significant time to run, it must repeatedly check
-        the shouldExit() method to see if something is trying to interrupt the job.
-        If shouldExit() ever returns true, the runJob() method must return immediately.
-
-        If this method returns jobHasFinished, then the job will be removed from the pool
-        immediately. If it returns jobNeedsRunningAgain, then the job will be left in the
-        pool and will get a chance to run again as soon as a thread is free.
-
-        @see shouldExit()
-    */
-    virtual JobStatus runJob() = 0;
-
-
-    //==============================================================================
-    /** Returns true if this job is currently running its runJob() method. */
-    bool isRunning() const noexcept                     { return isActive; }
-
-    /** Returns true if something is trying to interrupt this job and make it stop.
-
-        Your runJob() method must call this whenever it gets a chance, and if it ever
-        returns true, the runJob() method must return immediately.
-
-        @see signalJobShouldExit()
-    */
-    bool shouldExit() const noexcept                    { return shouldStop; }
-
-    /** Calling this will cause the shouldExit() method to return true, and the job
-        should (if it's been implemented correctly) stop as soon as possible.
-
-        @see shouldExit()
-    */
-    void signalJobShouldExit();
-
-    //==============================================================================
-private:
-    friend class ThreadPool;
-    friend class ThreadPoolThread;
-    String jobName;
-    ThreadPool* pool;
-    bool shouldStop, isActive, shouldBeDeleted;
-};
-
-
-//==============================================================================
-/**
-    A set of threads that will run a list of jobs.
-
-    When a ThreadPoolJob object is added to the ThreadPool's list, its runJob() method
-    will be called by the next pooled thread that becomes free.
-
-    @see ThreadPoolJob, Thread
-*/
-class BEAST_API ThreadPool : LeakChecked <ThreadPool>, public Uncopyable
-{
-public:
-    //==============================================================================
-    /** Creates a thread pool.
-        Once you've created a pool, you can give it some jobs by calling addJob().
-        @param numberOfThreads  the number of threads to run. These will be started
-                                immediately, and will run until the pool is deleted.
-    */
-    ThreadPool (int numberOfThreads);
-
-    /** Creates a thread pool with one thread per CPU core.
-        Once you've created a pool, you can give it some jobs by calling addJob().
-        If you want to specify the number of threads, use the other constructor; this
-        one creates a pool which has one thread for each CPU core.
-        @see SystemStats::getNumCpus()
-    */
-    ThreadPool();
-
-    /** Destructor.
-
-        This will attempt to remove all the jobs before deleting, but if you want to
-        specify a timeout, you should call removeAllJobs() explicitly before deleting
-        the pool.
-    */
-    ~ThreadPool();
-
-    //==============================================================================
-    /** A callback class used when you need to select which ThreadPoolJob objects are suitable
-        for some kind of operation.
-        @see ThreadPool::removeAllJobs
-    */
-    class BEAST_API JobSelector
-    {
-    public:
-        virtual ~JobSelector() {}
-
-        /** Should return true if the specified thread matches your criteria for whatever
-            operation that this object is being used for.
-
-            Any implementation of this method must be extremely fast and thread-safe!
-        */
-        virtual bool isJobSuitable (ThreadPoolJob* job) = 0;
-    };
-
-    //==============================================================================
-    /** Adds a job to the queue.
-
-        Once a job has been added, then the next time a thread is free, it will run
-        the job's ThreadPoolJob::runJob() method. Depending on the return value of the
-        runJob() method, the pool will either remove the job from the pool or add it to
-        the back of the queue to be run again.
-
-        If deleteJobWhenFinished is true, then the job object will be owned and deleted by
-        the pool when not needed - if you do this, make sure that your object's destructor
-        is thread-safe.
-
-        If deleteJobWhenFinished is false, the pointer will be used but not deleted, and
-        the caller is responsible for making sure the object is not deleted before it has
-        been removed from the pool.
-    */
-    void addJob (ThreadPoolJob* job,
-                 bool deleteJobWhenFinished);
-
-    /** Tries to remove a job from the pool.
-
-        If the job isn't yet running, this will simply remove it. If it is running, it
-        will wait for it to finish.
-
-        If the timeout period expires before the job finishes running, then the job will be
-        left in the pool and this will return false. It returns true if the job is sucessfully
-        stopped and removed.
-
-        @param job                  the job to remove
-        @param interruptIfRunning   if true, then if the job is currently busy, its
-                                    ThreadPoolJob::signalJobShouldExit() method will be called to try
-                                    to interrupt it. If false, then if the job will be allowed to run
-                                    until it stops normally (or the timeout expires)
-        @param timeOutMilliseconds  the length of time this method should wait for the job to finish
-                                    before giving up and returning false
-    */
-    bool removeJob (ThreadPoolJob* job,
-                    bool interruptIfRunning,
-                    int timeOutMilliseconds);
-
-    /** Tries to remove all jobs from the pool.
-
-        @param interruptRunningJobs if true, then all running jobs will have their ThreadPoolJob::signalJobShouldExit()
-                                    methods called to try to interrupt them
-        @param timeOutMilliseconds  the length of time this method should wait for all the jobs to finish
-                                    before giving up and returning false
-        @param selectedJobsToRemove if this is non-zero, the JobSelector object is asked to decide which
-                                    jobs should be removed. If it is zero, all jobs are removed
-        @returns    true if all jobs are successfully stopped and removed; false if the timeout period
-                    expires while waiting for one or more jobs to stop
-    */
-    bool removeAllJobs (bool interruptRunningJobs,
-                        int timeOutMilliseconds,
-                        JobSelector* selectedJobsToRemove = nullptr);
-
-    /** Returns the number of jobs currently running or queued.
-    */
-    int getNumJobs() const;
-
-    /** Returns one of the jobs in the queue.
-
-        Note that this can be a very volatile list as jobs might be continuously getting shifted
-        around in the list, and this method may return 0 if the index is currently out-of-range.
-    */
-    ThreadPoolJob* getJob (int index) const;
-
-    /** Returns true if the given job is currently queued or running.
-
-        @see isJobRunning()
-    */
-    bool contains (const ThreadPoolJob* job) const;
-
-    /** Returns true if the given job is currently being run by a thread.
-    */
-    bool isJobRunning (const ThreadPoolJob* job) const;
-
-    /** Waits until a job has finished running and has been removed from the pool.
-
-        This will wait until the job is no longer in the pool - i.e. until its
-        runJob() method returns ThreadPoolJob::jobHasFinished.
-
-        If the timeout period expires before the job finishes, this will return false;
-        it returns true if the job has finished successfully.
-    */
-    bool waitForJobToFinish (const ThreadPoolJob* job,
-                             int timeOutMilliseconds) const;
-
-    /** Returns a list of the names of all the jobs currently running or queued.
-        If onlyReturnActiveJobs is true, only the ones currently running are returned.
-    */
-    StringArray getNamesOfAllJobs (bool onlyReturnActiveJobs) const;
-
-    /** Changes the priority of all the threads.
-
-        This will call Thread::setPriority() for each thread in the pool.
-        May return false if for some reason the priority can't be changed.
-    */
-    bool setThreadPriorities (int newPriority);
-
-
-private:
-    //==============================================================================
-    Array <ThreadPoolJob*> jobs;
-
-    class ThreadPoolThread;
-    friend class ThreadPoolThread;
-    friend class OwnedArray <ThreadPoolThread>;
-    OwnedArray <ThreadPoolThread> threads;
-
-    CriticalSection lock;
-    WaitableEvent jobFinishedSignal;
-
-    bool runNextJob();
-    ThreadPoolJob* pickNextJobToRun();
-    void addToDeleteList (OwnedArray<ThreadPoolJob>&, ThreadPoolJob*) const;
-    void createThreads (int numThreads);
-    void stopThreads();
-
-    // Note that this method has changed, and no longer has a parameter to indicate
-    // whether the jobs should be deleted - see the new method for details.
-    void removeAllJobs (bool, int, bool);
-};
-
-
-#endif   // BEAST_THREADPOOL_H_INCLUDED
diff --git a/modules/beast_core/threads/beast_TimeSliceThread.cpp b/modules/beast_core/threads/beast_TimeSliceThread.cpp
deleted file mode 100644
index 106e7084db..0000000000
--- a/modules/beast_core/threads/beast_TimeSliceThread.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Portions of this file are from JUCE.
-    Copyright (c) 2013 - Raw Material Software Ltd.
-    Please visit http://www.juce.com
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-TimeSliceThread::TimeSliceThread (const String& name)
-    : Thread (name),
-      clientBeingCalled (nullptr)
-{
-}
-
-TimeSliceThread::~TimeSliceThread()
-{
-    stopThread (2000);
-}
-
-//==============================================================================
-void TimeSliceThread::addTimeSliceClient (TimeSliceClient* const client, int millisecondsBeforeStarting)
-{
-    if (client != nullptr)
-    {
-        const ScopedLock sl (listLock);
-        client->nextCallTime = Time::getCurrentTime() + RelativeTime::milliseconds (millisecondsBeforeStarting);
-        clients.addIfNotAlreadyThere (client);
-        notify();
-    }
-}
-
-void TimeSliceThread::removeTimeSliceClient (TimeSliceClient* const client)
-{
-    const ScopedLock sl1 (listLock);
-
-    // if there's a chance we're in the middle of calling this client, we need to
-    // also lock the outer lock..
-    if (clientBeingCalled == client)
-    {
-        const ScopedUnlock ul (listLock); // unlock first to get the order right..
-
-        const ScopedLock sl2 (callbackLock);
-        const ScopedLock sl3 (listLock);
-
-        clients.removeFirstMatchingValue (client);
-    }
-    else
-    {
-        clients.removeFirstMatchingValue (client);
-    }
-}
-
-void TimeSliceThread::moveToFrontOfQueue (TimeSliceClient* client)
-{
-    const ScopedLock sl (listLock);
-
-    if (clients.contains (client))
-    {
-        client->nextCallTime = Time::getCurrentTime();
-        notify();
-    }
-}
-
-int TimeSliceThread::getNumClients() const
-{
-    return clients.size();
-}
-
-TimeSliceClient* TimeSliceThread::getClient (const int i) const
-{
-    const ScopedLock sl (listLock);
-    return clients [i];
-}
-
-//==============================================================================
-TimeSliceClient* TimeSliceThread::getNextClient (int index) const
-{
-    Time soonest;
-    TimeSliceClient* client = nullptr;
-
-    for (int i = clients.size(); --i >= 0;)
-    {
-        TimeSliceClient* const c = clients.getUnchecked ((i + index) % clients.size());
-
-        if (client == nullptr || c->nextCallTime < soonest)
-        {
-            client = c;
-            soonest = c->nextCallTime;
-        }
-    }
-
-    return client;
-}
-
-void TimeSliceThread::run()
-{
-    int index = 0;
-
-    while (! threadShouldExit())
-    {
-        int timeToWait = 500;
-
-        {
-            Time nextClientTime;
-
-            {
-                const ScopedLock sl2 (listLock);
-
-                index = clients.size() > 0 ? ((index + 1) % clients.size()) : 0;
-
-                if (TimeSliceClient* const firstClient = getNextClient (index))
-                    nextClientTime = firstClient->nextCallTime;
-            }
-
-            const Time now (Time::getCurrentTime());
-
-            if (nextClientTime > now)
-            {
-                timeToWait = (int) bmin ((int64) 500, (nextClientTime - now).inMilliseconds());
-            }
-            else
-            {
-                timeToWait = index == 0 ? 1 : 0;
-
-                const ScopedLock sl (callbackLock);
-
-                {
-                    const ScopedLock sl2 (listLock);
-                    clientBeingCalled = getNextClient (index);
-                }
-
-                if (clientBeingCalled != nullptr)
-                {
-                    const int msUntilNextCall = clientBeingCalled->useTimeSlice();
-
-                    const ScopedLock sl2 (listLock);
-
-                    if (msUntilNextCall >= 0)
-                        clientBeingCalled->nextCallTime = now + RelativeTime::milliseconds (msUntilNextCall);
-                    else
-                        clients.removeFirstMatchingValue (clientBeingCalled);
-
-                    clientBeingCalled = nullptr;
-                }
-            }
-        }
-
-        if (timeToWait > 0)
-            wait (timeToWait);
-    }
-}
diff --git a/modules/beast_core/threads/beast_TimeSliceThread.h b/modules/beast_core/threads/beast_TimeSliceThread.h
deleted file mode 100644
index 566b398c20..0000000000
--- a/modules/beast_core/threads/beast_TimeSliceThread.h
+++ /dev/null
@@ -1,143 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Portions of this file are from JUCE.
-    Copyright (c) 2013 - Raw Material Software Ltd.
-    Please visit http://www.juce.com
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_TIMESLICETHREAD_H_INCLUDED
-#define BEAST_TIMESLICETHREAD_H_INCLUDED
-
-class TimeSliceThread;
-
-//==============================================================================
-/**
-    Used by the TimeSliceThread class.
-
-    To register your class with a TimeSliceThread, derive from this class and
-    use the TimeSliceThread::addTimeSliceClient() method to add it to the list.
-
-    Make sure you always call TimeSliceThread::removeTimeSliceClient() before
-    deleting your client!
-
-    @see TimeSliceThread
-*/
-class BEAST_API TimeSliceClient
-{
-public:
-    /** Destructor. */
-    virtual ~TimeSliceClient()   {}
-
-    /** Called back by a TimeSliceThread.
-
-        When you register this class with it, a TimeSliceThread will repeatedly call
-        this method.
-
-        The implementation of this method should use its time-slice to do something that's
-        quick - never block for longer than absolutely necessary.
-
-        @returns    Your method should return the number of milliseconds which it would like to wait before being called
-                    again. Returning 0 will make the thread call again as soon as possible (after possibly servicing
-                    other busy clients). If you return a value below zero, your client will be removed from the list of clients,
-                    and won't be called again. The value you specify isn't a guaranteee, and is only used as a hint by the
-                    thread - the actual time before the next callback may be more or less than specified.
-                    You can force the TimeSliceThread to wake up and poll again immediately by calling its notify() method.
-    */
-    virtual int useTimeSlice() = 0;
-
-
-private:
-    friend class TimeSliceThread;
-    Time nextCallTime;
-};
-
-
-//==============================================================================
-/**
-    A thread that keeps a list of clients, and calls each one in turn, giving them
-    all a chance to run some sort of short task.
-
-    @see TimeSliceClient, Thread
-*/
-class BEAST_API TimeSliceThread
-    : public Thread 
-    , LeakChecked <TimeSliceThread>
-{
-public:
-    //==============================================================================
-    /**
-        Creates a TimeSliceThread.
-
-        When first created, the thread is not running. Use the startThread()
-        method to start it.
-    */
-    explicit TimeSliceThread (const String& threadName);
-
-    /** Destructor.
-
-        Deleting a Thread object that is running will only give the thread a
-        brief opportunity to stop itself cleanly, so it's recommended that you
-        should always call stopThread() with a decent timeout before deleting,
-        to avoid the thread being forcibly killed (which is a Bad Thing).
-    */
-    ~TimeSliceThread();
-
-    //==============================================================================
-    /** Adds a client to the list.
-
-        The client's callbacks will start after the number of milliseconds specified
-        by millisecondsBeforeStarting (and this may happen before this method has returned).
-    */
-    void addTimeSliceClient (TimeSliceClient* client, int millisecondsBeforeStarting = 0);
-
-    /** Removes a client from the list.
-
-        This method will make sure that all callbacks to the client have completely
-        finished before the method returns.
-    */
-    void removeTimeSliceClient (TimeSliceClient* client);
-
-    /** If the given client is waiting in the queue, it will be moved to the front
-        and given a time-slice as soon as possible.
-        If the specified client has not been added, nothing will happen.
-    */
-    void moveToFrontOfQueue (TimeSliceClient* client);
-
-    /** Returns the number of registered clients. */
-    int getNumClients() const;
-
-    /** Returns one of the registered clients. */
-    TimeSliceClient* getClient (int index) const;
-
-    //==============================================================================
-   #ifndef DOXYGEN
-    void run() override;
-   #endif
-
-    //==============================================================================
-private:
-    CriticalSection callbackLock, listLock;
-    Array <TimeSliceClient*> clients;
-    TimeSliceClient* clientBeingCalled;
-
-    TimeSliceClient* getNextClient (int index) const;
-};
-
-
-#endif   // BEAST_TIMESLICETHREAD_H_INCLUDED
diff --git a/modules/beast_core/time/AtExitHook.cpp b/modules/beast_core/time/AtExitHook.cpp
new file mode 100644
index 0000000000..e983b7f28d
--- /dev/null
+++ b/modules/beast_core/time/AtExitHook.cpp
@@ -0,0 +1,135 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+// Manages the list of hooks, and calls
+// whoever is in the list at exit time.
+//
+class AtExitHook::Manager
+{
+public:
+    Manager ()
+        : m_didStaticDestruction (false)
+    {
+    }
+   
+    static inline Manager& get ()
+    {
+        return StaticObject <Manager>::get();
+    }
+
+    void insert (Item& item)
+    {
+        ScopedLockType lock (m_mutex);
+
+        // Adding a new AtExitHook during or after the destruction
+        // of objects with static storage duration has taken place?
+        // Surely something has gone wrong.
+        //
+        bassert (! m_didStaticDestruction);
+        m_list.push_front (item);
+    }
+
+    void erase (Item& item)
+    {
+        ScopedLockType lock (m_mutex);
+
+        m_list.erase (m_list.iterator_to (item));
+    }
+
+private:
+    // Called at program exit when destructors for objects
+    // with static storage duration are invoked.
+    //
+    void doStaticDetruction ()
+    {
+        // In theory this shouldn't be needed (?)
+        ScopedLockType lock (m_mutex);
+
+        bassert (! m_didStaticDestruction);
+
+        for (List <Item>::iterator iter (m_list.begin()); iter != m_list.end();)
+        {
+            Item& item (*iter++);
+            AtExitHook* const hook (item.hook ());
+            hook->onExit ();
+        }
+
+        // Now do the leak checking
+        //
+        LeakCheckedBase::checkForLeaks ();
+    }
+
+    struct StaticDestructor
+    {
+        ~StaticDestructor ()
+        {
+            Manager::get().doStaticDetruction();
+        }
+    };
+
+    typedef CriticalSection MutexType;
+    typedef MutexType::ScopedLockType ScopedLockType;
+
+    static StaticDestructor s_staticDestructor;
+
+    MutexType m_mutex;
+    List <Item> m_list;
+    bool m_didStaticDestruction;
+};
+
+// This is an object with static storage duration.
+// When it gets destroyed, we will call into the Manager to
+// call all of the AtExitHook items in the list.
+//
+AtExitHook::Manager::StaticDestructor AtExitHook::Manager::s_staticDestructor; 
+
+//------------------------------------------------------------------------------
+
+AtExitHook::Item::Item (AtExitHook* hook)
+    : m_hook (hook)
+{
+}
+
+AtExitHook* AtExitHook::Item::hook ()
+{
+    return m_hook;
+}
+
+//------------------------------------------------------------------------------
+
+AtExitHook::AtExitHook ()
+    : m_item (this)
+{
+#if BEAST_IOS
+    // Patrick Dehne:
+    //      AtExitHook::Manager::insert crashes on iOS
+    //      if the storage is not accessed before it is used.
+    //
+    // VFALCO TODO Figure out why and fix it cleanly if needed.
+    //
+    char* hack = AtExitHook::Manager::s_list.s_storage;
+#endif
+
+    Manager::get().insert (m_item);
+}
+
+AtExitHook::~AtExitHook ()
+{
+    Manager::get().erase (m_item);
+}
diff --git a/modules/beast_core/time/AtExitHook.h b/modules/beast_core/time/AtExitHook.h
new file mode 100644
index 0000000000..26801d23d9
--- /dev/null
+++ b/modules/beast_core/time/AtExitHook.h
@@ -0,0 +1,88 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CORE_ATEXITHOOK_H_INCLUDED
+#define BEAST_CORE_ATEXITHOOK_H_INCLUDED
+
+/** Hook for performing activity on program exit.
+
+    These hooks execute when objects with static storage duration are
+    destroyed. The hooks are called in the reverse order that they were
+    created.
+
+    To use, derive your class from AtExitHook and implement onExit.
+    Alternatively, add AtExitMemberHook as a data member of your class and
+    then provide your own onExit function with this signature:
+
+    @code
+
+    void onExit ()
+
+    @endcode
+
+    @see AtExitMemberHook
+*/
+/** @{ */
+class AtExitHook
+{
+protected:
+    AtExitHook ();
+    virtual ~AtExitHook ();
+
+protected:
+    /** Called at program exit. */
+    virtual void onExit () = 0;
+
+private:
+    class Manager;
+
+    class Item : public List <Item>::Node
+    {
+    public:
+        explicit Item (AtExitHook* hook);
+        AtExitHook* hook ();
+
+    private:
+        AtExitHook* m_hook;
+    };
+
+    Item m_item;
+};
+
+/** Helper for utilizing the AtExitHook as a data member.
+*/
+template <class Object>
+class AtExitMemberHook : public AtExitHook
+{
+public:
+    explicit AtExitMemberHook (Object* owner) : m_owner (owner)
+    {
+    }
+
+private:
+    void onExit ()
+    {
+        m_owner->onExit ();
+    }
+
+    Object* m_owner;
+};
+/** @} */
+
+#endif
diff --git a/modules/beast_core/time/beast_PerformanceCounter.cpp b/modules/beast_core/time/PerformanceCounter.cpp
similarity index 100%
rename from modules/beast_core/time/beast_PerformanceCounter.cpp
rename to modules/beast_core/time/PerformanceCounter.cpp
diff --git a/modules/beast_core/time/beast_PerformanceCounter.h b/modules/beast_core/time/PerformanceCounter.h
similarity index 100%
rename from modules/beast_core/time/beast_PerformanceCounter.h
rename to modules/beast_core/time/PerformanceCounter.h
diff --git a/modules/beast_core/time/beast_Time.cpp b/modules/beast_core/time/Time.cpp
similarity index 100%
rename from modules/beast_core/time/beast_Time.cpp
rename to modules/beast_core/time/Time.cpp
diff --git a/modules/beast_core/time/beast_Time.h b/modules/beast_core/time/Time.h
similarity index 97%
rename from modules/beast_core/time/beast_Time.h
rename to modules/beast_core/time/Time.h
index 037f18092b..9628333f8f 100644
--- a/modules/beast_core/time/beast_Time.h
+++ b/modules/beast_core/time/Time.h
@@ -97,6 +97,21 @@ public:
     */
     static Time BEAST_CALLTYPE getCurrentTime() noexcept;
 
+    /** Returns `true` if this object represents "no time", or NULL.
+        Internally we check for milliseconds since Epoch equal to zero.
+    */
+    /** @{ */
+    bool isNull () const noexcept
+    {
+        return millisSinceEpoch == 0;
+    }
+
+    bool isNotNull () const noexcept
+    {
+        return millisSinceEpoch != 0;
+    }
+    /** @} */
+
     /** Returns the time as a number of milliseconds.
 
         @returns    the number of milliseconds this Time object represents, since
diff --git a/modules/beast_core/time/beast_PerformedAtExit.cpp b/modules/beast_core/time/beast_PerformedAtExit.cpp
deleted file mode 100644
index 7babb0d2dd..0000000000
--- a/modules/beast_core/time/beast_PerformedAtExit.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-class PerformedAtExit::ExitHook
-{
-public:
-    typedef Static::Storage <LockFreeStack <PerformedAtExit>, PerformedAtExit> StackType;
-
-private:
-    ~ExitHook ()
-    {
-        // Call all PerformedAtExit objects
-        //
-        PerformedAtExit* object = s_list->pop_front ();
-
-        while (object != nullptr)
-        {
-            object->performAtExit ();
-
-            object = s_list->pop_front ();
-        }
-
-        // Now do the leak checking
-        //
-        LeakCheckedBase::checkForLeaks ();
-    }
-
-public:
-    static void push_front (PerformedAtExit* object)
-    {
-        s_list->push_front (object);
-    }
-
-private:
-    friend class PerformedAtExit;
-
-    static StackType s_list;
-
-    static ExitHook s_performer;
-};
-
-PerformedAtExit::ExitHook PerformedAtExit::ExitHook::s_performer;
-PerformedAtExit::ExitHook::StackType PerformedAtExit::ExitHook::s_list;
-
-PerformedAtExit::PerformedAtExit ()
-{
-#if BEAST_IOS
-    // Patrick Dehne:
-    //      PerformedAtExit::ExitHook::push_front crashes on iOS
-    //      if s_storage is not accessed before used
-    //
-    // VFALCO TODO Figure out why and fix it cleanly if needed.
-    //
-    char* hack = PerformedAtExit::ExitHook::s_list.s_storage;
-#endif
-
-    ExitHook::push_front (this);
-}
diff --git a/modules/beast_core/time/beast_PerformedAtExit.h b/modules/beast_core/time/beast_PerformedAtExit.h
deleted file mode 100644
index 9cde4ff713..0000000000
--- a/modules/beast_core/time/beast_PerformedAtExit.h
+++ /dev/null
@@ -1,52 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_PERFORMEDATEXIT_H_INCLUDED
-#define BEAST_PERFORMEDATEXIT_H_INCLUDED
-
-/*============================================================================*/
-/**
-  Perform an action at program exit
-
-  To use, derive your class from PerformedAtExit, and override `performAtExit()`.
-  The call will be made during the destruction of objects with static storage
-  duration, before LeakChecked performs its diagnostics.
-
-  @ingroup beast_core
-*/
-// VFALCO TODO Make the linked list element a private type and use composition
-//             instead of inheritance, so that PerformedAtExit doesn't expose
-//             lock free stack node interfaces.
-//
-class BEAST_API PerformedAtExit : public LockFreeStack <PerformedAtExit>::Node
-{
-public:
-    class ExitHook;
-
-protected:
-    PerformedAtExit ();
-    virtual ~PerformedAtExit () { }
-
-protected:
-    /** Called at program exit.
-    */
-    virtual void performAtExit () = 0;
-};
-
-#endif
diff --git a/modules/beast_core/time/beast_RelativeTime.cpp b/modules/beast_core/time/beast_RelativeTime.cpp
deleted file mode 100644
index 2e1cc607af..0000000000
--- a/modules/beast_core/time/beast_RelativeTime.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Portions of this file are from JUCE.
-    Copyright (c) 2013 - Raw Material Software Ltd.
-    Please visit http://www.juce.com
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-RelativeTime::RelativeTime (const double secs) noexcept           : numSeconds (secs) {}
-RelativeTime::RelativeTime (const RelativeTime& other) noexcept   : numSeconds (other.numSeconds) {}
-RelativeTime::~RelativeTime() noexcept {}
-
-//==============================================================================
-RelativeTime RelativeTime::milliseconds (const int milliseconds) noexcept   { return RelativeTime (milliseconds * 0.001); }
-RelativeTime RelativeTime::milliseconds (const int64 milliseconds) noexcept { return RelativeTime (milliseconds * 0.001); }
-RelativeTime RelativeTime::seconds (double s) noexcept                      { return RelativeTime (s); }
-RelativeTime RelativeTime::minutes (const double numberOfMinutes) noexcept  { return RelativeTime (numberOfMinutes * 60.0); }
-RelativeTime RelativeTime::hours (const double numberOfHours) noexcept      { return RelativeTime (numberOfHours * (60.0 * 60.0)); }
-RelativeTime RelativeTime::days (const double numberOfDays) noexcept        { return RelativeTime (numberOfDays  * (60.0 * 60.0 * 24.0)); }
-RelativeTime RelativeTime::weeks (const double numberOfWeeks) noexcept      { return RelativeTime (numberOfWeeks * (60.0 * 60.0 * 24.0 * 7.0)); }
-
-//==============================================================================
-int64 RelativeTime::inMilliseconds() const noexcept { return (int64) (numSeconds * 1000.0); }
-double RelativeTime::inMinutes() const noexcept     { return numSeconds / 60.0; }
-double RelativeTime::inHours() const noexcept       { return numSeconds / (60.0 * 60.0); }
-double RelativeTime::inDays() const noexcept        { return numSeconds / (60.0 * 60.0 * 24.0); }
-double RelativeTime::inWeeks() const noexcept       { return numSeconds / (60.0 * 60.0 * 24.0 * 7.0); }
-
-//==============================================================================
-RelativeTime& RelativeTime::operator= (const RelativeTime& other) noexcept      { numSeconds = other.numSeconds; return *this; }
-
-RelativeTime RelativeTime::operator+= (RelativeTime t) noexcept     { numSeconds += t.numSeconds; return *this; }
-RelativeTime RelativeTime::operator-= (RelativeTime t) noexcept     { numSeconds -= t.numSeconds; return *this; }
-RelativeTime RelativeTime::operator+= (const double secs) noexcept  { numSeconds += secs; return *this; }
-RelativeTime RelativeTime::operator-= (const double secs) noexcept  { numSeconds -= secs; return *this; }
-
-RelativeTime operator+ (RelativeTime t1, RelativeTime t2) noexcept  { return t1 += t2; }
-RelativeTime operator- (RelativeTime t1, RelativeTime t2) noexcept  { return t1 -= t2; }
-
-bool operator== (RelativeTime t1, RelativeTime t2) noexcept       { return t1.inSeconds() == t2.inSeconds(); }
-bool operator!= (RelativeTime t1, RelativeTime t2) noexcept       { return t1.inSeconds() != t2.inSeconds(); }
-bool operator>  (RelativeTime t1, RelativeTime t2) noexcept       { return t1.inSeconds() >  t2.inSeconds(); }
-bool operator<  (RelativeTime t1, RelativeTime t2) noexcept       { return t1.inSeconds() <  t2.inSeconds(); }
-bool operator>= (RelativeTime t1, RelativeTime t2) noexcept       { return t1.inSeconds() >= t2.inSeconds(); }
-bool operator<= (RelativeTime t1, RelativeTime t2) noexcept       { return t1.inSeconds() <= t2.inSeconds(); }
-
-//==============================================================================
-static void translateTimeField (String& result, int n, const char* singular, const char* plural)
-{
-    result << TRANS (n == 1 ? singular : plural)
-                .replace (n == 1 ? "1" : "2", String (n))
-           << ' ';
-}
-
-String RelativeTime::getDescription (const String& returnValueForZeroTime) const
-{
-    if (numSeconds < 0.001 && numSeconds > -0.001)
-        return returnValueForZeroTime;
-
-    String result;
-    result.preallocateBytes (32);
-
-    if (numSeconds < 0)
-        result << '-';
-
-    int fieldsShown = 0;
-    int n = std::abs ((int) inWeeks());
-    if (n > 0)
-    {
-        translateTimeField (result, n, NEEDS_TRANS("1 week"), NEEDS_TRANS("2 weeks"));
-        ++fieldsShown;
-    }
-
-    n = std::abs ((int) inDays()) % 7;
-    if (n > 0)
-    {
-        translateTimeField (result, n, NEEDS_TRANS("1 day"), NEEDS_TRANS("2 days"));
-        ++fieldsShown;
-    }
-
-    if (fieldsShown < 2)
-    {
-        n = std::abs ((int) inHours()) % 24;
-        if (n > 0)
-        {
-            translateTimeField (result, n, NEEDS_TRANS("1 hr"), NEEDS_TRANS("2 hrs"));
-            ++fieldsShown;
-        }
-
-        if (fieldsShown < 2)
-        {
-            n = std::abs ((int) inMinutes()) % 60;
-            if (n > 0)
-            {
-                translateTimeField (result, n, NEEDS_TRANS("1 min"), NEEDS_TRANS("2 mins"));
-                ++fieldsShown;
-            }
-
-            if (fieldsShown < 2)
-            {
-                n = std::abs ((int) inSeconds()) % 60;
-                if (n > 0)
-                {
-                    translateTimeField (result, n, NEEDS_TRANS("1 sec"), NEEDS_TRANS("2 secs"));
-                    ++fieldsShown;
-                }
-
-                if (fieldsShown == 0)
-                {
-                    n = std::abs ((int) inMilliseconds()) % 1000;
-                    if (n > 0)
-                        result << n << ' ' << TRANS ("ms");
-                }
-            }
-        }
-    }
-
-    return result.trimEnd();
-}
\ No newline at end of file
diff --git a/modules/beast_core/xml/beast_XmlDocument.cpp b/modules/beast_core/xml/XmlDocument.cpp
similarity index 100%
rename from modules/beast_core/xml/beast_XmlDocument.cpp
rename to modules/beast_core/xml/XmlDocument.cpp
diff --git a/modules/beast_core/xml/beast_XmlDocument.h b/modules/beast_core/xml/XmlDocument.h
similarity index 100%
rename from modules/beast_core/xml/beast_XmlDocument.h
rename to modules/beast_core/xml/XmlDocument.h
diff --git a/modules/beast_core/xml/beast_XmlElement.cpp b/modules/beast_core/xml/XmlElement.cpp
similarity index 100%
rename from modules/beast_core/xml/beast_XmlElement.cpp
rename to modules/beast_core/xml/XmlElement.cpp
diff --git a/modules/beast_core/xml/beast_XmlElement.h b/modules/beast_core/xml/XmlElement.h
similarity index 100%
rename from modules/beast_core/xml/beast_XmlElement.h
rename to modules/beast_core/xml/XmlElement.h
diff --git a/modules/beast_core/zip/beast_GZIPCompressorOutputStream.cpp b/modules/beast_core/zip/GZIPCompressorOutputStream.cpp
similarity index 100%
rename from modules/beast_core/zip/beast_GZIPCompressorOutputStream.cpp
rename to modules/beast_core/zip/GZIPCompressorOutputStream.cpp
diff --git a/modules/beast_core/zip/beast_GZIPCompressorOutputStream.h b/modules/beast_core/zip/GZIPCompressorOutputStream.h
similarity index 100%
rename from modules/beast_core/zip/beast_GZIPCompressorOutputStream.h
rename to modules/beast_core/zip/GZIPCompressorOutputStream.h
diff --git a/modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp b/modules/beast_core/zip/GZIPDecompressorInputStream.cpp
similarity index 99%
rename from modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp
rename to modules/beast_core/zip/GZIPDecompressorInputStream.cpp
index bc70e9b43c..b044649714 100644
--- a/modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp
+++ b/modules/beast_core/zip/GZIPDecompressorInputStream.cpp
@@ -66,6 +66,10 @@ namespace zlibNamespace
   #undef Byte
   #undef fdopen
   #undef local
+  #undef Code
+  #undef Dad
+  #undef Len
+  #undef Freq
 
   #if BEAST_CLANG
    #pragma clang diagnostic pop
diff --git a/modules/beast_core/zip/beast_GZIPDecompressorInputStream.h b/modules/beast_core/zip/GZIPDecompressorInputStream.h
similarity index 100%
rename from modules/beast_core/zip/beast_GZIPDecompressorInputStream.h
rename to modules/beast_core/zip/GZIPDecompressorInputStream.h
diff --git a/modules/beast_core/zip/beast_ZipFile.cpp b/modules/beast_core/zip/ZipFile.cpp
similarity index 100%
rename from modules/beast_core/zip/beast_ZipFile.cpp
rename to modules/beast_core/zip/ZipFile.cpp
diff --git a/modules/beast_core/zip/beast_ZipFile.h b/modules/beast_core/zip/ZipFile.h
similarity index 100%
rename from modules/beast_core/zip/beast_ZipFile.h
rename to modules/beast_core/zip/ZipFile.h
diff --git a/modules/beast_crypto/beast_crypto.cpp b/modules/beast_crypto/beast_crypto.cpp
index a2408a38e3..f5ef3ad86f 100644
--- a/modules/beast_crypto/beast_crypto.cpp
+++ b/modules/beast_crypto/beast_crypto.cpp
@@ -24,6 +24,7 @@
 namespace beast
 {
 
-#include "math/beast_UnsignedInteger.cpp"
+#include "math/BinaryEncoding.cpp"
+#include "math/UnsignedInteger.cpp"
 
 }
diff --git a/modules/beast_crypto/beast_crypto.h b/modules/beast_crypto/beast_crypto.h
index af560a3351..4e9039bbcc 100644
--- a/modules/beast_crypto/beast_crypto.h
+++ b/modules/beast_crypto/beast_crypto.h
@@ -44,7 +44,9 @@
 namespace beast
 {
 
-#include "math/beast_UnsignedInteger.h"
+# include "math/UnsignedIntegerCalc.h"
+#include "math/UnsignedInteger.h"
+#include "math/BinaryEncoding.h"
 
 }
 
diff --git a/modules/beast_crypto/math/BinaryEncoding.cpp b/modules/beast_crypto/math/BinaryEncoding.cpp
new file mode 100644
index 0000000000..198a6b7b86
--- /dev/null
+++ b/modules/beast_crypto/math/BinaryEncoding.cpp
@@ -0,0 +1,395 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+/** Generic algorithms for base encoding and decoding. */
+class BinaryEncoding
+{
+public:
+    /** Concept: Conversion
+
+        X denotes a Conversion class, a is a value of type X,
+        i is an integral type.
+
+        Requirements:
+
+            Expression      Type            Notes/Contracts
+            -------------   -----------     ------------------
+            X a;
+            X::radix        size_type       constexpr
+            a.map (i)       char            maps base numeral to a char
+    */
+
+    /** Encode the unsigned integer into a string using the specified conversion. */
+    template <typename Conversion, std::size_t Bytes>
+    static std::string encode (UnsignedInteger <Bytes> v, Conversion c = Conversion ())
+    {
+        // bi is destroyed in this process
+        typename UnsignedInteger <Bytes>::CalcType bi (v.toCalcType ());
+        std::size_t const radix (Conversion::radix);
+        std::string s;
+        s.reserve (bi.size() * 3); // guess
+        while (bi.isNotZero ())
+        {
+            std::size_t const m (bi % radix);
+            bi /= radix;
+            s.push_back (c.map (m));
+        }
+        std::reverse (s.begin(), s.end());
+        return s;
+    }
+
+    /** Decode the string into an unsigned integer.
+        The size must match exactly
+        @return `true` on success.
+    */
+    template <typename Conversion, std::size_t Bytes>
+    static bool decode (UnsignedInteger <Bytes>& rv,
+        std::string const& s, Conversion c = Conversion ())
+    {
+        typename UnsignedInteger <Bytes>::CalcType bi (rv.toCalcType (false));
+        std::size_t const radix (Conversion::radix);
+        bi.clear ();
+        for (std::string::const_iterator iter (s.begin()); iter != s.end(); ++iter)
+        {
+            int const v (c.invert (*iter));
+            if (v == -1)
+                return false;
+            bi *= radix;
+            bi += v;
+        }
+        bi.toCanonical();
+        return true;
+    }
+};
+
+//------------------------------------------------------------------------------
+
+// Some common code
+template <class Conversion>
+class BaseConversion
+{
+public:
+    char map (std::size_t i) const
+    {
+        return Conversion::alphabet () [i];
+    }
+
+    int invert (char c) const
+    {
+        return Conversion::inverse_alphabet () [c];
+    }
+
+    static std::vector <int> const& inverse_alphabet ()
+    {
+        static std::vector <int> t (invert (Conversion::alphabet(), Conversion::radix));
+        return t;
+    }
+
+    /** Build the inverse mapping table from characters to digits. */
+    static std::vector <int> invert (std::string const& alphabet, std::size_t radix)
+    {
+        std::vector <int> table (256, -1);
+        for (std::size_t i (0); i < radix; ++i)
+            table [alphabet [i]] = i;
+        return table;
+    }
+
+};
+
+//------------------------------------------------------------------------------
+
+/** Foolproof hexadecimal encoding and decoding facility.
+    This is to check the correctness of the more complex converters.
+*/
+class HexEncoding
+{
+public:
+    template <std::size_t Bytes>
+    static std::string encode (UnsignedInteger <Bytes> const& v)
+    {
+        std::string s;
+        uint8 const* src (v.cbegin()-1);
+        char const* const tab (alphabet().c_str());
+        s.reserve (Bytes * 2);
+        for (std::size_t bytes (v.size);bytes--;)
+        {
+            uint8 const v (*++src);
+            s.push_back (tab [v>>4]);
+            s.push_back (tab [v&0x0f]);
+        }
+        return s;
+    }
+
+    template <std::size_t Bytes>
+    static bool decode (UnsignedInteger <Bytes>& rv,
+        std::string const& s)
+    {
+        // can't have an odd size
+        if (s.size() & 1)
+            return false;
+        uint8* dest (rv.begin()-1);
+        int const* const tab (&inverse_alphabet().front());
+        for (std::string::const_iterator iter (s.begin()); iter != s.end();)
+        {
+            int const n1 (tab [*iter++]);
+            if (n1 == -1)
+                return false;
+            int const n2 (tab [*iter++]);
+            if (n2 == -1)
+                return false;
+            *++dest = ((uint8)((n1<<4)|n2));
+        }
+        return true;
+    }
+
+    static std::string const& alphabet ()
+    {
+        static std::string s ("0123456789ABCDEF");
+        return s;
+    }
+
+    static std::vector <int> const& inverse_alphabet ()
+    {
+        static std::vector <int> s (invert (alphabet(), 16));
+        return s;
+    }
+
+    /** Build the inverse mapping table from characters to digits. */
+    static std::vector <int> invert (std::string const& alphabet, std::size_t radix)
+    {
+        std::vector <int> table (256, -1);
+        for (std::size_t i (0); i < radix; ++i)
+            table [alphabet [i]] = i;
+        return table;
+    }
+};
+
+//------------------------------------------------------------------------------
+
+/** Base58 conversion used by Bitcoin. */
+class BitcoinBase58Conversion : public BaseConversion <BitcoinBase58Conversion>
+{
+public:
+    static std::size_t const radix = 58;
+
+    char const* name () const
+    {
+        return "BitcoinBase58";
+    }
+
+    static std::string const& alphabet ()
+    {
+        static std::string s (
+            "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
+        );
+        return s;
+    }
+};
+
+//------------------------------------------------------------------------------
+
+/** Base58 conversion used by Ripple. */
+class RippleBase58Conversion : public BaseConversion <RippleBase58Conversion>
+{
+public:
+    static std::size_t const radix = 58;
+
+    char const* name () const
+    {
+        return "RippleBase58";
+    }
+
+    static std::string const& alphabet ()
+    {
+        static std::string s (
+            "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz"
+        );
+        return s;
+    }
+};
+
+//------------------------------------------------------------------------------
+
+class Base64Conversion : public BaseConversion <Base64Conversion>
+{
+public:
+    static std::size_t const radix = 64;
+
+    char const* name () const
+    {
+        return "Base64";
+    }
+
+    static std::string const& alphabet ()
+    {
+        static std::string s (
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+        );
+        return s;
+    }
+};
+
+//------------------------------------------------------------------------------
+
+class Base16Conversion : public BaseConversion <Base16Conversion>
+{
+public:
+    static std::size_t const radix = 16;
+
+    char const* name () const
+    {
+        return "Hex";
+    }
+
+    static std::string const& alphabet ()
+    {
+        static std::string s (
+            "0123456789ABCDEF"
+        );
+        return s;
+    }
+};
+
+//------------------------------------------------------------------------------
+
+class BinaryEncodingTests : public UnitTest
+{
+public:
+    // This is a baseline for the other tests
+    template <std::size_t Bytes>
+    void testBase16 ()
+    {
+        beginTestCase ("base16");
+        for (int i = 0; i < 50; ++i)
+        {
+            typedef UnsignedInteger <Bytes> UInt;
+            UInt v0;
+            random().fillBitsRandomly (v0.begin(), UInt::size);
+            std::string const good (HexEncoding::encode (v0));
+
+            UInt v1;
+            bool const success (HexEncoding::decode (v1, good));
+            if (expect (success))
+            {
+                expect (v0 == v1);
+
+                Base16Conversion c;
+                std::string const check (BinaryEncoding::encode (v0, c));
+                if (! expect (good == check))
+                    logMessage (String ("expected ") + good + " but got " + check);
+            }
+        }
+    }
+
+    template <std::size_t Bytes>
+    void testBase64Bytes (
+        std::string const& vin, std::string const& vout,
+        Base64Conversion c = Base64Conversion ())
+    {
+        typedef UnsignedInteger <Bytes> UInt;
+        UInt v1 (vin.c_str());
+        std::string const s1 (BinaryEncoding::encode (v1, c));
+        logMessage (vout + " to " + s1);
+        expect (vout == s1);
+
+        UInt v2;
+        bool const success (BinaryEncoding::decode (v2, vout, c));
+        if (expect (success))
+        {
+            std::string const s2 (BinaryEncoding::encode (v2, c));
+            logMessage (vin + " to " + s2);
+            //expect (vin == v2);
+        }
+    }
+
+    void testBase64 ()
+    {
+        beginTestCase ("Base64");
+
+        // input (uint)
+        std::string const vin [] = {
+            "","f","fo","foo","foob","fooba","foobar"
+        };
+
+        // output (encoded string)
+        std::string const vout [] = {
+            "","Zg==","Zm8=","Zm9v","Zm9vYg==","Zm9vYmE=","Zm9vYmFy"
+        };
+
+        //testBase64Bytes <0> (vin [0], vout [0]);
+        testBase64Bytes <1> (vin [1], vout [1]);
+        testBase64Bytes <2> (vin [2], vout [2]);
+        testBase64Bytes <3> (vin [3], vout [3]);
+        testBase64Bytes <4> (vin [4], vout [4]);
+        testBase64Bytes <5> (vin [5], vout [5]);
+        testBase64Bytes <6> (vin [6], vout [6]);
+    }
+
+    template <typename Conversion, std::size_t Bytes>
+    void testEncode (Conversion c = Conversion())
+    {
+        typedef UnsignedInteger <Bytes> UInt;
+
+        beginTestCase (String (c.name()) + " <" + String::fromNumber (Bytes) + ">");
+
+        for (int i = 0; i < 50; ++i)
+        {
+            UInt v1;
+            random().fillBitsRandomly (v1.begin(), UInt::size);
+            std::string const s1 (BinaryEncoding::encode (v1, c));
+
+            UInt v2;
+            bool success (BinaryEncoding::decode (v2, s1, c));
+            if (expect (success))
+                expect (v1 == v2);
+        }
+    }
+
+    void runTest ()
+    {
+        testBase16 <10> ();
+
+#if 0
+        testEncode <Base16Conversion, 1>  ();
+        testEncode <Base16Conversion, 2>  ();
+        testEncode <Base16Conversion, 3>  ();
+        testEncode <Base16Conversion, 4>  ();
+        testEncode <Base16Conversion, 5>  ();
+        testEncode <Base16Conversion, 6>  ();
+        testEncode <Base16Conversion, 7>  ();
+        testEncode <Base16Conversion, 8>  ();
+        testEncode <Base16Conversion, 9>  ();
+        testEncode <Base16Conversion, 10> ();
+
+        testBase64 ();
+        testEncode <Base64Conversion, 20> ();
+        testEncode <Base64Conversion, 33> ();
+        testEncode <RippleBase58Conversion, 20> ();
+        testEncode <RippleBase58Conversion, 33> ();
+        testEncode <BitcoinBase58Conversion, 20> ();
+        testEncode <BitcoinBase58Conversion, 33> ();
+#endif
+    }
+
+    BinaryEncodingTests () : UnitTest ("BinaryEncoding", "beast", runManual)
+    {
+    }
+};
+
+static BinaryEncodingTests BinaryEncodingTests;
diff --git a/modules/beast_crypto/math/BinaryEncoding.h b/modules/beast_crypto/math/BinaryEncoding.h
new file mode 100644
index 0000000000..d93691e4a7
--- /dev/null
+++ b/modules/beast_crypto/math/BinaryEncoding.h
@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CRYPTO_BINARYENCODING_H_INCLUDED
+#define BEAST_CRYPTO_BINARYENCODING_H_INCLUDED
+
+
+#endif
diff --git a/modules/beast_crypto/math/UnsignedInteger.cpp b/modules/beast_crypto/math/UnsignedInteger.cpp
new file mode 100644
index 0000000000..40b079d061
--- /dev/null
+++ b/modules/beast_crypto/math/UnsignedInteger.cpp
@@ -0,0 +1,396 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+//------------------------------------------------------------------------------
+
+/*  Copyright (c) 2013 the authors listed at the following URL, and/or
+    the authors of referenced articles or incorporated external code:
+    http://en.literateprograms.org/Arbitrary-precision_integer_arithmetic_(C)?action=history&offset=20100923155004
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Retrieved from: http://en.literateprograms.org/Arbitrary-precision_integer_arithmetic_(C)?oldid=16902
+*/
+
+namespace multiprecsion
+{
+
+#if 0
+//------------------------------------------------------------------------------
+
+typedef unsigned short component_t;
+typedef unsigned long double_component_t;
+
+#define MAX_COMPONENT  ((component_t)(-1))
+#define COMPONENT_BITS  (sizeof(component_t)*CHAR_BIT)
+
+#define LOG_2_10    3.3219280948873623478703194294894
+
+#define MIN(x,y)  ((x)<(y) ? (x) : (y))
+#define MAX(x,y)  ((x)>(y) ? (x) : (y))
+
+typedef struct {
+    component_t* c;    /* least-significant word first */
+    int num_components;
+} integer;
+
+
+integer create_integer(int components);
+void free_integer(integer i);
+void set_zero_integer(integer i);
+void copy_integer(integer source, integer target);
+void add_integer(integer left, integer right, integer result);
+void subtract_integer(integer left, integer right, integer result);
+void multiply_small_integer(integer left, component_t right, integer result);
+void multiply_integer(integer left, integer right, integer result);
+int compare_integers(integer left, integer right);
+void shift_left_one_integer(integer arg);
+void shift_right_one_integer(integer arg);
+component_t mod_small_integer(integer left, component_t right);
+void mod_integer(integer left, integer right, integer result);
+void divide_small_integer(integer left, component_t right, integer result);
+integer string_to_integer(char* s);
+char* integer_to_string(integer x);
+int is_zero_integer(integer x);
+
+//------------------------------------------------------------------------------
+
+integer create_integer(int components) {
+    integer result;
+    result.num_components = components;
+    result.c = (component_t*)malloc(sizeof(component_t)*components);
+    return result;
+}
+
+
+void free_integer(integer i) {
+    free(i.c);
+}
+
+
+void set_zero_integer(integer i) {
+    memset(i.c, 0, sizeof(component_t)*i.num_components);
+}
+
+
+int is_zero_integer(integer x) {
+    int i;
+    for(i=0; i < x.num_components; i++) {
+        if (x.c[i] != 0) return 0;
+    }
+    return 1;
+}
+
+void copy_integer(integer source, integer target) {
+    memmove(target.c, source.c,
+            sizeof(component_t)*MIN(source.num_components, target.num_components));
+    if (target.num_components > source.num_components) {
+        memset(target.c + source.num_components, 0,
+               sizeof(component_t)*(target.num_components - source.num_components));
+    }
+}
+
+void add_integer(integer left, integer right, integer result) {
+    double_component_t carry = 0;
+    int i;
+    for(i=0; i<left.num_components || i<right.num_components || carry != 0; i++) {
+        double_component_t partial_sum = carry;
+        carry = 0;
+        if (i < left.num_components)  partial_sum += left.c[i];
+        if (i < right.num_components) partial_sum += right.c[i];
+        if (partial_sum > MAX_COMPONENT) {
+            partial_sum &= MAX_COMPONENT;
+            carry = 1;
+        }
+        result.c[i] = (component_t)partial_sum;
+    }
+    for ( ; i < result.num_components; i++) { result.c[i] = 0; }
+}
+
+void subtract_integer(integer left, integer right, integer result) {
+    int borrow = 0;
+    int i;
+    for(i=0; i<left.num_components; i++) {
+        double_component_t lhs = left.c[i];
+        double_component_t rhs = (i < right.num_components) ? right.c[i] : 0;
+        if (borrow) {
+	    if (lhs <= rhs) {
+	        /* leave borrow set to 1 */
+	        lhs += (MAX_COMPONENT + 1) - 1;
+	    } else {
+	        borrow = 0;
+	        lhs--;
+	    }
+	}
+        if (lhs < rhs) {
+            borrow = 1;
+            lhs += MAX_COMPONENT + 1;
+        }
+        result.c[i] = lhs - rhs;
+    }
+    for ( ; i < result.num_components; i++) { result.c[i] = 0; }
+}
+
+void multiply_small_integer(integer left, component_t right, integer result) {
+    double_component_t carry = 0;
+    int i;
+    for(i=0; i<left.num_components || carry != 0; i++) {
+        double_component_t partial_sum = carry;
+        carry = 0;
+        if (i < left.num_components)  partial_sum += left.c[i]*right;
+        carry = partial_sum >> COMPONENT_BITS;
+        result.c[i] = (component_t)(partial_sum & MAX_COMPONENT);
+    }
+    for ( ; i < result.num_components; i++) { result.c[i] = 0; }
+}
+
+void multiply_integer(integer left, integer right, integer result) {
+    int i, lidx, ridx;
+    double_component_t carry = 0;
+    int max_size_no_carry;
+    int left_max_component  = left.num_components - 1;
+    int right_max_component = right.num_components - 1;
+    while(left.c[left_max_component]   == 0) left_max_component--;
+    while(right.c[right_max_component] == 0) right_max_component--;
+    max_size_no_carry = left_max_component + right_max_component;
+    for(i=0; i <= max_size_no_carry || carry != 0; i++) {
+        double_component_t partial_sum = carry;
+        carry = 0;
+        lidx = MIN(i, left_max_component);
+        ridx = i - lidx;
+        while(lidx >= 0 && ridx <= right_max_component) {
+            partial_sum += ((double_component_t)left.c[lidx])*right.c[ridx];
+            carry += partial_sum >> COMPONENT_BITS;
+            partial_sum &= MAX_COMPONENT;
+            lidx--; ridx++;
+        }
+        result.c[i] = partial_sum;
+    }
+    for ( ; i < result.num_components; i++) { result.c[i] = 0; }
+}
+
+int compare_integers(integer left, integer right) {
+    int i = MAX(left.num_components - 1, right.num_components - 1);
+    for ( ; i >= 0; i--) {
+        component_t left_comp =
+            (i < left.num_components) ? left.c[i] : 0;
+        component_t right_comp =
+            (i < right.num_components) ? right.c[i] : 0;
+        if (left_comp < right_comp)
+            return -1;
+        else if (left_comp > right_comp)
+            return  1;
+    }
+    return 0;
+}
+
+void shift_left_one_integer(integer arg) {
+    int i;
+    arg.c[arg.num_components - 1] <<= 1;
+    for (i = arg.num_components - 2; i >= 0; i--) {
+        arg.c[i + 1] |= arg.c[i] >> (COMPONENT_BITS - 1);
+        arg.c[i] <<= 1;
+    }
+}
+
+void shift_right_one_integer(integer arg) {
+    int i;
+    arg.c[0] >>= 1;
+    for (i = 1; i < arg.num_components; i++) {
+        arg.c[i - 1] |= (arg.c[i] & 1) << (COMPONENT_BITS - 1);
+        arg.c[i] >>= 1;
+    }
+}
+
+component_t mod_small_integer(integer left, component_t right) {
+    double_component_t mod_two_power = 1;
+    double_component_t result = 0;
+    int i, bit;
+    for(i=0; i<left.num_components; i++) {
+        for(bit=0; bit<COMPONENT_BITS; bit++) {
+            if ((left.c[i] & (1 << bit)) != 0) {
+                result += mod_two_power;
+                if (result >= right) {
+                    result -= right;
+                }
+            }
+            mod_two_power <<= 1;
+            if (mod_two_power >= right) {
+                mod_two_power -= right;
+            }
+        }
+    }
+    return (component_t)result;
+}
+
+void mod_integer(integer left, integer right, integer result) {
+    integer mod_two_power = create_integer(right.num_components + 1);
+    int i, bit;
+    set_zero_integer(result);
+    set_zero_integer(mod_two_power);
+    mod_two_power.c[0] = 1;
+    for(i=0; i<left.num_components; i++) {
+        for(bit=0; bit<COMPONENT_BITS; bit++) {
+            if ((left.c[i] & (1 << bit)) != 0) {
+                add_integer(result, mod_two_power, result);
+                if (compare_integers(result, right) >= 0) {
+                    subtract_integer(result, right, result);
+                }
+            }
+            shift_left_one_integer(mod_two_power);
+            if (compare_integers(mod_two_power, right) >= 0) {
+                subtract_integer(mod_two_power, right, mod_two_power);
+            }
+        }
+    }
+    free_integer(mod_two_power);
+}
+
+void divide_small_integer(integer left, component_t right, integer result) {
+    double_component_t dividend = 0;
+    int i;
+    for (i = left.num_components - 1; i >= 0; i--) {
+        dividend |= left.c[i];
+        result.c[i] = dividend/right;
+        dividend = (dividend % right) << COMPONENT_BITS;
+    }
+}
+
+integer string_to_integer(char* s) {
+    integer result = create_integer((int)ceil(LOG_2_10*strlen(s)/COMPONENT_BITS));
+    set_zero_integer(result);
+    integer digit = create_integer(1);
+    int i;
+    for (i = 0; s[i] != '\0'; i++) {
+        multiply_small_integer(result, 10, result);
+        digit.c[0] = s[i] - '0';
+        add_integer(result, digit, result);
+    }
+    free_integer(digit);
+    return result;
+}
+
+
+char* integer_to_string(integer x) {
+    int i, result_len;
+    char* result =
+        (char*)malloc((int)ceil(COMPONENT_BITS*x.num_components/LOG_2_10) + 2);
+    integer ten = create_integer(1);
+    ten.c[0] = 10;
+
+    if (is_zero_integer(x)) {
+        strcpy(result, "0");
+    } else {
+        for (i = 0; !is_zero_integer(x); i++) {
+            result[i] = (char)mod_small_integer(x, 10) + '0';
+            divide_small_integer(x, 10, x);
+        }
+        result[i] = '\0';
+    }
+
+    result_len = strlen(result);
+    for(i=0; i < result_len/2; i++) {
+        char temp = result[i];
+        result[i] = result[result_len - i - 1];
+        result[result_len - i - 1] = temp;
+    }
+
+    free_integer(ten);
+    return result;
+}
+
+#endif
+
+}
+
+//------------------------------------------------------------------------------
+
+class UnsignedIntegerTests : public UnitTest
+{
+public:
+    UnsignedIntegerTests () : UnitTest ("UnsignedInteger", "beast")
+    {
+    }
+
+    template <unsigned int Bytes>
+    void runTest ()
+    {
+        typedef UnsignedInteger <Bytes> UInt;
+
+        String s;
+
+        s << "Bytes=" << String(Bytes);
+
+        beginTestCase (s);
+
+        UInt zero;
+        zero.fill (0);
+        expect (zero.isZero (), "should be zero");
+        expect (! zero.isNotZero (), "sould not be non-zero");
+
+        UInt one (UInt::createFromInteger (1U));
+        expect (one == UInt::createFromInteger (1U), "should be equal");
+
+        expect (! one.isZero (), "should not be zero");
+        expect (one.isNotZero (), "sould be non-zero");
+
+        expect (zero < one, "should be less");
+        expect (one > zero, "should be greater");
+        expect (zero >= zero, "should be less than or equal");
+        expect (one <= one, "should be less than or equal");
+
+        expect (zero == zero, "should be equal");
+        expect (zero != one, "should not be equal");
+
+        expect (zero == UInt::createFromInteger (0U), "should be zero");
+        expect (one  == UInt::createFromInteger (1U), "should be one");
+        expect (one  != UInt::createFromInteger (2U), "should not be two");
+
+        UInt largest = UInt::createFilled (0xff);
+
+        expect (largest > zero && largest > one, "should be greater");
+    }
+
+    void runTest()
+    {
+        runTest <16> ();
+        runTest <33> ();
+    }
+
+private:
+};
+
+static UnsignedIntegerTests unsignedIntegerTests;
diff --git a/modules/beast_crypto/math/UnsignedInteger.h b/modules/beast_crypto/math/UnsignedInteger.h
new file mode 100644
index 0000000000..7756d584fe
--- /dev/null
+++ b/modules/beast_crypto/math/UnsignedInteger.h
@@ -0,0 +1,299 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CRYPTO_UNSIGNEDINTEGER_H_INCLUDED
+#define BEAST_CRYPTO_UNSIGNEDINTEGER_H_INCLUDED
+
+/** Represents a set of bits of fixed size.
+
+    The data is stored in "canonical" format which is network (big endian)
+    byte order, most significant byte first.
+
+    In this implementation the pointer to the beginning of the canonical format
+    may not be aligned.
+*/
+template <std::size_t Bytes>
+class UnsignedInteger : public SafeBool <UnsignedInteger <Bytes> > 
+{
+public:
+    /** Constant for determining the number of bytes. */
+    static std::size_t const size = Bytes;
+
+    // The underlying integer type we use when converting to calculation format.
+    typedef uint32             IntCalcType;
+
+    // The type of object resulting from a conversion to calculation format.
+    typedef UnsignedIntegerCalc <IntCalcType> CalcType;
+
+    // Standard container compatibility
+    typedef uint8              value_type;
+    typedef value_type*        iterator;
+    typedef value_type const*  const_iterator;
+
+    /** Hardened hash function for use with hash based containers.
+        The seed is used to make the hash unpredictable. This prevents
+        attackers from exploiting crafted inputs to produce degenerate
+        containers.
+    */
+    class hasher
+    {
+    public:
+        /** Construct a hash function
+            If a seed is specified it will be used, else a random seed
+            will be generated from the system
+            @param seedToUse An optional seed to use.
+        */
+        explicit hasher (std::size_t seedToUse = Random::getSystemRandom ().nextInt ())
+            : m_seed (seedToUse)
+        {
+        }
+
+        /** Generates a simple hash from an UnsignedInteger. */
+        std::size_t operator() (UnsignedInteger const& key) const
+        {
+            std::size_t hash;
+            Murmur::Hash (key.cbegin (), key.size, m_seed, &hash);
+            return hash;
+        }
+
+    private:
+        std::size_t m_seed;
+    };
+
+    /** Determins if two UnsignedInteger objects are equal. */
+    class equal
+    {
+    public:
+        bool operator() (UnsignedInteger const& lhs, UnsignedInteger const& rhs) const
+        {
+            return lhs.compare (rhs) == 0;
+        }
+    };
+
+    //--------------------------------------------------------------------------
+
+    /** Construct the object.
+        The values are uninitialized.
+    */
+    UnsignedInteger ()
+    {
+    }
+
+    /** Construct a copy. */
+    UnsignedInteger (UnsignedInteger const& other)
+    {
+        this->operator= (other);
+    }
+
+    /** Construct from a raw memory.
+        The area pointed to by buffer must be at least Bytes in size,
+        or else undefined behavior will result.
+    */
+    /** @{ */
+    explicit UnsignedInteger (void const* buf)
+    {
+        m_values [0] = 0; // clear any pad bytes
+        std::memcpy (begin(), buf, Bytes);
+    }
+
+    template <typename InputIt>
+    UnsignedInteger (InputIt first, InputIt last)
+    {
+        m_values [0] = 0; // clear any pad bytes
+        check_precondition (std::distance (first, last) == size);
+        std::copy (first, last, begin());
+    }
+    /** @} */
+
+    /** Assign from another UnsignedInteger. */
+    UnsignedInteger& operator= (UnsignedInteger const& other)
+    {
+        // Perform an aligned, all inclusive copy that includes padding.
+        std::copy (other.m_values, other.m_values + CalcCount, m_values);
+        return *this;
+    }
+
+    /** Create from an integer type.
+        @invariant IntegerType must be an unsigned integer type.
+    */
+    template <class UnsignedIntegralType>
+    static UnsignedInteger createFromInteger (UnsignedIntegralType value)
+    {
+        static_bassert (Bytes >= sizeof (UnsignedIntegralType));
+        UnsignedInteger <Bytes> result;
+        value = toNetworkByteOrder <UnsignedIntegralType> (value);
+        result.clear ();
+        std::memcpy (result.end () - sizeof (value), &value, bmin (Bytes, sizeof (value)));
+        return result;
+    }
+
+    /** Construct with a filled value. */
+    static UnsignedInteger createFilled (value_type value)
+    {
+        UnsignedInteger result;
+        result.fill (value);
+        return result;
+    }
+
+    /** Fill with a particular byte value. */
+    void fill (value_type value)
+    {
+        IntCalcType c;
+        memset (&c, value, sizeof (c));
+        std::fill (m_values, m_values + CalcCount, c);
+    }
+
+    /** Clear the contents to zero. */
+    void clear ()
+    {
+        std::fill (m_values, m_values + CalcCount, 0);
+    }
+
+    /** Convert to calculation format. */
+    CalcType toCalcType (bool convert = true)
+    {
+        return CalcType::fromCanonical (m_values, Bytes, convert);
+    }
+
+    /** Determine if all bits are zero. */
+    bool isZero () const
+    {
+        for (int i = 0; i < CalcCount; ++i)
+        {
+            if (m_values [i] != 0)
+                return false;
+        }
+
+        return true;
+    }
+
+    /** Determine if any bit is non-zero. */
+    bool isNotZero () const
+    {
+        return ! isZero ();
+    }
+
+    /** Support conversion to `bool`.
+        @return `true` if any bit is non-zero.
+        @see SafeBool
+    */
+    bool asBoolean () const
+    {
+        return isNotZero ();
+    }
+
+    /** Get an iterator to the beginning. */
+    iterator begin ()
+    {
+        return get();
+    }
+
+    /** Get an iterator to past-the-end. */
+    iterator end ()
+    {
+        return get()+Bytes;
+    }
+
+    /** Get a const iterator to the beginning. */
+    const_iterator begin () const
+    {
+        return get();
+    }
+
+    /** Get a const iterator to past-the-end. */
+    const_iterator end () const
+    {
+        return get()+Bytes;
+    }
+
+    /** Get a const iterator to the beginning. */
+    const_iterator cbegin () const
+    {
+        return get();
+    }
+
+    /** Get a const iterator to past-the-end. */
+    const_iterator cend () const
+    {
+        return get()+Bytes;
+    }
+
+    /** Compare two objects of equal size.
+        The comparison is performed using a numeric lexicographical comparison.
+    */
+    int compare (UnsignedInteger const& other) const
+    {
+        return memcmp (cbegin (), other.cbegin (), Bytes);
+    }
+
+    /** Determine equality. */
+    bool operator== (UnsignedInteger const& other) const
+    {
+        return compare (other) == 0;
+    }
+
+    /** Determine inequality. */
+    bool operator!= (UnsignedInteger const& other) const
+    {
+        return compare (other) != 0;
+    }
+
+    /** Ordered comparison. */
+    bool operator< (UnsignedInteger const& other) const
+    {
+        return compare (other) < 0;
+    }
+
+    /** Ordered comparison. */
+    bool operator<= (UnsignedInteger const& other) const
+    {
+        return compare (other) <= 0;
+    }
+
+    /** Ordered comparison. */
+    bool operator> (UnsignedInteger const& other) const
+    {
+        return compare (other) > 0;
+    }
+
+    /** Ordered comparison. */
+    bool operator>= (UnsignedInteger const& other) const
+    {
+        return compare (other) >= 0;
+    }
+
+private:
+    static std::size_t const CalcCount = (Bytes + sizeof (IntCalcType) - 1) / sizeof (IntCalcType);
+
+    value_type* get ()
+    {
+        return (reinterpret_cast <value_type*> (&m_values [0])) +
+            ((sizeof(IntCalcType)-(Bytes&(sizeof(IntCalcType)-1)))&(sizeof(IntCalcType)-1));
+    }
+
+    value_type const* get () const
+    {
+        return (reinterpret_cast <value_type const*> (&m_values [0])) +
+            ((sizeof(IntCalcType)-(Bytes&(sizeof(IntCalcType)-1)))&(sizeof(IntCalcType)-1));
+    }
+
+    IntCalcType m_values [CalcCount];
+};
+
+#endif
diff --git a/modules/beast_crypto/math/UnsignedIntegerCalc.h b/modules/beast_crypto/math/UnsignedIntegerCalc.h
new file mode 100644
index 0000000000..5bb7f0f4f6
--- /dev/null
+++ b/modules/beast_crypto/math/UnsignedIntegerCalc.h
@@ -0,0 +1,430 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CRYPTO_UNSIGNEDINTEGERCALC_H_INCLUDED
+#define BEAST_CRYPTO_UNSIGNEDINTEGERCALC_H_INCLUDED
+
+namespace detail
+{
+
+template <typename UInt>
+struct DoubleWidthUInt;
+
+template <>
+struct DoubleWidthUInt <uint16>
+{
+    typedef uint32 type;
+};
+
+template <>
+struct DoubleWidthUInt <uint32>
+{
+    typedef uint64 type;
+};
+
+}
+
+/** Multiprecision unsigned integer suitable for calculations.
+
+    The data is stored in "calculation" format, which means it can be
+    readily used for performing calculations, but no raw access to the
+    bytes are provided. To transmit a serialized unsigned integer or
+    perform base encodings, it must be converted back into UnsignedInteger.
+    The number is represented as a series of native UInt unsigned integer
+    types, in order of increasing significance.
+
+    This is a lightweight object, storage and ownership of the underlying
+    data buffer is an external responsibility. The makes the class cheap to
+    copy and pass by value.
+
+    A consequence of this ownership model is that arithmetics operators
+    which return results by value cannot be included in the interface.
+*/
+template <typename UInt>
+class UnsignedIntegerCalc : public SafeBool <UnsignedIntegerCalc <UInt> >
+{
+public:
+    typedef typename detail::DoubleWidthUInt <UInt>::type UIntBig;
+
+    typedef std::size_t     size_type;
+
+    static UInt const       maxUInt = ((UInt)(-1));
+    static size_type const  numBits = (sizeof(UInt)*8);
+
+    //--------------------------------------------------------------------------
+
+    /** Construct an empty integer / zero bits. */
+    UnsignedIntegerCalc ()
+        : m_size (0)
+        , m_values (nullptr)
+    {
+    }
+
+    /** Construct a reference to an existing buffer. */
+    UnsignedIntegerCalc (UnsignedIntegerCalc const& other)
+        : m_size (other.m_size)
+        , m_values (other.m_values)
+    {
+    }
+
+    /** Construct from an existing array of values.
+        The existing data must already be in the "calculation" format.
+    */
+    UnsignedIntegerCalc (size_type count, UInt* values)
+        : m_size (count)
+        , m_values (values)
+    {
+    }
+
+    /** Convert to calculation format from canonical format.
+        This overwrites the callers memory without transferring ownership.
+        Canonical format is defined as a big endian byte oriented
+        multiprecision integer format. The buffer should point to the
+        beginning of the storage area and not the beginning of the canonical
+        data. Bytes is the desired canonical bytes.
+    */
+    static UnsignedIntegerCalc fromCanonical (
+        void* buffer, size_type const bytes, bool swizzle = true)
+    {
+        UInt* const values (reinterpret_cast <UInt*> (buffer));
+        size_type const count ((bytes + sizeof (UInt) - 1) / sizeof (UInt));
+        if (swizzle)
+        {
+            // Zero fill the possibly uninitialized pad bytes
+            memset (buffer, 0,
+                ((sizeof(UInt)-(bytes&(sizeof(UInt)-1)))&(sizeof(UInt)-1)));
+            // Swap and swizzle
+            UInt* lo (values);
+            UInt* hi (values + count - 1);
+            while (lo < hi)
+            {
+                std::swap (*lo, *hi);
+                *lo = fromNetworkByteOrder <UInt> (*lo);
+                ++lo;
+                *hi = fromNetworkByteOrder <UInt> (*hi);
+                ++hi;
+            }
+            if (lo == hi)
+                *lo = fromNetworkByteOrder <UInt> (*lo);
+        }
+        return UnsignedIntegerCalc (count, values);
+    }
+
+    /** Convert the buffer back into canonical format.
+        Since ownership was never transferred, the caller's data is
+        restored to its original format. Typically this will be done
+        as the last step of a series of operations.
+    */
+    void toCanonical ()
+    {
+        // Swap and swizzle
+        UInt* lo (m_values);
+        UInt* hi (m_values + m_size - 1);
+        while (lo < hi)
+        {
+            std::swap (*lo, *hi);
+            *lo = toNetworkByteOrder <UInt> (*lo); ++lo;
+            *hi = toNetworkByteOrder <UInt> (*hi); --hi;
+        }
+        if (lo == hi)
+            *lo = toNetworkByteOrder <UInt> (*lo);
+    }
+
+    /** Assign a value from another integer.
+        @note This does not transfer the reference to the buffer, it
+              copies the values from one buffer to the other.
+    */
+    UnsignedIntegerCalc& operator= (UnsignedIntegerCalc const& other)
+    {
+        bassert (other.size() <= size());
+        size_type n (size());
+        UInt* dest (m_values + size());
+        for (; n-- > other.size();)
+            *--dest = 0;
+        UInt const* rhs (other.m_values + n);
+        for (; n--;)
+            *--dest = *--rhs;
+        return *this;
+    }
+
+    /** Returns `true` if this represents the number zero. */
+    bool isZero () const
+    {
+        for (size_type n (size()); n--;)
+            if (m_values [n] != 0)
+                return false;
+        return true;
+    }
+
+    /** Returns `true` if this represents any number other than zero. */
+    bool isNotZero () const
+    {
+        return ! isZero ();
+    }
+
+    /** Safe conversion to `bool`, `true` means a non-zero value. */
+    bool asBoolean () const
+    {
+        return isNotZero ();
+    }
+
+    /** Returns `true` if the buffer has 0 values. */
+    bool empty () const
+    {
+        return m_size == 0;
+    }
+
+    /** Returns the size of the buffer, in values. */
+    size_type size () const
+    {
+        return m_size;
+    }
+
+    /** Safe array indexing to arbitrary positions.
+        If the index is out of range, zero is returned.
+    */
+    UInt operator[] (size_type n) const
+    {
+        if (n >= 0 && n < size())
+            return m_values [n];
+        return 0;
+    }
+
+    /** Universal comparison.
+        The comparison is performed numerically.
+        The return values have the same meaning as memcmp().
+    */
+    int compare (UnsignedIntegerCalc const& other) const
+    {
+        if (size() == 0)
+        {
+            if (other.size() == 0)
+                return 0;
+            return  -1;
+        }
+        else if (other.size() == 0)
+        {
+            return 1;
+        }
+
+        for (size_type n (std::max (size(), other.size())); n--;)
+        {
+            UInt lhs ((*this)[n]);
+            UInt rhs (other[n]);
+            if (lhs < rhs)
+                return -1;
+            else if (lhs > rhs)
+                return 1;
+        }
+
+        return 0;
+    }
+
+    /** Determine equality. */
+    bool operator== (UnsignedIntegerCalc const& other) const
+    {
+        return compare (other) == 0;
+    }
+
+    /** Determine inequality. */
+    bool operator!= (UnsignedIntegerCalc const& other) const
+    {
+        return compare (other) != 0;
+    }
+
+    /** Ordered comparison. */
+    bool operator< (UnsignedIntegerCalc const& other) const
+    {
+        return compare (other) < 0;
+    }
+
+    /** Ordered comparison. */
+    bool operator<= (UnsignedIntegerCalc const& other) const
+    {
+        return compare (other) <= 0;
+    }
+
+    /** Ordered comparison. */
+    bool operator> (UnsignedIntegerCalc const& other) const
+    {
+        return compare (other) > 0;
+    }
+
+    /** Ordered comparison. */
+    bool operator>= (UnsignedIntegerCalc const& other) const
+    {
+        return compare (other) >= 0;
+    }
+
+    /** Assign zero. */
+    void clear ()
+    {
+        UInt* dest (m_values - 1);
+        for (size_type n (size()); n--;)
+            *++dest = 0;
+    }
+
+    /** Perform bitwise logical-not. */
+    /*
+    UnsignedIntegerCalc& not ()
+    {
+        unaryAssign (Not());
+        return *this;
+    }
+    */
+
+    /** Perform bitwise logical-or. */
+    UnsignedIntegerCalc& operator|= (UnsignedIntegerCalc const& rhs)
+    {
+        binaryAssign (rhs, Or());
+        return *this;
+    }
+
+    /** Perform bitwise logical-and. */
+    UnsignedIntegerCalc& operator&= (UnsignedIntegerCalc const& rhs)
+    {
+        binaryAssign (rhs, And());
+        return *this;
+    }
+
+    /** Perform bitwise logical-xor. */
+    UnsignedIntegerCalc& operator^= (UnsignedIntegerCalc const& rhs)
+    {
+        binaryAssign (rhs, Xor());
+        return *this;
+    }
+
+    /** Perform addition. */
+    UnsignedIntegerCalc& operator+= (UnsignedIntegerCalc const& v)
+    {
+        UIntBig carry (0);
+        UInt* lhs (m_values);
+        UInt const* rhs (v.m_values - 1);
+        for (size_type n (0); n<size() || n<v.size(); ++n)
+        {
+            UIntBig part (carry);
+            carry = 0;
+            if (n < size())
+                part += *lhs;
+            if (n < v.size())
+                part += *++rhs;
+            if (part > maxUInt)
+            {
+                part &= maxUInt;
+                carry = 1;
+            }
+            *lhs++ = UInt (part);
+        }
+        bassert (carry == 0) // overflow
+        return *this;
+    }
+
+    /** Perform small addition. */
+    UnsignedIntegerCalc& operator+= (UInt rhs)
+    {
+        UnsignedIntegerCalc const v (1, &rhs);
+        return operator+= (v);
+    }
+
+    /** Perform small multiply. */
+    UnsignedIntegerCalc& operator*= (UInt rhs)
+    {
+        UIntBig carry (0);
+        UInt* lhs (m_values - 1);
+        for (size_type n (size()); n--;)
+        {
+            UIntBig part (carry);
+            carry = 0;
+            part += (*++lhs) * UIntBig(rhs);
+            carry = part >> numBits;
+            *lhs = UInt (part & maxUInt);
+        }
+        bassert (carry == 0); // overflow
+        return *this;
+    }
+
+    /** Small division. */
+    UnsignedIntegerCalc operator/= (UInt rhs)
+    {
+        UIntBig dividend (0);
+        UInt* lhs (m_values+size());
+        for (size_type n (size()); n--;)
+        {
+            dividend |= *--lhs;
+            *lhs = UInt (dividend / rhs);
+            dividend = (dividend % rhs) << numBits;
+        }
+        return *this;
+    }
+
+    /** Small modulus. */
+    UInt operator% (UInt rhs) const
+    {
+        UIntBig modsq = 1;
+        UIntBig result = 0;
+        UInt const* lhs (m_values);
+        for (size_type n (size()); n--; ++lhs)
+        {
+            for (int bit (0); bit < numBits; ++bit)
+            {
+                if (((*lhs) & (1 << bit)) != 0)
+                {
+                    result += modsq;
+                    if (result >= rhs)
+                        result -= rhs;
+                }
+                modsq <<= 1;
+                if (modsq >= rhs)
+                    modsq -= rhs;
+            }
+        }
+        return UInt (result);
+    }
+
+private:
+    struct Not { void operator() (UInt& rv) const             { rv = ~rv; } };
+    struct Or  { void operator() (UInt& lhs, UInt rhs) const { lhs |= rhs; } };
+    struct And { void operator() (UInt& lhs, UInt rhs) const { lhs &= rhs; } };
+    struct Xor { void operator() (UInt& lhs, UInt rhs) const { lhs ^= rhs; } };
+
+    template <class Operator>
+    void unaryAssign (Operator op = Operator())
+    {
+        UInt* dest (m_values-1);
+        for (size_type n (size()); n--;)
+            op (*++dest);
+    }
+
+    template <class Operator>
+    void binaryAssign (UnsignedIntegerCalc const& other, Operator op = Operator ())
+    {
+        UInt* dest (m_values + size());
+        size_type n (size());
+        for (; n-- > other.size();)
+            *--dest = 0;
+        UInt const* rhs (other.m_values + n);
+        for (UInt const* rhs (other.m_values + n); n--;)
+            op (*--dest, *--rhs);
+    }
+
+    size_type m_size;
+    UInt* m_values;
+};
+
+#endif
diff --git a/modules/beast_crypto/math/beast_UnsignedInteger.cpp b/modules/beast_crypto/math/beast_UnsignedInteger.cpp
deleted file mode 100644
index 2315d43449..0000000000
--- a/modules/beast_crypto/math/beast_UnsignedInteger.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-class UnsignedIntegerTests : public UnitTest
-{
-public:
-    UnsignedIntegerTests () : UnitTest ("UnsignedInteger", "beast")
-    {
-    }
-
-    template <unsigned int Bytes>
-    void runTest ()
-    {
-        String s;
-
-        s << "Bytes=" << String(Bytes);
-
-        beginTestCase (s);
-
-        UnsignedInteger <Bytes> zero;
-        zero.fill (0);
-        expect (zero.isZero (), "should be zero");
-        expect (! zero.isNotZero (), "sould not be non-zero");
-
-        UnsignedInteger <Bytes> one;
-        one.clear ();
-        one [Bytes - 1] = 1;
-        expect (one == UnsignedInteger <Bytes>::createFromInteger (1U), "should be equal");
-
-        expect (! one.isZero (), "should not be zero");
-        expect (one.isNotZero (), "sould be non-zero");
-
-        expect (zero < one, "should be less");
-        expect (one > zero, "should be greater");
-        expect (zero >= zero, "should be less than or equal");
-        expect (one <= one, "should be less than or equal");
-
-        expect (zero == zero, "should be equal");
-        expect (zero != one, "should not be equal");
-
-        expect ((zero | zero) == zero, "should be zero");
-        expect ((zero | one) != zero, "should not be zero");
-        expect ((one | one) != zero, "should not be zero");
-
-        expect ((one & zero) == zero, "should be zero");
-        expect ((one & one) == one, "should be one");
-        expect ((zero & zero) == zero, "should be zero");
-
-        expect (zero == UnsignedInteger <Bytes>::createFromInteger (0U), "should be zero");
-        expect (one == UnsignedInteger <Bytes>::createFromInteger (1U), "should be one");
-        expect (one != UnsignedInteger <Bytes>::createFromInteger (2U), "should not be two");
-
-        UnsignedInteger <Bytes> largest = UnsignedInteger <Bytes>::createFilled (0xff);
-
-        expect (largest > zero && largest > one, "should be greater");
-        expect (~largest == zero, "should be zero");
-        expect (~one < largest, "should be less");
-    }
-
-    void runTest()
-    {
-        runTest <16> ();
-        runTest <33> ();
-    }
-
-private:
-};
-
-static UnsignedIntegerTests unsignedIntegerTests;
diff --git a/modules/beast_crypto/math/beast_UnsignedInteger.h b/modules/beast_crypto/math/beast_UnsignedInteger.h
deleted file mode 100644
index 2a891cba5d..0000000000
--- a/modules/beast_crypto/math/beast_UnsignedInteger.h
+++ /dev/null
@@ -1,378 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_UNSIGNEDINTEGER_H_INCLUDED
-#define BEAST_UNSIGNEDINTEGER_H_INCLUDED
-
-/** Represents a set of bits of fixed size.
-    Integer representations are stored in network / big endian byte order.
-    @note The number of bits represented can only be a multiple of 8.
-    @tparam Bytes The number of bytes of storage.
-*/
-template <size_t Bytes>
-class UnsignedInteger : public SafeBool <UnsignedInteger <Bytes> > 
-{
-public:
-    enum
-    {
-        /** Constant for determining the number of bytes.
-        */
-        sizeInBytes = Bytes
-    };
-
-    // Standard container compatibility
-    typedef unsigned char* iterator;
-    typedef unsigned char const* const_iterator;
-
-    /** Hardened hash function for use with HashMap.
-        The seed is used to make the hash unpredictable. This prevents
-        attackers from exploiting crafted inputs to produce degenerate
-        containers.
-        @see HashMap
-    */
-    class HashFunction
-    {
-    public:
-        /** Construct a hash function
-            If a seed is specified it will be used, else a random seed
-            will be generated from the system
-            @param seedToUse An optional seed to use.
-        */
-        explicit HashFunction (HashValue seedToUse = Random::getSystemRandom ().nextInt ())
-            : m_seed (seedToUse)
-        {
-        }
-
-        /** Generates a simple hash from an UnsignedInteger. */
-        HashValue generateHash (UnsignedInteger <Bytes> const& key) const noexcept
-        {
-            HashValue hash;
-            Murmur::Hash (key.cbegin (), key.sizeInBytes, m_seed, &hash);
-            return hash;
-        }
-
-        HashValue operator() (UnsignedInteger <Bytes> const& key) const noexcept
-        {
-            HashValue hash;
-            Murmur::Hash (key.cbegin (), key.sizeInBytes, m_seed, &hash);
-            return hash;
-        }
-
-    private:
-        HashValue m_seed;
-    };
-
-    /** Construct the object.
-        The values are uninitialized.
-    */
-    UnsignedInteger () noexcept
-    {
-    }
-
-    /** Construct a copy. */
-    UnsignedInteger (UnsignedInteger <Bytes> const& other) noexcept
-    {
-        this->operator= (other);
-    }
-
-    /** Construct from raw memory.
-        The area pointed to by buffer must be at least Bytes in size,
-        or else undefined behavior will result.
-    */
-    explicit UnsignedInteger (void const* buffer)
-    {
-        memcpy (m_byte, buffer, Bytes);
-    }
-
-    /** Assign from another value. */
-    UnsignedInteger <Bytes>& operator= (UnsignedInteger const& other) noexcept
-    {
-        memcpy (m_byte, other.m_byte, Bytes);
-        return *this;
-    }
-
-    /** Create from an integer type.
-
-        @invariant IntegerType must be an unsigned integer type.
-    */
-    template <class IntegerType>
-    static UnsignedInteger <Bytes> createFromInteger (IntegerType value)
-    {
-        static_bassert (Bytes >= sizeof (IntegerType));
-        UnsignedInteger <Bytes> result;
-        value = toNetworkByteOrder <IntegerType> (value);
-        result.clear ();
-        memcpy (result.end () - sizeof (value), &value, bmin (Bytes, sizeof (value)));
-        return result;
-    }
-
-    /** Construct with a filled value.
-    */
-    static UnsignedInteger <Bytes> createFilled (unsigned char value)
-    {
-        UnsignedInteger <Bytes> result;
-        result.fill (value);
-        return result;
-    }
-
-    /** Fill with a particular byte value.
-    */
-    void fill (unsigned char value) noexcept
-    {
-        memset (m_byte, value, Bytes);
-    }
-
-    /** Clear the contents to zero.
-    */
-    void clear () noexcept
-    {
-        fill (0);
-    }
-
-    /** Determine if all bits are zero.
-    */
-    bool isZero () const noexcept
-    {
-        for (int i = 0; i < Bytes; ++i)
-        {
-            if (m_byte [i] != 0)
-                return false;
-        }
-
-        return true;
-    }
-
-    /** Determine if any bit is non-zero.
-    */
-    bool isNotZero () const noexcept
-    {
-        return ! isZero ();
-    }
-
-    /** Support conversion to `bool`.
-
-        @return `true` if any bit is non-zero.
-
-        @see SafeBool
-    */
-    bool asBoolean () const noexcept
-    {
-        return isNotZero ();
-    }
-
-    /** Access a particular byte.
-    */
-    unsigned char& getByte (int byteIndex) noexcept
-    {
-        bassert (byteIndex >= 0 && byteIndex < Bytes);
-
-        return m_byte [byteIndex];
-    }
-
-    /** Access a particular byte as `const`.
-    */
-    unsigned char getByte (int byteIndex) const noexcept
-    {
-        bassert (byteIndex >= 0 && byteIndex < Bytes);
-
-        return m_byte [byteIndex];
-    }
-
-    /** Access a particular byte.
-    */
-    unsigned char& operator[] (int byteIndex) noexcept
-    {
-        return getByte (byteIndex);
-    }
-
-    /** Access a particular byte as `const`.
-    */
-    unsigned char const operator[] (int byteIndex) const noexcept
-    {
-        return getByte (byteIndex);
-    }
-
-    /** Get an iterator to the beginning.
-    */
-    iterator begin () noexcept
-    {
-        return &m_byte [0];
-    }
-
-    /** Get an iterator to the end.
-    */
-    iterator end ()
-    {
-        return &m_byte [Bytes];
-    }
-
-    /** Get a const iterator to the beginning.
-    */
-    const_iterator cbegin () const noexcept
-    {
-        return &m_byte [0];
-    }
-
-    /** Get a const iterator to the end.
-    */
-    const_iterator cend () const noexcept
-    {
-        return &m_byte [Bytes];
-    }
-
-    /** Compare two objects.
-    */
-    int compare (UnsignedInteger <Bytes> const& other) const noexcept
-    {
-        return memcmp (cbegin (), other.cbegin (), Bytes);
-    }
-
-    /** Determine equality.
-    */
-    bool operator== (UnsignedInteger <Bytes> const& other) const noexcept
-    {
-        return compare (other) == 0;
-    }
-
-    /** Determine inequality.
-    */
-    bool operator!= (UnsignedInteger <Bytes> const& other) const noexcept
-    {
-        return compare (other) != 0;
-    }
-
-    /** Ordered comparison.
-    */
-    bool operator< (UnsignedInteger <Bytes> const& other) const noexcept
-    {
-        return compare (other) < 0;
-    }
-
-    /** Ordered comparison.
-    */
-    bool operator<= (UnsignedInteger <Bytes> const& other) const noexcept
-    {
-        return compare (other) <= 0;
-    }
-
-    /** Ordered comparison.
-    */
-    bool operator> (UnsignedInteger <Bytes> const& other) const noexcept
-    {
-        return compare (other) > 0;
-    }
-
-    /** Ordered comparison.
-    */
-    bool operator>= (UnsignedInteger <Bytes> const& other) const noexcept
-    {
-        return compare (other) >= 0;
-    }
-
-    /** Perform bitwise logical-not.
-    */
-    UnsignedInteger <Bytes> operator~ () const noexcept
-    {
-        UnsignedInteger <Bytes> result;
-
-        for (int i = 0; i < Bytes; ++i)
-            result [i] = ~getByte (i);
-
-        return result;
-    }
-
-    /** Perform bitwise logical-or.
-    */
-    UnsignedInteger <Bytes>& operator|= (UnsignedInteger <Bytes> const& rhs) noexcept
-    {
-        for (int i = 0; i < Bytes; ++i)
-            getByte (i) |= rhs [i];
-
-        return *this;
-    }
-
-    /** Perform bitwise logical-or.
-    */
-    UnsignedInteger <Bytes> operator| (UnsignedInteger <Bytes> const& rhs) const noexcept
-    {
-        UnsignedInteger <Bytes> result;
-
-        for (int i = 0; i < Bytes; ++i)
-            result [i] = getByte (i) | rhs [i];
-
-        return result;
-    }
-
-    /** Perform bitwise logical-and.
-    */
-    UnsignedInteger <Bytes>& operator&= (UnsignedInteger <Bytes> const& rhs) noexcept
-    {
-        for (int i = 0; i < Bytes; ++i)
-            getByte (i) &= rhs [i];
-
-        return *this;
-    }
-
-    /** Perform bitwise logical-and.
-    */
-    UnsignedInteger <Bytes> operator& (UnsignedInteger <Bytes> const& rhs) const noexcept
-    {
-        UnsignedInteger <Bytes> result;
-
-        for (int i = 0; i < Bytes; ++i)
-            result [i] = getByte (i) & rhs [i];
-
-        return result;
-    }
-
-    /** Perform bitwise logical-xor.
-    */
-    UnsignedInteger <Bytes>& operator^= (UnsignedInteger <Bytes> const& rhs) noexcept
-    {
-        for (int i = 0; i < Bytes; ++i)
-            getByte (i) ^= rhs [i];
-
-        return *this;
-    }
-
-    /** Perform bitwise logical-xor.
-    */
-    UnsignedInteger <Bytes> operator^ (UnsignedInteger <Bytes> const& rhs) const noexcept
-    {
-        UnsignedInteger <Bytes> result;
-
-        for (int i = 0; i < Bytes; ++i)
-            result [i] = getByte (i) ^ rhs [i];
-
-        return result;
-    }
-
-    // VFALCO TODO:
-    //
-    //      increment, decrement, add, subtract
-    //      negate
-    //      other stuff that makes sense from base_uint <>
-    //      missing stuff that built-in integers do
-    //
-
-private:
-    unsigned char m_byte [Bytes];
-};
-
-#endif
diff --git a/modules/beast_db/beast_db.cpp b/modules/beast_db/beast_db.cpp
index ab2fcbe0a2..3cf44b6339 100644
--- a/modules/beast_db/beast_db.cpp
+++ b/modules/beast_db/beast_db.cpp
@@ -30,7 +30,7 @@ namespace beast
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
-#include "keyvalue/beast_KeyvaDB.cpp"
+#include "keyvalue/KeyvaDB.cpp"
 #if BEAST_GCC
 #pragma GCC diagnostic pop
 #endif
diff --git a/modules/beast_db/beast_db.h b/modules/beast_db/beast_db.h
index 494d88b426..575a38d2a2 100644
--- a/modules/beast_db/beast_db.h
+++ b/modules/beast_db/beast_db.h
@@ -44,7 +44,7 @@
 namespace beast
 {
 
-#include "keyvalue/beast_KeyvaDB.h"
+#include "keyvalue/KeyvaDB.h"
 
 }
 
diff --git a/modules/beast_db/keyvalue/beast_KeyvaDB.cpp b/modules/beast_db/keyvalue/KeyvaDB.cpp
similarity index 97%
rename from modules/beast_db/keyvalue/beast_KeyvaDB.cpp
rename to modules/beast_db/keyvalue/KeyvaDB.cpp
index 3ef2e1b825..e53ef99732 100644
--- a/modules/beast_db/keyvalue/beast_KeyvaDB.cpp
+++ b/modules/beast_db/keyvalue/KeyvaDB.cpp
@@ -255,7 +255,7 @@ public:
         , m_keyBlockDepth (keyBlockDepth)
         , m_keyStorage (keyBytes)
     {
-        SharedState::WriteAccess state (m_state);
+        SharedState::Access state (m_state);
 
         openFile (&state->keyFile, keyPath);
 
@@ -289,7 +289,7 @@ public:
 
     ~KeyvaDBImp ()
     {
-        SharedState::WriteAccess state (m_state);
+        SharedState::Access state (m_state);
 
         flushInternal (state);
     }
@@ -310,7 +310,7 @@ public:
 
     //--------------------------------------------------------------------------
 
-    Result createMasterRecord (SharedState::WriteAccess& state)
+    Result createMasterRecord (SharedState::Access& state)
     {
         MemoryBlock buffer (masterHeaderBytes, true);
 
@@ -344,7 +344,7 @@ public:
     //
     void readKeyRecord (KeyRecord* const keyRecord,
                         KeyIndex const keyIndex,
-                        SharedState::WriteAccess& state)
+                        SharedState::Access& state)
     {
         FileOffset const byteOffset = calcKeyRecordOffset (keyIndex);
 
@@ -391,7 +391,7 @@ public:
     // Write a key record from memory
     void writeKeyRecord (KeyRecord const& keyRecord,
                          KeyIndex const keyIndex,
-                         SharedState::WriteAccess& state,
+                         SharedState::Access& state,
                          bool includingKey)
     {
         FileOffset const byteOffset = calcKeyRecordOffset (keyIndex);
@@ -442,7 +442,7 @@ public:
 
     // Append a value to the value file.
     // VFALCO TODO return a Result
-    void writeValue (void const* const value, ByteSize valueBytes, SharedState::WriteAccess& state)
+    void writeValue (void const* const value, ByteSize valueBytes, SharedState::Access& state)
     {
         Result result = state->valFile.setPosition (state->valFileSize);
 
@@ -493,7 +493,7 @@ public:
     //
     // Returns true if the key was found.
     //
-    bool find (FindResult* findResult, void const* key, SharedState::WriteAccess& state)
+    bool find (FindResult* findResult, void const* key, SharedState::Access& state)
     {
         // Not okay to call this with an empty key file!
         bassert (state->hasKeys ());
@@ -546,7 +546,7 @@ public:
     {
         FindResult findResult (m_keyStorage.getData ());
 
-        SharedState::WriteAccess state (m_state);
+        SharedState::Access state (m_state);
 
         bool found = false;
 
@@ -594,7 +594,7 @@ public:
     {
         bassert (valueBytes > 0);
 
-        SharedState::WriteAccess state (m_state);
+        SharedState::Access state (m_state);
 
         if (state->hasKeys ())
         {
@@ -681,12 +681,12 @@ public:
 
     void flush ()
     {
-        SharedState::WriteAccess state (m_state);
+        SharedState::Access state (m_state);
 
         flushInternal (state);
     }
 
-    void flushInternal (SharedState::WriteAccess& state)
+    void flushInternal (SharedState::Access& state)
     {
         state->keyFile.flush ();
         state->valFile.flush ();
diff --git a/modules/beast_db/keyvalue/beast_KeyvaDB.h b/modules/beast_db/keyvalue/KeyvaDB.h
similarity index 100%
rename from modules/beast_db/keyvalue/beast_KeyvaDB.h
rename to modules/beast_db/keyvalue/KeyvaDB.h
diff --git a/modules/beast_extras/beast_extras.h b/modules/beast_extras/beast_extras.h
index b9df7bf432..df5d8858b5 100644
--- a/modules/beast_extras/beast_extras.h
+++ b/modules/beast_extras/beast_extras.h
@@ -37,7 +37,7 @@
 #endif
 
 #if BEAST_BOOST_HAS_LOCKABLES
-# include "traits/beast_BoostLockableTraits.h"
+# include "traits/BoostLockableTraits.h"
 #endif
 
 #endif
diff --git a/modules/beast_extras/traits/beast_BoostLockableTraits.h b/modules/beast_extras/traits/BoostLockableTraits.h
similarity index 100%
rename from modules/beast_extras/traits/beast_BoostLockableTraits.h
rename to modules/beast_extras/traits/BoostLockableTraits.h
diff --git a/modules/beast_sqdb/api/session.h b/modules/beast_sqdb/api/session.h
index 8008c01bac..3a77093764 100644
--- a/modules/beast_sqdb/api/session.h
+++ b/modules/beast_sqdb/api/session.h
@@ -135,7 +135,7 @@ private:
 
 private:
     class Sqlite3;
-    SharedPtr <Sqlite3> m_instance;
+    SharedPtr <SharedSingleton <Sqlite3> > m_instance;
     bool m_bInTransaction;
     sqlite3* m_connection;
     String m_fileName;
diff --git a/modules/beast_sqdb/api/type_conversion_traits.h b/modules/beast_sqdb/api/type_conversion_traits.h
index 7742051d4a..c7b4786414 100644
--- a/modules/beast_sqdb/api/type_conversion_traits.h
+++ b/modules/beast_sqdb/api/type_conversion_traits.h
@@ -72,9 +72,7 @@ struct type_conversion
     static void from_base(base_type const& in, indicator ind, T& out)
     {
         // null not allowed
-        if (ind == i_null)
-            Throw(Error().fail(__FILE__, __LINE__));
-
+        check_precondition (ind != i_null);
         out = in;
     }
 
diff --git a/modules/beast_sqdb/source/error_codes.cpp b/modules/beast_sqdb/source/error_codes.cpp
index 58420f0727..e62110002b 100644
--- a/modules/beast_sqdb/source/error_codes.cpp
+++ b/modules/beast_sqdb/source/error_codes.cpp
@@ -63,6 +63,10 @@ namespace sqdb
 namespace detail
 {
 
+#ifdef c
+#undef c
+#endif
+
 const Error sqliteError(const char* sourceFileName,
                         int lineNumber,
                         int sqliteErrorCode)
diff --git a/modules/beast_sqdb/source/into_type.cpp b/modules/beast_sqdb/source/into_type.cpp
index 3eb7c4c2f6..d3bae12584 100644
--- a/modules/beast_sqdb/source/into_type.cpp
+++ b/modules/beast_sqdb/source/into_type.cpp
@@ -97,8 +97,7 @@ void standard_into_type::do_into()
     if (colType == SQLITE_NULL)
     {
         // null encountered with no indicator
-        if (!m_ind)
-            Throw(Error().fail(__FILE__, __LINE__));
+        check_precondition (m_ind != nullptr);
 
         *m_ind = i_null;
     }
@@ -164,7 +163,7 @@ void standard_into_type::do_into()
                 break;
 
             default:
-                Throw(Error().fail(__FILE__, __LINE__));
+                fatal_error ("unknown case");
             }
         }
         break;
@@ -188,7 +187,7 @@ void standard_into_type::do_into()
                 break;
 
             default:
-                Throw(Error().fail(__FILE__, __LINE__));
+                fatal_error ("unknown case");
             };
         }
         break;
@@ -208,7 +207,7 @@ void standard_into_type::do_into()
             break;
 
             case x_stdwstring:
-                Throw(Error().fail(__FILE__, __LINE__));
+                fatal_error ("invalid case");
                 break;
 
             case x_beastString:
@@ -276,7 +275,7 @@ void standard_into_type::do_into()
                     break;
 
                 default:
-                    Throw(Error().fail(__FILE__, __LINE__));
+                    fatal_error ("unknown case");
                 }
 
             }
@@ -286,10 +285,10 @@ void standard_into_type::do_into()
         break;
 
         case SQLITE_BLOB:
-            Throw(Error().fail(__FILE__, __LINE__));
+            fatal_error ("invalid case");
 
         default:
-            Throw(Error().fail(__FILE__, __LINE__));
+            fatal_error ("unknown case");
         };
     }
 
diff --git a/modules/beast_sqdb/source/session.cpp b/modules/beast_sqdb/source/session.cpp
index f3a1ba8e18..6e18c66eba 100644
--- a/modules/beast_sqdb/source/session.cpp
+++ b/modules/beast_sqdb/source/session.cpp
@@ -60,22 +60,20 @@
 namespace sqdb
 {
 
-class session::Sqlite3 : public SharedSingleton <Sqlite3>
+class session::Sqlite3
 {
 public:
-    friend class SharedSingleton <Sqlite3>;
-
-    Sqlite3() : SharedSingleton <Sqlite3> (SingletonLifetime::persistAfterCreation)
+    Sqlite3()
     {
         int threadSafe = sqlite3_threadsafe();
 
-        if (threadSafe == 0)
-            Throw(Error().fail(__FILE__, __LINE__, Error::assertFailed));
+        check_precondition (threadSafe != 0);
 
+#if 0
         int result = sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
 
-        if (result != SQLITE_OK)
-            Throw(Error().fail(__FILE__, __LINE__, Error::assertFailed));
+        check_postcondition (result == SQLITE_OK);
+#endif
 
         sqlite3_initialize();
     }
@@ -84,30 +82,25 @@ public:
     {
         sqlite3_shutdown();
     }
-
-    static Sqlite3* createInstance()
-    {
-        return new Sqlite3;
-    }
 };
 
 //------------------------------------------------------------------------------
 
 session::session()
-    : prepare(this)
-    , m_instance(Sqlite3::getInstance())
-    , m_bInTransaction(false)
-    , m_connection(nullptr)
+    : prepare (this)
+    , m_instance (SharedSingleton <Sqlite3>::getInstance ())
+    , m_bInTransaction (false)
+    , m_connection (nullptr)
 {
 }
 
 session::session(const session& deferredClone)
-    : prepare(this)
-    , m_instance(Sqlite3::getInstance())
-    , m_bInTransaction(false)
-    , m_connection(nullptr)
-    , m_fileName(deferredClone.m_fileName)
-    , m_connectString(deferredClone.m_connectString)
+    : prepare (this)
+    , m_instance (SharedSingleton <Sqlite3>::getInstance ())
+    , m_bInTransaction (false)
+    , m_connection (nullptr)
+    , m_fileName (deferredClone.m_fileName)
+    , m_connectString (deferredClone.m_connectString)
 {
     // shouldn't be needed since deferredClone did it
     //Sqlite::initialize();
@@ -120,8 +113,7 @@ session::~session()
 
 Error session::clone()
 {
-    if (m_connection)
-        Throw(Error().fail(__FILE__, __LINE__));    // already open
+    check_precondition (! m_connection);
 
     return open(m_fileName, m_connectString);
 }
@@ -139,8 +131,7 @@ Error session::open(String fileName, std::string options)
     Error err;
 
     // can't open twice
-    if (m_connection)
-        Throw(err.fail(__FILE__, __LINE__, Error::fileInUse));
+    check_precondition (! m_connection);
 
     int mode = 0;
     int flags = 0;
@@ -188,13 +179,12 @@ Error session::open(String fileName, std::string options)
                 }
                 else
                 {
-                    Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
+                    fatal_error ("bad parameter");
                 }
             }
             else
             {
-                // duplicate
-                Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
+                fatal_error ("duplicate parameter");
             }
         }
 
@@ -215,13 +205,12 @@ Error session::open(String fileName, std::string options)
                 }
                 else
                 {
-                    Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
+                    fatal_error ("bad parameter");
                 }
             }
             else
             {
-                // duplicate
-                Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
+                fatal_error ("duplicate parameter");
             }
         }
 
@@ -240,19 +229,17 @@ Error session::open(String fileName, std::string options)
                 }
                 else
                 {
-                    Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
+                    fatal_error ("bad parameter");
                 }
             }
             else
             {
-                // duplicate
-                Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
+                fatal_error ("duplicate parameter");
             }
         }
         else
         {
-            // unknown option
-            Throw(err.fail(__FILE__, __LINE__, Error::badParameter));
+            fatal_error ("unknown parameter");
         }
     }
 
diff --git a/modules/beast_sqdb/source/statement_imp.cpp b/modules/beast_sqdb/source/statement_imp.cpp
index 8c2933d5fa..501678defd 100644
--- a/modules/beast_sqdb/source/statement_imp.cpp
+++ b/modules/beast_sqdb/source/statement_imp.cpp
@@ -180,8 +180,7 @@ Error statement_imp::execute()
 {
     Error error;
 
-    if (!m_stmt)
-        Throw(Error().fail(__FILE__, __LINE__, Error::badParameter));
+    check_precondition (m_stmt != nullptr);
 
     // ???
     m_bGotData = false;
@@ -253,7 +252,7 @@ bool statement_imp::fetch(Error& error)
     else
     {
         // should never get SQLITE_OK here
-        Throw(Error().fail(__FILE__, __LINE__, Error::assertFailed));
+        fatal_error ("invalid result");
     }
 
     return m_bGotData;
diff --git a/modules/beast_sqdb/source/transaction.cpp b/modules/beast_sqdb/source/transaction.cpp
index 6d767e1f72..2999be25ff 100644
--- a/modules/beast_sqdb/source/transaction.cpp
+++ b/modules/beast_sqdb/source/transaction.cpp
@@ -77,8 +77,7 @@ Error transaction::commit()
     Error error;
 
     // already handled
-    if (m_bHandled)
-        Throw(Error().fail(__FILE__, __LINE__));
+    check_precondition (!m_bHandled);
 
     // if commit() throws, m_bHandled will remain false
     // and the destructor will attempt a rollback.
@@ -93,8 +92,7 @@ Error transaction::commit()
 void transaction::rollback()
 {
     // already handled
-    if (m_bHandled)
-        Throw(Error().fail(__FILE__, __LINE__));
+    check_precondition (!m_bHandled);
 
     m_session.rollback();
     m_bHandled = true;
diff --git a/modules/beast_sqdb/source/use_type.cpp b/modules/beast_sqdb/source/use_type.cpp
index 3c8b052279..70db82548d 100644
--- a/modules/beast_sqdb/source/use_type.cpp
+++ b/modules/beast_sqdb/source/use_type.cpp
@@ -87,8 +87,7 @@ inline T const& as(void const* v)
 {
     T const& val = *static_cast <T const*>(v);
 
-    if (val > T(std::numeric_limits<L>::max()))
-        Throw(Error().fail(__FILE__, __LINE__));
+    check_precondition (val <= T(std::numeric_limits<L>::max()));
 
     return val;
 }
@@ -203,7 +202,7 @@ void standard_use_type::do_use()
     case x_stdtm:
     case x_blob:
     default:
-        Throw(Error().fail(__FILE__, __LINE__, Error::badParameter));
+        fatal_error ("bad parameter");
     }
 
     if (result != SQLITE_OK)
diff --git a/modules/beast_sqlite/beast_sqlite.h b/modules/beast_sqlite/beast_sqlite.h
index 4dff289446..7c6f837757 100644
--- a/modules/beast_sqlite/beast_sqlite.h
+++ b/modules/beast_sqlite/beast_sqlite.h
@@ -30,7 +30,7 @@
           see BeastConfig.h.
 */
 
-#include "../beast_core/system/TargetPlatform.h"
+#include "../../beast/config/PlatformConfig.h"
 
 #if BEAST_IOS || BEAST_MAC
 # define BEAST_HAVE_NATIVE_SQLITE 1
diff --git a/Builds/VisualStudio2012/BeastConfig.h b/scripts/BeastConfig.h
similarity index 96%
rename from Builds/VisualStudio2012/BeastConfig.h
rename to scripts/BeastConfig.h
index 600c4d35a2..4c8e9aa1c0 100644
--- a/Builds/VisualStudio2012/BeastConfig.h
+++ b/scripts/BeastConfig.h
@@ -90,13 +90,6 @@
 //
 //------------------------------------------------------------------------------
 
-/** Config: BEAST_DISABLE_BEAST_VERSION_PRINTING
-    Turns off the debugging display of the beast version number
-*/
-#ifndef   BEAST_DISABLE_BEAST_VERSION_PRINTING
-//#define BEAST_DISABLE_BEAST_VERSION_PRINTING 1
-#endif
-
 /** Config: BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
     In a Visual C++  build, this can be used to stop the required system libs
     being automatically added to the link stage.
diff --git a/scripts/compile.sh b/scripts/compile.sh
new file mode 100755
index 0000000000..bb1f618d3d
--- /dev/null
+++ b/scripts/compile.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# This script makes sure that every directly includable header
+# file compiles stand-alone for all supported platforms.
+#
+
+for f in $1/*.h $1/*/*.h
+do
+{
+	echo "Compilng '$f'"
+g++ -xc++ - -c -o /dev/null <<EOF
+#define BEAST_BEASTCONFIG_H_INCLUDED
+#include "$f"
+EOF
+g++ -xc++ -std=c++11 - -c -o /dev/null <<EOF
+#define BEAST_BEASTCONFIG_H_INCLUDED
+#include "$f"
+EOF
+}
+done
+
+for f in $1/*/*.cpp
+do
+{
+	echo "Compilng '$f'"
+	g++ -xc++ -I$1/../config/ "$f" -c -o /dev/null
+	g++ -xc++ -std=c++11 -I$1/../config/ "$f" -c -o /dev/null
+}
+done