diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88ddcbfa5..f56e882f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,6 +71,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules")
 include(AddPCH)
 include(ConditionalSources)
+include(InstallHeaders)
 
 get_filename_component(AUTOWIRING_ROOT_DIR . ABSOLUTE)
 
@@ -157,14 +158,6 @@ install(FILES
   COMPONENT autowiring
 )
 
-# Install public header files
-install(
-  DIRECTORY ${PROJECT_SOURCE_DIR}/autowiring
-  DESTINATION include
-  COMPONENT autowiring
-  FILES_MATCHING PATTERN "*.h"
-)
-
 # Install autoboost headers on ARM, which still requires them
 if(CMAKE_COMPILER_IS_GNUCC AND ("${CMAKE_CXX_COMPILER}" MATCHES "androideabi"))
   if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9")
diff --git a/cmake-modules/InstallHeaders.cmake b/cmake-modules/InstallHeaders.cmake
new file mode 100644
index 000000000..108996a2b
--- /dev/null
+++ b/cmake-modules/InstallHeaders.cmake
@@ -0,0 +1,39 @@
+# Installs headers for the named target
+# Syntax:
+# install_headers TARGET <target> DESTINATION <destination> ...
+#
+# NOEXCLUDE_STDAFX      Also install the precompiled header file
+# <target>              The target whose sources are to be installed
+# <destination>         The root of the destination folder where files will be copied
+#
+# Additional options are passed after FILES to the cmake install command
+include(CMakeParseArguments)
+
+function(install_headers)
+  set(options NOEXCLUDE_STDAFX)
+  set(oneValueArgs TARGET DESTINATION)
+  set(multiValueArgs)
+
+  cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  if(NOT opt_TARGET)
+    message(FATAL_ERROR "Cannot install files for a nonexistent target")
+  endif()
+
+  get_target_property(target_SRCS ${opt_TARGET} SOURCES)
+  foreach(src IN LISTS target_SRCS)
+    if(NOT ${opt_NOEXCLUDE_STDAFX} AND ${src} STREQUAL "stdafx.h")
+      continue()
+    endif()
+
+    get_filename_component(src_ext ${src} EXT)
+    if(src_ext STREQUAL ".h")
+      get_filename_component(src_rel ${src} DIRECTORY)
+      install(
+        FILES ${src}
+        DESTINATION ${opt_DESTINATION}/${src_rel}
+        ${opt_UNPARSED_ARGUMENTS}
+      )
+    endif()
+  endforeach()
+endfunction()
diff --git a/examples/AutoNetExample.cpp b/examples/AutoNetExample.cpp
index 5229bdfb2..66db1d067 100644
--- a/examples/AutoNetExample.cpp
+++ b/examples/AutoNetExample.cpp
@@ -1,21 +1,21 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include <autowiring/Autowired.h>
-#include <autowiring/AutoNetServer.h>
+#include <autonet/AutoNetServer.h>
 #include <iostream>
 #include THREAD_HEADER
 
-// 
+//
 // AutoNetServer
-// 
+//
 // This example creates a sample context structure to view with the
 // AutoNetVisualizer. It creates contexts and adds dummy context members
 // at timed intervals to show off the dynamic nature of the visualizer.
 // You can view the visualizer at leapmotion.github.io/autonet
-// 
+//
 
-// 
+//
 // Declaration of dummy classes to view in the visualizer
-// 
+//
 
 class TestThread1:
   public CoreThread
@@ -65,30 +65,30 @@ int main() {
 
   // Initiate context to start threads
   ctxt->Initiate();
-  
+
   // Create a bunch of example Contexts and Context Members
   auto ctxt2 = ctxt->Create<ContextB>();
   auto ctxt3 = ctxt->Create<ContextC>();
-  
+
   ctxt2->Initiate();
-  
+
   {
     CurrentContextPusher pshr(ctxt3);
     AutoRequired<TestThread2> bar;
   }
-  
+
   std::shared_ptr<CoreContext> newContext;
-  
+
   {
     CurrentContextPusher pshr(ctxt2);
     AutoRequired<TestThread1> foo;
 
     AutoRequired<TestAutoFilter<const TestData<0>&, TestData<1>&>> filter01;
     AutoRequired<TestAutoFilter<const TestData<1>&, TestData<2>&>> filter12;
-    
+
     // Give time to open AutoNet Visualizer
     std::this_thread::sleep_for(std::chrono::seconds(10));
-    
+
     *foo += std::chrono::seconds(1),[&ctxt]{
       ctxt->Inject<ThisClassGetsAddedLater<4>>();
     };
diff --git a/scripts/copyright_check.sh b/scripts/copyright_check.sh
index a39fd4755..f311e4a62 100755
--- a/scripts/copyright_check.sh
+++ b/scripts/copyright_check.sh
@@ -4,12 +4,12 @@
 # Enforce LeapMotion copyright notice
 #
 
-ENFORCED_FILES="autowiring examples src"
+ENFORCED_FILES="examples src"
 COPYRIGHT_HEADER="// Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved."
 
 # Go to root directory
 for f in $(find $ENFORCED_FILES -name *.hpp -o -name *.cpp -o -name *.h);
-do 
+do
   if [ "$(head -n 1 $f)" != "$COPYRIGHT_HEADER" ];
   then
     if [ "$BAD_FILES" == "" ]
diff --git a/scripts/whitespace_check.sh b/scripts/whitespace_check.sh
index e63589e8d..d8809a631 100755
--- a/scripts/whitespace_check.sh
+++ b/scripts/whitespace_check.sh
@@ -4,12 +4,12 @@
 # Enforce spaces instead of tabs
 #
 
-ENFORCED_FILES="autowiring examples src CMakeLists.txt"
+ENFORCED_FILES="examples src CMakeLists.txt"
 
 # Go to root directory
 
 if grep -qr $'\t' $ENFORCED_FILES
-then 
+then
   echo
   echo "The Autowiring project prohibits tabs for spacing."
   echo
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cf7230857..f8e8bff2a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,12 @@
 include_directories(
   # Need to make sure all of our tests can find gtest
   ${PROJECT_SOURCE_DIR}/contrib/gtest-1.7.0/fused-src
-  ${PROJECT_SOURCE_DIR}/autowiring
-  ${PROJECT_SOURCE_DIR}/src/autowiring
-  ${PROJECT_SOURCE_DIR}/src/autotesting
+
+  # All projects in this folder have named access to other projects here
+  .
 )
 
 add_subdirectory(autonet)
 add_subdirectory(autowiring)
 add_subdirectory(autotesting)
+add_subdirectory(benchmark)
diff --git a/autowiring/AutoNetServer.h b/src/autonet/AutoNetServer.h
similarity index 98%
rename from autowiring/AutoNetServer.h
rename to src/autonet/AutoNetServer.h
index a26d7b96c..228a4879d 100644
--- a/autowiring/AutoNetServer.h
+++ b/src/autonet/AutoNetServer.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #pragma once
-#include "CoreThread.h"
-#include "index_tuple.h"
+#include <autowiring/CoreThread.h>
 #include <autowiring/Decompose.h>
+#include <autowiring/index_tuple.h>
 #include <sstream>
 #include STL_UNORDERED_MAP
 #include FUNCTIONAL_HEADER
@@ -37,7 +37,7 @@ class AutoNetTransport {
   /// Transmits the specified string message to the remote host
   /// </summary>
   virtual void Send(AutoNetTransportHandler::connection_hdl hdl, const std::string& msg) = 0;
-  
+
   /// <summary>
   /// Assigns the handler for operations occuring on this transport
   /// </summary>
@@ -63,7 +63,7 @@ class AutoNetServer:
   static AutoNetServer* New(std::unique_ptr<AutoNetTransport> transport) {
     return NewAutoNetServerImpl(std::move(transport));
   }
-  
+
   static AutoNetServer* New(void) {
     return NewAutoNetServerImpl();
   }
@@ -73,7 +73,7 @@ class AutoNetServer:
   /// </summary>
   /// <param name="name">The identifier for this breakpoint</param>
   virtual void Breakpoint(std::string name) = 0;
-  
+
   /// Add a custom event handler. Arguments must be primative types are strings
   template<typename Fx>
   void AddEventHandler(const std::string& event, Fx&& handler) {
@@ -84,24 +84,24 @@ class AutoNetServer:
       typename make_index_tuple<Decompose<decltype(&Fx::operator())>::N>::type()
     );
   }
-  
+
   /// Send a custom event to all clients.
   template<typename... Args>
   void SendEvent(const std::string& event, Args... args) {
     SendEvent(event, std::vector<std::string>{parseToString(args)...});
   }
-  
+
 protected:
   // Send event with arguments parsed as vector of string
   virtual void SendEvent(const std::string& event, const std::vector<std::string>& args) = 0;
-  
+
   // Map of callbacks keyed by event type
   std::unordered_map<std::string, std::vector<std::function<void(std::vector<std::string>)>>> m_handlers;
-  
+
 private:
   // Add a handler that will be called when an event is received from the client
   void AddEventHandlerInternal(const std::string& event, std::function<void(const std::vector<std::string>&)> handler);
-  
+
   // Extract arguments from list of strings, parse and pass to handler
   template<typename Fx, typename... Args, int... N>
   void AddEventHandler(const std::string& event, Fx&& handler, void (Fx::*pfn)(Args...) const, index_tuple<N...>) {
@@ -115,7 +115,7 @@ class AutoNetServer:
       }
     );
   }
