diff --git a/src/eressea/res/config-e3a.xml b/src/eressea/res/config-e3a.xml
index d9e72cdce..c9ebfad32 100644
--- a/src/eressea/res/config-e3a.xml
+++ b/src/eressea/res/config-e3a.xml
@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <eressea xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="messages.xml"/>
+  <xi:include href="eressea:///core/messages.xml"/>
 
   <!-- Localization -->
-  <xi:include href="de/strings.xml"/>
-  <xi:include href="en/strings.xml"/>
+  <xi:include href="eressea:///core/de/strings.xml"/>
+  <xi:include href="eressea:///core/en/strings.xml"/>
 
-  <xi:include href="common/items.xml" />
-  <!--xi:include href="common/armor.xml" /-->
-  <!--xi:include href="common/weapons.xml" /-->
-  <!--xi:include href="common/resources.xml" /-->
-  <!--xi:include href="common/luxuries.xml" /-->
-	<xi:include href="common/herbs.xml" />
-  <!--xi:include href="common/potions.xml" /-->
-  <xi:include href="spoils.xml"/>
-  <xi:include href="prefixes.xml"/>
-  <!--xi:include href="ships.xml"/-->
-  <xi:include href="common/buildings.xml"/>
-  <xi:include href="equipment.xml"/>
-  <!--xi:include href="terrains.xml"/-->
+  <xi:include href="eressea:///core/common/herbs.xml" />
+  <xi:include href="eressea:///core/spoils.xml"/>
+  <xi:include href="eressea:///core/prefixes.xml"/>
+  <xi:include href="eressea:///core/common/buildings.xml"/>
+  <xi:include href="eressea:///core/equipment.xml"/>
   <xi:include href="directions.xml"/>
 
   <xi:include href="e3a/ships.xml"/>
@@ -184,7 +176,6 @@
   </rules>
   <xi:include href="eressea/strings.xml"/>
   <xi:include href="eressea/items.xml"/>
-  <xi:include href="eressea/artrewards.xml"/>
   <strings>
     <string name="mailto">
       <text locale="de">eressea-server@eressea.de</text>
diff --git a/src/eressea/res/e3a/armor.xml b/src/eressea/res/e3a/armor.xml
index 0bdb3294b..fe1d7fb45 100644
--- a/src/eressea/res/e3a/armor.xml
+++ b/src/eressea/res/e3a/armor.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <resources xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="../armor/plate-2.xml"/>
-  <xi:include href="../armor/chainmail-2.xml"/>
-  <xi:include href="../armor/laenmail-2.xml"/>
-  <xi:include href="../armor/laenshield-2.xml"/>
-  <xi:include href="../armor/rustychainmail-2.xml"/>
-  <xi:include href="../armor/rustyshield-2.xml"/>
-  <xi:include href="../armor/shield-2.xml"/>
-  <xi:include href="../armor/scale.xml"/>
-  <xi:include href="../armor/towershield.xml"/>
+  <xi:include href="armor/chainmail.xml"/>
+  <xi:include href="armor/laenmail.xml"/>
+  <xi:include href="armor/laenshield.xml"/>
+  <xi:include href="armor/plate.xml"/>
+  <xi:include href="armor/rustychainmail.xml"/>
+  <xi:include href="armor/rustyshield.xml"/>
+  <xi:include href="armor/scale.xml"/>
+  <xi:include href="armor/shield.xml"/>
+  <xi:include href="armor/towershield.xml"/>
 </resources>
