diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index ad185deb8a..eb8787957b 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -44,22 +44,23 @@ add_subdirectory(Emu)
 add_subdirectory(rpcs3qt)
 
 set(RPCS3_SRC
-	basic_keyboard_handler.cpp
-	basic_mouse_handler.cpp
 	display_sleep_control.cpp
-	ds3_pad_handler.cpp
-	ds4_pad_handler.cpp
-	evdev_joystick_handler.cpp
 	headless_application.cpp
-	keyboard_pad_handler.cpp
 	main.cpp
 	main_application.cpp
-	mm_joystick_handler.cpp
-	pad_thread.cpp
 	rpcs3_version.cpp
 	stb_image.cpp
 	stdafx.cpp
-	xinput_pad_handler.cpp
+
+	Input/basic_keyboard_handler.cpp
+	Input/basic_mouse_handler.cpp
+	Input/ds3_pad_handler.cpp
+	Input/ds4_pad_handler.cpp
+	Input/evdev_joystick_handler.cpp
+	Input/keyboard_pad_handler.cpp
+	Input/mm_joystick_handler.cpp
+	Input/pad_thread.cpp
+	Input/xinput_pad_handler.cpp
 )
 
 if(WIN32)
diff --git a/rpcs3/Emu/Cell/Modules/cellGem.cpp b/rpcs3/Emu/Cell/Modules/cellGem.cpp
index ce33b6612c..25261bd545 100644
--- a/rpcs3/Emu/Cell/Modules/cellGem.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellGem.cpp
@@ -5,7 +5,7 @@
 #include "Emu/IdManager.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
-#include "pad_thread.h"
+#include "Input/pad_thread.h"
 #include "Emu/Io/MouseHandler.h"
 #include "Emu/RSX/GSRender.h"
 #include "Utilities/Timer.h"
diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
index f3545d727a..72056a8407 100644
--- a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
@@ -3,7 +3,7 @@
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/RSX/Overlays/overlays.h"
-#include "pad_thread.h"
+#include "Input/pad_thread.h"
 
 #include "cellSysutil.h"
 #include "cellOskDialog.h"
diff --git a/rpcs3/Emu/Cell/Modules/cellPad.cpp b/rpcs3/Emu/Cell/Modules/cellPad.cpp
index 6bc2029a2f..2db169be0b 100644
--- a/rpcs3/Emu/Cell/Modules/cellPad.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellPad.cpp
@@ -4,7 +4,7 @@
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/lv2/sys_process.h"
 
-#include "pad_thread.h"
+#include "Input/pad_thread.h"
 #include "cellPad.h"
 
 extern logs::channel sys_io;
diff --git a/rpcs3/Emu/Io/PadHandler.cpp b/rpcs3/Emu/Io/PadHandler.cpp
index 5c7e49a922..0d2b433588 100644
--- a/rpcs3/Emu/Io/PadHandler.cpp
+++ b/rpcs3/Emu/Io/PadHandler.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "PadHandler.h"
-#include "pad_thread.h"
+#include "Input/pad_thread.h"
 
 cfg_input g_cfg_input;
 
diff --git a/rpcs3/Emu/RSX/Overlays/overlays.h b/rpcs3/Emu/RSX/Overlays/overlays.h
index c78554d2e7..70080c3d31 100644
--- a/rpcs3/Emu/RSX/Overlays/overlays.h
+++ b/rpcs3/Emu/RSX/Overlays/overlays.h
@@ -6,7 +6,7 @@
 #include "../../Io/PadHandler.h"
 #include "Emu/Memory/vm.h"
 #include "Emu/IdManager.h"
-#include "pad_thread.h"
+#include "Input/pad_thread.h"
 
 #include "Emu/Cell/ErrorCodes.h"
 #include "Emu/Cell/Modules/cellSaveData.h"
