diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
index eb520092ec..ec5577408f 100644
--- a/Source/Core/Core/Boot/Boot.cpp
+++ b/Source/Core/Core/Boot/Boot.cpp
@@ -21,7 +21,7 @@
 #include "Core/GeckoCode.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HW/DVDInterface.h"
-#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/EXI/EXI_DeviceIPL.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/HW/VideoInterface.h"
diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp
index 8906792328..d6784b6ec0 100644
--- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp
+++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp
@@ -15,7 +15,7 @@
 #include "Core/HLE/HLE.h"
 #include "Core/HW/CPU.h"
 #include "Core/HW/DVDInterface.h"
-#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/EXI/EXI_DeviceIPL.h"
 #include "Core/HW/Memmap.h"
 #include "Core/MemTools.h"
 #include "Core/PatchEngine.h"
diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp
index 04b6e07f01..cb6e1db00c 100644
--- a/Source/Core/Core/BootManager.cpp
+++ b/Source/Core/Core/BootManager.cpp
@@ -32,7 +32,7 @@
 #include "Core/BootManager.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
-#include "Core/HW/EXI.h"
+#include "Core/HW/EXI/EXI.h"
 #include "Core/HW/SI.h"
 #include "Core/HW/Sram.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index c38ed5859e..4a24411e3a 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -86,16 +86,16 @@ set(SRCS	ActionReplay.cpp
 			HW/DSPLLE/DSPLLETools.cpp
 			HW/DVDInterface.cpp
 			HW/DVDThread.cpp
-			HW/EXI_Channel.cpp
-			HW/EXI.cpp
-			HW/EXI_Device.cpp
-			HW/EXI_DeviceAD16.cpp
-			HW/EXI_DeviceAGP.cpp
-			HW/EXI_DeviceEthernet.cpp
-			HW/EXI_DeviceGecko.cpp
-			HW/EXI_DeviceIPL.cpp
-			HW/EXI_DeviceMemoryCard.cpp
-			HW/EXI_DeviceMic.cpp
+			HW/EXI/EXI_Channel.cpp
+			HW/EXI/EXI.cpp
+			HW/EXI/EXI_Device.cpp
+			HW/EXI/EXI_DeviceAD16.cpp
+			HW/EXI/EXI_DeviceAGP.cpp
+			HW/EXI/EXI_DeviceEthernet.cpp
+			HW/EXI/EXI_DeviceGecko.cpp
+			HW/EXI/EXI_DeviceIPL.cpp
+			HW/EXI/EXI_DeviceMemoryCard.cpp
+			HW/EXI/EXI_DeviceMic.cpp
 			HW/GCKeyboard.cpp
 			HW/GCKeyboardEmu.cpp
 			HW/GCMemcard.cpp
@@ -271,13 +271,13 @@ endif()
 set(LIBS ${LIBS} ${MBEDTLS_LIBRARIES})
 
 if(WIN32)
-	set(SRCS ${SRCS} HW/BBA-TAP/TAP_Win32.cpp HW/WiimoteReal/IOWin.cpp)
+	set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Win32.cpp HW/WiimoteReal/IOWin.cpp)
 elseif(APPLE)
-	set(SRCS ${SRCS} HW/BBA-TAP/TAP_Apple.cpp HW/WiimoteReal/IOdarwin.mm)
+	set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Apple.cpp HW/WiimoteReal/IOdarwin.mm)
 	set(LIBS ${LIBS}
 		${IOB_LIBRARY})
 elseif(UNIX)
-	set(SRCS ${SRCS} HW/BBA-TAP/TAP_Unix.cpp)
+	set(SRCS ${SRCS} HW/EXI/BBA-TAP/TAP_Unix.cpp)
 	if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND BLUEZ_FOUND)
 		set(SRCS ${SRCS} HW/WiimoteReal/IOLinux.cpp)
 		set(LIBS ${LIBS} bluetooth)
diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h
index ca8419cd36..23b78369ae 100644
--- a/Source/Core/Core/ConfigManager.h
+++ b/Source/Core/Core/ConfigManager.h
@@ -10,7 +10,7 @@
 
 #include "Common/IniFile.h"
 #include "Common/NonCopyable.h"
-#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI/EXI_Device.h"
 #include "Core/HW/SI_Device.h"
 
 namespace DiscIO
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index 03dcc175b0..6eba2560cf 100644
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@@ -44,7 +44,7 @@
 #include "Core/HW/AudioInterface.h"
 #include "Core/HW/CPU.h"
 #include "Core/HW/DSP.h"
