diff --git a/src/main/ezusb-emu/Module.mk b/src/main/ezusb-emu/Module.mk
index 8fc6a0d..ea396ff 100644
--- a/src/main/ezusb-emu/Module.mk
+++ b/src/main/ezusb-emu/Module.mk
@@ -6,4 +6,12 @@ libs_ezusb-emu      := \
 src_ezusb-emu     := \
     desc.c \
     device.c \
-    util.c
+    util.c \
+    node-coin.c \
+    node-eeprom.c \
+    node-none.c \
+    node-security-mem.c \
+    node-security-plug.c \
+    node-sram.c \
+    node-wdt.c \
+    nodes.c
diff --git a/src/main/ezusb-iidx-emu/node-coin.c b/src/main/ezusb-emu/node-coin.c
similarity index 92%
rename from src/main/ezusb-iidx-emu/node-coin.c
rename to src/main/ezusb-emu/node-coin.c
index b6c1fcc..87e7503 100644
--- a/src/main/ezusb-iidx-emu/node-coin.c
+++ b/src/main/ezusb-emu/node-coin.c
@@ -1,6 +1,6 @@
-#define LOG_MODULE "ezusb-iidx-emu-node-coin"
+#define LOG_MODULE "ezusb-emu-node-coin"
 
-#include "ezusb-iidx-emu/node-coin.h"
+#include "ezusb-emu/node-coin.h"
 
 #include "ezusb-iidx/coin-cmd.h"
 
diff --git a/src/main/ezusb-iidx-emu/node-coin.h b/src/main/ezusb-emu/node-coin.h
similarity index 91%
rename from src/main/ezusb-iidx-emu/node-coin.h
rename to src/main/ezusb-emu/node-coin.h
index 126dbcc..ff6837c 100644
--- a/src/main/ezusb-iidx-emu/node-coin.h
+++ b/src/main/ezusb-emu/node-coin.h
@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_COIN_H
 #define EZUSB_IIDX_EMU_NODE_COIN_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 uint8_t ezusb_iidx_emu_node_coin_process_cmd(
     uint8_t cmd_id, uint8_t cmd_data, uint8_t cmd_data2);
diff --git a/src/main/ezusb-iidx-emu/node-eeprom.c b/src/main/ezusb-emu/node-eeprom.c
similarity index 97%
rename from src/main/ezusb-iidx-emu/node-eeprom.c
rename to src/main/ezusb-emu/node-eeprom.c
index 3754dea..ea6a3fe 100644
--- a/src/main/ezusb-iidx-emu/node-eeprom.c
+++ b/src/main/ezusb-emu/node-eeprom.c
@@ -1,8 +1,8 @@
-#define LOG_MODULE "ezusb-iidx-emu-node-eeprom"
+#define LOG_MODULE "ezusb-emu-node-eeprom"
 
 #include <string.h>
 
-#include "ezusb-iidx-emu/node-eeprom.h"
+#include "ezusb-emu/node-eeprom.h"
 
 #include "ezusb-iidx/eeprom-cmd.h"
 
diff --git a/src/main/ezusb-iidx-emu/node-eeprom.h b/src/main/ezusb-emu/node-eeprom.h
similarity index 95%
rename from src/main/ezusb-iidx-emu/node-eeprom.h
rename to src/main/ezusb-emu/node-eeprom.h
index e249984..5e8a522 100644
--- a/src/main/ezusb-iidx-emu/node-eeprom.h
+++ b/src/main/ezusb-emu/node-eeprom.h
@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_EEPROM_H
 #define EZUSB_IIDX_EMU_NODE_EEPROM_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 void ezusb_iidx_emu_node_eeprom_init(void);
 /* Used on 9th to DistorteD */
diff --git a/src/main/ezusb-iidx-emu/node-none.c b/src/main/ezusb-emu/node-none.c
similarity index 89%
rename from src/main/ezusb-iidx-emu/node-none.c
rename to src/main/ezusb-emu/node-none.c
index caeb1fa..a879285 100644
--- a/src/main/ezusb-iidx-emu/node-none.c
+++ b/src/main/ezusb-emu/node-none.c
@@ -1,4 +1,4 @@
-#include "ezusb-iidx-emu/node-none.h"
+#include "ezusb-emu/node-none.h"
 
 uint8_t ezusb_iidx_emu_node_none_process_cmd(
     uint8_t cmd_id, uint8_t cmd_data, uint8_t cmd_data2)
