diff --git a/3rdparty/libsamplerate/libsamplerate.vcxproj b/3rdparty/libsamplerate/libsamplerate.vcxproj
index ac25615cc..10ab3da66 100644
--- a/3rdparty/libsamplerate/libsamplerate.vcxproj
+++ b/3rdparty/libsamplerate/libsamplerate.vcxproj
@@ -22,29 +22,30 @@
     <ProjectGuid>{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}</ProjectGuid>
     <RootNamespace>libsamplerate</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -67,14 +68,14 @@
   </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)deps\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)deps\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)deps\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)deps\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\$(Configuration)\</IntDir>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
diff --git a/PCSX2_suite.sln b/PCSX2_suite.sln
index ce70ca52d..2d348ba46 100644
--- a/PCSX2_suite.sln
+++ b/PCSX2_suite.sln
@@ -76,6 +76,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblzma", "3rdparty\xz\libl
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "3rdparty\fmt\fmt.vcxproj", "{449AD25E-424A-4714-BABC-68706CDCC33B}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsamplerate", "3rdparty\libsamplerate\libsamplerate.vcxproj", "{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -490,6 +492,26 @@ Global
 		{449AD25E-424A-4714-BABC-68706CDCC33B}.Release|Win32.Build.0 = Release|Win32
 		{449AD25E-424A-4714-BABC-68706CDCC33B}.Release|x64.ActiveCfg = Release|x64
 		{449AD25E-424A-4714-BABC-68706CDCC33B}.Release|x64.Build.0 = Release|x64
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Debug|Win32.Build.0 = Debug|Win32
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Debug|x64.ActiveCfg = Debug|x64
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Debug|x64.Build.0 = Debug|x64
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Devel|Win32.ActiveCfg = Debug|Win32
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Devel|Win32.Build.0 = Debug|Win32
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Devel|x64.ActiveCfg = Debug|x64
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Devel|x64.Build.0 = Debug|x64
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release AVX2|Win32.ActiveCfg = Release|Win32
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release AVX2|Win32.Build.0 = Release|Win32
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release AVX2|x64.ActiveCfg = Release|x64
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release AVX2|x64.Build.0 = Release|x64
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release SSE4|Win32.ActiveCfg = Release|Win32
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release SSE4|Win32.Build.0 = Release|Win32
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release SSE4|x64.ActiveCfg = Release|x64
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release SSE4|x64.Build.0 = Release|x64
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release|Win32.ActiveCfg = Release|Win32
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release|Win32.Build.0 = Release|Win32
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release|x64.ActiveCfg = Release|x64
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -518,6 +540,7 @@ Global
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
 		{12728250-16EC-4DC6-94D7-E21DD88947F8} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
 		{449AD25E-424A-4714-BABC-68706CDCC33B} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
+		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0BC474EA-3628-45D3-9DBC-E22D0B7E0F77}
diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj
index e555349cd..fb281ff70 100644
--- a/pcsx2/windows/VCprojects/pcsx2.vcxproj
+++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj
@@ -63,12 +63,12 @@
       <PrecompiledHeaderFile>PrecompiledHeader.h</PrecompiledHeaderFile>
       <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">false</ShowIncludes>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NDEBUG;_SECURE_SCL_=0;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NDEBUG;_SECURE_SCL_=0;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;BUILD_DX=1;BUILD_RAW=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;BUILD_DX=1;BUILD_RAW=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;BUILD_DX=1;BUILD_RAW=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;BUILD_DX=1;BUILD_RAW=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NDEBUG;_SECURE_SCL_=0;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;BUILD_DX=1;BUILD_RAW=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NDEBUG;_SECURE_SCL_=0;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;BUILD_DX=1;BUILD_RAW=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <LargeAddressAware>Yes</LargeAddressAware>
@@ -349,6 +349,52 @@
     <ClCompile Include="..\..\Recording\NewRecordingFrame.cpp" />
     <ClCompile Include="..\..\Recording\InputRecordingFile.cpp" />
     <ClCompile Include="..\..\Recording\PadData.cpp" />
