Jetryl's requested SVN magic: Moved portraits/core to portraits

data/campaigns/Heir_To_The_Throne/scenarios/01_Elves_Besieged.cfg

@@ -254,7 +254,7 @@ name=start
 	[/message]
 	[message]
 	description=Urug-Telfar
-	image=portraits/core/James_Woo/orc-warlord4.png
+	image=portraits/James_Woo/orc-warlord4.png
 	message= _ "Attack the elves, my grunts, and take their villages. Let us claim this land for the Queen!"
 	[/message]
 
@@ -262,13 +262,13 @@ name=start
 #ifdef HARD
 	[message]
 	description=Knafa-Tan
-	image=portraits/core/James_Woo/orc-warlord.png
+	image=portraits/James_Woo/orc-warlord.png
 	message= _ "Remember, it is rumored that the filthy mage and one that he protects are in these parts. They are the ones we want!"
 	[/message]
 #else
 	[message]
 	description=Knafa-Tan
-	image=portraits/core/James_Woo/orc-warlord.png
+	image=portraits/James_Woo/orc-warlord.png
 	message= _ "Ha ha! We will rip the filthy elves to pieces!"
 	[/message]
 #endif

data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg

@@ -304,7 +304,7 @@
 		[/message]
 		[message]
 		description=Mokolo Qimur
-		image=portraits/core/James_Woo/orc-warlord3.png
+		image=portraits/James_Woo/orc-warlord3.png
 		message= _ "So many foul humans riding on horses! There is no way we can defeat them. Quick, we must make our escape!"
 		[/message]
 		[endlevel]

data/campaigns/Heir_To_The_Throne/scenarios/04_Bay_of_Pearls.cfg

@@ -214,7 +214,7 @@
 
 		[message]
 		description=Dwaba-Kukai
-		image=portraits/core/James_Woo/orc-warlord2.png
+		image=portraits/James_Woo/orc-warlord2.png
 		message= _ "Because we need to control the seas and the merman folk, and nagas and bats are best for doing that!"
 		[/message]
 
@@ -225,7 +225,7 @@
 
 		[message]
 		description=Dwaba-Kukai
-		image=portraits/core/James_Woo/orc-warlord2.png
+		image=portraits/James_Woo/orc-warlord2.png
 		message= _ "Shut up, worm! I'm the boss!"
 		[/message]
 		[/then]
@@ -256,7 +256,7 @@
 
 			[message]
 			description=Dwaba-Kukai
-			image=portraits/core/James_Woo/orc-warlord2.png
+			image=portraits/James_Woo/orc-warlord2.png
 			message= _ "(Sigh) Will someone kill this idiot for me, please?"
 			[/message]
 		[/command]

data/campaigns/Heir_To_The_Throne/scenarios/11_Ford_of_Abez.cfg

@@ -232,7 +232,7 @@
 		[/message]
 		[message]
 		description=Gaga-Breuk
-		image=portraits/core/James_Woo/orc-warlord2.png
+		image=portraits/James_Woo/orc-warlord2.png
 		message= _ "Look! Some of the southerners, men of Wesnoth, are trying to cross into our lands! We will slaughter them by the river's edge!"
 		[/message]
 		[message]

data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg

@@ -197,19 +197,19 @@
 
 		[message]
 			description=Tan-Vrodis
-			image="portraits/core/James_Woo/orc-warlord.png"
+			image="portraits/James_Woo/orc-warlord.png"
 			message= _ "HUMANS... I see humans!"
 		[/message]
 
 		[message]
 			description=Tan-Bok
-			image="portraits/core/James_Woo/orc-warlord2.png"
+			image="portraits/James_Woo/orc-warlord2.png"
 			message= _ "Ha, Hogar! You said we wouldn't see any action this far back from the front."
 		[/message]
 
 		[message]
 			description=Tan-Hogar
-			image="portraits/core/James_Woo/orc-warlord3.png"
+			image="portraits/James_Woo/orc-warlord3.png"
 			message= _ "Shut yer mouth! Let's just get 'em."
 		[/message]
 

data/units/Drake_Blademaster.cfg

@@ -3,7 +3,7 @@
 	name= _ "Drake Blademaster"
 	race=drake
 	image="units/drakes/blademaster.png"
-	profile="portraits/core/Alex_Jarocha-Ernst/drake-fighter.png"
+	profile="portraits/Alex_Jarocha-Ernst/drake-fighter.png"
 	hitpoints=80
 	movement_type=drakefly
 	movement=6

data/units/Drake_Burner.cfg

@@ -4,7 +4,7 @@
 	race=drake
 	image="units/drakes/burner.png"
 	ellipse="misc/ellipse"
-	profile="portraits/core/Alex_Jarocha-Ernst/drake-burner.png"
+	profile="portraits/Alex_Jarocha-Ernst/drake-burner.png"
 	hitpoints=42
 	movement_type=drakefly
 	movement=5

data/units/Drake_Clasher.cfg

