diff --git a/sql/updates/world/2013_08_07_01_world_misc.sql b/sql/updates/world/2013_08_07_01_world_misc.sql
new file mode 100644
index 00000000000..557b71742a6
--- /dev/null
+++ b/sql/updates/world/2013_08_07_01_world_misc.sql
@@ -0,0 +1,6 @@
+-- Move boss_lord_valthalak from EAI to CPP
+UPDATE `creature_template` SET `AIName`= '', `ScriptName`= 'boss_lord_valthalak' WHERE `entry`=16042;
+DELETE FROM creature_ai_scripts WHERE `creature_id`=16042;
+DELETE FROM `creature_text` WHERE `entry`=16042 AND `groupid`=0;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES
+(16042, 0, 0, '%s goes into a frenzy!', 16, 0, 100, 0, 0, 0, 'Lord Valthalak - Cast Frenzy');
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index c67a0aec4be..73bdc84b963 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -127,6 +127,7 @@ void AddSC_boss_gyth();
 void AddSC_boss_rend_blackhand();
 void AddSC_boss_gizrul_the_slavener();
 void AddSC_boss_urok_doomhowl();
+void AddSC_boss_lord_valthalak();
 void AddSC_instance_blackrock_spire();
 void AddSC_boss_razorgore();                 //Blackwing lair
 void AddSC_boss_vaelastrasz();
@@ -771,6 +772,7 @@ void AddEasternKingdomsScripts()
     AddSC_boss_rend_blackhand();
     AddSC_boss_gizrul_the_slavener();
     AddSC_boss_urok_doomhowl();
+    AddSC_boss_lord_valthalak();
     AddSC_instance_blackrock_spire();
     AddSC_boss_razorgore();                 //Blackwing lair
     AddSC_boss_vaelastrasz();
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
similarity index 89%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
index 5c34a30912a..e2295521a5b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
@@ -18,7 +18,7 @@
 #ifndef DEF_BLACKROCK_SPIRE_H
 #define DEF_BLACKROCK_SPIRE_H
 
-uint32 const EncounterCount         = 22;
+uint32 const EncounterCount         = 23;
 
 #define BRSScriptName "instance_blackrock_spire"
 
@@ -38,15 +38,16 @@ enum DataTypes
     DATA_GYTH                       = 11,
     DATA_THE_BEAST                  = 12,
     DATA_GENERAL_DRAKKISATH         = 13,
+    DATA_LORD_VALTHALAK             = 14,
     // Extra
-    DATA_DRAGONSPIRE_ROOM           = 14,
-    DATA_HALL_RUNE_1                = 15,
-    DATA_HALL_RUNE_2                = 16,
-    DATA_HALL_RUNE_3                = 17,
-    DATA_HALL_RUNE_4                = 18,
-    DATA_HALL_RUNE_5                = 19,
-    DATA_HALL_RUNE_6                = 20,
-    DATA_HALL_RUNE_7                = 21
+    DATA_DRAGONSPIRE_ROOM           = 15,
+    DATA_HALL_RUNE_1                = 16,
+    DATA_HALL_RUNE_2                = 17,
+    DATA_HALL_RUNE_3                = 18,
+    DATA_HALL_RUNE_4                = 19,
+    DATA_HALL_RUNE_5                = 20,
+    DATA_HALL_RUNE_6                = 21,
+    DATA_HALL_RUNE_7                = 22
 };
 
 enum CreaturesIds
