204 files changed, 2087 insertions, 3909 deletions

diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt
index b83b2f09f58..0ea35a6b201 100644
--- a/src/bindings/scripts/CMakeLists.txt
+++ b/src/bindings/scripts/CMakeLists.txt
@@ -281,12 +281,210 @@ SET(trinityscript_LIB_SRCS
    scripts/kalimdor/thunder_bluff.cpp
    scripts/kalimdor/ungoro_crater.cpp
    scripts/kalimdor/winterspring.cpp
+   scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
+   scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
+   scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp
+   scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp
+   scripts/northrend/azjol_nerub/azjol_nerub/def_azjol_nerub.h
+   scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
+   scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
+   scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
+   scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+   scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
+   scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp
+   scripts/northrend/azjol_nerub/ahnkahet/def_ahnkahet.h
+   scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp
+   scripts/northrend/draktharon_keep/boss_trollgore.cpp
+   scripts/northrend/draktharon_keep/boss_novos.cpp
+   scripts/northrend/draktharon_keep/boss_dred.cpp
+   scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
+   scripts/northrend/draktharon_keep/def_drak_tharon_keep.h
+   scripts/northrend/gundrak/instance_gundrak.cpp
+   scripts/northrend/gundrak/boss_slad_ran.cpp
+   scripts/northrend/gundrak/boss_moorabi.cpp
+   scripts/northrend/gundrak/boss_drakkari_colossus.cpp
+   scripts/northrend/gundrak/boss_gal_darah.cpp
+   scripts/northrend/gundrak/boss_eck.cpp
+   scripts/northrend/gundrak/def_gundrak.h
+   scripts/northrend/naxxramas/boss_anubrekhan.cpp
+   scripts/northrend/naxxramas/boss_faerlina.cpp
+   scripts/northrend/naxxramas/boss_gluth.cpp
+   scripts/northrend/naxxramas/boss_gothik.cpp
+   scripts/northrend/naxxramas/boss_grobbulus.cpp
+   scripts/northrend/naxxramas/boss_heigan.cpp
+   scripts/northrend/naxxramas/boss_kelthuzad.cpp
+   scripts/northrend/naxxramas/boss_four_horsemen.cpp
+   scripts/northrend/naxxramas/boss_loatheb.cpp
+   scripts/northrend/naxxramas/boss_maexxna.cpp
+   scripts/northrend/naxxramas/boss_noth.cpp
+   scripts/northrend/naxxramas/boss_patchwerk.cpp
+   scripts/northrend/naxxramas/boss_razuvious.cpp
+   scripts/northrend/naxxramas/boss_sapphiron.cpp
+   scripts/northrend/naxxramas/boss_thaddius.cpp
+   scripts/northrend/naxxramas/def_naxxramas.h
+   scripts/northrend/naxxramas/instance_naxxramas.cpp
+   scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
+   scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp
+   scripts/northrend/nexus/eye_of_eternity/def_eye_of_eternity.h
+   scripts/northrend/nexus/nexus/instance_nexus.cpp
+   scripts/northrend/nexus/nexus/boss_magus_telestra.cpp
+   scripts/northrend/nexus/nexus/boss_anomalus.cpp
+   scripts/northrend/nexus/nexus/boss_ormorok.cpp
+   scripts/northrend/nexus/nexus/boss_keristrasza.cpp
+   scripts/northrend/nexus/nexus/commander_stoutbeard.cpp
+   scripts/northrend/nexus/nexus/commander_kolurg.cpp
+   scripts/northrend/nexus/nexus/def_nexus.h
+   scripts/northrend/nexus/oculus/instance_oculus.cpp
+   scripts/northrend/nexus/oculus/boss_drakos.cpp
+   scripts/northrend/nexus/oculus/boss_urom.cpp
+   scripts/northrend/nexus/oculus/boss_varos.cpp
+   scripts/northrend/nexus/oculus/boss_eregos.cpp
+   scripts/northrend/nexus/oculus/def_oculus.h
+   scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp
+   scripts/northrend/obsidian_sanctum/boss_sartharion.cpp
+   scripts/northrend/obsidian_sanctum/def_obsidian_sanctum.h
+   scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
+   scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
+   scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp
+   scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
+   scripts/northrend/ulduar/halls_of_stone/def_halls_of_stone.h
+   scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
+   scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp
+   scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp
+   scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
+   scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp
+   scripts/northrend/ulduar/halls_of_lightning/def_halls_of_lightning.h
+   scripts/northrend/ulduar/ulduar/boss_algalon.cpp
+   scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp
+   scripts/northrend/ulduar/ulduar/boss_auriaya.cpp
+   scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp
+   scripts/northrend/ulduar/ulduar/boss_freya.cpp
+   scripts/northrend/ulduar/ulduar/boss_general_vezax.cpp
+   scripts/northrend/ulduar/ulduar/boss_hodir.cpp
+   scripts/northrend/ulduar/ulduar/boss_ignis.cpp
+   scripts/northrend/ulduar/ulduar/boss_kologarn.cpp
+   scripts/northrend/ulduar/ulduar/boss_mimiron.cpp
+   scripts/northrend/ulduar/ulduar/boss_razorscale.cpp
+   scripts/northrend/ulduar/ulduar/boss_thorim.cpp
+   scripts/northrend/ulduar/ulduar/boss_xt002.cpp
+   scripts/northrend/ulduar/ulduar/boss_yoggsaron.cpp
+   scripts/northrend/ulduar/ulduar/def_ulduar.h
+   scripts/northrend/ulduar/ulduar/instance_ulduar.cpp
+   scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
+   scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp
+   scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
+   scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
+   scripts/northrend/utgarde_keep/utgarde_keep/def_utgarde_keep.h
+   scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp
+   scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
+   scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
+   scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
+   scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
+   scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
+   scripts/northrend/utgarde_keep/utgarde_pinnacle/def_pinnacle.h
+   scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp
+   scripts/northrend/vault_of_archavon/boss_archavon.cpp
+   scripts/northrend/vault_of_archavon/boss_emalon.cpp
+   scripts/northrend/vault_of_archavon/def_vault_of_archavon.h
+   scripts/northrend/violet_hold/instance_violet_hold.cpp
+   scripts/northrend/violet_hold/boss_cyanigosa.cpp
+   scripts/northrend/violet_hold/boss_erekem.cpp
+   scripts/northrend/violet_hold/boss_ichoron.cpp
+   scripts/northrend/violet_hold/boss_lavanthor.cpp
+   scripts/northrend/violet_hold/boss_moragg.cpp
+   scripts/northrend/violet_hold/boss_xevozz.cpp
+   scripts/northrend/violet_hold/boss_zuramat.cpp
+   scripts/northrend/violet_hold/def_violet_hold.h
    scripts/northrend/borean_tundra.cpp
    scripts/northrend/dragonblight.cpp
    scripts/northrend/grizzly_hills.cpp
    scripts/northrend/icecrown.cpp
    scripts/northrend/sholazar_basin.cpp
+   scripts/northrend/wintergrasp.cpp
    scripts/northrend/zuldrak.cpp
+   scripts/outland/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
+   scripts/outland/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
+   scripts/outland/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
+   scripts/outland/aunchindoun/mana_tombs/boss_pandemonius.cpp
+   scripts/outland/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp
+   scripts/outland/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
+   scripts/outland/aunchindoun/sethekk_halls/def_sethekk_halls.h
+   scripts/outland/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp
+   scripts/outland/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
+   scripts/outland/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
+   scripts/outland/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
+   scripts/outland/aunchindoun/shadow_labyrinth/boss_murmur.cpp
+   scripts/outland/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h
+   scripts/outland/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
+   scripts/outland/black_temple/black_temple.cpp
+   scripts/outland/black_temple/boss_bloodboil.cpp
+   scripts/outland/black_temple/boss_illidan.cpp
+   scripts/outland/black_temple/boss_mother_shahraz.cpp
+   scripts/outland/black_temple/boss_reliquary_of_souls.cpp
+   scripts/outland/black_temple/boss_shade_of_akama.cpp
+   scripts/outland/black_temple/boss_supremus.cpp
+   scripts/outland/black_temple/boss_teron_gorefiend.cpp
+   scripts/outland/black_temple/boss_warlord_najentus.cpp
+   scripts/outland/black_temple/def_black_temple.h
+   scripts/outland/black_temple/illidari_council.cpp
+   scripts/outland/black_temple/instance_black_temple.cpp
+   scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
+   scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
+   scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
+   scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
+   scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
+   scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
+   scripts/outland/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h
+   scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
+   scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
+   scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
+   scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
+   scripts/outland/coilfang_resevoir/steam_vault/def_steam_vault.h
+   scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
+   scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp
+   scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
+   scripts/outland/gruuls_lair/boss_gruul.cpp
+   scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
+   scripts/outland/gruuls_lair/def_gruuls_lair.h
+   scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
+   scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
+   scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
+   scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
+   scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
+   scripts/outland/hellfire_citadel/blood_furnace/def_blood_furnace.h
+   scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
+   scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
+   scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
+   scripts/outland/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h
+   scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
+   scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
+   scripts/outland/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h
+   scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
+   scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
+   scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
+   scripts/outland/hellfire_citadel/shattered_halls/def_shattered_halls.h
+   scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
+   scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
+   scripts/outland/tempest_keep/arcatraz/arcatraz.cpp
+   scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
+   scripts/outland/tempest_keep/arcatraz/def_arcatraz.h
+   scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
+   scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
+   scripts/outland/tempest_keep/botanica/boss_laj.cpp
+   scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp
+   scripts/outland/tempest_keep/the_eye/boss_alar.cpp
+   scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
+   scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
+   scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
+   scripts/outland/tempest_keep/the_eye/def_the_eye.h
+   scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
+   scripts/outland/tempest_keep/the_eye/the_eye.cpp
+   scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp
+   scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
+   scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
+   scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
+   scripts/outland/tempest_keep/the_mechanar/def_mechanar.h
+   scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
    scripts/outland/blades_edge_mountains.cpp
    scripts/outland/boss_doomlord_kazzak.cpp
    scripts/outland/boss_doomwalker.cpp
@@ -297,204 +495,6 @@ SET(trinityscript_LIB_SRCS
    scripts/outland/shattrath_city.cpp
    scripts/outland/terokkar_forest.cpp
    scripts/outland/zangarmarsh.cpp
-   scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
-   scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
-   scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
-   scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp
-   scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp
-   scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
-   scripts/zone/aunchindoun/sethekk_halls/def_sethekk_halls.h
-   scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp
-   scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
-   scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
-   scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
-   scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp
-   scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h
-   scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
-   scripts/zone/black_temple/black_temple.cpp
-   scripts/zone/black_temple/boss_bloodboil.cpp
-   scripts/zone/black_temple/boss_illidan.cpp
-   scripts/zone/black_temple/boss_mother_shahraz.cpp
-   scripts/zone/black_temple/boss_reliquary_of_souls.cpp
-   scripts/zone/black_temple/boss_shade_of_akama.cpp
-   scripts/zone/black_temple/boss_supremus.cpp
-   scripts/zone/black_temple/boss_teron_gorefiend.cpp
-   scripts/zone/black_temple/boss_warlord_najentus.cpp
-   scripts/zone/black_temple/def_black_temple.h
-   scripts/zone/black_temple/illidari_council.cpp
-   scripts/zone/black_temple/instance_black_temple.cpp
-   scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
-   scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
-   scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
-   scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
-   scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
-   scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
-   scripts/zone/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h
-   scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
-   scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
-   scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
-   scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
-   scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h
-   scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
-   scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp
-   scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
-   scripts/zone/gruuls_lair/boss_gruul.cpp
-   scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp
-   scripts/zone/gruuls_lair/def_gruuls_lair.h
-   scripts/zone/gruuls_lair/instance_gruuls_lair.cpp
-   scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp
-   scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
-   scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp
-   scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
-   scripts/zone/hellfire_citadel/blood_furnace/def_blood_furnace.h
-   scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
-   scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
-   scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
-   scripts/zone/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h
-   scripts/zone/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
-   scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
-   scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h
-   scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
-   scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
-   scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
-   scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h
-   scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
-   scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
-   scripts/zone/naxxramas/boss_anubrekhan.cpp
-   scripts/zone/naxxramas/boss_faerlina.cpp
-   scripts/zone/naxxramas/boss_gluth.cpp
-   scripts/zone/naxxramas/boss_gothik.cpp
-   scripts/zone/naxxramas/boss_grobbulus.cpp
-   scripts/zone/naxxramas/boss_heigan.cpp
-   scripts/zone/naxxramas/boss_kelthuzad.cpp
-   scripts/zone/naxxramas/boss_four_horsemen.cpp
-   scripts/zone/naxxramas/boss_loatheb.cpp
-   scripts/zone/naxxramas/boss_maexxna.cpp
-   scripts/zone/naxxramas/boss_noth.cpp
-   scripts/zone/naxxramas/boss_patchwerk.cpp
-   scripts/zone/naxxramas/boss_razuvious.cpp
-   scripts/zone/naxxramas/boss_sapphiron.cpp
-   scripts/zone/naxxramas/boss_thaddius.cpp
-   scripts/zone/naxxramas/def_naxxramas.h
-   scripts/zone/naxxramas/instance_naxxramas.cpp
-   scripts/zone/tempest_keep/arcatraz/arcatraz.cpp
-   scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
-   scripts/zone/tempest_keep/arcatraz/def_arcatraz.h
-   scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp
-   scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
-   scripts/zone/tempest_keep/botanica/boss_laj.cpp
-   scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp
-   scripts/zone/tempest_keep/the_eye/boss_alar.cpp
-   scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp
-   scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp
-   scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp
-   scripts/zone/tempest_keep/the_eye/def_the_eye.h
-   scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp
-   scripts/zone/tempest_keep/the_eye/the_eye.cpp
-   scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp
-   scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
-   scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
-   scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
-   scripts/zone/tempest_keep/the_mechanar/def_mechanar.h
-   scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp
-   scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
-   scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp
-   scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
-   scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
-   scripts/zone/utgarde_keep/utgarde_keep/def_utgarde_keep.h
-   scripts/zone/utgarde_keep/utgarde_keep/utgarde_keep.cpp
-   scripts/zone/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
-   scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
-   scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
-   scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
-   scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
-   scripts/zone/utgarde_keep/utgarde_pinnacle/def_pinnacle.h
-   scripts/zone/nexus/nexus/instance_nexus.cpp
-   scripts/zone/nexus/nexus/boss_magus_telestra.cpp
-   scripts/zone/nexus/nexus/boss_anomalus.cpp
-   scripts/zone/nexus/nexus/boss_ormorok.cpp
-   scripts/zone/nexus/nexus/boss_keristrasza.cpp
-   scripts/zone/nexus/nexus/commander_stoutbeard.cpp
-   scripts/zone/nexus/nexus/commander_kolurg.cpp
-   scripts/zone/nexus/nexus/def_nexus.h
-   scripts/zone/nexus/oculus/instance_oculus.cpp
-   scripts/zone/nexus/oculus/boss_drakos.cpp
-   scripts/zone/nexus/oculus/boss_urom.cpp
-   scripts/zone/nexus/oculus/boss_varos.cpp
-   scripts/zone/nexus/oculus/boss_eregos.cpp
-   scripts/zone/nexus/oculus/def_oculus.h
-   scripts/zone/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
-   scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
-   scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp
-   scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp
-   scripts/zone/azjol_nerub/azjol_nerub/def_azjol_nerub.h
-   scripts/zone/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
-   scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
-   scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
-   scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
-   scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
-   scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp
-   scripts/zone/azjol_nerub/ahnkahet/def_ahnkahet.h
-   scripts/zone/draktharon_keep/instance_drak_tharon_keep.cpp
-   scripts/zone/draktharon_keep/boss_trollgore.cpp
-   scripts/zone/draktharon_keep/boss_novos.cpp
-   scripts/zone/draktharon_keep/boss_dred.cpp
-   scripts/zone/draktharon_keep/boss_tharon_ja.cpp
-   scripts/zone/draktharon_keep/def_drak_tharon_keep.h
-   scripts/zone/violet_hold/instance_violet_hold.cpp
-   scripts/zone/violet_hold/boss_cyanigosa.cpp
-   scripts/zone/violet_hold/boss_erekem.cpp
-   scripts/zone/violet_hold/boss_ichoron.cpp
-   scripts/zone/violet_hold/boss_lavanthor.cpp
-   scripts/zone/violet_hold/boss_moragg.cpp
-   scripts/zone/violet_hold/boss_xevozz.cpp
-   scripts/zone/violet_hold/boss_zuramat.cpp
-   scripts/zone/violet_hold/def_violet_hold.h
-   scripts/zone/gundrak/instance_gundrak.cpp
-   scripts/zone/gundrak/boss_slad_ran.cpp
-   scripts/zone/gundrak/boss_moorabi.cpp
-   scripts/zone/gundrak/boss_drakkari_colossus.cpp
-   scripts/zone/gundrak/boss_gal_darah.cpp
-   scripts/zone/gundrak/boss_eck.cpp
-   scripts/zone/gundrak/def_gundrak.h
-   scripts/zone/ulduar/halls_of_stone/instance_halls_of_stone.cpp
-   scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
-   scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp
-   scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp
-   scripts/zone/ulduar/halls_of_stone/def_halls_of_stone.h
-   scripts/zone/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
-   scripts/zone/ulduar/halls_of_lightning/boss_bjarngrim.cpp
-   scripts/zone/ulduar/halls_of_lightning/boss_ionar.cpp
-   scripts/zone/ulduar/halls_of_lightning/boss_volkhan.cpp
-   scripts/zone/ulduar/halls_of_lightning/boss_loken.cpp
-   scripts/zone/ulduar/halls_of_lightning/def_halls_of_lightning.h
-   scripts/zone/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
-   scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp
-   scripts/zone/nexus/eye_of_eternity/def_eye_of_eternity.h
-   scripts/zone/obsidian_sanctum/instance_obsidian_sanctum.cpp
-   scripts/zone/obsidian_sanctum/boss_sartharion.cpp
-   scripts/zone/obsidian_sanctum/def_obsidian_sanctum.h
-   scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp
-   scripts/zone/vault_of_archavon/boss_archavon.cpp
-   scripts/zone/vault_of_archavon/boss_emalon.cpp
-   scripts/zone/vault_of_archavon/def_vault_of_archavon.h
-   scripts/zone/wintergrasp/wintergrasp.cpp
-   scripts/zone/ulduar/ulduar/boss_algalon.cpp
-   scripts/zone/ulduar/ulduar/boss_assembly_of_iron.cpp
-   scripts/zone/ulduar/ulduar/boss_auriaya.cpp
-   scripts/zone/ulduar/ulduar/boss_flame_leviathan.cpp
-   scripts/zone/ulduar/ulduar/boss_freya.cpp
-   scripts/zone/ulduar/ulduar/boss_general_vezax.cpp
-   scripts/zone/ulduar/ulduar/boss_hodir.cpp
-   scripts/zone/ulduar/ulduar/boss_ignis.cpp
-   scripts/zone/ulduar/ulduar/boss_kologarn.cpp
-   scripts/zone/ulduar/ulduar/boss_mimiron.cpp
-   scripts/zone/ulduar/ulduar/boss_razorscale.cpp
-   scripts/zone/ulduar/ulduar/boss_thorim.cpp
-   scripts/zone/ulduar/ulduar/boss_xt002.cpp
-   scripts/zone/ulduar/ulduar/boss_yoggsaron.cpp
-   scripts/zone/ulduar/ulduar/def_ulduar.h
-   scripts/zone/ulduar/ulduar/instance_ulduar.cpp
    scripts/world/areatrigger_scripts.cpp
    scripts/world/boss_emeriss.cpp
    scripts/world/boss_lethon.cpp
diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
index 00b918bd22e..3136b5d6adc 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -1585,1070 +1585,1030 @@
             <Filter
                 Name="northrend"
                 >
-                <File
-                    RelativePath="..\scripts\northrend\borean_tundra.cpp"
+                <Filter
+                    Name="Azjol-Nerub"
                     >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\dragonblight.cpp"
+                    <Filter
+                        Name="Ahn&apos;kahet"
+                        >
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\boss_amanitar.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\boss_elder_nadox.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\boss_herald_volazj.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\boss_jedoga_shadowseeker.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\boss_prince_taldaram.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\def_ahnkahet.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\instance_ahnkahet.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Azjol-Nerub"
+                        >
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\boss_anubarak.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\boss_hadronox.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\boss_krikthir_the_gatewatcher.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\def_azjol_nerub.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\instance_azjol_nerub.cpp"
+                            >
+                        </File>
+                    </Filter>
+                </Filter>
+                <Filter
+                    Name="Drak&apos;Tharon Keep"
                     >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\grizzly_hills.cpp"
+                    <File
+                        RelativePath="..\scripts\northrend\draktharon_keep\boss_dred.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\draktharon_keep\boss_novos.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\draktharon_keep\boss_tharon_ja.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\draktharon_keep\boss_trollgore.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\draktharon_keep\def_drak_tharon_keep.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\draktharon_keep\instance_drak_tharon_keep.cpp"
+                        >
+                    </File>
+                </Filter>
+                <Filter
+                    Name="Gundrak"
                     >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\icecrown.cpp"
+                    <File
+                        RelativePath="..\scripts\northrend\gundrak\boss_drakkari_colossus.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\gundrak\boss_eck.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\gundrak\boss_gal_darah.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\gundrak\boss_moorabi.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\gundrak\boss_slad_ran.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\gundrak\def_gundrak.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\gundrak\instance_gundrak.cpp"
+                        >
+                    </File>
+                </Filter>
+                <Filter
+                    Name="Naxxramas"
                     >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\sholazar_basin.cpp"
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_anubrekhan.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_faerlina.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_four_horsemen.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_gluth.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_gothik.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_grobbulus.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_heigan.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_kelthuzad.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_loatheb.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_maexxna.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_noth.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_patchwerk.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_razuvious.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_sapphiron.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\boss_thaddius.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\def_naxxramas.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\naxxramas\instance_naxxramas.cpp"
+                        >
+                    </File>
+                </Filter>
+                <Filter
+                    Name="Nexus"
                     >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\zuldrak.cpp"
+                    <Filter
+                        Name="Nexus"
+                        >
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\boss_anomalus.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\boss_keristrasza.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\boss_magus_telestra.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\boss_ormorok.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\commander_kolurg.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\commander_stoutbeard.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\def_nexus.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\instance_nexus.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Oculus"
+                        >
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\oculus\boss_drakos.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\oculus\boss_eregos.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\oculus\boss_urom.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\oculus\boss_varos.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\oculus\def_oculus.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\oculus\instance_oculus.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Eye of Eternity"
+                        >
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\eye_of_eternity\boss_malygos.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\eye_of_eternity\def_eye_of_eternity.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\eye_of_eternity\instance_eye_of_eternity.cpp"
+                            >
+                        </File>
+                    </Filter>
+                </Filter>
+                <Filter
+                    Name="Obsidian Sanctum"
                     >
-                </File>
-            </Filter>
-            <Filter
-                Name="outland"
-                >
-                <File
-                    RelativePath="..\scripts\outland\blades_edge_mountains.cpp"
+                    <File
+                        RelativePath="..\scripts\northrend\obsidian_sanctum\boss_sartharion.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\obsidian_sanctum\def_obsidian_sanctum.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\obsidian_sanctum\instance_obsidian_sanctum.cpp"
+                        >
+                    </File>
+                </Filter>
+                <Filter
+                    Name="Ulduar"
                     >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\boss_doomlord_kazzak.cpp"
+                    <Filter
+                        Name="Halls of Stone"
+                        >
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_stone\boss_krystallus.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_stone\boss_maiden_of_grief.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_stone\boss_sjonnir.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_stone\def_halls_of_stone.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_stone\instance_halls_of_stone.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Halls of Lightning"
+                        >
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\boss_bjarngrim.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\boss_ionar.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\boss_loken.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\boss_volkhan.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\def_halls_of_lightning.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\instance_halls_of_lightning.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Ulduar"
+                        >
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_algalon.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_assembly_of_iron.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_auriaya.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_flame_leviathan.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_freya.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_general_vezax.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_hodir.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_ignis.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_kologarn.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_mimiron.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_razorscale.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_thorim.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_xt002.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_yoggsaron.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\def_ulduar.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\instance_ulduar.cpp"
+                            >
+                        </File>
+                    </Filter>
+                </Filter>
+                <Filter
+                    Name="Utgarde Keep"
                     >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\boss_doomwalker.cpp"
+                    <Filter
+                        Name="Utgarde Keep"
+                        >
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\boss_ingvar_the_plunderer.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\boss_keleseth.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\boss_skarvald_dalronn.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\def_utgarde_keep.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\instance_utgarde_keep.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\utgarde_keep.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Utgarde Pinnacle"
+                        >
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_palehoof.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_skadi.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_svala.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_ymiron.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\def_pinnacle.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\instance_pinnacle.cpp"
+                            >
+                        </File>
+                    </Filter>
+                </Filter>
+                <Filter
+                    Name="Vault of Archavon"
                     >
-                </File>
+                    <File
+                        RelativePath="..\scripts\northrend\vault_of_archavon\boss_archavon.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\vault_of_archavon\boss_emalon.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\vault_of_archavon\def_vault_of_archavon.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\vault_of_archavon\instance_vault_of_archavon.cpp"
+                        >
+                    </File>
+                </Filter>
+                <Filter
+                    Name="Violet Hold"
+                    >
+                    <File
+                        RelativePath="..\scripts\northrend\violet_hold\boss_cyanigosa.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\violet_hold\boss_erekem.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\violet_hold\boss_ichoron.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\violet_hold\boss_lavanthor.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\violet_hold\boss_moragg.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\violet_hold\boss_xevozz.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\violet_hold\boss_zuramat.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\violet_hold\def_violet_hold.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\northrend\violet_hold\instance_violet_hold.cpp"
+                        >
+                    </File>
+                </Filter>
                 <File
-                    RelativePath="..\scripts\outland\hellfire_peninsula.cpp"
+                    RelativePath="..\scripts\northrend\borean_tundra.cpp"
                     >
                 </File>
                 <File
-                    RelativePath="..\scripts\outland\nagrand.cpp"
+                    RelativePath="..\scripts\northrend\dragonblight.cpp"
                     >
                 </File>
                 <File
-                    RelativePath="..\scripts\outland\netherstorm.cpp"
+                    RelativePath="..\scripts\northrend\grizzly_hills.cpp"
                     >
                 </File>
                 <File
-                    RelativePath="..\scripts\outland\shadowmoon_valley.cpp"
+                    RelativePath="..\scripts\northrend\icecrown.cpp"
                     >
                 </File>
                 <File
-                    RelativePath="..\scripts\outland\shattrath_city.cpp"
+                    RelativePath="..\scripts\northrend\sholazar_basin.cpp"
                     >
                 </File>
                 <File
-                    RelativePath="..\scripts\outland\terokkar_forest.cpp"
+                    RelativePath="..\scripts\northrend\wintergrasp.cpp"
                     >
                 </File>
                 <File
-                    RelativePath="..\scripts\outland\zangarmarsh.cpp"
+                    RelativePath="..\scripts\northrend\zuldrak.cpp"
                     >
                 </File>
             </Filter>
             <Filter
-                Name="zone"
+                Name="outland"
                 >
                 <Filter
-                    Name="Outland"
+                    Name="Aunchindoun"
                     >
                     <Filter
-                        Name="Gruul&apos;s Lair"
+                        Name="Auchenai Crypts"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\auchenai_crypts\boss_exarch_maladaar.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\auchenai_crypts\boss_shirrak_the_dead_watcher.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Mana Tombs"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\mana_tombs\boss_nexusprince_shaffar.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\mana_tombs\boss_pandemonius.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Sethekk Halls"
                         >
                         <File
-                            RelativePath="..\scripts\zone\gruuls_lair\boss_gruul.cpp"
+                            RelativePath="..\scripts\outland\aunchindoun\sethekk_halls\boss_darkweaver_syth.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\gruuls_lair\boss_high_king_maulgar.cpp"
+                            RelativePath="..\scripts\outland\aunchindoun\sethekk_halls\boss_tailonking_ikiss.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\gruuls_lair\def_gruuls_lair.h"
+                            RelativePath="..\scripts\outland\aunchindoun\sethekk_halls\def_sethekk_halls.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\gruuls_lair\instance_gruuls_lair.cpp"
+                            RelativePath="..\scripts\outland\aunchindoun\sethekk_halls\instance_sethekk_halls.cpp"
                             >
                         </File>
                     </Filter>
                     <Filter
-                        Name="Hellfire Citadel"
-                        >
-                        <Filter
-                            Name="Blood Furnace"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\boss_broggok.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\boss_kelidan_the_breaker.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\boss_the_maker.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\def_blood_furnace.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\instance_blood_furnace.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Magtheridon&apos;s lair"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\magtheridons_lair\boss_magtheridon.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\magtheridons_lair\def_magtheridons_lair.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\magtheridons_lair\instance_magtheridons_lair.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Hellfire Ramparts"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\boss_omor_the_unscarred.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\boss_vazruden_the_herald.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\boss_watchkeeper_gargolmar.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\def_hellfire_ramparts.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\instance_hellfire_ramparts.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Shattered Halls"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\boss_nethekurse.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\boss_warbringer_omrogg.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\boss_warchief_kargath_bladefist.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\def_shattered_halls.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\instance_shattered_halls.cpp"
-                                >
-                            </File>
-                        </Filter>
+                        Name="Shadow Labyrinth"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\boss_ambassador_hellmaw.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\boss_blackheart_the_inciter.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\boss_grandmaster_vorpil.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\boss_murmur.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\def_shadow_labyrinth.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\instance_shadow_labyrinth.cpp"
+                            >
+                        </File>
+                    </Filter>
+                </Filter>
+                <Filter
+                    Name="Black Temple"
+                    >
+                    <File
+                        RelativePath="..\scripts\outland\black_temple\black_temple.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\outland\black_temple\boss_bloodboil.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\outland\black_temple\boss_illidan.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\outland\black_temple\boss_mother_shahraz.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\outland\black_temple\boss_reliquary_of_souls.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\outland\black_temple\boss_shade_of_akama.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\outland\black_temple\boss_supremus.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\outland\black_temple\boss_teron_gorefiend.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\outland\black_temple\boss_warlord_najentus.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\outland\black_temple\def_black_temple.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\outland\black_temple\illidari_council.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\outland\black_temple\instance_black_temple.cpp"
+                        >
+                    </File>
+                </Filter>
+                <Filter
+                    Name="Coilfang Resevoir"
+                    >
+                    <Filter
+                        Name="Serpent Shrine Cavern"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\boss_fathomlord_karathress.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\boss_hydross_the_unstable.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\boss_lady_vashj.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\boss_leotheras_the_blind.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\boss_lurker_below.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\boss_morogrim_tidewalker.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\def_serpent_shrine.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\instance_serpent_shrine.cpp"
+                            >
+                        </File>
                     </Filter>
                     <Filter
-                        Name="Tempest Keep"
-                        >
-                        <Filter
-                            Name="Arcatraz"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\arcatraz\arcatraz.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\arcatraz\boss_harbinger_skyriss.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\arcatraz\def_arcatraz.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\arcatraz\instance_arcatraz.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Botanica"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\botanica\boss_high_botanist_freywinn.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\botanica\boss_laj.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\botanica\boss_warp_splinter.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="The Eye"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_alar.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_astromancer.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_kaelthas.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_void_reaver.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_eye\def_the_eye.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_eye\instance_the_eye.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_eye\the_eye.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="The Mechanar"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_mechanar\boss_gatewatcher_gyrokill.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_mechanar\boss_gatewatcher_ironhand.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_mechanar\boss_nethermancer_sepethrea.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_mechanar\boss_pathaleon_the_calculator.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_mechanar\def_mechanar.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_mechanar\instance_mechanar.cpp"
-                                >
-                            </File>
-                        </Filter>
+                        Name="Steam Vault"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\boss_hydromancer_thespia.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\boss_mekgineer_steamrigger.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\boss_warlord_kalithresh.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\def_steam_vault.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\instance_steam_vault.cpp"
+                            >
+                        </File>
                     </Filter>
                     <Filter
-                        Name="Coilfang Resevoir"
-                        >
-                        <Filter
-                            Name="Serpent Shrine Cavern"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_fathomlord_karathress.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_hydross_the_unstable.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_lady_vashj.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_leotheras_the_blind.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_lurker_below.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_morogrim_tidewalker.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\def_serpent_shrine.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\instance_serpent_shrine.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Slave Pens"
-                            >
-                        </Filter>
-                        <Filter
-                            Name="Steam Vault"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\boss_hydromancer_thespia.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\boss_mekgineer_steamrigger.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\boss_warlord_kalithresh.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\def_steam_vault.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\instance_steam_vault.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Underbog"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\underbog\boss_hungarfen.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\underbog\boss_the_black_stalker.cpp"
-                                >
-                            </File>
-                        </Filter>
+                        Name="Underbog"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\underbog\boss_hungarfen.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\underbog\boss_the_black_stalker.cpp"
+                            >
+                        </File>
                     </Filter>
+                </Filter>
+                <Filter
+                    Name="Gruul&apos;s Lair"
+                    >
+                    <File
+                        RelativePath="..\scripts\outland\gruuls_lair\boss_gruul.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\outland\gruuls_lair\boss_high_king_maulgar.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\outland\gruuls_lair\def_gruuls_lair.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\outland\gruuls_lair\instance_gruuls_lair.cpp"
+                        >
+                    </File>
+                </Filter>
+                <Filter
+                    Name="Hellfire Citadel"
+                    >
                     <Filter
-                        Name="Aunchindoun"
-                        >
-                        <Filter
-                            Name="Auchenai Crypts"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\auchenai_crypts\boss_exarch_maladaar.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\auchenai_crypts\boss_shirrak_the_dead_watcher.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Mana Tombs"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\mana_tombs\boss_nexusprince_shaffar.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\mana_tombs\boss_pandemonius.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Sethekk Halls"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\sethekk_halls\boss_darkweaver_syth.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\sethekk_halls\boss_tailonking_ikiss.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\sethekk_halls\def_sethekk_halls.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\sethekk_halls\instance_sethekk_halls.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Shadow Labyrinth"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\boss_ambassador_hellmaw.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\boss_blackheart_the_inciter.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\boss_grandmaster_vorpil.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\boss_murmur.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\def_shadow_labyrinth.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\instance_shadow_labyrinth.cpp"
-                                >
-                            </File>
-                        </Filter>
+                        Name="Blood Furnace"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\boss_broggok.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\boss_kelidan_the_breaker.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\boss_the_maker.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\def_blood_furnace.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\instance_blood_furnace.cpp"
+                            >
+                        </File>
                     </Filter>
                     <Filter
-                        Name="Black Temple"
+                        Name="Magtheridon&apos;s lair"
                         >
                         <File
-                            RelativePath="..\scripts\zone\black_temple\black_temple.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\boss_magtheridon.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\def_magtheridons_lair.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_bloodboil.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\instance_magtheridons_lair.cpp"
                             >
                         </File>
+                    </Filter>
+                    <Filter
+                        Name="Hellfire Ramparts"
+                        >
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_illidan.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\boss_omor_the_unscarred.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_mother_shahraz.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\boss_vazruden_the_herald.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_reliquary_of_souls.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\boss_watchkeeper_gargolmar.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_shade_of_akama.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\def_hellfire_ramparts.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_supremus.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\instance_hellfire_ramparts.cpp"
                             >
                         </File>
+                    </Filter>
+                    <Filter
+                        Name="Shattered Halls"
+                        >
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_teron_gorefiend.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\boss_nethekurse.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_warlord_najentus.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\boss_warbringer_omrogg.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\def_black_temple.h"
+                            RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\boss_warchief_kargath_bladefist.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\illidari_council.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\def_shattered_halls.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\instance_black_temple.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\instance_shattered_halls.cpp"
                             >
                         </File>
                     </Filter>
                 </Filter>
                 <Filter
-                    Name="Northrend"
+                    Name="Tempest Keep"
                     >
                     <Filter
-                        Name="Region"
+                        Name="Arcatraz"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\arcatraz\arcatraz.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\arcatraz\boss_harbinger_skyriss.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\arcatraz\def_arcatraz.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\arcatraz\instance_arcatraz.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Botanica"
                         >
-                        <Filter
-                            Name="Zul&apos;Drak"
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\botanica\boss_high_botanist_freywinn.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\botanica\boss_laj.cpp"
                             >
-                        </Filter>
-                        <Filter
-                            Name="The Storm Peaks"
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\botanica\boss_warp_splinter.cpp"
                             >
-                        </Filter>
-                        <Filter
-                            Name="Crystalsong Forest"
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="The Eye"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_eye\boss_alar.cpp"
                             >
-                        </Filter>
-                        <Filter
-                            Name="Wintergrasp"
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_eye\boss_astromancer.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_eye\boss_kaelthas.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_eye\boss_void_reaver.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_eye\def_the_eye.h"
                             >
-                            <File
-                                RelativePath="..\scripts\zone\wintergrasp\wintergrasp.cpp"
-                                >
-                            </File>
-                        </Filter>
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_eye\instance_the_eye.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_eye\the_eye.cpp"
+                            >
+                        </File>
                     </Filter>
                     <Filter
-                        Name="Dungeon"
-                        >
-                        <Filter
-                            Name="Naxxramas"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_anubrekhan.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_faerlina.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_four_horsemen.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_gluth.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_gothik.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_grobbulus.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_heigan.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_kelthuzad.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_loatheb.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_maexxna.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_noth.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_patchwerk.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_razuvious.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_sapphiron.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_thaddius.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\def_naxxramas.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\instance_naxxramas.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Nexus"
-                            >
-                            <Filter
-                                Name="Nexus"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\boss_anomalus.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\boss_keristrasza.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\boss_magus_telestra.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\boss_ormorok.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\commander_kolurg.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\commander_stoutbeard.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\def_nexus.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\instance_nexus.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                            <Filter
-                                Name="Oculus"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\oculus\boss_drakos.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\oculus\boss_eregos.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\oculus\boss_urom.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\oculus\boss_varos.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\oculus\def_oculus.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\oculus\instance_oculus.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                            <Filter
-                                Name="Eye of Eternity"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\eye_of_eternity\boss_malygos.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\eye_of_eternity\def_eye_of_eternity.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\eye_of_eternity\instance_eye_of_eternity.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                        </Filter>
-                        <Filter
-                            Name="Obsidian Sanctum"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\obsidian_sanctum\boss_sartharion.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\obsidian_sanctum\def_obsidian_sanctum.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\obsidian_sanctum\instance_obsidian_sanctum.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Ulduar"
-                            >
-                            <Filter
-                                Name="Halls of Stone"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_stone\boss_krystallus.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_stone\boss_maiden_of_grief.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_stone\boss_sjonnir.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_stone\def_halls_of_stone.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_stone\instance_halls_of_stone.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                            <Filter
-                                Name="Halls of Lightning"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_lightning\boss_bjarngrim.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_lightning\boss_ionar.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_lightning\boss_loken.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_lightning\boss_volkhan.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_lightning\def_halls_of_lightning.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_lightning\instance_halls_of_lightning.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                            <Filter
-                                Name="Ulduar"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_algalon.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_assembly_of_iron.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_auriaya.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_flame_leviathan.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_freya.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_general_vezax.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_hodir.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_ignis.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_kologarn.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_mimiron.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_razorscale.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_thorim.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_xt002.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_yoggsaron.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\def_ulduar.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\instance_ulduar.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                        </Filter>
-                        <Filter
-                            Name="Utgarde Keep"
-                            >
-                            <Filter
-                                Name="Utgarde Keep"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_ingvar_the_plunderer.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_keleseth.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_skarvald_dalronn.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\def_utgarde_keep.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\instance_utgarde_keep.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\utgarde_keep.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                            <Filter
-                                Name="Utgarde Pinnacle"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_pinnacle\boss_palehoof.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_pinnacle\boss_skadi.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_pinnacle\boss_svala.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_pinnacle\boss_ymiron.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_pinnacle\def_pinnacle.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_pinnacle\instance_pinnacle.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                        </Filter>
-                        <Filter
-                            Name="Vault of Archavon"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\vault_of_archavon\boss_archavon.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\vault_of_archavon\boss_emalon.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\vault_of_archavon\def_vault_of_archavon.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\vault_of_archavon\instance_vault_of_archavon.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Violet Hold"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\boss_cyanigosa.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\boss_erekem.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\boss_ichoron.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\boss_lavanthor.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\boss_moragg.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\boss_xevozz.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\boss_zuramat.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\def_violet_hold.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\instance_violet_hold.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Gundrak"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\gundrak\boss_drakkari_colossus.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\gundrak\boss_eck.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\gundrak\boss_gal_darah.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\gundrak\boss_moorabi.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\gundrak\boss_slad_ran.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\gundrak\def_gundrak.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\gundrak\instance_gundrak.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Drak&apos;Tharon Keep"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\draktharon_keep\boss_dred.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\draktharon_keep\boss_novos.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\draktharon_keep\boss_tharon_ja.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\draktharon_keep\boss_trollgore.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\draktharon_keep\def_drak_tharon_keep.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\draktharon_keep\instance_drak_tharon_keep.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Azjol-Nerub"
-                            >
-                            <Filter
-                                Name="Ahn&apos;kahet"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_amanitar.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_elder_nadox.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_herald_volazj.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_jedoga_shadowseeker.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_prince_taldaram.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\def_ahnkahet.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\instance_ahnkahet.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                            <Filter
-                                Name="Azjol-Nerub"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\boss_anubarak.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\boss_hadronox.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\boss_krikthir_the_gatewatcher.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\def_azjol_nerub.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\instance_azjol_nerub.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                        </Filter>
+                        Name="The Mechanar"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_mechanar\boss_gatewatcher_gyrokill.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_mechanar\boss_gatewatcher_ironhand.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_mechanar\boss_nethermancer_sepethrea.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_mechanar\boss_pathaleon_the_calculator.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_mechanar\def_mechanar.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_mechanar\instance_mechanar.cpp"
+                            >
+                        </File>
                     </Filter>
                 </Filter>
+                <File
+                    RelativePath="..\scripts\outland\blades_edge_mountains.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\boss_doomlord_kazzak.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\boss_doomwalker.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\hellfire_peninsula.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\nagrand.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\netherstorm.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\shadowmoon_valley.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\shattrath_city.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\terokkar_forest.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\zangarmarsh.cpp"
+                    >
+                </File>
             </Filter>
             <Filter
                 Name="custom"
diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
index d25138a9e0f..33a3e2aeca1 100644
--- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
@@ -1175,2734 +1175,1437 @@
             <Filter
                 Name="kalimdor"
                 >
-                <File
-                    RelativePath="..\scripts\kalimdor\ashenvale.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\azshara.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\azuremyst_isle.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\bloodmyst_isle.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\boss_azuregos.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\darkshore.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\desolace.cpp">
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\dustwallow_marsh.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\felwood.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\feralas.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\moonglade.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\mulgore.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\orgrimmar.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\silithus.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\stonetalon_mountains.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\tanaris.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\teldrassil.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\the_barrens.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\thousand_needles.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\thunder_bluff.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\ungoro_crater.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\winterspring.cpp"
-                    >
-                </File>
-            </Filter>
-            <Filter
-                Name="northrend"
-                >
-                <File
-                    RelativePath="..\scripts\northrend\borean_tundra.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\dragonblight.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\grizzly_hills.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\icecrown.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\sholazar_basin.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\zuldrak.cpp"
-                    >
-                </File>
-            </Filter>
-            <Filter
-                Name="outland"
-                >
-                <File
-                    RelativePath="..\scripts\outland\blades_edge_mountains.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\boss_doomlord_kazzak.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\boss_doomwalker.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\hellfire_peninsula.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\nagrand.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\netherstorm.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\shadowmoon_valley.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\shattrath_city.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\terokkar_forest.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\zangarmarsh.cpp"
+                <Filter
+                    Name="Blackfathom Depths"
                     >
-                </File>
-            </Filter>
-            <Filter
-                Name="zone"
-                >
+                    <File
+                        RelativePath="..\scripts\kalimdor\blackfathom_depths\instance_blackfathom_deeps.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\scripts\kalimdor\blackfathom_depths\def_blackfathom_deeps.h"
+                        >
+                    </File>
+                </Filter>
                 <Filter
-                    Name="Kalimdor"
+                    Name="Caverns of Time"
                     >
                     <Filter
-                        Name="Blackfathom Depths"
+                        Name="Culling of Stratholme"
                         >
                         <File
-                            RelativePath="..\scripts\zone\blackfathom_depths\instance_blackfathom_deeps.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_epoch.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\blackfathom_depths\def_blackfathom_deeps.h"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_mal_ganis.cpp"
                             >
                         </File>
-                    </Filter>
-                    <Filter
-                        Name="Caverns of Time"
-                        >
-                        <Filter
-                            Name="The Dark Portal"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\dark_portal\boss_aeonus.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\dark_portal\boss_chrono_lord_deja.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\dark_portal\boss_temporus.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\dark_portal\dark_portal.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\dark_portal\def_dark_portal.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\dark_portal\instance_dark_portal.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Battle for Mt. Hyjal"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_anetheron.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_archimonde.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_azgalor.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_kazrogal.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_rage_winterchill.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\hyjal\def_hyjal.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\hyjal\hyjal.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\hyjal\hyjal_trash.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\hyjal\hyjal_trash.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\hyjal\hyjalAI.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\hyjal\hyjalAI.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\hyjal\instance_hyjal.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Culling of Stratholme"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\culling_of_stratholme\boss_epoch.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\culling_of_stratholme\boss_mal_ganis.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\culling_of_stratholme\boss_meathook.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\culling_of_stratholme\boss_salramm.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\culling_of_stratholme\def_culling_of_stratholme.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\culling_of_stratholme\instance_culling_of_stratholme.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Old Hillsbrad"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\old_hillsbrad\boss_captain_skarloc.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\old_hillsbrad\boss_epoch_hunter.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\old_hillsbrad\boss_leutenant_drake.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\old_hillsbrad\def_old_hillsbrad.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\old_hillsbrad\instance_old_hillsbrad.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\caverns_of_time\old_hillsbrad\old_hillsbrad.cpp"
-                                >
-                            </File>
-                        </Filter>
-                    </Filter>
-                    <Filter
-                        Name="Maraudon"
-                        >
                         <File
-                            RelativePath="..\scripts\zone\maraudon\boss_celebras_the_cursed.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_meathook.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\maraudon\boss_landslide.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_salramm.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\maraudon\boss_noxxion.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\def_culling_of_stratholme.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\maraudon\boss_princess_theradras.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\instance_culling_of_stratholme.cpp"
                             >
                         </File>
                     </Filter>
                     <Filter
-                        Name="Onyxia&apos;s Lair"
+                        Name="The Dark Portal"
                         >
                         <File
-                            RelativePath="..\scripts\zone\onyxias_lair\boss_onyxia.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\boss_aeonus.cpp"
                             >
                         </File>
-                    </Filter>
-                    <Filter
-                        Name="Ragefire Chasm"
-                        >
-                    </Filter>
-                    <Filter
-                        Name="Razorfen Downs"
-                        >
                         <File
-                            RelativePath="..\scripts\zone\razorfen_downs\boss_amnennar_the_coldbringer.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\boss_chrono_lord_deja.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\razorfen_downs\razorfen_downs.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\boss_temporus.cpp"
                             >
                         </File>
-                    </Filter>
-                    <Filter
-                        Name="Razorfen Kraul"
-                        >
                         <File
-                            RelativePath="..\scripts\zone\razorfen_kraul\razorfen_kraul.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\dark_portal.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\razorfen_kraul\instance_razorfen_kraul.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\def_dark_portal.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\razorfen_kraul\def_razorfen_kraul.h"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\instance_dark_portal.cpp"
                             >
                         </File>
                     </Filter>
                     <Filter
-                        Name="Ruins of Ahn&apos;Qiraj"
+                        Name="Battle for Mt. Hyjal"
                         >
                         <File
-                            RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_ayamiss.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\boss_anetheron.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\boss_archimonde.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_buru.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\boss_azgalor.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_kurinnaxx.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\boss_kazrogal.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_moam.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\boss_rage_winterchill.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_ossirian.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\def_hyjal.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_rajaxx.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjal.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\ruins_of_ahnqiraj\instance_ruins_of_ahnqiraj.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjal_trash.cpp"
                             >
                         </File>
-                    </Filter>
-                    <Filter
-                        Name="Zul&apos;Farrak"
-                        >
                         <File
-                            RelativePath="..\scripts\zone\zulfarrak\zulfarrak.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjal_trash.h"
                             >
                         </File>
-                    </Filter>
-                    <Filter
-                        Name="Wailing Caverns"
-                        >
                         <File
-                            RelativePath="..\scripts\zone\wailing_caverns\def_wailing_caverns.h"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjalAI.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\wailing_caverns\instance_wailing_caverns.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjalAI.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\wailing_caverns\wailing_caverns.cpp"
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\instance_hyjal.cpp"
                             >
                         </File>
                     </Filter>
                     <Filter
-                        Name="Temple of Ahn&apos;Qiraj"
+                        Name="Old Hillsbrad"
                         >
                         <File
-                            R
-        <Filter
-            Name="base"
-            >
-            <File
-                RelativePath="..\base\escortAI.cpp"
-                >
-            </File>
-            <File
-                RelativePath="..\base\escortAI.h"
-                >
-            </File>
-            <File
-                RelativePath="..\base\guard_ai.cpp"
-                >
-            </File>
-            <File
-                RelativePath="..\base\guard_ai.h"
-                >
-            </File>
-            <File
-                RelativePath="..\base\simple_ai.cpp"
-                >
-            </File>
-            <File
-                RelativePath="..\base\simple_ai.h"
-                >
-            </File>
-        </Filter>
-        <Filter
-            Name="scripts"
-            >
-            <Filter
-                Name="eastern_kingdoms"
-                >
-                <Filter
-                    Name="Blackrock Depths"
-                    >
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\blackrock_depths.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\boss_ambassador_flamelash.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\boss_anubshiah.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\boss_emperor_dagran_thaurissan.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\boss_general_angerforge.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\boss_gorosh_the_dervish.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\boss_grizzle.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\boss_high_interrogator_gerstahn.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\boss_magmus.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\boss_moira_bronzebeard.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\boss_tomb_of_seven.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\def_blackrock_depths.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\instance_blackrock_depths.cpp"
-                        >
-                    </File>
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\boss_captain_skarloc.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\boss_epoch_hunter.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\boss_leutenant_drake.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\def_old_hillsbrad.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\instance_old_hillsbrad.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\old_hillsbrad.cpp"
+                            >
+                        </File>
+                    </Filter>
                 </Filter>
                 <Filter
-                    Name="Blackrock Spire"
+                    Name="Maraudon"
                     >
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\boss_drakkisath.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\boss_gyth.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\boss_halycon.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\boss_highlord_omokk.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\boss_mother_smolderweb.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\boss_overlord_wyrmthalak.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\boss_pyroguard_emberseer.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\boss_quartermaster_zigris.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\boss_rend_blackhand.cpp"
+                        RelativePath="..\scripts\kalimdor\maraudon\boss_celebras_the_cursed.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\boss_shadow_hunter_voshgajin.cpp"
+                        RelativePath="..\scripts\kalimdor\maraudon\boss_landslide.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\boss_the_beast.cpp"
+                        RelativePath="..\scripts\kalimdor\maraudon\boss_noxxion.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\boss_warmaster_voone.cpp"
+                        RelativePath="..\scripts\kalimdor\maraudon\boss_princess_theradras.cpp"
                         >
                     </File>
                 </Filter>
                 <Filter
-                    Name="Blackwing Lair"
+                    Name="Onyxia&apos;s Lair"
                     >
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackwing_lair\boss_broodlord_lashlayer.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackwing_lair\boss_chromaggus.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackwing_lair\boss_ebonroc.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackwing_lair\boss_firemaw.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackwing_lair\boss_flamegor.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackwing_lair\boss_nefarian.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackwing_lair\boss_razorgore.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackwing_lair\boss_vaelastrasz.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackwing_lair\boss_victor_nefarius.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\blackwing_lair\instance_blackwing_lair.cpp"
+                        RelativePath="..\scripts\kalimdor\onyxias_lair\boss_onyxia.cpp"
                         >
                     </File>
                 </Filter>
                 <Filter
-                    Name="Deadmines"
+                    Name="Razorfen Downs"
                     >
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\deadmines\deadmines.cpp"
+                        RelativePath="..\scripts\kalimdor\razorfen_downs\boss_amnennar_the_coldbringer.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\deadmines\def_deadmines.h"
+                        RelativePath="..\scripts\kalimdor\razorfen_downs\razorfen_downs.cpp"
                         >
                     </File>
                 </Filter>
                 <Filter
-                    Name="Karazhan"
+                    Name="Razorfen Kraul"
                     >
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\karazhan\boss_curator.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\karazhan\boss_maiden_of_virtue.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\karazhan\boss_midnight.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\karazhan\boss_moroes.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\karazhan\boss_netherspite.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\karazhan\boss_nightbane.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\karazhan\boss_prince_malchezaar.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\karazhan\boss_shade_of_aran.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\karazhan\boss_terestian_illhoof.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\karazhan\bosses_opera.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\karazhan\def_karazhan.h"
+                        RelativePath="..\scripts\kalimdor\razorfen_kraul\razorfen_kraul.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\karazhan\instance_karazhan.cpp"
+                        RelativePath="..\scripts\kalimdor\razorfen_kraul\instance_razorfen_kraul.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\karazhan\karazhan.cpp"
+                        RelativePath="..\scripts\kalimdor\razorfen_kraul\def_razorfen_kraul.h"
                         >
                     </File>
                 </Filter>
                 <Filter
-                    Name="Magister&apos;s Terrace"
+                    Name="Ruins of Ahn&apos;Qiraj"
                     >
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\boss_felblood_kaelthas.cpp"
+                        RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_ayamiss.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\boss_priestess_delrissa.cpp"
+                        RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_buru.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\boss_selin_fireheart.cpp"
+                        RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_kurinnaxx.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\boss_vexallus.cpp"
+                        RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_moam.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\def_magisters_terrace.h"
+                        RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_ossirian.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\instance_magisters_terrace.cpp"
+                        RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_rajaxx.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\magisters_terrace.cpp"
+                        RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\instance_ruins_of_ahnqiraj.cpp"
                         >
                     </File>
                 </Filter>
                 <Filter
-                    Name="Molten Core"
+                    Name="Temple of Ahn&apos;Qiraj"
                     >
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\molten_core\boss_baron_geddon.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\molten_core\boss_garr.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\molten_core\boss_gehennas.cpp"
+                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_bug_trio.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\molten_core\boss_golemagg.cpp"
+                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_cthun.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\molten_core\boss_lucifron.cpp"
+                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_fankriss.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\molten_core\boss_magmadar.cpp"
+                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_huhuran.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\molten_core\boss_majordomo_executus.cpp"
+                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_ouro.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\molten_core\boss_ragnaros.cpp"
+                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_sartura.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\molten_core\boss_shazzrah.cpp"
+                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_skeram.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\molten_core\boss_sulfuron_harbinger.cpp"
+                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_twinemperors.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\molten_core\def_molten_core.h"
+                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_viscidus.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\molten_core\instance_molten_core.cpp"
+                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\def_temple_of_ahnqiraj.h"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\molten_core\molten_core.cpp"
+                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\instance_temple_of_ahnqiraj.cpp"
                         >
                     </File>
-                </Filter>
-                <Filter
-                    Name="scarlet_enclave"
-                    >
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\scarlet_enclave\the_scarlet_enclave.cpp"
+                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\mob_anubisath_sentinel.cpp"
                         >
                     </File>
                 </Filter>
                 <Filter
-                    Name="Scarlet Monastery"
+                    Name="Wailing Caverns"
                     >
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\boss_arcanist_doan.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\boss_azshir_the_sleepless.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\boss_bloodmage_thalnos.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\boss_headless_horseman.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\boss_herod.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\boss_high_inquisitor_fairbanks.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\boss_houndmaster_loksey.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\boss_interrogator_vishas.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\boss_mograine_and_whitemane.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\boss_scorn.cpp"
+                        RelativePath="..\scripts\kalimdor\wailing_caverns\def_wailing_caverns.h"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\def_scarlet_monastery.h"
+                        RelativePath="..\scripts\kalimdor\wailing_caverns\instance_wailing_caverns.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\instance_scarlet_monastery.cpp"
+                        RelativePath="..\scripts\kalimdor\wailing_caverns\wailing_caverns.cpp"
                         >
                     </File>
                 </Filter>
                 <Filter
-                    Name="Scholomance"
+                    Name="Zul&apos;Farrak"
                     >
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\scholomance\boss_darkmaster_gandling.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scholomance\boss_death_knight_darkreaver.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scholomance\boss_doctor_theolen_krastinov.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scholomance\boss_illucia_barov.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scholomance\boss_instructor_malicia.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scholomance\boss_jandice_barov.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scholomance\boss_kormok.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scholomance\boss_lord_alexei_barov.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scholomance\boss_lorekeeper_polkelt.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scholomance\boss_ras_frostwhisper.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scholomance\boss_the_ravenian.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scholomance\boss_vectus.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scholomance\def_scholomance.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\scholomance\instance_scholomance.cpp"
+                        RelativePath="..\scripts\kalimdor\zulfarrak\zulfarrak.cpp"
                         >
                     </File>
                 </Filter>
+                <File
+                    RelativePath="..\scripts\kalimdor\ashenvale.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\azshara.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\azuremyst_isle.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\bloodmyst_isle.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\boss_azuregos.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\darkshore.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\desolace.cpp">
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\dustwallow_marsh.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\felwood.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\feralas.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\moonglade.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\mulgore.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\orgrimmar.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\silithus.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\stonetalon_mountains.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\tanaris.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\teldrassil.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\the_barrens.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\thousand_needles.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\thunder_bluff.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\ungoro_crater.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\kalimdor\winterspring.cpp"
+                    >
+                </File>
+            </Filter>
+            <Filter
+                Name="northrend"
+                >
                 <Filter
-                    Name="Shadowfang Keep"
+                    Name="Azjol-Nerub"
                     >
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\def_shadowfang_keep.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\instance_shadowfang_keep.cpp"
+                    <Filter
+                        Name="Ahn&apos;kahet"
                         >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.cpp"
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\boss_amanitar.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\boss_elder_nadox.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\boss_herald_volazj.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\boss_jedoga_shadowseeker.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\boss_prince_taldaram.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\def_ahnkahet.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\instance_ahnkahet.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Azjol-Nerub"
                         >
-                    </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\boss_anubarak.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\boss_hadronox.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\boss_krikthir_the_gatewatcher.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\def_azjol_nerub.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\instance_azjol_nerub.cpp"
+                            >
+                        </File>
+                    </Filter>
                 </Filter>
                 <Filter
-                    Name="Stratholme"
+                    Name="Drak&apos;Tharon Keep"
                     >
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\stratholme\boss_baron_rivendare.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\stratholme\boss_baroness_anastari.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\stratholme\boss_cannon_master_willey.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\stratholme\boss_dathrohan_balnazzar.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\stratholme\boss_magistrate_barthilas.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\stratholme\boss_maleki_the_pallid.cpp"
+                        RelativePath="..\scripts\northrend\draktharon_keep\boss_dred.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\stratholme\boss_nerubenkan.cpp"
+                        RelativePath="..\scripts\northrend\draktharon_keep\boss_novos.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\stratholme\boss_order_of_silver_hand.cpp"
+                        RelativePath="..\scripts\northrend\draktharon_keep\boss_tharon_ja.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\stratholme\boss_postmaster_malown.cpp"
+                        RelativePath="..\scripts\northrend\draktharon_keep\boss_trollgore.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\stratholme\boss_ramstein_the_gorger.cpp"
+                        RelativePath="..\scripts\northrend\draktharon_keep\def_drak_tharon_keep.h"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\stratholme\boss_timmy_the_cruel.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\stratholme\def_stratholme.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\stratholme\instance_stratholme.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\stratholme\stratholme.cpp"
+                        RelativePath="..\scripts\northrend\draktharon_keep\instance_drak_tharon_keep.cpp"
                         >
                     </File>
                 </Filter>
                 <Filter
-                    Name="Sunwell Plateau"
+                    Name="Gundrak"
                     >
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\boss_brutallus.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\boss_eredar_twins.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\boss_felmyst.cpp"
+                        RelativePath="..\scripts\northrend\gundrak\boss_drakkari_colossus.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\boss_kalecgos.cpp"
+                        RelativePath="..\scripts\northrend\gundrak\boss_eck.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\boss_kiljaeden.cpp"
+                        RelativePath="..\scripts\northrend\gundrak\boss_gal_darah.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\boss_muru.cpp"
+                        RelativePath="..\scripts\northrend\gundrak\boss_moorabi.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\def_sunwell_plateau.h"
+                        RelativePath="..\scripts\northrend\gundrak\boss_slad_ran.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\instance_sunwell_plateau.cpp"
+                        RelativePath="..\scripts\northrend\gundrak\def_gundrak.h"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\sunwell_plateau.cpp"
+                        RelativePath="..\scripts\northrend\gundrak\instance_gundrak.cpp"
                         >
                     </File>
                 </Filter>
                 <Filter
-                    Name="Uldaman"
+                    Name="Naxxramas"
                     >
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\uldaman\boss_archaedas.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_anubrekhan.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\uldaman\boss_ironaya.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_faerlina.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\uldaman\instance_uldaman.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_four_horsemen.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\uldaman\uldaman.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_gluth.cpp"
                         >
                     </File>
-                </Filter>
-                <Filter
-                    Name="Zul&apos;Aman"
-                    >
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulaman\boss_akilzon.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_gothik.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulaman\boss_halazzi.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_grobbulus.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulaman\boss_hexlord.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_heigan.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulaman\boss_janalai.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_kelthuzad.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulaman\boss_nalorakk.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_loatheb.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulaman\boss_zuljin.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_maexxna.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulaman\def_zulaman.h"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_noth.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulaman\instance_zulaman.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_patchwerk.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulaman\zulaman.cpp"
-                        >
-                    </File>
-                </Filter>
-                <Filter
-                    Name="Zul&apos;Gurub"
-                    >
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\boss_arlokk.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\boss_gahzranka.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\boss_grilek.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\boss_hakkar.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\boss_hazzarah.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_razuvious.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\boss_jeklik.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_sapphiron.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\boss_jindo.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\boss_thaddius.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\boss_mandokir.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\def_naxxramas.h"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\boss_marli.cpp"
+                        RelativePath="..\scripts\northrend\naxxramas\instance_naxxramas.cpp"
                         >
                     </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\boss_renataki.cpp"
+                </Filter>
+                <Filter
+                    Name="Nexus"
+                    >
+                    <Filter
+                        Name="Nexus"
                         >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\boss_thekal.cpp"
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\boss_anomalus.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\boss_keristrasza.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\boss_magus_telestra.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\boss_ormorok.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\commander_kolurg.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\commander_stoutbeard.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\def_nexus.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\nexus\instance_nexus.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Oculus"
                         >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\boss_venoxis.cpp"
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\oculus\boss_drakos.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\oculus\boss_eregos.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\oculus\boss_urom.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\oculus\boss_varos.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\oculus\def_oculus.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\oculus\instance_oculus.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Eye of Eternity"
                         >
-                    </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\eye_of_eternity\boss_malygos.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\eye_of_eternity\def_eye_of_eternity.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\nexus\eye_of_eternity\instance_eye_of_eternity.cpp"
+                            >
+                        </File>
+                    </Filter>
+                </Filter>
+                <Filter
+                    Name="Obsidian Sanctum"
+                    >
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\boss_wushoolay.cpp"
+                        RelativePath="..\scripts\northrend\obsidian_sanctum\boss_sartharion.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\def_zulgurub.h"
+                        RelativePath="..\scripts\northrend\obsidian_sanctum\def_obsidian_sanctum.h"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\eastern_kingdoms\zulgurub\instance_zulgurub.cpp"
+                        RelativePath="..\scripts\northrend\obsidian_sanctum\instance_obsidian_sanctum.cpp"
                         >
                     </File>
                 </Filter>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\alterac_mountains.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\arathi_highlands.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\blasted_lands.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\boss_kruul.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\burning_steppes.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\dun_morogh.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\eastern_plaguelands.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\elwynn_forest.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\eversong_woods.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\ghostlands.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\hinterlands.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\ironforge.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\isle_of_queldanas.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\loch_modan.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\searing_gorge.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\silvermoon_city.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\silverpine_forest.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\stormwind_city.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\stranglethorn_vale.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\tirisfal_glades.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\undercity.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\western_plaguelands.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\eastern_kingdoms\westfall.cpp"
-                    >
-                </File>
-            </Filter>
-            <Filter
-                Name="examples"
-                >
-                <File
-                    RelativePath="..\scripts\examples\example_creature.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\examples\example_escort.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\examples\example_gossip_codebox.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\examples\example_misc.cpp"
-                    >
-                </File>
-            </Filter>
-            <Filter
-                Name="kalimdor"
-                >
                 <Filter
-                    Name="Blackfathom Depths"
+                    Name="Ulduar"
                     >
-                    <File
-                        RelativePath="..\scripts\kalimdor\blackfathom_depths\instance_blackfathom_deeps.cpp"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\kalimdor\blackfathom_depths\def_blackfathom_deeps.h"
+                    <Filter
+                        Name="Halls of Stone"
                         >
-                    </File>
-                </Filter>
-                <Filter
-                    Name="Caverns of Time"
-                    >
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_stone\boss_krystallus.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_stone\boss_maiden_of_grief.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_stone\boss_sjonnir.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_stone\def_halls_of_stone.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_stone\instance_halls_of_stone.cpp"
+                            >
+                        </File>
+                    </Filter>
                     <Filter
-                        Name="Culling of Stratholme"
+                        Name="Halls of Lightning"
                         >
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_epoch.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\boss_bjarngrim.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_mal_ganis.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\boss_ionar.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_meathook.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\boss_loken.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_salramm.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\boss_volkhan.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\def_culling_of_stratholme.h"
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\def_halls_of_lightning.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\instance_culling_of_stratholme.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\instance_halls_of_lightning.cpp"
                             >
                         </File>
                     </Filter>
                     <Filter
-                        Name="The Dark Portal"
+                        Name="Ulduar"
                         >
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\boss_aeonus.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_algalon.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\boss_chrono_lord_deja.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_assembly_of_iron.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\boss_temporus.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_auriaya.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\dark_portal.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_flame_leviathan.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\def_dark_portal.h"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_freya.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\instance_dark_portal.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_general_vezax.cpp"
                             >
                         </File>
-                    </Filter>
-                    <Filter
-                        Name="Battle for Mt. Hyjal"
-                        >
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\boss_anetheron.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_hodir.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\boss_archimonde.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_ignis.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\boss_azgalor.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_kologarn.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\boss_kazrogal.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_mimiron.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\boss_rage_winterchill.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_razorscale.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\def_hyjal.h"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_thorim.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjal.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_xt002.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjal_trash.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\boss_yoggsaron.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjal_trash.h"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\def_ulduar.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjalAI.cpp"
+                            RelativePath="..\scripts\northrend\ulduar\ulduar\instance_ulduar.cpp"
+                            >
+                        </File>
+                    </Filter>
+                </Filter>
+                <Filter
+                    Name="Utgarde Keep"
+                    >
+                    <Filter
+                        Name="Utgarde Keep"
+                        >
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\boss_ingvar_the_plunderer.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjalAI.h"
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\boss_keleseth.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\instance_hyjal.cpp"
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\boss_skarvald_dalronn.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\def_utgarde_keep.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\instance_utgarde_keep.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\utgarde_keep.cpp"
                             >
                         </File>
                     </Filter>
                     <Filter
-                        Name="Old Hillsbrad"
+                        Name="Utgarde Pinnacle"
                         >
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\boss_captain_skarloc.cpp"
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_palehoof.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\boss_epoch_hunter.cpp"
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_skadi.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\boss_leutenant_drake.cpp"
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_svala.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\def_old_hillsbrad.h"
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\boss_ymiron.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\instance_old_hillsbrad.cpp"
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\def_pinnacle.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\old_hillsbrad.cpp"
+                            RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\instance_pinnacle.cpp"
                             >
                         </File>
                     </Filter>
                 </Filter>
                 <Filter
-                    Name="Maraudon"
+                    Name="Vault of Archavon"
                     >
                     <File
-                        RelativePath="..\scripts\kalimdor\maraudon\boss_celebras_the_cursed.cpp"
+                        RelativePath="..\scripts\northrend\vault_of_archavon\boss_archavon.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\maraudon\boss_landslide.cpp"
+                        RelativePath="..\scripts\northrend\vault_of_archavon\boss_emalon.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\maraudon\boss_noxxion.cpp"
+                        RelativePath="..\scripts\northrend\vault_of_archavon\def_vault_of_archavon.h"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\maraudon\boss_princess_theradras.cpp"
+                        RelativePath="..\scripts\northrend\vault_of_archavon\instance_vault_of_archavon.cpp"
                         >
                     </File>
                 </Filter>
                 <Filter
-                    Name="Onyxia&apos;s Lair"
+                    Name="Violet Hold"
                     >
                     <File
-                        RelativePath="..\scripts\kalimdor\onyxias_lair\boss_onyxia.cpp"
+                        RelativePath="..\scripts\northrend\violet_hold\boss_cyanigosa.cpp"
                         >
                     </File>
-                </Filter>
-                <Filter
-                    Name="Razorfen Downs"
-                    >
                     <File
-                        RelativePath="..\scripts\kalimdor\razorfen_downs\boss_amnennar_the_coldbringer.cpp"
+                        RelativePath="..\scripts\northrend\violet_hold\boss_erekem.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\razorfen_downs\razorfen_downs.cpp"
+                        RelativePath="..\scripts\northrend\violet_hold\boss_ichoron.cpp"
                         >
                     </File>
-                </Filter>
-                <Filter
-                    Name="Razorfen Kraul"
-                    >
                     <File
-                        RelativePath="..\scripts\kalimdor\razorfen_kraul\razorfen_kraul.cpp"
+                        RelativePath="..\scripts\northrend\violet_hold\boss_lavanthor.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\razorfen_kraul\instance_razorfen_kraul.cpp"
+                        RelativePath="..\scripts\northrend\violet_hold\boss_moragg.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\razorfen_kraul\def_razorfen_kraul.h"
+                        RelativePath="..\scripts\northrend\violet_hold\boss_xevozz.cpp"
                         >
                     </File>
-                </Filter>
-                <Filter
-                    Name="Ruins of Ahn&apos;Qiraj"
-                    >
                     <File
-                        RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_ayamiss.cpp"
+                        RelativePath="..\scripts\northrend\violet_hold\boss_zuramat.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_buru.cpp"
+                        RelativePath="..\scripts\northrend\violet_hold\def_violet_hold.h"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_kurinnaxx.cpp"
+                        RelativePath="..\scripts\northrend\violet_hold\instance_violet_hold.cpp"
                         >
                     </File>
-                    <File
-                        RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_moam.cpp"
+                </Filter>
+                <File
+                    RelativePath="..\scripts\northrend\borean_tundra.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\northrend\dragonblight.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\northrend\grizzly_hills.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\northrend\icecrown.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\northrend\sholazar_basin.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\northrend\wintergrasp.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\northrend\zuldrak.cpp"
+                    >
+                </File>
+            </Filter>
+            <Filter
+                Name="outland"
+                >
+                <Filter
+                    Name="Aunchindoun"
+                    >
+                    <Filter
+                        Name="Auchenai Crypts"
                         >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_ossirian.cpp"
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\auchenai_crypts\boss_exarch_maladaar.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\auchenai_crypts\boss_shirrak_the_dead_watcher.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Mana Tombs"
                         >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_rajaxx.cpp"
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\mana_tombs\boss_nexusprince_shaffar.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\mana_tombs\boss_pandemonius.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Sethekk Halls"
                         >
-                    </File>
-                    <File
-                        RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\instance_ruins_of_ahnqiraj.cpp"
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\sethekk_halls\boss_darkweaver_syth.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\sethekk_halls\boss_tailonking_ikiss.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\sethekk_halls\def_sethekk_halls.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\sethekk_halls\instance_sethekk_halls.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Shadow Labyrinth"
                         >
-                    </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\boss_ambassador_hellmaw.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\boss_blackheart_the_inciter.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\boss_grandmaster_vorpil.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\boss_murmur.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\def_shadow_labyrinth.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\instance_shadow_labyrinth.cpp"
+                            >
+                        </File>
+                    </Filter>
                 </Filter>
                 <Filter
-                    Name="Temple of Ahn&apos;Qiraj"
+                    Name="Black Temple"
                     >
                     <File
-                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_bug_trio.cpp"
+                        RelativePath="..\scripts\outland\black_temple\black_temple.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_cthun.cpp"
+                        RelativePath="..\scripts\outland\black_temple\boss_bloodboil.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_fankriss.cpp"
+                        RelativePath="..\scripts\outland\black_temple\boss_illidan.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_huhuran.cpp"
+                        RelativePath="..\scripts\outland\black_temple\boss_mother_shahraz.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_ouro.cpp"
+                        RelativePath="..\scripts\outland\black_temple\boss_reliquary_of_souls.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_sartura.cpp"
+                        RelativePath="..\scripts\outland\black_temple\boss_shade_of_akama.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_skeram.cpp"
+                        RelativePath="..\scripts\outland\black_temple\boss_supremus.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_twinemperors.cpp"
+                        RelativePath="..\scripts\outland\black_temple\boss_teron_gorefiend.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\boss_viscidus.cpp"
+                        RelativePath="..\scripts\outland\black_temple\boss_warlord_najentus.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\def_temple_of_ahnqiraj.h"
+                        RelativePath="..\scripts\outland\black_temple\def_black_temple.h"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\instance_temple_of_ahnqiraj.cpp"
+                        RelativePath="..\scripts\outland\black_temple\illidari_council.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\mob_anubisath_sentinel.cpp"
+                        RelativePath="..\scripts\outland\black_temple\instance_black_temple.cpp"
                         >
                     </File>
                 </Filter>
                 <Filter
-                    Name="Wailing Caverns"
+                    Name="Coilfang Resevoir"
+                    >
+                    <Filter
+                        Name="Serpent Shrine Cavern"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\boss_fathomlord_karathress.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\boss_hydross_the_unstable.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\boss_lady_vashj.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\boss_leotheras_the_blind.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\boss_lurker_below.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\boss_morogrim_tidewalker.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\def_serpent_shrine.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\instance_serpent_shrine.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Steam Vault"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\boss_hydromancer_thespia.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\boss_mekgineer_steamrigger.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\boss_warlord_kalithresh.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\def_steam_vault.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\instance_steam_vault.cpp"
+                            >
+                        </File>
+                    </Filter>
+                    <Filter
+                        Name="Underbog"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\underbog\boss_hungarfen.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\coilfang_resevoir\underbog\boss_the_black_stalker.cpp"
+                            >
+                        </File>
+                    </Filter>
+                </Filter>
+                <Filter
+                    Name="Gruul&apos;s Lair"
                     >
                     <File
-                        RelativePath="..\scripts\kalimdor\wailing_caverns\def_wailing_caverns.h"
+                        RelativePath="..\scripts\outland\gruuls_lair\boss_gruul.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\wailing_caverns\instance_wailing_caverns.cpp"
+                        RelativePath="..\scripts\outland\gruuls_lair\boss_high_king_maulgar.cpp"
                         >
                     </File>
                     <File
-                        RelativePath="..\scripts\kalimdor\wailing_caverns\wailing_caverns.cpp"
+                        RelativePath="..\scripts\outland\gruuls_lair\def_gruuls_lair.h"
                         >
                     </File>
-                </Filter>
-                <Filter
-                    Name="Zul&apos;Farrak"
-                    >
                     <File
-                        RelativePath="..\scripts\kalimdor\zulfarrak\zulfarrak.cpp"
+                        RelativePath="..\scripts\outland\gruuls_lair\instance_gruuls_lair.cpp"
                         >
                     </File>
                 </Filter>
-                <File
-                    RelativePath="..\scripts\kalimdor\ashenvale.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\azshara.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\azuremyst_isle.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\bloodmyst_isle.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\boss_azuregos.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\darkshore.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\desolace.cpp">
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\dustwallow_marsh.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\felwood.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\feralas.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\moonglade.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\mulgore.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\orgrimmar.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\silithus.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\stonetalon_mountains.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\tanaris.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\teldrassil.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\the_barrens.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\thousand_needles.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\thunder_bluff.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\ungoro_crater.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\kalimdor\winterspring.cpp"
-                    >
-                </File>
-            </Filter>
-            <Filter
-                Name="northrend"
-                >
-                <File
-                    RelativePath="..\scripts\northrend\borean_tundra.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\dragonblight.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\grizzly_hills.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\icecrown.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\sholazar_basin.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\northrend\zuldrak.cpp"
-                    >
-                </File>
-            </Filter>
-            <Filter
-                Name="outland"
-                >
-                <File
-                    RelativePath="..\scripts\outland\blades_edge_mountains.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\boss_doomlord_kazzak.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\boss_doomwalker.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\hellfire_peninsula.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\nagrand.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\netherstorm.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\shadowmoon_valley.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\shattrath_city.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\terokkar_forest.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\outland\zangarmarsh.cpp"
-                    >
-                </File>
-            </Filter>
-            <Filter
-                Name="zone"
-                >
                 <Filter
-                    Name="Outland"
+                    Name="Hellfire Citadel"
                     >
                     <Filter
-                        Name="Gruul&apos;s Lair"
+                        Name="Blood Furnace"
                         >
                         <File
-                            RelativePath="..\scripts\zone\gruuls_lair\boss_gruul.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\boss_broggok.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\gruuls_lair\boss_high_king_maulgar.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\boss_kelidan_the_breaker.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\gruuls_lair\def_gruuls_lair.h"
+                            RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\boss_the_maker.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\gruuls_lair\instance_gruuls_lair.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\def_blood_furnace.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\instance_blood_furnace.cpp"
                             >
                         </File>
                     </Filter>
                     <Filter
-                        Name="Hellfire Citadel"
-                        >
-                        <Filter
-                            Name="Blood Furnace"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\boss_broggok.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\boss_kelidan_the_breaker.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\boss_the_maker.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\def_blood_furnace.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\instance_blood_furnace.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Magtheridon&apos;s lair"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\magtheridons_lair\boss_magtheridon.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\magtheridons_lair\def_magtheridons_lair.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\magtheridons_lair\instance_magtheridons_lair.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Hellfire Ramparts"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\boss_omor_the_unscarred.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\boss_vazruden_the_herald.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\boss_watchkeeper_gargolmar.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\def_hellfire_ramparts.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\instance_hellfire_ramparts.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Shattered Halls"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\boss_nethekurse.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\boss_warbringer_omrogg.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\boss_warchief_kargath_bladefist.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\def_shattered_halls.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\instance_shattered_halls.cpp"
-                                >
-                            </File>
-                        </Filter>
-                    </Filter>
-                    <Filter
-                        Name="Tempest Keep"
-                        >
-                        <Filter
-                            Name="Arcatraz"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\arcatraz\arcatraz.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\arcatraz\boss_harbinger_skyriss.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\arcatraz\def_arcatraz.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\arcatraz\instance_arcatraz.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Botanica"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\botanica\boss_high_botanist_freywinn.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\botanica\boss_laj.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\botanica\boss_warp_splinter.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="The Eye"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_alar.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_astromancer.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_kaelthas.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_void_reaver.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_eye\def_the_eye.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_eye\instance_the_eye.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_eye\the_eye.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="The Mechanar"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_mechanar\boss_gatewatcher_gyrokill.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_mechanar\boss_gatewatcher_ironhand.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_mechanar\boss_nethermancer_sepethrea.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_mechanar\boss_pathaleon_the_calculator.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_mechanar\def_mechanar.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\tempest_keep\the_mechanar\instance_mechanar.cpp"
-                                >
-                            </File>
-                        </Filter>
-                    </Filter>
-                    <Filter
-                        Name="Coilfang Resevoir"
-                        >
-                        <Filter
-                            Name="Serpent Shrine Cavern"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_fathomlord_karathress.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_hydross_the_unstable.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_lady_vashj.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_leotheras_the_blind.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_lurker_below.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_morogrim_tidewalker.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\def_serpent_shrine.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\instance_serpent_shrine.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Slave Pens"
-                            >
-                        </Filter>
-                        <Filter
-                            Name="Steam Vault"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\boss_hydromancer_thespia.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\boss_mekgineer_steamrigger.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\boss_warlord_kalithresh.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\def_steam_vault.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\instance_steam_vault.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Underbog"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\underbog\boss_hungarfen.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\coilfang_resevoir\underbog\boss_the_black_stalker.cpp"
-                                >
-                            </File>
-                        </Filter>
+                        Name="Magtheridon&apos;s lair"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\boss_magtheridon.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\def_magtheridons_lair.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\instance_magtheridons_lair.cpp"
+                            >
+                        </File>
                     </Filter>
                     <Filter
-                        Name="Aunchindoun"
-                        >
-                        <Filter
-                            Name="Auchenai Crypts"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\auchenai_crypts\boss_exarch_maladaar.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\auchenai_crypts\boss_shirrak_the_dead_watcher.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Mana Tombs"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\mana_tombs\boss_nexusprince_shaffar.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\mana_tombs\boss_pandemonius.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Sethekk Halls"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\sethekk_halls\boss_darkweaver_syth.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\sethekk_halls\boss_tailonking_ikiss.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\sethekk_halls\def_sethekk_halls.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\sethekk_halls\instance_sethekk_halls.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Shadow Labyrinth"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\boss_ambassador_hellmaw.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\boss_blackheart_the_inciter.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\boss_grandmaster_vorpil.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\boss_murmur.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\def_shadow_labyrinth.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\instance_shadow_labyrinth.cpp"
-                                >
-                            </File>
-                        </Filter>
+                        Name="Hellfire Ramparts"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\boss_omor_the_unscarred.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\boss_vazruden_the_herald.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\boss_watchkeeper_gargolmar.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\def_hellfire_ramparts.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\instance_hellfire_ramparts.cpp"
+                            >
+                        </File>
                     </Filter>
                     <Filter
-                        Name="Black Temple"
+                        Name="Shattered Halls"
                         >
                         <File
-                            RelativePath="..\scripts\zone\black_temple\black_temple.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\boss_nethekurse.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_bloodboil.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\boss_warbringer_omrogg.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_illidan.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\boss_warchief_kargath_bladefist.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_mother_shahraz.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\def_shattered_halls.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_reliquary_of_souls.cpp"
+                            RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\instance_shattered_halls.cpp"
                             >
                         </File>
+                    </Filter>
+                </Filter>
+                <Filter
+                    Name="Tempest Keep"
+                    >
+                    <Filter
+                        Name="Arcatraz"
+                        >
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_shade_of_akama.cpp"
+                            RelativePath="..\scripts\outland\tempest_keep\arcatraz\arcatraz.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_supremus.cpp"
+                            RelativePath="..\scripts\outland\tempest_keep\arcatraz\boss_harbinger_skyriss.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_teron_gorefiend.cpp"
+                            RelativePath="..\scripts\outland\tempest_keep\arcatraz\def_arcatraz.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\boss_warlord_najentus.cpp"
+                            RelativePath="..\scripts\outland\tempest_keep\arcatraz\instance_arcatraz.cpp"
                             >
                         </File>
+                    </Filter>
+                    <Filter
+                        Name="Botanica"
+                        >
                         <File
-                            RelativePath="..\scripts\zone\black_temple\def_black_temple.h"
+                            RelativePath="..\scripts\outland\tempest_keep\botanica\boss_high_botanist_freywinn.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\illidari_council.cpp"
+                            RelativePath="..\scripts\outland\tempest_keep\botanica\boss_laj.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\zone\black_temple\instance_black_temple.cpp"
+                            RelativePath="..\scripts\outland\tempest_keep\botanica\boss_warp_splinter.cpp"
                             >
                         </File>
                     </Filter>
-                </Filter>
-                <Filter
-                    Name="Northrend"
-                    >
                     <Filter
-                        Name="Region"
+                        Name="The Eye"
                         >
-                        <Filter
-                            Name="Zul&apos;Drak"
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_eye\boss_alar.cpp"
                             >
-                        </Filter>
-                        <Filter
-                            Name="The Storm Peaks"
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_eye\boss_astromancer.cpp"
                             >
-                        </Filter>
-                        <Filter
-                            Name="Crystalsong Forest"
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_eye\boss_kaelthas.cpp"
                             >
-                        </Filter>
-                        <Filter
-                            Name="Wintergrasp"
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_eye\boss_void_reaver.cpp"
                             >
-                            <File
-                                RelativePath="..\scripts\zone\wintergrasp\wintergrasp.cpp"
-                                >
-                            </File>
-                        </Filter>
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_eye\def_the_eye.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_eye\instance_the_eye.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_eye\the_eye.cpp"
+                            >
+                        </File>
                     </Filter>
                     <Filter
-                        Name="Dungeon"
-                        >
-                        <Filter
-                            Name="Naxxramas"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_anubrekhan.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_faerlina.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_four_horsemen.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_gluth.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_gothik.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_grobbulus.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_heigan.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_kelthuzad.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_loatheb.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_maexxna.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_noth.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_patchwerk.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_razuvious.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_sapphiron.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\boss_thaddius.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\def_naxxramas.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\naxxramas\instance_naxxramas.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Nexus"
-                            >
-                            <Filter
-                                Name="Nexus"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\boss_anomalus.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\boss_keristrasza.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\boss_magus_telestra.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\boss_ormorok.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\commander_kolurg.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\commander_stoutbeard.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\def_nexus.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\nexus\instance_nexus.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                            <Filter
-                                Name="Oculus"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\oculus\boss_drakos.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\oculus\boss_eregos.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\oculus\boss_urom.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\oculus\boss_varos.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\oculus\def_oculus.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\oculus\instance_oculus.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                            <Filter
-                                Name="Eye of Eternity"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\eye_of_eternity\boss_malygos.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\eye_of_eternity\def_eye_of_eternity.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\nexus\eye_of_eternity\instance_eye_of_eternity.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                        </Filter>
-                        <Filter
-                            Name="Obsidian Sanctum"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\obsidian_sanctum\boss_sartharion.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\obsidian_sanctum\def_obsidian_sanctum.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\obsidian_sanctum\instance_obsidian_sanctum.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Ulduar"
-                            >
-                            <Filter
-                                Name="Halls of Stone"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_stone\boss_krystallus.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_stone\boss_maiden_of_grief.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_stone\boss_sjonnir.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_stone\def_halls_of_stone.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_stone\instance_halls_of_stone.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                            <Filter
-                                Name="Halls of Lightning"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_lightning\boss_bjarngrim.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_lightning\boss_ionar.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_lightning\boss_loken.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_lightning\boss_volkhan.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_lightning\def_halls_of_lightning.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\halls_of_lightning\instance_halls_of_lightning.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                            <Filter
-                                Name="Ulduar"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_algalon.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_assembly_of_iron.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_auriaya.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_flame_leviathan.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_freya.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_general_vezax.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_hodir.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_ignis.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_kologarn.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_mimiron.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_razorscale.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_thorim.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_xt002.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\boss_yoggsaron.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\def_ulduar.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\ulduar\ulduar\instance_ulduar.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                        </Filter>
-                        <Filter
-                            Name="Utgarde Keep"
-                            >
-                            <Filter
-                                Name="Utgarde Keep"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_ingvar_the_plunderer.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_keleseth.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_skarvald_dalronn.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\def_utgarde_keep.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\instance_utgarde_keep.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\utgarde_keep.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                            <Filter
-                                Name="Utgarde Pinnacle"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_pinnacle\boss_palehoof.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_pinnacle\boss_skadi.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_pinnacle\boss_svala.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_pinnacle\boss_ymiron.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_pinnacle\def_pinnacle.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\utgarde_keep\utgarde_pinnacle\instance_pinnacle.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                        </Filter>
-                        <Filter
-                            Name="Vault of Archavon"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\vault_of_archavon\boss_archavon.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\vault_of_archavon\boss_emalon.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\vault_of_archavon\def_vault_of_archavon.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\vault_of_archavon\instance_vault_of_archavon.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Violet Hold"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\boss_cyanigosa.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\boss_erekem.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\boss_ichoron.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\boss_lavanthor.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\boss_moragg.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\boss_xevozz.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\boss_zuramat.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\def_violet_hold.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\violet_hold\instance_violet_hold.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Gundrak"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\gundrak\boss_drakkari_colossus.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\gundrak\boss_eck.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\gundrak\boss_gal_darah.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\gundrak\boss_moorabi.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\gundrak\boss_slad_ran.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\gundrak\def_gundrak.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\gundrak\instance_gundrak.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Drak&apos;Tharon Keep"
-                            >
-                            <File
-                                RelativePath="..\scripts\zone\draktharon_keep\boss_dred.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\draktharon_keep\boss_novos.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\draktharon_keep\boss_tharon_ja.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\draktharon_keep\boss_trollgore.cpp"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\draktharon_keep\def_drak_tharon_keep.h"
-                                >
-                            </File>
-                            <File
-                                RelativePath="..\scripts\zone\draktharon_keep\instance_drak_tharon_keep.cpp"
-                                >
-                            </File>
-                        </Filter>
-                        <Filter
-                            Name="Azjol-Nerub"
-                            >
-                            <Filter
-                                Name="Ahn&apos;kahet"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_amanitar.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_elder_nadox.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_herald_volazj.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_jedoga_shadowseeker.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_prince_taldaram.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\def_ahnkahet.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\instance_ahnkahet.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                            <Filter
-                                Name="Azjol-Nerub"
-                                >
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\boss_anubarak.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\boss_hadronox.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\boss_krikthir_the_gatewatcher.cpp"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\def_azjol_nerub.h"
-                                    >
-                                </File>
-                                <File
-                                    RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\instance_azjol_nerub.cpp"
-                                    >
-                                </File>
-                            </Filter>
-                        </Filter>
+                        Name="The Mechanar"
+                        >
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_mechanar\boss_gatewatcher_gyrokill.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_mechanar\boss_gatewatcher_ironhand.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_mechanar\boss_nethermancer_sepethrea.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_mechanar\boss_pathaleon_the_calculator.cpp"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_mechanar\def_mechanar.h"
+                            >
+                        </File>
+                        <File
+                            RelativePath="..\scripts\outland\tempest_keep\the_mechanar\instance_mechanar.cpp"
+                            >
+                        </File>
                     </Filter>
                 </Filter>
+                <File
+                    RelativePath="..\scripts\outland\blades_edge_mountains.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\boss_doomlord_kazzak.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\boss_doomwalker.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\hellfire_peninsula.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\nagrand.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\netherstorm.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\shadowmoon_valley.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\shattrath_city.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\terokkar_forest.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\scripts\outland\zangarmarsh.cpp"
+                    >
+                </File>
             </Filter>
             <Filter
                 Name="custom"
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp
index 3538aee0c5b..3538aee0c5b 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
index 129f7b34db6..129f7b34db6 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
index 820c260801e..820c260801e 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
index 47a7d79e87b..47a7d79e87b 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
index cb34d8919d7..cb34d8919d7 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/def_ahnkahet.h b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/def_ahnkahet.h
index 97c0db55d72..97c0db55d72 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/def_ahnkahet.h
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/def_ahnkahet.h
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/instance_ahnkahet.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
index db9befd65cf..db9befd65cf 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp
index b4717824443..b4717824443 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp
index fa85563a2e7..fa85563a2e7 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
index 3e0d3e97a51..3e0d3e97a51 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/def_azjol_nerub.h b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/def_azjol_nerub.h
index 9e319e8fde0..9e319e8fde0 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/def_azjol_nerub.h
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/def_azjol_nerub.h
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
index bac772acc6f..bac772acc6f 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_dred.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_dred.cpp
index 98425a29e1a..98425a29e1a 100644
--- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_dred.cpp
+++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_dred.cpp
diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_novos.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp
index 2f1cc7d22fc..2f1cc7d22fc 100644
--- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_novos.cpp
+++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp
diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_tharon_ja.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
index 62d724f4de4..62d724f4de4 100644
--- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_tharon_ja.cpp
+++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_trollgore.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp
index 59f68c37205..59f68c37205 100644
--- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_trollgore.cpp
+++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp
diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/def_drak_tharon_keep.h b/src/bindings/scripts/scripts/northrend/draktharon_keep/def_drak_tharon_keep.h
index 321d77a9c27..321d77a9c27 100644
--- a/src/bindings/scripts/scripts/zone/draktharon_keep/def_drak_tharon_keep.h
+++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/def_drak_tharon_keep.h
diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/instance_drak_tharon_keep.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp
index 795f36eca18..795f36eca18 100644
--- a/src/bindings/scripts/scripts/zone/draktharon_keep/instance_drak_tharon_keep.cpp
+++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp
diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_drakkari_colossus.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_drakkari_colossus.cpp
index 4d18ad6ba7c..4d18ad6ba7c 100644
--- a/src/bindings/scripts/scripts/zone/gundrak/boss_drakkari_colossus.cpp
+++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_drakkari_colossus.cpp
diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_eck.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp
index 8c72de6c9ad..8c72de6c9ad 100644
--- a/src/bindings/scripts/scripts/zone/gundrak/boss_eck.cpp
+++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp
diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_gal_darah.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp
index 65edd1b312e..65edd1b312e 100644
--- a/src/bindings/scripts/scripts/zone/gundrak/boss_gal_darah.cpp
+++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp
diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_moorabi.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp
index 7bdbe0eebc9..7bdbe0eebc9 100644
--- a/src/bindings/scripts/scripts/zone/gundrak/boss_moorabi.cpp
+++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp
diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_slad_ran.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp
index 559a0090e3b..559a0090e3b 100644
--- a/src/bindings/scripts/scripts/zone/gundrak/boss_slad_ran.cpp
+++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp
diff --git a/src/bindings/scripts/scripts/zone/gundrak/def_gundrak.h b/src/bindings/scripts/scripts/northrend/gundrak/def_gundrak.h
index 5f015610312..5f015610312 100644
--- a/src/bindings/scripts/scripts/zone/gundrak/def_gundrak.h
+++ b/src/bindings/scripts/scripts/northrend/gundrak/def_gundrak.h
diff --git a/src/bindings/scripts/scripts/zone/gundrak/instance_gundrak.cpp b/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp
index 0ed874d905f..0ed874d905f 100644
--- a/src/bindings/scripts/scripts/zone/gundrak/instance_gundrak.cpp
+++ b/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_anubrekhan.cpp
index 835a5bfa2da..835a5bfa2da 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_anubrekhan.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp
index 4be8f839e3d..4be8f839e3d 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_four_horsemen.cpp
index 467f5ef62e9..467f5ef62e9 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_four_horsemen.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp
index a92c34a019c..a92c34a019c 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp
index f98e7667e6e..f98e7667e6e 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_grobbulus.cpp
index 9195e0e7828..9195e0e7828 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_grobbulus.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_heigan.cpp
index 8491ab95703..8491ab95703 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_heigan.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_highlord_mograine.cpp
index 9bef8ebd3f9..9bef8ebd3f9 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_highlord_mograine.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp
index a93ff572ab0..a93ff572ab0 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_loatheb.cpp
index eb53583752f..eb53583752f 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_loatheb.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp
index 63ffb995cd5..63ffb995cd5 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_noth.cpp
index 87f9a96ad61..87f9a96ad61 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_noth.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp
index d50c72d8fa6..d50c72d8fa6 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp
index 2ade34b6e6d..2ade34b6e6d 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp
index f0dd9e735cb..f0dd9e735cb 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp
index b40b5aca876..b40b5aca876 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/def_naxxramas.h b/src/bindings/scripts/scripts/northrend/naxxramas/def_naxxramas.h
index 383200d4600..383200d4600 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/def_naxxramas.h
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/def_naxxramas.h
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/instance_naxxramas.cpp
index f6121c18ef5..f6121c18ef5 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/instance_naxxramas.cpp
diff --git a/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp b/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp
index b187fa10656..b187fa10656 100644
--- a/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp
diff --git a/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/def_eye_of_eternity.h b/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/def_eye_of_eternity.h
index caa82a92e95..caa82a92e95 100644
--- a/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/def_eye_of_eternity.h
+++ b/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/def_eye_of_eternity.h
diff --git a/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/instance_eye_of_eternity.cpp b/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
index 7c89a117d92..7c89a117d92 100644
--- a/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp
index 832dc9274e2..832dc9274e2 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp
index 072e6db1a1f..072e6db1a1f 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_magus_telestra.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp
index 2fe856cea05..2fe856cea05 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_magus_telestra.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_ormorok.cpp
index d55e8514cc6..d55e8514cc6 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_ormorok.cpp
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_kolurg.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/commander_kolurg.cpp
index a28deb89264..a28deb89264 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_kolurg.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/commander_kolurg.cpp
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_stoutbeard.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp
index 1bacd679e25..1bacd679e25 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_stoutbeard.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/def_nexus.h b/src/bindings/scripts/scripts/northrend/nexus/nexus/def_nexus.h
index 678e44e5bbe..678e44e5bbe 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/def_nexus.h
+++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/def_nexus.h
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/instance_nexus.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/instance_nexus.cpp
index 169eda90d2a..169eda90d2a 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/instance_nexus.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/instance_nexus.cpp
diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_drakos.cpp b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_drakos.cpp
index bde90bf021e..bde90bf021e 100644
--- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_drakos.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_drakos.cpp
diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_eregos.cpp b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_eregos.cpp
index cc3fa3b3043..cc3fa3b3043 100644
--- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_eregos.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_eregos.cpp
diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_urom.cpp b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_urom.cpp
index 1f34ecefbbd..1f34ecefbbd 100644
--- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_urom.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_urom.cpp
diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_varos.cpp b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_varos.cpp
index 299c54dd8dc..299c54dd8dc 100644
--- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_varos.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_varos.cpp
diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/def_oculus.h b/src/bindings/scripts/scripts/northrend/nexus/oculus/def_oculus.h
index 0b63a52d866..0b63a52d866 100644
--- a/src/bindings/scripts/scripts/zone/nexus/oculus/def_oculus.h
+++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/def_oculus.h
diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/instance_oculus.cpp b/src/bindings/scripts/scripts/northrend/nexus/oculus/instance_oculus.cpp
index b5ceee9e5ed..b5ceee9e5ed 100644
--- a/src/bindings/scripts/scripts/zone/nexus/oculus/instance_oculus.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/instance_oculus.cpp
diff --git a/src/bindings/scripts/scripts/zone/obsidian_sanctum/boss_sartharion.cpp b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp
index 01ba351ff99..01ba351ff99 100644
--- a/src/bindings/scripts/scripts/zone/obsidian_sanctum/boss_sartharion.cpp
+++ b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp
diff --git a/src/bindings/scripts/scripts/zone/obsidian_sanctum/def_obsidian_sanctum.h b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/def_obsidian_sanctum.h
index 461834a2386..461834a2386 100644
--- a/src/bindings/scripts/scripts/zone/obsidian_sanctum/def_obsidian_sanctum.h
+++ b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/def_obsidian_sanctum.h
diff --git a/src/bindings/scripts/scripts/zone/obsidian_sanctum/instance_obsidian_sanctum.cpp b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp
index 5dd3e06e585..5dd3e06e585 100644
--- a/src/bindings/scripts/scripts/zone/obsidian_sanctum/instance_obsidian_sanctum.cpp
+++ b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_bjarngrim.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp
index 5b6301019a5..5b6301019a5 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_bjarngrim.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_ionar.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp
index 227d23b154a..227d23b154a 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_ionar.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_loken.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp
index 164b393b6d9..164b393b6d9 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_loken.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_volkhan.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
index 35eadb9783e..35eadb9783e 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_volkhan.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/def_halls_of_lightning.h b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/def_halls_of_lightning.h
index 8790274e599..8790274e599 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/def_halls_of_lightning.h
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/def_halls_of_lightning.h
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
index e9d75fb8b6f..e9d75fb8b6f 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp
index e7ec03124de..e7ec03124de 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
index 51e8f26f6a9..51e8f26f6a9 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
index d0b0889ea63..d0b0889ea63 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/def_halls_of_stone.h b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/def_halls_of_stone.h
index ade934ad921..ade934ad921 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/def_halls_of_stone.h
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/def_halls_of_stone.h
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/instance_halls_of_stone.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
index fa2dd83637f..fa2dd83637f 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/instance_halls_of_stone.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_algalon.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_algalon.cpp
index a736b2db12a..a736b2db12a 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_algalon.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_algalon.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_assembly_of_iron.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp
index a736b2db12a..a736b2db12a 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_assembly_of_iron.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_auriaya.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp
index 685e2b506c0..685e2b506c0 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_auriaya.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_flame_leviathan.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp
index 20ad85351a9..20ad85351a9 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_flame_leviathan.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_freya.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_freya.cpp
index a736b2db12a..a736b2db12a 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_freya.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_freya.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_general_vezax.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_general_vezax.cpp
index a736b2db12a..a736b2db12a 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_general_vezax.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_general_vezax.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_hodir.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_hodir.cpp
index a736b2db12a..a736b2db12a 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_hodir.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_hodir.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_ignis.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp
index 56405eb13e1..56405eb13e1 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_ignis.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_kologarn.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp
index a736b2db12a..a736b2db12a 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_kologarn.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_mimiron.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_mimiron.cpp
index a736b2db12a..a736b2db12a 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_mimiron.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_mimiron.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_razorscale.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp
index 59a7b8e6a9a..59a7b8e6a9a 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_razorscale.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_thorim.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_thorim.cpp
index a736b2db12a..a736b2db12a 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_thorim.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_thorim.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_xt002.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_xt002.cpp
index a0d265f6224..a0d265f6224 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_xt002.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_xt002.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_yoggsaron.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_yoggsaron.cpp
index a736b2db12a..a736b2db12a 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_yoggsaron.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_yoggsaron.cpp
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/def_ulduar.h b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/def_ulduar.h
index d73e6324fc8..d73e6324fc8 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/def_ulduar.h
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/def_ulduar.h
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/instance_ulduar.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp
index a736b2db12a..a736b2db12a 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/instance_ulduar.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
index a2445a97229..a2445a97229 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp
index b7701a52472..b7701a52472 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
index 49811125594..49811125594 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/def_utgarde_keep.h b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/def_utgarde_keep.h
index b630e156564..b630e156564 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/def_utgarde_keep.h
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/def_utgarde_keep.h
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
index 4c7668970da..4c7668970da 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/utgarde_keep.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp
index d82e45f28d4..d82e45f28d4 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/utgarde_keep.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
index 503cae94f4d..503cae94f4d 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
index f21ae75318a..f21ae75318a 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
index e43d0cd9d4d..e43d0cd9d4d 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
index 43a16a78db4..43a16a78db4 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/def_pinnacle.h b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/def_pinnacle.h
index 82e2173fab5..82e2173fab5 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/def_pinnacle.h
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/def_pinnacle.h
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
index e1361c8960e..e1361c8960e 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_archavon.cpp b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_archavon.cpp
index 2a0e7fcd007..2a0e7fcd007 100644
--- a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_archavon.cpp
+++ b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_archavon.cpp
diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp
index 94290a05007..94290a05007 100644
--- a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp
+++ b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp
diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/def_vault_of_archavon.h b/src/bindings/scripts/scripts/northrend/vault_of_archavon/def_vault_of_archavon.h
index 95c44035184..95c44035184 100644
--- a/src/bindings/scripts/scripts/zone/vault_of_archavon/def_vault_of_archavon.h
+++ b/src/bindings/scripts/scripts/northrend/vault_of_archavon/def_vault_of_archavon.h
diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp b/src/bindings/scripts/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp
index 45d0a4be7ae..45d0a4be7ae 100644
--- a/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp
+++ b/src/bindings/scripts/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_cyanigosa.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp
index 13ad8c27a75..13ad8c27a75 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/boss_cyanigosa.cpp
+++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_erekem.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp
index d5f18ac806f..d5f18ac806f 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/boss_erekem.cpp
+++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_ichoron.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_ichoron.cpp
index 60b1c656808..60b1c656808 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/boss_ichoron.cpp
+++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_ichoron.cpp
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_lavanthor.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_lavanthor.cpp
index 430a8acb178..430a8acb178 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/boss_lavanthor.cpp
+++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_lavanthor.cpp
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_moragg.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp
index fdc18a3c549..fdc18a3c549 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/boss_moragg.cpp
+++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_xevozz.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_xevozz.cpp
index b59c4aec4e1..b59c4aec4e1 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/boss_xevozz.cpp
+++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_xevozz.cpp
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_zuramat.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp
index 218b5915bec..218b5915bec 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/boss_zuramat.cpp
+++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/def_violet_hold.h b/src/bindings/scripts/scripts/northrend/violet_hold/def_violet_hold.h
index 71bc0d18d2f..71bc0d18d2f 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/def_violet_hold.h
+++ b/src/bindings/scripts/scripts/northrend/violet_hold/def_violet_hold.h
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/instance_violet_hold.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp
index 98962b919e0..98962b919e0 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/instance_violet_hold.cpp
+++ b/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp
diff --git a/src/bindings/scripts/scripts/zone/wintergrasp/wintergrasp.cpp b/src/bindings/scripts/scripts/northrend/wintergrasp.cpp
index 275043d91e5..275043d91e5 100644
--- a/src/bindings/scripts/scripts/zone/wintergrasp/wintergrasp.cpp
+++ b/src/bindings/scripts/scripts/northrend/wintergrasp.cpp
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/src/bindings/scripts/scripts/outland/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
index 414804a6576..414804a6576 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
+++ b/src/bindings/scripts/scripts/outland/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/bindings/scripts/scripts/outland/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
index 4dfdd407731..4dfdd407731 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/bindings/scripts/scripts/outland/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/bindings/scripts/scripts/outland/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
index dcaaefee8c2..dcaaefee8c2 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
+++ b/src/bindings/scripts/scripts/outland/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp b/src/bindings/scripts/scripts/outland/aunchindoun/mana_tombs/boss_pandemonius.cpp
index 77e1c535340..77e1c535340 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp
+++ b/src/bindings/scripts/scripts/outland/aunchindoun/mana_tombs/boss_pandemonius.cpp
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/bindings/scripts/scripts/outland/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp
index 00e43fa257d..00e43fa257d 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp
+++ b/src/bindings/scripts/scripts/outland/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/bindings/scripts/scripts/outland/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
index 7830fc10645..7830fc10645 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
+++ b/src/bindings/scripts/scripts/outland/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/def_sethekk_halls.h b/src/bindings/scripts/scripts/outland/aunchindoun/sethekk_halls/def_sethekk_halls.h
index 6156f354d84..6156f354d84 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/def_sethekk_halls.h
+++ b/src/bindings/scripts/scripts/outland/aunchindoun/sethekk_halls/def_sethekk_halls.h
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp b/src/bindings/scripts/scripts/outland/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp
index 060e09a1325..060e09a1325 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp
+++ b/src/bindings/scripts/scripts/outland/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/bindings/scripts/scripts/outland/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
index f9961e10174..f9961e10174 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/bindings/scripts/scripts/outland/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/bindings/scripts/scripts/outland/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
index 73374c08f8c..73374c08f8c 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/bindings/scripts/scripts/outland/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/bindings/scripts/scripts/outland/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
index 0cc6255f3cf..0cc6255f3cf 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/bindings/scripts/scripts/outland/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp b/src/bindings/scripts/scripts/outland/aunchindoun/shadow_labyrinth/boss_murmur.cpp
index 259f6091af6..259f6091af6 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp
+++ b/src/bindings/scripts/scripts/outland/aunchindoun/shadow_labyrinth/boss_murmur.cpp
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h b/src/bindings/scripts/scripts/outland/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h
index a78955368bf..a78955368bf 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h
+++ b/src/bindings/scripts/scripts/outland/aunchindoun/shadow_labyrinth/def_shadow_labyrinth.h
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/bindings/scripts/scripts/outland/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
index f8f3b73bffa..f8f3b73bffa 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
+++ b/src/bindings/scripts/scripts/outland/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
diff --git a/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp b/src/bindings/scripts/scripts/outland/black_temple/black_temple.cpp
index 7f0f1e570ba..7f0f1e570ba 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/black_temple.cpp
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp
index 12c3d445018..12c3d445018 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp
index 2baa0abbe81..2baa0abbe81 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp
index a33874c74cf..a33874c74cf 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
index aa81259e451..aa81259e451 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp
index ea987bf4963..ea987bf4963 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp
index 669b0a25629..669b0a25629 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp
index 25a82877388..25a82877388 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp
index 1616333b007..1616333b007 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp
diff --git a/src/bindings/scripts/scripts/zone/black_temple/def_black_temple.h b/src/bindings/scripts/scripts/outland/black_temple/def_black_temple.h
index c98c0b1c363..c98c0b1c363 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/def_black_temple.h
+++ b/src/bindings/scripts/scripts/outland/black_temple/def_black_temple.h
diff --git a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp b/src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp
index 6b86140b659..6b86140b659 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp
diff --git a/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp b/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp
index 173632009ba..173632009ba 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
index 1e62083f1f9..1e62083f1f9 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
index 434e088cd99..434e088cd99 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
index c1a2280653c..c1a2280653c 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
index e43afc2926f..e43afc2926f 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
index 38abc8f1507..38abc8f1507 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
index 80e05cc494b..80e05cc494b 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h
index 13144bc93c0..13144bc93c0 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
index ebeda6aa565..ebeda6aa565 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
index 3bec4de6876..3bec4de6876 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
index d8cc2e0ef47..d8cc2e0ef47 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
index 0f4f2689398..0f4f2689398 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/def_steam_vault.h
index 4b407ac4816..4b407ac4816 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/def_steam_vault.h
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
index 29616a123ad..29616a123ad 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp
index 309c63d857e..309c63d857e 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
index 6da2a022adf..6da2a022adf 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp
index dc4d9df18c4..dc4d9df18c4 100644
--- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp
+++ b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp
diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
index 6918feaabba..6918feaabba 100644
--- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp
+++ b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/def_gruuls_lair.h b/src/bindings/scripts/scripts/outland/gruuls_lair/def_gruuls_lair.h
index 7003dcb1e26..7003dcb1e26 100644
--- a/src/bindings/scripts/scripts/zone/gruuls_lair/def_gruuls_lair.h
+++ b/src/bindings/scripts/scripts/outland/gruuls_lair/def_gruuls_lair.h
diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp b/src/bindings/scripts/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
index 0ac5cbcaf7a..0ac5cbcaf7a 100644
--- a/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp
+++ b/src/bindings/scripts/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
index 6c877602426..6c877602426 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
index 097a1f21a0d..097a1f21a0d 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
index 9902c505b6b..9902c505b6b 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/def_blood_furnace.h b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/def_blood_furnace.h
index b845c66823f..b845c66823f 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/def_blood_furnace.h
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/def_blood_furnace.h
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
index 5a18ded0c08..5a18ded0c08 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
index e7411187e86..e7411187e86 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
index 98aa4627be2..98aa4627be2 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
index 13059c55ff2..13059c55ff2 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h
index 4adf140b0ca..4adf140b0ca 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
index 5942f0142ef..5942f0142ef 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
index 8f7c076a701..8f7c076a701 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h
index c5469acaea0..c5469acaea0 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
index eb8e9b1a961..eb8e9b1a961 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
index 721d1efd03c..721d1efd03c 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
index 0681e94e2b0..0681e94e2b0 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
index 4fa673f3560..4fa673f3560 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/def_shattered_halls.h
index cbfa23ec4e0..cbfa23ec4e0 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/def_shattered_halls.h
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
index 864a49a84ba..864a49a84ba 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp
index fc855b74bd9..fc855b74bd9 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
index bcab1a6257f..bcab1a6257f 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/def_arcatraz.h b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/def_arcatraz.h
index 3f8dee8bbd0..3f8dee8bbd0 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/def_arcatraz.h
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/def_arcatraz.h
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
index 081c80c56e5..081c80c56e5 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
index c63fb1b8d58..c63fb1b8d58 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_laj.cpp
index ddd5745f93c..ddd5745f93c 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_laj.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp
index a9b111be839..a9b111be839 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp
index e57f3294a55..e57f3294a55 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
index 81f3c619bac..81f3c619bac 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
index d341e52ae06..d341e52ae06 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
index 60cfaf1609d..60cfaf1609d 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/def_the_eye.h b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/def_the_eye.h
index d0d3ea09061..d0d3ea09061 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/def_the_eye.h
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/def_the_eye.h
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
index f973f96c1ff..f973f96c1ff 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp
index 2dfff45796f..2dfff45796f 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/the_eye.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp
index 268cfeb2918..268cfeb2918 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
index a1ca31c3e5e..a1ca31c3e5e 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
index da6c613d794..da6c613d794 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
index 1e06232c9b6..1e06232c9b6 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/def_mechanar.h b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/def_mechanar.h
index d1b53eebf53..d1b53eebf53 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/def_mechanar.h
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/def_mechanar.h
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
index e43190620d9..e43190620d9 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
diff --git a/src/bindings/scripts/scripts/zone/black_temple/.instance_black_temple.cpp-s8inyu b/src/bindings/scripts/scripts/zone/black_temple/.instance_black_temple.cpp-s8inyu
deleted file mode 100644
index 43646746505..00000000000
--- a/src/bindings/scripts/scripts/zone/black_temple/.instance_black_temple.cpp-s8inyu
+++ /dev/null
@@ -1,347 +0,0 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-/* ScriptData
-SDName: Instance_Black_Temple
-SD%Complete: 100
-SDComment: Instance Data Scripts and functions to acquire mobs and set encounter status for use in various Black Temple Scripts
-SDCategory: Black Temple
-EndScriptData */
-
-#include "precompiled.h"
-#include "def_black_temple.h"
-
-#define ENCOUNTERS     9
-
-/* Black Temple encounters:
-0 - High Warlord Naj'entus event
-1 - Supremus Event
-2 - Shade of Akama Event
-3 - Teron Gorefiend Event
-4 - Gurtogg Bloodboil Event
-5 - Reliquary Of Souls Event
-6 - Mother Shahraz Event
-7 - Illidari Council Event
-8 - Illidan Stormrage Event
-*/
-
-struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance
-{
-    instance_black_temple(Map *map) : ScriptedInstance(map) {Initialize();};
-
-    uint32 Encounters[ENCOUNTERS];
-    std::string str_data;
-	
-    uint64 Najentus;
-    uint64 Akama;                                           // This is the Akama that starts the Illidan encounter.
-    uint64 Akama_Shade;                                     // This is the Akama that starts the Shade of Akama encounter.
-    uint64 ShadeOfAkama;
-    uint64 Supremus;
-    uint64 LadyMalande;
-    uint64 GathiosTheShatterer;
-    uint64 HighNethermancerZerevor;
-    uint64 VerasDarkshadow;
-    uint64 IllidariCouncil;
-    uint64 BloodElfCouncilVoice;
-    uint64 IllidanStormrage;
-
-    uint64 NajentusGate;
-    uint64 MainTempleDoors;
-    uint64 ShadeOfAkamaDoor;
-    uint64 CommonDoor;//Teron
-    uint64 TeronDoor;
-    uint64 GuurtogDoor;
-    uint64 MotherDoor;
-    uint64 TempleDoor;//Befor mother
-    uint64 CouncilDoor;
-    uint64 SimpleDoor;//council
-    uint64 IllidanGate;
-    uint64 IllidanDoor[2];
-
-    void Initialize()
-    {
-        Najentus = 0;
-        Akama = 0;
-        Akama_Shade = 0;
-        ShadeOfAkama = 0;
-        Supremus = 0;
-        LadyMalande = 0;
-        GathiosTheShatterer = 0;
-        HighNethermancerZerevor = 0;
-        VerasDarkshadow = 0;
-        IllidariCouncil = 0;
-        BloodElfCouncilVoice = 0;
-        IllidanStormrage = 0;
-
-        NajentusGate    = 0;
-        MainTempleDoors = 0;
-        ShadeOfAkamaDoor= 0;
-        CommonDoor              = 0;//teron
-        TeronDoor               = 0;
-        GuurtogDoor             = 0;
-        MotherDoor              = 0;
-        TempleDoor              = 0;
-        SimpleDoor              = 0;//Bycouncil
-        CouncilDoor             = 0;
-        IllidanGate     = 0;
-        IllidanDoor[0]  = 0;
-        IllidanDoor[1]  = 0;
-
-        for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            Encounters[i] = NOT_STARTED;
-    }
-
-    bool IsEncounterInProgress() const
-    {
-        for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS) return true;
-
-        return false;
-    }
-
-    Player* GetPlayerInMap()
-    {
-        Map::PlayerList const& players = instance->GetPlayers();
-
-        if (!players.isEmpty())
-        {
-            for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
-            {
-                if (Player* plr = itr->getSource())
-                    return plr;
-            }
-        }
-
-        debug_log("TSCR: Instance Black Temple: GetPlayerInMap, but PlayerList is empty!");
-        return NULL;
-    }
-
-    void OnCreatureCreate(Creature *creature, uint32 creature_entry)
-    {
-        switch(creature->GetEntry())
-        {
-        case 22887:    Najentus = creature->GetGUID();                  break;
-        case 23089:    Akama = creature->GetGUID();                     break;
-        case 22990:    Akama_Shade = creature->GetGUID();               break;
-        case 22841:    ShadeOfAkama = creature->GetGUID();              break;
-        case 22898:    Supremus = creature->GetGUID();                  break;
-        case 22917:    IllidanStormrage = creature->GetGUID();          break;
-        case 22949:    GathiosTheShatterer = creature->GetGUID();       break;
-        case 22950:    HighNethermancerZerevor = creature->GetGUID();   break;
-        case 22951:    LadyMalande = creature->GetGUID();               break;
-        case 22952:    VerasDarkshadow = creature->GetGUID();           break;
-        case 23426:    IllidariCouncil = creature->GetGUID();           break;
-        case 23499:    BloodElfCouncilVoice = creature->GetGUID();      break;
-        }
-    }
-
-    void OnObjectCreate(GameObject* go)
-    {
-        switch(go->GetEntry())
-        {
-        case 185483: NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards)
-            if(Encounters[0] == DONE)HandleGameObject(NULL,true,go);break;
-        case 185882: MainTempleDoors = go->GetGUID();// Main Temple Doors - right past Supermoose (Supremus)
-            if(Encounters[1] == DONE)HandleGameObject(NULL,true,go);break;
-        case 185478: ShadeOfAkamaDoor = go->GetGUID();break;
-        case 185480: CommonDoor = go->GetGUID();
-            if(Encounters[3] == DONE)HandleGameObject(NULL,true,go);;break;
-        case 186153: TeronDoor = go->GetGUID();
-            if(Encounters[3] == DONE)HandleGameObject(NULL,true,go);;break;
-        case 185892: GuurtogDoor = go->GetGUID();
-            if(Encounters[4] == DONE)HandleGameObject(NULL,true,go);break;
-        case 185479: TempleDoor = go->GetGUID();
-            if(Encounters[5] == DONE)HandleGameObject(NULL,true,go);break;
-        case 185482: MotherDoor = go->GetGUID();
-            if(Encounters[6] == DONE)HandleGameObject(NULL,true,go);break;
-        case 185481: CouncilDoor = go->GetGUID();
-            if(Encounters[7] == DONE)HandleGameObject(NULL,true,go);break;
-        case 186152: SimpleDoor = go->GetGUID();
-            if(Encounters[7] == DONE)HandleGameObject(NULL,true,go);break;
-        case 185905: IllidanGate = go->GetGUID(); break; // Gate leading to Temple Summit
-        case 186261: IllidanDoor[0] = go->GetGUID(); break; // Right door at Temple Summit
-        case 186262: IllidanDoor[1] = go->GetGUID(); break; // Left door at Temple Summit
-        }
-    }
-
-    uint64 GetData64(uint32 identifier)
-    {
-        switch(identifier)
-        {
-        case DATA_HIGHWARLORDNAJENTUS:         return Najentus;
-        case DATA_AKAMA:                       return Akama;
-        case DATA_AKAMA_SHADE:                 return Akama_Shade;
-        case DATA_SHADEOFAKAMA:                return ShadeOfAkama;
-        case DATA_SUPREMUS:                    return Supremus;
-        case DATA_ILLIDANSTORMRAGE:            return IllidanStormrage;
-        case DATA_GATHIOSTHESHATTERER:         return GathiosTheShatterer;
-        case DATA_HIGHNETHERMANCERZEREVOR:     return HighNethermancerZerevor;
-        case DATA_LADYMALANDE:                 return LadyMalande;
-        case DATA_VERASDARKSHADOW:             return VerasDarkshadow;
-        case DATA_ILLIDARICOUNCIL:             return IllidariCouncil;
-        case DATA_GAMEOBJECT_NAJENTUS_GATE:    return NajentusGate;
-        case DATA_GAMEOBJECT_ILLIDAN_GATE:     return IllidanGate;
-        case DATA_GAMEOBJECT_ILLIDAN_DOOR_R:   return IllidanDoor[0];
-        case DATA_GAMEOBJECT_ILLIDAN_DOOR_L:   return IllidanDoor[1];
-        case DATA_GAMEOBJECT_SUPREMUS_DOORS:   return MainTempleDoors;
-        case DATA_BLOOD_ELF_COUNCIL_VOICE:     return BloodElfCouncilVoice;
-        }
-
-        return 0;
-    }
-
-    void SetData(uint32 type, uint32 data)
-    {
-        switch(type)
-        {
-        case DATA_HIGHWARLORDNAJENTUSEVENT:
-            if(data == DONE)
-            {
-                HandleGameObject(NajentusGate, true);
-            }
-            Encounters[0] = data;break;
-        case DATA_SUPREMUSEVENT:
-            if(data == DONE)
-            {
-                HandleGameObject(NajentusGate, true);
-            }
-            Encounters[1] = data; break;
-        case DATA_SHADEOFAKAMAEVENT:
-            if(data == IN_PROGRESS)
-            {
-                HandleGameObject(ShadeOfAkamaDoor, false);
-            }else HandleGameObject(ShadeOfAkamaDoor, true);
-            Encounters[2] = data; break;
-        case DATA_TERONGOREFIENDEVENT:
-            if(data == IN_PROGRESS)
-            {
-                HandleGameObject(TeronDoor, false);
-                HandleGameObject(CommonDoor, false);
-            }else
-            {
-                HandleGameObject(TeronDoor, true);
-                HandleGameObject(CommonDoor, true);
-            }
-            Encounters[3] = data; break;
-        case DATA_GURTOGGBLOODBOILEVENT:
-            if(data == DONE)
-            {
-                HandleGameObject(GuurtogDoor, true);
-            }
-            Encounters[4] = data; break;
-        case DATA_RELIQUARYOFSOULSEVENT:
-            if(data == DONE)
-            {
-                HandleGameObject(TempleDoor, true);
-            }
-            Encounters[5] = data;         break;
-        case DATA_MOTHERSHAHRAZEVENT:
-            if(data == DONE)
-            {
-                HandleGameObject(MotherDoor, true);
-            }
-            Encounters[6] = data; break;
-        case DATA_ILLIDARICOUNCILEVENT:
-            if(data == IN_PROGRESS)
-            {
-                HandleGameObject(CouncilDoor, false);
-                HandleGameObject(SimpleDoor, false);
-            }else
-            {
-                HandleGameObject(CouncilDoor, true);
-                HandleGameObject(SimpleDoor, true);
-            }
-            Encounters[7] = data; break;
-        case DATA_ILLIDANSTORMRAGEEVENT:      Encounters[8] = data;         break;
-        }
-
-        if (data == DONE)
-        {
-            OUT_SAVE_INST_DATA;
-
-            std::ostringstream saveStream;
-            saveStream << Encounters[0] << " " << Encounters[1] << " "
-                << Encounters[2] << " " << Encounters[3] << " " << Encounters[4]
-            << " " << Encounters[5] << " " << Encounters[6] << " " << Encounters[7]
-            << " " << Encounters[8];
-
-            str_data = saveStream.str();
-
-            SaveToDB();
-            OUT_SAVE_INST_DATA_COMPLETE;
-        }
-    }
-
-    uint32 GetData(uint32 type)
-    {
-        switch(type)
-        {
-        case DATA_HIGHWARLORDNAJENTUSEVENT:         return Encounters[0];
-        case DATA_SUPREMUSEVENT:                    return Encounters[1];
-        case DATA_SHADEOFAKAMAEVENT:                return Encounters[2];
-        case DATA_TERONGOREFIENDEVENT:              return Encounters[3];
-        case DATA_GURTOGGBLOODBOILEVENT:            return Encounters[4];
-        case DATA_RELIQUARYOFSOULSEVENT:            return Encounters[5];
-        case DATA_MOTHERSHAHRAZEVENT:               return Encounters[6];
-        case DATA_ILLIDARICOUNCILEVENT:             return Encounters[7];
-        case DATA_ILLIDANSTORMRAGEEVENT:            return Encounters[8];
-        }
-
-        return 0;
-    }
-
-   const char* Save()
-    {
-        return str_data.c_str();
-    }
-
-    void Load(const char* in)
-    {
-        if (!in)
-        {
-            OUT_LOAD_INST_DATA_FAIL;
-            return;
-        }
-
-        OUT_LOAD_INST_DATA(in);
-
-        std::istringstream loadStream(in);
-        loadStream >> Encounters[0] >> Encounters[1] >> Encounters[2]
-        >> Encounters[3] >> Encounters[4] >> Encounters[5] >> Encounters[6]
-        >> Encounters[7] >> Encounters[8];
-
-        for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if (Encounters[i] == IN_PROGRESS)
-                Encounters[i] = NOT_STARTED;
-
-        OUT_LOAD_INST_DATA_COMPLETE;
-    }
-};
-
-InstanceData* GetInstanceData_instance_black_temple(Map* map)
-{
-    return new instance_black_temple(map);
-}
-
-void AddSC_instance_black_temple()
-{
-    Script *newscript;
-    newscript = new Script;
-    newscript->Name = "instance_black_temple";
-    newscript->GetInstanceData = &GetInstanceData_instance_black_temple;
-    newscript->RegisterSelf();
-}
-
diff --git a/src/bindings/scripts/system/ScriptLoader.cpp b/src/bindings/scripts/system/ScriptLoader.cpp
index 6f49b54a515..85221f5cb7e 100644
--- a/src/bindings/scripts/system/ScriptLoader.cpp
+++ b/src/bindings/scripts/system/ScriptLoader.cpp
@@ -250,58 +250,75 @@ extern void AddSC_teldrassil();
 extern void AddSC_the_barrens();
 extern void AddSC_thousand_needles();
 extern void AddSC_thunder_bluff();
