diff --git a/modules/azerothshard/conf/auth.conf b/modules/azerothshard/data/archive/etc/auth.conf
similarity index 100%
rename from modules/azerothshard/conf/auth.conf
rename to modules/azerothshard/data/archive/etc/auth.conf
diff --git a/modules/azerothshard/conf/world-dev.conf b/modules/azerothshard/data/archive/etc/world-dev.conf
similarity index 100%
rename from modules/azerothshard/conf/world-dev.conf
rename to modules/azerothshard/data/archive/etc/world-dev.conf
diff --git a/modules/azerothshard/conf/world-live.conf b/modules/azerothshard/data/archive/etc/world-live.conf
similarity index 100%
rename from modules/azerothshard/conf/world-live.conf
rename to modules/azerothshard/data/archive/etc/world-live.conf
diff --git a/modules/azerothshard/conf/world-test.conf b/modules/azerothshard/data/archive/etc/world-test.conf
similarity index 100%
rename from modules/azerothshard/conf/world-test.conf
rename to modules/azerothshard/data/archive/etc/world-test.conf
diff --git a/modules/azerothshard/conf/world-trilogy.conf b/modules/azerothshard/data/archive/etc/world-trilogy.conf
similarity index 100%
rename from modules/azerothshard/conf/world-trilogy.conf
rename to modules/azerothshard/data/archive/etc/world-trilogy.conf
diff --git a/modules/azerothshard/data/sql/archive/auth/arenawatcher_permissions.sql b/modules/azerothshard/data/archive/sql/auth/arenawatcher_permissions.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/auth/arenawatcher_permissions.sql
rename to modules/azerothshard/data/archive/sql/auth/arenawatcher_permissions.sql
diff --git a/modules/azerothshard/data/sql/archive/auth/auth_rbac_permissions.sql b/modules/azerothshard/data/archive/sql/auth/auth_rbac_permissions.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/auth/auth_rbac_permissions.sql
rename to modules/azerothshard/data/archive/sql/auth/auth_rbac_permissions.sql
diff --git a/modules/azerothshard/data/sql/archive/auth/azth_auth_rbac.sql b/modules/azerothshard/data/archive/sql/auth/azth_auth_rbac.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/auth/azth_auth_rbac.sql
rename to modules/azerothshard/data/archive/sql/auth/azth_auth_rbac.sql
diff --git a/modules/azerothshard/data/sql/archive/char/2016_04_20_00_instance.sql b/modules/azerothshard/data/archive/sql/char/2016_04_20_00_instance.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/char/2016_04_20_00_instance.sql
rename to modules/azerothshard/data/archive/sql/char/2016_04_20_00_instance.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/2016_04_13_cyclone_vs_bladestorm.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/2016_04_13_cyclone_vs_bladestorm.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/2016_04_13_cyclone_vs_bladestorm.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/2016_04_13_cyclone_vs_bladestorm.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/TriniIRC/World_TrinityChat.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/TriniIRC/World_TrinityChat.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/TriniIRC/World_TrinityChat.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/TriniIRC/World_TrinityChat.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_ashbringer_event.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_ashbringer_event.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_ashbringer_event.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_ashbringer_event.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_demolisher_fix.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_demolisher_fix.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_demolisher_fix.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_demolisher_fix.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_immunity_fixes_mik1893.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_immunity_fixes_mik1893.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_immunity_fixes_mik1893.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_immunity_fixes_mik1893.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_script_fixes_mik1893.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_script_fixes_mik1893.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_script_fixes_mik1893.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_script_fixes_mik1893.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_spell_fixes_mik183.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_spell_fixes_mik183.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_spell_fixes_mik183.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_spell_fixes_mik183.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_Charscale_Invoker_SAI.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_Charscale_Invoker_SAI.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_Charscale_Invoker_SAI.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_Charscale_Invoker_SAI.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_added_interrupt_mask_halion.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_added_interrupt_mask_halion.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_added_interrupt_mask_halion.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_added_interrupt_mask_halion.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_disables.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_disables.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_disables.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_disables.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_fix_valkyrs_immunities_and_diminishing.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_fix_valkyrs_immunities_and_diminishing.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_fix_valkyrs_immunities_and_diminishing.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_fix_valkyrs_immunities_and_diminishing.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_nefarian.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_nefarian.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_nefarian.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_nefarian.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_putricide.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_putricide.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_putricide.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_putricide.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_queue_announcer.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_queue_announcer.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_queue_announcer.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_queue_announcer.sql
diff --git a/modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_wintergrasp.sql b/modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_wintergrasp.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/for_azerothcore/world/azth_world_wintergrasp.sql
rename to modules/azerothshard/data/archive/sql/for_azerothcore/world/azth_world_wintergrasp.sql
diff --git a/modules/azerothshard/data/sql/archive/world/.dummy b/modules/azerothshard/data/archive/sql/world/.dummy
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/.dummy
rename to modules/azerothshard/data/archive/sql/world/.dummy
diff --git a/modules/azerothshard/data/sql/archive/world/2016_04_02_azth_trasmorg_spawn.sql b/modules/azerothshard/data/archive/sql/world/2016_04_02_azth_trasmorg_spawn.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/2016_04_02_azth_trasmorg_spawn.sql
rename to modules/azerothshard/data/archive/sql/world/2016_04_02_azth_trasmorg_spawn.sql
diff --git a/modules/azerothshard/data/sql/archive/world/2016_04_13_cyclone_vs_bladestorm.sql b/modules/azerothshard/data/archive/sql/world/2016_04_13_cyclone_vs_bladestorm.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/2016_04_13_cyclone_vs_bladestorm.sql
rename to modules/azerothshard/data/archive/sql/world/2016_04_13_cyclone_vs_bladestorm.sql
diff --git a/modules/azerothshard/data/sql/archive/world/TriniIRC/World_TrinityChat.sql b/modules/azerothshard/data/archive/sql/world/TriniIRC/World_TrinityChat.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/TriniIRC/World_TrinityChat.sql
rename to modules/azerothshard/data/archive/sql/world/TriniIRC/World_TrinityChat.sql
diff --git a/modules/azerothshard/data/sql/archive/world/arenawatcher_stuff.sql b/modules/azerothshard/data/archive/sql/world/arenawatcher_stuff.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/arenawatcher_stuff.sql
rename to modules/azerothshard/data/archive/sql/world/arenawatcher_stuff.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_ashbringer_event.sql b/modules/azerothshard/data/archive/sql/world/azth_ashbringer_event.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_ashbringer_event.sql
rename to modules/azerothshard/data/archive/sql/world/azth_ashbringer_event.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_commands.sql b/modules/azerothshard/data/archive/sql/world/azth_commands.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_commands.sql
rename to modules/azerothshard/data/archive/sql/world/azth_commands.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_custom_world_creature.sql b/modules/azerothshard/data/archive/sql/world/azth_custom_world_creature.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_custom_world_creature.sql
rename to modules/azerothshard/data/archive/sql/world/azth_custom_world_creature.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_custom_world_creature_template.sql b/modules/azerothshard/data/archive/sql/world/azth_custom_world_creature_template.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_custom_world_creature_template.sql
rename to modules/azerothshard/data/archive/sql/world/azth_custom_world_creature_template.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_custom_world_npc_vendors.sql b/modules/azerothshard/data/archive/sql/world/azth_custom_world_npc_vendors.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_custom_world_npc_vendors.sql
rename to modules/azerothshard/data/archive/sql/world/azth_custom_world_npc_vendors.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_immunity_fixes_mik1893.sql b/modules/azerothshard/data/archive/sql/world/azth_immunity_fixes_mik1893.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_immunity_fixes_mik1893.sql
rename to modules/azerothshard/data/archive/sql/world/azth_immunity_fixes_mik1893.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_script_fixes_mik1893.sql b/modules/azerothshard/data/archive/sql/world/azth_script_fixes_mik1893.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_script_fixes_mik1893.sql
rename to modules/azerothshard/data/archive/sql/world/azth_script_fixes_mik1893.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_spell_fixes_mik183.sql b/modules/azerothshard/data/archive/sql/world/azth_spell_fixes_mik183.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_spell_fixes_mik183.sql
rename to modules/azerothshard/data/archive/sql/world/azth_spell_fixes_mik183.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_Charscale_Invoker_SAI.sql b/modules/azerothshard/data/archive/sql/world/azth_world_Charscale_Invoker_SAI.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_Charscale_Invoker_SAI.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_Charscale_Invoker_SAI.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_achievement_reward.sql b/modules/azerothshard/data/archive/sql/world/azth_world_achievement_reward.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_achievement_reward.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_achievement_reward.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_added_interrupt_mask_halion.sql b/modules/azerothshard/data/archive/sql/world/azth_world_added_interrupt_mask_halion.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_added_interrupt_mask_halion.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_added_interrupt_mask_halion.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_battleground_template.sql b/modules/azerothshard/data/archive/sql/world/azth_world_battleground_template.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_battleground_template.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_battleground_template.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_creature.sql b/modules/azerothshard/data/archive/sql/world/azth_world_creature.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_creature.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_creature.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_creature_template.sql b/modules/azerothshard/data/archive/sql/world/azth_world_creature_template.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_creature_template.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_creature_template.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_disables.sql b/modules/azerothshard/data/archive/sql/world/azth_world_disables.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_disables.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_disables.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_fix_valkyrs_immunities_and_diminishing.sql b/modules/azerothshard/data/archive/sql/world/azth_world_fix_valkyrs_immunities_and_diminishing.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_fix_valkyrs_immunities_and_diminishing.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_fix_valkyrs_immunities_and_diminishing.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_game_tele.sql b/modules/azerothshard/data/archive/sql/world/azth_world_game_tele.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_game_tele.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_game_tele.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_gameobject.sql b/modules/azerothshard/data/archive/sql/world/azth_world_gameobject.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_gameobject.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_gameobject.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_instance_template.sql b/modules/azerothshard/data/archive/sql/world/azth_world_instance_template.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_instance_template.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_instance_template.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_nefarian.sql b/modules/azerothshard/data/archive/sql/world/azth_world_nefarian.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_nefarian.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_nefarian.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_putricide.sql b/modules/azerothshard/data/archive/sql/world/azth_world_putricide.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_putricide.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_putricide.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_pvp_vendor.sql b/modules/azerothshard/data/archive/sql/world/azth_world_pvp_vendor.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_pvp_vendor.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_pvp_vendor.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_quest_completer.sql b/modules/azerothshard/data/archive/sql/world/azth_world_quest_completer.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_quest_completer.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_quest_completer.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_queue_announcer.sql b/modules/azerothshard/data/archive/sql/world/azth_world_queue_announcer.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_queue_announcer.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_queue_announcer.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_toc5.sql b/modules/azerothshard/data/archive/sql/world/azth_world_toc5.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_toc5.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_toc5.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_ulduar_thorim.sql b/modules/azerothshard/data/archive/sql/world/azth_world_ulduar_thorim.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_ulduar_thorim.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_ulduar_thorim.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_various_fixes.sql b/modules/azerothshard/data/archive/sql/world/azth_world_various_fixes.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_various_fixes.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_various_fixes.sql
diff --git a/modules/azerothshard/data/sql/archive/world/azth_world_wintergrasp.sql b/modules/azerothshard/data/archive/sql/world/azth_world_wintergrasp.sql
similarity index 100%
rename from modules/azerothshard/data/sql/archive/world/azth_world_wintergrasp.sql
rename to modules/azerothshard/data/archive/sql/world/azth_world_wintergrasp.sql