*Cleanup..

--HG--
branch : trunk

1 files changed, 128 insertions, 120 deletions

diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
index 61ea4e0729c..6c7b446f607 100644
--- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
@@ -507,6 +507,10 @@
 						>
 					</File>
 					<File
+						RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\blackrock_depths.h"
+						>
+					</File>
+					<File
 						RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\boss_ambassador_flamelash.cpp"
 						>
 					</File>
@@ -547,10 +551,6 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\def_blackrock_depths.h"
-						>
-					</File>
-					<File
 						RelativePath="..\scripts\eastern_kingdoms\blackrock_depths\instance_blackrock_depths.cpp"
 						>
 					</File>
@@ -659,7 +659,11 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\deadmines\def_deadmines.h"
+						RelativePath="..\scripts\eastern_kingdoms\deadmines\deadmines.h"
+						>
+					</File>
+					<File
+						RelativePath="..\scripts\eastern_kingdoms\deadmines\instance_deadmines.cpp"
 						>
 					</File>
 				</Filter>
@@ -707,15 +711,15 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\karazhan\def_karazhan.h"
+						RelativePath="..\scripts\eastern_kingdoms\karazhan\instance_karazhan.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\karazhan\instance_karazhan.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\karazhan\karazhan.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\karazhan\karazhan.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\karazhan\karazhan.h"
 						>
 					</File>
 				</Filter>
@@ -739,15 +743,15 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\def_magisters_terrace.h"
+						RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\instance_magisters_terrace.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\instance_magisters_terrace.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\magisters_terrace.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\magisters_terrace.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\magisters_terrace\magisters_terrace.h"
 						>
 					</File>
 				</Filter>
@@ -795,20 +799,20 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\molten_core\def_molten_core.h"
+						RelativePath="..\scripts\eastern_kingdoms\molten_core\instance_molten_core.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\molten_core\instance_molten_core.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\molten_core\molten_core.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\molten_core\molten_core.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\molten_core\molten_core.h"
 						>
 					</File>
 				</Filter>
 				<Filter
-					Name="scarlet_enclave"
+					Name="Scarlet Enclave"
 					>
 					<File
 						RelativePath="..\scripts\eastern_kingdoms\scarlet_enclave\chapter1.cpp"
@@ -871,11 +875,11 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\def_scarlet_monastery.h"
+						RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\instance_scarlet_monastery.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\instance_scarlet_monastery.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\scarlet_monastery\scarlet_monastery.h"
 						>
 					</File>
 				</Filter>
@@ -931,11 +935,11 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\scholomance\def_scholomance.h"
+						RelativePath="..\scripts\eastern_kingdoms\scholomance\instance_scholomance.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\scholomance\instance_scholomance.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\scholomance\scholomance.h"
 						>
 					</File>
 				</Filter>
@@ -943,15 +947,15 @@
 					Name="Shadowfang Keep"
 					>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\def_shadowfang_keep.h"
+						RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\instance_shadowfang_keep.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\instance_shadowfang_keep.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\shadowfang_keep\shadowfang_keep.h"
 						>
 					</File>
 				</Filter>
@@ -1003,15 +1007,15 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\stratholme\def_stratholme.h"
+						RelativePath="..\scripts\eastern_kingdoms\stratholme\instance_stratholme.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\stratholme\instance_stratholme.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\stratholme\stratholme.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\stratholme\stratholme.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\stratholme\stratholme.h"
 						>
 					</File>
 				</Filter>
@@ -1019,15 +1023,15 @@
 					Name="Sunken Temple"
 					>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\sunken_temple\def_sunken_temple.h"
+						RelativePath="..\scripts\eastern_kingdoms\sunken_temple\instance_sunken_temple.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\sunken_temple\instance_sunken_temple.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\sunken_temple\sunken_temple.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\sunken_temple\sunken_temple.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\sunken_temple\sunken_temple.h"
 						>
 					</File>
 				</Filter>