diff --git a/src/main/ezusb-iidx-emu/node-none.h b/src/main/ezusb-emu/node-none.h
similarity index 90%
rename from src/main/ezusb-iidx-emu/node-none.h
rename to src/main/ezusb-emu/node-none.h
index 02e5f37..09502e7 100644
--- a/src/main/ezusb-iidx-emu/node-none.h
+++ b/src/main/ezusb-emu/node-none.h
@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_NONE_H
 #define EZUSB_IIDX_EMU_NODE_NONE_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 uint8_t ezusb_iidx_emu_node_none_process_cmd(
     uint8_t cmd_id, uint8_t cmd_data, uint8_t cmd_data2);
diff --git a/src/main/ezusb-iidx-emu/node-security-mem.c b/src/main/ezusb-emu/node-security-mem.c
similarity index 97%
rename from src/main/ezusb-iidx-emu/node-security-mem.c
rename to src/main/ezusb-emu/node-security-mem.c
index 88fcb14..92422c8 100644
--- a/src/main/ezusb-iidx-emu/node-security-mem.c
+++ b/src/main/ezusb-emu/node-security-mem.c
@@ -1,8 +1,8 @@
-#define LOG_MODULE "ezusb-iidx-emu-node-sec-mem"
+#define LOG_MODULE "ezusb-emu-node-sec-mem"
 
 #include <string.h>
 
-#include "ezusb-iidx-emu/node-security-mem.h"
+#include "ezusb-emu/node-security-mem.h"
 #include "ezusb-iidx/secmem-cmd.h"
 
 #include "util/log.h"
diff --git a/src/main/ezusb-iidx-emu/node-security-mem.h b/src/main/ezusb-emu/node-security-mem.h
similarity index 95%
rename from src/main/ezusb-iidx-emu/node-security-mem.h
rename to src/main/ezusb-emu/node-security-mem.h
index 48e27ea..01dfb23 100644
--- a/src/main/ezusb-iidx-emu/node-security-mem.h
+++ b/src/main/ezusb-emu/node-security-mem.h
@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_SECURITY_MEM_H
 #define EZUSB_IIDX_EMU_NODE_SECURITY_MEM_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 void ezusb_iidx_emu_node_security_mem_init(void);
 
diff --git a/src/main/ezusb-iidx-emu/node-security-plug.c b/src/main/ezusb-emu/node-security-plug.c
similarity index 98%
rename from src/main/ezusb-iidx-emu/node-security-plug.c
rename to src/main/ezusb-emu/node-security-plug.c
index 21cc1d5..c6c7a07 100644
--- a/src/main/ezusb-iidx-emu/node-security-plug.c
+++ b/src/main/ezusb-emu/node-security-plug.c
@@ -1,10 +1,10 @@
-#define LOG_MODULE "ezusb-iidx-emu-node-sec-plug"
+#define LOG_MODULE "ezusb-emu-node-sec-plug"
 
 #include <string.h>
 
-#include "ezusb-iidx-emu/node-eeprom.h"
-#include "ezusb-iidx-emu/node-security-mem.h"
-#include "ezusb-iidx-emu/node-security-plug.h"
+#include "ezusb-emu/node-eeprom.h"
+#include "ezusb-emu/node-security-mem.h"
+#include "ezusb-emu/node-security-plug.h"
 #include "ezusb-iidx/secplug-cmd.h"
 
 #include "security/rp.h"
diff --git a/src/main/ezusb-iidx-emu/node-security-plug.h b/src/main/ezusb-emu/node-security-plug.h
similarity index 99%
rename from src/main/ezusb-iidx-emu/node-security-plug.h
rename to src/main/ezusb-emu/node-security-plug.h
index e6b56b0..57b312a 100644
--- a/src/main/ezusb-iidx-emu/node-security-plug.h
+++ b/src/main/ezusb-emu/node-security-plug.h
@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_SECURITY_PLUG_H
 #define EZUSB_IIDX_EMU_NODE_SECURITY_PLUG_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 #include "security/id.h"
 #include "security/mcode.h"
