From 24199293d37f42b657cd5f9736d6eea10d1384f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@innovatetechnologi.es>
Date: Wed, 18 Jan 2017 13:50:28 +0100
Subject: [PATCH] =?UTF-8?q?IOS:=20Reorganise=20the=20source=20files=20and?=
 =?UTF-8?q?=20IPC=5FHLE=E2=86=92IOS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

IPC_HLE is actually IOS HLE. The actual IPC emulation is not in
IPC_HLE, but in HW/WII_IPC.cpp. So calling IPC_HLE IOS is more
accurate. (If IOS LLE gets ever implemented, it'll likely be at
a lower level -- Starlet LLE.)

This also totally gets rid of the IPC_HLE prefix in file names, and
moves some source files to their own subdirectories to make the file
hierarchy cleaner.

We're going to get ~14 additional source files with the USB PR,
and this is really needed to keep things from becoming a total pain.
---
 Source/Core/Core/Boot/Boot.cpp                |   2 +-
 Source/Core/Core/Boot/Boot_WiiWAD.cpp         |   4 +-
 Source/Core/Core/CMakeLists.txt               |  54 +--
 Source/Core/Core/ConfigManager.cpp            |   2 +-
 Source/Core/Core/Core.cpp                     |   6 +-
 Source/Core/Core/Core.vcxproj                 | 113 ++---
 Source/Core/Core/Core.vcxproj.filters         | 409 +++++++++---------
 Source/Core/Core/HLE/HLE.cpp                  |   2 +-
 Source/Core/Core/HW/DVDInterface.cpp          |   4 +-
 Source/Core/Core/HW/HW.cpp                    |   2 +-
 Source/Core/Core/HW/ProcessorInterface.cpp    |   4 +-
 Source/Core/Core/HW/SystemTimers.cpp          |   2 +-
 Source/Core/Core/HW/WII_IPC.cpp               |   2 +-
 .../DI/DI.cpp}                                |   4 +-
 .../WII_IPC_HLE_Device_DI.h => IOS/DI/DI.h}   |   4 +-
 .../WII_IPC_HLE_Device.cpp => IOS/Device.cpp} |   4 +-
 .../WII_IPC_HLE_Device.h => IOS/Device.h}     |   2 +-
 .../DeviceStub.cpp}                           |   2 +-
 .../DeviceStub.h}                             |   4 +-
 .../ES/ES.cpp}                                |   8 +-
 .../WII_IPC_HLE_Device_es.h => IOS/ES/ES.h}   |   6 +-
 .../ESFormats.cpp => IOS/ES/Formats.cpp}      |   2 +-
 .../{IPC_HLE/ESFormats.h => IOS/ES/Formats.h} |   0
 .../FS/FS.cpp}                                |   4 +-
 .../WII_IPC_HLE_Device_fs.h => IOS/FS/FS.h}   |   4 +-
 .../FS/FileIO.cpp}                            |   4 +-
 .../FS/FileIO.h}                              |   4 +-
 .../{IPC_HLE/WII_IPC_HLE.cpp => IOS/IPC.cpp}  |  36 +-
 .../Core/{IPC_HLE/WII_IPC_HLE.h => IOS/IPC.h} |   0
 .../Network/Config.cpp}                       |   2 +-
 .../WiiNetConfig.h => IOS/Network/Config.h}   |   0
 .../Core/Core/{IPC_HLE => IOS/Network}/ICMP.h |   0
 .../Core/{IPC_HLE => IOS/Network}/ICMPLin.cpp |   2 +-
 .../Core/{IPC_HLE => IOS/Network}/ICMPWin.cpp |   2 +-
 .../{IPC_HLE => IOS/Network}/NWC24Config.cpp  |   2 +-
 .../{IPC_HLE => IOS/Network}/NWC24Config.h    |   0
 .../Network/Net.cpp}                          |   6 +-
 .../Network/Net.h}                            |   8 +-
 .../Network/SSL.cpp}                          |   4 +-
 .../Network/SSL.h}                            |   4 +-
 .../WII_Socket.cpp => IOS/Network/Socket.cpp} |   6 +-
 .../WII_Socket.h => IOS/Network/Socket.h}     |   6 +-
 .../SDIO/SDIOSlot0.cpp}                       |   4 +-
 .../SDIO/SDIOSlot0.h}                         |   4 +-
 .../STM/STM.cpp}                              |   2 +-
 .../STM/STM.h}                                |   4 +-
 .../USB/Bluetooth/BTBase.cpp}                 |   2 +-
 .../USB/Bluetooth/BTBase.h}                   |   4 +-
 .../USB/Bluetooth/BTEmu.cpp}                  |   7 +-
 .../USB/Bluetooth/BTEmu.h}                    |  10 +-
 .../USB/Bluetooth/BTReal.cpp}                 |   6 +-
 .../USB/Bluetooth/BTReal.h}                   |   6 +-
 .../USB/Bluetooth/BTStub.cpp}                 |   2 +-
 .../USB/Bluetooth/BTStub.h}                   |   4 +-
 .../USB/Bluetooth/WiimoteDevice.cpp}          |   8 +-
 .../USB/Bluetooth/WiimoteDevice.h}            |   2 +-
 .../USB/Bluetooth/WiimoteHIDAttr.cpp}         |   2 +-
 .../USB/Bluetooth/WiimoteHIDAttr.h}           |   0
 .../Core/{IPC_HLE => IOS/USB/Bluetooth}/hci.h |   0
 .../{IPC_HLE => IOS/USB/Bluetooth}/l2cap.h    |   0
 .../USB/USB_HIDv4.cpp}                        |   4 +-
 .../USB/USB_HIDv4.h}                          |   4 +-
 .../USB/USB_KBD.cpp}                          |   2 +-
 .../USB/USB_KBD.h}                            |   4 +-
 .../USB/USB_VEN.cpp}                          |   2 +-
 .../USB/USB_VEN.h}                            |   4 +-
 .../WFS/WFSI.cpp}                             |   6 +-
 .../WFS/WFSI.h}                               |   6 +-
 .../WFS/WFSSRV.cpp}                           |   2 +-
 .../WFS/WFSSRV.h}                             |   4 +-
 Source/Core/Core/Movie.cpp                    |   4 +-
 Source/Core/Core/NetPlayClient.cpp            |   2 +-
 .../Core/DolphinWX/Config/WiiConfigPane.cpp   |   2 +-
 .../Core/DolphinWX/ControllerConfigDiag.cpp   |   4 +-
 Source/Core/DolphinWX/Frame.cpp               |   4 +-
 Source/Core/DolphinWX/FrameTools.cpp          |   8 +-
 Source/Core/DolphinWX/MainNoGUI.cpp           |   8 +-
 77 files changed, 432 insertions(+), 441 deletions(-)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_DI.cpp => IOS/DI/DI.cpp} (97%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_DI.h => IOS/DI/DI.h} (91%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device.cpp => IOS/Device.cpp} (98%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device.h => IOS/Device.h} (99%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_stub.cpp => IOS/DeviceStub.cpp} (95%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_stub.h => IOS/DeviceStub.h} (88%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_es.cpp => IOS/ES/ES.cpp} (99%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_es.h => IOS/ES/ES.h} (97%)
 rename Source/Core/Core/{IPC_HLE/ESFormats.cpp => IOS/ES/Formats.cpp} (98%)
 rename Source/Core/Core/{IPC_HLE/ESFormats.h => IOS/ES/Formats.h} (100%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_fs.cpp => IOS/FS/FS.cpp} (99%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_fs.h => IOS/FS/FS.h} (93%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp => IOS/FS/FileIO.cpp} (99%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_FileIO.h => IOS/FS/FileIO.h} (95%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE.cpp => IOS/IPC.cpp} (93%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE.h => IOS/IPC.h} (100%)
 rename Source/Core/Core/{IPC_HLE/WiiNetConfig.cpp => IOS/Network/Config.cpp} (97%)
 rename Source/Core/Core/{IPC_HLE/WiiNetConfig.h => IOS/Network/Config.h} (100%)
 rename Source/Core/Core/{IPC_HLE => IOS/Network}/ICMP.h (100%)
 rename Source/Core/Core/{IPC_HLE => IOS/Network}/ICMPLin.cpp (93%)
 rename Source/Core/Core/{IPC_HLE => IOS/Network}/ICMPWin.cpp (98%)
 rename Source/Core/Core/{IPC_HLE => IOS/Network}/NWC24Config.cpp (99%)
 rename Source/Core/Core/{IPC_HLE => IOS/Network}/NWC24Config.h (100%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_net.cpp => IOS/Network/Net.cpp} (99%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_net.h => IOS/Network/Net.h} (98%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp => IOS/Network/SSL.cpp} (99%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_net_ssl.h => IOS/Network/SSL.h} (97%)
 rename Source/Core/Core/{IPC_HLE/WII_Socket.cpp => IOS/Network/Socket.cpp} (99%)
 rename Source/Core/Core/{IPC_HLE/WII_Socket.h => IOS/Network/Socket.h} (97%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp => IOS/SDIO/SDIOSlot0.cpp} (99%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h => IOS/SDIO/SDIOSlot0.h} (97%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_stm.cpp => IOS/STM/STM.cpp} (98%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_stm.h => IOS/STM/STM.h} (95%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.cpp => IOS/USB/Bluetooth/BTBase.cpp} (98%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h => IOS/USB/Bluetooth/BTBase.h} (95%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp => IOS/USB/Bluetooth/BTEmu.cpp} (99%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h => IOS/USB/Bluetooth/BTEmu.h} (96%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp => IOS/USB/Bluetooth/BTReal.cpp} (99%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h => IOS/USB/Bluetooth/BTReal.h} (95%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.cpp => IOS/USB/Bluetooth/BTStub.cpp} (93%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h => IOS/USB/Bluetooth/BTStub.h} (87%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_WiiMote.cpp => IOS/USB/Bluetooth/WiimoteDevice.cpp} (99%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_WiiMote.h => IOS/USB/Bluetooth/WiimoteDevice.h} (99%)
 rename Source/Core/Core/{IPC_HLE/WiiMote_HID_Attr.cpp => IOS/USB/Bluetooth/WiimoteHIDAttr.cpp} (98%)
 rename Source/Core/Core/{IPC_HLE/WiiMote_HID_Attr.h => IOS/USB/Bluetooth/WiimoteHIDAttr.h} (100%)
 rename Source/Core/Core/{IPC_HLE => IOS/USB/Bluetooth}/hci.h (100%)
 rename Source/Core/Core/{IPC_HLE => IOS/USB/Bluetooth}/l2cap.h (100%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_hid.cpp => IOS/USB/USB_HIDv4.cpp} (99%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_hid.h => IOS/USB/USB_HIDv4.h} (97%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp => IOS/USB/USB_KBD.cpp} (99%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h => IOS/USB/USB_KBD.h} (93%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_usb_ven.cpp => IOS/USB/USB_VEN.cpp} (97%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_usb_ven.h => IOS/USB/USB_VEN.h} (92%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_wfsi.cpp => IOS/WFS/WFSI.cpp} (98%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_wfsi.h => IOS/WFS/WFSI.h} (92%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.cpp => IOS/WFS/WFSSRV.cpp} (99%)
 rename Source/Core/Core/{IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.h => IOS/WFS/WFSSRV.h} (95%)

diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
index 7bf221273a..eb520092ec 100644
--- a/Source/Core/Core/Boot/Boot.cpp
+++ b/Source/Core/Core/Boot/Boot.cpp
@@ -26,7 +26,7 @@
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/HW/VideoInterface.h"
 #include "Core/Host.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IOS/IPC.h"
 #include "Core/PatchEngine.h"
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
diff --git a/Source/Core/Core/Boot/Boot_WiiWAD.cpp b/Source/Core/Core/Boot/Boot_WiiWAD.cpp
index 366f89e439..4869353bf4 100644
--- a/Source/Core/Core/Boot/Boot_WiiWAD.cpp
+++ b/Source/Core/Core/Boot/Boot_WiiWAD.cpp
@@ -14,8 +14,8 @@
 #include "Core/HLE/HLE.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/VideoInterface.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
+#include "Core/IOS/FS/FileIO.h"
+#include "Core/IOS/IPC.h"
 #include "Core/PatchEngine.h"
 #include "Core/PowerPC/PowerPC.h"
 
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index 7b576f9577..c38ed5859e 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -135,31 +135,31 @@ set(SRCS	ActionReplay.cpp
 			HW/WiimoteEmu/Speaker.cpp
 			HW/WiimoteReal/WiimoteReal.cpp
 			HW/WiiSaveCrypted.cpp
-			IPC_HLE/ESFormats.cpp
-			IPC_HLE/ICMPLin.cpp
-			IPC_HLE/NWC24Config.cpp
-			IPC_HLE/WII_IPC_HLE.cpp
-			IPC_HLE/WII_IPC_HLE_Device.cpp
-			IPC_HLE/WII_IPC_HLE_Device_stub.cpp
-			IPC_HLE/WII_IPC_HLE_Device_DI.cpp
-			IPC_HLE/WII_IPC_HLE_Device_es.cpp
-			IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
-			IPC_HLE/WII_IPC_HLE_Device_fs.cpp
-			IPC_HLE/WII_Socket.cpp
-			IPC_HLE/WII_IPC_HLE_Device_net.cpp
-			IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
-			IPC_HLE/WII_IPC_HLE_Device_stm.cpp
-			IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
-			IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.cpp
-			IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp
-			IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.cpp
-			IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
-			IPC_HLE/WII_IPC_HLE_Device_usb_ven.cpp
-			IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.cpp
-			IPC_HLE/WII_IPC_HLE_Device_wfsi.cpp
-			IPC_HLE/WII_IPC_HLE_WiiMote.cpp
-			IPC_HLE/WiiMote_HID_Attr.cpp
-			IPC_HLE/WiiNetConfig.cpp
+			IOS/Device.cpp
+			IOS/DeviceStub.cpp
+			IOS/IPC.cpp
+			IOS/DI/DI.cpp
+			IOS/ES/ES.cpp
+			IOS/ES/Formats.cpp
+			IOS/FS/FileIO.cpp
+			IOS/FS/FS.cpp
+			IOS/Network/Config.cpp
+			IOS/Network/ICMPLin.cpp
+			IOS/Network/NWC24Config.cpp
+			IOS/Network/Socket.cpp
+			IOS/Network/Net.cpp
+			IOS/Network/SSL.cpp
+			IOS/SDIO/SDIOSlot0.cpp
+			IOS/STM/STM.cpp
+			IOS/USB/USB_KBD.cpp
+			IOS/USB/USB_VEN.cpp
+			IOS/USB/Bluetooth/BTBase.cpp
+			IOS/USB/Bluetooth/BTEmu.cpp
+			IOS/USB/Bluetooth/BTStub.cpp
+			IOS/USB/Bluetooth/WiimoteDevice.cpp
+			IOS/USB/Bluetooth/WiimoteHIDAttr.cpp
+			IOS/WFS/WFSSRV.cpp
+			IOS/WFS/WFSI.cpp
 			PowerPC/BreakPoints.cpp
 			PowerPC/MMU.cpp
 			PowerPC/PowerPC.cpp
@@ -260,8 +260,8 @@ set(LIBS
 if(LIBUSB_FOUND)
 	# Using shared LibUSB
 	set(LIBS	${LIBS}	${LIBUSB_LIBRARIES})
-	set(SRCS	${SRCS}	IPC_HLE/WII_IPC_HLE_Device_hid.cpp
-	        	       	IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp)
+	set(SRCS	${SRCS}	IOS/USB/USB_HIDv4.cpp
+	        	       	IOS/USB/Bluetooth/BTReal.cpp)
 endif(LIBUSB_FOUND)
 
 if(NOT APPLE)
diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
index cf89127184..7d8f7d7993 100644
--- a/Source/Core/Core/ConfigManager.cpp
+++ b/Source/Core/Core/ConfigManager.cpp
@@ -22,7 +22,7 @@
 #include "Core/Core.h"  // for bWii
 #include "Core/FifoPlayer/FifoDataFile.h"
 #include "Core/HW/SI.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h"
+#include "Core/IOS/USB/Bluetooth/BTBase.h"
 #include "Core/PowerPC/PowerPC.h"
 
 #include "DiscIO/Enums.h"
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index fbe872c534..03dcc175b0 100644
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@@ -54,9 +54,9 @@
 #include "Core/HW/SystemTimers.h"
 #include "Core/HW/VideoInterface.h"
 #include "Core/HW/Wiimote.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
-#include "Core/IPC_HLE/WII_Socket.h"
+#include "Core/IOS/Network/Socket.h"
+#include "Core/IOS/USB/Bluetooth/BTEmu.h"
+#include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
 #include "Core/Movie.h"
 #include "Core/NetPlayClient.h"
 #include "Core/NetPlayProto.h"
diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
index b9f950a2eb..0219697453 100644
--- a/Source/Core/Core/Core.vcxproj
+++ b/Source/Core/Core/Core.vcxproj
@@ -167,41 +167,41 @@
     <ClCompile Include="HW\WiimoteReal\WiimoteReal.cpp" />
     <ClCompile Include="HW\WII_IPC.cpp" />
     <ClCompile Include="HW\WiiSaveCrypted.cpp" />
-    <ClCompile Include="IPC_HLE\ESFormats.cpp" />
-    <ClCompile Include="IPC_HLE\ICMPWin.cpp" />
-    <ClCompile Include="IPC_HLE\NWC24Config.cpp" />
-    <ClCompile Include="IPC_HLE\WiiMote_HID_Attr.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_stub.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_DI.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_es.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_fs.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_hid.cpp">
+    <ClCompile Include="IOS\Device.cpp" />
+    <ClCompile Include="IOS\DeviceStub.cpp" />
+    <ClCompile Include="IOS\IPC.cpp" />
+    <ClCompile Include="IOS\DI\DI.cpp" />
+    <ClCompile Include="IOS\ES\ES.cpp" />
+    <ClCompile Include="IOS\ES\Formats.cpp" />
+    <ClCompile Include="IOS\FS\FileIO.cpp" />
+    <ClCompile Include="IOS\FS\FS.cpp" />
+    <ClCompile Include="IOS\Network\Config.cpp" />
+    <ClCompile Include="IOS\Network\ICMPLin.cpp" />
+    <ClCompile Include="IOS\Network\NWC24Config.cpp" />
+    <ClCompile Include="IOS\Network\Socket.cpp" />
+    <ClCompile Include="IOS\Network\Net.cpp" />
+    <ClCompile Include="IOS\Network\SSL.cpp" />
+    <ClCompile Include="IOS\SDIO\SDIOSlot0.cpp" />
+    <ClCompile Include="IOS\STM\STM.cpp" />
+    <ClCompile Include="IOS\USB\USB_HIDv4.cpp">
       <!--
       Disable "nonstandard extension used : zero-sized array in struct/union" warning,
       which is hit in libusb.h.
       -->
       <DisableSpecificWarnings>4200;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_net.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_net_ssl.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_stm.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_base.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_emu.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_real.cpp">
+    <ClCompile Include="IOS\USB\USB_KBD.cpp" />
+    <ClCompile Include="IOS\USB\USB_VEN.cpp" />
+    <ClCompile Include="IOS\USB\Bluetooth\BTBase.cpp" />
+    <ClCompile Include="IOS\USB\Bluetooth\BTEmu.cpp" />
+    <ClCompile Include="IOS\USB\Bluetooth\BTStub.cpp" />
+    <ClCompile Include="IOS\USB\Bluetooth\BTReal.cpp">
       <DisableSpecificWarnings>4200;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_stub.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_ven.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_wfssrv.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_wfsi.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_WiiMote.cpp" />
-    <ClCompile Include="IPC_HLE\WII_Socket.cpp" />
-    <ClCompile Include="IPC_HLE\WiiNetConfig.cpp" />
+    <ClCompile Include="IOS\USB\Bluetooth\WiimoteDevice.cpp" />
+    <ClCompile Include="IOS\USB\Bluetooth\WiimoteHIDAttr.cpp" />
+    <ClCompile Include="IOS\WFS\WFSSRV.cpp" />
+    <ClCompile Include="IOS\WFS\WFSI.cpp" />
     <ClCompile Include="MemTools.cpp" />
     <ClCompile Include="Movie.cpp" />
     <ClCompile Include="NetPlayClient.cpp" />
@@ -395,35 +395,36 @@
     <ClInclude Include="HW\WiimoteReal\WiimoteRealBase.h" />
     <ClInclude Include="HW\WiiSaveCrypted.h" />
     <ClInclude Include="HW\WII_IPC.h" />
-    <ClInclude Include="IPC_HLE\ESFormats.h" />
-    <ClInclude Include="IPC_HLE\hci.h" />
-    <ClInclude Include="IPC_HLE\ICMP.h" />
-    <ClInclude Include="IPC_HLE\l2cap.h" />
-    <ClInclude Include="IPC_HLE\NWC24Config.h" />
-    <ClInclude Include="IPC_HLE\WiiMote_HID_Attr.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_stub.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_DI.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_es.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_FileIO.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_fs.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_hid.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_net.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_net_ssl.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_stm.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_base.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_emu.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_real.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_stub.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_ven.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_wfssrv.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_wfsi.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_WiiMote.h" />
-    <ClInclude Include="IPC_HLE\WII_Socket.h" />
-    <ClInclude Include="IPC_HLE\WiiNetConfig.h" />
+    <ClInclude Include="IOS\Device.h" />
+    <ClInclude Include="IOS\DeviceStub.h" />
+    <ClInclude Include="IOS\IPC.h" />
+    <ClInclude Include="IOS\DI\DI.h" />
+    <ClInclude Include="IOS\ES\ES.h" />
+    <ClInclude Include="IOS\ES\Formats.h" />
+    <ClInclude Include="IOS\FS\FileIO.h" />
+    <ClInclude Include="IOS\FS\FS.h" />
+    <ClInclude Include="IOS\Network\Config.h" />
+    <ClInclude Include="IOS\Network\ICMPLin.h" />
+    <ClInclude Include="IOS\Network\NWC24Config.h" />
+    <ClInclude Include="IOS\Network\ICMP.h" />
+    <ClInclude Include="IOS\Network\Socket.h" />
+    <ClInclude Include="IOS\Network\Net.h" />
+    <ClInclude Include="IOS\Network\SSL.h" />
+    <ClInclude Include="IOS\SDIO\SDIOSlot0.h" />
+    <ClInclude Include="IOS\STM\STM.h" />
+    <ClInclude Include="IOS\USB\USB_HIDv4.h" />
+    <ClInclude Include="IOS\USB\USB_KBD.h" />
+    <ClInclude Include="IOS\USB\USB_VEN.h" />
+    <ClInclude Include="IOS\USB\Bluetooth\BTBase.h" />
+    <ClInclude Include="IOS\USB\Bluetooth\BTEmu.h" />
+    <ClInclude Include="IOS\USB\Bluetooth\BTStub.h" />
+    <ClInclude Include="IOS\USB\Bluetooth\BTReal.h" />
+    <ClInclude Include="IOS\USB\Bluetooth\WiimoteDevice.h" />
+    <ClInclude Include="IOS\USB\Bluetooth\WiimoteHIDAttr.h" />
+    <ClInclude Include="IOS\USB\Bluetooth\hci.h" />
+    <ClInclude Include="IOS\USB\Bluetooth\l2cap.h" />
+    <ClInclude Include="IOS\WFS\WFSSRV.h" />
+    <ClInclude Include="IOS\WFS\WFSI.h" />
     <ClInclude Include="MachineContext.h" />
     <ClInclude Include="MemTools.h" />
     <ClInclude Include="Movie.h" />
diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters
index 555cf460a6..8afa31ba27 100644
--- a/Source/Core/Core/Core.vcxproj.filters
+++ b/Source/Core/Core/Core.vcxproj.filters
@@ -25,9 +25,6 @@
     <Filter Include="HW %28Flipper/Hollywood%29">
       <UniqueIdentifier>{d060b137-c211-44eb-9cad-fc12dedbea73}</UniqueIdentifier>
     </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29">
-      <UniqueIdentifier>{becbad5b-2531-410c-b032-2da2f078b178}</UniqueIdentifier>
-    </Filter>
     <Filter Include="PowerPC">
       <UniqueIdentifier>{ebd24590-dfdc-433e-a411-21723e4b7cb5}</UniqueIdentifier>
     </Filter>
@@ -112,39 +109,42 @@
     <Filter Include="HW %28Flipper/Hollywood%29\Wii IPC">
       <UniqueIdentifier>{2b41ab45-ba8c-45dc-92cc-9107c1fa3e36}</UniqueIdentifier>
     </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\DI">
-      <UniqueIdentifier>{9370a21f-a7bf-4973-8258-290253617653}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\ES">
-      <UniqueIdentifier>{3f85582a-e612-4582-b0fa-ecc27ba3658c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\FS">
-      <UniqueIdentifier>{1f5662c1-885f-4ed4-9f10-cc8e98eaa35d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\Keyboard">
-      <UniqueIdentifier>{1fb00563-01ba-42c4-82de-2c66371e614a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\Net">
-      <UniqueIdentifier>{4620ba8f-5638-4d56-941e-69fc4a4dfc07}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\SDIO - SD Card">
-      <UniqueIdentifier>{83c278e5-6b06-4cd0-96fb-2e3c88eb32d7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\USB">
-      <UniqueIdentifier>{4a090016-76d5-43dd-95a4-abedfc11ef31}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\WFS">
-      <UniqueIdentifier>{f11746cf-277a-4d58-bcf1-578a45348b07}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote">
-      <UniqueIdentifier>{8352be4d-d37d-4f55-adec-b940a9712802}</UniqueIdentifier>
-    </Filter>
     <Filter Include="PowerPC\JitILCommon">
       <UniqueIdentifier>{827afa93-1a80-4835-93ae-b5516d95867f}</UniqueIdentifier>
     </Filter>
     <Filter Include="PowerPC\Jit64Common">
       <UniqueIdentifier>{81956f71-d9fe-454f-96a6-855195d611c4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="IOS">
+      <UniqueIdentifier>{e14b3339-dc23-46d6-845d-7206dc4f88c3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IOS\USB">
+      <UniqueIdentifier>{c1e2e0dc-30ac-44cd-9909-e5b594647a04}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IOS\USB\Bluetooth">
+      <UniqueIdentifier>{5846b261-397e-4e2a-89e3-88d22ab927c5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IOS\Network">
+      <UniqueIdentifier>{ab9cdd90-54d7-4f42-9248-d7903ce52cc8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IOS\DI">
+      <UniqueIdentifier>{3db8c364-1d72-4660-9179-86d1c46904b9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IOS\FS">
+      <UniqueIdentifier>{75be4669-90fe-4280-b0ea-df350f481357}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IOS\ES">
+      <UniqueIdentifier>{7fae98ef-4b62-4701-8f08-c496bd1ce2a7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IOS\SDIO">
+      <UniqueIdentifier>{b132ac6a-a02e-429e-858b-bfbc3fdc1851}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IOS\STM">
+      <UniqueIdentifier>{2bfd4ecc-7225-48f0-91b9-efb42aaf71bf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="IOS\WFS">
+      <UniqueIdentifier>{1fa9df3e-6741-4045-b2f6-457b4a0540a9}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BootManager.cpp" />
@@ -568,84 +568,6 @@
     <ClCompile Include="DSP\LabelMap.cpp">
       <Filter>DSPCore</Filter>
     </ClCompile>
-    <ClCompile Include="IPC_HLE\ESFormats.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_stub.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_DI.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\DI</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_es.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_fs.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Keyboard</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\ICMPWin.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\NWC24Config.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_net.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_net_ssl.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_Socket.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WiiNetConfig.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\SDIO - SD Card</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_stm.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_hid.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_base.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_emu.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_real.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_stub.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_wfssrv.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\WFS</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_wfsi.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\WFS</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_WiiMote.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClCompile>
-    <ClCompile Include="IPC_HLE\WiiMote_HID_Attr.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClCompile>
     <ClCompile Include="HW\Wiimote.cpp">
       <Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter>
     </ClCompile>
@@ -779,17 +701,89 @@
       <Filter>PowerPC\Jit64Common</Filter>
     </ClCompile>
     <ClCompile Include="Analytics.cpp" />
-    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_ven.cpp">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB</Filter>
+    <ClCompile Include="PowerPC\SignatureDB\CSVSignatureDB.cpp" />
+    <ClCompile Include="PowerPC\SignatureDB\DSYSignatureDB.cpp" />
+    <ClCompile Include="PowerPC\SignatureDB\SignatureDB.cpp" />
+    <ClCompile Include="IOS\USB\Bluetooth\BTBase.cpp">
+      <Filter>IOS\USB\Bluetooth</Filter>
     </ClCompile>
-    <ClCompile Include="PowerPC\SignatureDB\CSVSignatureDB.cpp">
-      <Filter>PowerPC\SignatureDB</Filter>
+    <ClCompile Include="IOS\USB\Bluetooth\BTEmu.cpp">
+      <Filter>IOS\USB\Bluetooth</Filter>
     </ClCompile>
-    <ClCompile Include="PowerPC\SignatureDB\DSYSignatureDB.cpp">
-      <Filter>PowerPC\SignatureDB</Filter>
+    <ClCompile Include="IOS\USB\Bluetooth\BTReal.cpp">
+      <Filter>IOS\USB\Bluetooth</Filter>
     </ClCompile>
-    <ClCompile Include="PowerPC\SignatureDB\SignatureDB.cpp">
-      <Filter>PowerPC\SignatureDB</Filter>
+    <ClCompile Include="IOS\USB\Bluetooth\BTStub.cpp">
+      <Filter>IOS\USB\Bluetooth</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\Network\Config.cpp">
+      <Filter>IOS\Network</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\Device.cpp">
+      <Filter>IOS</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\DeviceStub.cpp">
+      <Filter>IOS</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\DI\DI.cpp">
+      <Filter>IOS\DI</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\FS\FileIO.cpp">
+      <Filter>IOS\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\ES\ES.cpp">
+      <Filter>IOS\ES</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\ES\Formats.cpp">
+      <Filter>IOS\ES</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\FS\FS.cpp">
+      <Filter>IOS\FS</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\Network\ICMPLin.cpp">
+      <Filter>IOS\Network</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\IPC.cpp">
+      <Filter>IOS</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\Network\Net.cpp">
+      <Filter>IOS\Network</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\Network\NWC24Config.cpp">
+      <Filter>IOS\Network</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\SDIO\SDIOSlot0.cpp">
+      <Filter>IOS\SDIO</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\Network\Socket.cpp">
+      <Filter>IOS\Network</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\Network\SSL.cpp">
+      <Filter>IOS\Network</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\STM\STM.cpp">
+      <Filter>IOS\STM</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\USB\USB_HIDv4.cpp">
+      <Filter>IOS\USB</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\USB\USB_KBD.cpp">
+      <Filter>IOS\USB</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\USB\USB_VEN.cpp">
+      <Filter>IOS\USB</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\WFS\WFSI.cpp">
+      <Filter>IOS\WFS</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\WFS\WFSSRV.cpp">
+      <Filter>IOS\WFS</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\USB\Bluetooth\WiimoteDevice.cpp">
+      <Filter>IOS\USB\Bluetooth</Filter>
+    </ClCompile>
+    <ClCompile Include="IOS\USB\Bluetooth\WiimoteHIDAttr.cpp">
+      <Filter>IOS\USB\Bluetooth</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1174,90 +1168,6 @@
     <ClInclude Include="DSP\LabelMap.h">
       <Filter>DSPCore</Filter>
     </ClInclude>
-    <ClInclude Include="IPC_HLE\ESFormats.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE.h">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device.h">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_stub.h">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_stm.h">
-      <Filter>IPC HLE %28IOS/Starlet%29</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_DI.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\DI</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_es.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\ES</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_FileIO.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_fs.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\FS</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Keyboard</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\ICMP.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\NWC24Config.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_net.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_net_ssl.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_Socket.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WiiNetConfig.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\Net</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\SDIO - SD Card</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_hid.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_base.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_emu.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_real.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_bt_stub.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_WiiMote.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\hci.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\l2cap.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WiiMote_HID_Attr.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB/BT/Wiimote</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_wfssrv.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\WFS</Filter>
-    </ClInclude>
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_wfsi.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\WFS</Filter>
-    </ClInclude>
     <ClInclude Include="HW\Wiimote.h">
       <Filter>HW %28Flipper/Hollywood%29\Wiimote</Filter>
     </ClInclude>
@@ -1356,20 +1266,101 @@
       <Filter>PowerPC\Jit64Common</Filter>
     </ClInclude>
     <ClInclude Include="Analytics.h" />
-    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_ven.h">
-      <Filter>IPC HLE %28IOS/Starlet%29\USB</Filter>
+    <ClInclude Include="PowerPC\SignatureDB\CSVSignatureDB.h" />
+    <ClInclude Include="PowerPC\SignatureDB\DSYSignatureDB.h" />
+    <ClInclude Include="PowerPC\SignatureDB\SignatureDB.h" />
+    <ClInclude Include="IOS\USB\Bluetooth\BTBase.h">
+      <Filter>IOS\USB\Bluetooth</Filter>
     </ClInclude>
-    <ClInclude Include="PowerPC\SignatureDB\CSVSignatureDB.h">
-      <Filter>PowerPC\SignatureDB</Filter>
+    <ClInclude Include="IOS\USB\Bluetooth\BTEmu.h">
+      <Filter>IOS\USB\Bluetooth</Filter>
     </ClInclude>
-    <ClInclude Include="PowerPC\SignatureDB\DSYSignatureDB.h">
-      <Filter>PowerPC\SignatureDB</Filter>
+    <ClInclude Include="IOS\USB\Bluetooth\BTReal.h">
+      <Filter>IOS\USB\Bluetooth</Filter>
     </ClInclude>
-    <ClInclude Include="PowerPC\SignatureDB\SignatureDB.h">
-      <Filter>PowerPC\SignatureDB</Filter>
+    <ClInclude Include="IOS\USB\Bluetooth\BTStub.h">
+      <Filter>IOS\USB\Bluetooth</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\Network\Config.h">
+      <Filter>IOS\Network</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\DeviceStub.h">
+      <Filter>IOS</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\DI\DI.h">
+      <Filter>IOS\DI</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\ES\ES.h">
+      <Filter>IOS\ES</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\FS\FileIO.h">
+      <Filter>IOS\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\ES\Formats.h">
+      <Filter>IOS\ES</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\FS\FS.h">
+      <Filter>IOS\FS</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\USB\Bluetooth\hci.h">
+      <Filter>IOS\USB\Bluetooth</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\Network\ICMP.h">
+      <Filter>IOS\Network</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\Network\ICMPLin.h">
+      <Filter>IOS\Network</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\USB\Bluetooth\l2cap.h">
+      <Filter>IOS\USB\Bluetooth</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\Network\Net.h">
+      <Filter>IOS\Network</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\Network\NWC24Config.h">
+      <Filter>IOS\Network</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\SDIO\SDIOSlot0.h">
+      <Filter>IOS\SDIO</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\Network\Socket.h">
+      <Filter>IOS\Network</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\Network\SSL.h">
+      <Filter>IOS\Network</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\STM\STM.h">
+      <Filter>IOS\STM</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\USB\USB_HIDv4.h">
+      <Filter>IOS\USB</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\USB\USB_KBD.h">
+      <Filter>IOS\USB</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\USB\USB_VEN.h">
+      <Filter>IOS\USB</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\WFS\WFSI.h">
+      <Filter>IOS\WFS</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\WFS\WFSSRV.h">
+      <Filter>IOS\WFS</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\USB\Bluetooth\WiimoteDevice.h">
+      <Filter>IOS\USB\Bluetooth</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\USB\Bluetooth\WiimoteHIDAttr.h">
+      <Filter>IOS\USB\Bluetooth</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\Device.h">
+      <Filter>IOS</Filter>
+    </ClInclude>
+    <ClInclude Include="IOS\IPC.h">
+      <Filter>IOS</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/Core/HLE/HLE.cpp b/Source/Core/Core/HLE/HLE.cpp
index e30d073192..fbb6bef40b 100644
--- a/Source/Core/Core/HLE/HLE.cpp
+++ b/Source/Core/Core/HLE/HLE.cpp
@@ -14,7 +14,7 @@
 #include "Core/HLE/HLE_Misc.h"
 #include "Core/HLE/HLE_OS.h"
 #include "Core/HW/Memmap.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
+#include "Core/IOS/ES/ES.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
 #include "Core/PowerPC/PowerPC.h"
 
diff --git a/Source/Core/Core/HW/DVDInterface.cpp b/Source/Core/Core/HW/DVDInterface.cpp
index c56c9e7a0d..355f04ab27 100644
--- a/Source/Core/Core/HW/DVDInterface.cpp
+++ b/Source/Core/Core/HW/DVDInterface.cpp
@@ -24,8 +24,8 @@
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/HW/StreamADPCM.h"
 #include "Core/HW/SystemTimers.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h"
+#include "Core/IOS/DI/DI.h"
+#include "Core/IOS/IPC.h"
 #include "Core/Movie.h"
 
 #include "DiscIO/Enums.h"
diff --git a/Source/Core/Core/HW/HW.cpp b/Source/Core/Core/HW/HW.cpp
index bfc4856320..8518bb192b 100644
--- a/Source/Core/Core/HW/HW.cpp
+++ b/Source/Core/Core/HW/HW.cpp
@@ -21,7 +21,7 @@
 #include "Core/HW/SystemTimers.h"
 #include "Core/HW/VideoInterface.h"
 #include "Core/HW/WII_IPC.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IOS/IPC.h"
 #include "Core/State.h"
 #include "Core/WiiRoot.h"
 #include "DiscIO/NANDContentLoader.h"
diff --git a/Source/Core/Core/HW/ProcessorInterface.cpp b/Source/Core/Core/HW/ProcessorInterface.cpp
index c5bf1ba412..f7925d30e3 100644
--- a/Source/Core/Core/HW/ProcessorInterface.cpp
+++ b/Source/Core/Core/HW/ProcessorInterface.cpp
@@ -11,8 +11,8 @@
 #include "Core/HW/MMIO.h"
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/HW/SystemTimers.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/STM/STM.h"
 #include "Core/PowerPC/PowerPC.h"
 
 namespace ProcessorInterface
diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp
index 45ffa2f9f7..45e5f010d0 100644
--- a/Source/Core/Core/HW/SystemTimers.cpp
+++ b/Source/Core/Core/HW/SystemTimers.cpp
@@ -57,7 +57,7 @@ IPC_HLE_PERIOD: For the Wii Remote this is the call schedule:
 #include "Core/HW/DSP.h"
 #include "Core/HW/EXI_DeviceIPL.h"
 #include "Core/HW/VideoInterface.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IOS/IPC.h"
 #include "Core/PatchEngine.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "VideoCommon/Fifo.h"
diff --git a/Source/Core/Core/HW/WII_IPC.cpp b/Source/Core/Core/HW/WII_IPC.cpp
index c98775a0b5..19974b0533 100644
--- a/Source/Core/Core/HW/WII_IPC.cpp
+++ b/Source/Core/Core/HW/WII_IPC.cpp
@@ -9,7 +9,7 @@
 #include "Core/CoreTiming.h"
 #include "Core/HW/MMIO.h"
 #include "Core/HW/ProcessorInterface.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IOS/IPC.h"
 
 // This is the intercommunication between ARM and PPC. Currently only PPC actually uses it, because
 // of the IOS HLE
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/IOS/DI/DI.cpp
similarity index 97%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
rename to Source/Core/Core/IOS/DI/DI.cpp
index 3940f1d800..5706661bfd 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
+++ b/Source/Core/Core/IOS/DI/DI.cpp
@@ -13,8 +13,8 @@
 #include "Common/MsgHandler.h"
 #include "Core/HW/DVDInterface.h"
 #include "Core/HW/Memmap.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h"
+#include "Core/IOS/DI/DI.h"
+#include "Core/IOS/IPC.h"
 #include "DiscIO/Volume.h"
 
 namespace IOS
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h b/Source/Core/Core/IOS/DI/DI.h
similarity index 91%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h
rename to Source/Core/Core/IOS/DI/DI.h
index abc537f37c..fa56c9fb2e 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h
+++ b/Source/Core/Core/IOS/DI/DI.h
@@ -8,8 +8,8 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
 
 class PointerWrap;
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.cpp b/Source/Core/Core/IOS/Device.cpp
similarity index 98%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.cpp
rename to Source/Core/Core/IOS/Device.cpp
index c852bc3263..cdaf14f20a 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.cpp
+++ b/Source/Core/Core/IOS/Device.cpp
@@ -9,8 +9,8 @@
 #include "Common/StringUtil.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/SystemTimers.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/IOS/Device.h
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h
rename to Source/Core/Core/IOS/Device.h
index fe7983b536..441f9081cb 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h
+++ b/Source/Core/Core/IOS/Device.h
@@ -11,7 +11,7 @@
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IOS/IPC.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stub.cpp b/Source/Core/Core/IOS/DeviceStub.cpp
similarity index 95%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stub.cpp
rename to Source/Core/Core/IOS/DeviceStub.cpp
index 63cdec4c9d..7136c5683d 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stub.cpp
+++ b/Source/Core/Core/IOS/DeviceStub.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_stub.h"
+#include "Core/IOS/DeviceStub.h"
 #include "Common/Logging/Log.h"
 
 namespace IOS
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stub.h b/Source/Core/Core/IOS/DeviceStub.h
similarity index 88%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stub.h
rename to Source/Core/Core/IOS/DeviceStub.h
index a4c641ad77..15cacc8cdb 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stub.h
+++ b/Source/Core/Core/IOS/DeviceStub.h
@@ -7,8 +7,8 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/IOS/ES/ES.cpp
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp
rename to Source/Core/Core/IOS/ES/ES.cpp
index 1c04f7357d..a8dc23fd52 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp
+++ b/Source/Core/Core/IOS/ES/ES.cpp
@@ -53,10 +53,10 @@
 #include "Core/HW/DVDInterface.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/Wiimote.h"
-#include "Core/IPC_HLE/ESFormats.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+#include "Core/IOS/ES/ES.h"
+#include "Core/IOS/ES/Formats.h"
+#include "Core/IOS/USB/Bluetooth/BTEmu.h"
+#include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
 #include "Core/Movie.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/ec_wii.h"
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h b/Source/Core/Core/IOS/ES/ES.h
similarity index 97%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h
rename to Source/Core/Core/IOS/ES/ES.h
index 61fedff948..df9cb41e48 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h
+++ b/Source/Core/Core/IOS/ES/ES.h
@@ -10,9 +10,9 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
-#include "Core/IPC_HLE/ESFormats.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/ES/Formats.h"
+#include "Core/IOS/IPC.h"
 
 class PointerWrap;
 
diff --git a/Source/Core/Core/IPC_HLE/ESFormats.cpp b/Source/Core/Core/IOS/ES/Formats.cpp
similarity index 98%
rename from Source/Core/Core/IPC_HLE/ESFormats.cpp
rename to Source/Core/Core/IOS/ES/Formats.cpp
index a2e24d755a..8e0879ef87 100644
--- a/Source/Core/Core/IPC_HLE/ESFormats.cpp
+++ b/Source/Core/Core/IOS/ES/Formats.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/IPC_HLE/ESFormats.h"
+#include "Core/IOS/ES/Formats.h"
 
 #include <algorithm>
 #include <utility>
diff --git a/Source/Core/Core/IPC_HLE/ESFormats.h b/Source/Core/Core/IOS/ES/Formats.h
similarity index 100%
rename from Source/Core/Core/IPC_HLE/ESFormats.h
rename to Source/Core/Core/IOS/ES/Formats.h
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/IOS/FS/FS.cpp
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
rename to Source/Core/Core/IOS/FS/FS.cpp
index 79e9fdd4e1..f2d862017b 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
+++ b/Source/Core/Core/IOS/FS/FS.cpp
@@ -19,8 +19,8 @@
 #include "Common/StringUtil.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/SystemTimers.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_fs.h"
+#include "Core/IOS/FS/FS.h"
+#include "Core/IOS/FS/FileIO.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h b/Source/Core/Core/IOS/FS/FS.h
similarity index 93%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h
rename to Source/Core/Core/IOS/FS/FS.h
index 0b25f85f7a..ee2784b549 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h
+++ b/Source/Core/Core/IOS/FS/FS.h
@@ -7,8 +7,8 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
 
 class PointerWrap;
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/IOS/FS/FileIO.cpp
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
rename to Source/Core/Core/IOS/FS/FileIO.cpp
index 6d428c594d..3a16fc1ce7 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
+++ b/Source/Core/Core/IOS/FS/FileIO.cpp
@@ -14,8 +14,8 @@
 #include "Common/FileUtil.h"
 #include "Common/NandPaths.h"
 #include "Core/HW/Memmap.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
+#include "Core/IOS/FS/FileIO.h"
+#include "Core/IOS/IPC.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h b/Source/Core/Core/IOS/FS/FileIO.h
similarity index 95%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h
rename to Source/Core/Core/IOS/FS/FileIO.h
index b5039c031a..8f2751e97c 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h
+++ b/Source/Core/Core/IOS/FS/FileIO.h
@@ -8,8 +8,8 @@
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
 
 class PointerWrap;
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/IOS/IPC.cpp
similarity index 93%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
rename to Source/Core/Core/IOS/IPC.cpp
index b0ab9610ec..17c4ea9101 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
+++ b/Source/Core/Core/IOS/IPC.cpp
@@ -33,23 +33,23 @@
 #include "Core/CoreTiming.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/WII_IPC.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_fs.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_stub.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_wfsi.h"
+#include "Core/IOS/DI/DI.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/DeviceStub.h"
+#include "Core/IOS/ES/ES.h"
+#include "Core/IOS/FS/FS.h"
+#include "Core/IOS/FS/FileIO.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/Network/Net.h"
+#include "Core/IOS/Network/SSL.h"
+#include "Core/IOS/SDIO/SDIOSlot0.h"
+#include "Core/IOS/STM/STM.h"
+#include "Core/IOS/USB/Bluetooth/BTEmu.h"
+#include "Core/IOS/USB/Bluetooth/BTReal.h"
+#include "Core/IOS/USB/USB_KBD.h"
+#include "Core/IOS/USB/USB_VEN.h"
+#include "Core/IOS/WFS/WFSI.h"
+#include "Core/IOS/WFS/WFSSRV.h"
 
 namespace CoreTiming
 {
@@ -57,7 +57,7 @@ struct EventType;
 }  // namespace CoreTiming
 
 #if defined(__LIBUSB__)
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_hid.h"
+#include "Core/IOS/USB/USB_HIDv4.h"
 #endif
 
 namespace IOS
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h b/Source/Core/Core/IOS/IPC.h
similarity index 100%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE.h
rename to Source/Core/Core/IOS/IPC.h
diff --git a/Source/Core/Core/IPC_HLE/WiiNetConfig.cpp b/Source/Core/Core/IOS/Network/Config.cpp
similarity index 97%
rename from Source/Core/Core/IPC_HLE/WiiNetConfig.cpp
rename to Source/Core/Core/IOS/Network/Config.cpp
index 0d79ed2e63..86dd3d05d1 100644
--- a/Source/Core/Core/IPC_HLE/WiiNetConfig.cpp
+++ b/Source/Core/Core/IOS/Network/Config.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/IPC_HLE/WiiNetConfig.h"
+#include "Core/IOS/Network/Config.h"
 
 #include <cstring>
 
diff --git a/Source/Core/Core/IPC_HLE/WiiNetConfig.h b/Source/Core/Core/IOS/Network/Config.h
similarity index 100%
rename from Source/Core/Core/IPC_HLE/WiiNetConfig.h
rename to Source/Core/Core/IOS/Network/Config.h
diff --git a/Source/Core/Core/IPC_HLE/ICMP.h b/Source/Core/Core/IOS/Network/ICMP.h
similarity index 100%
rename from Source/Core/Core/IPC_HLE/ICMP.h
rename to Source/Core/Core/IOS/Network/ICMP.h
diff --git a/Source/Core/Core/IPC_HLE/ICMPLin.cpp b/Source/Core/Core/IOS/Network/ICMPLin.cpp
similarity index 93%
rename from Source/Core/Core/IPC_HLE/ICMPLin.cpp
rename to Source/Core/Core/IOS/Network/ICMPLin.cpp
index d847d8d0a2..258371c294 100644
--- a/Source/Core/Core/IPC_HLE/ICMPLin.cpp
+++ b/Source/Core/Core/IOS/Network/ICMPLin.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "ICMP.h"
+#include "Core/IOS/Network/ICMP.h"
 
 // Currently stubbed. AFAIK (delroth) there is no way to send ICMP echo
 // requests without being root on current Linux versions.
diff --git a/Source/Core/Core/IPC_HLE/ICMPWin.cpp b/Source/Core/Core/IOS/Network/ICMPWin.cpp
similarity index 98%
rename from Source/Core/Core/IPC_HLE/ICMPWin.cpp
rename to Source/Core/Core/IOS/Network/ICMPWin.cpp
index ced1b4d320..d95bf64de3 100644
--- a/Source/Core/Core/IPC_HLE/ICMPWin.cpp
+++ b/Source/Core/Core/IOS/Network/ICMPWin.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/IPC_HLE/ICMP.h"
+#include "Core/IOS/Network/ICMP.h"
 
 enum
 {
diff --git a/Source/Core/Core/IPC_HLE/NWC24Config.cpp b/Source/Core/Core/IOS/Network/NWC24Config.cpp
similarity index 99%
rename from Source/Core/Core/IPC_HLE/NWC24Config.cpp
rename to Source/Core/Core/IOS/Network/NWC24Config.cpp
index 7aa5c3fb18..e0de924b77 100644
--- a/Source/Core/Core/IPC_HLE/NWC24Config.cpp
+++ b/Source/Core/Core/IOS/Network/NWC24Config.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/IPC_HLE/NWC24Config.h"
+#include "Core/IOS/Network/NWC24Config.h"
 
 #include <cstring>
 
diff --git a/Source/Core/Core/IPC_HLE/NWC24Config.h b/Source/Core/Core/IOS/Network/NWC24Config.h
similarity index 100%
rename from Source/Core/Core/IPC_HLE/NWC24Config.h
rename to Source/Core/Core/IOS/Network/NWC24Config.h
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/IOS/Network/Net.cpp
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp
rename to Source/Core/Core/IOS/Network/Net.cpp
index 7c0c954b5f..d581374fb0 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp
+++ b/Source/Core/Core/IOS/Network/Net.cpp
@@ -28,9 +28,9 @@
 #include "Common/StringUtil.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
-#include "Core/IPC_HLE/ICMP.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h"
-#include "Core/IPC_HLE/WII_Socket.h"
+#include "Core/IOS/Network/ICMP.h"
+#include "Core/IOS/Network/Net.h"
+#include "Core/IOS/Network/Socket.h"
 #include "Core/ec_wii.h"
 
 #ifdef _WIN32
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/IOS/Network/Net.h
similarity index 98%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h
rename to Source/Core/Core/IOS/Network/Net.h
index 9472aa048b..e750eea0dc 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h
+++ b/Source/Core/Core/IOS/Network/Net.h
@@ -10,10 +10,10 @@
 #include "Common/Logging/Log.h"
 #include "Core/HW/EXI_DeviceIPL.h"
 #include "Core/HW/Memmap.h"
-#include "Core/IPC_HLE/NWC24Config.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
-#include "Core/IPC_HLE/WiiNetConfig.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/Network/Config.h"
+#include "Core/IOS/Network/NWC24Config.h"
 
 #ifdef _WIN32
 #include <ws2tcpip.h>
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp b/Source/Core/Core/IOS/Network/SSL.cpp
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
rename to Source/Core/Core/IOS/Network/SSL.cpp
index ba6642aa04..51ff2aa5e6 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
+++ b/Source/Core/Core/IOS/Network/SSL.cpp
@@ -13,8 +13,8 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/Memmap.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h"
-#include "Core/IPC_HLE/WII_Socket.h"
+#include "Core/IOS/Network/SSL.h"
+#include "Core/IOS/Network/Socket.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h b/Source/Core/Core/IOS/Network/SSL.h
similarity index 97%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
rename to Source/Core/Core/IOS/Network/SSL.h
index 136569cb0b..bd003b6d77 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
+++ b/Source/Core/Core/IOS/Network/SSL.h
@@ -19,8 +19,8 @@
 // clang-format on
 
 #include "Common/CommonTypes.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/Device.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.cpp b/Source/Core/Core/IOS/Network/Socket.cpp
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_Socket.cpp
rename to Source/Core/Core/IOS/Network/Socket.cpp
index 53812b4d8f..0a3ded07a4 100644
--- a/Source/Core/Core/IPC_HLE/WII_Socket.cpp
+++ b/Source/Core/Core/IOS/Network/Socket.cpp
@@ -12,9 +12,9 @@
 #include "Common/FileUtil.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
-#include "Core/IPC_HLE/WII_Socket.h"  // No Wii socket support while using NetPlay or TAS
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/Network/Socket.h"  // No Wii socket support while using NetPlay or TAS
 
 #ifdef _WIN32
 #define ERRORCODE(name) WSA##name
diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.h b/Source/Core/Core/IOS/Network/Socket.h
similarity index 97%
rename from Source/Core/Core/IPC_HLE/WII_Socket.h
rename to Source/Core/Core/IOS/Network/Socket.h
index 6736fe4899..0de19a59d9 100644
--- a/Source/Core/Core/IPC_HLE/WII_Socket.h
+++ b/Source/Core/Core/IOS/Network/Socket.h
@@ -52,9 +52,9 @@ typedef struct pollfd pollfd_t;
 #include "Common/Logging/Log.h"
 #include "Common/NonCopyable.h"
 #include "Core/HW/Memmap.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/Network/Net.h"
+#include "Core/IOS/Network/SSL.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
rename to Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp
index a33afc4703..7cb2bbeca1 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
+++ b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp
@@ -14,8 +14,8 @@
 #include "Common/SDCardUtil.h"
 #include "Core/ConfigManager.h"
 #include "Core/HW/Memmap.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/SDIO/SDIOSlot0.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h b/Source/Core/Core/IOS/SDIO/SDIOSlot0.h
similarity index 97%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
rename to Source/Core/Core/IOS/SDIO/SDIOSlot0.h
index 2c349546fe..f227d7d114 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
+++ b/Source/Core/Core/IOS/SDIO/SDIOSlot0.h
@@ -11,8 +11,8 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
 
 class PointerWrap;
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.cpp b/Source/Core/Core/IOS/STM/STM.cpp
similarity index 98%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.cpp
rename to Source/Core/Core/IOS/STM/STM.cpp
index 5a6af84273..f79ceda8cd 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.cpp
+++ b/Source/Core/Core/IOS/STM/STM.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h"
+#include "Core/IOS/STM/STM.h"
 
 #include <functional>
 #include <memory>
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h b/Source/Core/Core/IOS/STM/STM.h
similarity index 95%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h
rename to Source/Core/Core/IOS/STM/STM.h
index 4ba8e29672..7f332cf003 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h
+++ b/Source/Core/Core/IOS/STM/STM.h
@@ -7,8 +7,8 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp
similarity index 98%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.cpp
rename to Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp
index a9148d8752..7e0e664661 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.cpp
+++ b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp
@@ -14,7 +14,7 @@
 #include "Common/Logging/Log.h"
 #include "Common/SysConf.h"
 #include "Core/HW/Memmap.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h"
+#include "Core/IOS/USB/Bluetooth/BTBase.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.h
similarity index 95%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h
rename to Source/Core/Core/IOS/USB/Bluetooth/BTBase.h
index c6889dcf5b..c03d041455 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h
+++ b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.h
@@ -8,8 +8,8 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
 
 class PointerWrap;
 class SysConf;
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp
rename to Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp
index 568a51e079..5365f899ad 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp
+++ b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp
@@ -22,10 +22,9 @@
 #include "Core/HW/SystemTimers.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/Host.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/USB/Bluetooth/BTEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 
 namespace IOS
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h
similarity index 96%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h
rename to Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h
index bbd06fdadb..66146d3e6c 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h
+++ b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h
@@ -13,11 +13,11 @@
 
 #include "Common/CommonTypes.h"
 #include "Core/HW/Wiimote.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
-#include "Core/IPC_HLE/hci.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/USB/Bluetooth/BTBase.h"
+#include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
+#include "Core/IOS/USB/Bluetooth/hci.h"
 
 class PointerWrap;
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp
rename to Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp
index 7f93b65cbe..bb550c4000 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp
+++ b/Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp
@@ -27,9 +27,9 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/Memmap.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h"
-#include "Core/IPC_HLE/hci.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/USB/Bluetooth/BTReal.h"
+#include "Core/IOS/USB/Bluetooth/hci.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h b/Source/Core/Core/IOS/USB/Bluetooth/BTReal.h
similarity index 95%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h
rename to Source/Core/Core/IOS/USB/Bluetooth/BTReal.h
index a87b9cc4b6..316ad3cef9 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h
+++ b/Source/Core/Core/IOS/USB/Bluetooth/BTReal.h
@@ -13,8 +13,8 @@
 #include "Common/CommonTypes.h"
 #include "Common/Flag.h"
 #include "Common/Timer.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/USB/Bluetooth/BTBase.h"
 
 class PointerWrap;
 struct libusb_context;
@@ -104,7 +104,7 @@ private:
 }  // namespace IOS
 
 #else
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h"
+#include "Core/IOS/USB/Bluetooth/BTStub.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTStub.cpp
similarity index 93%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.cpp
rename to Source/Core/Core/IOS/USB/Bluetooth/BTStub.cpp
index 074404e40e..1c9b20222f 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.cpp
+++ b/Source/Core/Core/IOS/USB/Bluetooth/BTStub.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h"
+#include "Core/IOS/USB/Bluetooth/BTStub.h"
 
 #include "Common/ChunkFile.h"
 #include "Common/MsgHandler.h"
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h b/Source/Core/Core/IOS/USB/Bluetooth/BTStub.h
similarity index 87%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h
rename to Source/Core/Core/IOS/USB/Bluetooth/BTStub.h
index e811b8eb0e..875d888f0d 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_stub.h
+++ b/Source/Core/Core/IOS/USB/Bluetooth/BTStub.h
@@ -7,8 +7,8 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/USB/Bluetooth/BTBase.h"
 
 class PointerWrap;
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
rename to Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
index 0b13fac48c..0735a41034 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
+++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
@@ -16,10 +16,10 @@
 #include "Core/Core.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/Host.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
-#include "Core/IPC_HLE/WiiMote_HID_Attr.h"
-#include "Core/IPC_HLE/l2cap.h"
+#include "Core/IOS/USB/Bluetooth/BTEmu.h"
+#include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
+#include "Core/IOS/USB/Bluetooth/WiimoteHIDAttr.h"
+#include "Core/IOS/USB/Bluetooth/l2cap.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.h
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h
rename to Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.h
index 66e5d46428..ac7a1abd4c 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h
+++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.h
@@ -10,7 +10,7 @@
 
 #include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
-#include "Core/IPC_HLE/hci.h"
+#include "Core/IOS/USB/Bluetooth/hci.h"
 
 class PointerWrap;
 
diff --git a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteHIDAttr.cpp
similarity index 98%
rename from Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp
rename to Source/Core/Core/IOS/USB/Bluetooth/WiimoteHIDAttr.cpp
index f210cda351..d97ab7db60 100644
--- a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp
+++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteHIDAttr.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/IPC_HLE/WiiMote_HID_Attr.h"
+#include "Core/IOS/USB/Bluetooth/WiimoteHIDAttr.h"
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 
diff --git a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteHIDAttr.h
similarity index 100%
rename from Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h
rename to Source/Core/Core/IOS/USB/Bluetooth/WiimoteHIDAttr.h
diff --git a/Source/Core/Core/IPC_HLE/hci.h b/Source/Core/Core/IOS/USB/Bluetooth/hci.h
similarity index 100%
rename from Source/Core/Core/IPC_HLE/hci.h
rename to Source/Core/Core/IOS/USB/Bluetooth/hci.h
diff --git a/Source/Core/Core/IPC_HLE/l2cap.h b/Source/Core/Core/IOS/USB/Bluetooth/l2cap.h
similarity index 100%
rename from Source/Core/Core/IPC_HLE/l2cap.h
rename to Source/Core/Core/IOS/USB/Bluetooth/l2cap.h
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp b/Source/Core/Core/IOS/USB/USB_HIDv4.cpp
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
rename to Source/Core/Core/IOS/USB/USB_HIDv4.cpp
index aa1f6206c3..11469d6eda 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
+++ b/Source/Core/Core/IOS/USB/USB_HIDv4.cpp
@@ -17,8 +17,8 @@
 #include "Core/CoreTiming.h"
 #include "Core/Debugger/Debugger_SymbolMap.h"
 #include "Core/HW/Memmap.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_hid.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/USB/USB_HIDv4.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h b/Source/Core/Core/IOS/USB/USB_HIDv4.h
similarity index 97%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h
rename to Source/Core/Core/IOS/USB/USB_HIDv4.h
index 3b74d7b55f..651773189d 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h
+++ b/Source/Core/Core/IOS/USB/USB_HIDv4.h
@@ -11,8 +11,8 @@
 #include <thread>
 
 #include "Common/CommonTypes.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
 
 // Forward declare things which we need from libusb header.
 // This prevents users of this file from indirectly pulling in libusb.
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp b/Source/Core/Core/IOS/USB/USB_KBD.cpp
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
rename to Source/Core/Core/IOS/USB/USB_KBD.cpp
index 69d377fb65..b45c84953b 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
+++ b/Source/Core/Core/IOS/USB/USB_KBD.cpp
@@ -11,7 +11,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"  // Local core functions
 #include "Core/HW/Memmap.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h"
+#include "Core/IOS/USB/USB_KBD.h"
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h b/Source/Core/Core/IOS/USB/USB_KBD.h
similarity index 93%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
rename to Source/Core/Core/IOS/USB/USB_KBD.h
index 76ad64a260..7a54a1e0e0 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
+++ b/Source/Core/Core/IOS/USB/USB_KBD.h
@@ -8,8 +8,8 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.cpp b/Source/Core/Core/IOS/USB/USB_VEN.cpp
similarity index 97%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.cpp
rename to Source/Core/Core/IOS/USB/USB_VEN.cpp
index ec41fa8c35..f4b59f9df7 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.cpp
+++ b/Source/Core/Core/IOS/USB/USB_VEN.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.h"
+#include "Core/IOS/USB/USB_VEN.h"
 #include "Common/Logging/Log.h"
 #include "Core/HW/Memmap.h"
 
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.h b/Source/Core/Core/IOS/USB/USB_VEN.h
similarity index 92%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.h
rename to Source/Core/Core/IOS/USB/USB_VEN.h
index e74554e328..3c67a4be37 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.h
+++ b/Source/Core/Core/IOS/USB/USB_VEN.h
@@ -7,8 +7,8 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_wfsi.cpp b/Source/Core/Core/IOS/WFS/WFSI.cpp
similarity index 98%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_wfsi.cpp
rename to Source/Core/Core/IOS/WFS/WFSI.cpp
index 22b563cf38..26ac69cb57 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_wfsi.cpp
+++ b/Source/Core/Core/IOS/WFS/WFSI.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_wfsi.h"
+#include "Core/IOS/WFS/WFSI.h"
 
 #include <mbedtls/aes.h>
 #include <stack>
@@ -14,8 +14,8 @@
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Core/HW/Memmap.h"
-#include "Core/IPC_HLE/ESFormats.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.h"
+#include "Core/IOS/ES/Formats.h"
+#include "Core/IOS/WFS/WFSSRV.h"
 #include "DiscIO/NANDContentLoader.h"
 
 namespace IOS
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_wfsi.h b/Source/Core/Core/IOS/WFS/WFSI.h
similarity index 92%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_wfsi.h
rename to Source/Core/Core/IOS/WFS/WFSI.h
index baf44d809f..11f0190bd0 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_wfsi.h
+++ b/Source/Core/Core/IOS/WFS/WFSI.h
@@ -10,9 +10,9 @@
 #include <mbedtls/aes.h>
 
 #include "Common/CommonTypes.h"
-#include "Core/IPC_HLE/ESFormats.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/ES/Formats.h"
+#include "Core/IOS/IPC.h"
 
 namespace IOS
 {
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.cpp b/Source/Core/Core/IOS/WFS/WFSSRV.cpp
similarity index 99%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.cpp
rename to Source/Core/Core/IOS/WFS/WFSSRV.cpp
index ab19a718d1..1e8dd64b52 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.cpp
+++ b/Source/Core/Core/IOS/WFS/WFSSRV.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.h"
+#include "Core/IOS/WFS/WFSSRV.h"
 
 #include <string>
 #include <vector>
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.h b/Source/Core/Core/IOS/WFS/WFSSRV.h
similarity index 95%
rename from Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.h
rename to Source/Core/Core/IOS/WFS/WFSSRV.h
index a26a8bf74a..a6096f969d 100644
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_wfssrv.h
+++ b/Source/Core/Core/IOS/WFS/WFSSRV.h
@@ -9,8 +9,8 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+#include "Core/IOS/Device.h"
+#include "Core/IOS/IPC.h"
 #include "DiscIO/Volume.h"
 
 namespace IOS
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
index b1338db740..da3da6dcd0 100644
--- a/Source/Core/Core/Movie.cpp
+++ b/Source/Core/Core/Movie.cpp
@@ -32,8 +32,8 @@
 #include "Core/HW/Wiimote.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 #include "Core/HW/WiimoteEmu/WiimoteHid.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+#include "Core/IOS/USB/Bluetooth/BTEmu.h"
+#include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
 #include "Core/Movie.h"
 #include "Core/NetPlayProto.h"
 #include "Core/PowerPC/PowerPC.h"
diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
index a9697ac058..0f3902910a 100644
--- a/Source/Core/Core/NetPlayClient.cpp
+++ b/Source/Core/Core/NetPlayClient.cpp
@@ -22,7 +22,7 @@
 #include "Core/HW/Sram.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h"
+#include "Core/IOS/USB/Bluetooth/BTEmu.h"
 #include "Core/Movie.h"
 #include "InputCommon/GCAdapter.h"
 #include "VideoCommon/OnScreenDisplay.h"
diff --git a/Source/Core/DolphinWX/Config/WiiConfigPane.cpp b/Source/Core/DolphinWX/Config/WiiConfigPane.cpp
index 168e29a1c7..93beb2b73e 100644
--- a/Source/Core/DolphinWX/Config/WiiConfigPane.cpp
+++ b/Source/Core/DolphinWX/Config/WiiConfigPane.cpp
@@ -13,7 +13,7 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IOS/IPC.h"
 #include "DolphinWX/DolphinSlider.h"
 #include "DolphinWX/WxEventUtils.h"
 #include "DolphinWX/WxUtils.h"
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
index 2c0a8646bd..366e12cad4 100644
--- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp
+++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
@@ -27,8 +27,8 @@
 #include "Core/HW/Wiimote.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/HotkeyManager.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/USB/Bluetooth/BTReal.h"
 #include "Core/NetPlayProto.h"
 #include "DolphinWX/Config/GCAdapterConfigDiag.h"
 #include "DolphinWX/ControllerConfigDiag.h"
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index cd334b54d2..4ea3c3901d 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -46,8 +46,8 @@
 #include "Core/HW/GCPad.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/HotkeyManager.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/USB/Bluetooth/BTBase.h"
 #include "Core/Movie.h"
 #include "Core/State.h"
 
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index 243f217690..7c57776b74 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -42,10 +42,10 @@
 #include "Core/HW/Wiimote.h"
 #include "Core/Host.h"
 #include "Core/HotkeyManager.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/STM/STM.h"
+#include "Core/IOS/USB/Bluetooth/BTEmu.h"
+#include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
 #include "Core/Movie.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
 #include "Core/PowerPC/PowerPC.h"
diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp
index e60b246605..eb957997a5 100644
--- a/Source/Core/DolphinWX/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/MainNoGUI.cpp
@@ -23,10 +23,10 @@
 #include "Core/Core.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/Host.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+#include "Core/IOS/IPC.h"
+#include "Core/IOS/STM/STM.h"
+#include "Core/IOS/USB/Bluetooth/BTEmu.h"
+#include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
 #include "Core/State.h"
 
 #include "UICommon/UICommon.h"