diff --git a/gamedata/_avalanche b/gamedata/engines/avalanche
similarity index 100%
rename from gamedata/_avalanche
rename to gamedata/engines/avalanche
diff --git a/gamedata/_dontstarve b/gamedata/engines/dontstarve
similarity index 100%
rename from gamedata/_dontstarve
rename to gamedata/engines/dontstarve
diff --git a/gamedata/_goldsource b/gamedata/engines/goldsource
similarity index 100%
rename from gamedata/_goldsource
rename to gamedata/engines/goldsource
diff --git a/gamedata/_halflife_shared b/gamedata/engines/halflife_shared
similarity index 100%
rename from gamedata/_halflife_shared
rename to gamedata/engines/halflife_shared
diff --git a/gamedata/_idtech3 b/gamedata/engines/idtech3
similarity index 100%
rename from gamedata/_idtech3
rename to gamedata/engines/idtech3
diff --git a/gamedata/_projectzomboid b/gamedata/engines/projectzomboid
similarity index 100%
rename from gamedata/_projectzomboid
rename to gamedata/engines/projectzomboid
diff --git a/gamedata/_realvirtuality b/gamedata/engines/realvirtuality
similarity index 100%
rename from gamedata/_realvirtuality
rename to gamedata/engines/realvirtuality
diff --git a/gamedata/_seriousengine35 b/gamedata/engines/seriousengine35
similarity index 100%
rename from gamedata/_seriousengine35
rename to gamedata/engines/seriousengine35
diff --git a/gamedata/_spark b/gamedata/engines/spark
similarity index 100%
rename from gamedata/_spark
rename to gamedata/engines/spark
diff --git a/gamedata/_starbound b/gamedata/engines/starbound
similarity index 100%
rename from gamedata/_starbound
rename to gamedata/engines/starbound
diff --git a/gamedata/_teeworlds b/gamedata/engines/teeworlds
similarity index 100%
rename from gamedata/_teeworlds
rename to gamedata/engines/teeworlds
diff --git a/gamedata/_terraria b/gamedata/engines/terraria
similarity index 100%
rename from gamedata/_terraria
rename to gamedata/engines/terraria
diff --git a/gamedata/_unity3d b/gamedata/engines/unity3d
similarity index 100%
rename from gamedata/_unity3d
rename to gamedata/engines/unity3d
diff --git a/gamedata/_unreal b/gamedata/engines/unreal
similarity index 100%
rename from gamedata/_unreal
rename to gamedata/engines/unreal
diff --git a/gamedata/_unreal2 b/gamedata/engines/unreal2
similarity index 100%
rename from gamedata/_unreal2
rename to gamedata/engines/unreal2
diff --git a/gamedata/_unreal4 b/gamedata/engines/unreal4
similarity index 100%
rename from gamedata/_unreal4
rename to gamedata/engines/unreal4
diff --git a/gamedata/_unreal_shared b/gamedata/engines/unreal_shared
similarity index 100%
rename from gamedata/_unreal_shared
rename to gamedata/engines/unreal_shared
diff --git a/gamedata/arkserver b/gamedata/games/arkserver
similarity index 100%
rename from gamedata/arkserver
rename to gamedata/games/arkserver
diff --git a/gamedata/arma3server b/gamedata/games/arma3server
similarity index 100%
rename from gamedata/arma3server
rename to gamedata/games/arma3server
diff --git a/gamedata/bb2server b/gamedata/games/bb2server
similarity index 100%
rename from gamedata/bb2server
rename to gamedata/games/bb2server
diff --git a/gamedata/bmdmserver b/gamedata/games/bmdmserver
similarity index 100%
rename from gamedata/bmdmserver
rename to gamedata/games/bmdmserver
diff --git a/gamedata/bsserver b/gamedata/games/bsserver
similarity index 100%
rename from gamedata/bsserver
rename to gamedata/games/bsserver
diff --git a/gamedata/ccserver b/gamedata/games/ccserver
similarity index 100%
rename from gamedata/ccserver
rename to gamedata/games/ccserver
diff --git a/gamedata/csczserver b/gamedata/games/csczserver
similarity index 100%
rename from gamedata/csczserver
rename to gamedata/games/csczserver
diff --git a/gamedata/csgoserver b/gamedata/games/csgoserver
similarity index 100%
rename from gamedata/csgoserver
rename to gamedata/games/csgoserver
diff --git a/gamedata/csserver b/gamedata/games/csserver
similarity index 100%
rename from gamedata/csserver
rename to gamedata/games/csserver
diff --git a/gamedata/cssserver b/gamedata/games/cssserver
similarity index 100%
rename from gamedata/cssserver
rename to gamedata/games/cssserver
diff --git a/gamedata/dabserver b/gamedata/games/dabserver
similarity index 100%
rename from gamedata/dabserver
rename to gamedata/games/dabserver
diff --git a/gamedata/dmcserver b/gamedata/games/dmcserver
similarity index 100%
rename from gamedata/dmcserver
rename to gamedata/games/dmcserver
diff --git a/gamedata/dodserver b/gamedata/games/dodserver
similarity index 100%
rename from gamedata/dodserver
rename to gamedata/games/dodserver
diff --git a/gamedata/dodsserver b/gamedata/games/dodsserver
similarity index 100%
rename from gamedata/dodsserver
rename to gamedata/games/dodsserver
diff --git a/gamedata/dstserver b/gamedata/games/dstserver
similarity index 100%
rename from gamedata/dstserver
rename to gamedata/games/dstserver
diff --git a/gamedata/fofserver b/gamedata/games/fofserver
similarity index 100%
rename from gamedata/fofserver
rename to gamedata/games/fofserver
diff --git a/gamedata/gesserver b/gamedata/games/gesserver
similarity index 100%
rename from gamedata/gesserver
rename to gamedata/games/gesserver
diff --git a/gamedata/gmodserver b/gamedata/games/gmodserver
similarity index 100%
rename from gamedata/gmodserver
rename to gamedata/games/gmodserver
diff --git a/gamedata/hl2dmserver b/gamedata/games/hl2dmserver
similarity index 100%
rename from gamedata/hl2dmserver
rename to gamedata/games/hl2dmserver
diff --git a/gamedata/hldmserver b/gamedata/games/hldmserver
similarity index 100%
rename from gamedata/hldmserver
rename to gamedata/games/hldmserver
diff --git a/gamedata/hldmsserver b/gamedata/games/hldmsserver
similarity index 100%
rename from gamedata/hldmsserver
rename to gamedata/games/hldmsserver
diff --git a/gamedata/hwserver b/gamedata/games/hwserver
similarity index 100%
rename from gamedata/hwserver
rename to gamedata/games/hwserver
diff --git a/gamedata/insserver b/gamedata/games/insserver
similarity index 100%
rename from gamedata/insserver
rename to gamedata/games/insserver
diff --git a/gamedata/jc2server b/gamedata/games/jc2server
similarity index 100%
rename from gamedata/jc2server
rename to gamedata/games/jc2server
diff --git a/gamedata/kfserver b/gamedata/games/kfserver
similarity index 100%
rename from gamedata/kfserver
rename to gamedata/games/kfserver
diff --git a/gamedata/l4d2server b/gamedata/games/l4d2server
similarity index 100%
rename from gamedata/l4d2server
rename to gamedata/games/l4d2server
diff --git a/gamedata/l4dserver b/gamedata/games/l4dserver
similarity index 100%
rename from gamedata/l4dserver
rename to gamedata/games/l4dserver
diff --git a/gamedata/mumbleserver b/gamedata/games/mumbleserver
similarity index 100%
rename from gamedata/mumbleserver
rename to gamedata/games/mumbleserver
diff --git a/gamedata/nmrihserver b/gamedata/games/nmrihserver
similarity index 100%
rename from gamedata/nmrihserver
rename to gamedata/games/nmrihserver
diff --git a/gamedata/ns2cserver b/gamedata/games/ns2cserver
similarity index 100%
rename from gamedata/ns2cserver
rename to gamedata/games/ns2cserver
diff --git a/gamedata/ns2server b/gamedata/games/ns2server
similarity index 100%
rename from gamedata/ns2server
rename to gamedata/games/ns2server
diff --git a/gamedata/opforserver b/gamedata/games/opforserver
similarity index 100%
rename from gamedata/opforserver
rename to gamedata/games/opforserver
diff --git a/gamedata/pvkiiserver b/gamedata/games/pvkiiserver
similarity index 100%
rename from gamedata/pvkiiserver
rename to gamedata/games/pvkiiserver
diff --git a/gamedata/pzserver b/gamedata/games/pzserver
similarity index 100%
rename from gamedata/pzserver
rename to gamedata/games/pzserver
diff --git a/gamedata/qlserver b/gamedata/games/qlserver
similarity index 100%
rename from gamedata/qlserver
rename to gamedata/games/qlserver
diff --git a/gamedata/ricochetserver b/gamedata/games/ricochetserver
similarity index 100%
rename from gamedata/ricochetserver
rename to gamedata/games/ricochetserver
diff --git a/gamedata/roserver b/gamedata/games/roserver
similarity index 100%
rename from gamedata/roserver
rename to gamedata/games/roserver
diff --git a/gamedata/sbserver b/gamedata/games/sbserver
similarity index 100%
rename from gamedata/sbserver
rename to gamedata/games/sbserver
diff --git a/gamedata/sdtdserver b/gamedata/games/sdtdserver
similarity index 100%
rename from gamedata/sdtdserver
rename to gamedata/games/sdtdserver
diff --git a/gamedata/ss3sserver b/gamedata/games/ss3sserver
similarity index 100%
rename from gamedata/ss3sserver
rename to gamedata/games/ss3sserver
diff --git a/gamedata/svencoopserver b/gamedata/games/svencoopserver
similarity index 100%
rename from gamedata/svencoopserver
rename to gamedata/games/svencoopserver
diff --git a/gamedata/terrariaserver b/gamedata/games/terrariaserver
similarity index 100%
rename from gamedata/terrariaserver
rename to gamedata/games/terrariaserver
diff --git a/gamedata/tf2server b/gamedata/games/tf2server
similarity index 100%
rename from gamedata/tf2server
rename to gamedata/games/tf2server
diff --git a/gamedata/tfcserver b/gamedata/games/tfcserver
similarity index 100%
rename from gamedata/tfcserver
rename to gamedata/games/tfcserver
diff --git a/gamedata/ts3server b/gamedata/games/ts3server
similarity index 100%
rename from gamedata/ts3server
rename to gamedata/games/ts3server
diff --git a/gamedata/twserver b/gamedata/games/twserver
similarity index 100%
rename from gamedata/twserver
rename to gamedata/games/twserver
diff --git a/gamedata/ut2k4server b/gamedata/games/ut2k4server
similarity index 100%
rename from gamedata/ut2k4server
rename to gamedata/games/ut2k4server
diff --git a/gamedata/ut99server b/gamedata/games/ut99server
similarity index 100%
rename from gamedata/ut99server
rename to gamedata/games/ut99server
diff --git a/gamedata/_default b/gamedata/include/default
similarity index 100%
rename from gamedata/_default
rename to gamedata/include/default
diff --git a/gamedata/_gslt b/gamedata/include/gslt
similarity index 100%
rename from gamedata/_gslt
rename to gamedata/include/gslt
diff --git a/gamedata/_mapcyclefile b/gamedata/include/mapcyclefile
similarity index 100%
rename from gamedata/_mapcyclefile
rename to gamedata/include/mapcyclefile
diff --git a/gamedata/_parms b/gamedata/include/parms
similarity index 100%
rename from gamedata/_parms
rename to gamedata/include/parms
diff --git a/gamedata/_parms_plusminus b/gamedata/include/parms_plusminus
similarity index 100%
rename from gamedata/_parms_plusminus
rename to gamedata/include/parms_plusminus
diff --git a/gamedata/_functions b/gamedata/include/random
similarity index 100%
rename from gamedata/_functions
rename to gamedata/include/random
diff --git a/gamedata/_source b/gamedata/include/source
similarity index 100%
rename from gamedata/_source
rename to gamedata/include/source
diff --git a/gamedata/_steam b/gamedata/include/steam
similarity index 100%
rename from gamedata/_steam
rename to gamedata/include/steam
diff --git a/gamedata/_tickrate b/gamedata/include/tickrate
similarity index 100%
rename from gamedata/_tickrate
rename to gamedata/include/tickrate
diff --git a/gamedata/_workshop b/gamedata/include/workshop
similarity index 100%
rename from gamedata/_workshop
rename to gamedata/include/workshop