diff --git a/gamedata/README.md b/gamedata/README.md
index 873647178..900ba6594 100644
--- a/gamedata/README.md
+++ b/gamedata/README.md
@@ -47,10 +47,10 @@ This is an example of a gamedata file for the Widgets engine. We'll call it \_wi
 
 ```bash
 # Import Steam settings
-fn_import_game_settings _steam
+fn_import_game_settings include/steam
 
 # Use + and - parameters
-fn_import_game_settings _parms_plusminus
+fn_import_game_settings include/parms_plusminus
 
 # Game Settings
 fn_set_game_setting settings "appid" "99999" "Steam App ID"
diff --git a/gamedata/engines/avalanche b/gamedata/engines/avalanche
index fc14d470d..40135ee99 100644
--- a/gamedata/engines/avalanche
+++ b/gamedata/engines/avalanche
@@ -1,10 +1,10 @@
 # Game Settings File
-# _avalanche
+# engines/avalanche
 # Avalanche Engine
 
-fn_import_game_settings _steam
-fn_import_game_settings _sourcetv
-fn_import_game_settings _tickrate
+fn_import_game_settings include/steam
+fn_import_game_settings include/sourcetv
+fn_import_game_settings include/tickrate
 
 # Dependencies
 fn_set_game_setting dependencies  "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f"
diff --git a/gamedata/engines/dontstarve b/gamedata/engines/dontstarve
index 11c2ea684..7cf0b420e 100644
--- a/gamedata/engines/dontstarve
+++ b/gamedata/engines/dontstarve
@@ -3,7 +3,7 @@
 # Don't Starve Engine
 
 # Import default settings
-fn_import_game_settings _steam
+fn_import_game_settings include/steam
 
 # And the settings for defaults
 fn_set_game_setting settings "engine" "dontstarve"
diff --git a/gamedata/engines/goldsource b/gamedata/engines/goldsource
index 63f7e4f2a..7a3743ea4 100644
--- a/gamedata/engines/goldsource
+++ b/gamedata/engines/goldsource
@@ -3,7 +3,7 @@
 # Gold Source Engine
 
 # Import default settings
-fn_import_game_settings _halflife_shared
+fn_import_game_settings engines/halflife_shared
 
 
 # And the settings for defaults
diff --git a/gamedata/engines/halflife_shared b/gamedata/engines/halflife_shared
index 59be83da6..d7821011a 100644
--- a/gamedata/engines/halflife_shared
+++ b/gamedata/engines/halflife_shared
@@ -3,9 +3,9 @@
 # Half-Life Shared Engine (Source and GoldSource)
 
 # Import default settings
-fn_import_game_settings _steam
-fn_import_game_settings _parms_plusminus
-fn_import_game_settings _tickrate
+fn_import_game_settings include/steam
+fn_import_game_settings include/parms_plusminus
+fn_import_game_settings include/tickrate
 
 # Dependencies
 fn_set_game_setting settings "dependency_path" "\${filesdir}/bin"
diff --git a/gamedata/engines/idtech3 b/gamedata/engines/idtech3
index 518513595..380d6d716 100644
--- a/gamedata/engines/idtech3
+++ b/gamedata/engines/idtech3
@@ -3,8 +3,8 @@
 # id Tech 3
 
 # Import default settings
-fn_import_game_settings _steam
-fn_import_game_settings _parms
+fn_import_game_settings include/steam
+fn_import_game_settings include/parms
 
 # Dependencies
 fn_set_game_setting settings "arch" "x64" "Architecture to use (x86|x64)"
diff --git a/gamedata/engines/projectzomboid b/gamedata/engines/projectzomboid
index da98686e1..35ccc013c 100644
--- a/gamedata/engines/projectzomboid
+++ b/gamedata/engines/projectzomboid
@@ -3,7 +3,7 @@
 # Project Zomboid Engine
 
 # Import default settings
-fn_import_game_settings _steam
+fn_import_game_settings include/steam
 
 # And the settings for defaults
 fn_set_game_setting settings "engine" "projectzomboid"
diff --git a/gamedata/engines/realvirtuality b/gamedata/engines/realvirtuality
index 805c5f085..8ce30a99a 100644
--- a/gamedata/engines/realvirtuality
+++ b/gamedata/engines/realvirtuality
@@ -3,7 +3,7 @@
 # Real Virtuality Engine
 
 # Import default settings
-fn_import_game_settings _steam
+fn_import_game_settings include/steam
 
 # Dependencies
 fn_set_game_setting dependencies  "libstdc++.so.6" "4f9c911de2276f988afaf47659a8367f"
diff --git a/gamedata/engines/seriousengine35 b/gamedata/engines/seriousengine35
index d00ee234b..7a8720b48 100644
--- a/gamedata/engines/seriousengine35
+++ b/gamedata/engines/seriousengine35
@@ -3,7 +3,7 @@
 # Serious Engine 3.5
 
 # Import default settings
-fn_import_game_settings _steam
+fn_import_game_settings include/steam
 
 # Dependencies
 fn_set_game_setting settings "dependency_path" "\${filesdir}/Bin"
diff --git a/gamedata/engines/spark b/gamedata/engines/spark
index 8a74db026..039630d73 100644
--- a/gamedata/engines/spark
+++ b/gamedata/engines/spark
@@ -3,7 +3,7 @@
 # Spark Engine
 
 # Import default settings
-fn_import_game_settings _steam
+fn_import_game_settings include/steam
 
 # http://wiki.unknownworlds.com/ns2/Dedicated_Server
 fn_parms(){
diff --git a/gamedata/engines/starbound b/gamedata/engines/starbound
index 6e1b71553..2d56bcf2d 100644
--- a/gamedata/engines/starbound
+++ b/gamedata/engines/starbound
@@ -3,7 +3,7 @@
 # Base SRCDS Game
 
 # Import default settings
-fn_import_game_settings _steam
+fn_import_game_settings include/steam
 
 fn_set_game_setting settings "engine" "starbound"
 fn_set_game_setting settings "executabledir" "\${filesdir}/linux64"
diff --git a/gamedata/engines/teeworlds b/gamedata/engines/teeworlds
index d775760d7..1ea226e48 100644
--- a/gamedata/engines/teeworlds
+++ b/gamedata/engines/teeworlds
@@ -3,7 +3,7 @@
 # TeeWorlds Engine
 
 # Import default settings
-fn_import_game_settings _default
+fn_import_game_settings include/default
 
 fn_set_game_setting settings "engine" "teeworlds"
 fn_set_game_setting settings "systemdir" "\${filesdir}"
diff --git a/gamedata/engines/terraria b/gamedata/engines/terraria
index 9a583ad23..415abce15 100644
--- a/gamedata/engines/terraria
+++ b/gamedata/engines/terraria
@@ -3,7 +3,7 @@
 # Terarria Engine
 
 # Import default settings
-fn_import_game_settings _steam
+fn_import_game_settings include/steam
 
 fn_set_game_setting settings "engine" "terraria"
 fn_set_game_setting settings "executabledir" "\${filesdir}"
diff --git a/gamedata/engines/unity3d b/gamedata/engines/unity3d
index ffb00feda..c26755746 100644
--- a/gamedata/engines/unity3d
+++ b/gamedata/engines/unity3d
@@ -3,7 +3,7 @@
 # Unity 3D Engine
 
 # Import default settings
-fn_import_game_settings _steam
+fn_import_game_settings include/steam
 
 fn_set_game_setting settings "engine" "unity3d"
 # http://hurtworld.wikia.com/wiki/Hosting_A_Server
diff --git a/gamedata/engines/unreal b/gamedata/engines/unreal
index 4c32e0717..68141d658 100644
--- a/gamedata/engines/unreal
+++ b/gamedata/engines/unreal
@@ -3,6 +3,6 @@
 # Unreal Engine
 
 # Import default settings
-fn_import_game_settings _unreal_shared
+fn_import_game_settings engines/unreal_shared
 
 fn_set_game_setting scriptactions "mc" "map-compressor|compress_ut99_maps.sh|Map Compressor."
diff --git a/gamedata/engines/unreal2 b/gamedata/engines/unreal2
index 09e716293..b76a4f4df 100644
--- a/gamedata/engines/unreal2
+++ b/gamedata/engines/unreal2
@@ -3,8 +3,8 @@
 # Unreal 2 Engine
 
 # Import default settings
-fn_import_game_settings _steam
-fn_import_game_settings _unreal_shared
+fn_import_game_settings include/steam
+fn_import_game_settings engines/unreal_shared
 
 fn_parms(){
 	parms=""
diff --git a/gamedata/engines/unreal4 b/gamedata/engines/unreal4
index fdedce22b..f13e89e91 100644
--- a/gamedata/engines/unreal4
+++ b/gamedata/engines/unreal4
@@ -3,7 +3,7 @@
 # Unreal 4 Engine
 
 # Import default settings
-fn_import_game_settings _unreal_shared
+fn_import_game_settings engines/unreal_shared
 
 fn_set_game_setting settings "systemdir" "\${filesdir}/\${game}"
 fn_set_game_setting settings "executabledir" "\${systemdir}/Binaries/Linux"
diff --git a/gamedata/engines/unreal_shared b/gamedata/engines/unreal_shared
index b0dd91b1a..24bad93b8 100644
--- a/gamedata/engines/unreal_shared
+++ b/gamedata/engines/unreal_shared
@@ -3,7 +3,7 @@
 # Unreal Engine Shared (across all generations)
 
 # Import default settings
-fn_import_game_settings _default
+fn_import_game_settings include/default
 
 fn_set_game_setting settings "systemdir" "${filesdir}/System"
 fn_set_game_setting settings "executabledir" "${systemdir}"
diff --git a/gamedata/games/arkserver b/gamedata/games/arkserver
index 4aa71a2b9..372a4fa6d 100644
--- a/gamedata/games/arkserver
+++ b/gamedata/games/arkserver
@@ -3,8 +3,8 @@
 #
 
 # Import Engine
-fn_import_game_settings _steam
-fn_import_game_settings _unreal4
+fn_import_game_settings include/steam
+fn_import_game_settings engines/unreal4
 
 fn_parms(){
 parms="TheIsland?listen"
diff --git a/gamedata/games/arma3server b/gamedata/games/arma3server
index 7ad36b7b9..97ad7962b 100644
--- a/gamedata/games/arma3server
+++ b/gamedata/games/arma3server
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _realvirtuality
+fn_import_game_settings engines/realvirtuality
 
 fn_parms(){
 parms="-netlog -ip=${ip} -port=${port} -cfg=${cfg} -config=${config} -mod=${mod} -servermod=${servermod} -bepath=${bepath} -autoinit -loadmissiontomemory"
diff --git a/gamedata/games/bb2server b/gamedata/games/bb2server
index 879d3debf..4aba7e11c 100644
--- a/gamedata/games/bb2server
+++ b/gamedata/games/bb2server
@@ -1,7 +1,7 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _source
-#fn_import_game_settings _gslt
+fn_import_game_settings include/source
+#fn_import_game_settings include/gslt
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
diff --git a/gamedata/games/bmdmserver b/gamedata/games/bmdmserver
index 47bf89f29..61f94efa3 100644
--- a/gamedata/games/bmdmserver
+++ b/gamedata/games/bmdmserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _source
+fn_import_game_settings include/source
 
 fn_parms(){
 parms="-game bms -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${tv_port} +map ${map} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
diff --git a/gamedata/games/bsserver b/gamedata/games/bsserver
index f1b1c9bf9..8bb393d29 100644
--- a/gamedata/games/bsserver
+++ b/gamedata/games/bsserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _source
+fn_import_game_settings include/source
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
diff --git a/gamedata/games/ccserver b/gamedata/games/ccserver
index d7e742e4e..6c2852276 100644
--- a/gamedata/games/ccserver
+++ b/gamedata/games/ccserver
@@ -3,10 +3,10 @@
 # Codename: CURE
 
 # Import SRCDS
-fn_import_game_settings _source
-#fn_import_game_settings _gslt
-#fn_import_game_settings _workshop
-#fn_import_game_settings _mapcyclefile
+fn_import_game_settings include/source
+#fn_import_game_settings include/gslt
+#fn_import_game_settings include/workshop
+#fn_import_game_settings include/mapcyclefile
 
 # Game Settings
 fn_set_game_setting settings "appid" "383410"
diff --git a/gamedata/games/csczserver b/gamedata/games/csczserver
index 8bf680b5f..668d6acd2 100644
--- a/gamedata/games/csczserver
+++ b/gamedata/games/csczserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _goldsource
+fn_import_game_settings engines/goldsource
 fn_parms(){
 parms="-game czero -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${map} -maxplayers ${maxplayers}"
 }
diff --git a/gamedata/games/csgoserver b/gamedata/games/csgoserver
index 1fcbd63d5..7f61da02a 100644
--- a/gamedata/games/csgoserver
+++ b/gamedata/games/csgoserver
@@ -3,10 +3,10 @@
 # Counter-Strike: Global Offensive Dedicated Server
 
 # Import SRCDS
-fn_import_game_settings _source
-fn_import_game_settings _gslt
-fn_import_game_settings _workshop
-fn_import_game_settings _mapcyclefile
+fn_import_game_settings include/source
+fn_import_game_settings include/gslt
+fn_import_game_settings include/workshop
+fn_import_game_settings include/mapcyclefile
 
 # Override some server settings
 fn_set_game_setting settings "appid" "740"
diff --git a/gamedata/games/csserver b/gamedata/games/csserver
index afe1cccea..d6155b3af 100644
--- a/gamedata/games/csserver
+++ b/gamedata/games/csserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _goldsource
+fn_import_game_settings engines/goldsource
 
 #TODO
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
diff --git a/gamedata/games/cssserver b/gamedata/games/cssserver
index d3af973cd..1f018d7a4 100644
--- a/gamedata/games/cssserver
+++ b/gamedata/games/cssserver
@@ -3,8 +3,8 @@
 # Counter-Strike: Source Dedicated Server
 
 # Import SRCDS
-fn_import_game_settings _source
-fn_import_game_settings _mapcyclefile
+fn_import_game_settings include/source
+fn_import_game_settings include/mapcyclefile
 # Override some server settings
 fn_parms(){
 parms="-game cstrike -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${tv_port} +map ${map} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
diff --git a/gamedata/games/dabserver b/gamedata/games/dabserver
index e94a21f2c..d68cae8f5 100644
--- a/gamedata/games/dabserver
+++ b/gamedata/games/dabserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _source
+fn_import_game_settings include/source
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
diff --git a/gamedata/games/dmcserver b/gamedata/games/dmcserver
index 27bb651f5..19196c44b 100644
--- a/gamedata/games/dmcserver
+++ b/gamedata/games/dmcserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _goldsource
+fn_import_game_settings engines/goldsource
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
diff --git a/gamedata/games/dodserver b/gamedata/games/dodserver
index bd8ece3b4..1e798e9e4 100644
--- a/gamedata/games/dodserver
+++ b/gamedata/games/dodserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _goldsource
+fn_import_game_settings engines/goldsource
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
diff --git a/gamedata/games/dodsserver b/gamedata/games/dodsserver
index ba3349440..ee2fc42a5 100644
--- a/gamedata/games/dodsserver
+++ b/gamedata/games/dodsserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _source
+fn_import_game_settings include/source
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
diff --git a/gamedata/games/dstserver b/gamedata/games/dstserver
index 4a5014af5..e5297a49e 100644
--- a/gamedata/games/dstserver
+++ b/gamedata/games/dstserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _dontstarve
+fn_import_game_settings engines/dontstarve
 
 #http://dont-starve-game.wikia.com/wiki/Guides/Don%E2%80%99t_Starve_Together_Dedicated_Servers
 fn_parms(){
diff --git a/gamedata/games/fofserver b/gamedata/games/fofserver
index e06a2f99e..cfb0093d5 100644
--- a/gamedata/games/fofserver
+++ b/gamedata/games/fofserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _source
+fn_import_game_settings include/source
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
diff --git a/gamedata/games/gesserver b/gamedata/games/gesserver
index 9b10e31ef..4498ffc62 100644
--- a/gamedata/games/gesserver
+++ b/gamedata/games/gesserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _source
+fn_import_game_settings include/source
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
diff --git a/gamedata/games/gmodserver b/gamedata/games/gmodserver
index 1052c3afe..98498eab2 100644
--- a/gamedata/games/gmodserver
+++ b/gamedata/games/gmodserver
@@ -3,10 +3,10 @@
 # Garry's Mod Server
 
 # Import SRCDS
-fn_import_game_settings _source
-fn_import_game_settings _gslt
-fn_import_game_settings _workshop
-fn_import_game_settings _mapcyclefile
+fn_import_game_settings include/source
+fn_import_game_settings include/gslt
+fn_import_game_settings include/workshop
+fn_import_game_settings include/mapcyclefile
 
 # Add dependencies
 fn_set_game_setting dependencies  "libpthread.so.0" "50a2a33d3cdd82f15c3de6539db7bf60"
diff --git a/gamedata/games/hl2dmserver b/gamedata/games/hl2dmserver
index fff487e33..f024b918f 100644
--- a/gamedata/games/hl2dmserver
+++ b/gamedata/games/hl2dmserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _source
+fn_import_game_settings include/source
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
diff --git a/gamedata/games/hldmserver b/gamedata/games/hldmserver
index 02ff2492e..482ad29ff 100644
--- a/gamedata/games/hldmserver
+++ b/gamedata/games/hldmserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _goldsource
+fn_import_game_settings engines/goldsource
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
diff --git a/gamedata/games/hldmsserver b/gamedata/games/hldmsserver
index 91334bfb9..f816e3db8 100644
--- a/gamedata/games/hldmsserver
+++ b/gamedata/games/hldmsserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _source
+fn_import_game_settings include/source
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
diff --git a/gamedata/games/hwserver b/gamedata/games/hwserver
index d3c12527d..ab6a852e4 100644
--- a/gamedata/games/hwserver
+++ b/gamedata/games/hwserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _unity3d
+fn_import_game_settings engines/unity3d
 
 
 # http://hurtworld.wikia.com/wiki/Hosting_A_Server
diff --git a/gamedata/games/insserver b/gamedata/games/insserver
index 3b8e2760a..a1e151774 100644
--- a/gamedata/games/insserver
+++ b/gamedata/games/insserver
@@ -3,8 +3,8 @@
 # Insurgency Dedicated Server
 
 # Import Source Engine
-fn_import_game_settings _source
-fn_import_game_settings _mapcyclefile
+fn_import_game_settings include/source
+fn_import_game_settings include/mapcyclefile
 
 # Dependencies
 fn_set_game_setting dependencies  "libc.so.6" "c856f3fcac0a944a36e723b06bdbeb7e"
diff --git a/gamedata/games/jc2server b/gamedata/games/jc2server
index 4fc523962..386617239 100644
--- a/gamedata/games/jc2server
+++ b/gamedata/games/jc2server
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _avalanche
+fn_import_game_settings engines/avalanche
 
 fn_parms(){
 parms=""
diff --git a/gamedata/games/kfserver b/gamedata/games/kfserver
index 38699de49..ebfbf9855 100644
--- a/gamedata/games/kfserver
+++ b/gamedata/games/kfserver
@@ -1,7 +1,7 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _steam
-fn_import_game_settings _unreal2
+fn_import_game_settings include/steam
+fn_import_game_settings engines/unreal2
 
 fn_parms(){
 parms="server ${map}?game=KFmod.KFGameType?VACSecured=true -nohomedir ini=${servercfg} log=${gamelog}"
diff --git a/gamedata/games/l4d2server b/gamedata/games/l4d2server
index a78cb8d3b..1e05cb8b4 100644
--- a/gamedata/games/l4d2server
+++ b/gamedata/games/l4d2server
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _source
+fn_import_game_settings include/source
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
diff --git a/gamedata/games/l4dserver b/gamedata/games/l4dserver
index 6dea0ac4b..7226dbd0b 100644
--- a/gamedata/games/l4dserver
+++ b/gamedata/games/l4dserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _source
+fn_import_game_settings include/source
 
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
diff --git a/gamedata/games/mumbleserver b/gamedata/games/mumbleserver
index bdfa5a9d9..13602775f 100644
--- a/gamedata/games/mumbleserver
+++ b/gamedata/games/mumbleserver
@@ -3,7 +3,7 @@
 # Mumble Server
 
 # Import default settings
-fn_import_game_settings _default
+fn_import_game_settings include/default
 
 fn_parms(){
 	parms="-fg -ini ${servercfgfullpath}"
diff --git a/gamedata/games/nmrihserver b/gamedata/games/nmrihserver
index 2796aaf95..4cd9ace40 100644
--- a/gamedata/games/nmrihserver
+++ b/gamedata/games/nmrihserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _source
+fn_import_game_settings include/source
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
diff --git a/gamedata/games/ns2cserver b/gamedata/games/ns2cserver
index 3120e0395..2586b7e37 100644
--- a/gamedata/games/ns2cserver
+++ b/gamedata/games/ns2cserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _spark
+fn_import_game_settings engines/spark
 
 fn_set_game_setting settings "appid" "313900"
 fn_set_game_setting settings "map" "co_core"
diff --git a/gamedata/games/ns2server b/gamedata/games/ns2server
index ad479d94f..728e0e4a1 100644
--- a/gamedata/games/ns2server
+++ b/gamedata/games/ns2server
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _spark
+fn_import_game_settings engines/spark
 
 fn_set_game_setting settings "appid" "4940"
 fn_set_game_setting settings "map" "ns2_summit"
diff --git a/gamedata/games/opforserver b/gamedata/games/opforserver
index 526c155fb..b1813c90a 100644
--- a/gamedata/games/opforserver
+++ b/gamedata/games/opforserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _goldsource
+fn_import_game_settings engines/goldsource
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
diff --git a/gamedata/games/pvkiiserver b/gamedata/games/pvkiiserver
index d94f999d5..b83fc3e3a 100644
--- a/gamedata/games/pvkiiserver
+++ b/gamedata/games/pvkiiserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _source
+fn_import_game_settings include/source
 
 fn_parms(){
 parms="-game pvkii -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${tv_port} +map ${map} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
diff --git a/gamedata/games/pzserver b/gamedata/games/pzserver
index 3615a13f2..91c25d338 100644
--- a/gamedata/games/pzserver
+++ b/gamedata/games/pzserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _projectzomboid
+fn_import_game_settings engines/projectzomboid
 
 
 fn_parms(){
diff --git a/gamedata/games/qlserver b/gamedata/games/qlserver
index c8f8c7300..78fa04013 100644
--- a/gamedata/games/qlserver
+++ b/gamedata/games/qlserver
@@ -1,7 +1,7 @@
 # Game Settings File
 # qlserver
 # Quake Live
-fn_import_game_settings _idtech3
+fn_import_game_settings engines/idtech3
 
 fn_set_game_setting settings "appid" "349090"
 fn_set_game_setting settings "gamename" "Quake Live"
diff --git a/gamedata/games/ricochetserver b/gamedata/games/ricochetserver
index 9dc52f648..a4d653ef4 100644
--- a/gamedata/games/ricochetserver
+++ b/gamedata/games/ricochetserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _goldsource
+fn_import_game_settings engines/goldsource
 
 fn_parms(){
 parms="-game ricochet -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${map} -maxplayers ${maxplayers}"
diff --git a/gamedata/games/roserver b/gamedata/games/roserver
index 02934df80..097789b81 100644
--- a/gamedata/games/roserver
+++ b/gamedata/games/roserver
@@ -1,7 +1,7 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _steam
-fn_import_game_settings _unreal2
+fn_import_game_settings include/steam
+fn_import_game_settings engines/unreal2
 
 fn_parms(){
 parms="server ${map}?game=ROGame.ROTeamGame?VACSecured=true -nohomedir ini=${servercfg} log=${gamelog}"
diff --git a/gamedata/games/sbserver b/gamedata/games/sbserver
index a1fd142c5..104aa9b11 100644
--- a/gamedata/games/sbserver
+++ b/gamedata/games/sbserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _starbound
+fn_import_game_settings engines/starbound
 
 fn_parms(){
 parms=""
diff --git a/gamedata/games/sdtdserver b/gamedata/games/sdtdserver
index 90a4a969a..5369a84a8 100644
--- a/gamedata/games/sdtdserver
+++ b/gamedata/games/sdtdserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _unity3d
+fn_import_game_settings engines/unity3d
 
 # http://7daystodie.gamepedia.com/Server
 fn_parms(){
diff --git a/gamedata/games/ss3sserver b/gamedata/games/ss3sserver
index cbf0ce094..1330cb5d5 100644
--- a/gamedata/games/ss3sserver
+++ b/gamedata/games/ss3sserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _seriousengine35
+fn_import_game_settings engines/seriousengine35
 
 # https://raw.githubusercontent.com/dgibbs64/linuxgsm/master/SeriousSam3BFE/help/DedicatedServer_Readme.txt
 fn_parms(){
diff --git a/gamedata/games/svencoopserver b/gamedata/games/svencoopserver
index 18ceb48f3..98fa4bf3c 100644
--- a/gamedata/games/svencoopserver
+++ b/gamedata/games/svencoopserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _goldsource
+fn_import_game_settings engines/goldsource
 
 fn_set_game_setting settings "appid" "276060"
 fn_set_game_setting settings "map" "svencoop1"
diff --git a/gamedata/games/tf2server b/gamedata/games/tf2server
index 44cb7f1db..97b3cd2c3 100644
--- a/gamedata/games/tf2server
+++ b/gamedata/games/tf2server
@@ -1,7 +1,7 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _source
-fn_import_game_settings _gslt
+fn_import_game_settings include/source
+fn_import_game_settings include/gslt
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
diff --git a/gamedata/games/tfcserver b/gamedata/games/tfcserver
index 9f451a2e4..8a977e37c 100644
--- a/gamedata/games/tfcserver
+++ b/gamedata/games/tfcserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _goldsource
+fn_import_game_settings engines/goldsource
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
diff --git a/gamedata/games/ts3server b/gamedata/games/ts3server
index bdaf1062a..e50a3db3b 100644
--- a/gamedata/games/ts3server
+++ b/gamedata/games/ts3server
@@ -3,7 +3,7 @@
 # TeamSpeak 3 Server
 
 # Import default settings
-fn_import_game_settings _default
+fn_import_game_settings include/default
 
 fn_set_game_setting settings "gamename" "TeamSpeak 3"
 fn_set_game_setting settings "servername" "TeamSpeak 3 Server"
diff --git a/gamedata/games/twserver b/gamedata/games/twserver
index 09bba9c46..6823ee066 100644
--- a/gamedata/games/twserver
+++ b/gamedata/games/twserver
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _teeworlds
+fn_import_game_settings engines/teeworlds
 
 fn_parms(){
 parms="-f ${servercfgfullpath}"
diff --git a/gamedata/games/ut2k4server b/gamedata/games/ut2k4server
index a0f1373b7..241b11656 100644
--- a/gamedata/games/ut2k4server
+++ b/gamedata/games/ut2k4server
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _unreal2
+fn_import_game_settings engines/unreal2
 
 fn_parms(){
 parms="server ${map}?game=XGame.xDeathMatch -nohomedir ini=${servercfg} log=${gamelog}"
diff --git a/gamedata/games/ut99server b/gamedata/games/ut99server
index 6bc6c85d3..1e09a3096 100644
--- a/gamedata/games/ut99server
+++ b/gamedata/games/ut99server
@@ -1,6 +1,6 @@
 # Game Settings File
 # Import Engine
-fn_import_game_settings _unreal
+fn_import_game_settings engines/unreal
 
 fn_parms(){
 parms="server ${map}.unr ini=${servercfgfullpath}"
diff --git a/gamedata/include/parms_plusminus b/gamedata/include/parms_plusminus
index f6d0ff180..4f7bada95 100644
--- a/gamedata/include/parms_plusminus
+++ b/gamedata/include/parms_plusminus
@@ -1,7 +1,7 @@
 # Game Settings File
 # _parms_plusminus
 # Parameter parsing with "+" and "-" sorting
-fn_import_game_settings _parms
+fn_import_game_settings include/parms
 # This is the way we create a script that collates and parses the parameters
 fn_parms(){
 	parms_minus="$(fn_process_parmlist "\-" ${settingsdir}/parms_minus)"
diff --git a/gamedata/include/source b/gamedata/include/source
index ae2fb3dac..9276636d2 100644
--- a/gamedata/include/source
+++ b/gamedata/include/source
@@ -3,7 +3,7 @@
 # Source Engine
 
 # Import default settings
-fn_import_game_settings _halflife_shared
+fn_import_game_settings engines/halflife_shared
 
 # And the settings for defaults
 fn_set_game_setting settings "engine" "source" "Game Engine"
diff --git a/gamedata/include/steam b/gamedata/include/steam
index d39240b57..120ad715c 100644
--- a/gamedata/include/steam
+++ b/gamedata/include/steam
@@ -3,7 +3,7 @@
 # Steam based games
 
 # Import default settings
-fn_import_game_settings _default
+fn_import_game_settings include/default
 
 # Game Settings
 fn_set_game_setting settings "appid" "--EMPTY--" "Steam App ID"