-  
+
   // parse type to string
   template<class T>
   std::string parseToString(const T& t){
@@ -123,18 +123,18 @@ class AutoNetServer:
     ss << t;
     return ss.str();
   }
-  
+
   // parse string to primative type
   template<class T>
   inline T parseFromString(const std::string& str){
     std::istringstream ss(str);
     typename std::decay<T>::type val;
     ss >> std::boolalpha >> val;
-    
+
     if (ss.fail()) {
       autowiring::ThrowFailedTypeParseException(str, typeid(T));
     }
-    
+
     return val;
   }
 };
diff --git a/src/autonet/AutoNetServerImpl.cpp b/src/autonet/AutoNetServerImpl.cpp
index f75af8f6a..7aab7ad40 100644
--- a/src/autonet/AutoNetServerImpl.cpp
+++ b/src/autonet/AutoNetServerImpl.cpp
@@ -1,12 +1,10 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
 #include "AutoNetServerImpl.hpp"
-#include "at_exit.h"
-#include "autowiring.h"
+#include <autowiring/autowiring.h>
+#include <autowiring/at_exit.h>
+#include <autowiring/demangle.h>
 #include "AutoNetTransportHttp.hpp"
-#include "demangle.h"
-#include "CoreObjectDescriptor.h"
-#include "TypeRegistry.h"
 #include <iostream>
 #include FUTURE_HEADER
 
diff --git a/src/autonet/CMakeLists.txt b/src/autonet/CMakeLists.txt
index 69d2fdaa8..8f9873e4e 100644
--- a/src/autonet/CMakeLists.txt
+++ b/src/autonet/CMakeLists.txt
@@ -14,7 +14,6 @@ set(AutoNet_SRCS
 )
 
 # All include files are located in /autowiring from here, so prepend that to all sources
-rewrite_header_paths(AutoNet_SRCS)
 add_pch(AutoNet_SRCS "stdafx.h" "stdafx.cpp")
 
 add_library(AutoNet STATIC ${AutoNet_SRCS})
@@ -27,6 +26,9 @@ add_subdirectory(test)
 # Install library
 #
 