diff --git a/src/main/ezusb-iidx-emu/node-sram.c b/src/main/ezusb-emu/node-sram.c
similarity index 95%
rename from src/main/ezusb-iidx-emu/node-sram.c
rename to src/main/ezusb-emu/node-sram.c
index 72c6066..200f1ca 100644
--- a/src/main/ezusb-iidx-emu/node-sram.c
+++ b/src/main/ezusb-emu/node-sram.c
@@ -1,9 +1,9 @@
-#define LOG_MODULE "ezusb-iidx-emu-node-sram"
+#define LOG_MODULE "ezusb-emu-node-sram"
 
 #include <string.h>
 
-#include "ezusb-iidx-emu/conf.h"
-#include "ezusb-iidx-emu/node-sram.h"
+#include "ezusb-emu/conf.h"
+#include "ezusb-emu/node-sram.h"
 #include "ezusb-iidx/sram-cmd.h"
 
 #include "util/fs.h"
diff --git a/src/main/ezusb-iidx-emu/node-sram.h b/src/main/ezusb-emu/node-sram.h
similarity index 90%
rename from src/main/ezusb-iidx-emu/node-sram.h
rename to src/main/ezusb-emu/node-sram.h
index ccfe4d0..954b1a2 100644
--- a/src/main/ezusb-iidx-emu/node-sram.h
+++ b/src/main/ezusb-emu/node-sram.h
@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_SRAM_H
 #define EZUSB_IIDX_EMU_NODE_SRAM_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 uint8_t ezusb_iidx_emu_node_sram_process_cmd(
     uint8_t cmd_id, uint8_t cmd_data, uint8_t cmd_data2);
diff --git a/src/main/ezusb-iidx-emu/node-wdt.c b/src/main/ezusb-emu/node-wdt.c
similarity index 89%
rename from src/main/ezusb-iidx-emu/node-wdt.c
rename to src/main/ezusb-emu/node-wdt.c
index e86903a..9185bdd 100644
--- a/src/main/ezusb-iidx-emu/node-wdt.c
+++ b/src/main/ezusb-emu/node-wdt.c
@@ -1,6 +1,6 @@
-#define LOG_MODULE "ezusb-iidx-emu-node-wdt"
+#define LOG_MODULE "ezusb-emu-node-wdt"
 
-#include "ezusb-iidx-emu/node-wdt.h"
+#include "ezusb-emu/node-wdt.h"
 #include "ezusb-iidx/wdt-cmd.h"
 
 #include "util/log.h"
diff --git a/src/main/ezusb-iidx-emu/node-wdt.h b/src/main/ezusb-emu/node-wdt.h
similarity index 90%
rename from src/main/ezusb-iidx-emu/node-wdt.h
rename to src/main/ezusb-emu/node-wdt.h
index 781e409..e473e20 100644
--- a/src/main/ezusb-iidx-emu/node-wdt.h
+++ b/src/main/ezusb-emu/node-wdt.h
@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_WDT_H
 #define EZUSB_IIDX_EMU_NODE_WDT_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 uint8_t ezusb_iidx_emu_node_wdt_process_cmd(
     uint8_t cmd_id, uint8_t cmd_data, uint8_t cmd_data2);