@@ -14,7 +14,7 @@
 	undead_variation=drake
 	cost=19
 	usage=fighter
-	profile=portraits/core/Alex_Jarocha-Ernst/drake-clasher.png
+	profile=portraits/Alex_Jarocha-Ernst/drake-clasher.png
 	unit_description= _ "A Drake Clasher is incapable of both flight and fire-breathing, and most assume their relegation to melee combat is because of disability - an attempt to garner use from what otherwise would be a liability. It is possible that they have some mild deficiency in those skills, but those who support this theory have failed to consider how uniquely well-suited they are to combat a fellow drake.
 
 They are, in fact, the Judicators of the Drake Hierarchy, and though their armament is now largely ceremonial, it is none the less effective. In their encounters with lesser races, they discovered that their natural size and strength were themselves powerful weapons, and when combined with the armament worn by this caste, the resulting warriors lack some of the typical weaknesses of their kind, such as the strong vulnerability to spears and arrows."

data/units/Drake_Enforcer.cfg

@@ -16,7 +16,7 @@
 	undead_variation=drake
 	cost=40
 	usage=fighter
-	profile=portraits/core/Alex_Jarocha-Ernst/drake-clasher.png
+	profile=portraits/Alex_Jarocha-Ernst/drake-clasher.png
 	unit_description= _ "The great Drake Enforcers epitomize the raw strength of their kind. Long hours at the forge have provided them with a bristling array of weaponry, and have clad them head to toe in shining armor."
 	die_sound=drake-die.ogg
 	[death]

data/units/Drake_Fighter.cfg

@@ -4,7 +4,7 @@
 	race=drake
 	image="units/drakes/fighter.png"
 	ellipse="misc/ellipse"
-	profile="portraits/core/Alex_Jarocha-Ernst/drake-fighter.png"
+	profile="portraits/Alex_Jarocha-Ernst/drake-fighter.png"
 	hitpoints=39
 	movement_type=drakefly
 	movement=6

data/units/Drake_Fire.cfg

@@ -3,7 +3,7 @@
 	name= _ "Fire Drake"
 	race=drake
 	image="units/drakes/fire.png"
-	profile="portraits/core/Alex_Jarocha-Ernst/drake-burner.png"
+	profile="portraits/Alex_Jarocha-Ernst/drake-burner.png"
 	hitpoints=63
 	movement_type=drakefly
 	movement=5

data/units/Drake_Flameheart.cfg

@@ -10,7 +10,7 @@
 			image="units/drakes/flameheart-lead.png"
 		[/frame]
 	[/leading_anim]
-	profile="portraits/core/Alex_Jarocha-Ernst/drake-burner.png"
+	profile="portraits/Alex_Jarocha-Ernst/drake-burner.png"
 	hitpoints=72
 	movement_type=drakefly
 	movement=5

data/units/Drake_Flare.cfg

@@ -10,7 +10,7 @@
 			image="units/drakes/flare-lead.png"
 		[/frame]
 	[/leading_anim]
-	profile="portraits/core/Alex_Jarocha-Ernst/drake-burner.png"
+	profile="portraits/Alex_Jarocha-Ernst/drake-burner.png"
 	hitpoints=54
 	movement_type=drakefly
 	movement=5

data/units/Drake_Gladiator.cfg

@@ -14,7 +14,7 @@
 	undead_variation=drake
 	cost=31
 	usage=fighter
-	profile=portraits/core/Alex_Jarocha-Ernst/drake-clasher.png
+	profile=portraits/Alex_Jarocha-Ernst/drake-clasher.png
 	unit_description= _ "The Gladiator has taken a completely different path from the Slashers. Rather than emphasize training, they have chosen to focus on the craft of their weaponry. They are the smiths of Drake society, and it follows that they possess the best weaponry - the sharpest blades and spears, and the maces which complement their already impressive array. Their intense focus on their weapons comes at the slight expense of their defensive abilities."
 	die_sound=drake-die.ogg
 	{DEFENSE_ANIM "units/drakes/gladiator-defend.png" "units/drakes/gladiator.png" {SOUND_LIST:DRAKE_HIT} }

data/units/Drake_Glider.cfg

@@ -4,7 +4,7 @@
 	race=drake
 	image="units/drakes/glider.png"
 	ellipse="misc/ellipse"
-	profile="portraits/core/Alex_Jarocha-Ernst/drake-glider.png"
+	profile="portraits/Alex_Jarocha-Ernst/drake-glider.png"
 	hitpoints=32
 	movement_type=drakefly
 	movement=8

data/units/Drake_Hurricane.cfg

@@ -3,7 +3,7 @@
 	name= _ "Hurricane Drake"
 	race=drake
 	image="units/drakes/hurricane.png"
-	profile="portraits/core/Alex_Jarocha-Ernst/drake-glider.png"
+	profile="portraits/Alex_Jarocha-Ernst/drake-glider.png"
 	hitpoints=58
 	movement_type=fly
 