@@ -1059,15 +1063,15 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\def_sunwell_plateau.h"
+						RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\instance_sunwell_plateau.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\instance_sunwell_plateau.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\sunwell_plateau.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\sunwell_plateau.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\sunwell_plateau\sunwell_plateau.h"
 						>
 					</File>
 				</Filter>
@@ -1119,15 +1123,15 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\zulaman\def_zulaman.h"
+						RelativePath="..\scripts\eastern_kingdoms\zulaman\instance_zulaman.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\zulaman\instance_zulaman.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\zulaman\zulaman.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\zulaman\zulaman.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\zulaman\zulaman.h"
 						>
 					</File>
 				</Filter>
@@ -1187,11 +1191,11 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\zulgurub\def_zulgurub.h"
+						RelativePath="..\scripts\eastern_kingdoms\zulgurub\instance_zulgurub.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\eastern_kingdoms\zulgurub\instance_zulgurub.cpp"
+						RelativePath="..\scripts\eastern_kingdoms\zulgurub\zulgurub.h"
 						>
 					</File>
 				</Filter>
@@ -1311,7 +1315,7 @@
 					Name="Blackfathom Depths"
 					>
 					<File
-						RelativePath="..\scripts\kalimdor\blackfathom_depths\def_blackfathom_deeps.h"
+						RelativePath="..\scripts\kalimdor\blackfathom_depths\blackfathom_deeps.h"
 						>
 					</File>
 					<File
@@ -1330,6 +1334,10 @@
 							>
 						</File>
 						<File
+							RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_infinite.cpp"
+							>
+						</File>
+						<File
 							RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_mal_ganis.cpp"
 							>
 						</File>
@@ -1341,12 +1349,8 @@
 							RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_salramm.cpp"
 							>
 						</File>
-                        <File
-                            RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\boss_infinite.cpp"
-                            >
-                        </File>
 						<File
-							RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\def_culling_of_stratholme.h"
+							RelativePath="..\scripts\kalimdor\caverns_of_time\culling_of_stratholme\culling_of_stratholme.h"
 							>
 						</File>
 						<File
@@ -1374,7 +1378,7 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\def_dark_portal.h"
+							RelativePath="..\scripts\kalimdor\caverns_of_time\dark_portal\dark_portal.h"
 							>
 						</File>
 						<File
@@ -1406,11 +1410,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\def_hyjal.h"
+							RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjal.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjal.cpp"
+							RelativePath="..\scripts\kalimdor\caverns_of_time\hyjal\hyjal.h"
 							>
 						</File>
 						<File
@@ -1450,15 +1454,15 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\def_old_hillsbrad.h"
+							RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\instance_old_hillsbrad.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\instance_old_hillsbrad.cpp"
+							RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\old_hillsbrad.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\old_hillsbrad.cpp"
+							RelativePath="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\old_hillsbrad.h"
 							>
 						</File>
 					</Filter>
@@ -1507,15 +1511,15 @@
 					Name="Razorfen Kraul"
 					>
 					<File
-						RelativePath="..\scripts\kalimdor\razorfen_kraul\def_razorfen_kraul.h"
+						RelativePath="..\scripts\kalimdor\razorfen_kraul\instance_razorfen_kraul.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\kalimdor\razorfen_kraul\instance_razorfen_kraul.cpp"
+						RelativePath="..\scripts\kalimdor\razorfen_kraul\razorfen_kraul.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\kalimdor\razorfen_kraul\razorfen_kraul.cpp"
+						RelativePath="..\scripts\kalimdor\razorfen_kraul\razorfen_kraul.h"
 						>
 					</File>
 				</Filter>
@@ -1550,6 +1554,10 @@
 						RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\instance_ruins_of_ahnqiraj.cpp"
 						>
 					</File>
+					<File
+						RelativePath="..\scripts\kalimdor\ruins_of_ahnqiraj\ruins_of_ahnqiraj.h"
+						>
+					</File>
 				</Filter>
 				<Filter
 					Name="Temple of Ahn&apos;Qiraj"