+extern void AddSC_ungoro_crater();
 extern void AddSC_winterspring();
 
 //northrend
+extern void AddSC_instance_ahnkahet();          //Azjol-Nerub Ahn'kahet
+extern void AddSC_boss_elder_nadox();
+extern void AddSC_boss_anubrekhan();            //Naxxramas
+extern void AddSC_boss_maexxna();
+extern void AddSC_boss_patchwerk();
+extern void AddSC_boss_grobbulus();
+extern void AddSC_boss_razuvious();
+extern void AddSC_boss_kelthuzad();
+extern void AddSC_boss_loatheb();
+extern void AddSC_boss_noth();
+extern void AddSC_boss_gluth();
+extern void AddSC_boss_sapphiron();
+extern void AddSC_boss_four_horsemen();
+extern void AddSC_boss_faerlina();
+extern void AddSC_boss_heigan();
+extern void AddSC_boss_gothik();
+extern void AddSC_boss_thaddius();
+extern void AddSC_instance_naxxramas();
+extern void AddSC_boss_magus_telestra();        //The Nexus Nexus
+extern void AddSC_boss_anomalus();
+extern void AddSC_boss_ormorok();
+extern void AddSC_boss_keristrasza();
+extern void AddSC_instance_nexus();
+extern void AddSC_boss_sartharion();            //Obsidian Sanctum
+extern void AddSC_instance_obsidian_sanctum();
+extern void AddSC_boss_bjarngrim();             //Ulduar Halls of Lightning
+extern void AddSC_boss_loken();
+extern void AddSC_instance_halls_of_lightning();
+extern void AddSC_boss_auriaya();               //Ulduar Ulduar
+extern void AddSC_boss_flame_leviathan();
+extern void AddSC_boss_ignis();
+extern void AddSC_boss_razorscale();
+extern void AddSC_boss_xt002();
+//extern void AddSC_instance_ulduar();
+extern void AddSC_boss_keleseth();              //Utgarde Keep
+extern void AddSC_boss_skarvald_dalronn();
+extern void AddSC_boss_ingvar_the_plunderer();
+extern void AddSC_instance_utgarde_keep();
+extern void AddSC_utgarde_keep();
+extern void AddSC_boss_archavon();              //Vault of Archavon
+extern void AddSC_boss_emalon();
+extern void AddSC_instance_archavon();
+
 extern void AddSC_borean_tundra();
 extern void AddSC_dragonblight();
 extern void AddSC_grizzly_hills();
 extern void AddSC_icecrown();
 extern void AddSC_sholazar_basin();
