*Some work on wintergrasp. Player can get ranks by killing other players and can build vehicles at workshop. Vehicles can be used to destroy buildings. Except these no other thing is done.

--HG--
branch : trunk

30 files changed, 2401 insertions, 1806 deletions

diff --git a/sql/updates/3466_world_scripts_(wintergrasp).sql b/sql/updates/3466_world_scripts_(wintergrasp).sql
new file mode 100644
index 00000000000..ac757d126de
--- /dev/null
+++ b/sql/updates/3466_world_scripts_(wintergrasp).sql
@@ -0,0 +1,19 @@
+DELETE FROM `spell_script_target` WHERE entry IN
+(56575,56661,56663,56665,56667,56669,61408);
+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
+(56575, 1, 27852),
+(56661, 1, 27852),
+(56663, 1, 27852),
+(56665, 1, 27852),
+(56667, 1, 27852),
+(56669, 1, 27852),
+(61408, 1, 27852);
+
+
+update creature_template set maxhealth = 133525, minhealth = 133525, maxmana = 51360, minmana = 51360, spell1 = 53114, spell2 = 53112, spell3=53110 where entry = 28670;
+update creature_template set maxhealth = 30000, minhealth = 30000, speed = 2, spell1=50025, spell2=50989, VehicleId = 36 where entry = 27881;
+update creature_template set maxhealth = 50000, minhealth = 50000, speed = 1.6, spell1=50896, spell2=50652, VehicleId = 106 where entry = 28094;
+update creature_template set maxhealth = 75000, minhealth = 75000, speed = 1, spell1=51678, VehicleId = 117 where entry IN (28312,32627);
+update creature_template set maxhealth = 50000, minhealth = 50000, spell1=51362, VehicleId = 116 where entry IN (28319,32629);
+
+update creature_template set scriptname = "npc_demolisher_engineerer" where entry in (30400,30499);
\ No newline at end of file
diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt
index 8d1ade57b4a..b89344f2b9d 100644
--- a/src/bindings/scripts/CMakeLists.txt
+++ b/src/bindings/scripts/CMakeLists.txt
@@ -477,6 +477,7 @@ SET(trinityscript_LIB_SRCS
    scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp
    scripts/zone/vault_of_archavon/boss_archavon.cpp
    scripts/zone/vault_of_archavon/def_vault_of_archavon.h
+   scripts/zone/wintergrasp/wintergrasp.cpp
    system.cpp
 )
 
diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index 9ba94eb4ac6..e98ea3395cb 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -628,6 +628,9 @@ extern void AddSC_zulaman();
 //Vault of Archavon
 extern void AddSC_boss_archavon();
 
