diff --git a/iop/Makefile b/iop/Makefile
index ed041bdf368..736dc0a888c 100644
--- a/iop/Makefile
+++ b/iop/Makefile
@@ -16,6 +16,7 @@ SUBDIRS = \
 	fs \
 	hdd \
 	iLink \
+	input \
 	kernel \
 	memorycard \
 	network \
diff --git a/iop/input/Makefile b/iop/input/Makefile
new file mode 100644
index 00000000000..ac7b35a74be
--- /dev/null
+++ b/iop/input/Makefile
@@ -0,0 +1,18 @@
+# _____     ___ ____     ___ ____
+#  ____|   |    ____|   |        | |____|
+# |     ___|   |____ ___|    ____| |    \    PS2DEV Open Source Project.
+#-----------------------------------------------------------------------
+# Copyright 2001-2004, ps2dev - http://www.ps2dev.org
+# Licenced under Academic Free License version 2.0
+# Review ps2sdk README & LICENSE files for further details.
+
+SUBDIRS = \
+    padman \
+    padman-1300 \
+    padman-1400 \
+    rmman \
+    rmman2 \
+    rmmanx
+
+include $(PS2SDKSRC)/Defs.make
+include $(PS2SDKSRC)/Rules.make
diff --git a/iop/system/padman-old/Makefile b/iop/input/padman-1300/Makefile
similarity index 72%
rename from iop/system/padman-old/Makefile
rename to iop/input/padman-1300/Makefile
index 4a3957351f9..daa221b7fbe 100644
--- a/iop/system/padman-old/Makefile
+++ b/iop/input/padman-1300/Makefile
@@ -6,12 +6,12 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
-IOP_BIN_ALTNAMES =
+IOP_BIN_ALTNAMES = padman-old.irx
 
-IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/padman/src/
+IOP_SRC_DIR = $(PS2SDKSRC)/iop/input/padman/src/
 
-IOP_BIN ?= padman-old.irx
+IOP_BIN ?= padman-1300.irx
 
 PADMAN_BUILDING_XPADMAN ?= 0
 
-include $(PS2SDKSRC)/iop/system/padman/Makefile
+include $(PS2SDKSRC)/iop/input/padman/Makefile
diff --git a/iop/system/rpadman/Makefile b/iop/input/padman-1400/Makefile
similarity index 72%
rename from iop/system/rpadman/Makefile
rename to iop/input/padman-1400/Makefile
index 1ef3bc22d58..89fcec5d32d 100644
--- a/iop/system/rpadman/Makefile
+++ b/iop/input/padman-1400/Makefile
@@ -8,10 +8,10 @@
 
 IOP_BIN_ALTNAMES =
 
-IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/padman/src/
+IOP_SRC_DIR = $(PS2SDKSRC)/iop/input/padman/src/
 
-IOP_BIN ?= rpadman.irx
+IOP_BIN ?= padman-1400.irx
 
-PADMAN_BUILDING_XPADMAN_V2 ?= 1
+PADMAN_BUILDING_XPADMAN_V2 ?= 0
 
-include $(PS2SDKSRC)/iop/system/padman/Makefile
+include $(PS2SDKSRC)/iop/input/padman/Makefile
diff --git a/iop/system/padman/Makefile b/iop/input/padman/Makefile
similarity index 91%
rename from iop/system/padman/Makefile
rename to iop/input/padman/Makefile
index 04ad2183549..5e842228ad1 100644
--- a/iop/system/padman/Makefile
+++ b/iop/input/padman/Makefile
@@ -6,16 +6,16 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
-IOP_BIN_ALTNAMES ?= freepad.irx
+IOP_BIN_ALTNAMES ?= freepad.irx rpadman.irx padman-2000.irx
 
 # IOP_CFLAGS += -DDEBUG
 
 IOP_IMPORT_INCS += \
+	sio/sio2man \
 	system/intrman \
 	system/loadcore \
 	system/sifcmd \
 	system/sifman \
-	system/sio2man \
 	system/stdio \
 	system/sysclib \
 	system/sysmem \