-#include "Core/HW/EXI.h"
+#include "Core/HW/EXI/EXI.h"
 #include "Core/HW/GCKeyboard.h"
 #include "Core/HW/GCPad.h"
 #include "Core/HW/GPFifo.h"
diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
index 0219697453..1c69d70297 100644
--- a/Source/Core/Core/Core.vcxproj
+++ b/Source/Core/Core/Core.vcxproj
@@ -96,7 +96,6 @@
     <ClCompile Include="HLE\HLE_OS.cpp" />
     <ClCompile Include="HotkeyManager.cpp" />
     <ClCompile Include="HW\AudioInterface.cpp" />
-    <ClCompile Include="HW\BBA-TAP\TAP_Win32.cpp" />
     <ClCompile Include="HW\CPU.cpp" />
     <ClCompile Include="HW\DSP.cpp" />
     <ClCompile Include="HW\DSPHLE\DSPHLE.cpp" />
@@ -117,16 +116,17 @@
     <ClCompile Include="HW\DSPLLE\DSPSymbols.cpp" />
     <ClCompile Include="HW\DVDInterface.cpp" />
     <ClCompile Include="HW\DVDThread.cpp" />
-    <ClCompile Include="HW\EXI.cpp" />
-    <ClCompile Include="HW\EXI_Channel.cpp" />
-    <ClCompile Include="HW\EXI_Device.cpp" />
-    <ClCompile Include="HW\EXI_DeviceAD16.cpp" />
-    <ClCompile Include="HW\EXI_DeviceAGP.cpp" />
-    <ClCompile Include="HW\EXI_DeviceEthernet.cpp" />
-    <ClCompile Include="HW\EXI_DeviceGecko.cpp" />
-    <ClCompile Include="HW\EXI_DeviceIPL.cpp" />
-    <ClCompile Include="HW\EXI_DeviceMemoryCard.cpp" />
-    <ClCompile Include="HW\EXI_DeviceMic.cpp" />
+    <ClCompile Include="HW\EXI\BBA-TAP\TAP_Win32.cpp" />
+    <ClCompile Include="HW\EXI\EXI.cpp" />
+    <ClCompile Include="HW\EXI\EXI_Channel.cpp" />
+    <ClCompile Include="HW\EXI\EXI_Device.cpp" />
+    <ClCompile Include="HW\EXI\EXI_DeviceAD16.cpp" />
+    <ClCompile Include="HW\EXI\EXI_DeviceAGP.cpp" />
+    <ClCompile Include="HW\EXI\EXI_DeviceEthernet.cpp" />
+    <ClCompile Include="HW\EXI\EXI_DeviceGecko.cpp" />
+    <ClCompile Include="HW\EXI\EXI_DeviceIPL.cpp" />
+    <ClCompile Include="HW\EXI\EXI_DeviceMemoryCard.cpp" />
+    <ClCompile Include="HW\EXI\EXI_DeviceMic.cpp" />
     <ClCompile Include="HW\GCKeyboard.cpp" />
     <ClCompile Include="HW\GCKeyboardEmu.cpp" />
     <ClCompile Include="HW\GCMemcard.cpp" />
@@ -322,7 +322,6 @@
     <ClInclude Include="Host.h" />
     <ClInclude Include="HotkeyManager.h" />
     <ClInclude Include="HW\AudioInterface.h" />
-    <ClInclude Include="HW\BBA-TAP\TAP_Win32.h" />
     <ClInclude Include="HW\CPU.h" />
     <ClInclude Include="HW\DSP.h" />
     <ClInclude Include="HW\DSPHLE\DSPHLE.h" />
@@ -344,16 +343,17 @@
     <ClInclude Include="HW\DSPLLE\DSPSymbols.h" />
     <ClInclude Include="HW\DVDInterface.h" />
     <ClInclude Include="HW\DVDThread.h" />