+//Region
+extern void AddSC_wintergrasp();
+
 // -------------------
 void LoadDatabase()
 {
@@ -1510,6 +1513,9 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf")
     //Vault of Archavon
     AddSC_boss_archavon();
 
+    //Region
+    AddSC_wintergrasp();
+
     // -------------------
 
     outstring_log(">> Loaded %i C++ Scripts.", num_sc_scripts);
diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
index 9ec9a72ec99..1a39f5b3947 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -459,13 +459,13 @@
 					>
 				</File>
 				<File
+					RelativePath="..\scripts\npc\npc_taxi.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\scripts\npc\npcs_special.cpp"
 					>
 				</File>
-                <File
-                    RelativePath="..\scripts\npc\npc_taxi.cpp"
-                    >
-                </File>
 			</Filter>
 			<Filter
 				Name="servers"
@@ -474,6 +474,14 @@
 			<Filter
 				Name="custom"
 				>
+				<File
+					RelativePath="..\scripts\custom\npc_acherus_taxi.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\scripts\custom\npc_wyrmresttempel_taxi.cpp"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="areatrigger"
@@ -503,2105 +511,2396 @@
 				Name="zone"
 				>
 				<Filter
-					Name="Alterac Mountains"
+					Name="Kalimdor"
 					>
-					<File
-						RelativePath="..\scripts\zone\alterac_mountains\alterac_mountains.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Ashenvale Forest"
-					>
-					<File
-						RelativePath="..\scripts\zone\ashenvale_forest\ashenvale.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Azshara"
-					>
-					<File
-						RelativePath="..\scripts\zone\azshara\azshara.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\azshara\boss_azuregos.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Badlands"
-					>
-				</Filter>
-				<Filter
-					Name="Barrens"
-					>
-					<File
-						RelativePath="..\scripts\zone\barrens\the_barrens.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Blackfathom Depths"
-					>
-				</Filter>
-				<Filter
-					Name="Arathi Highlands"
-					>
-					<File
-						RelativePath="..\scripts\zone\arathi_highlands\arathi_highlands.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Deadmines"
-					>
-					<File
-						RelativePath="..\scripts\zone\deadmines\deadmines.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\deadmines\def_deadmines.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Deadwind Pass"
-					>
-				</Filter>
-				<Filter
-					Name="Desolace"
-					>
-				</Filter>
-				<Filter
-					Name="Dire Maul"
-					>
-				</Filter>
-				<Filter
-					Name="Dun Morogh"
-					>
-					<File
-						RelativePath="..\scripts\zone\dun_morogh\dun_morogh.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Durotar"
-					>
-				</Filter>
-				<Filter
-					Name="Duskwood"
-					>
-				</Filter>
-				<Filter
-					Name="Dustwallow Marsh"
-					>
-					<File
-						RelativePath="..\scripts\zone\dustwallow_marsh\dustwallow_marsh.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Blackwing Lair"
-					>
-					<File
-						RelativePath="..\scripts\zone\blackwing_lair\boss_broodlord_lashlayer.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackwing_lair\boss_chromaggus.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackwing_lair\boss_ebonroc.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackwing_lair\boss_firemaw.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackwing_lair\boss_flamegor.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackwing_lair\boss_nefarian.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackwing_lair\boss_razorgore.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackwing_lair\boss_vaelastrasz.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackwing_lair\boss_victor_nefarius.cpp"
+					<Filter
+						Name="Ashenvale Forest"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackwing_lair\instance_blackwing_lair.cpp"
+						<File
+							RelativePath="..\scripts\zone\ashenvale_forest\ashenvale.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Azshara"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Bloodmyst Isle"
-					>
-					<File
-						RelativePath="..\scripts\zone\bloodmyst_isle\bloodmyst_isle.cpp"
+						<File
+							RelativePath="..\scripts\zone\azshara\azshara.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\azshara\boss_azuregos.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Azuremyst Isle"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Gruul&apos;s Lair"
-					>
-					<File
-						RelativePath="..\scripts\zone\gruuls_lair\boss_gruul.cpp"
+						<File
+							RelativePath="..\scripts\zone\azuremyst_isle\azuremyst_isle.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Badlands"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\gruuls_lair\boss_high_king_maulgar.cpp"
+					</Filter>
+					<Filter
+						Name="Barrens"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\gruuls_lair\def_gruuls_lair.h"
+						<File
+							RelativePath="..\scripts\zone\barrens\the_barrens.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Blackfathom Depths"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\gruuls_lair\instance_gruuls_lair.cpp"
+					</Filter>
+					<Filter
+						Name="Bloodmyst Isle"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Burning Steppes"
-					>
-					<File
-						RelativePath="..\scripts\zone\burning_steppes\burning_steppes.cpp"
+						<File
+							RelativePath="..\scripts\zone\bloodmyst_isle\bloodmyst_isle.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="Darkshore"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Darkshore"
-					>
-					<File
-						RelativePath="..\scripts\zone\darkshore\darkshore.cpp"
+						<File
+							RelativePath="..\scripts\zone\darkshore\darkshore.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Darnassus"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Eastern Plaguelands"
-					>
-					<File
-						RelativePath="..\scripts\zone\eastern_plaguelands\eastern_plaguelands.cpp"
+					</Filter>
+					<Filter
+						Name="Desolace"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\eastern_plaguelands\the_scarlet_enclave.cpp"
+					</Filter>
+					<Filter
+						Name="Dire Maul"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Moonglade"
-					>
-					<File
-						RelativePath="..\scripts\zone\moonglade\moonglade.cpp"
+					</Filter>
+					<Filter
+						Name="Durotar"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Razorfen Kraul"
-					>
-					<File
-						RelativePath="..\scripts\zone\razorfen_kraul\razorfen_kraul.cpp"
+					</Filter>
+					<Filter
+						Name="Dustwallow Marsh"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Redridge Mountains"
-					>
-				</Filter>
-				<Filter
-					Name="Ruins of Ahn&apos;Qiraj"
-					>
-					<File
-						RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_ayamiss.cpp"
+						<File
+							RelativePath="..\scripts\zone\dustwallow_marsh\dustwallow_marsh.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Exodar"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_buru.cpp"
+					</Filter>
+					<Filter
+						Name="Felwood"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_kurinnaxx.cpp"
+						<File
+							RelativePath="..\scripts\zone\felwood\felwood.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Feralas"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_moam.cpp"
+						<File
+							RelativePath="..\scripts\zone\feralas\feralas.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Maraudon"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_ossirian.cpp"
+						<File
+							RelativePath="..\scripts\zone\maraudon\boss_celebras_the_cursed.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\maraudon\boss_landslide.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\maraudon\boss_noxxion.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\maraudon\boss_princess_theradras.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Moonglade"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_rajaxx.cpp"
+						<File
+							RelativePath="..\scripts\zone\moonglade\moonglade.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Mulgore"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\ruins_of_ahnqiraj\instance_ruins_of_ahnqiraj.cpp"
+						<File
+							RelativePath="..\scripts\zone\mulgore\mulgore.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Onyxia&apos;s Lair"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Swamp of Sorrows"
-					>
-				</Filter>
-				<Filter
-					Name="Borean Tundra"
-					>
-					<File
-						RelativePath="..\scripts\zone\borean_tundra\borean_tundra.cpp"
+						<File
+							RelativePath="..\scripts\zone\onyxias_lair\boss_onyxia.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Orgrimmar"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Howling Fjord"
-					>
-				</Filter>
-				<Filter
-					Name="Crystalsong Forest"
-					>
-				</Filter>
-				<Filter
-					Name="Dalaran"
-					>
-					<File
-						RelativePath="..\scripts\zone\dragonblight\dragonblight.cpp"
+						<File
+							RelativePath="..\scripts\zone\orgrimmar\orgrimmar.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Ragefire Chasm"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Dragonblight"
-					>
-				</Filter>
-				<Filter
-					Name="Grizzly Hills"
-					>
-				</Filter>
-				<Filter
-					Name="Icecrown"
-					>
-				</Filter>
-				<Filter
-					Name="Sholazar Basin"
-					>
-				</Filter>
-				<Filter
-					Name="The Storm Peaks"
-					>
-				</Filter>
-				<Filter
-					Name="Zul&apos;Drak"
-					>
-				</Filter>
-				<Filter
-					Name="Azjol-Nerub"
-					>
+					</Filter>
 					<Filter
-						Name="Ahn&apos;kahet"
+						Name="Razorfen Downs"
 						>
 						<File
-							RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_amanitar.cpp"
+							RelativePath="..\scripts\zone\razorfen_downs\boss_amnennar_the_coldbringer.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_elder_nadox.cpp"
+							RelativePath="..\scripts\zone\razorfen_downs\razorfen_downs.cpp"
 							>
 						</File>
+					</Filter>
+					<Filter
+						Name="Razorfen Kraul"
+						>
 						<File
-							RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_herald_volazj.cpp"
+							RelativePath="..\scripts\zone\razorfen_kraul\razorfen_kraul.cpp"
 							>
 						</File>
+					</Filter>
+					<Filter
+						Name="Ruins of Ahn&apos;Qiraj"
+						>
 						<File
-							RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_jedoga_shadowseeker.cpp"
+							RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_ayamiss.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\boss_prince_taldaram.cpp"
+							RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_buru.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\def_ahnkahet.h"
+							RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_kurinnaxx.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\azjol_nerub\ahnkahet\instance_ahnkahet.cpp"
+							RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_moam.cpp"
 							>
 						</File>
-					</Filter>
-					<Filter
-						Name="Azjol-Nerub"
-						>
 						<File
-							RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\boss_anubarak.cpp"
+							RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_ossirian.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\boss_hadronox.cpp"
+							RelativePath="..\scripts\zone\ruins_of_ahnqiraj\boss_rajaxx.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\boss_krikthir_the_gatewatcher.cpp"
+							RelativePath="..\scripts\zone\ruins_of_ahnqiraj\instance_ruins_of_ahnqiraj.cpp"
 							>
 						</File>
+					</Filter>
+					<Filter
+						Name="Silithus"
+						>
 						<File
-							RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\def_azjol_nerub.h"
+							RelativePath="..\scripts\zone\silithus\silithus.cpp"
 							>
 						</File>
+					</Filter>
+					<Filter
+						Name="Zul&apos;Farrak"
+						>
 						<File
-							RelativePath="..\scripts\zone\azjol_nerub\azjol_nerub\instance_azjol_nerub.cpp"
+							RelativePath="..\scripts\zone\zulfarrak\zulfarrak.cpp"
 							>
 						</File>
 					</Filter>
-				</Filter>
-				<Filter
-					Name="Drak&apos;Tharon Keep"
-					>
-				</Filter>
-				<Filter
-					Name="Gundrak"
-					>
-				</Filter>
-				<Filter
-					Name="Nexus"
-					>
 					<Filter
-						Name="Nexus"
+						Name="Winterspring"
 						>
+						<File
+							RelativePath="..\scripts\zone\winterspring\winterspring.cpp"
+							>
+						</File>
 					</Filter>
 					<Filter
-						Name="Oculus"
+						Name="Wailing Caverns"
 						>
+						<File
+							RelativePath="..\scripts\zone\wailing_caverns\instance_wailing_caverns.cpp"
+							>
+						</File>
 					</Filter>
 					<Filter
-						Name="Eye of Eternity"
+						Name="Un&apos;Goro Crater"
 						>
+						<File
+							RelativePath="..\scripts\zone\ungoro_crater\ungoro_crater.cpp"
+							>
+						</File>
 					</Filter>
-				</Filter>
-				<Filter
-					Name="Violet Hold"
-					>
-				</Filter>
-				<Filter
-					Name="Ulduar"
-					>
 					<Filter
-						Name="Halls of Stone"
+						Name="Thunder Bluff"
 						>
+						<File
+							RelativePath="..\scripts\zone\thunder_bluff\thunder_bluff.cpp"
+							>
+						</File>
 					</Filter>
 					<Filter
-						Name="Halls of Lightning"
+						Name="Thousand Needles"
 						>
+						<File
+							RelativePath="..\scripts\zone\thousand_needles\thousand_needles.cpp"
+							>
+						</File>
 					</Filter>
-				</Filter>
-				<Filter
-					Name="Utgarde Keep"
-					>
 					<Filter
-						Name="Utgarde Keep"
+						Name="Temple of Ahn&apos;Qiraj"
 						>
 						<File
-							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_ingvar_the_plunderer.cpp"
+							RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_bug_trio.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_cthun.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_fankriss.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_huhuran.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_ouro.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_keleseth.cpp"
+							RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_sartura.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_skarvald_dalronn.cpp"
+							RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_skeram.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\def_utgarde_keep.h"
+							RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_twinemperors.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\instance_utgarde_keep.cpp"
+							RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_viscidus.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\utgarde_keep.cpp"
+							RelativePath="..\scripts\zone\temple_of_ahnqiraj\def_temple_of_ahnqiraj.h"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\temple_of_ahnqiraj\instance_temple_of_ahnqiraj.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\temple_of_ahnqiraj\mob_anubisath_sentinel.cpp"
 							>
 						</File>
 					</Filter>
 					<Filter
-						Name="Utgarde Pinnacle"
+						Name="Teldrassil"
 						>
+						<File
+							RelativePath="..\scripts\zone\teldrassil\teldrassil.cpp"
+							>
+						</File>
 					</Filter>
-				</Filter>
-				<Filter
-					Name="Obsidian Sanctum"
-					>
-				</Filter>
-				<Filter
-					Name="Vault of Archavon"
-					>
-					<File
-						RelativePath="..\scripts\zone\vault_of_archavon\boss_archavon.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="Scarlet Monastery"
-					>
-					<File
-						RelativePath="..\scripts\zone\scarlet_monastery\boss_arcanist_doan.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scarlet_monastery\boss_azshir_the_sleepless.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scarlet_monastery\boss_bloodmage_thalnos.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scarlet_monastery\boss_headless_horseman.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scarlet_monastery\boss_herod.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scarlet_monastery\boss_high_inquisitor_fairbanks.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scarlet_monastery\boss_houndmaster_loksey.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scarlet_monastery\boss_interrogator_vishas.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scarlet_monastery\boss_mograine_and_whitemane.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scarlet_monastery\boss_scorn.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scarlet_monastery\def_scarlet_monastery.h"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scarlet_monastery\instance_scarlet_monastery.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Scholomance"
-					>
-					<File
-						RelativePath="..\scripts\zone\scholomance\boss_darkmaster_gandling.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scholomance\boss_death_knight_darkreaver.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scholomance\boss_doctor_theolen_krastinov.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scholomance\boss_illucia_barov.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scholomance\boss_instructor_malicia.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scholomance\boss_jandice_barov.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scholomance\boss_kormok.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scholomance\boss_lord_alexei_barov.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scholomance\boss_lorekeeper_polkelt.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scholomance\boss_ras_frostwhisper.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scholomance\boss_the_ravenian.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scholomance\boss_vectus.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scholomance\def_scholomance.h"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\scholomance\instance_scholomance.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Searing Gorge"
-					>
-					<File
-						RelativePath="..\scripts\zone\searing_gorge\searing_gorge.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Elwynn Forest"
-					>
-					<File
-						RelativePath="..\scripts\zone\elwynn_forest\elwynn_forest.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Felwood"
-					>
-					<File
-						RelativePath="..\scripts\zone\felwood\felwood.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Feralas"
-					>
-					<File
-						RelativePath="..\scripts\zone\feralas\feralas.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Gnomeregan"
-					>
-				</Filter>
-				<Filter
-					Name="Hillsbrad Foothills"
-					>
-				</Filter>
-				<Filter
-					Name="Hinterlands"
-					>
-				</Filter>
-				<Filter
-					Name="Maraudon"
-					>
-					<File
-						RelativePath="..\scripts\zone\maraudon\boss_celebras_the_cursed.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\maraudon\boss_landslide.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\maraudon\boss_noxxion.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\maraudon\boss_princess_theradras.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Molten Core"
-					>
-					<File
-						RelativePath="..\scripts\zone\molten_core\boss_baron_geddon.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\molten_core\boss_garr.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\molten_core\boss_gehennas.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\molten_core\boss_golemagg.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\molten_core\boss_lucifron.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\molten_core\boss_magmadar.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\molten_core\boss_majordomo_executus.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\molten_core\boss_ragnaros.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\molten_core\boss_shazzrah.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\molten_core\boss_sulfuron_harbinger.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\molten_core\def_molten_core.h"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\molten_core\instance_molten_core.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\molten_core\molten_core.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Mulgore"
-					>
-					<File
-						RelativePath="..\scripts\zone\mulgore\mulgore.cpp"
-						>
-					</File>
-				</Filter>
-				<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="Onyxia&apos;s Lair"
-					>
-					<File
-						RelativePath="..\scripts\zone\onyxias_lair\boss_onyxia.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Ragefire Chasm"
-					>
-				</Filter>
-				<Filter
-					Name="Razorfen Downs"
-					>
-					<File
-						RelativePath="..\scripts\zone\razorfen_downs\boss_amnennar_the_coldbringer.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\razorfen_downs\razorfen_downs.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Shadowfang Keep"
-					>
-					<File
-						RelativePath="..\scripts\zone\shadowfang_keep\def_shadowfang_keep.h"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\shadowfang_keep\instance_shadowfang_keep.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\shadowfang_keep\shadowfang_keep.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Stonetalon Mountains"
-					>
-					<File
-						RelativePath="..\scripts\zone\stonetalon_mountains\stonetalon_mountains.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Stranglethorn Vale"
-					>
-					<File
-						RelativePath="..\scripts\zone\stranglethorn_vale\stranglethorn_vale.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Stratholme"
-					>
-					<File
-						RelativePath="..\scripts\zone\stratholme\boss_baron_rivendare.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\stratholme\boss_baroness_anastari.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\stratholme\boss_cannon_master_willey.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\stratholme\boss_dathrohan_balnazzar.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\stratholme\boss_magistrate_barthilas.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\stratholme\boss_maleki_the_pallid.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\stratholme\boss_nerubenkan.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\stratholme\boss_order_of_silver_hand.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\stratholme\boss_postmaster_malown.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\stratholme\boss_ramstein_the_gorger.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\stratholme\boss_timmy_the_cruel.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\stratholme\def_stratholme.h"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\stratholme\instance_stratholme.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\stratholme\stratholme.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Sunken Temple"
-					>
-				</Filter>
-				<Filter
-					Name="Tanaris"
-					>
-					<File
-						RelativePath="..\scripts\zone\tanaris\tanaris.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Teldrassil"
-					>
-					<File
-						RelativePath="..\scripts\zone\teldrassil\teldrassil.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Temple of Ahn&apos;Qiraj"
-					>
-					<File
-						RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_bug_trio.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_cthun.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_fankriss.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_huhuran.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_ouro.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_sartura.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_skeram.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_twinemperors.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\temple_of_ahnqiraj\boss_viscidus.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\temple_of_ahnqiraj\def_temple_of_ahnqiraj.h"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\temple_of_ahnqiraj\instance_temple_of_ahnqiraj.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\temple_of_ahnqiraj\mob_anubisath_sentinel.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Thousand Needles"
-					>
-					<File
-						RelativePath="..\scripts\zone\thousand_needles\thousand_needles.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Silithus"
-					>
-					<File
-						RelativePath="..\scripts\zone\silithus\silithus.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Silverpine Forest"
-					>
-					<File
-						RelativePath="..\scripts\zone\silverpine_forest\silverpine_forest.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Stockade"
-					>
-				</Filter>
-				<Filter
-					Name="Tirisfal Glades"
-					>
-					<File
-						RelativePath="..\scripts\zone\tirisfal_glades\tirisfal_glades.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Wailing Caverns"
-					>
-					<File
-						RelativePath="..\scripts\zone\wailing_caverns\instance_wailing_caverns.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Western Plaguelands"
-					>
-					<File
-						RelativePath="..\scripts\zone\western_plaguelands\western_plaguelands.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Westfall"
-					>
-					<File
-						RelativePath="..\scripts\zone\westfall\westfall.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Wetlands"
-					>
-				</Filter>
-				<Filter
-					Name="Winterspring"
-					>
-					<File
-						RelativePath="..\scripts\zone\winterspring\winterspring.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Zul&apos;Farrak"
-					>
-					<File
-						RelativePath="..\scripts\zone\zulfarrak\zulfarrak.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Zul&apos;Gurub"
-					>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\boss_arlokk.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\boss_gahzranka.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\boss_grilek.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\boss_hakkar.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\boss_hazzarah.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\boss_jeklik.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\boss_jindo.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\boss_mandokir.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\boss_marli.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\boss_renataki.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\boss_thekal.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\boss_venoxis.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\boss_wushoolay.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\def_zulgurub.h"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulgurub\instance_zulgurub.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Uldaman"
-					>
-					<File
-						RelativePath="..\scripts\zone\uldaman\boss_archaedas.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\uldaman\boss_ironaya.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\uldaman\instance_uldaman.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\uldaman\uldaman.cpp"
+					<Filter
+						Name="Tanaris"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Un&apos;Goro Crater"
-					>
-					<File
-						RelativePath="..\scripts\zone\ungoro_crater\ungoro_crater.cpp"
+						<File
+							RelativePath="..\scripts\zone\tanaris\tanaris.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Stonetalon Mountains"
 						>
-					</File>
+						<File
+							RelativePath="..\scripts\zone\stonetalon_mountains\stonetalon_mountains.cpp"
+							>
+						</File>
+					</Filter>
 				</Filter>
 				<Filter
-					Name="Aunchindoun"
+					Name="Azeroth"
 					>
 					<Filter
-						Name="Auchenai Crypts"
+						Name="Molten Core"
 						>
 						<File
-							RelativePath="..\scripts\zone\aunchindoun\auchenai_crypts\boss_exarch_maladaar.cpp"
+							RelativePath="..\scripts\zone\molten_core\boss_baron_geddon.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\aunchindoun\auchenai_crypts\boss_shirrak_the_dead_watcher.cpp"
+							RelativePath="..\scripts\zone\molten_core\boss_garr.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\molten_core\boss_gehennas.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\molten_core\boss_golemagg.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\molten_core\boss_lucifron.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\molten_core\boss_magmadar.cpp"
 							>
 						</File>
-					</Filter>
-					<Filter
-						Name="Mana Tombs"
-						>
 						<File
-							RelativePath="..\scripts\zone\aunchindoun\mana_tombs\boss_nexusprince_shaffar.cpp"
+							RelativePath="..\scripts\zone\molten_core\boss_majordomo_executus.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\aunchindoun\mana_tombs\boss_pandemonius.cpp"
+							RelativePath="..\scripts\zone\molten_core\boss_ragnaros.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\molten_core\boss_shazzrah.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\molten_core\boss_sulfuron_harbinger.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\molten_core\def_molten_core.h"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\molten_core\instance_molten_core.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\molten_core\molten_core.cpp"
 							>
 						</File>
 					</Filter>
 					<Filter
-						Name="Sethekk Halls"
+						Name="Magister&apos;s Terrace"
 						>
 						<File
-							RelativePath="..\scripts\zone\aunchindoun\sethekk_halls\boss_darkweaver_syth.cpp"
+							RelativePath="..\scripts\zone\magisters_terrace\boss_felblood_kaelthas.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\aunchindoun\sethekk_halls\boss_tailonking_ikiss.cpp"
+							RelativePath="..\scripts\zone\magisters_terrace\boss_priestess_delrissa.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\aunchindoun\sethekk_halls\def_sethekk_halls.h"
+							RelativePath="..\scripts\zone\magisters_terrace\boss_selin_fireheart.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\aunchindoun\sethekk_halls\instance_sethekk_halls.cpp"
+							RelativePath="..\scripts\zone\magisters_terrace\boss_vexallus.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\magisters_terrace\def_magisters_terrace.h"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\magisters_terrace\instance_magisters_terrace.cpp"
 							>
 						</File>
 					</Filter>
 					<Filter
-						Name="Shadow Labyrinth"
+						Name="Loch Modan"
 						>
 						<File
-							RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\boss_ambassador_hellmaw.cpp"
+							RelativePath="..\scripts\zone\loch_modan\loch_modan.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Karazhan"
+						>
+						<File
+							RelativePath="..\scripts\zone\karazhan\boss_curator.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\karazhan\boss_maiden_of_virtue.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\karazhan\boss_midnight.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\boss_blackheart_the_inciter.cpp"
+							RelativePath="..\scripts\zone\karazhan\boss_moroes.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\boss_grandmaster_vorpil.cpp"
+							RelativePath="..\scripts\zone\karazhan\boss_netherspite.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\boss_murmur.cpp"
+							RelativePath="..\scripts\zone\karazhan\boss_nightbane.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\def_shadow_labyrinth.h"
+							RelativePath="..\scripts\zone\karazhan\boss_prince_malchezaar.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\aunchindoun\shadow_labyrinth\instance_shadow_labyrinth.cpp"
+							RelativePath="..\scripts\zone\karazhan\boss_shade_of_aran.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\karazhan\boss_terestian_illhoof.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\karazhan\bosses_opera.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\karazhan\def_karazhan.h"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\karazhan\instance_karazhan.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\karazhan\karazhan.cpp"
 							>
 						</File>
 					</Filter>
-				</Filter>
-				<Filter
-					Name="Azuremyst Isle"
-					>
-					<File
-						RelativePath="..\scripts\zone\azuremyst_isle\azuremyst_isle.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Black Temple"
-					>
-					<File
-						RelativePath="..\scripts\zone\black_temple\black_temple.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\black_temple\boss_bloodboil.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\black_temple\boss_illidan.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\black_temple\boss_mother_shahraz.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\black_temple\boss_reliquary_of_souls.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\black_temple\boss_shade_of_akama.cpp"
+					<Filter
+						Name="Isle of Quel&apos;Danas"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\black_temple\boss_supremus.cpp"
+						<File
+							RelativePath="..\scripts\zone\isle_of_queldanas\isle_of_queldanas.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Hinterlands"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\black_temple\boss_teron_gorefiend.cpp"
+					</Filter>
+					<Filter
+						Name="Iron Forge"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\black_temple\boss_warlord_najentus.cpp"
+						<File
+							RelativePath="..\scripts\zone\ironforge\ironforge.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Hillsbrad Foothills"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\black_temple\def_black_temple.h"
+					</Filter>
+					<Filter
+						Name="Gnomeregan"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\black_temple\illidari_council.cpp"
+					</Filter>
+					<Filter
+						Name="Ghostlands"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\black_temple\instance_black_temple.cpp"
+						<File
+							RelativePath="..\scripts\zone\ghostlands\ghostlands.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Elwynn Forest"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Eversong Woods"
-					>
-					<File
-						RelativePath="..\scripts\zone\eversong_woods\eversong_woods.cpp"
+						<File
+							RelativePath="..\scripts\zone\elwynn_forest\elwynn_forest.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Deadmines"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Ghostlands"
-					>
-					<File
-						RelativePath="..\scripts\zone\ghostlands\ghostlands.cpp"
+						<File
+							RelativePath="..\scripts\zone\deadmines\deadmines.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\deadmines\def_deadmines.h"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Deadwind Pass"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Blade&apos;s Edge Mountains"
-					>
-					<File
-						RelativePath="..\scripts\zone\blades_edge_mountains\blades_edge_mountains.cpp"
+					</Filter>
+					<Filter
+						Name="Dun Morogh"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Blasted Lands"
-					>
-					<File
-						RelativePath="..\scripts\zone\blasted_lands\blasted_lands.cpp"
+						<File
+							RelativePath="..\scripts\zone\dun_morogh\dun_morogh.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Alterac Mountains"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blasted_lands\boss_kruul.cpp"
+						<File
+							RelativePath="..\scripts\zone\alterac_mountains\alterac_mountains.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Arathi Highlands"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Hellfire Citadel"
-					>
+						<File
+							RelativePath="..\scripts\zone\arathi_highlands\arathi_highlands.cpp"
+							>
+						</File>
+					</Filter>
 					<Filter
-						Name="Blood Furnace"
+						Name="Blackrock Depths"
 						>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\boss_broggok.cpp"
+							RelativePath="..\scripts\zone\blackrock_depths\blackrock_depths.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\boss_kelidan_the_breaker.cpp"
+							RelativePath="..\scripts\zone\blackrock_depths\boss_ambassador_flamelash.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\boss_the_maker.cpp"
+							RelativePath="..\scripts\zone\blackrock_depths\boss_anubshiah.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\def_blood_furnace.h"
+							RelativePath="..\scripts\zone\blackrock_depths\boss_emperor_dagran_thaurissan.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\blood_furnace\instance_blood_furnace.cpp"
+							RelativePath="..\scripts\zone\blackrock_depths\boss_general_angerforge.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackrock_depths\boss_gorosh_the_dervish.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackrock_depths\boss_grizzle.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackrock_depths\boss_high_interrogator_gerstahn.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackrock_depths\boss_magmus.cpp"
 							>
 						</File>
-					</Filter>
-					<Filter
-						Name="Magtheridon&apos;s lair"
-						>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\magtheridons_lair\boss_magtheridon.cpp"
+							RelativePath="..\scripts\zone\blackrock_depths\boss_moira_bronzebeard.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\magtheridons_lair\def_magtheridons_lair.h"
+							RelativePath="..\scripts\zone\blackrock_depths\boss_tomb_of_seven.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\magtheridons_lair\instance_magtheridons_lair.cpp"
+							RelativePath="..\scripts\zone\blackrock_depths\def_blackrock_depths.h"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackrock_depths\instance_blackrock_depths.cpp"
 							>
 						</File>
 					</Filter>
 					<Filter
-						Name="Hellfire Ramparts"
+						Name="Blackrock Spire"
 						>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\boss_omor_the_unscarred.cpp"
+							RelativePath="..\scripts\zone\blackrock_spire\boss_drakkisath.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackrock_spire\boss_gyth.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackrock_spire\boss_halycon.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\boss_vazruden_the_herald.cpp"
+							RelativePath="..\scripts\zone\blackrock_spire\boss_highlord_omokk.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\boss_watchkeeper_gargolmar.cpp"
+							RelativePath="..\scripts\zone\blackrock_spire\boss_mother_smolderweb.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\def_hellfire_ramparts.h"
+							RelativePath="..\scripts\zone\blackrock_spire\boss_overlord_wyrmthalak.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\instance_hellfire_ramparts.cpp"
+							RelativePath="..\scripts\zone\blackrock_spire\boss_pyroguard_emberseer.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackrock_spire\boss_quartermaster_zigris.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackrock_spire\boss_rend_blackhand.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackrock_spire\boss_shadow_hunter_voshgajin.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackrock_spire\boss_the_beast.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackrock_spire\boss_warmaster_voone.cpp"
 							>
 						</File>
 					</Filter>
 					<Filter
-						Name="Shattered Halls"
+						Name="Blackwing Lair"
 						>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\boss_nethekurse.cpp"
+							RelativePath="..\scripts\zone\blackwing_lair\boss_broodlord_lashlayer.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackwing_lair\boss_chromaggus.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackwing_lair\boss_ebonroc.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackwing_lair\boss_firemaw.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\boss_warbringer_omrogg.cpp"
+							RelativePath="..\scripts\zone\blackwing_lair\boss_flamegor.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\boss_warchief_kargath_bladefist.cpp"
+							RelativePath="..\scripts\zone\blackwing_lair\boss_nefarian.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\def_shattered_halls.h"
+							RelativePath="..\scripts\zone\blackwing_lair\boss_razorgore.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\shattered_halls\instance_shattered_halls.cpp"
+							RelativePath="..\scripts\zone\blackwing_lair\boss_vaelastrasz.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackwing_lair\boss_victor_nefarius.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blackwing_lair\instance_blackwing_lair.cpp"
 							>
 						</File>
 					</Filter>
-				</Filter>
-				<Filter
-					Name="Hellfire Peninsula"
-					>
-					<File
-						RelativePath="..\scripts\zone\hellfire_peninsula\boss_doomlord_kazzak.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\hellfire_peninsula\hellfire_peninsula.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Karazhan"
-					>
-					<File
-						RelativePath="..\scripts\zone\karazhan\boss_curator.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\karazhan\boss_maiden_of_virtue.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\karazhan\boss_midnight.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\karazhan\boss_moroes.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\karazhan\boss_netherspite.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\karazhan\boss_nightbane.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\karazhan\boss_prince_malchezaar.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\karazhan\boss_shade_of_aran.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\karazhan\boss_terestian_illhoof.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\karazhan\bosses_opera.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\karazhan\def_karazhan.h"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\karazhan\instance_karazhan.cpp"
+					<Filter
+						Name="Blasted Lands"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\karazhan\karazhan.cpp"
+						<File
+							RelativePath="..\scripts\zone\blasted_lands\blasted_lands.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\blasted_lands\boss_kruul.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Burning Steppes"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Nagrand"
-					>
-					<File
-						RelativePath="..\scripts\zone\nagrand\nagrand.cpp"
+						<File
+							RelativePath="..\scripts\zone\burning_steppes\burning_steppes.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Duskwood"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Netherstorm"
-					>
-					<File
-						RelativePath="..\scripts\zone\netherstorm\netherstorm.cpp"
+					</Filter>
+					<Filter
+						Name="Eastern Plaguelands"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Shadowmoon Valley"
-					>
-					<File
-						RelativePath="..\scripts\zone\shadowmoon_valley\boss_doomwalker.cpp"
+						<File
+							RelativePath="..\scripts\zone\eastern_plaguelands\eastern_plaguelands.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\eastern_plaguelands\the_scarlet_enclave.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Eversong Woods"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\shadowmoon_valley\shadowmoon_valley.cpp"
+						<File
+							RelativePath="..\scripts\zone\eversong_woods\eversong_woods.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Redridge Mountains"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Tempest Keep"
-					>
+					</Filter>
 					<Filter
-						Name="Arcatraz"
+						Name="Scarlet Monastery"
 						>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\arcatraz\arcatraz.cpp"
+							RelativePath="..\scripts\zone\scarlet_monastery\boss_arcanist_doan.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\arcatraz\boss_harbinger_skyriss.cpp"
+							RelativePath="..\scripts\zone\scarlet_monastery\boss_azshir_the_sleepless.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\arcatraz\def_arcatraz.h"
+							RelativePath="..\scripts\zone\scarlet_monastery\boss_bloodmage_thalnos.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\arcatraz\instance_arcatraz.cpp"
+							RelativePath="..\scripts\zone\scarlet_monastery\boss_headless_horseman.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\scarlet_monastery\boss_herod.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\scarlet_monastery\boss_high_inquisitor_fairbanks.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\scarlet_monastery\boss_houndmaster_loksey.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\scarlet_monastery\boss_interrogator_vishas.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\scarlet_monastery\boss_mograine_and_whitemane.cpp"
 							>
 						</File>
-					</Filter>
-					<Filter
-						Name="Botanica"
-						>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\botanica\boss_high_botanist_freywinn.cpp"
+							RelativePath="..\scripts\zone\scarlet_monastery\boss_scorn.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\botanica\boss_laj.cpp"
+							RelativePath="..\scripts\zone\scarlet_monastery\def_scarlet_monastery.h"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\botanica\boss_warp_splinter.cpp"
+							RelativePath="..\scripts\zone\scarlet_monastery\instance_scarlet_monastery.cpp"
 							>
 						</File>
 					</Filter>
 					<Filter
-						Name="The Eye"
+						Name="Scholomance"
 						>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_alar.cpp"
+							RelativePath="..\scripts\zone\scholomance\boss_darkmaster_gandling.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_astromancer.cpp"
+							RelativePath="..\scripts\zone\scholomance\boss_death_knight_darkreaver.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_kaelthas.cpp"
+							RelativePath="..\scripts\zone\scholomance\boss_doctor_theolen_krastinov.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_eye\boss_void_reaver.cpp"
+							RelativePath="..\scripts\zone\scholomance\boss_illucia_barov.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_eye\def_the_eye.h"
+							RelativePath="..\scripts\zone\scholomance\boss_instructor_malicia.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_eye\instance_the_eye.cpp"
+							RelativePath="..\scripts\zone\scholomance\boss_jandice_barov.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_eye\the_eye.cpp"
+							RelativePath="..\scripts\zone\scholomance\boss_kormok.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\scholomance\boss_lord_alexei_barov.cpp"
 							>
 						</File>
-					</Filter>
-					<Filter
-						Name="The Mechanar"
-						>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_mechanar\boss_gatewatcher_gyrokill.cpp"
+							RelativePath="..\scripts\zone\scholomance\boss_lorekeeper_polkelt.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_mechanar\boss_gatewatcher_ironhand.cpp"
+							RelativePath="..\scripts\zone\scholomance\boss_ras_frostwhisper.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_mechanar\boss_nethermancer_sepethrea.cpp"
+							RelativePath="..\scripts\zone\scholomance\boss_the_ravenian.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_mechanar\boss_pathaleon_the_calculator.cpp"
+							RelativePath="..\scripts\zone\scholomance\boss_vectus.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_mechanar\def_mechanar.h"
+							RelativePath="..\scripts\zone\scholomance\def_scholomance.h"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\tempest_keep\the_mechanar\instance_mechanar.cpp"
+							RelativePath="..\scripts\zone\scholomance\instance_scholomance.cpp"
 							>
 						</File>
 					</Filter>
-				</Filter>
-				<Filter
-					Name="Terokkar Forest"
-					>
-					<File
-						RelativePath="..\scripts\zone\terokkar_forest\terokkar_forest.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Zangarmarsh"
-					>
-					<File
-						RelativePath="..\scripts\zone\zangarmarsh\zangarmarsh.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Blackrock Spire"
-					>
-					<File
-						RelativePath="..\scripts\zone\blackrock_spire\boss_drakkisath.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_spire\boss_gyth.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_spire\boss_halycon.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_spire\boss_highlord_omokk.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_spire\boss_mother_smolderweb.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_spire\boss_overlord_wyrmthalak.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_spire\boss_pyroguard_emberseer.cpp"
+					<Filter
+						Name="Searing Gorge"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_spire\boss_quartermaster_zigris.cpp"
+						<File
+							RelativePath="..\scripts\zone\searing_gorge\searing_gorge.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Shadowfang Keep"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_spire\boss_rend_blackhand.cpp"
+						<File
+							RelativePath="..\scripts\zone\shadowfang_keep\def_shadowfang_keep.h"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\shadowfang_keep\instance_shadowfang_keep.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\shadowfang_keep\shadowfang_keep.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Silvermoon City"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_spire\boss_shadow_hunter_voshgajin.cpp"
+						<File
+							RelativePath="..\scripts\zone\silvermoon\silvermoon_city.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Silverpine Forest"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_spire\boss_the_beast.cpp"
+						<File
+							RelativePath="..\scripts\zone\silverpine_forest\silverpine_forest.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Stockade"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_spire\boss_warmaster_voone.cpp"
+					</Filter>
+					<Filter
+						Name="Stormwind City"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Stormwind City"
-					>
-					<File
-						RelativePath="..\scripts\zone\stormwind\stormwind_city.cpp"
+						<File
+							RelativePath="..\scripts\zone\stormwind\stormwind_city.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Stranglethorn Vale"
 						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Coilfang Resevoir"
-					>
+						<File
+							RelativePath="..\scripts\zone\stranglethorn_vale\stranglethorn_vale.cpp"
+							>
+						</File>
+					</Filter>
 					<Filter
-						Name="Serpent Shrine Cavern"
+						Name="Stratholme"
 						>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_fathomlord_karathress.cpp"
+							RelativePath="..\scripts\zone\stratholme\boss_baron_rivendare.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_hydross_the_unstable.cpp"
+							RelativePath="..\scripts\zone\stratholme\boss_baroness_anastari.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_lady_vashj.cpp"
+							RelativePath="..\scripts\zone\stratholme\boss_cannon_master_willey.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_leotheras_the_blind.cpp"
+							RelativePath="..\scripts\zone\stratholme\boss_dathrohan_balnazzar.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_lurker_below.cpp"
+							RelativePath="..\scripts\zone\stratholme\boss_magistrate_barthilas.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\boss_morogrim_tidewalker.cpp"
+							RelativePath="..\scripts\zone\stratholme\boss_maleki_the_pallid.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\def_serpent_shrine.h"
+							RelativePath="..\scripts\zone\stratholme\boss_nerubenkan.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\serpent_shrine\instance_serpent_shrine.cpp"
+							RelativePath="..\scripts\zone\stratholme\boss_order_of_silver_hand.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\stratholme\boss_postmaster_malown.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\stratholme\boss_ramstein_the_gorger.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\stratholme\boss_timmy_the_cruel.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\stratholme\def_stratholme.h"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\stratholme\instance_stratholme.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\stratholme\stratholme.cpp"
 							>
 						</File>
 					</Filter>
 					<Filter
-						Name="Slave Pens"
+						Name="Sunken Temple"
 						>
 					</Filter>
 					<Filter
-						Name="Steam Vault"
+						Name="Sunwell Plateau"
 						>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\boss_hydromancer_thespia.cpp"
+							RelativePath="..\scripts\zone\sunwell_plateau\boss_brutallus.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\boss_mekgineer_steamrigger.cpp"
+							RelativePath="..\scripts\zone\sunwell_plateau\boss_eredar_twins.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\boss_warlord_kalithresh.cpp"
+							RelativePath="..\scripts\zone\sunwell_plateau\boss_felmyst.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\def_steam_vault.h"
+							RelativePath="..\scripts\zone\sunwell_plateau\boss_kalecgos.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\steam_vault\instance_steam_vault.cpp"
+							RelativePath="..\scripts\zone\sunwell_plateau\boss_kiljaeden.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\sunwell_plateau\boss_muru.cpp"
 							>
 						</File>
-					</Filter>
-					<Filter
-						Name="Underbog"
-						>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\underbog\boss_hungarfen.cpp"
+							RelativePath="..\scripts\zone\sunwell_plateau\def_sunwell_plateau.h"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\coilfang_resevoir\underbog\boss_the_black_stalker.cpp"
+							RelativePath="..\scripts\zone\sunwell_plateau\instance_sunwell_plateau.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\sunwell_plateau\sunwell_plateau.cpp"
 							>
 						</File>
 					</Filter>
-				</Filter>
-				<Filter
-					Name="Caverns of Time"
-					>
 					<Filter
-						Name="The Dark Portal"
+						Name="Swamp of Sorrows"
+						>
+					</Filter>
+					<Filter
+						Name="Zul&apos;Gurub"
 						>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\dark_portal\boss_aeonus.cpp"
+							RelativePath="..\scripts\zone\zulgurub\boss_arlokk.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\dark_portal\boss_chrono_lord_deja.cpp"
+							RelativePath="..\scripts\zone\zulgurub\boss_gahzranka.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\dark_portal\boss_temporus.cpp"
+							RelativePath="..\scripts\zone\zulgurub\boss_grilek.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\dark_portal\dark_portal.cpp"
+							RelativePath="..\scripts\zone\zulgurub\boss_hakkar.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\dark_portal\def_dark_portal.h"
+							RelativePath="..\scripts\zone\zulgurub\boss_hazzarah.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\dark_portal\instance_dark_portal.cpp"
+							RelativePath="..\scripts\zone\zulgurub\boss_jeklik.cpp"
 							>
 						</File>
-					</Filter>
-					<Filter
-						Name="Battle for Mt. Hyjal"
-						>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_anetheron.cpp"
+							RelativePath="..\scripts\zone\zulgurub\boss_jindo.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_archimonde.cpp"
+							RelativePath="..\scripts\zone\zulgurub\boss_mandokir.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_azgalor.cpp"
+							RelativePath="..\scripts\zone\zulgurub\boss_marli.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_kazrogal.cpp"
+							RelativePath="..\scripts\zone\zulgurub\boss_renataki.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_rage_winterchill.cpp"
+							RelativePath="..\scripts\zone\zulgurub\boss_thekal.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\hyjal\def_hyjal.h"
+							RelativePath="..\scripts\zone\zulgurub\boss_venoxis.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\hyjal\hyjal.cpp"
+							RelativePath="..\scripts\zone\zulgurub\boss_wushoolay.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\hyjal\hyjal_trash.cpp"
+							RelativePath="..\scripts\zone\zulgurub\def_zulgurub.h"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\hyjal\hyjal_trash.h"
+							RelativePath="..\scripts\zone\zulgurub\instance_zulgurub.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Zul&apos;Aman"
+						>
+						<File
+							RelativePath="..\scripts\zone\zulaman\boss_akilzon.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\zulaman\boss_halazzi.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\zulaman\boss_hexlord.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\zulaman\boss_janalai.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\zulaman\boss_nalorakk.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\zulaman\boss_zuljin.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\hyjal\hyjalAI.cpp"
+							RelativePath="..\scripts\zone\zulaman\def_zulaman.h"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\hyjal\hyjalAI.h"
+							RelativePath="..\scripts\zone\zulaman\instance_zulaman.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\hyjal\instance_hyjal.cpp"
+							RelativePath="..\scripts\zone\zulaman\zulaman.cpp"
 							>
 						</File>
 					</Filter>
-
 					<Filter
-						Name="Culling of Stratholme"
+						Name="Wetlands"
 						>
 					</Filter>
 					<Filter
-						Name="Old Hillsbrad"
+						Name="Westfall"
 						>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\old_hillsbrad\boss_captain_skarloc.cpp"
+							RelativePath="..\scripts\zone\westfall\westfall.cpp"
 							>
 						</File>
+					</Filter>
+					<Filter
+						Name="Western Plaguelands"
+						>
+						<File
+							RelativePath="..\scripts\zone\western_plaguelands\western_plaguelands.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Undercity"
+						>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\old_hillsbrad\boss_epoch_hunter.cpp"
+							RelativePath="..\scripts\zone\undercity\undercity.cpp"
 							>
 						</File>
+					</Filter>
+					<Filter
+						Name="Uldaman"
+						>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\old_hillsbrad\boss_leutenant_drake.cpp"
+							RelativePath="..\scripts\zone\uldaman\boss_archaedas.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\old_hillsbrad\def_old_hillsbrad.h"
+							RelativePath="..\scripts\zone\uldaman\boss_ironaya.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\old_hillsbrad\instance_old_hillsbrad.cpp"
+							RelativePath="..\scripts\zone\uldaman\instance_uldaman.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\caverns_of_time\old_hillsbrad\old_hillsbrad.cpp"
+							RelativePath="..\scripts\zone\uldaman\uldaman.cpp"
 							>
 						</File>
 					</Filter>
-				</Filter>
-				<Filter
-					Name="Silvermoon City"
-					>
-					<File
-						RelativePath="..\scripts\zone\silvermoon\silvermoon_city.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Darnassus"
-					>
-				</Filter>
-				<Filter
-					Name="Exodar"
-					>
-				</Filter>
-				<Filter
-					Name="Iron Forge"
-					>
-					<File
-						RelativePath="..\scripts\zone\ironforge\ironforge.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Orgrimmar"
-					>
-					<File
-						RelativePath="..\scripts\zone\orgrimmar\orgrimmar.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Shattrath City"
-					>
-					<File
-						RelativePath="..\scripts\zone\shattrath\shattrath_city.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Thunder Bluff"
-					>
-					<File
-						RelativePath="..\scripts\zone\thunder_bluff\thunder_bluff.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Undercity"
-					>
-					<File
-						RelativePath="..\scripts\zone\undercity\undercity.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Zul&apos;Aman"
-					>
-					<File
-						RelativePath="..\scripts\zone\zulaman\boss_akilzon.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulaman\boss_halazzi.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulaman\boss_hexlord.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulaman\boss_janalai.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulaman\boss_nalorakk.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulaman\boss_zuljin.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulaman\def_zulaman.h"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulaman\instance_zulaman.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\zulaman\zulaman.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Isle of Quel&apos;Danas"
-					>
-					<File
-						RelativePath="..\scripts\zone\isle_of_queldanas\isle_of_queldanas.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Magister&apos;s Terrace"
-					>
-					<File
-						RelativePath="..\scripts\zone\magisters_terrace\boss_felblood_kaelthas.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\magisters_terrace\boss_priestess_delrissa.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\magisters_terrace\boss_selin_fireheart.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\magisters_terrace\boss_vexallus.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\magisters_terrace\def_magisters_terrace.h"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\magisters_terrace\instance_magisters_terrace.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Sunwell Plateau"
-					>
-					<File
-						RelativePath="..\scripts\zone\sunwell_plateau\boss_brutallus.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\sunwell_plateau\boss_eredar_twins.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\sunwell_plateau\boss_felmyst.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\sunwell_plateau\boss_kalecgos.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\sunwell_plateau\boss_muru.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\sunwell_plateau\boss_kiljaeden.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\sunwell_plateau\sunwell_plateau.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\sunwell_plateau\def_sunwell_plateau.h"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\sunwell_plateau\instance_sunwell_plateau.cpp"
+					<Filter
+						Name="Tirisfal Glades"
 						>
-					</File>
+						<File
+							RelativePath="..\scripts\zone\tirisfal_glades\tirisfal_glades.cpp"
+							>
+						</File>
+					</Filter>
 				</Filter>
 				<Filter
-					Name="Blackrock Depths"
+					Name="Outland"
 					>
-					<File
-						RelativePath="..\scripts\zone\blackrock_depths\blackrock_depths.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_depths\boss_ambassador_flamelash.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_depths\boss_anubshiah.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_depths\boss_emperor_dagran_thaurissan.cpp"
+					<Filter
+						Name="Netherstorm"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_depths\boss_general_angerforge.cpp"
+						<File
+							RelativePath="..\scripts\zone\netherstorm\netherstorm.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Nagrand"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_depths\boss_gorosh_the_dervish.cpp"
+						<File
+							RelativePath="..\scripts\zone\nagrand\nagrand.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Gruul&apos;s Lair"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_depths\boss_grizzle.cpp"
+						<File
+							RelativePath="..\scripts\zone\gruuls_lair\boss_gruul.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\gruuls_lair\boss_high_king_maulgar.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\gruuls_lair\def_gruuls_lair.h"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\gruuls_lair\instance_gruuls_lair.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="Hellfire Peninsula"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_depths\boss_high_interrogator_gerstahn.cpp"
+						<File
+							RelativePath="..\scripts\zone\hellfire_peninsula\boss_doomlord_kazzak.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\hellfire_peninsula\hellfire_peninsula.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Shadowmoon Valley"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_depths\boss_magmus.cpp"
+						<File
+							RelativePath="..\scripts\zone\shadowmoon_valley\boss_doomwalker.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\shadowmoon_valley\shadowmoon_valley.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>
+					</Filter>
+					<Filter
+						Name="Terokkar Forest"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_depths\boss_moira_bronzebeard.cpp"
+						<File
+							RelativePath="..\scripts\zone\terokkar_forest\terokkar_forest.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>
+					</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>
+					</Filter>
+					<Filter
+						Name="Black Temple"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_depths\boss_tomb_of_seven.cpp"
+						<File
+							RelativePath="..\scripts\zone\black_temple\black_temple.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\black_temple\boss_bloodboil.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\black_temple\boss_illidan.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\black_temple\boss_mother_shahraz.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\black_temple\boss_reliquary_of_souls.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\black_temple\boss_shade_of_akama.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\black_temple\boss_supremus.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\black_temple\boss_teron_gorefiend.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\black_temple\boss_warlord_najentus.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\black_temple\def_black_temple.h"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\black_temple\illidari_council.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\black_temple\instance_black_temple.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Blade&apos;s Edge Mountains"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_depths\def_blackrock_depths.h"
+						<File
+							RelativePath="..\scripts\zone\blades_edge_mountains\blades_edge_mountains.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Zangarmarsh"
 						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_depths\instance_blackrock_depths.cpp"
+						<File
+							RelativePath="..\scripts\zone\zangarmarsh\zangarmarsh.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Shattrath City"
 						>
-					</File>
+						<File
+							RelativePath="..\scripts\zone\shattrath\shattrath_city.cpp"
+							>
+						</File>
+					</Filter>
 				</Filter>
 				<Filter
-					Name="Loch Modan"
+					Name="Northrend"
 					>
-					<File
-						RelativePath="..\scripts\zone\loch_modan\loch_modan.cpp"
-						>
-					</File>
+					<Filter
+						Name="Region"
+						>
+						<Filter
+							Name="Howling Fjord"
+							>
+						</Filter>
+						<Filter
+							Name="Grizzly Hills"
+							>
+						</Filter>
+						<Filter
+							Name="Zul&apos;Drak"
+							>
+						</Filter>
+						<Filter
+							Name="The Storm Peaks"
+							>
+						</Filter>
+						<Filter
+							Name="Crystalsong Forest"
+							>
+						</Filter>
+						<Filter
+							Name="Dragonblight"
+							>
+							<File
+								RelativePath="..\scripts\zone\dragonblight\dragonblight.cpp"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="Borean Tundra"
+							>
+							<File
+								RelativePath="..\scripts\zone\borean_tundra\borean_tundra.cpp"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="Wintergrasp"
+							>
+							<File
+								RelativePath="..\scripts\zone\wintergrasp\wintergrasp.cpp"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="Icecrown"
+							>
+						</Filter>
+						<Filter
+							Name="Sholazar Basin"
+							>
+						</Filter>
+						<Filter
+							Name="Dalaran"
+							>
+						</Filter>
+					</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>
+						<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\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>
+					</Filter>
 				</Filter>
 			</Filter>
 		</Filter>
diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
index b92dd51a0d7..cfcbcc54059 100644
--- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
@@ -458,13 +458,13 @@
 					>
 				</File>
 				<File
+					RelativePath="..\scripts\npc\npc_taxi.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\scripts\npc\npcs_special.cpp"
 					>
 				</File>
-                <File
-                    RelativePath="..\scripts\npc\npc_taxi.cpp"
-                    >
-                </File>
 			</Filter>
 			<Filter
 				Name="servers"
@@ -1972,7 +1972,7 @@
 							</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"
@@ -2414,6 +2414,10 @@
 						<Filter
 							Name="Wintergrasp"
 							>
+							<File
+								RelativePath="..\scripts\zone\wintergrasp\wintergrasp.cpp"
+								>
+							</File>
 						</Filter>
 						<Filter
 							Name="Icecrown"
diff --git a/src/bindings/scripts/scripts/zone/wintergrasp/wintergrasp.cpp b/src/bindings/scripts/scripts/zone/wintergrasp/wintergrasp.cpp
new file mode 100644
index 00000000000..374e511ad63
--- /dev/null
+++ b/src/bindings/scripts/scripts/zone/wintergrasp/wintergrasp.cpp
@@ -0,0 +1,60 @@
+/* Copyright (C) 2008 - 2009 Trinity <http://www.trinitycore.org/>
+ * 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
+ */
+
+#include "precompiled.h"
+#include "Wintergrasp.h"
+
+bool GossipHello_npc_demolisher_engineerer(Player *player, Creature *_creature)
+{
+    if(_creature->isQuestGiver())
+        player->PrepareQuestMenu(_creature->GetGUID());
+
+    if(player->HasAura(SPELL_CORPORAL))
+        player->ADD_GOSSIP_ITEM(0, "Build catapult.", GOSSIP_SENDER_MAIN,   GOSSIP_ACTION_INFO_DEF);
+    else if(player->HasAura(SPELL_LIEUTENANT))
+    {
+        player->ADD_GOSSIP_ITEM(0, "Build catapult.", GOSSIP_SENDER_MAIN,   GOSSIP_ACTION_INFO_DEF);
+        player->ADD_GOSSIP_ITEM(0, "Build demolisher.", GOSSIP_SENDER_MAIN,   GOSSIP_ACTION_INFO_DEF+1);
+        player->ADD_GOSSIP_ITEM(0, "Build siege engine.", GOSSIP_SENDER_MAIN,   GOSSIP_ACTION_INFO_DEF+2);
+    }
+
+    player->SEND_GOSSIP_MENU(_creature->GetNpcTextId(), _creature->GetGUID());
+    return true;
+}
+
+bool GossipSelect_npc_demolisher_engineerer(Player* player, Creature* me, uint32 uiSender, uint32 uiAction)
+{
+    player->CLOSE_GOSSIP_MENU();
+    switch(uiAction - GOSSIP_ACTION_INFO_DEF)
+    {
+        case 0: player->CastSpell(player, 56663, false); break;
+        case 1: player->CastSpell(player, 56575, false); break;
+        case 2: player->CastSpell(player, TEAM_ID(player->GetTeam()) ? 61408 : 56661, false); break;
+    }
+
+    return true;
+}
+
+void AddSC_wintergrasp()
+{
+    Script *newscript;
+
+    newscript = new Script;
+    newscript->Name = "npc_demolisher_engineerer";
+    newscript->pGossipHello = &GossipHello_npc_demolisher_engineerer;
+    newscript->pGossipSelect = &GossipSelect_npc_demolisher_engineerer;
+    newscript->RegisterSelf();
+}
\ No newline at end of file
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index 89a9e460968..44e692b71ba 100644
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -293,6 +293,9 @@ SET(game_STAT_SRCS
    GroupReference.cpp
    GroupReference.h
    GroupRefManager.h
+   OutdoorPvPImpl.h
+   Wintergrasp.h
+   Wintergrasp.cpp
 )
 
 add_library(game STATIC ${game_STAT_SRCS})
diff --git a/src/game/CreatureAIImpl.h b/src/game/CreatureAIImpl.h
index f404f0d954f..95a16d0ac5b 100644
--- a/src/game/CreatureAIImpl.h
+++ b/src/game/CreatureAIImpl.h
@@ -1,6 +1,4 @@
 /*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/game/OutdoorPvP.cpp b/src/game/OutdoorPvP.cpp
index 97acf08ce8c..0bfc8a6e084 100644
--- a/src/game/OutdoorPvP.cpp
+++ b/src/game/OutdoorPvP.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "OutdoorPvP.h"
+#include "OutdoorPvPImpl.h"
 #include "OutdoorPvPMgr.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
@@ -776,3 +777,7 @@ bool OutdoorPvP::HandleAreaTrigger(Player *plr, uint32 trigger)
     return false;
 }
 
+void OutdoorPvP::RegisterZone(uint32 zoneId)
+{
+    sOutdoorPvPMgr.AddZone(zoneId, this);
+}
diff --git a/src/game/OutdoorPvP.h b/src/game/OutdoorPvP.h
index c1c39c1ff65..48a478b5549 100644
--- a/src/game/OutdoorPvP.h
+++ b/src/game/OutdoorPvP.h
@@ -26,23 +26,15 @@
 
 #define OPVP_TRIGGER_CREATURE_ENTRY 12999
 
-enum ObjectiveStates{
-    OBJECTIVESTATE_NEUTRAL = 0,
-    OBJECTIVESTATE_ALLIANCE = 1,
-    OBJECTIVESTATE_HORDE = 2,
-    OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE = 3,
-    OBJECTIVESTATE_NEUTRAL_HORDE_CHALLENGE = 4,
-    OBJECTIVESTATE_ALLIANCE_HORDE_CHALLENGE = 5,
-    OBJECTIVESTATE_HORDE_ALLIANCE_CHALLENGE = 6
-};
-
-enum OutdoorPvPTypes{
+enum OutdoorPvPTypes
+{
     OUTDOOR_PVP_HP = 1,
-    OUTDOOR_PVP_NA = 2,
-    OUTDOOR_PVP_TF = 3,
-    OUTDOOR_PVP_ZM = 4,
-    OUTDOOR_PVP_SI = 5,
-    OUTDOOR_PVP_EP = 6
+    OUTDOOR_PVP_NA,
+    OUTDOOR_PVP_TF,
+    OUTDOOR_PVP_ZM,
+    OUTDOOR_PVP_SI,
+    OUTDOOR_PVP_EP,
+    OPVP_WINTERGRASP,
 };
 
 // struct for go spawning
@@ -220,6 +212,8 @@ protected:
     // players in the zones of this outdoorpvp, 0 - alliance, 1 - horde
     std::set<uint64> m_PlayerGuids[2];
     uint32 m_TypeId;
+
+    void RegisterZone(uint32 zoneid);
 };
 
 #endif /*OUTDOOR_PVP_H_*/
diff --git a/src/game/OutdoorPvPEP.cpp b/src/game/OutdoorPvPEP.cpp
index fc688314e0c..4eddab08a40 100644
--- a/src/game/OutdoorPvPEP.cpp
+++ b/src/game/OutdoorPvPEP.cpp
@@ -789,7 +789,7 @@ OutdoorPvPEP::OutdoorPvPEP()
 bool OutdoorPvPEP::SetupOutdoorPvP()
 {
     for(int i = 0; i < EPBuffZonesNum; ++i)
-        sOutdoorPvPMgr.AddZone(EPBuffZones[i],this);
+        RegisterZone(EPBuffZones[i]);
 
     m_OutdoorPvPObjectives.push_back(new OutdoorPvPObjectiveEP_EWT(this));
     m_OutdoorPvPObjectives.push_back(new OutdoorPvPObjectiveEP_PWT(this));
diff --git a/src/game/OutdoorPvPEP.h b/src/game/OutdoorPvPEP.h
index 08d31de5cf5..f6199ac5a3b 100644
--- a/src/game/OutdoorPvPEP.h
+++ b/src/game/OutdoorPvPEP.h
@@ -19,7 +19,7 @@
 #ifndef OUTDOOR_PVP_EP_
 #define OUTDOOR_PVP_EP_
 
-#include "OutdoorPvP.h"
+#include "OutdoorPvPImpl.h"
 
 #include "DBCStructure.h"
 
diff --git a/src/game/OutdoorPvPHP.cpp b/src/game/OutdoorPvPHP.cpp
index 6058b82c102..60ceb7f4e3c 100644
--- a/src/game/OutdoorPvPHP.cpp
+++ b/src/game/OutdoorPvPHP.cpp
@@ -70,7 +70,7 @@ bool OutdoorPvPHP::SetupOutdoorPvP()
     m_HordeTowersControlled = 0;
     // add the zones affected by the pvp buff
     for(int i = 0; i < OutdoorPvPHPBuffZonesNum; ++i)
-        sOutdoorPvPMgr.AddZone(OutdoorPvPHPBuffZones[i],this);
+        RegisterZone(OutdoorPvPHPBuffZones[i]);
 
     m_OutdoorPvPObjectives.push_back(new OutdoorPvPObjectiveHP(this,HP_TOWER_BROKEN_HILL));
 
diff --git a/src/game/OutdoorPvPHP.h b/src/game/OutdoorPvPHP.h
index a538f82b216..7ccccd2fa61 100644
--- a/src/game/OutdoorPvPHP.h
+++ b/src/game/OutdoorPvPHP.h
@@ -19,7 +19,7 @@
 #ifndef OUTDOOR_PVP_HP_
 #define OUTDOOR_PVP_HP_
 
-#include "OutdoorPvP.h"
+#include "OutdoorPvPImpl.h"
 
 #define OutdoorPvPHPBuffZonesNum 6
                                                          //  HP, citadel, ramparts, blood furnace, shattered halls, mag's lair
diff --git a/src/game/OutdoorPvPImpl.h b/src/game/OutdoorPvPImpl.h
new file mode 100644
index 00000000000..17602b07388
--- /dev/null
+++ b/src/game/OutdoorPvPImpl.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
+ *
+ * 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
+ */
+#ifndef OUTDOORPVP_IMPL_H
+#define OUTDOORPVP_IMPL_H
+
+#include "SharedDefines.h"
+#include "OutdoorPvP.h"
+#include "Player.h"
+
+#define TEAM_ID(a) (a == ALLIANCE ? 0 : 1)
+
+enum ObjectiveStates
+{
+    OBJECTIVESTATE_NEUTRAL = 0,
+    OBJECTIVESTATE_ALLIANCE,
+    OBJECTIVESTATE_HORDE,
+    OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE,
+    OBJECTIVESTATE_NEUTRAL_HORDE_CHALLENGE,
+    OBJECTIVESTATE_ALLIANCE_HORDE_CHALLENGE,
+    OBJECTIVESTATE_HORDE_ALLIANCE_CHALLENGE,
+};
+
+#endif
diff --git a/src/game/OutdoorPvPMgr.cpp b/src/game/OutdoorPvPMgr.cpp
index 2050a6c11f7..4016b84a73a 100644
--- a/src/game/OutdoorPvPMgr.cpp
+++ b/src/game/OutdoorPvPMgr.cpp
@@ -23,6 +23,7 @@
 #include "OutdoorPvPZM.h"
 #include "OutdoorPvPSI.h"
 #include "OutdoorPvPEP.h"
+#include "Wintergrasp.h"
 #include "Player.h"
 #include "Policies/SingletonImp.h"
 
@@ -125,6 +126,19 @@ void OutdoorPvPMgr::InitOutdoorPvP()
         m_OutdoorPvPSet.push_back(pOP);
         sLog.outDebug("OutdoorPvP : EP successfully initiated.");
     }
+
+    pOP = new OPvPWintergrasp;
+    // respawn, init variables
+    if(!pOP->SetupOutdoorPvP())
+    {
+        sLog.outDebug("OutdoorPvP : Wintergrasp init failed.");
+        delete pOP;
+    }
+    else
+    {
+        m_OutdoorPvPSet.push_back(pOP);
+        sLog.outDebug("OutdoorPvP : Wintergrasp successfully initiated.");
+    }
 }
 
 void OutdoorPvPMgr::AddZone(uint32 zoneid, OutdoorPvP *handle)