@@ -28,7 +28,7 @@ IOP_OBJS = freepad.o rpcserver.o exports.o imports.o padInit.o padPortOpen.o pad
 PADMAN_BUILDING_XPADMAN ?= 1
 
 # Build the newer version of the gamepad module that links against the remote-compatible SIO2MAN?
-PADMAN_BUILDING_XPADMAN_V2 ?= 0
+PADMAN_BUILDING_XPADMAN_V2 ?= 1
 
 ifneq (x$(PADMAN_BUILDING_XPADMAN),x0)
 IOP_CFLAGS += -DBUILDING_XPADMAN
diff --git a/iop/system/padman/README b/iop/input/padman/README
similarity index 100%
rename from iop/system/padman/README
rename to iop/input/padman/README
diff --git a/iop/system/padman/include/xpadman.h b/iop/input/padman/include/xpadman.h
similarity index 100%
rename from iop/system/padman/include/xpadman.h
rename to iop/input/padman/include/xpadman.h
diff --git a/iop/system/padman/src/exports.tab b/iop/input/padman/src/exports.tab
similarity index 100%
rename from iop/system/padman/src/exports.tab
rename to iop/input/padman/src/exports.tab
diff --git a/iop/system/padman/src/freepad.c b/iop/input/padman/src/freepad.c
similarity index 100%
rename from iop/system/padman/src/freepad.c
rename to iop/input/padman/src/freepad.c
diff --git a/iop/system/padman/src/freepad.h b/iop/input/padman/src/freepad.h
similarity index 100%
rename from iop/system/padman/src/freepad.h
rename to iop/input/padman/src/freepad.h
diff --git a/iop/system/padman/src/imports.lst b/iop/input/padman/src/imports.lst
similarity index 100%
rename from iop/system/padman/src/imports.lst
rename to iop/input/padman/src/imports.lst
diff --git a/iop/system/padman/src/irx_imports.h b/iop/input/padman/src/irx_imports.h
similarity index 100%
rename from iop/system/padman/src/irx_imports.h
rename to iop/input/padman/src/irx_imports.h
diff --git a/iop/system/padman/src/padCmds.c b/iop/input/padman/src/padCmds.c
similarity index 100%
rename from iop/system/padman/src/padCmds.c
rename to iop/input/padman/src/padCmds.c
diff --git a/iop/system/padman/src/padCmds.h b/iop/input/padman/src/padCmds.h
similarity index 100%
rename from iop/system/padman/src/padCmds.h
rename to iop/input/padman/src/padCmds.h
diff --git a/iop/system/padman/src/padData.c b/iop/input/padman/src/padData.c
similarity index 100%
rename from iop/system/padman/src/padData.c
rename to iop/input/padman/src/padData.c
diff --git a/iop/system/padman/src/padData.h b/iop/input/padman/src/padData.h
similarity index 100%
rename from iop/system/padman/src/padData.h
rename to iop/input/padman/src/padData.h
diff --git a/iop/system/padman/src/padInit.c b/iop/input/padman/src/padInit.c
similarity index 100%
rename from iop/system/padman/src/padInit.c
rename to iop/input/padman/src/padInit.c
diff --git a/iop/system/padman/src/padMiscFuncs.c b/iop/input/padman/src/padMiscFuncs.c
similarity index 100%
rename from iop/system/padman/src/padMiscFuncs.c
rename to iop/input/padman/src/padMiscFuncs.c
diff --git a/iop/system/padman/src/padPortOpen.c b/iop/input/padman/src/padPortOpen.c
similarity index 100%
rename from iop/system/padman/src/padPortOpen.c
rename to iop/input/padman/src/padPortOpen.c
diff --git a/iop/system/padman/src/rpcserver.c b/iop/input/padman/src/rpcserver.c
similarity index 100%
rename from iop/system/padman/src/rpcserver.c
rename to iop/input/padman/src/rpcserver.c
diff --git a/iop/system/padman/src/rpcserver.h b/iop/input/padman/src/rpcserver.h
similarity index 100%
rename from iop/system/padman/src/rpcserver.h
rename to iop/input/padman/src/rpcserver.h
diff --git a/iop/system/padman/src/sio2Cmds.c b/iop/input/padman/src/sio2Cmds.c
similarity index 100%
rename from iop/system/padman/src/sio2Cmds.c
rename to iop/input/padman/src/sio2Cmds.c
diff --git a/iop/system/padman/src/sio2Cmds.h b/iop/input/padman/src/sio2Cmds.h
similarity index 100%
rename from iop/system/padman/src/sio2Cmds.h
rename to iop/input/padman/src/sio2Cmds.h
diff --git a/iop/system/rmman/Makefile b/iop/input/rmman/Makefile
similarity index 95%
rename from iop/system/rmman/Makefile
rename to iop/input/rmman/Makefile
index 78e2170889e..f024e50242b 100644
--- a/iop/system/rmman/Makefile
+++ b/iop/input/rmman/Makefile
@@ -6,14 +6,16 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+IOP_BIN_ALTNAMES ?= rmman-2000.irx
+
 IOP_IMPORT_INCS += \
 	cdvd/cdvdman \
