diff --git a/sql/updates/auth/2014_04_26_00_auth_rbac_permissions.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/auth/2014_04_26_00_auth_rbac_permissions.sql
similarity index 100%
rename from sql/updates/auth/2014_04_26_00_auth_rbac_permissions.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/auth/2014_04_26_00_auth_rbac_permissions.sql
diff --git a/sql/updates/auth/2014_04_28_00_auth_rbac_permissions.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/auth/2014_04_28_00_auth_rbac_permissions.sql
similarity index 100%
rename from sql/updates/auth/2014_04_28_00_auth_rbac_permissions.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/auth/2014_04_28_00_auth_rbac_permissions.sql
diff --git a/sql/updates/auth/2014_06_23_00_auth_action_ip_logger.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/auth/2014_06_23_00_auth_action_ip_logger.sql
similarity index 100%
rename from sql/updates/auth/2014_06_23_00_auth_action_ip_logger.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/auth/2014_06_23_00_auth_action_ip_logger.sql
diff --git a/sql/updates/characters/2014_03_29_00_characters_groups.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/characters/2014_03_29_00_characters_groups.sql
similarity index 100%
rename from sql/updates/characters/2014_03_29_00_characters_groups.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/characters/2014_03_29_00_characters_groups.sql
diff --git a/sql/updates/characters/2014_04_30_00_characters_character_queststatus_seasonal.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/characters/2014_04_30_00_characters_character_queststatus_seasonal.sql
similarity index 100%
rename from sql/updates/characters/2014_04_30_00_characters_character_queststatus_seasonal.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/characters/2014_04_30_00_characters_character_queststatus_seasonal.sql
diff --git a/sql/updates/characters/2014_07_01_00_characters_character_skills.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/characters/2014_07_01_00_characters_character_skills.sql
similarity index 100%
rename from sql/updates/characters/2014_07_01_00_characters_character_skills.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/characters/2014_07_01_00_characters_character_skills.sql
diff --git a/sql/updates/world/2014_03_29_00_world_version.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_29_00_world_version.sql
similarity index 100%
rename from sql/updates/world/2014_03_29_00_world_version.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_29_00_world_version.sql
diff --git a/sql/updates/world/2014_03_29_01_world_smart_scripts.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_29_01_world_smart_scripts.sql
similarity index 100%
rename from sql/updates/world/2014_03_29_01_world_smart_scripts.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_29_01_world_smart_scripts.sql
diff --git a/sql/updates/world/2014_03_29_02_world_creature.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_29_02_world_creature.sql
similarity index 100%
rename from sql/updates/world/2014_03_29_02_world_creature.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_29_02_world_creature.sql
diff --git a/sql/updates/world/2014_03_30_00_world_game_event_335.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_00_world_game_event_335.sql
similarity index 100%
rename from sql/updates/world/2014_03_30_00_world_game_event_335.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_00_world_game_event_335.sql
diff --git a/sql/updates/world/2014_03_30_01_world_creature.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_01_world_creature.sql
similarity index 100%
rename from sql/updates/world/2014_03_30_01_world_creature.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_01_world_creature.sql
diff --git a/sql/updates/world/2014_03_30_02_world_game_event_335.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_02_world_game_event_335.sql
similarity index 100%
rename from sql/updates/world/2014_03_30_02_world_game_event_335.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_02_world_game_event_335.sql
diff --git a/sql/updates/world/2014_03_30_03_world_smart_scripts.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_03_world_smart_scripts.sql
similarity index 100%
rename from sql/updates/world/2014_03_30_03_world_smart_scripts.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_03_world_smart_scripts.sql
diff --git a/sql/updates/world/2014_03_30_04_world_creature_equip_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_04_world_creature_equip_template.sql
similarity index 100%
rename from sql/updates/world/2014_03_30_04_world_creature_equip_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_04_world_creature_equip_template.sql
diff --git a/sql/updates/world/2014_03_30_05_world_creature_equip_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_05_world_creature_equip_template.sql
similarity index 100%
rename from sql/updates/world/2014_03_30_05_world_creature_equip_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_05_world_creature_equip_template.sql
diff --git a/sql/updates/world/2014_03_30_06_world_broadcast_text.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_06_world_broadcast_text.sql
similarity index 100%
rename from sql/updates/world/2014_03_30_06_world_broadcast_text.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_30_06_world_broadcast_text.sql
diff --git a/sql/updates/world/2014_03_31_00_world_creature_template_addon.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_31_00_world_creature_template_addon.sql
similarity index 100%
rename from sql/updates/world/2014_03_31_00_world_creature_template_addon.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_31_00_world_creature_template_addon.sql
diff --git a/sql/updates/world/2014_03_31_01_world_creature_addon.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_31_01_world_creature_addon.sql
similarity index 100%
rename from sql/updates/world/2014_03_31_01_world_creature_addon.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_31_01_world_creature_addon.sql
diff --git a/sql/updates/world/2014_03_31_02_world_gameobject_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_31_02_world_gameobject_template.sql
similarity index 100%
rename from sql/updates/world/2014_03_31_02_world_gameobject_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_31_02_world_gameobject_template.sql
diff --git a/sql/updates/world/2014_03_31_03_world_gameobject_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_31_03_world_gameobject_template.sql
similarity index 100%
rename from sql/updates/world/2014_03_31_03_world_gameobject_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_03_31_03_world_gameobject_template.sql
diff --git a/sql/updates/world/2014_04_01_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_01_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_04_01_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_01_00_world_misc.sql
diff --git a/sql/updates/world/2014_04_01_01_world_gameobject_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_01_01_world_gameobject_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_01_01_world_gameobject_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_01_01_world_gameobject_template.sql
diff --git a/sql/updates/world/2014_04_01_02_world_gameobject_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_01_02_world_gameobject_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_01_02_world_gameobject_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_01_02_world_gameobject_template.sql
diff --git a/sql/updates/world/2014_04_01_03_world_gameobject_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_01_03_world_gameobject_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_01_03_world_gameobject_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_01_03_world_gameobject_template.sql
diff --git a/sql/updates/world/2014_04_02_00_world_sai.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_02_00_world_sai.sql
similarity index 100%
rename from sql/updates/world/2014_04_02_00_world_sai.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_02_00_world_sai.sql
diff --git a/sql/updates/world/2014_04_02_01_world_gameobject_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_02_01_world_gameobject_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_02_01_world_gameobject_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_02_01_world_gameobject_template.sql
diff --git a/sql/updates/world/2014_04_02_02_world_gameobject_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_02_02_world_gameobject_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_02_02_world_gameobject_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_02_02_world_gameobject_template.sql
diff --git a/sql/updates/world/2014_04_03_00_world_sai.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_03_00_world_sai.sql
similarity index 100%
rename from sql/updates/world/2014_04_03_00_world_sai.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_03_00_world_sai.sql
diff --git a/sql/updates/world/2014_04_04_00_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_04_00_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_04_00_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_04_00_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_05_00_world_spell_script_names.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_05_00_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2014_04_05_00_world_spell_script_names.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_05_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2014_04_12_00_world_spell_bonus_data.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_12_00_world_spell_bonus_data.sql
similarity index 100%
rename from sql/updates/world/2014_04_12_00_world_spell_bonus_data.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_12_00_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2014_04_13_00_world_broadcast_text_conversion.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_13_00_world_broadcast_text_conversion.sql
similarity index 100%
rename from sql/updates/world/2014_04_13_00_world_broadcast_text_conversion.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_13_00_world_broadcast_text_conversion.sql
diff --git a/sql/updates/world/2014_04_14_00_world_spell_script_names.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_14_00_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2014_04_14_00_world_spell_script_names.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_14_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2014_04_14_01_world_broadcast_text_conversion.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_14_01_world_broadcast_text_conversion.sql
similarity index 100%
rename from sql/updates/world/2014_04_14_01_world_broadcast_text_conversion.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_14_01_world_broadcast_text_conversion.sql
diff --git a/sql/updates/world/2014_04_14_02_world_broadcast_text_conversion.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_14_02_world_broadcast_text_conversion.sql
similarity index 100%
rename from sql/updates/world/2014_04_14_02_world_broadcast_text_conversion.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_14_02_world_broadcast_text_conversion.sql
diff --git a/sql/updates/world/2014_04_16_00_world_sai.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_16_00_world_sai.sql
similarity index 100%
rename from sql/updates/world/2014_04_16_00_world_sai.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_16_00_world_sai.sql
diff --git a/sql/updates/world/2014_04_16_01_world_broadcast_text_conversion.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_16_01_world_broadcast_text_conversion.sql
similarity index 100%
rename from sql/updates/world/2014_04_16_01_world_broadcast_text_conversion.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_16_01_world_broadcast_text_conversion.sql
diff --git a/sql/updates/world/2014_04_16_02_world_broadcast_text.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_16_02_world_broadcast_text.sql
similarity index 100%
rename from sql/updates/world/2014_04_16_02_world_broadcast_text.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_16_02_world_broadcast_text.sql
diff --git a/sql/updates/world/2014_04_17_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_04_17_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_00_world_misc.sql
diff --git a/sql/updates/world/2014_04_17_01_world_spelldifficulty_dbc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_01_world_spelldifficulty_dbc.sql
similarity index 100%
rename from sql/updates/world/2014_04_17_01_world_spelldifficulty_dbc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_01_world_spelldifficulty_dbc.sql
diff --git a/sql/updates/world/2014_04_17_02_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_02_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_17_02_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_02_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_17_03_world_spell_area.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_03_world_spell_area.sql
similarity index 100%
rename from sql/updates/world/2014_04_17_03_world_spell_area.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_03_world_spell_area.sql
diff --git a/sql/updates/world/2014_04_17_04_world_ulduar.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_04_world_ulduar.sql
similarity index 100%
rename from sql/updates/world/2014_04_17_04_world_ulduar.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_17_04_world_ulduar.sql
diff --git a/sql/updates/world/2014_04_18_00_world_spell_script_names.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_18_00_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2014_04_18_00_world_spell_script_names.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_18_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2014_04_19_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_19_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_04_19_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_19_00_world_misc.sql
diff --git a/sql/updates/world/2014_04_19_01_world_quest.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_19_01_world_quest.sql
similarity index 100%
rename from sql/updates/world/2014_04_19_01_world_quest.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_19_01_world_quest.sql
diff --git a/sql/updates/world/2014_04_20_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_20_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_04_20_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_20_00_world_misc.sql
diff --git a/sql/updates/world/2014_04_20_01_world_creature_text.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_20_01_world_creature_text.sql
similarity index 100%
rename from sql/updates/world/2014_04_20_01_world_creature_text.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_20_01_world_creature_text.sql
diff --git a/sql/updates/world/2014_04_20_02_world_creature_text.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_20_02_world_creature_text.sql
similarity index 100%
rename from sql/updates/world/2014_04_20_02_world_creature_text.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_20_02_world_creature_text.sql
diff --git a/sql/updates/world/2014_04_20_03_world_gossip_menu_option.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_20_03_world_gossip_menu_option.sql
similarity index 100%
rename from sql/updates/world/2014_04_20_03_world_gossip_menu_option.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_20_03_world_gossip_menu_option.sql
diff --git a/sql/updates/world/2014_04_21_00_world_smart_scripts.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_00_world_smart_scripts.sql
similarity index 100%
rename from sql/updates/world/2014_04_21_00_world_smart_scripts.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_00_world_smart_scripts.sql
diff --git a/sql/updates/world/2014_04_21_01_world_quest_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_01_world_quest_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_21_01_world_quest_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_01_world_quest_template.sql
diff --git a/sql/updates/world/2014_04_21_02_world_disables.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_02_world_disables.sql
similarity index 100%
rename from sql/updates/world/2014_04_21_02_world_disables.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_02_world_disables.sql
diff --git a/sql/updates/world/2014_04_21_03_world_smart_scripts.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_03_world_smart_scripts.sql
similarity index 100%
rename from sql/updates/world/2014_04_21_03_world_smart_scripts.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_03_world_smart_scripts.sql
diff --git a/sql/updates/world/2014_04_21_04_world_broadcast_text_conversion.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_04_world_broadcast_text_conversion.sql
similarity index 100%
rename from sql/updates/world/2014_04_21_04_world_broadcast_text_conversion.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_04_world_broadcast_text_conversion.sql
diff --git a/sql/updates/world/2014_04_21_05_world_gossip_menu.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_05_world_gossip_menu.sql
similarity index 100%
rename from sql/updates/world/2014_04_21_05_world_gossip_menu.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_05_world_gossip_menu.sql
diff --git a/sql/updates/world/2014_04_21_06_world_locales_broadcast_text.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_06_world_locales_broadcast_text.sql
similarity index 100%
rename from sql/updates/world/2014_04_21_06_world_locales_broadcast_text.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_06_world_locales_broadcast_text.sql
diff --git a/sql/updates/world/2014_04_21_07_world_locales_item.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_07_world_locales_item.sql
similarity index 100%
rename from sql/updates/world/2014_04_21_07_world_locales_item.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_07_world_locales_item.sql
diff --git a/sql/updates/world/2014_04_21_08_world_locales_item_set_names.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_08_world_locales_item_set_names.sql
similarity index 100%
rename from sql/updates/world/2014_04_21_08_world_locales_item_set_names.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_21_08_world_locales_item_set_names.sql
diff --git a/sql/updates/world/2014_04_22_00_world_locales_gameobject.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_00_world_locales_gameobject.sql
similarity index 100%
rename from sql/updates/world/2014_04_22_00_world_locales_gameobject.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_00_world_locales_gameobject.sql
diff --git a/sql/updates/world/2014_04_22_01_world_locales_creature.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_01_world_locales_creature.sql
similarity index 100%
rename from sql/updates/world/2014_04_22_01_world_locales_creature.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_01_world_locales_creature.sql
diff --git a/sql/updates/world/2014_04_22_02_world_creature_text.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_02_world_creature_text.sql
similarity index 100%
rename from sql/updates/world/2014_04_22_02_world_creature_text.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_02_world_creature_text.sql
diff --git a/sql/updates/world/2014_04_22_03_world_trinity_string.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_03_world_trinity_string.sql
similarity index 100%
rename from sql/updates/world/2014_04_22_03_world_trinity_string.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_03_world_trinity_string.sql
diff --git a/sql/updates/world/2014_04_22_04_world_creature_text.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_04_world_creature_text.sql
similarity index 100%
rename from sql/updates/world/2014_04_22_04_world_creature_text.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_22_04_world_creature_text.sql
diff --git a/sql/updates/world/2014_04_23_00_world_trinity_string.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_00_world_trinity_string.sql
similarity index 100%
rename from sql/updates/world/2014_04_23_00_world_trinity_string.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_00_world_trinity_string.sql
diff --git a/sql/updates/world/2014_04_23_01_world_locales_quest.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_01_world_locales_quest.sql
similarity index 100%
rename from sql/updates/world/2014_04_23_01_world_locales_quest.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_01_world_locales_quest.sql
diff --git a/sql/updates/world/2014_04_23_02_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_02_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_04_23_02_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_02_world_misc.sql
diff --git a/sql/updates/world/2014_04_23_03_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_03_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_04_23_03_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_03_world_misc.sql
diff --git a/sql/updates/world/2014_04_23_04_world_locales_item.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_04_world_locales_item.sql
similarity index 100%
rename from sql/updates/world/2014_04_23_04_world_locales_item.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_23_04_world_locales_item.sql
diff --git a/sql/updates/world/2014_04_24_00_world_locales_broadcast_text.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_00_world_locales_broadcast_text.sql
similarity index 100%
rename from sql/updates/world/2014_04_24_00_world_locales_broadcast_text.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_00_world_locales_broadcast_text.sql
diff --git a/sql/updates/world/2014_04_24_01_world_locales_gameobject.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_01_world_locales_gameobject.sql
similarity index 100%
rename from sql/updates/world/2014_04_24_01_world_locales_gameobject.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_01_world_locales_gameobject.sql
diff --git a/sql/updates/world/2014_04_24_02_world_gossip.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_02_world_gossip.sql
similarity index 100%
rename from sql/updates/world/2014_04_24_02_world_gossip.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_02_world_gossip.sql
diff --git a/sql/updates/world/2014_04_24_03_world_gossip.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_03_world_gossip.sql
similarity index 100%
rename from sql/updates/world/2014_04_24_03_world_gossip.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_03_world_gossip.sql
diff --git a/sql/updates/world/2014_04_24_04_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_04_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_24_04_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_24_04_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_26_00_world_command.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_00_world_command.sql
similarity index 100%
rename from sql/updates/world/2014_04_26_00_world_command.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_00_world_command.sql
diff --git a/sql/updates/world/2014_04_26_01_world_locales_creature.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_01_world_locales_creature.sql
similarity index 100%
rename from sql/updates/world/2014_04_26_01_world_locales_creature.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_01_world_locales_creature.sql
diff --git a/sql/updates/world/2014_04_26_02_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_02_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_04_26_02_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_02_world_misc.sql
diff --git a/sql/updates/world/2014_04_26_03_world_gossip_menu_option.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_03_world_gossip_menu_option.sql
similarity index 100%
rename from sql/updates/world/2014_04_26_03_world_gossip_menu_option.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_03_world_gossip_menu_option.sql
diff --git a/sql/updates/world/2014_04_26_04_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_04_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_26_04_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_26_04_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_27_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_04_27_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_00_world_misc.sql
diff --git a/sql/updates/world/2014_04_27_01_world_gossip_menu_option.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_01_world_gossip_menu_option.sql
similarity index 100%
rename from sql/updates/world/2014_04_27_01_world_gossip_menu_option.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_01_world_gossip_menu_option.sql
diff --git a/sql/updates/world/2014_04_27_02_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_02_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_27_02_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_02_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_27_03_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_03_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_27_03_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_03_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_27_04_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_04_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_27_04_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_04_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_27_05_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_05_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_27_05_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_05_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_27_06_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_06_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_27_06_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_06_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_27_07_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_07_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_27_07_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_07_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_27_08_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_08_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_27_08_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_08_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_27_09_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_09_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_27_09_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_09_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_27_10_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_10_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_27_10_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_27_10_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_28_00_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_00_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_28_00_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_00_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_28_01_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_01_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_28_01_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_01_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_28_02_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_02_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_28_02_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_02_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_28_03_world_command.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_03_world_command.sql
similarity index 100%
rename from sql/updates/world/2014_04_28_03_world_command.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_03_world_command.sql
diff --git a/sql/updates/world/2014_04_28_04_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_04_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_04_28_04_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_04_world_misc.sql
diff --git a/sql/updates/world/2014_04_28_05_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_05_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_04_28_05_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_05_world_misc.sql
diff --git a/sql/updates/world/2014_04_28_06_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_06_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_28_06_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_06_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_28_07_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_07_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_28_07_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_07_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_28_08_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_08_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_28_08_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_08_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_28_09_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_09_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_28_09_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_09_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_28_10_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_10_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_04_28_10_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_28_10_world_misc.sql
diff --git a/sql/updates/world/2014_04_29_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_29_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_04_29_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_29_00_world_misc.sql
diff --git a/sql/updates/world/2014_04_29_01_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_29_01_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_04_29_01_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_29_01_world_misc.sql
diff --git a/sql/updates/world/2014_04_29_02_world_gossip_menu_option.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_29_02_world_gossip_menu_option.sql
similarity index 100%
rename from sql/updates/world/2014_04_29_02_world_gossip_menu_option.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_29_02_world_gossip_menu_option.sql
diff --git a/sql/updates/world/2014_04_29_03_world_gossip_menu_option.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_29_03_world_gossip_menu_option.sql
similarity index 100%
rename from sql/updates/world/2014_04_29_03_world_gossip_menu_option.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_29_03_world_gossip_menu_option.sql
diff --git a/sql/updates/world/2014_04_29_04_world_gameobject_loot_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_29_04_world_gameobject_loot_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_29_04_world_gameobject_loot_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_29_04_world_gameobject_loot_template.sql
diff --git a/sql/updates/world/2014_04_30_00_world_game_event_seasonal_questrelation.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_30_00_world_game_event_seasonal_questrelation.sql
similarity index 100%
rename from sql/updates/world/2014_04_30_00_world_game_event_seasonal_questrelation.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_30_00_world_game_event_seasonal_questrelation.sql
diff --git a/sql/updates/world/2014_04_30_01_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_30_01_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_04_30_01_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_30_01_world_misc.sql
diff --git a/sql/updates/world/2014_04_30_02_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_30_02_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_30_02_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_30_02_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_30_03_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_30_03_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_30_03_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_30_03_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_30_04_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_30_04_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_30_04_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_30_04_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_30_05_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_30_05_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_30_05_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_30_05_world_creature_template.sql
diff --git a/sql/updates/world/2014_04_30_06_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_30_06_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_04_30_06_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_04_30_06_world_creature_template.sql
diff --git a/sql/updates/world/2014_05_01_00_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_01_00_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_05_01_00_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_01_00_world_creature_template.sql
diff --git a/sql/updates/world/2014_05_02_00_world_gossip_menu_option.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_02_00_world_gossip_menu_option.sql
similarity index 100%
rename from sql/updates/world/2014_05_02_00_world_gossip_menu_option.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_02_00_world_gossip_menu_option.sql
diff --git a/sql/updates/world/2014_05_02_00_world_locales_item_335.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_02_00_world_locales_item_335.sql
similarity index 100%
rename from sql/updates/world/2014_05_02_00_world_locales_item_335.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_02_00_world_locales_item_335.sql
diff --git a/sql/updates/world/2014_05_02_01_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_02_01_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_05_02_01_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_02_01_world_creature_template.sql
diff --git a/sql/updates/world/2014_05_03_00_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_03_00_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_05_03_00_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_03_00_world_creature_template.sql
diff --git a/sql/updates/world/2014_05_03_01_world_gossip_menu_option.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_03_01_world_gossip_menu_option.sql
similarity index 100%
rename from sql/updates/world/2014_05_03_01_world_gossip_menu_option.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_03_01_world_gossip_menu_option.sql
diff --git a/sql/updates/world/2014_05_04_00_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_04_00_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_05_04_00_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_04_00_world_creature_template.sql
diff --git a/sql/updates/world/2014_05_04_01_world_sai.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_04_01_world_sai.sql
similarity index 100%
rename from sql/updates/world/2014_05_04_01_world_sai.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_04_01_world_sai.sql
diff --git a/sql/updates/world/2014_05_04_02_world_creature_text.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_04_02_world_creature_text.sql
similarity index 100%
rename from sql/updates/world/2014_05_04_02_world_creature_text.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_04_02_world_creature_text.sql
diff --git a/sql/updates/world/2014_05_04_03_world_creature_text.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_04_03_world_creature_text.sql
similarity index 100%
rename from sql/updates/world/2014_05_04_03_world_creature_text.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_04_03_world_creature_text.sql
diff --git a/sql/updates/world/2014_05_04_04_world_creature.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_04_04_world_creature.sql
similarity index 100%
rename from sql/updates/world/2014_05_04_04_world_creature.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_04_04_world_creature.sql
diff --git a/sql/updates/world/2014_05_07_00_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_07_00_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_05_07_00_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_07_00_world_creature_template.sql
diff --git a/sql/updates/world/2014_05_07_00_world_gossip_menu_option.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_07_00_world_gossip_menu_option.sql
similarity index 100%
rename from sql/updates/world/2014_05_07_00_world_gossip_menu_option.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_07_00_world_gossip_menu_option.sql
diff --git a/sql/updates/world/2014_05_08_00_world_smart_scripts.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_08_00_world_smart_scripts.sql
similarity index 100%
rename from sql/updates/world/2014_05_08_00_world_smart_scripts.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_08_00_world_smart_scripts.sql
diff --git a/sql/updates/world/2014_05_09_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_09_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_05_09_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_09_00_world_misc.sql
diff --git a/sql/updates/world/2014_05_09_01_world_gossip.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_09_01_world_gossip.sql
similarity index 100%
rename from sql/updates/world/2014_05_09_01_world_gossip.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_09_01_world_gossip.sql
diff --git a/sql/updates/world/2014_05_09_02_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_09_02_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_05_09_02_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_09_02_world_creature_template.sql
diff --git a/sql/updates/world/2014_05_10_00_world_player_factionchange_items.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_10_00_world_player_factionchange_items.sql
similarity index 100%
rename from sql/updates/world/2014_05_10_00_world_player_factionchange_items.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_10_00_world_player_factionchange_items.sql
diff --git a/sql/updates/world/2014_05_10_01_world_halls_of_reflection.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_10_01_world_halls_of_reflection.sql
similarity index 100%
rename from sql/updates/world/2014_05_10_01_world_halls_of_reflection.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_10_01_world_halls_of_reflection.sql
diff --git a/sql/updates/world/2014_05_11_00_world_gameobject.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_11_00_world_gameobject.sql
similarity index 100%
rename from sql/updates/world/2014_05_11_00_world_gameobject.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_11_00_world_gameobject.sql
diff --git a/sql/updates/world/2014_05_11_01_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_11_01_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_05_11_01_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_11_01_world_misc.sql
diff --git a/sql/updates/world/2014_05_11_02_world_gameobject.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_11_02_world_gameobject.sql
similarity index 100%
rename from sql/updates/world/2014_05_11_02_world_gameobject.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_11_02_world_gameobject.sql
diff --git a/sql/updates/world/2014_05_11_03_world_gameobject.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_11_03_world_gameobject.sql
similarity index 100%
rename from sql/updates/world/2014_05_11_03_world_gameobject.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_11_03_world_gameobject.sql
diff --git a/sql/updates/world/2014_05_12_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_12_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_05_12_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_12_00_world_misc.sql
diff --git a/sql/updates/world/2014_05_12_01_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_12_01_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_05_12_01_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_12_01_world_creature_template.sql
diff --git a/sql/updates/world/2014_05_13_00_world_conditions.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_13_00_world_conditions.sql
similarity index 100%
rename from sql/updates/world/2014_05_13_00_world_conditions.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_13_00_world_conditions.sql
diff --git a/sql/updates/world/2014_05_18_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_18_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_05_18_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_18_00_world_misc.sql
diff --git a/sql/updates/world/2014_05_18_01_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_18_01_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_05_18_01_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_18_01_world_misc.sql
diff --git a/sql/updates/world/2014_05_18_02_world_gameobject.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_18_02_world_gameobject.sql
similarity index 100%
rename from sql/updates/world/2014_05_18_02_world_gameobject.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_18_02_world_gameobject.sql
diff --git a/sql/updates/world/2014_05_18_03_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_18_03_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_05_18_03_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_18_03_world_misc.sql
diff --git a/sql/updates/world/2014_05_18_04_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_18_04_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_05_18_04_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_18_04_world_misc.sql
diff --git a/sql/updates/world/2014_05_19_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_19_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_05_19_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_19_00_world_misc.sql
diff --git a/sql/updates/world/2014_05_19_01_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_19_01_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_05_19_01_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_19_01_world_misc.sql
diff --git a/sql/updates/world/2014_05_23_00_world_spell_script_names.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_23_00_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2014_05_23_00_world_spell_script_names.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_23_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2014_05_23_01_world_trinity_string.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_23_01_world_trinity_string.sql
similarity index 100%
rename from sql/updates/world/2014_05_23_01_world_trinity_string.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_23_01_world_trinity_string.sql
diff --git a/sql/updates/world/2014_05_30_00_world_quest_update.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_30_00_world_quest_update.sql
similarity index 100%
rename from sql/updates/world/2014_05_30_00_world_quest_update.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_05_30_00_world_quest_update.sql
diff --git a/sql/updates/world/2014_06_03_00_world_creature.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_03_00_world_creature.sql
similarity index 100%
rename from sql/updates/world/2014_06_03_00_world_creature.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_03_00_world_creature.sql
diff --git a/sql/updates/world/2014_06_06_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_06_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_06_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_06_00_world_misc.sql
diff --git a/sql/updates/world/2014_06_06_00_world_quest_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_06_00_world_quest_template.sql
similarity index 100%
rename from sql/updates/world/2014_06_06_00_world_quest_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_06_00_world_quest_template.sql
diff --git a/sql/updates/world/2014_06_07_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_07_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_07_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_07_00_world_misc.sql
diff --git a/sql/updates/world/2014_06_08_00_world_conditions.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_08_00_world_conditions.sql
similarity index 100%
rename from sql/updates/world/2014_06_08_00_world_conditions.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_08_00_world_conditions.sql
diff --git a/sql/updates/world/2014_06_08_01_world_gameobject.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_08_01_world_gameobject.sql
similarity index 100%
rename from sql/updates/world/2014_06_08_01_world_gameobject.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_08_01_world_gameobject.sql
diff --git a/sql/updates/world/2014_06_08_02_world_gameobject.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_08_02_world_gameobject.sql
similarity index 100%
rename from sql/updates/world/2014_06_08_02_world_gameobject.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_08_02_world_gameobject.sql
diff --git a/sql/updates/world/2014_06_08_03_world_gameobject.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_08_03_world_gameobject.sql
similarity index 100%
rename from sql/updates/world/2014_06_08_03_world_gameobject.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_08_03_world_gameobject.sql
diff --git a/sql/updates/world/2014_06_09_00_world_quest_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_09_00_world_quest_template.sql
similarity index 100%
rename from sql/updates/world/2014_06_09_00_world_quest_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_09_00_world_quest_template.sql
diff --git a/sql/updates/world/2014_06_11_01_world_spell_script_names.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_11_01_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2014_06_11_01_world_spell_script_names.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_11_01_world_spell_script_names.sql
diff --git a/sql/updates/world/2014_06_11_02_world_fish_junk_loot_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_11_02_world_fish_junk_loot_template.sql
similarity index 100%
rename from sql/updates/world/2014_06_11_02_world_fish_junk_loot_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_11_02_world_fish_junk_loot_template.sql
diff --git a/sql/updates/world/2014_06_12_00_world_quest_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_12_00_world_quest_template.sql
similarity index 100%
rename from sql/updates/world/2014_06_12_00_world_quest_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_12_00_world_quest_template.sql
diff --git a/sql/updates/world/2014_06_12_01_world_gossip_menu_option.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_12_01_world_gossip_menu_option.sql
similarity index 100%
rename from sql/updates/world/2014_06_12_01_world_gossip_menu_option.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_12_01_world_gossip_menu_option.sql
diff --git a/sql/updates/world/2014_06_14_00_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_14_00_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_06_14_00_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_14_00_world_creature_template.sql
diff --git a/sql/updates/world/2014_06_14_01_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_14_01_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_14_01_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_14_01_world_misc.sql
diff --git a/sql/updates/world/2014_06_14_02_world_spell_script_names.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_14_02_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2014_06_14_02_world_spell_script_names.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_14_02_world_spell_script_names.sql
diff --git a/sql/updates/world/2014_06_14_03_world_smart_scripts.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_14_03_world_smart_scripts.sql
similarity index 100%
rename from sql/updates/world/2014_06_14_03_world_smart_scripts.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_14_03_world_smart_scripts.sql
diff --git a/sql/updates/world/2014_06_14_04_world_trinity_string.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_14_04_world_trinity_string.sql
similarity index 100%
rename from sql/updates/world/2014_06_14_04_world_trinity_string.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_14_04_world_trinity_string.sql
diff --git a/sql/updates/world/2014_06_15_00_world_spell_script_names.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_15_00_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2014_06_15_00_world_spell_script_names.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_15_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2014_06_15_01_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_15_01_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_06_15_01_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_15_01_world_creature_template.sql
diff --git a/sql/updates/world/2014_06_15_02_world_spell_group.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_15_02_world_spell_group.sql
similarity index 100%
rename from sql/updates/world/2014_06_15_02_world_spell_group.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_15_02_world_spell_group.sql
diff --git a/sql/updates/world/2014_06_16_00_world_spell_group.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_16_00_world_spell_group.sql
similarity index 100%
rename from sql/updates/world/2014_06_16_00_world_spell_group.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_16_00_world_spell_group.sql
diff --git a/sql/updates/world/2014_06_17_00_world_creature.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_17_00_world_creature.sql
similarity index 100%
rename from sql/updates/world/2014_06_17_00_world_creature.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_17_00_world_creature.sql
diff --git a/sql/updates/world/2014_06_17_00_world_spell_group.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_17_00_world_spell_group.sql
similarity index 100%
rename from sql/updates/world/2014_06_17_00_world_spell_group.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_17_00_world_spell_group.sql
diff --git a/sql/updates/world/2014_06_20_00_world_spell_dbc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_20_00_world_spell_dbc.sql
similarity index 100%
rename from sql/updates/world/2014_06_20_00_world_spell_dbc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_20_00_world_spell_dbc.sql
diff --git a/sql/updates/world/2014_06_20_01_world_creature_text.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_20_01_world_creature_text.sql
similarity index 100%
rename from sql/updates/world/2014_06_20_01_world_creature_text.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_20_01_world_creature_text.sql
diff --git a/sql/updates/world/2014_06_22_00_world_locales_creature.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_00_world_locales_creature.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_00_world_locales_creature.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_00_world_locales_creature.sql
diff --git a/sql/updates/world/2014_06_22_01_world_gameobject.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_01_world_gameobject.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_01_world_gameobject.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_01_world_gameobject.sql
diff --git a/sql/updates/world/2014_06_22_02_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_02_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_02_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_02_world_misc.sql
diff --git a/sql/updates/world/2014_06_22_03_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_03_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_03_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_03_world_misc.sql
diff --git a/sql/updates/world/2014_06_22_04_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_04_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_04_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_04_world_misc.sql
diff --git a/sql/updates/world/2014_06_22_05_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_05_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_05_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_05_world_misc.sql
diff --git a/sql/updates/world/2014_06_22_06_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_06_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_06_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_06_world_misc.sql
diff --git a/sql/updates/world/2014_06_22_07_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_07_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_07_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_07_world_misc.sql
diff --git a/sql/updates/world/2014_06_22_08_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_08_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_08_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_08_world_misc.sql
diff --git a/sql/updates/world/2014_06_22_09_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_09_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_09_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_09_world_misc.sql
diff --git a/sql/updates/world/2014_06_22_10_world_spell_custom_attr.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_10_world_spell_custom_attr.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_10_world_spell_custom_attr.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_10_world_spell_custom_attr.sql
diff --git a/sql/updates/world/2014_06_22_11_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_11_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_11_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_11_world_misc.sql
diff --git a/sql/updates/world/2014_06_22_12_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_12_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_12_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_12_world_misc.sql
diff --git a/sql/updates/world/2014_06_22_13_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_13_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_13_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_13_world_misc.sql
diff --git a/sql/updates/world/2014_06_22_14_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_14_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_14_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_14_world_misc.sql
diff --git a/sql/updates/world/2014_06_22_15_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_15_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_15_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_15_world_misc.sql
diff --git a/sql/updates/world/2014_06_22_16_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_16_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_16_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_16_world_misc.sql
diff --git a/sql/updates/world/2014_06_22_17_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_17_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_22_17_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_22_17_world_misc.sql
diff --git a/sql/updates/world/2014_06_23_00_world_gameobject.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_00_world_gameobject.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_00_world_gameobject.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_00_world_gameobject.sql
diff --git a/sql/updates/world/2014_06_23_00_world_spell_dbc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_00_world_spell_dbc.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_00_world_spell_dbc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_00_world_spell_dbc.sql
diff --git a/sql/updates/world/2014_06_23_01_world_creature_text.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_01_world_creature_text.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_01_world_creature_text.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_01_world_creature_text.sql
diff --git a/sql/updates/world/2014_06_23_03_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_03_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_03_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_03_world_misc.sql
diff --git a/sql/updates/world/2014_06_23_04_world_gameobject.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_04_world_gameobject.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_04_world_gameobject.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_04_world_gameobject.sql
diff --git a/sql/updates/world/2014_06_23_05_world_creature_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_05_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_05_world_creature_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_05_world_creature_template.sql
diff --git a/sql/updates/world/2014_06_23_06_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_06_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_06_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_06_world_misc.sql
diff --git a/sql/updates/world/2014_06_23_07_world_misc_335a.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_07_world_misc_335a.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_07_world_misc_335a.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_07_world_misc_335a.sql
diff --git a/sql/updates/world/2014_06_23_08_world_gameobject_loot_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_08_world_gameobject_loot_template.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_08_world_gameobject_loot_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_08_world_gameobject_loot_template.sql
diff --git a/sql/updates/world/2014_06_23_09_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_09_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_09_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_09_world_misc.sql
diff --git a/sql/updates/world/2014_06_23_10_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_10_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_10_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_10_world_misc.sql
diff --git a/sql/updates/world/2014_06_23_11_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_11_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_11_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_11_world_misc.sql
diff --git a/sql/updates/world/2014_06_23_12_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_12_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_12_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_12_world_misc.sql
diff --git a/sql/updates/world/2014_06_23_13_world_spell_group.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_13_world_spell_group.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_13_world_spell_group.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_13_world_spell_group.sql
diff --git a/sql/updates/world/2014_06_23_14_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_14_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_14_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_14_world_misc.sql
diff --git a/sql/updates/world/2014_06_23_15_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_15_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_15_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_15_world_misc.sql
diff --git a/sql/updates/world/2014_06_23_16_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_16_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_16_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_16_world_misc.sql
diff --git a/sql/updates/world/2014_06_23_17_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_17_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_17_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_17_world_misc.sql
diff --git a/sql/updates/world/2014_06_23_18_world_smart_scripts.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_18_world_smart_scripts.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_18_world_smart_scripts.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_18_world_smart_scripts.sql
diff --git a/sql/updates/world/2014_06_23_19_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_19_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_19_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_19_world_misc.sql
diff --git a/sql/updates/world/2014_06_23_20_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_20_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_20_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_20_world_misc.sql
diff --git a/sql/updates/world/2014_06_23_21_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_21_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_23_21_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_23_21_world_misc.sql
diff --git a/sql/updates/world/2014_06_24_00_world_quest_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_00_world_quest_template.sql
similarity index 100%
rename from sql/updates/world/2014_06_24_00_world_quest_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_00_world_quest_template.sql
diff --git a/sql/updates/world/2014_06_24_01_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_01_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_24_01_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_01_world_misc.sql
diff --git a/sql/updates/world/2014_06_24_02_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_02_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_24_02_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_02_world_misc.sql
diff --git a/sql/updates/world/2014_06_24_03_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_03_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_24_03_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_03_world_misc.sql
diff --git a/sql/updates/world/2014_06_24_04_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_04_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_24_04_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_04_world_misc.sql
diff --git a/sql/updates/world/2014_06_24_05_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_05_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_24_05_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_05_world_misc.sql
diff --git a/sql/updates/world/2014_06_24_06_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_06_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_24_06_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_06_world_misc.sql
diff --git a/sql/updates/world/2014_06_24_07_world_spell_proc_event.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_07_world_spell_proc_event.sql
similarity index 100%
rename from sql/updates/world/2014_06_24_07_world_spell_proc_event.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_07_world_spell_proc_event.sql
diff --git a/sql/updates/world/2014_06_24_08_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_08_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_24_08_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_08_world_misc.sql
diff --git a/sql/updates/world/2014_06_24_09_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_09_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_24_09_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_24_09_world_misc.sql
diff --git a/sql/updates/world/2014_06_25_00_world_quest.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_00_world_quest.sql
similarity index 100%
rename from sql/updates/world/2014_06_25_00_world_quest.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_00_world_quest.sql
diff --git a/sql/updates/world/2014_06_25_01_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_01_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_25_01_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_01_world_misc.sql
diff --git a/sql/updates/world/2014_06_25_02_world_creature.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_02_world_creature.sql
similarity index 100%
rename from sql/updates/world/2014_06_25_02_world_creature.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_02_world_creature.sql
diff --git a/sql/updates/world/2014_06_25_03_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_03_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_25_03_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_03_world_misc.sql
diff --git a/sql/updates/world/2014_06_25_04_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_04_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_25_04_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_04_world_misc.sql
diff --git a/sql/updates/world/2014_06_25_05_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_05_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_25_05_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_05_world_misc.sql
diff --git a/sql/updates/world/2014_06_25_06_world_conditions.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_06_world_conditions.sql
similarity index 100%
rename from sql/updates/world/2014_06_25_06_world_conditions.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_06_world_conditions.sql
diff --git a/sql/updates/world/2014_06_25_07_world_conditions.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_07_world_conditions.sql
similarity index 100%
rename from sql/updates/world/2014_06_25_07_world_conditions.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_07_world_conditions.sql
diff --git a/sql/updates/world/2014_06_25_08_world_conditions.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_08_world_conditions.sql
similarity index 100%
rename from sql/updates/world/2014_06_25_08_world_conditions.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_25_08_world_conditions.sql
diff --git a/sql/updates/world/2014_06_26_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_26_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_26_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_26_00_world_misc.sql
diff --git a/sql/updates/world/2014_06_26_01_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_26_01_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_26_01_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_26_01_world_misc.sql
diff --git a/sql/updates/world/2014_06_26_02_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_26_02_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_26_02_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_26_02_world_misc.sql
diff --git a/sql/updates/world/2014_06_27_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_27_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_27_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_27_00_world_misc.sql
diff --git a/sql/updates/world/2014_06_27_00_world_smart_scripts.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_27_00_world_smart_scripts.sql
similarity index 100%
rename from sql/updates/world/2014_06_27_00_world_smart_scripts.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_27_00_world_smart_scripts.sql
diff --git a/sql/updates/world/2014_06_28_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_28_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_28_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_28_00_world_misc.sql
diff --git a/sql/updates/world/2014_06_28_00_world_smart_scripts.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_28_00_world_smart_scripts.sql
similarity index 100%
rename from sql/updates/world/2014_06_28_00_world_smart_scripts.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_28_00_world_smart_scripts.sql
diff --git a/sql/updates/world/2014_06_28_02_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_28_02_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_28_02_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_28_02_world_misc.sql
diff --git a/sql/updates/world/2014_06_28_03_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_28_03_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_28_03_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_28_03_world_misc.sql
diff --git a/sql/updates/world/2014_06_28_04_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_28_04_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_28_04_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_28_04_world_misc.sql
diff --git a/sql/updates/world/2014_06_29_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_29_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_29_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_29_00_world_misc.sql
diff --git a/sql/updates/world/2014_06_29_01_world_quest_template.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_29_01_world_quest_template.sql
similarity index 100%
rename from sql/updates/world/2014_06_29_01_world_quest_template.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_29_01_world_quest_template.sql
diff --git a/sql/updates/world/2014_06_29_02_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_29_02_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_06_29_02_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_06_29_02_world_misc.sql
diff --git a/sql/updates/world/2014_07_01_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_01_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_07_01_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_01_00_world_misc.sql
diff --git a/sql/updates/world/2014_07_01_01_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_01_01_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_07_01_01_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_01_01_world_misc.sql
diff --git a/sql/updates/world/2014_07_01_02_world playercreateinfo_skills.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_01_02_world_playercreateinfo_skills.sql
similarity index 100%
rename from sql/updates/world/2014_07_01_02_world playercreateinfo_skills.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_01_02_world_playercreateinfo_skills.sql
diff --git a/sql/updates/world/2014_07_02_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_02_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_07_02_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_02_00_world_misc.sql
diff --git a/sql/updates/world/2014_07_02_01_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_02_01_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_07_02_01_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_02_01_world_misc.sql
diff --git a/sql/updates/world/2014_07_02_02_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_02_02_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_07_02_02_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_02_02_world_misc.sql
diff --git a/sql/updates/world/2014_07_02_03_world_npc_vendor.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_02_03_world_npc_vendor.sql
similarity index 100%
rename from sql/updates/world/2014_07_02_03_world_npc_vendor.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_02_03_world_npc_vendor.sql
diff --git a/sql/updates/world/2014_07_03_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_03_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2014_07_03_00_world_misc.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_03_00_world_misc.sql
diff --git a/sql/updates/world/2014_07_03_01_world_spell_proc_event.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_03_01_world_spell_proc_event.sql
similarity index 100%
rename from sql/updates/world/2014_07_03_01_world_spell_proc_event.sql
rename to sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_03_01_world_spell_proc_event.sql
diff --git a/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_04_00_world_playercreateinfo_skills.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_04_00_world_playercreateinfo_skills.sql
new file mode 100644
index 0000000000..b058e32079
--- /dev/null
+++ b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_04_00_world_playercreateinfo_skills.sql
@@ -0,0 +1,5 @@
+DELETE FROM `playercreateinfo_skills` WHERE `skill` IN (113,115,137);
+INSERT INTO `playercreateinfo_skills` VALUES
+(512,0,137,0,'Language: Thalassian'),
+(8,0,113,0,'Language: Darnassian'),
+(32,0,115,0,'Language: Taurahe');
diff --git a/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_05_00_world_misc.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_05_00_world_misc.sql
new file mode 100644
index 0000000000..027a23802b
--- /dev/null
+++ b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_05_00_world_misc.sql
@@ -0,0 +1,7 @@
+--
+DELETE FROM smart_scripts WHERE entryorguid in (25001,25002,24999) AND event_type=6;
+UPDATE `smart_scripts` SET `id`=1 WHERE  `entryorguid`=25001 AND `id`=0 AND `action_param1` =12744;
+DELETE FROM smart_scripts WHERE entryorguid in (25001) AND `id`>0;
+
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(25001,0,0,0,11,0,100,0,0,0,0,0,11,45227,0,0,0,0,0,1,0,0,0,0,0,0,0,'Abyssal Flamewalker - On spawn - Cast Abyssal Meteor Fall');
diff --git a/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_05_01_world_smart_scripts.sql b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_05_01_world_smart_scripts.sql
new file mode 100644
index 0000000000..ddd158c83a
--- /dev/null
+++ b/sql/old/3.3.5a/TDB53_to_TDB54_updates/world/2014_07_05_01_world_smart_scripts.sql
@@ -0,0 +1,19 @@
+UPDATE `smart_scripts` SET
+  `action_type`=11, `action_param1`=37903, `action_param2`=1, `comment`='Razaani Light Orb - Between 0-30% Health - Cast Trapping the Light: Kill Credit (No Repeat)' WHERE
+  `entryorguid`=20635 AND `source_type`=0 AND `id`=3 AND `link`=4;
+
+UPDATE `smart_scripts` SET
+  `action_type`=11, `action_param1`=37903, `action_param2`=1, `comment`='Razaani Light Orb - Mini - On Reached Point 1 - Cast  Trapping the Light: Kill Credit (No Repeat)' WHERE
+  `entryorguid`=20771 AND `source_type`=0 AND `id`=3 AND `link`=4;
+
+UPDATE `smart_scripts` SET
+  `action_type`=11, `action_param1`=37903, `action_param2`=1, `comment`='Multi-Spectrum Light Trap Bunny - On Data Set 1 1 - Cast Trapping the Light: Kill Credit ' WHERE
+  `entryorguid`=21926 AND `source_type`=0 AND `id`=4 AND `link`=5;
+
+UPDATE `smart_scripts` SET
+  `action_type`=85, `action_param1`=37829, `action_param2`=1, `comment`='Scalewing Serpent - On Spellhit - Cast Ride the Lightning: Kill Credit' WHERE
+  `entryorguid`=20749 AND `source_type`=0 AND `id`=1 AND `link`=0;
+
+UPDATE `smart_scripts` SET
+ `action_type`=85, `action_param1`=43174, `action_param2`=1, `comment`='Proto-Drake - On Death - Cast Draconis Gastritis: Kill Credit' WHERE
+ `entryorguid`=23689 AND `source_type`=0 AND `id`=7 AND `link`=0;
diff --git a/sql/updates/world/2014_07_06_00_world_version.sql b/sql/updates/world/2014_07_06_00_world_version.sql
new file mode 100644
index 0000000000..4fdfda68de
--- /dev/null
+++ b/sql/updates/world/2014_07_06_00_world_version.sql
@@ -0,0 +1 @@
+UPDATE `version` SET `db_version`='TDB 335.54', `cache_id`=54 LIMIT 1;
diff --git a/sql/updates/world/2014_07_06_01_world_misc.sql b/sql/updates/world/2014_07_06_01_world_misc.sql
new file mode 100644
index 0000000000..ff7e226bdd
--- /dev/null
+++ b/sql/updates/world/2014_07_06_01_world_misc.sql
@@ -0,0 +1,10 @@
+--
+SET @GUID=5412;
+
+DELETE FROM `gameobject` WHERE `id`=188367;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES
+(@GUID,188367,571,1,1,5048.28,-4817.63,219.778,2.49582,0,0,0,1,-60,255,1,0);
+
+DELETE FROM `event_scripts` WHERE `id`=17566;
+INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES
+(17566,0,9,@GUID,60,0,0,0,0,0);
diff --git a/sql/updates/world/2014_07_06_02_world_misc.sql b/sql/updates/world/2014_07_06_02_world_misc.sql
new file mode 100644
index 0000000000..7ff6e74d00
--- /dev/null
+++ b/sql/updates/world/2014_07_06_02_world_misc.sql
@@ -0,0 +1,4 @@
+--
+UPDATE `creature_template` SET `npcflag`=16777216 WHERE `entry`=25743;
+DELETE FROM `creature_loot_template` WHERE `entry`=25802 AND `item`=35234;
+UPDATE `item_template` SET `flagsCustom`=1 WHERE `entry`=44834;
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
index 5555f2a824..41539b9cda 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
@@ -41,14 +41,14 @@ BattlefieldWG::~BattlefieldWG()
 
 bool BattlefieldWG::SetupBattlefield()
 {
-    InitStalker(BATTLEFIELD_WG_NPC_STALKER, WintergraspStalkerPos[0], WintergraspStalkerPos[1], WintergraspStalkerPos[2], WintergraspStalkerPos[3]);
-
     m_TypeId = BATTLEFIELD_WG;                              // See enum BattlefieldTypes
     m_BattleId = BATTLEFIELD_BATTLEID_WG;
     m_ZoneId = BATTLEFIELD_WG_ZONEID;
     m_MapId = BATTLEFIELD_WG_MAPID;
     m_Map = sMapMgr->FindMap(m_MapId, 0);
 
+    InitStalker(BATTLEFIELD_WG_NPC_STALKER, WintergraspStalkerPos[0], WintergraspStalkerPos[1], WintergraspStalkerPos[2], WintergraspStalkerPos[3]);
+
     m_MaxPlayer = sWorld->getIntConfig(CONFIG_WINTERGRASP_PLR_MAX);
     m_IsEnabled = sWorld->getBoolConfig(CONFIG_WINTERGRASP_ENABLE);
     m_MinPlayer = sWorld->getIntConfig(CONFIG_WINTERGRASP_PLR_MIN);
diff --git a/src/server/game/Battlegrounds/BattlegroundScore.h b/src/server/game/Battlegrounds/BattlegroundScore.h
index ae65721b51..95d1db2c33 100644
--- a/src/server/game/Battlegrounds/BattlegroundScore.h
+++ b/src/server/game/Battlegrounds/BattlegroundScore.h
@@ -87,7 +87,7 @@ struct BattlegroundScore
             }
         }
 