@@ -1591,15 +1599,15 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\def_temple_of_ahnqiraj.h"
+						RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\instance_temple_of_ahnqiraj.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\instance_temple_of_ahnqiraj.cpp"
+						RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\mob_anubisath_sentinel.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\mob_anubisath_sentinel.cpp"
+						RelativePath="..\scripts\kalimdor\temple_of_ahnqiraj\temple_of_ahnqiraj.h"
 						>
 					</File>
 				</Filter>
@@ -1607,15 +1615,15 @@
 					Name="Wailing Caverns"
 					>
 					<File
-						RelativePath="..\scripts\kalimdor\wailing_caverns\def_wailing_caverns.h"
+						RelativePath="..\scripts\kalimdor\wailing_caverns\instance_wailing_caverns.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\kalimdor\wailing_caverns\instance_wailing_caverns.cpp"
+						RelativePath="..\scripts\kalimdor\wailing_caverns\wailing_caverns.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\kalimdor\wailing_caverns\wailing_caverns.cpp"
+						RelativePath="..\scripts\kalimdor\wailing_caverns\wailing_caverns.h"
 						>
 					</File>
 				</Filter>
@@ -1674,6 +1682,10 @@
 						Name="Ahn&apos;kahet"
 						>
 						<File
+							RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\ahnkahet.h"
+							>
+						</File>
+						<File
 							RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\boss_amanitar.cpp"
 							>
 						</File>
@@ -1694,10 +1706,6 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\def_ahnkahet.h"
-							>
-						</File>
-						<File
 							RelativePath="..\scripts\northrend\azjol_nerub\ahnkahet\instance_ahnkahet.cpp"
 							>
 						</File>
@@ -1706,19 +1714,19 @@
 						Name="Azjol-Nerub"
 						>
 						<File
-							RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\boss_anubarak.cpp"
+							RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\azjol_nerub.h"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\boss_hadronox.cpp"
+							RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\boss_anubarak.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\boss_krikthir_the_gatewatcher.cpp"
+							RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\boss_hadronox.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\def_azjol_nerub.h"
+							RelativePath="..\scripts\northrend\azjol_nerub\azjol_nerub\boss_krikthir_the_gatewatcher.cpp"
 							>
 						</File>
 						<File
@@ -1747,7 +1755,7 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\northrend\draktharon_keep\def_drak_tharon_keep.h"
+						RelativePath="..\scripts\northrend\draktharon_keep\drak_tharon_keep.h"
 						>
 					</File>
 					<File
@@ -1779,7 +1787,7 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\northrend\gundrak\def_gundrak.h"
+						RelativePath="..\scripts\northrend\gundrak\gundrak.h"
 						>
 					</File>
 					<File
@@ -1851,11 +1859,11 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\northrend\naxxramas\def_naxxramas.h"
+						RelativePath="..\scripts\northrend\naxxramas\instance_naxxramas.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\northrend\naxxramas\instance_naxxramas.cpp"
+						RelativePath="..\scripts\northrend\naxxramas\naxxramas.h"
 						>
 					</File>
 				</Filter>
@@ -1890,11 +1898,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\nexus\nexus\def_nexus.h"
+							RelativePath="..\scripts\northrend\nexus\nexus\instance_nexus.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\nexus\nexus\instance_nexus.cpp"
+							RelativePath="..\scripts\northrend\nexus\nexus\nexus.h"
 							>
 						</File>
 					</Filter>
@@ -1918,11 +1926,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\nexus\oculus\def_oculus.h"
+							RelativePath="..\scripts\northrend\nexus\oculus\instance_oculus.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\nexus\oculus\instance_oculus.cpp"
+							RelativePath="..\scripts\northrend\nexus\oculus\oculus.h"
 							>
 						</File>
 					</Filter>
@@ -1934,7 +1942,7 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\nexus\eye_of_eternity\def_eye_of_eternity.h"
+							RelativePath="..\scripts\northrend\nexus\eye_of_eternity\eye_of_eternity.h"
 							>
 						</File>
 						<File