diff --git a/rpcs3/basic_keyboard_handler.cpp b/rpcs3/Input/basic_keyboard_handler.cpp
similarity index 100%
rename from rpcs3/basic_keyboard_handler.cpp
rename to rpcs3/Input/basic_keyboard_handler.cpp
diff --git a/rpcs3/basic_keyboard_handler.h b/rpcs3/Input/basic_keyboard_handler.h
similarity index 100%
rename from rpcs3/basic_keyboard_handler.h
rename to rpcs3/Input/basic_keyboard_handler.h
diff --git a/rpcs3/basic_mouse_handler.cpp b/rpcs3/Input/basic_mouse_handler.cpp
similarity index 100%
rename from rpcs3/basic_mouse_handler.cpp
rename to rpcs3/Input/basic_mouse_handler.cpp
diff --git a/rpcs3/basic_mouse_handler.h b/rpcs3/Input/basic_mouse_handler.h
similarity index 100%
rename from rpcs3/basic_mouse_handler.h
rename to rpcs3/Input/basic_mouse_handler.h
diff --git a/rpcs3/ds3_pad_handler.cpp b/rpcs3/Input/ds3_pad_handler.cpp
similarity index 100%
rename from rpcs3/ds3_pad_handler.cpp
rename to rpcs3/Input/ds3_pad_handler.cpp
diff --git a/rpcs3/ds3_pad_handler.h b/rpcs3/Input/ds3_pad_handler.h
similarity index 100%
rename from rpcs3/ds3_pad_handler.h
rename to rpcs3/Input/ds3_pad_handler.h
diff --git a/rpcs3/ds4_pad_handler.cpp b/rpcs3/Input/ds4_pad_handler.cpp
similarity index 100%
rename from rpcs3/ds4_pad_handler.cpp
rename to rpcs3/Input/ds4_pad_handler.cpp
diff --git a/rpcs3/ds4_pad_handler.h b/rpcs3/Input/ds4_pad_handler.h
similarity index 100%
rename from rpcs3/ds4_pad_handler.h
rename to rpcs3/Input/ds4_pad_handler.h
diff --git a/rpcs3/evdev_joystick_handler.cpp b/rpcs3/Input/evdev_joystick_handler.cpp
similarity index 100%
rename from rpcs3/evdev_joystick_handler.cpp
rename to rpcs3/Input/evdev_joystick_handler.cpp
diff --git a/rpcs3/evdev_joystick_handler.h b/rpcs3/Input/evdev_joystick_handler.h
similarity index 100%
rename from rpcs3/evdev_joystick_handler.h
rename to rpcs3/Input/evdev_joystick_handler.h
diff --git a/rpcs3/keyboard_pad_handler.cpp b/rpcs3/Input/keyboard_pad_handler.cpp
similarity index 100%
rename from rpcs3/keyboard_pad_handler.cpp
rename to rpcs3/Input/keyboard_pad_handler.cpp
diff --git a/rpcs3/keyboard_pad_handler.h b/rpcs3/Input/keyboard_pad_handler.h
similarity index 100%
rename from rpcs3/keyboard_pad_handler.h
rename to rpcs3/Input/keyboard_pad_handler.h
diff --git a/rpcs3/mm_joystick_handler.cpp b/rpcs3/Input/mm_joystick_handler.cpp
similarity index 100%
rename from rpcs3/mm_joystick_handler.cpp
rename to rpcs3/Input/mm_joystick_handler.cpp
diff --git a/rpcs3/mm_joystick_handler.h b/rpcs3/Input/mm_joystick_handler.h
similarity index 100%
rename from rpcs3/mm_joystick_handler.h
rename to rpcs3/Input/mm_joystick_handler.h
diff --git a/rpcs3/pad_thread.cpp b/rpcs3/Input/pad_thread.cpp
similarity index 100%
rename from rpcs3/pad_thread.cpp
rename to rpcs3/Input/pad_thread.cpp
diff --git a/rpcs3/pad_thread.h b/rpcs3/Input/pad_thread.h
similarity index 100%
rename from rpcs3/pad_thread.h
rename to rpcs3/Input/pad_thread.h
diff --git a/rpcs3/xinput_pad_handler.cpp b/rpcs3/Input/xinput_pad_handler.cpp
similarity index 100%
rename from rpcs3/xinput_pad_handler.cpp
rename to rpcs3/Input/xinput_pad_handler.cpp
diff --git a/rpcs3/xinput_pad_handler.h b/rpcs3/Input/xinput_pad_handler.h
similarity index 100%
rename from rpcs3/xinput_pad_handler.h
rename to rpcs3/Input/xinput_pad_handler.h
diff --git a/rpcs3/main_application.cpp b/rpcs3/main_application.cpp
index f3ea23e904..f24e2397a7 100644
--- a/rpcs3/main_application.cpp
+++ b/rpcs3/main_application.cpp
@@ -1,22 +1,22 @@
 #include "main_application.h"
 