+# Install public header files
+install_headers(TARGET AutoNet DESTINATION include/autonet COMPONENT autowiring)
+
 if(NOT NO_INSTALL_AUTONET AND NOT AUTOWIRING_IS_EMBEDDED)
   install(TARGETS AutoNet EXPORT AutowiringTargets
     DESTINATION lib
diff --git a/src/autonet/stdafx.h b/src/autonet/stdafx.h
index 7e90f259f..01f35853c 100644
--- a/src/autonet/stdafx.h
+++ b/src/autonet/stdafx.h
@@ -7,7 +7,7 @@
   #define NOMINMAX
 #endif
 
-#include "AutowiringConfig.h"
+#include <autowiring/AutowiringConfig.h>
 
 // Defined when Autowiring is being built, as opposed to when it is being linked
 #define AUTOWIRING_IS_BEING_BUILT
@@ -21,6 +21,6 @@
 #endif
 
 // C++11 glue logic, for platforms that have incomplete C++11 support
-#include "C++11/cpp11.h"
+#include <autowiring/C++11/cpp11.h>
 
 #define ARRAYCOUNT(x) sizeof(ArraySize(x))
diff --git a/src/autonet/test/AutoNetTest.cpp b/src/autonet/test/AutoNetTest.cpp
index b1488fc7d..f0b7422df 100644
--- a/src/autonet/test/AutoNetTest.cpp
+++ b/src/autonet/test/AutoNetTest.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
-#include "gtest-all-guard.hpp"
+#include <autotesting/gtest-all-guard.hpp>
 
 int main(int argc, const char* argv []) {
   return autotesting_main(argc, argv);
diff --git a/src/autonet/test/BreakpointTest.cpp b/src/autonet/test/BreakpointTest.cpp
index 7f337f47e..51709a437 100644
--- a/src/autonet/test/BreakpointTest.cpp
+++ b/src/autonet/test/BreakpointTest.cpp
@@ -1,8 +1,8 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
-#include "src/autonet/AutoNetServerImpl.hpp"
-#include "AutoNetServer.h"
-#include "Autowired.h"
+#include <autonet/AutoNetServer.h>
+#include <autonet/AutoNetServerImpl.hpp>
+#include <autowiring/autowiring.h>
 #include THREAD_HEADER
 
 class BreakpointTest:
@@ -12,7 +12,7 @@ class BreakpointTest:
 class ExposedAutoNetServer:
   public AutoNetServerImpl
 {
-public:  
+public:
   void HandleResumeFromBreakpoint(const std::string& breakpoint) {
     *this += [this, breakpoint] {
       for (const auto& handler : this->m_handlers["resumeFromBreakpoint"]){
@@ -50,6 +50,6 @@ TEST_F(BreakpointTest, SimplePauseAndResume) {
   AutoRequired<ExposedAutoNetServer> autonet;
   AutoRequired<BreakpointThread> thread;
   AutoRequired<WaitsThenSimulatesResume>();
-  
+
   autonet->Breakpoint("Main");
 }
diff --git a/src/autonet/test/RPCTest.cpp b/src/autonet/test/RPCTest.cpp
index 4c7c73e83..093bbcf50 100644
--- a/src/autonet/test/RPCTest.cpp
+++ b/src/autonet/test/RPCTest.cpp
@@ -1,8 +1,8 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
-#include "AutoNetServer.h"
-#include "src/autonet/AutoNetServerImpl.hpp"
-#include "Autowired.h"
+#include <autonet/AutoNetServer.h>
+#include <autonet/AutoNetServerImpl.hpp>
+#include <autowiring/autowiring.h>
 
 class RPCTest:
   public testing::Test
@@ -15,5 +15,5 @@ TEST_F(RPCTest, SimpleSend) {
 }
 
 TEST_F(RPCTest, SimpleReceive) {
-  
+
 }
diff --git a/src/autonet/test/WebsocketTest.cpp b/src/autonet/test/WebsocketTest.cpp
index cdc3e5863..77278e465 100644
--- a/src/autonet/test/WebsocketTest.cpp
+++ b/src/autonet/test/WebsocketTest.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
-#include "AutoNetServer.h"
-#include "Autowired.h"
+#include <autonet/AutoNetServer.h>
+#include <autowiring/autowiring.h>
 #include CHRONO_HEADER
 
 #include <iostream>
@@ -25,33 +25,33 @@ class WebsocketExceptionFilter:
 
 TEST_F(WebsocketTest, CleanShutdown) {
   AutoRequired<WebsocketExceptionFilter>();
-  
+
   // Try starting and stopping server multiple times
   {
     AutoCreateContext ctxt;
     CurrentContextPusher pshr(ctxt);
     AutoRequired<AutoNetServer>();
-    
+
     ctxt->Initiate();
     ctxt->Wait(std::chrono::milliseconds(200));
     ctxt->SignalShutdown(true);
   }
-  
+
   {
     AutoCreateContext ctxt;
     CurrentContextPusher pshr(ctxt);
     AutoRequired<AutoNetServer>();
-    
+
     ctxt->Initiate();
     ctxt->Wait(std::chrono::milliseconds(200));
     ctxt->SignalShutdown(true);
   }
-  
+
   {
     AutoCreateContext ctxt;
     CurrentContextPusher pshr(ctxt);
     AutoRequired<AutoNetServer>();
-    
+
     ctxt->Initiate();
     ctxt->Wait(std::chrono::milliseconds(200));
     ctxt->SignalShutdown(true);
diff --git a/src/autonet/test/stdafx.h b/src/autonet/test/stdafx.h
index 896fead2c..357558062 100644
--- a/src/autonet/test/stdafx.h
+++ b/src/autonet/test/stdafx.h
@@ -1,7 +1,7 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #pragma once
 
-#include <C++11/cpp11.h>
+#include <autowiring/C++11/cpp11.h>
 #include <gtest/gtest.h>
 
 #ifdef _MSC_VER
diff --git a/autowiring/AutowiringEnclosure.h b/src/autotesting/AutowiringEnclosure.h
similarity index 99%
rename from autowiring/AutowiringEnclosure.h
rename to src/autotesting/AutowiringEnclosure.h
index d0b76d2b7..65cc675a5 100644
--- a/autowiring/AutowiringEnclosure.h
+++ b/src/autotesting/AutowiringEnclosure.h
@@ -1,7 +1,7 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #pragma once
 #include <autowiring/autowiring.h>
-#include "demangle.h"
+#include <autowiring/demangle.h>
 #include <autowiring/at_exit.h>
 #include MEMORY_HEADER
 
diff --git a/src/autotesting/CMakeLists.txt b/src/autotesting/CMakeLists.txt
index 27237e9cb..ce2975b4a 100644
--- a/src/autotesting/CMakeLists.txt
+++ b/src/autotesting/CMakeLists.txt
@@ -4,10 +4,14 @@ set(AutoTesting_SOURCES
   gtest-all-guard.cpp
 )
 
-rewrite_header_paths(AutoTesting_SOURCES)
 add_library(AutoTesting ${AutoTesting_SOURCES})
 target_link_libraries(AutoTesting Autowiring)
-target_include_directories(AutoTesting PRIVATE "${CMAKE_SOURCE_DIR}/contrib/autoboost")
+target_include_directories(
+  AutoTesting
+  PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}/contrib/autoboost
+)
+install_headers(TARGET AutoTesting DESTINATION include/autotesting COMPONENT autowiring)
 
 if(NOT AUTOWIRING_IS_EMBEDDED)
   install(TARGETS AutoTesting EXPORT AutowiringTargets
diff --git a/src/autotesting/stdafx.h b/src/autotesting/stdafx.h
index e62f14197..b315122fa 100644
--- a/src/autotesting/stdafx.h
+++ b/src/autotesting/stdafx.h
@@ -18,7 +18,7 @@
 #endif
 
 // C++11 glue logic, for platforms that have incomplete C++11 support
-#include "C++11/cpp11.h"
+#include <autowiring/C++11/cpp11.h>
 
 
 template<class T, int n>
diff --git a/autowiring/AnySharedPointer.h b/src/autowiring/AnySharedPointer.h
similarity index 100%
rename from autowiring/AnySharedPointer.h
rename to src/autowiring/AnySharedPointer.h
diff --git a/autowiring/AutoCurrentPacketPusher.h b/src/autowiring/AutoCurrentPacketPusher.h
similarity index 100%
rename from autowiring/AutoCurrentPacketPusher.h
rename to src/autowiring/AutoCurrentPacketPusher.h
diff --git a/autowiring/AutoFilterArgument.h b/src/autowiring/AutoFilterArgument.h
similarity index 100%
rename from autowiring/AutoFilterArgument.h
rename to src/autowiring/AutoFilterArgument.h
diff --git a/autowiring/AutoFilterDescriptor.h b/src/autowiring/AutoFilterDescriptor.h
similarity index 100%
rename from autowiring/AutoFilterDescriptor.h
rename to src/autowiring/AutoFilterDescriptor.h
diff --git a/autowiring/AutoFuture.h b/src/autowiring/AutoFuture.h
similarity index 100%
rename from autowiring/AutoFuture.h
rename to src/autowiring/AutoFuture.h
diff --git a/autowiring/AutoPacket.h b/src/autowiring/AutoPacket.h
similarity index 100%
rename from autowiring/AutoPacket.h
rename to src/autowiring/AutoPacket.h
diff --git a/autowiring/AutoPacketFactory.h b/src/autowiring/AutoPacketFactory.h
similarity index 100%
rename from autowiring/AutoPacketFactory.h
rename to src/autowiring/AutoPacketFactory.h
diff --git a/autowiring/AutoPacketGraph.h b/src/autowiring/AutoPacketGraph.h
similarity index 100%
rename from autowiring/AutoPacketGraph.h
rename to src/autowiring/AutoPacketGraph.h
diff --git a/autowiring/AutoSelfUpdate.h b/src/autowiring/AutoSelfUpdate.h
similarity index 100%
rename from autowiring/AutoSelfUpdate.h
rename to src/autowiring/AutoSelfUpdate.h
diff --git a/autowiring/AutoTimeStamp.h b/src/autowiring/AutoTimeStamp.h
similarity index 100%
rename from autowiring/AutoTimeStamp.h
rename to src/autowiring/AutoTimeStamp.h
diff --git a/autowiring/AutowirableSlot.h b/src/autowiring/AutowirableSlot.h
similarity index 100%
rename from autowiring/AutowirableSlot.h
rename to src/autowiring/AutowirableSlot.h
diff --git a/autowiring/Autowired.h b/src/autowiring/Autowired.h
similarity index 100%
rename from autowiring/Autowired.h
rename to src/autowiring/Autowired.h
diff --git a/src/autowiring/AutowiringConfig.h b/src/autowiring/AutowiringConfig.h
new file mode 100644
index 000000000..919ca7d4f
--- /dev/null
+++ b/src/autowiring/AutowiringConfig.h
@@ -0,0 +1,12 @@
+// Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
+#pragma once
+
+//
+// Define preprocessor macros from CMake variables
+//
+
+// Are we building autonet?
+#define AUTOWIRING_BUILD_AUTONET 0
+
+// Building for ARM?
+#define autowiring_BUILD_ARM 0
diff --git a/autowiring/AutowiringDebug.h b/src/autowiring/AutowiringDebug.h
similarity index 100%
rename from autowiring/AutowiringDebug.h
rename to src/autowiring/AutowiringDebug.h
diff --git a/autowiring/BasicThread.h b/src/autowiring/BasicThread.h
similarity index 100%
rename from autowiring/BasicThread.h
rename to src/autowiring/BasicThread.h
diff --git a/autowiring/BasicThreadStateBlock.h b/src/autowiring/BasicThreadStateBlock.h
similarity index 100%
rename from autowiring/BasicThreadStateBlock.h
rename to src/autowiring/BasicThreadStateBlock.h
diff --git a/autowiring/Bolt.h b/src/autowiring/Bolt.h
similarity index 100%
rename from autowiring/Bolt.h
rename to src/autowiring/Bolt.h
diff --git a/autowiring/BoltBase.h b/src/autowiring/BoltBase.h
similarity index 100%
rename from autowiring/BoltBase.h
rename to src/autowiring/BoltBase.h
diff --git a/autowiring/C++11/README.md b/src/autowiring/C++11/README.md
similarity index 100%
rename from autowiring/C++11/README.md
rename to src/autowiring/C++11/README.md
diff --git a/autowiring/C++11/boost_array.h b/src/autowiring/C++11/boost_array.h
similarity index 100%
rename from autowiring/C++11/boost_array.h
rename to src/autowiring/C++11/boost_array.h
diff --git a/autowiring/C++11/boost_atomic.h b/src/autowiring/C++11/boost_atomic.h
similarity index 100%
rename from autowiring/C++11/boost_atomic.h
rename to src/autowiring/C++11/boost_atomic.h
diff --git a/autowiring/C++11/boost_chrono.h b/src/autowiring/C++11/boost_chrono.h
similarity index 100%
rename from autowiring/C++11/boost_chrono.h
rename to src/autowiring/C++11/boost_chrono.h
diff --git a/autowiring/C++11/boost_exception_ptr.h b/src/autowiring/C++11/boost_exception_ptr.h
similarity index 100%
rename from autowiring/C++11/boost_exception_ptr.h
rename to src/autowiring/C++11/boost_exception_ptr.h
diff --git a/autowiring/C++11/boost_functional.h b/src/autowiring/C++11/boost_functional.h
similarity index 100%
rename from autowiring/C++11/boost_functional.h
rename to src/autowiring/C++11/boost_functional.h
diff --git a/autowiring/C++11/boost_future.h b/src/autowiring/C++11/boost_future.h
similarity index 100%
rename from autowiring/C++11/boost_future.h
rename to src/autowiring/C++11/boost_future.h
diff --git a/autowiring/C++11/boost_mutex.h b/src/autowiring/C++11/boost_mutex.h
similarity index 100%
rename from autowiring/C++11/boost_mutex.h
rename to src/autowiring/C++11/boost_mutex.h
diff --git a/autowiring/C++11/boost_rvalue.h b/src/autowiring/C++11/boost_rvalue.h
similarity index 100%
rename from autowiring/C++11/boost_rvalue.h
rename to src/autowiring/C++11/boost_rvalue.h
diff --git a/autowiring/C++11/boost_shared_ptr.h b/src/autowiring/C++11/boost_shared_ptr.h
similarity index 100%
rename from autowiring/C++11/boost_shared_ptr.h
rename to src/autowiring/C++11/boost_shared_ptr.h
diff --git a/autowiring/C++11/boost_system_error.h b/src/autowiring/C++11/boost_system_error.h
similarity index 100%
rename from autowiring/C++11/boost_system_error.h
rename to src/autowiring/C++11/boost_system_error.h
diff --git a/autowiring/C++11/boost_thread.h b/src/autowiring/C++11/boost_thread.h
similarity index 100%
rename from autowiring/C++11/boost_thread.h
rename to src/autowiring/C++11/boost_thread.h
diff --git a/autowiring/C++11/boost_tuple.h b/src/autowiring/C++11/boost_tuple.h
similarity index 100%
rename from autowiring/C++11/boost_tuple.h
rename to src/autowiring/C++11/boost_tuple.h
diff --git a/autowiring/C++11/boost_type_traits.h b/src/autowiring/C++11/boost_type_traits.h
similarity index 100%
rename from autowiring/C++11/boost_type_traits.h
rename to src/autowiring/C++11/boost_type_traits.h
diff --git a/autowiring/C++11/boost_utility.h b/src/autowiring/C++11/boost_utility.h
similarity index 100%
rename from autowiring/C++11/boost_utility.h
rename to src/autowiring/C++11/boost_utility.h
diff --git a/autowiring/C++11/chrono_with_profiling_clock.h b/src/autowiring/C++11/chrono_with_profiling_clock.h
similarity index 100%
rename from autowiring/C++11/chrono_with_profiling_clock.h
rename to src/autowiring/C++11/chrono_with_profiling_clock.h
diff --git a/autowiring/C++11/cpp11.h b/src/autowiring/C++11/cpp11.h
similarity index 100%
rename from autowiring/C++11/cpp11.h
rename to src/autowiring/C++11/cpp11.h
diff --git a/autowiring/C++11/empty_file.h b/src/autowiring/C++11/empty_file.h
similarity index 100%
rename from autowiring/C++11/empty_file.h
rename to src/autowiring/C++11/empty_file.h
diff --git a/autowiring/C++11/make_unique.h b/src/autowiring/C++11/make_unique.h
similarity index 100%
rename from autowiring/C++11/make_unique.h
rename to src/autowiring/C++11/make_unique.h
diff --git a/autowiring/C++11/memory.h b/src/autowiring/C++11/memory.h
similarity index 100%
rename from autowiring/C++11/memory.h
rename to src/autowiring/C++11/memory.h
diff --git a/autowiring/C++11/memory_nostl11.h b/src/autowiring/C++11/memory_nostl11.h
similarity index 100%
rename from autowiring/C++11/memory_nostl11.h
rename to src/autowiring/C++11/memory_nostl11.h
diff --git a/autowiring/C++11/mutex.h b/src/autowiring/C++11/mutex.h
similarity index 100%
rename from autowiring/C++11/mutex.h
rename to src/autowiring/C++11/mutex.h
diff --git a/autowiring/C++11/tr1_unordered_map.h b/src/autowiring/C++11/tr1_unordered_map.h
similarity index 100%
rename from autowiring/C++11/tr1_unordered_map.h
rename to src/autowiring/C++11/tr1_unordered_map.h
diff --git a/autowiring/C++11/tr1_unordered_set.h b/src/autowiring/C++11/tr1_unordered_set.h
similarity index 100%
rename from autowiring/C++11/tr1_unordered_set.h
rename to src/autowiring/C++11/tr1_unordered_set.h
diff --git a/autowiring/C++11/type_index.h b/src/autowiring/C++11/type_index.h
similarity index 100%
rename from autowiring/C++11/type_index.h
rename to src/autowiring/C++11/type_index.h
diff --git a/autowiring/C++11/unique_ptr.h b/src/autowiring/C++11/unique_ptr.h
similarity index 100%
rename from autowiring/C++11/unique_ptr.h
rename to src/autowiring/C++11/unique_ptr.h
diff --git a/src/autowiring/CMakeLists.txt b/src/autowiring/CMakeLists.txt
index 6664f6db4..cef8e7b83 100644
--- a/src/autowiring/CMakeLists.txt
+++ b/src/autowiring/CMakeLists.txt
@@ -3,7 +3,6 @@
 #
 
 add_subdirectory(test)
-add_subdirectory(benchmark)
 
 #
 # Configure source files
@@ -134,6 +133,7 @@ set(Autowiring_SRCS
   Parallel.h
   Parallel.cpp
   registration.h
+  result_or_default.h
   SatCounter.h
   signal_base.h
   SlotInformation.cpp
@@ -179,6 +179,38 @@ add_conditional_sources(
   ${PROJECT_SOURCE_DIR}/contrib/autoboost/libs/thread/src/future.cpp
 )
 
+add_conditional_sources(
+  Autowiring_SRCS
+  "TRUE"
+  GROUP_NAME "C++11"
+  FILES
+  C++11/boost_array.h
+  C++11/boost_atomic.h
+  C++11/boost_chrono.h
+  C++11/boost_exception_ptr.h
+  C++11/boost_functional.h
+  C++11/boost_future.h
+  C++11/boost_mutex.h
+  C++11/boost_rvalue.h
+  C++11/boost_shared_ptr.h
+  C++11/boost_system_error.h
+  C++11/boost_thread.h
+  C++11/boost_tuple.h
+  C++11/boost_type_traits.h
+  C++11/boost_utility.h
+  C++11/chrono_with_profiling_clock.h
+  C++11/cpp11.h
+  C++11/empty_file.h
+  C++11/make_unique.h
+  C++11/memory.h
+  C++11/memory_nostl11.h
+  C++11/mutex.h
+  C++11/tr1_unordered_map.h
+  C++11/tr1_unordered_set.h
+  C++11/type_index.h
+  C++11/unique_ptr.h
+)
+
 add_windows_sources(Autowiring_SRCS
   auto_future_win.h
   CoreThreadWin.cpp
@@ -224,7 +256,6 @@ add_conditional_sources(Autowiring_SRCS "NOT WIN32 AND NOT APPLE"
   FILES CoreThreadLinux.cpp
 )
 
-rewrite_header_paths(Autowiring_SRCS)
 add_pch(Autowiring_SRCS "stdafx.h" "stdafx.cpp")
 
 #
@@ -233,14 +264,17 @@ add_pch(Autowiring_SRCS "stdafx.h" "stdafx.cpp")
 
 add_library(Autowiring STATIC ${Autowiring_SRCS})
 
-target_include_directories(Autowiring
+target_include_directories(
+  Autowiring
   PUBLIC
   "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/contrib/autoboost>"
   INTERFACE
-  "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
   "$<INSTALL_INTERFACE:include>"
 )
 
+# Install public header files
+install_headers(TARGET Autowiring DESTINATION include/autowiring COMPONENT autowiring)
+
 # Need multithreading services if available
 find_package(Threads)
 if(Threads_FOUND)
diff --git a/autowiring/CallExtractor.h b/src/autowiring/CallExtractor.h
similarity index 100%
rename from autowiring/CallExtractor.h
rename to src/autowiring/CallExtractor.h
diff --git a/autowiring/ContextEnumerator.h b/src/autowiring/ContextEnumerator.h
similarity index 100%
rename from autowiring/ContextEnumerator.h
rename to src/autowiring/ContextEnumerator.h
diff --git a/autowiring/ContextMap.h b/src/autowiring/ContextMap.h
similarity index 100%
rename from autowiring/ContextMap.h
rename to src/autowiring/ContextMap.h
diff --git a/autowiring/ContextMember.h b/src/autowiring/ContextMember.h
similarity index 100%
rename from autowiring/ContextMember.h
rename to src/autowiring/ContextMember.h
diff --git a/autowiring/CoreContext.h b/src/autowiring/CoreContext.h
similarity index 100%
rename from autowiring/CoreContext.h
rename to src/autowiring/CoreContext.h
diff --git a/autowiring/CoreContextStateBlock.h b/src/autowiring/CoreContextStateBlock.h
similarity index 100%
rename from autowiring/CoreContextStateBlock.h
rename to src/autowiring/CoreContextStateBlock.h
diff --git a/autowiring/CoreJob.h b/src/autowiring/CoreJob.h
similarity index 100%
rename from autowiring/CoreJob.h
rename to src/autowiring/CoreJob.h
diff --git a/autowiring/CoreObject.h b/src/autowiring/CoreObject.h
similarity index 100%
rename from autowiring/CoreObject.h
rename to src/autowiring/CoreObject.h
diff --git a/autowiring/CoreObjectDescriptor.h b/src/autowiring/CoreObjectDescriptor.h
similarity index 100%
rename from autowiring/CoreObjectDescriptor.h
rename to src/autowiring/CoreObjectDescriptor.h
diff --git a/autowiring/CoreRunnable.h b/src/autowiring/CoreRunnable.h
similarity index 100%
rename from autowiring/CoreRunnable.h
rename to src/autowiring/CoreRunnable.h
diff --git a/autowiring/CoreThread.h b/src/autowiring/CoreThread.h
similarity index 100%
rename from autowiring/CoreThread.h
rename to src/autowiring/CoreThread.h
diff --git a/autowiring/CreationRules.h b/src/autowiring/CreationRules.h
similarity index 100%
rename from autowiring/CreationRules.h
rename to src/autowiring/CreationRules.h
diff --git a/autowiring/CurrentContextPusher.h b/src/autowiring/CurrentContextPusher.h
similarity index 100%
rename from autowiring/CurrentContextPusher.h
rename to src/autowiring/CurrentContextPusher.h
diff --git a/autowiring/Decompose.h b/src/autowiring/Decompose.h
similarity index 100%
rename from autowiring/Decompose.h
rename to src/autowiring/Decompose.h
diff --git a/autowiring/DecorationDisposition.h b/src/autowiring/DecorationDisposition.h
similarity index 100%
rename from autowiring/DecorationDisposition.h
rename to src/autowiring/DecorationDisposition.h
diff --git a/autowiring/Deferred.h b/src/autowiring/Deferred.h
similarity index 100%
rename from autowiring/Deferred.h
rename to src/autowiring/Deferred.h
diff --git a/autowiring/Deserialize.h b/src/autowiring/Deserialize.h
similarity index 100%
rename from autowiring/Deserialize.h
rename to src/autowiring/Deserialize.h
diff --git a/autowiring/DispatchQueue.h b/src/autowiring/DispatchQueue.h
similarity index 100%
rename from autowiring/DispatchQueue.h
rename to src/autowiring/DispatchQueue.h
diff --git a/autowiring/DispatchThunk.h b/src/autowiring/DispatchThunk.h
similarity index 100%
rename from autowiring/DispatchThunk.h
rename to src/autowiring/DispatchThunk.h
diff --git a/autowiring/ExceptionFilter.h b/src/autowiring/ExceptionFilter.h
similarity index 100%
rename from autowiring/ExceptionFilter.h
rename to src/autowiring/ExceptionFilter.h
diff --git a/autowiring/GlobalCoreContext.h b/src/autowiring/GlobalCoreContext.h
similarity index 100%
rename from autowiring/GlobalCoreContext.h
rename to src/autowiring/GlobalCoreContext.h
diff --git a/autowiring/HeteroBlock.h b/src/autowiring/HeteroBlock.h
similarity index 100%
rename from autowiring/HeteroBlock.h
rename to src/autowiring/HeteroBlock.h
diff --git a/autowiring/InterlockedExchange.h b/src/autowiring/InterlockedExchange.h
similarity index 100%
rename from autowiring/InterlockedExchange.h
rename to src/autowiring/InterlockedExchange.h
diff --git a/autowiring/LockFreeList.h b/src/autowiring/LockFreeList.h
similarity index 100%
rename from autowiring/LockFreeList.h
rename to src/autowiring/LockFreeList.h
diff --git a/autowiring/LockReducedCollection.h b/src/autowiring/LockReducedCollection.h
similarity index 100%
rename from autowiring/LockReducedCollection.h
rename to src/autowiring/LockReducedCollection.h
diff --git a/autowiring/ManualThreadPool.h b/src/autowiring/ManualThreadPool.h
similarity index 100%
rename from autowiring/ManualThreadPool.h
rename to src/autowiring/ManualThreadPool.h
diff --git a/autowiring/MemoEntry.h b/src/autowiring/MemoEntry.h
similarity index 100%
rename from autowiring/MemoEntry.h
rename to src/autowiring/MemoEntry.h
diff --git a/autowiring/MicroAutoFilter.h b/src/autowiring/MicroAutoFilter.h
similarity index 100%
rename from autowiring/MicroAutoFilter.h
rename to src/autowiring/MicroAutoFilter.h
diff --git a/autowiring/MicroBolt.h b/src/autowiring/MicroBolt.h
similarity index 100%
rename from autowiring/MicroBolt.h
rename to src/autowiring/MicroBolt.h
diff --git a/autowiring/NullPool.h b/src/autowiring/NullPool.h
similarity index 100%
rename from autowiring/NullPool.h
rename to src/autowiring/NullPool.h
diff --git a/autowiring/Object.h b/src/autowiring/Object.h
similarity index 100%
rename from autowiring/Object.h
rename to src/autowiring/Object.h
diff --git a/autowiring/ObjectPool.h b/src/autowiring/ObjectPool.h
similarity index 100%
rename from autowiring/ObjectPool.h
rename to src/autowiring/ObjectPool.h
diff --git a/autowiring/ObjectPoolMonitor.h b/src/autowiring/ObjectPoolMonitor.h
similarity index 100%
rename from autowiring/ObjectPoolMonitor.h
rename to src/autowiring/ObjectPoolMonitor.h
diff --git a/autowiring/Parallel.h b/src/autowiring/Parallel.h
similarity index 100%
rename from autowiring/Parallel.h
rename to src/autowiring/Parallel.h
diff --git a/autowiring/SatCounter.h b/src/autowiring/SatCounter.h
similarity index 100%
rename from autowiring/SatCounter.h
rename to src/autowiring/SatCounter.h
diff --git a/autowiring/SlotInformation.h b/src/autowiring/SlotInformation.h
similarity index 100%
rename from autowiring/SlotInformation.h
rename to src/autowiring/SlotInformation.h
diff --git a/autowiring/SystemThreadPool.h b/src/autowiring/SystemThreadPool.h
similarity index 100%
rename from autowiring/SystemThreadPool.h
rename to src/autowiring/SystemThreadPool.h
diff --git a/autowiring/SystemThreadPoolStl.h b/src/autowiring/SystemThreadPoolStl.h
similarity index 100%
rename from autowiring/SystemThreadPoolStl.h
rename to src/autowiring/SystemThreadPoolStl.h
diff --git a/autowiring/TeardownNotifier.h b/src/autowiring/TeardownNotifier.h
similarity index 100%
rename from autowiring/TeardownNotifier.h
rename to src/autowiring/TeardownNotifier.h
diff --git a/autowiring/ThreadPool.h b/src/autowiring/ThreadPool.h
similarity index 100%
rename from autowiring/ThreadPool.h
rename to src/autowiring/ThreadPool.h
diff --git a/autowiring/TypeIdentifier.h b/src/autowiring/TypeIdentifier.h
similarity index 100%
rename from autowiring/TypeIdentifier.h
rename to src/autowiring/TypeIdentifier.h
diff --git a/autowiring/TypeRegistry.h b/src/autowiring/TypeRegistry.h
similarity index 100%
rename from autowiring/TypeRegistry.h
rename to src/autowiring/TypeRegistry.h
diff --git a/autowiring/TypeUnifier.h b/src/autowiring/TypeUnifier.h
similarity index 100%
rename from autowiring/TypeUnifier.h
rename to src/autowiring/TypeUnifier.h
diff --git a/autowiring/altitude.h b/src/autowiring/altitude.h
similarity index 100%
rename from autowiring/altitude.h
rename to src/autowiring/altitude.h
diff --git a/autowiring/at_exit.h b/src/autowiring/at_exit.h
similarity index 100%
rename from autowiring/at_exit.h
rename to src/autowiring/at_exit.h
diff --git a/autowiring/atomic_list.h b/src/autowiring/atomic_list.h
similarity index 100%
rename from autowiring/atomic_list.h
rename to src/autowiring/atomic_list.h
diff --git a/autowiring/atomic_object.h b/src/autowiring/atomic_object.h
similarity index 100%
rename from autowiring/atomic_object.h
rename to src/autowiring/atomic_object.h
diff --git a/autowiring/auto_arg.h b/src/autowiring/auto_arg.h
similarity index 100%
rename from autowiring/auto_arg.h
rename to src/autowiring/auto_arg.h
diff --git a/autowiring/auto_future.h b/src/autowiring/auto_future.h
similarity index 100%
rename from autowiring/auto_future.h
rename to src/autowiring/auto_future.h
diff --git a/autowiring/auto_future_mac.h b/src/autowiring/auto_future_mac.h
similarity index 100%
rename from autowiring/auto_future_mac.h
rename to src/autowiring/auto_future_mac.h
diff --git a/autowiring/auto_future_win.h b/src/autowiring/auto_future_win.h
similarity index 100%
rename from autowiring/auto_future_win.h
rename to src/autowiring/auto_future_win.h
diff --git a/autowiring/auto_id.h b/src/autowiring/auto_id.h
similarity index 100%
rename from autowiring/auto_id.h
rename to src/autowiring/auto_id.h
diff --git a/autowiring/auto_in.h b/src/autowiring/auto_in.h
similarity index 100%
rename from autowiring/auto_in.h
rename to src/autowiring/auto_in.h
diff --git a/autowiring/auto_out.h b/src/autowiring/auto_out.h
similarity index 100%
rename from autowiring/auto_out.h
rename to src/autowiring/auto_out.h
diff --git a/autowiring/auto_prev.h b/src/autowiring/auto_prev.h
similarity index 100%
rename from autowiring/auto_prev.h
rename to src/autowiring/auto_prev.h
diff --git a/autowiring/auto_signal.h b/src/autowiring/auto_signal.h
similarity index 100%
rename from autowiring/auto_signal.h
rename to src/autowiring/auto_signal.h
diff --git a/autowiring/auto_tuple.h b/src/autowiring/auto_tuple.h
similarity index 100%
rename from autowiring/auto_tuple.h
rename to src/autowiring/auto_tuple.h
diff --git a/autowiring/autowiring.h b/src/autowiring/autowiring.h
similarity index 86%
rename from autowiring/autowiring.h
rename to src/autowiring/autowiring.h
index d627a2631..c7adf3007 100644
--- a/autowiring/autowiring.h
+++ b/src/autowiring/autowiring.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include "Autowired.h"
-#include "AutoNetServer.h"
 #include "auto_in.h"
 #include "auto_out.h"
 #include "auto_prev.h"
diff --git a/autowiring/autowiring_error.h b/src/autowiring/autowiring_error.h
similarity index 100%
rename from autowiring/autowiring_error.h
rename to src/autowiring/autowiring_error.h
diff --git a/autowiring/basic_timer.h b/src/autowiring/basic_timer.h
similarity index 100%
rename from autowiring/basic_timer.h
rename to src/autowiring/basic_timer.h
diff --git a/autowiring/callable.h b/src/autowiring/callable.h
similarity index 100%
rename from autowiring/callable.h
rename to src/autowiring/callable.h
diff --git a/autowiring/chrono_types.h b/src/autowiring/chrono_types.h
similarity index 100%
rename from autowiring/chrono_types.h
rename to src/autowiring/chrono_types.h
diff --git a/autowiring/demangle.h b/src/autowiring/demangle.h
similarity index 100%
rename from autowiring/demangle.h
rename to src/autowiring/demangle.h
diff --git a/autowiring/deref_error.h b/src/autowiring/deref_error.h
similarity index 100%
rename from autowiring/deref_error.h
rename to src/autowiring/deref_error.h
diff --git a/autowiring/dispatch_aborted_exception.h b/src/autowiring/dispatch_aborted_exception.h
similarity index 100%
rename from autowiring/dispatch_aborted_exception.h
rename to src/autowiring/dispatch_aborted_exception.h
diff --git a/autowiring/fast_pointer_cast.h b/src/autowiring/fast_pointer_cast.h
similarity index 100%
rename from autowiring/fast_pointer_cast.h
rename to src/autowiring/fast_pointer_cast.h
diff --git a/autowiring/has_autofilter.h b/src/autowiring/has_autofilter.h
similarity index 100%
rename from autowiring/has_autofilter.h
rename to src/autowiring/has_autofilter.h
diff --git a/autowiring/has_autoinit.h b/src/autowiring/has_autoinit.h
similarity index 100%
rename from autowiring/has_autoinit.h
rename to src/autowiring/has_autoinit.h
diff --git a/autowiring/has_simple_constructor.h b/src/autowiring/has_simple_constructor.h
similarity index 100%
rename from autowiring/has_simple_constructor.h
rename to src/autowiring/has_simple_constructor.h
diff --git a/autowiring/has_static_new.h b/src/autowiring/has_static_new.h
similarity index 100%
rename from autowiring/has_static_new.h
rename to src/autowiring/has_static_new.h
diff --git a/autowiring/has_validate.h b/src/autowiring/has_validate.h
similarity index 100%
rename from autowiring/has_validate.h
rename to src/autowiring/has_validate.h
diff --git a/autowiring/hash_tuple.h b/src/autowiring/hash_tuple.h
similarity index 100%
rename from autowiring/hash_tuple.h
rename to src/autowiring/hash_tuple.h
diff --git a/autowiring/index_tuple.h b/src/autowiring/index_tuple.h
similarity index 100%
rename from autowiring/index_tuple.h
rename to src/autowiring/index_tuple.h
diff --git a/autowiring/is_any.h b/src/autowiring/is_any.h
similarity index 100%
rename from autowiring/is_any.h
rename to src/autowiring/is_any.h
diff --git a/autowiring/is_shared_ptr.h b/src/autowiring/is_shared_ptr.h
similarity index 100%
rename from autowiring/is_shared_ptr.h
rename to src/autowiring/is_shared_ptr.h
diff --git a/autowiring/member_new_type.h b/src/autowiring/member_new_type.h
similarity index 100%
rename from autowiring/member_new_type.h
rename to src/autowiring/member_new_type.h
diff --git a/autowiring/noop.h b/src/autowiring/noop.h
similarity index 100%
rename from autowiring/noop.h
rename to src/autowiring/noop.h
diff --git a/autowiring/observable.h b/src/autowiring/observable.h
similarity index 100%
rename from autowiring/observable.h
rename to src/autowiring/observable.h
diff --git a/autowiring/once.h b/src/autowiring/once.h
similarity index 100%
rename from autowiring/once.h
rename to src/autowiring/once.h
diff --git a/autowiring/registration.h b/src/autowiring/registration.h
similarity index 100%
rename from autowiring/registration.h
rename to src/autowiring/registration.h
diff --git a/autowiring/result_or_default.h b/src/autowiring/result_or_default.h
similarity index 100%
rename from autowiring/result_or_default.h
rename to src/autowiring/result_or_default.h
diff --git a/autowiring/signal_base.h b/src/autowiring/signal_base.h
similarity index 100%
rename from autowiring/signal_base.h
rename to src/autowiring/signal_base.h
diff --git a/autowiring/spin_lock.h b/src/autowiring/spin_lock.h
similarity index 100%
rename from autowiring/spin_lock.h
rename to src/autowiring/spin_lock.h
diff --git a/autowiring/sum.h b/src/autowiring/sum.h
similarity index 100%
rename from autowiring/sum.h
rename to src/autowiring/sum.h
diff --git a/src/autowiring/test/ArgumentTypeTest.cpp b/src/autowiring/test/ArgumentTypeTest.cpp
index afe0f713e..1685124a3 100644
--- a/src/autowiring/test/ArgumentTypeTest.cpp
+++ b/src/autowiring/test/ArgumentTypeTest.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
-#include "var_logic.h"
+#include <autowiring/var_logic.h>
 #include <autowiring/auto_arg.h>
 #include <autowiring/has_autofilter.h>
 
diff --git a/src/autowiring/test/AtomicListTest.cpp b/src/autowiring/test/AtomicListTest.cpp
index 04e3c4267..507756381 100644
--- a/src/autowiring/test/AtomicListTest.cpp
+++ b/src/autowiring/test/AtomicListTest.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
-#include "at_exit.h"
-#include "atomic_list.h"
+#include <autowiring/at_exit.h>
+#include <autowiring/atomic_list.h>
 #include <thread>
 
 using autowiring::atomic_list;
diff --git a/src/autowiring/test/AutowiringTest.cpp b/src/autowiring/test/AutowiringTest.cpp
index 016287b34..637b16a14 100644
--- a/src/autowiring/test/AutowiringTest.cpp
+++ b/src/autowiring/test/AutowiringTest.cpp
@@ -1,11 +1,11 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
-#include "gtest-all-guard.hpp"
 #include "TestFixtures/SimpleObject.hpp"
 #include "TestFixtures/SimpleReceiver.hpp"
+#include <autotesting/gtest-all-guard.hpp>
 #include <autowiring/Autowired.h>
+#include <autowiring/AutowiringDebug.h>
 #include <autowiring/CoreThread.h>
-#include "AutowiringDebug.h"
 
 int main(int argc, const char* argv []) {
   autowiring::dbg::DebugInit();
diff --git a/src/autowiring/test/CoreContextTest.cpp b/src/autowiring/test/CoreContextTest.cpp
index 04704941d..cd6bc89f7 100644
--- a/src/autowiring/test/CoreContextTest.cpp
+++ b/src/autowiring/test/CoreContextTest.cpp
@@ -2,6 +2,7 @@
 #include "stdafx.h"
 #include "TestFixtures/SimpleObject.hpp"
 #include <autowiring/ContextEnumerator.h>
+#include <autowiring/CoreThread.h>
 #include <algorithm>
 #include <set>
 #include THREAD_HEADER
diff --git a/src/autowiring/test/ParallelTest.cpp b/src/autowiring/test/ParallelTest.cpp
index d0519b3dc..7ebbe541d 100644
--- a/src/autowiring/test/ParallelTest.cpp
+++ b/src/autowiring/test/ParallelTest.cpp
@@ -1,6 +1,5 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
-#include "gtest-all-guard.hpp"
 #include <autowiring/Parallel.h>
 #include <algorithm>
 #include <thread>
diff --git a/src/autowiring/test/PostConstructTest.cpp b/src/autowiring/test/PostConstructTest.cpp
index b669b7b31..1b4e8494d 100644
--- a/src/autowiring/test/PostConstructTest.cpp
+++ b/src/autowiring/test/PostConstructTest.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
 #include "TestFixtures/SimpleObject.hpp"
-#include "test/HasForwardOnlyType.hpp"
+#include "HasForwardOnlyType.hpp"
 #include <autowiring/Autowired.h>
 #include <autowiring/ContextMember.h>
 #include THREAD_HEADER
@@ -230,7 +230,7 @@ TEST_F(PostConstructTest, VerifyAllInstancesSatisfied) {
 TEST_F(PostConstructTest, ContextNotifyWhenAutowired) {
   auto called = std::make_shared<bool>(false);
   AutoCurrentContext ctxt;
-  
+
   // Now we'd like to be notified when SimpleObject gets added:
   ctxt->NotifyWhenAutowired<SimpleObject>(
     [called] {
diff --git a/src/autowiring/test/SpinLockTest.cpp b/src/autowiring/test/SpinLockTest.cpp
index 2e478c83c..dde95a86c 100644
--- a/src/autowiring/test/SpinLockTest.cpp
+++ b/src/autowiring/test/SpinLockTest.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
-#include "spin_lock.h"
+#include <autowiring/spin_lock.h>
 #include <gtest/gtest.h>
 #include <mutex>
 #include <thread>
diff --git a/src/autowiring/test/ThreadPoolTest.cpp b/src/autowiring/test/ThreadPoolTest.cpp
index 2029a9d28..336d6c98c 100644
--- a/src/autowiring/test/ThreadPoolTest.cpp
+++ b/src/autowiring/test/ThreadPoolTest.cpp
@@ -7,8 +7,8 @@
 #include FUTURE_HEADER
 
 #ifdef _MSC_VER
-#include "SystemThreadPoolWinXP.hpp"
-#include "SystemThreadPoolWinLH.hpp"
+#include <autowiring/SystemThreadPoolWinXP.hpp>
+#include <autowiring/SystemThreadPoolWinLH.hpp>
 #endif
 
 template<typename T>
diff --git a/src/autowiring/test/stdafx.h b/src/autowiring/test/stdafx.h
index 50c2d9522..bbc6fcdef 100644
--- a/src/autowiring/test/stdafx.h
+++ b/src/autowiring/test/stdafx.h
@@ -4,7 +4,7 @@
 // Internal build flag for namespace discrimination
 #define AUTOWIRING_IS_BEING_BUILT
 
-#include <C++11/cpp11.h>
+#include <autowiring/C++11/cpp11.h>
 #include <gtest/gtest.h>
 #include <autowiring/autowiring.h>
 
diff --git a/autowiring/thread_specific_ptr.h b/src/autowiring/thread_specific_ptr.h
similarity index 100%
rename from autowiring/thread_specific_ptr.h
rename to src/autowiring/thread_specific_ptr.h
diff --git a/autowiring/thread_specific_ptr_unix.h b/src/autowiring/thread_specific_ptr_unix.h
similarity index 100%
rename from autowiring/thread_specific_ptr_unix.h
rename to src/autowiring/thread_specific_ptr_unix.h
diff --git a/autowiring/thread_specific_ptr_win.h b/src/autowiring/thread_specific_ptr_win.h
similarity index 100%
rename from autowiring/thread_specific_ptr_win.h
rename to src/autowiring/thread_specific_ptr_win.h
diff --git a/autowiring/unlock_object.h b/src/autowiring/unlock_object.h
similarity index 100%
rename from autowiring/unlock_object.h
rename to src/autowiring/unlock_object.h
diff --git a/autowiring/uuid.h b/src/autowiring/uuid.h
similarity index 100%
rename from autowiring/uuid.h
rename to src/autowiring/uuid.h
diff --git a/autowiring/var_logic.h b/src/autowiring/var_logic.h
similarity index 100%
rename from autowiring/var_logic.h
rename to src/autowiring/var_logic.h
diff --git a/src/autowiring/benchmark/AutoBench.cpp b/src/benchmark/AutoBench.cpp
similarity index 100%
rename from src/autowiring/benchmark/AutoBench.cpp
rename to src/benchmark/AutoBench.cpp
diff --git a/src/autowiring/benchmark/Benchmark.cpp b/src/benchmark/Benchmark.cpp
similarity index 100%
rename from src/autowiring/benchmark/Benchmark.cpp
rename to src/benchmark/Benchmark.cpp
diff --git a/src/autowiring/benchmark/Benchmark.h b/src/benchmark/Benchmark.h
similarity index 100%
rename from src/autowiring/benchmark/Benchmark.h
rename to src/benchmark/Benchmark.h
diff --git a/src/autowiring/benchmark/CMakeLists.txt b/src/benchmark/CMakeLists.txt
similarity index 100%
rename from src/autowiring/benchmark/CMakeLists.txt
rename to src/benchmark/CMakeLists.txt
diff --git a/src/autowiring/benchmark/ContextSearchBm.cpp b/src/benchmark/ContextSearchBm.cpp
similarity index 100%
rename from src/autowiring/benchmark/ContextSearchBm.cpp
rename to src/benchmark/ContextSearchBm.cpp
diff --git a/src/autowiring/benchmark/ContextSearchBm.h b/src/benchmark/ContextSearchBm.h
similarity index 100%
rename from src/autowiring/benchmark/ContextSearchBm.h
rename to src/benchmark/ContextSearchBm.h
diff --git a/src/autowiring/benchmark/ContextTrackingBm.cpp b/src/benchmark/ContextTrackingBm.cpp
similarity index 100%
rename from src/autowiring/benchmark/ContextTrackingBm.cpp
rename to src/benchmark/ContextTrackingBm.cpp
diff --git a/src/autowiring/benchmark/ContextTrackingBm.h b/src/benchmark/ContextTrackingBm.h
similarity index 100%
rename from src/autowiring/benchmark/ContextTrackingBm.h
rename to src/benchmark/ContextTrackingBm.h
diff --git a/src/autowiring/benchmark/DispatchQueueBm.cpp b/src/benchmark/DispatchQueueBm.cpp
similarity index 98%
rename from src/autowiring/benchmark/DispatchQueueBm.cpp
rename to src/benchmark/DispatchQueueBm.cpp
index b8851c6d1..86a4e4a39 100644
--- a/src/autowiring/benchmark/DispatchQueueBm.cpp
+++ b/src/benchmark/DispatchQueueBm.cpp
@@ -2,6 +2,7 @@
 #include "stdafx.h"
 #include "DispatchQueueBm.h"
 #include "Benchmark.h"
+#include <autowiring/CoreThread.h>
 #include FUTURE_HEADER
 #include <thread>
 
diff --git a/src/autowiring/benchmark/DispatchQueueBm.h b/src/benchmark/DispatchQueueBm.h
similarity index 100%
rename from src/autowiring/benchmark/DispatchQueueBm.h
rename to src/benchmark/DispatchQueueBm.h
diff --git a/src/autowiring/benchmark/Foo.h b/src/benchmark/Foo.h
similarity index 100%
rename from src/autowiring/benchmark/Foo.h
rename to src/benchmark/Foo.h
diff --git a/src/autowiring/benchmark/ObjectPoolBm.cpp b/src/benchmark/ObjectPoolBm.cpp
similarity index 100%
rename from src/autowiring/benchmark/ObjectPoolBm.cpp
rename to src/benchmark/ObjectPoolBm.cpp
diff --git a/src/autowiring/benchmark/ObjectPoolBm.h b/src/benchmark/ObjectPoolBm.h
similarity index 100%
rename from src/autowiring/benchmark/ObjectPoolBm.h
rename to src/benchmark/ObjectPoolBm.h
diff --git a/src/autowiring/benchmark/PrintableDuration.h b/src/benchmark/PrintableDuration.h
similarity index 100%
rename from src/autowiring/benchmark/PrintableDuration.h
rename to src/benchmark/PrintableDuration.h
diff --git a/src/autowiring/benchmark/PriorityBoost.cpp b/src/benchmark/PriorityBoost.cpp
similarity index 100%
rename from src/autowiring/benchmark/PriorityBoost.cpp
rename to src/benchmark/PriorityBoost.cpp
diff --git a/src/autowiring/benchmark/PriorityBoost.h b/src/benchmark/PriorityBoost.h
similarity index 100%
rename from src/autowiring/benchmark/PriorityBoost.h
rename to src/benchmark/PriorityBoost.h
diff --git a/src/autowiring/benchmark/stdafx.cpp b/src/benchmark/stdafx.cpp
similarity index 100%
rename from src/autowiring/benchmark/stdafx.cpp
rename to src/benchmark/stdafx.cpp
diff --git a/src/autowiring/benchmark/stdafx.h b/src/benchmark/stdafx.h
similarity index 84%
rename from src/autowiring/benchmark/stdafx.h
rename to src/benchmark/stdafx.h
index 2080b423d..0597492fd 100644
--- a/src/autowiring/benchmark/stdafx.h
+++ b/src/benchmark/stdafx.h
@@ -1,7 +1,7 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #pragma once
 
-#include <C++11/cpp11.h>
+#include <autowiring/C++11/cpp11.h>
 #include <autowiring/autowiring.h>
 #include "Foo.h"