@@ -1951,11 +1959,11 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\northrend\obsidian_sanctum\def_obsidian_sanctum.h"
+						RelativePath="..\scripts\northrend\obsidian_sanctum\instance_obsidian_sanctum.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\northrend\obsidian_sanctum\instance_obsidian_sanctum.cpp"
+						RelativePath="..\scripts\northrend\obsidian_sanctum\obsidian_sanctum.h"
 						>
 					</File>
 				</Filter>
@@ -1978,11 +1986,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\ulduar\halls_of_stone\def_halls_of_stone.h"
+							RelativePath="..\scripts\northrend\ulduar\halls_of_stone\halls_of_stone.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\ulduar\halls_of_stone\halls_of_stone.cpp"
+							RelativePath="..\scripts\northrend\ulduar\halls_of_stone\halls_of_stone.h"
 							>
 						</File>
 						<File
@@ -2010,7 +2018,7 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\def_halls_of_lightning.h"
+							RelativePath="..\scripts\northrend\ulduar\halls_of_lightning\halls_of_lightning.h"
 							>
 						</File>
 						<File
@@ -2078,11 +2086,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\ulduar\ulduar\def_ulduar.h"
+							RelativePath="..\scripts\northrend\ulduar\ulduar\instance_ulduar.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\ulduar\ulduar\instance_ulduar.cpp"
+							RelativePath="..\scripts\northrend\ulduar\ulduar\ulduar.h"
 							>
 						</File>
 						<File
@@ -2110,15 +2118,15 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\def_utgarde_keep.h"
+							RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\instance_utgarde_keep.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\instance_utgarde_keep.cpp"
+							RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\utgarde_keep.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\utgarde_keep.cpp"
+							RelativePath="..\scripts\northrend\utgarde_keep\utgarde_keep\utgarde_keep.h"
 							>
 						</File>
 					</Filter>
@@ -2142,11 +2150,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\def_pinnacle.h"
+							RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\instance_pinnacle.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\instance_pinnacle.cpp"
+							RelativePath="..\scripts\northrend\utgarde_keep\utgarde_pinnacle\utgarde_pinnacle.h"
 							>
 						</File>
 					</Filter>
@@ -2163,11 +2171,11 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\northrend\vault_of_archavon\def_vault_of_archavon.h"
+						RelativePath="..\scripts\northrend\vault_of_archavon\instance_vault_of_archavon.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\northrend\vault_of_archavon\instance_vault_of_archavon.cpp"
+						RelativePath="..\scripts\northrend\vault_of_archavon\vault_of_archavon.h"
 						>
 					</File>
 				</Filter>
@@ -2203,15 +2211,15 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\northrend\violet_hold\def_violet_hold.h"
+						RelativePath="..\scripts\northrend\violet_hold\instance_violet_hold.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\northrend\violet_hold\instance_violet_hold.cpp"
+						RelativePath="..\scripts\northrend\violet_hold\violet_hold.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\northrend\violet_hold\violet_hold.cpp"
+						RelativePath="..\scripts\northrend\violet_hold\violet_hold.h"
 						>
 					</File>
 				</Filter>
@@ -2298,11 +2306,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\auchindoun\sethekk_halls\def_sethekk_halls.h"
+							RelativePath="..\scripts\outland\auchindoun\sethekk_halls\instance_sethekk_halls.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\auchindoun\sethekk_halls\instance_sethekk_halls.cpp"
+							RelativePath="..\scripts\outland\auchindoun\sethekk_halls\sethekk_halls.h"
 							>
 						</File>
 					</Filter>
@@ -2326,11 +2334,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\def_shadow_labyrinth.h"
+							RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\instance_shadow_labyrinth.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\instance_shadow_labyrinth.cpp"
+							RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\shadow_labyrinth.h"
 							>
 						</File>
 					</Filter>
@@ -2343,6 +2351,10 @@
 						>
 					</File>
 					<File
+						RelativePath="..\scripts\outland\black_temple\black_temple.h"
+						>
+					</File>
+					<File
 						RelativePath="..\scripts\outland\black_temple\boss_bloodboil.cpp"
 						>
 					</File>
