diff --git a/resources/buildings/AnimalTrap.xml b/resources/buildings/AnimalTrap.xml
deleted file mode 100644
index c16d2195..00000000
--- a/resources/buildings/AnimalTrap.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<building name="Animal trap" game_type="AnimalTrap">
-    <sprite index="354" color="building" />
-</building>
diff --git a/resources/buildings/DoorsAndFloodgates.png b/resources/buildings/DoorsAndFloodgates.png
deleted file mode 100644
index dfd15c9c..00000000
Binary files a/resources/buildings/DoorsAndFloodgates.png and /dev/null differ
diff --git a/resources/buildings/Restraint.xml b/resources/buildings/Restraint.xml
deleted file mode 100644
index f2697e15..00000000
--- a/resources/buildings/Restraint.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<building name="Restraint" game_type="Chain">
-    <sprite index="107" />
-</building>
diff --git a/resources/buildings/cages-restraints/AnimalTrap.xml b/resources/buildings/cages-restraints/AnimalTrap.xml
new file mode 100644
index 00000000..993910d1
--- /dev/null
+++ b/resources/buildings/cages-restraints/AnimalTrap.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<building name="Animal trap" game_type="AnimalTrap" file = "cages-restraints.png" >
+    <sprite index="354" color="building" />
+</building>
diff --git a/resources/buildings/Cage.xml b/resources/buildings/cages-restraints/Cage.xml
similarity index 86%
rename from resources/buildings/Cage.xml
rename to resources/buildings/cages-restraints/Cage.xml
index 614641f7..da9252d9 100644
--- a/resources/buildings/Cage.xml
+++ b/resources/buildings/cages-restraints/Cage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="Cage" game_type="Cage">
+<building name="Cage" game_type="Cage" file = "cages-restraints.png" >
     <if>
         <MaterialType value="Wood" />
         <sprite index="313" />
diff --git a/resources/buildings/cages-restraints/Restraint.xml b/resources/buildings/cages-restraints/Restraint.xml
new file mode 100644
index 00000000..e1f104d7
--- /dev/null
+++ b/resources/buildings/cages-restraints/Restraint.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<building name="Restraint" game_type="Chain" file = "cages-restraints.png" >
+    <sprite index="107" />
+</building>
diff --git a/resources/buildings/cages-restraints/cages-restraints.png b/resources/buildings/cages-restraints/cages-restraints.png
new file mode 100644
index 00000000..087584d7
Binary files /dev/null and b/resources/buildings/cages-restraints/cages-restraints.png differ
diff --git a/resources/buildings/cages-restraints/index.txt b/resources/buildings/cages-restraints/index.txt
new file mode 100644
index 00000000..a81d249c
--- /dev/null
+++ b/resources/buildings/cages-restraints/index.txt
@@ -0,0 +1,3 @@
+Restraint.xml
+AnimalTrap.xml
+Cage.xml
diff --git a/resources/buildings/Bridge.xml b/resources/buildings/constructions/Bridge.xml
similarity index 89%
rename from resources/buildings/Bridge.xml
rename to resources/buildings/constructions/Bridge.xml
index bb675e7e..e7ac1b85 100644
--- a/resources/buildings/Bridge.xml
+++ b/resources/buildings/constructions/Bridge.xml
@@ -56,8 +56,8 @@
                     </or>
                 </not>
                 <sprite index="365" color="building">
-                    <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="bgibs.png" />
-                    <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="bgibs.png" />
+                    <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="../bgibs.png" />
+                    <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="../bgibs.png" />
                 </sprite>
             </if>
             <else>
@@ -65,8 +65,8 @@
                     <NeighbourSameBuilding dir="North" />
                 </not>
                 <sprite index="362" color="building">
-                    <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="bgibs.png" />
-                    <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="bgibs.png" />
+                    <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="../bgibs.png" />
+                    <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="../bgibs.png" />
                 </sprite>
             </else>
             <else>
@@ -74,8 +74,8 @@
                     <NeighbourSameBuilding dir="West" />
                 </not>
                 <sprite index="361" color="building">
-                    <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="bgibs.png" />
-                    <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="bgibs.png" />
+                    <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="../bgibs.png" />
+                    <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="../bgibs.png" />
                 </sprite>
             </else>
             <if>
@@ -83,8 +83,8 @@
                     <NeighbourSameBuilding dir="South" />
                 </not>
                 <sprite index="363" color="building">
-                    <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="bgibs.png" />
-                    <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="bgibs.png" />
+                    <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="../bgibs.png" />
+                    <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="../bgibs.png" />
                 </sprite>
             </if>
             <if>
@@ -92,8 +92,8 @@
                     <NeighbourSameBuilding dir="East" />
                 </not>
                 <sprite index="364" color="building">
-                    <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="bgibs.png" />
-                    <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="bgibs.png" />
+                    <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="../bgibs.png" />
+                    <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="../bgibs.png" />
                 </sprite>
             </if>
         </else>
@@ -148,8 +148,8 @@
                 </or>
             </not>
             <sprite index="329" color="building">
-                <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="bgibs.png" />
-                <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="bgibs.png" />
+                <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="../bgibs.png" />
+                <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="../bgibs.png" />
             </sprite>
         </if>
         <else>
@@ -157,8 +157,8 @@
                 <NeighbourSameBuilding dir="North" />
             </not>
             <sprite index="326" color="building">
-                <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="bgibs.png" />
-                <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="bgibs.png" />
+                <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="../bgibs.png" />
+                <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="../bgibs.png" />
             </sprite>
         </else>
         <else>
@@ -166,8 +166,8 @@
                 <NeighbourSameBuilding dir="West" />
             </not>
             <sprite index="325" color="building">
-                <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="bgibs.png" />
-                <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="bgibs.png" />
+                <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="../bgibs.png" />
+                <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="../bgibs.png" />
             </sprite>
         </else>
         <if>
@@ -175,8 +175,8 @@
                 <NeighbourSameBuilding dir="South" />
             </not>
             <sprite index="327" color="building">
-                <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="bgibs.png" />
-                <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="bgibs.png" />
+                <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="../bgibs.png" />
+                <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="../bgibs.png" />
             </sprite>
         </if>
         <if>
@@ -184,8 +184,8 @@
                 <NeighbourSameBuilding dir="East" />
             </not>
             <sprite index="328" color="building">
-                <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="bgibs.png" />
-                <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="bgibs.png" />
+                <subsprite blood_min="1" sheetIndex="0" blood_sprite="1" color="blood" file="../bgibs.png" />
+                <subsprite blood_min="1" sheetIndex="20" blood_sprite="1" file="../bgibs.png" />
             </sprite>
         </if>
     </else>
