6 files changed, 1317 insertions, 638 deletions
diff --git a/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj b/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj
index 37b304b..00d8a1b 100644
--- a/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj
+++ b/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj
@@ -21,22 +21,40 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.h" />
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.h" />
-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_GlobalState.h" />
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.h" />
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDState.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_LatencyStatistics.h" />
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_HSWDisplay.h" />
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_HSWDisplay.h" />
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.h" />
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_Util.h" />
-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_HSWDisplay.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GLE.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GLE_GL.h" />
     <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionShaders.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_HSWDisplay.h" />
     <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Display.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_Display.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_Dxgi_Display.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_FocusReader.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_ShimFunctions.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Alg.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Allocator.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Array.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Atomic.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Color.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Compiler.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_ContainerAllocator.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_CRC32.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_DebugHelp.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Delegates.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Deque.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_File.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Hash.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_KeyCodes.h" />
@@ -44,8 +62,9 @@
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Lockless.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Log.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Math.h" />
-    <ClInclude Include="..\..\..\Src\Kernel\OVR_Deque.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Nullptr.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_RefCount.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_SharedMemory.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Std.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_String.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_StringHash.h" />
@@ -55,50 +74,46 @@
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Timer.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Types.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_UTF8Util.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_BitStream.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_NetworkPlugin.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_NetworkTypes.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_PacketizedTCPSocket.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_RPC1.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_Session.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_Socket.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_Win32_Socket.h" />
     <ClInclude Include="..\..\..\Src\OVR_CAPI.h" />
     <ClInclude Include="..\..\..\Src\OVR_CAPI_D3D.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Device.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceConstants.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceHandle.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceMessages.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDeviceBase.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDeviceImpl.h" />
+    <ClInclude Include="..\..\..\Src\OVR_CAPI_GL.h" />
     <ClInclude Include="..\..\..\Src\OVR_JSON.h" />
-    <ClInclude Include="..\..\..\Src\OVR_LatencyTestImpl.h" />
     <ClInclude Include="..\..\..\Src\OVR_Profile.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Recording.h" />
-    <ClInclude Include="..\..\..\Src\OVR_RecordingDefs.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Sensor2Impl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Sensor2ImplUtil.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorCalibration.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorFilter.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorFusion.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorImpl_Common.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorTimeFilter.h" />
+    <ClInclude Include="..\..\..\Src\OVR_SerialFormat.h" />
     <ClInclude Include="..\..\..\Src\OVR_Stereo.h" />
-    <ClInclude Include="..\..\..\Src\OVR_ThreadCommandQueue.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_DeviceManager.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_DeviceStatus.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_HIDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_HMDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_SensorDevice.h" />
+    <ClInclude Include="..\..\..\Src\Sensors\OVR_DeviceConstants.h" />
+    <ClInclude Include="..\..\..\Src\Service\Service_NetClient.h" />
+    <ClInclude Include="..\..\..\Src\Service\Service_NetSessionCommon.h" />
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_PoseState.h" />
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_SensorState.h" />
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_SensorStateReader.h" />
     <ClInclude Include="..\..\..\Src\Util\Util_ImageWindow.h" />
     <ClInclude Include="..\..\..\Src\Util\Util_Interface.h" />
-    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest.h" />
-    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2.h" />
+    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2Reader.h" />
+    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2State.h" />
     <ClInclude Include="..\..\..\Src\Util\Util_Render_Stereo.h" />
+    <ClInclude Include="..\..\..\Src\Util\Util_SystemGUI.h" />
+    <ClInclude Include="..\..\..\Src\Util\Util_SystemInfo.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.cpp" />
-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_GlobalState.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDState.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_LatencyStatistics.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_HSWDisplay.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_HSWDisplay.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -111,19 +126,29 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_DistortionRenderer.cpp" />
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_Util.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_DistortionRenderer.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_HSWDisplay.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_Util.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GLE.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_HSWDisplay.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.cpp" />
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_Display.cpp" />
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_FocusReader.cpp" />
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_RenderShim.cpp" />
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_ShimFunctions.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Alg.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Allocator.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Atomic.cpp" />
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_CRC32.cpp" />
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_DebugHelp.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_File.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_FileFILE.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Lockless.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Log.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Math.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_RefCount.cpp" />
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_SharedMemory.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Std.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_String.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_String_FormatUtil.cpp" />
@@ -133,123 +158,151 @@
     <ClCompile Include="..\..\..\Src\Kernel\OVR_ThreadsWinAPI.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Timer.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_UTF8Util.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_BitStream.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_NetworkPlugin.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_PacketizedTCPSocket.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_RPC1.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_Session.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_Socket.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_Win32_Socket.cpp" />
     <ClCompile Include="..\..\..\Src\OVR_CAPI.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_DeviceHandle.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_DeviceImpl.cpp" />
     <ClCompile Include="..\..\..\Src\OVR_JSON.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_LatencyTestImpl.cpp" />
     <ClCompile Include="..\..\..\Src\OVR_Profile.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Recording.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Sensor2Impl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorCalibration.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorFilter.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorFusion.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorImpl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorImpl_Common.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorTimeFilter.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_SerialFormat.cpp" />
     <ClCompile Include="..\..\..\Src\OVR_Stereo.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_ThreadCommandQueue.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_DeviceManager.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_DeviceStatus.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_HIDDevice.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_HMDDevice.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_SensorDevice.cpp" />
+    <ClCompile Include="..\..\..\Src\Service\Service_NetClient.cpp" />
+    <ClCompile Include="..\..\..\Src\Service\Service_NetSessionCommon.cpp" />
+    <ClCompile Include="..\..\..\Src\Tracking\Tracking_SensorStateReader.cpp" />
     <ClCompile Include="..\..\..\Src\Util\Util_ImageWindow.cpp" />
     <ClCompile Include="..\..\..\Src\Util\Util_Interface.cpp" />
-    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest.cpp" />
-    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2.cpp" />
+    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2Reader.cpp" />
     <ClCompile Include="..\..\..\Src\Util\Util_Render_Stereo.cpp" />
+    <ClCompile Include="..\..\..\Src\Util\Util_SystemGUI.cpp" />
+    <ClCompile Include="..\..\..\Src\Util\Util_SystemInfo.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_ps.psh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionChroma_ps.psh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_vs.vsh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionChroma_vs.vsh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionTimewarpChroma_vs.vsh">
-      <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionTimewarpChroma_vs.vsh">
+      <FileType>Document</FileType>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionTimewarp_vs.vsh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionTimewarp_vs.vsh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\Distortion_ps.psh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\Distortion_ps.psh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\Distortion_vs.vsh">
+      <FileType>Document</FileType>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\Distortion_vs.vsh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleQuad_ps.psh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleQuad_vs.vsh">
+      <FileType>Document</FileType>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_ps.psh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleTexturedQuad_ps.psh">
       <FileType>Document</FileType>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_vs.vsh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleTexturedQuad_vs.vsh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionCS2x2.csh">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
   </ItemGroup>
   <PropertyGroup Label="Globals">
