diff --git a/Source/Core/Core/Analytics.cpp b/Source/Core/Core/Analytics.cpp
index 4d2dcd8e41..6d628cd582 100644
--- a/Source/Core/Core/Analytics.cpp
+++ b/Source/Core/Core/Analytics.cpp
@@ -21,7 +21,7 @@
 #include "Core/HW/GCPad.h"
 #include "Core/Movie.h"
 #include "Core/NetPlayProto.h"
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/GCAdapter.h"
 #include "InputCommon/InputConfig.h"
 #include "VideoCommon/VideoBackendBase.h"
diff --git a/Source/Core/Core/HW/GCKeyboard.h b/Source/Core/Core/HW/GCKeyboard.h
index 6f254a9a85..c968e2bae2 100644
--- a/Source/Core/Core/HW/GCKeyboard.h
+++ b/Source/Core/Core/HW/GCKeyboard.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "Common/CommonTypes.h"
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 
 class InputConfig;
 enum class KeyboardGroup;
diff --git a/Source/Core/Core/HW/GCKeyboardEmu.cpp b/Source/Core/Core/HW/GCKeyboardEmu.cpp
index f31dca91ca..067cd996d3 100644
--- a/Source/Core/Core/HW/GCKeyboardEmu.cpp
+++ b/Source/Core/Core/HW/GCKeyboardEmu.cpp
@@ -4,7 +4,7 @@
 
 #include "Core/HW/GCKeyboardEmu.h"
 #include "Common/Common.h"
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/KeyboardStatus.h"
 
 static const u16 keys0_bitmasks[] = {KEYMASK_HOME,       KEYMASK_END, KEYMASK_PGUP, KEYMASK_PGDN,
diff --git a/Source/Core/Core/HW/GCKeyboardEmu.h b/Source/Core/Core/HW/GCKeyboardEmu.h
index d1729e6a9b..cf6cfd7e9d 100644
--- a/Source/Core/Core/HW/GCKeyboardEmu.h
+++ b/Source/Core/Core/HW/GCKeyboardEmu.h
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 
 struct KeyboardStatus;
 
diff --git a/Source/Core/Core/HW/GCPad.h b/Source/Core/Core/HW/GCPad.h
index b330f44170..28917da35e 100644
--- a/Source/Core/Core/HW/GCPad.h
+++ b/Source/Core/Core/HW/GCPad.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "Common/CommonTypes.h"
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/Device.h"
 
 class InputConfig;
diff --git a/Source/Core/Core/HW/GCPadEmu.h b/Source/Core/Core/HW/GCPadEmu.h
index a239c299b5..cc51d60db0 100644
--- a/Source/Core/Core/HW/GCPadEmu.h
+++ b/Source/Core/Core/HW/GCPadEmu.h
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 
 class ControlGroup;
 
diff --git a/Source/Core/Core/HW/Wiimote.h b/Source/Core/Core/HW/Wiimote.h
index 3f1dd1db06..668096265d 100644
--- a/Source/Core/Core/HW/Wiimote.h
+++ b/Source/Core/Core/HW/Wiimote.h
@@ -6,7 +6,7 @@
 
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 
 class InputConfig;
 class PointerWrap;
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h
index 7d5361795a..caec32754a 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h
@@ -7,7 +7,7 @@
 #include <array>
 #include <string>
 #include "Common/CommonTypes.h"
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 
 namespace WiimoteEmu
 {
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
index 11719ad1ee..a32433ec44 100644
--- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
+++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
@@ -9,7 +9,7 @@
 
 #include "Core/HW/WiimoteEmu/Encryption.h"
 #include "Core/HW/WiimoteEmu/WiimoteHid.h"
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 
 // Registry sizes
 #define WIIMOTE_EEPROM_SIZE (16 * 1024)
diff --git a/Source/Core/Core/HotkeyManager.h b/Source/Core/Core/HotkeyManager.h
index 629d033e5b..e002c48d54 100644
--- a/Source/Core/Core/HotkeyManager.h
+++ b/Source/Core/Core/HotkeyManager.h
@@ -7,7 +7,7 @@
 #include <array>
 #include <string>
 
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/InputConfig.h"
 
 enum Hotkey
diff --git a/Source/Core/DolphinWX/Input/InputConfigDiag.cpp b/Source/Core/DolphinWX/Input/InputConfigDiag.cpp
index ed71fd1b3f..b9e93553b3 100644
--- a/Source/Core/DolphinWX/Input/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Input/InputConfigDiag.cpp
@@ -52,7 +52,7 @@
 #include "DolphinWX/Input/NunchukInputConfigDiag.h"
 #include "DolphinWX/Input/TurntableInputConfigDiag.h"
 #include "DolphinWX/WxUtils.h"
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/ControllerInterface/Device.h"
 #include "InputCommon/ControllerInterface/ExpressionParser.h"
diff --git a/Source/Core/DolphinWX/Input/InputConfigDiag.h b/Source/Core/DolphinWX/Input/InputConfigDiag.h
index 74d22065cf..09c2a011d1 100644
--- a/Source/Core/DolphinWX/Input/InputConfigDiag.h
+++ b/Source/Core/DolphinWX/Input/InputConfigDiag.h
@@ -23,7 +23,7 @@
 #include <wx/spinctrl.h>
 #include <wx/timer.h>
 
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/ControllerInterface/Device.h"
 
diff --git a/Source/Core/DolphinWX/Input/InputConfigDiagBitmaps.cpp b/Source/Core/DolphinWX/Input/InputConfigDiagBitmaps.cpp
index f531e8c1a0..57f2d892a2 100644
--- a/Source/Core/DolphinWX/Input/InputConfigDiagBitmaps.cpp
+++ b/Source/Core/DolphinWX/Input/InputConfigDiagBitmaps.cpp
@@ -22,7 +22,7 @@
 #include "DolphinWX/Input/InputConfigDiag.h"
 #include "DolphinWX/WxUtils.h"
 
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/ControllerInterface/Device.h"
 
diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
index bc56dbe4f7..658ce9f215 100644
--- a/Source/Core/InputCommon/CMakeLists.txt
+++ b/Source/Core/InputCommon/CMakeLists.txt
@@ -1,79 +1,79 @@
-set(SRCS	ControllerEmu.cpp
-			InputConfig.cpp
-			ControllerInterface/ControllerInterface.cpp
-			ControllerInterface/Device.cpp
-			ControllerInterface/ExpressionParser.cpp)
-set(LIBS	common)
+set(SRCS InputConfig.cpp
+         ControllerEmu/ControllerEmu.cpp
+         ControllerInterface/ControllerInterface.cpp
+         ControllerInterface/Device.cpp
+         ControllerInterface/ExpressionParser.cpp)
+set(LIBS common)
 
 if(WIN32)
-	set(SRCS	${SRCS}
-				ControllerInterface/DInput/DInput.cpp
-				ControllerInterface/DInput/DInputJoystick.cpp
-				ControllerInterface/DInput/DInputKeyboardMouse.cpp
-				ControllerInterface/DInput/XInputFilter.cpp
-				ControllerInterface/XInput/XInput.cpp
-				ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp)
+  set(SRCS ${SRCS}
+           ControllerInterface/DInput/DInput.cpp
+           ControllerInterface/DInput/DInputJoystick.cpp
+           ControllerInterface/DInput/DInputKeyboardMouse.cpp
+           ControllerInterface/DInput/XInputFilter.cpp
+           ControllerInterface/XInput/XInput.cpp
+           ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp)
 elseif(APPLE)
-	find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-	find_library(CARBON_LIBRARY Carbon)
-	find_library(COCOA_LIBRARY Cocoa)
-	set(SRCS	${SRCS}
-				ControllerInterface/OSX/OSX.mm
-				ControllerInterface/OSX/OSXKeyboard.mm
-				ControllerInterface/OSX/OSXJoystick.mm
-				ControllerInterface/Quartz/Quartz.mm
-				ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm
-				ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp)
-	set(LIBS ${LIBS} ${COREFOUNDATION_LIBRARY} ${CARBON_LIBRARY} ${COCOA_LIBRARY})
+  find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+  find_library(CARBON_LIBRARY Carbon)
+  find_library(COCOA_LIBRARY Cocoa)
+  set(SRCS ${SRCS}
+           ControllerInterface/OSX/OSX.mm
+           ControllerInterface/OSX/OSXKeyboard.mm
+           ControllerInterface/OSX/OSXJoystick.mm
+           ControllerInterface/Quartz/Quartz.mm
+           ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm
+           ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp)
+  set(LIBS ${LIBS} ${COREFOUNDATION_LIBRARY} ${CARBON_LIBRARY} ${COCOA_LIBRARY})
 elseif(X11_FOUND)
-	set(SRCS	${SRCS}
-				ControllerInterface/Xlib/XInput2.cpp)
-	set(LIBS ${LIBS} ${X11_LIBRARIES} ${X11_INPUT_LIBRARIES})
+  set(SRCS ${SRCS}
+           ControllerInterface/Xlib/XInput2.cpp)
+  set(LIBS ${LIBS} ${X11_LIBRARIES} ${X11_INPUT_LIBRARIES})
 elseif(ANDROID)
-	add_definitions(-DCIFACE_USE_ANDROID)
-	set(SRCS ${SRCS}
-	         ControllerInterface/Android/Android.cpp)
+  add_definitions(-DCIFACE_USE_ANDROID)
+  set(SRCS ${SRCS}
+           ControllerInterface/Android/Android.cpp)
 endif()
 
 if(ANDROID)
-        set(SRCS        ${SRCS} GCAdapter_Android.cpp)
+  set(SRCS ${SRCS} GCAdapter_Android.cpp)
 else()
-        set(SRCS        ${SRCS} GCAdapter.cpp)
-        set(LIBS ${LIBS} ${LIBUSB_LIBRARIES})
+  set(SRCS ${SRCS} GCAdapter.cpp)
+  set(LIBS ${LIBS} ${LIBUSB_LIBRARIES})
 endif()
 
 if(LIBEVDEV_FOUND AND LIBUDEV_FOUND)
-	set(SRCS ${SRCS} ControllerInterface/evdev/evdev.cpp)
-	set(LIBS ${LIBS} ${LIBEVDEV_LIBRARY} ${LIBUDEV_LIBRARY})
+  set(SRCS ${SRCS} ControllerInterface/evdev/evdev.cpp)
+  set(LIBS ${LIBS} ${LIBEVDEV_LIBRARY} ${LIBUDEV_LIBRARY})
 endif()
 
 if(UNIX)
-	set(SRCS ${SRCS} ControllerInterface/Pipes/Pipes.cpp)
+  set(SRCS ${SRCS} ControllerInterface/Pipes/Pipes.cpp)
 endif()
 
 if(ENABLE_SDL)
-	find_package(SDL2)
-	if(SDL2_FOUND)
-		message(STATUS "Using shared SDL2")
-		set(SDL_TARGET SDL2::SDL2)
-	else()
-		# SDL2 not found, try SDL
-		find_package(SDL)
-		if(SDL_FOUND)
-			message(STATUS "Using shared SDL")
-			add_library(System_SDL INTERFACE)
-			target_include_directories(System_SDL INTERFACE ${SDL_INCLUDE_DIR})
-			target_link_libraries(System_SDL INTERFACE ${SDL_LIBRARY})
-			set(SDL_TARGET System_SDL)
-		endif()
-	endif()
-	if(SDL_TARGET AND TARGET ${SDL_TARGET})
-		set(SRCS ${SRCS} ControllerInterface/SDL/SDL.cpp)
-		set(LIBS ${LIBS} ${SDL_TARGET})
-		add_definitions(-DHAVE_SDL=1)
-	else()
-	  message(STATUS "SDL NOT found, disabling SDL input")
-	endif()
+  find_package(SDL2)
+  if(SDL2_FOUND)
+    message(STATUS "Using shared SDL2")
+    set(SDL_TARGET SDL2::SDL2)
+  else()
+    # SDL2 not found, try SDL
+    find_package(SDL)
+    if(SDL_FOUND)
+      message(STATUS "Using shared SDL")
+      add_library(System_SDL INTERFACE)
+      target_include_directories(System_SDL INTERFACE ${SDL_INCLUDE_DIR})
+      target_link_libraries(System_SDL INTERFACE ${SDL_LIBRARY})
+      set(SDL_TARGET System_SDL)
+    endif()
+  endif()
+  if(SDL_TARGET AND TARGET ${SDL_TARGET})
+    set(SRCS ${SRCS} ControllerInterface/SDL/SDL.cpp)
+    set(LIBS ${LIBS} ${SDL_TARGET})
+    add_definitions(-DHAVE_SDL=1)
+  else()
+    message(STATUS "SDL NOT found, disabling SDL input")
+  endif()
 endif()
 
 add_dolphin_library(inputcommon "${SRCS}" "${LIBS}")
diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
similarity index 99%
rename from Source/Core/InputCommon/ControllerEmu.cpp
rename to Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
index 678ae02259..e66e682e48 100644
--- a/Source/Core/InputCommon/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include <memory>
 #include "Common/Common.h"
 #include "VideoCommon/OnScreenDisplay.h"
diff --git a/Source/Core/InputCommon/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
similarity index 100%
rename from Source/Core/InputCommon/ControllerEmu.h
rename to Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj
index 3ffd5c8397..96e0bad04e 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj
+++ b/Source/Core/InputCommon/InputCommon.vcxproj
@@ -35,7 +35,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <ClCompile Include="ControllerEmu.cpp" />
+    <ClCompile Include="ControllerEmu\ControllerEmu.cpp" />
     <ClCompile Include="ControllerInterface\ControllerInterface.cpp" />
     <ClCompile Include="ControllerInterface\Device.cpp" />
     <ClCompile Include="ControllerInterface\DInput\DInput.cpp" />
@@ -55,7 +55,7 @@
     <ClCompile Include="InputConfig.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="ControllerEmu.h" />
+    <ClInclude Include="ControllerEmu\ControllerEmu.h" />
     <ClInclude Include="ControllerInterface\ControllerInterface.h" />
     <ClInclude Include="ControllerInterface\Device.h" />
     <ClInclude Include="ControllerInterface\DInput\DInput.h" />
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters
index 6a63852303..046e66f571 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj.filters
+++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters
@@ -13,11 +13,16 @@
     <Filter Include="ControllerInterface\ForceFeedback">
       <UniqueIdentifier>{e10ce316-283c-4be0-848d-578dec2b6404}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ControllerEmu">
+      <UniqueIdentifier>{4c839215-4085-4e34-a960-7960986ad015}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="ControllerEmu.cpp" />
     <ClCompile Include="GCAdapter.cpp" />
     <ClCompile Include="InputConfig.cpp" />
+    <ClCompile Include="ControllerEmu\ControllerEmu.cpp">
+      <Filter>ControllerEmu</Filter>
+    </ClCompile>
     <ClCompile Include="ControllerInterface\DInput\DInput.cpp">
       <Filter>ControllerInterface\DInput</Filter>
     </ClCompile>
@@ -47,10 +52,12 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="ControllerEmu.h" />
-    <ClCompile Include="GCAdapter.h" />
+    <ClInclude Include="GCAdapter.h" />
     <ClInclude Include="GCPadStatus.h" />
     <ClInclude Include="InputConfig.h" />
+    <ClInclude Include="ControllerEmu\ControllerEmu.h">
+      <Filter>ControllerEmu</Filter>
+    </ClInclude>
     <ClInclude Include="ControllerInterface\DInput\DInput.h">
       <Filter>ControllerInterface\DInput</Filter>
     </ClInclude>
diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp
index cb4ea376bd..1a723c5fbb 100644
--- a/Source/Core/InputCommon/InputConfig.cpp
+++ b/Source/Core/InputCommon/InputConfig.cpp
@@ -9,7 +9,7 @@
 #include "Common/MsgHandler.h"
 #include "Core/ConfigManager.h"
 #include "Core/HW/Wiimote.h"
-#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/InputConfig.h"