diff --git a/resources/buildings/FloorBars.xml b/resources/buildings/constructions/FloorBars.xml
similarity index 100%
rename from resources/buildings/FloorBars.xml
rename to resources/buildings/constructions/FloorBars.xml
diff --git a/resources/buildings/FloorGrate.xml b/resources/buildings/constructions/FloorGrate.xml
similarity index 100%
rename from resources/buildings/FloorGrate.xml
rename to resources/buildings/constructions/FloorGrate.xml
diff --git a/resources/buildings/Road.xml b/resources/buildings/constructions/Road.xml
similarity index 100%
rename from resources/buildings/Road.xml
rename to resources/buildings/constructions/Road.xml
diff --git a/resources/buildings/Support.xml b/resources/buildings/constructions/Support.xml
similarity index 100%
rename from resources/buildings/Support.xml
rename to resources/buildings/constructions/Support.xml
diff --git a/resources/buildings/VerticalBars.png b/resources/buildings/constructions/VerticalBars.png
similarity index 100%
rename from resources/buildings/VerticalBars.png
rename to resources/buildings/constructions/VerticalBars.png
diff --git a/resources/buildings/VerticalBars.xml b/resources/buildings/constructions/VerticalBars.xml
similarity index 100%
rename from resources/buildings/VerticalBars.xml
rename to resources/buildings/constructions/VerticalBars.xml
diff --git a/resources/buildings/WallGrate.xml b/resources/buildings/constructions/WallGrate.xml
similarity index 100%
rename from resources/buildings/WallGrate.xml
rename to resources/buildings/constructions/WallGrate.xml
diff --git a/resources/buildings/WindowGem.xml b/resources/buildings/constructions/WindowGem.xml
similarity index 100%
rename from resources/buildings/WindowGem.xml
rename to resources/buildings/constructions/WindowGem.xml
diff --git a/resources/buildings/WindowGlass.xml b/resources/buildings/constructions/WindowGlass.xml
similarity index 100%
rename from resources/buildings/WindowGlass.xml
rename to resources/buildings/constructions/WindowGlass.xml
diff --git a/resources/buildings/Windows.png b/resources/buildings/constructions/Windows.png
similarity index 100%
rename from resources/buildings/Windows.png
rename to resources/buildings/constructions/Windows.png
diff --git a/resources/buildings/constructions/index.txt b/resources/buildings/constructions/index.txt
new file mode 100644
index 00000000..b0ec737d
--- /dev/null
+++ b/resources/buildings/constructions/index.txt
@@ -0,0 +1,9 @@
+Bridge.xml
+FloorGrate.xml
+FloorBars.xml
+Road.xml
+Support.xml
+VerticalBars.xml
+WallGrate.xml
+WindowGem.xml
+WindowGlass.xml
diff --git a/resources/buildings/Door.xml b/resources/buildings/doors-hatches/Door.xml
similarity index 99%
rename from resources/buildings/Door.xml
rename to resources/buildings/doors-hatches/Door.xml
index e7c9f590..d8f304c1 100644
--- a/resources/buildings/Door.xml
+++ b/resources/buildings/doors-hatches/Door.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="Door" game_type="Door" file="DoorsAndFloodgates.png">
+<building name="Door" game_type="Door" file="DoorsAndHatches.png">
     <if>
         <!-- if there is wall at north or south -->
         <or>
diff --git a/resources/buildings/doors-hatches/DoorsAndHatches.png b/resources/buildings/doors-hatches/DoorsAndHatches.png
new file mode 100644
index 00000000..caaaaf93
Binary files /dev/null and b/resources/buildings/doors-hatches/DoorsAndHatches.png differ
diff --git a/resources/buildings/Hatch.xml b/resources/buildings/doors-hatches/Hatch.xml
similarity index 97%
rename from resources/buildings/Hatch.xml
rename to resources/buildings/doors-hatches/Hatch.xml
index 0dacc739..440c830c 100644
--- a/resources/buildings/Hatch.xml
+++ b/resources/buildings/doors-hatches/Hatch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="Floor Hatch" game_type="Hatch" file="DoorsAndFloodgates.png">
+<building name="Floor Hatch" game_type="Hatch" file="DoorsAndHatches.png">
     <if>
         <!-- wooden -->
         <MaterialType value="Wood" />
diff --git a/resources/buildings/doors-hatches/index.txt b/resources/buildings/doors-hatches/index.txt
new file mode 100644
index 00000000..794bf8b7
--- /dev/null
+++ b/resources/buildings/doors-hatches/index.txt
@@ -0,0 +1,2 @@
+Door.xml
+Hatch.xml
diff --git a/resources/buildings/Bed.xml b/resources/buildings/furniture/Bed.xml
similarity index 63%
rename from resources/buildings/Bed.xml
rename to resources/buildings/furniture/Bed.xml
index ec573f5e..8b26759c 100644
--- a/resources/buildings/Bed.xml
+++ b/resources/buildings/furniture/Bed.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="Bed" game_type="Bed">
+<building name="Bed" game_type="Bed" file = "furniture.png">
     <sprite index="81" color="building" />
     <sprite index="101" />
 </building>
diff --git a/resources/buildings/Bookcase.xml b/resources/buildings/furniture/Bookcase.xml
similarity index 88%
rename from resources/buildings/Bookcase.xml
rename to resources/buildings/furniture/Bookcase.xml
index 59a034b7..52b65f3d 100644
--- a/resources/buildings/Bookcase.xml
+++ b/resources/buildings/furniture/Bookcase.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="Bookcase" game_type="Bookcase">
+<building name="Bookcase" game_type="Bookcase" file = "furniture.png">
     <if>
         <MaterialType value="Wood" />
         <sprite index="88" color="building" />
diff --git a/resources/buildings/Cabinet.xml b/resources/buildings/furniture/Cabinet.xml
similarity index 88%
rename from resources/buildings/Cabinet.xml
rename to resources/buildings/furniture/Cabinet.xml
index 9b9f4e6d..4fdc19be 100644
--- a/resources/buildings/Cabinet.xml
+++ b/resources/buildings/furniture/Cabinet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="Cabinet" game_type="Cabinet">
+<building name="Cabinet" game_type="Cabinet" file = "furniture.png">
     <if>
         <MaterialType value="Wood" />
         <sprite index="86" color="building" />
diff --git a/resources/buildings/Chair.xml b/resources/buildings/furniture/Chair.xml
similarity index 89%
rename from resources/buildings/Chair.xml
rename to resources/buildings/furniture/Chair.xml
index 0fe1baa6..d4a6ddef 100644
--- a/resources/buildings/Chair.xml
+++ b/resources/buildings/furniture/Chair.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="Chair" game_type="Chair">
+<building name="Chair" game_type="Chair" file = "furniture.png">
     <if>
         <MaterialType value="Wood" />
         <sprite index="84" color="building" />
diff --git a/resources/buildings/Chest.xml b/resources/buildings/furniture/Chest.xml
similarity index 92%
rename from resources/buildings/Chest.xml
rename to resources/buildings/furniture/Chest.xml
index 965328b0..6f700a33 100644
--- a/resources/buildings/Chest.xml
+++ b/resources/buildings/furniture/Chest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="Chest" game_type="Box">
+<building name="Chest" game_type="Box" file = "furniture.png">
     <if>
         <MaterialType value="GreenGlass" />
         <sprite index="34" />
diff --git a/resources/buildings/Coffin.xml b/resources/buildings/furniture/Coffin.xml
similarity index 63%
rename from resources/buildings/Coffin.xml
rename to resources/buildings/furniture/Coffin.xml
index f46b8e0c..d3b7ca07 100644
--- a/resources/buildings/Coffin.xml
+++ b/resources/buildings/furniture/Coffin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="Coffin" game_type="Coffin">
+<building name="Coffin" game_type="Coffin" file = "furniture.png">
     <sprite index="275" color="building" />
     <sprite index="274" color="none" />
 </building>