@@ -75,6 +76,7 @@ enum CreaturesIds
 enum AdditionalData
 {
     SPELL_SUMMON_ROOKERY_WHELP      = 15745,
+    EVENT_UROK_DOOMHOWL             = 4845,
     EVENT_PYROGUARD_EMBERSEER       = 4884,
     AREATRIGGER                     = 1,
     AREATRIGGER_DRAGONSPIRE_HALL    = 2046,
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gizrul_the_slavener.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
new file mode 100644
index 00000000000..b54c8f11f34
--- /dev/null
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2008-2013 TrinityCore <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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ScriptMgr.h"
+#include "ScriptedCreature.h"
+#include "blackrock_spire.h"
+
+enum Spells
+{
+    SPELL_FRENZY                    = 8269,
+    SPELL_SUMMON_SPECTRAL_ASSASSIN  = 27249,
+    SPELL_SHADOW_BOLT_VOLLEY        = 27382,
+    SPELL_SHADOW_WRATH              = 27286
+};
+
+enum Says
+{
+    EMOTE_FRENZY                    = 0
+};
+
+enum Events
+{
+    EVENT_SUMMON_SPECTRAL_ASSASSIN  = 1,
+    EVENT_SHADOW_BOLT_VOLLEY        = 2,
+    EVENT_SHADOW_WRATH              = 3
+};
+
+class boss_lord_valthalak : public CreatureScript
+{
+public:
+    boss_lord_valthalak() : CreatureScript("boss_lord_valthalak") { }
+
+    struct boss_lord_valthalakAI : public BossAI
+    {
+        boss_lord_valthalakAI(Creature* creature) : BossAI(creature, DATA_LORD_VALTHALAK) {}
+
+        void Reset() OVERRIDE
+        {
+            _Reset();
+            frenzy40 = false;
+            frenzy15 = false;
+        }
+
+        void EnterCombat(Unit* /*who*/) OVERRIDE
+        {
+            _EnterCombat();
+            events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, urand(6000,8000));
+            events.ScheduleEvent(EVENT_SHADOW_WRATH, urand(9000,18000));
+        }
+
+        void JustDied(Unit* /*killer*/) OVERRIDE
+        {
+            if (instance)
+                instance->SetData(DATA_LORD_VALTHALAK, DONE);
+        }
+
+        void UpdateAI(uint32 diff) OVERRIDE
+        {
+            if (!UpdateVictim())
+                return;
+
+            events.Update(diff);
+
+            if (me->HasUnitState(UNIT_STATE_CASTING))
+                return;
+
+            while (uint32 eventId = events.ExecuteEvent())
+            {
+                switch (eventId)
+                {
+                    case EVENT_SUMMON_SPECTRAL_ASSASSIN:
+                        DoCast(me, SPELL_SUMMON_SPECTRAL_ASSASSIN);
+                        events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, urand(30000,35000));
+                        break;
+                    case EVENT_SHADOW_BOLT_VOLLEY:
+                        DoCastVictim(SPELL_SHADOW_BOLT_VOLLEY);
+                        events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, urand(4000,6000));
+                        break;
+                    case EVENT_SHADOW_WRATH:
+                        DoCastVictim(SPELL_SHADOW_WRATH);
+                        events.ScheduleEvent(EVENT_SHADOW_WRATH, urand(19000,24000));
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            if (!frenzy40)
+            {
+                if (HealthBelowPct(40))
+                {
+                    DoCast(me, SPELL_FRENZY);
+                    events.CancelEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN);
+                    frenzy40 = true;
+                }
+            }
+
+            if (!frenzy15)
+            {
+                if (HealthBelowPct(15))
+                {
+                    DoCast(me, SPELL_FRENZY);
+                    events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, urand(7000,14000));
+                    frenzy15 = true;
+                }
+            }
+
+            DoMeleeAttackIfReady();
+        }
+        private:
+            bool frenzy40;
+            bool frenzy15;
+    };
+
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
+    {
+        return new boss_lord_valthalakAI(creature);
+    }
+};
+
+void AddSC_boss_lord_valthalak()
+{
+    new boss_lord_valthalak();
+}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
similarity index 99%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
index b84be2feb17..57c3dfac7ff 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
@@ -227,7 +227,7 @@ public:
                                     {
                                         creatureList->Respawn();
                                     }
-                                    creatureList->AI()->SetData(1, 2);
+                                    creatureList->AI()->SetData(1, 1);
                                 }
                             me->AddAura(SPELL_ENCAGED_EMBERSEER, me);
                             instance->SetBossState(DATA_PYROGAURD_EMBERSEER, NOT_STARTED);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_urok_doomhowl.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/boss_urok_doomhowl.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
similarity index 97%
rename from src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
index f07e426c808..f0d252a5c5e 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
@@ -33,7 +33,13 @@ uint32 const DragonspireMobs[3] = { NPC_BLACKHAND_DREADWEAVER, NPC_BLACKHAND_SUM
 enum EventIds
 {
     EVENT_DARGONSPIRE_ROOM_STORE           = 1,
-    EVENT_DARGONSPIRE_ROOM_CHECK           = 2
+    EVENT_DARGONSPIRE_ROOM_CHECK           = 2,
+    EVENT_UROK_DOOMHOWL_SPAWNS_1           = 3,
+    EVENT_UROK_DOOMHOWL_SPAWNS_2           = 4,
+    EVENT_UROK_DOOMHOWL_SPAWNS_3           = 5,
+    EVENT_UROK_DOOMHOWL_SPAWNS_4           = 6,
+    EVENT_UROK_DOOMHOWL_SPAWNS_5           = 7,
+    EVENT_UROK_DOOMHOWL_SPAWN_IN           = 8
 };
 
 class instance_blackrock_spire : public InstanceMapScript
@@ -275,6 +281,12 @@ public:
                             Emberseer->AI()->SetData(1, 1);
                     }
                     break;