@@ -2375,10 +2387,6 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\outland\black_temple\def_black_temple.h"
-						>
-					</File>
-					<File
 						RelativePath="..\scripts\outland\black_temple\illidari_council.cpp"
 						>
 					</File>
@@ -2418,11 +2426,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\def_serpent_shrine.h"
+							RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\instance_serpent_shrine.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\instance_serpent_shrine.cpp"
+							RelativePath="..\scripts\outland\coilfang_resevoir\serpent_shrine\serpent_shrine.h"
 							>
 						</File>
 					</Filter>
@@ -2442,11 +2450,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\def_steam_vault.h"
+							RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\instance_steam_vault.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\instance_steam_vault.cpp"
+							RelativePath="..\scripts\outland\coilfang_resevoir\steam_vault\steam_vault.h"
 							>
 						</File>
 					</Filter>
@@ -2475,7 +2483,7 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\outland\gruuls_lair\def_gruuls_lair.h"
+						RelativePath="..\scripts\outland\gruuls_lair\gruuls_lair.h"
 						>
 					</File>
 					<File
@@ -2490,19 +2498,19 @@
 						Name="Blood Furnace"
 						>
 						<File
-							RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\boss_broggok.cpp"
+							RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\blood_furnace.h"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\boss_kelidan_the_breaker.cpp"
+							RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\boss_broggok.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\boss_the_maker.cpp"
+							RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\boss_kelidan_the_breaker.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\def_blood_furnace.h"
+							RelativePath="..\scripts\outland\hellfire_citadel\blood_furnace\boss_the_maker.cpp"
 							>
 						</File>
 						<File
@@ -2518,11 +2526,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\def_magtheridons_lair.h"
+							RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\instance_magtheridons_lair.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\instance_magtheridons_lair.cpp"
+							RelativePath="..\scripts\outland\hellfire_citadel\magtheridons_lair\magtheridons_lair.h"
 							>
 						</File>
 					</Filter>
@@ -2542,7 +2550,7 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\def_hellfire_ramparts.h"
+							RelativePath="..\scripts\outland\hellfire_citadel\hellfire_ramparts\hellfire_ramparts.h"
 							>
 						</File>
 						<File
@@ -2566,11 +2574,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\def_shattered_halls.h"
+							RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\instance_shattered_halls.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\instance_shattered_halls.cpp"
+							RelativePath="..\scripts\outland\hellfire_citadel\shattered_halls\shattered_halls.h"
 							>
 						</File>
 					</Filter>
@@ -2586,11 +2594,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\tempest_keep\arcatraz\boss_harbinger_skyriss.cpp"
+							RelativePath="..\scripts\outland\tempest_keep\arcatraz\arcatraz.h"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\tempest_keep\arcatraz\def_arcatraz.h"
+							RelativePath="..\scripts\outland\tempest_keep\arcatraz\boss_harbinger_skyriss.cpp"
 							>
 						</File>
 						<File
@@ -2634,15 +2642,15 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\tempest_keep\the_eye\def_the_eye.h"
+							RelativePath="..\scripts\outland\tempest_keep\the_eye\instance_the_eye.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\tempest_keep\the_eye\instance_the_eye.cpp"
+							RelativePath="..\scripts\outland\tempest_keep\the_eye\the_eye.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\tempest_keep\the_eye\the_eye.cpp"
+							RelativePath="..\scripts\outland\tempest_keep\the_eye\the_eye.h"
 							>
 						</File>
 					</Filter>
@@ -2666,11 +2674,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\tempest_keep\the_mechanar\def_mechanar.h"
+							RelativePath="..\scripts\outland\tempest_keep\the_mechanar\instance_mechanar.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\outland\tempest_keep\the_mechanar\instance_mechanar.cpp"
+							RelativePath="..\scripts\outland\tempest_keep\the_mechanar\mechanar.h"
 							>
 						</File>
 					</Filter>