+	sio/sio2man \
 	system/intrman \
 	system/iomanx \
 	system/loadcore \
 	system/sifcmd \
 	system/sifman \
-	system/sio2man \
 	system/stdio \
 	system/threadman \
 	system/vblank
diff --git a/iop/system/rmman/README b/iop/input/rmman/README
similarity index 100%
rename from iop/system/rmman/README
rename to iop/input/rmman/README
diff --git a/iop/system/rmman/include/rmman.h b/iop/input/rmman/include/rmman.h
similarity index 100%
rename from iop/system/rmman/include/rmman.h
rename to iop/input/rmman/include/rmman.h
diff --git a/iop/system/rmman/src/exports.tab b/iop/input/rmman/src/exports.tab
similarity index 100%
rename from iop/system/rmman/src/exports.tab
rename to iop/input/rmman/src/exports.tab
diff --git a/iop/system/rmman/src/imports.lst b/iop/input/rmman/src/imports.lst
similarity index 100%
rename from iop/system/rmman/src/imports.lst
rename to iop/input/rmman/src/imports.lst
diff --git a/iop/system/rmman/src/irx_imports.h b/iop/input/rmman/src/irx_imports.h
similarity index 100%
rename from iop/system/rmman/src/irx_imports.h
rename to iop/input/rmman/src/irx_imports.h
diff --git a/iop/system/rmman/src/rmman.c b/iop/input/rmman/src/rmman.c
similarity index 100%
rename from iop/system/rmman/src/rmman.c
rename to iop/input/rmman/src/rmman.c
diff --git a/iop/system/rmman2/Makefile b/iop/input/rmman2/Makefile
similarity index 75%
rename from iop/system/rmman2/Makefile
rename to iop/input/rmman2/Makefile
index 3292da8e989..57555501acd 100644
--- a/iop/system/rmman2/Makefile
+++ b/iop/input/rmman2/Makefile
@@ -8,11 +8,11 @@
 
 IOP_BIN_ALTNAMES =
 
-IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/rmman/src/
-IOP_INC_DIR = $(PS2SDKSRC)/iop/system/rmman/include/
+IOP_SRC_DIR = $(PS2SDKSRC)/iop/input/rmman/src/
+IOP_INC_DIR = $(PS2SDKSRC)/iop/input/rmman/include/
 
 IOP_BIN ?= rmman2.irx
 
 RMMAN_BUILDING_RMMAN2 ?= 1
 
-include $(PS2SDKSRC)/iop/system/rmman/Makefile
+include $(PS2SDKSRC)/iop/input/rmman/Makefile
diff --git a/iop/system/rmmanx/Makefile b/iop/input/rmmanx/Makefile
similarity index 76%
rename from iop/system/rmmanx/Makefile
rename to iop/input/rmmanx/Makefile
index 68a9d5fde37..68e6393c904 100644
--- a/iop/system/rmmanx/Makefile
+++ b/iop/input/rmmanx/Makefile
@@ -8,12 +8,12 @@
 
 IOP_BIN_ALTNAMES =
 
-IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/rmman/src/
-IOP_INC_DIR = $(PS2SDKSRC)/iop/system/rmman/include/
+IOP_SRC_DIR = $(PS2SDKSRC)/iop/input/rmman/src/
+IOP_INC_DIR = $(PS2SDKSRC)/iop/input/rmman/include/
 
 IOP_BIN ?= rmmanx.irx
 
 RMMAN_BUILDING_RMMAN2 ?= 1
 RMMAN_BUILDING_RMMANX ?= 1
 
-include $(PS2SDKSRC)/iop/system/rmman/Makefile
+include $(PS2SDKSRC)/iop/input/rmman/Makefile
diff --git a/iop/memorycard/Makefile b/iop/memorycard/Makefile
index 8edefcb0dd7..6a481b80ebe 100644
--- a/iop/memorycard/Makefile
+++ b/iop/memorycard/Makefile
@@ -9,9 +9,10 @@
 SUBDIRS = \
 	dongleman \
 	mcman \
-	mcman-old \
+	mcman-1300 \
+	mcman-1400 \
 	mcserv \
-	mcserv-old \
+	mcserv-1300 \
 	vmcman \
 	xfromman
 
diff --git a/iop/memorycard/dongleman/Makefile b/iop/memorycard/dongleman/Makefile
index 63b2f18e53d..3980f6ad5b2 100644
--- a/iop/memorycard/dongleman/Makefile
+++ b/iop/memorycard/dongleman/Makefile
@@ -6,6 +6,8 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+IOP_BIN_ALTNAMES = 
+
 PARENT_DIR=$(PS2SDKSRC)/iop/memorycard/mcman
 
 IOP_SRC_DIR = $(PARENT_DIR)/src/
diff --git a/iop/memorycard/mcman-old/Makefile b/iop/memorycard/mcman-1300/Makefile
similarity index 90%
rename from iop/memorycard/mcman-old/Makefile
rename to iop/memorycard/mcman-1300/Makefile
index f3385581b9c..5ec60d1f758 100644
--- a/iop/memorycard/mcman-old/Makefile
+++ b/iop/memorycard/mcman-1300/Makefile
@@ -6,10 +6,12 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+IOP_BIN_ALTNAMES = mcman-old.irx
+
 IOP_SRC_DIR = $(PS2SDKSRC)/iop/memorycard/mcman/src/
 IOP_INC_DIR = $(PS2SDKSRC)/iop/memorycard/mcman/include/
 
-IOP_BIN ?= mcman-old.irx
+IOP_BIN ?= mcman-1300.irx
 
 MCMAN_BUILDING_XMCMAN ?= 0
 
diff --git a/iop/memorycard/mcman-1400/Makefile b/iop/memorycard/mcman-1400/Makefile
new file mode 100644
index 00000000000..006af8cb1bf
--- /dev/null
+++ b/iop/memorycard/mcman-1400/Makefile
@@ -0,0 +1,18 @@
+# _____     ___ ____     ___ ____
+#  ____|   |    ____|   |        | |____|
+# |     ___|   |____ ___|    ____| |    \    PS2DEV Open Source Project.
+#-----------------------------------------------------------------------
+# Copyright 2001-2004, ps2dev - http://www.ps2dev.org
+# Licenced under Academic Free License version 2.0
+# Review ps2sdk README & LICENSE files for further details.
+
+IOP_BIN_ALTNAMES = 
+
+IOP_SRC_DIR = $(PS2SDKSRC)/iop/memorycard/mcman/src/
+IOP_INC_DIR = $(PS2SDKSRC)/iop/memorycard/mcman/include/
+
+IOP_BIN ?= mcman-1400.irx
+
+MCMAN_BUILDING_XMCMAN_V2 ?= 0
+
+include $(PS2SDKSRC)/iop/memorycard/mcman/Makefile
diff --git a/iop/memorycard/mcman/Makefile b/iop/memorycard/mcman/Makefile
index 826b310566f..fe4d5448915 100644
--- a/iop/memorycard/mcman/Makefile
+++ b/iop/memorycard/mcman/Makefile
@@ -6,9 +6,14 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+IOP_BIN_ALTNAMES ?= mcman-2000.irx
+
 # Build the newer version of the memory card module?
 MCMAN_BUILDING_XMCMAN ?= 1
 
