diff --git a/cstrike/addons/amxmodx/configs/plugins-ChatAdditions.ini b/cstrike/addons/amxmodx/configs/plugins-ChatAdditions.ini
index b398c4b..c76aeca 100644
--- a/cstrike/addons/amxmodx/configs/plugins-ChatAdditions.ini
+++ b/cstrike/addons/amxmodx/configs/plugins-ChatAdditions.ini
@@ -1,20 +1,20 @@
  ; A core plugin for control different types of chat.
-ChatAdditions_Core.amxx     debug
+ChatAdditions/ChatAdditions_Core.amxx     debug
 
  ; Storage choose (disable not used storages)
  ; IMPORTANT: you must leave ONLY ONE plugin to manage the storage.
-CA_Storage_SQLite.amxx      debug ; SQLite storage provider
-; CA_Storage_CSBans.amxx      debug ; CSBans (MySQL) storage provider
-; CA_Storage_GameCMS.amxx     debug ; GameCMS (MySQL) storage provider
+ChatAdditions/Storage/CA_Storage_SQLite.amxx      debug ; SQLite storage provider
+; ChatAdditions/Storage/CA_Storage_CSBans.amxx      debug ; CSBans (MySQL) storage provider
+; ChatAdditions/Storage/CA_Storage_GameCMS.amxx     debug ; GameCMS (MySQL) storage provider
 
  ; Extensions
-CA_AntiFlood.amxx               debug ; Antiflood for chat
-CA_Mute.amxx                    debug ; Players can choose who they can hear.
-CA_Addon_DeathMute.amxx         debug ; Alive players don't hear dead players after 5 secs
-CA_Addon_RankRestrictions.amxx  debug ; Restrict chat until you reach the rank of a statistic.
-CA_Addon_VoteGag.amxx           debug ; Ability for players to vote for gag.
-CA_Addon_RequestUnGag.amxx      debug ; A player can apologize to the administration.
-CA_Gag.amxx                     debug ; Manage player chats for the admin.
+ChatAdditions/CA_AntiFlood.amxx                         debug ; Antiflood for chat
+ChatAdditions/CA_Mute.amxx                              debug ; Players can choose who they can hear.
+ChatAdditions/Addons/CA_Addon_DeathMute.amxx            debug ; Alive players don't hear dead players after 5 secs
+ChatAdditions/Addons/CA_Addon_RankRestrictions.amxx     debug ; Restrict chat until you reach the rank of a statistic.
+ChatAdditions/Addons/CA_Addon_VoteGag.amxx              debug ; Ability for players to vote for gag.
+ChatAdditions/Addons/CA_Addon_RequestUnGag.amxx         debug ; A player can apologize to the administration.
+ChatAdditions/CA_Gag.amxx                               debug ; Manage player chats for the admin.
 
  ; IMPORTANT: Place you chat manager below (Chat RBS plugins, Lite Translit, Colored Translit etc..)
  ; Most chat managers are not written using the correct chat handling,