-#include "pad_thread.h"
+#include "Input/pad_thread.h"
 #include "Emu/Io/Null/NullPadHandler.h"
 #include "Emu/Io/Null/NullKeyboardHandler.h"
 #include "Emu/Io/Null/NullMouseHandler.h"
 #include "Emu/Io/KeyboardHandler.h"
 #include "Emu/Io/PadHandler.h"
 #include "Emu/Io/MouseHandler.h"
-#include "basic_keyboard_handler.h"
-#include "basic_mouse_handler.h"
-#include "keyboard_pad_handler.h"
-#include "ds4_pad_handler.h"
+#include "Input/basic_keyboard_handler.h"
+#include "Input/basic_mouse_handler.h"
+#include "Input/keyboard_pad_handler.h"
+#include "Input/ds4_pad_handler.h"
 #ifdef _WIN32
-#include "xinput_pad_handler.h"
-#include "mm_joystick_handler.h"
+#include "Input/xinput_pad_handler.h"
+#include "Input/mm_joystick_handler.h"
 #endif
 #ifdef HAVE_LIBEVDEV
-#include "evdev_joystick_handler.h"
+#include "Input/evdev_joystick_handler.h"
 #endif
 
 #include "Emu/Audio/AudioBackend.h"
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index d7ca1f9773..d02d910e84 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -331,17 +331,17 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="basic_keyboard_handler.cpp" />
-    <ClCompile Include="basic_mouse_handler.cpp" />
     <ClCompile Include="display_sleep_control.cpp" />
-    <ClCompile Include="ds3_pad_handler.cpp" />
-    <ClCompile Include="ds4_pad_handler.cpp" />
-    <ClCompile Include="evdev_joystick_handler.cpp" />
-    <ClCompile Include="keyboard_pad_handler.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="main_application.cpp" />
-    <ClCompile Include="mm_joystick_handler.cpp" />
-    <ClCompile Include="pad_thread.cpp" />
+    <ClCompile Include="Input\basic_keyboard_handler.cpp" />
+    <ClCompile Include="Input\basic_mouse_handler.cpp" />
+    <ClCompile Include="Input\ds3_pad_handler.cpp" />
+    <ClCompile Include="Input\ds4_pad_handler.cpp" />
+    <ClCompile Include="Input\evdev_joystick_handler.cpp" />
+    <ClCompile Include="Input\keyboard_pad_handler.cpp" />
+    <ClCompile Include="Input\mm_joystick_handler.cpp" />
+    <ClCompile Include="Input\pad_thread.cpp" />
     <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_about_dialog.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -1193,7 +1193,7 @@
     <ClCompile Include="rpcs3qt\save_data_dialog.cpp" />
     <ClCompile Include="rpcs3qt\save_data_list_dialog.cpp" />
     <ClCompile Include="rpcs3qt\settings_dialog.cpp" />
-    <ClCompile Include="xinput_pad_handler.cpp" />
+    <ClCompile Include="Input\xinput_pad_handler.cpp" />
     <ClCompile Include="\rpcs3qt\*.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -1215,7 +1215,7 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
-    <CustomBuild Include="basic_keyboard_handler.h">
+    <CustomBuild Include="Input\basic_keyboard_handler.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing basic_keyboard_handler.h...</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing basic_keyboard_handler.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
@@ -1233,7 +1233,7 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
-    <CustomBuild Include="basic_mouse_handler.h">
+    <CustomBuild Include="Input\basic_mouse_handler.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing basic_mouse_handler.h...</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing basic_mouse_handler.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
@@ -1252,10 +1252,10 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
     <ClInclude Include="display_sleep_control.h" />
-    <ClInclude Include="ds3_pad_handler.h" />
-    <ClInclude Include="ds4_pad_handler.h" />
-    <ClInclude Include="evdev_joystick_handler.h" />
-    <ClInclude Include="keyboard_pad_handler.h" />
+    <ClInclude Include="Input\ds3_pad_handler.h" />
+    <ClInclude Include="Input\ds4_pad_handler.h" />
+    <ClInclude Include="Input\evdev_joystick_handler.h" />
+    <ClInclude Include="Input\keyboard_pad_handler.h" />
     <CustomBuild Include="rpcs3qt\gs_frame.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing gs_frame.h...</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing gs_frame.h...</Message>
@@ -1426,7 +1426,7 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">
       </Command>
     </CustomBuild>
