diff --git a/.github/calcrom/BuildAnalyzer.cpp b/.github/calcrom/BuildAnalyzer.cpp
index 18f71c11bb..7e4111b664 100644
--- a/.github/calcrom/BuildAnalyzer.cpp
+++ b/.github/calcrom/BuildAnalyzer.cpp
@@ -104,7 +104,7 @@ BuildAnalyzer &BuildAnalyzer::operator()() {
     if (analyzed) {
         reset();
     }
-     string pattern = srcbase.string() + "/{src,asm,lib/{src,asm},lib/{NitroSDK,NitroSystem,NitroDWC,NitroWiFi,libVCT}/{src,asm}}/{,*/,*/*/}*.{c,s,cpp}";
+     string pattern = srcbase.string() + "/{src,asm,lib/{src,asm},lib/{NitroSDK,NitroSystem,NitroDWC,NitroWiFi,libVCT,gamespy}/{src,asm}}/{,*/,*/*/}*.{c,s,cpp}";
     for (char const * & fname : Glob(pattern, GLOB_TILDE | GLOB_BRACE | GLOB_NOSORT)) {
         AnalyzeObject(fname);
     }
diff --git a/common.mk b/common.mk
index 9c3668f9bc..2e6677da7c 100644
--- a/common.mk
+++ b/common.mk
@@ -57,7 +57,7 @@ NITRO_PRECOMPILE_DEPFILE := $(BUILD_DIR)/precompile/nitro.d
 
 # Directories
 
-LIB_SUBDIRS               := NitroSDK NitroSystem NitroDWC NitroWiFi libVCT
+LIB_SUBDIRS               := NitroSDK NitroSystem NitroDWC NitroWiFi libVCT gamespy
 
 SRC_SUBDIR                := src
 ASM_SUBDIR                := asm
diff --git a/lib/NitroDWC/asm/gs/available.s b/lib/gamespy/asm/available.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/available.s
rename to lib/gamespy/asm/available.s
diff --git a/lib/NitroDWC/asm/gs/darray.s b/lib/gamespy/asm/darray.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/darray.s
rename to lib/gamespy/asm/darray.s
diff --git a/lib/NitroDWC/asm/gs/gp/gp.s b/lib/gamespy/asm/gp/gp.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/gp.s
rename to lib/gamespy/asm/gp/gp.s
diff --git a/lib/NitroDWC/asm/gs/gp/gpi.s b/lib/gamespy/asm/gp/gpi.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/gpi.s
rename to lib/gamespy/asm/gp/gpi.s
diff --git a/lib/NitroDWC/asm/gs/gp/gpibuddy.s b/lib/gamespy/asm/gp/gpibuddy.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/gpibuddy.s
rename to lib/gamespy/asm/gp/gpibuddy.s
diff --git a/lib/NitroDWC/asm/gs/gp/gpibuffer.s b/lib/gamespy/asm/gp/gpibuffer.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/gpibuffer.s
rename to lib/gamespy/asm/gp/gpibuffer.s
diff --git a/lib/NitroDWC/asm/gs/gp/gpicallback.s b/lib/gamespy/asm/gp/gpicallback.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/gpicallback.s
rename to lib/gamespy/asm/gp/gpicallback.s
diff --git a/lib/NitroDWC/asm/gs/gp/gpiconnect.s b/lib/gamespy/asm/gp/gpiconnect.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/gpiconnect.s
rename to lib/gamespy/asm/gp/gpiconnect.s
diff --git a/lib/NitroDWC/asm/gs/gp/gpiinfo.s b/lib/gamespy/asm/gp/gpiinfo.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/gpiinfo.s
rename to lib/gamespy/asm/gp/gpiinfo.s
diff --git a/lib/NitroDWC/asm/gs/gp/gpioperation.s b/lib/gamespy/asm/gp/gpioperation.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/gpioperation.s
rename to lib/gamespy/asm/gp/gpioperation.s
diff --git a/lib/NitroDWC/asm/gs/gp/gpipeer.s b/lib/gamespy/asm/gp/gpipeer.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/gpipeer.s
rename to lib/gamespy/asm/gp/gpipeer.s
diff --git a/lib/NitroDWC/asm/gs/gp/gpiprofile.s b/lib/gamespy/asm/gp/gpiprofile.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/gpiprofile.s
rename to lib/gamespy/asm/gp/gpiprofile.s
diff --git a/lib/NitroDWC/asm/gs/gp/gpisearch.s b/lib/gamespy/asm/gp/gpisearch.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/gpisearch.s
rename to lib/gamespy/asm/gp/gpisearch.s
diff --git a/lib/NitroDWC/asm/gs/gp/gpitransfer.s b/lib/gamespy/asm/gp/gpitransfer.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/gpitransfer.s
rename to lib/gamespy/asm/gp/gpitransfer.s
diff --git a/lib/NitroDWC/asm/gs/gp/gpiunique.s b/lib/gamespy/asm/gp/gpiunique.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/gpiunique.s
rename to lib/gamespy/asm/gp/gpiunique.s
diff --git a/lib/NitroDWC/asm/gs/gp/gpiutility.s b/lib/gamespy/asm/gp/gpiutility.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/gpiutility.s
rename to lib/gamespy/asm/gp/gpiutility.s
diff --git a/lib/NitroDWC/asm/gs/gp/include/gp.inc b/lib/gamespy/asm/gp/include/gp.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/include/gp.inc
rename to lib/gamespy/asm/gp/include/gp.inc
diff --git a/lib/NitroDWC/asm/gs/gp/include/gpi.inc b/lib/gamespy/asm/gp/include/gpi.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/include/gpi.inc
rename to lib/gamespy/asm/gp/include/gpi.inc
diff --git a/lib/NitroDWC/asm/gs/gp/include/gpibuddy.inc b/lib/gamespy/asm/gp/include/gpibuddy.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/include/gpibuddy.inc
rename to lib/gamespy/asm/gp/include/gpibuddy.inc
diff --git a/lib/NitroDWC/asm/gs/gp/include/gpibuffer.inc b/lib/gamespy/asm/gp/include/gpibuffer.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/include/gpibuffer.inc
rename to lib/gamespy/asm/gp/include/gpibuffer.inc
diff --git a/lib/NitroDWC/asm/gs/gp/include/gpicallback.inc b/lib/gamespy/asm/gp/include/gpicallback.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/include/gpicallback.inc
rename to lib/gamespy/asm/gp/include/gpicallback.inc
diff --git a/lib/NitroDWC/asm/gs/gp/include/gpiconnect.inc b/lib/gamespy/asm/gp/include/gpiconnect.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/include/gpiconnect.inc
rename to lib/gamespy/asm/gp/include/gpiconnect.inc
diff --git a/lib/NitroDWC/asm/gs/gp/include/gpiinfo.inc b/lib/gamespy/asm/gp/include/gpiinfo.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/include/gpiinfo.inc
rename to lib/gamespy/asm/gp/include/gpiinfo.inc
diff --git a/lib/NitroDWC/asm/gs/gp/include/gpioperation.inc b/lib/gamespy/asm/gp/include/gpioperation.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/include/gpioperation.inc
rename to lib/gamespy/asm/gp/include/gpioperation.inc
diff --git a/lib/NitroDWC/asm/gs/gp/include/gpipeer.inc b/lib/gamespy/asm/gp/include/gpipeer.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/include/gpipeer.inc
rename to lib/gamespy/asm/gp/include/gpipeer.inc
diff --git a/lib/NitroDWC/asm/gs/gp/include/gpiprofile.inc b/lib/gamespy/asm/gp/include/gpiprofile.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/include/gpiprofile.inc
rename to lib/gamespy/asm/gp/include/gpiprofile.inc
diff --git a/lib/NitroDWC/asm/gs/gp/include/gpisearch.inc b/lib/gamespy/asm/gp/include/gpisearch.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/include/gpisearch.inc
rename to lib/gamespy/asm/gp/include/gpisearch.inc
diff --git a/lib/NitroDWC/asm/gs/gp/include/gpitransfer.inc b/lib/gamespy/asm/gp/include/gpitransfer.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/include/gpitransfer.inc
rename to lib/gamespy/asm/gp/include/gpitransfer.inc
diff --git a/lib/NitroDWC/asm/gs/gp/include/gpiunique.inc b/lib/gamespy/asm/gp/include/gpiunique.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/include/gpiunique.inc
rename to lib/gamespy/asm/gp/include/gpiunique.inc
diff --git a/lib/NitroDWC/asm/gs/gp/include/gpiutility.inc b/lib/gamespy/asm/gp/include/gpiutility.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gp/include/gpiutility.inc
rename to lib/gamespy/asm/gp/include/gpiutility.inc
diff --git a/lib/NitroDWC/asm/gs/gstats/gbucket.s b/lib/gamespy/asm/gstats/gbucket.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gstats/gbucket.s
rename to lib/gamespy/asm/gstats/gbucket.s
diff --git a/lib/NitroDWC/asm/gs/gstats/gstats.s b/lib/gamespy/asm/gstats/gstats.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gstats/gstats.s
rename to lib/gamespy/asm/gstats/gstats.s
diff --git a/lib/NitroDWC/asm/gs/gstats/include/gbucket.inc b/lib/gamespy/asm/gstats/include/gbucket.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gstats/include/gbucket.inc
rename to lib/gamespy/asm/gstats/include/gbucket.inc
diff --git a/lib/NitroDWC/asm/gs/gstats/include/gstats.inc b/lib/gamespy/asm/gstats/include/gstats.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gstats/include/gstats.inc
rename to lib/gamespy/asm/gstats/include/gstats.inc
diff --git a/lib/NitroDWC/asm/gs/gt2/gt2auth.s b/lib/gamespy/asm/gt2/gt2auth.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/gt2auth.s
rename to lib/gamespy/asm/gt2/gt2auth.s
diff --git a/lib/NitroDWC/asm/gs/gt2/gt2buffer.s b/lib/gamespy/asm/gt2/gt2buffer.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/gt2buffer.s
rename to lib/gamespy/asm/gt2/gt2buffer.s
diff --git a/lib/NitroDWC/asm/gs/gt2/gt2callback.s b/lib/gamespy/asm/gt2/gt2callback.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/gt2callback.s
rename to lib/gamespy/asm/gt2/gt2callback.s
diff --git a/lib/NitroDWC/asm/gs/gt2/gt2connection.s b/lib/gamespy/asm/gt2/gt2connection.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/gt2connection.s
rename to lib/gamespy/asm/gt2/gt2connection.s
diff --git a/lib/NitroDWC/asm/gs/gt2/gt2main.s b/lib/gamespy/asm/gt2/gt2main.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/gt2main.s
rename to lib/gamespy/asm/gt2/gt2main.s
diff --git a/lib/NitroDWC/asm/gs/gt2/gt2message.s b/lib/gamespy/asm/gt2/gt2message.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/gt2message.s
rename to lib/gamespy/asm/gt2/gt2message.s
diff --git a/lib/NitroDWC/asm/gs/gt2/gt2socket.s b/lib/gamespy/asm/gt2/gt2socket.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/gt2socket.s
rename to lib/gamespy/asm/gt2/gt2socket.s
diff --git a/lib/NitroDWC/asm/gs/gt2/gt2utility.s b/lib/gamespy/asm/gt2/gt2utility.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/gt2utility.s
rename to lib/gamespy/asm/gt2/gt2utility.s
diff --git a/lib/NitroDWC/asm/gs/gt2/include/gt2auth.inc b/lib/gamespy/asm/gt2/include/gt2auth.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/include/gt2auth.inc
rename to lib/gamespy/asm/gt2/include/gt2auth.inc
diff --git a/lib/NitroDWC/asm/gs/gt2/include/gt2buffer.inc b/lib/gamespy/asm/gt2/include/gt2buffer.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/include/gt2buffer.inc
rename to lib/gamespy/asm/gt2/include/gt2buffer.inc
diff --git a/lib/NitroDWC/asm/gs/gt2/include/gt2callback.inc b/lib/gamespy/asm/gt2/include/gt2callback.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/include/gt2callback.inc
rename to lib/gamespy/asm/gt2/include/gt2callback.inc
diff --git a/lib/NitroDWC/asm/gs/gt2/include/gt2connection.inc b/lib/gamespy/asm/gt2/include/gt2connection.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/include/gt2connection.inc
rename to lib/gamespy/asm/gt2/include/gt2connection.inc
diff --git a/lib/NitroDWC/asm/gs/gt2/include/gt2main.inc b/lib/gamespy/asm/gt2/include/gt2main.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/include/gt2main.inc
rename to lib/gamespy/asm/gt2/include/gt2main.inc
diff --git a/lib/NitroDWC/asm/gs/gt2/include/gt2message.inc b/lib/gamespy/asm/gt2/include/gt2message.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/include/gt2message.inc
rename to lib/gamespy/asm/gt2/include/gt2message.inc
diff --git a/lib/NitroDWC/asm/gs/gt2/include/gt2socket.inc b/lib/gamespy/asm/gt2/include/gt2socket.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/include/gt2socket.inc
rename to lib/gamespy/asm/gt2/include/gt2socket.inc
diff --git a/lib/NitroDWC/asm/gs/gt2/include/gt2utility.inc b/lib/gamespy/asm/gt2/include/gt2utility.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/gt2/include/gt2utility.inc
rename to lib/gamespy/asm/gt2/include/gt2utility.inc
diff --git a/lib/NitroDWC/asm/gs/hashtable.s b/lib/gamespy/asm/hashtable.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/hashtable.s
rename to lib/gamespy/asm/hashtable.s
diff --git a/lib/NitroDWC/asm/gs/include/available.inc b/lib/gamespy/asm/include/available.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/include/available.inc
rename to lib/gamespy/asm/include/available.inc
diff --git a/lib/NitroDWC/asm/gs/include/darray.inc b/lib/gamespy/asm/include/darray.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/include/darray.inc
rename to lib/gamespy/asm/include/darray.inc
diff --git a/lib/NitroDWC/asm/gs/include/hashtable.inc b/lib/gamespy/asm/include/hashtable.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/include/hashtable.inc
rename to lib/gamespy/asm/include/hashtable.inc
diff --git a/lib/NitroDWC/asm/gs/include/md5c.inc b/lib/gamespy/asm/include/md5c.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/include/md5c.inc
rename to lib/gamespy/asm/include/md5c.inc
diff --git a/lib/NitroDWC/asm/gs/include/nonport.inc b/lib/gamespy/asm/include/nonport.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/include/nonport.inc
rename to lib/gamespy/asm/include/nonport.inc
diff --git a/lib/NitroDWC/asm/gs/md5c.s b/lib/gamespy/asm/md5c.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/md5c.s
rename to lib/gamespy/asm/md5c.s
diff --git a/lib/NitroDWC/asm/gs/natneg/include/natneg.inc b/lib/gamespy/asm/natneg/include/natneg.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/natneg/include/natneg.inc
rename to lib/gamespy/asm/natneg/include/natneg.inc
diff --git a/lib/NitroDWC/asm/gs/natneg/natneg.s b/lib/gamespy/asm/natneg/natneg.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/natneg/natneg.s
rename to lib/gamespy/asm/natneg/natneg.s
diff --git a/lib/NitroDWC/asm/gs/nonport.s b/lib/gamespy/asm/nonport.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/nonport.s
rename to lib/gamespy/asm/nonport.s
diff --git a/lib/NitroDWC/asm/gs/qr2/include/qr2.inc b/lib/gamespy/asm/qr2/include/qr2.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/qr2/include/qr2.inc
rename to lib/gamespy/asm/qr2/include/qr2.inc
diff --git a/lib/NitroDWC/asm/gs/qr2/qr2.s b/lib/gamespy/asm/qr2/qr2.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/qr2/qr2.s
rename to lib/gamespy/asm/qr2/qr2.s
diff --git a/lib/NitroDWC/asm/gs/qr2/qr2regkeys.s b/lib/gamespy/asm/qr2/qr2regkeys.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/qr2/qr2regkeys.s
rename to lib/gamespy/asm/qr2/qr2regkeys.s
diff --git a/lib/NitroDWC/asm/gs/serverbrowsing/include/sb_crypt.inc b/lib/gamespy/asm/serverbrowsing/include/sb_crypt.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/serverbrowsing/include/sb_crypt.inc
rename to lib/gamespy/asm/serverbrowsing/include/sb_crypt.inc
diff --git a/lib/NitroDWC/asm/gs/serverbrowsing/include/sb_queryengine.inc b/lib/gamespy/asm/serverbrowsing/include/sb_queryengine.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/serverbrowsing/include/sb_queryengine.inc
rename to lib/gamespy/asm/serverbrowsing/include/sb_queryengine.inc
diff --git a/lib/NitroDWC/asm/gs/serverbrowsing/include/sb_server.inc b/lib/gamespy/asm/serverbrowsing/include/sb_server.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/serverbrowsing/include/sb_server.inc
rename to lib/gamespy/asm/serverbrowsing/include/sb_server.inc
diff --git a/lib/NitroDWC/asm/gs/serverbrowsing/include/sb_serverbrowsing.inc b/lib/gamespy/asm/serverbrowsing/include/sb_serverbrowsing.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/serverbrowsing/include/sb_serverbrowsing.inc
rename to lib/gamespy/asm/serverbrowsing/include/sb_serverbrowsing.inc
diff --git a/lib/NitroDWC/asm/gs/serverbrowsing/include/sb_serverlist.inc b/lib/gamespy/asm/serverbrowsing/include/sb_serverlist.inc
similarity index 100%
rename from lib/NitroDWC/asm/gs/serverbrowsing/include/sb_serverlist.inc
rename to lib/gamespy/asm/serverbrowsing/include/sb_serverlist.inc
diff --git a/lib/NitroDWC/asm/gs/serverbrowsing/sb_crypt.s b/lib/gamespy/asm/serverbrowsing/sb_crypt.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/serverbrowsing/sb_crypt.s
rename to lib/gamespy/asm/serverbrowsing/sb_crypt.s
diff --git a/lib/NitroDWC/asm/gs/serverbrowsing/sb_queryengine.s b/lib/gamespy/asm/serverbrowsing/sb_queryengine.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/serverbrowsing/sb_queryengine.s
rename to lib/gamespy/asm/serverbrowsing/sb_queryengine.s
diff --git a/lib/NitroDWC/asm/gs/serverbrowsing/sb_server.s b/lib/gamespy/asm/serverbrowsing/sb_server.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/serverbrowsing/sb_server.s
rename to lib/gamespy/asm/serverbrowsing/sb_server.s
diff --git a/lib/NitroDWC/asm/gs/serverbrowsing/sb_serverbrowsing.s b/lib/gamespy/asm/serverbrowsing/sb_serverbrowsing.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/serverbrowsing/sb_serverbrowsing.s
rename to lib/gamespy/asm/serverbrowsing/sb_serverbrowsing.s
diff --git a/lib/NitroDWC/asm/gs/serverbrowsing/sb_serverlist.s b/lib/gamespy/asm/serverbrowsing/sb_serverlist.s
similarity index 100%
rename from lib/NitroDWC/asm/gs/serverbrowsing/sb_serverlist.s
rename to lib/gamespy/asm/serverbrowsing/sb_serverlist.s
diff --git a/lib/NitroDWC/include/gs/available.h b/lib/gamespy/include/gs/available.h
similarity index 100%
rename from lib/NitroDWC/include/gs/available.h
rename to lib/gamespy/include/gs/available.h
diff --git a/lib/NitroDWC/include/gs/chat/chat.h b/lib/gamespy/include/gs/chat/chat.h
similarity index 100%
rename from lib/NitroDWC/include/gs/chat/chat.h
rename to lib/gamespy/include/gs/chat/chat.h
diff --git a/lib/NitroDWC/include/gs/chat/chatASCII.h b/lib/gamespy/include/gs/chat/chatASCII.h
similarity index 100%
rename from lib/NitroDWC/include/gs/chat/chatASCII.h
rename to lib/gamespy/include/gs/chat/chatASCII.h
diff --git a/lib/NitroDWC/include/gs/chat/chatCallbacks.h b/lib/gamespy/include/gs/chat/chatCallbacks.h
similarity index 100%
rename from lib/NitroDWC/include/gs/chat/chatCallbacks.h
rename to lib/gamespy/include/gs/chat/chatCallbacks.h
diff --git a/lib/NitroDWC/include/gs/chat/chatChannel.h b/lib/gamespy/include/gs/chat/chatChannel.h
similarity index 100%
rename from lib/NitroDWC/include/gs/chat/chatChannel.h
rename to lib/gamespy/include/gs/chat/chatChannel.h
diff --git a/lib/NitroDWC/include/gs/chat/chatCrypt.h b/lib/gamespy/include/gs/chat/chatCrypt.h
similarity index 100%
rename from lib/NitroDWC/include/gs/chat/chatCrypt.h
rename to lib/gamespy/include/gs/chat/chatCrypt.h
diff --git a/lib/NitroDWC/include/gs/chat/chatHandlers.h b/lib/gamespy/include/gs/chat/chatHandlers.h
similarity index 100%
rename from lib/NitroDWC/include/gs/chat/chatHandlers.h
rename to lib/gamespy/include/gs/chat/chatHandlers.h
diff --git a/lib/NitroDWC/include/gs/chat/chatMain.h b/lib/gamespy/include/gs/chat/chatMain.h
similarity index 100%
rename from lib/NitroDWC/include/gs/chat/chatMain.h
rename to lib/gamespy/include/gs/chat/chatMain.h
diff --git a/lib/NitroDWC/include/gs/chat/chatSocket.h b/lib/gamespy/include/gs/chat/chatSocket.h
similarity index 100%
rename from lib/NitroDWC/include/gs/chat/chatSocket.h
rename to lib/gamespy/include/gs/chat/chatSocket.h
diff --git a/lib/NitroDWC/include/gs/core.h b/lib/gamespy/include/gs/core.h
similarity index 100%
rename from lib/NitroDWC/include/gs/core.h
rename to lib/gamespy/include/gs/core.h
diff --git a/lib/NitroDWC/include/gs/darray.h b/lib/gamespy/include/gs/darray.h
similarity index 100%
rename from lib/NitroDWC/include/gs/darray.h
rename to lib/gamespy/include/gs/darray.h
diff --git a/lib/NitroDWC/include/gs/dummy_auth.h b/lib/gamespy/include/gs/dummy_auth.h
similarity index 100%
rename from lib/NitroDWC/include/gs/dummy_auth.h
rename to lib/gamespy/include/gs/dummy_auth.h
diff --git a/lib/NitroDWC/include/gs/ghttp/ghttp.h b/lib/gamespy/include/gs/ghttp/ghttp.h
similarity index 100%
rename from lib/NitroDWC/include/gs/ghttp/ghttp.h
rename to lib/gamespy/include/gs/ghttp/ghttp.h
diff --git a/lib/NitroDWC/include/gs/ghttp/ghttpASCII.h b/lib/gamespy/include/gs/ghttp/ghttpASCII.h
similarity index 100%
rename from lib/NitroDWC/include/gs/ghttp/ghttpASCII.h
rename to lib/gamespy/include/gs/ghttp/ghttpASCII.h
diff --git a/lib/NitroDWC/include/gs/ghttp/ghttpBuffer.h b/lib/gamespy/include/gs/ghttp/ghttpBuffer.h
similarity index 100%
rename from lib/NitroDWC/include/gs/ghttp/ghttpBuffer.h
rename to lib/gamespy/include/gs/ghttp/ghttpBuffer.h
diff --git a/lib/NitroDWC/include/gs/ghttp/ghttpCallbacks.h b/lib/gamespy/include/gs/ghttp/ghttpCallbacks.h
similarity index 100%
rename from lib/NitroDWC/include/gs/ghttp/ghttpCallbacks.h
rename to lib/gamespy/include/gs/ghttp/ghttpCallbacks.h
diff --git a/lib/NitroDWC/include/gs/ghttp/ghttpCommon.h b/lib/gamespy/include/gs/ghttp/ghttpCommon.h
similarity index 100%
rename from lib/NitroDWC/include/gs/ghttp/ghttpCommon.h
rename to lib/gamespy/include/gs/ghttp/ghttpCommon.h
diff --git a/lib/NitroDWC/include/gs/ghttp/ghttpConnection.h b/lib/gamespy/include/gs/ghttp/ghttpConnection.h
similarity index 100%
rename from lib/NitroDWC/include/gs/ghttp/ghttpConnection.h
rename to lib/gamespy/include/gs/ghttp/ghttpConnection.h
diff --git a/lib/NitroDWC/include/gs/ghttp/ghttpEncryption.h b/lib/gamespy/include/gs/ghttp/ghttpEncryption.h
similarity index 100%
rename from lib/NitroDWC/include/gs/ghttp/ghttpEncryption.h
rename to lib/gamespy/include/gs/ghttp/ghttpEncryption.h
diff --git a/lib/NitroDWC/include/gs/ghttp/ghttpMain.h b/lib/gamespy/include/gs/ghttp/ghttpMain.h
similarity index 100%
rename from lib/NitroDWC/include/gs/ghttp/ghttpMain.h
rename to lib/gamespy/include/gs/ghttp/ghttpMain.h
diff --git a/lib/NitroDWC/include/gs/ghttp/ghttpPost.h b/lib/gamespy/include/gs/ghttp/ghttpPost.h
similarity index 100%
rename from lib/NitroDWC/include/gs/ghttp/ghttpPost.h
rename to lib/gamespy/include/gs/ghttp/ghttpPost.h
diff --git a/lib/NitroDWC/include/gs/ghttp/ghttpProcess.h b/lib/gamespy/include/gs/ghttp/ghttpProcess.h
similarity index 100%
rename from lib/NitroDWC/include/gs/ghttp/ghttpProcess.h
rename to lib/gamespy/include/gs/ghttp/ghttpProcess.h
diff --git a/lib/NitroDWC/include/gs/gp/gp.h b/lib/gamespy/include/gs/gp/gp.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gp/gp.h
rename to lib/gamespy/include/gs/gp/gp.h
diff --git a/lib/NitroDWC/include/gs/gp/gpi.h b/lib/gamespy/include/gs/gp/gpi.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gp/gpi.h
rename to lib/gamespy/include/gs/gp/gpi.h
diff --git a/lib/NitroDWC/include/gs/gp/gpiBuddy.h b/lib/gamespy/include/gs/gp/gpiBuddy.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gp/gpiBuddy.h
rename to lib/gamespy/include/gs/gp/gpiBuddy.h
diff --git a/lib/NitroDWC/include/gs/gp/gpiBuffer.h b/lib/gamespy/include/gs/gp/gpiBuffer.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gp/gpiBuffer.h
rename to lib/gamespy/include/gs/gp/gpiBuffer.h
diff --git a/lib/NitroDWC/include/gs/gp/gpiCallback.h b/lib/gamespy/include/gs/gp/gpiCallback.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gp/gpiCallback.h
rename to lib/gamespy/include/gs/gp/gpiCallback.h
diff --git a/lib/NitroDWC/include/gs/gp/gpiConnect.h b/lib/gamespy/include/gs/gp/gpiConnect.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gp/gpiConnect.h
rename to lib/gamespy/include/gs/gp/gpiConnect.h
diff --git a/lib/NitroDWC/include/gs/gp/gpiInfo.h b/lib/gamespy/include/gs/gp/gpiInfo.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gp/gpiInfo.h
rename to lib/gamespy/include/gs/gp/gpiInfo.h
diff --git a/lib/NitroDWC/include/gs/gp/gpiOperation.h b/lib/gamespy/include/gs/gp/gpiOperation.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gp/gpiOperation.h
rename to lib/gamespy/include/gs/gp/gpiOperation.h
diff --git a/lib/NitroDWC/include/gs/gp/gpiPeer.h b/lib/gamespy/include/gs/gp/gpiPeer.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gp/gpiPeer.h
rename to lib/gamespy/include/gs/gp/gpiPeer.h
diff --git a/lib/NitroDWC/include/gs/gp/gpiProfile.h b/lib/gamespy/include/gs/gp/gpiProfile.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gp/gpiProfile.h
rename to lib/gamespy/include/gs/gp/gpiProfile.h
diff --git a/lib/NitroDWC/include/gs/gp/gpiSearch.h b/lib/gamespy/include/gs/gp/gpiSearch.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gp/gpiSearch.h
rename to lib/gamespy/include/gs/gp/gpiSearch.h
diff --git a/lib/NitroDWC/include/gs/gp/gpiTransfer.h b/lib/gamespy/include/gs/gp/gpiTransfer.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gp/gpiTransfer.h
rename to lib/gamespy/include/gs/gp/gpiTransfer.h
diff --git a/lib/NitroDWC/include/gs/gp/gpiUnique.h b/lib/gamespy/include/gs/gp/gpiUnique.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gp/gpiUnique.h
rename to lib/gamespy/include/gs/gp/gpiUnique.h
diff --git a/lib/NitroDWC/include/gs/gp/gpiUtility.h b/lib/gamespy/include/gs/gp/gpiUtility.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gp/gpiUtility.h
rename to lib/gamespy/include/gs/gp/gpiUtility.h
diff --git a/lib/NitroDWC/include/gs/gsiDebug.h b/lib/gamespy/include/gs/gsiDebug.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gsiDebug.h
rename to lib/gamespy/include/gs/gsiDebug.h
diff --git a/lib/NitroDWC/include/gs/gsiMemory.h b/lib/gamespy/include/gs/gsiMemory.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gsiMemory.h
rename to lib/gamespy/include/gs/gsiMemory.h
diff --git a/lib/NitroDWC/include/gs/gstats/gbucket.h b/lib/gamespy/include/gs/gstats/gbucket.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gstats/gbucket.h
rename to lib/gamespy/include/gs/gstats/gbucket.h
diff --git a/lib/NitroDWC/include/gs/gstats/gpersist.h b/lib/gamespy/include/gs/gstats/gpersist.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gstats/gpersist.h
rename to lib/gamespy/include/gs/gstats/gpersist.h
diff --git a/lib/NitroDWC/include/gs/gstats/gstats.h b/lib/gamespy/include/gs/gstats/gstats.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gstats/gstats.h
rename to lib/gamespy/include/gs/gstats/gstats.h
diff --git a/lib/NitroDWC/include/gs/gt2/gt2.h b/lib/gamespy/include/gs/gt2/gt2.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gt2/gt2.h
rename to lib/gamespy/include/gs/gt2/gt2.h
diff --git a/lib/NitroDWC/include/gs/gt2/gt2Auth.h b/lib/gamespy/include/gs/gt2/gt2Auth.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gt2/gt2Auth.h
rename to lib/gamespy/include/gs/gt2/gt2Auth.h
diff --git a/lib/NitroDWC/include/gs/gt2/gt2Buffer.h b/lib/gamespy/include/gs/gt2/gt2Buffer.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gt2/gt2Buffer.h
rename to lib/gamespy/include/gs/gt2/gt2Buffer.h
diff --git a/lib/NitroDWC/include/gs/gt2/gt2Callback.h b/lib/gamespy/include/gs/gt2/gt2Callback.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gt2/gt2Callback.h
rename to lib/gamespy/include/gs/gt2/gt2Callback.h
diff --git a/lib/NitroDWC/include/gs/gt2/gt2Connection.h b/lib/gamespy/include/gs/gt2/gt2Connection.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gt2/gt2Connection.h
rename to lib/gamespy/include/gs/gt2/gt2Connection.h
diff --git a/lib/NitroDWC/include/gs/gt2/gt2Encode.h b/lib/gamespy/include/gs/gt2/gt2Encode.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gt2/gt2Encode.h
rename to lib/gamespy/include/gs/gt2/gt2Encode.h
diff --git a/lib/NitroDWC/include/gs/gt2/gt2Filter.h b/lib/gamespy/include/gs/gt2/gt2Filter.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gt2/gt2Filter.h
rename to lib/gamespy/include/gs/gt2/gt2Filter.h
diff --git a/lib/NitroDWC/include/gs/gt2/gt2Main.h b/lib/gamespy/include/gs/gt2/gt2Main.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gt2/gt2Main.h
rename to lib/gamespy/include/gs/gt2/gt2Main.h
diff --git a/lib/NitroDWC/include/gs/gt2/gt2Message.h b/lib/gamespy/include/gs/gt2/gt2Message.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gt2/gt2Message.h
rename to lib/gamespy/include/gs/gt2/gt2Message.h
diff --git a/lib/NitroDWC/include/gs/gt2/gt2Socket.h b/lib/gamespy/include/gs/gt2/gt2Socket.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gt2/gt2Socket.h
rename to lib/gamespy/include/gs/gt2/gt2Socket.h
diff --git a/lib/NitroDWC/include/gs/gt2/gt2Utility.h b/lib/gamespy/include/gs/gt2/gt2Utility.h
similarity index 100%
rename from lib/NitroDWC/include/gs/gt2/gt2Utility.h
rename to lib/gamespy/include/gs/gt2/gt2Utility.h
diff --git a/lib/NitroDWC/include/gs/hashtable.h b/lib/gamespy/include/gs/hashtable.h
similarity index 100%
rename from lib/NitroDWC/include/gs/hashtable.h
rename to lib/gamespy/include/gs/hashtable.h
diff --git a/lib/NitroDWC/include/gs/md5.h b/lib/gamespy/include/gs/md5.h
similarity index 100%
rename from lib/NitroDWC/include/gs/md5.h
rename to lib/gamespy/include/gs/md5.h
diff --git a/lib/NitroDWC/include/gs/natneg/natneg.h b/lib/gamespy/include/gs/natneg/natneg.h
similarity index 100%
rename from lib/NitroDWC/include/gs/natneg/natneg.h
rename to lib/gamespy/include/gs/natneg/natneg.h
diff --git a/lib/NitroDWC/include/gs/natneg/nninternal.h b/lib/gamespy/include/gs/natneg/nninternal.h
similarity index 100%
rename from lib/NitroDWC/include/gs/natneg/nninternal.h
rename to lib/gamespy/include/gs/natneg/nninternal.h
diff --git a/lib/NitroDWC/include/gs/nonport.h b/lib/gamespy/include/gs/nonport.h
similarity index 100%
rename from lib/NitroDWC/include/gs/nonport.h
rename to lib/gamespy/include/gs/nonport.h
diff --git a/lib/NitroDWC/include/gs/qr2/qr2.h b/lib/gamespy/include/gs/qr2/qr2.h
similarity index 100%
rename from lib/NitroDWC/include/gs/qr2/qr2.h
rename to lib/gamespy/include/gs/qr2/qr2.h
diff --git a/lib/NitroDWC/include/gs/qr2/qr2regkeys.h b/lib/gamespy/include/gs/qr2/qr2regkeys.h
similarity index 100%
rename from lib/NitroDWC/include/gs/qr2/qr2regkeys.h
rename to lib/gamespy/include/gs/qr2/qr2regkeys.h
diff --git a/lib/NitroDWC/include/gs/serverbrowsing/sb_ascii.h b/lib/gamespy/include/gs/serverbrowsing/sb_ascii.h
similarity index 100%
rename from lib/NitroDWC/include/gs/serverbrowsing/sb_ascii.h
rename to lib/gamespy/include/gs/serverbrowsing/sb_ascii.h
diff --git a/lib/NitroDWC/include/gs/serverbrowsing/sb_crypt.h b/lib/gamespy/include/gs/serverbrowsing/sb_crypt.h
similarity index 100%
rename from lib/NitroDWC/include/gs/serverbrowsing/sb_crypt.h
rename to lib/gamespy/include/gs/serverbrowsing/sb_crypt.h
diff --git a/lib/NitroDWC/include/gs/serverbrowsing/sb_internal.h b/lib/gamespy/include/gs/serverbrowsing/sb_internal.h
similarity index 100%
rename from lib/NitroDWC/include/gs/serverbrowsing/sb_internal.h
rename to lib/gamespy/include/gs/serverbrowsing/sb_internal.h
diff --git a/lib/NitroDWC/include/gs/serverbrowsing/sb_serverbrowsing.h b/lib/gamespy/include/gs/serverbrowsing/sb_serverbrowsing.h
similarity index 100%
rename from lib/NitroDWC/include/gs/serverbrowsing/sb_serverbrowsing.h
rename to lib/gamespy/include/gs/serverbrowsing/sb_serverbrowsing.h
diff --git a/lib/NitroDWC/include/gs/soap.h b/lib/gamespy/include/gs/soap.h
similarity index 100%
rename from lib/NitroDWC/include/gs/soap.h
rename to lib/gamespy/include/gs/soap.h
diff --git a/lib/NitroDWC/include/gs/stringutil.h b/lib/gamespy/include/gs/stringutil.h
similarity index 100%
rename from lib/NitroDWC/include/gs/stringutil.h
rename to lib/gamespy/include/gs/stringutil.h
diff --git a/main.lsf b/main.lsf
index cb918f546b..46930777b0 100644
--- a/main.lsf
+++ b/main.lsf
@@ -732,43 +732,43 @@ Overlay overlay4
 	Object lib/NitroDWC/asm/ac/shop_usb.o
 	Object lib/NitroDWC/asm/ac/wds.o
 	Object lib/NitroDWC/asm/ac/nintendospot.o
-	Object lib/NitroDWC/asm/gs/available.o
-	Object lib/NitroDWC/asm/gs/darray.o
-	Object lib/NitroDWC/asm/gs/hashtable.o
-	Object lib/NitroDWC/asm/gs/md5c.o
-	Object lib/NitroDWC/asm/gs/nonport.o
-	Object lib/NitroDWC/asm/gs/gp/gp.o
-	Object lib/NitroDWC/asm/gs/gp/gpi.o
-	Object lib/NitroDWC/asm/gs/gp/gpibuddy.o
-	Object lib/NitroDWC/asm/gs/gp/gpibuffer.o
-	Object lib/NitroDWC/asm/gs/gp/gpicallback.o
-	Object lib/NitroDWC/asm/gs/gp/gpiconnect.o
-	Object lib/NitroDWC/asm/gs/gp/gpiinfo.o
-	Object lib/NitroDWC/asm/gs/gp/gpioperation.o
-	Object lib/NitroDWC/asm/gs/gp/gpipeer.o
-	Object lib/NitroDWC/asm/gs/gp/gpiprofile.o
-	Object lib/NitroDWC/asm/gs/gp/gpisearch.o
-	Object lib/NitroDWC/asm/gs/gp/gpitransfer.o
-	Object lib/NitroDWC/asm/gs/gp/gpiunique.o
-	Object lib/NitroDWC/asm/gs/gp/gpiutility.o
-	Object lib/NitroDWC/asm/gs/gstats/gbucket.o
-	Object lib/NitroDWC/asm/gs/gstats/gstats.o
-	Object lib/NitroDWC/asm/gs/gt2/gt2auth.o
-	Object lib/NitroDWC/asm/gs/gt2/gt2buffer.o
-	Object lib/NitroDWC/asm/gs/gt2/gt2callback.o
-	Object lib/NitroDWC/asm/gs/gt2/gt2connection.o
-	Object lib/NitroDWC/asm/gs/gt2/gt2main.o
-	Object lib/NitroDWC/asm/gs/gt2/gt2message.o
-	Object lib/NitroDWC/asm/gs/gt2/gt2socket.o
-	Object lib/NitroDWC/asm/gs/gt2/gt2utility.o
-	Object lib/NitroDWC/asm/gs/natneg/natneg.o
-	Object lib/NitroDWC/asm/gs/qr2/qr2.o
-	Object lib/NitroDWC/asm/gs/qr2/qr2regkeys.o
-	Object lib/NitroDWC/asm/gs/serverbrowsing/sb_crypt.o
-	Object lib/NitroDWC/asm/gs/serverbrowsing/sb_queryengine.o
-	Object lib/NitroDWC/asm/gs/serverbrowsing/sb_server.o
-	Object lib/NitroDWC/asm/gs/serverbrowsing/sb_serverbrowsing.o
-	Object lib/NitroDWC/asm/gs/serverbrowsing/sb_serverlist.o
+	Object lib/gamespy/asm/available.o
+	Object lib/gamespy/asm/darray.o
+	Object lib/gamespy/asm/hashtable.o
+	Object lib/gamespy/asm/md5c.o
+	Object lib/gamespy/asm/nonport.o
+	Object lib/gamespy/asm/gp/gp.o
+	Object lib/gamespy/asm/gp/gpi.o
+	Object lib/gamespy/asm/gp/gpibuddy.o
+	Object lib/gamespy/asm/gp/gpibuffer.o
+	Object lib/gamespy/asm/gp/gpicallback.o
+	Object lib/gamespy/asm/gp/gpiconnect.o
+	Object lib/gamespy/asm/gp/gpiinfo.o
+	Object lib/gamespy/asm/gp/gpioperation.o
+	Object lib/gamespy/asm/gp/gpipeer.o
+	Object lib/gamespy/asm/gp/gpiprofile.o
+	Object lib/gamespy/asm/gp/gpisearch.o
+	Object lib/gamespy/asm/gp/gpitransfer.o
+	Object lib/gamespy/asm/gp/gpiunique.o
+	Object lib/gamespy/asm/gp/gpiutility.o
+	Object lib/gamespy/asm/gstats/gbucket.o
+	Object lib/gamespy/asm/gstats/gstats.o
+	Object lib/gamespy/asm/gt2/gt2auth.o
+	Object lib/gamespy/asm/gt2/gt2buffer.o
+	Object lib/gamespy/asm/gt2/gt2callback.o
+	Object lib/gamespy/asm/gt2/gt2connection.o
+	Object lib/gamespy/asm/gt2/gt2main.o
+	Object lib/gamespy/asm/gt2/gt2message.o
+	Object lib/gamespy/asm/gt2/gt2socket.o
+	Object lib/gamespy/asm/gt2/gt2utility.o
+	Object lib/gamespy/asm/natneg/natneg.o
+	Object lib/gamespy/asm/qr2/qr2.o
+	Object lib/gamespy/asm/qr2/qr2regkeys.o
+	Object lib/gamespy/asm/serverbrowsing/sb_crypt.o
+	Object lib/gamespy/asm/serverbrowsing/sb_queryengine.o
+	Object lib/gamespy/asm/serverbrowsing/sb_server.o
+	Object lib/gamespy/asm/serverbrowsing/sb_serverbrowsing.o
+	Object lib/gamespy/asm/serverbrowsing/sb_serverlist.o
 	Object lib/libVCT/asm/adpcm.o
 	Object lib/libVCT/asm/audio.o
 	Object lib/libVCT/asm/decoder.o