diff --git a/L2J_Mobius_Underground/dist/game/data/spawns/Elven/IrisLake.xml b/L2J_Mobius_Underground/dist/game/data/spawns/Elven/IrisLake.xml
new file mode 100644
index 0000000000..5f5404ba00
--- /dev/null
+++ b/L2J_Mobius_Underground/dist/game/data/spawns/Elven/IrisLake.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="IrisLake">
+		<group>
+			<npc id="20013" x="53466" y="74896" z="-3512" heading="54433" respawnTime="60Sec" /> <!-- Dryad -->
+			<npc id="20013" x="54402" y="75235" z="-3560" heading="42932" respawnTime="60Sec" /> <!-- Dryad -->
+			<npc id="20013" x="54924" y="87717" z="-3544" heading="50974" respawnTime="60Sec" /> <!-- Dryad -->
+			<npc id="20013" x="55126" y="87567" z="-3552" heading="52941" respawnTime="60Sec" /> <!-- Dryad -->
+			<npc id="20013" x="55996" y="83745" z="-3568" heading="33366" respawnTime="60Sec" /> <!-- Dryad -->
+			<npc id="20013" x="56425" y="84360" z="-3568" heading="41253" respawnTime="60Sec" /> <!-- Dryad -->
+			<npc id="20013" x="56568" y="84483" z="-3576" heading="21756" respawnTime="60Sec" /> <!-- Dryad -->
+			<npc id="20013" x="56743" y="78740" z="-3552" heading="19678" respawnTime="60Sec" /> <!-- Dryad -->
+			<npc id="20013" x="57355" y="77822" z="-3576" heading="4823" respawnTime="60Sec" /> <!-- Dryad -->
+			<npc id="20013" x="58579" y="79811" z="-3568" heading="2144" respawnTime="60Sec" /> <!-- Dryad -->
+			<npc id="20019" x="55138" y="84729" z="-3568" heading="3663" respawnTime="60Sec" /> <!-- Dryad Elder -->
+			<npc id="20019" x="55631" y="85767" z="-3584" heading="52601" respawnTime="60Sec" /> <!-- Dryad Elder -->
+			<npc id="20019" x="56136" y="85317" z="-3568" heading="13274" respawnTime="60Sec" /> <!-- Dryad Elder -->
+			<npc id="20019" x="56136" y="85467" z="-3584" heading="17138" respawnTime="60Sec" /> <!-- Dryad Elder -->
+			<npc id="20019" x="56711" y="84852" z="-3600" heading="59922" respawnTime="60Sec" /> <!-- Dryad Elder -->
+			<npc id="20019" x="57355" y="78281" z="-3584" heading="24845" respawnTime="60Sec" /> <!-- Dryad Elder -->
+			<npc id="20019" x="57661" y="79352" z="-3560" heading="44930" respawnTime="60Sec" /> <!-- Dryad Elder -->
+			<npc id="20460" x="56136" y="87117" z="-3584" heading="37792" respawnTime="60Sec" /> <!-- Crimson Spider -->
+			<npc id="20460" x="56568" y="83007" z="-3584" heading="56215" respawnTime="60Sec" /> <!-- Crimson Spider -->
+			<npc id="20469" x="53835" y="62994" z="-3472" heading="46528" respawnTime="60Sec" /> <!-- Kaboo Orc Archer -->
+			<npc id="20469" x="55676" y="62376" z="-3488" heading="48168" respawnTime="60Sec" /> <!-- Kaboo Orc Archer -->
+			<npc id="20469" x="56068" y="62519" z="-3424" heading="51593" respawnTime="60Sec" /> <!-- Kaboo Orc Archer -->
+			<npc id="20470" x="52405" y="63707" z="-3544" heading="27725" respawnTime="60Sec" /> <!-- Kaboo Orc Soldier -->
+			<npc id="20470" x="53034" y="64077" z="-3464" heading="19227" respawnTime="60Sec" /> <!-- Kaboo Orc Soldier -->
+			<npc id="20471" x="51368" y="69616" z="-3480" heading="21428" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior -->
+			<npc id="20471" x="51652" y="69616" z="-3448" heading="56028" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior -->
+			<npc id="20471" x="55068" y="67711" z="-3560" heading="61198" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior -->
+			<npc id="20471" x="55072" y="71480" z="-3432" heading="45769" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior -->
+			<npc id="20471" x="55359" y="62840" z="-3504" heading="13633" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior -->
+			<npc id="20471" x="55435" y="71810" z="-3456" heading="53996" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior -->
+			<npc id="20471" x="55876" y="63548" z="-3448" heading="13545" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior -->
+			<npc id="20471" x="56284" y="65774" z="-3456" heading="38087" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior -->
+			<npc id="20472" x="51936" y="69616" z="-3448" heading="41816" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior Captain -->
+			<npc id="20472" x="51936" y="69787" z="-3432" heading="42837" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior Captain -->
+			<npc id="20472" x="53620" y="71480" z="-3352" heading="54782" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior Captain -->
+			<npc id="20472" x="53665" y="74831" z="-3488" heading="9088" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior Captain -->
+			<npc id="20472" x="55673" y="68039" z="-3608" heading="63584" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior Captain -->
+			<npc id="20472" x="55828" y="66817" z="-3528" heading="12906" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior Captain -->
+			<npc id="20472" x="56896" y="78434" z="-3568" heading="16114" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior Captain -->
+			<npc id="20472" x="57508" y="79658" z="-3576" heading="34877" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior Captain -->
+			<npc id="20473" x="52007" y="70471" z="-3408" heading="63599" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior Lieutenant -->
+			<npc id="20473" x="54346" y="70820" z="-3448" heading="27526" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior Lieutenant -->
+			<npc id="20473" x="54348" y="74721" z="-3472" heading="2739" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior Lieutenant -->
+			<npc id="20473" x="54612" y="66519" z="-3504" heading="56599" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior Lieutenant -->
+			<npc id="20473" x="54951" y="71150" z="-3448" heading="53255" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior Lieutenant -->
+			<npc id="20473" x="55220" y="67562" z="-3552" heading="19040" respawnTime="60Sec" /> <!-- Kaboo Orc Warrior Lieutenant -->
+			<npc id="27061" x="31606" y="78869" z="-3560" heading="11495" respawnTime="60Sec" /> <!-- Batoh -->
+			<npc id="27064" x="43323" y="69230" z="-3264" heading="3306" respawnTime="60Sec" /> <!-- Turel -->
+			<npc id="27065" x="36934" y="82822" z="-3584" heading="44515" respawnTime="60Sec" /> <!-- Roko -->
+			<npc id="27066" x="36622" y="82550" z="-3608" heading="0" respawnTime="60Sec" /> <!-- Roko's Warhound -->
+			<npc id="27066" x="36742" y="82682" z="-3608" heading="0" respawnTime="60Sec" /> <!-- Roko's Warhound -->
+			<npc id="27067" x="47314" y="91692" z="-3584" heading="25181" respawnTime="60Sec" /> <!-- Kamut -->
+			<npc id="27068" x="56844" y="78200" z="-3584" heading="11687" respawnTime="60Sec" /> <!-- Murtika -->
+			<npc id="27069" x="56659" y="78290" z="-3568" heading="0" respawnTime="60Sec" /> <!-- Murtika's Warhound -->
+			<npc id="27069" x="56785" y="78110" z="-3576" heading="0" respawnTime="60Sec" /> <!-- Murtika's Warhound -->
+			<npc id="27077" x="35199" y="90196" z="-3488" heading="17737" respawnTime="60Sec" /> <!-- Eva's Unicorn -->
+			<npc id="27077" x="38232" y="90859" z="-3352" heading="28767" respawnTime="60Sec" /> <!-- Eva's Unicorn -->
+			<npc id="27077" x="43519" y="92430" z="-3616" heading="45658" respawnTime="60Sec" /> <!-- Eva's Unicorn -->
+			<npc id="27077" x="46116" y="89347" z="-3520" heading="44361" respawnTime="60Sec" /> <!-- Eva's Unicorn -->
+			<npc id="27077" x="49805" y="91250" z="-3560" heading="8271" respawnTime="60Sec" /> <!-- Eva's Unicorn -->
+			<npc id="27077" x="56541" y="91120" z="-3712" heading="14052" respawnTime="60Sec" /> <!-- Eva's Unicorn -->
+			<npc id="30423" x="28928" y="74248" z="-3776" heading="8192" respawnTime="60Sec" />
+			<npc id="31033" x="38768" y="73517" z="-3584" heading="10165" respawnTime="60Sec" />
+			<npc id="31033" x="45611" y="89381" z="-3528" heading="22872" respawnTime="60Sec" />
+			<npc id="31033" x="53565" y="76038" z="-3632" heading="61917" respawnTime="60Sec" />
+			<npc id="31033" x="56324" y="82933" z="-3624" heading="25247" respawnTime="60Sec" />
+			<npc id="30371" x="51210" y="82474" z="-3280" heading="6000" respawnTime="60sec" /> <!-- Thalia -->
+			<npc id="30749" x="63906" y="74711" z="-3760" heading="57344" respawnTime="60sec" /> <!-- Zwov -->
+			<npc id="31033" x="35872" y="78095" z="-3608" respawnTime="60sec" /> <!-- Sentinel -->
+		</group>
+	</spawn>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Underground/dist/game/data/spawns/old/21_20.xml b/L2J_Mobius_Underground/dist/game/data/spawns/old/21_20.xml
deleted file mode 100644
index 9cd7fec5bf..0000000000
--- a/L2J_Mobius_Underground/dist/game/data/spawns/old/21_20.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="21_20">
-		<group>
-			<npc id="20013" x="57661" y="77516" z="-3560" respawnTime="15sec" /> <!-- Dryad -->
-			<npc id="20013" x="56437" y="78587" z="-3560" respawnTime="15sec" /> <!-- Dryad -->
-			<npc id="20013" x="57814" y="78587" z="-3576" respawnTime="15sec" /> <!-- Dryad -->
-			<npc id="20013" x="56425" y="83499" z="-3560" respawnTime="15sec" /> <!-- Dryad -->
-			<npc id="20013" x="57140" y="83007" z="-3560" respawnTime="15sec" /> <!-- Dryad -->
-			<npc id="20013" x="56035" y="85467" z="-3584" respawnTime="15sec" /> <!-- Dryad -->
-			<npc id="20013" x="55853" y="84606" z="-3560" respawnTime="15sec" /> <!-- Dryad -->
-			<npc id="20013" x="56237" y="87267" z="-3592" respawnTime="15sec" /> <!-- Dryad -->
-			<npc id="20019" x="56743" y="79505" z="-3552" respawnTime="15sec" /> <!-- Dryad Elder -->
-			<npc id="20019" x="58273" y="79811" z="-3576" respawnTime="15sec" /> <!-- Dryad Elder -->
-			<npc id="20019" x="57283" y="83868" z="-3552" respawnTime="15sec" /> <!-- Dryad Elder -->
-			<npc id="20019" x="57569" y="83499" z="-3544" respawnTime="15sec" /> <!-- Dryad Elder -->
-			<npc id="20019" x="56338" y="86517" z="-3632" heading="25348" respawnTime="15sec" /> <!-- Dryad Elder -->
-			<npc id="20019" x="55833" y="87267" z="-3576" respawnTime="15sec" /> <!-- Dryad Elder -->
-			<npc id="20460" x="56854" y="83745" z="-3552" heading="24214" respawnTime="15sec" /> <!-- Crimson Spider -->
-			<npc id="20460" x="55732" y="86667" z="-3592" respawnTime="15sec" /> <!-- Crimson Spider -->
-			<npc id="20471" x="54612" y="67264" z="-3544" respawnTime="15sec" /> <!-- Kaboo Orc Warrior -->
-			<npc id="20471" x="56132" y="66072" z="-3464" respawnTime="15sec" /> <!-- Kaboo Orc Warrior -->
-			<npc id="20471" x="54225" y="70490" z="-3496" respawnTime="15sec" /> <!-- Kaboo Orc Warrior -->
-			<npc id="20471" x="54588" y="71370" z="-3416" respawnTime="15sec" /> <!-- Kaboo Orc Warrior -->
-			<npc id="20472" x="54612" y="66966" z="-3536" respawnTime="15sec" /> <!-- Kaboo Orc Warrior Captain -->
-			<npc id="20472" x="54156" y="67711" z="-3592" heading="1123" respawnTime="15sec" /> <!-- Kaboo Orc Warrior Captain -->
-			<npc id="20472" x="54951" y="71150" z="-3456" respawnTime="15sec" /> <!-- Kaboo Orc Warrior Captain -->
-			<npc id="20472" x="56437" y="79046" z="-3536" respawnTime="15sec" /> <!-- Kaboo Orc Warrior Captain -->
-			<npc id="20472" x="57814" y="78281" z="-3576" respawnTime="15sec" /> <!-- Kaboo Orc Warrior Captain -->
-			<npc id="20473" x="54612" y="67264" z="-3544" respawnTime="15sec" /> <!-- Kaboo Orc Warrior Lieutenant -->
-			<npc id="20473" x="55372" y="67860" z="-3584" respawnTime="15sec" /> <!-- Kaboo Orc Warrior Lieutenant -->
-			<npc id="20473" x="55072" y="70490" z="-3568" respawnTime="15sec" /> <!-- Kaboo Orc Warrior Lieutenant -->
-			<npc id="20473" x="54126" y="71556" z="-3376" heading="55369" respawnTime="15sec" /> <!-- Kaboo Orc Warrior Lieutenant -->
-			<npc id="27064" x="40494" y="68888" z="-3448" respawnTime="180sec" /> <!-- Turel -->
-			<npc id="27065" x="36148" y="81950" z="-3600" heading="47071" respawnTime="180sec" /> <!-- Roko -->
-			<npc id="27066" x="36273" y="81761" z="-3616" respawnTime="180sec" /> <!-- Roko's Warhound -->
-			<npc id="27066" x="36368" y="81877" z="-3624" respawnTime="180sec" /> <!-- Roko's Warhound -->
-			<npc id="27067" x="45499" y="91692" z="-3552" respawnTime="180sec" /> <!-- Kamut -->
-			<npc id="27068" x="58086" y="77350" z="-3536" respawnTime="180sec" /> <!-- Murtika -->
-			<npc id="27069" x="58113" y="77163" z="-3528" respawnTime="180sec" /> <!-- Murtika's Warhound -->
-			<npc id="27069" x="57974" y="77296" z="-3536" respawnTime="180sec" /> <!-- Murtika's Warhound -->
-			<npc id="27077" x="56214" y="90020" z="-3624" respawnTime="180sec" /> <!-- Eva's Unicorn -->
-			<npc id="27077" x="49061" y="92034" z="-3664" respawnTime="180sec" /> <!-- Eva's Unicorn -->
-			<npc id="27077" x="47496" y="89513" z="-3488" respawnTime="180sec" /> <!-- Eva's Unicorn -->
-			<npc id="27077" x="42840" y="92980" z="-3672" respawnTime="180sec" /> <!-- Eva's Unicorn -->
-			<npc id="27077" x="38148" y="91274" z="-3400" respawnTime="180sec" /> <!-- Eva's Unicorn -->
-			<npc id="27077" x="35345" y="89791" z="-3448" respawnTime="180sec" /> <!-- Eva's Unicorn -->
-			<npc id="20767" x="64879" y="65564" z="-3680" heading="32730" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="64248" y="70585" z="-3520" heading="36253" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20584" x="65042" y="72974" z="-3720" heading="47831" respawnTime="40sec" /> <!-- Timak Orc Archer -->
-			<npc id="30371" x="51210" y="82474" z="-3280" heading="6000" respawnTime="60sec" /> <!-- Thalia -->
-			<npc id="30749" x="63906" y="74711" z="-3760" heading="57344" respawnTime="60sec" /> <!-- Zwov -->
-			<npc id="31033" x="35872" y="78095" z="-3608" respawnTime="60sec" /> <!-- Sentinel -->
-			<npc id="20585" x="65494" y="69406" z="-3720" heading="39535" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
-			<npc id="20586" x="65324" y="70222" z="-3712" heading="37652" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="65002" y="71201" z="-3688" heading="35518" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="65215" y="71997" z="-3720" heading="28802" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20587" x="64788" y="66771" z="-3688" heading="7792" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file