+    <ClCompile Include="..\..\USB\configuration.cpp" />
+    <ClCompile Include="..\..\USB\deviceproxy.cpp" />
+    <ClCompile Include="..\..\USB\device_init.cpp" />
+    <ClCompile Include="..\..\USB\osdebugout.cpp" />
+    <ClCompile Include="..\..\USB\qemu-usb\bus.cpp" />
+    <ClCompile Include="..\..\USB\qemu-usb\core.cpp" />
+    <ClCompile Include="..\..\USB\qemu-usb\desc.cpp" />
+    <ClCompile Include="..\..\USB\qemu-usb\glib.cpp" />
+    <ClCompile Include="..\..\USB\qemu-usb\hid.cpp" />
+    <ClCompile Include="..\..\USB\qemu-usb\input-keymap-qcode-to-qnum.cpp" />
+    <ClCompile Include="..\..\USB\qemu-usb\input-keymap-win32-to-qcode.cpp" />
+    <ClCompile Include="..\..\USB\qemu-usb\iov.cpp" />
+    <ClCompile Include="..\..\USB\qemu-usb\usb-ohci.cpp" />
+    <ClCompile Include="..\..\USB\qemu-usb\vl.cpp" />
+    <ClCompile Include="..\..\USB\shared\hidapi.cpp" />
+    <ClCompile Include="..\..\USB\shared\inifile.cpp" />
+    <ClCompile Include="..\..\USB\shared\rawinput.cpp" />
+    <ClCompile Include="..\..\USB\shared\ringbuffer.cpp" />
+    <ClCompile Include="..\..\USB\shared\shared.cpp" />
+    <ClCompile Include="..\..\USB\usb-eyetoy\api_init_win32.cpp" />
+    <ClCompile Include="..\..\USB\usb-eyetoy\cam-windows.cpp" />
+    <ClCompile Include="..\..\USB\usb-eyetoy\jo_mpeg.cpp" />
+    <ClCompile Include="..\..\USB\usb-eyetoy\jpgd\jpgd.cpp" />
+    <ClCompile Include="..\..\USB\usb-eyetoy\usb-eyetoy-webcam.cpp" />
+    <ClCompile Include="..\..\USB\usb-hid\api_init_win32.cpp" />
+    <ClCompile Include="..\..\USB\usb-hid\raw\rawinput.cpp" />
+    <ClCompile Include="..\..\USB\usb-hid\usb-hid.cpp" />
+    <ClCompile Include="..\..\USB\usb-mic\api_init_win32.cpp" />
+    <ClCompile Include="..\..\USB\usb-mic\audiodev-wasapi.cpp" />
+    <ClCompile Include="..\..\USB\usb-mic\usb-headset.cpp" />
+    <ClCompile Include="..\..\USB\usb-mic\usb-mic-logitech.cpp" />
+    <ClCompile Include="..\..\USB\usb-mic\usb-mic-singstar.cpp" />
+    <ClCompile Include="..\..\USB\usb-msd\usb-msd-win32.cpp" />
+    <ClCompile Include="..\..\USB\usb-msd\usb-msd.cpp" />
+    <ClCompile Include="..\..\USB\usb-pad\api_init_win32.cpp" />
+    <ClCompile Include="..\..\USB\usb-pad\dx\dinput-config.cpp" />
+    <ClCompile Include="..\..\USB\usb-pad\dx\dinput.cpp" />
+    <ClCompile Include="..\..\USB\usb-pad\dx\usb-pad-dx.cpp" />
+    <ClCompile Include="..\..\USB\usb-pad\lg\lg_ff.cpp" />
+    <ClCompile Include="..\..\USB\usb-pad\raw\raw-config.cpp" />
+    <ClCompile Include="..\..\USB\usb-pad\raw\usb-pad-raw.cpp" />
+    <ClCompile Include="..\..\USB\usb-pad\usb-pad-ff.cpp" />
+    <ClCompile Include="..\..\USB\usb-pad\usb-pad.cpp" />
+    <ClCompile Include="..\..\USB\usb-pad\usb-seamic.cpp" />
+    <ClCompile Include="..\..\USB\USB.cpp" />
+    <ClCompile Include="..\..\USB\Win32\Config.cpp" />
     <ClCompile Include="..\..\Utilities\FileUtils.cpp" />
     <ClCompile Include="..\..\Dump.cpp" />
     <ClCompile Include="..\..\x86\iMisc.cpp" />
@@ -616,6 +662,59 @@
     <ClInclude Include="..\..\Recording\VirtualPad\VirtualPadData.h" />
     <ClInclude Include="..\..\Recording\VirtualPad\VirtualPadResources.h" />
     <ClInclude Include="..\..\Recording\Utilities\InputRecordingLogger.h" />