diff --git a/resources/buildings/DisplayFurniture.xml b/resources/buildings/furniture/DisplayFurniture.xml
similarity index 85%
rename from resources/buildings/DisplayFurniture.xml
rename to resources/buildings/furniture/DisplayFurniture.xml
index 467019c6..44a8dedf 100644
--- a/resources/buildings/DisplayFurniture.xml
+++ b/resources/buildings/furniture/DisplayFurniture.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<building name="Pedestal" game_type="DisplayFurniture" >
+<building name="Pedestal" game_type="DisplayFurniture" file = "furniture.png">
   <if>
     <MaterialType value="Wood" />
     <sprite index="92" color="building" />
diff --git a/resources/buildings/OfferingPlace.xml b/resources/buildings/furniture/OfferingPlace.xml
similarity index 86%
rename from resources/buildings/OfferingPlace.xml
rename to resources/buildings/furniture/OfferingPlace.xml
index a0281394..e96c4821 100644
--- a/resources/buildings/OfferingPlace.xml
+++ b/resources/buildings/furniture/OfferingPlace.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<building name="Altar" game_type="OfferingPlace" >
+<building name="Altar" game_type="OfferingPlace" file = "furniture.png">
   <if>
     <MaterialType value="Wood" />
     <sprite index="90" color="building" />
diff --git a/resources/buildings/Statue.xml b/resources/buildings/furniture/Statue.xml
similarity index 53%
rename from resources/buildings/Statue.xml
rename to resources/buildings/furniture/Statue.xml
index 40bb18f4..32d1fb9c 100644
--- a/resources/buildings/Statue.xml
+++ b/resources/buildings/furniture/Statue.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<building name="Statue" game_type="Statue">
+<building name="Statue" game_type="Statue" file = "furniture.png">
     <sprite index="61" color="building" />
 </building>
diff --git a/resources/buildings/Table.xml b/resources/buildings/furniture/Table.xml
similarity index 97%
rename from resources/buildings/Table.xml
rename to resources/buildings/furniture/Table.xml
index ca39a311..7c361b3c 100644
--- a/resources/buildings/Table.xml
+++ b/resources/buildings/furniture/Table.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="Table" game_type="Table">
+<building name="Table" game_type="Table" file = "furniture.png">
     <if>
         <MaterialType value="Wood" />
         <sprite index="82" color="building">
diff --git a/resources/buildings/furniture/furniture.png b/resources/buildings/furniture/furniture.png
new file mode 100644
index 00000000..3574a679
Binary files /dev/null and b/resources/buildings/furniture/furniture.png differ
diff --git a/resources/buildings/furniture/index.txt b/resources/buildings/furniture/index.txt
new file mode 100644
index 00000000..4d54f8ed
--- /dev/null
+++ b/resources/buildings/furniture/index.txt
@@ -0,0 +1,10 @@
+Bed.xml
+Bookcase.xml
+Cabinet.xml
+Chair.xml
+Chest.xml
+Coffin.xml
+DisplayFurniture.xml
+OfferingPlace.xml
+Statue.xml
+Table.xml
diff --git a/resources/buildings/workshop.png b/resources/buildings/include/workshop.png
similarity index 100%
rename from resources/buildings/workshop.png
rename to resources/buildings/include/workshop.png
diff --git a/resources/buildings/index.txt b/resources/buildings/index.txt
index fd6d5573..2aa32dad 100644
--- a/resources/buildings/index.txt
+++ b/resources/buildings/index.txt
@@ -1,91 +1,16 @@
-Press.xml
-caravan_1.xml
-Soapmakers.xml
-
-Road.xml
+cages-restraints/index.txt
+constructions/index.txt
+doors-hatches/index.txt
+furniture/index.txt
+machines-fluids/index.txt
+military/index.txt
+traps/index.txt
+workshops/index.txt
 
+specials/index.txt
 
-Restraint.xml
-Statue.xml
-Table.xml
-Cabinet.xml
-Chair.xml
-Chest.xml
-Bed.xml
-Bookcase.xml
-DisplayFurniture.xml
-OfferingPlace.xml
-WeaponRack.xml
-ArmorStand.xml
-Quern.xml
-Millstone.xml
-Cage.xml
-Coffin.xml
-Hatch.xml
-Target.xml
-Wagon.xml
-FloorGrate.xml
-FloorBars.xml
-Well.xml
-Stockpile.xml
-Zone.xml
-
-AnimalTrap.xml
-WeaponTrap.xml
-StonefallTrap.xml
-CageTrap.xml
-PressurePlate.xml
-Spikes.xml
 
-Door.xml
-VerticalBars.xml
-WallGrate.xml
-Floodgate.xml
-WindowGlass.xml
-WindowGem.xml
-
-Kitchen.xml
-Carpenter.xml
-Smelter.xml
-MagmaSmelter.xml
-WoodFurnace.xml
-Forge.xml
-MagmaForge.xml
-Masons.xml
-Craftsdwarfs.xml
-Mechanics.xml
-Butchers.xml
-Loom.xml
-Clothiers.xml
-Tannery.xml
-Still.xml
-Leatherworks.xml
-MagmaGlassFurnace.xml
-GlassFurnace.xml
-Kiln.xml
-MagmaKiln.xml
-Ashery.xml
-FarmersWorkshop.xml
-Jewelers.xml
-Fishery.xml
-Bowyers.xml
-Dyers.xml
-
-TradeDepot.xml
-SiegeWorkshop.xml
-Kennels.xml
+caravan_1.xml
 Shop.xml
-
-Pump.xml
-
-Support.xml
-Blueprint.xml
-Lever.xml
-
-Farm.xml
-HorizontalAxle.xml
-Gear.xml
-VerticalAxle.xml
-Waterwheel.xml
-Windmill.xml
-Bridge.xml
+TradeDepot.xml
+Wagon.xml
diff --git a/resources/buildings/Floodgate.xml b/resources/buildings/machines-fluids/Floodgate.xml
similarity index 98%
rename from resources/buildings/Floodgate.xml
rename to resources/buildings/machines-fluids/Floodgate.xml
index b707eade..fcfbf3a2 100644
--- a/resources/buildings/Floodgate.xml
+++ b/resources/buildings/machines-fluids/Floodgate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="Floodgate" game_type="Floodgate" file="DoorsAndFloodgates.png">
+<building name="Floodgate" game_type="Floodgate" file="Floodgates.png">
     <if>
         <!-- wooden -->
         <MaterialType value="Wood" />
