diff --git a/sql/updates/world/2011_04_02_01_world_version.sql b/sql/old/3.3.5a/2011_04_02_01_world_version.sql
similarity index 100%
rename from sql/updates/world/2011_04_02_01_world_version.sql
rename to sql/old/3.3.5a/2011_04_02_01_world_version.sql
diff --git a/sql/updates/world/2011_04_03_00_world_conditions.sql b/sql/old/3.3.5a/2011_04_03_00_world_conditions.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_00_world_conditions.sql
rename to sql/old/3.3.5a/2011_04_03_00_world_conditions.sql
diff --git a/sql/updates/world/2011_04_03_00_world_item_template.sql b/sql/old/3.3.5a/2011_04_03_00_world_item_template.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_00_world_item_template.sql
rename to sql/old/3.3.5a/2011_04_03_00_world_item_template.sql
diff --git a/sql/updates/world/2011_04_03_00_world_misc.sql b/sql/old/3.3.5a/2011_04_03_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_00_world_misc.sql
rename to sql/old/3.3.5a/2011_04_03_00_world_misc.sql
diff --git a/sql/updates/world/2011_04_03_00_world_scriptname.sql b/sql/old/3.3.5a/2011_04_03_00_world_scriptname.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_00_world_scriptname.sql
rename to sql/old/3.3.5a/2011_04_03_00_world_scriptname.sql
diff --git a/sql/updates/world/2011_04_03_01_world_game_events.sql b/sql/old/3.3.5a/2011_04_03_01_world_game_events.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_01_world_game_events.sql
rename to sql/old/3.3.5a/2011_04_03_01_world_game_events.sql
diff --git a/sql/updates/world/2011_04_03_02_world_game_event.sql b/sql/old/3.3.5a/2011_04_03_02_world_game_event.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_02_world_game_event.sql
rename to sql/old/3.3.5a/2011_04_03_02_world_game_event.sql
diff --git a/sql/updates/world/2011_04_03_03_world_game_events.sql b/sql/old/3.3.5a/2011_04_03_03_world_game_events.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_03_world_game_events.sql
rename to sql/old/3.3.5a/2011_04_03_03_world_game_events.sql
diff --git a/sql/updates/world/2011_04_03_04_world_misc.sql b/sql/old/3.3.5a/2011_04_03_04_world_misc.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_04_world_misc.sql
rename to sql/old/3.3.5a/2011_04_03_04_world_misc.sql
diff --git a/sql/updates/world/2011_04_03_05_world_sai.sql b/sql/old/3.3.5a/2011_04_03_05_world_sai.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_05_world_sai.sql
rename to sql/old/3.3.5a/2011_04_03_05_world_sai.sql
diff --git a/sql/updates/world/2011_04_03_06_world_waypoint.sql b/sql/old/3.3.5a/2011_04_03_06_world_waypoint.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_06_world_waypoint.sql
rename to sql/old/3.3.5a/2011_04_03_06_world_waypoint.sql
diff --git a/sql/updates/world/2011_04_03_07_world_achievement_dbc.sql b/sql/old/3.3.5a/2011_04_03_07_world_achievement_dbc.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_07_world_achievement_dbc.sql
rename to sql/old/3.3.5a/2011_04_03_07_world_achievement_dbc.sql
diff --git a/sql/updates/world/2011_04_03_08_world_creatures.sql b/sql/old/3.3.5a/2011_04_03_08_world_creatures.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_08_world_creatures.sql
rename to sql/old/3.3.5a/2011_04_03_08_world_creatures.sql
diff --git a/sql/updates/world/2011_04_03_09_world_misc.sql b/sql/old/3.3.5a/2011_04_03_09_world_misc.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_09_world_misc.sql
rename to sql/old/3.3.5a/2011_04_03_09_world_misc.sql
diff --git a/sql/updates/world/2011_04_03_10_world_spell_script_names.sql b/sql/old/3.3.5a/2011_04_03_10_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_10_world_spell_script_names.sql
rename to sql/old/3.3.5a/2011_04_03_10_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_04_03_11_world_spell_script_names.sql b/sql/old/3.3.5a/2011_04_03_11_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_11_world_spell_script_names.sql
rename to sql/old/3.3.5a/2011_04_03_11_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_04_03_12_world_script_text.sql b/sql/old/3.3.5a/2011_04_03_12_world_script_text.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_12_world_script_text.sql
rename to sql/old/3.3.5a/2011_04_03_12_world_script_text.sql
diff --git a/sql/updates/world/2011_04_03_12_world_scriptname.sql b/sql/old/3.3.5a/2011_04_03_12_world_scriptname.sql
similarity index 100%
rename from sql/updates/world/2011_04_03_12_world_scriptname.sql
rename to sql/old/3.3.5a/2011_04_03_12_world_scriptname.sql
diff --git a/sql/updates/auth_char/2011_04_05_00_characters_arena_team_misc.sql b/sql/old/3.3.5a/2011_04_05_00_characters_arena_team_misc.sql
similarity index 100%
rename from sql/updates/auth_char/2011_04_05_00_characters_arena_team_misc.sql
rename to sql/old/3.3.5a/2011_04_05_00_characters_arena_team_misc.sql
diff --git a/sql/updates/auth_char/2011_04_06_00_characters_arena_team_member.sql b/sql/old/3.3.5a/2011_04_06_00_characters_arena_team_member.sql
similarity index 100%
rename from sql/updates/auth_char/2011_04_06_00_characters_arena_team_member.sql
rename to sql/old/3.3.5a/2011_04_06_00_characters_arena_team_member.sql
diff --git a/sql/updates/world/2011_04_06_00_world_script_text.sql b/sql/old/3.3.5a/2011_04_06_00_world_script_text.sql
similarity index 100%
rename from sql/updates/world/2011_04_06_00_world_script_text.sql
rename to sql/old/3.3.5a/2011_04_06_00_world_script_text.sql
diff --git a/sql/updates/world/2011_04_06_00_world_scriptname.sql b/sql/old/3.3.5a/2011_04_06_00_world_scriptname.sql
similarity index 100%
rename from sql/updates/world/2011_04_06_00_world_scriptname.sql
rename to sql/old/3.3.5a/2011_04_06_00_world_scriptname.sql
diff --git a/sql/updates/world/2011_04_06_01_world_spell_script_names.sql b/sql/old/3.3.5a/2011_04_06_01_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2011_04_06_01_world_spell_script_names.sql
rename to sql/old/3.3.5a/2011_04_06_01_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_04_06_02_world_command.sql b/sql/old/3.3.5a/2011_04_06_02_world_command.sql
similarity index 100%
rename from sql/updates/world/2011_04_06_02_world_command.sql
rename to sql/old/3.3.5a/2011_04_06_02_world_command.sql
diff --git a/sql/updates/world/2011_04_06_03_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_04_06_03_world_spell_linked_spell.sql
similarity index 100%
rename from sql/updates/world/2011_04_06_03_world_spell_linked_spell.sql
rename to sql/old/3.3.5a/2011_04_06_03_world_spell_linked_spell.sql
diff --git a/sql/updates/world/2011_04_06_03_world_spell_script_names.sql b/sql/old/3.3.5a/2011_04_06_03_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2011_04_06_03_world_spell_script_names.sql
rename to sql/old/3.3.5a/2011_04_06_03_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_04_07_00_world_instance_scripts.sql b/sql/old/3.3.5a/2011_04_07_00_world_instance_scripts.sql
similarity index 100%
rename from sql/updates/world/2011_04_07_00_world_instance_scripts.sql
rename to sql/old/3.3.5a/2011_04_07_00_world_instance_scripts.sql
diff --git a/sql/updates/auth_char/2011_04_08_00_characters_battleground_data.sql b/sql/old/3.3.5a/2011_04_08_00_characters_battleground_data.sql
similarity index 100%
rename from sql/updates/auth_char/2011_04_08_00_characters_battleground_data.sql
rename to sql/old/3.3.5a/2011_04_08_00_characters_battleground_data.sql
diff --git a/sql/updates/auth_char/2011_04_08_01_characters_character_homebind.sql b/sql/old/3.3.5a/2011_04_08_01_characters_character_homebind.sql
similarity index 100%
rename from sql/updates/auth_char/2011_04_08_01_characters_character_homebind.sql
rename to sql/old/3.3.5a/2011_04_08_01_characters_character_homebind.sql
diff --git a/sql/updates/auth_char/2011_04_08_02_characters_arena_team.sql b/sql/old/3.3.5a/2011_04_08_02_characters_arena_team.sql
similarity index 100%
rename from sql/updates/auth_char/2011_04_08_02_characters_arena_team.sql
rename to sql/old/3.3.5a/2011_04_08_02_characters_arena_team.sql
diff --git a/sql/updates/auth_char/2011_04_08_03_characters_arena_team_member.sql b/sql/old/3.3.5a/2011_04_08_03_characters_arena_team_member.sql
similarity index 100%
rename from sql/updates/auth_char/2011_04_08_03_characters_arena_team_member.sql
rename to sql/old/3.3.5a/2011_04_08_03_characters_arena_team_member.sql
diff --git a/sql/updates/world/2011_04_09_00_world_sai.sql b/sql/old/3.3.5a/2011_04_09_00_world_sai.sql
similarity index 100%
rename from sql/updates/world/2011_04_09_00_world_sai.sql
rename to sql/old/3.3.5a/2011_04_09_00_world_sai.sql
diff --git a/sql/updates/auth_char/2011_04_11_00_characters_corpse.sql b/sql/old/3.3.5a/2011_04_11_00_characters_corpse.sql
similarity index 100%
rename from sql/updates/auth_char/2011_04_11_00_characters_corpse.sql
rename to sql/old/3.3.5a/2011_04_11_00_characters_corpse.sql
diff --git a/sql/updates/world/2011_04_11_00_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_04_11_00_world_achievement_criteria_data.sql
similarity index 100%
rename from sql/updates/world/2011_04_11_00_world_achievement_criteria_data.sql
rename to sql/old/3.3.5a/2011_04_11_00_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2011_04_11_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2011_04_11_01_world_creature_loot_template.sql
similarity index 100%
rename from sql/updates/world/2011_04_11_01_world_creature_loot_template.sql
rename to sql/old/3.3.5a/2011_04_11_01_world_creature_loot_template.sql
diff --git a/sql/updates/world/2011_04_11_02_world_spell_area.sql b/sql/old/3.3.5a/2011_04_11_02_world_spell_area.sql
similarity index 100%
rename from sql/updates/world/2011_04_11_02_world_spell_area.sql
rename to sql/old/3.3.5a/2011_04_11_02_world_spell_area.sql
diff --git a/sql/updates/world/2011_04_11_03_world_arena_season_5.sql b/sql/old/3.3.5a/2011_04_11_03_world_arena_season_5.sql
similarity index 100%
rename from sql/updates/world/2011_04_11_03_world_arena_season_5.sql
rename to sql/old/3.3.5a/2011_04_11_03_world_arena_season_5.sql
diff --git a/sql/updates/auth_char/2011_04_13_00_characters_creature_respawn.sql b/sql/old/3.3.5a/2011_04_13_00_characters_creature_respawn.sql
similarity index 100%
rename from sql/updates/auth_char/2011_04_13_00_characters_creature_respawn.sql
rename to sql/old/3.3.5a/2011_04_13_00_characters_creature_respawn.sql
diff --git a/sql/updates/world/2011_04_13_00_world_pool_template.sql b/sql/old/3.3.5a/2011_04_13_00_world_pool_template.sql
similarity index 100%
rename from sql/updates/world/2011_04_13_00_world_pool_template.sql
rename to sql/old/3.3.5a/2011_04_13_00_world_pool_template.sql
diff --git a/sql/updates/auth_char/2011_04_13_01_characters_gameobject_respawn.sql b/sql/old/3.3.5a/2011_04_13_01_characters_gameobject_respawn.sql
similarity index 100%
rename from sql/updates/auth_char/2011_04_13_01_characters_gameobject_respawn.sql
rename to sql/old/3.3.5a/2011_04_13_01_characters_gameobject_respawn.sql
diff --git a/sql/updates/auth_char/2011_04_14_00_characters.sql b/sql/old/3.3.5a/2011_04_14_00_characters.sql
similarity index 100%
rename from sql/updates/auth_char/2011_04_14_00_characters.sql
rename to sql/old/3.3.5a/2011_04_14_00_characters.sql
diff --git a/sql/updates/world/2011_04_14_00_world_sai.sql b/sql/old/3.3.5a/2011_04_14_00_world_sai.sql
similarity index 100%
rename from sql/updates/world/2011_04_14_00_world_sai.sql
rename to sql/old/3.3.5a/2011_04_14_00_world_sai.sql
diff --git a/sql/updates/world/2011_04_14_01_world_quest_template.sql b/sql/old/3.3.5a/2011_04_14_01_world_quest_template.sql
similarity index 100%
rename from sql/updates/world/2011_04_14_01_world_quest_template.sql
rename to sql/old/3.3.5a/2011_04_14_01_world_quest_template.sql
diff --git a/sql/updates/auth_char/2011_04_15_00_characters_characters.sql b/sql/old/3.3.5a/2011_04_15_00_characters_characters.sql
similarity index 100%
rename from sql/updates/auth_char/2011_04_15_00_characters_characters.sql
rename to sql/old/3.3.5a/2011_04_15_00_characters_characters.sql
diff --git a/sql/updates/world/2011_04_16_00_world_gossip_menu.sql b/sql/old/3.3.5a/2011_04_16_00_world_gossip_menu.sql
similarity index 100%
rename from sql/updates/world/2011_04_16_00_world_gossip_menu.sql
rename to sql/old/3.3.5a/2011_04_16_00_world_gossip_menu.sql
diff --git a/sql/updates/world/2011_04_17_00_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_04_17_00_world_achievement_criteria_data.sql
similarity index 100%
rename from sql/updates/world/2011_04_17_00_world_achievement_criteria_data.sql
rename to sql/old/3.3.5a/2011_04_17_00_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2011_04_17_01_world_spell_bonus_data.sql b/sql/old/3.3.5a/2011_04_17_01_world_spell_bonus_data.sql
similarity index 100%
rename from sql/updates/world/2011_04_17_01_world_spell_bonus_data.sql
rename to sql/old/3.3.5a/2011_04_17_01_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2011_04_17_02_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_04_17_02_world_achievement_criteria_data.sql
similarity index 100%
rename from sql/updates/world/2011_04_17_02_world_achievement_criteria_data.sql
rename to sql/old/3.3.5a/2011_04_17_02_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2011_04_17_03_world_spell_script_names.sql b/sql/old/3.3.5a/2011_04_17_03_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2011_04_17_03_world_spell_script_names.sql
rename to sql/old/3.3.5a/2011_04_17_03_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_04_17_04_world_creature.sql b/sql/old/3.3.5a/2011_04_17_04_world_creature.sql
similarity index 100%
rename from sql/updates/world/2011_04_17_04_world_creature.sql
rename to sql/old/3.3.5a/2011_04_17_04_world_creature.sql
diff --git a/sql/updates/world/2011_04_17_05_world_creature.sql b/sql/old/3.3.5a/2011_04_17_05_world_creature.sql
similarity index 100%
rename from sql/updates/world/2011_04_17_05_world_creature.sql
rename to sql/old/3.3.5a/2011_04_17_05_world_creature.sql
diff --git a/sql/updates/world/2011_04_17_06_world_creature.sql b/sql/old/3.3.5a/2011_04_17_06_world_creature.sql
similarity index 100%
rename from sql/updates/world/2011_04_17_06_world_creature.sql
rename to sql/old/3.3.5a/2011_04_17_06_world_creature.sql
diff --git a/sql/updates/world/2011_04_17_07_world_creature_template.sql b/sql/old/3.3.5a/2011_04_17_07_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2011_04_17_07_world_creature_template.sql
rename to sql/old/3.3.5a/2011_04_17_07_world_creature_template.sql
diff --git a/sql/updates/world/2011_04_17_08_world_conditions.sql b/sql/old/3.3.5a/2011_04_17_08_world_conditions.sql
similarity index 100%
rename from sql/updates/world/2011_04_17_08_world_conditions.sql
rename to sql/old/3.3.5a/2011_04_17_08_world_conditions.sql
diff --git a/sql/updates/auth_char/2011_04_19_00_characters.sql b/sql/old/3.3.5a/2011_04_19_00_characters.sql
similarity index 100%
rename from sql/updates/auth_char/2011_04_19_00_characters.sql
rename to sql/old/3.3.5a/2011_04_19_00_characters.sql
diff --git a/sql/updates/world/2011_04_21_00_world_achievement.sql b/sql/old/3.3.5a/2011_04_21_00_world_achievement.sql
similarity index 100%
rename from sql/updates/world/2011_04_21_00_world_achievement.sql
rename to sql/old/3.3.5a/2011_04_21_00_world_achievement.sql
diff --git a/sql/updates/world/2011_04_21_01_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_04_21_01_world_achievement_criteria_data.sql
similarity index 100%
rename from sql/updates/world/2011_04_21_01_world_achievement_criteria_data.sql
rename to sql/old/3.3.5a/2011_04_21_01_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2011_04_22_00_world_spell_dbc.sql b/sql/old/3.3.5a/2011_04_22_00_world_spell_dbc.sql
similarity index 100%
rename from sql/updates/world/2011_04_22_00_world_spell_dbc.sql
rename to sql/old/3.3.5a/2011_04_22_00_world_spell_dbc.sql
diff --git a/sql/updates/world/2011_04_22_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_04_22_00_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2011_04_22_00_world_spell_script_names.sql
rename to sql/old/3.3.5a/2011_04_22_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_04_22_01_world_spell_script_names.sql b/sql/old/3.3.5a/2011_04_22_01_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2011_04_22_01_world_spell_script_names.sql
rename to sql/old/3.3.5a/2011_04_22_01_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_04_22_02_world_creature.sql b/sql/old/3.3.5a/2011_04_22_02_world_creature.sql
similarity index 100%
rename from sql/updates/world/2011_04_22_02_world_creature.sql
rename to sql/old/3.3.5a/2011_04_22_02_world_creature.sql
diff --git a/sql/updates/world/2011_04_22_03_world_creatures.sql b/sql/old/3.3.5a/2011_04_22_03_world_creatures.sql
similarity index 100%
rename from sql/updates/world/2011_04_22_03_world_creatures.sql
rename to sql/old/3.3.5a/2011_04_22_03_world_creatures.sql
diff --git a/sql/updates/world/2011_04_22_04_world_conditions.sql b/sql/old/3.3.5a/2011_04_22_04_world_conditions.sql
similarity index 100%
rename from sql/updates/world/2011_04_22_04_world_conditions.sql
rename to sql/old/3.3.5a/2011_04_22_04_world_conditions.sql
diff --git a/sql/updates/world/2011_04_22_05_world_gossips.sql b/sql/old/3.3.5a/2011_04_22_05_world_gossips.sql
similarity index 100%
rename from sql/updates/world/2011_04_22_05_world_gossips.sql
rename to sql/old/3.3.5a/2011_04_22_05_world_gossips.sql
diff --git a/sql/updates/world/2011_04_22_06_world_creatures.sql b/sql/old/3.3.5a/2011_04_22_06_world_creatures.sql
similarity index 100%
rename from sql/updates/world/2011_04_22_06_world_creatures.sql
rename to sql/old/3.3.5a/2011_04_22_06_world_creatures.sql
diff --git a/sql/updates/world/2011_04_22_07_world_script_texts.sql b/sql/old/3.3.5a/2011_04_22_07_world_script_texts.sql
similarity index 100%
rename from sql/updates/world/2011_04_22_07_world_script_texts.sql
rename to sql/old/3.3.5a/2011_04_22_07_world_script_texts.sql
diff --git a/sql/updates/world/2011_04_22_07_world_scriptname.sql b/sql/old/3.3.5a/2011_04_22_07_world_scriptname.sql
similarity index 100%
rename from sql/updates/world/2011_04_22_07_world_scriptname.sql
rename to sql/old/3.3.5a/2011_04_22_07_world_scriptname.sql
diff --git a/sql/updates/world/2011_04_22_07_world_smart_scripts.sql b/sql/old/3.3.5a/2011_04_22_07_world_smart_scripts.sql
similarity index 100%
rename from sql/updates/world/2011_04_22_07_world_smart_scripts.sql
rename to sql/old/3.3.5a/2011_04_22_07_world_smart_scripts.sql
diff --git a/sql/updates/auth_char/2011_04_23_00_characters_corpse.sql b/sql/old/3.3.5a/2011_04_23_00_characters_corpse.sql
similarity index 100%
rename from sql/updates/auth_char/2011_04_23_00_characters_corpse.sql
rename to sql/old/3.3.5a/2011_04_23_00_characters_corpse.sql
diff --git a/sql/updates/world/2011_04_23_00_world_misc.sql b/sql/old/3.3.5a/2011_04_23_00_world_misc.sql
similarity index 100%
rename from sql/updates/world/2011_04_23_00_world_misc.sql
rename to sql/old/3.3.5a/2011_04_23_00_world_misc.sql
diff --git a/sql/updates/auth_char/2011_04_23_01_characters_character_banned.sql b/sql/old/3.3.5a/2011_04_23_01_characters_character_banned.sql
similarity index 100%
rename from sql/updates/auth_char/2011_04_23_01_characters_character_banned.sql
rename to sql/old/3.3.5a/2011_04_23_01_characters_character_banned.sql
diff --git a/sql/updates/world/2011_04_23_01_world_gameobjects.sql b/sql/old/3.3.5a/2011_04_23_01_world_gameobjects.sql
similarity index 100%
rename from sql/updates/world/2011_04_23_01_world_gameobjects.sql
rename to sql/old/3.3.5a/2011_04_23_01_world_gameobjects.sql
diff --git a/sql/updates/world/2011_04_23_02_world_creatures.sql b/sql/old/3.3.5a/2011_04_23_02_world_creatures.sql
similarity index 100%
rename from sql/updates/world/2011_04_23_02_world_creatures.sql
rename to sql/old/3.3.5a/2011_04_23_02_world_creatures.sql
diff --git a/sql/updates/world/2011_04_25_00_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_04_25_00_world_achievement_criteria_data.sql
similarity index 100%
rename from sql/updates/world/2011_04_25_00_world_achievement_criteria_data.sql
rename to sql/old/3.3.5a/2011_04_25_00_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2011_04_25_00_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_04_25_00_world_spell_linked_spell.sql
similarity index 100%
rename from sql/updates/world/2011_04_25_00_world_spell_linked_spell.sql
rename to sql/old/3.3.5a/2011_04_25_00_world_spell_linked_spell.sql
diff --git a/sql/updates/world/2011_04_25_01_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_04_25_01_world_achievement_criteria_data.sql
similarity index 100%
rename from sql/updates/world/2011_04_25_01_world_achievement_criteria_data.sql
rename to sql/old/3.3.5a/2011_04_25_01_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2011_04_27_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_04_27_00_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2011_04_27_00_world_spell_script_names.sql
rename to sql/old/3.3.5a/2011_04_27_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_04_28_00_world_instance_template.sql b/sql/old/3.3.5a/2011_04_28_00_world_instance_template.sql
similarity index 100%
rename from sql/updates/world/2011_04_28_00_world_instance_template.sql
rename to sql/old/3.3.5a/2011_04_28_00_world_instance_template.sql
diff --git a/sql/updates/world/2011_04_28_01_world_creature_equip_template.sql b/sql/old/3.3.5a/2011_04_28_01_world_creature_equip_template.sql
similarity index 100%
rename from sql/updates/world/2011_04_28_01_world_creature_equip_template.sql
rename to sql/old/3.3.5a/2011_04_28_01_world_creature_equip_template.sql
diff --git a/sql/updates/world/2011_04_28_02_world_creature_addon.sql b/sql/old/3.3.5a/2011_04_28_02_world_creature_addon.sql
similarity index 100%
rename from sql/updates/world/2011_04_28_02_world_creature_addon.sql
rename to sql/old/3.3.5a/2011_04_28_02_world_creature_addon.sql
diff --git a/sql/updates/world/2011_04_28_03_world_creature_template_addon.sql b/sql/old/3.3.5a/2011_04_28_03_world_creature_template_addon.sql
similarity index 100%
rename from sql/updates/world/2011_04_28_03_world_creature_template_addon.sql
rename to sql/old/3.3.5a/2011_04_28_03_world_creature_template_addon.sql
diff --git a/sql/updates/world/2011_04_29_00_world_loot_template.sql b/sql/old/3.3.5a/2011_04_29_00_world_loot_template.sql
similarity index 100%
rename from sql/updates/world/2011_04_29_00_world_loot_template.sql
rename to sql/old/3.3.5a/2011_04_29_00_world_loot_template.sql
diff --git a/sql/updates/world/2011_04_30_00_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_04_30_00_world_achievement_criteria_data.sql
similarity index 100%
rename from sql/updates/world/2011_04_30_00_world_achievement_criteria_data.sql
rename to sql/old/3.3.5a/2011_04_30_00_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2011_04_30_01_world_misc.sql b/sql/old/3.3.5a/2011_04_30_01_world_misc.sql
similarity index 100%
rename from sql/updates/world/2011_04_30_01_world_misc.sql
rename to sql/old/3.3.5a/2011_04_30_01_world_misc.sql
diff --git a/sql/updates/world/2011_04_30_02_world_instance_culling_of_stratholme.sql b/sql/old/3.3.5a/2011_04_30_02_world_instance_culling_of_stratholme.sql
similarity index 100%
rename from sql/updates/world/2011_04_30_02_world_instance_culling_of_stratholme.sql
rename to sql/old/3.3.5a/2011_04_30_02_world_instance_culling_of_stratholme.sql
diff --git a/sql/updates/world/2011_04_30_02_world_scriptname.sql b/sql/old/3.3.5a/2011_04_30_02_world_scriptname.sql
similarity index 100%
rename from sql/updates/world/2011_04_30_02_world_scriptname.sql
rename to sql/old/3.3.5a/2011_04_30_02_world_scriptname.sql
diff --git a/sql/updates/world/2011_05_04_00_world_spell_linked_spell.sql b/sql/old/3.3.5a/2011_05_04_00_world_spell_linked_spell.sql
similarity index 100%
rename from sql/updates/world/2011_05_04_00_world_spell_linked_spell.sql
rename to sql/old/3.3.5a/2011_05_04_00_world_spell_linked_spell.sql
diff --git a/sql/updates/world/2011_05_04_01_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_05_04_01_world_spell_proc_event.sql
similarity index 100%
rename from sql/updates/world/2011_05_04_01_world_spell_proc_event.sql
rename to sql/old/3.3.5a/2011_05_04_01_world_spell_proc_event.sql
diff --git a/sql/updates/world/2011_05_05_00_world_command.sql b/sql/old/3.3.5a/2011_05_05_00_world_command.sql
similarity index 100%
rename from sql/updates/world/2011_05_05_00_world_command.sql
rename to sql/old/3.3.5a/2011_05_05_00_world_command.sql
diff --git a/sql/updates/world/2011_05_05_01_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_05_05_01_world_spell_proc_event.sql
similarity index 100%
rename from sql/updates/world/2011_05_05_01_world_spell_proc_event.sql
rename to sql/old/3.3.5a/2011_05_05_01_world_spell_proc_event.sql
diff --git a/sql/updates/world/2011_05_05_02_world_gameobject.sql b/sql/old/3.3.5a/2011_05_05_02_world_gameobject.sql
similarity index 100%
rename from sql/updates/world/2011_05_05_02_world_gameobject.sql
rename to sql/old/3.3.5a/2011_05_05_02_world_gameobject.sql
diff --git a/sql/updates/auth_char/2011_05_06_00_characters_guild_rank.sql b/sql/old/3.3.5a/2011_05_06_00_characters_guild_rank.sql
similarity index 100%
rename from sql/updates/auth_char/2011_05_06_00_characters_guild_rank.sql
rename to sql/old/3.3.5a/2011_05_06_00_characters_guild_rank.sql
diff --git a/sql/updates/world/2011_05_06_00_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_05_06_00_world_spell_proc_event.sql
similarity index 100%
rename from sql/updates/world/2011_05_06_00_world_spell_proc_event.sql
rename to sql/old/3.3.5a/2011_05_06_00_world_spell_proc_event.sql
diff --git a/sql/updates/world/2011_05_06_01_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_05_06_01_world_spell_proc_event.sql
similarity index 100%
rename from sql/updates/world/2011_05_06_01_world_spell_proc_event.sql
rename to sql/old/3.3.5a/2011_05_06_01_world_spell_proc_event.sql
diff --git a/sql/updates/world/2011_05_06_02_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_05_06_02_world_spell_proc_event.sql
similarity index 100%
rename from sql/updates/world/2011_05_06_02_world_spell_proc_event.sql
rename to sql/old/3.3.5a/2011_05_06_02_world_spell_proc_event.sql
diff --git a/sql/updates/world/2011_05_06_03_world_spell_bonus_data.sql b/sql/old/3.3.5a/2011_05_06_03_world_spell_bonus_data.sql
similarity index 100%
rename from sql/updates/world/2011_05_06_03_world_spell_bonus_data.sql
rename to sql/old/3.3.5a/2011_05_06_03_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2011_05_06_04_world_spell_bonus_data.sql b/sql/old/3.3.5a/2011_05_06_04_world_spell_bonus_data.sql
similarity index 100%
rename from sql/updates/world/2011_05_06_04_world_spell_bonus_data.sql
rename to sql/old/3.3.5a/2011_05_06_04_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2011_05_06_05_world_creature_text.sql b/sql/old/3.3.5a/2011_05_06_05_world_creature_text.sql
similarity index 100%
rename from sql/updates/world/2011_05_06_05_world_creature_text.sql
rename to sql/old/3.3.5a/2011_05_06_05_world_creature_text.sql
diff --git a/sql/updates/world/2011_05_06_06_world_spell_script_names.sql b/sql/old/3.3.5a/2011_05_06_06_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2011_05_06_06_world_spell_script_names.sql
rename to sql/old/3.3.5a/2011_05_06_06_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_05_06_07_world_game_event.sql b/sql/old/3.3.5a/2011_05_06_07_world_game_event.sql
similarity index 100%
rename from sql/updates/world/2011_05_06_07_world_game_event.sql
rename to sql/old/3.3.5a/2011_05_06_07_world_game_event.sql
diff --git a/sql/updates/world/2011_05_07_00_world_sai.sql b/sql/old/3.3.5a/2011_05_07_00_world_sai.sql
similarity index 100%
rename from sql/updates/world/2011_05_07_00_world_sai.sql
rename to sql/old/3.3.5a/2011_05_07_00_world_sai.sql
diff --git a/sql/updates/world/2011_05_07_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_05_07_00_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2011_05_07_00_world_spell_script_names.sql
rename to sql/old/3.3.5a/2011_05_07_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_05_07_01_world_game_event.sql b/sql/old/3.3.5a/2011_05_07_01_world_game_event.sql
similarity index 100%
rename from sql/updates/world/2011_05_07_01_world_game_event.sql
rename to sql/old/3.3.5a/2011_05_07_01_world_game_event.sql
diff --git a/sql/updates/world/2011_05_07_02_world_sai.sql b/sql/old/3.3.5a/2011_05_07_02_world_sai.sql
similarity index 100%
rename from sql/updates/world/2011_05_07_02_world_sai.sql
rename to sql/old/3.3.5a/2011_05_07_02_world_sai.sql
diff --git a/sql/updates/world/2011_05_07_03_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_05_07_03_world_achievement_criteria_data.sql
similarity index 100%
rename from sql/updates/world/2011_05_07_03_world_achievement_criteria_data.sql
rename to sql/old/3.3.5a/2011_05_07_03_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2011_05_07_04_world_sai.sql b/sql/old/3.3.5a/2011_05_07_04_world_sai.sql
similarity index 100%
rename from sql/updates/world/2011_05_07_04_world_sai.sql
rename to sql/old/3.3.5a/2011_05_07_04_world_sai.sql
diff --git a/sql/updates/world/2011_05_07_05_world_sai.sql b/sql/old/3.3.5a/2011_05_07_05_world_sai.sql
similarity index 100%
rename from sql/updates/world/2011_05_07_05_world_sai.sql
rename to sql/old/3.3.5a/2011_05_07_05_world_sai.sql
diff --git a/sql/updates/world/2011_05_07_06_world_sai.sql b/sql/old/3.3.5a/2011_05_07_06_world_sai.sql
similarity index 100%
rename from sql/updates/world/2011_05_07_06_world_sai.sql
rename to sql/old/3.3.5a/2011_05_07_06_world_sai.sql
diff --git a/sql/updates/world/2011_05_07_06_world_spell_script_names.sql b/sql/old/3.3.5a/2011_05_07_06_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2011_05_07_06_world_spell_script_names.sql
rename to sql/old/3.3.5a/2011_05_07_06_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_05_07_07_world_creature_text.sql b/sql/old/3.3.5a/2011_05_07_07_world_creature_text.sql
similarity index 100%
rename from sql/updates/world/2011_05_07_07_world_creature_text.sql
rename to sql/old/3.3.5a/2011_05_07_07_world_creature_text.sql
diff --git a/sql/updates/world/2011_05_08_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_05_08_00_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2011_05_08_00_world_spell_script_names.sql
rename to sql/old/3.3.5a/2011_05_08_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_05_08_01_world_spell_script_names.sql b/sql/old/3.3.5a/2011_05_08_01_world_spell_script_names.sql
similarity index 100%
rename from sql/updates/world/2011_05_08_01_world_spell_script_names.sql
rename to sql/old/3.3.5a/2011_05_08_01_world_spell_script_names.sql
diff --git a/sql/updates/auth_char/2011_05_09_00_characters_character_stats.sql b/sql/old/3.3.5a/2011_05_09_00_characters_character_stats.sql
similarity index 100%
rename from sql/updates/auth_char/2011_05_09_00_characters_character_stats.sql
rename to sql/old/3.3.5a/2011_05_09_00_characters_character_stats.sql
diff --git a/sql/updates/world/2011_05_09_00_world_trinity_string.sql b/sql/old/3.3.5a/2011_05_09_00_world_trinity_string.sql
similarity index 100%
rename from sql/updates/world/2011_05_09_00_world_trinity_string.sql
rename to sql/old/3.3.5a/2011_05_09_00_world_trinity_string.sql
diff --git a/sql/updates/world/2011_05_09_01_world_creature_template.sql b/sql/old/3.3.5a/2011_05_09_01_world_creature_template.sql
similarity index 100%
rename from sql/updates/world/2011_05_09_01_world_creature_template.sql
rename to sql/old/3.3.5a/2011_05_09_01_world_creature_template.sql
diff --git a/sql/updates/world/2011_05_09_02_world_version.sql b/sql/updates/world/2011_05_09_02_world_version.sql
new file mode 100644
index 00000000000..af8eb81c037
--- /dev/null
+++ b/sql/updates/world/2011_05_09_02_world_version.sql
@@ -0,0 +1 @@
+UPDATE `version` SET `db_version`='TDB 335.11.40' LIMIT 1;