+extern void AddSC_wintergrasp();
 extern void AddSC_zuldrak();
 
 //outland
-extern void AddSC_blades_edge_mountains();
-extern void AddSC_boss_doomlordkazzak();
-extern void AddSC_boss_doomwalker();
-extern void AddSC_hellfire_peninsula();
-extern void AddSC_nagrand();
-extern void AddSC_netherstorm();
-extern void AddSC_shadowmoon_valley();
-extern void AddSC_shattrath_city();
-extern void AddSC_terokkar_forest();
-extern void AddSC_zangarmarsh();
-
-//--------------------
-//------ ZONE --------
-
-//Aunchindoun
-//--Auchenai Crypts
-extern void AddSC_boss_exarch_maladaar();
+extern void AddSC_boss_exarch_maladaar();           //Aunchindoun Auchenai Crypts
 extern void AddSC_boss_shirrak_the_dead_watcher();
-//--Mana Tombs
-extern void AddSC_boss_nexusprince_shaffar();
+extern void AddSC_boss_nexusprince_shaffar();       //Aunchindoun Mana Tombs
 extern void AddSC_boss_pandemonius();
-
-//--Sekketh Halls
-extern void AddSC_boss_darkweaver_syth();
+extern void AddSC_boss_darkweaver_syth();           //Aunchindoun Sekketh Halls
 extern void AddSC_boss_talon_king_ikiss();
 extern void AddSC_instance_sethekk_halls();
