diff --git a/rpcs3/Emu/SysCalls/ModuleManager.cpp b/rpcs3/Emu/SysCalls/ModuleManager.cpp
index 26c4adbd1b..8c919c7cb3 100644
--- a/rpcs3/Emu/SysCalls/ModuleManager.cpp
+++ b/rpcs3/Emu/SysCalls/ModuleManager.cpp
@@ -13,20 +13,6 @@ extern void cellFont_init();
 extern void cellFont_load();
 extern void cellFont_unload();
 extern Module *cellFont;
-extern void sys_net_init();
-extern Module *sys_net;
-extern void cellUserInfo_init();
-extern Module *cellUserInfo;
-extern void cellSysutil_init();
-extern Module *cellSysutil;
-extern void cellSysutilAp_init();
-extern Module *cellSysutilAp;
-extern void cellPngDec_init();
-extern Module *cellPngDec;
-extern void cellNetCtl_init();
-extern Module *cellNetCtl;
-extern void cellJpgDec_init();
-extern Module *cellJpgDec;
 extern void cellFontFT_init();
 extern void cellFontFT_load();
 extern void cellFontFT_unload();
@@ -41,26 +27,36 @@ extern void cellGem_init();
 extern Module *cellGem;
 extern void cellGifDec_init();
 extern Module *cellGifDec;
-extern void sys_io_init();
-extern Module *sys_io;
+extern void cellJpgDec_init();
+extern Module *cellJpgDec;
 extern void cellL10n_init();
 extern Module *cellL10n;
+extern void cellNetCtl_init();
+extern Module *cellNetCtl;
 extern void cellPamf_init();
 extern Module *cellPamf;
+extern void cellPngDec_init();
+extern Module *cellPngDec;
 extern void cellResc_init();
 extern void cellResc_load();
 extern void cellResc_unload();
 extern Module *cellResc;
-extern void cellSail_init();
-extern Module *cellSail;
 extern void cellRtc_init();
 extern Module *cellRtc;
+extern void cellSail_init();
+extern Module *cellSail;
 extern void cellSpurs_init();
 extern Module *cellSpurs;
 extern void cellSync_init();
 extern Module *cellSync;
 extern void cellSysmodule_init();
 extern Module *cellSysmodule;
+extern void cellSysutil_init();
+extern Module *cellSysutil;
+extern void cellSysutilAp_init();
+extern Module *cellSysutilAp;
+extern void cellUserInfo_init();
+extern Module *cellUserInfo;
 extern void cellVdec_init();
 extern Module *cellVdec;
 extern void cellVpost_init();
@@ -88,6 +84,10 @@ extern void sysPrxForUser_init();
 extern Module *sysPrxForUser;
 extern void sys_fs_init();
 extern Module *sys_fs;