+# Build the newer version of the memory card module that links against the remote-compatible SIO2MAN?
+MCMAN_BUILDING_XMCMAN_V2 ?= 1
+
 # Read from the dev9 external flash ROM instead of the memory card?
 MCMAN_BUILDING_XFROMMAN ?= 0
 
@@ -24,12 +29,12 @@ IOP_IMPORT_INCS += \
     cdvd/cdvdman \
     debug/sior \
     security/secrman \
+    sio/sio2man \
     system/intrman \
     system/ioman \
     system/iomanx \
     system/loadcore \
     system/modload \
-    system/sio2man \
     system/stdio \
     system/sysclib \
     system/threadman \
@@ -49,6 +54,10 @@ ifneq (x$(MCMAN_BUILDING_XMCMAN),x0)
 IOP_CFLAGS += -DBUILDING_XMCMAN
 endif
 
+ifneq (x$(MCMAN_BUILDING_XMCMAN_V2),x0)
+IOP_CFLAGS += -DSIO2MAN_V2
+endif
+
 ifneq (x$(MCMAN_BUILDING_XFROMMAN),x0)
 IOP_CFLAGS += -DBUILDING_XFROMMAN
 IOP_IMPORT_INCS += dev9/extflash
diff --git a/iop/memorycard/mcserv-old/Makefile b/iop/memorycard/mcserv-1300/Makefile
similarity index 90%
rename from iop/memorycard/mcserv-old/Makefile
rename to iop/memorycard/mcserv-1300/Makefile
index 5be866bd1bf..60fa0f41926 100644
--- a/iop/memorycard/mcserv-old/Makefile
+++ b/iop/memorycard/mcserv-1300/Makefile
@@ -6,10 +6,12 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+IOP_BIN_ALTNAMES = mcserv-old.irx
+
 IOP_SRC_DIR = $(PS2SDKSRC)/iop/memorycard/mcserv/src/
 IOP_INC_DIR = $(PS2SDKSRC)/iop/memorycard/mcserv/include/
 
-IOP_BIN ?= mcserv-old.irx
+IOP_BIN ?= mcserv-1300.irx
 
 MCMAN_BUILDING_XMCSERV ?= 0
 
diff --git a/iop/memorycard/mcserv/Makefile b/iop/memorycard/mcserv/Makefile
index 928f57ebbd8..026c09587ff 100644
--- a/iop/memorycard/mcserv/Makefile
+++ b/iop/memorycard/mcserv/Makefile
@@ -6,6 +6,8 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+IOP_BIN_ALTNAMES ?= mcserv-1400.irx mcserv-2000.irx
+
 # Build the newer version of the memory card server module?
 MCMAN_BUILDING_XMCSERV ?= 1
 
diff --git a/iop/security/secrman/Makefile b/iop/security/secrman/Makefile
index a2812bcd8f1..383fbb0777a 100644
--- a/iop/security/secrman/Makefile
+++ b/iop/security/secrman/Makefile
@@ -11,10 +11,10 @@ DEX_SUPPORT ?= 1
 
 IOP_IMPORT_INCS += \
 	cdvd/cdvdman \
+	sio/sio2man \
 	system/ioman \
 	system/loadcore \
 	system/modload \
-	system/sio2man \
 	system/stdio \
 	system/sysclib
 
diff --git a/iop/security/secrsif/Makefile b/iop/security/secrsif/Makefile
index b153d1749dc..31216fc98c2 100644
--- a/iop/security/secrsif/Makefile
+++ b/iop/security/secrsif/Makefile
@@ -8,10 +8,10 @@
 
 IOP_IMPORT_INCS += \
 	security/secrman \
+	sio/sio2man \
 	system/loadcore \
 	system/sifcmd \
 	system/sifman \
-	system/sio2man \
 	system/stdio \
 	system/sysclib \
 	system/threadman