diff --git a/src/main/ezusb-iidx-emu/node.h b/src/main/ezusb-emu/node.h
similarity index 100%
rename from src/main/ezusb-iidx-emu/node.h
rename to src/main/ezusb-emu/node.h
diff --git a/src/main/ezusb-emu/nodes.c b/src/main/ezusb-emu/nodes.c
new file mode 100644
index 0000000..0dfd1a1
--- /dev/null
+++ b/src/main/ezusb-emu/nodes.c
@@ -0,0 +1,96 @@
+/*
+ * This file contains the ezusb nodes that appeared on
+ * all IIDX games so far.
+ */
+
+#include "ezusb-iidx/msg.h"
+
+#include "ezusb-emu/node-coin.h"
+#include "ezusb-emu/node-eeprom.h"
+#include "ezusb-emu/node-none.h"
+#include "ezusb-emu/node-security-mem.h"
+#include "ezusb-emu/node-security-plug.h"
+#include "ezusb-emu/node-sram.h"
+#include "ezusb-emu/node-wdt.h"
+#include "ezusb-emu/nodes.h"
+#include "ezusb-emu/node.h"
+
+/* All IIDX games */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_coin = {
+    .node_id = EZUSB_IIDX_MSG_NODE_COIN,
+    .init_node = NULL,
+    .process_cmd = ezusb_iidx_emu_node_coin_process_cmd,
+    .read_packet = ezusb_iidx_emu_node_coin_read_packet,
+    .write_packet = ezusb_iidx_emu_node_coin_write_packet};
+
+/* Used on 9th to DistorteD */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v1 = {
+    .node_id = EZUSB_IIDX_MSG_NODE_EEPROM,
+    .init_node = ezusb_iidx_emu_node_eeprom_init,
+    .process_cmd = ezusb_iidx_emu_node_eeprom_process_cmd_v1,
+    .read_packet = ezusb_iidx_emu_node_eeprom_read_packet,
+    .write_packet = ezusb_iidx_emu_node_eeprom_write_packet};
+
+/* Used on Gold to Sirius */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v2 = {
+    .node_id = EZUSB_IIDX_MSG_NODE_EEPROM,
+    .init_node = ezusb_iidx_emu_node_eeprom_init,
+    .process_cmd = ezusb_iidx_emu_node_eeprom_process_cmd_v2,
+    .read_packet = ezusb_iidx_emu_node_eeprom_read_packet,
+    .write_packet = ezusb_iidx_emu_node_eeprom_write_packet};
+
+/* All IIDX games */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_none = {
+    .node_id = EZUSB_IIDX_MSG_NODE_NONE,
+    .init_node = NULL,
+    .process_cmd = ezusb_iidx_emu_node_none_process_cmd,
+    .read_packet = ezusb_iidx_emu_node_none_read_packet,
+    .write_packet = ezusb_iidx_emu_node_none_write_packet};
+
+/* Used on 9th to DistorteD */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v1 = {
+    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_MEM,
+    .init_node = ezusb_iidx_emu_node_security_mem_init,
+    .process_cmd = ezusb_iidx_emu_node_security_mem_v1_process_cmd,
+    .read_packet = ezusb_iidx_emu_node_security_mem_read_packet,
+    .write_packet = ezusb_iidx_emu_node_security_mem_write_packet};
+
+/* Used on Gold to Sirius */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v2 = {
+    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_MEM,
+    .init_node = ezusb_iidx_emu_node_security_mem_init,
+    .process_cmd = ezusb_iidx_emu_node_security_mem_v2_process_cmd,
+    .read_packet = ezusb_iidx_emu_node_security_mem_read_packet,
+    .write_packet = ezusb_iidx_emu_node_security_mem_write_packet};
+
+/* Used on 9th to DistorteD */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v1 = {
+    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_PLUG,
+    .init_node = NULL,
+    .process_cmd = ezusb_iidx_emu_node_security_plug_process_cmd_v1,
+    .read_packet = ezusb_iidx_emu_node_security_plug_read_packet_v1,
+    .write_packet = ezusb_iidx_emu_node_security_plug_write_packet};
+
+/* Used on Gold to Sirius */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v2 = {
+    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_PLUG,
+    .init_node = NULL,
+    .process_cmd = ezusb_iidx_emu_node_security_plug_process_cmd_v2,
+    .read_packet = ezusb_iidx_emu_node_security_plug_read_packet_v2,
+    .write_packet = ezusb_iidx_emu_node_security_plug_write_packet};
+
+/* All IIDX games */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_sram = {
+    .node_id = EZUSB_IIDX_MSG_NODE_SRAM,
+    .init_node = NULL,
+    .process_cmd = ezusb_iidx_emu_node_sram_process_cmd,
+    .read_packet = ezusb_iidx_emu_node_sram_read_packet,
+    .write_packet = ezusb_iidx_emu_node_sram_write_packet};
+
+/* Used on 9th to Sirius */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_wdt = {
+    .node_id = EZUSB_IIDX_MSG_NODE_WDT,
+    .init_node = NULL,
+    .process_cmd = ezusb_iidx_emu_node_wdt_process_cmd,
+    .read_packet = ezusb_iidx_emu_node_wdt_read_packet,
+    .write_packet = ezusb_iidx_emu_node_wdt_write_packet};
diff --git a/src/main/ezusb-emu/nodes.h b/src/main/ezusb-emu/nodes.h
new file mode 100644
index 0000000..a52d113
--- /dev/null
+++ b/src/main/ezusb-emu/nodes.h
@@ -0,0 +1,17 @@
+#ifndef EZUSBEMU_NODES_H
+#define EZUSBEMU_NODES_H
+
+#include "ezusb-emu/node.h"
+
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_coin;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v1;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v2;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_none;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v1;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v2;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v1;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v2;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_sram;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_wdt;
+
+#endif
diff --git a/src/main/ezusb-iidx-emu/Module.mk b/src/main/ezusb-iidx-emu/Module.mk
index a8bbef5..cdf2fc0 100644
--- a/src/main/ezusb-iidx-emu/Module.mk
+++ b/src/main/ezusb-iidx-emu/Module.mk
@@ -1,19 +1,12 @@
 libs            += ezusb-iidx-emu
 
 libs_ezusb-iidx-emu      := \