diff --git a/src/res/armor/chainmail-2.xml b/src/eressea/res/e3a/armor/chainmail.xml
similarity index 100%
rename from src/res/armor/chainmail-2.xml
rename to src/eressea/res/e3a/armor/chainmail.xml
diff --git a/src/res/armor/laenmail-2.xml b/src/eressea/res/e3a/armor/laenmail.xml
similarity index 100%
rename from src/res/armor/laenmail-2.xml
rename to src/eressea/res/e3a/armor/laenmail.xml
diff --git a/src/res/armor/laenshield-2.xml b/src/eressea/res/e3a/armor/laenshield.xml
similarity index 100%
rename from src/res/armor/laenshield-2.xml
rename to src/eressea/res/e3a/armor/laenshield.xml
diff --git a/src/res/armor/plate-2.xml b/src/eressea/res/e3a/armor/plate.xml
similarity index 100%
rename from src/res/armor/plate-2.xml
rename to src/eressea/res/e3a/armor/plate.xml
diff --git a/src/res/armor/rustychainmail-2.xml b/src/eressea/res/e3a/armor/rustychainmail.xml
similarity index 100%
rename from src/res/armor/rustychainmail-2.xml
rename to src/eressea/res/e3a/armor/rustychainmail.xml
diff --git a/src/res/armor/rustyshield-2.xml b/src/eressea/res/e3a/armor/rustyshield.xml
similarity index 100%
rename from src/res/armor/rustyshield-2.xml
rename to src/eressea/res/e3a/armor/rustyshield.xml
diff --git a/src/res/armor/scale.xml b/src/eressea/res/e3a/armor/scale.xml
similarity index 100%
rename from src/res/armor/scale.xml
rename to src/eressea/res/e3a/armor/scale.xml
diff --git a/src/res/armor/shield-2.xml b/src/eressea/res/e3a/armor/shield.xml
similarity index 100%
rename from src/res/armor/shield-2.xml
rename to src/eressea/res/e3a/armor/shield.xml
diff --git a/src/res/armor/towershield.xml b/src/eressea/res/e3a/armor/towershield.xml
similarity index 100%
rename from src/res/armor/towershield.xml
rename to src/eressea/res/e3a/armor/towershield.xml
diff --git a/src/eressea/res/e3a/weapons.xml b/src/eressea/res/e3a/weapons.xml
index cbadcc7cc..b84943df3 100644
--- a/src/eressea/res/e3a/weapons.xml
+++ b/src/eressea/res/e3a/weapons.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <resources xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="../weapons/axe.xml"/>
-  <xi:include href="../weapons/bow.xml"/>
-  <xi:include href="../weapons/catapult.xml"/>
-  <xi:include href="../weapons/crossbow-2.xml"/>
-  <xi:include href="../weapons/rep_crossbow.xml"/>
-  <xi:include href="../weapons/firesword.xml"/>
-  <xi:include href="../weapons/greatbow-2.xml"/>
-  <xi:include href="../weapons/greatsword-2.xml"/>
-  <xi:include href="../weapons/halberd-2.xml"/>
-  <xi:include href="../weapons/laensword-2.xml"/>
-  <xi:include href="../weapons/lance.xml"/>
-  <xi:include href="../weapons/mallornbow.xml"/>
-  <xi:include href="../weapons/mallorncrossbow-2.xml"/>
-  <xi:include href="../weapons/mallornlance-2.xml"/>
-  <xi:include href="../weapons/mallornspear.xml"/>
-  <xi:include href="../weapons/runesword.xml"/>
-  <xi:include href="../weapons/rustyaxe.xml"/>
-  <xi:include href="../weapons/rustygreatsword-2.xml"/>
-  <xi:include href="../weapons/rustyhalberd-2.xml"/>
-  <xi:include href="../weapons/rustysword.xml"/>
-  <xi:include href="../weapons/spear.xml"/>
-  <xi:include href="../weapons/sword.xml"/>
+  <xi:include href="eressea://core/weapons/axe.xml"/>
+  <xi:include href="eressea://core/weapons/bow.xml"/>
+  <xi:include href="eressea://core/weapons/catapult.xml"/>
+  <xi:include href="eressea://core/weapons/firesword.xml"/>
+  <xi:include href="eressea://core/weapons/lance.xml"/>
+  <xi:include href="eressea://core/weapons/mallornbow.xml"/>
+  <xi:include href="eressea://core/weapons/mallornspear.xml"/>
+  <xi:include href="eressea://core/weapons/rep_crossbow.xml"/>
+  <xi:include href="eressea://core/weapons/runesword.xml"/>
+  <xi:include href="eressea://core/weapons/rustyaxe.xml"/>
+  <xi:include href="eressea://core/weapons/rustysword.xml"/>
+  <xi:include href="eressea://core/weapons/spear.xml"/>
+  <xi:include href="eressea://core/weapons/sword.xml"/>
+  <xi:include href="weapons/crossbow.xml"/>
+  <xi:include href="weapons/greatbow.xml"/>
+  <xi:include href="weapons/greatsword.xml"/>
+  <xi:include href="weapons/halberd.xml"/>
+  <xi:include href="weapons/laensword.xml"/>
+  <xi:include href="weapons/mallorncrossbow.xml"/>
+  <xi:include href="weapons/mallornlance.xml"/>
+  <xi:include href="weapons/rustygreatsword.xml"/>
+  <xi:include href="weapons/rustyhalberd.xml"/>
 </resources>