-    <ClInclude Include="mm_joystick_handler.h" />
+    <ClInclude Include="Input/mm_joystick_handler.h" />
     <CustomBuild Include="rpcs3qt\cg_disasm_window.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing cg_disasm_window.h...</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing cg_disasm_window.h...</Message>
@@ -1535,7 +1535,7 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions)  "-I.\..\3rdparty\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
     </CustomBuild>
-    <ClInclude Include="pad_thread.h" />
+    <ClInclude Include="Input\pad_thread.h" />
     <ClInclude Include="QTGeneratedFiles\ui_about_dialog.h" />
     <ClInclude Include="QTGeneratedFiles\ui_main_window.h" />
     <ClInclude Include="QTGeneratedFiles\ui_pad_settings_dialog.h" />
@@ -2007,7 +2007,7 @@
     <ClInclude Include="rpcs3qt\trophy_notification_frame.h" />
     <ClInclude Include="rpcs3qt\trophy_notification_helper.h" />
     <ClInclude Include="rpcs3qt\user_account.h" />
-    <ClInclude Include="xinput_pad_handler.h" />
+    <ClInclude Include="Input\xinput_pad_handler.h" />
     <ClInclude Include="\rpcs3qt\*.h" />
   </ItemGroup>
   <ItemGroup>
@@ -2191,4 +2191,4 @@
       <UserProperties MocDir=".\QTGeneratedFiles\$(ConfigurationName)" UicDir=".\QTGeneratedFiles" RccDir=".\QTGeneratedFiles" Qt5Version_x0020_x64="$(DefaultQtVersion)" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters
index f2c99cd1e9..e8e7655799 100644
--- a/rpcs3/rpcs3.vcxproj.filters
+++ b/rpcs3/rpcs3.vcxproj.filters
@@ -296,7 +296,7 @@
     <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_settings_dialog.cpp">
       <Filter>Generated Files\Debug - LLVM</Filter>
     </ClCompile>
-    <ClCompile Include="basic_keyboard_handler.cpp">
+    <ClCompile Include="Input\basic_keyboard_handler.cpp">
       <Filter>Io\Basic</Filter>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_basic_keyboard_handler.cpp">
@@ -323,16 +323,16 @@
     <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_basic_mouse_handler.cpp">
       <Filter>Generated Files\Debug - LLVM</Filter>
     </ClCompile>
-    <ClCompile Include="basic_mouse_handler.cpp">
+    <ClCompile Include="Input\basic_mouse_handler.cpp">
       <Filter>Io\Basic</Filter>
     </ClCompile>
-    <ClCompile Include="ds4_pad_handler.cpp">
+    <ClCompile Include="Input\ds4_pad_handler.cpp">
       <Filter>Io\DS4</Filter>
     </ClCompile>
-    <ClCompile Include="mm_joystick_handler.cpp">
+    <ClCompile Include="Input\mm_joystick_handler.cpp">
       <Filter>Io\MMJoystick</Filter>
     </ClCompile>
-    <ClCompile Include="xinput_pad_handler.cpp">
+    <ClCompile Include="Input\xinput_pad_handler.cpp">
       <Filter>Io\XInput</Filter>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_msg_dialog_frame.cpp">
@@ -461,7 +461,7 @@
     <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_save_manager_dialog.cpp">
       <Filter>Generated Files\Debug - LLVM</Filter>
     </ClCompile>
-    <ClCompile Include="pad_thread.cpp">
+    <ClCompile Include="Input\pad_thread.cpp">
       <Filter>Io</Filter>
     </ClCompile>
     <ClCompile Include="rpcs3qt\about_dialog.cpp">
@@ -554,7 +554,7 @@
     <ClCompile Include="rpcs3qt\msg_dialog_frame.cpp">
       <Filter>Gui\message dialog</Filter>
     </ClCompile>
-    <ClCompile Include="evdev_joystick_handler.cpp">
+    <ClCompile Include="Input\evdev_joystick_handler.cpp">
       <Filter>Io\evdev</Filter>
     </ClCompile>
     <ClCompile Include="rpcs3qt\save_manager_dialog.cpp">
@@ -656,7 +656,7 @@
     <ClCompile Include="rpcs3qt\_discord_utils.cpp">
       <Filter>Gui\utils</Filter>
     </ClCompile>