-    ezusbemu \
+    ezusb-emu \
 
 src_ezusb-iidx-emu     := \
     card-mag.c \
     msg.c \
     node-16seg.c \
-    node-coin.c \
-    node-eeprom.c \
     node-fpga.c \
-    node-none.c \
-    node-security-mem.c \
-    node-security-plug.c \
     node-serial.c \
-    node-sram.c \
-    node-wdt.c \
     nodes.c \
diff --git a/src/main/ezusb-iidx-emu/msg.c b/src/main/ezusb-iidx-emu/msg.c
index c651042..b464b31 100644
--- a/src/main/ezusb-iidx-emu/msg.c
+++ b/src/main/ezusb-iidx-emu/msg.c
@@ -9,11 +9,12 @@
 #include "hook/iohook.h"
 
 #include "ezusb-emu/msg.h"
+#include "ezusb-emu/nodes.h"
+#include "ezusb-emu/node-coin.h"
 
 #include "ezusb-iidx/msg.h"
 
 #include "ezusb-iidx-emu/msg.h"
-#include "ezusb-iidx-emu/node-coin.h"
 #include "ezusb-iidx-emu/node-serial.h"
 #include "ezusb-iidx-emu/nodes.h"
 
diff --git a/src/main/ezusb-iidx-emu/node-16seg.h b/src/main/ezusb-iidx-emu/node-16seg.h
index ea128c8..c2dd7f0 100644
--- a/src/main/ezusb-iidx-emu/node-16seg.h
+++ b/src/main/ezusb-iidx-emu/node-16seg.h
@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_16SEG_H
 #define EZUSB_IIDX_EMU_NODE_16SEG_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 uint8_t ezusb_iidx_emu_node_16seg_process_cmd(
     uint8_t cmd_id, uint8_t cmd_data, uint8_t cmd_data2);
