Move some Elvish units to core, since they're now used by both HttT and aOI

(and will be by Legend of Wesmere later).

data/campaigns/An_Orcish_Incursion/_main.cfg

@@ -4,15 +4,15 @@
 [/textdomain]
 [campaign]
     id="orcish_incursion"
-    icon="units/elvish-lord.png~TC(1,magenta)"
+    icon="units/elves-wood/elvish-lord.png~TC(1,magenta)"
     image="portraits/kalenz.png"
     name=_"An Orcish Incursion"
     rank=15
     first_scenario="1_Defend_the_Forest"
     difficulties="EASY,NORMAL,HARD"
     difficulty_descriptions={MENU_IMG_TXT2 "units/elves-wood/fighter.png~RC(magenta>red)" _"Fighter" _"(Beginner)"} +
-    ";*" + {MENU_IMG_TXT2 "units/elvish-lord.png~RC(magenta>red)" _"Lord" _"(Normal)"} + ";" +
-    {MENU_IMG_TXT2 "units/elvish-high-lord.png~RC(magenta>red)" _"High Lord" _"(Challenging)"}
+    ";*" + {MENU_IMG_TXT2 "units/elves-wood/elvish-lord.png~RC(magenta>red)" _"Lord" _"(Normal)"} + ";" +
+    {MENU_IMG_TXT2 "units/elves-wood/elvish-high-lord.png~RC(magenta>red)" _"High Lord" _"(Challenging)"}
     define="CAMPAIGN_AN_ORCISH_INCURSION"
     description=_"Defend the forests of the elves against marauding orcs, learning valuable tactics as you do so.
 

data/campaigns/An_Orcish_Incursion/scenarios/1_Defend_the_Forest.cfg

@@ -182,7 +182,7 @@ Elves can move fast and safely among the trees. Pick off the enemy grunts with y
             [image]
                 x="551"
                 y="363"
-                file="units/elvish-lord.png~TC(1,magenta)"
+                file="units/elves-wood/elvish-lord.png~TC(1,magenta)"
                 delay="1000"
             [/image]
             background="map.jpg"

data/campaigns/An_Orcish_Incursion/scenarios/2_Assassins.cfg

@@ -211,7 +211,7 @@ Assassins are hard to hit, and their poison is insidious. Stay close to the vill
             [image]
                 x="317"
                 y="286"
-                file="units/elvish-lord.png~TC(1,magenta)"
+                file="units/elves-wood/elvish-lord.png~TC(1,magenta)"
                 delay="500"
             [/image]
             [image]

data/campaigns/An_Orcish_Incursion/scenarios/3_Wasteland.cfg

@@ -154,7 +154,7 @@ There are no villages in this scenario - you must use healers instead. Use hit a
             [image]
                 x="120"
                 y="261"
-                file="units/elvish-lord.png~TC(1,magenta)"
+                file="units/elves-wood/elvish-lord.png~TC(1,magenta)"
                 delay="500"
             [/image]
             [image]

data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg

@@ -200,7 +200,7 @@ Trolls are very dangerous if they can attack as a group. Use the cave-mouths as
             [image]
                 x="102"
                 y="166"
-                file="units/elvish-lord.png~TC(1,magenta)"
+                file="units/elves-wood/elvish-lord.png~TC(1,magenta)"
                 delay="500"
             [/image]
             [image]

data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg

@@ -2,7 +2,7 @@
 [scenario]
     name=_"Linaera the Quick"
     id="5_Linaera_the_Quick"
-    map_data="{campaigns/maps/linaera_the_quick.map}"
+    map_data="{campaigns/An_Orcish_Incursion/maps/linaera_the_quick.map}"
 
     {DAWN}
     {MORNING}
@@ -344,7 +344,7 @@ This enemy is too strong for you to defeat alone. Use mounted units, and Linaera
             [image]
                 x="135"
                 y="88"
-                file="units/elvish-lord.png~TC(1,magenta)"
+                file="units/elves-wood/elvish-lord.png~TC(1,magenta)"
                 delay="500"
             [/image]
             [image]

data/campaigns/An_Orcish_Incursion/scenarios/6_A_Detour_through_the_Swamp.cfg

@@ -205,7 +205,7 @@ Undead are resistant to physical attack. Use mages to attack the undead, and elv
             [image]
                 x="260"
                 y="15"
-                file="units/elvish-lord.png~TC(1,magenta)"
+                file="units/elves-wood/elvish-lord.png~TC(1,magenta)"
                 delay="500"
             [/image]
             [image]

data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg

@@ -311,7 +311,7 @@ Your enemy is well defended against attacks from the south. Use rangers to sneak
             [image]
                 x="525"
                 y="72"
-                file="units/elvish-lord.png~TC(1,magenta)"
+                file="units/elves-wood/elvish-lord.png~TC(1,magenta)"
                 delay="250"
             [/image]
             [image]

data/core/units/Elvish_High_Lord.cfg

@@ -1,4 +1,4 @@
-#textdomain wesnoth-httt
+#textdomain wesnoth
 [unit]
     id=Elvish High Lord
     name= _ "Elvish High Lord"

data/core/units/Elvish_Lady.cfg

@@ -1,12 +1,12 @@
-#textdomain wesnoth-httt
+#textdomain wesnoth
 #unit used for the Elvish Lady in Heir to the Throne
 [unit]
     id=Elvish Lady
     name= _ "female^Elvish Lady"
     gender=female
     race=elf
-    image="parandra.png"
-    profile=portraits/elvish-lady.png
+    image="elvish-lady.png"
+    profile=portraits/Other/elvish-lady.png
     hitpoints=30
     movement_type=fly
     movement=6

data/core/units/Elvish_Lord.cfg

@@ -1,4 +1,4 @@
-#textdomain wesnoth-httt
+#textdomain wesnoth
 [unit]
     id=Elvish Lord
     name= _ "Elvish Lord"