+    <ClInclude Include="..\..\USB\configuration.h" />
+    <ClInclude Include="..\..\USB\deviceproxy.h" />
+    <ClInclude Include="..\..\USB\helpers.h" />
+    <ClInclude Include="..\..\USB\osdebugout.h" />
+    <ClInclude Include="..\..\USB\platcompat.h" />
+    <ClInclude Include="..\..\USB\proxybase.h" />
+    <ClInclude Include="..\..\USB\qemu-usb\desc.h" />
+    <ClInclude Include="..\..\USB\qemu-usb\glib.h" />
+    <ClInclude Include="..\..\USB\qemu-usb\hid.h" />
+    <ClInclude Include="..\..\USB\qemu-usb\input-keymap-win32-to-qcode.h" />
+    <ClInclude Include="..\..\USB\qemu-usb\input-keymap.h" />
+    <ClInclude Include="..\..\USB\qemu-usb\iov.h" />
+    <ClInclude Include="..\..\USB\qemu-usb\queue.h" />
+    <ClInclude Include="..\..\USB\qemu-usb\qusb.h" />
+    <ClInclude Include="..\..\USB\qemu-usb\USBinternal.h" />
+    <ClInclude Include="..\..\USB\qemu-usb\vl.h" />
+    <ClInclude Include="..\..\USB\readerwriterqueue\atomicops.h" />
+    <ClInclude Include="..\..\USB\readerwriterqueue\readerwriterqueue.h" />
+    <ClInclude Include="..\..\USB\shared\hidapi.h" />
+    <ClInclude Include="..\..\USB\shared\inifile.h" />
+    <ClInclude Include="..\..\USB\shared\rawinput.h" />
+    <ClInclude Include="..\..\USB\shared\ringbuffer.h" />
+    <ClInclude Include="..\..\USB\shared\shared.h" />
+    <ClInclude Include="..\..\USB\usb-eyetoy\cam-windows.h" />
+    <ClInclude Include="..\..\USB\usb-eyetoy\jo_mpeg.h" />
+    <ClInclude Include="..\..\USB\usb-eyetoy\jpgd\jpgd.h" />
+    <ClInclude Include="..\..\USB\usb-eyetoy\ov519.h" />
+    <ClInclude Include="..\..\USB\usb-eyetoy\usb-eyetoy-webcam.h" />
+    <ClInclude Include="..\..\USB\usb-eyetoy\videodev.h" />
+    <ClInclude Include="..\..\USB\usb-eyetoy\videodeviceproxy.h" />
+    <ClInclude Include="..\..\USB\usb-hid\hidproxy.h" />
+    <ClInclude Include="..\..\USB\usb-hid\noop.h" />
+    <ClInclude Include="..\..\USB\usb-hid\raw\rawinput.h" />
+    <ClInclude Include="..\..\USB\usb-hid\usb-hid.h" />
+    <ClInclude Include="..\..\USB\usb-mic\audio.h" />
+    <ClInclude Include="..\..\USB\usb-mic\audiodev-noop.h" />
+    <ClInclude Include="..\..\USB\usb-mic\audiodev-wasapi.h" />
+    <ClInclude Include="..\..\USB\usb-mic\audiodev.h" />
+    <ClInclude Include="..\..\USB\usb-mic\audiodeviceproxy.h" />
+    <ClInclude Include="..\..\USB\usb-mic\usb-headset.h" />
+    <ClInclude Include="..\..\USB\usb-mic\usb-mic-singstar.h" />
+    <ClInclude Include="..\..\USB\usb-msd\usb-msd.h" />
+    <ClInclude Include="..\..\USB\usb-pad\dx\dx.h" />
+    <ClInclude Include="..\..\USB\usb-pad\dx\usb-pad-dx.h" />
+    <ClInclude Include="..\..\USB\usb-pad\dx\versionproxy.h" />
+    <ClInclude Include="..\..\USB\usb-pad\lg\lg_ff.h" />
+    <ClInclude Include="..\..\USB\usb-pad\padproxy.h" />
+    <ClInclude Include="..\..\USB\usb-pad\raw\raw-config-res.h" />
+    <ClInclude Include="..\..\USB\usb-pad\raw\usb-pad-raw.h" />
+    <ClInclude Include="..\..\USB\usb-pad\usb-pad.h" />
+    <ClInclude Include="..\..\USB\USB.h" />
+    <ClInclude Include="..\..\USB\Win32\Config.h" />
+    <ClInclude Include="..\..\USB\Win32\resource.h" />
     <ClInclude Include="..\..\Utilities\AsciiFile.h" />
     <ClInclude Include="..\..\Elfheader.h" />
     <ClInclude Include="..\..\CDVD\IsoFileFormats.h" />