diff --git a/resources/buildings/machines-fluids/Floodgates.png b/resources/buildings/machines-fluids/Floodgates.png
new file mode 100644
index 00000000..c30b46c7
Binary files /dev/null and b/resources/buildings/machines-fluids/Floodgates.png differ
diff --git a/resources/buildings/Gear.xml b/resources/buildings/machines-fluids/Gear.xml
similarity index 100%
rename from resources/buildings/Gear.xml
rename to resources/buildings/machines-fluids/Gear.xml
diff --git a/resources/buildings/HorizontalAxle.xml b/resources/buildings/machines-fluids/HorizontalAxle.xml
similarity index 100%
rename from resources/buildings/HorizontalAxle.xml
rename to resources/buildings/machines-fluids/HorizontalAxle.xml
diff --git a/resources/buildings/Lever.xml b/resources/buildings/machines-fluids/Lever.xml
similarity index 100%
rename from resources/buildings/Lever.xml
rename to resources/buildings/machines-fluids/Lever.xml
diff --git a/resources/buildings/Millstone.xml b/resources/buildings/machines-fluids/Millstone.xml
similarity index 100%
rename from resources/buildings/Millstone.xml
rename to resources/buildings/machines-fluids/Millstone.xml
diff --git a/resources/buildings/Pump.xml b/resources/buildings/machines-fluids/Pump.xml
similarity index 100%
rename from resources/buildings/Pump.xml
rename to resources/buildings/machines-fluids/Pump.xml
diff --git a/resources/buildings/VerticalAxle.xml b/resources/buildings/machines-fluids/VerticalAxle.xml
similarity index 100%
rename from resources/buildings/VerticalAxle.xml
rename to resources/buildings/machines-fluids/VerticalAxle.xml
diff --git a/resources/buildings/Waterwheel.xml b/resources/buildings/machines-fluids/Waterwheel.xml
similarity index 100%
rename from resources/buildings/Waterwheel.xml
rename to resources/buildings/machines-fluids/Waterwheel.xml
diff --git a/resources/buildings/Well.xml b/resources/buildings/machines-fluids/Well.xml
similarity index 85%
rename from resources/buildings/Well.xml
rename to resources/buildings/machines-fluids/Well.xml
index 52e48def..35f7319c 100644
--- a/resources/buildings/Well.xml
+++ b/resources/buildings/machines-fluids/Well.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
-<building name="Well" game_type="Well" file="workshop.png">
+<building name="Well" game_type="Well" file="../workshop.png">
     <if>
         <or>
             <BuildingSpecial value="0" />
             <BuildingSpecial value="1" />
         </or>
-        <include file="wsBenches.xml" />
-        <include file="wsTub.xml" />
+        <include file="../wsBenches.xml" />
+        <include file="../wsTub.xml" />
         <sprite index="218" color="building" pattern_index="0" />
     </if>
     <if>
diff --git a/resources/buildings/Windmill.xml b/resources/buildings/machines-fluids/Windmill.xml
similarity index 100%
rename from resources/buildings/Windmill.xml
rename to resources/buildings/machines-fluids/Windmill.xml
diff --git a/resources/buildings/machines-fluids/index.txt b/resources/buildings/machines-fluids/index.txt
new file mode 100644
index 00000000..f6eb2068
--- /dev/null
+++ b/resources/buildings/machines-fluids/index.txt
@@ -0,0 +1,10 @@
+Floodgate.xml
+Gear.xml
+HorizontalAxle.xml
+Lever.xml
+Millstone.xml
+Pump.xml
+VerticalAxle.xml
+Waterwheel.xml
+Windmill.xml
+Well.xml
diff --git a/resources/buildings/mechanics.png b/resources/buildings/machines-fluids/mechanics.png
similarity index 100%
rename from resources/buildings/mechanics.png
rename to resources/buildings/machines-fluids/mechanics.png
diff --git a/resources/buildings/ArmorStand.xml b/resources/buildings/military/ArmorStand.xml
similarity index 100%
rename from resources/buildings/ArmorStand.xml
rename to resources/buildings/military/ArmorStand.xml
diff --git a/resources/buildings/Target.xml b/resources/buildings/military/Target.xml
similarity index 100%
rename from resources/buildings/Target.xml
rename to resources/buildings/military/Target.xml
diff --git a/resources/buildings/WeaponRack.xml b/resources/buildings/military/WeaponRack.xml
similarity index 100%
rename from resources/buildings/WeaponRack.xml
rename to resources/buildings/military/WeaponRack.xml
diff --git a/resources/buildings/military/index.txt b/resources/buildings/military/index.txt
new file mode 100644
index 00000000..53392a07
--- /dev/null
+++ b/resources/buildings/military/index.txt
@@ -0,0 +1,3 @@
+ArmorStand.xml
+Target.xml
+WeaponRack.xml
diff --git a/resources/buildings/Blueprint.xml b/resources/buildings/specials/Blueprint.xml
similarity index 100%
rename from resources/buildings/Blueprint.xml
rename to resources/buildings/specials/Blueprint.xml
diff --git a/resources/buildings/Stockpile.xml b/resources/buildings/specials/Stockpile.xml
similarity index 100%
rename from resources/buildings/Stockpile.xml
rename to resources/buildings/specials/Stockpile.xml
diff --git a/resources/buildings/Zone.xml b/resources/buildings/specials/Zone.xml
similarity index 100%
rename from resources/buildings/Zone.xml
rename to resources/buildings/specials/Zone.xml
diff --git a/resources/buildings/specials/index.txt b/resources/buildings/specials/index.txt
new file mode 100644
index 00000000..1dfd3b43
--- /dev/null
+++ b/resources/buildings/specials/index.txt
@@ -0,0 +1,3 @@
+Blueprint.xml
+Stockpile.xml
+Zone.xml
diff --git a/resources/buildings/CageTrap.xml b/resources/buildings/traps/CageTrap.xml
similarity index 100%
rename from resources/buildings/CageTrap.xml
rename to resources/buildings/traps/CageTrap.xml
diff --git a/resources/buildings/PressurePlate.xml b/resources/buildings/traps/PressurePlate.xml
similarity index 100%
rename from resources/buildings/PressurePlate.xml
rename to resources/buildings/traps/PressurePlate.xml
diff --git a/resources/buildings/Spikes.xml b/resources/buildings/traps/Spikes.xml
similarity index 100%
rename from resources/buildings/Spikes.xml
rename to resources/buildings/traps/Spikes.xml
diff --git a/resources/buildings/StonefallTrap.xml b/resources/buildings/traps/StonefallTrap.xml
similarity index 100%
rename from resources/buildings/StonefallTrap.xml
rename to resources/buildings/traps/StonefallTrap.xml
diff --git a/resources/buildings/WeaponTrap.xml b/resources/buildings/traps/WeaponTrap.xml
similarity index 100%
rename from resources/buildings/WeaponTrap.xml
rename to resources/buildings/traps/WeaponTrap.xml
diff --git a/resources/buildings/traps/index.txt b/resources/buildings/traps/index.txt
new file mode 100644
index 00000000..e6d4ed58
--- /dev/null
+++ b/resources/buildings/traps/index.txt
@@ -0,0 +1,5 @@
+CageTrap.xml
+PressurePlate.xml
+Spikes.xml
+StonefallTrap.xml
+WeaponTrap.xml
diff --git a/resources/buildings/Ashery.xml b/resources/buildings/workshops/Ashery.xml
similarity index 77%
rename from resources/buildings/Ashery.xml
rename to resources/buildings/workshops/Ashery.xml
index e9044912..3132bd4c 100644
--- a/resources/buildings/Ashery.xml
+++ b/resources/buildings/workshops/Ashery.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<building name="Ashery" game_type="Workshop" game_subtype="Ashery" file="workshop.png">
+<building name="Ashery" game_type="Workshop" game_subtype="Ashery" file="../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsBenches.xml" />
+        <include file="../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -27,6 +27,6 @@
             <sprite index="278" />
         </else>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../ws3x3Blueprint.xml" />
