diff --git a/data/campaigns/Under_the_Burning_Suns/images/portraits/naga-hunter.png b/data/core/images/portraits/nagas/hunter.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/portraits/naga-hunter.png
rename to data/core/images/portraits/nagas/hunter.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-1.png b/data/core/images/units/nagas/guardian-attack-1.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-1.png
rename to data/core/images/units/nagas/guardian-attack-1.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-2.png b/data/core/images/units/nagas/guardian-attack-2.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-2.png
rename to data/core/images/units/nagas/guardian-attack-2.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-3.png b/data/core/images/units/nagas/guardian-attack-3.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-3.png
rename to data/core/images/units/nagas/guardian-attack-3.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-4.png b/data/core/images/units/nagas/guardian-attack-4.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-attack-4.png
rename to data/core/images/units/nagas/guardian-attack-4.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-1.png b/data/core/images/units/nagas/guardian-defend-1.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-1.png
rename to data/core/images/units/nagas/guardian-defend-1.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-2.png b/data/core/images/units/nagas/guardian-defend-2.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian-defend-2.png
rename to data/core/images/units/nagas/guardian-defend-2.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian.png b/data/core/images/units/nagas/guardian.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/guardian.png
rename to data/core/images/units/nagas/guardian.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-1.png b/data/core/images/units/nagas/hunter-attack-melee-1.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-1.png
rename to data/core/images/units/nagas/hunter-attack-melee-1.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-2.png b/data/core/images/units/nagas/hunter-attack-melee-2.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-2.png
rename to data/core/images/units/nagas/hunter-attack-melee-2.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-3.png b/data/core/images/units/nagas/hunter-attack-melee-3.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-3.png
rename to data/core/images/units/nagas/hunter-attack-melee-3.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-4.png b/data/core/images/units/nagas/hunter-attack-melee-4.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-melee-4.png
rename to data/core/images/units/nagas/hunter-attack-melee-4.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-1.png b/data/core/images/units/nagas/hunter-attack-ranged-1.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-1.png
rename to data/core/images/units/nagas/hunter-attack-ranged-1.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-2.png b/data/core/images/units/nagas/hunter-attack-ranged-2.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-2.png
rename to data/core/images/units/nagas/hunter-attack-ranged-2.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-3.png b/data/core/images/units/nagas/hunter-attack-ranged-3.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-3.png
rename to data/core/images/units/nagas/hunter-attack-ranged-3.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-4.png b/data/core/images/units/nagas/hunter-attack-ranged-4.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-4.png
rename to data/core/images/units/nagas/hunter-attack-ranged-4.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-5.png b/data/core/images/units/nagas/hunter-attack-ranged-5.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-5.png
rename to data/core/images/units/nagas/hunter-attack-ranged-5.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-6.png b/data/core/images/units/nagas/hunter-attack-ranged-6.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-attack-ranged-6.png
rename to data/core/images/units/nagas/hunter-attack-ranged-6.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-defend.png b/data/core/images/units/nagas/hunter-defend.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-defend.png
rename to data/core/images/units/nagas/hunter-defend.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-melee-defend.png b/data/core/images/units/nagas/hunter-melee-defend.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter-melee-defend.png
rename to data/core/images/units/nagas/hunter-melee-defend.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter.png b/data/core/images/units/nagas/hunter.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/hunter.png
rename to data/core/images/units/nagas/hunter.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-1.png b/data/core/images/units/nagas/sentinel-attack-1.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-1.png
rename to data/core/images/units/nagas/sentinel-attack-1.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-2.png b/data/core/images/units/nagas/sentinel-attack-2.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-2.png
rename to data/core/images/units/nagas/sentinel-attack-2.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-3.png b/data/core/images/units/nagas/sentinel-attack-3.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-3.png
rename to data/core/images/units/nagas/sentinel-attack-3.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-4.png b/data/core/images/units/nagas/sentinel-attack-4.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-attack-4.png
rename to data/core/images/units/nagas/sentinel-attack-4.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-defend-1.png b/data/core/images/units/nagas/sentinel-defend-1.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-defend-1.png
rename to data/core/images/units/nagas/sentinel-defend-1.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-defend-2.png b/data/core/images/units/nagas/sentinel-defend-2.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel-defend-2.png
rename to data/core/images/units/nagas/sentinel-defend-2.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel.png b/data/core/images/units/nagas/sentinel.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/sentinel.png
rename to data/core/images/units/nagas/sentinel.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-1.png b/data/core/images/units/nagas/warden-attack-1.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-1.png
rename to data/core/images/units/nagas/warden-attack-1.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-2.png b/data/core/images/units/nagas/warden-attack-2.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-2.png
rename to data/core/images/units/nagas/warden-attack-2.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-3.png b/data/core/images/units/nagas/warden-attack-3.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-3.png
rename to data/core/images/units/nagas/warden-attack-3.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-4.png b/data/core/images/units/nagas/warden-attack-4.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-attack-4.png
rename to data/core/images/units/nagas/warden-attack-4.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-defend-1.png b/data/core/images/units/nagas/warden-defend-1.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-defend-1.png
rename to data/core/images/units/nagas/warden-defend-1.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-defend-2.png b/data/core/images/units/nagas/warden-defend-2.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden-defend-2.png
rename to data/core/images/units/nagas/warden-defend-2.png
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden.png b/data/core/images/units/nagas/warden.png
similarity index 100%
rename from data/campaigns/Under_the_Burning_Suns/images/units/nagas/warden.png
rename to data/core/images/units/nagas/warden.png
diff --git a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Guardian.cfg b/data/core/units/nagas/Guardian.cfg
similarity index 98%
rename from data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Guardian.cfg
rename to data/core/units/nagas/Guardian.cfg
index 2e5c3b069676..6b30a6e45b49 100644
--- a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Guardian.cfg
+++ b/data/core/units/nagas/Guardian.cfg
@@ -1,4 +1,4 @@
-#textdomain wesnoth-utbs
+#textdomain wesnoth-units
 [unit_type]
     id=Naga Guardian
     name= _ "Naga Guardian"