-        virtual void AppendToPacket(WorldPacket& data) 
+        virtual void AppendToPacket(WorldPacket& data)
         {
             data << uint64(PlayerGuid);
 
@@ -108,7 +108,7 @@ struct BattlegroundScore
 
         uint64 PlayerGuid;
 
-        // Default score, present in every type 
+        // Default score, present in every type
         uint32 KillingBlows;
         uint32 Deaths;
         uint32 HonorableKills;
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 4ff0153dea..08d984e079 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -2603,13 +2603,39 @@ void WorldObject::MovePosition(Position &pos, float dist, float angle)
     pos.SetOrientation(GetOrientation());
 }
 
+// @todo: replace with WorldObject::UpdateAllowedPositionZ
+float NormalizeZforCollision(WorldObject* obj, float x, float y, float z)
+{
+    float ground = obj->GetMap()->GetHeight(obj->GetPhaseMask(), x, y, MAX_HEIGHT, true);
+    float floor = obj->GetMap()->GetHeight(obj->GetPhaseMask(), x, y, z + 2.0f, true);
+    float helper = fabs(ground - z) <= fabs(floor - z) ? ground : floor;
+    if (z > helper) // must be above ground
+    {
+        if (Unit* unit = obj->ToUnit())
+        {
+            if (unit->CanFly())
+                return z;
+        }
+        LiquidData liquid_status;
+        ZLiquidStatus res = obj->GetMap()->getLiquidStatus(x, y, z, MAP_ALL_LIQUIDS, &liquid_status);
+        if (res && liquid_status.level > helper) // water must be above ground
+        {
+            if (liquid_status.level > z) // z is underwater
+                return z;
+            else
+                return fabs(liquid_status.level - z) <= fabs(helper - z) ? liquid_status.level : helper;
+        }
+    }
+    return helper;
+}
+
 void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float angle)
 {
     angle += GetOrientation();
-    float destx, desty, destz, ground, floor;
-    pos.m_positionZ += 2.0f;
+    float destx, desty, destz;
     destx = pos.m_positionX + dist * std::cos(angle);
     desty = pos.m_positionY + dist * std::sin(angle);
+    destz = NormalizeZforCollision(this, destx, desty, pos.GetPositionZ());
 
     // Prevent invalid coordinates here, position is unchanged
     if (!Trinity::IsValidMapCoord(destx, desty))
@@ -2618,11 +2644,7 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float
         return;
     }
 