+    <include file="../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Bowyers.xml b/resources/buildings/workshops/Bowyers.xml
similarity index 83%
rename from resources/buildings/Bowyers.xml
rename to resources/buildings/workshops/Bowyers.xml
index f4b7cc4c..cc870629 100644
--- a/resources/buildings/Bowyers.xml
+++ b/resources/buildings/workshops/Bowyers.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<building name="bowyers_workshop" game_type="Workshop" game_subtype="Bowyers" file="workshop.png">
+<building name="bowyers_workshop" game_type="Workshop" game_subtype="Bowyers" file="../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsBenches.xml" />
+        <include file="../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -40,6 +40,6 @@
             <sprite index="163" />
         </else>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../ws3x3Blueprint.xml" />
+    <include file="../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Carpenter.xml b/resources/buildings/workshops/Carpenter.xml
similarity index 96%
rename from resources/buildings/Carpenter.xml
rename to resources/buildings/workshops/Carpenter.xml
index 3906dcd0..a78705f9 100644
--- a/resources/buildings/Carpenter.xml
+++ b/resources/buildings/workshops/Carpenter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="Carpentry" game_type="Workshop" game_subtype="Carpenters" file="workshop.png">
+<building name="Carpentry" game_type="Workshop" game_subtype="Carpenters" file="../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
@@ -12,10 +12,10 @@
                 <PositionIndex value="6" />
             </not>
         </and>
-        <include file="wsBenches.xml" />
+        <include file="../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -142,6 +142,6 @@
             <sprite index="168" />
         </else>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../ws3x3Blueprint.xml" />
+    <include file="../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Craftsdwarfs.xml b/resources/buildings/workshops/Craftsdwarfs.xml
similarity index 83%
rename from resources/buildings/Craftsdwarfs.xml
rename to resources/buildings/workshops/Craftsdwarfs.xml
index d8ee7701..20c434a9 100644
--- a/resources/buildings/Craftsdwarfs.xml
+++ b/resources/buildings/workshops/Craftsdwarfs.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<building name="Craftsdwarfs Workshop" game_type="Workshop" game_subtype="Craftsdwarfs" file="workshop.png">
+<building name="Craftsdwarfs Workshop" game_type="Workshop" game_subtype="Craftsdwarfs" file="../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsBenches.xml" />
+        <include file="../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -41,6 +41,6 @@
             <sprite index="163" />
         </if>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../ws3x3Blueprint.xml" />
+    <include file="../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Forge.xml b/resources/buildings/workshops/Forge.xml
similarity index 91%
rename from resources/buildings/Forge.xml
rename to resources/buildings/workshops/Forge.xml
index f5e3e028..18bb8ca5 100644
--- a/resources/buildings/Forge.xml
+++ b/resources/buildings/workshops/Forge.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
-<building name="Forge" game_type="Workshop" game_subtype="MetalsmithsForge" file="workshop.png">
+<building name="Forge" game_type="Workshop" game_subtype="MetalsmithsForge" file="../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsFPTub.xml" />
+        <include file="../wsFPTub.xml" />
     </if>
     <else>
         <HaveFloor />
-        <include file="wsUpperBorder.xml" />
+        <include file="../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -73,6 +73,6 @@
         </not>
         <empty />
     </else>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../ws3x3Blueprint.xml" />
+    <include file="../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Jewelers.xml b/resources/buildings/workshops/Jewelers.xml
similarity index 83%
rename from resources/buildings/Jewelers.xml
rename to resources/buildings/workshops/Jewelers.xml
index 4e493aac..b1c5bc96 100644
--- a/resources/buildings/Jewelers.xml
+++ b/resources/buildings/workshops/Jewelers.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<building name="Jewelers Workshop" game_type="Workshop" game_subtype="Jewelers" file="workshop.png">
+<building name="Jewelers Workshop" game_type="Workshop" game_subtype="Jewelers" file="../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsBenches.xml" />
+        <include file="../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -41,6 +41,6 @@
             <sprite index="163" />
         </else>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../ws3x3Blueprint.xml" />
+    <include file="../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/MagmaForge.xml b/resources/buildings/workshops/MagmaForge.xml
similarity index 89%
rename from resources/buildings/MagmaForge.xml
rename to resources/buildings/workshops/MagmaForge.xml
index 4cb80dbb..77c4e27c 100644
--- a/resources/buildings/MagmaForge.xml
+++ b/resources/buildings/workshops/MagmaForge.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
-<building name="Magma Forge" game_type="Workshop" game_subtype="MagmaForge" file="workshop.png">
+<building name="Magma Forge" game_type="Workshop" game_subtype="MagmaForge" file="../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsFPTub.xml" />
+        <include file="../wsFPTub.xml" />
     </if>
     <else>
         <HaveFloor />
-        <include file="wsUpperBorder.xml" />
+        <include file="../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -73,6 +73,6 @@
         </not>
         <empty />
     </else>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../ws3x3Blueprint.xml" />
+    <include file="../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Masons.xml b/resources/buildings/workshops/Masons.xml
similarity index 79%
rename from resources/buildings/Masons.xml
rename to resources/buildings/workshops/Masons.xml
index 517ffa7c..89c6e1a4 100644
--- a/resources/buildings/Masons.xml
+++ b/resources/buildings/workshops/Masons.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<building name="Masonry" game_type="Workshop" game_subtype="Masons" file="workshop.png">
+<building name="Masonry" game_type="Workshop" game_subtype="Masons" file="../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsBenches.xml" />
+        <include file="../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -28,6 +28,6 @@
             <sprite index="169" offsetx="-3" offsety="-2" />
         </else>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../ws3x3Blueprint.xml" />
+    <include file="../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Mechanics.xml b/resources/buildings/workshops/Mechanics.xml
similarity index 79%
rename from resources/buildings/Mechanics.xml
rename to resources/buildings/workshops/Mechanics.xml
index 057ab873..23a37632 100644
--- a/resources/buildings/Mechanics.xml
+++ b/resources/buildings/workshops/Mechanics.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<building name="Mechanics Workshop" game_type="Workshop" game_subtype="Mechanics" file="workshop.png">
+<building name="Mechanics Workshop" game_type="Workshop" game_subtype="Mechanics" file="../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsBenches.xml" />
+        <include file="../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -32,6 +32,6 @@
             <sprite index="169" offsetx="-3" offsety="-2" />
         </if>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../ws3x3Blueprint.xml" />
+    <include file="../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Press.xml b/resources/buildings/workshops/Press.xml
similarity index 61%
rename from resources/buildings/Press.xml
rename to resources/buildings/workshops/Press.xml
index 1a8fdf77..c3dbfa02 100644
--- a/resources/buildings/Press.xml
+++ b/resources/buildings/workshops/Press.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<building name="Soapmakers Worshop" game_type="Workshop" game_subtype="Custom" game_custom="SCREW_PRESS" file="workshop.png">
-    <include file="sBlueprint.xml" />
+<building name="Soapmakers Worshop" game_type="Workshop" game_subtype="Custom" game_custom="SCREW_PRESS" file="../workshop.png">
+    <include file="../sBlueprint.xml" />
     <else>
         <sprite index="302" color="building" />
     </else>
