diff --git a/OptiScaler/OptiScaler.vcxproj b/OptiScaler/OptiScaler.vcxproj
index 6f28e6a4..30322e12 100644
--- a/OptiScaler/OptiScaler.vcxproj
+++ b/OptiScaler/OptiScaler.vcxproj
@@ -211,9 +211,9 @@ copy NUL "$(SolutionDir)x64\Release\a\!! EXTRACT ALL FILES TO GAME FOLDER !!" /Y
     <ClInclude Include="upscalers\fsr31\FSR31Feature_Vk.h" />
     <ClInclude Include="DLSSG_Mod.h" />
     <ClInclude Include="proxies\Gdi32_Proxy.h" />
-    <ClInclude Include="FfxApi_Dx12.h" />
-    <ClInclude Include="FSR2_Dx12.h" />
-    <ClInclude Include="FSR3_Dx12.h" />
+    <ClInclude Include="inputs\FfxApi_Dx12.h" />
+    <ClInclude Include="inputs\FSR2_Dx12.h" />
+    <ClInclude Include="inputs\FSR3_Dx12.h" />
     <ClInclude Include="include\imgui\imconfig.h" />
     <ClInclude Include="include\imgui\imgui.h" />
     <ClInclude Include="include\imgui\imgui_impl_dx11.h" />
@@ -334,9 +334,9 @@ copy NUL "$(SolutionDir)x64\Release\a\!! EXTRACT ALL FILES TO GAME FOLDER !!" /Y
     <ClCompile Include="upscalers\fsr2\FSR2Feature_Vk.cpp" />
     <ClCompile Include="upscalers\IFeature.cpp" />
     <ClCompile Include="upscalers\IFeature_Dx12.cpp" />
-    <ClCompile Include="FfxApi_Dx12.cpp" />
-    <ClCompile Include="FSR2_Dx12.cpp" />
-    <ClCompile Include="FSR3_Dx12.cpp" />
+    <ClCompile Include="inputs\FfxApi_Dx12.cpp" />
+    <ClCompile Include="inputs\FSR2_Dx12.cpp" />
+    <ClCompile Include="inputs\FSR3_Dx12.cpp" />
     <ClCompile Include="hooks\HooksDx.cpp" />
     <ClCompile Include="hooks\HooksVk.cpp" />
     <ClCompile Include="menu\imgui_common.cpp" />
@@ -358,11 +358,11 @@ copy NUL "$(SolutionDir)x64\Release\a\!! EXTRACT ALL FILES TO GAME FOLDER !!" /Y
     <ClCompile Include="include\imgui\imgui_widgets.cpp" />
     <ClCompile Include="include\imgui\misc\freetype\imgui_freetype.cpp" />
     <ClCompile Include="Logger.cpp" />
-    <ClCompile Include="NVNGX.cpp" />
-    <ClCompile Include="NVNGX_DLSS_Dx11.cpp" />
-    <ClCompile Include="NVNGX_DLSS_Dx12.cpp" />
+    <ClCompile Include="inputs\NVNGX.cpp" />
+    <ClCompile Include="inputs\NVNGX_DLSS_Dx11.cpp" />
+    <ClCompile Include="inputs\NVNGX_DLSS_Dx12.cpp" />
     <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="NVNGX_DLSS_Vk.cpp" />
+    <ClCompile Include="inputs\NVNGX_DLSS_Vk.cpp" />
     <ClCompile Include="upscalers\xess\XeSSFeature.cpp" />
     <ClCompile Include="upscalers\xess\XeSSFeature.h" />
     <ClCompile Include="upscalers\xess\XeSSFeature_Dx11.cpp" />
@@ -377,8 +377,8 @@ copy NUL "$(SolutionDir)x64\Release\a\!! EXTRACT ALL FILES TO GAME FOLDER !!" /Y
     <ClCompile Include="shaders\rcas\RCAS_Dx11.cpp" />
     <ClCompile Include="shaders\rcas\RCAS_Dx12.cpp" />
     <ClCompile Include="Util.cpp" />
-    <ClCompile Include="XeSS_Debug.cpp" />
-    <ClCompile Include="XeSS_Dx12.cpp" />
+    <ClCompile Include="inputs\XeSS_Debug.cpp" />
+    <ClCompile Include="inputs\XeSS_Dx12.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="OptiScaler.rc" />
diff --git a/OptiScaler/OptiScaler.vcxproj.filters b/OptiScaler/OptiScaler.vcxproj.filters
index bdd9a36c..e28dd92c 100644
--- a/OptiScaler/OptiScaler.vcxproj.filters
+++ b/OptiScaler/OptiScaler.vcxproj.filters
@@ -212,13 +212,13 @@
     <ClInclude Include="proxies\Streamline_Proxy.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="FfxApi_Dx12.h">
+    <ClInclude Include="inputs\FfxApi_Dx12.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="FSR2_Dx12.h">
+    <ClInclude Include="inputs\FSR2_Dx12.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="FSR3_Dx12.h">
+    <ClInclude Include="inputs\FSR3_Dx12.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="scanner\scanner.h">
@@ -362,13 +362,13 @@
     <ClCompile Include="Util.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="NVNGX_DLSS_Dx12.cpp">
+    <ClCompile Include="inputs\NVNGX_DLSS_Dx12.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="NVNGX_DLSS_Dx11.cpp">
+    <ClCompile Include="inputs\NVNGX_DLSS_Dx11.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="NVNGX_DLSS_Vk.cpp">
+    <ClCompile Include="inputs\NVNGX_DLSS_Vk.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="upscalers\fsr2\FSR2Feature.cpp">
@@ -443,7 +443,7 @@
     <ClCompile Include="upscalers\dlss\DLSSFeature_Vk.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="NVNGX.cpp">