-    <ClInclude Include="HW\EXI.h" />
-    <ClInclude Include="HW\EXI_Channel.h" />
-    <ClInclude Include="HW\EXI_Device.h" />
-    <ClInclude Include="HW\EXI_DeviceAD16.h" />
-    <ClInclude Include="HW\EXI_DeviceAGP.h" />
-    <ClInclude Include="HW\EXI_DeviceEthernet.h" />
-    <ClInclude Include="HW\EXI_DeviceGecko.h" />
-    <ClInclude Include="HW\EXI_DeviceIPL.h" />
-    <ClInclude Include="HW\EXI_DeviceMemoryCard.h" />
-    <ClInclude Include="HW\EXI_DeviceMic.h" />
+    <ClInclude Include="HW\EXI\BBA-TAP\TAP_Win32.h" />
+    <ClInclude Include="HW\EXI\EXI.h" />
+    <ClInclude Include="HW\EXI\EXI_Channel.h" />
+    <ClInclude Include="HW\EXI\EXI_Device.h" />
+    <ClInclude Include="HW\EXI\EXI_DeviceAD16.h" />
+    <ClInclude Include="HW\EXI\EXI_DeviceAGP.h" />
+    <ClInclude Include="HW\EXI\EXI_DeviceEthernet.h" />
+    <ClInclude Include="HW\EXI\EXI_DeviceGecko.h" />
+    <ClInclude Include="HW\EXI\EXI_DeviceIPL.h" />
+    <ClInclude Include="HW\EXI\EXI_DeviceMemoryCard.h" />
+    <ClInclude Include="HW\EXI\EXI_DeviceMic.h" />
     <ClInclude Include="HW\GCKeyboard.h" />
     <ClInclude Include="HW\GCKeyboardEmu.h" />
     <ClInclude Include="HW\GCMemcard.h" />
diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters
index 8afa31ba27..b269ffdf96 100644
--- a/Source/Core/Core/Core.vcxproj.filters
+++ b/Source/Core/Core/Core.vcxproj.filters
@@ -385,37 +385,37 @@
     <ClCompile Include="HW\DSP.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE</Filter>
     </ClCompile>
-    <ClCompile Include="HW\EXI.cpp">
+    <ClCompile Include="HW\EXI\EXI.cpp">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\EXI_Channel.cpp">
+    <ClCompile Include="HW\EXI\EXI_Channel.cpp">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\EXI_Device.cpp">
+    <ClCompile Include="HW\EXI\EXI_Device.cpp">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\EXI_DeviceAD16.cpp">
+    <ClCompile Include="HW\EXI\EXI_DeviceAD16.cpp">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\EXI_DeviceAGP.cpp">
+    <ClCompile Include="HW\EXI\EXI_DeviceAGP.cpp">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\EXI_DeviceEthernet.cpp">
+    <ClCompile Include="HW\EXI\EXI_DeviceEthernet.cpp">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\EXI_DeviceGecko.cpp">
+    <ClCompile Include="HW\EXI\EXI_DeviceGecko.cpp">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\EXI_DeviceIPL.cpp">
+    <ClCompile Include="HW\EXI\EXI_DeviceIPL.cpp">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\EXI_DeviceMemoryCard.cpp">
+    <ClCompile Include="HW\EXI\EXI_DeviceMemoryCard.cpp">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\EXI_DeviceMic.cpp">
+    <ClCompile Include="HW\EXI\EXI_DeviceMic.cpp">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\BBA-TAP\TAP_Win32.cpp">
+    <ClCompile Include="HW\EXI\BBA-TAP\TAP_Win32.cpp">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClCompile>
     <ClCompile Include="HW\Sram.cpp">
@@ -976,37 +976,37 @@
     <ClInclude Include="HW\DSP.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE</Filter>
     </ClInclude>
-    <ClInclude Include="HW\EXI.h">
+    <ClInclude Include="HW\EXI\EXI.h">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\EXI_Channel.h">
+    <ClInclude Include="HW\EXI\EXI_Channel.h">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\EXI_Device.h">
+    <ClInclude Include="HW\EXI\EXI_Device.h">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\EXI_DeviceAD16.h">
+    <ClInclude Include="HW\EXI\EXI_DeviceAD16.h">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\EXI_DeviceAGP.h">
+    <ClInclude Include="HW\EXI\EXI_DeviceAGP.h">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\EXI_DeviceEthernet.h">
+    <ClInclude Include="HW\EXI\EXI_DeviceEthernet.h">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\EXI_DeviceGecko.h">
+    <ClInclude Include="HW\EXI\EXI_DeviceGecko.h">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\EXI_DeviceIPL.h">
+    <ClInclude Include="HW\EXI\EXI_DeviceIPL.h">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\EXI_DeviceMemoryCard.h">
+    <ClInclude Include="HW\EXI\EXI_DeviceMemoryCard.h">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\EXI_DeviceMic.h">
+    <ClInclude Include="HW\EXI\EXI_DeviceMic.h">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\BBA-TAP\TAP_Win32.h">
+    <ClInclude Include="HW\EXI\BBA-TAP\TAP_Win32.h">
       <Filter>HW %28Flipper/Hollywood%29\EXI - Expansion Interface</Filter>
     </ClInclude>
     <ClInclude Include="HW\Sram.h">
diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp b/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Apple.cpp
similarity index 96%
rename from Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp
rename to Source/Core/Core/HW/EXI/BBA-TAP/TAP_Apple.cpp
index 380fe1b814..92bcd550dd 100644
--- a/Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp
+++ b/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Apple.cpp
@@ -7,8 +7,8 @@
 
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
-#include "Core/HW/EXI_Device.h"
-#include "Core/HW/EXI_DeviceEthernet.h"
+#include "Core/HW/EXI/EXI_Device.h"
+#include "Core/HW/EXI/EXI_DeviceEthernet.h"
 
 bool CEXIETHERNET::Activate()
 {
diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp b/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Unix.cpp
similarity index 97%
rename from Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp
rename to Source/Core/Core/HW/EXI/BBA-TAP/TAP_Unix.cpp
index 21cc08def0..8babee7478 100644
--- a/Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp
+++ b/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Unix.cpp
@@ -10,8 +10,8 @@
 
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
-#include "Core/HW/EXI_Device.h"
-#include "Core/HW/EXI_DeviceEthernet.h"
+#include "Core/HW/EXI/EXI_Device.h"
+#include "Core/HW/EXI/EXI_DeviceEthernet.h"
 
 #ifdef __linux__
 #include <fcntl.h>
diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp b/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Win32.cpp
similarity index 98%
rename from Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp
rename to Source/Core/Core/HW/EXI/BBA-TAP/TAP_Win32.cpp
index 4565813283..0818b35228 100644
--- a/Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp
+++ b/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Win32.cpp
@@ -2,13 +2,13 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/HW/BBA-TAP/TAP_Win32.h"
+#include "Core/HW/EXI/BBA-TAP/TAP_Win32.h"
 #include "Common/Assert.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
-#include "Core/HW/EXI_Device.h"
-#include "Core/HW/EXI_DeviceEthernet.h"
+#include "Core/HW/EXI/EXI_Device.h"
+#include "Core/HW/EXI/EXI_DeviceEthernet.h"
 
 namespace Win32TAPHelper
 {
diff --git a/Source/Core/Core/HW/BBA-TAP/TAP_Win32.h b/Source/Core/Core/HW/EXI/BBA-TAP/TAP_Win32.h
similarity index 100%
rename from Source/Core/Core/HW/BBA-TAP/TAP_Win32.h
rename to Source/Core/Core/HW/EXI/BBA-TAP/TAP_Win32.h
diff --git a/Source/Core/Core/HW/EXI.cpp b/Source/Core/Core/HW/EXI/EXI.cpp
similarity index 97%
rename from Source/Core/Core/HW/EXI.cpp
rename to Source/Core/Core/HW/EXI/EXI.cpp
index 1b18c566c3..d47ffb478e 100644
--- a/Source/Core/Core/HW/EXI.cpp
+++ b/Source/Core/Core/HW/EXI/EXI.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/HW/EXI/EXI.h"
+
 #include <array>
 #include <memory>
 
@@ -10,9 +12,8 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/CoreTiming.h"
-#include "Core/HW/EXI.h"
-#include "Core/HW/EXI_Channel.h"
-#include "Core/HW/EXI_DeviceMemoryCard.h"
+#include "Core/HW/EXI/EXI_Channel.h"
+#include "Core/HW/EXI/EXI_DeviceMemoryCard.h"
 #include "Core/HW/MMIO.h"
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/HW/Sram.h"
diff --git a/Source/Core/Core/HW/EXI.h b/Source/Core/Core/HW/EXI/EXI.h
similarity index 100%
rename from Source/Core/Core/HW/EXI.h
rename to Source/Core/Core/HW/EXI/EXI.h
diff --git a/Source/Core/Core/HW/EXI_Channel.cpp b/Source/Core/Core/HW/EXI/EXI_Channel.cpp
similarity index 98%
rename from Source/Core/Core/HW/EXI_Channel.cpp
rename to Source/Core/Core/HW/EXI/EXI_Channel.cpp
index e9d5a28c9d..4cd3b1e3db 100644
--- a/Source/Core/Core/HW/EXI_Channel.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_Channel.cpp
@@ -2,14 +2,15 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/HW/EXI/EXI_Channel.h"
+
 #include <memory>
 
 #include "Common/Assert.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
-#include "Core/HW/EXI.h"
-#include "Core/HW/EXI_Channel.h"
-#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI/EXI.h"
+#include "Core/HW/EXI/EXI_Device.h"
 #include "Core/HW/MMIO.h"
 
 enum
diff --git a/Source/Core/Core/HW/EXI_Channel.h b/Source/Core/Core/HW/EXI/EXI_Channel.h
similarity index 100%
rename from Source/Core/Core/HW/EXI_Channel.h
rename to Source/Core/Core/HW/EXI/EXI_Channel.h
diff --git a/Source/Core/Core/HW/EXI_Device.cpp b/Source/Core/Core/HW/EXI/EXI_Device.cpp
similarity index 91%
rename from Source/Core/Core/HW/EXI_Device.cpp
rename to Source/Core/Core/HW/EXI/EXI_Device.cpp
index 48a5c1c286..1185ef2ab2 100644
--- a/Source/Core/Core/HW/EXI_Device.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_Device.cpp
@@ -2,19 +2,20 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/HW/EXI/EXI_Device.h"
+
 #include <memory>
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Core/HW/EXI_Device.h"
-#include "Core/HW/EXI_DeviceAD16.h"
-#include "Core/HW/EXI_DeviceAGP.h"
-#include "Core/HW/EXI_DeviceEthernet.h"
-#include "Core/HW/EXI_DeviceGecko.h"
-#include "Core/HW/EXI_DeviceIPL.h"
-#include "Core/HW/EXI_DeviceMemoryCard.h"
-#include "Core/HW/EXI_DeviceMic.h"
+#include "Core/HW/EXI/EXI_DeviceAD16.h"
+#include "Core/HW/EXI/EXI_DeviceAGP.h"
+#include "Core/HW/EXI/EXI_DeviceEthernet.h"
+#include "Core/HW/EXI/EXI_DeviceGecko.h"
+#include "Core/HW/EXI/EXI_DeviceIPL.h"
+#include "Core/HW/EXI/EXI_DeviceMemoryCard.h"
+#include "Core/HW/EXI/EXI_DeviceMic.h"
 #include "Core/HW/Memmap.h"
 
 // --- interface IEXIDevice ---
diff --git a/Source/Core/Core/HW/EXI_Device.h b/Source/Core/Core/HW/EXI/EXI_Device.h
similarity index 100%
rename from Source/Core/Core/HW/EXI_Device.h
rename to Source/Core/Core/HW/EXI/EXI_Device.h
diff --git a/Source/Core/Core/HW/EXI_DeviceAD16.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceAD16.cpp
similarity index 97%
rename from Source/Core/Core/HW/EXI_DeviceAD16.cpp
rename to Source/Core/Core/HW/EXI/EXI_DeviceAD16.cpp
index 619b361682..cc49c7f46c 100644
--- a/Source/Core/Core/HW/EXI_DeviceAD16.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceAD16.cpp
@@ -2,7 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/HW/EXI_DeviceAD16.h"
+#include "Core/HW/EXI/EXI_DeviceAD16.h"
+
 #include "Common/Assert.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
diff --git a/Source/Core/Core/HW/EXI_DeviceAD16.h b/Source/Core/Core/HW/EXI/EXI_DeviceAD16.h
similarity index 94%
rename from Source/Core/Core/HW/EXI_DeviceAD16.h
rename to Source/Core/Core/HW/EXI/EXI_DeviceAD16.h
index 1ba7201289..0dfe0f89b4 100644
--- a/Source/Core/Core/HW/EXI_DeviceAD16.h
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceAD16.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI/EXI_Device.h"
 
 class PointerWrap;
 
diff --git a/Source/Core/Core/HW/EXI_DeviceAGP.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp
similarity index 99%
rename from Source/Core/Core/HW/EXI_DeviceAGP.cpp
rename to Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp
index d996ed49dc..124ab0df4e 100644
--- a/Source/Core/Core/HW/EXI_DeviceAGP.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/HW/EXI/EXI_DeviceAGP.h"
+
 #include <memory>
 #include <string>
 
@@ -10,7 +12,6 @@
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Core/ConfigManager.h"
-#include "Core/HW/EXI_DeviceAGP.h"
 
 CEXIAgp::CEXIAgp(int index)
 {
diff --git a/Source/Core/Core/HW/EXI_DeviceAGP.h b/Source/Core/Core/HW/EXI/EXI_DeviceAGP.h
similarity index 97%
rename from Source/Core/Core/HW/EXI_DeviceAGP.h
rename to Source/Core/Core/HW/EXI/EXI_DeviceAGP.h
index 4a97a17eef..6a14ae1cfd 100644
--- a/Source/Core/Core/HW/EXI_DeviceAGP.h
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceAGP.h
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI/EXI_Device.h"
 
 class PointerWrap;
 
diff --git a/Source/Core/Core/HW/EXI_DeviceEthernet.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.cpp
similarity index 99%
rename from Source/Core/Core/HW/EXI_DeviceEthernet.cpp
rename to Source/Core/Core/HW/EXI/EXI_DeviceEthernet.cpp
index 11675b5eb6..bf5fd1047a 100644
--- a/Source/Core/Core/HW/EXI_DeviceEthernet.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/HW/EXI/EXI_DeviceEthernet.h"
+
 #include <string>
 
 #include "Common/ChunkFile.h"
@@ -10,8 +12,7 @@
 #include "Common/Network.h"
 #include "Core/ConfigManager.h"
 #include "Core/CoreTiming.h"
-#include "Core/HW/EXI.h"
-#include "Core/HW/EXI_DeviceEthernet.h"
+#include "Core/HW/EXI/EXI.h"
 #include "Core/HW/Memmap.h"
 
 // XXX: The BBA stores multi-byte elements as little endian.
diff --git a/Source/Core/Core/HW/EXI_DeviceEthernet.h b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h
similarity index 99%
rename from Source/Core/Core/HW/EXI_DeviceEthernet.h
rename to Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h
index c73d1c9df7..29af2db3f3 100644
--- a/Source/Core/Core/HW/EXI_DeviceEthernet.h
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h
@@ -13,7 +13,7 @@
 #endif
 
 #include "Common/Flag.h"
-#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI/EXI_Device.h"
 
 class PointerWrap;
 
diff --git a/Source/Core/Core/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp
similarity index 99%
rename from Source/Core/Core/HW/EXI_DeviceGecko.cpp
rename to Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp
index 0648197618..5b28d9abd0 100644
--- a/Source/Core/Core/HW/EXI_DeviceGecko.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/HW/EXI/EXI_DeviceGecko.h"
+
 #include <memory>
 #include <mutex>
 #include <queue>
@@ -15,7 +17,6 @@
 #include "Common/StringUtil.h"
 #include "Common/Thread.h"
 #include "Core/Core.h"
-#include "Core/HW/EXI_DeviceGecko.h"
 
 u16 GeckoSockServer::server_port;
 int GeckoSockServer::client_count;
diff --git a/Source/Core/Core/HW/EXI_DeviceGecko.h b/Source/Core/Core/HW/EXI/EXI_DeviceGecko.h
similarity index 97%
rename from Source/Core/Core/HW/EXI_DeviceGecko.h
rename to Source/Core/Core/HW/EXI/EXI_DeviceGecko.h
index b05341a245..90c8bd23db 100644
--- a/Source/Core/Core/HW/EXI_DeviceGecko.h
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceGecko.h
@@ -13,7 +13,7 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/Flag.h"
-#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI/EXI_Device.h"
 
 class GeckoSockServer
 {
diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp
similarity index 99%
rename from Source/Core/Core/HW/EXI_DeviceIPL.cpp
rename to Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp
index 5b2287ace4..71618d257f 100644
--- a/Source/Core/Core/HW/EXI_DeviceIPL.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/HW/EXI/EXI_DeviceIPL.h"
+
 #include <cstring>
 
 #include "Common/Assert.h"
@@ -17,7 +19,6 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
-#include "Core/HW/EXI_DeviceIPL.h"
 #include "Core/HW/Sram.h"
 #include "Core/HW/SystemTimers.h"
 #include "Core/Movie.h"
diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.h b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.h
similarity index 98%
rename from Source/Core/Core/HW/EXI_DeviceIPL.h
rename to Source/Core/Core/HW/EXI/EXI_DeviceIPL.h
index 190ea63422..f18a40ca54 100644
--- a/Source/Core/Core/HW/EXI_DeviceIPL.h
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.h
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI/EXI_Device.h"
 
 class PointerWrap;
 
diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp
similarity index 99%
rename from Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp
rename to Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp
index 2a4286f440..b02345060c 100644
--- a/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Core/HW/EXI/EXI_DeviceMemoryCard.h"
+
 #include <array>
 #include <cstring>
 #include <memory>
@@ -17,10 +19,9 @@
 #include "Common/StringUtil.h"
 #include "Core/ConfigManager.h"
 #include "Core/CoreTiming.h"
-#include "Core/HW/EXI.h"
-#include "Core/HW/EXI_Channel.h"
-#include "Core/HW/EXI_Device.h"
-#include "Core/HW/EXI_DeviceMemoryCard.h"
+#include "Core/HW/EXI/EXI.h"
+#include "Core/HW/EXI/EXI_Channel.h"
+#include "Core/HW/EXI/EXI_Device.h"
 #include "Core/HW/GCMemcard.h"
 #include "Core/HW/GCMemcardDirectory.h"
 #include "Core/HW/GCMemcardRaw.h"
diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.h
similarity index 98%
rename from Source/Core/Core/HW/EXI_DeviceMemoryCard.h
rename to Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.h
index 95c0dd1e1f..58a28efbb4 100644
--- a/Source/Core/Core/HW/EXI_DeviceMemoryCard.h
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.h
@@ -7,7 +7,7 @@
 #include <functional>
 #include <memory>
 
-#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI/EXI_Device.h"
 
 class MemoryCardBase;
 class PointerWrap;
diff --git a/Source/Core/Core/HW/EXI_DeviceMic.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp
similarity index 98%
rename from Source/Core/Core/HW/EXI_DeviceMic.cpp
rename to Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp
index f81c26d624..b76bda3a03 100644
--- a/Source/Core/Core/HW/EXI_DeviceMic.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp
@@ -11,9 +11,10 @@
 
 #if HAVE_PORTAUDIO
 
+#include "Core/HW/EXI/EXI_DeviceMic.h"
+
 #include "Core/CoreTiming.h"
-#include "Core/HW/EXI.h"
-#include "Core/HW/EXI_DeviceMic.h"
+#include "Core/HW/EXI/EXI.h"
 #include "Core/HW/GCPad.h"
 #include "Core/HW/SystemTimers.h"
 
diff --git a/Source/Core/Core/HW/EXI_DeviceMic.h b/Source/Core/Core/HW/EXI/EXI_DeviceMic.h
similarity index 98%
rename from Source/Core/Core/HW/EXI_DeviceMic.h
rename to Source/Core/Core/HW/EXI/EXI_DeviceMic.h
index 09a95c593d..7269f8fac8 100644
--- a/Source/Core/Core/HW/EXI_DeviceMic.h
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceMic.h
@@ -6,7 +6,7 @@
 
 #include <mutex>
 #include "Common/Common.h"
-#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI/EXI_Device.h"
 
 #if HAVE_PORTAUDIO
 
diff --git a/Source/Core/Core/HW/GCMemcard.h b/Source/Core/Core/HW/GCMemcard.h
index b6be07df33..8887dffd09 100644
--- a/Source/Core/Core/HW/GCMemcard.h
+++ b/Source/Core/Core/HW/GCMemcard.h
@@ -13,7 +13,7 @@
 #include "Common/NonCopyable.h"
 #include "Common/Timer.h"
 
-#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/EXI/EXI_DeviceIPL.h"
 #include "Core/HW/Sram.h"
 
 namespace File
diff --git a/Source/Core/Core/HW/HW.cpp b/Source/Core/Core/HW/HW.cpp
index 8518bb192b..5e75d767f5 100644
--- a/Source/Core/Core/HW/HW.cpp
+++ b/Source/Core/Core/HW/HW.cpp
@@ -12,7 +12,7 @@
 #include "Core/HW/CPU.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/DVDInterface.h"
-#include "Core/HW/EXI.h"
+#include "Core/HW/EXI/EXI.h"
 #include "Core/HW/GPFifo.h"
 #include "Core/HW/HW.h"
 #include "Core/HW/Memmap.h"
diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp
index 393b88c7bd..ec751a90c0 100644
--- a/Source/Core/Core/HW/Memmap.cpp
+++ b/Source/Core/Core/HW/Memmap.cpp
@@ -19,7 +19,7 @@
 #include "Core/HW/AudioInterface.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/DVDInterface.h"
-#include "Core/HW/EXI.h"
+#include "Core/HW/EXI/EXI.h"
 #include "Core/HW/MMIO.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/MemoryInterface.h"
diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp
index fcd269e199..0fa2ffe7fc 100644
--- a/Source/Core/Core/HW/SystemTimers.cpp
+++ b/Source/Core/Core/HW/SystemTimers.cpp
@@ -55,7 +55,7 @@ IPC_HLE_PERIOD: For the Wii Remote this is the call schedule:
 #include "Core/DSPEmulator.h"
 #include "Core/HW/AudioInterface.h"
 #include "Core/HW/DSP.h"
-#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/EXI/EXI_DeviceIPL.h"
 #include "Core/HW/VideoInterface.h"
 #include "Core/IOS/IPC.h"
 #include "Core/PatchEngine.h"
diff --git a/Source/Core/Core/IOS/Network/Net.h b/Source/Core/Core/IOS/Network/Net.h
index f7f2d045ac..0ab06deb90 100644
--- a/Source/Core/Core/IOS/Network/Net.h
+++ b/Source/Core/Core/IOS/Network/Net.h
@@ -8,7 +8,7 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/EXI/EXI_DeviceIPL.h"
 #include "Core/HW/Memmap.h"
 #include "Core/IOS/Device.h"
 #include "Core/IOS/IPC.h"
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
index 13882da1df..bea569e859 100644
--- a/Source/Core/Core/Movie.cpp
+++ b/Source/Core/Core/Movie.cpp
@@ -26,7 +26,7 @@
 #include "Core/DSP/DSPCore.h"
 #include "Core/HW/CPU.h"
 #include "Core/HW/DVDInterface.h"
-#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/EXI/EXI_DeviceIPL.h"
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/HW/SI.h"
 #include "Core/HW/Wiimote.h"
diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
index 0f3902910a..2f8284bee1 100644
--- a/Source/Core/Core/NetPlayClient.cpp
+++ b/Source/Core/Core/NetPlayClient.cpp
@@ -16,7 +16,7 @@
 #include "Common/MsgHandler.h"
 #include "Common/Timer.h"
 #include "Core/ConfigManager.h"
-#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/EXI/EXI_DeviceIPL.h"
 #include "Core/HW/SI.h"
 #include "Core/HW/SI_DeviceGCController.h"
 #include "Core/HW/Sram.h"
diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h
index f5ced9b781..cff5d1d00b 100644
--- a/Source/Core/Core/NetPlayProto.h
+++ b/Source/Core/Core/NetPlayProto.h
@@ -7,7 +7,7 @@
 #include <array>
 #include <vector>
 #include "Common/CommonTypes.h"
-#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI/EXI_Device.h"
 
 struct NetSettings
 {
diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
index 1d70799ce4..2be0919eb8 100644
--- a/Source/Core/Core/NetPlayServer.cpp
+++ b/Source/Core/Core/NetPlayServer.cpp
@@ -14,7 +14,7 @@
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
 #include "Core/ConfigManager.h"
-#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/EXI/EXI_DeviceIPL.h"
 #include "Core/HW/Sram.h"
 #include "Core/NetPlayClient.h"  //for NetPlayUI
 #include "InputCommon/GCPadStatus.h"
diff --git a/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp b/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp
index cafb592eee..761956fd5d 100644
--- a/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp
+++ b/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp
@@ -21,7 +21,7 @@
 #include "Common/FileUtil.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
-#include "Core/HW/EXI.h"
+#include "Core/HW/EXI/EXI.h"
 #include "Core/HW/GCMemcard.h"
 #include "Core/HW/GCPad.h"
 #include "Core/NetPlayProto.h"
diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp
index ff5e5a368c..f082656a94 100644
--- a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp
+++ b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp
@@ -35,7 +35,7 @@
 #include "Common/MsgHandler.h"
 
 #include "Core/ConfigManager.h"
-#include "Core/HW/EXI_Device.h"
+#include "Core/HW/EXI/EXI_Device.h"
 #include "Core/NetPlayClient.h"
 #include "Core/NetPlayProto.h"
 #include "Core/NetPlayServer.h"