diff --git a/src/res/weapons/crossbow-2.xml b/src/eressea/res/e3a/weapons/crossbow.xml
similarity index 100%
rename from src/res/weapons/crossbow-2.xml
rename to src/eressea/res/e3a/weapons/crossbow.xml
diff --git a/src/res/weapons/greatbow-2.xml b/src/eressea/res/e3a/weapons/greatbow.xml
similarity index 100%
rename from src/res/weapons/greatbow-2.xml
rename to src/eressea/res/e3a/weapons/greatbow.xml
diff --git a/src/res/weapons/greatsword-2.xml b/src/eressea/res/e3a/weapons/greatsword.xml
similarity index 100%
rename from src/res/weapons/greatsword-2.xml
rename to src/eressea/res/e3a/weapons/greatsword.xml
diff --git a/src/res/weapons/halberd-2.xml b/src/eressea/res/e3a/weapons/halberd.xml
similarity index 100%
rename from src/res/weapons/halberd-2.xml
rename to src/eressea/res/e3a/weapons/halberd.xml
diff --git a/src/res/weapons/laensword-2.xml b/src/eressea/res/e3a/weapons/laensword.xml
similarity index 100%
rename from src/res/weapons/laensword-2.xml
rename to src/eressea/res/e3a/weapons/laensword.xml
diff --git a/src/res/weapons/mallorncrossbow-2.xml b/src/eressea/res/e3a/weapons/mallorncrossbow.xml
similarity index 100%
rename from src/res/weapons/mallorncrossbow-2.xml
rename to src/eressea/res/e3a/weapons/mallorncrossbow.xml
diff --git a/src/res/weapons/mallornlance-2.xml b/src/eressea/res/e3a/weapons/mallornlance.xml
similarity index 100%
rename from src/res/weapons/mallornlance-2.xml
rename to src/eressea/res/e3a/weapons/mallornlance.xml
diff --git a/src/res/weapons/rustygreatsword-2.xml b/src/eressea/res/e3a/weapons/rustygreatsword.xml
similarity index 100%
rename from src/res/weapons/rustygreatsword-2.xml
rename to src/eressea/res/e3a/weapons/rustygreatsword.xml
diff --git a/src/res/weapons/rustyhalberd-2.xml b/src/eressea/res/e3a/weapons/rustyhalberd.xml
similarity index 100%
rename from src/res/weapons/rustyhalberd-2.xml
rename to src/eressea/res/e3a/weapons/rustyhalberd.xml
diff --git a/src/res/common/armor.xml b/src/res/common/armor.xml
index 84a329114..58abae47f 100644
--- a/src/res/common/armor.xml
+++ b/src/res/common/armor.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0"?>
 <resources xmlns:xi="http://www.w3.org/2001/XInclude">
-  <!-- this file contains a lot of armor -->
-
-  <xi:include href="../armor/plate.xml"/>
   <xi:include href="../armor/chainmail.xml"/>
   <xi:include href="../armor/laenmail.xml"/>
   <xi:include href="../armor/laenshield.xml"/>
+  <xi:include href="../armor/plate.xml"/>
   <xi:include href="../armor/rustychainmail.xml"/>
   <xi:include href="../armor/rustyshield.xml"/>
   <xi:include href="../armor/shield.xml"/>
-
 </resources>
diff --git a/src/res/common/weapons.xml b/src/res/common/weapons.xml
index b55eb381b..e91b15e69 100644
--- a/src/res/common/weapons.xml
+++ b/src/res/common/weapons.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <resources xmlns:xi="http://www.w3.org/2001/XInclude">
-  <!-- this file contains a lot of weapons -->
   <xi:include href="../weapons/axe.xml"/>
   <xi:include href="../weapons/bow.xml"/>
   <xi:include href="../weapons/catapult.xml"/>