data/units/Drake_Inferno.cfg

@@ -3,7 +3,7 @@
 	name= _ "Inferno Drake"
 	race=drake
 	image="units/drakes/inferno.png"
-	profile="portraits/core/Alex_Jarocha-Ernst/drake-burner.png"
+	profile="portraits/Alex_Jarocha-Ernst/drake-burner.png"
 	hitpoints=82
 	movement_type=drakefly
 	movement=5

data/units/Drake_Sky.cfg

@@ -3,7 +3,7 @@
 	name= _ "Sky Drake"
 	race=drake
 	image="units/drakes/sky.png"
-	profile="portraits/core/Alex_Jarocha-Ernst/drake-glider.png"
+	profile="portraits/Alex_Jarocha-Ernst/drake-glider.png"
 	hitpoints=45
 	movement_type=fly
 

data/units/Drake_Slasher.cfg

@@ -14,7 +14,7 @@
 	undead_variation=drake
 	cost=31
 	usage=fighter
-	profile=portraits/core/Alex_Jarocha-Ernst/drake-clasher.png
+	profile=portraits/Alex_Jarocha-Ernst/drake-clasher.png
 	unit_description= _ "Slashers are clashers who have chosen to master the use of a Halberd instead of carrying a sword and the spear. Their great size allows them to use a weapon of matching scale, large enough to skewer a horse as a man would a boar. Their training has also enhanced their stamina and defensive skills, which is a major advantage over their close cousins the Gladiators.
 
 Special Notes:"+{SPECIAL_NOTES_FIRSTSTRIKE}

data/units/Drake_Warden.cfg

@@ -15,7 +15,7 @@
 	undead_variation=drake
 	cost=46
 	usage=fighter
-	profile=portraits/core/Alex_Jarocha-Ernst/drake-clasher.png
+	profile=portraits/Alex_Jarocha-Ernst/drake-clasher.png
 	unit_description= _ "The Warden represents the pinnacle of the clasher caste, being picked from the most able Slashers. They have forged their might such that few warriors on this earth would dare stand against them. The Wardens' weapon of choice is the halberd, which they use to great effect.
 
 Special Notes:"+{SPECIAL_NOTES_FIRSTSTRIKE}

data/units/Drake_Warrior.cfg

@@ -3,7 +3,7 @@
 	name= _ "Drake Warrior"
 	race=drake
 	image="units/drakes/warrior.png"
-	profile="portraits/core/Alex_Jarocha-Ernst/drake-fighter.png"
+	profile="portraits/Alex_Jarocha-Ernst/drake-fighter.png"
 	hitpoints=60
 	movement_type=drakefly
 	movement=6

data/units/Dwarvish_Fighter.cfg

@@ -3,7 +3,7 @@
 	name= _ "Dwarvish Fighter"
 	race=dwarf
 	image="units/dwarves/fighter.png"
-	profile="portraits/core/Tristan_Millner/dwarven-fighter.png"
+	profile="portraits/Tristan_Millner/dwarven-fighter.png"
 {MAGENTA_IS_THE_TEAM_COLOR}
 	ellipse="misc/ellipse"
 #ifdef CAMPAIGN_THE_RISE_OF_WESNOTH

data/units/Dwarvish_Guardsman.cfg

@@ -4,7 +4,7 @@
 	race=dwarf
 	image="units/dwarves/guard.png"
 	ellipse="misc/ellipse"
-	profile=portraits/core/James_Woo/dwarf-guard.png
+	profile=portraits/James_Woo/dwarf-guard.png
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=42
 	movement_type=dwarvishfoot

data/units/Dwarvish_Lord.cfg

@@ -3,7 +3,7 @@
 	name= _ "Dwarvish Lord"
 	race=dwarf
 	image="units/dwarves/lord.png"