diff --git a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg b/data/core/units/nagas/Hunter.cfg
similarity index 97%
rename from data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg
rename to data/core/units/nagas/Hunter.cfg
index c7b18a6d0c36..3d74f1b1c5fe 100644
--- a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg
+++ b/data/core/units/nagas/Hunter.cfg
@@ -1,10 +1,10 @@
-#textdomain wesnoth-utbs
+#textdomain wesnoth-units
 [unit_type]
     id=Naga Hunter
     name= _ "Naga Hunter"
     race=naga
     image="units/nagas/hunter.png"
-    profile="portraits/naga-hunter.png"
+    profile="portraits/nagas/hunter.png"
     hitpoints=33
     movement_type=naga
     movement=7
diff --git a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Sentinel.cfg b/data/core/units/nagas/Sentinel.cfg
similarity index 98%
rename from data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Sentinel.cfg
rename to data/core/units/nagas/Sentinel.cfg
index 42513a87d1f4..6cb39cfcf7b6 100644
--- a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Sentinel.cfg
+++ b/data/core/units/nagas/Sentinel.cfg
@@ -1,4 +1,4 @@
-#textdomain wesnoth-utbs
+#textdomain wesnoth-units
 [unit_type]
     id=Naga Sentinel
     name= _ "Naga Sentinel"
diff --git a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Warden.cfg b/data/core/units/nagas/Warden.cfg
similarity index 98%
rename from data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Warden.cfg
rename to data/core/units/nagas/Warden.cfg
index 6da1f4aca7a2..643287cb468d 100644
--- a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Warden.cfg
+++ b/data/core/units/nagas/Warden.cfg
@@ -1,4 +1,4 @@
-#textdomain wesnoth-utbs
+#textdomain wesnoth-units
 [unit_type]
     id=Naga Warden
     name= _ "Naga Warden"