-
-//--Shadow Labyrinth
-extern void AddSC_instance_shadow_labyrinth();
+extern void AddSC_instance_shadow_labyrinth();      //Aunchindoun Shadow Labyrinth
 extern void AddSC_boss_ambassador_hellmaw();
 extern void AddSC_boss_blackheart_the_inciter();
 extern void AddSC_boss_grandmaster_vorpil();
 extern void AddSC_boss_murmur();
-
-//Azjol-Nerub
-//--Ahn'kahet
-extern void AddSC_instance_ahnkahet();
-extern void AddSC_boss_elder_nadox();
-
-//Black Temple
-extern void AddSC_black_temple();
+extern void AddSC_black_temple();                   //Black Temple
 extern void AddSC_boss_illidan();
 extern void AddSC_boss_shade_of_akama();
 extern void AddSC_boss_supremus();
@@ -312,149 +329,63 @@ extern void AddSC_boss_teron_gorefiend();
 extern void AddSC_boss_najentus();
 extern void AddSC_boss_illidari_council();
 extern void AddSC_instance_black_temple();
-
-//Coilfang Resevoir
-//--Serpent Shrine Cavern
-extern void AddSC_boss_fathomlord_karathress();
+extern void AddSC_boss_fathomlord_karathress();     //CR Serpent Shrine Cavern
 extern void AddSC_boss_hydross_the_unstable();
 extern void AddSC_boss_lady_vashj();
 extern void AddSC_boss_leotheras_the_blind();
 extern void AddSC_boss_morogrim_tidewalker();
 extern void AddSC_instance_serpentshrine_cavern();
 extern void AddSC_boss_the_lurker_below();