diff --git a/src/game/OutdoorPvPNA.cpp b/src/game/OutdoorPvPNA.cpp
index 9030337f2cd..c46c92a6404 100644
--- a/src/game/OutdoorPvPNA.cpp
+++ b/src/game/OutdoorPvPNA.cpp
@@ -256,7 +256,7 @@ bool OutdoorPvPNA::SetupOutdoorPvP()
 {
 //    m_TypeId = OUTDOOR_PVP_NA; _MUST_ be set in ctor, because of spawns cleanup
     // add the zones affected by the pvp buff
-    sOutdoorPvPMgr.AddZone(NA_BUFF_ZONE,this);
+    RegisterZone(NA_BUFF_ZONE);
 
     // halaa
     m_obj = new OutdoorPvPObjectiveNA(this);
diff --git a/src/game/OutdoorPvPNA.h b/src/game/OutdoorPvPNA.h
index 92e0b9dcbbb..15b314d4e06 100644
--- a/src/game/OutdoorPvPNA.h
+++ b/src/game/OutdoorPvPNA.h
@@ -21,7 +21,7 @@
 
 // TODO: "sometimes" set to neutral
 
-#include "OutdoorPvP.h"
+#include "OutdoorPvPImpl.h"
 
 // kill credit for pks
 const uint32 NA_CREDIT_MARKER = 24867;
diff --git a/src/game/OutdoorPvPObjectiveAI.cpp b/src/game/OutdoorPvPObjectiveAI.cpp
index 233fffd6b2f..35247d81210 100644
--- a/src/game/OutdoorPvPObjectiveAI.cpp
+++ b/src/game/OutdoorPvPObjectiveAI.cpp
@@ -21,6 +21,7 @@
 #include "Player.h"
 #include "Unit.h"
 #include "OutdoorPvPMgr.h"
+#include "OutdoorPvPImpl.h"
 #include "World.h"
 
 #define MAX_OUTDOOR_PVP_DISTANCE 200 // the max value in capture point type go data0 is 100 currently, so use twice that much to handle leaving as well
diff --git a/src/game/OutdoorPvPSI.cpp b/src/game/OutdoorPvPSI.cpp
index 366c5923351..0f61e6c3fed 100644
--- a/src/game/OutdoorPvPSI.cpp
+++ b/src/game/OutdoorPvPSI.cpp
@@ -58,7 +58,7 @@ void OutdoorPvPSI::UpdateWorldState()
 bool OutdoorPvPSI::SetupOutdoorPvP()
 {
     for(int i = 0; i < OutdoorPvPSIBuffZonesNum; ++i)
-        sOutdoorPvPMgr.AddZone(OutdoorPvPSIBuffZones[i],this);
+        RegisterZone(OutdoorPvPSIBuffZones[i]);
     return true;
 }
 
diff --git a/src/game/OutdoorPvPSI.h b/src/game/OutdoorPvPSI.h
index 1f2331b4251..3b60cb525e3 100644
--- a/src/game/OutdoorPvPSI.h
+++ b/src/game/OutdoorPvPSI.h
@@ -19,7 +19,7 @@
 #ifndef OUTDOOR_PVP_SI_
 #define OUTDOOR_PVP_SI_
 
-#include "OutdoorPvP.h"
+#include "OutdoorPvPImpl.h"
 
 const uint32 SI_SILITHYST_FLAG_GO_SPELL = 29518;
 
diff --git a/src/game/OutdoorPvPTF.cpp b/src/game/OutdoorPvPTF.cpp
index 01b224cffa9..5c4ed9dd7d4 100644
--- a/src/game/OutdoorPvPTF.cpp
+++ b/src/game/OutdoorPvPTF.cpp
@@ -276,7 +276,7 @@ bool OutdoorPvPTF::SetupOutdoorPvP()
 
     // add the zones affected by the pvp buff
     for(int i = 0; i < OutdoorPvPTFBuffZonesNum; ++i)
-        sOutdoorPvPMgr.AddZone(OutdoorPvPTFBuffZones[i],this);
+        RegisterZone(OutdoorPvPTFBuffZones[i]);
 
     m_OutdoorPvPObjectives.push_back(new OutdoorPvPObjectiveTF(this,TF_TOWER_NW));
     m_OutdoorPvPObjectives.push_back(new OutdoorPvPObjectiveTF(this,TF_TOWER_N));
diff --git a/src/game/OutdoorPvPTF.h b/src/game/OutdoorPvPTF.h
index 255ddb1fda9..2d99a93c7cf 100644
--- a/src/game/OutdoorPvPTF.h
+++ b/src/game/OutdoorPvPTF.h
@@ -1,7 +1,7 @@
 #ifndef OUTDOOR_PVP_TF_
 #define OUTDOOR_PVP_TF_
 
-#include "OutdoorPvP.h"
+#include "OutdoorPvPImpl.h"
 
 const uint32 OutdoorPvPTFBuffZonesNum = 5;
 
diff --git a/src/game/OutdoorPvPZM.cpp b/src/game/OutdoorPvPZM.cpp
index 6077a0ba66f..15625177393 100644
--- a/src/game/OutdoorPvPZM.cpp
+++ b/src/game/OutdoorPvPZM.cpp
@@ -203,7 +203,7 @@ bool OutdoorPvPZM::SetupOutdoorPvP()
 
     // add the zones affected by the pvp buff
     for(int i = 0; i < OutdoorPvPZMBuffZonesNum; ++i)
-        sOutdoorPvPMgr.AddZone(OutdoorPvPZMBuffZones[i],this);
+        RegisterZone(OutdoorPvPZMBuffZones[i]);
 
     m_OutdoorPvPObjectives.push_back(new OutdoorPvPObjectiveZM_Beacon(this,ZM_BEACON_WEST));
     m_OutdoorPvPObjectives.push_back(new OutdoorPvPObjectiveZM_Beacon(this,ZM_BEACON_EAST));
diff --git a/src/game/OutdoorPvPZM.h b/src/game/OutdoorPvPZM.h
index 405c0133b5c..f4a60f8c8f4 100644
--- a/src/game/OutdoorPvPZM.h
+++ b/src/game/OutdoorPvPZM.h
@@ -19,7 +19,7 @@
 #ifndef OUTDOOR_PVP_ZM_
 #define OUTDOOR_PVP_ZM_
 
-#include "OutdoorPvP.h"
+#include "OutdoorPvPImpl.h"
 #include "Language.h"
 
 const uint32 OutdoorPvPZMBuffZonesNum = 5;
diff --git a/src/game/Vehicle.cpp b/src/game/Vehicle.cpp
index 9dd36895d56..d05c7085bff 100644
--- a/src/game/Vehicle.cpp
+++ b/src/game/Vehicle.cpp
@@ -45,10 +45,11 @@ void Vehicle::AddToWorld()
         AIM_Initialize();
         switch(GetEntry())
         {
-        case 27850:InstallAccessory(27905,1);break;
-        case 28312:InstallAccessory(28319,7);break;
-        case 32627:InstallAccessory(32629,7);break;
+            case 27850:InstallAccessory(27905,1);break;
+            case 28312:InstallAccessory(28319,7);break;
+            case 32627:InstallAccessory(32629,7);break;
         }
+        //setPowerType(POWER_ENERGY);SetMaxPower(POWER_ENERGY, 100);
     }
 }
 