diff --git a/resources/buildings/SiegeWorkshop.xml b/resources/buildings/workshops/SiegeWorkshop.xml
similarity index 90%
rename from resources/buildings/SiegeWorkshop.xml
rename to resources/buildings/workshops/SiegeWorkshop.xml
index 7574147d..dbd70cc9 100644
--- a/resources/buildings/SiegeWorkshop.xml
+++ b/resources/buildings/workshops/SiegeWorkshop.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<building name="Siege Workshop" game_type="Workshop" game_subtype="Siege" file="workshop.png">
+<building name="Siege Workshop" game_type="Workshop" game_subtype="Siege" file="../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsBenches.xml" />
+        <include file="../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -67,6 +67,6 @@
             <sprite index="166" offsety="-1" />
         </if>
     </if>
-    <include file="ws5x5Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../ws5x5Blueprint.xml" />
+    <include file="../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Soapmakers.xml b/resources/buildings/workshops/Soapmakers.xml
similarity index 88%
rename from resources/buildings/Soapmakers.xml
rename to resources/buildings/workshops/Soapmakers.xml
index ae39948b..c1ad7584 100644
--- a/resources/buildings/Soapmakers.xml
+++ b/resources/buildings/workshops/Soapmakers.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
-<building name="Soapmakers Worshop" game_type="Workshop" game_subtype="Custom" game_custom="SOAP_MAKER" file="workshop.png">
+<building name="Soapmakers Worshop" game_type="Workshop" game_subtype="Custom" game_custom="SOAP_MAKER" file="../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsFPTub.xml" />
+        <include file="../wsFPTub.xml" />
     </if>
     <else>
         <HaveFloor />
-        <include file="wsUpperBorder.xml" />
+        <include file="../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -69,6 +69,6 @@
         </not>
         <empty />
     </else>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../ws3x3Blueprint.xml" />
+    <include file="../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Workshop.txt b/resources/buildings/workshops/Workshop.txt
similarity index 100%
rename from resources/buildings/Workshop.txt
rename to resources/buildings/workshops/Workshop.txt
diff --git a/resources/buildings/Clothiers.xml b/resources/buildings/workshops/clothing-leather/Clothiers.xml
similarity index 77%
rename from resources/buildings/Clothiers.xml
rename to resources/buildings/workshops/clothing-leather/Clothiers.xml
index d536fd94..2294fb8e 100644
--- a/resources/buildings/Clothiers.xml
+++ b/resources/buildings/workshops/clothing-leather/Clothiers.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<building name="Clothiers Shop" game_type="Workshop" game_subtype="Clothiers" file="workshop.png">
+<building name="Clothiers Shop" game_type="Workshop" game_subtype="Clothiers" file="../../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsBenches.xml" />
+        <include file="../../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -31,6 +31,6 @@
             <sprite index="189" />
         </else>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Dyers.xml b/resources/buildings/workshops/clothing-leather/Dyers.xml
similarity index 75%
rename from resources/buildings/Dyers.xml
rename to resources/buildings/workshops/clothing-leather/Dyers.xml
index b9d0d8d3..befc6b84 100644
--- a/resources/buildings/Dyers.xml
+++ b/resources/buildings/workshops/clothing-leather/Dyers.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<building name="Dyers" game_type="Workshop" game_subtype="Dyers" file="workshop.png">
+<building name="Dyers" game_type="Workshop" game_subtype="Dyers" file="../../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsBenches.xml" />
+        <include file="../../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -18,7 +18,7 @@
     </if>
     <if>
         <BuildingOccupancy value="3" />
-        <include file="wsTub.xml" />
+        <include file="../wsTub.xml" />
         <if>
             <PositionIndex value="1" />
             <sprite index="152" />
@@ -32,6 +32,6 @@
             <sprite index="157" />
         </else>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Leatherworks.xml b/resources/buildings/workshops/clothing-leather/Leatherworks.xml
similarity index 77%
rename from resources/buildings/Leatherworks.xml
rename to resources/buildings/workshops/clothing-leather/Leatherworks.xml
index 5ca80f17..e830dc2a 100644
--- a/resources/buildings/Leatherworks.xml
+++ b/resources/buildings/workshops/clothing-leather/Leatherworks.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<building name="Leatherworks" game_type="Workshop" game_subtype="Leatherworks" file="workshop.png">
+<building name="Leatherworks" game_type="Workshop" game_subtype="Leatherworks" file="../../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsBenches.xml" />
+        <include file="../../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -31,6 +31,6 @@
             <sprite index="189" />
         </else>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Loom.xml b/resources/buildings/workshops/clothing-leather/Loom.xml
similarity index 88%
rename from resources/buildings/Loom.xml
rename to resources/buildings/workshops/clothing-leather/Loom.xml
index 7f214262..3b77219d 100644
--- a/resources/buildings/Loom.xml
+++ b/resources/buildings/workshops/clothing-leather/Loom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<building name="Loom" game_type="Workshop" game_subtype="Loom" file="workshop.png">
-    <include file="wsUpperBorder.xml" />
+<building name="Loom" game_type="Workshop" game_subtype="Loom" file="../../workshop.png">
+    <include file="../../wsUpperBorder.xml" />
     <!-- contents -->
     <if>
         <BuildingOccupancy value="3" />
@@ -41,6 +41,6 @@
     <if>
         <never />
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/workshops/clothing-leather/index.txt b/resources/buildings/workshops/clothing-leather/index.txt
new file mode 100644
index 00000000..74bc90b0
--- /dev/null
+++ b/resources/buildings/workshops/clothing-leather/index.txt
@@ -0,0 +1,4 @@
+Clothiers.xml
+Dyers.xml
+Leatherworks.xml
+Loom.xml
diff --git a/resources/buildings/Butchers.xml b/resources/buildings/workshops/farming/Butchers.xml
similarity index 88%
rename from resources/buildings/Butchers.xml
rename to resources/buildings/workshops/farming/Butchers.xml
index 2395d6a0..6c26292e 100644
--- a/resources/buildings/Butchers.xml
+++ b/resources/buildings/workshops/farming/Butchers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="Butchers shop" game_type="Workshop" game_subtype="Butchers" file="workshop.png">
+<building name="Butchers shop" game_type="Workshop" game_subtype="Butchers" file="../../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
@@ -9,10 +9,10 @@
             </not>
             <BuildingOccupancy value="3" />
         </and>
-        <include file="wsBenches.xml" />
+        <include file="../../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -70,6 +70,6 @@
             </rotate>
         </else>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Farm.xml b/resources/buildings/workshops/farming/Farm.xml