-
-//--Slave Pens
-
-//--Steam Vault
-extern void AddSC_boss_hydromancer_thespia();
+extern void AddSC_boss_hydromancer_thespia();       //CR Steam Vault
 extern void AddSC_boss_mekgineer_steamrigger();
 extern void AddSC_boss_warlord_kalithresh();
 extern void AddSC_instance_steam_vault();
-
-//--Underbog
-extern void AddSC_boss_hungarfen();
+extern void AddSC_boss_hungarfen();                 //CR Underbog
 extern void AddSC_boss_the_black_stalker();
-
-//Gruul's Lair
-extern void AddSC_boss_gruul();
+extern void AddSC_boss_gruul();                     //Gruul's Lair
 extern void AddSC_boss_high_king_maulgar();
 extern void AddSC_instance_gruuls_lair();
-
-//Hellfire Citadel
-//--Blood Furnace
-extern void AddSC_boss_broggok();
+extern void AddSC_boss_broggok();                   //HC Blood Furnace
 extern void AddSC_boss_kelidan_the_breaker();
 extern void AddSC_boss_the_maker();
 extern void AddSC_instance_blood_furnace();
-
-//--Magtheridon's Lair
-extern void AddSC_boss_magtheridon();
+extern void AddSC_boss_magtheridon();               //HC Magtheridon's Lair
 extern void AddSC_instance_magtheridons_lair();
