diff --git a/data/sql/archive/updates/auth/2016_07_09_00.sql b/data/sql/archive/updates/db_auth/2016_07_09_00.sql
similarity index 100%
rename from data/sql/archive/updates/auth/2016_07_09_00.sql
rename to data/sql/archive/updates/db_auth/2016_07_09_00.sql
diff --git a/data/sql/archive/updates/auth/2016_07_09_01.sql b/data/sql/archive/updates/db_auth/2016_07_09_01.sql
similarity index 100%
rename from data/sql/archive/updates/auth/2016_07_09_01.sql
rename to data/sql/archive/updates/db_auth/2016_07_09_01.sql
diff --git a/data/sql/archive/updates/auth/2016_07_10_00.sql b/data/sql/archive/updates/db_auth/2016_07_10_00.sql
similarity index 100%
rename from data/sql/archive/updates/auth/2016_07_10_00.sql
rename to data/sql/archive/updates/db_auth/2016_07_10_00.sql
diff --git a/data/sql/archive/updates/characters/2016_07_09_00.sql b/data/sql/archive/updates/db_characters/2016_07_09_00.sql
similarity index 100%
rename from data/sql/archive/updates/characters/2016_07_09_00.sql
rename to data/sql/archive/updates/db_characters/2016_07_09_00.sql
diff --git a/data/sql/archive/updates/characters/2016_07_09_01.sql b/data/sql/archive/updates/db_characters/2016_07_09_01.sql
similarity index 100%
rename from data/sql/archive/updates/characters/2016_07_09_01.sql
rename to data/sql/archive/updates/db_characters/2016_07_09_01.sql
diff --git a/data/sql/archive/updates/characters/2016_07_10_00.sql b/data/sql/archive/updates/db_characters/2016_07_10_00.sql
similarity index 100%
rename from data/sql/archive/updates/characters/2016_07_10_00.sql
rename to data/sql/archive/updates/db_characters/2016_07_10_00.sql
diff --git a/data/sql/archive/updates/characters/2016_07_30_00.sql b/data/sql/archive/updates/db_characters/2016_07_30_00.sql
similarity index 100%
rename from data/sql/archive/updates/characters/2016_07_30_00.sql
rename to data/sql/archive/updates/db_characters/2016_07_30_00.sql
diff --git a/data/sql/archive/updates/characters/2016_08_08_00.sql b/data/sql/archive/updates/db_characters/2016_08_08_00.sql
similarity index 100%
rename from data/sql/archive/updates/characters/2016_08_08_00.sql
rename to data/sql/archive/updates/db_characters/2016_08_08_00.sql
diff --git a/data/sql/archive/updates/characters/2016_08_12_00.sql b/data/sql/archive/updates/db_characters/2016_08_12_00.sql
similarity index 100%
rename from data/sql/archive/updates/characters/2016_08_12_00.sql
rename to data/sql/archive/updates/db_characters/2016_08_12_00.sql
diff --git a/data/sql/archive/updates/world/2016_07_09_00.sql b/data/sql/archive/updates/db_world/2016_07_09_00.sql
similarity index 100%
rename from data/sql/archive/updates/world/2016_07_09_00.sql
rename to data/sql/archive/updates/db_world/2016_07_09_00.sql
diff --git a/data/sql/archive/updates/world/2016_07_09_01.sql b/data/sql/archive/updates/db_world/2016_07_09_01.sql
similarity index 100%
rename from data/sql/archive/updates/world/2016_07_09_01.sql
rename to data/sql/archive/updates/db_world/2016_07_09_01.sql
diff --git a/data/sql/archive/updates/world/2016_07_10_00_.sql b/data/sql/archive/updates/db_world/2016_07_10_00_.sql
similarity index 100%
rename from data/sql/archive/updates/world/2016_07_10_00_.sql
rename to data/sql/archive/updates/db_world/2016_07_10_00_.sql
diff --git a/data/sql/archive/updates/world/2016_07_10_01.sql b/data/sql/archive/updates/db_world/2016_07_10_01.sql
similarity index 100%
rename from data/sql/archive/updates/world/2016_07_10_01.sql
rename to data/sql/archive/updates/db_world/2016_07_10_01.sql
diff --git a/data/sql/archive/updates/world/2016_07_10_02.sql b/data/sql/archive/updates/db_world/2016_07_10_02.sql
similarity index 100%
rename from data/sql/archive/updates/world/2016_07_10_02.sql
rename to data/sql/archive/updates/db_world/2016_07_10_02.sql
diff --git a/data/sql/archive/updates/world/2016_07_14_00.sql b/data/sql/archive/updates/db_world/2016_07_14_00.sql
similarity index 100%
rename from data/sql/archive/updates/world/2016_07_14_00.sql
rename to data/sql/archive/updates/db_world/2016_07_14_00.sql
diff --git a/data/sql/archive/updates/world/2016_07_28_00.sql b/data/sql/archive/updates/db_world/2016_07_28_00.sql
similarity index 100%
rename from data/sql/archive/updates/world/2016_07_28_00.sql
rename to data/sql/archive/updates/db_world/2016_07_28_00.sql
diff --git a/data/sql/archive/updates/world/2016_08_01_00.sql b/data/sql/archive/updates/db_world/2016_08_01_00.sql
similarity index 100%
rename from data/sql/archive/updates/world/2016_08_01_00.sql
rename to data/sql/archive/updates/db_world/2016_08_01_00.sql
diff --git a/data/sql/archive/updates/world/2016_08_03_00.sql b/data/sql/archive/updates/db_world/2016_08_03_00.sql
similarity index 100%
rename from data/sql/archive/updates/world/2016_08_03_00.sql
rename to data/sql/archive/updates/db_world/2016_08_03_00.sql
diff --git a/data/sql/archive/updates/world/2016_08_10_00.sql b/data/sql/archive/updates/db_world/2016_08_10_00.sql
similarity index 100%
rename from data/sql/archive/updates/world/2016_08_10_00.sql
rename to data/sql/archive/updates/db_world/2016_08_10_00.sql
diff --git a/data/sql/archive/updates/world/2016_08_10_01.sql b/data/sql/archive/updates/db_world/2016_08_10_01.sql
similarity index 100%
rename from data/sql/archive/updates/world/2016_08_10_01.sql
rename to data/sql/archive/updates/db_world/2016_08_10_01.sql
diff --git a/data/sql/base/auth/account.sql b/data/sql/base/db_auth/account.sql
similarity index 100%
rename from data/sql/base/auth/account.sql
rename to data/sql/base/db_auth/account.sql
diff --git a/data/sql/base/auth/account_access.sql b/data/sql/base/db_auth/account_access.sql
similarity index 100%
rename from data/sql/base/auth/account_access.sql
rename to data/sql/base/db_auth/account_access.sql
diff --git a/data/sql/base/auth/account_banned.sql b/data/sql/base/db_auth/account_banned.sql
similarity index 100%
rename from data/sql/base/auth/account_banned.sql
rename to data/sql/base/db_auth/account_banned.sql
diff --git a/data/sql/base/auth/auth_db_version.sql b/data/sql/base/db_auth/auth_db_version.sql
similarity index 100%
rename from data/sql/base/auth/auth_db_version.sql
rename to data/sql/base/db_auth/auth_db_version.sql
diff --git a/data/sql/base/auth/autobroadcast.sql b/data/sql/base/db_auth/autobroadcast.sql
similarity index 100%
rename from data/sql/base/auth/autobroadcast.sql
rename to data/sql/base/db_auth/autobroadcast.sql
diff --git a/data/sql/base/auth/ip_banned.sql b/data/sql/base/db_auth/ip_banned.sql
similarity index 100%
rename from data/sql/base/auth/ip_banned.sql
rename to data/sql/base/db_auth/ip_banned.sql
diff --git a/data/sql/base/auth/realmcharacters.sql b/data/sql/base/db_auth/realmcharacters.sql
similarity index 100%
rename from data/sql/base/auth/realmcharacters.sql
rename to data/sql/base/db_auth/realmcharacters.sql
diff --git a/data/sql/base/auth/realmlist.sql b/data/sql/base/db_auth/realmlist.sql
similarity index 100%
rename from data/sql/base/auth/realmlist.sql
rename to data/sql/base/db_auth/realmlist.sql
diff --git a/data/sql/base/characters/account_data.sql b/data/sql/base/db_characters/account_data.sql
similarity index 100%
rename from data/sql/base/characters/account_data.sql
rename to data/sql/base/db_characters/account_data.sql
diff --git a/data/sql/base/characters/account_instance_times.sql b/data/sql/base/db_characters/account_instance_times.sql
similarity index 100%
rename from data/sql/base/characters/account_instance_times.sql
rename to data/sql/base/db_characters/account_instance_times.sql
diff --git a/data/sql/base/characters/account_tutorial.sql b/data/sql/base/db_characters/account_tutorial.sql
similarity index 100%
rename from data/sql/base/characters/account_tutorial.sql
rename to data/sql/base/db_characters/account_tutorial.sql
diff --git a/data/sql/base/characters/addons.sql b/data/sql/base/db_characters/addons.sql
similarity index 100%
rename from data/sql/base/characters/addons.sql
rename to data/sql/base/db_characters/addons.sql
diff --git a/data/sql/base/characters/arena_team.sql b/data/sql/base/db_characters/arena_team.sql
similarity index 100%
rename from data/sql/base/characters/arena_team.sql
rename to data/sql/base/db_characters/arena_team.sql
diff --git a/data/sql/base/characters/arena_team_member.sql b/data/sql/base/db_characters/arena_team_member.sql
similarity index 100%
rename from data/sql/base/characters/arena_team_member.sql
rename to data/sql/base/db_characters/arena_team_member.sql
diff --git a/data/sql/base/characters/auctionhouse.sql b/data/sql/base/db_characters/auctionhouse.sql
similarity index 100%
rename from data/sql/base/characters/auctionhouse.sql
rename to data/sql/base/db_characters/auctionhouse.sql
diff --git a/data/sql/base/characters/battleground_deserters.sql b/data/sql/base/db_characters/battleground_deserters.sql
similarity index 100%
rename from data/sql/base/characters/battleground_deserters.sql
rename to data/sql/base/db_characters/battleground_deserters.sql
diff --git a/data/sql/base/characters/bugreport.sql b/data/sql/base/db_characters/bugreport.sql
similarity index 100%
rename from data/sql/base/characters/bugreport.sql
rename to data/sql/base/db_characters/bugreport.sql
diff --git a/data/sql/base/characters/calendar_events.sql b/data/sql/base/db_characters/calendar_events.sql
similarity index 100%
rename from data/sql/base/characters/calendar_events.sql
rename to data/sql/base/db_characters/calendar_events.sql
diff --git a/data/sql/base/characters/calendar_invites.sql b/data/sql/base/db_characters/calendar_invites.sql
similarity index 100%
rename from data/sql/base/characters/calendar_invites.sql
rename to data/sql/base/db_characters/calendar_invites.sql
diff --git a/data/sql/base/characters/channels.sql b/data/sql/base/db_characters/channels.sql
similarity index 100%
rename from data/sql/base/characters/channels.sql
rename to data/sql/base/db_characters/channels.sql
diff --git a/data/sql/base/characters/channels_bans.sql b/data/sql/base/db_characters/channels_bans.sql
similarity index 100%
rename from data/sql/base/characters/channels_bans.sql
rename to data/sql/base/db_characters/channels_bans.sql
diff --git a/data/sql/base/characters/channels_rights.sql b/data/sql/base/db_characters/channels_rights.sql
similarity index 100%
rename from data/sql/base/characters/channels_rights.sql
rename to data/sql/base/db_characters/channels_rights.sql
diff --git a/data/sql/base/characters/character_account_data.sql b/data/sql/base/db_characters/character_account_data.sql
similarity index 100%
rename from data/sql/base/characters/character_account_data.sql
rename to data/sql/base/db_characters/character_account_data.sql
diff --git a/data/sql/base/characters/character_achievement.sql b/data/sql/base/db_characters/character_achievement.sql
similarity index 100%
rename from data/sql/base/characters/character_achievement.sql
rename to data/sql/base/db_characters/character_achievement.sql
diff --git a/data/sql/base/characters/character_achievement_progress.sql b/data/sql/base/db_characters/character_achievement_progress.sql
similarity index 100%
rename from data/sql/base/characters/character_achievement_progress.sql
rename to data/sql/base/db_characters/character_achievement_progress.sql
diff --git a/data/sql/base/characters/character_action.sql b/data/sql/base/db_characters/character_action.sql
similarity index 100%
rename from data/sql/base/characters/character_action.sql
rename to data/sql/base/db_characters/character_action.sql
diff --git a/data/sql/base/characters/character_arena_stats.sql b/data/sql/base/db_characters/character_arena_stats.sql
similarity index 100%
rename from data/sql/base/characters/character_arena_stats.sql
rename to data/sql/base/db_characters/character_arena_stats.sql
diff --git a/data/sql/base/characters/character_aura.sql b/data/sql/base/db_characters/character_aura.sql
similarity index 100%
rename from data/sql/base/characters/character_aura.sql
rename to data/sql/base/db_characters/character_aura.sql
diff --git a/data/sql/base/characters/character_banned.sql b/data/sql/base/db_characters/character_banned.sql
similarity index 100%
rename from data/sql/base/characters/character_banned.sql
rename to data/sql/base/db_characters/character_banned.sql
diff --git a/data/sql/base/characters/character_battleground_random.sql b/data/sql/base/db_characters/character_battleground_random.sql
similarity index 100%
rename from data/sql/base/characters/character_battleground_random.sql
rename to data/sql/base/db_characters/character_battleground_random.sql
diff --git a/data/sql/base/characters/character_brew_of_the_month.sql b/data/sql/base/db_characters/character_brew_of_the_month.sql
similarity index 100%
rename from data/sql/base/characters/character_brew_of_the_month.sql
rename to data/sql/base/db_characters/character_brew_of_the_month.sql
diff --git a/data/sql/base/characters/character_declinedname.sql b/data/sql/base/db_characters/character_declinedname.sql
similarity index 100%
rename from data/sql/base/characters/character_declinedname.sql
rename to data/sql/base/db_characters/character_declinedname.sql
diff --git a/data/sql/base/characters/character_entry_point.sql b/data/sql/base/db_characters/character_entry_point.sql
similarity index 100%
rename from data/sql/base/characters/character_entry_point.sql
rename to data/sql/base/db_characters/character_entry_point.sql
diff --git a/data/sql/base/characters/character_equipmentsets.sql b/data/sql/base/db_characters/character_equipmentsets.sql
similarity index 100%
rename from data/sql/base/characters/character_equipmentsets.sql
rename to data/sql/base/db_characters/character_equipmentsets.sql
diff --git a/data/sql/base/characters/character_gifts.sql b/data/sql/base/db_characters/character_gifts.sql
similarity index 100%
rename from data/sql/base/characters/character_gifts.sql
rename to data/sql/base/db_characters/character_gifts.sql
diff --git a/data/sql/base/characters/character_glyphs.sql b/data/sql/base/db_characters/character_glyphs.sql
similarity index 100%
rename from data/sql/base/characters/character_glyphs.sql
rename to data/sql/base/db_characters/character_glyphs.sql
diff --git a/data/sql/base/characters/character_homebind.sql b/data/sql/base/db_characters/character_homebind.sql
similarity index 100%
rename from data/sql/base/characters/character_homebind.sql
rename to data/sql/base/db_characters/character_homebind.sql
diff --git a/data/sql/base/characters/character_instance.sql b/data/sql/base/db_characters/character_instance.sql
similarity index 100%
rename from data/sql/base/characters/character_instance.sql
rename to data/sql/base/db_characters/character_instance.sql
diff --git a/data/sql/base/characters/character_inventory.sql b/data/sql/base/db_characters/character_inventory.sql
similarity index 100%
rename from data/sql/base/characters/character_inventory.sql
rename to data/sql/base/db_characters/character_inventory.sql
diff --git a/data/sql/base/characters/character_pet.sql b/data/sql/base/db_characters/character_pet.sql
similarity index 100%
rename from data/sql/base/characters/character_pet.sql
rename to data/sql/base/db_characters/character_pet.sql
diff --git a/data/sql/base/characters/character_pet_declinedname.sql b/data/sql/base/db_characters/character_pet_declinedname.sql
similarity index 100%
rename from data/sql/base/characters/character_pet_declinedname.sql
rename to data/sql/base/db_characters/character_pet_declinedname.sql
diff --git a/data/sql/base/characters/character_queststatus.sql b/data/sql/base/db_characters/character_queststatus.sql
similarity index 100%
rename from data/sql/base/characters/character_queststatus.sql
rename to data/sql/base/db_characters/character_queststatus.sql
diff --git a/data/sql/base/characters/character_queststatus_daily.sql b/data/sql/base/db_characters/character_queststatus_daily.sql
similarity index 100%
rename from data/sql/base/characters/character_queststatus_daily.sql
rename to data/sql/base/db_characters/character_queststatus_daily.sql
diff --git a/data/sql/base/characters/character_queststatus_monthly.sql b/data/sql/base/db_characters/character_queststatus_monthly.sql
similarity index 100%
rename from data/sql/base/characters/character_queststatus_monthly.sql
rename to data/sql/base/db_characters/character_queststatus_monthly.sql
diff --git a/data/sql/base/characters/character_queststatus_rewarded.sql b/data/sql/base/db_characters/character_queststatus_rewarded.sql
similarity index 100%
rename from data/sql/base/characters/character_queststatus_rewarded.sql
rename to data/sql/base/db_characters/character_queststatus_rewarded.sql
diff --git a/data/sql/base/characters/character_queststatus_seasonal.sql b/data/sql/base/db_characters/character_queststatus_seasonal.sql
similarity index 100%
rename from data/sql/base/characters/character_queststatus_seasonal.sql
rename to data/sql/base/db_characters/character_queststatus_seasonal.sql
diff --git a/data/sql/base/characters/character_queststatus_weekly.sql b/data/sql/base/db_characters/character_queststatus_weekly.sql
similarity index 100%
rename from data/sql/base/characters/character_queststatus_weekly.sql
rename to data/sql/base/db_characters/character_queststatus_weekly.sql
diff --git a/data/sql/base/characters/character_reputation.sql b/data/sql/base/db_characters/character_reputation.sql
similarity index 100%
rename from data/sql/base/characters/character_reputation.sql
rename to data/sql/base/db_characters/character_reputation.sql
diff --git a/data/sql/base/characters/character_skills.sql b/data/sql/base/db_characters/character_skills.sql
similarity index 100%
rename from data/sql/base/characters/character_skills.sql
rename to data/sql/base/db_characters/character_skills.sql
diff --git a/data/sql/base/characters/character_social.sql b/data/sql/base/db_characters/character_social.sql
similarity index 100%
rename from data/sql/base/characters/character_social.sql
rename to data/sql/base/db_characters/character_social.sql
diff --git a/data/sql/base/characters/character_spell.sql b/data/sql/base/db_characters/character_spell.sql
similarity index 100%
rename from data/sql/base/characters/character_spell.sql
rename to data/sql/base/db_characters/character_spell.sql
diff --git a/data/sql/base/characters/character_spell_cooldown.sql b/data/sql/base/db_characters/character_spell_cooldown.sql
similarity index 100%
rename from data/sql/base/characters/character_spell_cooldown.sql
rename to data/sql/base/db_characters/character_spell_cooldown.sql
diff --git a/data/sql/base/characters/character_stats.sql b/data/sql/base/db_characters/character_stats.sql
similarity index 100%
rename from data/sql/base/characters/character_stats.sql
rename to data/sql/base/db_characters/character_stats.sql
diff --git a/data/sql/base/characters/character_talent.sql b/data/sql/base/db_characters/character_talent.sql
similarity index 100%
rename from data/sql/base/characters/character_talent.sql
rename to data/sql/base/db_characters/character_talent.sql
diff --git a/data/sql/base/characters/characters.sql b/data/sql/base/db_characters/characters.sql
similarity index 100%
rename from data/sql/base/characters/characters.sql
rename to data/sql/base/db_characters/characters.sql
diff --git a/data/sql/base/characters/characters_db_version.sql b/data/sql/base/db_characters/characters_db_version.sql
similarity index 100%
rename from data/sql/base/characters/characters_db_version.sql
rename to data/sql/base/db_characters/characters_db_version.sql
diff --git a/data/sql/base/characters/cheaters.sql b/data/sql/base/db_characters/cheaters.sql
similarity index 100%
rename from data/sql/base/characters/cheaters.sql
rename to data/sql/base/db_characters/cheaters.sql
diff --git a/data/sql/base/characters/corpse.sql b/data/sql/base/db_characters/corpse.sql
similarity index 100%
rename from data/sql/base/characters/corpse.sql
rename to data/sql/base/db_characters/corpse.sql
diff --git a/data/sql/base/characters/creature_respawn.sql b/data/sql/base/db_characters/creature_respawn.sql
similarity index 100%
rename from data/sql/base/characters/creature_respawn.sql
rename to data/sql/base/db_characters/creature_respawn.sql
diff --git a/data/sql/base/characters/game_event_condition_save.sql b/data/sql/base/db_characters/game_event_condition_save.sql
similarity index 100%
rename from data/sql/base/characters/game_event_condition_save.sql
rename to data/sql/base/db_characters/game_event_condition_save.sql
diff --git a/data/sql/base/characters/game_event_save.sql b/data/sql/base/db_characters/game_event_save.sql
similarity index 100%
rename from data/sql/base/characters/game_event_save.sql
rename to data/sql/base/db_characters/game_event_save.sql
diff --git a/data/sql/base/characters/gameobject_respawn.sql b/data/sql/base/db_characters/gameobject_respawn.sql
similarity index 100%
rename from data/sql/base/characters/gameobject_respawn.sql
rename to data/sql/base/db_characters/gameobject_respawn.sql
diff --git a/data/sql/base/characters/gm_subsurvey.sql b/data/sql/base/db_characters/gm_subsurvey.sql
similarity index 100%
rename from data/sql/base/characters/gm_subsurvey.sql
rename to data/sql/base/db_characters/gm_subsurvey.sql
diff --git a/data/sql/base/characters/gm_survey.sql b/data/sql/base/db_characters/gm_survey.sql
similarity index 100%
rename from data/sql/base/characters/gm_survey.sql
rename to data/sql/base/db_characters/gm_survey.sql
diff --git a/data/sql/base/characters/gm_ticket.sql b/data/sql/base/db_characters/gm_ticket.sql
similarity index 100%
rename from data/sql/base/characters/gm_ticket.sql
rename to data/sql/base/db_characters/gm_ticket.sql
diff --git a/data/sql/base/characters/group_member.sql b/data/sql/base/db_characters/group_member.sql
similarity index 100%
rename from data/sql/base/characters/group_member.sql
rename to data/sql/base/db_characters/group_member.sql
diff --git a/data/sql/base/characters/groups.sql b/data/sql/base/db_characters/groups.sql
similarity index 100%
rename from data/sql/base/characters/groups.sql
rename to data/sql/base/db_characters/groups.sql
diff --git a/data/sql/base/characters/guild.sql b/data/sql/base/db_characters/guild.sql
similarity index 100%
rename from data/sql/base/characters/guild.sql
rename to data/sql/base/db_characters/guild.sql
diff --git a/data/sql/base/characters/guild_bank_eventlog.sql b/data/sql/base/db_characters/guild_bank_eventlog.sql
similarity index 100%
rename from data/sql/base/characters/guild_bank_eventlog.sql
rename to data/sql/base/db_characters/guild_bank_eventlog.sql
diff --git a/data/sql/base/characters/guild_bank_item.sql b/data/sql/base/db_characters/guild_bank_item.sql
similarity index 100%
rename from data/sql/base/characters/guild_bank_item.sql
rename to data/sql/base/db_characters/guild_bank_item.sql
diff --git a/data/sql/base/characters/guild_bank_right.sql b/data/sql/base/db_characters/guild_bank_right.sql
similarity index 100%
rename from data/sql/base/characters/guild_bank_right.sql
rename to data/sql/base/db_characters/guild_bank_right.sql
diff --git a/data/sql/base/characters/guild_bank_tab.sql b/data/sql/base/db_characters/guild_bank_tab.sql
similarity index 100%
rename from data/sql/base/characters/guild_bank_tab.sql
rename to data/sql/base/db_characters/guild_bank_tab.sql
diff --git a/data/sql/base/characters/guild_eventlog.sql b/data/sql/base/db_characters/guild_eventlog.sql
similarity index 100%
rename from data/sql/base/characters/guild_eventlog.sql
rename to data/sql/base/db_characters/guild_eventlog.sql
diff --git a/data/sql/base/characters/guild_member.sql b/data/sql/base/db_characters/guild_member.sql
similarity index 100%
rename from data/sql/base/characters/guild_member.sql
rename to data/sql/base/db_characters/guild_member.sql
diff --git a/data/sql/base/characters/guild_member_withdraw.sql b/data/sql/base/db_characters/guild_member_withdraw.sql
similarity index 100%
rename from data/sql/base/characters/guild_member_withdraw.sql
rename to data/sql/base/db_characters/guild_member_withdraw.sql
diff --git a/data/sql/base/characters/guild_rank.sql b/data/sql/base/db_characters/guild_rank.sql
similarity index 100%
rename from data/sql/base/characters/guild_rank.sql
rename to data/sql/base/db_characters/guild_rank.sql
diff --git a/data/sql/base/characters/instance.sql b/data/sql/base/db_characters/instance.sql
similarity index 100%
rename from data/sql/base/characters/instance.sql
rename to data/sql/base/db_characters/instance.sql
diff --git a/data/sql/base/characters/instance_reset.sql b/data/sql/base/db_characters/instance_reset.sql
similarity index 100%
rename from data/sql/base/characters/instance_reset.sql
rename to data/sql/base/db_characters/instance_reset.sql
diff --git a/data/sql/base/characters/item_instance.sql b/data/sql/base/db_characters/item_instance.sql
similarity index 100%
rename from data/sql/base/characters/item_instance.sql
rename to data/sql/base/db_characters/item_instance.sql
diff --git a/data/sql/base/characters/item_loot_storage.sql b/data/sql/base/db_characters/item_loot_storage.sql
similarity index 100%
rename from data/sql/base/characters/item_loot_storage.sql
rename to data/sql/base/db_characters/item_loot_storage.sql
diff --git a/data/sql/base/characters/item_refund_instance.sql b/data/sql/base/db_characters/item_refund_instance.sql
similarity index 100%
rename from data/sql/base/characters/item_refund_instance.sql
rename to data/sql/base/db_characters/item_refund_instance.sql
diff --git a/data/sql/base/characters/item_soulbound_trade_data.sql b/data/sql/base/db_characters/item_soulbound_trade_data.sql
similarity index 100%
rename from data/sql/base/characters/item_soulbound_trade_data.sql
rename to data/sql/base/db_characters/item_soulbound_trade_data.sql
diff --git a/data/sql/base/characters/lag_reports.sql b/data/sql/base/db_characters/lag_reports.sql
similarity index 100%
rename from data/sql/base/characters/lag_reports.sql
rename to data/sql/base/db_characters/lag_reports.sql
diff --git a/data/sql/base/characters/lfg_data.sql b/data/sql/base/db_characters/lfg_data.sql
similarity index 100%
rename from data/sql/base/characters/lfg_data.sql
rename to data/sql/base/db_characters/lfg_data.sql
diff --git a/data/sql/base/characters/log_arena_fights.sql b/data/sql/base/db_characters/log_arena_fights.sql
similarity index 100%
rename from data/sql/base/characters/log_arena_fights.sql
rename to data/sql/base/db_characters/log_arena_fights.sql
diff --git a/data/sql/base/characters/log_arena_memberstats.sql b/data/sql/base/db_characters/log_arena_memberstats.sql
similarity index 100%
rename from data/sql/base/characters/log_arena_memberstats.sql
rename to data/sql/base/db_characters/log_arena_memberstats.sql
diff --git a/data/sql/base/characters/log_encounter.sql b/data/sql/base/db_characters/log_encounter.sql
similarity index 100%
rename from data/sql/base/characters/log_encounter.sql
rename to data/sql/base/db_characters/log_encounter.sql
diff --git a/data/sql/base/characters/log_money.sql b/data/sql/base/db_characters/log_money.sql
similarity index 100%
rename from data/sql/base/characters/log_money.sql
rename to data/sql/base/db_characters/log_money.sql
diff --git a/data/sql/base/characters/mail.sql b/data/sql/base/db_characters/mail.sql
similarity index 100%
rename from data/sql/base/characters/mail.sql
rename to data/sql/base/db_characters/mail.sql
diff --git a/data/sql/base/characters/mail_items.sql b/data/sql/base/db_characters/mail_items.sql
similarity index 100%
rename from data/sql/base/characters/mail_items.sql
rename to data/sql/base/db_characters/mail_items.sql
diff --git a/data/sql/base/characters/pet_aura.sql b/data/sql/base/db_characters/pet_aura.sql
similarity index 100%
rename from data/sql/base/characters/pet_aura.sql
rename to data/sql/base/db_characters/pet_aura.sql
diff --git a/data/sql/base/characters/pet_spell.sql b/data/sql/base/db_characters/pet_spell.sql
similarity index 100%
rename from data/sql/base/characters/pet_spell.sql
rename to data/sql/base/db_characters/pet_spell.sql
diff --git a/data/sql/base/characters/pet_spell_cooldown.sql b/data/sql/base/db_characters/pet_spell_cooldown.sql
similarity index 100%
rename from data/sql/base/characters/pet_spell_cooldown.sql
rename to data/sql/base/db_characters/pet_spell_cooldown.sql
diff --git a/data/sql/base/characters/petition.sql b/data/sql/base/db_characters/petition.sql
similarity index 100%
rename from data/sql/base/characters/petition.sql
rename to data/sql/base/db_characters/petition.sql
diff --git a/data/sql/base/characters/petition_sign.sql b/data/sql/base/db_characters/petition_sign.sql
similarity index 100%
rename from data/sql/base/characters/petition_sign.sql
rename to data/sql/base/db_characters/petition_sign.sql
diff --git a/data/sql/base/characters/pool_quest_save.sql b/data/sql/base/db_characters/pool_quest_save.sql
similarity index 100%
rename from data/sql/base/characters/pool_quest_save.sql
rename to data/sql/base/db_characters/pool_quest_save.sql
diff --git a/data/sql/base/characters/pvpstats_battlegrounds.sql b/data/sql/base/db_characters/pvpstats_battlegrounds.sql
similarity index 100%
rename from data/sql/base/characters/pvpstats_battlegrounds.sql
rename to data/sql/base/db_characters/pvpstats_battlegrounds.sql
diff --git a/data/sql/base/characters/pvpstats_players.sql b/data/sql/base/db_characters/pvpstats_players.sql
similarity index 100%
rename from data/sql/base/characters/pvpstats_players.sql
rename to data/sql/base/db_characters/pvpstats_players.sql
diff --git a/data/sql/base/characters/reserved_name.sql b/data/sql/base/db_characters/reserved_name.sql
similarity index 100%
rename from data/sql/base/characters/reserved_name.sql
rename to data/sql/base/db_characters/reserved_name.sql
diff --git a/data/sql/base/characters/uptime.sql b/data/sql/base/db_characters/uptime.sql
similarity index 100%
rename from data/sql/base/characters/uptime.sql
rename to data/sql/base/db_characters/uptime.sql
diff --git a/data/sql/base/characters/warden_action.sql b/data/sql/base/db_characters/warden_action.sql
similarity index 100%
rename from data/sql/base/characters/warden_action.sql
rename to data/sql/base/db_characters/warden_action.sql
diff --git a/data/sql/base/characters/worldstates.sql b/data/sql/base/db_characters/worldstates.sql
similarity index 100%
rename from data/sql/base/characters/worldstates.sql
rename to data/sql/base/db_characters/worldstates.sql
diff --git a/data/sql/base/world/access_requirement.sql b/data/sql/base/db_world/access_requirement.sql
similarity index 100%
rename from data/sql/base/world/access_requirement.sql
rename to data/sql/base/db_world/access_requirement.sql
diff --git a/data/sql/base/world/achievement_criteria_data.sql b/data/sql/base/db_world/achievement_criteria_data.sql
similarity index 100%
rename from data/sql/base/world/achievement_criteria_data.sql
rename to data/sql/base/db_world/achievement_criteria_data.sql
diff --git a/data/sql/base/world/achievement_dbc.sql b/data/sql/base/db_world/achievement_dbc.sql
similarity index 100%
rename from data/sql/base/world/achievement_dbc.sql
rename to data/sql/base/db_world/achievement_dbc.sql
diff --git a/data/sql/base/world/achievement_reward.sql b/data/sql/base/db_world/achievement_reward.sql
similarity index 100%
rename from data/sql/base/world/achievement_reward.sql
rename to data/sql/base/db_world/achievement_reward.sql
diff --git a/data/sql/base/world/areatrigger_involvedrelation.sql b/data/sql/base/db_world/areatrigger_involvedrelation.sql
similarity index 100%
rename from data/sql/base/world/areatrigger_involvedrelation.sql
rename to data/sql/base/db_world/areatrigger_involvedrelation.sql
diff --git a/data/sql/base/world/areatrigger_scripts.sql b/data/sql/base/db_world/areatrigger_scripts.sql
similarity index 100%
rename from data/sql/base/world/areatrigger_scripts.sql
rename to data/sql/base/db_world/areatrigger_scripts.sql
diff --git a/data/sql/base/world/areatrigger_tavern.sql b/data/sql/base/db_world/areatrigger_tavern.sql
similarity index 100%
rename from data/sql/base/world/areatrigger_tavern.sql
rename to data/sql/base/db_world/areatrigger_tavern.sql
diff --git a/data/sql/base/world/areatrigger_teleport.sql b/data/sql/base/db_world/areatrigger_teleport.sql
similarity index 100%
rename from data/sql/base/world/areatrigger_teleport.sql
rename to data/sql/base/db_world/areatrigger_teleport.sql
diff --git a/data/sql/base/world/battleground_template.sql b/data/sql/base/db_world/battleground_template.sql
similarity index 100%
rename from data/sql/base/world/battleground_template.sql
rename to data/sql/base/db_world/battleground_template.sql
diff --git a/data/sql/base/world/battlemaster_entry.sql b/data/sql/base/db_world/battlemaster_entry.sql
similarity index 100%
rename from data/sql/base/world/battlemaster_entry.sql
rename to data/sql/base/db_world/battlemaster_entry.sql
diff --git a/data/sql/base/world/command.sql b/data/sql/base/db_world/command.sql
similarity index 100%
rename from data/sql/base/world/command.sql
rename to data/sql/base/db_world/command.sql
diff --git a/data/sql/base/world/conditions.sql b/data/sql/base/db_world/conditions.sql
similarity index 100%
rename from data/sql/base/world/conditions.sql
rename to data/sql/base/db_world/conditions.sql
diff --git a/data/sql/base/world/creature.sql b/data/sql/base/db_world/creature.sql
similarity index 100%
rename from data/sql/base/world/creature.sql
rename to data/sql/base/db_world/creature.sql
diff --git a/data/sql/base/world/creature_addon.sql b/data/sql/base/db_world/creature_addon.sql
similarity index 100%
rename from data/sql/base/world/creature_addon.sql
rename to data/sql/base/db_world/creature_addon.sql
diff --git a/data/sql/base/world/creature_classlevelstats.sql b/data/sql/base/db_world/creature_classlevelstats.sql
similarity index 100%
rename from data/sql/base/world/creature_classlevelstats.sql
rename to data/sql/base/db_world/creature_classlevelstats.sql
diff --git a/data/sql/base/world/creature_equip_template.sql b/data/sql/base/db_world/creature_equip_template.sql
similarity index 100%
rename from data/sql/base/world/creature_equip_template.sql
rename to data/sql/base/db_world/creature_equip_template.sql
diff --git a/data/sql/base/world/creature_formations.sql b/data/sql/base/db_world/creature_formations.sql
similarity index 100%
rename from data/sql/base/world/creature_formations.sql
rename to data/sql/base/db_world/creature_formations.sql
diff --git a/data/sql/base/world/creature_loot_template.sql b/data/sql/base/db_world/creature_loot_template.sql
similarity index 100%
rename from data/sql/base/world/creature_loot_template.sql
rename to data/sql/base/db_world/creature_loot_template.sql
diff --git a/data/sql/base/world/creature_model_info.sql b/data/sql/base/db_world/creature_model_info.sql
similarity index 100%
rename from data/sql/base/world/creature_model_info.sql
rename to data/sql/base/db_world/creature_model_info.sql
diff --git a/data/sql/base/world/creature_onkill_reputation.sql b/data/sql/base/db_world/creature_onkill_reputation.sql
similarity index 100%
rename from data/sql/base/world/creature_onkill_reputation.sql
rename to data/sql/base/db_world/creature_onkill_reputation.sql
diff --git a/data/sql/base/world/creature_questender.sql b/data/sql/base/db_world/creature_questender.sql
similarity index 100%
rename from data/sql/base/world/creature_questender.sql
rename to data/sql/base/db_world/creature_questender.sql
diff --git a/data/sql/base/world/creature_queststarter.sql b/data/sql/base/db_world/creature_queststarter.sql
similarity index 100%
rename from data/sql/base/world/creature_queststarter.sql
rename to data/sql/base/db_world/creature_queststarter.sql
diff --git a/data/sql/base/world/creature_summon_groups.sql b/data/sql/base/db_world/creature_summon_groups.sql
similarity index 100%
rename from data/sql/base/world/creature_summon_groups.sql
rename to data/sql/base/db_world/creature_summon_groups.sql
diff --git a/data/sql/base/world/creature_template.sql b/data/sql/base/db_world/creature_template.sql
similarity index 100%
rename from data/sql/base/world/creature_template.sql
rename to data/sql/base/db_world/creature_template.sql
diff --git a/data/sql/base/world/creature_template_addon.sql b/data/sql/base/db_world/creature_template_addon.sql
similarity index 100%
rename from data/sql/base/world/creature_template_addon.sql
rename to data/sql/base/db_world/creature_template_addon.sql
diff --git a/data/sql/base/world/creature_text.sql b/data/sql/base/db_world/creature_text.sql
similarity index 100%
rename from data/sql/base/world/creature_text.sql
rename to data/sql/base/db_world/creature_text.sql
diff --git a/data/sql/base/world/db_script_string.sql b/data/sql/base/db_world/db_script_string.sql
similarity index 100%
rename from data/sql/base/world/db_script_string.sql
rename to data/sql/base/db_world/db_script_string.sql
diff --git a/data/sql/base/world/disables.sql b/data/sql/base/db_world/disables.sql
similarity index 100%
rename from data/sql/base/world/disables.sql
rename to data/sql/base/db_world/disables.sql
diff --git a/data/sql/base/world/disenchant_loot_template.sql b/data/sql/base/db_world/disenchant_loot_template.sql
similarity index 100%
rename from data/sql/base/world/disenchant_loot_template.sql
rename to data/sql/base/db_world/disenchant_loot_template.sql
diff --git a/data/sql/base/world/event_scripts.sql b/data/sql/base/db_world/event_scripts.sql
similarity index 100%
rename from data/sql/base/world/event_scripts.sql
rename to data/sql/base/db_world/event_scripts.sql
diff --git a/data/sql/base/world/exploration_basexp.sql b/data/sql/base/db_world/exploration_basexp.sql
similarity index 100%
rename from data/sql/base/world/exploration_basexp.sql
rename to data/sql/base/db_world/exploration_basexp.sql
diff --git a/data/sql/base/world/fishing_loot_template.sql b/data/sql/base/db_world/fishing_loot_template.sql
similarity index 100%
rename from data/sql/base/world/fishing_loot_template.sql
rename to data/sql/base/db_world/fishing_loot_template.sql
diff --git a/data/sql/base/world/game_event.sql b/data/sql/base/db_world/game_event.sql
similarity index 100%
rename from data/sql/base/world/game_event.sql
rename to data/sql/base/db_world/game_event.sql
diff --git a/data/sql/base/world/game_event_arena_seasons.sql b/data/sql/base/db_world/game_event_arena_seasons.sql
similarity index 100%
rename from data/sql/base/world/game_event_arena_seasons.sql
rename to data/sql/base/db_world/game_event_arena_seasons.sql
diff --git a/data/sql/base/world/game_event_battleground_holiday.sql b/data/sql/base/db_world/game_event_battleground_holiday.sql
similarity index 100%
rename from data/sql/base/world/game_event_battleground_holiday.sql
rename to data/sql/base/db_world/game_event_battleground_holiday.sql
diff --git a/data/sql/base/world/game_event_condition.sql b/data/sql/base/db_world/game_event_condition.sql
similarity index 100%
rename from data/sql/base/world/game_event_condition.sql
rename to data/sql/base/db_world/game_event_condition.sql
diff --git a/data/sql/base/world/game_event_creature.sql b/data/sql/base/db_world/game_event_creature.sql
similarity index 100%
rename from data/sql/base/world/game_event_creature.sql
rename to data/sql/base/db_world/game_event_creature.sql
diff --git a/data/sql/base/world/game_event_creature_quest.sql b/data/sql/base/db_world/game_event_creature_quest.sql
similarity index 100%
rename from data/sql/base/world/game_event_creature_quest.sql
rename to data/sql/base/db_world/game_event_creature_quest.sql
diff --git a/data/sql/base/world/game_event_gameobject.sql b/data/sql/base/db_world/game_event_gameobject.sql
similarity index 100%
rename from data/sql/base/world/game_event_gameobject.sql
rename to data/sql/base/db_world/game_event_gameobject.sql
diff --git a/data/sql/base/world/game_event_gameobject_quest.sql b/data/sql/base/db_world/game_event_gameobject_quest.sql
similarity index 100%
rename from data/sql/base/world/game_event_gameobject_quest.sql
rename to data/sql/base/db_world/game_event_gameobject_quest.sql
diff --git a/data/sql/base/world/game_event_model_equip.sql b/data/sql/base/db_world/game_event_model_equip.sql
similarity index 100%
rename from data/sql/base/world/game_event_model_equip.sql
rename to data/sql/base/db_world/game_event_model_equip.sql
diff --git a/data/sql/base/world/game_event_npc_vendor.sql b/data/sql/base/db_world/game_event_npc_vendor.sql
similarity index 100%
rename from data/sql/base/world/game_event_npc_vendor.sql
rename to data/sql/base/db_world/game_event_npc_vendor.sql
diff --git a/data/sql/base/world/game_event_npcflag.sql b/data/sql/base/db_world/game_event_npcflag.sql
similarity index 100%
rename from data/sql/base/world/game_event_npcflag.sql
rename to data/sql/base/db_world/game_event_npcflag.sql
diff --git a/data/sql/base/world/game_event_pool.sql b/data/sql/base/db_world/game_event_pool.sql
similarity index 100%
rename from data/sql/base/world/game_event_pool.sql
rename to data/sql/base/db_world/game_event_pool.sql
diff --git a/data/sql/base/world/game_event_prerequisite.sql b/data/sql/base/db_world/game_event_prerequisite.sql
similarity index 100%
rename from data/sql/base/world/game_event_prerequisite.sql
rename to data/sql/base/db_world/game_event_prerequisite.sql
diff --git a/data/sql/base/world/game_event_quest_condition.sql b/data/sql/base/db_world/game_event_quest_condition.sql
similarity index 100%
rename from data/sql/base/world/game_event_quest_condition.sql
rename to data/sql/base/db_world/game_event_quest_condition.sql
diff --git a/data/sql/base/world/game_event_seasonal_questrelation.sql b/data/sql/base/db_world/game_event_seasonal_questrelation.sql
similarity index 100%
rename from data/sql/base/world/game_event_seasonal_questrelation.sql
rename to data/sql/base/db_world/game_event_seasonal_questrelation.sql
diff --git a/data/sql/base/world/game_graveyard_zone.sql b/data/sql/base/db_world/game_graveyard_zone.sql
similarity index 100%
rename from data/sql/base/world/game_graveyard_zone.sql
rename to data/sql/base/db_world/game_graveyard_zone.sql
diff --git a/data/sql/base/world/game_tele.sql b/data/sql/base/db_world/game_tele.sql
similarity index 100%
rename from data/sql/base/world/game_tele.sql
rename to data/sql/base/db_world/game_tele.sql
diff --git a/data/sql/base/world/game_weather.sql b/data/sql/base/db_world/game_weather.sql
similarity index 100%
rename from data/sql/base/world/game_weather.sql
rename to data/sql/base/db_world/game_weather.sql
diff --git a/data/sql/base/world/gameobject.sql b/data/sql/base/db_world/gameobject.sql
similarity index 100%
rename from data/sql/base/world/gameobject.sql
rename to data/sql/base/db_world/gameobject.sql
diff --git a/data/sql/base/world/gameobject_addon.sql b/data/sql/base/db_world/gameobject_addon.sql
similarity index 100%
rename from data/sql/base/world/gameobject_addon.sql
rename to data/sql/base/db_world/gameobject_addon.sql
diff --git a/data/sql/base/world/gameobject_loot_template.sql b/data/sql/base/db_world/gameobject_loot_template.sql
similarity index 100%
rename from data/sql/base/world/gameobject_loot_template.sql
rename to data/sql/base/db_world/gameobject_loot_template.sql
diff --git a/data/sql/base/world/gameobject_questender.sql b/data/sql/base/db_world/gameobject_questender.sql
similarity index 100%
rename from data/sql/base/world/gameobject_questender.sql
rename to data/sql/base/db_world/gameobject_questender.sql
diff --git a/data/sql/base/world/gameobject_queststarter.sql b/data/sql/base/db_world/gameobject_queststarter.sql
similarity index 100%
rename from data/sql/base/world/gameobject_queststarter.sql
rename to data/sql/base/db_world/gameobject_queststarter.sql
diff --git a/data/sql/base/world/gameobject_template.sql b/data/sql/base/db_world/gameobject_template.sql
similarity index 100%
rename from data/sql/base/world/gameobject_template.sql
rename to data/sql/base/db_world/gameobject_template.sql
diff --git a/data/sql/base/world/gossip_menu.sql b/data/sql/base/db_world/gossip_menu.sql
similarity index 100%
rename from data/sql/base/world/gossip_menu.sql
rename to data/sql/base/db_world/gossip_menu.sql
diff --git a/data/sql/base/world/gossip_menu_option.sql b/data/sql/base/db_world/gossip_menu_option.sql
similarity index 100%
rename from data/sql/base/world/gossip_menu_option.sql
rename to data/sql/base/db_world/gossip_menu_option.sql
diff --git a/data/sql/base/world/instance_encounters.sql b/data/sql/base/db_world/instance_encounters.sql
similarity index 100%
rename from data/sql/base/world/instance_encounters.sql
rename to data/sql/base/db_world/instance_encounters.sql
diff --git a/data/sql/base/world/instance_template.sql b/data/sql/base/db_world/instance_template.sql
similarity index 100%
rename from data/sql/base/world/instance_template.sql
rename to data/sql/base/db_world/instance_template.sql
diff --git a/data/sql/base/world/item_enchantment_template.sql b/data/sql/base/db_world/item_enchantment_template.sql
similarity index 100%
rename from data/sql/base/world/item_enchantment_template.sql
rename to data/sql/base/db_world/item_enchantment_template.sql
diff --git a/data/sql/base/world/item_loot_template.sql b/data/sql/base/db_world/item_loot_template.sql
similarity index 100%
rename from data/sql/base/world/item_loot_template.sql
rename to data/sql/base/db_world/item_loot_template.sql
diff --git a/data/sql/base/world/item_set_names.sql b/data/sql/base/db_world/item_set_names.sql
similarity index 100%
rename from data/sql/base/world/item_set_names.sql
rename to data/sql/base/db_world/item_set_names.sql
diff --git a/data/sql/base/world/item_template.sql b/data/sql/base/db_world/item_template.sql
similarity index 100%
rename from data/sql/base/world/item_template.sql
rename to data/sql/base/db_world/item_template.sql
diff --git a/data/sql/base/world/lfg_dungeon_rewards.sql b/data/sql/base/db_world/lfg_dungeon_rewards.sql
similarity index 100%
rename from data/sql/base/world/lfg_dungeon_rewards.sql
rename to data/sql/base/db_world/lfg_dungeon_rewards.sql
diff --git a/data/sql/base/world/lfg_entrances.sql b/data/sql/base/db_world/lfg_entrances.sql
similarity index 100%
rename from data/sql/base/world/lfg_entrances.sql
rename to data/sql/base/db_world/lfg_entrances.sql
diff --git a/data/sql/base/world/linked_respawn.sql b/data/sql/base/db_world/linked_respawn.sql
similarity index 100%
rename from data/sql/base/world/linked_respawn.sql
rename to data/sql/base/db_world/linked_respawn.sql
diff --git a/data/sql/base/world/locales_achievement_reward.sql b/data/sql/base/db_world/locales_achievement_reward.sql
similarity index 100%
rename from data/sql/base/world/locales_achievement_reward.sql
rename to data/sql/base/db_world/locales_achievement_reward.sql
diff --git a/data/sql/base/world/locales_creature.sql b/data/sql/base/db_world/locales_creature.sql
similarity index 100%
rename from data/sql/base/world/locales_creature.sql
rename to data/sql/base/db_world/locales_creature.sql
diff --git a/data/sql/base/world/locales_creature_text.sql b/data/sql/base/db_world/locales_creature_text.sql
similarity index 100%
rename from data/sql/base/world/locales_creature_text.sql
rename to data/sql/base/db_world/locales_creature_text.sql
diff --git a/data/sql/base/world/locales_gameobject.sql b/data/sql/base/db_world/locales_gameobject.sql
similarity index 100%
rename from data/sql/base/world/locales_gameobject.sql
rename to data/sql/base/db_world/locales_gameobject.sql
diff --git a/data/sql/base/world/locales_gossip_menu_option.sql b/data/sql/base/db_world/locales_gossip_menu_option.sql
similarity index 100%
rename from data/sql/base/world/locales_gossip_menu_option.sql
rename to data/sql/base/db_world/locales_gossip_menu_option.sql
diff --git a/data/sql/base/world/locales_item.sql b/data/sql/base/db_world/locales_item.sql
similarity index 100%
rename from data/sql/base/world/locales_item.sql
rename to data/sql/base/db_world/locales_item.sql
diff --git a/data/sql/base/world/locales_item_set_names.sql b/data/sql/base/db_world/locales_item_set_names.sql
similarity index 100%
rename from data/sql/base/world/locales_item_set_names.sql
rename to data/sql/base/db_world/locales_item_set_names.sql
diff --git a/data/sql/base/world/locales_npc_text.sql b/data/sql/base/db_world/locales_npc_text.sql
similarity index 100%
rename from data/sql/base/world/locales_npc_text.sql
rename to data/sql/base/db_world/locales_npc_text.sql
diff --git a/data/sql/base/world/locales_page_text.sql b/data/sql/base/db_world/locales_page_text.sql
similarity index 100%
rename from data/sql/base/world/locales_page_text.sql
rename to data/sql/base/db_world/locales_page_text.sql
diff --git a/data/sql/base/world/locales_points_of_interest.sql b/data/sql/base/db_world/locales_points_of_interest.sql
similarity index 100%
rename from data/sql/base/world/locales_points_of_interest.sql
rename to data/sql/base/db_world/locales_points_of_interest.sql
diff --git a/data/sql/base/world/locales_quest.sql b/data/sql/base/db_world/locales_quest.sql
similarity index 100%
rename from data/sql/base/world/locales_quest.sql
rename to data/sql/base/db_world/locales_quest.sql
diff --git a/data/sql/base/world/mail_level_reward.sql b/data/sql/base/db_world/mail_level_reward.sql
similarity index 100%
rename from data/sql/base/world/mail_level_reward.sql
rename to data/sql/base/db_world/mail_level_reward.sql
diff --git a/data/sql/base/world/mail_loot_template.sql b/data/sql/base/db_world/mail_loot_template.sql
similarity index 100%
rename from data/sql/base/world/mail_loot_template.sql
rename to data/sql/base/db_world/mail_loot_template.sql
diff --git a/data/sql/base/world/milling_loot_template.sql b/data/sql/base/db_world/milling_loot_template.sql
similarity index 100%
rename from data/sql/base/world/milling_loot_template.sql
rename to data/sql/base/db_world/milling_loot_template.sql
diff --git a/data/sql/base/world/npc_spellclick_spells.sql b/data/sql/base/db_world/npc_spellclick_spells.sql
similarity index 100%
rename from data/sql/base/world/npc_spellclick_spells.sql
rename to data/sql/base/db_world/npc_spellclick_spells.sql
diff --git a/data/sql/base/world/npc_text.sql b/data/sql/base/db_world/npc_text.sql
similarity index 100%
rename from data/sql/base/world/npc_text.sql
rename to data/sql/base/db_world/npc_text.sql
diff --git a/data/sql/base/world/npc_trainer.sql b/data/sql/base/db_world/npc_trainer.sql
similarity index 100%
rename from data/sql/base/world/npc_trainer.sql
rename to data/sql/base/db_world/npc_trainer.sql
diff --git a/data/sql/base/world/npc_vendor.sql b/data/sql/base/db_world/npc_vendor.sql
similarity index 100%
rename from data/sql/base/world/npc_vendor.sql
rename to data/sql/base/db_world/npc_vendor.sql
diff --git a/data/sql/base/world/outdoorpvp_template.sql b/data/sql/base/db_world/outdoorpvp_template.sql
similarity index 100%
rename from data/sql/base/world/outdoorpvp_template.sql
rename to data/sql/base/db_world/outdoorpvp_template.sql
diff --git a/data/sql/base/world/page_text.sql b/data/sql/base/db_world/page_text.sql
similarity index 100%
rename from data/sql/base/world/page_text.sql
rename to data/sql/base/db_world/page_text.sql
diff --git a/data/sql/base/world/pet_levelstats.sql b/data/sql/base/db_world/pet_levelstats.sql
similarity index 100%
rename from data/sql/base/world/pet_levelstats.sql
rename to data/sql/base/db_world/pet_levelstats.sql
diff --git a/data/sql/base/world/pet_name_generation.sql b/data/sql/base/db_world/pet_name_generation.sql
similarity index 100%
rename from data/sql/base/world/pet_name_generation.sql
rename to data/sql/base/db_world/pet_name_generation.sql
diff --git a/data/sql/base/world/pickpocketing_loot_template.sql b/data/sql/base/db_world/pickpocketing_loot_template.sql
similarity index 100%
rename from data/sql/base/world/pickpocketing_loot_template.sql
rename to data/sql/base/db_world/pickpocketing_loot_template.sql
diff --git a/data/sql/base/world/player_classlevelstats.sql b/data/sql/base/db_world/player_classlevelstats.sql
similarity index 100%
rename from data/sql/base/world/player_classlevelstats.sql
rename to data/sql/base/db_world/player_classlevelstats.sql
diff --git a/data/sql/base/world/player_factionchange_achievement.sql b/data/sql/base/db_world/player_factionchange_achievement.sql
similarity index 100%
rename from data/sql/base/world/player_factionchange_achievement.sql
rename to data/sql/base/db_world/player_factionchange_achievement.sql
diff --git a/data/sql/base/world/player_factionchange_items.sql b/data/sql/base/db_world/player_factionchange_items.sql
similarity index 100%
rename from data/sql/base/world/player_factionchange_items.sql
rename to data/sql/base/db_world/player_factionchange_items.sql
diff --git a/data/sql/base/world/player_factionchange_quests.sql b/data/sql/base/db_world/player_factionchange_quests.sql
similarity index 100%
rename from data/sql/base/world/player_factionchange_quests.sql
rename to data/sql/base/db_world/player_factionchange_quests.sql
diff --git a/data/sql/base/world/player_factionchange_reputations.sql b/data/sql/base/db_world/player_factionchange_reputations.sql
similarity index 100%
rename from data/sql/base/world/player_factionchange_reputations.sql
rename to data/sql/base/db_world/player_factionchange_reputations.sql
diff --git a/data/sql/base/world/player_factionchange_spells.sql b/data/sql/base/db_world/player_factionchange_spells.sql
similarity index 100%
rename from data/sql/base/world/player_factionchange_spells.sql
rename to data/sql/base/db_world/player_factionchange_spells.sql
diff --git a/data/sql/base/world/player_factionchange_titles.sql b/data/sql/base/db_world/player_factionchange_titles.sql
similarity index 100%
rename from data/sql/base/world/player_factionchange_titles.sql
rename to data/sql/base/db_world/player_factionchange_titles.sql
diff --git a/data/sql/base/world/player_levelstats.sql b/data/sql/base/db_world/player_levelstats.sql
similarity index 100%
rename from data/sql/base/world/player_levelstats.sql
rename to data/sql/base/db_world/player_levelstats.sql
diff --git a/data/sql/base/world/player_xp_for_level.sql b/data/sql/base/db_world/player_xp_for_level.sql
similarity index 100%
rename from data/sql/base/world/player_xp_for_level.sql
rename to data/sql/base/db_world/player_xp_for_level.sql
diff --git a/data/sql/base/world/playercreateinfo.sql b/data/sql/base/db_world/playercreateinfo.sql
similarity index 100%
rename from data/sql/base/world/playercreateinfo.sql
rename to data/sql/base/db_world/playercreateinfo.sql
diff --git a/data/sql/base/world/playercreateinfo_action.sql b/data/sql/base/db_world/playercreateinfo_action.sql
similarity index 100%
rename from data/sql/base/world/playercreateinfo_action.sql
rename to data/sql/base/db_world/playercreateinfo_action.sql
diff --git a/data/sql/base/world/playercreateinfo_item.sql b/data/sql/base/db_world/playercreateinfo_item.sql
similarity index 100%
rename from data/sql/base/world/playercreateinfo_item.sql
rename to data/sql/base/db_world/playercreateinfo_item.sql
diff --git a/data/sql/base/world/playercreateinfo_spell.sql b/data/sql/base/db_world/playercreateinfo_spell.sql
similarity index 100%
rename from data/sql/base/world/playercreateinfo_spell.sql
rename to data/sql/base/db_world/playercreateinfo_spell.sql
diff --git a/data/sql/base/world/playercreateinfo_spell_custom.sql b/data/sql/base/db_world/playercreateinfo_spell_custom.sql
similarity index 100%
rename from data/sql/base/world/playercreateinfo_spell_custom.sql
rename to data/sql/base/db_world/playercreateinfo_spell_custom.sql
diff --git a/data/sql/base/world/points_of_interest.sql b/data/sql/base/db_world/points_of_interest.sql
similarity index 100%
rename from data/sql/base/world/points_of_interest.sql
rename to data/sql/base/db_world/points_of_interest.sql
diff --git a/data/sql/base/world/pool_creature.sql b/data/sql/base/db_world/pool_creature.sql
similarity index 100%
rename from data/sql/base/world/pool_creature.sql
rename to data/sql/base/db_world/pool_creature.sql
diff --git a/data/sql/base/world/pool_gameobject.sql b/data/sql/base/db_world/pool_gameobject.sql
similarity index 100%
rename from data/sql/base/world/pool_gameobject.sql
rename to data/sql/base/db_world/pool_gameobject.sql
diff --git a/data/sql/base/world/pool_pool.sql b/data/sql/base/db_world/pool_pool.sql
similarity index 100%
rename from data/sql/base/world/pool_pool.sql
rename to data/sql/base/db_world/pool_pool.sql
diff --git a/data/sql/base/world/pool_quest.sql b/data/sql/base/db_world/pool_quest.sql
similarity index 100%
rename from data/sql/base/world/pool_quest.sql
rename to data/sql/base/db_world/pool_quest.sql
diff --git a/data/sql/base/world/pool_template.sql b/data/sql/base/db_world/pool_template.sql
similarity index 100%
rename from data/sql/base/world/pool_template.sql
rename to data/sql/base/db_world/pool_template.sql
diff --git a/data/sql/base/world/prospecting_loot_template.sql b/data/sql/base/db_world/prospecting_loot_template.sql
similarity index 100%
rename from data/sql/base/world/prospecting_loot_template.sql
rename to data/sql/base/db_world/prospecting_loot_template.sql
diff --git a/data/sql/base/world/quest_poi.sql b/data/sql/base/db_world/quest_poi.sql
similarity index 100%
rename from data/sql/base/world/quest_poi.sql
rename to data/sql/base/db_world/quest_poi.sql
diff --git a/data/sql/base/world/quest_poi_points.sql b/data/sql/base/db_world/quest_poi_points.sql
similarity index 100%
rename from data/sql/base/world/quest_poi_points.sql
rename to data/sql/base/db_world/quest_poi_points.sql
diff --git a/data/sql/base/world/quest_template.sql b/data/sql/base/db_world/quest_template.sql
similarity index 100%
rename from data/sql/base/world/quest_template.sql
rename to data/sql/base/db_world/quest_template.sql
diff --git a/data/sql/base/world/reference_loot_template.sql b/data/sql/base/db_world/reference_loot_template.sql
similarity index 100%
rename from data/sql/base/world/reference_loot_template.sql
rename to data/sql/base/db_world/reference_loot_template.sql
diff --git a/data/sql/base/world/reputation_reward_rate.sql b/data/sql/base/db_world/reputation_reward_rate.sql
similarity index 100%
rename from data/sql/base/world/reputation_reward_rate.sql
rename to data/sql/base/db_world/reputation_reward_rate.sql
diff --git a/data/sql/base/world/reputation_spillover_template.sql b/data/sql/base/db_world/reputation_spillover_template.sql
similarity index 100%
rename from data/sql/base/world/reputation_spillover_template.sql
rename to data/sql/base/db_world/reputation_spillover_template.sql
diff --git a/data/sql/base/world/script_waypoint.sql b/data/sql/base/db_world/script_waypoint.sql
similarity index 100%
rename from data/sql/base/world/script_waypoint.sql
rename to data/sql/base/db_world/script_waypoint.sql
diff --git a/data/sql/base/world/skill_discovery_template.sql b/data/sql/base/db_world/skill_discovery_template.sql
similarity index 100%
rename from data/sql/base/world/skill_discovery_template.sql
rename to data/sql/base/db_world/skill_discovery_template.sql
diff --git a/data/sql/base/world/skill_extra_item_template.sql b/data/sql/base/db_world/skill_extra_item_template.sql
similarity index 100%
rename from data/sql/base/world/skill_extra_item_template.sql
rename to data/sql/base/db_world/skill_extra_item_template.sql
diff --git a/data/sql/base/world/skill_fishing_base_level.sql b/data/sql/base/db_world/skill_fishing_base_level.sql
similarity index 100%
rename from data/sql/base/world/skill_fishing_base_level.sql
rename to data/sql/base/db_world/skill_fishing_base_level.sql
diff --git a/data/sql/base/world/skinning_loot_template.sql b/data/sql/base/db_world/skinning_loot_template.sql
similarity index 100%
rename from data/sql/base/world/skinning_loot_template.sql
rename to data/sql/base/db_world/skinning_loot_template.sql
diff --git a/data/sql/base/world/smart_scripts.sql b/data/sql/base/db_world/smart_scripts.sql
similarity index 100%
rename from data/sql/base/world/smart_scripts.sql
rename to data/sql/base/db_world/smart_scripts.sql
diff --git a/data/sql/base/world/spell_area.sql b/data/sql/base/db_world/spell_area.sql
similarity index 100%
rename from data/sql/base/world/spell_area.sql
rename to data/sql/base/db_world/spell_area.sql
diff --git a/data/sql/base/world/spell_bonus_data.sql b/data/sql/base/db_world/spell_bonus_data.sql
similarity index 100%
rename from data/sql/base/world/spell_bonus_data.sql
rename to data/sql/base/db_world/spell_bonus_data.sql
diff --git a/data/sql/base/world/spell_custom_attr.sql b/data/sql/base/db_world/spell_custom_attr.sql
similarity index 100%
rename from data/sql/base/world/spell_custom_attr.sql
rename to data/sql/base/db_world/spell_custom_attr.sql
diff --git a/data/sql/base/world/spell_dbc.sql b/data/sql/base/db_world/spell_dbc.sql
similarity index 100%
rename from data/sql/base/world/spell_dbc.sql
rename to data/sql/base/db_world/spell_dbc.sql
diff --git a/data/sql/base/world/spell_enchant_proc_data.sql b/data/sql/base/db_world/spell_enchant_proc_data.sql
similarity index 100%
rename from data/sql/base/world/spell_enchant_proc_data.sql
rename to data/sql/base/db_world/spell_enchant_proc_data.sql
diff --git a/data/sql/base/world/spell_group.sql b/data/sql/base/db_world/spell_group.sql
similarity index 100%
rename from data/sql/base/world/spell_group.sql
rename to data/sql/base/db_world/spell_group.sql
diff --git a/data/sql/base/world/spell_group_stack_rules.sql b/data/sql/base/db_world/spell_group_stack_rules.sql
similarity index 100%
rename from data/sql/base/world/spell_group_stack_rules.sql
rename to data/sql/base/db_world/spell_group_stack_rules.sql
diff --git a/data/sql/base/world/spell_linked_spell.sql b/data/sql/base/db_world/spell_linked_spell.sql
similarity index 100%
rename from data/sql/base/world/spell_linked_spell.sql
rename to data/sql/base/db_world/spell_linked_spell.sql
diff --git a/data/sql/base/world/spell_loot_template.sql b/data/sql/base/db_world/spell_loot_template.sql
similarity index 100%
rename from data/sql/base/world/spell_loot_template.sql
rename to data/sql/base/db_world/spell_loot_template.sql
diff --git a/data/sql/base/world/spell_mixology.sql b/data/sql/base/db_world/spell_mixology.sql
similarity index 100%
rename from data/sql/base/world/spell_mixology.sql
rename to data/sql/base/db_world/spell_mixology.sql
diff --git a/data/sql/base/world/spell_pet_auras.sql b/data/sql/base/db_world/spell_pet_auras.sql
similarity index 100%
rename from data/sql/base/world/spell_pet_auras.sql
rename to data/sql/base/db_world/spell_pet_auras.sql
diff --git a/data/sql/base/world/spell_proc.sql b/data/sql/base/db_world/spell_proc.sql
similarity index 100%
rename from data/sql/base/world/spell_proc.sql
rename to data/sql/base/db_world/spell_proc.sql
diff --git a/data/sql/base/world/spell_proc_event.sql b/data/sql/base/db_world/spell_proc_event.sql
similarity index 100%
rename from data/sql/base/world/spell_proc_event.sql
rename to data/sql/base/db_world/spell_proc_event.sql
diff --git a/data/sql/base/world/spell_ranks.sql b/data/sql/base/db_world/spell_ranks.sql
similarity index 100%
rename from data/sql/base/world/spell_ranks.sql
rename to data/sql/base/db_world/spell_ranks.sql
diff --git a/data/sql/base/world/spell_required.sql b/data/sql/base/db_world/spell_required.sql
similarity index 100%
rename from data/sql/base/world/spell_required.sql
rename to data/sql/base/db_world/spell_required.sql
diff --git a/data/sql/base/world/spell_script_names.sql b/data/sql/base/db_world/spell_script_names.sql
similarity index 100%
rename from data/sql/base/world/spell_script_names.sql
rename to data/sql/base/db_world/spell_script_names.sql
diff --git a/data/sql/base/world/spell_scripts.sql b/data/sql/base/db_world/spell_scripts.sql
similarity index 100%
rename from data/sql/base/world/spell_scripts.sql
rename to data/sql/base/db_world/spell_scripts.sql
diff --git a/data/sql/base/world/spell_target_position.sql b/data/sql/base/db_world/spell_target_position.sql
similarity index 100%
rename from data/sql/base/world/spell_target_position.sql
rename to data/sql/base/db_world/spell_target_position.sql
diff --git a/data/sql/base/world/spell_threat.sql b/data/sql/base/db_world/spell_threat.sql
similarity index 100%
rename from data/sql/base/world/spell_threat.sql
rename to data/sql/base/db_world/spell_threat.sql
diff --git a/data/sql/base/world/spelldifficulty_dbc.sql b/data/sql/base/db_world/spelldifficulty_dbc.sql
similarity index 100%
rename from data/sql/base/world/spelldifficulty_dbc.sql
rename to data/sql/base/db_world/spelldifficulty_dbc.sql
diff --git a/data/sql/base/world/transports.sql b/data/sql/base/db_world/transports.sql
similarity index 100%
rename from data/sql/base/world/transports.sql
rename to data/sql/base/db_world/transports.sql
diff --git a/data/sql/base/world/trinity_string.sql b/data/sql/base/db_world/trinity_string.sql
similarity index 100%
rename from data/sql/base/world/trinity_string.sql
rename to data/sql/base/db_world/trinity_string.sql
diff --git a/data/sql/base/world/vehicle_accessory.sql b/data/sql/base/db_world/vehicle_accessory.sql
similarity index 100%
rename from data/sql/base/world/vehicle_accessory.sql
rename to data/sql/base/db_world/vehicle_accessory.sql
diff --git a/data/sql/base/world/vehicle_template_accessory.sql b/data/sql/base/db_world/vehicle_template_accessory.sql
similarity index 100%
rename from data/sql/base/world/vehicle_template_accessory.sql
rename to data/sql/base/db_world/vehicle_template_accessory.sql
diff --git a/data/sql/base/world/version.sql b/data/sql/base/db_world/version.sql
similarity index 100%
rename from data/sql/base/world/version.sql
rename to data/sql/base/db_world/version.sql
diff --git a/data/sql/base/world/warden_checks.sql b/data/sql/base/db_world/warden_checks.sql
similarity index 100%
rename from data/sql/base/world/warden_checks.sql
rename to data/sql/base/db_world/warden_checks.sql
diff --git a/data/sql/base/world/waypoint_data.sql b/data/sql/base/db_world/waypoint_data.sql
similarity index 100%
rename from data/sql/base/world/waypoint_data.sql
rename to data/sql/base/db_world/waypoint_data.sql
diff --git a/data/sql/base/world/waypoint_scripts.sql b/data/sql/base/db_world/waypoint_scripts.sql
similarity index 100%
rename from data/sql/base/world/waypoint_scripts.sql
rename to data/sql/base/db_world/waypoint_scripts.sql
diff --git a/data/sql/base/world/waypoints.sql b/data/sql/base/db_world/waypoints.sql
similarity index 100%
rename from data/sql/base/world/waypoints.sql
rename to data/sql/base/db_world/waypoints.sql
diff --git a/data/sql/base/world/world_db_version.sql b/data/sql/base/db_world/world_db_version.sql
similarity index 100%
rename from data/sql/base/world/world_db_version.sql
rename to data/sql/base/db_world/world_db_version.sql
diff --git a/data/sql/updates/auth/.dummy b/data/sql/custom/db_auth/.dummy
similarity index 100%
rename from data/sql/updates/auth/.dummy
rename to data/sql/custom/db_auth/.dummy
diff --git a/data/sql/updates/characters/.dummy b/data/sql/custom/db_characters/.dummy
similarity index 100%
rename from data/sql/updates/characters/.dummy
rename to data/sql/custom/db_characters/.dummy
diff --git a/data/sql/updates/world/.dummy b/data/sql/custom/db_world/.dummy
similarity index 100%
rename from data/sql/updates/world/.dummy
rename to data/sql/custom/db_world/.dummy
diff --git a/data/sql/updates/db_auth/.dummy b/data/sql/updates/db_auth/.dummy
new file mode 100644
index 000000000..e69de29bb
diff --git a/data/sql/updates/db_characters/.dummy b/data/sql/updates/db_characters/.dummy
new file mode 100644
index 000000000..e69de29bb
diff --git a/data/sql/updates/characters/2016_08_15_00.sql b/data/sql/updates/db_characters/2016_08_15_00.sql
similarity index 100%
rename from data/sql/updates/characters/2016_08_15_00.sql
rename to data/sql/updates/db_characters/2016_08_15_00.sql
diff --git a/data/sql/updates/db_world/.dummy b/data/sql/updates/db_world/.dummy
new file mode 100644
index 000000000..e69de29bb
diff --git a/data/sql/updates/world/2016_08_14_00.sql b/data/sql/updates/db_world/2016_08_14_00.sql
similarity index 100%
rename from data/sql/updates/world/2016_08_14_00.sql
rename to data/sql/updates/db_world/2016_08_14_00.sql
diff --git a/data/sql/updates/world/2016_08_14_01.sql b/data/sql/updates/db_world/2016_08_14_01.sql
similarity index 100%
rename from data/sql/updates/world/2016_08_14_01.sql
rename to data/sql/updates/db_world/2016_08_14_01.sql
diff --git a/data/sql/updates/world/2016_08_14_02.sql b/data/sql/updates/db_world/2016_08_14_02.sql
similarity index 100%
rename from data/sql/updates/world/2016_08_14_02.sql
rename to data/sql/updates/db_world/2016_08_14_02.sql
diff --git a/data/sql/updates/world/2016_08_19_00.sql b/data/sql/updates/db_world/2016_08_19_00.sql
similarity index 100%
rename from data/sql/updates/world/2016_08_19_00.sql
rename to data/sql/updates/db_world/2016_08_19_00.sql
diff --git a/data/sql/updates/world/2016_08_21_00.sql b/data/sql/updates/db_world/2016_08_21_00.sql
similarity index 100%
rename from data/sql/updates/world/2016_08_21_00.sql
rename to data/sql/updates/db_world/2016_08_21_00.sql
diff --git a/data/sql/updates/world/2016_08_24_00.sql b/data/sql/updates/db_world/2016_08_24_00.sql
similarity index 100%
rename from data/sql/updates/world/2016_08_24_00.sql
rename to data/sql/updates/db_world/2016_08_24_00.sql
diff --git a/data/sql/updates/world/2016_08_24_01.sql b/data/sql/updates/db_world/2016_08_24_01.sql
similarity index 100%
rename from data/sql/updates/world/2016_08_24_01.sql
rename to data/sql/updates/db_world/2016_08_24_01.sql
diff --git a/data/sql/updates/pending/db_auth/.dummy b/data/sql/updates/pending/db_auth/.dummy
new file mode 100644
index 000000000..e69de29bb
diff --git a/data/sql/updates/pending/db_characters/.dummy b/data/sql/updates/pending/db_characters/.dummy
new file mode 100644
index 000000000..e69de29bb
diff --git a/data/sql/updates/pending/db_world/.dummy b/data/sql/updates/pending/db_world/.dummy
new file mode 100644
index 000000000..e69de29bb