diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp
index cb6e1db00c..ef2c75fc3c 100644
--- a/Source/Core/Core/BootManager.cpp
+++ b/Source/Core/Core/BootManager.cpp
@@ -33,7 +33,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/EXI/EXI.h"
-#include "Core/HW/SI.h"
+#include "Core/HW/SI/SI.h"
 #include "Core/HW/Sram.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/Host.h"
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index de5373c70c..1fb847e497 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -109,14 +109,14 @@ set(SRCS	ActionReplay.cpp
 			HW/MemoryInterface.cpp
 			HW/MMIO.cpp
 			HW/ProcessorInterface.cpp
-			HW/SI.cpp
-			HW/SI_Device.cpp
-			HW/SI_DeviceDanceMat.cpp
-			HW/SI_DeviceGBA.cpp
-			HW/SI_DeviceGCAdapter.cpp
-			HW/SI_DeviceGCController.cpp
-			HW/SI_DeviceGCSteeringWheel.cpp
-			HW/SI_DeviceKeyboard.cpp
+			HW/SI/SI.cpp
+			HW/SI/SI_Device.cpp
+			HW/SI/SI_DeviceDanceMat.cpp
+			HW/SI/SI_DeviceGBA.cpp
+			HW/SI/SI_DeviceGCAdapter.cpp
+			HW/SI/SI_DeviceGCController.cpp
+			HW/SI/SI_DeviceGCSteeringWheel.cpp
+			HW/SI/SI_DeviceKeyboard.cpp
 			HW/Sram.cpp
 			HW/StreamADPCM.cpp
 			HW/SystemTimers.cpp
diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
index 7d8f7d7993..d2ba192dd8 100644
--- a/Source/Core/Core/ConfigManager.cpp
+++ b/Source/Core/Core/ConfigManager.cpp
@@ -21,7 +21,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"  // for bWii
 #include "Core/FifoPlayer/FifoDataFile.h"
-#include "Core/HW/SI.h"
+#include "Core/HW/SI/SI.h"
 #include "Core/IOS/USB/Bluetooth/BTBase.h"
 #include "Core/PowerPC/PowerPC.h"
 
diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h
index 23b78369ae..76318d68f2 100644
--- a/Source/Core/Core/ConfigManager.h
+++ b/Source/Core/Core/ConfigManager.h
@@ -11,7 +11,7 @@
 #include "Common/IniFile.h"
 #include "Common/NonCopyable.h"
 #include "Core/HW/EXI/EXI_Device.h"
-#include "Core/HW/SI_Device.h"
+#include "Core/HW/SI/SI_Device.h"
 
 namespace DiscIO
 {
diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
index 99bf3264e7..c3ed4081ad 100644
--- a/Source/Core/Core/Core.vcxproj
+++ b/Source/Core/Core/Core.vcxproj
@@ -140,14 +140,14 @@
     <ClCompile Include="HW\MemoryInterface.cpp" />
     <ClCompile Include="HW\MMIO.cpp" />
     <ClCompile Include="HW\ProcessorInterface.cpp" />
-    <ClCompile Include="HW\SI.cpp" />
-    <ClCompile Include="HW\SI_Device.cpp" />
-    <ClCompile Include="HW\SI_DeviceDanceMat.cpp" />
-    <ClCompile Include="HW\SI_DeviceGBA.cpp" />
-    <ClCompile Include="HW\SI_DeviceGCAdapter.cpp" />
-    <ClCompile Include="HW\SI_DeviceGCController.cpp" />
-    <ClCompile Include="HW\SI_DeviceGCSteeringWheel.cpp" />
-    <ClCompile Include="HW\SI_DeviceKeyboard.cpp" />
+    <ClCompile Include="HW\SI\SI.cpp" />
+    <ClCompile Include="HW\SI\SI_Device.cpp" />
+    <ClCompile Include="HW\SI\SI_DeviceDanceMat.cpp" />
+    <ClCompile Include="HW\SI\SI_DeviceGBA.cpp" />
+    <ClCompile Include="HW\SI\SI_DeviceGCAdapter.cpp" />
+    <ClCompile Include="HW\SI\SI_DeviceGCController.cpp" />
+    <ClCompile Include="HW\SI\SI_DeviceGCSteeringWheel.cpp" />
+    <ClCompile Include="HW\SI\SI_DeviceKeyboard.cpp" />
     <ClCompile Include="HW\Sram.cpp" />
     <ClCompile Include="HW\StreamADPCM.cpp" />
     <ClCompile Include="HW\SystemTimers.cpp" />
@@ -370,14 +370,14 @@
     <ClInclude Include="HW\MMIO.h" />
     <ClInclude Include="HW\MMIOHandlers.h" />
     <ClInclude Include="HW\ProcessorInterface.h" />
-    <ClInclude Include="HW\SI.h" />
-    <ClInclude Include="HW\SI_Device.h" />
-    <ClInclude Include="HW\SI_DeviceDanceMat.h" />
-    <ClInclude Include="HW\SI_DeviceGBA.h" />
-    <ClInclude Include="HW\SI_DeviceGCAdapter.h" />
-    <ClInclude Include="HW\SI_DeviceGCController.h" />
-    <ClInclude Include="HW\SI_DeviceGCSteeringWheel.h" />
-    <ClInclude Include="HW\SI_DeviceKeyboard.h" />
+    <ClInclude Include="HW\SI\SI.h" />
+    <ClInclude Include="HW\SI\SI_Device.h" />
+    <ClInclude Include="HW\SI\SI_DeviceDanceMat.h" />
+    <ClInclude Include="HW\SI\SI_DeviceGBA.h" />
+    <ClInclude Include="HW\SI\SI_DeviceGCAdapter.h" />
+    <ClInclude Include="HW\SI\SI_DeviceGCController.h" />
+    <ClInclude Include="HW\SI\SI_DeviceGCSteeringWheel.h" />
+    <ClInclude Include="HW\SI\SI_DeviceKeyboard.h" />
     <ClInclude Include="HW\Sram.h" />
     <ClInclude Include="HW\StreamADPCM.h" />
     <ClInclude Include="HW\SystemTimers.h" />
diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters
index d4c6f5e70c..c08e6a8d1b 100644
--- a/Source/Core/Core/Core.vcxproj.filters
+++ b/Source/Core/Core/Core.vcxproj.filters
@@ -445,28 +445,28 @@
     <ClCompile Include="HW\ProcessorInterface.cpp">
       <Filter>HW %28Flipper/Hollywood%29\PI - Processor Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\SI.cpp">
+    <ClCompile Include="HW\SI\SI.cpp">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\SI_Device.cpp">
+    <ClCompile Include="HW\SI\SI_Device.cpp">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\SI_DeviceDanceMat.cpp">
+    <ClCompile Include="HW\SI\SI_DeviceDanceMat.cpp">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\SI_DeviceGBA.cpp">
+    <ClCompile Include="HW\SI\SI_DeviceGBA.cpp">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\SI_DeviceGCAdapter.cpp">
+    <ClCompile Include="HW\SI\SI_DeviceGCAdapter.cpp">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\SI_DeviceGCController.cpp">
+    <ClCompile Include="HW\SI\SI_DeviceGCController.cpp">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\SI_DeviceGCSteeringWheel.cpp">
+    <ClCompile Include="HW\SI\SI_DeviceGCSteeringWheel.cpp">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\SI_DeviceKeyboard.cpp">
+    <ClCompile Include="HW\SI\SI_DeviceKeyboard.cpp">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClCompile>
     <ClCompile Include="HW\VideoInterface.cpp">
@@ -1042,28 +1042,28 @@
     <ClInclude Include="HW\ProcessorInterface.h">
       <Filter>HW %28Flipper/Hollywood%29\PI - Processor Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\SI.h">
+    <ClInclude Include="HW\SI\SI.h">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\SI_Device.h">
+    <ClInclude Include="HW\SI\SI_Device.h">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\SI_DeviceDanceMat.h">
+    <ClInclude Include="HW\SI\SI_DeviceDanceMat.h">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\SI_DeviceGBA.h">
+    <ClInclude Include="HW\SI\SI_DeviceGBA.h">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\SI_DeviceGCAdapter.h">
+    <ClInclude Include="HW\SI\SI_DeviceGCAdapter.h">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\SI_DeviceGCController.h">
+    <ClInclude Include="HW\SI\SI_DeviceGCController.h">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\SI_DeviceGCSteeringWheel.h">
+    <ClInclude Include="HW\SI\SI_DeviceGCSteeringWheel.h">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\SI_DeviceKeyboard.h">
+    <ClInclude Include="HW\SI\SI_DeviceKeyboard.h">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClInclude>
     <ClInclude Include="HW\VideoInterface.h">
diff --git a/Source/Core/Core/HW/HW.cpp b/Source/Core/Core/HW/HW.cpp
index 5e75d767f5..d29541c19a 100644
--- a/Source/Core/Core/HW/HW.cpp
+++ b/Source/Core/Core/HW/HW.cpp
@@ -17,7 +17,7 @@
 #include "Core/HW/HW.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/ProcessorInterface.h"
-#include "Core/HW/SI.h"
+#include "Core/HW/SI/SI.h"
 #include "Core/HW/SystemTimers.h"
 #include "Core/HW/VideoInterface.h"
 #include "Core/HW/WII_IPC.h"
diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp
index ec751a90c0..6260483881 100644
--- a/Source/Core/Core/HW/Memmap.cpp
+++ b/Source/Core/Core/HW/Memmap.cpp
@@ -24,7 +24,7 @@
 #include "Core/HW/Memmap.h"
 #include "Core/HW/MemoryInterface.h"
 #include "Core/HW/ProcessorInterface.h"
-#include "Core/HW/SI.h"
+#include "Core/HW/SI/SI.h"
 #include "Core/HW/VideoInterface.h"
 #include "Core/HW/WII_IPC.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
diff --git a/Source/Core/Core/HW/SI.cpp b/Source/Core/Core/HW/SI/SI.cpp
similarity index 99%
rename from Source/Core/Core/HW/SI.cpp
rename to Source/Core/Core/HW/SI/SI.cpp
index ed04225e77..edddf1b488 100644
--- a/Source/Core/Core/HW/SI.cpp
+++ b/Source/Core/Core/HW/SI/SI.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/HW/SI/SI.h"
+
 #include <algorithm>
 #include <array>
 #include <cstring>
@@ -13,8 +15,7 @@
 #include "Core/CoreTiming.h"
 #include "Core/HW/MMIO.h"
 #include "Core/HW/ProcessorInterface.h"
-#include "Core/HW/SI.h"
-#include "Core/HW/SI_DeviceGBA.h"
+#include "Core/HW/SI/SI_DeviceGBA.h"
 #include "Core/HW/SystemTimers.h"
 #include "Core/Movie.h"
 #include "Core/NetPlayProto.h"
diff --git a/Source/Core/Core/HW/SI.h b/Source/Core/Core/HW/SI/SI.h
similarity index 100%
rename from Source/Core/Core/HW/SI.h
rename to Source/Core/Core/HW/SI/SI.h
diff --git a/Source/Core/Core/HW/SI_Device.cpp b/Source/Core/Core/HW/SI/SI_Device.cpp
similarity index 90%
rename from Source/Core/Core/HW/SI_Device.cpp
rename to Source/Core/Core/HW/SI/SI_Device.cpp
index 04495b699e..925605121c 100644
--- a/Source/Core/Core/HW/SI_Device.cpp
+++ b/Source/Core/Core/HW/SI/SI_Device.cpp
@@ -2,19 +2,20 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/HW/SI/SI_Device.h"
+
 #include <memory>
 #include <string>
 
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
-#include "Core/HW/SI_Device.h"
-#include "Core/HW/SI_DeviceDanceMat.h"
-#include "Core/HW/SI_DeviceGBA.h"
-#include "Core/HW/SI_DeviceGCAdapter.h"
-#include "Core/HW/SI_DeviceGCController.h"
-#include "Core/HW/SI_DeviceGCSteeringWheel.h"
-#include "Core/HW/SI_DeviceKeyboard.h"
+#include "Core/HW/SI/SI_DeviceDanceMat.h"
+#include "Core/HW/SI/SI_DeviceGBA.h"
+#include "Core/HW/SI/SI_DeviceGCAdapter.h"
+#include "Core/HW/SI/SI_DeviceGCController.h"
+#include "Core/HW/SI/SI_DeviceGCSteeringWheel.h"
+#include "Core/HW/SI/SI_DeviceKeyboard.h"
 
 // --- interface ISIDevice ---
 int ISIDevice::RunBuffer(u8* _pBuffer, int _iLength)
diff --git a/Source/Core/Core/HW/SI_Device.h b/Source/Core/Core/HW/SI/SI_Device.h
similarity index 100%
rename from Source/Core/Core/HW/SI_Device.h
rename to Source/Core/Core/HW/SI/SI_Device.h
diff --git a/Source/Core/Core/HW/SI_DeviceDanceMat.cpp b/Source/Core/Core/HW/SI/SI_DeviceDanceMat.cpp
similarity index 97%
rename from Source/Core/Core/HW/SI_DeviceDanceMat.cpp
rename to Source/Core/Core/HW/SI/SI_DeviceDanceMat.cpp
index 4259ad34d8..46291038b1 100644
--- a/Source/Core/Core/HW/SI_DeviceDanceMat.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceDanceMat.cpp
@@ -2,7 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/HW/SI_DeviceDanceMat.h"
+#include "Core/HW/SI/SI_DeviceDanceMat.h"
+
 #include "Common/CommonTypes.h"
 #include "InputCommon/GCPadStatus.h"
 
diff --git a/Source/Core/Core/HW/SI_DeviceDanceMat.h b/Source/Core/Core/HW/SI/SI_DeviceDanceMat.h
similarity index 91%
rename from Source/Core/Core/HW/SI_DeviceDanceMat.h
rename to Source/Core/Core/HW/SI/SI_DeviceDanceMat.h
index 14e7c64edf..fcaf14b86a 100644
--- a/Source/Core/Core/HW/SI_DeviceDanceMat.h
+++ b/Source/Core/Core/HW/SI/SI_DeviceDanceMat.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "Common/CommonTypes.h"
-#include "Core/HW/SI_DeviceGCController.h"
+#include "Core/HW/SI/SI_DeviceGCController.h"
 
 struct GCPadStatus;
 
diff --git a/Source/Core/Core/HW/SI_DeviceGBA.cpp b/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp
similarity index 98%
rename from Source/Core/Core/HW/SI_DeviceGBA.cpp
rename to Source/Core/Core/HW/SI/SI_DeviceGBA.cpp
index 880310bcb4..90f654ba65 100644
--- a/Source/Core/Core/HW/SI_DeviceGBA.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp
@@ -2,22 +2,23 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/HW/SI/SI_DeviceGBA.h"
+
 #include <memory>
 #include <mutex>
 #include <queue>
 #include <thread>
 
+#include <SFML/Network.hpp>
+
 #include "Common/CommonTypes.h"
 #include "Common/Flag.h"
 #include "Common/Logging/Log.h"
 #include "Common/Thread.h"
 #include "Core/CoreTiming.h"
-#include "Core/HW/SI_Device.h"
-#include "Core/HW/SI_DeviceGBA.h"
+#include "Core/HW/SI/SI_Device.h"
 #include "Core/HW/SystemTimers.h"
 
-#include "SFML/Network.hpp"
-
 static std::thread connectionThread;
 static std::queue<std::unique_ptr<sf::TcpSocket>> waiting_socks;
 static std::queue<std::unique_ptr<sf::TcpSocket>> waiting_clocks;
diff --git a/Source/Core/Core/HW/SI_DeviceGBA.h b/Source/Core/Core/HW/SI/SI_DeviceGBA.h
similarity index 97%
rename from Source/Core/Core/HW/SI_DeviceGBA.h
rename to Source/Core/Core/HW/SI/SI_DeviceGBA.h
index e1bb966bb0..d2c2da8e1b 100644
--- a/Source/Core/Core/HW/SI_DeviceGBA.h
+++ b/Source/Core/Core/HW/SI/SI_DeviceGBA.h
@@ -4,11 +4,12 @@
 
 #pragma once
 
-#include <SFML/Network.hpp>
 #include <memory>
 
+#include <SFML/Network.hpp>
+
 #include "Common/CommonTypes.h"
-#include "Core/HW/SI_Device.h"
+#include "Core/HW/SI/SI_Device.h"
 
 // GameBoy Advance "Link Cable"
 
diff --git a/Source/Core/Core/HW/SI_DeviceGCAdapter.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp
similarity index 97%
rename from Source/Core/Core/HW/SI_DeviceGCAdapter.cpp
rename to Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp
index 2683cc6605..97d52d8d6e 100644
--- a/Source/Core/Core/HW/SI_DeviceGCAdapter.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/HW/SI/SI_DeviceGCAdapter.h"
+
 #include <cstring>
 
 #include "Common/CommonTypes.h"
@@ -10,7 +12,6 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/GCPad.h"
-#include "Core/HW/SI_DeviceGCAdapter.h"
 #include "Core/NetPlayProto.h"
 #include "InputCommon/GCAdapter.h"
 
diff --git a/Source/Core/Core/HW/SI_DeviceGCAdapter.h b/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.h
similarity index 82%
rename from Source/Core/Core/HW/SI_DeviceGCAdapter.h
rename to Source/Core/Core/HW/SI/SI_DeviceGCAdapter.h
index ff0a3508ef..6e12b2c874 100644
--- a/Source/Core/Core/HW/SI_DeviceGCAdapter.h
+++ b/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "Core/HW/SI_Device.h"
-#include "Core/HW/SI_DeviceGCController.h"
+#include "Core/HW/SI/SI_Device.h"
+#include "Core/HW/SI/SI_DeviceGCController.h"
 #include "InputCommon/GCPadStatus.h"
 
 class CSIDevice_GCAdapter : public CSIDevice_GCController
diff --git a/Source/Core/Core/HW/SI_DeviceGCController.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
similarity index 99%
rename from Source/Core/Core/HW/SI_DeviceGCController.cpp
rename to Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
index 39676c4847..edb743baf4 100644
--- a/Source/Core/Core/HW/SI_DeviceGCController.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
@@ -2,7 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/HW/SI_Device.h"
+#include "Core/HW/SI/SI_DeviceGCController.h"
+
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
@@ -10,7 +11,7 @@
 #include "Core/CoreTiming.h"
 #include "Core/HW/GCPad.h"
 #include "Core/HW/ProcessorInterface.h"
-#include "Core/HW/SI_DeviceGCController.h"
+#include "Core/HW/SI/SI_Device.h"
 #include "Core/HW/SystemTimers.h"
 #include "Core/Movie.h"
 #include "Core/NetPlayProto.h"
diff --git a/Source/Core/Core/HW/SI_DeviceGCController.h b/Source/Core/Core/HW/SI/SI_DeviceGCController.h
similarity index 98%
rename from Source/Core/Core/HW/SI_DeviceGCController.h
rename to Source/Core/Core/HW/SI/SI_DeviceGCController.h
index 22a9fecf56..7e87bca51b 100644
--- a/Source/Core/Core/HW/SI_DeviceGCController.h
+++ b/Source/Core/Core/HW/SI/SI_DeviceGCController.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "Core/HW/GCPad.h"
-#include "Core/HW/SI_Device.h"
+#include "Core/HW/SI/SI_Device.h"
 #include "InputCommon/GCPadStatus.h"
 
 class CSIDevice_GCController : public ISIDevice
diff --git a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp
similarity index 98%
rename from Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp
rename to Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp
index cff1698189..11dd2d2143 100644
--- a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp
@@ -2,7 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/HW/SI_DeviceGCSteeringWheel.h"
+#include "Core/HW/SI/SI_DeviceGCSteeringWheel.h"
+
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Core/HW/GCPad.h"
diff --git a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h b/Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.h
similarity index 93%
rename from Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h
rename to Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.h
index 2d106b8a23..5ec7e1d758 100644
--- a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h
+++ b/Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Core/HW/SI_DeviceGCController.h"
+#include "Core/HW/SI/SI_DeviceGCController.h"
 
 class CSIDevice_GCSteeringWheel : public CSIDevice_GCController
 {
diff --git a/Source/Core/Core/HW/SI_DeviceKeyboard.cpp b/Source/Core/Core/HW/SI/SI_DeviceKeyboard.cpp
similarity index 99%
rename from Source/Core/Core/HW/SI_DeviceKeyboard.cpp
rename to Source/Core/Core/HW/SI/SI_DeviceKeyboard.cpp
index dc321fd859..a3d0c827c1 100644
--- a/Source/Core/Core/HW/SI_DeviceKeyboard.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceKeyboard.cpp
@@ -2,7 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/HW/SI_DeviceKeyboard.h"
+#include "Core/HW/SI/SI_DeviceKeyboard.h"
+
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
diff --git a/Source/Core/Core/HW/SI_DeviceKeyboard.h b/Source/Core/Core/HW/SI/SI_DeviceKeyboard.h
similarity index 97%
rename from Source/Core/Core/HW/SI_DeviceKeyboard.h
rename to Source/Core/Core/HW/SI/SI_DeviceKeyboard.h
index de4be49411..a0311af715 100644
--- a/Source/Core/Core/HW/SI_DeviceKeyboard.h
+++ b/Source/Core/Core/HW/SI/SI_DeviceKeyboard.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Core/HW/SI_Device.h"
+#include "Core/HW/SI/SI_Device.h"
 
 class PointerWrap;
 struct KeyboardStatus;
diff --git a/Source/Core/Core/HW/VideoInterface.cpp b/Source/Core/Core/HW/VideoInterface.cpp
index 9b87eaf8c1..4f5c4be50b 100644
--- a/Source/Core/Core/HW/VideoInterface.cpp
+++ b/Source/Core/Core/HW/VideoInterface.cpp
@@ -14,7 +14,7 @@
 #include "Core/CoreTiming.h"
 #include "Core/HW/MMIO.h"
 #include "Core/HW/ProcessorInterface.h"
-#include "Core/HW/SI.h"
+#include "Core/HW/SI/SI.h"
 #include "Core/HW/SystemTimers.h"
 #include "Core/HW/VideoInterface.h"
 
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
index bea569e859..d8851c44c9 100644
--- a/Source/Core/Core/Movie.cpp
+++ b/Source/Core/Core/Movie.cpp
@@ -28,7 +28,7 @@
 #include "Core/HW/DVDInterface.h"
 #include "Core/HW/EXI/EXI_DeviceIPL.h"
 #include "Core/HW/ProcessorInterface.h"
-#include "Core/HW/SI.h"
+#include "Core/HW/SI/SI.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 #include "Core/HW/WiimoteEmu/WiimoteHid.h"
diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
index 2f8284bee1..db68983004 100644
--- a/Source/Core/Core/NetPlayClient.cpp
+++ b/Source/Core/Core/NetPlayClient.cpp
@@ -17,8 +17,8 @@
 #include "Common/Timer.h"
 #include "Core/ConfigManager.h"
 #include "Core/HW/EXI/EXI_DeviceIPL.h"
-#include "Core/HW/SI.h"
-#include "Core/HW/SI_DeviceGCController.h"
+#include "Core/HW/SI/SI.h"
+#include "Core/HW/SI/SI_DeviceGCController.h"
 #include "Core/HW/Sram.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
index a63a9cdff7..39adfbec42 100644
--- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp
+++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
@@ -23,7 +23,7 @@
 #include "Core/Core.h"
 #include "Core/HW/GCKeyboard.h"
 #include "Core/HW/GCPad.h"
-#include "Core/HW/SI.h"
+#include "Core/HW/SI/SI.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/HotkeyManager.h"
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index 50dec10be5..ae70fa22c6 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -37,7 +37,7 @@
 #include "Core/HW/GCKeyboard.h"
 #include "Core/HW/GCPad.h"
 #include "Core/HW/ProcessorInterface.h"
-#include "Core/HW/SI_Device.h"
+#include "Core/HW/SI/SI_Device.h"
 #include "Core/HW/WiiSaveCrypted.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/Host.h"
diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp
index 9caa255aac..e3dcb44739 100644
--- a/Source/Core/InputCommon/GCAdapter.cpp
+++ b/Source/Core/InputCommon/GCAdapter.cpp
@@ -12,7 +12,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
-#include "Core/HW/SI.h"
+#include "Core/HW/SI/SI.h"
 #include "Core/HW/SystemTimers.h"
 #include "Core/NetPlayProto.h"
 
diff --git a/Source/Core/InputCommon/GCAdapter_Android.cpp b/Source/Core/InputCommon/GCAdapter_Android.cpp
index c5f8a98922..3395a22b37 100644
--- a/Source/Core/InputCommon/GCAdapter_Android.cpp
+++ b/Source/Core/InputCommon/GCAdapter_Android.cpp
@@ -13,7 +13,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
-#include "Core/HW/SI.h"
+#include "Core/HW/SI/SI.h"
 #include "Core/HW/SystemTimers.h"
 
 #include "InputCommon/GCAdapter.h"