similarity index 100%
rename from resources/buildings/Farm.xml
rename to resources/buildings/workshops/farming/Farm.xml
diff --git a/resources/buildings/FarmersWorkshop.xml b/resources/buildings/workshops/farming/FarmersWorkshop.xml
similarity index 79%
rename from resources/buildings/FarmersWorkshop.xml
rename to resources/buildings/workshops/farming/FarmersWorkshop.xml
index bafec561..c605b138 100644
--- a/resources/buildings/FarmersWorkshop.xml
+++ b/resources/buildings/workshops/farming/FarmersWorkshop.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<building name="Farmers Workshop" game_type="Workshop" game_subtype="Farmers" file="workshop.png">
+<building name="Farmers Workshop" game_type="Workshop" game_subtype="Farmers" file="../../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsBenches.xml" />
+        <include file="../../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -32,6 +32,6 @@
             <sprite index="172" />
         </else>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Fishery.xml b/resources/buildings/workshops/farming/Fishery.xml
similarity index 80%
rename from resources/buildings/Fishery.xml
rename to resources/buildings/workshops/farming/Fishery.xml
index 978df0d4..ba2971a7 100644
--- a/resources/buildings/Fishery.xml
+++ b/resources/buildings/workshops/farming/Fishery.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<building name="Fishery" game_type="Workshop" game_subtype="Fishery" file="workshop.png">
+<building name="Fishery" game_type="Workshop" game_subtype="Fishery" file="../../workshop.png">
     <!-- benches wall -->
     <if>
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsBenches.xml" />
+        <include file="../../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -38,10 +38,10 @@
         </else>
         <else>
             <PositionIndex value="7" />
-            <include file="wsTub.xml" />
+            <include file="../../wsTub.xml" />
             <sprite index="154" />
         </else>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Kennels.xml b/resources/buildings/workshops/farming/Kennels.xml
similarity index 81%
rename from resources/buildings/Kennels.xml
rename to resources/buildings/workshops/farming/Kennels.xml
index e537f3e9..978b86d0 100644
--- a/resources/buildings/Kennels.xml
+++ b/resources/buildings/workshops/farming/Kennels.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <building name="Kennels" game_type="Workshop" game_subtype="Kennels">
-    <include file="wsUpperBorder.xml" />
+    <include file="../../wsUpperBorder.xml" />
     <if>
         <PositionIndex value="6" />
         <sprite index="107" />
@@ -23,6 +23,6 @@
         <PositionIndex value="18" />
         <sprite index="107" />
     </else>
-    <include file="ws5x5Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws5x5Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Kitchen.xml b/resources/buildings/workshops/farming/Kitchen.xml
similarity index 77%
rename from resources/buildings/Kitchen.xml
rename to resources/buildings/workshops/farming/Kitchen.xml
index 0b1a6cb1..9543c2d9 100644
--- a/resources/buildings/Kitchen.xml
+++ b/resources/buildings/workshops/farming/Kitchen.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<building name="Kitchen" game_type="Workshop" game_subtype="Kitchen" file="workshop.png">
+<building name="Kitchen" game_type="Workshop" game_subtype="Kitchen" file="../../workshop.png">
     <if>
         <and>
             <BuildingOccupancy value="3" />
             <PositionIndex value="1" />
         </and>
-        <include file="wsFurnace.xml" />
+        <include file="../../wsFurnace.xml" />
         <rotate>
             <sprite index="120" />
             <sprite index="121" />
@@ -18,10 +18,10 @@
         <!-- replace this with position index if required -->
         <BuildingOccupancy value="3" />
         <!-- benches -->
-        <include file="wsBenches.xml" />
+        <include file="../../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -33,7 +33,7 @@
         <BuildingOccupancy value="3" />
         <if>
             <PositionIndex value="2" />
-            <include file="wsTub.xml" />
+            <include file="../../wsTub.xml" />
             <sprite index="159" />
         </if>
         <else>
@@ -44,6 +44,6 @@
             </rotate>
         </else>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Quern.xml b/resources/buildings/workshops/farming/Quern.xml
similarity index 100%
rename from resources/buildings/Quern.xml
rename to resources/buildings/workshops/farming/Quern.xml
diff --git a/resources/buildings/Still.xml b/resources/buildings/workshops/farming/Still.xml
similarity index 85%
rename from resources/buildings/Still.xml
rename to resources/buildings/workshops/farming/Still.xml
index 37edbf48..efac30ce 100644
--- a/resources/buildings/Still.xml
+++ b/resources/buildings/workshops/farming/Still.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<building name="Still" game_type="Workshop" game_subtype="Still" file="workshop.png">
-    <include file="wsUpperBorder.xml" />
+<building name="Still" game_type="Workshop" game_subtype="Still" file="../../workshop.png">
+    <include file="../../wsUpperBorder.xml" />
     <if>
         <PositionIndex value="0" />
         <rotate>
@@ -39,6 +39,6 @@
     <if>
         <never />
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Tannery.xml b/resources/buildings/workshops/farming/Tannery.xml
similarity index 81%
rename from resources/buildings/Tannery.xml
rename to resources/buildings/workshops/farming/Tannery.xml
index 1839f69c..27d10955 100644
--- a/resources/buildings/Tannery.xml
+++ b/resources/buildings/workshops/farming/Tannery.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="Tannery" game_type="Workshop" game_subtype="Tanners" file="workshop.png">
+<building name="Tannery" game_type="Workshop" game_subtype="Tanners" file="../../workshop.png">
     <!-- benches wall -->
     <if>
         <and>
@@ -10,10 +10,10 @@
             <!-- replace this with position index if required -->
         </and>
         <!-- benches -->
-        <include file="wsBenches.xml" />
+        <include file="../../wsBenches.xml" />
     </if>
     <else>
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -36,7 +36,7 @@
                 <PositionIndex value="5" />
             </not>
         </and>
-        <include file="wsTub.xml" />
+        <include file="../../wsTub.xml" />
         <if>
             <PositionIndex value="0" />
             <sprite index="157" />
@@ -46,6 +46,6 @@
             <sprite index="158" />
         </else>
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/farm.png b/resources/buildings/workshops/farming/farm.png
similarity index 100%
rename from resources/buildings/farm.png
rename to resources/buildings/workshops/farming/farm.png
diff --git a/resources/buildings/workshops/farming/index.txt b/resources/buildings/workshops/farming/index.txt
new file mode 100644
index 00000000..592cca2b
--- /dev/null
+++ b/resources/buildings/workshops/farming/index.txt
@@ -0,0 +1,9 @@
+Butchers.xml
+Farm.xml
+FarmersWorkshop.xml
+Fishery.xml
+Kennels.xml
+Kitchen.xml
+Quern.xml
+Still.xml
+Tannery.xml
diff --git a/resources/buildings/GlassFurnace.xml b/resources/buildings/workshops/furnaces/GlassFurnace.xml
similarity index 82%
rename from resources/buildings/GlassFurnace.xml
rename to resources/buildings/workshops/furnaces/GlassFurnace.xml
index be32021e..cae9ced0 100644
--- a/resources/buildings/GlassFurnace.xml
+++ b/resources/buildings/workshops/furnaces/GlassFurnace.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<building name="Glass Furnace" game_type="Furnace" game_subtype="GlassFurnace" file="workshop.png">
+<building name="Glass Furnace" game_type="Furnace" game_subtype="GlassFurnace" file="../../workshop.png">
     <!-- benches wall -->
     <if>
         <BuildingOccupancy value="3" />
