diff --git a/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Mount Hyjal.lua b/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Mount Hyjal.lua
index e5bff2102d5..7d499c8a121 100644
--- a/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Mount Hyjal.lua	
+++ b/.contrib/Parser/DATAS/02 - Outdoor Zones/01 Kalimdor/Mount Hyjal.lua	
@@ -6,9 +6,6 @@ root(ROOTS.Zones, m(KALIMDOR, {
 		["lore"] = "Mount Hyjal is the zone most players quest in when starting Cataclysm zones. Between Ragnaros attacking Hyjal with the help of the Twilight Cultists and Malfurion Stormrage back from the Emerald Dream, this zone is filled with familiar faces and epic quests from the start. The scenery alternates between lush forests and scorched earth, as the player attempts to heal the land and regrow the forests.",
 		["icon"] = 409547,
 		["timeline"] = { ADDED_4_0_3 },
-		["maps"] = {
-			760,	-- Malorne's Nightmare
-		},
 		["groups"] = {
 			n(ACHIEVEMENTS, {
 				ach(5483, {	-- Bounce
diff --git a/.contrib/Parser/DATAS/06 - Expansion Features/07 - Legion/Legion Class Halls/Druid/Marlone's nightmare.lua b/.contrib/Parser/DATAS/06 - Expansion Features/07 - Legion/Legion Class Halls/Druid/Marlone's nightmare.lua
new file mode 100644
index 00000000000..ef300c4a06c
--- /dev/null
+++ b/.contrib/Parser/DATAS/06 - Expansion Features/07 - Legion/Legion Class Halls/Druid/Marlone's nightmare.lua	
@@ -0,0 +1,15 @@
+-------------------------------------------------------------------
+--      E X P A N S I O N   F E A T U R E S    M O D U L E       --
+-------------------------------------------------------------------
+
+root(ROOTS.ExpansionFeatures, expansion(EXPANSION.LEGION, bubbleDown({ ["timeline"] = { ADDED_7_0_3 } },{
+    n(CLASS_HALL, {
+        cl(DRUID, bubbleDown({ ["classes"] = { DRUID } }, {
+            m(MARLONE_NIGHTMARE, {
+                ["lore"] = "Malorne's Nightmare is an Emerald Nightmare recreation of a battle on the slopes of Mount Hyjal during the War of the Ancients in which Malorne and the other Wild Gods were slain. It is located in the Rift of Aln. The Archdruid of the Dreamgrove enters this Nightmare, along with several other druids, in order to save Malorne from the Nightmare's grasp.",
+                ["timeline"] = { ADDED_7_0_3 },
+                ["icon"] = 409547,
+            })
+        }))
+    })
+})));
\ No newline at end of file
diff --git a/.contrib/Parser/DATAS/06 - Expansion Features/07 - Legion/Legion Class Halls/The Dreamgrove (Druid).lua b/.contrib/Parser/DATAS/06 - Expansion Features/07 - Legion/Legion Class Halls/Druid/The Dreamgrove (Druid).lua
similarity index 99%
rename from .contrib/Parser/DATAS/06 - Expansion Features/07 - Legion/Legion Class Halls/The Dreamgrove (Druid).lua
rename to .contrib/Parser/DATAS/06 - Expansion Features/07 - Legion/Legion Class Halls/Druid/The Dreamgrove (Druid).lua
index 78f6e61162b..e5c54824e79 100644
--- a/.contrib/Parser/DATAS/06 - Expansion Features/07 - Legion/Legion Class Halls/The Dreamgrove (Druid).lua	
+++ b/.contrib/Parser/DATAS/06 - Expansion Features/07 - Legion/Legion Class Halls/Druid/The Dreamgrove (Druid).lua	
@@ -245,7 +245,7 @@ root(ROOTS.ExpansionFeatures, expansion(EXPANSION.LEGION, bubbleDown({ ["timelin
 							107214,	-- Guardian of the Dream
 							107215,	-- Guardian of the Dream
 						},
-						["coord"] = { 61.6, 65.6, 760 },
+						["coord"] = { 61.6, 65.6, MARLONE_NIGHTMARE },
 					}),
 					q(41332, {	-- Ascending The Circle
 						["sourceQuests"] = { 41255 },	-- Sowing The Seed
@@ -409,7 +409,7 @@ root(ROOTS.ExpansionFeatures, expansion(EXPANSION.LEGION, bubbleDown({ ["timelin
 					q(42050, {	-- Defenders of the Dream
 						["sourceQuests"] = { 42051 },	-- Enter Nightmare
 						["provider"] = { "n", 107163 },	-- Archdruid Hamuul Runetotem
-						["coord"] = { 61.2, 65.2, 760 },
+						["coord"] = { 61.2, 65.2, MARLONE_NIGHTMARE },
 					}),
 					q(43403, {	-- Defending the Isles
 						["sourceQuests"] = { 42046 },	-- A New Beginning
@@ -742,7 +742,7 @@ root(ROOTS.ExpansionFeatures, expansion(EXPANSION.LEGION, bubbleDown({ ["timelin
 					q(42055, {	-- The Demi-God's Return
 						["sourceQuests"] = { 42054 },	-- Call of the Wilds
 						["provider"] = { "n", 106905 },	-- Malorne
-						["coord"] = { 66.1, 66.8, 760 },
+						["coord"] = { 66.1, 66.8, MARLONE_NIGHTMARE },
 						["groups"] = {
 							i(139723),	-- Robes of the Dreamgrove
 							title(327),	-- Archdruid <Name>
@@ -860,7 +860,7 @@ root(ROOTS.ExpansionFeatures, expansion(EXPANSION.LEGION, bubbleDown({ ["timelin
 					q(42053, {	-- The War of Ancients
 						["sourceQuests"] = { 42050 },	-- Defenders of the Dream
 						["provider"] = { "n", 107132 },	-- Keeper Remulos
-						["coord"] = { 61.4, 65.6, 760 },
+						["coord"] = { 61.4, 65.6, MARLONE_NIGHTMARE },
 					}),
 					q(42040, {	-- The Way to Nordrassil
 						["sourceQuests"] = { 42037 },	-- Gathering the Dreamweavers
diff --git a/.contrib/Parser/lib/Constants/Maps.lua b/.contrib/Parser/lib/Constants/Maps.lua
index 28e80b1d27b..8e5a4bcb984 100644
--- a/.contrib/Parser/lib/Constants/Maps.lua
+++ b/.contrib/Parser/lib/Constants/Maps.lua
@@ -398,6 +398,7 @@ HALL_OF_THE_GUARDIAN = 734;
 HALL_OF_THE_GUARDIAN_2ND_FLOOR = 735;
 MARDUM_THE_SHATTERED_ABYSS_UPPER_COMMAND_CENTER = 720;
 MARDUM_THE_SHATTERED_ABYSS_LOWER_COMMAND_CENTER = 721;
+MARLONE_NIGHTMARE = 760;
 NETHERLIGHT_TEMPLE = 702;
 SANCTUM_OF_LIGHT = LIGHTS_HOPE_CHAPEL; -- = 24
 SCARLET_MONASTERY_DEATH_KNIGHT_CAMPAIGN = 804;	-- Scarlet Monastery: Death Knight Campaign