diff --git a/iop/sio/Makefile b/iop/sio/Makefile
index 5cbec08cef1..ae5d439ee8b 100644
--- a/iop/sio/Makefile
+++ b/iop/sio/Makefile
@@ -6,7 +6,14 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
-SUBDIRS = mx4sio_bd mx4sio_bd_mini
+SUBDIRS = \
+    mtapman \
+    mtapman-1400 \
+    mx4sio_bd \
+    mx4sio_bd_mini \
+    sio2log \
+    sio2man \
+    sio2man-nano
 
 include $(PS2SDKSRC)/Defs.make
 include $(PS2SDKSRC)/Rules.make
diff --git a/iop/system/rmtapman/Makefile b/iop/sio/mtapman-1400/Makefile
similarity index 72%
rename from iop/system/rmtapman/Makefile
rename to iop/sio/mtapman-1400/Makefile
index ca6c1fd9442..113dd9346f9 100644
--- a/iop/system/rmtapman/Makefile
+++ b/iop/sio/mtapman-1400/Makefile
@@ -8,8 +8,10 @@
 
 IOP_BIN_ALTNAMES = 
 
-IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/mtapman/src/
+IOP_SRC_DIR = $(PS2SDKSRC)/iop/sio/mtapman/src/
 
-IOP_CFLAGS += -DSIO2MAN_V2
+IOP_BIN ?= mtapman-1400.irx
 
-include $(PS2SDKSRC)/iop/system/mtapman/Makefile
+MTAPMAN_BUILDING_XMTAPMAN_V2 ?= 0
+
+include $(PS2SDKSRC)/iop/sio/mtapman/Makefile
diff --git a/iop/system/mtapman/Makefile b/iop/sio/mtapman/Makefile
similarity index 70%
rename from iop/system/mtapman/Makefile
rename to iop/sio/mtapman/Makefile
index bbc79c1fe10..cd3cbb9a7c1 100644
--- a/iop/system/mtapman/Makefile
+++ b/iop/sio/mtapman/Makefile
@@ -6,18 +6,25 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
-IOP_BIN_ALTNAMES ?= freemtap.irx
+IOP_BIN_ALTNAMES ?= freemtap.irx rmtapman.irx mtapman-2000.irx
 
 IOP_IMPORT_INCS += \
+	sio/sio2man \
 	system/loadcore \
 	system/sifcmd \
 	system/sifman \
-	system/sio2man \
 	system/stdio \
 	system/threadman
 
 IOP_OBJS = freemtap.o rpcservers.o exports.o imports.o
 
+# Build the newer version of the multitap module that links against the remote-compatible SIO2MAN?
+MTAPMAN_BUILDING_XMTAPMAN_V2 ?= 1
+
+ifneq (x$(MTAPMAN_BUILDING_XMTAPMAN_V2),x0)
+IOP_CFLAGS += -DSIO2MAN_V2
+endif
+
 include $(PS2SDKSRC)/Defs.make
 include $(PS2SDKSRC)/iop/Rules.bin.make
 include $(PS2SDKSRC)/iop/Rules.make
diff --git a/iop/system/mtapman/README b/iop/sio/mtapman/README
similarity index 100%
rename from iop/system/mtapman/README
rename to iop/sio/mtapman/README
diff --git a/iop/system/mtapman/include/xmtapman.h b/iop/sio/mtapman/include/xmtapman.h
similarity index 100%
rename from iop/system/mtapman/include/xmtapman.h
rename to iop/sio/mtapman/include/xmtapman.h
diff --git a/iop/system/mtapman/src/exports.tab b/iop/sio/mtapman/src/exports.tab
similarity index 100%
rename from iop/system/mtapman/src/exports.tab
rename to iop/sio/mtapman/src/exports.tab
diff --git a/iop/system/mtapman/src/freemtap.c b/iop/sio/mtapman/src/freemtap.c
similarity index 100%
rename from iop/system/mtapman/src/freemtap.c
rename to iop/sio/mtapman/src/freemtap.c
diff --git a/iop/system/mtapman/src/freemtap.h b/iop/sio/mtapman/src/freemtap.h
similarity index 100%
rename from iop/system/mtapman/src/freemtap.h
rename to iop/sio/mtapman/src/freemtap.h
diff --git a/iop/system/mtapman/src/imports.lst b/iop/sio/mtapman/src/imports.lst
similarity index 100%
rename from iop/system/mtapman/src/imports.lst
rename to iop/sio/mtapman/src/imports.lst
diff --git a/iop/system/mtapman/src/irx_imports.h b/iop/sio/mtapman/src/irx_imports.h
similarity index 100%
rename from iop/system/mtapman/src/irx_imports.h
rename to iop/sio/mtapman/src/irx_imports.h
diff --git a/iop/system/mtapman/src/rpcservers.c b/iop/sio/mtapman/src/rpcservers.c
similarity index 100%
rename from iop/system/mtapman/src/rpcservers.c
rename to iop/sio/mtapman/src/rpcservers.c
diff --git a/iop/sio/mx4sio_bd/Makefile b/iop/sio/mx4sio_bd/Makefile
index 6f9aa493b2d..8a232a6aab1 100644
--- a/iop/sio/mx4sio_bd/Makefile
+++ b/iop/sio/mx4sio_bd/Makefile
@@ -8,10 +8,10 @@
 
 IOP_IMPORT_INCS += \
 	fs/bdm \