-        <include file="wsFurnace.xml" />
+        <include file="../../wsFurnace.xml" />
     </if>
     <else>
         <HaveFloor />
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -43,6 +43,6 @@
         </or>
         <empty />
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Kiln.xml b/resources/buildings/workshops/furnaces/Kiln.xml
similarity index 84%
rename from resources/buildings/Kiln.xml
rename to resources/buildings/workshops/furnaces/Kiln.xml
index 2855177c..ae385d5b 100644
--- a/resources/buildings/Kiln.xml
+++ b/resources/buildings/workshops/furnaces/Kiln.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<building name="Kiln" game_type="Furnace" game_subtype="Kiln" file="workshop.png">
+<building name="Kiln" game_type="Furnace" game_subtype="Kiln" file="../../workshop.png">
     <!-- benches wall -->
     <if>
         <BuildingOccupancy value="3" />
-        <include file="wsFurnace.xml" />
+        <include file="../../wsFurnace.xml" />
     </if>
     <else>
         <HaveFloor />
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -45,6 +45,6 @@
         </or>
         <empty />
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/MagmaGlassFurnace.xml b/resources/buildings/workshops/furnaces/MagmaGlassFurnace.xml
similarity index 81%
rename from resources/buildings/MagmaGlassFurnace.xml
rename to resources/buildings/workshops/furnaces/MagmaGlassFurnace.xml
index 7f746337..d1e960bb 100644
--- a/resources/buildings/MagmaGlassFurnace.xml
+++ b/resources/buildings/workshops/furnaces/MagmaGlassFurnace.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<building name="Magma Glass Furnace" game_type="Furnace" game_subtype="MagmaGlassFurnace" file="workshop.png">
+<building name="Magma Glass Furnace" game_type="Furnace" game_subtype="MagmaGlassFurnace" file="../../workshop.png">
     <!-- benches wall -->
     <if>
         <BuildingOccupancy value="3" />
-        <include file="wsFurnace.xml" />
+        <include file="../../wsFurnace.xml" />
     </if>
     <else>
         <HaveFloor />
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -43,6 +43,6 @@
         </or>
         <empty />
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/MagmaKiln.xml b/resources/buildings/workshops/furnaces/MagmaKiln.xml
similarity index 83%
rename from resources/buildings/MagmaKiln.xml
rename to resources/buildings/workshops/furnaces/MagmaKiln.xml
index 5c1f93f5..002bfe92 100644
--- a/resources/buildings/MagmaKiln.xml
+++ b/resources/buildings/workshops/furnaces/MagmaKiln.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<building name="Magma Kiln" game_type="Furnace" game_subtype="MagmaKiln" file="workshop.png">
+<building name="Magma Kiln" game_type="Furnace" game_subtype="MagmaKiln" file="../../workshop.png">
     <!-- benches wall -->
     <if>
         <BuildingOccupancy value="3" />
-        <include file="wsFurnace.xml" />
+        <include file="../../wsFurnace.xml" />
     </if>
     <else>
         <HaveFloor />
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -45,6 +45,6 @@
         </or>
         <empty />
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/MagmaSmelter.xml b/resources/buildings/workshops/furnaces/MagmaSmelter.xml
similarity index 83%
rename from resources/buildings/MagmaSmelter.xml
rename to resources/buildings/workshops/furnaces/MagmaSmelter.xml
index 28e74f42..1f7199fa 100644
--- a/resources/buildings/MagmaSmelter.xml
+++ b/resources/buildings/workshops/furnaces/MagmaSmelter.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<building name="Magma Smelter" game_type="Furnace" game_subtype="MagmaSmelter" file="workshop.png">
+<building name="Magma Smelter" game_type="Furnace" game_subtype="MagmaSmelter" file="../../workshop.png">
     <!-- benches wall -->
     <if>
         <BuildingOccupancy value="3" />
-        <include file="wsFurnace.xml" />
+        <include file="../../wsFurnace.xml" />
     </if>
     <else>
         <HaveFloor />
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -46,6 +46,6 @@
         </or>
         <empty />
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/Smelter.xml b/resources/buildings/workshops/furnaces/Smelter.xml
similarity index 84%
rename from resources/buildings/Smelter.xml
rename to resources/buildings/workshops/furnaces/Smelter.xml
index ad256f33..a9607723 100644
--- a/resources/buildings/Smelter.xml
+++ b/resources/buildings/workshops/furnaces/Smelter.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<building name="Smelter" game_type="Furnace" game_subtype="Smelter" file="workshop.png">
+<building name="Smelter" game_type="Furnace" game_subtype="Smelter" file="../../workshop.png">
     <!-- benches wall -->
     <if>
         <BuildingOccupancy value="3" />
-        <include file="wsFurnace.xml" />
+        <include file="../../wsFurnace.xml" />
     </if>
     <else>
         <HaveFloor />
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -46,6 +46,6 @@
         </or>
         <empty />
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/WoodFurnace.xml b/resources/buildings/workshops/furnaces/WoodFurnace.xml
similarity index 83%
rename from resources/buildings/WoodFurnace.xml
rename to resources/buildings/workshops/furnaces/WoodFurnace.xml
index 77a9c585..c4bc16db 100644
--- a/resources/buildings/WoodFurnace.xml
+++ b/resources/buildings/workshops/furnaces/WoodFurnace.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<building name="Wood Furname" game_type="Furnace" game_subtype="WoodFurnace" file="workshop.png">
+<building name="Wood Furname" game_type="Furnace" game_subtype="WoodFurnace" file="../../workshop.png">
     <!-- benches wall -->
     <if>
         <BuildingOccupancy value="3" />
-        <include file="wsFurnace.xml" />
+        <include file="../../wsFurnace.xml" />
     </if>
     <else>
         <HaveFloor />
-        <include file="wsUpperBorder.xml" />
+        <include file="../../wsUpperBorder.xml" />
     </else>
     <!-- end benches wall -->
     <!-- contents -->
@@ -45,6 +45,6 @@
         </or>
         <empty />
     </if>
-    <include file="ws3x3Blueprint.xml" />
-    <include file="wsLowerBorder.xml" />
+    <include file="../../ws3x3Blueprint.xml" />
+    <include file="../../wsLowerBorder.xml" />
 </building>
diff --git a/resources/buildings/workshops/furnaces/index.txt b/resources/buildings/workshops/furnaces/index.txt
new file mode 100644
index 00000000..28174278
--- /dev/null
+++ b/resources/buildings/workshops/furnaces/index.txt
@@ -0,0 +1,7 @@
+GlassFurnace.xml
+Kiln.xml
+MagmaGlassFurnace.xml
+MagmaKiln.xml
+MagmaSmelter.xml
+Smelter.xml
+WoodFurnace.xml
diff --git a/resources/buildings/workshops/index.txt b/resources/buildings/workshops/index.txt
new file mode 100644
index 00000000..53facba5
--- /dev/null
+++ b/resources/buildings/workshops/index.txt
@@ -0,0 +1,17 @@
+clothing-leather/index.txt
+farming/index.txt
+furnaces/index.txt
+
+
+Ashery.xml
+Bowyers.xml
+Carpenter.xml
+Craftsdwarfs.xml
+Forge.xml
+Jewelers.xml
+MagmaForge.xml
+Masons.xml
+Mechanics.xml
+Press.xml
+SiegeWorkshop.xml
+Soapmakers.xml