+                case EVENT_UROK_DOOMHOWL:
+                    if (GetBossState(NPC_UROK_DOOMHOWL) == NOT_STARTED)
+                    {
+
+                    }
+                    break;
                 default:
                     break;
             }
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/blackwing_lair.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackwingLair/blackwing_lair.h
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
diff --git a/src/server/scripts/EasternKingdoms/CMakeLists.txt b/src/server/scripts/EasternKingdoms/CMakeLists.txt
index 41d6179b169..53d37d83610 100644
--- a/src/server/scripts/EasternKingdoms/CMakeLists.txt
+++ b/src/server/scripts/EasternKingdoms/CMakeLists.txt
@@ -17,6 +17,58 @@ set(scripts_STAT_SRCS
   EasternKingdoms/AlteracValley/boss_drekthar.cpp
   EasternKingdoms/AlteracValley/boss_vanndar.cpp
   EasternKingdoms/AlteracValley/alterac_valley.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
+  EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
+  EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
+  EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
+  EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
+  EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
+  EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
+  EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
+  EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+  EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+  EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
+  EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
+  EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+  EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
+  EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
+  EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
+  EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
+  EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
+  EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
+  EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
+  EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
+  EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
+  EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
+  EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
+  EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
   EasternKingdoms/Scholomance/boss_the_ravenian.cpp
   EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
   EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
@@ -55,37 +107,12 @@ set(scripts_STAT_SRCS
   EasternKingdoms/Gnomeregan/gnomeregan.cpp
   EasternKingdoms/Gnomeregan/gnomeregan.h
   EasternKingdoms/zone_redridge_mountains.cpp
-  EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
-  EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
-  EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
-  EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
-  EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
-  EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
-  EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
-  EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
-  EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
-  EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
-  EasternKingdoms/BlackrockDepths/blackrock_depths.h
-  EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
-  EasternKingdoms/BlackrockDepths/boss_magmus.cpp
   EasternKingdoms/zone_ironforge.cpp
   EasternKingdoms/ScarletEnclave/chapter2.cpp
   EasternKingdoms/ScarletEnclave/chapter5.cpp
   EasternKingdoms/ScarletEnclave/chapter1.cpp
   EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
   EasternKingdoms/zone_eastern_plaguelands.cpp
-  EasternKingdoms/MoltenCore/boss_gehennas.cpp
-  EasternKingdoms/MoltenCore/boss_lucifron.cpp
-  EasternKingdoms/MoltenCore/boss_golemagg.cpp
-  EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
-  EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
-  EasternKingdoms/MoltenCore/boss_ragnaros.cpp
-  EasternKingdoms/MoltenCore/boss_garr.cpp
-  EasternKingdoms/MoltenCore/molten_core.h
-  EasternKingdoms/MoltenCore/instance_molten_core.cpp
-  EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
-  EasternKingdoms/MoltenCore/boss_magmadar.cpp
-  EasternKingdoms/MoltenCore/boss_shazzrah.cpp
   EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
   EasternKingdoms/Stratholme/boss_nerubenkan.cpp
   EasternKingdoms/Stratholme/instance_stratholme.cpp
@@ -117,22 +144,6 @@ set(scripts_STAT_SRCS
   EasternKingdoms/Uldaman/instance_uldaman.cpp
   EasternKingdoms/Uldaman/boss_archaedas.cpp
   EasternKingdoms/zone_swamp_of_sorrows.cpp
-  EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
-  EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
-  EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
-  EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
-  EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
-  EasternKingdoms/BlackrockSpire/boss_halycon.cpp
-  EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
-  EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
-  EasternKingdoms/BlackrockSpire/boss_gyth.cpp
-  EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
-  EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
-  EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
-  EasternKingdoms/BlackrockSpire/boss_gizrul_the_slavener.cpp
-  EasternKingdoms/BlackrockSpire/boss_urok_doomhowl.cpp
-  EasternKingdoms/BlackrockSpire/blackrock_spire.h
-  EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
   EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
   EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
   EasternKingdoms/SunwellPlateau/sunwell_plateau.h
@@ -167,16 +178,6 @@ set(scripts_STAT_SRCS
   EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
   EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
   EasternKingdoms/zone_burning_steppes.cpp
-  EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
-  EasternKingdoms/BlackwingLair/boss_razorgore.cpp
-  EasternKingdoms/BlackwingLair/boss_firemaw.cpp
-  EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
-  EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
-  EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
-  EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
-  EasternKingdoms/BlackwingLair/boss_nefarian.cpp
-  EasternKingdoms/BlackwingLair/boss_flamegor.cpp
-  EasternKingdoms/BlackwingLair/blackwing_lair.h
   EasternKingdoms/zone_blasted_lands.cpp
   EasternKingdoms/zone_stormwind_city.cpp
   EasternKingdoms/ZulAman/boss_halazzi.cpp