DFHack · realSquidCoder · Jan 20, 2025 · Jan 20, 2025 · Jan 20, 2025 · Jan 21, 2025
diff --git a/resources/buildings/AnimalTrap.xml b/resources/buildings/AnimalTrap.xml
diff --git a/resources/buildings/DoorsAndFloodgates.png b/resources/buildings/DoorsAndFloodgates.png
diff --git a/resources/buildings/Restraint.xml b/resources/buildings/Restraint.xml
diff --git a/resources/buildings/cages-restraints/AnimalTrap.xml 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 → ...urces/buildings/cages-restraints/Cage.xml b/resources/buildings/Cage.xml → ...urces/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
@@ -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
diff --git a/resources/buildings/cages-restraints/index.txt b/resources/buildings/cages-restraints/index.txt
@@ -0,0 +1,3 @@
+Restraint.xml
+AnimalTrap.xml
+Cage.xml
diff --git a/resources/buildings/Bridge.xml → resources/buildings/constructions/Bridge.xml b/resources/buildings/Bridge.xml → resources/buildings/constructions/Bridge.xml
@@ -56,44 +56,44 @@
                     </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>
                 <not>
                     <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>
                 <not>
                     <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>
                 <not>
                     <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>
                 <not>
                     <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,44 +148,44 @@
                 </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>
             <not>
                 <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>
             <not>
                 <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>
             <not>
                 <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>
             <not>
                 <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 → ...ces/buildings/constructions/FloorBars.xml b/resources/buildings/FloorBars.xml → ...ces/buildings/constructions/FloorBars.xml