+    <ClCompile Include="inputs\NVNGX.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="menu\imgui_overlay_base.cpp">
@@ -494,10 +494,10 @@
     <ClCompile Include="upscalers\fsr31\FSR31Feature_Dx11.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="XeSS_Debug.cpp">
+    <ClCompile Include="inputs\XeSS_Debug.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="XeSS_Dx12.cpp">
+    <ClCompile Include="inputs\XeSS_Dx12.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="hooks\HooksDx.cpp">
@@ -509,13 +509,13 @@
     <ClCompile Include="hooks\wrapped_swapchain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="FfxApi_Dx12.cpp">
+    <ClCompile Include="inputs\FfxApi_Dx12.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="FSR2_Dx12.cpp">
+    <ClCompile Include="inputs\FSR2_Dx12.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="FSR3_Dx12.cpp">
+    <ClCompile Include="inputs\FSR3_Dx12.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="scanner\scanner.cpp">
diff --git a/OptiScaler/dllmain.cpp b/OptiScaler/dllmain.cpp
index 201186fc..d01cae98 100644
--- a/OptiScaler/dllmain.cpp
+++ b/OptiScaler/dllmain.cpp
@@ -8,8 +8,8 @@
 #include "proxies/FfxApi_Proxy.h"
 #include "proxies/Gdi32_Proxy.h"
 #include "proxies/Streamline_Proxy.h"
-#include "FSR2_Dx12.h"
-#include "FSR3_Dx12.h"
+#include "inputs/FSR2_Dx12.h"
+#include "inputs/FSR3_Dx12.h"
 
 #include "hooks/HooksDx.h"
 #include "hooks/HooksVk.h"
diff --git a/OptiScaler/FSR2_Dx12.cpp b/OptiScaler/inputs/FSR2_Dx12.cpp
similarity index 100%
rename from OptiScaler/FSR2_Dx12.cpp
rename to OptiScaler/inputs/FSR2_Dx12.cpp
diff --git a/OptiScaler/FSR2_Dx12.h b/OptiScaler/inputs/FSR2_Dx12.h
similarity index 100%
rename from OptiScaler/FSR2_Dx12.h
rename to OptiScaler/inputs/FSR2_Dx12.h
diff --git a/OptiScaler/FSR3_Dx12.cpp b/OptiScaler/inputs/FSR3_Dx12.cpp
similarity index 100%
rename from OptiScaler/FSR3_Dx12.cpp
rename to OptiScaler/inputs/FSR3_Dx12.cpp
diff --git a/OptiScaler/FSR3_Dx12.h b/OptiScaler/inputs/FSR3_Dx12.h
similarity index 100%
rename from OptiScaler/FSR3_Dx12.h
rename to OptiScaler/inputs/FSR3_Dx12.h
diff --git a/OptiScaler/FfxApi_Dx12.cpp b/OptiScaler/inputs/FfxApi_Dx12.cpp
similarity index 100%
rename from OptiScaler/FfxApi_Dx12.cpp
rename to OptiScaler/inputs/FfxApi_Dx12.cpp
diff --git a/OptiScaler/FfxApi_Dx12.h b/OptiScaler/inputs/FfxApi_Dx12.h
similarity index 100%
rename from OptiScaler/FfxApi_Dx12.h
rename to OptiScaler/inputs/FfxApi_Dx12.h
diff --git a/OptiScaler/NVNGX.cpp b/OptiScaler/inputs/NVNGX.cpp
similarity index 100%
rename from OptiScaler/NVNGX.cpp
rename to OptiScaler/inputs/NVNGX.cpp
diff --git a/OptiScaler/NVNGX_DLSS_Dx11.cpp b/OptiScaler/inputs/NVNGX_DLSS_Dx11.cpp
similarity index 100%
rename from OptiScaler/NVNGX_DLSS_Dx11.cpp
rename to OptiScaler/inputs/NVNGX_DLSS_Dx11.cpp
diff --git a/OptiScaler/NVNGX_DLSS_Dx12.cpp b/OptiScaler/inputs/NVNGX_DLSS_Dx12.cpp
similarity index 100%
rename from OptiScaler/NVNGX_DLSS_Dx12.cpp
rename to OptiScaler/inputs/NVNGX_DLSS_Dx12.cpp
diff --git a/OptiScaler/NVNGX_DLSS_Vk.cpp b/OptiScaler/inputs/NVNGX_DLSS_Vk.cpp
similarity index 100%
rename from OptiScaler/NVNGX_DLSS_Vk.cpp
rename to OptiScaler/inputs/NVNGX_DLSS_Vk.cpp
diff --git a/OptiScaler/XeSS_Debug.cpp b/OptiScaler/inputs/XeSS_Debug.cpp
similarity index 100%
rename from OptiScaler/XeSS_Debug.cpp
rename to OptiScaler/inputs/XeSS_Debug.cpp
diff --git a/OptiScaler/XeSS_Dx12.cpp b/OptiScaler/inputs/XeSS_Dx12.cpp
similarity index 100%
rename from OptiScaler/XeSS_Dx12.cpp
rename to OptiScaler/inputs/XeSS_Dx12.cpp
diff --git a/OptiScaler/proxies/FfxApi_Proxy.h b/OptiScaler/proxies/FfxApi_Proxy.h
index 6377b637..1b5a1517 100644
--- a/OptiScaler/proxies/FfxApi_Proxy.h
+++ b/OptiScaler/proxies/FfxApi_Proxy.h
@@ -5,7 +5,7 @@
 #include "Config.h"
 #include "Logger.h"
 
-#include "FfxApi_Dx12.h"
+#include <inputs/FfxApi_Dx12.h>
 
 #include "ffx_api.h"