-
-//--Shattered Halls
-extern void AddSC_boss_grand_warlock_nethekurse();
+extern void AddSC_boss_grand_warlock_nethekurse();  //HC Shattered Halls
 extern void AddSC_boss_warbringer_omrogg();
 extern void AddSC_boss_warchief_kargath_bladefist();
 extern void AddSC_instance_shattered_halls();
-
-//--Ramparts
-extern void AddSC_boss_watchkeeper_gargolmar();
+extern void AddSC_boss_watchkeeper_gargolmar();     //HC Ramparts
 extern void AddSC_boss_omor_the_unscarred();
 extern void AddSC_boss_vazruden_the_herald();
 extern void AddSC_instance_ramparts();
-
-//Naxxramas
-extern void AddSC_boss_anubrekhan();
-extern void AddSC_boss_maexxna();
-extern void AddSC_boss_patchwerk();
-extern void AddSC_boss_grobbulus();
-extern void AddSC_boss_razuvious();
-extern void AddSC_boss_kelthuzad();
-extern void AddSC_boss_loatheb();
-extern void AddSC_boss_noth();
-extern void AddSC_boss_gluth();
-extern void AddSC_boss_sapphiron();
-extern void AddSC_boss_four_horsemen();
-extern void AddSC_boss_faerlina();
-extern void AddSC_boss_heigan();
-extern void AddSC_boss_gothik();
-extern void AddSC_boss_thaddius();
-extern void AddSC_instance_naxxramas();
-
-//The Nexus
-//Eye of Eternety
-
-//Nexus
-extern void AddSC_boss_magus_telestra();
-extern void AddSC_boss_anomalus();
-extern void AddSC_boss_ormorok();
-extern void AddSC_boss_keristrasza();
-extern void AddSC_instance_nexus();
-
-//Oculus
-
-//Obsidian Sanctum
-extern void AddSC_boss_sartharion();
-extern void AddSC_instance_obsidian_sanctum();
-
-//Tempest Keep
-//--Arcatraz
-extern void AddSC_arcatraz();
+extern void AddSC_arcatraz();                       //TK Arcatraz
 extern void AddSC_boss_harbinger_skyriss();
 extern void AddSC_instance_arcatraz();