diff --git a/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj.filters b/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj.filters
index 6fd4b16..f4f3648 100644
--- a/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj.filters
+++ b/LibOVR/Projects/Win32/VS2010/LibOVR.vcxproj.filters
@@ -1,40 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\Src\OVR_DeviceHandle.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_DeviceImpl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_JSON.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_LatencyTestImpl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Profile.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Sensor2Impl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorCalibration.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorFilter.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorFusion.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorImpl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorImpl_Common.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorTimeFilter.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Stereo.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_ThreadCommandQueue.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_DeviceManager.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_DeviceStatus.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_HIDDevice.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_HMDDevice.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_SensorDevice.cpp" />
-    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest.cpp">
+    <ClCompile Include="..\..\..\Src\Util\Util_Render_Stereo.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Util\Util_Render_Stereo.cpp">
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.cpp">
+      <Filter>CAPI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.cpp">
+      <Filter>CAPI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDState.cpp">
+      <Filter>CAPI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.cpp">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_Util.cpp">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.cpp">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.cpp">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.cpp">
+      <Filter>CAPI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Util\Util_ImageWindow.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Kernel\OVR_Alg.cpp">
-      <Filter>Kernel</Filter>
+    <ClCompile Include="..\..\..\Src\Util\Util_Interface.cpp">
+      <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Kernel\OVR_Allocator.cpp">
-      <Filter>Kernel</Filter>
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.cpp">
+      <Filter>CAPI\GL</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Kernel\OVR_Atomic.cpp">
-      <Filter>Kernel</Filter>
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.cpp">
+      <Filter>CAPI\GL</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Src\OVR_CAPI.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_JSON.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_Profile.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_SerialFormat.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_Stereo.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_File.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
@@ -53,6 +63,9 @@
     <ClCompile Include="..\..\..\Src\Kernel\OVR_RefCount.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_SharedMemory.cpp">
+      <Filter>Kernel</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Std.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
@@ -80,105 +93,148 @@
     <ClCompile Include="..\..\..\Src\Kernel\OVR_UTF8Util.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.cpp">
-      <Filter>CAPI</Filter>
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_Alg.cpp">
+      <Filter>Kernel</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_GlobalState.cpp">
-      <Filter>CAPI</Filter>
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_Allocator.cpp">
+      <Filter>Kernel</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.cpp">
-      <Filter>CAPI</Filter>
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_Atomic.cpp">
+      <Filter>Kernel</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDState.cpp">
-      <Filter>CAPI</Filter>
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_CRC32.cpp">
+      <Filter>Kernel</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.cpp">
-      <Filter>CAPI\D3D1X</Filter>
+    <ClCompile Include="..\..\..\Src\Net\OVR_NetworkPlugin.cpp">
+      <Filter>Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_Util.cpp">
-      <Filter>CAPI\D3D1X</Filter>
+    <ClCompile Include="..\..\..\Src\Net\OVR_PacketizedTCPSocket.cpp">
+      <Filter>Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.cpp">
-      <Filter>CAPI\D3D1X</Filter>
+    <ClCompile Include="..\..\..\Src\Net\OVR_RPC1.cpp">
+      <Filter>Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.cpp">
-      <Filter>CAPI\D3D1X</Filter>
+    <ClCompile Include="..\..\..\Src\Net\OVR_Session.cpp">
+      <Filter>Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\OVR_CAPI.cpp" />
-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.cpp">
+    <ClCompile Include="..\..\..\Src\Net\OVR_Socket.cpp">
+      <Filter>Net</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Net\OVR_Win32_Socket.cpp">
+      <Filter>Net</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Net\OVR_BitStream.cpp">
+      <Filter>Net</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Tracking\Tracking_SensorStateReader.cpp">
+      <Filter>Tracking</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_Display.cpp">
+      <Filter>Displays</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_RenderShim.cpp">
+      <Filter>Displays</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_ShimFunctions.cpp">
+      <Filter>Displays</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Service\Service_NetSessionCommon.cpp">
+      <Filter>Service</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Service\Service_NetClient.cpp">
+      <Filter>Service</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_FocusReader.cpp">
+      <Filter>Displays</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2Reader.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.cpp">
       <Filter>CAPI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_DistortionRenderer.cpp">
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_HSWDisplay.cpp">
       <Filter>CAPI\D3D1X</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_Util.cpp">
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_HSWDisplay.cpp">
       <Filter>CAPI\D3D1X</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Util\Util_ImageWindow.cpp">
-      <Filter>Util</Filter>
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_HSWDisplay.cpp">
+      <Filter>CAPI\GL</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2.cpp">
-      <Filter>Util</Filter>
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_LatencyStatistics.cpp">
+      <Filter>CAPI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Util\Util_Interface.cpp">
+    <ClCompile Include="..\..\..\Src\Util\Util_SystemInfo.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.cpp">
-      <Filter>CAPI\GL</Filter>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_DistortionRenderer.cpp">
+      <Filter>CAPI\D3D9</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.cpp">
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_HSWDisplay.cpp">
+      <Filter>CAPI\D3D9</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_Util.cpp">
+      <Filter>CAPI\D3D9</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_DebugHelp.cpp">
+      <Filter>Kernel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Util\Util_SystemGUI.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GLE.cpp">
       <Filter>CAPI\GL</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\OVR_Recording.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\Src\OVR_Device.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceConstants.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceHandle.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceMessages.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDeviceBase.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDeviceImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_JSON.h" />
-    <ClInclude Include="..\..\..\Src\OVR_LatencyTestImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Profile.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Sensor2Impl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorCalibration.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorFilter.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorFusion.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorImpl_Common.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorTimeFilter.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Stereo.h" />
-    <ClInclude Include="..\..\..\Src\OVR_ThreadCommandQueue.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_DeviceManager.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_DeviceStatus.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_HIDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_HMDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_SensorDevice.h" />
     <ClInclude Include="..\..\..\Src\Util\Util_Render_Stereo.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest.h">
-      <Filter>Util</Filter>
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.h">
+      <Filter>CAPI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Kernel\OVR_Alg.h">
-      <Filter>Kernel</Filter>
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.h">
+      <Filter>CAPI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Kernel\OVR_Allocator.h">
-      <Filter>Kernel</Filter>
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDState.h">
+      <Filter>CAPI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Kernel\OVR_Array.h">
-      <Filter>Kernel</Filter>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.h">
+      <Filter>CAPI\D3D1X</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Kernel\OVR_Atomic.h">
-      <Filter>Kernel</Filter>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_Util.h">
+      <Filter>CAPI\D3D1X</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Kernel\OVR_Color.h">
-      <Filter>Kernel</Filter>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.h">
+      <Filter>CAPI\D3D1X</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Kernel\OVR_ContainerAllocator.h">
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.h">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.h">
+      <Filter>CAPI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_Interface.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_ImageWindow.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.h">
+      <Filter>CAPI\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.h">
+      <Filter>CAPI\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\OVR_CAPI.h" />
+    <ClInclude Include="..\..\..\Src\OVR_CAPI_D3D.h" />
+    <ClInclude Include="..\..\..\Src\OVR_CAPI_GL.h" />
+    <ClInclude Include="..\..\..\Src\OVR_JSON.h" />
+    <ClInclude Include="..\..\..\Src\OVR_Profile.h" />
+    <ClInclude Include="..\..\..\Src\OVR_SerialFormat.h" />
+    <ClInclude Include="..\..\..\Src\OVR_Stereo.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Delegates.h">
       <Filter>Kernel</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Deque.h">
@@ -205,9 +261,15 @@
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Math.h">
       <Filter>Kernel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Nullptr.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\Src\Kernel\OVR_RefCount.h">
       <Filter>Kernel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_SharedMemory.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Std.h">
       <Filter>Kernel</Filter>
     </ClInclude>
@@ -235,56 +297,132 @@
     <ClInclude Include="..\..\..\Src\Kernel\OVR_UTF8Util.h">
       <Filter>Kernel</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\OVR_Sensor2ImplUtil.h" />