+	sio/sio2man \
 	system/dmacman \
 	system/intrman \
 	system/loadcore \
-	system/sio2man \
 	system/stdio \
 	system/sysclib \
 	system/threadman
diff --git a/iop/system/sio2log/Makefile b/iop/sio/sio2log/Makefile
similarity index 74%
rename from iop/system/sio2log/Makefile
rename to iop/sio/sio2log/Makefile
index c8370805eac..1e9580826b7 100644
--- a/iop/system/sio2log/Makefile
+++ b/iop/sio/sio2log/Makefile
@@ -8,11 +8,11 @@
 
 IOP_BIN_ALTNAMES =
 
-IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/sio2man/src/
-IOP_INC_DIR = $(PS2SDKSRC)/iop/system/sio2man/include/
+IOP_SRC_DIR = $(PS2SDKSRC)/iop/sio/sio2man/src/
+IOP_INC_DIR = $(PS2SDKSRC)/iop/sio/sio2man/include/
 
 IOP_BIN ?= sio2log.irx
 
 SIO2MAN_ENABLE_LOGGING ?= 1
 
-include $(PS2SDKSRC)/iop/system/sio2man/Makefile
+include $(PS2SDKSRC)/iop/sio/sio2man/Makefile
diff --git a/iop/system/sio2man-nano/Makefile b/iop/sio/sio2man-nano/Makefile
similarity index 74%
rename from iop/system/sio2man-nano/Makefile
rename to iop/sio/sio2man-nano/Makefile
index d904feeb5dd..a76794d8356 100644
--- a/iop/system/sio2man-nano/Makefile
+++ b/iop/sio/sio2man-nano/Makefile
@@ -8,11 +8,11 @@
 
 IOP_BIN_ALTNAMES =
 
-IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/sio2man/src/
-IOP_INC_DIR = $(PS2SDKSRC)/iop/system/sio2man/include/
+IOP_SRC_DIR = $(PS2SDKSRC)/iop/sio/sio2man/src/
+IOP_INC_DIR = $(PS2SDKSRC)/iop/sio/sio2man/include/
 
 IOP_BIN ?= sio2man-nano.irx
 
 SIO2MAN_ENABLE_NANO ?= 1
 
-include $(PS2SDKSRC)/iop/system/sio2man/Makefile
+include $(PS2SDKSRC)/iop/sio/sio2man/Makefile
diff --git a/iop/system/sio2man/Makefile b/iop/sio/sio2man/Makefile
similarity index 87%
rename from iop/system/sio2man/Makefile
rename to iop/sio/sio2man/Makefile
index 554933aba11..c303029f46b 100644
--- a/iop/system/sio2man/Makefile
+++ b/iop/sio/sio2man/Makefile
@@ -12,14 +12,14 @@ SIO2MAN_ENABLE_LOGGING ?= 0
 # Build nano version?
 SIO2MAN_ENABLE_NANO ?= 0
 
