diff --git a/objects/clutter/subporta.iob b/objects/clutter/subporta.iob
new file mode 100644
index 00000000..1450fc27
Binary files /dev/null and b/objects/clutter/subporta.iob differ
diff --git a/structures/mush-huts.json b/structures/mush-huts.json
index 28389047..6e784db5 100644
--- a/structures/mush-huts.json
+++ b/structures/mush-huts.json
@@ -1,5 +1,12 @@
 {
     "gridHeight": 32,
+    "entityInitialSpawns": [
+        {
+        "entity": "villager",
+        "maxSpawns": 5,
+        "minSpawns": 2
+        }
+    ],
     "maxLayers": 1,
     "bore": false,
     "wallStyle": {
@@ -17,7 +24,7 @@
             "south": "NEVER",
             "rareObjects": [],
             "north": "NEVER",
-            "objects": ["structure/mush-huts/cross-1"],
+            "objects": ["structure/village-stone/cross-1"],
             "west": "NEVER",
             "loot": {
                 "mode": "ADD",
@@ -35,7 +42,7 @@
             "south": "NEVER",
             "rareObjects": [],
             "north": "REQUIRED",
-            "objects": ["structure/mush-huts/t-connect-1"],
+            "objects": ["structure/village-stone/t-connect-1"],
             "west": "NEVER",
             "loot": {
                 "mode": "ADD",
@@ -53,7 +60,7 @@
             "south": "REQUIRED",
             "rareObjects": [],
             "north": "REQUIRED",
-            "objects": ["structure/mush-huts/hall-1"],
+            "objects": ["structure/village-stone/hall-1"],
             "west": "NEVER",
             "loot": {
                 "mode": "ADD",
@@ -71,7 +78,7 @@
             "south": "NEVER",
             "rareObjects": [],
             "north": "REQUIRED",
-            "objects": ["structure/mush-huts/corner-1"],
+            "objects": ["structure/village-stone/corner-1"],
             "west": "NEVER",
             "loot": {
                 "mode": "ADD",
diff --git a/structures/village.json b/structures/village.json
deleted file mode 100644
index e239d0f4..00000000
--- a/structures/village.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-    "gridHeight": 11,
-    "maxLayers": 1,
-    "bore": true,
-    "wallStyle": {
-        "multiplier": 1,
-        "style": "STATIC",
-        "zoom": 1,
-        "exponent": 1
-    },
-    "entityInitialSpawns": [
-        {
-            "entity": "villager",
-            "maxSpawns": 3,
-            "minSpawns": 1,
-            "rarity": 2
-        },
-        {
-            "entity": "golem",
-            "maxSpawns": 1,
-            "minSpawns": 1,
-            "rarity": 2
-        }
-    ],
-    "tiles": [
-        {
-            "ceiling": "AGNOSTIC",
-            "east": "NEVER",
-            "entitySpawnOverrides": [],
-            "placeMode": "CENTER_HEIGHT",
-            "south": "NEVER",
-            "rareObjects": [],
-            "north": "REQUIRED",
-            "objects": ["structure/Village/t-connect-1"],
-            "west": "NEVER",
-            "loot": {
-                "mode": "ADD",
-                "tables": [],
-                "multiplier": 1
-            },
-            "floor": "REQUIRED"
-        },
-        {
-            "ceiling": "AGNOSTIC",
-            "east": "NEVER",
-            "entitySpawnOverrides": [],
-            "placeMode": "CENTER_HEIGHT",
-            "south": "REQUIRED",
-            "rareObjects": [],
-            "north": "REQUIRED",
-            "objects": ["structure/Village/hall-1"],
-            "west": "NEVER",
-            "loot": {
-                "mode": "ADD",
-                "tables": [],
-                "multiplier": 1
-            },
-            "floor": "REQUIRED"
-        },
-        {
-            "ceiling": "AGNOSTIC",
-            "east": "REQUIRED",
-            "entitySpawnOverrides": [],
-            "placeMode": "CENTER_HEIGHT",
-            "south": "NEVER",
-            "rareObjects": [],
-            "north": "REQUIRED",
-            "objects": ["structure/Village/corner-1"],
-            "west": "NEVER",
-            "loot": {
-                "mode": "ADD",
-                "tables": [],
-                "multiplier": 1
-            },
-            "floor": "REQUIRED"
-        },
-        {
-            "ceiling": "AGNOSTIC",
-            "east": "REQUIRED",
-            "entitySpawnOverrides": [],
-            "placeMode": "CENTER_HEIGHT",
-            "south": "NEVER",
-            "rareObjects": [],
-            "north": "REQUIRED",
-            "objects": ["structure/Village/room-1"],
-            "west": "REQUIRED",
-            "loot": {
-                "mode": "ADD",
-                "tables": [],
-                "multiplier": 1
-            },
-            "floor": "REQUIRED"
-        },
-        {
-            "ceiling": "AGNOSTIC",
-            "east": "REQUIRED",
-            "entitySpawnOverrides": [],
-            "placeMode": "CENTER_HEIGHT",
-            "south": "REQUIRED",
-            "rareObjects": [],
-            "north": "REQUIRED",
-            "objects": ["structure/Village/walled-room-1"],
-            "west": "REQUIRED",
-            "loot": {
-                "mode": "ADD",
-                "tables": [],
-                "multiplier": 1
-            },
-            "floor": "REQUIRED"
-        },
-        {
-            "ceiling": "AGNOSTIC",
-            "east": "NEVER",
-            "entitySpawnOverrides": [],
-            "placeMode": "CENTER_HEIGHT",
-            "south": "NEVER",
-            "rareObjects": [],
-            "north": "NEVER",
-            "objects": [
-                "structure/Village/cross-1",
-                "structure/Village/cross-2",
-                "structure/Village/cross-3",
-                "structure/Village/cross-4",
-                "structure/Village/cross-5",
-                "structure/Village/cross-6",
-                "structure/Village/cross-7",
-                "structure/Village/cross-8",
-                "structure/Village/cross-9",
-                "structure/Village/cross-10",
-                "structure/Village/cross-11",
-                "structure/Village/cross-12"
-            ],
-            "west": "NEVER",
-            "loot": {
-                "mode": "ADD",
-                "tables": [],
-                "multiplier": 1
-            },
-            "floor": "REQUIRED"
-        }
-    ],
-    "entitySpawnOverrides": [],
-    "gridSize": 11,
-    "wallChance": 0.35,
-    "name": "Village",
-    "underwater": false,
-    "loot": {
-        "mode": "ADD",
-        "tables": [],
-        "multiplier": 1
-    },
-    "clamp": {
-        "minimumHeight": 0,
-        "maximumHeight": 255
-    },
-    "mergeEdges": false
-}