-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.h">
-      <Filter>CAPI</Filter>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Alg.h">
+      <Filter>Kernel</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_GlobalState.h">
-      <Filter>CAPI</Filter>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Allocator.h">
+      <Filter>Kernel</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.h">
-      <Filter>CAPI</Filter>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Array.h">
+      <Filter>Kernel</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDState.h">
-      <Filter>CAPI</Filter>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Atomic.h">
+      <Filter>Kernel</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.h">
-      <Filter>CAPI\D3D1X</Filter>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Color.h">
+      <Filter>Kernel</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_Util.h">
-      <Filter>CAPI\D3D1X</Filter>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Compiler.h">
+      <Filter>Kernel</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.h">
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_ContainerAllocator.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_CRC32.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_NetworkPlugin.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_NetworkTypes.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_PacketizedTCPSocket.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_RPC1.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_Session.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_Socket.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_Win32_Socket.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_BitStream.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Sensors\OVR_DeviceConstants.h">
+      <Filter>Sensors</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_SensorStateReader.h">
+      <Filter>Tracking</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_Display.h">
+      <Filter>Displays</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_Dxgi_Display.h">
+      <Filter>Displays</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_ShimFunctions.h">
+      <Filter>Displays</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Display.h">
+      <Filter>Displays</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Service\Service_NetClient.h">
+      <Filter>Service</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Service\Service_NetSessionCommon.h">
+      <Filter>Service</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_FocusReader.h">
+      <Filter>Displays</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_SensorState.h">
+      <Filter>Tracking</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_PoseState.h">
+      <Filter>Tracking</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2Reader.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2State.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.h">
+      <Filter>CAPI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_HSWDisplay.h">
       <Filter>CAPI\D3D1X</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.h">
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_HSWDisplay.h">
       <Filter>CAPI\D3D1X</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\OVR_CAPI.h" />
-    <ClInclude Include="..\..\..\Src\OVR_CAPI_D3D.h" />
-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.h">
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_HSWDisplay.h">
+      <Filter>CAPI\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_LatencyStatistics.h">
       <Filter>CAPI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Util\Util_Interface.h">
+    <ClInclude Include="..\..\..\Src\Util\Util_SystemInfo.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_DistortionRenderer.h">
-      <Filter>CAPI\D3D1X</Filter>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_DistortionRenderer.h">
+      <Filter>CAPI\D3D9</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Util\Util_ImageWindow.h">
-      <Filter>Util</Filter>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_HSWDisplay.h">
+      <Filter>CAPI\D3D9</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2.h">
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionShaders.h">
+      <Filter>CAPI\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_DebugHelp.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_SystemGUI.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.h">
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GLE.h">
       <Filter>CAPI\GL</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.h">
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GLE_GL.h">
       <Filter>CAPI\GL</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\OVR_Recording.h" />
-    <ClInclude Include="..\..\..\Src\OVR_RecordingDefs.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Util">
@@ -299,37 +437,64 @@
     <Filter Include="CAPI\D3D1X">
       <UniqueIdentifier>{0ee0029b-0b10-4ad6-a10c-7bf4ccefdf54}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CAPI\Shaders">