-	profile="portraits/core/Tristan_Millner/dwarven-fighter.png"
+	profile="portraits/Tristan_Millner/dwarven-fighter.png"
 {MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=79
 	movement_type=dwarvishfoot

data/units/Dwarvish_Sentinel.cfg

@@ -3,7 +3,7 @@
 	name= _ "Dwarvish Sentinel"
 	race=dwarf
 	image="units/dwarves/sentinel.png"
-	profile=portraits/core/James_Woo/dwarf-guard.png
+	profile=portraits/James_Woo/dwarf-guard.png
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=56
 	movement_type=dwarvishfoot

data/units/Dwarvish_Stalwart.cfg

@@ -3,7 +3,7 @@
 	name= _ "Dwarvish Stalwart"
 	race=dwarf
 	image="units/dwarves/stalwart.png"
-	profile=portraits/core/James_Woo/dwarf-guard.png
+	profile=portraits/James_Woo/dwarf-guard.png
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=48
 	movement_type=dwarvishfoot

data/units/Dwarvish_Steelclad.cfg

@@ -3,7 +3,7 @@
 	name= _ "Dwarvish Steelclad"
 	race=dwarf
 	image="units/dwarves/warrior.png"
-	profile="portraits/core/Tristan_Millner/dwarven-fighter.png"
+	profile="portraits/Tristan_Millner/dwarven-fighter.png"
 {MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=59
 	movement_type=dwarvishfoot

data/units/Elvish_Shaman.cfg

@@ -5,7 +5,7 @@
 	gender=female
 	image="units/elves-wood/shaman.png"
 	ellipse="misc/ellipse"
-	profile=portraits/core/Alex_Jarocha-Ernst/elvish-shaman.png
+	profile=portraits/Alex_Jarocha-Ernst/elvish-shaman.png
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=26
 	movement_type=woodland

data/units/Human_Horse_Grand_Knight.cfg

@@ -3,7 +3,7 @@
 	name= _ "Grand Knight"
 	race=human
 	image="units/human-loyalists/grand-knight.png"
-	profile="portraits/core/Jason_Lutes/human-grand-knight.png"
+	profile="portraits/Jason_Lutes/human-grand-knight.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=78
 	movement_type=mounted

data/units/Human_Horse_Knight.cfg

@@ -3,7 +3,7 @@
 	name= _ "Knight"
 	race=human
 	image="units/human-loyalists/knight.png"
-	profile="portraits/core/Jason_Lutes/human-knight.png"
+	profile="portraits/Jason_Lutes/human-knight.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=58
 	movement_type=mounted

data/units/Human_Horse_Lancer.cfg

@@ -3,7 +3,7 @@
 	name= _ "Lancer"
 	race=human
 	image="units/human-loyalists/lancer.png"
-	profile="portraits/core/Jason_Lutes/human-lancer.png"
+	profile="portraits/Jason_Lutes/human-lancer.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=50
 	movement_type=mounted

data/units/Human_Horse_Paladin.cfg

@@ -4,7 +4,7 @@
 	race=human
 	image="units/human-loyalists/paladin.png"
 	image_healing="units/human-loyalists/paladin-healing.png"
-	profile="portraits/core/Jason_Lutes/human-paladin.png"
+	profile="portraits/Jason_Lutes/human-paladin.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=65
 	movement_type=mounted

data/units/Human_Horseman.cfg

@@ -3,7 +3,7 @@
 	name= _ "Horseman"
 	race=human
 	image="units/human-loyalists/horseman.png"
-	profile="portraits/core/Jason_Lutes/human-horseman.png"
+	profile="portraits/Jason_Lutes/human-horseman.png"
 	ellipse="misc/ellipse"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=38

data/units/Human_Loyalist_Halberdier.cfg

@@ -3,7 +3,7 @@
 	name= _ "Halberdier"
 	race=human
 	image="units/human-loyalists/halberdier.png"
-	profile="portraits/core/Jason_Lutes/human-halberdier.png"
+	profile="portraits/Jason_Lutes/human-halberdier.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=72
 	movement_type=smallfoot

data/units/Human_Loyalist_Javelineer.cfg

@@ -3,7 +3,7 @@
 	name= _ "Javelineer"
 	race=human
 	image="units/human-loyalists/javelineer.png"
-	profile="portraits/core/Jason_Lutes/human-javelineer.png"
+	profile="portraits/Jason_Lutes/human-javelineer.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=48
 	movement_type=smallfoot

data/units/Human_Loyalist_Longbowman.cfg

@@ -4,7 +4,7 @@
 	race=human
 	gender=male
 	image="units/human-loyalists/longbowman.png"
-	profile="portraits/core/Pekka_Aikio/human-longbowman.png"
+	profile="portraits/Pekka_Aikio/human-longbowman.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=45
 	movement_type=smallfoot

data/units/Human_Loyalist_Pikeman.cfg

@@ -3,7 +3,7 @@
 	name= _ "Pikeman"
 	race=human
 	image="units/human-loyalists/pikeman.png"
-	profile="portraits/core/Jason_Lutes/human-pikeman.png"
+	profile="portraits/Jason_Lutes/human-pikeman.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=55
 	movement_type=smallfoot

data/units/Human_Loyalist_Royal_Guard.cfg

@@ -3,7 +3,7 @@
 	name= _ "Royal Guard"
 	race=human
 	image="units/human-loyalists/royalguard.png"
-	profile="portraits/core/Jason_Lutes/human-royalguard.png"
+	profile="portraits/Jason_Lutes/human-royalguard.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=74
 	movement_type=smallfoot

data/units/Human_Loyalist_Spearman.cfg

@@ -4,7 +4,7 @@
 	race=human
 	image="units/human-loyalists/spearman.png"
 	ellipse="misc/ellipse"
-	profile="portraits/core/Jason_Lutes/human-spearman.png"
+	profile="portraits/Jason_Lutes/human-spearman.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=36
 	movement_type=smallfoot

data/units/Human_Loyalist_Swordsman.cfg

@@ -3,7 +3,7 @@
 	name= _ "Swordsman"
 	race=human
 	image="units/human-loyalists/swordsman.png"
-	profile="portraits/core/Jason_Lutes/human-swordsman.png"
+	profile="portraits/Jason_Lutes/human-swordsman.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=55
 	movement_type=smallfoot

data/units/Human_Outlaw_Assassin.cfg

@@ -4,7 +4,7 @@
 	race=human
 	gender=male,female
 	image="units/human-outlaws/assassin.png"
-	profile=portraits/core/James_Woo/assassin.png
+	profile=portraits/James_Woo/assassin.png
 	hitpoints=51
 	movement_type=elusivefoot
 	movement=6

data/units/Human_Outlaw_Bandit.cfg

@@ -3,7 +3,7 @@
 	name= _ "Bandit"
 	race=human
 	image="units/human-outlaws/bandit.png"
-	profile="portraits/core/Jason_Lutes/human-bandit.png"
+	profile="portraits/Jason_Lutes/human-bandit.png"
 	hitpoints=50
 	movement_type=smallfoot
 	movement=5

data/units/Human_Outlaw_Poacher.cfg

@@ -3,7 +3,7 @@
 	name= _ "Poacher"
 	race=human
 	image="units/human-outlaws/poacher.png"
-	profile=portraits/core/Nicholas_Kerpan/human-poacher.png
+	profile=portraits/Nicholas_Kerpan/human-poacher.png
 	ellipse="misc/ellipse"
 	hitpoints=32
 	movement_type=smallfoot

data/units/Human_Outlaw_Rogue.cfg

@@ -4,7 +4,7 @@
 	race=human
 	gender=male,female
 	image="units/human-outlaws/rogue.png"
-	profile=portraits/core/Nicholas_Kerpan/human-thief.png
+	profile=portraits/Nicholas_Kerpan/human-thief.png
 	hitpoints=40
 	movement_type=elusivefoot
 	movement=6

data/units/Human_Outlaw_Thief.cfg

@@ -4,7 +4,7 @@
 	race=human
 	gender=male,female
 	image="units/human-outlaws/thief.png"
-	profile=portraits/core/Nicholas_Kerpan/human-thief.png
+	profile=portraits/Nicholas_Kerpan/human-thief.png
 	ellipse="misc/ellipse"
 	hitpoints=24
 	movement_type=elusivefoot

data/units/Human_Outlaw_Thug.cfg

@@ -4,7 +4,7 @@
 	race=human
 	image="units/human-outlaws/thug.png"
 	ellipse="misc/ellipse"
-	profile="portraits/core/Jason_Lutes/human-thug.png"
+	profile="portraits/Jason_Lutes/human-thug.png"
 	hitpoints=32
 	movement_type=smallfoot
 	movement=5

data/units/Human_Outlaw_Trapper.cfg

@@ -3,7 +3,7 @@
 	name= _ "Trapper"
 	race=human
 	image="units/human-outlaws/trapper.png"
-	profile=portraits/core/Nicholas_Kerpan/human-poacher.png
+	profile=portraits/Nicholas_Kerpan/human-poacher.png
 	hitpoints=45
 	movement_type=smallfoot
 	movement=5

data/units/Human_Peasant.cfg

@@ -5,7 +5,7 @@
 	gender=male
 	image="units/human-loyalists/peasant.png"
 	ellipse="misc/ellipse-nozoc"
-	profile="portraits/core/Jason_Lutes/human-peasant.png"
+	profile="portraits/Jason_Lutes/human-peasant.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=18
 	movement_type=smallfoot

data/units/Mermaid_Diviner.cfg

@@ -4,7 +4,7 @@
 	race=merman
 	gender=female
 	image="units/merfolk/diviner.png"
-	profile=portraits/core/Alex_Jarocha-Ernst/mermaid-initiate.png
+	profile=portraits/Alex_Jarocha-Ernst/mermaid-initiate.png
 	image_healing="units/merfolk/diviner-magic1.png"
 	image_halo_healing="units/merfolk/diviner-magic1.png:100,units/merfolk/diviner-magic2.png:100,units/merfolk/diviner-magic3.png:100,units/merfolk/diviner-magic4.png:100,units/merfolk/diviner-magic5.png:100,units/merfolk/diviner-magic6.png:100"
 	halo=halo/white-cleric-aura.png

data/units/Mermaid_Enchantress.cfg

@@ -4,7 +4,7 @@
 	race=merman
 	gender=female
 	image="units/merfolk/enchantress.png"
-	profile=portraits/core/Alex_Jarocha-Ernst/mermaid-initiate.png
+	profile=portraits/Alex_Jarocha-Ernst/mermaid-initiate.png
 	hitpoints=38
 	movement_type=swimmer
 	movement=6

data/units/Mermaid_Initiate.cfg

@@ -5,7 +5,7 @@
 	gender=female
 	image="units/merfolk/initiate.png"
 	ellipse="misc/ellipse"
-	profile=portraits/core/Alex_Jarocha-Ernst/mermaid-initiate.png
+	profile=portraits/Alex_Jarocha-Ernst/mermaid-initiate.png
 	hitpoints=27
 	movement_type=swimmer
 	movement=6

data/units/Mermaid_Priestess.cfg

@@ -4,7 +4,7 @@
 	race=merman
 	gender=female
 	image="units/merfolk/priestess.png"
-	profile=portraits/core/Alex_Jarocha-Ernst/mermaid-initiate.png
+	profile=portraits/Alex_Jarocha-Ernst/mermaid-initiate.png
 	image_healing="units/merfolk/priestess-magic1.png"
 	image_halo_healing="units/merfolk/priestess-magic1.png:100,units/merfolk/priestess-magic2.png:100,units/merfolk/priestess-magic3.png:100,units/merfolk/priestess-magic4.png:100,units/merfolk/priestess-magic5.png:100,units/merfolk/priestess-magic6.png:100"
 	hitpoints=31

data/units/Mermaid_Siren.cfg

@@ -4,7 +4,7 @@
 	race=merman
 	gender=female
 	image="units/merfolk/siren.png"
-	profile=portraits/core/Alex_Jarocha-Ernst/mermaid-initiate.png
+	profile=portraits/Alex_Jarocha-Ernst/mermaid-initiate.png
 	hitpoints=49
 	movement_type=swimmer
 	movement=7

data/units/Merman_Entangler.cfg

@@ -3,7 +3,7 @@
 	name= _ "Merman Entangler"
 	race=merman
 	image="units/merfolk/entangler.png"
-	profile=portraits/core/Alex_Jarocha-Ernst/merman-hunter.png
+	profile=portraits/Alex_Jarocha-Ernst/merman-hunter.png
 	hitpoints=55
 	movement_type=swimmer
 	movement=7

data/units/Merman_Fighter.cfg

@@ -4,7 +4,7 @@
 	race=merman
 	image="units/merfolk/fighter.png"
 	ellipse="misc/ellipse"
-	profile=portraits/core/Alex_Jarocha-Ernst/merman-fighter.png
+	profile=portraits/Alex_Jarocha-Ernst/merman-fighter.png
 	hitpoints=36
 	movement_type=swimmer
 	movement=6

data/units/Merman_Hoplite.cfg

@@ -3,7 +3,7 @@
 	name= _ "Merman Hoplite"
 	race=merman
 	image="units/merfolk/hoplite.png"
-	profile=portraits/core/Alex_Jarocha-Ernst/merman-fighter.png
+	profile=portraits/Alex_Jarocha-Ernst/merman-fighter.png
 	hitpoints=52
 	movement_type=swimmer
 # The following resistance adjustments are to make the hoplite good defensively, and to make 'steadfast' actually do something

data/units/Merman_Hunter.cfg

@@ -4,7 +4,7 @@
 	race=merman
 	image="units/merfolk/hunter.png"
 	ellipse="misc/ellipse"
-	profile=portraits/core/Alex_Jarocha-Ernst/merman-hunter.png
+	profile=portraits/Alex_Jarocha-Ernst/merman-hunter.png
 	hitpoints=30
 	movement_type=swimmer
 	movement=6

data/units/Merman_Javelineer.cfg

@@ -3,7 +3,7 @@
 	name= _ "Merman Javelineer"
 	race=merman
 	image="units/merfolk/javelineer.png"
-	profile=portraits/core/Alex_Jarocha-Ernst/merman-hunter.png
+	profile=portraits/Alex_Jarocha-Ernst/merman-hunter.png
 	hitpoints=55
 	movement_type=swimmer
 	movement=6

data/units/Merman_Netcaster.cfg

@@ -3,7 +3,7 @@
 	name= _ "Merman Netcaster"
 	race=merman
 	image="units/merfolk/netcaster.png"
-	profile=portraits/core/Alex_Jarocha-Ernst/merman-hunter.png
+	profile=portraits/Alex_Jarocha-Ernst/merman-hunter.png
 	hitpoints=40
 	movement_type=swimmer
 	movement=7

data/units/Merman_Spearman.cfg

@@ -3,7 +3,7 @@
 	name= _ "Merman Spearman"
 	race=merman
 	image="units/merfolk/spearman.png"
-	profile=portraits/core/Alex_Jarocha-Ernst/merman-hunter.png
+	profile=portraits/Alex_Jarocha-Ernst/merman-hunter.png
 	hitpoints=40
 	movement_type=swimmer
 	movement=6

data/units/Merman_Triton.cfg

@@ -3,7 +3,7 @@
 	name= _ "Merman Triton"
 	race=merman
 	image="units/merfolk/triton.png"
-	profile=portraits/core/Alex_Jarocha-Ernst/merman-fighter.png
+	profile=portraits/Alex_Jarocha-Ernst/merman-fighter.png
 	hitpoints=60
 	movement_type=swimmer
 	movement=6

data/units/Merman_Warrior.cfg

@@ -3,7 +3,7 @@
 	name= _ "Merman Warrior"
 	race=merman
 	image="units/merfolk/warrior.png"
-	profile=portraits/core/Alex_Jarocha-Ernst/merman-fighter.png
+	profile=portraits/Alex_Jarocha-Ernst/merman-fighter.png
 	hitpoints=50
 	movement_type=swimmer
 	movement=6

data/units/Monster_Giant_Scorpion.cfg

@@ -4,7 +4,7 @@
 	race=monster
 	image="units/monsters/scorpion.png"
 	ellipse="misc/ellipse"
-	profile="portraits/core/Other/scorpion.png"
+	profile="portraits/Other/scorpion.png"
 	hitpoints=40
 	movement_type=scuttlefoot
 	movement=8

data/units/Naga_Fighter.cfg

@@ -5,7 +5,7 @@
 	gender=male,female
 	image="units/nagas/fighter.png"
 	ellipse="misc/ellipse"
-	profile=portraits/core/Alex_Jarocha-Ernst/naga-fighter.png
+	profile=portraits/Alex_Jarocha-Ernst/naga-fighter.png
 	hitpoints=33
 	movement_type=naga
 	movement=7
@@ -69,7 +69,7 @@
 		name= _ "Nagini Fighter"
 		gender=female
 		image="units/nagas/fighter+female.png"
-		profile=portraits/core/Alex_Jarocha-Ernst/nagini-fighter.png
+		profile=portraits/Alex_Jarocha-Ernst/nagini-fighter.png
 		{DEFENSE_ANIM "units/nagas/fighter+female-defend.png" "units/nagas/fighter+female.png" {SOUND_LIST:NAGA_HIT} }
 		[attack]
 			[animation]

data/units/Naga_Myrmidon.cfg

@@ -4,7 +4,7 @@
 	race=naga
 	gender=male,female
 	image="units/nagas/myrmidon.png"
-	profile=portraits/core/Alex_Jarocha-Ernst/naga-fighter.png
+	profile=portraits/Alex_Jarocha-Ernst/naga-fighter.png
 	hitpoints=49
 	movement_type=naga
 	movement=7
@@ -74,7 +74,7 @@
 		gender=female
 		image="units/nagas/myrmidon+female.png"
 		unit_description= _ "The most practiced of the nagini blademasters are initiated into the caste of the Myrmidon, masters of their twin-bladed art. They strike as fast as the snakes which they resemble, and dance away from attacks with grace. Not only are they potent enemies on any open terrain, but their ability to swim allows them a deadly mobility."
-		profile=portraits/core/Alex_Jarocha-Ernst/nagini-fighter.png
+		profile=portraits/Alex_Jarocha-Ernst/nagini-fighter.png
 		{DEFENSE_ANIM "units/nagas/myrmidon+female-defend.png" "units/nagas/myrmidon+female.png" {SOUND_LIST:NAGA_HIT} }
 		[attack]
 			[animation]

data/units/Naga_Warrior.cfg

@@ -4,7 +4,7 @@
 	race=naga
 	gender=male,female
 	image="units/nagas/warrior.png"
-	profile=portraits/core/Alex_Jarocha-Ernst/naga-fighter.png
+	profile=portraits/Alex_Jarocha-Ernst/naga-fighter.png
 	hitpoints=43
 	movement_type=naga
 	movement=7
@@ -72,7 +72,7 @@
 		name= _ "Nagini Warrior"
 		gender=female
 		image="units/nagas/warrior+female.png"
-		profile=portraits/core/Alex_Jarocha-Ernst/nagini-fighter.png
+		profile=portraits/Alex_Jarocha-Ernst/nagini-fighter.png
 		{DEFENSE_ANIM "units/nagas/warrior+female-defend.png" "units/nagas/warrior+female.png" {SOUND_LIST:NAGA_HIT} }
 		[attack]
 			[animation]

data/units/Orcish_Assassin.cfg

@@ -4,7 +4,7 @@
 	race=orc
 	image="units/orcs/assassin.png"
 	ellipse="misc/ellipse"
-	profile=portraits/core/Alex_Jarocha-Ernst/orcish-assassin.png
+	profile=portraits/Alex_Jarocha-Ernst/orcish-assassin.png
 	hitpoints=26
 	movement_type=elusivefoot
 	movement=6

data/units/Orcish_Grunt.cfg

@@ -4,7 +4,7 @@
 	race=orc
 	image="units/orcs/grunt.png"
 	ellipse="misc/ellipse"
-	profile="portraits/core/James_Woo/orc-warlord5.png"
+	profile="portraits/James_Woo/orc-warlord5.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=38
 	movement_type=orcishfoot

data/units/Orcish_Slayer.cfg

@@ -3,7 +3,7 @@
 	name= _ "Orcish Slayer"
 	race=orc
 	image="units/orcs/slayer.png"
-	profile="portraits/core/Alex_Jarocha-Ernst/orcish-assassin.png"
+	profile="portraits/Alex_Jarocha-Ernst/orcish-assassin.png"
 	hitpoints=36
 	movement_type=elusivefoot
 	movement=6

data/units/Orcish_Warlord.cfg

@@ -3,7 +3,7 @@
 	name= _ "Orcish Warlord"
 	race=orc
 	image="units/orcs/warlord.png"
-	profile="portraits/core/James_Woo/orc-warlord.png"
+	profile="portraits/James_Woo/orc-warlord.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=78
 	movement_type=orcishfoot

data/units/Orcish_Warrior.cfg

@@ -4,7 +4,7 @@
 	race=orc
 	image="units/orcs/warrior.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
-	profile="portraits/core/James_Woo/orc-warlord4.png"
+	profile="portraits/James_Woo/orc-warlord4.png"
 	hitpoints=58
 	movement_type=orcishfoot
 	movement=5

data/units/Saurian_Ambusher.cfg

@@ -3,7 +3,7 @@
 	name= _ "Saurian Ambusher"
 	race=lizard
 	image="units/saurians/ambusher.png"
-	profile="portraits/core/Alex_Jarocha-Ernst/saurian-skirmisher.png"
+	profile="portraits/Alex_Jarocha-Ernst/saurian-skirmisher.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
 	hitpoints=32
 	movement_type=lizard

data/units/Saurian_Flanker.cfg

@@ -4,7 +4,7 @@
 	race=lizard
 	image="units/saurians/flanker.png"
 	{MAGENTA_IS_THE_TEAM_COLOR}
-	profile="portraits/core/Alex_Jarocha-Ernst/saurian-skirmisher.png"
+	profile="portraits/Alex_Jarocha-Ernst/saurian-skirmisher.png"
 	hitpoints=43
 	movement_type=lizard
 	movement=7

data/units/Saurian_Skirmisher.cfg

@@ -5,7 +5,7 @@
 	image="units/saurians/skirmisher.png"
 	ellipse="misc/ellipse"
 	{MAGENTA_IS_THE_TEAM_COLOR}
-	profile=portraits/core/Alex_Jarocha-Ernst/saurian-skirmisher.png
+	profile=portraits/Alex_Jarocha-Ernst/saurian-skirmisher.png
 	hitpoints=22
 	movement_type=lizard
 	movement=6

data/units/Troll.cfg

@@ -3,7 +3,7 @@
 	name= _ "Troll"
 	race=troll
 	image="units/trolls/grunt.png"
-	profile=portraits/core/James_Woo/troll.png
+	profile=portraits/James_Woo/troll.png
 	hitpoints=55
 	movement_type=largefoot
 	movement=5

data/units/Troll_Great.cfg

@@ -3,7 +3,7 @@
 	name= _ "Great Troll"
 	race=troll
 	image="units/trolls/great-troll.png"
-	profile=portraits/core/James_Woo/troll.png
+	profile=portraits/James_Woo/troll.png
 	hitpoints=80
 	movement_type=largefoot
 	movement=5

data/units/Troll_Hero.cfg

@@ -3,7 +3,7 @@
 	name= _ "Troll Hero"
 	race=troll
 	image="units/trolls/hero.png"
-	profile=portraits/core/James_Woo/troll.png
+	profile=portraits/James_Woo/troll.png
 	hitpoints=60
 	movement_type=largefoot
 	movement=5

data/units/Troll_Rocklobber.cfg

@@ -3,7 +3,7 @@
 	name= _ "Troll Rocklobber"
 	race=troll
 	image="units/trolls/lobber.png"
-	profile=portraits/core/James_Woo/troll.png
+	profile=portraits/James_Woo/troll.png
 	hitpoints=53
 	movement_type=largefoot
 	movement=4

data/units/Troll_Warrior.cfg

@@ -3,7 +3,7 @@
 	name= _ "Troll Warrior"
 	race=troll
 	image="units/trolls/warrior.png"
-	profile=portraits/core/James_Woo/troll.png
+	profile=portraits/James_Woo/troll.png
 	hitpoints=70
 	movement_type=largefoot
 	movement=5

data/units/Undead_Corpse_Ghoul.cfg

@@ -4,7 +4,7 @@
 	race=undead
 	image="units/undead/ghoul.png"
 	ellipse="misc/ellipse"
-	profile=portraits/core/Alex_Jarocha-Ernst/ghoul.png
+	profile=portraits/Alex_Jarocha-Ernst/ghoul.png
 	hitpoints=33
 	movement_type=undeadfoot
 	movement=5

data/units/Undead_Corpse_Necrophage.cfg

@@ -3,7 +3,7 @@
 	name= _ "Necrophage"
 	race=undead
 	image="units/undead/necrophage.png"
-	profile="portraits/core/Alex_Jarocha-Ernst/ghoul.png"
+	profile="portraits/Alex_Jarocha-Ernst/ghoul.png"
 	hitpoints=47
 	movement_type=undeadfoot
 	movement=5