+extern void sys_io_init();
+extern Module *sys_io;
+extern void sys_net_init();
+extern Module *sys_net;
 
 struct ModuleInfo
 {
@@ -221,62 +221,70 @@ void ModuleManager::init()
 		m_mod_init.emplace_back(0x0007, cellDmux_init);
 		cellFont = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back(0x0019, cellFont_init, cellFont_load, cellFont_unload);
-		cellGem = static_cast <Module*>(&(m_mod_init.back())) + 1;
-		m_mod_init.emplace_back(0x005a, cellGem_init);
-		sys_net = static_cast <Module*>(&(m_mod_init.back())) + 1;
-		m_mod_init.emplace_back((u16)0x0000, sys_net_init);
-		sceNpTrophy = static_cast <Module*>(&(m_mod_init.back())) + 1;
-		m_mod_init.emplace_back(0xf035, sceNpTrophy_init, nullptr, sceNpTrophy_unload);
-		sceNp = static_cast <Module*>(&(m_mod_init.back())) + 1;
-		m_mod_init.emplace_back(0x0016, sceNp_init);
-		cellUserInfo = static_cast <Module*>(&(m_mod_init.back())) + 1;
-		m_mod_init.emplace_back(0x0032, cellUserInfo_init);
-		cellSysutil = static_cast <Module*>(&(m_mod_init.back())) + 1;
-		m_mod_init.emplace_back(0x0015, cellSysutil_init);
-		cellSysutilAp = static_cast <Module*>(&(m_mod_init.back())) + 1;
-		m_mod_init.emplace_back(0x0039, cellSysutilAp_init);
-		cellPngDec = static_cast <Module*>(&(m_mod_init.back())) + 1;
-		m_mod_init.emplace_back(0x0018, cellPngDec_init);
-		cellNetCtl = static_cast <Module*>(&(m_mod_init.back())) + 1;
-		m_mod_init.emplace_back(0x0014, cellNetCtl_init);
-		cellJpgDec = static_cast <Module*>(&(m_mod_init.back())) + 1;
-		m_mod_init.emplace_back(0x000f, cellJpgDec_init);
 		cellFontFT = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back(0x001a, cellFontFT_init, cellFontFT_load, cellFontFT_unload);
-		cellGifDec = static_cast <Module*>(&(m_mod_init.back())) + 1;
-		m_mod_init.emplace_back(0xf010, cellGifDec_init);
-		cellGcmSys = static_cast <Module*>(&(m_mod_init.back())) + 1;
-		m_mod_init.emplace_back(0x0010, cellGcmSys_init, cellGcmSys_load, cellGcmSys_unload);
 		cellGame = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back(0x003e, cellGame_init);
-		sys_io = static_cast <Module*>(&(m_mod_init.back())) + 1;
-		m_mod_init.emplace_back(0x0017, sys_io_init);
+		cellGcmSys = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0x0010, cellGcmSys_init, cellGcmSys_load, cellGcmSys_unload);
+		cellGem = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0x005a, cellGem_init);
+		cellJpgDec = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0x000f, cellJpgDec_init);
+		cellGifDec = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0xf010, cellGifDec_init);
 		cellL10n = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back(0x001e, cellL10n_init);
+		cellNetCtl = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0x0014, cellNetCtl_init);
 		cellPamf = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back(0x0012, cellPamf_init);
-		cellSail = static_cast <Module*>(&(m_mod_init.back())) + 1;
-		m_mod_init.emplace_back("cellSail", cellSail_init);
+		cellPngDec = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0x0018, cellPngDec_init);
 		cellResc = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back(0x001f, cellResc_init, cellResc_load, cellResc_unload);
 		cellRtc = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back(0x0009, cellRtc_init);
+		cellSail = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back("cellSail", cellSail_init);
 		cellSpurs = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back(0x000a, cellSpurs_init);
 		cellSync = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back("cellSync", cellSync_init);
+		cellSysutil = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0x0015, cellSysutil_init);
+		cellSysutilAp = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0x0039, cellSysutilAp_init);
 		cellSysmodule = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back("cellSysmodule", cellSysmodule_init);
+		cellUserInfo = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0x0032, cellUserInfo_init);
 		cellVdec = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back(0x0005, cellVdec_init);
 		cellVpost = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back(0x0008, cellVpost_init);
 		libmixer = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back("libmixer", libmixer_init);
+		sceNp = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0x0016, sceNp_init);
+		sceNpClans = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0x003a, sceNpClans_init, nullptr, sceNpClans_unload);
+		sceNpCommerce2 = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0x0044, sceNpCommerce2_init, nullptr, sceNpCommerce2_unload);
+		sceNpSns = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0x0059, sceNpSns_init, nullptr, sceNpSns_unload);
+		sceNpTrophy = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0xf035, sceNpTrophy_init, nullptr, sceNpTrophy_unload);
+		sceNpTus = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0x0045, sceNpTus_init, nullptr, sceNpTus_unload);
 		sysPrxForUser = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back("sysPrxForUser", sysPrxForUser_init);
 		sys_fs = static_cast <Module*>(&(m_mod_init.back())) + 1;
 		m_mod_init.emplace_back(0x000e, sys_fs_init);
+		sys_io = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back(0x0017, sys_io_init);
+		sys_net = static_cast <Module*>(&(m_mod_init.back())) + 1;
+		m_mod_init.emplace_back((u16)0x0000, sys_net_init);
 		initialized = true;
 	}
 }