diff --git a/configs/core.ini b/configs/core.ini
index ab448a7c..9eaeb44b 100755
--- a/configs/core.ini
+++ b/configs/core.ini
@@ -1,13 +1,10 @@
-; Configuration file for AMX Mod X
-amxx_logdir	addons/amxx/logs
+; Configuration file for AMX Mod Xamxx_logdir	addons/amxx/logs
 amxx_configsdir	addons/amxx/configs
 amxx_datadir	addons/amxx/data
-amxx_modules	addons/amxx/modules.ini
-amxx_plugins	addons/amxx/plugins.ini
+amxx_modules	addons/amxx/configs/modules.iniamxx_plugins	addons/amxx/configs/plugins.ini
 amxx_pluginsdir	addons/amxx/plugins
 amxx_modulesdir	addons/amxx/modules
 amxx_vault	addons/amxx/data/vault.ini
-
 ; Logging mode
 ; 0 - no logging
 ; 1 - one logfile / day
diff --git a/configs/dod/core.ini b/configs/dod/core.ini
index d6e26af9..a16445aa 100755
--- a/configs/dod/core.ini
+++ b/configs/dod/core.ini
@@ -1,14 +1,10 @@
-; Configuration file for AMX Mod X
-amxx_logdir	addons/amxx/logs
+; Configuration file for AMX Mod Xamxx_logdir	addons/amxx/logs
 amxx_configsdir	addons/amxx/configs
 amxx_datadir	addons/amxx/data
-amxx_modules	addons/amxx/modules.ini
-amxx_plugins	addons/amxx/plugins.ini
+amxx_modules	addons/amxx/configs/modules.iniamxx_plugins	addons/amxx/configs/plugins.ini
 amxx_pluginsdir	addons/amxx/plugins
 amxx_modulesdir	addons/amxx/modules
-amxx_vault	addons/amxx/data/vault.ini
-dodstats_score	addons/amxx/data/dodstats.amx
-dodstats	addons/amxx/data/dodstats.dat
+amxx_vault	addons/amxx/data/vault.inidodstats_score	addons/amxx/data/dodstats.amxdodstats	addons/amxx/data/dodstats.dat
 
 ; Logging mode
 ; 0 - no logging
diff --git a/configs/dod/modules.ini b/configs/dod/modules.ini
index 6d5ca8f8..290d378e 100755
--- a/configs/dod/modules.ini
+++ b/configs/dod/modules.ini
@@ -1,6 +1,6 @@
 ; AMX Mod X Modules
 ; You can specify both linux & win32 modules here
-
+; To enable a module, remove the semi-colon from the line
 ; ------------------------------
 ; Fun - provides extra functions
 ; ------------------------------
@@ -23,7 +23,6 @@ fun_amxx.dll
 ;pgsql_amxx_i386.so
 ;pgsql_amxx.dll
 ; Microsoft SQL
-;mssql_amxx_i386.so
 ;mssql_amxx.dll
 
 ; ---------------------------------------------
diff --git a/configs/modules.ini b/configs/modules.ini
index d7515c80..55d51f0b 100755
--- a/configs/modules.ini
+++ b/configs/modules.ini
@@ -1,6 +1,6 @@
 ; AMX Mod X Modules
 ; You can specify both linux & win32 modules here
-
+; To enable a module, remove the semi-colon from the line
 ; ------------------------------
 ; Fun - provides extra functions
 ; ------------------------------
@@ -23,7 +23,6 @@ fun_amxx.dll
 ;pgsql_amxx_i386.so
 ;pgsql_amxx.dll
 ; Microsoft SQL
-;mssql_amxx_i386.so
 ;mssql_amxx.dll
 
 ; ---------------------------------------------
diff --git a/configs/ns/modules.ini b/configs/ns/modules.ini
index 6b7d9dca..57442c50 100755
--- a/configs/ns/modules.ini
+++ b/configs/ns/modules.ini
@@ -1,6 +1,6 @@
 ; AMX Mod X Modules
 ; You can specify both linux & win32 modules here
-
+; To enable a module, remove the semi-colon from the line
 ; ------------------------------
 ; Fun - provides extra functions
 ; ------------------------------