-    ground = GetMap()->GetHeight(GetPhaseMask(), destx, desty, MAX_HEIGHT, true);
-    floor = GetMap()->GetHeight(GetPhaseMask(), destx, desty, pos.m_positionZ, true);
-    destz = fabs(ground - pos.m_positionZ) <= fabs(floor - pos.m_positionZ) ? ground : floor;
-
-    bool col = VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(GetMapId(), pos.m_positionX, pos.m_positionY, pos.m_positionZ+0.5f, destx, desty, destz+0.5f, destx, desty, destz, -0.5f);
+    bool col = VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(GetMapId(), pos.m_positionX, pos.m_positionY, pos.m_positionZ + 0.5f, destx, desty, destz + 0.5f, destx, desty, destz, -0.5f);
 
     // collision occured
     if (col)
@@ -2634,7 +2656,7 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float
     }
 
     // check dynamic collision
-    col = GetMap()->getObjectHitPos(GetPhaseMask(), pos.m_positionX, pos.m_positionY, pos.m_positionZ+0.5f, destx, desty, destz+0.5f, destx, desty, destz, -0.5f);
+    col = GetMap()->getObjectHitPos(GetPhaseMask(), pos.m_positionX, pos.m_positionY, pos.m_positionZ + 0.5f, destx, desty, destz + 0.5f, destx, desty, destz, -0.5f);
 
     // Collided with a gameobject
     if (col)