-    <ClCompile Include="keyboard_pad_handler.cpp">
+    <ClCompile Include="Input/keyboard_pad_handler.cpp">
       <Filter>Io\Keyboard</Filter>
     </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_trophy_manager_dialog.cpp">
@@ -716,7 +716,7 @@
     <ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_osk_dialog_frame.cpp">
       <Filter>Generated Files\Debug - LLVM</Filter>
     </ClCompile>
-    <ClCompile Include="ds3_pad_handler.cpp">
+    <ClCompile Include="Input/ds3_pad_handler.cpp">
       <Filter>Io\DS3</Filter>
     </ClCompile>
     <ClCompile Include="rpcs3qt\gui_application.cpp">
@@ -793,13 +793,13 @@
     <ClInclude Include="\rpcs3qt\*.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ds4_pad_handler.h">
+    <ClInclude Include="Input\ds4_pad_handler.h">
       <Filter>Io\DS4</Filter>
     </ClInclude>
-    <ClInclude Include="mm_joystick_handler.h">
+    <ClInclude Include="Input\mm_joystick_handler.h">
       <Filter>Io\MMJoystick</Filter>
     </ClInclude>
-    <ClInclude Include="xinput_pad_handler.h">
+    <ClInclude Include="Input\xinput_pad_handler.h">
       <Filter>Io\XInput</Filter>
     </ClInclude>
     <ClInclude Include="QTGeneratedFiles\ui_about_dialog.h">
@@ -826,7 +826,7 @@
     <ClInclude Include="rpcs3qt\trophy_notification_frame.h">
       <Filter>Gui\trophy</Filter>
     </ClInclude>
-    <ClInclude Include="pad_thread.h">
+    <ClInclude Include="Input\pad_thread.h">
       <Filter>Io</Filter>
     </ClInclude>
     <ClInclude Include="rpcs3qt\gl_gs_frame.h">
@@ -847,7 +847,7 @@
     <ClInclude Include="rpcs3qt\instruction_editor_dialog.h">
       <Filter>Gui\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="evdev_joystick_handler.h">
+    <ClInclude Include="Input\evdev_joystick_handler.h">
       <Filter>Io\evdev</Filter>
     </ClInclude>
     <ClInclude Include="rpcs3qt\find_dialog.h">
@@ -868,10 +868,10 @@
     <ClInclude Include="rpcs3qt\_discord_utils.h">
       <Filter>Gui\utils</Filter>
     </ClInclude>
-    <ClInclude Include="keyboard_pad_handler.h">
+    <ClInclude Include="Input/keyboard_pad_handler.h">
       <Filter>Io\Keyboard</Filter>
     </ClInclude>
-    <ClInclude Include="ds3_pad_handler.h">
+    <ClInclude Include="Input/ds3_pad_handler.h">
       <Filter>Io\DS3</Filter>
     </ClInclude>
     <ClInclude Include="rpcs3qt\stylesheets.h">
@@ -891,10 +891,10 @@
     <CustomBuild Include="release\moc_predefs.h.cbt">
       <Filter>Generated Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="basic_keyboard_handler.h">
+    <CustomBuild Include="Input\basic_keyboard_handler.h">
       <Filter>Io\Basic</Filter>
     </CustomBuild>
-    <CustomBuild Include="basic_mouse_handler.h">
+    <CustomBuild Include="Input\basic_mouse_handler.h">
       <Filter>Io\Basic</Filter>
     </CustomBuild>
     <ClInclude Include="resource.h">
@@ -1048,4 +1048,4 @@
   <ItemGroup>
     <ResourceCompile Include="rpcs3.rc" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
index 667b4484f3..c39159ea14 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
@@ -13,15 +13,15 @@
 
 #include "Emu/Io/Null/NullPadHandler.h"
 
-#include "keyboard_pad_handler.h"
-#include "ds3_pad_handler.h"
-#include "ds4_pad_handler.h"
+#include "Input/keyboard_pad_handler.h"
+#include "Input/ds3_pad_handler.h"
+#include "Input/ds4_pad_handler.h"
 #ifdef _WIN32
-#include "xinput_pad_handler.h"
-#include "mm_joystick_handler.h"
+#include "Input/xinput_pad_handler.h"
+#include "Input/mm_joystick_handler.h"
 #endif
 #ifdef HAVE_LIBEVDEV
-#include "evdev_joystick_handler.h"
+#include "Input/evdev_joystick_handler.h"
 #endif
 
 inline std::string sstr(const QString& _in) { return _in.toStdString(); }