-
-//--Botanica
-extern void AddSC_boss_high_botanist_freywinn();
+extern void AddSC_boss_high_botanist_freywinn();    //TK Botanica
 extern void AddSC_boss_laj();
 extern void AddSC_boss_warp_splinter();
-
-//--The Eye
-extern void AddSC_boss_alar();
+extern void AddSC_boss_alar();                      //TK The Eye
 extern void AddSC_boss_kaelthas();
 extern void AddSC_boss_void_reaver();
 extern void AddSC_boss_high_astromancer_solarian();
 extern void AddSC_instance_the_eye();
 extern void AddSC_the_eye();
-
-//--The Mechanar
-extern void AddSC_boss_gatewatcher_iron_hand();
+extern void AddSC_boss_gatewatcher_iron_hand();     //TK The Mechanar
 extern void AddSC_boss_nethermancer_sepethrea();
 extern void AddSC_boss_pathaleon_the_calculator();
 extern void AddSC_instance_mechanar();
 
-
-//Ulduar
-extern void AddSC_boss_auriaya();
-extern void AddSC_boss_flame_leviathan();
-extern void AddSC_boss_ignis();
-extern void AddSC_boss_razorscale();
-extern void AddSC_boss_xt002();
-//extern void AddSC_instance_ulduar();
-
-//Un'Goro Crater
-extern void AddSC_ungoro_crater();
-
-//Upper blackrock spire
-
-//Utgarde Keep
-extern void AddSC_boss_keleseth();
-extern void AddSC_boss_skarvald_dalronn();
-extern void AddSC_boss_ingvar_the_plunderer();
-extern void AddSC_instance_utgarde_keep();
-extern void AddSC_utgarde_keep();
-
-//Vault of Archavon
-extern void AddSC_boss_archavon();
-extern void AddSC_boss_emalon();
-extern void AddSC_instance_archavon();
-
-//Halls of Lightning
-extern void AddSC_boss_bjarngrim();
-extern void AddSC_boss_loken();
-extern void AddSC_instance_halls_of_lightning();
-
-//Region
-extern void AddSC_wintergrasp();
+extern void AddSC_blades_edge_mountains();
+extern void AddSC_boss_doomlordkazzak();
+extern void AddSC_boss_doomwalker();
+extern void AddSC_hellfire_peninsula();
+extern void AddSC_nagrand();
+extern void AddSC_netherstorm();
+extern void AddSC_shadowmoon_valley();
+extern void AddSC_shattrath_city();
+extern void AddSC_terokkar_forest();
+extern void AddSC_zangarmarsh();
 
 void AddScripts()
 {
@@ -704,58 +635,75 @@ void AddScripts()
     AddSC_the_barrens();
     AddSC_thousand_needles();
     AddSC_thunder_bluff();
+    AddSC_ungoro_crater();
     AddSC_winterspring();
 
     //northrend
+    AddSC_instance_ahnkahet();          //Azjol-Nerub Ahn'kahet
+    AddSC_boss_elder_nadox();
+    AddSC_boss_anubrekhan();            //Naxxramas
+    AddSC_boss_maexxna();
+    AddSC_boss_patchwerk();
+    AddSC_boss_grobbulus();
+    AddSC_boss_razuvious();
+    AddSC_boss_kelthuzad();
+    AddSC_boss_loatheb();
+    AddSC_boss_noth();
+    AddSC_boss_gluth();
+    AddSC_boss_sapphiron();
+    AddSC_boss_four_horsemen();
+    AddSC_boss_faerlina();
+    AddSC_boss_heigan();
+    AddSC_boss_gothik();
+    AddSC_boss_thaddius();
+    AddSC_instance_naxxramas();
+    AddSC_boss_magus_telestra();        //The Nexus Nexus
+    AddSC_boss_anomalus();
+    AddSC_boss_ormorok();
+    AddSC_boss_keristrasza();
+    AddSC_instance_nexus();
+    AddSC_boss_sartharion();            //Obsidian Sanctum
+    AddSC_instance_obsidian_sanctum();
+    AddSC_boss_bjarngrim();             //Ulduar Halls of Lightning
+    AddSC_boss_loken();
+    AddSC_instance_halls_of_lightning();
+    AddSC_boss_auriaya();               //Ulduar Ulduar
+    AddSC_boss_flame_leviathan();
+    AddSC_boss_ignis();
+    AddSC_boss_razorscale();
+    AddSC_boss_xt002();
+    //AddSC_instance_ulduar();
+    AddSC_boss_keleseth();              //Utgarde Keep
+    AddSC_boss_skarvald_dalronn();
+    AddSC_boss_ingvar_the_plunderer();
+    AddSC_instance_utgarde_keep();
+    AddSC_utgarde_keep();
+    AddSC_boss_archavon();              //Vault of Archavon
+    AddSC_boss_emalon();
+    AddSC_instance_archavon();
+
     AddSC_borean_tundra();
     AddSC_dragonblight();
     AddSC_grizzly_hills();
     AddSC_icecrown();
     AddSC_sholazar_basin();
+    AddSC_wintergrasp();
     AddSC_zuldrak();
 
     //outland
-    AddSC_blades_edge_mountains();
-    AddSC_boss_doomlordkazzak();
-    AddSC_boss_doomwalker();
-    AddSC_hellfire_peninsula();
-    AddSC_nagrand();
-    AddSC_netherstorm();
-    AddSC_shadowmoon_valley();
-    AddSC_shattrath_city();
-    AddSC_terokkar_forest();
-    AddSC_zangarmarsh();
-
-    //--------------------
-    //------ ZONE --------
-
-    //Aunchindoun
-    //--Auchenai Crypts
-    AddSC_boss_exarch_maladaar();
+    AddSC_boss_exarch_maladaar();           //Aunchindoun Auchenai Crypts
     AddSC_boss_shirrak_the_dead_watcher();
-    //--Mana Tombs
-    AddSC_boss_nexusprince_shaffar();
+    AddSC_boss_nexusprince_shaffar();       //Aunchindoun Mana Tombs
     AddSC_boss_pandemonius();
-
-    //--Sekketh Halls
-    AddSC_boss_darkweaver_syth();
+    AddSC_boss_darkweaver_syth();           //Aunchindoun Sekketh Halls
     AddSC_boss_talon_king_ikiss();
     AddSC_instance_sethekk_halls();
-
-    //--Shadow Labyrinth
-    AddSC_instance_shadow_labyrinth();
+    AddSC_instance_shadow_labyrinth();      //Aunchindoun Shadow Labyrinth
     AddSC_boss_ambassador_hellmaw();
     AddSC_boss_blackheart_the_inciter();
     AddSC_boss_grandmaster_vorpil();
     AddSC_boss_murmur();
-
-    //Azjol-Nerub
-    //--Ahn'kahet
-    AddSC_instance_ahnkahet();
-    AddSC_boss_elder_nadox();
-
-    //Black Temple
-    AddSC_black_temple();
+    AddSC_black_temple();                   //Black Temple
     AddSC_boss_illidan();
     AddSC_boss_shade_of_akama();
     AddSC_boss_supremus();
@@ -766,147 +714,61 @@ void AddScripts()
     AddSC_boss_najentus();
     AddSC_boss_illidari_council();
     AddSC_instance_black_temple();
-
-    //Coilfang Resevoir
-    //--Serpent Shrine Cavern
-    AddSC_boss_fathomlord_karathress();
+    AddSC_boss_fathomlord_karathress();     //CR Serpent Shrine Cavern
     AddSC_boss_hydross_the_unstable();
     AddSC_boss_lady_vashj();
     AddSC_boss_leotheras_the_blind();
     AddSC_boss_morogrim_tidewalker();
     AddSC_instance_serpentshrine_cavern();
     AddSC_boss_the_lurker_below();
-
-    //--Slave Pens
-
-    //--Steam Vault
-    AddSC_boss_hydromancer_thespia();
+    AddSC_boss_hydromancer_thespia();       //CR Steam Vault
     AddSC_boss_mekgineer_steamrigger();
     AddSC_boss_warlord_kalithresh();
     AddSC_instance_steam_vault();
-
-    //--Underbog
-    AddSC_boss_hungarfen();
+    AddSC_boss_hungarfen();                 //CR Underbog
     AddSC_boss_the_black_stalker();
-
-    //Gruul's Lair
-    AddSC_boss_gruul();
+    AddSC_boss_gruul();                     //Gruul's Lair
     AddSC_boss_high_king_maulgar();
     AddSC_instance_gruuls_lair();
-
-    //Hellfire Citadel
-    //--Blood Furnace
-    AddSC_boss_broggok();
+    AddSC_boss_broggok();                   //HC Blood Furnace
     AddSC_boss_kelidan_the_breaker();
     AddSC_boss_the_maker();
     AddSC_instance_blood_furnace();
-
-    //--Magtheridon's Lair
-    AddSC_boss_magtheridon();
+    AddSC_boss_magtheridon();               //HC Magtheridon's Lair
     AddSC_instance_magtheridons_lair();
-
-    //--Shattered Halls
-    AddSC_boss_grand_warlock_nethekurse();
+    AddSC_boss_grand_warlock_nethekurse();  //HC Shattered Halls
     AddSC_boss_warbringer_omrogg();
     AddSC_boss_warchief_kargath_bladefist();
     AddSC_instance_shattered_halls();
-
-    //--Ramparts
-    AddSC_boss_watchkeeper_gargolmar();
+    AddSC_boss_watchkeeper_gargolmar();     //HC Ramparts
     AddSC_boss_omor_the_unscarred();
     AddSC_boss_vazruden_the_herald();
     AddSC_instance_ramparts();
-
-    //Naxxramas
-    AddSC_boss_anubrekhan();
-    AddSC_boss_maexxna();
-    AddSC_boss_patchwerk();
-    AddSC_boss_grobbulus();
-    AddSC_boss_razuvious();
-    AddSC_boss_kelthuzad();
-    AddSC_boss_loatheb();
-    AddSC_boss_noth();
-    AddSC_boss_gluth();
-    AddSC_boss_sapphiron();
-    AddSC_boss_four_horsemen();
-    AddSC_boss_faerlina();
-    AddSC_boss_heigan();
-    AddSC_boss_gothik();
-    AddSC_boss_thaddius();
-    AddSC_instance_naxxramas();
-
-    //The Nexus
-    //Eye of Eternety
-
-    //Nexus
-    AddSC_boss_magus_telestra();
-    AddSC_boss_anomalus();
-    AddSC_boss_ormorok();
-    AddSC_boss_keristrasza();
-    AddSC_instance_nexus();
-
-    //Oculus
-
-    //Obsidian Sanctum
-    AddSC_boss_sartharion();
-    AddSC_instance_obsidian_sanctum();
-
-    //Tempest Keep
-    //--Arcatraz
-    AddSC_arcatraz();
+    AddSC_arcatraz();                       //TK Arcatraz
     AddSC_boss_harbinger_skyriss();
     AddSC_instance_arcatraz();
-
-    //--Botanica
-    AddSC_boss_high_botanist_freywinn();
+    AddSC_boss_high_botanist_freywinn();    //TK Botanica
     AddSC_boss_laj();
     AddSC_boss_warp_splinter();
-
-    //--The Eye
-    AddSC_boss_alar();
+    AddSC_boss_alar();                      //TK The Eye
     AddSC_boss_kaelthas();
     AddSC_boss_void_reaver();
     AddSC_boss_high_astromancer_solarian();
     AddSC_instance_the_eye();
     AddSC_the_eye();
-
-    //--The Mechanar
-    AddSC_boss_gatewatcher_iron_hand();
+    AddSC_boss_gatewatcher_iron_hand();     //TK The Mechanar
     AddSC_boss_nethermancer_sepethrea();
     AddSC_boss_pathaleon_the_calculator();
     AddSC_instance_mechanar();
 
-
-    //Ulduar
-    AddSC_boss_auriaya();
-    AddSC_boss_flame_leviathan();
-    AddSC_boss_ignis();
-    AddSC_boss_razorscale();
-    AddSC_boss_xt002();
-    //AddSC_instance_ulduar();
-
-    //Un'Goro Crater
-    AddSC_ungoro_crater();
-
-    //Upper blackrock spire
-
-    //Utgarde Keep
-    AddSC_boss_keleseth();
-    AddSC_boss_skarvald_dalronn();
-    AddSC_boss_ingvar_the_plunderer();
-    AddSC_instance_utgarde_keep();
-    AddSC_utgarde_keep();
-
-    //Vault of Archavon
-    AddSC_boss_archavon();
-    AddSC_boss_emalon();
-    AddSC_instance_archavon();
-
-    //Halls of Lightning
-    AddSC_boss_bjarngrim();
-    AddSC_boss_loken();
-    AddSC_instance_halls_of_lightning();
-
-    //Region
-    AddSC_wintergrasp();
+    AddSC_blades_edge_mountains();
+    AddSC_boss_doomlordkazzak();
+    AddSC_boss_doomwalker();
+    AddSC_hellfire_peninsula();
+    AddSC_nagrand();
+    AddSC_netherstorm();
+    AddSC_shadowmoon_valley();
+    AddSC_shattrath_city();
+    AddSC_terokkar_forest();
+    AddSC_zangarmarsh();
 }