@@ -755,6 +854,8 @@
     </ResourceCompile>
     <ResourceCompile Include="..\..\SPU2\Windows\SPU2.rc" />
     <ResourceCompile Include="..\..\DEV9\Win32\DEV9ghzdrk.rc" />
+    <ResourceCompile Include="..\..\USB\usb-pad\dx\versionproxy.rc" />
+    <ResourceCompile Include="..\..\USB\usb-pad\raw\raw-config.rc" />
     <ResourceCompile Include="..\wxResources.rc" />
   </ItemGroup>
   <ItemGroup>
diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
index 86596bc1b..8b9a07759 100644
--- a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
+++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
@@ -169,9 +169,51 @@
     <Filter Include="Recording\VirtualPad\Images">
       <UniqueIdentifier>{ad528458-08eb-49a2-aefa-3c2b86ab8896}</UniqueIdentifier>
     </Filter>
-    <Filter Include="System\DEV9">
+    <Filter Include="System\Ps2\DEV9">
       <UniqueIdentifier>{8d5454f9-590c-4c53-aae1-8391c6465e50}</UniqueIdentifier>
     </Filter>
+    <Filter Include="System\Ps2\USB">
+      <UniqueIdentifier>{df9de75c-2272-4f73-b2a0-4f9f492ba1e9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\USB\readerwriterqueue">
+      <UniqueIdentifier>{f128e163-0f30-43eb-80a1-4739a6313c8f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\USB\qemu-usb">
+      <UniqueIdentifier>{5a206eba-a8b6-44ef-98e7-eb0384c9a896}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\USB\usb-msd">
+      <UniqueIdentifier>{c63d7e06-bbf9-48ec-aa38-d122aa6648cf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\USB\usb-pad">
+      <UniqueIdentifier>{aee88110-a71e-4896-8b22-73e3198eb30a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\USB\usb-pad\lg">
+      <UniqueIdentifier>{1aa4f41d-451c-4599-9aa7-e2f51f5b467d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\USB\usb-mic">
+      <UniqueIdentifier>{9c8b3479-af75-4999-b265-d0c8c66d0954}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\USB\usb-eyetoy">
+      <UniqueIdentifier>{e4b2d8b4-a9fb-4c6d-b247-2112afd8d099}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\USB\usb-eyetoy\jpgd">
+      <UniqueIdentifier>{fe77f40c-84c0-4a06-affb-b6e7fb09ce49}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\USB\usb-hid">
+      <UniqueIdentifier>{a478e196-ac99-4a12-bfbb-2a7a3128d6e9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\USB\shared">
+      <UniqueIdentifier>{96b523da-ac91-4f95-81af-8df223188783}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\USB\Win32">
+      <UniqueIdentifier>{a12c76e1-5876-4ce2-aec6-427270102eed}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\USB\usb-pad\dx">
+      <UniqueIdentifier>{b067682e-741d-4414-89ef-8ffc22aef8dc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="System\Ps2\USB\usb-pad\raw">
+      <UniqueIdentifier>{8640e8ca-7d79-4221-b1bf-35bc142a9add}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Utilities\folderdesc.txt">
@@ -1007,28 +1049,166 @@
       <Filter>System\Ps2\SPU2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\DEV9\DEV9.cpp">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\DEV9\flash.cpp">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\DEV9\pcap_io.cpp">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\DEV9\smap.cpp">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\DEV9\net.cpp">
       <Filter>System\DEV9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\DEV9\Win32\tap-win32.cpp">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\DEV9\Win32\Win32.cpp">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\DEV9\Win32\DEV9WinConfig.cpp">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\configuration.cpp">
+      <Filter>System\Ps2\USB</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\device_init.cpp">
+      <Filter>System\Ps2\USB</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\deviceproxy.cpp">
+      <Filter>System\Ps2\USB</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\osdebugout.cpp">
+      <Filter>System\Ps2\USB</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\USB.cpp">
+      <Filter>System\Ps2\USB</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\qemu-usb\bus.cpp">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\qemu-usb\core.cpp">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\qemu-usb\desc.cpp">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\qemu-usb\glib.cpp">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\qemu-usb\hid.cpp">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\qemu-usb\input-keymap-qcode-to-qnum.cpp">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\qemu-usb\iov.cpp">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\qemu-usb\usb-ohci.cpp">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\qemu-usb\vl.cpp">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-msd\usb-msd.cpp">
+      <Filter>System\Ps2\USB\usb-msd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-pad\usb-pad.cpp">
+      <Filter>System\Ps2\USB\usb-pad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-pad\usb-pad-ff.cpp">
+      <Filter>System\Ps2\USB\usb-pad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-pad\lg\lg_ff.cpp">
+      <Filter>System\Ps2\USB\usb-pad\lg</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-pad\usb-seamic.cpp">
+      <Filter>System\Ps2\USB\usb-pad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-mic\usb-headset.cpp">
+      <Filter>System\Ps2\USB\usb-mic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-mic\usb-mic-logitech.cpp">
+      <Filter>System\Ps2\USB\usb-mic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-mic\usb-mic-singstar.cpp">
+      <Filter>System\Ps2\USB\usb-mic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-eyetoy\jpgd\jpgd.cpp">
+      <Filter>System\Ps2\USB\usb-eyetoy\jpgd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-eyetoy\jo_mpeg.cpp">
+      <Filter>System\Ps2\USB\usb-eyetoy</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-eyetoy\usb-eyetoy-webcam.cpp">
+      <Filter>System\Ps2\USB\usb-eyetoy</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-hid\usb-hid.cpp">
+      <Filter>System\Ps2\USB\usb-hid</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\shared\inifile.cpp">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\shared\ringbuffer.cpp">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\shared\shared.cpp">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-eyetoy\api_init_win32.cpp">
+      <Filter>System\Ps2\USB\usb-eyetoy</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-hid\api_init_win32.cpp">
+      <Filter>System\Ps2\USB\usb-hid</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-mic\api_init_win32.cpp">
+      <Filter>System\Ps2\USB\usb-mic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-pad\api_init_win32.cpp">
+      <Filter>System\Ps2\USB\usb-pad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\Win32\Config.cpp">
+      <Filter>System\Ps2\USB\Win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-mic\audiodev-wasapi.cpp">
+      <Filter>System\Ps2\USB\usb-mic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-msd\usb-msd-win32.cpp">
+      <Filter>System\Ps2\USB\usb-msd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\shared\hidapi.cpp">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\shared\rawinput.cpp">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\qemu-usb\input-keymap-win32-to-qcode.cpp">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-hid\raw\rawinput.cpp">
+      <Filter>System\Ps2\USB\usb-hid</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-eyetoy\cam-windows.cpp">
+      <Filter>System\Ps2\USB\usb-eyetoy</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-pad\dx\dinput.cpp">
+      <Filter>System\Ps2\USB\usb-pad\dx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-pad\dx\dinput-config.cpp">
+      <Filter>System\Ps2\USB\usb-pad\dx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-pad\dx\usb-pad-dx.cpp">
+      <Filter>System\Ps2\USB\usb-pad\dx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-pad\raw\raw-config.cpp">
+      <Filter>System\Ps2\USB\usb-pad\raw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-pad\raw\usb-pad-raw.cpp">
+      <Filter>System\Ps2\USB\usb-pad\raw</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1552,28 +1732,187 @@
       <Filter>Recording\Utilities</Filter>
     </ClInclude>
     <ClInclude Include="..\..\DEV9\ata.h">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
     </ClInclude>
     <ClInclude Include="..\..\DEV9\Config.h">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
     </ClInclude>
     <ClInclude Include="..\..\DEV9\DEV9.h">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
     </ClInclude>
     <ClInclude Include="..\..\DEV9\net.h">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
     </ClInclude>
     <ClInclude Include="..\..\DEV9\pcap_io.h">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
     </ClInclude>
     <ClInclude Include="..\..\DEV9\smap.h">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
     </ClInclude>
     <ClInclude Include="..\..\DEV9\Win32\resource.h">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
     </ClInclude>
     <ClInclude Include="..\..\DEV9\Win32\tap.h">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\configuration.h">
+      <Filter>System\Ps2\USB</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\deviceproxy.h">
+      <Filter>System\Ps2\USB</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\helpers.h">
+      <Filter>System\Ps2\USB</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\osdebugout.h">
+      <Filter>System\Ps2\USB</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\platcompat.h">
+      <Filter>System\Ps2\USB</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\proxybase.h">
+      <Filter>System\Ps2\USB</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\USB.h">
+      <Filter>System\Ps2\USB</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\readerwriterqueue\atomicops.h">
+      <Filter>System\Ps2\USB\readerwriterqueue</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\readerwriterqueue\readerwriterqueue.h">
+      <Filter>System\Ps2\USB\readerwriterqueue</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\qemu-usb\desc.h">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\qemu-usb\glib.h">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\qemu-usb\hid.h">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\qemu-usb\input-keymap.h">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\qemu-usb\iov.h">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\qemu-usb\queue.h">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\qemu-usb\qusb.h">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\qemu-usb\USBinternal.h">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\qemu-usb\vl.h">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-msd\usb-msd.h">
+      <Filter>System\Ps2\USB\usb-msd</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-pad\padproxy.h">
+      <Filter>System\Ps2\USB\usb-pad</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-pad\usb-pad.h">
+      <Filter>System\Ps2\USB\usb-pad</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-pad\lg\lg_ff.h">
+      <Filter>System\Ps2\USB\usb-pad\lg</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-mic\audio.h">
+      <Filter>System\Ps2\USB\usb-mic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-mic\audiodev.h">
+      <Filter>System\Ps2\USB\usb-mic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-mic\audiodeviceproxy.h">
+      <Filter>System\Ps2\USB\usb-mic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-mic\audiodev-noop.h">
+      <Filter>System\Ps2\USB\usb-mic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-mic\usb-headset.h">
+      <Filter>System\Ps2\USB\usb-mic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-mic\usb-mic-singstar.h">
+      <Filter>System\Ps2\USB\usb-mic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-eyetoy\jo_mpeg.h">
+      <Filter>System\Ps2\USB\usb-eyetoy</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-eyetoy\ov519.h">
+      <Filter>System\Ps2\USB\usb-eyetoy</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-eyetoy\usb-eyetoy-webcam.h">
+      <Filter>System\Ps2\USB\usb-eyetoy</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-eyetoy\videodev.h">
+      <Filter>System\Ps2\USB\usb-eyetoy</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-eyetoy\videodeviceproxy.h">
+      <Filter>System\Ps2\USB\usb-eyetoy</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-eyetoy\jpgd\jpgd.h">
+      <Filter>System\Ps2\USB\usb-eyetoy\jpgd</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-hid\hidproxy.h">
+      <Filter>System\Ps2\USB\usb-hid</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-hid\noop.h">
+      <Filter>System\Ps2\USB\usb-hid</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-hid\usb-hid.h">
+      <Filter>System\Ps2\USB\usb-hid</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\shared\inifile.h">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\shared\ringbuffer.h">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\shared\shared.h">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\Win32\Config.h">
+      <Filter>System\Ps2\USB\Win32</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\Win32\resource.h">
+      <Filter>System\Ps2\USB\Win32</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-mic\audiodev-wasapi.h">
+      <Filter>System\Ps2\USB\usb-mic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\shared\hidapi.h">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\shared\rawinput.h">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\qemu-usb\input-keymap-win32-to-qcode.h">
+      <Filter>System\Ps2\USB\qemu-usb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-hid\raw\rawinput.h">
+      <Filter>System\Ps2\USB\usb-hid</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-eyetoy\cam-windows.h">
+      <Filter>System\Ps2\USB\usb-eyetoy</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-pad\dx\dx.h">
+      <Filter>System\Ps2\USB\usb-pad\dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-pad\dx\usb-pad-dx.h">
+      <Filter>System\Ps2\USB\usb-pad\dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-pad\dx\versionproxy.h">
+      <Filter>System\Ps2\USB\usb-pad\dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-pad\raw\raw-config-res.h">
+      <Filter>System\Ps2\USB\usb-pad\raw</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\usb-pad\raw\usb-pad-raw.h">
+      <Filter>System\Ps2\USB\usb-pad\raw</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -1587,7 +1926,13 @@
       <Filter>System\Ps2\SPU2</Filter>
     </ResourceCompile>
     <ResourceCompile Include="..\..\DEV9\Win32\DEV9ghzdrk.rc">
-      <Filter>System\DEV9</Filter>
+      <Filter>System\Ps2\DEV9</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="..\..\USB\usb-pad\dx\versionproxy.rc">
+      <Filter>System\Ps2\USB\usb-pad\dx</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="..\..\USB\usb-pad\raw\raw-config.rc">
+      <Filter>System\Ps2\USB\usb-pad\raw</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1722,4 +2067,4 @@
       <Filter>AppHost\Resources</Filter>
     </Manifest>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>