diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt
index 0d63ed10020..b83b2f09f58 100644
--- a/src/bindings/scripts/CMakeLists.txt
+++ b/src/bindings/scripts/CMakeLists.txt
@@ -194,6 +194,71 @@ SET(trinityscript_LIB_SRCS
scripts/examples/example_escort.cpp
scripts/examples/example_gossip_codebox.cpp
scripts/examples/example_misc.cpp
+ scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
+ scripts/kalimdor/blackfathom_depths/def_blackfathom_deeps.h
+ scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
+ scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
+ scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
+ scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
+ scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
+ scripts/kalimdor/caverns_of_time/culling_of_stratholme/def_culling_of_stratholme.h
+ scripts/kalimdor/caverns_of_time/dark_portal/def_dark_portal.h
+ scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
+ scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
+ scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
+ scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
+ scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
+ scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
+ scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
+ scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
+ scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
+ scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
+ scripts/kalimdor/caverns_of_time/hyjal/def_hyjal.h
+ scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
+ scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
+ scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
+ scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
+ scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h
+ scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
+ scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
+ scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
+ scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
+ scripts/kalimdor/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
+ scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
+ scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
+ scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp
+ scripts/kalimdor/maraudon/boss_landslide.cpp
+ scripts/kalimdor/maraudon/boss_noxxion.cpp
+ scripts/kalimdor/maraudon/boss_princess_theradras.cpp
+ scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
+ scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp
+ scripts/kalimdor/razorfen_downs/razorfen_downs.cpp
+ scripts/kalimdor/razorfen_kraul/def_razorfen_kraul.h
+ scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
+ scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp
+ scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
+ scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
+ scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
+ scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
+ scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
+ scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
+ scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
+ scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
+ scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
+ scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp
+ scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp
+ scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
+ scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
+ scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
+ scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
+ scripts/kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp
+ scripts/kalimdor/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h
+ scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
+ scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
+ scripts/kalimdor/wailing_caverns/def_wailing_caverns.h
+ scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
+ scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
+ scripts/kalimdor/zulfarrak/zulfarrak.cpp
scripts/kalimdor/ashenvale.cpp
scripts/kalimdor/azshara.cpp
scripts/kalimdor/azuremyst_isle.cpp
@@ -214,6 +279,7 @@ SET(trinityscript_LIB_SRCS
scripts/kalimdor/the_barrens.cpp
scripts/kalimdor/thousand_needles.cpp
scripts/kalimdor/thunder_bluff.cpp
+ scripts/kalimdor/ungoro_crater.cpp
scripts/kalimdor/winterspring.cpp
scripts/northrend/borean_tundra.cpp
scripts/northrend/dragonblight.cpp
@@ -257,32 +323,6 @@ SET(trinityscript_LIB_SRCS
scripts/zone/black_temple/def_black_temple.h
scripts/zone/black_temple/illidari_council.cpp
scripts/zone/black_temple/instance_black_temple.cpp
- scripts/zone/blackfathom_depths/instance_blackfathom_deeps.cpp
- scripts/zone/blackfathom_depths/def_blackfathom_deeps.h
- scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h
- scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp
- scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp
- scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp
- scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
- scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp
- scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp
- scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp
- scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp
- scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp
- scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp
- scripts/zone/caverns_of_time/hyjal/def_hyjal.h
- scripts/zone/caverns_of_time/hyjal/hyjal.cpp
- scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp
- scripts/zone/caverns_of_time/hyjal/hyjal_trash.h
- scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp
- scripts/zone/caverns_of_time/hyjal/hyjalAI.h
- scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp
- scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
- scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
- scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
- scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
- scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
- scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
@@ -320,10 +360,6 @@ SET(trinityscript_LIB_SRCS
scripts/zone/hellfire_citadel/shattered_halls/def_shattered_halls.h
scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
- scripts/zone/maraudon/boss_celebras_the_cursed.cpp
- scripts/zone/maraudon/boss_landslide.cpp
- scripts/zone/maraudon/boss_noxxion.cpp
- scripts/zone/maraudon/boss_princess_theradras.cpp
scripts/zone/naxxramas/boss_anubrekhan.cpp
scripts/zone/naxxramas/boss_faerlina.cpp
scripts/zone/naxxramas/boss_gluth.cpp
@@ -341,19 +377,6 @@ SET(trinityscript_LIB_SRCS
scripts/zone/naxxramas/boss_thaddius.cpp
scripts/zone/naxxramas/def_naxxramas.h
scripts/zone/naxxramas/instance_naxxramas.cpp
- scripts/zone/onyxias_lair/boss_onyxia.cpp
- scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp
- scripts/zone/razorfen_downs/razorfen_downs.cpp
- scripts/zone/razorfen_kraul/def_razorfen_kraul.h
- scripts/zone/razorfen_kraul/instance_razorfen_kraul.cpp
- scripts/zone/razorfen_kraul/razorfen_kraul.cpp
- scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp
- scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp
- scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
- scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp
- scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp
- scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp
- scripts/zone/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
scripts/zone/tempest_keep/arcatraz/arcatraz.cpp
scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
scripts/zone/tempest_keep/arcatraz/def_arcatraz.h
@@ -374,23 +397,6 @@ SET(trinityscript_LIB_SRCS
scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
scripts/zone/tempest_keep/the_mechanar/def_mechanar.h
scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp
- scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp
- scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp
- scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp
- scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp
- scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp
- scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp
- scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp
- scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp
- scripts/zone/temple_of_ahnqiraj/boss_viscidus.cpp
- scripts/zone/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h
- scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
- scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
- scripts/zone/ungoro_crater/ungoro_crater.cpp
- scripts/zone/wailing_caverns/def_wailing_caverns.h
- scripts/zone/wailing_caverns/instance_wailing_caverns.cpp
- scripts/zone/wailing_caverns/wailing_caverns.cpp
- scripts/zone/zulfarrak/zulfarrak.cpp
scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp
scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
@@ -462,12 +468,6 @@ SET(trinityscript_LIB_SRCS
scripts/zone/ulduar/halls_of_lightning/boss_volkhan.cpp
scripts/zone/ulduar/halls_of_lightning/boss_loken.cpp
scripts/zone/ulduar/halls_of_lightning/def_halls_of_lightning.h
- scripts/zone/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
- scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
- scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
- scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
- scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
- scripts/zone/caverns_of_time/culling_of_stratholme/def_culling_of_stratholme.h
scripts/zone/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp
scripts/zone/nexus/eye_of_eternity/def_eye_of_eternity.h
diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
index ece3e669445..00b918bd22e 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -1178,6 +1178,322 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1257,6 +1573,10 @@
RelativePath="..\scripts\kalimdor\thunder_bluff.cpp"
>
+
+
@@ -1337,339 +1657,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
index 87b5cb00ce4..d25138a9e0f 100644
--- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
@@ -1254,6 +1254,10 @@
RelativePath="..\scripts\kalimdor\thunder_bluff.cpp"
>
+
+
@@ -1605,68 +1609,1308 @@
>
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bindings/scripts/scripts/zone/blackfathom_depths/def_blackfathom_deeps.h b/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/def_blackfathom_deeps.h
similarity index 100%
rename from src/bindings/scripts/scripts/zone/blackfathom_depths/def_blackfathom_deeps.h
rename to src/bindings/scripts/scripts/kalimdor/blackfathom_depths/def_blackfathom_deeps.h
diff --git a/src/bindings/scripts/scripts/zone/blackfathom_depths/instance_blackfathom_deeps.cpp b/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/blackfathom_depths/instance_blackfathom_deeps.cpp
rename to src/bindings/scripts/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/def_culling_of_stratholme.h b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/def_culling_of_stratholme.h
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/def_culling_of_stratholme.h
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/def_culling_of_stratholme.h
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/def_dark_portal.h
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/def_dark_portal.h
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/def_dark_portal.h
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/def_hyjal.h b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/def_hyjal.h
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/def_hyjal.h
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/def_hyjal.h
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.h b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.h
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
rename to src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp
rename to src/bindings/scripts/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp
diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_landslide.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp
rename to src/bindings/scripts/scripts/kalimdor/maraudon/boss_landslide.cpp
diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_noxxion.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp
rename to src/bindings/scripts/scripts/kalimdor/maraudon/boss_noxxion.cpp
diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_princess_theradras.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp
rename to src/bindings/scripts/scripts/kalimdor/maraudon/boss_princess_theradras.cpp
diff --git a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp b/src/bindings/scripts/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp
rename to src/bindings/scripts/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
diff --git a/src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp b/src/bindings/scripts/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp
rename to src/bindings/scripts/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp
diff --git a/src/bindings/scripts/scripts/zone/razorfen_downs/razorfen_downs.cpp b/src/bindings/scripts/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/razorfen_downs/razorfen_downs.cpp
rename to src/bindings/scripts/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp
diff --git a/src/bindings/scripts/scripts/zone/razorfen_kraul/def_razorfen_kraul.h b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/def_razorfen_kraul.h
similarity index 100%
rename from src/bindings/scripts/scripts/zone/razorfen_kraul/def_razorfen_kraul.h
rename to src/bindings/scripts/scripts/kalimdor/razorfen_kraul/def_razorfen_kraul.h
diff --git a/src/bindings/scripts/scripts/zone/razorfen_kraul/instance_razorfen_kraul.cpp b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/razorfen_kraul/instance_razorfen_kraul.cpp
rename to src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
diff --git a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp
rename to src/bindings/scripts/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp
diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp
rename to src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp
rename to src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
rename to src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_moam.cpp
rename to src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ossirian.cpp
rename to src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_rajaxx.cpp
rename to src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
rename to src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp
rename to src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp
rename to src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp
rename to src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp
rename to src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp
rename to src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_sartura.cpp
rename to src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp
rename to src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp
rename to src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_viscidus.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_viscidus.cpp
rename to src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h
similarity index 100%
rename from src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h
rename to src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
rename to src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
rename to src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
diff --git a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp b/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp
rename to src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp
diff --git a/src/bindings/scripts/scripts/zone/wailing_caverns/def_wailing_caverns.h b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/def_wailing_caverns.h
similarity index 100%
rename from src/bindings/scripts/scripts/zone/wailing_caverns/def_wailing_caverns.h
rename to src/bindings/scripts/scripts/kalimdor/wailing_caverns/def_wailing_caverns.h
diff --git a/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp
rename to src/bindings/scripts/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
diff --git a/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp
rename to src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
diff --git a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp b/src/bindings/scripts/scripts/kalimdor/zulfarrak/zulfarrak.cpp
similarity index 100%
rename from src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp
rename to src/bindings/scripts/scripts/kalimdor/zulfarrak/zulfarrak.cpp
diff --git a/src/bindings/scripts/system/ScriptLoader.cpp b/src/bindings/scripts/system/ScriptLoader.cpp
index 49d2aa8bb7e..6f49b54a515 100644
--- a/src/bindings/scripts/system/ScriptLoader.cpp
+++ b/src/bindings/scripts/system/ScriptLoader.cpp
@@ -164,6 +164,7 @@ extern void AddSC_boss_hazzarah();
extern void AddSC_boss_renataki();
extern void AddSC_boss_wushoolay();
extern void AddSC_instance_zulgurub();
+
//extern void AddSC_alterac_mountains();
extern void AddSC_arathi_highlands();
extern void AddSC_blasted_lands();
@@ -189,6 +190,46 @@ extern void AddSC_western_plaguelands();
extern void AddSC_westfall();
//kalimdor
+extern void AddSC_instance_blackfathom_deeps(); //Blackfathom Depths
+extern void AddSC_hyjal(); //CoT Battle for Mt. Hyjal
+extern void AddSC_boss_archimonde();
+extern void AddSC_instance_mount_hyjal();
+extern void AddSC_hyjal_trash();
+extern void AddSC_boss_rage_winterchill();
+extern void AddSC_boss_anetheron();
+extern void AddSC_boss_kazrogal();
+extern void AddSC_boss_azgalor();
+extern void AddSC_boss_captain_skarloc(); //CoT Old Hillsbrad
+extern void AddSC_boss_epoch_hunter();
+extern void AddSC_boss_lieutenant_drake();
+extern void AddSC_instance_old_hillsbrad();
+extern void AddSC_old_hillsbrad();
+extern void AddSC_boss_aeonus(); //CoT The Dark Portal
+extern void AddSC_boss_chrono_lord_deja();
+extern void AddSC_boss_temporus();
+extern void AddSC_dark_portal();
+extern void AddSC_instance_dark_portal();
+extern void AddSC_boss_celebras_the_cursed(); //Maraudon
+extern void AddSC_boss_landslide();
+extern void AddSC_boss_noxxion();
+extern void AddSC_boss_ptheradras();
+extern void AddSC_boss_onyxia(); //Onyxia's Lair
+extern void AddSC_boss_amnennar_the_coldbringer(); //Razorfen Downs
+extern void AddSC_razorfen_downs();
+extern void AddSC_razorfen_kraul(); //Razorfen Kraul
+extern void AddSC_boss_cthun(); //Temple of ahn'qiraj
+extern void AddSC_boss_fankriss();
+extern void AddSC_boss_huhuran();
+extern void AddSC_bug_trio();
+extern void AddSC_boss_sartura();
+extern void AddSC_boss_skeram();
+extern void AddSC_boss_twinemperors();
+extern void AddSC_mob_anubisath_sentinel();
+extern void AddSC_instance_temple_of_ahnqiraj();
+extern void AddSC_wailing_caverns(); //Wailing caverns
+extern void AddSC_instance_wailing_caverns();
+extern void AddSC_zulfarrak(); //Zul'Farrak
+
extern void AddSC_ashenvale();
extern void AddSC_azshara();
extern void AddSC_azuremyst_isle();
@@ -272,34 +313,6 @@ extern void AddSC_boss_najentus();
extern void AddSC_boss_illidari_council();
extern void AddSC_instance_black_temple();
-//Blackfathom Depths
-extern void AddSC_instance_blackfathom_deeps();
-
-//Caverns of Time
-//--Battle for Mt. Hyjal
-extern void AddSC_hyjal();
-extern void AddSC_boss_archimonde();
-extern void AddSC_instance_mount_hyjal();
-extern void AddSC_hyjal_trash();
-extern void AddSC_boss_rage_winterchill();
-extern void AddSC_boss_anetheron();
-extern void AddSC_boss_kazrogal();
-extern void AddSC_boss_azgalor();
-
-//--Old Hillsbrad
-extern void AddSC_boss_captain_skarloc();
-extern void AddSC_boss_epoch_hunter();
-extern void AddSC_boss_lieutenant_drake();
-extern void AddSC_instance_old_hillsbrad();
-extern void AddSC_old_hillsbrad();
-
-//--The Dark Portal
-extern void AddSC_boss_aeonus();
-extern void AddSC_boss_chrono_lord_deja();
-extern void AddSC_boss_temporus();
-extern void AddSC_dark_portal();
-extern void AddSC_instance_dark_portal();
-
//Coilfang Resevoir
//--Serpent Shrine Cavern
extern void AddSC_boss_fathomlord_karathress();
@@ -350,12 +363,6 @@ extern void AddSC_boss_omor_the_unscarred();
extern void AddSC_boss_vazruden_the_herald();
extern void AddSC_instance_ramparts();
-//Maraudon
-extern void AddSC_boss_celebras_the_cursed();
-extern void AddSC_boss_landslide();
-extern void AddSC_boss_noxxion();
-extern void AddSC_boss_ptheradras();
-
//Naxxramas
extern void AddSC_boss_anubrekhan();
extern void AddSC_boss_maexxna();
@@ -390,17 +397,6 @@ extern void AddSC_instance_nexus();
extern void AddSC_boss_sartharion();
extern void AddSC_instance_obsidian_sanctum();
-//Onyxia's Lair
-extern void AddSC_boss_onyxia();
-
-//Ragefire Chasm
-//Razorfen Downs
-extern void AddSC_boss_amnennar_the_coldbringer();
-extern void AddSC_razorfen_downs();
-
-//Razorfen Kraul
-extern void AddSC_razorfen_kraul();
-
//Tempest Keep
//--Arcatraz
extern void AddSC_arcatraz();
@@ -426,16 +422,6 @@ extern void AddSC_boss_nethermancer_sepethrea();
extern void AddSC_boss_pathaleon_the_calculator();
extern void AddSC_instance_mechanar();
-//Temple of ahn'qiraj
-extern void AddSC_boss_cthun();
-extern void AddSC_boss_fankriss();
-extern void AddSC_boss_huhuran();
-extern void AddSC_bug_trio();
-extern void AddSC_boss_sartura();
-extern void AddSC_boss_skeram();
-extern void AddSC_boss_twinemperors();
-extern void AddSC_mob_anubisath_sentinel();
-extern void AddSC_instance_temple_of_ahnqiraj();
//Ulduar
extern void AddSC_boss_auriaya();
@@ -457,13 +443,6 @@ extern void AddSC_boss_ingvar_the_plunderer();
extern void AddSC_instance_utgarde_keep();
extern void AddSC_utgarde_keep();
-//Wailing caverns
-extern void AddSC_wailing_caverns();
-extern void AddSC_instance_wailing_caverns();
-
-//Zul'Farrak
-extern void AddSC_zulfarrak();
-
//Vault of Archavon
extern void AddSC_boss_archavon();
extern void AddSC_boss_emalon();
@@ -639,6 +618,7 @@ void AddScripts()
AddSC_boss_renataki();
AddSC_boss_wushoolay();
AddSC_instance_zulgurub();
+
//AddSC_alterac_mountains();
AddSC_arathi_highlands();
AddSC_blasted_lands();
@@ -664,6 +644,46 @@ void AddScripts()
AddSC_westfall();
//kalimdor
+ AddSC_instance_blackfathom_deeps(); //Blackfathom Depths
+ AddSC_hyjal(); //CoT Battle for Mt. Hyjal
+ AddSC_boss_archimonde();
+ AddSC_instance_mount_hyjal();
+ AddSC_hyjal_trash();
+ AddSC_boss_rage_winterchill();
+ AddSC_boss_anetheron();
+ AddSC_boss_kazrogal();
+ AddSC_boss_azgalor();
+ AddSC_boss_captain_skarloc(); //CoT Old Hillsbrad
+ AddSC_boss_epoch_hunter();
+ AddSC_boss_lieutenant_drake();
+ AddSC_instance_old_hillsbrad();
+ AddSC_old_hillsbrad();
+ AddSC_boss_aeonus(); //CoT The Dark Portal
+ AddSC_boss_chrono_lord_deja();
+ AddSC_boss_temporus();
+ AddSC_dark_portal();
+ AddSC_instance_dark_portal();
+ AddSC_boss_celebras_the_cursed(); //Maraudon
+ AddSC_boss_landslide();
+ AddSC_boss_noxxion();
+ AddSC_boss_ptheradras();
+ AddSC_boss_onyxia(); //Onyxia's Lair
+ AddSC_boss_amnennar_the_coldbringer(); //Razorfen Downs
+ AddSC_razorfen_downs();
+ AddSC_razorfen_kraul(); //Razorfen Kraul
+ AddSC_boss_cthun(); //Temple of ahn'qiraj
+ AddSC_boss_fankriss();
+ AddSC_boss_huhuran();
+ AddSC_bug_trio();
+ AddSC_boss_sartura();
+ AddSC_boss_skeram();
+ AddSC_boss_twinemperors();
+ AddSC_mob_anubisath_sentinel();
+ AddSC_instance_temple_of_ahnqiraj();
+ AddSC_wailing_caverns(); //Wailing caverns
+ AddSC_instance_wailing_caverns();
+ AddSC_zulfarrak(); //Zul'Farrak
+
AddSC_ashenvale();
AddSC_azshara();
AddSC_azuremyst_isle();
@@ -747,34 +767,6 @@ void AddScripts()
AddSC_boss_illidari_council();
AddSC_instance_black_temple();
- //Blackfathom Depths
- AddSC_instance_blackfathom_deeps();
-
- //Caverns of Time
- //--Battle for Mt. Hyjal
- AddSC_hyjal();
- AddSC_boss_archimonde();
- AddSC_instance_mount_hyjal();
- AddSC_hyjal_trash();
- AddSC_boss_rage_winterchill();
- AddSC_boss_anetheron();
- AddSC_boss_kazrogal();
- AddSC_boss_azgalor();
-
- //--Old Hillsbrad
- AddSC_boss_captain_skarloc();
- AddSC_boss_epoch_hunter();
- AddSC_boss_lieutenant_drake();
- AddSC_instance_old_hillsbrad();
- AddSC_old_hillsbrad();
-
- //--The Dark Portal
- AddSC_boss_aeonus();
- AddSC_boss_chrono_lord_deja();
- AddSC_boss_temporus();
- AddSC_dark_portal();
- AddSC_instance_dark_portal();
-
//Coilfang Resevoir
//--Serpent Shrine Cavern
AddSC_boss_fathomlord_karathress();
@@ -825,12 +817,6 @@ void AddScripts()
AddSC_boss_vazruden_the_herald();
AddSC_instance_ramparts();
- //Maraudon
- AddSC_boss_celebras_the_cursed();
- AddSC_boss_landslide();
- AddSC_boss_noxxion();
- AddSC_boss_ptheradras();
-
//Naxxramas
AddSC_boss_anubrekhan();
AddSC_boss_maexxna();
@@ -865,17 +851,6 @@ void AddScripts()
AddSC_boss_sartharion();
AddSC_instance_obsidian_sanctum();
- //Onyxia's Lair
- AddSC_boss_onyxia();
-
- //Ragefire Chasm
- //Razorfen Downs
- AddSC_boss_amnennar_the_coldbringer();
- AddSC_razorfen_downs();
-
- //Razorfen Kraul
- AddSC_razorfen_kraul();
-
//Tempest Keep
//--Arcatraz
AddSC_arcatraz();
@@ -901,16 +876,6 @@ void AddScripts()
AddSC_boss_pathaleon_the_calculator();
AddSC_instance_mechanar();
- //Temple of ahn'qiraj
- AddSC_boss_cthun();
- AddSC_boss_fankriss();
- AddSC_boss_huhuran();
- AddSC_bug_trio();
- AddSC_boss_sartura();
- AddSC_boss_skeram();
- AddSC_boss_twinemperors();
- AddSC_mob_anubisath_sentinel();
- AddSC_instance_temple_of_ahnqiraj();
//Ulduar
AddSC_boss_auriaya();
@@ -932,13 +897,6 @@ void AddScripts()
AddSC_instance_utgarde_keep();
AddSC_utgarde_keep();
- //Wailing caverns
- AddSC_wailing_caverns();
- AddSC_instance_wailing_caverns();
-
- //Zul'Farrak
- AddSC_zulfarrak();
-
//Vault of Archavon
AddSC_boss_archavon();
AddSC_boss_emalon();