diff --git a/resources/buildings/FloorGrate.xml → ...es/buildings/constructions/FloorGrate.xml b/resources/buildings/FloorGrate.xml → ...es/buildings/constructions/FloorGrate.xml
diff --git a/resources/buildings/Road.xml → resources/buildings/constructions/Road.xml b/resources/buildings/Road.xml → resources/buildings/constructions/Road.xml
diff --git a/resources/buildings/Support.xml → ...urces/buildings/constructions/Support.xml b/resources/buildings/Support.xml → ...urces/buildings/constructions/Support.xml
diff --git a/resources/buildings/VerticalBars.png → .../buildings/constructions/VerticalBars.png b/resources/buildings/VerticalBars.png → .../buildings/constructions/VerticalBars.png
diff --git a/resources/buildings/VerticalBars.xml → .../buildings/constructions/VerticalBars.xml b/resources/buildings/VerticalBars.xml → .../buildings/constructions/VerticalBars.xml
diff --git a/resources/buildings/WallGrate.xml → ...ces/buildings/constructions/WallGrate.xml b/resources/buildings/WallGrate.xml → ...ces/buildings/constructions/WallGrate.xml
diff --git a/resources/buildings/WindowGem.xml → ...ces/buildings/constructions/WindowGem.xml b/resources/buildings/WindowGem.xml → ...ces/buildings/constructions/WindowGem.xml
diff --git a/resources/buildings/WindowGlass.xml → ...s/buildings/constructions/WindowGlass.xml b/resources/buildings/WindowGlass.xml → ...s/buildings/constructions/WindowGlass.xml
diff --git a/resources/buildings/Windows.png → ...urces/buildings/constructions/Windows.png b/resources/buildings/Windows.png → ...urces/buildings/constructions/Windows.png
diff --git a/resources/buildings/constructions/index.txt 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 → resources/buildings/doors-hatches/Door.xml b/resources/buildings/Door.xml → 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
diff --git a/resources/buildings/Hatch.xml → resources/buildings/doors-hatches/Hatch.xml b/resources/buildings/Hatch.xml → 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
@@ -0,0 +1,2 @@
+Door.xml
+Hatch.xml
diff --git a/resources/buildings/Bed.xml → resources/buildings/furniture/Bed.xml b/resources/buildings/Bed.xml → 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 → resources/buildings/furniture/Bookcase.xml b/resources/buildings/Bookcase.xml → 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 → resources/buildings/furniture/Cabinet.xml b/resources/buildings/Cabinet.xml → 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 → resources/buildings/furniture/Chair.xml b/resources/buildings/Chair.xml → 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 → resources/buildings/furniture/Chest.xml b/resources/buildings/Chest.xml → 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 → resources/buildings/furniture/Coffin.xml b/resources/buildings/Coffin.xml → 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 → .../buildings/furniture/DisplayFurniture.xml b/resources/buildings/DisplayFurniture.xml → .../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 → ...ces/buildings/furniture/OfferingPlace.xml b/resources/buildings/OfferingPlace.xml → ...ces/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 → resources/buildings/furniture/Statue.xml b/resources/buildings/Statue.xml → 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 → resources/buildings/furniture/Table.xml b/resources/buildings/Table.xml → 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
diff --git a/resources/buildings/furniture/index.txt 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 → resources/buildings/include/workshop.png b/resources/buildings/workshop.png → resources/buildings/include/workshop.png
diff --git 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 → ...s/buildings/machines-fluids/Floodgate.xml b/resources/buildings/Floodgate.xml → ...s/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
diff --git a/resources/buildings/Gear.xml → resources/buildings/machines-fluids/Gear.xml b/resources/buildings/Gear.xml → resources/buildings/machines-fluids/Gear.xml
diff --git a/resources/buildings/HorizontalAxle.xml → ...ldings/machines-fluids/HorizontalAxle.xml b/resources/buildings/HorizontalAxle.xml → ...ldings/machines-fluids/HorizontalAxle.xml
diff --git a/resources/buildings/Lever.xml → ...urces/buildings/machines-fluids/Lever.xml b/resources/buildings/Lever.xml → ...urces/buildings/machines-fluids/Lever.xml
diff --git a/resources/buildings/Millstone.xml → ...s/buildings/machines-fluids/Millstone.xml b/resources/buildings/Millstone.xml → ...s/buildings/machines-fluids/Millstone.xml
diff --git a/resources/buildings/Pump.xml → resources/buildings/machines-fluids/Pump.xml b/resources/buildings/Pump.xml → resources/buildings/machines-fluids/Pump.xml
diff --git a/resources/buildings/VerticalAxle.xml → ...uildings/machines-fluids/VerticalAxle.xml b/resources/buildings/VerticalAxle.xml → ...uildings/machines-fluids/VerticalAxle.xml
diff --git a/resources/buildings/Waterwheel.xml → .../buildings/machines-fluids/Waterwheel.xml b/resources/buildings/Waterwheel.xml → .../buildings/machines-fluids/Waterwheel.xml
diff --git a/resources/buildings/Well.xml → resources/buildings/machines-fluids/Well.xml b/resources/buildings/Well.xml → 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 → ...es/buildings/machines-fluids/Windmill.xml b/resources/buildings/Windmill.xml → ...es/buildings/machines-fluids/Windmill.xml
diff --git a/resources/buildings/machines-fluids/index.txt 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 → ...s/buildings/machines-fluids/mechanics.png b/resources/buildings/mechanics.png → ...s/buildings/machines-fluids/mechanics.png
diff --git a/resources/buildings/ArmorStand.xml → resources/buildings/military/ArmorStand.xml b/resources/buildings/ArmorStand.xml → resources/buildings/military/ArmorStand.xml
diff --git a/resources/buildings/Target.xml → resources/buildings/military/Target.xml b/resources/buildings/Target.xml → resources/buildings/military/Target.xml
diff --git a/resources/buildings/WeaponRack.xml → resources/buildings/military/WeaponRack.xml b/resources/buildings/WeaponRack.xml → resources/buildings/military/WeaponRack.xml
diff --git a/resources/buildings/military/index.txt b/resources/buildings/military/index.txt
@@ -0,0 +1,3 @@
+ArmorStand.xml
+Target.xml
+WeaponRack.xml
diff --git a/resources/buildings/Blueprint.xml → resources/buildings/specials/Blueprint.xml b/resources/buildings/Blueprint.xml → resources/buildings/specials/Blueprint.xml
diff --git a/resources/buildings/Stockpile.xml → resources/buildings/specials/Stockpile.xml b/resources/buildings/Stockpile.xml → resources/buildings/specials/Stockpile.xml
diff --git a/resources/buildings/Zone.xml → resources/buildings/specials/Zone.xml b/resources/buildings/Zone.xml → resources/buildings/specials/Zone.xml
diff --git a/resources/buildings/specials/index.txt b/resources/buildings/specials/index.txt
@@ -0,0 +1,3 @@
+Blueprint.xml
+Stockpile.xml
+Zone.xml
diff --git a/resources/buildings/CageTrap.xml → resources/buildings/traps/CageTrap.xml b/resources/buildings/CageTrap.xml → resources/buildings/traps/CageTrap.xml
diff --git a/resources/buildings/PressurePlate.xml → resources/buildings/traps/PressurePlate.xml b/resources/buildings/PressurePlate.xml → resources/buildings/traps/PressurePlate.xml
diff --git a/resources/buildings/Spikes.xml → resources/buildings/traps/Spikes.xml b/resources/buildings/Spikes.xml → resources/buildings/traps/Spikes.xml
diff --git a/resources/buildings/StonefallTrap.xml → resources/buildings/traps/StonefallTrap.xml b/resources/buildings/StonefallTrap.xml → resources/buildings/traps/StonefallTrap.xml
diff --git a/resources/buildings/WeaponTrap.xml → resources/buildings/traps/WeaponTrap.xml b/resources/buildings/WeaponTrap.xml → resources/buildings/traps/WeaponTrap.xml