@@ -2644,18 +2666,16 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float
         dist = sqrt((pos.m_positionX - destx)*(pos.m_positionX - destx) + (pos.m_positionY - desty)*(pos.m_positionY - desty));
     }
 
-    float step = dist/10.0f;
+    float step = dist / 10.0f;
 
     for (uint8 j = 0; j < 10; ++j)
     {
         // do not allow too big z changes
-        if (fabs(pos.m_positionZ - destz) > 6)
+        if (fabs(pos.m_positionZ - destz) > 6.0f)
         {
             destx -= step * std::cos(angle);
             desty -= step * std::sin(angle);
-            ground = GetMap()->GetHeight(GetPhaseMask(), destx, desty, MAX_HEIGHT, true);
-            floor = GetMap()->GetHeight(GetPhaseMask(), destx, desty, pos.m_positionZ, true);
-            destz = fabs(ground - pos.m_positionZ) <= fabs(floor - pos.m_positionZ) ? ground : floor;
+            destz = NormalizeZforCollision(this, destx, desty, pos.GetPositionZ());
         }
         // we have correct destz now
         else
@@ -2667,7 +2687,7 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float
 
     Trinity::NormalizeMapCoord(pos.m_positionX);
     Trinity::NormalizeMapCoord(pos.m_positionY);
-    UpdateAllowedPositionZ(pos.m_positionX, pos.m_positionY, pos.m_positionZ);
+    pos.m_positionZ = NormalizeZforCollision(this, destx, desty, pos.GetPositionZ());
     pos.SetOrientation(GetOrientation());
 }
 
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 6a1c91456e..e00728d25c 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -3828,7 +3828,7 @@ bool Player::addSpell(uint32 spellId, bool active, bool learning, bool dependent
             if (!pSkill)
                 continue;
 
-            if (!HasSkill(pSkill->id))
+            if (_spell_idx->second->AutolearnType == SKILL_LINE_ABILITY_LEARNED_ON_SKILL_LEARN && !HasSkill(pSkill->id))
                 LearnDefaultSkill(pSkill->id, 0);
 
             if (pSkill->id == SKILL_MOUNTS && !Has310Flyer(false))
@@ -23119,11 +23119,11 @@ void Player::LearnDefaultSkill(uint32 skillId, uint16 rank)
             break;
         case SKILL_RANGE_LEVEL:
         {
-            uint16 skillValue = 0;
+            uint16 skillValue = 1;
             uint16 maxValue = GetMaxSkillValueForLevel();
             if (rcInfo->Flags & SKILL_FLAG_ALWAYS_MAX_VALUE)
                 skillValue = maxValue;
-            else
+            else if (getClass() == CLASS_DEATH_KNIGHT)
                 skillValue = std::min(std::max<uint16>({ 1, uint16((getLevel() - 1) * 5) }), maxValue);
 
             SetSkill(skillId, 0, skillValue, maxValue);
@@ -23138,8 +23138,13 @@ void Player::LearnDefaultSkill(uint32 skillId, uint16 rank)
                 break;
 
             SkillTiersEntry const* tier = sSkillTiersStore.LookupEntry(rcInfo->SkillTier);
-            uint16 maxValue = std::max<uint16>(GetMaxSkillValue(skillId), tier->MaxSkill[std::max<int32>(rank - 1, 0)]);
-            uint16 skillValue = std::min(std::max<uint16>({ uint16(1), uint16((getLevel() - 1) * 5) }), maxValue);
+            uint16 maxValue = tier->MaxSkill[std::max<int32>(rank - 1, 0)];
+            uint16 skillValue = 1;
+            if (rcInfo->Flags & SKILL_FLAG_ALWAYS_MAX_VALUE)
+                skillValue = maxValue;
+            else if (getClass() == CLASS_DEATH_KNIGHT)
+                skillValue = std::min(std::max<uint16>({ uint16(1), uint16((getLevel() - 1) * 5) }), maxValue);
+
             SetSkill(skillId, rank, skillValue, maxValue);
             break;
         }
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index bdf42a2632..bfb38a3124 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -119,6 +119,9 @@ bool Map::ExistVMap(uint32 mapid, int gx, int gy)
 
 void Map::LoadMMap(int gx, int gy)
 {
+    if (!MMAP::MMapFactory::IsPathfindingEnabled(GetId()))
+        return;
+
     bool mmapLoadResult = MMAP::MMapFactory::createOrGetMMapManager()->loadMap((sWorld->GetDataPath() + "mmaps").c_str(), GetId(), gx, gy);
 
     if (mmapLoadResult)
@@ -129,6 +132,8 @@ void Map::LoadMMap(int gx, int gy)
 
 void Map::LoadVMap(int gx, int gy)
 {
+    if (!VMAP::VMapFactory::createOrGetVMapManager()->isMapLoadingEnabled())
+        return;
                                                             // x and y are swapped !!
     int vmapLoadResult = VMAP::VMapFactory::createOrGetVMapManager()->loadMap((sWorld->GetDataPath()+ "vmaps").c_str(),  GetId(), gx, gy);
     switch (vmapLoadResult)
diff --git a/src/server/game/Movement/PathGenerator.cpp b/src/server/game/Movement/PathGenerator.cpp
index d6912bac7c..3140fc2329 100644
--- a/src/server/game/Movement/PathGenerator.cpp
+++ b/src/server/game/Movement/PathGenerator.cpp
@@ -882,3 +882,41 @@ float PathGenerator::Dist3DSqr(G3D::Vector3 const& p1, G3D::Vector3 const& p2) c
 {
     return (p1 - p2).squaredLength();
 }
+
+void PathGenerator::ReducePathLenghtByDist(float dist)
+{
+    if (GetPathType() == PATHFIND_BLANK)
+    {
+        TC_LOG_ERROR("maps", "PathGenerator::ReducePathLenghtByDist called before path was built");
+        return;
+    }
+
+    if (_pathPoints.size() < 2) // path building failure
+        return;
+
+    uint32 i = _pathPoints.size();
+    G3D::Vector3 nextVec = _pathPoints[--i];
+    while (i > 0)
+    {
+        G3D::Vector3 currVec = _pathPoints[--i];
+        G3D::Vector3 diffVec = (nextVec - currVec);
+        float len = diffVec.length();
+        if (len > dist)
+        {
+            float step = dist / len;
+            // same as nextVec
+            _pathPoints[i + 1] -= diffVec * step;
+            _pathPoints.resize(i + 2);
+            break;
+        }
+        else if (i == 0) // at second point
+        {
+            _pathPoints[1] = _pathPoints[0];
+            _pathPoints.resize(2);
+            break;
+        }
+
+        dist -= len;
+        nextVec = currVec; // we're going backwards
+    }
+}
diff --git a/src/server/game/Movement/PathGenerator.h b/src/server/game/Movement/PathGenerator.h
index 6e0d72ec8d..a9a13c3725 100644
--- a/src/server/game/Movement/PathGenerator.h
+++ b/src/server/game/Movement/PathGenerator.h
@@ -72,6 +72,8 @@ class PathGenerator
 
         PathType GetPathType() const { return _type; }
 
+        void ReducePathLenghtByDist(float dist); // path must be already built
+
     private:
 
         dtPolyRef _pathPolyRefs[MAX_PATH_LENGTH];   // array of detour polygon references
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 0e0443cc67..0d7dd8819a 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -5043,15 +5043,24 @@ SpellCastResult Spell::CheckCast(bool strict)
                     if (!target)
                         return SPELL_FAILED_DONT_REPORT;
 
-                    //target->GetContactPoint(m_caster, pos.m_positionX, pos.m_positionY, pos.m_positionZ);
-                    Position pos = target->GetFirstCollisionPosition(CONTACT_DISTANCE, target->GetRelativeAngle(m_caster));
+                    float objSize = target->GetObjectSize();
+                    float range = m_spellInfo->GetMaxRange(true, m_caster, this) * 1.5f + objSize; // can't be overly strict
 
-                    m_preGeneratedPath.SetPathLengthLimit(m_spellInfo->GetMaxRange(true) * 1.5f);
-                    bool result = m_preGeneratedPath.CalculatePath(pos.m_positionX, pos.m_positionY, pos.m_positionZ + target->GetObjectSize(), false, true);
+                    m_preGeneratedPath.SetPathLengthLimit(range);
+                    // first try with raycast, if it fails fall back to normal path
+                    bool result = m_preGeneratedPath.CalculatePath(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ() + target->GetObjectSize(), false, true);
                     if (m_preGeneratedPath.GetPathType() & PATHFIND_SHORT)
                         return SPELL_FAILED_OUT_OF_RANGE;
                     else if (!result || m_preGeneratedPath.GetPathType() & PATHFIND_NOPATH)
-                        return SPELL_FAILED_NOPATH;
+                    {
+                        result = m_preGeneratedPath.CalculatePath(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ() + target->GetObjectSize(), false, false);
+                        if (m_preGeneratedPath.GetPathType() & PATHFIND_SHORT)
+                            return SPELL_FAILED_OUT_OF_RANGE;
+                        else if (!result || m_preGeneratedPath.GetPathType() & PATHFIND_NOPATH)
+                            return SPELL_FAILED_NOPATH;
+                    }
+
+                    m_preGeneratedPath.ReducePathLenghtByDist(objSize); // move back
                 }
                 break;
             }
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 0a5d265cbf..abeeb39421 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -4586,7 +4586,7 @@ void Spell::EffectLeap(SpellEffIndex /*effIndex*/)
         return;
 
     Position pos = destTarget->GetPosition();
-    pos = unitTarget->GetFirstCollisionPosition(unitTarget->GetDistance(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ() + 2.0f), 0.0f);
+    pos = unitTarget->GetFirstCollisionPosition(unitTarget->GetDistance(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ()), 0.0f);
     unitTarget->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), unitTarget == m_caster);
 }
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index e0050420a0..1f8ccfbd5d 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -159,7 +159,7 @@ class instance_magisters_terrace : public InstanceMapScript
                 switch (type)
                 {
                     case DATA_DELRISSA:
-                        if (type == IN_PROGRESS)
+                        if (state == IN_PROGRESS)
                             DelrissaDeathCount = 0;
                         break;
                     default:
diff --git a/src/tools/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp
index 825a2697c1..c527ec32dd 100644
--- a/src/tools/vmap4_extractor/model.cpp
+++ b/src/tools/vmap4_extractor/model.cpp
@@ -96,8 +96,19 @@ bool Model::ConvertToVMAPModel(const char * outfilename)
     wsize = sizeof(uint32) + sizeof(unsigned short) * nIndexes;
     fwrite(&wsize, sizeof(int), 1, output);
     fwrite(&nIndexes, sizeof(uint32), 1, output);
-    if (nIndexes >0)
+    if (nIndexes > 0)
+    {
+        for (uint32 i = 0; i < nIndexes; ++i)
+        {
+            if ((i % 3) - 1 == 0 && i + 1 < nIndexes)
+            {
+                uint16 tmp = indices[i];
+                indices[i] = indices[i + 1];
+                indices[i + 1] = tmp;
+            }
+        }
         fwrite(indices, sizeof(unsigned short), nIndexes, output);
+    }
 
     fwrite("VERT", 4, 1, output);
     wsize = sizeof(int) + sizeof(float) * 3 * nVertices;
@@ -105,8 +116,12 @@ bool Model::ConvertToVMAPModel(const char * outfilename)
     fwrite(&nVertices, sizeof(int), 1, output);
     if (nVertices >0)
     {
-        for(uint32 vpos=0; vpos <nVertices; ++vpos)
-            std::swap(vertices[vpos].y, vertices[vpos].z);
+        for (uint32 vpos = 0; vpos < nVertices; ++vpos)
+        {
+            float tmp = vertices[vpos].y;
+            vertices[vpos].y = -vertices[vpos].z;
+            vertices[vpos].z = tmp;
+        }
 
         fwrite(vertices, sizeof(float)*3, nVertices, output);
     }