-      <UniqueIdentifier>{191043aa-7805-44f0-a0a4-02799289365c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="CAPI\GL">
       <UniqueIdentifier>{fe5d391d-40b2-48a6-8615-6654c19b3a71}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Net">
+      <UniqueIdentifier>{499e41fb-c8f9-4eb1-bfda-d9ec4190f884}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Sensors">
+      <UniqueIdentifier>{603dfa0f-c6ed-497c-b29e-7bccbe9c442b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tracking">
+      <UniqueIdentifier>{ca920a3e-285c-4530-a8dc-f9b09b676951}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Service">
+      <UniqueIdentifier>{242c9ebf-ce0a-44fd-8b90-0420ffcb44c4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Displays">
+      <UniqueIdentifier>{4db52c9f-ff4d-4aee-82b8-af6dcd6257bf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CAPI\D3D9">
+      <UniqueIdentifier>{bb2d660e-9324-4735-9b3c-44209de507f8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CAPI\D3D1X\Shaders">
+      <UniqueIdentifier>{79ee8d9c-1c2e-4f6a-a42d-edd426ae0a9b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_ps.psh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleTexturedQuad_ps.psh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleQuad_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleQuad_ps.psh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionTimewarpChroma_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\Distortion_ps.psh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionTimewarp_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionTimewarpChroma_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionChroma_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionTimewarp_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionChroma_ps.psh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\Distortion_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\Distortion_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleTexturedQuad_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_ps.psh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\Distortion_ps.psh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionCS2x2.csh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj b/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj
index 0e8505c..94bee8c 100644
--- a/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj
+++ b/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj
@@ -21,22 +21,40 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.h" />
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.h" />
-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_GlobalState.h" />
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.h" />
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDState.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_LatencyStatistics.h" />
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_HSWDisplay.h" />
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_HSWDisplay.h" />
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.h" />
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_Util.h" />
-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_HSWDisplay.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GLE.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GLE_GL.h" />
     <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionShaders.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_HSWDisplay.h" />
     <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Display.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_Display.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_Dxgi_Display.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_FocusReader.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_ShimFunctions.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Alg.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Allocator.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Array.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Atomic.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Color.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Compiler.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_ContainerAllocator.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_CRC32.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_DebugHelp.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Delegates.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Deque.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_File.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Hash.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_KeyCodes.h" />
@@ -44,61 +62,59 @@
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Lockless.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Log.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Math.h" />
-    <ClInclude Include="..\..\..\Src\Kernel\OVR_Deque.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Nullptr.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_RefCount.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_SharedMemory.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Std.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_String.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_StringHash.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_SysFile.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_System.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_ThreadCommandQueue.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Threads.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Timer.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Types.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_UTF8Util.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_BitStream.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_NetworkPlugin.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_NetworkTypes.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_PacketizedTCPSocket.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_RPC1.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_Session.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_Socket.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_Win32_Socket.h" />
     <ClInclude Include="..\..\..\Src\OVR_CAPI.h" />
     <ClInclude Include="..\..\..\Src\OVR_CAPI_D3D.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Device.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceConstants.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceHandle.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceMessages.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDeviceBase.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDeviceImpl.h" />
+    <ClInclude Include="..\..\..\Src\OVR_CAPI_GL.h" />
     <ClInclude Include="..\..\..\Src\OVR_JSON.h" />
-    <ClInclude Include="..\..\..\Src\OVR_LatencyTestImpl.h" />
     <ClInclude Include="..\..\..\Src\OVR_Profile.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Recording.h" />
-    <ClInclude Include="..\..\..\Src\OVR_RecordingDefs.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Sensor2Impl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Sensor2ImplUtil.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorCalibration.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorFilter.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorFusion.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorImpl_Common.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorTimeFilter.h" />
+    <ClInclude Include="..\..\..\Src\OVR_SerialFormat.h" />
     <ClInclude Include="..\..\..\Src\OVR_Stereo.h" />
-    <ClInclude Include="..\..\..\Src\OVR_ThreadCommandQueue.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_DeviceManager.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_DeviceStatus.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_HIDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_HMDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_SensorDevice.h" />
+    <ClInclude Include="..\..\..\Src\Sensors\OVR_DeviceConstants.h" />
+    <ClInclude Include="..\..\..\Src\Service\Service_NetClient.h" />
+    <ClInclude Include="..\..\..\Src\Service\Service_NetSessionCommon.h" />
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_PoseState.h" />
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_SensorState.h" />
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_SensorStateReader.h" />
     <ClInclude Include="..\..\..\Src\Util\Util_ImageWindow.h" />
     <ClInclude Include="..\..\..\Src\Util\Util_Interface.h" />
-    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest.h" />
-    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2.h" />
+    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2Reader.h" />
+    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2State.h" />
     <ClInclude Include="..\..\..\Src\Util\Util_Render_Stereo.h" />
+    <ClInclude Include="..\..\..\Src\Util\Util_SystemGUI.h" />
+    <ClInclude Include="..\..\..\Src\Util\Util_SystemInfo.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.cpp" />
-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_GlobalState.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDState.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_LatencyStatistics.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_HSWDisplay.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_HSWDisplay.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -111,145 +127,184 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_DistortionRenderer.cpp" />
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_Util.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_DistortionRenderer.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_HSWDisplay.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_Util.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GLE.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_HSWDisplay.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.cpp" />
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_Display.cpp" />
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_FocusReader.cpp" />
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_RenderShim.cpp" />
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_ShimFunctions.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Alg.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Allocator.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Atomic.cpp" />
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_CRC32.cpp" />
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_DebugHelp.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_File.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_FileFILE.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Lockless.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Log.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Math.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_RefCount.cpp" />
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_SharedMemory.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Std.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_String.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_String_FormatUtil.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_String_PathUtil.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_SysFile.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_System.cpp" />
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_ThreadCommandQueue.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_ThreadsWinAPI.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Timer.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_UTF8Util.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_BitStream.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_NetworkPlugin.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_PacketizedTCPSocket.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_RPC1.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_Session.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_Socket.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_Win32_Socket.cpp" />
     <ClCompile Include="..\..\..\Src\OVR_CAPI.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_DeviceHandle.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_DeviceImpl.cpp" />
     <ClCompile Include="..\..\..\Src\OVR_JSON.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_LatencyTestImpl.cpp" />
     <ClCompile Include="..\..\..\Src\OVR_Profile.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Recording.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Sensor2Impl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorCalibration.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorFilter.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorFusion.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorImpl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorImpl_Common.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorTimeFilter.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_SerialFormat.cpp" />
     <ClCompile Include="..\..\..\Src\OVR_Stereo.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_ThreadCommandQueue.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_DeviceManager.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_DeviceStatus.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_HIDDevice.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_HMDDevice.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_SensorDevice.cpp" />
+    <ClCompile Include="..\..\..\Src\Service\Service_NetClient.cpp" />
+    <ClCompile Include="..\..\..\Src\Service\Service_NetSessionCommon.cpp" />
+    <ClCompile Include="..\..\..\Src\Tracking\Tracking_SensorStateReader.cpp" />
     <ClCompile Include="..\..\..\Src\Util\Util_ImageWindow.cpp" />
     <ClCompile Include="..\..\..\Src\Util\Util_Interface.cpp" />
-    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest.cpp" />
-    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2.cpp" />
+    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2Reader.cpp" />
     <ClCompile Include="..\..\..\Src\Util\Util_Render_Stereo.cpp" />
+    <ClCompile Include="..\..\..\Src\Util\Util_SystemGUI.cpp" />
+    <ClCompile Include="..\..\..\Src\Util\Util_SystemInfo.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_ps.psh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionChroma_ps.psh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_vs.vsh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionChroma_vs.vsh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionTimewarpChroma_vs.vsh">
-      <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionTimewarpChroma_vs.vsh">
+      <FileType>Document</FileType>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionTimewarp_vs.vsh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionTimewarp_vs.vsh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\Distortion_ps.psh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\Distortion_ps.psh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\Distortion_vs.vsh">
+      <FileType>Document</FileType>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\Distortion_vs.vsh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleQuad_ps.psh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleQuad_vs.vsh">
+      <FileType>Document</FileType>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_ps.psh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleTexturedQuad_ps.psh">
       <FileType>Document</FileType>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_vs.vsh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleTexturedQuad_vs.vsh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionCS2x2.csh">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
   </ItemGroup>
   <PropertyGroup Label="Globals">
diff --git a/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj.filters b/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj.filters
index 54d430d..5bf7077 100644
--- a/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj.filters
+++ b/LibOVR/Projects/Win32/VS2012/LibOVR.vcxproj.filters
@@ -1,31 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\Src\OVR_DeviceHandle.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_DeviceImpl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_JSON.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_LatencyTestImpl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Profile.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Sensor2Impl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorCalibration.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorFilter.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorFusion.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorImpl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorImpl_Common.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorTimeFilter.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Stereo.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_ThreadCommandQueue.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_DeviceManager.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_DeviceStatus.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_HIDDevice.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_HMDDevice.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_SensorDevice.cpp" />
-    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest.cpp">
+    <ClCompile Include="..\..\..\Src\Util\Util_Render_Stereo.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Util\Util_Render_Stereo.cpp">
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.cpp">
+      <Filter>CAPI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.cpp">
+      <Filter>CAPI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDState.cpp">
+      <Filter>CAPI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.cpp">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_Util.cpp">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.cpp">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.cpp">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.cpp">
+      <Filter>CAPI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Util\Util_ImageWindow.cpp">
       <Filter>Util</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Src\Util\Util_Interface.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.cpp">
+      <Filter>CAPI\GL</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.cpp">
+      <Filter>CAPI\GL</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\OVR_CAPI.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_JSON.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_Profile.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_SerialFormat.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_Stereo.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Alg.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
@@ -35,6 +54,9 @@
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Atomic.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_CRC32.cpp">
+      <Filter>Kernel</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\Src\Kernel\OVR_File.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
@@ -53,6 +75,9 @@
     <ClCompile Include="..\..\..\Src\Kernel\OVR_RefCount.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_SharedMemory.cpp">
+      <Filter>Kernel</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Std.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
@@ -80,89 +105,138 @@
     <ClCompile Include="..\..\..\Src\Kernel\OVR_UTF8Util.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.cpp">
-      <Filter>CAPI</Filter>
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_Display.cpp">
+      <Filter>Displays</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_GlobalState.cpp">
-      <Filter>CAPI</Filter>
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_RenderShim.cpp">
+      <Filter>Displays</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.cpp">
-      <Filter>CAPI</Filter>
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_ShimFunctions.cpp">
+      <Filter>Displays</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDState.cpp">
-      <Filter>CAPI</Filter>
+    <ClCompile Include="..\..\..\Src\Net\OVR_NetworkPlugin.cpp">
+      <Filter>Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.cpp">
-      <Filter>CAPI\D3D1X</Filter>
+    <ClCompile Include="..\..\..\Src\Net\OVR_PacketizedTCPSocket.cpp">
+      <Filter>Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_Util.cpp">
-      <Filter>CAPI\D3D1X</Filter>
+    <ClCompile Include="..\..\..\Src\Net\OVR_RPC1.cpp">
+      <Filter>Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.cpp">
-      <Filter>CAPI\D3D1X</Filter>
+    <ClCompile Include="..\..\..\Src\Net\OVR_Session.cpp">
+      <Filter>Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.cpp">
-      <Filter>CAPI\D3D1X</Filter>
+    <ClCompile Include="..\..\..\Src\Net\OVR_Socket.cpp">
+      <Filter>Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\OVR_CAPI.cpp" />
-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.cpp">
+    <ClCompile Include="..\..\..\Src\Net\OVR_Win32_Socket.cpp">
+      <Filter>Net</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Net\OVR_BitStream.cpp">
+      <Filter>Net</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Service\Service_NetClient.cpp">
+      <Filter>Service</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Service\Service_NetSessionCommon.cpp">
+      <Filter>Service</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Tracking\Tracking_SensorStateReader.cpp">
+      <Filter>Tracking</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_FocusReader.cpp">
+      <Filter>Displays</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2Reader.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_ThreadCommandQueue.cpp">
+      <Filter>Kernel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.cpp">
       <Filter>CAPI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_DistortionRenderer.cpp">
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_HSWDisplay.cpp">
       <Filter>CAPI\D3D1X</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_Util.cpp">
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_HSWDisplay.cpp">
       <Filter>CAPI\D3D1X</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Util\Util_ImageWindow.cpp">
-      <Filter>Util</Filter>
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_HSWDisplay.cpp">
+      <Filter>CAPI\GL</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_LatencyStatistics.cpp">
+      <Filter>CAPI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2.cpp">
+    <ClCompile Include="..\..\..\Src\Util\Util_SystemInfo.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Util\Util_Interface.cpp">
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_DistortionRenderer.cpp">
+      <Filter>CAPI\D3D9</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_HSWDisplay.cpp">
+      <Filter>CAPI\D3D9</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_Util.cpp">
+      <Filter>CAPI\D3D9</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_DebugHelp.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.cpp">
-      <Filter>CAPI\GL</Filter>
+    <ClCompile Include="..\..\..\Src\Util\Util_SystemGUI.cpp">
+      <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.cpp">
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GLE.cpp">
       <Filter>CAPI\GL</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\OVR_Recording.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\Src\OVR_Device.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceConstants.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceHandle.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceMessages.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDeviceBase.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDeviceImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_JSON.h" />
-    <ClInclude Include="..\..\..\Src\OVR_LatencyTestImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Profile.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Sensor2Impl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorCalibration.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorFilter.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorFusion.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorImpl_Common.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorTimeFilter.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Stereo.h" />
-    <ClInclude Include="..\..\..\Src\OVR_ThreadCommandQueue.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_DeviceManager.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_DeviceStatus.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_HIDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_HMDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_SensorDevice.h" />
     <ClInclude Include="..\..\..\Src\Util\Util_Render_Stereo.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest.h">
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.h">
+      <Filter>CAPI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.h">
+      <Filter>CAPI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDState.h">
+      <Filter>CAPI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.h">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_Util.h">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.h">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.h">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.h">
+      <Filter>CAPI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_Interface.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_ImageWindow.h">
       <Filter>Util</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.h">
+      <Filter>CAPI\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.h">
+      <Filter>CAPI\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\OVR_CAPI.h" />
+    <ClInclude Include="..\..\..\Src\OVR_CAPI_D3D.h" />
+    <ClInclude Include="..\..\..\Src\OVR_CAPI_GL.h" />
+    <ClInclude Include="..\..\..\Src\OVR_JSON.h" />
+    <ClInclude Include="..\..\..\Src\OVR_Profile.h" />
+    <ClInclude Include="..\..\..\Src\OVR_SerialFormat.h" />
+    <ClInclude Include="..\..\..\Src\OVR_Stereo.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Alg.h">
       <Filter>Kernel</Filter>
     </ClInclude>
@@ -178,9 +252,18 @@
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Color.h">
       <Filter>Kernel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Compiler.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\Src\Kernel\OVR_ContainerAllocator.h">
       <Filter>Kernel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_CRC32.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Delegates.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Deque.h">
       <Filter>Kernel</Filter>
     </ClInclude>
@@ -205,9 +288,15 @@
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Math.h">
       <Filter>Kernel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Nullptr.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\Src\Kernel\OVR_RefCount.h">
       <Filter>Kernel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_SharedMemory.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Std.h">
       <Filter>Kernel</Filter>
     </ClInclude>
@@ -235,56 +324,111 @@
     <ClInclude Include="..\..\..\Src\Kernel\OVR_UTF8Util.h">
       <Filter>Kernel</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\OVR_Sensor2ImplUtil.h" />
-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.h">
-      <Filter>CAPI</Filter>
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Display.h">
+      <Filter>Displays</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_GlobalState.h">
-      <Filter>CAPI</Filter>
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_Display.h">
+      <Filter>Displays</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.h">
-      <Filter>CAPI</Filter>
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_Dxgi_Display.h">
+      <Filter>Displays</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDState.h">
-      <Filter>CAPI</Filter>
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_ShimFunctions.h">
+      <Filter>Displays</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.h">
-      <Filter>CAPI\D3D1X</Filter>
+    <ClInclude Include="..\..\..\Src\Net\OVR_BitStream.h">
+      <Filter>Net</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_Util.h">
-      <Filter>CAPI\D3D1X</Filter>
+    <ClInclude Include="..\..\..\Src\Net\OVR_NetworkPlugin.h">
+      <Filter>Net</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.h">
+    <ClInclude Include="..\..\..\Src\Net\OVR_NetworkTypes.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_PacketizedTCPSocket.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_RPC1.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_Session.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_Socket.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_Win32_Socket.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Sensors\OVR_DeviceConstants.h">
+      <Filter>Sensors</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Service\Service_NetClient.h">
+      <Filter>Service</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Service\Service_NetSessionCommon.h">
+      <Filter>Service</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_SensorStateReader.h">
+      <Filter>Tracking</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_FocusReader.h">
+      <Filter>Displays</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_SensorState.h">
+      <Filter>Tracking</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_PoseState.h">
+      <Filter>Tracking</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2Reader.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2State.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_ThreadCommandQueue.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.h">
+      <Filter>CAPI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_HSWDisplay.h">
       <Filter>CAPI\D3D1X</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.h">
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_HSWDisplay.h">
       <Filter>CAPI\D3D1X</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\OVR_CAPI.h" />
-    <ClInclude Include="..\..\..\Src\OVR_CAPI_D3D.h" />
-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.h">
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_HSWDisplay.h">
+      <Filter>CAPI\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_LatencyStatistics.h">
       <Filter>CAPI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Util\Util_Interface.h">
+    <ClInclude Include="..\..\..\Src\Util\Util_SystemInfo.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_DistortionRenderer.h">
-      <Filter>CAPI\D3D1X</Filter>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_DistortionRenderer.h">
+      <Filter>CAPI\D3D9</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Util\Util_ImageWindow.h">
+    <ClInclude Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_HSWDisplay.h">
+      <Filter>CAPI\D3D9</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionShaders.h">
+      <Filter>CAPI\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_DebugHelp.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2.h">
+    <ClInclude Include="..\..\..\Src\Util\Util_SystemGUI.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.h">
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GLE.h">
       <Filter>CAPI\GL</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.h">
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GLE_GL.h">
       <Filter>CAPI\GL</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\OVR_Recording.h" />
-    <ClInclude Include="..\..\..\Src\OVR_RecordingDefs.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Util">
@@ -299,37 +443,64 @@
     <Filter Include="CAPI\D3D1X">
       <UniqueIdentifier>{0ee0029b-0b10-4ad6-a10c-7bf4ccefdf54}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CAPI\Shaders">
-      <UniqueIdentifier>{191043aa-7805-44f0-a0a4-02799289365c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="CAPI\GL">
       <UniqueIdentifier>{0e2e7bad-69a3-464a-9256-12114645638c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Net">
+      <UniqueIdentifier>{44df3147-efdd-4001-9f31-212174da3fa2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Sensors">
+      <UniqueIdentifier>{1d053ad6-31a7-4ef9-babb-22579ba7df12}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Service">
+      <UniqueIdentifier>{e26124bc-50b0-40a8-b678-41e4bca60564}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tracking">
+      <UniqueIdentifier>{411b56fb-26bf-4bad-bdd2-8b85dd00afbe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Displays">
+      <UniqueIdentifier>{97998d73-b1cd-465a-9a52-8bd2d0cd4940}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CAPI\D3D9">
+      <UniqueIdentifier>{bf026447-0fe0-4119-82e0-5cbd34de8128}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CAPI\D3D1X\Shaders">
+      <UniqueIdentifier>{944c9556-a543-437e-a17e-10ce78ef836a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_ps.psh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\Distortion_ps.psh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\Distortion_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionChroma_ps.psh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionChroma_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\Distortion_ps.psh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionTimewarp_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionTimewarpChroma_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionTimewarpChroma_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionTimewarp_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleQuad_ps.psh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleQuad_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\Distortion_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleTexturedQuad_ps.psh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_ps.psh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleTexturedQuad_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionCS2x2.csh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
     </CustomBuild>
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj b/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj
index ada929d..6a271d4 100644
--- a/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj
+++ b/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj
@@ -21,22 +21,41 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.h" />
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.h" />
-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_GlobalState.h" />
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.h" />
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDState.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_LatencyStatistics.h" />
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_HSWDisplay.h" />
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_HSWDisplay.h" />
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.h" />
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_Util.h" />
-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_HSWDisplay.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GLE.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GLE_GL.h" />
     <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionShaders.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_HSWDisplay.h" />
     <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.h" />
+    <ClInclude Include="..\..\..\Src\CAPI\Textures\healthAndSafety.tga.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Display.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_Display.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_Dxgi_Display.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_FocusReader.h" />
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_ShimFunctions.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Alg.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Allocator.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Array.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Atomic.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Color.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Compiler.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_ContainerAllocator.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_CRC32.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_DebugHelp.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Delegates.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Deque.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_File.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Hash.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_KeyCodes.h" />
@@ -44,61 +63,59 @@
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Lockless.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Log.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Math.h" />
-    <ClInclude Include="..\..\..\Src\Kernel\OVR_Deque.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Nullptr.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_RefCount.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_SharedMemory.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Std.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_String.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_StringHash.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_SysFile.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_System.h" />
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_ThreadCommandQueue.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Threads.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Timer.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Types.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_UTF8Util.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_BitStream.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_NetworkPlugin.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_NetworkTypes.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_PacketizedTCPSocket.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_RPC1.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_Session.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_Socket.h" />
+    <ClInclude Include="..\..\..\Src\Net\OVR_Win32_Socket.h" />
     <ClInclude Include="..\..\..\Src\OVR_CAPI.h" />
     <ClInclude Include="..\..\..\Src\OVR_CAPI_D3D.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Device.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceConstants.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceHandle.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceMessages.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDeviceBase.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDeviceImpl.h" />
+    <ClInclude Include="..\..\..\Src\OVR_CAPI_GL.h" />
     <ClInclude Include="..\..\..\Src\OVR_JSON.h" />
-    <ClInclude Include="..\..\..\Src\OVR_LatencyTestImpl.h" />
     <ClInclude Include="..\..\..\Src\OVR_Profile.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Recording.h" />
-    <ClInclude Include="..\..\..\Src\OVR_RecordingDefs.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Sensor2Impl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Sensor2ImplUtil.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorCalibration.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorFilter.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorFusion.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorImpl_Common.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorTimeFilter.h" />
+    <ClInclude Include="..\..\..\Src\OVR_SerialFormat.h" />
     <ClInclude Include="..\..\..\Src\OVR_Stereo.h" />
-    <ClInclude Include="..\..\..\Src\OVR_ThreadCommandQueue.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_DeviceManager.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_DeviceStatus.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_HIDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_HMDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_SensorDevice.h" />
+    <ClInclude Include="..\..\..\Src\Sensors\OVR_DeviceConstants.h" />
+    <ClInclude Include="..\..\..\Src\Service\Service_NetClient.h" />
+    <ClInclude Include="..\..\..\Src\Service\Service_NetSessionCommon.h" />
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_PoseState.h" />
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_SensorState.h" />
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_SensorStateReader.h" />
     <ClInclude Include="..\..\..\Src\Util\Util_ImageWindow.h" />
     <ClInclude Include="..\..\..\Src\Util\Util_Interface.h" />
-    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest.h" />
-    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2.h" />
+    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2Reader.h" />
+    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2State.h" />
     <ClInclude Include="..\..\..\Src\Util\Util_Render_Stereo.h" />
+    <ClInclude Include="..\..\..\Src\Util\Util_SystemGUI.h" />
+    <ClInclude Include="..\..\..\Src\Util\Util_SystemInfo.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_DistortionRenderer.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.cpp" />
-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_GlobalState.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDState.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_LatencyStatistics.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_HSWDisplay.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_DistortionRenderer.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_HSWDisplay.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -111,144 +128,183 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_DistortionRenderer.cpp" />
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_Util.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_DistortionRenderer.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_HSWDisplay.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_Util.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GLE.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.cpp" />
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_HSWDisplay.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.cpp" />
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_Display.cpp" />
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_FocusReader.cpp" />
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_RenderShim.cpp" />
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_ShimFunctions.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Alg.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Allocator.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Atomic.cpp" />
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_CRC32.cpp" />
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_DebugHelp.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_File.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_FileFILE.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Lockless.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Log.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Math.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_RefCount.cpp" />
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_SharedMemory.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Std.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_String.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_String_FormatUtil.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_String_PathUtil.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_SysFile.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_System.cpp" />
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_ThreadCommandQueue.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_ThreadsWinAPI.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Timer.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_UTF8Util.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_BitStream.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_NetworkPlugin.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_PacketizedTCPSocket.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_RPC1.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_Session.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_Socket.cpp" />
+    <ClCompile Include="..\..\..\Src\Net\OVR_Win32_Socket.cpp" />
     <ClCompile Include="..\..\..\Src\OVR_CAPI.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_DeviceHandle.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_DeviceImpl.cpp" />
     <ClCompile Include="..\..\..\Src\OVR_JSON.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_LatencyTestImpl.cpp" />
     <ClCompile Include="..\..\..\Src\OVR_Profile.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Recording.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Sensor2Impl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorCalibration.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorFilter.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorFusion.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorImpl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorImpl_Common.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorTimeFilter.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_SerialFormat.cpp" />
     <ClCompile Include="..\..\..\Src\OVR_Stereo.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_ThreadCommandQueue.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_DeviceManager.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_DeviceStatus.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_HIDDevice.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_HMDDevice.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_SensorDevice.cpp" />
+    <ClCompile Include="..\..\..\Src\Service\Service_NetClient.cpp" />
+    <ClCompile Include="..\..\..\Src\Service\Service_NetSessionCommon.cpp" />
+    <ClCompile Include="..\..\..\Src\Tracking\Tracking_SensorStateReader.cpp" />
     <ClCompile Include="..\..\..\Src\Util\Util_ImageWindow.cpp" />
     <ClCompile Include="..\..\..\Src\Util\Util_Interface.cpp" />
-    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest.cpp" />
-    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2.cpp" />
+    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2Reader.cpp" />
     <ClCompile Include="..\..\..\Src\Util\Util_Render_Stereo.cpp" />
+    <ClCompile Include="..\..\..\Src\Util\Util_SystemGUI.cpp" />
+    <ClCompile Include="..\..\..\Src\Util\Util_SystemInfo.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_ps.psh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionChroma_ps.psh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_vs.vsh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionChroma_vs.vsh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionTimewarpChroma_vs.vsh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionTimewarpChroma_vs.vsh">
       <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionTimewarp_vs.vsh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionTimewarp_vs.vsh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\Distortion_ps.psh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\Distortion_ps.psh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\Distortion_vs.vsh">
+      <FileType>Document</FileType>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\Distortion_vs.vsh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleQuad_ps.psh">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleQuad_vs.vsh">
+      <FileType>Document</FileType>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
     </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_ps.psh">
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleTexturedQuad_ps.psh">
       <FileType>Document</FileType>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genPixelShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleTexturedQuad_vs.vsh">
+      <FileType>Document</FileType>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_vs.vsh">
-      <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genVertexShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionCS2x2.csh">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)%(Filename).h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call %(RelativeDir)genComputeShaderHeader.bat %(Filename) "%(Fullpath)"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)%(Filename).h</Outputs>
     </CustomBuild>
   </ItemGroup>
@@ -350,6 +406,7 @@
       <OmitDefaultLibName>true</OmitDefaultLibName>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>../../../../3rdParty/glext/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ShowIncludes>false</ShowIncludes>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -373,6 +430,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>../../../../3rdParty/glext/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OmitFramePointers>false</OmitFramePointers>
+      <ShowIncludes>false</ShowIncludes>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj.filters b/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj.filters
index 3216bbf..5b873a2 100644
--- a/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj.filters
+++ b/LibOVR/Projects/Win32/VS2013/LibOVR.vcxproj.filters
@@ -1,38 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\Src\OVR_CAPI.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_DeviceHandle.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_DeviceImpl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_JSON.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_LatencyTestImpl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Profile.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Sensor2Impl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorCalibration.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorFilter.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorFusion.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorImpl.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorImpl_Common.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_SensorTimeFilter.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Stereo.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_ThreadCommandQueue.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_DeviceManager.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_DeviceStatus.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_HIDDevice.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_HMDDevice.cpp" />
-    <ClCompile Include="..\..\..\Src\OVR_Win32_SensorDevice.cpp" />
     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.cpp">
       <Filter>CAPI\D3D1X</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_Util.cpp">
       <Filter>CAPI\D3D1X</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_DistortionRenderer.cpp">
-      <Filter>CAPI\D3D1X</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_Util.cpp">
-      <Filter>CAPI\D3D1X</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.cpp">
       <Filter>CAPI\D3D1X</Filter>
     </ClCompile>
@@ -45,15 +19,32 @@
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.cpp">
       <Filter>CAPI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\CAPI_GlobalState.cpp">
-      <Filter>CAPI</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.cpp">
       <Filter>CAPI</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Src\CAPI\CAPI_HMDState.cpp">
       <Filter>CAPI</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Src\Util\Util_Render_Stereo.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Util\Util_ImageWindow.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Util\Util_Interface.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.cpp">
+      <Filter>CAPI\GL</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.cpp">
+      <Filter>CAPI\GL</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\OVR_Profile.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_SerialFormat.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_Stereo.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_CAPI.cpp" />
+    <ClCompile Include="..\..\..\Src\OVR_JSON.cpp" />
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Alg.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
@@ -63,6 +54,9 @@
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Atomic.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_CRC32.cpp">
+      <Filter>Kernel</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\Src\Kernel\OVR_File.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
@@ -81,6 +75,9 @@
     <ClCompile Include="..\..\..\Src\Kernel\OVR_RefCount.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_SharedMemory.cpp">
+      <Filter>Kernel</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\Src\Kernel\OVR_Std.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
@@ -108,67 +105,98 @@
     <ClCompile Include="..\..\..\Src\Kernel\OVR_UTF8Util.cpp">
       <Filter>Kernel</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest.cpp">
-      <Filter>Util</Filter>
+    <ClCompile Include="..\..\..\Src\Net\OVR_NetworkPlugin.cpp">
+      <Filter>Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Util\Util_Render_Stereo.cpp">
-      <Filter>Util</Filter>
+    <ClCompile Include="..\..\..\Src\Net\OVR_PacketizedTCPSocket.cpp">
+      <Filter>Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Util\Util_ImageWindow.cpp">
-      <Filter>Util</Filter>
+    <ClCompile Include="..\..\..\Src\Net\OVR_RPC1.cpp">
+      <Filter>Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2.cpp">
-      <Filter>Util</Filter>
+    <ClCompile Include="..\..\..\Src\Net\OVR_Session.cpp">
+      <Filter>Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\Util\Util_Interface.cpp">
+    <ClCompile Include="..\..\..\Src\Net\OVR_Socket.cpp">
+      <Filter>Net</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Net\OVR_Win32_Socket.cpp">
+      <Filter>Net</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Net\OVR_BitStream.cpp">
+      <Filter>Net</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_RenderShim.cpp">
+      <Filter>Displays</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_ShimFunctions.cpp">
+      <Filter>Displays</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Service\Service_NetSessionCommon.cpp">
+      <Filter>Service</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Service\Service_NetClient.cpp">
+      <Filter>Service</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Tracking\Tracking_SensorStateReader.cpp">
+      <Filter>Tracking</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_Display.cpp">
+      <Filter>Displays</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Util\Util_LatencyTest2Reader.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.cpp">
+    <ClCompile Include="..\..\..\Src\Displays\OVR_Win32_FocusReader.cpp">
+      <Filter>Displays</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_ThreadCommandQueue.cpp">
+      <Filter>Kernel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.cpp">
+      <Filter>CAPI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_HSWDisplay.cpp">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_HSWDisplay.cpp">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_HSWDisplay.cpp">
       <Filter>CAPI\GL</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.cpp">
+    <ClCompile Include="..\..\..\Src\CAPI\CAPI_LatencyStatistics.cpp">
+      <Filter>CAPI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Util\Util_SystemInfo.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_DistortionRenderer.cpp">
+      <Filter>CAPI\D3D9</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_HSWDisplay.cpp">
+      <Filter>CAPI\D3D9</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_Util.cpp">
+      <Filter>CAPI\D3D9</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Kernel\OVR_DebugHelp.cpp">
+      <Filter>Kernel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\Util\Util_SystemGUI.cpp">
+      <Filter>Util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Src\CAPI\GL\CAPI_GLE.cpp">
       <Filter>CAPI\GL</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Src\OVR_Recording.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\Src\OVR_CAPI.h" />
-    <ClInclude Include="..\..\..\Src\OVR_CAPI_D3D.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Device.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceConstants.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceHandle.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_DeviceMessages.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDeviceBase.h" />
-    <ClInclude Include="..\..\..\Src\OVR_HIDDeviceImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_JSON.h" />
-    <ClInclude Include="..\..\..\Src\OVR_LatencyTestImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Profile.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Sensor2Impl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Sensor2ImplUtil.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorCalibration.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorFilter.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorFusion.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorImpl.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorImpl_Common.h" />
-    <ClInclude Include="..\..\..\Src\OVR_SensorTimeFilter.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Stereo.h" />
-    <ClInclude Include="..\..\..\Src\OVR_ThreadCommandQueue.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_DeviceManager.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_DeviceStatus.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_HIDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_HMDDevice.h" />
-    <ClInclude Include="..\..\..\Src\OVR_Win32_SensorDevice.h" />
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_DistortionRenderer.h">
       <Filter>CAPI\D3D1X</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D1X_Util.h">
       <Filter>CAPI\D3D1X</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D9_DistortionRenderer.h">
-      <Filter>CAPI\D3D1X</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_DistortionRenderer.h">
       <Filter>CAPI\D3D1X</Filter>
     </ClInclude>
@@ -181,15 +209,34 @@
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_FrameTimeManager.h">
       <Filter>CAPI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\CAPI_GlobalState.h">
-      <Filter>CAPI</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDRenderState.h">
       <Filter>CAPI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Src\CAPI\CAPI_HMDState.h">
       <Filter>CAPI</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_Interface.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_Render_Stereo.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_ImageWindow.h">
+      <Filter>Util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.h">
+      <Filter>CAPI\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.h">
+      <Filter>CAPI\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\OVR_JSON.h" />
+    <ClInclude Include="..\..\..\Src\OVR_Profile.h" />
+    <ClInclude Include="..\..\..\Src\OVR_SerialFormat.h" />
+    <ClInclude Include="..\..\..\Src\OVR_Stereo.h" />
+    <ClInclude Include="..\..\..\Src\OVR_CAPI.h" />
+    <ClInclude Include="..\..\..\Src\OVR_CAPI_D3D.h" />
+    <ClInclude Include="..\..\..\Src\OVR_CAPI_GL.h" />
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Alg.h">
       <Filter>Kernel</Filter>
     </ClInclude>
@@ -205,9 +252,18 @@
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Color.h">
       <Filter>Kernel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Compiler.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\Src\Kernel\OVR_ContainerAllocator.h">
       <Filter>Kernel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_CRC32.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Delegates.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Deque.h">
       <Filter>Kernel</Filter>
     </ClInclude>
@@ -232,9 +288,15 @@
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Math.h">
       <Filter>Kernel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_Nullptr.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\Src\Kernel\OVR_RefCount.h">
       <Filter>Kernel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_SharedMemory.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\Src\Kernel\OVR_Std.h">
       <Filter>Kernel</Filter>
     </ClInclude>
@@ -262,63 +324,119 @@
     <ClInclude Include="..\..\..\Src\Kernel\OVR_UTF8Util.h">
       <Filter>Kernel</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Util\Util_Interface.h">
-      <Filter>Util</Filter>
+    <ClInclude Include="..\..\..\Src\Net\OVR_NetworkPlugin.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_NetworkTypes.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_PacketizedTCPSocket.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_RPC1.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_Session.h">
+      <Filter>Net</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest.h">
+    <ClInclude Include="..\..\..\Src\Net\OVR_Socket.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_Win32_Socket.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Net\OVR_BitStream.h">
+      <Filter>Net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_ShimFunctions.h">
+      <Filter>Displays</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Service\Service_NetClient.h">
+      <Filter>Service</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Service\Service_NetSessionCommon.h">
+      <Filter>Service</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_SensorStateReader.h">
+      <Filter>Tracking</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_Dxgi_Display.h">
+      <Filter>Displays</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_Display.h">
+      <Filter>Displays</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2Reader.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Util\Util_Render_Stereo.h">
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Win32_FocusReader.h">
+      <Filter>Displays</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_SensorState.h">
+      <Filter>Tracking</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Tracking\Tracking_PoseState.h">
+      <Filter>Tracking</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2State.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Util\Util_ImageWindow.h">
+    <ClInclude Include="..\..\..\Src\Sensors\OVR_DeviceConstants.h">
+      <Filter>Sensors</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_ThreadCommandQueue.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Displays\OVR_Display.h">
+      <Filter>Displays</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_HSWDisplay.h">
+      <Filter>CAPI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\Textures\healthAndSafety.tga.h">
+      <Filter>CAPI\Textures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D10_HSWDisplay.h">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D1X\CAPI_D3D11_HSWDisplay.h">
+      <Filter>CAPI\D3D1X</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_HSWDisplay.h">
+      <Filter>CAPI\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\CAPI_LatencyStatistics.h">
+      <Filter>CAPI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_SystemInfo.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\Util\Util_LatencyTest2.h">
+    <ClInclude Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_DistortionRenderer.h">
+      <Filter>CAPI\D3D9</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\D3D9\CAPI_D3D9_HSWDisplay.h">
+      <Filter>CAPI\D3D9</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionShaders.h">
+      <Filter>CAPI\GL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Kernel\OVR_DebugHelp.h">
+      <Filter>Kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Src\Util\Util_SystemGUI.h">
       <Filter>Util</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_DistortionRenderer.h">
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GLE.h">
       <Filter>CAPI\GL</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GL_Util.h">
+    <ClInclude Include="..\..\..\Src\CAPI\GL\CAPI_GLE_GL.h">
       <Filter>CAPI\GL</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Src\OVR_Recording.h" />
-    <ClInclude Include="..\..\..\Src\OVR_RecordingDefs.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionTimewarpChroma_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionTimewarp_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\DistortionChroma_ps.psh">
-      <Filter>CAPI\Shaders</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\Distortion_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\Distortion_ps.psh">
-      <Filter>CAPI\Shaders</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_vs.vsh">
-      <Filter>CAPI\Shaders</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\Src\CAPI\Shaders\SimpleQuad_ps.psh">
-      <Filter>CAPI\Shaders</Filter>
-    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CAPI">
       <UniqueIdentifier>{42ff86e1-b618-4432-99ce-e6b92c7460eb}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CAPI\Shaders">
-      <UniqueIdentifier>{a65a3889-6d00-4a76-acfe-6db1249f104d}</UniqueIdentifier>
-    </Filter>
     <Filter Include="CAPI\D3D1X">
       <UniqueIdentifier>{77e1d16e-00a1-4130-8ee6-f81d1e850859}</UniqueIdentifier>
     </Filter>
@@ -331,5 +449,64 @@
     <Filter Include="CAPI\GL">
       <UniqueIdentifier>{47ac92b1-d962-4180-90a5-846feef19a6b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Net">
+      <UniqueIdentifier>{908d5c2d-305b-4a8a-9b25-b551a42677d1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Displays">
+      <UniqueIdentifier>{166e9ffc-558b-46ca-be9f-de9ac0ed89e9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Service">
+      <UniqueIdentifier>{5ef4cc4f-f0f2-4653-96fa-aafafd95f77e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tracking">
+      <UniqueIdentifier>{16de1b27-4167-429c-a964-44e476ec9c95}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Sensors">
+      <UniqueIdentifier>{9b464232-8a47-404b-8120-b6e8dc016c36}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CAPI\Textures">
+      <UniqueIdentifier>{4133d45b-be4b-4813-afea-9ad61ce3fe11}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CAPI\D3D9">
+      <UniqueIdentifier>{723b8d80-1ae0-4e67-9dec-9b3397726d86}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CAPI\D3D1X\Shaders">
+      <UniqueIdentifier>{c6fb4a59-0089-41c0-b5c8-5e429addacfe}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleTexturedQuad_ps.psh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleTexturedQuad_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\Distortion_ps.psh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\Distortion_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionChroma_ps.psh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionChroma_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionTimewarp_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionTimewarpChroma_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\DistortionCS2x2.csh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleQuad_ps.psh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\Src\CAPI\D3D1X\Shaders\SimpleQuad_vs.vsh">
+      <Filter>CAPI\D3D1X\Shaders</Filter>
+    </CustomBuild>
   </ItemGroup>
 </Project>
 \ No newline at end of file