diff --git a/src/main/ezusb-iidx-emu/node-fpga.h b/src/main/ezusb-iidx-emu/node-fpga.h
index 21a0192..759f263 100644
--- a/src/main/ezusb-iidx-emu/node-fpga.h
+++ b/src/main/ezusb-iidx-emu/node-fpga.h
@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_FPGA_H
 #define EZUSB_IIDX_EMU_NODE_FPGA_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 /* Used on 9th to DistorteD */
 uint8_t ezusb_iidx_emu_node_fpga_v1_process_cmd(
diff --git a/src/main/ezusb-iidx-emu/node-serial.h b/src/main/ezusb-iidx-emu/node-serial.h
index ad68d25..dc5d650 100644
--- a/src/main/ezusb-iidx-emu/node-serial.h
+++ b/src/main/ezusb-iidx-emu/node-serial.h
@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_SERIAL_H
 #define EZUSB_IIDX_EMU_NODE_SERIAL_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 void ezusb_iidx_emu_node_serial_init(void);
 
diff --git a/src/main/ezusb-iidx-emu/nodes.c b/src/main/ezusb-iidx-emu/nodes.c
index dcc9b2b..8814347 100644
--- a/src/main/ezusb-iidx-emu/nodes.c
+++ b/src/main/ezusb-iidx-emu/nodes.c
@@ -6,16 +6,8 @@
 #include "ezusb-iidx/msg.h"
 
 #include "ezusb-iidx-emu/node-16seg.h"
-#include "ezusb-iidx-emu/node-coin.h"
-#include "ezusb-iidx-emu/node-eeprom.h"
 #include "ezusb-iidx-emu/node-fpga.h"
-#include "ezusb-iidx-emu/node-none.h"
-#include "ezusb-iidx-emu/node-security-mem.h"
-#include "ezusb-iidx-emu/node-security-plug.h"
 #include "ezusb-iidx-emu/node-serial.h"
-#include "ezusb-iidx-emu/node-sram.h"
-#include "ezusb-iidx-emu/node-wdt.h"
-#include "ezusb-iidx-emu/node.h"
 #include "ezusb-iidx-emu/nodes.h"
 
 /* All IIDX games */
@@ -26,30 +18,6 @@ const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_16seg = {
     .read_packet = ezusb_iidx_emu_node_16seg_read_packet,
     .write_packet = ezusb_iidx_emu_node_16seg_write_packet};
 
-/* All IIDX games */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_coin = {
-    .node_id = EZUSB_IIDX_MSG_NODE_COIN,
-    .init_node = NULL,
-    .process_cmd = ezusb_iidx_emu_node_coin_process_cmd,
-    .read_packet = ezusb_iidx_emu_node_coin_read_packet,
-    .write_packet = ezusb_iidx_emu_node_coin_write_packet};
-
-/* Used on 9th to DistorteD */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v1 = {
-    .node_id = EZUSB_IIDX_MSG_NODE_EEPROM,
-    .init_node = ezusb_iidx_emu_node_eeprom_init,
-    .process_cmd = ezusb_iidx_emu_node_eeprom_process_cmd_v1,
-    .read_packet = ezusb_iidx_emu_node_eeprom_read_packet,
-    .write_packet = ezusb_iidx_emu_node_eeprom_write_packet};
-
-/* Used on Gold to Sirius */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v2 = {
-    .node_id = EZUSB_IIDX_MSG_NODE_EEPROM,
-    .init_node = ezusb_iidx_emu_node_eeprom_init,
-    .process_cmd = ezusb_iidx_emu_node_eeprom_process_cmd_v2,
-    .read_packet = ezusb_iidx_emu_node_eeprom_read_packet,
-    .write_packet = ezusb_iidx_emu_node_eeprom_write_packet};
-
 /* Used on 9th to DistorteD */
 const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_fpga_v1 = {
     .node_id = EZUSB_IIDX_MSG_NODE_FPGA_V1,
@@ -66,46 +34,6 @@ const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_fpga_v2 = {
     .read_packet = ezusb_iidx_emu_node_fpga_read_packet,
     .write_packet = ezusb_iidx_emu_node_fpga_write_packet};
 
-/* All IIDX games */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_none = {
-    .node_id = EZUSB_IIDX_MSG_NODE_NONE,
-    .init_node = NULL,
-    .process_cmd = ezusb_iidx_emu_node_none_process_cmd,
-    .read_packet = ezusb_iidx_emu_node_none_read_packet,
-    .write_packet = ezusb_iidx_emu_node_none_write_packet};
-
-/* Used on 9th to DistorteD */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v1 = {
-    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_MEM,
-    .init_node = ezusb_iidx_emu_node_security_mem_init,
-    .process_cmd = ezusb_iidx_emu_node_security_mem_v1_process_cmd,
-    .read_packet = ezusb_iidx_emu_node_security_mem_read_packet,
-    .write_packet = ezusb_iidx_emu_node_security_mem_write_packet};
-
-/* Used on Gold to Sirius */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v2 = {
-    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_MEM,
-    .init_node = ezusb_iidx_emu_node_security_mem_init,
-    .process_cmd = ezusb_iidx_emu_node_security_mem_v2_process_cmd,
-    .read_packet = ezusb_iidx_emu_node_security_mem_read_packet,
-    .write_packet = ezusb_iidx_emu_node_security_mem_write_packet};
-
-/* Used on 9th to DistorteD */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v1 = {
-    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_PLUG,
-    .init_node = NULL,
-    .process_cmd = ezusb_iidx_emu_node_security_plug_process_cmd_v1,
-    .read_packet = ezusb_iidx_emu_node_security_plug_read_packet_v1,
-    .write_packet = ezusb_iidx_emu_node_security_plug_write_packet};
-
-/* Used on Gold to Sirius */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v2 = {
-    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_PLUG,
-    .init_node = NULL,
-    .process_cmd = ezusb_iidx_emu_node_security_plug_process_cmd_v2,
-    .read_packet = ezusb_iidx_emu_node_security_plug_read_packet_v2,
-    .write_packet = ezusb_iidx_emu_node_security_plug_write_packet};
-
 /* Used on 9th to HappySky for magnetic readers */
 const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_serial = {
     .node_id = EZUSB_IIDX_MSG_NODE_SERIAL,
@@ -113,19 +41,3 @@ const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_serial = {
     .process_cmd = ezusb_iidx_emu_node_serial_process_cmd,
     .read_packet = ezusb_iidx_emu_node_serial_read_packet,
     .write_packet = ezusb_iidx_emu_node_serial_write_packet};
-
-/* All IIDX games */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_sram = {
-    .node_id = EZUSB_IIDX_MSG_NODE_SRAM,
-    .init_node = NULL,
-    .process_cmd = ezusb_iidx_emu_node_sram_process_cmd,
-    .read_packet = ezusb_iidx_emu_node_sram_read_packet,
-    .write_packet = ezusb_iidx_emu_node_sram_write_packet};
-
-/* Used on 9th to Sirius */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_wdt = {
-    .node_id = EZUSB_IIDX_MSG_NODE_WDT,
-    .init_node = NULL,
-    .process_cmd = ezusb_iidx_emu_node_wdt_process_cmd,
-    .read_packet = ezusb_iidx_emu_node_wdt_read_packet,
-    .write_packet = ezusb_iidx_emu_node_wdt_write_packet};
diff --git a/src/main/ezusb-iidx-emu/nodes.h b/src/main/ezusb-iidx-emu/nodes.h
index 633824b..74a7534 100644
--- a/src/main/ezusb-iidx-emu/nodes.h
+++ b/src/main/ezusb-iidx-emu/nodes.h
@@ -1,21 +1,11 @@
 #ifndef EZUSBEMU_NODES_IIDX_H
 #define EZUSBEMU_NODES_IIDX_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_16seg;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_coin;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v1;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v2;
 extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_fpga_v1;
 extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_fpga_v2;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_none;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v1;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v2;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v1;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v2;
 extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_serial;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_sram;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_wdt;
 
 #endif
diff --git a/src/main/ezusb2-iidx-emu/msg.c b/src/main/ezusb2-iidx-emu/msg.c
index f1596ce..20aac23 100644
--- a/src/main/ezusb2-iidx-emu/msg.c
+++ b/src/main/ezusb2-iidx-emu/msg.c
@@ -9,6 +9,7 @@
 #include "hook/iohook.h"
 
 #include "ezusb-emu/msg.h"
+#include "ezusb-emu/nodes.h"
 
 #include "ezusb-iidx-emu/msg.h"
 #include "ezusb-iidx-emu/nodes.h"
diff --git a/src/main/ezusb2-popn-emu/Module.mk b/src/main/ezusb2-popn-emu/Module.mk
index 6004b89..92da064 100644
--- a/src/main/ezusb2-popn-emu/Module.mk
+++ b/src/main/ezusb2-popn-emu/Module.mk
@@ -2,7 +2,6 @@ libs            += ezusb2-popn-emu
 
 libs_ezusb2-popn-emu      := \
     ezusb-emu \
-    ezusb-iidx-emu \
     ezusb-iidx \
     ezusb2-iidx-emu \
 
diff --git a/src/main/ezusb2-popn-emu/msg.c b/src/main/ezusb2-popn-emu/msg.c
index 95b9fa4..ad83059 100644
--- a/src/main/ezusb2-popn-emu/msg.c
+++ b/src/main/ezusb2-popn-emu/msg.c
@@ -10,12 +10,11 @@
 
 #include "ezusb-emu/msg.h"
 
-#include "ezusb-iidx-emu/msg.h"
-#include "ezusb-iidx-emu/nodes.h"
-#include "ezusb-iidx-emu/node-none.h"
-#include "ezusb-iidx-emu/node-coin.h"
-#include "ezusb-iidx-emu/node-security-mem.h"
-#include "ezusb-iidx-emu/node-security-plug.h"
+#include "ezusb-emu/nodes.h"
+#include "ezusb-emu/node-none.h"
+#include "ezusb-emu/node-coin.h"
+#include "ezusb-emu/node-security-mem.h"
+#include "ezusb-emu/node-security-plug.h"
 
 #include "ezusb2-popn/msg.h"
 
diff --git a/src/main/iidxhook1/dllmain.c b/src/main/iidxhook1/dllmain.c
index 492b67a..f8d9d53 100644
--- a/src/main/iidxhook1/dllmain.c
+++ b/src/main/iidxhook1/dllmain.c
@@ -11,9 +11,9 @@
 
 #include "ezusb-emu/desc.h"
 #include "ezusb-emu/device.h"
+#include "ezusb-emu/node-security-plug.h"
 
 #include "ezusb-iidx-emu/msg.h"
-#include "ezusb-iidx-emu/node-security-plug.h"
 #include "ezusb-iidx-emu/node-serial.h"
 #include "ezusb-iidx-emu/nodes.h"
 
diff --git a/src/main/iidxhook2/dllmain.c b/src/main/iidxhook2/dllmain.c
index 26ccb12..fbcf65e 100644
--- a/src/main/iidxhook2/dllmain.c
+++ b/src/main/iidxhook2/dllmain.c
@@ -11,9 +11,9 @@
 
 #include "ezusb-emu/desc.h"
 #include "ezusb-emu/device.h"
+#include "ezusb-emu/node-security-plug.h"
 
 #include "ezusb-iidx-emu/msg.h"
-#include "ezusb-iidx-emu/node-security-plug.h"
 #include "ezusb-iidx-emu/node-serial.h"
 #include "ezusb-iidx-emu/nodes.h"
 
diff --git a/src/main/iidxhook3/dllmain.c b/src/main/iidxhook3/dllmain.c
index 1bd717d..67dd09a 100644
--- a/src/main/iidxhook3/dllmain.c
+++ b/src/main/iidxhook3/dllmain.c
@@ -9,7 +9,7 @@
 
 #include "cconfig/cconfig-hook.h"
 
-#include "ezusb-iidx-emu/node-security-plug.h"
+#include "ezusb-emu/node-security-plug.h"
 #include "ezusb-iidx-emu/node-serial.h"
 #include "ezusb-iidx-emu/nodes.h"
 
diff --git a/src/main/iidxhook4-cn/dllmain.c b/src/main/iidxhook4-cn/dllmain.c
index 86fe0f9..550a418 100644
--- a/src/main/iidxhook4-cn/dllmain.c
+++ b/src/main/iidxhook4-cn/dllmain.c
@@ -9,7 +9,7 @@
 
 #include "cconfig/cconfig-hook.h"
 
-#include "ezusb-iidx-emu/node-security-plug.h"
+#include "ezusb-emu/node-security-plug.h"
 
 #include "ezusb2-emu/desc.h"
 #include "ezusb2-emu/device.h"
diff --git a/src/main/iidxhook5-cn/dllmain.c b/src/main/iidxhook5-cn/dllmain.c
index ada22e1..fbf66b0 100644
--- a/src/main/iidxhook5-cn/dllmain.c
+++ b/src/main/iidxhook5-cn/dllmain.c
@@ -9,7 +9,7 @@
 
 #include "cconfig/cconfig-hook.h"
 
-#include "ezusb-iidx-emu/node-security-plug.h"
+#include "ezusb-emu/node-security-plug.h"
 
 #include "ezusb2-emu/desc.h"
 #include "ezusb2-emu/device.h"
diff --git a/src/main/popnhook1/Module.mk b/src/main/popnhook1/Module.mk
index 4c40a08..c2c1510 100644
--- a/src/main/popnhook1/Module.mk
+++ b/src/main/popnhook1/Module.mk
@@ -9,7 +9,7 @@ ldflags_popnhook1   := \
 
 libs_popnhook1		:= \
     iidxhook-util \
-    ezusb-iidx-emu \
+    ezusb-emu \
     ezusb2-popn-emu \
     ezusb2-emu \
     security \
diff --git a/src/main/popnhook1/dllmain.c b/src/main/popnhook1/dllmain.c
index 1b57629..b076236 100644
--- a/src/main/popnhook1/dllmain.c
+++ b/src/main/popnhook1/dllmain.c
@@ -10,8 +10,7 @@
 
 #include "cconfig/cconfig-hook.h"
 
-#include "ezusb-iidx-emu/node-security-plug.h"
-#include "ezusb-iidx-emu/nodes.h"
+#include "ezusb-emu/node-security-plug.h"
 
 #include "hook/d3d9.h"
 #include "hook/table.h"