@@ -23,7 +23,6 @@ fun_amxx.dll
 ;pgsql_amxx_i386.so
 ;pgsql_amxx.dll
 ; Microsoft SQL
-;mssql_amxx_i386.so
 ;mssql_amxx.dll
 
 ; ---------------------------------------------
diff --git a/configs/tfc/core.ini b/configs/tfc/core.ini
index b39f2a04..3d9efcca 100755
--- a/configs/tfc/core.ini
+++ b/configs/tfc/core.ini
@@ -1,14 +1,10 @@
-; Configuration file for AMX Mod X
-amxx_logdir	addons/amxx/logs
+; Configuration file for AMX Mod Xamxx_logdir	addons/amxx/logs
 amxx_configsdir	addons/amxx/configs
 amxx_datadir	addons/amxx/data
-amxx_modules	addons/amxx/modules.ini
-amxx_plugins	addons/amxx/plugins.ini
+amxx_modules	addons/amxx/configs/modules.iniamxx_plugins	addons/amxx/configs/plugins.ini
 amxx_pluginsdir	addons/amxx/plugins
 amxx_modulesdir	addons/amxx/modules
-amxx_vault	addons/amxx/data/vault.ini
-tfcstats_score	addons/amxx/data/tfcstats.amx
-tfcstats	addons/amxx/data/tfcstats.dat
+amxx_vault	addons/amxx/data/vault.initfcstats_score	addons/amxx/data/tfcstats.amxtfcstats	addons/amxx/data/tfcstats.dat
 
 ; Logging mode
 ; 0 - no logging
diff --git a/configs/tfc/modules.ini b/configs/tfc/modules.ini
index 7fda9793..b9be5f97 100755
--- a/configs/tfc/modules.ini
+++ b/configs/tfc/modules.ini
@@ -1,6 +1,6 @@
 ; AMX Mod X Modules
 ; You can specify both linux & win32 modules here
-
+; To enable a module, remove the semi-colon from the line
 ; ------------------------------
 ; Fun - provides extra functions
 ; ------------------------------
@@ -23,7 +23,6 @@ fun_amxx.dll
 ;pgsql_amxx_i386.so
 ;pgsql_amxx.dll
 ; Microsoft SQL
-;mssql_amxx_i386.so
 ;mssql_amxx.dll
 
 ; ---------------------------------------------
diff --git a/configs/ts/core.ini b/configs/ts/core.ini
index 22a71178..7dcbc954 100755
--- a/configs/ts/core.ini
+++ b/configs/ts/core.ini
@@ -1,15 +1,12 @@
-; Configuration file for AMX Mod X
-amxx_logdir	addons/amxx/logs
+; Configuration file for AMX Mod Xamxx_logdir	addons/amxx/logs
 amxx_configsdir	addons/amxx/configs
 amxx_datadir	addons/amxx/data
-amxx_modules	addons/amxx/modules.ini
-amxx_plugins	addons/amxx/plugins.ini
+amxx_modules	addons/amxx/configs/modules.iniamxx_plugins	addons/amxx/configs/plugins.ini
 amxx_pluginsdir	addons/amxx/plugins
 amxx_modulesdir	addons/amxx/modules
 amxx_vault	addons/amxx/data/vault.ini
 tsstats_score	addons/amxx/data/tsstats.amx
 tsstats		addons/amxx/data/tsstats.dat
-
 ; Logging mode
 ; 0 - no logging
 ; 1 - one logfile / day
diff --git a/configs/ts/modules.ini b/configs/ts/modules.ini
index 182cf2c9..00ccaec5 100755
--- a/configs/ts/modules.ini
+++ b/configs/ts/modules.ini
@@ -1,6 +1,6 @@
 ; AMX Mod X Modules
 ; You can specify both linux & win32 modules here
-
+; To enable a module, remove the semi-colon from the line
 ; ------------------------------
 ; Fun - provides extra functions
 ; ------------------------------
@@ -23,7 +23,6 @@ fun_amxx.dll
 ;pgsql_amxx_i386.so
 ;pgsql_amxx.dll
 ; Microsoft SQL
-;mssql_amxx_i386.so
 ;mssql_amxx.dll
 
 ; ---------------------------------------------