@@ -84,6 +85,9 @@ void Vehicle::setDeathState(DeathState s)                       // overwrite vir
 void Vehicle::Update(uint32 diff)
 {
     Creature::Update(diff);
+    //310
+    //if(getPowerType() == POWER_ENERGY)
+    //    ModifyPower(POWER_ENERGY, 1);
 }
 
 bool Vehicle::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint32 vehicleId, uint32 team)
diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp
new file mode 100644
index 00000000000..a2cbb3d7cf5
--- /dev/null
+++ b/src/game/Wintergrasp.cpp
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
+ *
+ * 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
+ */
+
+#include "Wintergrasp.h"
+#include "SpellAuras.h"
+#include "Vehicle.h"
+
+bool OPvPWintergrasp::SetupOutdoorPvP()
+{
+    RegisterZone(ZONE_WINTERGRASP);
+    return true;
+}
+
+void OPvPWintergrasp::HandlePlayerEnterZone(Player * plr, uint32 zone)
+{
+    if(!plr->HasAura(SPELL_RECRUIT) && !plr->HasAura(SPELL_CORPORAL)
+        && !plr->HasAura(SPELL_LIEUTENANT))
+        plr->CastSpell(plr, SPELL_RECRUIT, true);
+    OutdoorPvP::HandlePlayerEnterZone(plr, zone);
+}
+
+void OPvPWintergrasp::HandlePlayerLeaveZone(Player * plr, uint32 zone)
+{
+    if(plr->m_Vehicle)
+        plr->m_Vehicle->Dismiss();
+    OutdoorPvP::HandlePlayerLeaveZone(plr, zone);
+}
+
+void OPvPWintergrasp::HandleKill(Player *killer, Unit *victim)
+{
+    if(victim->GetTypeId() == TYPEID_PLAYER)
+    {
+        // We handle promotion here because player should not get promotion if he has buff but do the kill outside the zone
+        if(victim->getLevel() >= 70)
+        {
+            if(Aura *aur = killer->GetAura(SPELL_RECRUIT))
+            {
+                if(aur->GetStackAmount() >= 5)
+                {
+                    killer->RemoveAura(SPELL_RECRUIT);
+                    killer->CastSpell(killer, SPELL_CORPORAL, true);
+                }
+                else
+                    killer->CastSpell(killer, SPELL_RECRUIT, true);
+            }
+            else if(Aura *aur = killer->GetAura(SPELL_CORPORAL))
+            {
+                if(aur->GetStackAmount() >= 5)
+                {
+                    killer->RemoveAura(SPELL_CORPORAL);
+                    killer->CastSpell(killer, SPELL_LIEUTENANT, true);
+                }
+                else
+                    killer->CastSpell(killer, SPELL_CORPORAL, true);
+            }
+            else if(killer->HasAura(SPELL_LIEUTENANT))
+                killer->CastSpell(killer, SPELL_LIEUTENANT, true);
+        }
+    }
+}
diff --git a/src/game/Wintergrasp.h b/src/game/Wintergrasp.h
new file mode 100644
index 00000000000..1a698c4c1cf
--- /dev/null
+++ b/src/game/Wintergrasp.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
+ *
+ * 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
+ */
+
+#ifndef TRINITY_WINTERGRASP_H
+#define TRINITY_WINTERGRASP_H
+
+#include "OutdoorPvPImpl.h"
+
+#define ZONE_WINTERGRASP    4197
+
+#define SPELL_RECRUIT       37795
+#define SPELL_CORPORAL      33280
+#define SPELL_LIEUTENANT    55629
+
+#define SPELL_TENICITY      58549
+#define SPELL_TENICITY_VEHICLE  59911
+
+class OPvPWintergrasp : public OutdoorPvP
+{
+    public:
+        bool SetupOutdoorPvP();
+        void HandlePlayerEnterZone(Player *plr, uint32 zone);
+        void HandlePlayerLeaveZone(Player *plr, uint32 zone);
+        void HandleKill(Player *killer, Unit *victim);
+};
+
+#endif
diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj
index 002b5e7fb2d..9b37bb359d5 100644
--- a/win/VC80/game.vcproj
+++ b/win/VC80/game.vcproj
@@ -842,70 +842,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvP.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvP.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPEP.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPEP.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPHP.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPHP.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPNA.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPNA.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPSI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPSI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPTF.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPTF.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPZM.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPZM.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\game\Path.h"
 				>
 			</File>
@@ -1690,6 +1626,86 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="OutdoorPvP"
+			>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvP.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvP.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPEP.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPEP.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPHP.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPHP.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPImpl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPMgr.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPMgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPNA.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPNA.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPSI.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPSI.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPTF.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPTF.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPZM.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPZM.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\Wintergrasp.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\Wintergrasp.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\..\src\game\pchdef.cpp"
 			>
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index 15fc293a02c..ebe03efaab5 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -843,70 +843,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\OutdoorPvP.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvP.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPEP.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPEP.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPHP.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPHP.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPMgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPMgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPNA.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPNA.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPSI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPSI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPTF.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPTF.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPZM.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\OutdoorPvPZM.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\src\game\Path.h"
 				>
 			</File>
@@ -1691,6 +1627,86 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="OutdoorPvP"
+			>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvP.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvP.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPEP.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPEP.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPHP.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPHP.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPImpl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPMgr.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPMgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPNA.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPNA.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPSI.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPSI.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPTF.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPTF.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPZM.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\OutdoorPvPZM.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\Wintergrasp.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\game\Wintergrasp.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\..\src\game\pchdef.cpp"
 			>