diff --git a/cstrike/addons/amxmodx/scripting/CA_Addon_DeathMute.sma b/cstrike/addons/amxmodx/scripting/ChatAdditions/Addons/CA_Addon_DeathMute.sma
similarity index 100%
rename from cstrike/addons/amxmodx/scripting/CA_Addon_DeathMute.sma
rename to cstrike/addons/amxmodx/scripting/ChatAdditions/Addons/CA_Addon_DeathMute.sma
diff --git a/cstrike/addons/amxmodx/scripting/CA_Addon_RankRestrictions.sma b/cstrike/addons/amxmodx/scripting/ChatAdditions/Addons/CA_Addon_RankRestrictions.sma
similarity index 93%
rename from cstrike/addons/amxmodx/scripting/CA_Addon_RankRestrictions.sma
rename to cstrike/addons/amxmodx/scripting/ChatAdditions/Addons/CA_Addon_RankRestrictions.sma
index 2626f76..373a485 100644
--- a/cstrike/addons/amxmodx/scripting/CA_Addon_RankRestrictions.sma
+++ b/cstrike/addons/amxmodx/scripting/ChatAdditions/Addons/CA_Addon_RankRestrictions.sma
@@ -58,32 +58,19 @@ public plugin_natives() {
 }
 
 public native_filter(const name[], index, trap) {
-    if (strcmp(name, "aes_get_player_level")) {
-        return PLUGIN_HANDLED
+    new const na[][] = {
+        "aes_get_player_level",
+        "ar_get_user_level",
+        "crxranks_get_user_level",
+        "csstats_get_user_stats",
+        "cmsranks_get_user_level",
+        "cmsstats_get_user_skill",
+        "get_user_stats"
     }
 
-    if (strcmp(name, "ar_get_user_level")) {
-        return PLUGIN_HANDLED
-    }
-
-    if (strcmp(name, "crxranks_get_user_level")) {
-        return PLUGIN_HANDLED
-    }
-
-    if (strcmp(name, "csstats_get_user_stats")) {
-        return PLUGIN_HANDLED
-    }
-
-    if (strcmp(name, "cmsranks_get_user_level")) {
-        return PLUGIN_HANDLED
-    }
-
-    if (strcmp(name, "cmsstats_get_user_skill")) {
-        return PLUGIN_HANDLED
-    }
-
-    if (strcmp(name, "get_user_stats")) {
-        return PLUGIN_HANDLED
+    for (new i; i < sizeof(na); i++) {
+        if (strcmp(na[i], name) != 0)
+            return PLUGIN_HANDLED
     }
 
     return PLUGIN_CONTINUE
diff --git a/cstrike/addons/amxmodx/scripting/CA_Addon_RequestUnGag.sma b/cstrike/addons/amxmodx/scripting/ChatAdditions/Addons/CA_Addon_RequestUnGag.sma
similarity index 100%
rename from cstrike/addons/amxmodx/scripting/CA_Addon_RequestUnGag.sma
rename to cstrike/addons/amxmodx/scripting/ChatAdditions/Addons/CA_Addon_RequestUnGag.sma
diff --git a/cstrike/addons/amxmodx/scripting/CA_Addon_VoteGag.sma b/cstrike/addons/amxmodx/scripting/ChatAdditions/Addons/CA_Addon_VoteGag.sma
similarity index 100%
rename from cstrike/addons/amxmodx/scripting/CA_Addon_VoteGag.sma
rename to cstrike/addons/amxmodx/scripting/ChatAdditions/Addons/CA_Addon_VoteGag.sma
diff --git a/cstrike/addons/amxmodx/scripting/CA_AntiFlood.sma b/cstrike/addons/amxmodx/scripting/ChatAdditions/CA_AntiFlood.sma
similarity index 100%
rename from cstrike/addons/amxmodx/scripting/CA_AntiFlood.sma
rename to cstrike/addons/amxmodx/scripting/ChatAdditions/CA_AntiFlood.sma
diff --git a/cstrike/addons/amxmodx/scripting/CA_Gag.sma b/cstrike/addons/amxmodx/scripting/ChatAdditions/CA_Gag.sma
similarity index 100%
rename from cstrike/addons/amxmodx/scripting/CA_Gag.sma
rename to cstrike/addons/amxmodx/scripting/ChatAdditions/CA_Gag.sma
diff --git a/cstrike/addons/amxmodx/scripting/CA_Mute.sma b/cstrike/addons/amxmodx/scripting/ChatAdditions/CA_Mute.sma
similarity index 100%
rename from cstrike/addons/amxmodx/scripting/CA_Mute.sma
rename to cstrike/addons/amxmodx/scripting/ChatAdditions/CA_Mute.sma
diff --git a/cstrike/addons/amxmodx/scripting/ChatAdditions_Core.sma b/cstrike/addons/amxmodx/scripting/ChatAdditions/ChatAdditions_Core.sma
similarity index 100%
rename from cstrike/addons/amxmodx/scripting/ChatAdditions_Core.sma
rename to cstrike/addons/amxmodx/scripting/ChatAdditions/ChatAdditions_Core.sma
diff --git a/cstrike/addons/amxmodx/scripting/CA_Storage_CSBans.sma b/cstrike/addons/amxmodx/scripting/ChatAdditions/Storage/CA_Storage_CSBans.sma
similarity index 100%
rename from cstrike/addons/amxmodx/scripting/CA_Storage_CSBans.sma
rename to cstrike/addons/amxmodx/scripting/ChatAdditions/Storage/CA_Storage_CSBans.sma
diff --git a/cstrike/addons/amxmodx/scripting/CA_Storage_GameCMS.sma b/cstrike/addons/amxmodx/scripting/ChatAdditions/Storage/CA_Storage_GameCMS.sma
similarity index 100%
rename from cstrike/addons/amxmodx/scripting/CA_Storage_GameCMS.sma
rename to cstrike/addons/amxmodx/scripting/ChatAdditions/Storage/CA_Storage_GameCMS.sma
diff --git a/cstrike/addons/amxmodx/scripting/CA_Storage_PGBans.sma b/cstrike/addons/amxmodx/scripting/ChatAdditions/Storage/CA_Storage_PGBans.sma
similarity index 100%
rename from cstrike/addons/amxmodx/scripting/CA_Storage_PGBans.sma
rename to cstrike/addons/amxmodx/scripting/ChatAdditions/Storage/CA_Storage_PGBans.sma
diff --git a/cstrike/addons/amxmodx/scripting/CA_Storage_SQLite.sma b/cstrike/addons/amxmodx/scripting/ChatAdditions/Storage/CA_Storage_SQLite.sma
similarity index 100%
rename from cstrike/addons/amxmodx/scripting/CA_Storage_SQLite.sma
rename to cstrike/addons/amxmodx/scripting/ChatAdditions/Storage/CA_Storage_SQLite.sma