-IOP_BIN_ALTNAMES ?= freesio2.irx rsio2man.irx sio2man-old.irx
+IOP_BIN_ALTNAMES ?= freesio2.irx rsio2man.irx sio2man-old.irx sio2man-1300.irx sio2man-1400.irx sio2man-2000.irx
 
 IOP_IMPORT_INCS += \
+	sio/sio2man \
 	system/dmacman \
 	system/intrman \
 	system/ioman \
 	system/loadcore \
-	system/sio2man \
 	system/stdio \
 	system/threadman
 
diff --git a/iop/system/sio2man/README.md b/iop/sio/sio2man/README.md
similarity index 100%
rename from iop/system/sio2man/README.md
rename to iop/sio/sio2man/README.md
diff --git a/iop/system/sio2man/include/log.h b/iop/sio/sio2man/include/log.h
similarity index 100%
rename from iop/system/sio2man/include/log.h
rename to iop/sio/sio2man/include/log.h
diff --git a/iop/system/sio2man/include/rsio2man.h b/iop/sio/sio2man/include/rsio2man.h
similarity index 100%
rename from iop/system/sio2man/include/rsio2man.h
rename to iop/sio/sio2man/include/rsio2man.h
diff --git a/iop/system/sio2man/include/sio2man.h b/iop/sio/sio2man/include/sio2man.h
similarity index 100%
rename from iop/system/sio2man/include/sio2man.h
rename to iop/sio/sio2man/include/sio2man.h
diff --git a/iop/system/sio2man/include/xsio2man.h b/iop/sio/sio2man/include/xsio2man.h
similarity index 100%
rename from iop/system/sio2man/include/xsio2man.h
rename to iop/sio/sio2man/include/xsio2man.h
diff --git a/iop/system/sio2man/src/exports.tab b/iop/sio/sio2man/src/exports.tab
similarity index 100%
rename from iop/system/sio2man/src/exports.tab
rename to iop/sio/sio2man/src/exports.tab
diff --git a/iop/system/sio2man/src/imports.lst b/iop/sio/sio2man/src/imports.lst
similarity index 100%
rename from iop/system/sio2man/src/imports.lst
rename to iop/sio/sio2man/src/imports.lst
diff --git a/iop/system/sio2man/src/irx_imports.h b/iop/sio/sio2man/src/irx_imports.h
similarity index 100%
rename from iop/system/sio2man/src/irx_imports.h
rename to iop/sio/sio2man/src/irx_imports.h
diff --git a/iop/system/sio2man/src/log.c b/iop/sio/sio2man/src/log.c
similarity index 100%
rename from iop/system/sio2man/src/log.c
rename to iop/sio/sio2man/src/log.c
diff --git a/iop/system/sio2man/src/sio2man.c b/iop/sio/sio2man/src/sio2man.c
similarity index 100%
rename from iop/system/sio2man/src/sio2man.c
rename to iop/sio/sio2man/src/sio2man.c
diff --git a/iop/system/Makefile b/iop/system/Makefile
index bb6527afadf..2e95d6bc05e 100644
--- a/iop/system/Makefile
+++ b/iop/system/Makefile
@@ -25,23 +25,12 @@ SUBDIRS = \
 	loadcore \
 	loadfile \
 	modload \
-	mtapman \
-	padman \
-	padman-old \
 	reboot \
-	rmman \
-	rmman2 \
-	rmmanx \
-	rmtapman \
-	rpadman \
 	sbusintr \
 	sifcmd \
 	sifinit \
 	sifman \
 	siftoo \
-	sio2log \
-	sio2man \
-	sio2man-nano \
 	ssbusc \
 	stdio \
 	sysclib \
diff --git a/iop/system/rmtapman/README b/iop/system/rmtapman/README
deleted file mode 100644
index d68db901dde..00000000000
--- a/iop/system/rmtapman/README
+++ /dev/null
@@ -1 +0,0 @@
-Special build to support the newer SIO2MAN module, to support RMMAN.
diff --git a/iop/system/rpadman/README b/iop/system/rpadman/README
deleted file mode 100644
index d68db901dde..00000000000
--- a/iop/system/rpadman/README
+++ /dev/null
@@ -1 +0,0 @@
-Special build to support the newer SIO2MAN module, to support RMMAN.