diff --git a/biomes/frozen/fzn-beach.json b/biomes/frozen/fzn-beach.json index f0184232..9c4869b4 100644 --- a/biomes/frozen/fzn-beach.json +++ b/biomes/frozen/fzn-beach.json @@ -26,7 +26,6 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", - "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -42,6 +41,12 @@ "style": {"style": "STATIC"}, "palette": [{"block": "packed_ice"}] }], + "entityInitialSpawns": [{ + "entity": "wolf", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 6 + }], "objects": [ { "chance": 0.003, diff --git a/biomes/frozen/fzn-hills.json b/biomes/frozen/fzn-hills.json index 1ec21e5a..1be92ee0 100644 --- a/biomes/frozen/fzn-hills.json +++ b/biomes/frozen/fzn-hills.json @@ -35,7 +35,6 @@ "id": "fznhills", "waterColor": "#216FC4", "downfallType": "snow", - "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", @@ -149,5 +148,11 @@ "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]} + ]}, + "entityInitialSpawns": [{ + "entity": "polar-bear", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 + }] } diff --git a/biomes/frozen/fzn-mountain-cliffs.json b/biomes/frozen/fzn-mountain-cliffs.json index 73754b99..c19454d1 100644 --- a/biomes/frozen/fzn-mountain-cliffs.json +++ b/biomes/frozen/fzn-mountain-cliffs.json @@ -36,7 +36,6 @@ "customDerivitives": [{ "id": "fznmountaincliff", "downfallType": "snow", - "temperature": -3, "waterColor": "#216FC4", "fogColor": "#B8D0E1", "waterFogColor": "#216FC4", @@ -249,7 +248,20 @@ } ] }], - + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "wall": { "style": {"style": "IRIS"}, "palette": [{"block": "packed_ice"}] diff --git a/biomes/frozen/fzn-mountain-middle.json b/biomes/frozen/fzn-mountain-middle.json index f61381b3..9ed52341 100644 --- a/biomes/frozen/fzn-mountain-middle.json +++ b/biomes/frozen/fzn-mountain-middle.json @@ -21,7 +21,6 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", - "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" diff --git a/biomes/frozen/fzn-mountain.json b/biomes/frozen/fzn-mountain.json index 83f828e0..952e5037 100644 --- a/biomes/frozen/fzn-mountain.json +++ b/biomes/frozen/fzn-mountain.json @@ -13,7 +13,6 @@ "id": "fznmountain", "waterColor": "#216FC4", "downfallType": "snow", - "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", diff --git a/biomes/frozen/fzn-mountains.json b/biomes/frozen/fzn-mountains.json index 717e0ac9..c20b2607 100644 --- a/biomes/frozen/fzn-mountains.json +++ b/biomes/frozen/fzn-mountains.json @@ -12,7 +12,6 @@ "id": "fznmountains", "waterColor": "#216FC4", "downfallType": "snow", - "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", @@ -200,6 +199,20 @@ } } ], + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "biomeZoom": 30, "biomeStyle": {"style": "IRIS"}, "decorators": [{ diff --git a/biomes/frozen/fzn-peak.json b/biomes/frozen/fzn-peak.json index 8c8dad04..2344ba24 100644 --- a/biomes/frozen/fzn-peak.json +++ b/biomes/frozen/fzn-peak.json @@ -8,7 +8,6 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", - "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -181,6 +180,20 @@ } } ], + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "biomeZoom": 30, "biomeStyle": {"style": "IRIS"}, "biomeScatter": [ diff --git a/biomes/frozen/fzn-pine-hills.json b/biomes/frozen/fzn-pine-hills.json index 8164de53..c5b4f25b 100644 --- a/biomes/frozen/fzn-pine-hills.json +++ b/biomes/frozen/fzn-pine-hills.json @@ -34,7 +34,6 @@ "customDerivitives": [{ "id": "fznpinehills", "downfallType": "snow", - "temperature": -3, "waterColor": "#216FC4", "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", @@ -112,5 +111,11 @@ "zoom": 0.4 }, "snow": 0.1 + }], + "entityInitialSpawns": [{ + "entity": "polar-bear", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 }] } diff --git a/biomes/frozen/fzn-pine-plains.json b/biomes/frozen/fzn-pine-plains.json index 6d1587ae..b996cecf 100644 --- a/biomes/frozen/fzn-pine-plains.json +++ b/biomes/frozen/fzn-pine-plains.json @@ -22,7 +22,6 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", - "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -121,5 +120,11 @@ "zoom": 0.4 }, "snow": 0.1 + }], + "entityInitialSpawns": [{ + "entity": "polar-bear", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 }] } diff --git a/biomes/frozen/fzn-pines.json b/biomes/frozen/fzn-pines.json index 33c7a454..527a8c3b 100644 --- a/biomes/frozen/fzn-pines.json +++ b/biomes/frozen/fzn-pines.json @@ -40,7 +40,6 @@ "id": "fznpines", "waterColor": "#216FC4", "downfallType": "snow", - "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", @@ -189,6 +188,20 @@ {"block": "air"} ] }], + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "childShrinkFactor": 20, "wall": { "style": {"style": "STATIC"}, diff --git a/biomes/frozen/fzn-plains.json b/biomes/frozen/fzn-plains.json index b5d99c37..ee79a741 100644 --- a/biomes/frozen/fzn-plains.json +++ b/biomes/frozen/fzn-plains.json @@ -23,7 +23,6 @@ "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "downfallType": "snow", - "temperature": -3, "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" }], @@ -265,6 +264,25 @@ "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]} - + ]}, + "entityInitialSpawns": [ + { + "entity": "polar-bear", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ] } diff --git a/biomes/frozen/fzn-redwood-forest.json b/biomes/frozen/fzn-redwood-forest.json index 82566ab8..8ac57268 100644 --- a/biomes/frozen/fzn-redwood-forest.json +++ b/biomes/frozen/fzn-redwood-forest.json @@ -21,7 +21,6 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", - "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -180,6 +179,20 @@ } } ], + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "biomeZoom": 30, "biomeStyle": {"style": "IRIS"}, "decorators": [{ diff --git a/biomes/frozen/fzn-spruce-hills.json b/biomes/frozen/fzn-spruce-hills.json index 63d78497..401d696f 100644 --- a/biomes/frozen/fzn-spruce-hills.json +++ b/biomes/frozen/fzn-spruce-hills.json @@ -36,7 +36,6 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", - "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -108,5 +107,11 @@ "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]} + ]}, + "entityInitialSpawns": [{ + "entity": "polar-bear", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 + }] } diff --git a/biomes/frozen/fzn-spruce-plains.json b/biomes/frozen/fzn-spruce-plains.json index dc585c16..9fa9a63f 100644 --- a/biomes/frozen/fzn-spruce-plains.json +++ b/biomes/frozen/fzn-spruce-plains.json @@ -37,7 +37,6 @@ "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "downfallType": "snow", - "temperature": -3, "fogColor": "#A6D1FF", "grassColor": "#D0E1FF" }], @@ -116,5 +115,11 @@ "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]} + ]}, + "entityInitialSpawns": [{ + "entity": "polar-bear", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 + }] } diff --git a/biomes/frozen/fzn-vander.json b/biomes/frozen/fzn-vander.json index 459ea0de..c723a61d 100644 --- a/biomes/frozen/fzn-vander.json +++ b/biomes/frozen/fzn-vander.json @@ -36,7 +36,6 @@ "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "downfallType": "snow", - "temperature": -3, "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" }], @@ -229,6 +228,20 @@ } } ], + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "biomeZoom": 50, "biomeStyle": {"style": "IRIS"}, "childShrinkFactor": 20, diff --git a/biomes/hot/sav-acacia-denmyre.json b/biomes/hot/sav-acacia-denmyre.json index 8bce2e5e..df139160 100644 --- a/biomes/hot/sav-acacia-denmyre.json +++ b/biomes/hot/sav-acacia-denmyre.json @@ -149,7 +149,20 @@ "z": 0 } }], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "wall": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/hot/sav-beach.json b/biomes/hot/sav-beach.json index 09182ab8..38010ce2 100644 --- a/biomes/hot/sav-beach.json +++ b/biomes/hot/sav-beach.json @@ -41,6 +41,32 @@ ] } ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "chance": 0.001, diff --git a/biomes/hot/sav-cliff.json b/biomes/hot/sav-cliff.json index df8b9175..5e26a902 100644 --- a/biomes/hot/sav-cliff.json +++ b/biomes/hot/sav-cliff.json @@ -103,7 +103,20 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "objects": [ { "chance": 0.07, diff --git a/biomes/hot/sav-forest.json b/biomes/hot/sav-forest.json index daacb798..d8946798 100644 --- a/biomes/hot/sav-forest.json +++ b/biomes/hot/sav-forest.json @@ -257,7 +257,20 @@ } } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "biomeZoom": 20, "biomeStyle": {"style": "IRIS"}, "wall": { diff --git a/biomes/hot/sav-plateau.json b/biomes/hot/sav-plateau.json index 5e6c5103..0a55e2ae 100644 --- a/biomes/hot/sav-plateau.json +++ b/biomes/hot/sav-plateau.json @@ -67,7 +67,20 @@ "DESERT", "SAVANNA" ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.001, diff --git a/biomes/hot/sav-savanna.json b/biomes/hot/sav-savanna.json index 0e407124..caf1d4d7 100644 --- a/biomes/hot/sav-savanna.json +++ b/biomes/hot/sav-savanna.json @@ -75,7 +75,20 @@ "DESERT", "SAVANNA" ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.001, diff --git a/biomes/hot/msa-beach.json b/biomes/mesa/msa-beach.json similarity index 100% rename from biomes/hot/msa-beach.json rename to biomes/mesa/msa-beach.json diff --git a/biomes/hot/msa-blue.json b/biomes/mesa/msa-blue.json similarity index 92% rename from biomes/hot/msa-blue.json rename to biomes/mesa/msa-blue.json index e6676414..edcf379c 100644 --- a/biomes/hot/msa-blue.json +++ b/biomes/mesa/msa-blue.json @@ -120,7 +120,20 @@ "mode": "VACUUM", "carvingSupport": "SURFACE_ONLY" }], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "lockLayers": true, "wall": { "style": {"style": "IRIS"}, diff --git a/biomes/hot/msa-cliffs.json b/biomes/mesa/msa-cliffs.json similarity index 89% rename from biomes/hot/msa-cliffs.json rename to biomes/mesa/msa-cliffs.json index d0a246e7..846b5b7a 100644 --- a/biomes/hot/msa-cliffs.json +++ b/biomes/mesa/msa-cliffs.json @@ -87,7 +87,20 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "lockLayers": true, "wall": { "style": {"style": "IRIS"}, diff --git a/biomes/hot/msa-dark.json b/biomes/mesa/msa-dark.json similarity index 91% rename from biomes/hot/msa-dark.json rename to biomes/mesa/msa-dark.json index 670a81c1..839bfccc 100644 --- a/biomes/hot/msa-dark.json +++ b/biomes/mesa/msa-dark.json @@ -5,10 +5,10 @@ "derivative": "SHATTERED_SAVANNA", "vanillaDerivative": "ERODED_BADLANDS", "children": [ - "hot/msa-cliffs", - "hot/msa-red", - "hot/msa-green", - "hot/msa-blue" + "mesa/msa-cliffs", + "mesa/msa-red", + "mesa/msa-green", + "mesa/msa-blue" ], "generators": [ { @@ -138,7 +138,20 @@ "mode": "VACUUM", "carvingSupport": "SURFACE_ONLY" }], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "childShrinkFactor": 0.35, "lockLayers": true, "wall": { diff --git a/biomes/hot/msa-green.json b/biomes/mesa/msa-green.json similarity index 92% rename from biomes/hot/msa-green.json rename to biomes/mesa/msa-green.json index a6d52031..df5879bd 100644 --- a/biomes/hot/msa-green.json +++ b/biomes/mesa/msa-green.json @@ -120,7 +120,20 @@ "mode": "VACUUM", "carvingSupport": "SURFACE_ONLY" }], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "lockLayers": true, "wall": { "style": {"style": "IRIS"}, diff --git a/biomes/hot/msa-mesa.json b/biomes/mesa/msa-mesa.json similarity index 95% rename from biomes/hot/msa-mesa.json rename to biomes/mesa/msa-mesa.json index e40211e6..e961b17a 100644 --- a/biomes/hot/msa-mesa.json +++ b/biomes/mesa/msa-mesa.json @@ -10,14 +10,14 @@ "ERODED_BADLANDS" ], "children": [ - "hot/msa-valleys", - "hot/msa-red", - "hot/msa-blue", - "hot/msa-dark", - "hot/msa-green", - "hot/msa-red", - "hot/msa-yellow", - "hot/msa-blue" + "mesa/msa-valleys", + "mesa/msa-red", + "mesa/msa-blue", + "mesa/msa-dark", + "mesa/msa-green", + "mesa/msa-red", + "mesa/msa-yellow", + "mesa/msa-blue" ], "generators": [{ "min": 25, diff --git a/biomes/hot/msa-plateau-dirt-high.json b/biomes/mesa/msa-plateau-dirt-high.json similarity index 100% rename from biomes/hot/msa-plateau-dirt-high.json rename to biomes/mesa/msa-plateau-dirt-high.json diff --git a/biomes/hot/msa-plateau-dirt.json b/biomes/mesa/msa-plateau-dirt.json similarity index 83% rename from biomes/hot/msa-plateau-dirt.json rename to biomes/mesa/msa-plateau-dirt.json index 01076e02..20c78a05 100644 --- a/biomes/hot/msa-plateau-dirt.json +++ b/biomes/mesa/msa-plateau-dirt.json @@ -72,6 +72,32 @@ }], "lockLayers": true, "biomeStyle": {"style": "IRIS"}, + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "place": [ diff --git a/biomes/hot/msa-plateau-high.json b/biomes/mesa/msa-plateau-high.json similarity index 98% rename from biomes/hot/msa-plateau-high.json rename to biomes/mesa/msa-plateau-high.json index eea354e2..9d626589 100644 --- a/biomes/hot/msa-plateau-high.json +++ b/biomes/mesa/msa-plateau-high.json @@ -9,7 +9,7 @@ "BADLANDS_PLATEAU", "ERODED_BADLANDS" ], - "children": ["hot/msa-plateau-dirt-high"], + "children": ["mesa/msa-plateau-dirt-high"], "generators": [ { "min": 55, diff --git a/biomes/hot/msa-plateau.json b/biomes/mesa/msa-plateau.json similarity index 99% rename from biomes/hot/msa-plateau.json rename to biomes/mesa/msa-plateau.json index ec3cb1a9..97ce71fb 100644 --- a/biomes/hot/msa-plateau.json +++ b/biomes/mesa/msa-plateau.json @@ -9,7 +9,7 @@ "BADLANDS_PLATEAU", "ERODED_BADLANDS" ], - "children": ["hot/msa-plateau-dirt"], + "children": ["mesa/msa-plateau-dirt"], "generators": [ { "min": 35, diff --git a/biomes/hot/msa-red.json b/biomes/mesa/msa-red.json similarity index 93% rename from biomes/hot/msa-red.json rename to biomes/mesa/msa-red.json index 2addba46..f2aab863 100644 --- a/biomes/hot/msa-red.json +++ b/biomes/mesa/msa-red.json @@ -126,7 +126,20 @@ "mode": "VACUUM", "carvingSupport": "SURFACE_ONLY" }], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "lockLayers": true, "wall": { "style": {"style": "IRIS"}, diff --git a/biomes/hot/msa-valleys.json b/biomes/mesa/msa-valleys.json similarity index 93% rename from biomes/hot/msa-valleys.json rename to biomes/mesa/msa-valleys.json index 4305b681..d61d67c9 100644 --- a/biomes/hot/msa-valleys.json +++ b/biomes/mesa/msa-valleys.json @@ -107,6 +107,32 @@ "palette": [{"block": "terracotta"}] } ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + } + ], "decorators": [ { "chance": 0.189, diff --git a/biomes/hot/msa-yellow.json b/biomes/mesa/msa-yellow.json similarity index 90% rename from biomes/hot/msa-yellow.json rename to biomes/mesa/msa-yellow.json index 91449252..331b55bb 100644 --- a/biomes/hot/msa-yellow.json +++ b/biomes/mesa/msa-yellow.json @@ -4,7 +4,7 @@ "rarity": 1, "color": "#BDBF05", "vanillaDerivative": "BADLANDS", - "children": ["hot/msa-dark"], + "children": ["mesa/msa-dark"], "generators": [ { "min": 9, @@ -100,7 +100,20 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "objects": [{ "rotation": { "yAxis": { diff --git a/biomes/mountain/mtn-forest-hills.json b/biomes/mountain/mtn-forest-hills.json index 95c8961c..8cd332a5 100644 --- a/biomes/mountain/mtn-forest-hills.json +++ b/biomes/mountain/mtn-forest-hills.json @@ -74,7 +74,26 @@ "palette": [{"block": "dirt"}] } ], - + "entityInitialSpawns": [ + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "fox", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"}, diff --git a/biomes/mountain/mtn-forest.json b/biomes/mountain/mtn-forest.json index e6a7d447..2fdfd5ae 100644 --- a/biomes/mountain/mtn-forest.json +++ b/biomes/mountain/mtn-forest.json @@ -74,6 +74,26 @@ "palette": [{"block": "dirt"}] } ], + "entityInitialSpawns": [ + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "fox", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"}, diff --git a/biomes/mountain/mtn-hills.json b/biomes/mountain/mtn-hills.json index d6722440..13f2cf46 100644 --- a/biomes/mountain/mtn-hills.json +++ b/biomes/mountain/mtn-hills.json @@ -145,6 +145,32 @@ }] } ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "mode": "PAINT", diff --git a/biomes/mountain/mtn-plains.json b/biomes/mountain/mtn-plains.json index c997bec1..e98f0355 100644 --- a/biomes/mountain/mtn-plains.json +++ b/biomes/mountain/mtn-plains.json @@ -152,7 +152,32 @@ }] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "mode": "PAINT", diff --git a/biomes/mushroom/mus-forest-hills.json b/biomes/mushroom/mus-forest-hills.json index f4cbdf65..dab1ac94 100644 --- a/biomes/mushroom/mus-forest-hills.json +++ b/biomes/mushroom/mus-forest-hills.json @@ -90,7 +90,12 @@ ] } ], - + "entityInitialSpawns": [{ + "maxSpawns": 5, + "minSpawns": 2, + "entity": "mooshroom", + "rarity": 5 + }], "decorators": [ { "chance": 0.009, diff --git a/biomes/mushroom/mus-forest.json b/biomes/mushroom/mus-forest.json index 4843dc02..bf368620 100644 --- a/biomes/mushroom/mus-forest.json +++ b/biomes/mushroom/mus-forest.json @@ -91,6 +91,12 @@ "max": 24, "generator": "plain" }], + "entityInitialSpawns": [{ + "maxSpawns": 5, + "minSpawns": 2, + "entity": "mooshroom", + "rarity": 5 + }], "decorators": [ { "chance": 0.009, diff --git a/biomes/mushroom/mus-plains.json b/biomes/mushroom/mus-plains.json index 372b9e61..d5fd765a 100644 --- a/biomes/mushroom/mus-plains.json +++ b/biomes/mushroom/mus-plains.json @@ -55,7 +55,12 @@ "rarity": 150, "structure": "mush-huts" }], - + "entityInitialSpawns": [{ + "maxSpawns": 6, + "minSpawns": 2, + "entity": "mooshroom", + "rarity": 3 + }], "decorators": [ { "chance": 0.005, diff --git a/biomes/ocean/oce-mtn-lake.json b/biomes/ocean/oce-mtn-lake.json index a97d649b..78dbb2bf 100644 --- a/biomes/ocean/oce-mtn-lake.json +++ b/biomes/ocean/oce-mtn-lake.json @@ -130,7 +130,32 @@ }] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "mode": "PAINT", diff --git a/biomes/ocean/oce-mus-lake.json b/biomes/ocean/oce-mus-lake.json index 861df01c..8708408f 100644 --- a/biomes/ocean/oce-mus-lake.json +++ b/biomes/ocean/oce-mus-lake.json @@ -43,7 +43,12 @@ "max": -10, "generator": "river" }], - + "entityInitialSpawns": [{ + "maxSpawns": 5, + "minSpawns": 2, + "entity": "mooshroom", + "rarity": 5 + }], "decorators": [ { "chance": 0.005, diff --git a/biomes/swamp/swa-beach.json b/biomes/swamp/swa-beach.json index 29c6cbf4..feffb30b 100644 --- a/biomes/swamp/swa-beach.json +++ b/biomes/swamp/swa-beach.json @@ -77,7 +77,20 @@ "heightVariance": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "objects": [{ "place": [ "tree/jungle/1", diff --git a/biomes/swamp/swa-denmyre.json b/biomes/swamp/swa-denmyre.json index 97e29f6a..398898c8 100644 --- a/biomes/swamp/swa-denmyre.json +++ b/biomes/swamp/swa-denmyre.json @@ -239,7 +239,20 @@ } } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "wall": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/swamp/swa-lake.json b/biomes/swamp/swa-lake.json index 44043283..66961539 100644 --- a/biomes/swamp/swa-lake.json +++ b/biomes/swamp/swa-lake.json @@ -78,7 +78,20 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "objects": [{ "chance": 0.35, "density": 2, diff --git a/biomes/swamp/swa-marsh-rotten.json b/biomes/swamp/swa-marsh-rotten.json index 8a5d2dfa..be7473bb 100644 --- a/biomes/swamp/swa-marsh-rotten.json +++ b/biomes/swamp/swa-marsh-rotten.json @@ -5,23 +5,10 @@ "derivative": "SWAMP_HILLS", "vanillaDerivative": "SWAMP", "generators": [{ - "min": -5, - "max": 4, - "generator": "plain" + "min": 7, + "max": 3, + "generator": "mountain" }], - "customDerivitives": [ - { - "id": "swamprottenmarsh", - "waterColor": "#684D1A", - "grassColor": "#5C581A", - "spawnRarity": 20, - "spawns": [ - { - "type": "SLIME" - } - ] - } - ], "layers": [ { "style": {"style": "IRIS"}, @@ -91,7 +78,20 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "objects": [ { "chance": 0.4, diff --git a/biomes/swamp/swa-marsh.json b/biomes/swamp/swa-marsh.json index 1e322b06..b830a695 100644 --- a/biomes/swamp/swa-marsh.json +++ b/biomes/swamp/swa-marsh.json @@ -78,7 +78,20 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "objects": [ { "place": [ diff --git a/biomes/swamp/swa-roofed-forest.json b/biomes/swamp/swa-roofed-forest.json index 4bda3656..1a2162ac 100644 --- a/biomes/swamp/swa-roofed-forest.json +++ b/biomes/swamp/swa-roofed-forest.json @@ -378,7 +378,20 @@ } } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "wall": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/swamp/swa-roofed-wayward.json b/biomes/swamp/swa-roofed-wayward.json index 9a86ad85..4802bac8 100644 --- a/biomes/swamp/swa-roofed-wayward.json +++ b/biomes/swamp/swa-roofed-wayward.json @@ -366,7 +366,20 @@ } } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "wall": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/temperate/tem-beach.json b/biomes/temperate/tem-beach.json index 90009253..366ef043 100644 --- a/biomes/temperate/tem-beach.json +++ b/biomes/temperate/tem-beach.json @@ -60,7 +60,32 @@ "heightVariance": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [{ "mode": "PAINT", "chance": 0.0025, diff --git a/biomes/temperate/tem-birch-denmyre.json b/biomes/temperate/tem-birch-denmyre.json index 7b9614c3..33a15649 100644 --- a/biomes/temperate/tem-birch-denmyre.json +++ b/biomes/temperate/tem-birch-denmyre.json @@ -234,10 +234,28 @@ ], "entityInitialSpawns": [ { - "entity": "bee", - "maxSpawns": 5, - "minSpawns": 2, - "rarity": 3 + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 } ], "wall": { diff --git a/biomes/temperate/tem-birch-forest.json b/biomes/temperate/tem-birch-forest.json index 9af7e1a5..0e8de67f 100644 --- a/biomes/temperate/tem-birch-forest.json +++ b/biomes/temperate/tem-birch-forest.json @@ -62,7 +62,38 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "bee", + "maxSpawns": 5, + "minSpawns": 1, + "rarity": 2 + } + ], "objects": [ { "mode": "PAINT", diff --git a/biomes/temperate/tem-flower-forest.json b/biomes/temperate/tem-flower-forest.json index df3978e5..81e01316 100644 --- a/biomes/temperate/tem-flower-forest.json +++ b/biomes/temperate/tem-flower-forest.json @@ -62,10 +62,34 @@ } ], "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 4, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 4, + "minSpawns": 1, + "rarity": 7 + }, { "entity": "bee", "maxSpawns": 5, - "minSpawns": 2, + "minSpawns": 1, "rarity": 3 } ], diff --git a/biomes/temperate/tem-highlands.json b/biomes/temperate/tem-highlands.json index 4fcb3cb9..6961b81b 100644 --- a/biomes/temperate/tem-highlands.json +++ b/biomes/temperate/tem-highlands.json @@ -57,10 +57,28 @@ ], "entityInitialSpawns": [ { - "entity": "bee", - "maxSpawns": 5, - "minSpawns": 2, - "rarity": 3 + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 } ], "decorators": [ diff --git a/biomes/temperate/tem-island.json b/biomes/temperate/tem-island.json index 198c76d7..0a5c4526 100644 --- a/biomes/temperate/tem-island.json +++ b/biomes/temperate/tem-island.json @@ -39,7 +39,32 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "decorators": [ { "chance": 0.19, diff --git a/biomes/temperate/tem-longtree-forest.json b/biomes/temperate/tem-longtree-forest.json index 7badcd76..5d8c7044 100644 --- a/biomes/temperate/tem-longtree-forest.json +++ b/biomes/temperate/tem-longtree-forest.json @@ -252,7 +252,31 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pandaUwU", + "maxSpawns": 1, + "rarity": 40 + }, + { + "entity": "panda", + "maxSpawns": 4, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "fox", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 5 + } + ], "objects": [ { "chance": 0.7, diff --git a/biomes/temperate/tem-oak-beach.json b/biomes/temperate/tem-oak-beach.json index 478d1586..48049352 100644 --- a/biomes/temperate/tem-oak-beach.json +++ b/biomes/temperate/tem-oak-beach.json @@ -44,7 +44,32 @@ "structure": "village-temperate" } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "chance": 0.001, diff --git a/biomes/temperate/tem-oak-denmyre.json b/biomes/temperate/tem-oak-denmyre.json index d2f3030a..ed5ae7f9 100644 --- a/biomes/temperate/tem-oak-denmyre.json +++ b/biomes/temperate/tem-oak-denmyre.json @@ -114,7 +114,32 @@ "palette": [{"block": "cobblestone_slab"}] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "mode": "PAINT", diff --git a/biomes/temperate/tem-oak-forest.json b/biomes/temperate/tem-oak-forest.json index f3c2c8b5..bee18eb8 100644 --- a/biomes/temperate/tem-oak-forest.json +++ b/biomes/temperate/tem-oak-forest.json @@ -52,7 +52,32 @@ "structure": "village-temperate" } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "chance": 0.07, diff --git a/biomes/temperate/tem-plains.json b/biomes/temperate/tem-plains.json index f6c22805..3d2989c0 100644 --- a/biomes/temperate/tem-plains.json +++ b/biomes/temperate/tem-plains.json @@ -411,7 +411,32 @@ } } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + } + ], "biomeStyle": {"style": "IRIS"}, "wall": {"palette": [ {"block": "stone"}, diff --git a/biomes/temperate/tem-plateau.json b/biomes/temperate/tem-plateau.json index 8fde6c03..e4fc560a 100644 --- a/biomes/temperate/tem-plateau.json +++ b/biomes/temperate/tem-plateau.json @@ -63,7 +63,32 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "name": "standard-surface-portals", diff --git a/biomes/temperate/tem-sakura-pink-child.json b/biomes/temperate/tem-sakura-pink-child.json index bcf06db1..382ece15 100644 --- a/biomes/temperate/tem-sakura-pink-child.json +++ b/biomes/temperate/tem-sakura-pink-child.json @@ -41,7 +41,32 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "chance": 0.1, diff --git a/biomes/temperate/tem-sakura-pink-forest.json b/biomes/temperate/tem-sakura-pink-forest.json index 43383554..64c5b711 100644 --- a/biomes/temperate/tem-sakura-pink-forest.json +++ b/biomes/temperate/tem-sakura-pink-forest.json @@ -49,10 +49,28 @@ ], "entityInitialSpawns": [ { - "entity": "bee", - "maxSpawns": 5, - "minSpawns": 2, - "rarity": 3 + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 } ], "objects": [ diff --git a/biomes/temperate/tem-stranged-plains.json b/biomes/temperate/tem-stranged-plains.json index 70369e93..189c8ad6 100644 --- a/biomes/temperate/tem-stranged-plains.json +++ b/biomes/temperate/tem-stranged-plains.json @@ -225,6 +225,32 @@ ] } ], + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 3, + "minSpawns": 1, + "rarity": 7 + } + ], "biomeZoom": 60, "biomeStyle": {"style": "IRIS"}, "wall": {"palette": [ diff --git a/biomes/temperate/tem-wilds.json b/biomes/temperate/tem-wilds.json index d2c701dd..4162c1e5 100644 --- a/biomes/temperate/tem-wilds.json +++ b/biomes/temperate/tem-wilds.json @@ -81,7 +81,32 @@ "style": {"style": "IRIS"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "effects": [{ "interval": 250, "chance": 5, diff --git a/biomes/tropical/tro-bamboo-forest.json b/biomes/tropical/tro-bamboo-forest.json index 10a62c8a..17686d08 100644 --- a/biomes/tropical/tro-bamboo-forest.json +++ b/biomes/tropical/tro-bamboo-forest.json @@ -12,7 +12,7 @@ }], "customDerivitives": [{ "id": "trobamboo", - "foliageColor": "#20A52F", + "foliageColor": "#44A906", "grassColor": "#1E7307", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2", @@ -99,7 +99,7 @@ "replace": {"palette": [{"block": "air"}]} }, { - "find": [{"block": "birch_leaves"}], + "find": [{"block": "acacia_leaves"}], "replace": {"palette": [{ "block": "jungle_leaves", "data": {"persistent": true} @@ -107,11 +107,11 @@ }, { "find": [{"block": "stripped_birch_log"}], - "replace": {"palette": [{"block": "jungle_wood"}]} + "replace": {"palette": [{"block": "stripped_jungle_log"}]} }, { "find": [{"block": "stripped_birch_wood"}], - "replace": {"palette": [{"block": "oak_wood"}]} + "replace": {"palette": [{"block": "stripped_jungle_wood"}]} } ], "place": [ @@ -176,7 +176,32 @@ } } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "biomeZoom": 10, "biomeStyle": {"style": "IRIS"}, "effects": [{ diff --git a/biomes/tropical/tro-beach-bamboo.json b/biomes/tropical/tro-beach-bamboo.json index 6157f238..a5328c20 100644 --- a/biomes/tropical/tro-beach-bamboo.json +++ b/biomes/tropical/tro-beach-bamboo.json @@ -31,6 +31,20 @@ "interval": 550, "particleCount": 0 }], + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.03, diff --git a/biomes/tropical/tro-beach-charred.json b/biomes/tropical/tro-beach-charred.json index c204e878..fffc56f3 100644 --- a/biomes/tropical/tro-beach-charred.json +++ b/biomes/tropical/tro-beach-charred.json @@ -31,6 +31,12 @@ "interval": 550, "particleCount": 0 }], + "entityInitialSpawns": [{ + "entity": "wolf", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4 + }], "decorators": [{ "chance": 0.01, "variance": {"style": "STATIC"}, diff --git a/biomes/tropical/tro-beach.json b/biomes/tropical/tro-beach.json index 6b527029..24615200 100644 --- a/biomes/tropical/tro-beach.json +++ b/biomes/tropical/tro-beach.json @@ -31,6 +31,20 @@ "interval": 550, "particleCount": 0 }], + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.01, diff --git a/biomes/tropical/tro-highlands.json b/biomes/tropical/tro-highlands.json index 4c272ad2..4c066c52 100644 --- a/biomes/tropical/tro-highlands.json +++ b/biomes/tropical/tro-highlands.json @@ -11,7 +11,7 @@ }], "customDerivitives": [{ "id": "trohighlands", - "foliageColor": "#478F04", + "foliageColor": "#40C42B", "grassColor": "#41A726", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2", @@ -67,7 +67,32 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "decorators": [ { "chance": 0.003, diff --git a/biomes/tropical/tro-island-beach.json b/biomes/tropical/tro-island-beach.json index a496ba12..0f996cea 100644 --- a/biomes/tropical/tro-island-beach.json +++ b/biomes/tropical/tro-island-beach.json @@ -31,7 +31,20 @@ "interval": 550, "particleCount": 0 }], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.01, diff --git a/biomes/tropical/tro-jungle-denmyre.json b/biomes/tropical/tro-jungle-denmyre.json index e3f3240e..dd0e1272 100644 --- a/biomes/tropical/tro-jungle-denmyre.json +++ b/biomes/tropical/tro-jungle-denmyre.json @@ -56,7 +56,20 @@ "interval": 550, "particleCount": 0 }], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.4, diff --git a/biomes/tropical/tro-mountain-extreme.json b/biomes/tropical/tro-mountain-extreme.json index 16688bcb..5ace1524 100644 --- a/biomes/tropical/tro-mountain-extreme.json +++ b/biomes/tropical/tro-mountain-extreme.json @@ -12,10 +12,10 @@ }], "customDerivitives": [{ "id": "tromtnextreme", - "foliageColor": "#478F04", - "grassColor": "#41A726", + "foliageColor": "#40C42B", + "grassColor": "#5CCA52", "waterColor": "#3AB2A2", - "waterFogColor": "#3FE727", + "waterFogColor": "#3AB2A2", "category": "jungle" }], "layers": [ diff --git a/biomes/tropical/tro-mountain-middle.json b/biomes/tropical/tro-mountain-middle.json index 87632bd9..be0959f5 100644 --- a/biomes/tropical/tro-mountain-middle.json +++ b/biomes/tropical/tro-mountain-middle.json @@ -19,8 +19,8 @@ ], "customDerivitives": [{ "id": "tromtnmiddle", - "foliageColor": "#478F04", - "grassColor": "#41A726", + "foliageColor": "#40C42B", + "grassColor": "#1E7307", "waterColor": "#3AB2A2", "fogColor": "#6DCA87", "category": "jungle" diff --git a/biomes/tropical/tro-mountain-plains.json b/biomes/tropical/tro-mountain-plains.json index 27866edb..94c6bbcf 100644 --- a/biomes/tropical/tro-mountain-plains.json +++ b/biomes/tropical/tro-mountain-plains.json @@ -11,8 +11,8 @@ }], "customDerivitives": [{ "id": "tromtnplains", - "foliageColor": "#258F04", - "grassColor": "#41A726", + "foliageColor": "#40C42B", + "grassColor": "#5CCA52", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" diff --git a/biomes/tropical/tro-mountain.json b/biomes/tropical/tro-mountain.json index 0928a1ca..ffd1b666 100644 --- a/biomes/tropical/tro-mountain.json +++ b/biomes/tropical/tro-mountain.json @@ -12,8 +12,8 @@ }], "customDerivitives": [{ "id": "tromountain", - "foliageColor": "#478F04", - "grassColor": "#41A726", + "foliageColor": "#40C42B", + "grassColor": "#5CCA52", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" diff --git a/biomes/tropical/tro-plains-hills.json b/biomes/tropical/tro-plains-hills.json index fd3459ef..c96ae9ea 100644 --- a/biomes/tropical/tro-plains-hills.json +++ b/biomes/tropical/tro-plains-hills.json @@ -12,7 +12,7 @@ "customDerivitives": [{ "id": "troplainshills", "foliageColor": "#40C42B", - "grassColor": "#41A726", + "grassColor": "#1E7307", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" diff --git a/biomes/tropical/tro-rainforest-hills.json b/biomes/tropical/tro-rainforest-hills.json index c3f5650b..bc766bab 100644 --- a/biomes/tropical/tro-rainforest-hills.json +++ b/biomes/tropical/tro-rainforest-hills.json @@ -11,7 +11,7 @@ }], "customDerivitives": [{ "id": "trohills", - "foliageColor": "#258F04", + "foliageColor": "#40C42B", "grassColor": "#41A726", "category": "jungle", "waterColor": "#3AB2A2", @@ -73,7 +73,20 @@ "interval": 550, "particleCount": 0 }], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.45, diff --git a/biomes/tropical/tro-rainforest-island.json b/biomes/tropical/tro-rainforest-island.json index 37d19b98..4fa3df1c 100644 --- a/biomes/tropical/tro-rainforest-island.json +++ b/biomes/tropical/tro-rainforest-island.json @@ -5,14 +5,14 @@ "color": "#6F9F60", "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", "generators": [{ - "min": 25, + "min": 49, "max": 65, - "generator": "mountain" + "generator": "plain" }], "customDerivitives": [{ "id": "troisle", - "foliageColor": "#258F04", - "grassColor": "#3FE727", + "foliageColor": "#40C42B", + "grassColor": "#2DAF09", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" @@ -54,7 +54,20 @@ "maxHeight": 64, "palette": [{"block": "air"}] }], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "effects": [{ "particleAltX": 0.301, "particleAltY": -0.33885, diff --git a/biomes/tropical/tro-rainforest-wicked-child.json b/biomes/tropical/tro-rainforest-wicked-child.json index b8e1bc74..2152adc9 100644 --- a/biomes/tropical/tro-rainforest-wicked-child.json +++ b/biomes/tropical/tro-rainforest-wicked-child.json @@ -73,7 +73,20 @@ "interval": 550, "particleCount": 3 }], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.45, diff --git a/biomes/tropical/tro-rainforest-wicked-village.json b/biomes/tropical/tro-rainforest-wicked-village.json index ec61d5c8..69f121b0 100644 --- a/biomes/tropical/tro-rainforest-wicked-village.json +++ b/biomes/tropical/tro-rainforest-wicked-village.json @@ -59,7 +59,20 @@ "interval": 550, "particleCount": 0 }], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.45, diff --git a/biomes/tropical/tro-rainforest-wicked.json b/biomes/tropical/tro-rainforest-wicked.json index e10cfa53..be6aed6f 100644 --- a/biomes/tropical/tro-rainforest-wicked.json +++ b/biomes/tropical/tro-rainforest-wicked.json @@ -2,7 +2,7 @@ "name": "Tropical Rainforest Wicked", "derivative": "MODIFIED_JUNGLE", "rarity": 1, - "color": "#10EF15", + "color": "10EF15#", "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", "children": [ "tropical/tro-rainforest-hills", @@ -64,6 +64,20 @@ "interval": 550, "particleCount": 0 }], + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], "decorators": [ { "chance": 0.45, diff --git a/biomes/tropical/tro-rainforest.json b/biomes/tropical/tro-rainforest.json index 0a1e6904..874361c1 100644 --- a/biomes/tropical/tro-rainforest.json +++ b/biomes/tropical/tro-rainforest.json @@ -15,7 +15,7 @@ }], "customDerivitives": [{ "id": "trorainforest", - "foliageColor": "#258F04", + "foliageColor": "#40C42B", "grassColor": "#2DAF09", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2", @@ -63,6 +63,20 @@ "interval": 550, "particleCount": 3 }], + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "ocelot", + "maxSpawns": 2, + "minSpawns": 1, + "rarity": 4 + } + ], "decorators": [ { "chance": 0.45, diff --git a/biomes/tropical/tro-volcanic-plains.json b/biomes/tropical/tro-volcanic-plains.json index 7062586a..04353851 100644 --- a/biomes/tropical/tro-volcanic-plains.json +++ b/biomes/tropical/tro-volcanic-plains.json @@ -10,15 +10,6 @@ "max": 190, "generator": "mountain" }], - "customDerivitives": [ - { - "id": "trovolcanoplains", - "grassColor": "#9BC20D", - "foliageColor": "#9CD320", - "fogColor": "#DD793C", - "downfallType": "none" - } - ], "layers": [ { "style": { diff --git a/biomes/tropical/tro-volcanoes-lava.json b/biomes/tropical/tro-volcanoes-lava.json index 183ce214..c980e9cd 100644 --- a/biomes/tropical/tro-volcanoes-lava.json +++ b/biomes/tropical/tro-volcanoes-lava.json @@ -4,15 +4,6 @@ "vanillaDerivative": "THE_VOID", "rarity": 1, "color": "#50AF52", - "customDerivitives": [ - { - "id": "trovolcanolava", - "grassColor": "#BDBF0B", - "foliageColor": "#BDBF0B", - "fogColor": "#DD793C", - "downfallType": "none" - } - ], "generators": [ { "generator": "mountain", diff --git a/biomes/tropical/tro-volcanoes.json b/biomes/tropical/tro-volcanoes.json index c1b4a7d3..57247faf 100644 --- a/biomes/tropical/tro-volcanoes.json +++ b/biomes/tropical/tro-volcanoes.json @@ -4,15 +4,6 @@ "vanillaDerivative": "THE_VOID", "rarity": 1, "color": "#609F61", - "customDerivitives": [ - { - "id": "trovolcanolava", - "grassColor": "#BDBF0B", - "foliageColor": "#BDBF0B", - "fogColor": "#DD793C", - "downfallType": "none" - } - ], "children": ["tropical/tro-volcanoes-lava"], "generators": [ { diff --git a/biomes/tropical/tro-wilds.json b/biomes/tropical/tro-wilds.json index e07e43d2..01e128e3 100644 --- a/biomes/tropical/tro-wilds.json +++ b/biomes/tropical/tro-wilds.json @@ -11,7 +11,7 @@ "generator": "mountain" }], "customDerivitives": [{ - "id": "trowilds", + "id": "tromtnextreme", "foliageColor": "#2C8806", "grassColor": "#183F0E", "waterColor": "#11BA89", @@ -113,7 +113,32 @@ "style": {"style": "IRIS"} } ], - + "entityInitialSpawns": [ + { + "entity": "cow", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "pig", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "effects": [{ "interval": 250, "chance": 5, diff --git a/biomes/tundra/tun-beach.json b/biomes/tundra/tun-beach.json index 07429ca9..611d43fc 100644 --- a/biomes/tundra/tun-beach.json +++ b/biomes/tundra/tun-beach.json @@ -116,7 +116,26 @@ "mode": "VACUUM", "carvingSupport": "SURFACE_ONLY" }], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "slab": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/tundra/tun-bonsai-forest.json b/biomes/tundra/tun-bonsai-forest.json index f19edb12..ac3b09fb 100644 --- a/biomes/tundra/tun-bonsai-forest.json +++ b/biomes/tundra/tun-bonsai-forest.json @@ -127,7 +127,26 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "chance": 0.00375, diff --git a/biomes/tundra/tun-forest-cliffs.json b/biomes/tundra/tun-forest-cliffs.json index a9a277fa..fe9ad151 100644 --- a/biomes/tundra/tun-forest-cliffs.json +++ b/biomes/tundra/tun-forest-cliffs.json @@ -60,7 +60,26 @@ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "decorators": [ { "chance": 0.01, diff --git a/biomes/tundra/tun-forest.json b/biomes/tundra/tun-forest.json index d62265a5..4cb691b8 100644 --- a/biomes/tundra/tun-forest.json +++ b/biomes/tundra/tun-forest.json @@ -60,7 +60,26 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "place": [ diff --git a/biomes/tundra/tun-lake.json b/biomes/tundra/tun-lake.json index 1f1cc72a..9c470b71 100644 --- a/biomes/tundra/tun-lake.json +++ b/biomes/tundra/tun-lake.json @@ -123,7 +123,26 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "mode": "PAINT", diff --git a/biomes/tundra/tun-magic-forest.json b/biomes/tundra/tun-magic-forest.json index 482fa7db..2133cd40 100644 --- a/biomes/tundra/tun-magic-forest.json +++ b/biomes/tundra/tun-magic-forest.json @@ -62,7 +62,26 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "place": [ diff --git a/biomes/tundra/tun-mountains-cliffs.json b/biomes/tundra/tun-mountains-cliffs.json index 60d4e657..ee1cbe62 100644 --- a/biomes/tundra/tun-mountains-cliffs.json +++ b/biomes/tundra/tun-mountains-cliffs.json @@ -60,7 +60,26 @@ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "decorators": [ { "chance": 0.01, diff --git a/biomes/tundra/tun-mountains.json b/biomes/tundra/tun-mountains.json index 4c58ebd1..52619e74 100644 --- a/biomes/tundra/tun-mountains.json +++ b/biomes/tundra/tun-mountains.json @@ -64,7 +64,26 @@ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "place": [ diff --git a/biomes/tundra/tun-redwood-cliffs.json b/biomes/tundra/tun-redwood-cliffs.json index 75074d91..92959531 100644 --- a/biomes/tundra/tun-redwood-cliffs.json +++ b/biomes/tundra/tun-redwood-cliffs.json @@ -58,7 +58,26 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "wall": { "style": {"style": "FRACTAL_WATER"}, "palette": [ diff --git a/biomes/tundra/tun-redwood-forest.json b/biomes/tundra/tun-redwood-forest.json index 66c6ca99..6f7b9d3a 100644 --- a/biomes/tundra/tun-redwood-forest.json +++ b/biomes/tundra/tun-redwood-forest.json @@ -62,7 +62,26 @@ ] } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "wall": { "style": {"style": "FRACTAL_WATER"}, "palette": [ diff --git a/biomes/tundra/tun-sequia-redwoods.json b/biomes/tundra/tun-sequia-redwoods.json index 92d4dc5d..923ae5a7 100644 --- a/biomes/tundra/tun-sequia-redwoods.json +++ b/biomes/tundra/tun-sequia-redwoods.json @@ -156,7 +156,26 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "place": [ diff --git a/biomes/tundra/tun-spruce-denmyre.json b/biomes/tundra/tun-spruce-denmyre.json index 1605001a..5086b44d 100644 --- a/biomes/tundra/tun-spruce-denmyre.json +++ b/biomes/tundra/tun-spruce-denmyre.json @@ -133,7 +133,26 @@ "style": {"style": "STATIC"} } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [ { "mode": "PAINT", diff --git a/biomes/tundra/tun-taiga.json b/biomes/tundra/tun-taiga.json index 2a85fbbf..85299ad8 100644 --- a/biomes/tundra/tun-taiga.json +++ b/biomes/tundra/tun-taiga.json @@ -288,7 +288,26 @@ } } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "wall": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/tundra/tun-tundra-beach-stone.json b/biomes/tundra/tun-tundra-beach-stone.json index aaeb1512..f8fb6369 100644 --- a/biomes/tundra/tun-tundra-beach-stone.json +++ b/biomes/tundra/tun-tundra-beach-stone.json @@ -24,7 +24,26 @@ "palette": [{"block": "dirt"}] } ], - + "entityInitialSpawns": [ + { + "entity": "chicken", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 7 + } + ], "objects": [{ "name": "standard-surface-portals", "chance": 0.00505, diff --git a/dimensions/overworld.json b/dimensions/overworld.json index e335bae4..a457152c 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -18,17 +18,23 @@ "regions": [ "mushroom", "swamp", - "frozen", + "ocean", "tundra", "temperate", - "ocean", + "frozen", + "hot", "tropical", - "hot" - + "mesa" ], "regionStyle": { "style": "NOWHERE_CELLULAR", - "zoom": 1 + "zoom": 1, + "fracture": { + "multiplier": 18, + "maxFractureAccuracy": true, + "style": "FRACTAL_SMOKE", + "zoom": 1 + } }, "islandBiomeChanceStyle": { "style": "NOWHERE_CELLULAR", diff --git a/entities/donkey.json b/entities/donkey.json deleted file mode 100644 index a571a5a4..00000000 --- a/entities/donkey.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "DONKEY"} diff --git a/entities/glowsquid.json b/entities/glowsquid.json deleted file mode 100644 index cb763085..00000000 --- a/entities/glowsquid.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "GLOW_SQUID", - "glowing": true -} diff --git a/entities/goat.json b/entities/goat.json deleted file mode 100644 index 3477a173..00000000 --- a/entities/goat.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "GOAT"} diff --git a/entities/horse.json b/entities/horse.json deleted file mode 100644 index e4655c8b..00000000 --- a/entities/horse.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "HORSE"} diff --git a/entities/llama.json b/entities/llama.json deleted file mode 100644 index f60cee71..00000000 --- a/entities/llama.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "LLAMA"} diff --git a/entities/mule.json b/entities/mule.json deleted file mode 100644 index 6e12d13b..00000000 --- a/entities/mule.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "MULE"} diff --git a/entities/parrot.json b/entities/parrot.json deleted file mode 100644 index f5371701..00000000 --- a/entities/parrot.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "PARROT"} diff --git a/entities/rabbit.json b/entities/rabbit.json deleted file mode 100644 index bd623b85..00000000 --- a/entities/rabbit.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "RABBIT"} diff --git a/entities/turtle.json b/entities/turtle.json deleted file mode 100644 index 659fd6b6..00000000 --- a/entities/turtle.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "TURTLE"} diff --git a/entities/wanderingtrader.json b/entities/wanderingtrader.json deleted file mode 100644 index 1f51f397..00000000 --- a/entities/wanderingtrader.json +++ /dev/null @@ -1,10 +0,0 @@ -{"type": "HORSE", -"customName": "THE WANDERING HORSE", -"passengers": [ - { - "type": "WANDERING_TRADER", - "customName": "THE WANDERING TRADER!", - "invulnerable": true - } -] -} diff --git a/objects/FloatIsle/f-1.iob b/objects/FloatIsle/f-1.iob new file mode 100644 index 00000000..2114b325 Binary files /dev/null and b/objects/FloatIsle/f-1.iob differ diff --git a/objects/trees/acacia/denmyre1.iob b/objects/acacia-medium/acacia-denmyre-1.iob similarity index 100% rename from objects/trees/acacia/denmyre1.iob rename to objects/acacia-medium/acacia-denmyre-1.iob diff --git a/objects/trees/acacia/denmyre2.iob b/objects/acacia-medium/acacia-denmyre-10.iob similarity index 100% rename from objects/trees/acacia/denmyre2.iob rename to objects/acacia-medium/acacia-denmyre-10.iob diff --git a/objects/trees/acacia/denmyre3.iob b/objects/acacia-medium/acacia-denmyre-11.iob similarity index 100% rename from objects/trees/acacia/denmyre3.iob rename to objects/acacia-medium/acacia-denmyre-11.iob diff --git a/objects/trees/acacia/denmyre4.iob b/objects/acacia-medium/acacia-denmyre-12.iob similarity index 100% rename from objects/trees/acacia/denmyre4.iob rename to objects/acacia-medium/acacia-denmyre-12.iob diff --git a/objects/trees/acacia/denmyre5.iob b/objects/acacia-medium/acacia-denmyre-13.iob similarity index 100% rename from objects/trees/acacia/denmyre5.iob rename to objects/acacia-medium/acacia-denmyre-13.iob diff --git a/objects/trees/acacia/denmyre6.iob b/objects/acacia-medium/acacia-denmyre-14.iob similarity index 100% rename from objects/trees/acacia/denmyre6.iob rename to objects/acacia-medium/acacia-denmyre-14.iob diff --git a/objects/trees/acacia/denmyre7.iob b/objects/acacia-medium/acacia-denmyre-15.iob similarity index 100% rename from objects/trees/acacia/denmyre7.iob rename to objects/acacia-medium/acacia-denmyre-15.iob diff --git a/objects/trees/acacia/denmyre8.iob b/objects/acacia-medium/acacia-denmyre-16.iob similarity index 100% rename from objects/trees/acacia/denmyre8.iob rename to objects/acacia-medium/acacia-denmyre-16.iob diff --git a/objects/trees/acacia/denmyre9.iob b/objects/acacia-medium/acacia-denmyre-2.iob similarity index 100% rename from objects/trees/acacia/denmyre9.iob rename to objects/acacia-medium/acacia-denmyre-2.iob diff --git a/objects/trees/acacia/denmyre10.iob b/objects/acacia-medium/acacia-denmyre-3.iob similarity index 100% rename from objects/trees/acacia/denmyre10.iob rename to objects/acacia-medium/acacia-denmyre-3.iob diff --git a/objects/trees/acacia/denmyre11.iob b/objects/acacia-medium/acacia-denmyre-4.iob similarity index 100% rename from objects/trees/acacia/denmyre11.iob rename to objects/acacia-medium/acacia-denmyre-4.iob diff --git a/objects/trees/acacia/denmyre12.iob b/objects/acacia-medium/acacia-denmyre-5.iob similarity index 100% rename from objects/trees/acacia/denmyre12.iob rename to objects/acacia-medium/acacia-denmyre-5.iob diff --git a/objects/trees/acacia/denmyre13.iob b/objects/acacia-medium/acacia-denmyre-6.iob similarity index 100% rename from objects/trees/acacia/denmyre13.iob rename to objects/acacia-medium/acacia-denmyre-6.iob diff --git a/objects/trees/acacia/denmyre14.iob b/objects/acacia-medium/acacia-denmyre-7.iob similarity index 100% rename from objects/trees/acacia/denmyre14.iob rename to objects/acacia-medium/acacia-denmyre-7.iob diff --git a/objects/trees/acacia/denmyre15.iob b/objects/acacia-medium/acacia-denmyre-8.iob similarity index 100% rename from objects/trees/acacia/denmyre15.iob rename to objects/acacia-medium/acacia-denmyre-8.iob diff --git a/objects/trees/acacia/denmyre16.iob b/objects/acacia-medium/acacia-denmyre-9.iob similarity index 100% rename from objects/trees/acacia/denmyre16.iob rename to objects/acacia-medium/acacia-denmyre-9.iob diff --git a/objects/amethyst/ame1.iob b/objects/amethyst/ame1.iob new file mode 100644 index 00000000..3dbb6f55 Binary files /dev/null and b/objects/amethyst/ame1.iob differ diff --git a/objects/amethyst/ame2.iob b/objects/amethyst/ame2.iob new file mode 100644 index 00000000..8d73f5f9 Binary files /dev/null and b/objects/amethyst/ame2.iob differ diff --git a/objects/amethyst/ame3.iob b/objects/amethyst/ame3.iob new file mode 100644 index 00000000..d05c4e2d Binary files /dev/null and b/objects/amethyst/ame3.iob differ diff --git a/objects/amethyst/ame4.iob b/objects/amethyst/ame4.iob new file mode 100644 index 00000000..f598a0be Binary files /dev/null and b/objects/amethyst/ame4.iob differ diff --git a/objects/amethyst/ame5.iob b/objects/amethyst/ame5.iob new file mode 100644 index 00000000..c2fc945c Binary files /dev/null and b/objects/amethyst/ame5.iob differ diff --git a/objects/amethyst/ame6.iob b/objects/amethyst/ame6.iob new file mode 100644 index 00000000..3ca7aa51 Binary files /dev/null and b/objects/amethyst/ame6.iob differ diff --git a/objects/trees/birch/arid1.iob b/objects/arid-birch/arid-birch1.iob similarity index 100% rename from objects/trees/birch/arid1.iob rename to objects/arid-birch/arid-birch1.iob diff --git a/objects/trees/birch/arid2.iob b/objects/arid-birch/arid-birch2.iob similarity index 100% rename from objects/trees/birch/arid2.iob rename to objects/arid-birch/arid-birch2.iob diff --git a/objects/trees/birch/arid3.iob b/objects/arid-birch/arid-birch3.iob similarity index 100% rename from objects/trees/birch/arid3.iob rename to objects/arid-birch/arid-birch3.iob diff --git a/objects/trees/birch/arid4.iob b/objects/arid-birch/arid-birch4.iob similarity index 100% rename from objects/trees/birch/arid4.iob rename to objects/arid-birch/arid-birch4.iob diff --git a/objects/trees/birch/arid5.iob b/objects/arid-birch/arid-birch5.iob similarity index 100% rename from objects/trees/birch/arid5.iob rename to objects/arid-birch/arid-birch5.iob diff --git a/objects/trees/birch/arid6.iob b/objects/arid-birch/arid-birch6.iob similarity index 100% rename from objects/trees/birch/arid6.iob rename to objects/arid-birch/arid-birch6.iob diff --git a/objects/trees/birch/arid7.iob b/objects/arid-birch/arid-birch7.iob similarity index 100% rename from objects/trees/birch/arid7.iob rename to objects/arid-birch/arid-birch7.iob diff --git a/objects/trees/oak/arid1.iob b/objects/arid-oak/arid-oak1.iob similarity index 100% rename from objects/trees/oak/arid1.iob rename to objects/arid-oak/arid-oak1.iob diff --git a/objects/trees/oak/arid2.iob b/objects/arid-oak/arid-oak2.iob similarity index 100% rename from objects/trees/oak/arid2.iob rename to objects/arid-oak/arid-oak2.iob diff --git a/objects/trees/oak/arid3.iob b/objects/arid-oak/arid-oak3.iob similarity index 100% rename from objects/trees/oak/arid3.iob rename to objects/arid-oak/arid-oak3.iob diff --git a/objects/trees/oak/arid4.iob b/objects/arid-oak/arid-oak4.iob similarity index 100% rename from objects/trees/oak/arid4.iob rename to objects/arid-oak/arid-oak4.iob diff --git a/objects/trees/oak/arid5.iob b/objects/arid-oak/arid-oak5.iob similarity index 100% rename from objects/trees/oak/arid5.iob rename to objects/arid-oak/arid-oak5.iob diff --git a/objects/trees/oak/arid6.iob b/objects/arid-oak/arid-oak6.iob similarity index 100% rename from objects/trees/oak/arid6.iob rename to objects/arid-oak/arid-oak6.iob diff --git a/objects/trees/oak/arid7.iob b/objects/arid-oak/arid-oak7.iob similarity index 100% rename from objects/trees/oak/arid7.iob rename to objects/arid-oak/arid-oak7.iob diff --git a/objects/trees/spruce/aridpine1.iob b/objects/arid-pine/arid-pine1.iob similarity index 100% rename from objects/trees/spruce/aridpine1.iob rename to objects/arid-pine/arid-pine1.iob diff --git a/objects/trees/spruce/aridpine2.iob b/objects/arid-pine/arid-pine2.iob similarity index 100% rename from objects/trees/spruce/aridpine2.iob rename to objects/arid-pine/arid-pine2.iob diff --git a/objects/trees/spruce/aridpine3.iob b/objects/arid-pine/arid-pine3.iob similarity index 100% rename from objects/trees/spruce/aridpine3.iob rename to objects/arid-pine/arid-pine3.iob diff --git a/objects/trees/spruce/aridpine4.iob b/objects/arid-pine/arid-pine4.iob similarity index 100% rename from objects/trees/spruce/aridpine4.iob rename to objects/arid-pine/arid-pine4.iob diff --git a/objects/trees/spruce/aridpine5.iob b/objects/arid-pine/arid-pine5.iob similarity index 100% rename from objects/trees/spruce/aridpine5.iob rename to objects/arid-pine/arid-pine5.iob diff --git a/objects/trees/spruce/aridgeneric1.iob b/objects/arid-spruce/arid-spruce1.iob similarity index 100% rename from objects/trees/spruce/aridgeneric1.iob rename to objects/arid-spruce/arid-spruce1.iob diff --git a/objects/trees/spruce/aridgeneric2.iob b/objects/arid-spruce/arid-spruce2.iob similarity index 100% rename from objects/trees/spruce/aridgeneric2.iob rename to objects/arid-spruce/arid-spruce2.iob diff --git a/objects/trees/spruce/aridgeneric3.iob b/objects/arid-spruce/arid-spruce3.iob similarity index 100% rename from objects/trees/spruce/aridgeneric3.iob rename to objects/arid-spruce/arid-spruce3.iob diff --git a/objects/trees/spruce/aridgeneric4.iob b/objects/arid-spruce/arid-spruce4.iob similarity index 100% rename from objects/trees/spruce/aridgeneric4.iob rename to objects/arid-spruce/arid-spruce4.iob diff --git a/objects/trees/spruce/aridgeneric5.iob b/objects/arid-spruce/arid-spruce5.iob similarity index 100% rename from objects/trees/spruce/aridgeneric5.iob rename to objects/arid-spruce/arid-spruce5.iob diff --git a/objects/jigsaw/bastion/blocks/air.iob b/objects/bastion/blocks/air.iob similarity index 100% rename from objects/jigsaw/bastion/blocks/air.iob rename to objects/bastion/blocks/air.iob diff --git a/objects/jigsaw/bastion/blocks/gold.iob b/objects/bastion/blocks/gold.iob similarity index 100% rename from objects/jigsaw/bastion/blocks/gold.iob rename to objects/bastion/blocks/gold.iob diff --git a/objects/jigsaw/bastion/bridge/bridge_pieces/bridge.iob b/objects/bastion/bridge/bridge_pieces/bridge.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/bridge_pieces/bridge.iob rename to objects/bastion/bridge/bridge_pieces/bridge.iob diff --git a/objects/jigsaw/bastion/bridge/connectors/back_bridge_bottom.iob b/objects/bastion/bridge/connectors/back_bridge_bottom.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/connectors/back_bridge_bottom.iob rename to objects/bastion/bridge/connectors/back_bridge_bottom.iob diff --git a/objects/jigsaw/bastion/bridge/connectors/back_bridge_top.iob b/objects/bastion/bridge/connectors/back_bridge_top.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/connectors/back_bridge_top.iob rename to objects/bastion/bridge/connectors/back_bridge_top.iob diff --git a/objects/jigsaw/bastion/bridge/legs/leg_0.iob b/objects/bastion/bridge/legs/leg_0.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/legs/leg_0.iob rename to objects/bastion/bridge/legs/leg_0.iob diff --git a/objects/jigsaw/bastion/bridge/legs/leg_1.iob b/objects/bastion/bridge/legs/leg_1.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/legs/leg_1.iob rename to objects/bastion/bridge/legs/leg_1.iob diff --git a/objects/jigsaw/bastion/bridge/rampart_plates/plate_0.iob b/objects/bastion/bridge/rampart_plates/plate_0.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/rampart_plates/plate_0.iob rename to objects/bastion/bridge/rampart_plates/plate_0.iob diff --git a/objects/jigsaw/bastion/bridge/ramparts/rampart_0.iob b/objects/bastion/bridge/ramparts/rampart_0.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/ramparts/rampart_0.iob rename to objects/bastion/bridge/ramparts/rampart_0.iob diff --git a/objects/jigsaw/bastion/bridge/ramparts/rampart_1.iob b/objects/bastion/bridge/ramparts/rampart_1.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/ramparts/rampart_1.iob rename to objects/bastion/bridge/ramparts/rampart_1.iob diff --git a/objects/jigsaw/bastion/bridge/starting_pieces/entrance.iob b/objects/bastion/bridge/starting_pieces/entrance.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/starting_pieces/entrance.iob rename to objects/bastion/bridge/starting_pieces/entrance.iob diff --git a/objects/jigsaw/bastion/bridge/starting_pieces/entrance_base.iob b/objects/bastion/bridge/starting_pieces/entrance_base.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/starting_pieces/entrance_base.iob rename to objects/bastion/bridge/starting_pieces/entrance_base.iob diff --git a/objects/jigsaw/bastion/bridge/starting_pieces/entrance_face.iob b/objects/bastion/bridge/starting_pieces/entrance_face.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/starting_pieces/entrance_face.iob rename to objects/bastion/bridge/starting_pieces/entrance_face.iob diff --git a/objects/jigsaw/bastion/bridge/walls/wall_base_0.iob b/objects/bastion/bridge/walls/wall_base_0.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/walls/wall_base_0.iob rename to objects/bastion/bridge/walls/wall_base_0.iob diff --git a/objects/jigsaw/bastion/bridge/walls/wall_base_1.iob b/objects/bastion/bridge/walls/wall_base_1.iob similarity index 100% rename from objects/jigsaw/bastion/bridge/walls/wall_base_1.iob rename to objects/bastion/bridge/walls/wall_base_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/air_base.iob b/objects/bastion/hoglin_stable/air_base.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/air_base.iob rename to objects/bastion/hoglin_stable/air_base.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/connectors/end_post_connector.iob b/objects/bastion/hoglin_stable/connectors/end_post_connector.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/connectors/end_post_connector.iob rename to objects/bastion/hoglin_stable/connectors/end_post_connector.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_0.iob b/objects/bastion/hoglin_stable/large_stables/inner_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/inner_0.iob rename to objects/bastion/hoglin_stable/large_stables/inner_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_1.iob b/objects/bastion/hoglin_stable/large_stables/inner_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/inner_1.iob rename to objects/bastion/hoglin_stable/large_stables/inner_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_2.iob b/objects/bastion/hoglin_stable/large_stables/inner_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/inner_2.iob rename to objects/bastion/hoglin_stable/large_stables/inner_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_3.iob b/objects/bastion/hoglin_stable/large_stables/inner_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/inner_3.iob rename to objects/bastion/hoglin_stable/large_stables/inner_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_4.iob b/objects/bastion/hoglin_stable/large_stables/inner_4.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/inner_4.iob rename to objects/bastion/hoglin_stable/large_stables/inner_4.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_0.iob b/objects/bastion/hoglin_stable/large_stables/outer_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/outer_0.iob rename to objects/bastion/hoglin_stable/large_stables/outer_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_1.iob b/objects/bastion/hoglin_stable/large_stables/outer_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/outer_1.iob rename to objects/bastion/hoglin_stable/large_stables/outer_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_2.iob b/objects/bastion/hoglin_stable/large_stables/outer_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/outer_2.iob rename to objects/bastion/hoglin_stable/large_stables/outer_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_3.iob b/objects/bastion/hoglin_stable/large_stables/outer_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/outer_3.iob rename to objects/bastion/hoglin_stable/large_stables/outer_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_4.iob b/objects/bastion/hoglin_stable/large_stables/outer_4.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/large_stables/outer_4.iob rename to objects/bastion/hoglin_stable/large_stables/outer_4.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/posts/end_post.iob b/objects/bastion/hoglin_stable/posts/end_post.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/posts/end_post.iob rename to objects/bastion/hoglin_stable/posts/end_post.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/posts/stair_post.iob b/objects/bastion/hoglin_stable/posts/stair_post.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/posts/stair_post.iob rename to objects/bastion/hoglin_stable/posts/stair_post.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/rampart_plates/rampart_plate_1.iob b/objects/bastion/hoglin_stable/rampart_plates/rampart_plate_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/rampart_plates/rampart_plate_1.iob rename to objects/bastion/hoglin_stable/rampart_plates/rampart_plate_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_1.iob b/objects/bastion/hoglin_stable/ramparts/ramparts_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_1.iob rename to objects/bastion/hoglin_stable/ramparts/ramparts_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_2.iob b/objects/bastion/hoglin_stable/ramparts/ramparts_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_2.iob rename to objects/bastion/hoglin_stable/ramparts/ramparts_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_3.iob b/objects/bastion/hoglin_stable/ramparts/ramparts_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_3.iob rename to objects/bastion/hoglin_stable/ramparts/ramparts_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/inner_0.iob b/objects/bastion/hoglin_stable/small_stables/inner_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/inner_0.iob rename to objects/bastion/hoglin_stable/small_stables/inner_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/inner_1.iob b/objects/bastion/hoglin_stable/small_stables/inner_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/inner_1.iob rename to objects/bastion/hoglin_stable/small_stables/inner_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/inner_2.iob b/objects/bastion/hoglin_stable/small_stables/inner_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/inner_2.iob rename to objects/bastion/hoglin_stable/small_stables/inner_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/inner_3.iob b/objects/bastion/hoglin_stable/small_stables/inner_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/inner_3.iob rename to objects/bastion/hoglin_stable/small_stables/inner_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/outer_0.iob b/objects/bastion/hoglin_stable/small_stables/outer_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/outer_0.iob rename to objects/bastion/hoglin_stable/small_stables/outer_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/outer_1.iob b/objects/bastion/hoglin_stable/small_stables/outer_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/outer_1.iob rename to objects/bastion/hoglin_stable/small_stables/outer_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/outer_2.iob b/objects/bastion/hoglin_stable/small_stables/outer_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/outer_2.iob rename to objects/bastion/hoglin_stable/small_stables/outer_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/small_stables/outer_3.iob b/objects/bastion/hoglin_stable/small_stables/outer_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/small_stables/outer_3.iob rename to objects/bastion/hoglin_stable/small_stables/outer_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_0.iob b/objects/bastion/hoglin_stable/stairs/stairs_1_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_0.iob rename to objects/bastion/hoglin_stable/stairs/stairs_1_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_1.iob b/objects/bastion/hoglin_stable/stairs/stairs_1_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_1.iob rename to objects/bastion/hoglin_stable/stairs/stairs_1_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_2.iob b/objects/bastion/hoglin_stable/stairs/stairs_1_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_2.iob rename to objects/bastion/hoglin_stable/stairs/stairs_1_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_3.iob b/objects/bastion/hoglin_stable/stairs/stairs_1_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_3.iob rename to objects/bastion/hoglin_stable/stairs/stairs_1_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_4.iob b/objects/bastion/hoglin_stable/stairs/stairs_1_4.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_4.iob rename to objects/bastion/hoglin_stable/stairs/stairs_1_4.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_0.iob b/objects/bastion/hoglin_stable/stairs/stairs_2_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_0.iob rename to objects/bastion/hoglin_stable/stairs/stairs_2_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_1.iob b/objects/bastion/hoglin_stable/stairs/stairs_2_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_1.iob rename to objects/bastion/hoglin_stable/stairs/stairs_2_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_2.iob b/objects/bastion/hoglin_stable/stairs/stairs_2_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_2.iob rename to objects/bastion/hoglin_stable/stairs/stairs_2_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_3.iob b/objects/bastion/hoglin_stable/stairs/stairs_2_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_3.iob rename to objects/bastion/hoglin_stable/stairs/stairs_2_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_4.iob b/objects/bastion/hoglin_stable/stairs/stairs_2_4.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_4.iob rename to objects/bastion/hoglin_stable/stairs/stairs_2_4.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_0.iob b/objects/bastion/hoglin_stable/stairs/stairs_3_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_0.iob rename to objects/bastion/hoglin_stable/stairs/stairs_3_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_1.iob b/objects/bastion/hoglin_stable/stairs/stairs_3_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_1.iob rename to objects/bastion/hoglin_stable/stairs/stairs_3_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_2.iob b/objects/bastion/hoglin_stable/stairs/stairs_3_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_2.iob rename to objects/bastion/hoglin_stable/stairs/stairs_3_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_3.iob b/objects/bastion/hoglin_stable/stairs/stairs_3_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_3.iob rename to objects/bastion/hoglin_stable/stairs/stairs_3_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_4.iob b/objects/bastion/hoglin_stable/stairs/stairs_3_4.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_4.iob rename to objects/bastion/hoglin_stable/stairs/stairs_3_4.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.iob b/objects/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.iob rename to objects/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.iob b/objects/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.iob rename to objects/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.iob b/objects/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.iob rename to objects/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.iob b/objects/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.iob rename to objects/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.iob b/objects/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.iob rename to objects/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_0.iob b/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_0.iob rename to objects/bastion/hoglin_stable/starting_pieces/starting_stairs_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_1.iob b/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_1.iob rename to objects/bastion/hoglin_stable/starting_pieces/starting_stairs_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_2.iob b/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_2.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_2.iob rename to objects/bastion/hoglin_stable/starting_pieces/starting_stairs_2.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_3.iob b/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_3.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_3.iob rename to objects/bastion/hoglin_stable/starting_pieces/starting_stairs_3.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_4.iob b/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_4.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_4.iob rename to objects/bastion/hoglin_stable/starting_pieces/starting_stairs_4.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/walls/side_wall_0.iob b/objects/bastion/hoglin_stable/walls/side_wall_0.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/walls/side_wall_0.iob rename to objects/bastion/hoglin_stable/walls/side_wall_0.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/walls/side_wall_1.iob b/objects/bastion/hoglin_stable/walls/side_wall_1.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/walls/side_wall_1.iob rename to objects/bastion/hoglin_stable/walls/side_wall_1.iob diff --git a/objects/jigsaw/bastion/hoglin_stable/walls/wall_base.iob b/objects/bastion/hoglin_stable/walls/wall_base.iob similarity index 100% rename from objects/jigsaw/bastion/hoglin_stable/walls/wall_base.iob rename to objects/bastion/hoglin_stable/walls/wall_base.iob diff --git a/objects/jigsaw/bastion/mobs/crossbow_piglin.iob b/objects/bastion/mobs/crossbow_piglin.iob similarity index 100% rename from objects/jigsaw/bastion/mobs/crossbow_piglin.iob rename to objects/bastion/mobs/crossbow_piglin.iob diff --git a/objects/jigsaw/bastion/mobs/empty.iob b/objects/bastion/mobs/empty.iob similarity index 100% rename from objects/jigsaw/bastion/mobs/empty.iob rename to objects/bastion/mobs/empty.iob diff --git a/objects/jigsaw/bastion/mobs/hoglin.iob b/objects/bastion/mobs/hoglin.iob similarity index 100% rename from objects/jigsaw/bastion/mobs/hoglin.iob rename to objects/bastion/mobs/hoglin.iob diff --git a/objects/jigsaw/bastion/mobs/melee_piglin.iob b/objects/bastion/mobs/melee_piglin.iob similarity index 100% rename from objects/jigsaw/bastion/mobs/melee_piglin.iob rename to objects/bastion/mobs/melee_piglin.iob diff --git a/objects/jigsaw/bastion/mobs/melee_piglin_always.iob b/objects/bastion/mobs/melee_piglin_always.iob similarity index 100% rename from objects/jigsaw/bastion/mobs/melee_piglin_always.iob rename to objects/bastion/mobs/melee_piglin_always.iob diff --git a/objects/jigsaw/bastion/mobs/sword_piglin.iob b/objects/bastion/mobs/sword_piglin.iob similarity index 100% rename from objects/jigsaw/bastion/mobs/sword_piglin.iob rename to objects/bastion/mobs/sword_piglin.iob diff --git a/objects/jigsaw/bastion/treasure/bases/centers/center_0.iob b/objects/bastion/treasure/bases/centers/center_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/bases/centers/center_0.iob rename to objects/bastion/treasure/bases/centers/center_0.iob diff --git a/objects/jigsaw/bastion/treasure/bases/centers/center_1.iob b/objects/bastion/treasure/bases/centers/center_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/bases/centers/center_1.iob rename to objects/bastion/treasure/bases/centers/center_1.iob diff --git a/objects/jigsaw/bastion/treasure/bases/centers/center_2.iob b/objects/bastion/treasure/bases/centers/center_2.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/bases/centers/center_2.iob rename to objects/bastion/treasure/bases/centers/center_2.iob diff --git a/objects/jigsaw/bastion/treasure/bases/centers/center_3.iob b/objects/bastion/treasure/bases/centers/center_3.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/bases/centers/center_3.iob rename to objects/bastion/treasure/bases/centers/center_3.iob diff --git a/objects/jigsaw/bastion/treasure/bases/lava_basin.iob b/objects/bastion/treasure/bases/lava_basin.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/bases/lava_basin.iob rename to objects/bastion/treasure/bases/lava_basin.iob diff --git a/objects/jigsaw/bastion/treasure/big_air_full.iob b/objects/bastion/treasure/big_air_full.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/big_air_full.iob rename to objects/bastion/treasure/big_air_full.iob diff --git a/objects/jigsaw/bastion/treasure/brains/center_brain.iob b/objects/bastion/treasure/brains/center_brain.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/brains/center_brain.iob rename to objects/bastion/treasure/brains/center_brain.iob diff --git a/objects/jigsaw/bastion/treasure/connectors/center_to_wall_middle.iob b/objects/bastion/treasure/connectors/center_to_wall_middle.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/connectors/center_to_wall_middle.iob rename to objects/bastion/treasure/connectors/center_to_wall_middle.iob diff --git a/objects/jigsaw/bastion/treasure/connectors/center_to_wall_top.iob b/objects/bastion/treasure/connectors/center_to_wall_top.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/connectors/center_to_wall_top.iob rename to objects/bastion/treasure/connectors/center_to_wall_top.iob diff --git a/objects/jigsaw/bastion/treasure/connectors/center_to_wall_top_entrance.iob b/objects/bastion/treasure/connectors/center_to_wall_top_entrance.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/connectors/center_to_wall_top_entrance.iob rename to objects/bastion/treasure/connectors/center_to_wall_top_entrance.iob diff --git a/objects/jigsaw/bastion/treasure/corners/bottom/corner_0.iob b/objects/bastion/treasure/corners/bottom/corner_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/bottom/corner_0.iob rename to objects/bastion/treasure/corners/bottom/corner_0.iob diff --git a/objects/jigsaw/bastion/treasure/corners/bottom/corner_1.iob b/objects/bastion/treasure/corners/bottom/corner_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/bottom/corner_1.iob rename to objects/bastion/treasure/corners/bottom/corner_1.iob diff --git a/objects/jigsaw/bastion/treasure/corners/edges/bottom.iob b/objects/bastion/treasure/corners/edges/bottom.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/edges/bottom.iob rename to objects/bastion/treasure/corners/edges/bottom.iob diff --git a/objects/jigsaw/bastion/treasure/corners/edges/middle.iob b/objects/bastion/treasure/corners/edges/middle.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/edges/middle.iob rename to objects/bastion/treasure/corners/edges/middle.iob diff --git a/objects/jigsaw/bastion/treasure/corners/edges/top.iob b/objects/bastion/treasure/corners/edges/top.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/edges/top.iob rename to objects/bastion/treasure/corners/edges/top.iob diff --git a/objects/jigsaw/bastion/treasure/corners/middle/corner_0.iob b/objects/bastion/treasure/corners/middle/corner_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/middle/corner_0.iob rename to objects/bastion/treasure/corners/middle/corner_0.iob diff --git a/objects/jigsaw/bastion/treasure/corners/middle/corner_1.iob b/objects/bastion/treasure/corners/middle/corner_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/middle/corner_1.iob rename to objects/bastion/treasure/corners/middle/corner_1.iob diff --git a/objects/jigsaw/bastion/treasure/corners/top/corner_0.iob b/objects/bastion/treasure/corners/top/corner_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/top/corner_0.iob rename to objects/bastion/treasure/corners/top/corner_0.iob diff --git a/objects/jigsaw/bastion/treasure/corners/top/corner_1.iob b/objects/bastion/treasure/corners/top/corner_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/corners/top/corner_1.iob rename to objects/bastion/treasure/corners/top/corner_1.iob diff --git a/objects/jigsaw/bastion/treasure/entrances/entrance_0.iob b/objects/bastion/treasure/entrances/entrance_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/entrances/entrance_0.iob rename to objects/bastion/treasure/entrances/entrance_0.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/empty.iob b/objects/bastion/treasure/extensions/empty.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/empty.iob rename to objects/bastion/treasure/extensions/empty.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/fire_room.iob b/objects/bastion/treasure/extensions/fire_room.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/fire_room.iob rename to objects/bastion/treasure/extensions/fire_room.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/house_0.iob b/objects/bastion/treasure/extensions/house_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/house_0.iob rename to objects/bastion/treasure/extensions/house_0.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/house_1.iob b/objects/bastion/treasure/extensions/house_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/house_1.iob rename to objects/bastion/treasure/extensions/house_1.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/large_bridge_0.iob b/objects/bastion/treasure/extensions/large_bridge_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/large_bridge_0.iob rename to objects/bastion/treasure/extensions/large_bridge_0.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/large_bridge_1.iob b/objects/bastion/treasure/extensions/large_bridge_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/large_bridge_1.iob rename to objects/bastion/treasure/extensions/large_bridge_1.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/large_bridge_2.iob b/objects/bastion/treasure/extensions/large_bridge_2.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/large_bridge_2.iob rename to objects/bastion/treasure/extensions/large_bridge_2.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/large_bridge_3.iob b/objects/bastion/treasure/extensions/large_bridge_3.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/large_bridge_3.iob rename to objects/bastion/treasure/extensions/large_bridge_3.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/roofed_bridge.iob b/objects/bastion/treasure/extensions/roofed_bridge.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/roofed_bridge.iob rename to objects/bastion/treasure/extensions/roofed_bridge.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/small_bridge_0.iob b/objects/bastion/treasure/extensions/small_bridge_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/small_bridge_0.iob rename to objects/bastion/treasure/extensions/small_bridge_0.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/small_bridge_1.iob b/objects/bastion/treasure/extensions/small_bridge_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/small_bridge_1.iob rename to objects/bastion/treasure/extensions/small_bridge_1.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/small_bridge_2.iob b/objects/bastion/treasure/extensions/small_bridge_2.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/small_bridge_2.iob rename to objects/bastion/treasure/extensions/small_bridge_2.iob diff --git a/objects/jigsaw/bastion/treasure/extensions/small_bridge_3.iob b/objects/bastion/treasure/extensions/small_bridge_3.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/extensions/small_bridge_3.iob rename to objects/bastion/treasure/extensions/small_bridge_3.iob diff --git a/objects/jigsaw/bastion/treasure/ramparts/bottom_wall_0.iob b/objects/bastion/treasure/ramparts/bottom_wall_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/ramparts/bottom_wall_0.iob rename to objects/bastion/treasure/ramparts/bottom_wall_0.iob diff --git a/objects/jigsaw/bastion/treasure/ramparts/lava_basin_main.iob b/objects/bastion/treasure/ramparts/lava_basin_main.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/ramparts/lava_basin_main.iob rename to objects/bastion/treasure/ramparts/lava_basin_main.iob diff --git a/objects/jigsaw/bastion/treasure/ramparts/lava_basin_side.iob b/objects/bastion/treasure/ramparts/lava_basin_side.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/ramparts/lava_basin_side.iob rename to objects/bastion/treasure/ramparts/lava_basin_side.iob diff --git a/objects/jigsaw/bastion/treasure/ramparts/mid_wall_main.iob b/objects/bastion/treasure/ramparts/mid_wall_main.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/ramparts/mid_wall_main.iob rename to objects/bastion/treasure/ramparts/mid_wall_main.iob diff --git a/objects/jigsaw/bastion/treasure/ramparts/mid_wall_side.iob b/objects/bastion/treasure/ramparts/mid_wall_side.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/ramparts/mid_wall_side.iob rename to objects/bastion/treasure/ramparts/mid_wall_side.iob diff --git a/objects/jigsaw/bastion/treasure/ramparts/top_wall.iob b/objects/bastion/treasure/ramparts/top_wall.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/ramparts/top_wall.iob rename to objects/bastion/treasure/ramparts/top_wall.iob diff --git a/objects/jigsaw/bastion/treasure/roofs/center_roof.iob b/objects/bastion/treasure/roofs/center_roof.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/roofs/center_roof.iob rename to objects/bastion/treasure/roofs/center_roof.iob diff --git a/objects/jigsaw/bastion/treasure/roofs/corner_roof.iob b/objects/bastion/treasure/roofs/corner_roof.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/roofs/corner_roof.iob rename to objects/bastion/treasure/roofs/corner_roof.iob diff --git a/objects/jigsaw/bastion/treasure/roofs/wall_roof.iob b/objects/bastion/treasure/roofs/wall_roof.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/roofs/wall_roof.iob rename to objects/bastion/treasure/roofs/wall_roof.iob diff --git a/objects/jigsaw/bastion/treasure/stairs/lower_stairs.iob b/objects/bastion/treasure/stairs/lower_stairs.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/stairs/lower_stairs.iob rename to objects/bastion/treasure/stairs/lower_stairs.iob diff --git a/objects/jigsaw/bastion/treasure/walls/bottom/wall_0.iob b/objects/bastion/treasure/walls/bottom/wall_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/bottom/wall_0.iob rename to objects/bastion/treasure/walls/bottom/wall_0.iob diff --git a/objects/jigsaw/bastion/treasure/walls/bottom/wall_1.iob b/objects/bastion/treasure/walls/bottom/wall_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/bottom/wall_1.iob rename to objects/bastion/treasure/walls/bottom/wall_1.iob diff --git a/objects/jigsaw/bastion/treasure/walls/bottom/wall_2.iob b/objects/bastion/treasure/walls/bottom/wall_2.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/bottom/wall_2.iob rename to objects/bastion/treasure/walls/bottom/wall_2.iob diff --git a/objects/jigsaw/bastion/treasure/walls/bottom/wall_3.iob b/objects/bastion/treasure/walls/bottom/wall_3.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/bottom/wall_3.iob rename to objects/bastion/treasure/walls/bottom/wall_3.iob diff --git a/objects/jigsaw/bastion/treasure/walls/entrance_wall.iob b/objects/bastion/treasure/walls/entrance_wall.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/entrance_wall.iob rename to objects/bastion/treasure/walls/entrance_wall.iob diff --git a/objects/jigsaw/bastion/treasure/walls/lava_wall.iob b/objects/bastion/treasure/walls/lava_wall.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/lava_wall.iob rename to objects/bastion/treasure/walls/lava_wall.iob diff --git a/objects/jigsaw/bastion/treasure/walls/mid/wall_0.iob b/objects/bastion/treasure/walls/mid/wall_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/mid/wall_0.iob rename to objects/bastion/treasure/walls/mid/wall_0.iob diff --git a/objects/jigsaw/bastion/treasure/walls/mid/wall_1.iob b/objects/bastion/treasure/walls/mid/wall_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/mid/wall_1.iob rename to objects/bastion/treasure/walls/mid/wall_1.iob diff --git a/objects/jigsaw/bastion/treasure/walls/mid/wall_2.iob b/objects/bastion/treasure/walls/mid/wall_2.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/mid/wall_2.iob rename to objects/bastion/treasure/walls/mid/wall_2.iob diff --git a/objects/jigsaw/bastion/treasure/walls/outer/bottom_corner.iob b/objects/bastion/treasure/walls/outer/bottom_corner.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/outer/bottom_corner.iob rename to objects/bastion/treasure/walls/outer/bottom_corner.iob diff --git a/objects/jigsaw/bastion/treasure/walls/outer/medium_outer_wall.iob b/objects/bastion/treasure/walls/outer/medium_outer_wall.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/outer/medium_outer_wall.iob rename to objects/bastion/treasure/walls/outer/medium_outer_wall.iob diff --git a/objects/jigsaw/bastion/treasure/walls/outer/mid_corner.iob b/objects/bastion/treasure/walls/outer/mid_corner.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/outer/mid_corner.iob rename to objects/bastion/treasure/walls/outer/mid_corner.iob diff --git a/objects/jigsaw/bastion/treasure/walls/outer/outer_wall.iob b/objects/bastion/treasure/walls/outer/outer_wall.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/outer/outer_wall.iob rename to objects/bastion/treasure/walls/outer/outer_wall.iob diff --git a/objects/jigsaw/bastion/treasure/walls/outer/tall_outer_wall.iob b/objects/bastion/treasure/walls/outer/tall_outer_wall.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/outer/tall_outer_wall.iob rename to objects/bastion/treasure/walls/outer/tall_outer_wall.iob diff --git a/objects/jigsaw/bastion/treasure/walls/outer/top_corner.iob b/objects/bastion/treasure/walls/outer/top_corner.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/outer/top_corner.iob rename to objects/bastion/treasure/walls/outer/top_corner.iob diff --git a/objects/jigsaw/bastion/treasure/walls/top/main_entrance.iob b/objects/bastion/treasure/walls/top/main_entrance.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/top/main_entrance.iob rename to objects/bastion/treasure/walls/top/main_entrance.iob diff --git a/objects/jigsaw/bastion/treasure/walls/top/wall_0.iob b/objects/bastion/treasure/walls/top/wall_0.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/top/wall_0.iob rename to objects/bastion/treasure/walls/top/wall_0.iob diff --git a/objects/jigsaw/bastion/treasure/walls/top/wall_1.iob b/objects/bastion/treasure/walls/top/wall_1.iob similarity index 100% rename from objects/jigsaw/bastion/treasure/walls/top/wall_1.iob rename to objects/bastion/treasure/walls/top/wall_1.iob diff --git a/objects/jigsaw/bastion/units/air_base.iob b/objects/bastion/units/air_base.iob similarity index 100% rename from objects/jigsaw/bastion/units/air_base.iob rename to objects/bastion/units/air_base.iob diff --git a/objects/jigsaw/bastion/units/center_pieces/center_0.iob b/objects/bastion/units/center_pieces/center_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/center_pieces/center_0.iob rename to objects/bastion/units/center_pieces/center_0.iob diff --git a/objects/jigsaw/bastion/units/center_pieces/center_1.iob b/objects/bastion/units/center_pieces/center_1.iob similarity index 100% rename from objects/jigsaw/bastion/units/center_pieces/center_1.iob rename to objects/bastion/units/center_pieces/center_1.iob diff --git a/objects/jigsaw/bastion/units/center_pieces/center_2.iob b/objects/bastion/units/center_pieces/center_2.iob similarity index 100% rename from objects/jigsaw/bastion/units/center_pieces/center_2.iob rename to objects/bastion/units/center_pieces/center_2.iob diff --git a/objects/jigsaw/bastion/units/edges/edge_0.iob b/objects/bastion/units/edges/edge_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/edges/edge_0.iob rename to objects/bastion/units/edges/edge_0.iob diff --git a/objects/jigsaw/bastion/units/fillers/stage_0.iob b/objects/bastion/units/fillers/stage_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/fillers/stage_0.iob rename to objects/bastion/units/fillers/stage_0.iob diff --git a/objects/jigsaw/bastion/units/pathways/pathway_0.iob b/objects/bastion/units/pathways/pathway_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/pathways/pathway_0.iob rename to objects/bastion/units/pathways/pathway_0.iob diff --git a/objects/jigsaw/bastion/units/pathways/pathway_wall_0.iob b/objects/bastion/units/pathways/pathway_wall_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/pathways/pathway_wall_0.iob rename to objects/bastion/units/pathways/pathway_wall_0.iob diff --git a/objects/jigsaw/bastion/units/rampart_plates/plate_0.iob b/objects/bastion/units/rampart_plates/plate_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/rampart_plates/plate_0.iob rename to objects/bastion/units/rampart_plates/plate_0.iob diff --git a/objects/jigsaw/bastion/units/ramparts/ramparts_0.iob b/objects/bastion/units/ramparts/ramparts_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/ramparts/ramparts_0.iob rename to objects/bastion/units/ramparts/ramparts_0.iob diff --git a/objects/jigsaw/bastion/units/ramparts/ramparts_1.iob b/objects/bastion/units/ramparts/ramparts_1.iob similarity index 100% rename from objects/jigsaw/bastion/units/ramparts/ramparts_1.iob rename to objects/bastion/units/ramparts/ramparts_1.iob diff --git a/objects/jigsaw/bastion/units/ramparts/ramparts_2.iob b/objects/bastion/units/ramparts/ramparts_2.iob similarity index 100% rename from objects/jigsaw/bastion/units/ramparts/ramparts_2.iob rename to objects/bastion/units/ramparts/ramparts_2.iob diff --git a/objects/jigsaw/bastion/units/stages/rot/stage_1_0.iob b/objects/bastion/units/stages/rot/stage_1_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/rot/stage_1_0.iob rename to objects/bastion/units/stages/rot/stage_1_0.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_0_0.iob b/objects/bastion/units/stages/stage_0_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_0_0.iob rename to objects/bastion/units/stages/stage_0_0.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_0_1.iob b/objects/bastion/units/stages/stage_0_1.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_0_1.iob rename to objects/bastion/units/stages/stage_0_1.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_0_2.iob b/objects/bastion/units/stages/stage_0_2.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_0_2.iob rename to objects/bastion/units/stages/stage_0_2.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_0_3.iob b/objects/bastion/units/stages/stage_0_3.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_0_3.iob rename to objects/bastion/units/stages/stage_0_3.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_1_0.iob b/objects/bastion/units/stages/stage_1_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_1_0.iob rename to objects/bastion/units/stages/stage_1_0.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_1_1.iob b/objects/bastion/units/stages/stage_1_1.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_1_1.iob rename to objects/bastion/units/stages/stage_1_1.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_1_2.iob b/objects/bastion/units/stages/stage_1_2.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_1_2.iob rename to objects/bastion/units/stages/stage_1_2.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_1_3.iob b/objects/bastion/units/stages/stage_1_3.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_1_3.iob rename to objects/bastion/units/stages/stage_1_3.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_2_0.iob b/objects/bastion/units/stages/stage_2_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_2_0.iob rename to objects/bastion/units/stages/stage_2_0.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_2_1.iob b/objects/bastion/units/stages/stage_2_1.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_2_1.iob rename to objects/bastion/units/stages/stage_2_1.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_3_0.iob b/objects/bastion/units/stages/stage_3_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_3_0.iob rename to objects/bastion/units/stages/stage_3_0.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_3_1.iob b/objects/bastion/units/stages/stage_3_1.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_3_1.iob rename to objects/bastion/units/stages/stage_3_1.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_3_2.iob b/objects/bastion/units/stages/stage_3_2.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_3_2.iob rename to objects/bastion/units/stages/stage_3_2.iob diff --git a/objects/jigsaw/bastion/units/stages/stage_3_3.iob b/objects/bastion/units/stages/stage_3_3.iob similarity index 100% rename from objects/jigsaw/bastion/units/stages/stage_3_3.iob rename to objects/bastion/units/stages/stage_3_3.iob diff --git a/objects/jigsaw/bastion/units/wall_units/edge_0_large.iob b/objects/bastion/units/wall_units/edge_0_large.iob similarity index 100% rename from objects/jigsaw/bastion/units/wall_units/edge_0_large.iob rename to objects/bastion/units/wall_units/edge_0_large.iob diff --git a/objects/jigsaw/bastion/units/wall_units/unit_0.iob b/objects/bastion/units/wall_units/unit_0.iob similarity index 100% rename from objects/jigsaw/bastion/units/wall_units/unit_0.iob rename to objects/bastion/units/wall_units/unit_0.iob diff --git a/objects/jigsaw/bastion/units/walls/connected_wall.iob b/objects/bastion/units/walls/connected_wall.iob similarity index 100% rename from objects/jigsaw/bastion/units/walls/connected_wall.iob rename to objects/bastion/units/walls/connected_wall.iob diff --git a/objects/jigsaw/bastion/units/walls/wall_base.iob b/objects/bastion/units/walls/wall_base.iob similarity index 100% rename from objects/jigsaw/bastion/units/walls/wall_base.iob rename to objects/bastion/units/walls/wall_base.iob diff --git a/objects/beach-islander/easterHead1.iob b/objects/beach-islander/easterHead1.iob new file mode 100644 index 00000000..2896d275 Binary files /dev/null and b/objects/beach-islander/easterHead1.iob differ diff --git a/objects/bee/hive.iob b/objects/bee/hive.iob new file mode 100644 index 00000000..bb579862 Binary files /dev/null and b/objects/bee/hive.iob differ diff --git a/objects/bee/hive1.iob b/objects/bee/hive1.iob new file mode 100644 index 00000000..b8a84a21 Binary files /dev/null and b/objects/bee/hive1.iob differ diff --git a/objects/trees/sakura/vlarge1.iob b/objects/big-blossom/big-1.iob similarity index 100% rename from objects/trees/sakura/vlarge1.iob rename to objects/big-blossom/big-1.iob diff --git a/objects/trees/sakura/vlarge2.iob b/objects/big-blossom/big-2.iob similarity index 100% rename from objects/trees/sakura/vlarge2.iob rename to objects/big-blossom/big-2.iob diff --git a/objects/trees/sakura/vlarge3.iob b/objects/big-blossom/big-3.iob similarity index 100% rename from objects/trees/sakura/vlarge3.iob rename to objects/big-blossom/big-3.iob diff --git a/objects/trees/birch/antioch1.iob b/objects/birch-antioch/antioch-1.iob similarity index 100% rename from objects/trees/birch/antioch1.iob rename to objects/birch-antioch/antioch-1.iob diff --git a/objects/trees/birch/antioch10.iob b/objects/birch-antioch/antioch-10.iob similarity index 100% rename from objects/trees/birch/antioch10.iob rename to objects/birch-antioch/antioch-10.iob diff --git a/objects/trees/birch/antioch11.iob b/objects/birch-antioch/antioch-11.iob similarity index 100% rename from objects/trees/birch/antioch11.iob rename to objects/birch-antioch/antioch-11.iob diff --git a/objects/trees/birch/antioch12.iob b/objects/birch-antioch/antioch-12.iob similarity index 100% rename from objects/trees/birch/antioch12.iob rename to objects/birch-antioch/antioch-12.iob diff --git a/objects/trees/birch/antioch13.iob b/objects/birch-antioch/antioch-13.iob similarity index 100% rename from objects/trees/birch/antioch13.iob rename to objects/birch-antioch/antioch-13.iob diff --git a/objects/trees/birch/antioch2.iob b/objects/birch-antioch/antioch-2.iob similarity index 100% rename from objects/trees/birch/antioch2.iob rename to objects/birch-antioch/antioch-2.iob diff --git a/objects/trees/birch/antioch3b.iob b/objects/birch-antioch/antioch-3-b.iob similarity index 100% rename from objects/trees/birch/antioch3b.iob rename to objects/birch-antioch/antioch-3-b.iob diff --git a/objects/trees/birch/antioch3.iob b/objects/birch-antioch/antioch-3.iob similarity index 100% rename from objects/trees/birch/antioch3.iob rename to objects/birch-antioch/antioch-3.iob diff --git a/objects/trees/birch/antioch4b.iob b/objects/birch-antioch/antioch-4-b.iob similarity index 100% rename from objects/trees/birch/antioch4b.iob rename to objects/birch-antioch/antioch-4-b.iob diff --git a/objects/trees/birch/antioch4.iob b/objects/birch-antioch/antioch-4.iob similarity index 100% rename from objects/trees/birch/antioch4.iob rename to objects/birch-antioch/antioch-4.iob diff --git a/objects/trees/birch/antioch5b.iob b/objects/birch-antioch/antioch-5-b.iob similarity index 100% rename from objects/trees/birch/antioch5b.iob rename to objects/birch-antioch/antioch-5-b.iob diff --git a/objects/trees/birch/antioch5.iob b/objects/birch-antioch/antioch-5.iob similarity index 100% rename from objects/trees/birch/antioch5.iob rename to objects/birch-antioch/antioch-5.iob diff --git a/objects/trees/birch/antioch6b.iob b/objects/birch-antioch/antioch-6-b.iob similarity index 100% rename from objects/trees/birch/antioch6b.iob rename to objects/birch-antioch/antioch-6-b.iob diff --git a/objects/trees/birch/antioch6.iob b/objects/birch-antioch/antioch-6.iob similarity index 100% rename from objects/trees/birch/antioch6.iob rename to objects/birch-antioch/antioch-6.iob diff --git a/objects/trees/birch/antioch7.iob b/objects/birch-antioch/antioch-7.iob similarity index 100% rename from objects/trees/birch/antioch7.iob rename to objects/birch-antioch/antioch-7.iob diff --git a/objects/trees/birch/antioch8.iob b/objects/birch-antioch/antioch-8.iob similarity index 100% rename from objects/trees/birch/antioch8.iob rename to objects/birch-antioch/antioch-8.iob diff --git a/objects/trees/birch/antioch9.iob b/objects/birch-antioch/antioch-9.iob similarity index 100% rename from objects/trees/birch/antioch9.iob rename to objects/birch-antioch/antioch-9.iob diff --git a/objects/trees/birch/largegeneric1.iob b/objects/birch-large/birch1.iob similarity index 100% rename from objects/trees/birch/largegeneric1.iob rename to objects/birch-large/birch1.iob diff --git a/objects/trees/birch/largegeneric2.iob b/objects/birch-large/birch10.iob similarity index 100% rename from objects/trees/birch/largegeneric2.iob rename to objects/birch-large/birch10.iob diff --git a/objects/trees/birch/largegeneric3.iob b/objects/birch-large/birch11.iob similarity index 100% rename from objects/trees/birch/largegeneric3.iob rename to objects/birch-large/birch11.iob diff --git a/objects/trees/birch/largegeneric4.iob b/objects/birch-large/birch12.iob similarity index 100% rename from objects/trees/birch/largegeneric4.iob rename to objects/birch-large/birch12.iob diff --git a/objects/trees/birch/largegeneric5.iob b/objects/birch-large/birch13.iob similarity index 100% rename from objects/trees/birch/largegeneric5.iob rename to objects/birch-large/birch13.iob diff --git a/objects/trees/birch/largegeneric6.iob b/objects/birch-large/birch14.iob similarity index 100% rename from objects/trees/birch/largegeneric6.iob rename to objects/birch-large/birch14.iob diff --git a/objects/trees/birch/largegeneric7.iob b/objects/birch-large/birch15.iob similarity index 100% rename from objects/trees/birch/largegeneric7.iob rename to objects/birch-large/birch15.iob diff --git a/objects/trees/birch/largegeneric8.iob b/objects/birch-large/birch16.iob similarity index 100% rename from objects/trees/birch/largegeneric8.iob rename to objects/birch-large/birch16.iob diff --git a/objects/trees/birch/largegeneric9.iob b/objects/birch-large/birch17.iob similarity index 100% rename from objects/trees/birch/largegeneric9.iob rename to objects/birch-large/birch17.iob diff --git a/objects/trees/birch/largegeneric10.iob b/objects/birch-large/birch18.iob similarity index 100% rename from objects/trees/birch/largegeneric10.iob rename to objects/birch-large/birch18.iob diff --git a/objects/trees/birch/largegeneric11.iob b/objects/birch-large/birch19.iob similarity index 100% rename from objects/trees/birch/largegeneric11.iob rename to objects/birch-large/birch19.iob diff --git a/objects/trees/birch/largegeneric12.iob b/objects/birch-large/birch2.iob similarity index 100% rename from objects/trees/birch/largegeneric12.iob rename to objects/birch-large/birch2.iob diff --git a/objects/trees/birch/largegeneric13.iob b/objects/birch-large/birch20.iob similarity index 100% rename from objects/trees/birch/largegeneric13.iob rename to objects/birch-large/birch20.iob diff --git a/objects/trees/birch/largegeneric14.iob b/objects/birch-large/birch3.iob similarity index 100% rename from objects/trees/birch/largegeneric14.iob rename to objects/birch-large/birch3.iob diff --git a/objects/trees/birch/largegeneric15.iob b/objects/birch-large/birch4.iob similarity index 100% rename from objects/trees/birch/largegeneric15.iob rename to objects/birch-large/birch4.iob diff --git a/objects/trees/birch/largegeneric16.iob b/objects/birch-large/birch5.iob similarity index 100% rename from objects/trees/birch/largegeneric16.iob rename to objects/birch-large/birch5.iob diff --git a/objects/trees/birch/largegeneric17.iob b/objects/birch-large/birch6.iob similarity index 100% rename from objects/trees/birch/largegeneric17.iob rename to objects/birch-large/birch6.iob diff --git a/objects/trees/birch/largegeneric18.iob b/objects/birch-large/birch7.iob similarity index 100% rename from objects/trees/birch/largegeneric18.iob rename to objects/birch-large/birch7.iob diff --git a/objects/trees/birch/largegeneric19.iob b/objects/birch-large/birch8.iob similarity index 100% rename from objects/trees/birch/largegeneric19.iob rename to objects/birch-large/birch8.iob diff --git a/objects/trees/birch/largegeneric20.iob b/objects/birch-large/birch9.iob similarity index 100% rename from objects/trees/birch/largegeneric20.iob rename to objects/birch-large/birch9.iob diff --git a/objects/trees/birch/denmyre1.iob b/objects/birch-medium/birch-denmyre-1.iob similarity index 100% rename from objects/trees/birch/denmyre1.iob rename to objects/birch-medium/birch-denmyre-1.iob diff --git a/objects/trees/birch/denmyre2.iob b/objects/birch-medium/birch-denmyre-10.iob similarity index 100% rename from objects/trees/birch/denmyre2.iob rename to objects/birch-medium/birch-denmyre-10.iob diff --git a/objects/trees/birch/denmyre3.iob b/objects/birch-medium/birch-denmyre-11.iob similarity index 100% rename from objects/trees/birch/denmyre3.iob rename to objects/birch-medium/birch-denmyre-11.iob diff --git a/objects/trees/birch/denmyre4.iob b/objects/birch-medium/birch-denmyre-12.iob similarity index 100% rename from objects/trees/birch/denmyre4.iob rename to objects/birch-medium/birch-denmyre-12.iob diff --git a/objects/trees/birch/denmyre5.iob b/objects/birch-medium/birch-denmyre-13.iob similarity index 100% rename from objects/trees/birch/denmyre5.iob rename to objects/birch-medium/birch-denmyre-13.iob diff --git a/objects/trees/birch/denmyre6.iob b/objects/birch-medium/birch-denmyre-14.iob similarity index 100% rename from objects/trees/birch/denmyre6.iob rename to objects/birch-medium/birch-denmyre-14.iob diff --git a/objects/trees/birch/denmyre7.iob b/objects/birch-medium/birch-denmyre-15.iob similarity index 100% rename from objects/trees/birch/denmyre7.iob rename to objects/birch-medium/birch-denmyre-15.iob diff --git a/objects/trees/birch/denmyre8.iob b/objects/birch-medium/birch-denmyre-16.iob similarity index 100% rename from objects/trees/birch/denmyre8.iob rename to objects/birch-medium/birch-denmyre-16.iob diff --git a/objects/trees/birch/denmyre9.iob b/objects/birch-medium/birch-denmyre-2.iob similarity index 100% rename from objects/trees/birch/denmyre9.iob rename to objects/birch-medium/birch-denmyre-2.iob diff --git a/objects/trees/birch/denmyre10.iob b/objects/birch-medium/birch-denmyre-3.iob similarity index 100% rename from objects/trees/birch/denmyre10.iob rename to objects/birch-medium/birch-denmyre-3.iob diff --git a/objects/trees/birch/denmyre11.iob b/objects/birch-medium/birch-denmyre-4.iob similarity index 100% rename from objects/trees/birch/denmyre11.iob rename to objects/birch-medium/birch-denmyre-4.iob diff --git a/objects/trees/birch/denmyre12.iob b/objects/birch-medium/birch-denmyre-5.iob similarity index 100% rename from objects/trees/birch/denmyre12.iob rename to objects/birch-medium/birch-denmyre-5.iob diff --git a/objects/trees/birch/denmyre13.iob b/objects/birch-medium/birch-denmyre-6.iob similarity index 100% rename from objects/trees/birch/denmyre13.iob rename to objects/birch-medium/birch-denmyre-6.iob diff --git a/objects/trees/birch/denmyre14.iob b/objects/birch-medium/birch-denmyre-7.iob similarity index 100% rename from objects/trees/birch/denmyre14.iob rename to objects/birch-medium/birch-denmyre-7.iob diff --git a/objects/trees/birch/denmyre15.iob b/objects/birch-medium/birch-denmyre-8.iob similarity index 100% rename from objects/trees/birch/denmyre15.iob rename to objects/birch-medium/birch-denmyre-8.iob diff --git a/objects/trees/birch/denmyre16.iob b/objects/birch-medium/birch-denmyre-9.iob similarity index 100% rename from objects/trees/birch/denmyre16.iob rename to objects/birch-medium/birch-denmyre-9.iob diff --git a/objects/trees/birch/mediumgeneric1.iob b/objects/birch-medium/birch2.iob similarity index 100% rename from objects/trees/birch/mediumgeneric1.iob rename to objects/birch-medium/birch2.iob diff --git a/objects/trees/birch/mediumgeneric2.iob b/objects/birch-medium/birch3.iob similarity index 100% rename from objects/trees/birch/mediumgeneric2.iob rename to objects/birch-medium/birch3.iob diff --git a/objects/trees/birch/mediumgeneric3.iob b/objects/birch-medium/birch4.iob similarity index 100% rename from objects/trees/birch/mediumgeneric3.iob rename to objects/birch-medium/birch4.iob diff --git a/objects/trees/birch/largeponderosa1.iob b/objects/birch-ponderosa/large-1.iob similarity index 100% rename from objects/trees/birch/largeponderosa1.iob rename to objects/birch-ponderosa/large-1.iob diff --git a/objects/trees/birch/largeponderosa2.iob b/objects/birch-ponderosa/large-10.iob similarity index 100% rename from objects/trees/birch/largeponderosa2.iob rename to objects/birch-ponderosa/large-10.iob diff --git a/objects/trees/birch/largeponderosa3.iob b/objects/birch-ponderosa/large-11.iob similarity index 100% rename from objects/trees/birch/largeponderosa3.iob rename to objects/birch-ponderosa/large-11.iob diff --git a/objects/trees/birch/largeponderosa4.iob b/objects/birch-ponderosa/large-12.iob similarity index 100% rename from objects/trees/birch/largeponderosa4.iob rename to objects/birch-ponderosa/large-12.iob diff --git a/objects/trees/birch/largeponderosa5.iob b/objects/birch-ponderosa/large-13.iob similarity index 100% rename from objects/trees/birch/largeponderosa5.iob rename to objects/birch-ponderosa/large-13.iob diff --git a/objects/trees/birch/largeponderosa6.iob b/objects/birch-ponderosa/large-14.iob similarity index 100% rename from objects/trees/birch/largeponderosa6.iob rename to objects/birch-ponderosa/large-14.iob diff --git a/objects/trees/birch/largeponderosa7.iob b/objects/birch-ponderosa/large-15.iob similarity index 100% rename from objects/trees/birch/largeponderosa7.iob rename to objects/birch-ponderosa/large-15.iob diff --git a/objects/trees/birch/largeponderosa8.iob b/objects/birch-ponderosa/large-16.iob similarity index 100% rename from objects/trees/birch/largeponderosa8.iob rename to objects/birch-ponderosa/large-16.iob diff --git a/objects/trees/birch/largeponderosa9.iob b/objects/birch-ponderosa/large-17.iob similarity index 100% rename from objects/trees/birch/largeponderosa9.iob rename to objects/birch-ponderosa/large-17.iob diff --git a/objects/trees/birch/largeponderosa10.iob b/objects/birch-ponderosa/large-18.iob similarity index 100% rename from objects/trees/birch/largeponderosa10.iob rename to objects/birch-ponderosa/large-18.iob diff --git a/objects/trees/birch/largeponderosa11.iob b/objects/birch-ponderosa/large-19.iob similarity index 100% rename from objects/trees/birch/largeponderosa11.iob rename to objects/birch-ponderosa/large-19.iob diff --git a/objects/trees/birch/largeponderosa12.iob b/objects/birch-ponderosa/large-2.iob similarity index 100% rename from objects/trees/birch/largeponderosa12.iob rename to objects/birch-ponderosa/large-2.iob diff --git a/objects/trees/birch/largeponderosa13.iob b/objects/birch-ponderosa/large-20.iob similarity index 100% rename from objects/trees/birch/largeponderosa13.iob rename to objects/birch-ponderosa/large-20.iob diff --git a/objects/trees/birch/largeponderosa14.iob b/objects/birch-ponderosa/large-3.iob similarity index 100% rename from objects/trees/birch/largeponderosa14.iob rename to objects/birch-ponderosa/large-3.iob diff --git a/objects/trees/birch/largeponderosa15.iob b/objects/birch-ponderosa/large-4.iob similarity index 100% rename from objects/trees/birch/largeponderosa15.iob rename to objects/birch-ponderosa/large-4.iob diff --git a/objects/trees/birch/largeponderosa16.iob b/objects/birch-ponderosa/large-5.iob similarity index 100% rename from objects/trees/birch/largeponderosa16.iob rename to objects/birch-ponderosa/large-5.iob diff --git a/objects/trees/birch/largeponderosa17.iob b/objects/birch-ponderosa/large-6.iob similarity index 100% rename from objects/trees/birch/largeponderosa17.iob rename to objects/birch-ponderosa/large-6.iob diff --git a/objects/trees/birch/largeponderosa18.iob b/objects/birch-ponderosa/large-7.iob similarity index 100% rename from objects/trees/birch/largeponderosa18.iob rename to objects/birch-ponderosa/large-7.iob diff --git a/objects/trees/birch/largeponderosa19.iob b/objects/birch-ponderosa/large-8.iob similarity index 100% rename from objects/trees/birch/largeponderosa19.iob rename to objects/birch-ponderosa/large-8.iob diff --git a/objects/trees/birch/largeponderosa20.iob b/objects/birch-ponderosa/large-9.iob similarity index 100% rename from objects/trees/birch/largeponderosa20.iob rename to objects/birch-ponderosa/large-9.iob diff --git a/objects/trees/birch/medponderosa1.iob b/objects/birch-ponderosa/med-1.iob similarity index 100% rename from objects/trees/birch/medponderosa1.iob rename to objects/birch-ponderosa/med-1.iob diff --git a/objects/trees/birch/medponderosa2.iob b/objects/birch-ponderosa/med-10.iob similarity index 100% rename from objects/trees/birch/medponderosa2.iob rename to objects/birch-ponderosa/med-10.iob diff --git a/objects/trees/birch/medponderosa3.iob b/objects/birch-ponderosa/med-11.iob similarity index 100% rename from objects/trees/birch/medponderosa3.iob rename to objects/birch-ponderosa/med-11.iob diff --git a/objects/trees/birch/medponderosa4.iob b/objects/birch-ponderosa/med-12.iob similarity index 100% rename from objects/trees/birch/medponderosa4.iob rename to objects/birch-ponderosa/med-12.iob diff --git a/objects/trees/birch/medponderosa5.iob b/objects/birch-ponderosa/med-13.iob similarity index 100% rename from objects/trees/birch/medponderosa5.iob rename to objects/birch-ponderosa/med-13.iob diff --git a/objects/trees/birch/medponderosa6.iob b/objects/birch-ponderosa/med-14.iob similarity index 100% rename from objects/trees/birch/medponderosa6.iob rename to objects/birch-ponderosa/med-14.iob diff --git a/objects/trees/birch/medponderosa7.iob b/objects/birch-ponderosa/med-15.iob similarity index 100% rename from objects/trees/birch/medponderosa7.iob rename to objects/birch-ponderosa/med-15.iob diff --git a/objects/trees/birch/medponderosa8.iob b/objects/birch-ponderosa/med-2.iob similarity index 100% rename from objects/trees/birch/medponderosa8.iob rename to objects/birch-ponderosa/med-2.iob diff --git a/objects/trees/birch/medponderosa9.iob b/objects/birch-ponderosa/med-3.iob similarity index 100% rename from objects/trees/birch/medponderosa9.iob rename to objects/birch-ponderosa/med-3.iob diff --git a/objects/trees/birch/medponderosa10.iob b/objects/birch-ponderosa/med-4.iob similarity index 100% rename from objects/trees/birch/medponderosa10.iob rename to objects/birch-ponderosa/med-4.iob diff --git a/objects/trees/birch/medponderosa11.iob b/objects/birch-ponderosa/med-5.iob similarity index 100% rename from objects/trees/birch/medponderosa11.iob rename to objects/birch-ponderosa/med-5.iob diff --git a/objects/trees/birch/medponderosa12.iob b/objects/birch-ponderosa/med-6.iob similarity index 100% rename from objects/trees/birch/medponderosa12.iob rename to objects/birch-ponderosa/med-6.iob diff --git a/objects/trees/birch/medponderosa13.iob b/objects/birch-ponderosa/med-7.iob similarity index 100% rename from objects/trees/birch/medponderosa13.iob rename to objects/birch-ponderosa/med-7.iob diff --git a/objects/trees/birch/medponderosa14.iob b/objects/birch-ponderosa/med-8.iob similarity index 100% rename from objects/trees/birch/medponderosa14.iob rename to objects/birch-ponderosa/med-8.iob diff --git a/objects/trees/birch/medponderosa15.iob b/objects/birch-ponderosa/med-9.iob similarity index 100% rename from objects/trees/birch/medponderosa15.iob rename to objects/birch-ponderosa/med-9.iob diff --git a/objects/trees/birch/smolponderosa1.iob b/objects/birch-ponderosa/smol-1.iob similarity index 100% rename from objects/trees/birch/smolponderosa1.iob rename to objects/birch-ponderosa/smol-1.iob diff --git a/objects/trees/birch/smolponderosa2.iob b/objects/birch-ponderosa/smol-10.iob similarity index 100% rename from objects/trees/birch/smolponderosa2.iob rename to objects/birch-ponderosa/smol-10.iob diff --git a/objects/trees/birch/smolponderosa3.iob b/objects/birch-ponderosa/smol-11.iob similarity index 100% rename from objects/trees/birch/smolponderosa3.iob rename to objects/birch-ponderosa/smol-11.iob diff --git a/objects/trees/birch/smolponderosa4.iob b/objects/birch-ponderosa/smol-12.iob similarity index 100% rename from objects/trees/birch/smolponderosa4.iob rename to objects/birch-ponderosa/smol-12.iob diff --git a/objects/trees/birch/smolponderosa5.iob b/objects/birch-ponderosa/smol-13.iob similarity index 100% rename from objects/trees/birch/smolponderosa5.iob rename to objects/birch-ponderosa/smol-13.iob diff --git a/objects/trees/birch/smolponderosa6.iob b/objects/birch-ponderosa/smol-14.iob similarity index 100% rename from objects/trees/birch/smolponderosa6.iob rename to objects/birch-ponderosa/smol-14.iob diff --git a/objects/trees/birch/smolponderosa7.iob b/objects/birch-ponderosa/smol-15.iob similarity index 100% rename from objects/trees/birch/smolponderosa7.iob rename to objects/birch-ponderosa/smol-15.iob diff --git a/objects/trees/birch/smolponderosa8.iob b/objects/birch-ponderosa/smol-2.iob similarity index 100% rename from objects/trees/birch/smolponderosa8.iob rename to objects/birch-ponderosa/smol-2.iob diff --git a/objects/trees/birch/smolponderosa9.iob b/objects/birch-ponderosa/smol-3.iob similarity index 100% rename from objects/trees/birch/smolponderosa9.iob rename to objects/birch-ponderosa/smol-3.iob diff --git a/objects/trees/birch/smolponderosa10.iob b/objects/birch-ponderosa/smol-4.iob similarity index 100% rename from objects/trees/birch/smolponderosa10.iob rename to objects/birch-ponderosa/smol-4.iob diff --git a/objects/trees/birch/smolponderosa11.iob b/objects/birch-ponderosa/smol-5.iob similarity index 100% rename from objects/trees/birch/smolponderosa11.iob rename to objects/birch-ponderosa/smol-5.iob diff --git a/objects/trees/birch/smolponderosa12.iob b/objects/birch-ponderosa/smol-6.iob similarity index 100% rename from objects/trees/birch/smolponderosa12.iob rename to objects/birch-ponderosa/smol-6.iob diff --git a/objects/trees/birch/smolponderosa13.iob b/objects/birch-ponderosa/smol-7.iob similarity index 100% rename from objects/trees/birch/smolponderosa13.iob rename to objects/birch-ponderosa/smol-7.iob diff --git a/objects/trees/birch/smolponderosa14.iob b/objects/birch-ponderosa/smol-8.iob similarity index 100% rename from objects/trees/birch/smolponderosa14.iob rename to objects/birch-ponderosa/smol-8.iob diff --git a/objects/trees/birch/smolponderosa15.iob b/objects/birch-ponderosa/smol-9.iob similarity index 100% rename from objects/trees/birch/smolponderosa15.iob rename to objects/birch-ponderosa/smol-9.iob diff --git a/objects/trees/birch/forest1.iob b/objects/birch-remade/b1.iob similarity index 100% rename from objects/trees/birch/forest1.iob rename to objects/birch-remade/b1.iob diff --git a/objects/trees/birch/forest2.iob b/objects/birch-remade/b2.iob similarity index 100% rename from objects/trees/birch/forest2.iob rename to objects/birch-remade/b2.iob diff --git a/objects/trees/birch/forest3.iob b/objects/birch-remade/b3.iob similarity index 100% rename from objects/trees/birch/forest3.iob rename to objects/birch-remade/b3.iob diff --git a/objects/trees/birch/forest4.iob b/objects/birch-remade/b4.iob similarity index 100% rename from objects/trees/birch/forest4.iob rename to objects/birch-remade/b4.iob diff --git a/objects/trees/birch/variantforest1.iob b/objects/birch-sespire/altbirch-1.iob similarity index 100% rename from objects/trees/birch/variantforest1.iob rename to objects/birch-sespire/altbirch-1.iob diff --git a/objects/trees/birch/variantforest2.iob b/objects/birch-sespire/altbirch-10.iob similarity index 100% rename from objects/trees/birch/variantforest2.iob rename to objects/birch-sespire/altbirch-10.iob diff --git a/objects/trees/birch/variantforest3.iob b/objects/birch-sespire/altbirch-11.iob similarity index 100% rename from objects/trees/birch/variantforest3.iob rename to objects/birch-sespire/altbirch-11.iob diff --git a/objects/trees/birch/variantforest4.iob b/objects/birch-sespire/altbirch-12.iob similarity index 100% rename from objects/trees/birch/variantforest4.iob rename to objects/birch-sespire/altbirch-12.iob diff --git a/objects/trees/birch/variantforest5.iob b/objects/birch-sespire/altbirch-13.iob similarity index 100% rename from objects/trees/birch/variantforest5.iob rename to objects/birch-sespire/altbirch-13.iob diff --git a/objects/trees/birch/variantforest6.iob b/objects/birch-sespire/altbirch-14.iob similarity index 100% rename from objects/trees/birch/variantforest6.iob rename to objects/birch-sespire/altbirch-14.iob diff --git a/objects/trees/birch/variantforest7.iob b/objects/birch-sespire/altbirch-15.iob similarity index 100% rename from objects/trees/birch/variantforest7.iob rename to objects/birch-sespire/altbirch-15.iob diff --git a/objects/trees/birch/variantforest8.iob b/objects/birch-sespire/altbirch-16.iob similarity index 100% rename from objects/trees/birch/variantforest8.iob rename to objects/birch-sespire/altbirch-16.iob diff --git a/objects/trees/birch/variantforest9.iob b/objects/birch-sespire/altbirch-17.iob similarity index 100% rename from objects/trees/birch/variantforest9.iob rename to objects/birch-sespire/altbirch-17.iob diff --git a/objects/trees/birch/variantforest10.iob b/objects/birch-sespire/altbirch-18.iob similarity index 100% rename from objects/trees/birch/variantforest10.iob rename to objects/birch-sespire/altbirch-18.iob diff --git a/objects/trees/birch/variantforest11.iob b/objects/birch-sespire/altbirch-19.iob similarity index 100% rename from objects/trees/birch/variantforest11.iob rename to objects/birch-sespire/altbirch-19.iob diff --git a/objects/trees/birch/variantforest12.iob b/objects/birch-sespire/altbirch-2.iob similarity index 100% rename from objects/trees/birch/variantforest12.iob rename to objects/birch-sespire/altbirch-2.iob diff --git a/objects/trees/birch/variantforest13.iob b/objects/birch-sespire/altbirch-20.iob similarity index 100% rename from objects/trees/birch/variantforest13.iob rename to objects/birch-sespire/altbirch-20.iob diff --git a/objects/trees/birch/variantforest14.iob b/objects/birch-sespire/altbirch-3.iob similarity index 100% rename from objects/trees/birch/variantforest14.iob rename to objects/birch-sespire/altbirch-3.iob diff --git a/objects/trees/birch/variantforest15.iob b/objects/birch-sespire/altbirch-4.iob similarity index 100% rename from objects/trees/birch/variantforest15.iob rename to objects/birch-sespire/altbirch-4.iob diff --git a/objects/trees/birch/variantforest16.iob b/objects/birch-sespire/altbirch-5.iob similarity index 100% rename from objects/trees/birch/variantforest16.iob rename to objects/birch-sespire/altbirch-5.iob diff --git a/objects/trees/birch/variantforest17.iob b/objects/birch-sespire/altbirch-6.iob similarity index 100% rename from objects/trees/birch/variantforest17.iob rename to objects/birch-sespire/altbirch-6.iob diff --git a/objects/trees/birch/variantforest18.iob b/objects/birch-sespire/altbirch-7.iob similarity index 100% rename from objects/trees/birch/variantforest18.iob rename to objects/birch-sespire/altbirch-7.iob diff --git a/objects/trees/birch/variantforest19.iob b/objects/birch-sespire/altbirch-8.iob similarity index 100% rename from objects/trees/birch/variantforest19.iob rename to objects/birch-sespire/altbirch-8.iob diff --git a/objects/trees/birch/variantforest20.iob b/objects/birch-sespire/altbirch-9.iob similarity index 100% rename from objects/trees/birch/variantforest20.iob rename to objects/birch-sespire/altbirch-9.iob diff --git a/objects/trees/birch/generic9.iob b/objects/birch-sespire/birch-1.iob similarity index 100% rename from objects/trees/birch/generic9.iob rename to objects/birch-sespire/birch-1.iob diff --git a/objects/trees/birch/generic10.iob b/objects/birch-sespire/birch-2.iob similarity index 100% rename from objects/trees/birch/generic10.iob rename to objects/birch-sespire/birch-2.iob diff --git a/objects/trees/birch/generic11.iob b/objects/birch-sespire/birch-3.iob similarity index 100% rename from objects/trees/birch/generic11.iob rename to objects/birch-sespire/birch-3.iob diff --git a/objects/trees/birch/generic12.iob b/objects/birch-sespire/birch-4.iob similarity index 100% rename from objects/trees/birch/generic12.iob rename to objects/birch-sespire/birch-4.iob diff --git a/objects/trees/birch/generic13.iob b/objects/birch-sespire/birch-5.iob similarity index 100% rename from objects/trees/birch/generic13.iob rename to objects/birch-sespire/birch-5.iob diff --git a/objects/trees/birch/generic14.iob b/objects/birch-sespire/birch-6.iob similarity index 100% rename from objects/trees/birch/generic14.iob rename to objects/birch-sespire/birch-6.iob diff --git a/objects/trees/birch/generic15.iob b/objects/birch-sespire/birch-7.iob similarity index 100% rename from objects/trees/birch/generic15.iob rename to objects/birch-sespire/birch-7.iob diff --git a/objects/trees/birch/generic16.iob b/objects/birch-sespire/birch-8.iob similarity index 100% rename from objects/trees/birch/generic16.iob rename to objects/birch-sespire/birch-8.iob diff --git a/objects/trees/birch/generic17.iob b/objects/birch-small/birch1.iob similarity index 100% rename from objects/trees/birch/generic17.iob rename to objects/birch-small/birch1.iob diff --git a/objects/trees/birch/generic24.iob b/objects/birch-small/birch10.iob similarity index 100% rename from objects/trees/birch/generic24.iob rename to objects/birch-small/birch10.iob diff --git a/objects/trees/birch/generic25.iob b/objects/birch-small/birch11.iob similarity index 100% rename from objects/trees/birch/generic25.iob rename to objects/birch-small/birch11.iob diff --git a/objects/trees/birch/generic26.iob b/objects/birch-small/birch12.iob similarity index 100% rename from objects/trees/birch/generic26.iob rename to objects/birch-small/birch12.iob diff --git a/objects/trees/birch/generic27.iob b/objects/birch-small/birch13.iob similarity index 100% rename from objects/trees/birch/generic27.iob rename to objects/birch-small/birch13.iob diff --git a/objects/trees/birch/generic28.iob b/objects/birch-small/birch14.iob similarity index 100% rename from objects/trees/birch/generic28.iob rename to objects/birch-small/birch14.iob diff --git a/objects/trees/birch/generic29.iob b/objects/birch-small/birch15.iob similarity index 100% rename from objects/trees/birch/generic29.iob rename to objects/birch-small/birch15.iob diff --git a/objects/trees/birch/generic30.iob b/objects/birch-small/birch2.iob similarity index 100% rename from objects/trees/birch/generic30.iob rename to objects/birch-small/birch2.iob diff --git a/objects/trees/birch/generic31.iob b/objects/birch-small/birch3.iob similarity index 100% rename from objects/trees/birch/generic31.iob rename to objects/birch-small/birch3.iob diff --git a/objects/trees/birch/generic18.iob b/objects/birch-small/birch4.iob similarity index 100% rename from objects/trees/birch/generic18.iob rename to objects/birch-small/birch4.iob diff --git a/objects/trees/birch/generic19.iob b/objects/birch-small/birch5.iob similarity index 100% rename from objects/trees/birch/generic19.iob rename to objects/birch-small/birch5.iob diff --git a/objects/trees/birch/generic20.iob b/objects/birch-small/birch6.iob similarity index 100% rename from objects/trees/birch/generic20.iob rename to objects/birch-small/birch6.iob diff --git a/objects/trees/birch/generic21.iob b/objects/birch-small/birch7.iob similarity index 100% rename from objects/trees/birch/generic21.iob rename to objects/birch-small/birch7.iob diff --git a/objects/trees/birch/generic22.iob b/objects/birch-small/birch8.iob similarity index 100% rename from objects/trees/birch/generic22.iob rename to objects/birch-small/birch8.iob diff --git a/objects/trees/birch/generic23.iob b/objects/birch-small/birch9.iob similarity index 100% rename from objects/trees/birch/generic23.iob rename to objects/birch-small/birch9.iob diff --git a/objects/trees/birch/generic1.iob b/objects/birch/birch1.iob similarity index 100% rename from objects/trees/birch/generic1.iob rename to objects/birch/birch1.iob diff --git a/objects/trees/birch/generic2.iob b/objects/birch/birch2.iob similarity index 100% rename from objects/trees/birch/generic2.iob rename to objects/birch/birch2.iob diff --git a/objects/trees/birch/generic3.iob b/objects/birch/birch3.iob similarity index 100% rename from objects/trees/birch/generic3.iob rename to objects/birch/birch3.iob diff --git a/objects/trees/birch/generic4.iob b/objects/birch/birch4.iob similarity index 100% rename from objects/trees/birch/generic4.iob rename to objects/birch/birch4.iob diff --git a/objects/trees/birch/generic5.iob b/objects/birch/birch5.iob similarity index 100% rename from objects/trees/birch/generic5.iob rename to objects/birch/birch5.iob diff --git a/objects/trees/birch/generic6.iob b/objects/birch/birch6.iob similarity index 100% rename from objects/trees/birch/generic6.iob rename to objects/birch/birch6.iob diff --git a/objects/trees/birch/generic7.iob b/objects/birch/birch7.iob similarity index 100% rename from objects/trees/birch/generic7.iob rename to objects/birch/birch7.iob diff --git a/objects/trees/birch/generic8.iob b/objects/birch/birch8.iob similarity index 100% rename from objects/trees/birch/generic8.iob rename to objects/birch/birch8.iob diff --git a/objects/trees/sakura/ogbase2.iob b/objects/blosom-superlarge/blossom1.iob similarity index 100% rename from objects/trees/sakura/ogbase2.iob rename to objects/blosom-superlarge/blossom1.iob diff --git a/objects/trees/bonsai/smfallen1.iob b/objects/blossom-fallen/blossom1.iob similarity index 100% rename from objects/trees/bonsai/smfallen1.iob rename to objects/blossom-fallen/blossom1.iob diff --git a/objects/trees/sakura/mlarge9.iob b/objects/blossom-massive/blossom1.iob similarity index 100% rename from objects/trees/sakura/mlarge9.iob rename to objects/blossom-massive/blossom1.iob diff --git a/objects/trees/sakura/mlarge10.iob b/objects/blossom-massive/blossom2.iob similarity index 100% rename from objects/trees/sakura/mlarge10.iob rename to objects/blossom-massive/blossom2.iob diff --git a/objects/trees/sakura/mlarge11.iob b/objects/blossom-massive/blossom3.iob similarity index 100% rename from objects/trees/sakura/mlarge11.iob rename to objects/blossom-massive/blossom3.iob diff --git a/objects/trees/bonsai/smbase1.iob b/objects/blossom-supermassive/blossom1.iob similarity index 100% rename from objects/trees/bonsai/smbase1.iob rename to objects/blossom-supermassive/blossom1.iob diff --git a/objects/trees/sakura/smtaint1.iob b/objects/blossom-tainted/blossom1.iob similarity index 100% rename from objects/trees/sakura/smtaint1.iob rename to objects/blossom-tainted/blossom1.iob diff --git a/objects/trees/sakura/smwilt1.iob b/objects/blossom-wilted-supermassive/blossom1.iob similarity index 100% rename from objects/trees/sakura/smwilt1.iob rename to objects/blossom-wilted-supermassive/blossom1.iob diff --git a/objects/bombs/bomb.iob b/objects/bombs/bomb.iob new file mode 100644 index 00000000..163affef Binary files /dev/null and b/objects/bombs/bomb.iob differ diff --git a/objects/bone-spire/BoneSpire1.iob b/objects/bone-spire/BoneSpire1.iob new file mode 100644 index 00000000..8712d080 Binary files /dev/null and b/objects/bone-spire/BoneSpire1.iob differ diff --git a/objects/bone-spire/BoneSpire10.iob b/objects/bone-spire/BoneSpire10.iob new file mode 100644 index 00000000..aea3556a Binary files /dev/null and b/objects/bone-spire/BoneSpire10.iob differ diff --git a/objects/bone-spire/BoneSpire11.iob b/objects/bone-spire/BoneSpire11.iob new file mode 100644 index 00000000..fe09b6c7 Binary files /dev/null and b/objects/bone-spire/BoneSpire11.iob differ diff --git a/objects/bone-spire/BoneSpire12.iob b/objects/bone-spire/BoneSpire12.iob new file mode 100644 index 00000000..aae8787c Binary files /dev/null and b/objects/bone-spire/BoneSpire12.iob differ diff --git a/objects/bone-spire/BoneSpire13.iob b/objects/bone-spire/BoneSpire13.iob new file mode 100644 index 00000000..f0886954 Binary files /dev/null and b/objects/bone-spire/BoneSpire13.iob differ diff --git a/objects/bone-spire/BoneSpire14.iob b/objects/bone-spire/BoneSpire14.iob new file mode 100644 index 00000000..73f72d9e Binary files /dev/null and b/objects/bone-spire/BoneSpire14.iob differ diff --git a/objects/bone-spire/BoneSpire15.iob b/objects/bone-spire/BoneSpire15.iob new file mode 100644 index 00000000..2ffd69c3 Binary files /dev/null and b/objects/bone-spire/BoneSpire15.iob differ diff --git a/objects/bone-spire/BoneSpire16.iob b/objects/bone-spire/BoneSpire16.iob new file mode 100644 index 00000000..c7c0ee3e Binary files /dev/null and b/objects/bone-spire/BoneSpire16.iob differ diff --git a/objects/bone-spire/BoneSpire17.iob b/objects/bone-spire/BoneSpire17.iob new file mode 100644 index 00000000..8a8574fa Binary files /dev/null and b/objects/bone-spire/BoneSpire17.iob differ diff --git a/objects/bone-spire/BoneSpire18.iob b/objects/bone-spire/BoneSpire18.iob new file mode 100644 index 00000000..808e652d Binary files /dev/null and b/objects/bone-spire/BoneSpire18.iob differ diff --git a/objects/bone-spire/BoneSpire19.iob b/objects/bone-spire/BoneSpire19.iob new file mode 100644 index 00000000..41dd4e06 Binary files /dev/null and b/objects/bone-spire/BoneSpire19.iob differ diff --git a/objects/bone-spire/BoneSpire2.iob b/objects/bone-spire/BoneSpire2.iob new file mode 100644 index 00000000..fd40d6ca Binary files /dev/null and b/objects/bone-spire/BoneSpire2.iob differ diff --git a/objects/bone-spire/BoneSpire20.iob b/objects/bone-spire/BoneSpire20.iob new file mode 100644 index 00000000..e4ac47a8 Binary files /dev/null and b/objects/bone-spire/BoneSpire20.iob differ diff --git a/objects/bone-spire/BoneSpire3.iob b/objects/bone-spire/BoneSpire3.iob new file mode 100644 index 00000000..3429fb50 Binary files /dev/null and b/objects/bone-spire/BoneSpire3.iob differ diff --git a/objects/bone-spire/BoneSpire4.iob b/objects/bone-spire/BoneSpire4.iob new file mode 100644 index 00000000..666ae1ef Binary files /dev/null and b/objects/bone-spire/BoneSpire4.iob differ diff --git a/objects/bone-spire/BoneSpire5.iob b/objects/bone-spire/BoneSpire5.iob new file mode 100644 index 00000000..9cb2c890 Binary files /dev/null and b/objects/bone-spire/BoneSpire5.iob differ diff --git a/objects/bone-spire/BoneSpire6.iob b/objects/bone-spire/BoneSpire6.iob new file mode 100644 index 00000000..25bd71e2 Binary files /dev/null and b/objects/bone-spire/BoneSpire6.iob differ diff --git a/objects/bone-spire/BoneSpire7.iob b/objects/bone-spire/BoneSpire7.iob new file mode 100644 index 00000000..22fb6595 Binary files /dev/null and b/objects/bone-spire/BoneSpire7.iob differ diff --git a/objects/bone-spire/BoneSpire8.iob b/objects/bone-spire/BoneSpire8.iob new file mode 100644 index 00000000..0cf17b96 Binary files /dev/null and b/objects/bone-spire/BoneSpire8.iob differ diff --git a/objects/bone-spire/BoneSpire9.iob b/objects/bone-spire/BoneSpire9.iob new file mode 100644 index 00000000..9ff16011 Binary files /dev/null and b/objects/bone-spire/BoneSpire9.iob differ diff --git a/objects/bones/Bone1.iob b/objects/bones/Bone1.iob new file mode 100644 index 00000000..74c1d24a Binary files /dev/null and b/objects/bones/Bone1.iob differ diff --git a/objects/bones/Bone2.iob b/objects/bones/Bone2.iob new file mode 100644 index 00000000..31ad98fa Binary files /dev/null and b/objects/bones/Bone2.iob differ diff --git a/objects/bones/Bone3.iob b/objects/bones/Bone3.iob new file mode 100644 index 00000000..bcb50b03 Binary files /dev/null and b/objects/bones/Bone3.iob differ diff --git a/objects/bones/Bone4.iob b/objects/bones/Bone4.iob new file mode 100644 index 00000000..83fc5b97 Binary files /dev/null and b/objects/bones/Bone4.iob differ diff --git a/objects/bones/Bone5.iob b/objects/bones/Bone5.iob new file mode 100644 index 00000000..f193a6e0 Binary files /dev/null and b/objects/bones/Bone5.iob differ diff --git a/objects/bones/Bone6.iob b/objects/bones/Bone6.iob new file mode 100644 index 00000000..a56140c5 Binary files /dev/null and b/objects/bones/Bone6.iob differ diff --git a/objects/bones/Bone7.iob b/objects/bones/Bone7.iob new file mode 100644 index 00000000..0a78f5d7 Binary files /dev/null and b/objects/bones/Bone7.iob differ diff --git a/objects/trees/bonsai/frolow1.iob b/objects/bonsai-ice/IcePadBonsai1.iob similarity index 100% rename from objects/trees/bonsai/frolow1.iob rename to objects/bonsai-ice/IcePadBonsai1.iob diff --git a/objects/trees/bonsai/frolow2.iob b/objects/bonsai-ice/IcePadBonsai10.iob similarity index 100% rename from objects/trees/bonsai/frolow2.iob rename to objects/bonsai-ice/IcePadBonsai10.iob diff --git a/objects/trees/bonsai/frolow3.iob b/objects/bonsai-ice/IcePadBonsai11.iob similarity index 100% rename from objects/trees/bonsai/frolow3.iob rename to objects/bonsai-ice/IcePadBonsai11.iob diff --git a/objects/trees/bonsai/frolow4.iob b/objects/bonsai-ice/IcePadBonsai12.iob similarity index 100% rename from objects/trees/bonsai/frolow4.iob rename to objects/bonsai-ice/IcePadBonsai12.iob diff --git a/objects/trees/bonsai/frolow5.iob b/objects/bonsai-ice/IcePadBonsai13.iob similarity index 100% rename from objects/trees/bonsai/frolow5.iob rename to objects/bonsai-ice/IcePadBonsai13.iob diff --git a/objects/trees/bonsai/frolow6.iob b/objects/bonsai-ice/IcePadBonsai14.iob similarity index 100% rename from objects/trees/bonsai/frolow6.iob rename to objects/bonsai-ice/IcePadBonsai14.iob diff --git a/objects/trees/bonsai/frolow7.iob b/objects/bonsai-ice/IcePadBonsai15.iob similarity index 100% rename from objects/trees/bonsai/frolow7.iob rename to objects/bonsai-ice/IcePadBonsai15.iob diff --git a/objects/trees/bonsai/frolow8.iob b/objects/bonsai-ice/IcePadBonsai16.iob similarity index 100% rename from objects/trees/bonsai/frolow8.iob rename to objects/bonsai-ice/IcePadBonsai16.iob diff --git a/objects/trees/bonsai/frolow9.iob b/objects/bonsai-ice/IcePadBonsai2.iob similarity index 100% rename from objects/trees/bonsai/frolow9.iob rename to objects/bonsai-ice/IcePadBonsai2.iob diff --git a/objects/trees/bonsai/frolow10.iob b/objects/bonsai-ice/IcePadBonsai3.iob similarity index 100% rename from objects/trees/bonsai/frolow10.iob rename to objects/bonsai-ice/IcePadBonsai3.iob diff --git a/objects/trees/bonsai/frolow11.iob b/objects/bonsai-ice/IcePadBonsai4.iob similarity index 100% rename from objects/trees/bonsai/frolow11.iob rename to objects/bonsai-ice/IcePadBonsai4.iob diff --git a/objects/trees/bonsai/frolow12.iob b/objects/bonsai-ice/IcePadBonsai5.iob similarity index 100% rename from objects/trees/bonsai/frolow12.iob rename to objects/bonsai-ice/IcePadBonsai5.iob diff --git a/objects/trees/bonsai/frolow13.iob b/objects/bonsai-ice/IcePadBonsai6.iob similarity index 100% rename from objects/trees/bonsai/frolow13.iob rename to objects/bonsai-ice/IcePadBonsai6.iob diff --git a/objects/trees/bonsai/frolow14.iob b/objects/bonsai-ice/IcePadBonsai7.iob similarity index 100% rename from objects/trees/bonsai/frolow14.iob rename to objects/bonsai-ice/IcePadBonsai7.iob diff --git a/objects/trees/bonsai/frolow15.iob b/objects/bonsai-ice/IcePadBonsai8.iob similarity index 100% rename from objects/trees/bonsai/frolow15.iob rename to objects/bonsai-ice/IcePadBonsai8.iob diff --git a/objects/trees/bonsai/frolow16.iob b/objects/bonsai-ice/IcePadBonsai9.iob similarity index 100% rename from objects/trees/bonsai/frolow16.iob rename to objects/bonsai-ice/IcePadBonsai9.iob diff --git a/objects/trees/bonsai/smbon1.iob b/objects/bonsai-massive/bonsai1.iob similarity index 100% rename from objects/trees/bonsai/smbon1.iob rename to objects/bonsai-massive/bonsai1.iob diff --git a/objects/trees/bonsai/smbon2.iob b/objects/bonsai-massive/bonsai2.iob similarity index 100% rename from objects/trees/bonsai/smbon2.iob rename to objects/bonsai-massive/bonsai2.iob diff --git a/objects/trees/bonsai/smbon3.iob b/objects/bonsai-massive/bonsai3.iob similarity index 100% rename from objects/trees/bonsai/smbon3.iob rename to objects/bonsai-massive/bonsai3.iob diff --git a/objects/trees/bonsai/big-1.iob b/objects/bonsai/big-1.iob similarity index 100% rename from objects/trees/bonsai/big-1.iob rename to objects/bonsai/big-1.iob diff --git a/objects/trees/bonsai/big-2.iob b/objects/bonsai/big-2.iob similarity index 100% rename from objects/trees/bonsai/big-2.iob rename to objects/bonsai/big-2.iob diff --git a/objects/trees/bonsai/big-3.iob b/objects/bonsai/big-3.iob similarity index 100% rename from objects/trees/bonsai/big-3.iob rename to objects/bonsai/big-3.iob diff --git a/objects/trees/bonsai/big-4.iob b/objects/bonsai/big-4.iob similarity index 100% rename from objects/trees/bonsai/big-4.iob rename to objects/bonsai/big-4.iob diff --git a/objects/trees/bonsai/big-5.iob b/objects/bonsai/big-5.iob similarity index 100% rename from objects/trees/bonsai/big-5.iob rename to objects/bonsai/big-5.iob diff --git a/objects/trees/bonsai/big-6.iob b/objects/bonsai/big-6.iob similarity index 100% rename from objects/trees/bonsai/big-6.iob rename to objects/bonsai/big-6.iob diff --git a/objects/trees/bonsai/big-7.iob b/objects/bonsai/big-7.iob similarity index 100% rename from objects/trees/bonsai/big-7.iob rename to objects/bonsai/big-7.iob diff --git a/objects/trees/bonsai/med-1.iob b/objects/bonsai/med-1.iob similarity index 100% rename from objects/trees/bonsai/med-1.iob rename to objects/bonsai/med-1.iob diff --git a/objects/trees/bonsai/med-2.iob b/objects/bonsai/med-2.iob similarity index 100% rename from objects/trees/bonsai/med-2.iob rename to objects/bonsai/med-2.iob diff --git a/objects/trees/bonsai/med-3.iob b/objects/bonsai/med-3.iob similarity index 100% rename from objects/trees/bonsai/med-3.iob rename to objects/bonsai/med-3.iob diff --git a/objects/trees/bonsai/med-4.iob b/objects/bonsai/med-4.iob similarity index 100% rename from objects/trees/bonsai/med-4.iob rename to objects/bonsai/med-4.iob diff --git a/objects/boulder-stone/boulder1.iob b/objects/boulder-stone/boulder1.iob new file mode 100644 index 00000000..9d003ac0 Binary files /dev/null and b/objects/boulder-stone/boulder1.iob differ diff --git a/objects/boulder-stone/boulder10.iob b/objects/boulder-stone/boulder10.iob new file mode 100644 index 00000000..c83aea72 Binary files /dev/null and b/objects/boulder-stone/boulder10.iob differ diff --git a/objects/boulder-stone/boulder11.iob b/objects/boulder-stone/boulder11.iob new file mode 100644 index 00000000..637cd42e Binary files /dev/null and b/objects/boulder-stone/boulder11.iob differ diff --git a/objects/boulder-stone/boulder12.iob b/objects/boulder-stone/boulder12.iob new file mode 100644 index 00000000..9e983674 Binary files /dev/null and b/objects/boulder-stone/boulder12.iob differ diff --git a/objects/boulder-stone/boulder13.iob b/objects/boulder-stone/boulder13.iob new file mode 100644 index 00000000..db01083f Binary files /dev/null and b/objects/boulder-stone/boulder13.iob differ diff --git a/objects/boulder-stone/boulder14.iob b/objects/boulder-stone/boulder14.iob new file mode 100644 index 00000000..ae25d665 Binary files /dev/null and b/objects/boulder-stone/boulder14.iob differ diff --git a/objects/boulder-stone/boulder15.iob b/objects/boulder-stone/boulder15.iob new file mode 100644 index 00000000..4c51b470 Binary files /dev/null and b/objects/boulder-stone/boulder15.iob differ diff --git a/objects/boulder-stone/boulder2.iob b/objects/boulder-stone/boulder2.iob new file mode 100644 index 00000000..cdb66fe0 Binary files /dev/null and b/objects/boulder-stone/boulder2.iob differ diff --git a/objects/boulder-stone/boulder3.iob b/objects/boulder-stone/boulder3.iob new file mode 100644 index 00000000..e4e92107 Binary files /dev/null and b/objects/boulder-stone/boulder3.iob differ diff --git a/objects/boulder-stone/boulder4.iob b/objects/boulder-stone/boulder4.iob new file mode 100644 index 00000000..0805ab2c Binary files /dev/null and b/objects/boulder-stone/boulder4.iob differ diff --git a/objects/boulder-stone/boulder5.iob b/objects/boulder-stone/boulder5.iob new file mode 100644 index 00000000..f8d0bedd Binary files /dev/null and b/objects/boulder-stone/boulder5.iob differ diff --git a/objects/boulder-stone/boulder6.iob b/objects/boulder-stone/boulder6.iob new file mode 100644 index 00000000..21ec4bea Binary files /dev/null and b/objects/boulder-stone/boulder6.iob differ diff --git a/objects/boulder-stone/boulder7.iob b/objects/boulder-stone/boulder7.iob new file mode 100644 index 00000000..9d2668b7 Binary files /dev/null and b/objects/boulder-stone/boulder7.iob differ diff --git a/objects/boulder-stone/boulder8.iob b/objects/boulder-stone/boulder8.iob new file mode 100644 index 00000000..62c99213 Binary files /dev/null and b/objects/boulder-stone/boulder8.iob differ diff --git a/objects/boulder-stone/boulder9.iob b/objects/boulder-stone/boulder9.iob new file mode 100644 index 00000000..112f717d Binary files /dev/null and b/objects/boulder-stone/boulder9.iob differ diff --git a/objects/clutter/stone-6.iob b/objects/boulder/boulder1.iob similarity index 100% rename from objects/clutter/stone-6.iob rename to objects/boulder/boulder1.iob diff --git a/objects/clutter/stone-2.iob b/objects/boulder/boulder10.iob similarity index 100% rename from objects/clutter/stone-2.iob rename to objects/boulder/boulder10.iob diff --git a/objects/boulder/boulder11.iob b/objects/boulder/boulder11.iob new file mode 100644 index 00000000..9185dbcc Binary files /dev/null and b/objects/boulder/boulder11.iob differ diff --git a/objects/clutter/stone-3.iob b/objects/boulder/boulder12.iob similarity index 100% rename from objects/clutter/stone-3.iob rename to objects/boulder/boulder12.iob diff --git a/objects/clutter/stone-4.iob b/objects/boulder/boulder13.iob similarity index 100% rename from objects/clutter/stone-4.iob rename to objects/boulder/boulder13.iob diff --git a/objects/boulder/boulder14.iob b/objects/boulder/boulder14.iob new file mode 100644 index 00000000..0a920d2e Binary files /dev/null and b/objects/boulder/boulder14.iob differ diff --git a/objects/boulder/boulder15.iob b/objects/boulder/boulder15.iob new file mode 100644 index 00000000..3442af79 Binary files /dev/null and b/objects/boulder/boulder15.iob differ diff --git a/objects/boulder/boulder2.iob b/objects/boulder/boulder2.iob new file mode 100644 index 00000000..97c2b4e0 Binary files /dev/null and b/objects/boulder/boulder2.iob differ diff --git a/objects/clutter/stone-7.iob b/objects/boulder/boulder3.iob similarity index 100% rename from objects/clutter/stone-7.iob rename to objects/boulder/boulder3.iob diff --git a/objects/boulder/boulder4.iob b/objects/boulder/boulder4.iob new file mode 100644 index 00000000..95c8808c Binary files /dev/null and b/objects/boulder/boulder4.iob differ diff --git a/objects/boulder/boulder5.iob b/objects/boulder/boulder5.iob new file mode 100644 index 00000000..0633b2fa Binary files /dev/null and b/objects/boulder/boulder5.iob differ diff --git a/objects/boulder/boulder6.iob b/objects/boulder/boulder6.iob new file mode 100644 index 00000000..f663612a Binary files /dev/null and b/objects/boulder/boulder6.iob differ diff --git a/objects/boulder/boulder7.iob b/objects/boulder/boulder7.iob new file mode 100644 index 00000000..aa804f95 Binary files /dev/null and b/objects/boulder/boulder7.iob differ diff --git a/objects/boulder/boulder8.iob b/objects/boulder/boulder8.iob new file mode 100644 index 00000000..134f75c6 Binary files /dev/null and b/objects/boulder/boulder8.iob differ diff --git a/objects/clutter/stone-1.iob b/objects/boulder/boulder9.iob similarity index 100% rename from objects/clutter/stone-1.iob rename to objects/boulder/boulder9.iob diff --git a/objects/bush/small/1.iob b/objects/bush/small/1.iob new file mode 100644 index 00000000..189bd22c Binary files /dev/null and b/objects/bush/small/1.iob differ diff --git a/objects/bush/small/2.iob b/objects/bush/small/2.iob new file mode 100644 index 00000000..027c5297 Binary files /dev/null and b/objects/bush/small/2.iob differ diff --git a/objects/bush/small/3.iob b/objects/bush/small/3.iob new file mode 100644 index 00000000..f39bbc97 Binary files /dev/null and b/objects/bush/small/3.iob differ diff --git a/objects/cactus-white/c1.iob b/objects/cactus-white/c1.iob new file mode 100644 index 00000000..7586f1e7 Binary files /dev/null and b/objects/cactus-white/c1.iob differ diff --git a/objects/cactus-white/c2.iob b/objects/cactus-white/c2.iob new file mode 100644 index 00000000..0797b52d Binary files /dev/null and b/objects/cactus-white/c2.iob differ diff --git a/objects/cactus-white/c3.iob b/objects/cactus-white/c3.iob new file mode 100644 index 00000000..795f9eb3 Binary files /dev/null and b/objects/cactus-white/c3.iob differ diff --git a/objects/cactus-white/c4.iob b/objects/cactus-white/c4.iob new file mode 100644 index 00000000..eb67dc36 Binary files /dev/null and b/objects/cactus-white/c4.iob differ diff --git a/objects/trees/darkoak/talldrift1.iob b/objects/cambian-drift/cambian-drift-3.iob similarity index 100% rename from objects/trees/darkoak/talldrift1.iob rename to objects/cambian-drift/cambian-drift-3.iob diff --git a/objects/trees/darkoak/talldrift2.iob b/objects/cambian-drift/cambian-drift-4.iob similarity index 100% rename from objects/trees/darkoak/talldrift2.iob rename to objects/cambian-drift/cambian-drift-4.iob diff --git a/objects/trees/darkoak/talldrift3.iob b/objects/cambian-drift/cambian-drift-5.iob similarity index 100% rename from objects/trees/darkoak/talldrift3.iob rename to objects/cambian-drift/cambian-drift-5.iob diff --git a/objects/trees/darkoak/talldrift4.iob b/objects/cambian-drift/cambian-drift-6.iob similarity index 100% rename from objects/trees/darkoak/talldrift4.iob rename to objects/cambian-drift/cambian-drift-6.iob diff --git a/objects/trees/darkoak/talldrift5.iob b/objects/cambian-drift/cambian-drift-7.iob similarity index 100% rename from objects/trees/darkoak/talldrift5.iob rename to objects/cambian-drift/cambian-drift-7.iob diff --git a/objects/trees/darkoak/talldrift6.iob b/objects/cambian-drift/cambian-drift-8.iob similarity index 100% rename from objects/trees/darkoak/talldrift6.iob rename to objects/cambian-drift/cambian-drift-8.iob diff --git a/objects/trees/darkoak/talldrift7.iob b/objects/cambian-drift/cambian-drift-9.iob similarity index 100% rename from objects/trees/darkoak/talldrift7.iob rename to objects/cambian-drift/cambian-drift-9.iob diff --git a/objects/trees/darkoak/talldrift8.iob b/objects/cambian-drift/cambian_drift-1.iob similarity index 100% rename from objects/trees/darkoak/talldrift8.iob rename to objects/cambian-drift/cambian_drift-1.iob diff --git a/objects/trees/darkoak/talldrift9.iob b/objects/cambian-drift/cambian_drift-2.iob similarity index 100% rename from objects/trees/darkoak/talldrift9.iob rename to objects/cambian-drift/cambian_drift-2.iob diff --git a/objects/camp/barrel-bin.iob b/objects/camp/barrel-bin.iob new file mode 100644 index 00000000..5566381d Binary files /dev/null and b/objects/camp/barrel-bin.iob differ diff --git a/objects/camp/camp.iob b/objects/camp/camp.iob new file mode 100644 index 00000000..5c3ef3ea Binary files /dev/null and b/objects/camp/camp.iob differ diff --git a/objects/camp/camp2.iob b/objects/camp/camp2.iob new file mode 100644 index 00000000..f889eb59 Binary files /dev/null and b/objects/camp/camp2.iob differ diff --git a/objects/camp/camp3.iob b/objects/camp/camp3.iob new file mode 100644 index 00000000..b041e9e5 Binary files /dev/null and b/objects/camp/camp3.iob differ diff --git a/objects/camp/camp4.iob b/objects/camp/camp4.iob new file mode 100644 index 00000000..f31a90c4 Binary files /dev/null and b/objects/camp/camp4.iob differ diff --git a/objects/camp/camp5.iob b/objects/camp/camp5.iob new file mode 100644 index 00000000..06da6752 Binary files /dev/null and b/objects/camp/camp5.iob differ diff --git a/objects/camp/soul-camp.iob b/objects/camp/soul-camp.iob new file mode 100644 index 00000000..dc0f1ba0 Binary files /dev/null and b/objects/camp/soul-camp.iob differ diff --git a/objects/caves/cave1.iob b/objects/caves/cave1.iob new file mode 100644 index 00000000..0212172e Binary files /dev/null and b/objects/caves/cave1.iob differ diff --git a/objects/caves/cave2.iob b/objects/caves/cave2.iob new file mode 100644 index 00000000..c728a936 Binary files /dev/null and b/objects/caves/cave2.iob differ diff --git a/objects/caves/cave3.iob b/objects/caves/cave3.iob new file mode 100644 index 00000000..16425106 Binary files /dev/null and b/objects/caves/cave3.iob differ diff --git a/objects/caves/cave4.iob b/objects/caves/cave4.iob new file mode 100644 index 00000000..c3fc6afb Binary files /dev/null and b/objects/caves/cave4.iob differ diff --git a/objects/caves/cave5.iob b/objects/caves/cave5.iob new file mode 100644 index 00000000..aa14047d Binary files /dev/null and b/objects/caves/cave5.iob differ diff --git a/objects/caves/cave6.iob b/objects/caves/cave6.iob new file mode 100644 index 00000000..24c79420 Binary files /dev/null and b/objects/caves/cave6.iob differ diff --git a/objects/clutter/JClutter1.iob b/objects/clutter/JClutter1.iob new file mode 100644 index 00000000..ede30434 Binary files /dev/null and b/objects/clutter/JClutter1.iob differ diff --git a/objects/clutter/JClutter10.iob b/objects/clutter/JClutter10.iob new file mode 100644 index 00000000..9afecc87 Binary files /dev/null and b/objects/clutter/JClutter10.iob differ diff --git a/objects/clutter/JClutter11.iob b/objects/clutter/JClutter11.iob new file mode 100644 index 00000000..875bd332 Binary files /dev/null and b/objects/clutter/JClutter11.iob differ diff --git a/objects/clutter/JClutter12.iob b/objects/clutter/JClutter12.iob new file mode 100644 index 00000000..ad09a0ba Binary files /dev/null and b/objects/clutter/JClutter12.iob differ diff --git a/objects/clutter/JClutter13.iob b/objects/clutter/JClutter13.iob new file mode 100644 index 00000000..7f1333a4 Binary files /dev/null and b/objects/clutter/JClutter13.iob differ diff --git a/objects/clutter/JClutter2.iob b/objects/clutter/JClutter2.iob new file mode 100644 index 00000000..dc575b93 Binary files /dev/null and b/objects/clutter/JClutter2.iob differ diff --git a/objects/clutter/JClutter3.iob b/objects/clutter/JClutter3.iob new file mode 100644 index 00000000..3aa704b7 Binary files /dev/null and b/objects/clutter/JClutter3.iob differ diff --git a/objects/clutter/JClutter4.iob b/objects/clutter/JClutter4.iob new file mode 100644 index 00000000..c3ad5387 Binary files /dev/null and b/objects/clutter/JClutter4.iob differ diff --git a/objects/clutter/JClutter5.iob b/objects/clutter/JClutter5.iob new file mode 100644 index 00000000..68e97363 Binary files /dev/null and b/objects/clutter/JClutter5.iob differ diff --git a/objects/clutter/JClutter6.iob b/objects/clutter/JClutter6.iob new file mode 100644 index 00000000..ba32727d Binary files /dev/null and b/objects/clutter/JClutter6.iob differ diff --git a/objects/clutter/JClutter7.iob b/objects/clutter/JClutter7.iob new file mode 100644 index 00000000..674b185c Binary files /dev/null and b/objects/clutter/JClutter7.iob differ diff --git a/objects/clutter/JClutter8.iob b/objects/clutter/JClutter8.iob new file mode 100644 index 00000000..93cc003c Binary files /dev/null and b/objects/clutter/JClutter8.iob differ diff --git a/objects/clutter/JClutter9.iob b/objects/clutter/JClutter9.iob new file mode 100644 index 00000000..f051bf64 Binary files /dev/null and b/objects/clutter/JClutter9.iob differ diff --git a/objects/clutter/Jstone1.iob b/objects/clutter/Jstone1.iob new file mode 100644 index 00000000..23feb5b8 Binary files /dev/null and b/objects/clutter/Jstone1.iob differ diff --git a/objects/clutter/Jstone2.iob b/objects/clutter/Jstone2.iob new file mode 100644 index 00000000..85ebdfb5 Binary files /dev/null and b/objects/clutter/Jstone2.iob differ diff --git a/objects/clutter/birch-clutt-1.iob b/objects/clutter/birch-clutt-1.iob new file mode 100644 index 00000000..c529bf8f Binary files /dev/null and b/objects/clutter/birch-clutt-1.iob differ diff --git a/objects/clutter/birch-clutt-2.iob b/objects/clutter/birch-clutt-2.iob new file mode 100644 index 00000000..3b2ecc8c Binary files /dev/null and b/objects/clutter/birch-clutt-2.iob differ diff --git a/objects/clutter/birch-clutt-3.iob b/objects/clutter/birch-clutt-3.iob new file mode 100644 index 00000000..ce2f42ef Binary files /dev/null and b/objects/clutter/birch-clutt-3.iob differ diff --git a/objects/clutter/birch-clutt-4.iob b/objects/clutter/birch-clutt-4.iob new file mode 100644 index 00000000..3788bf1e Binary files /dev/null and b/objects/clutter/birch-clutt-4.iob differ diff --git a/objects/clutter/birch-clutt-5.iob b/objects/clutter/birch-clutt-5.iob new file mode 100644 index 00000000..ea0c4595 Binary files /dev/null and b/objects/clutter/birch-clutt-5.iob differ diff --git a/objects/clutter/desert-post1.iob b/objects/clutter/desert-post1.iob new file mode 100644 index 00000000..5581722e Binary files /dev/null and b/objects/clutter/desert-post1.iob differ diff --git a/objects/clutter/desert-post2.iob b/objects/clutter/desert-post2.iob new file mode 100644 index 00000000..792012f0 Binary files /dev/null and b/objects/clutter/desert-post2.iob differ diff --git a/objects/clutter/desert-post3.iob b/objects/clutter/desert-post3.iob new file mode 100644 index 00000000..ba802739 Binary files /dev/null and b/objects/clutter/desert-post3.iob differ diff --git a/objects/clutter/doak-spec-1.iob b/objects/clutter/doak-spec-1.iob new file mode 100644 index 00000000..26ea63c6 Binary files /dev/null and b/objects/clutter/doak-spec-1.iob differ diff --git a/objects/clutter/doak-spec-2.iob b/objects/clutter/doak-spec-2.iob new file mode 100644 index 00000000..1211a38c Binary files /dev/null and b/objects/clutter/doak-spec-2.iob differ diff --git a/objects/clutter/doak-spec-3.iob b/objects/clutter/doak-spec-3.iob new file mode 100644 index 00000000..bccc6a48 Binary files /dev/null and b/objects/clutter/doak-spec-3.iob differ diff --git a/objects/clutter/oak-clutt-1.iob b/objects/clutter/oak-clutt-1.iob new file mode 100644 index 00000000..d0c57a54 Binary files /dev/null and b/objects/clutter/oak-clutt-1.iob differ diff --git a/objects/clutter/oak-clutt-2.iob b/objects/clutter/oak-clutt-2.iob new file mode 100644 index 00000000..150b2111 Binary files /dev/null and b/objects/clutter/oak-clutt-2.iob differ diff --git a/objects/clutter/oak-clutt-3.iob b/objects/clutter/oak-clutt-3.iob new file mode 100644 index 00000000..efe9c561 Binary files /dev/null and b/objects/clutter/oak-clutt-3.iob differ diff --git a/objects/clutter/oak-clutt-4.iob b/objects/clutter/oak-clutt-4.iob new file mode 100644 index 00000000..2649225f Binary files /dev/null and b/objects/clutter/oak-clutt-4.iob differ diff --git a/objects/clutter/oak-clutt-5.iob b/objects/clutter/oak-clutt-5.iob new file mode 100644 index 00000000..4c89981e Binary files /dev/null and b/objects/clutter/oak-clutt-5.iob differ diff --git a/objects/clutter/spruce-clutt-1.iob b/objects/clutter/spruce-clutt-1.iob new file mode 100644 index 00000000..e6fa6dc9 Binary files /dev/null and b/objects/clutter/spruce-clutt-1.iob differ diff --git a/objects/clutter/spruce-clutt-2.iob b/objects/clutter/spruce-clutt-2.iob new file mode 100644 index 00000000..40bf40d0 Binary files /dev/null and b/objects/clutter/spruce-clutt-2.iob differ diff --git a/objects/clutter/spruce-clutt-3.iob b/objects/clutter/spruce-clutt-3.iob new file mode 100644 index 00000000..85e807a7 Binary files /dev/null and b/objects/clutter/spruce-clutt-3.iob differ diff --git a/objects/clutter/spruce-clutt-4.iob b/objects/clutter/spruce-clutt-4.iob new file mode 100644 index 00000000..d470bfa2 Binary files /dev/null and b/objects/clutter/spruce-clutt-4.iob differ diff --git a/objects/clutter/spruce-clutt-5.iob b/objects/clutter/spruce-clutt-5.iob new file mode 100644 index 00000000..a604ed4d Binary files /dev/null and b/objects/clutter/spruce-clutt-5.iob differ diff --git a/objects/clutter/spruce-clutter.iob b/objects/clutter/spruce-clutter.iob new file mode 100644 index 00000000..b0feb511 Binary files /dev/null and b/objects/clutter/spruce-clutter.iob differ diff --git a/objects/clutter/stone-clutt-1.iob b/objects/clutter/stone-clutt-1.iob new file mode 100644 index 00000000..7e09542c Binary files /dev/null and b/objects/clutter/stone-clutt-1.iob differ diff --git a/objects/clutter/stone-clutt-2.iob b/objects/clutter/stone-clutt-2.iob new file mode 100644 index 00000000..97c3af68 Binary files /dev/null and b/objects/clutter/stone-clutt-2.iob differ diff --git a/objects/clutter/stone-clutt-3.iob b/objects/clutter/stone-clutt-3.iob new file mode 100644 index 00000000..ddcecfdc Binary files /dev/null and b/objects/clutter/stone-clutt-3.iob differ diff --git a/objects/clutter/stone-clutt-4.iob b/objects/clutter/stone-clutt-4.iob new file mode 100644 index 00000000..58d28bd2 Binary files /dev/null and b/objects/clutter/stone-clutt-4.iob differ diff --git a/objects/clutter/stone-clutt-5.iob b/objects/clutter/stone-clutt-5.iob new file mode 100644 index 00000000..66d15293 Binary files /dev/null and b/objects/clutter/stone-clutt-5.iob differ diff --git a/objects/clutter/stone-clutt-6.iob b/objects/clutter/stone-clutt-6.iob new file mode 100644 index 00000000..84e4bded Binary files /dev/null and b/objects/clutter/stone-clutt-6.iob differ diff --git a/objects/clutter/stone-clutt-7.iob b/objects/clutter/stone-clutt-7.iob new file mode 100644 index 00000000..2985919d Binary files /dev/null and b/objects/clutter/stone-clutt-7.iob differ 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/objects/coral-rgb/coral-by-1.iob b/objects/coral-rgb/coral-by-1.iob new file mode 100644 index 00000000..495c3cfd Binary files /dev/null and b/objects/coral-rgb/coral-by-1.iob differ diff --git a/objects/coral-rgb/coral-by-2.iob b/objects/coral-rgb/coral-by-2.iob new file mode 100644 index 00000000..0f274322 Binary files /dev/null and b/objects/coral-rgb/coral-by-2.iob differ diff --git a/objects/coral-rgb/coral-by-3.iob b/objects/coral-rgb/coral-by-3.iob new file mode 100644 index 00000000..dc8cadaa Binary files /dev/null and b/objects/coral-rgb/coral-by-3.iob differ diff --git a/objects/coral-rgb/coral-by-4.iob b/objects/coral-rgb/coral-by-4.iob new file mode 100644 index 00000000..4acf3f21 Binary files /dev/null and b/objects/coral-rgb/coral-by-4.iob differ diff --git a/objects/coral-rgb/coral-pink-1.iob b/objects/coral-rgb/coral-pink-1.iob new file mode 100644 index 00000000..df6e063e Binary files /dev/null and b/objects/coral-rgb/coral-pink-1.iob differ diff --git a/objects/coral-rgb/coral-pink-2.iob b/objects/coral-rgb/coral-pink-2.iob new file mode 100644 index 00000000..874b0ef4 Binary files /dev/null and b/objects/coral-rgb/coral-pink-2.iob differ diff --git a/objects/coral-rgb/coral-pink-3.iob b/objects/coral-rgb/coral-pink-3.iob new file mode 100644 index 00000000..a399611e Binary files /dev/null and b/objects/coral-rgb/coral-pink-3.iob differ diff --git a/objects/coral-rgb/coral-pink-4.iob b/objects/coral-rgb/coral-pink-4.iob new file mode 100644 index 00000000..dff0b836 Binary files /dev/null and b/objects/coral-rgb/coral-pink-4.iob differ diff --git a/objects/coral-rgb/coral-purp-1.iob b/objects/coral-rgb/coral-purp-1.iob new file mode 100644 index 00000000..33aab052 Binary files /dev/null and b/objects/coral-rgb/coral-purp-1.iob differ diff --git a/objects/coral-rgb/coral-purp-2.iob b/objects/coral-rgb/coral-purp-2.iob new file mode 100644 index 00000000..0ad5b120 Binary files /dev/null and b/objects/coral-rgb/coral-purp-2.iob differ diff --git a/objects/coral-rgb/coral-purp-3.iob b/objects/coral-rgb/coral-purp-3.iob new file mode 100644 index 00000000..06f3e491 Binary files /dev/null and b/objects/coral-rgb/coral-purp-3.iob differ diff --git a/objects/coral-rgb/coral-red-1.iob b/objects/coral-rgb/coral-red-1.iob new file mode 100644 index 00000000..a8afab3a Binary files /dev/null and b/objects/coral-rgb/coral-red-1.iob differ diff --git a/objects/coral-rgb/coral-yellow-3.iob b/objects/coral-rgb/coral-yellow-3.iob new file mode 100644 index 00000000..4af6a8eb Binary files /dev/null and b/objects/coral-rgb/coral-yellow-3.iob differ diff --git a/objects/coral/coral-by-1.iob b/objects/coral/coral-by-1.iob new file mode 100644 index 00000000..495c3cfd Binary files /dev/null and b/objects/coral/coral-by-1.iob differ diff --git a/objects/coral/coral-by-2.iob b/objects/coral/coral-by-2.iob new file mode 100644 index 00000000..0f274322 Binary files /dev/null and b/objects/coral/coral-by-2.iob differ diff --git a/objects/coral/coral-by-3.iob b/objects/coral/coral-by-3.iob new file mode 100644 index 00000000..dc8cadaa Binary files /dev/null and b/objects/coral/coral-by-3.iob differ diff --git a/objects/coral/coral-by-4.iob b/objects/coral/coral-by-4.iob new file mode 100644 index 00000000..4acf3f21 Binary files /dev/null and b/objects/coral/coral-by-4.iob differ diff --git a/objects/coral/coral-pink-1.iob b/objects/coral/coral-pink-1.iob new file mode 100644 index 00000000..df6e063e Binary files /dev/null and b/objects/coral/coral-pink-1.iob differ diff --git a/objects/coral/coral-pink-2.iob b/objects/coral/coral-pink-2.iob new file mode 100644 index 00000000..874b0ef4 Binary files /dev/null and b/objects/coral/coral-pink-2.iob differ diff --git a/objects/coral/coral-pink-3.iob b/objects/coral/coral-pink-3.iob new file mode 100644 index 00000000..a399611e Binary files /dev/null and b/objects/coral/coral-pink-3.iob differ diff --git a/objects/coral/coral-pink-4.iob b/objects/coral/coral-pink-4.iob new file mode 100644 index 00000000..dff0b836 Binary files /dev/null and b/objects/coral/coral-pink-4.iob differ diff --git a/objects/coral/coral-purp-1.iob b/objects/coral/coral-purp-1.iob new file mode 100644 index 00000000..33aab052 Binary files /dev/null and b/objects/coral/coral-purp-1.iob differ diff --git a/objects/coral/coral-purp-2.iob b/objects/coral/coral-purp-2.iob new file mode 100644 index 00000000..0ad5b120 Binary files /dev/null and b/objects/coral/coral-purp-2.iob differ diff --git a/objects/coral/coral-purp-3.iob b/objects/coral/coral-purp-3.iob new file mode 100644 index 00000000..06f3e491 Binary files /dev/null and b/objects/coral/coral-purp-3.iob differ diff --git a/objects/coral/coral-red-1.iob b/objects/coral/coral-red-1.iob new file mode 100644 index 00000000..a8afab3a Binary files /dev/null and b/objects/coral/coral-red-1.iob differ diff --git a/objects/coral/stonedirtsetter-1.iob b/objects/coral/stonedirtsetter-1.iob new file mode 100644 index 00000000..37597c70 Binary files /dev/null and b/objects/coral/stonedirtsetter-1.iob differ diff --git a/objects/coral/stonedirtsetter-2.iob b/objects/coral/stonedirtsetter-2.iob new file mode 100644 index 00000000..0233b920 Binary files /dev/null and b/objects/coral/stonedirtsetter-2.iob differ diff --git a/objects/coral/stonedirtsetter-3.iob b/objects/coral/stonedirtsetter-3.iob new file mode 100644 index 00000000..eeee451b Binary files /dev/null and b/objects/coral/stonedirtsetter-3.iob differ diff --git a/objects/coral/stonedirtsetter-4.iob b/objects/coral/stonedirtsetter-4.iob new file mode 100644 index 00000000..06bf9687 Binary files /dev/null and b/objects/coral/stonedirtsetter-4.iob differ diff --git a/objects/coral/stonedirtsetter-5.iob b/objects/coral/stonedirtsetter-5.iob new file mode 100644 index 00000000..8405f093 Binary files /dev/null and b/objects/coral/stonedirtsetter-5.iob differ diff --git a/objects/coral/stonedirtsetter-6.iob b/objects/coral/stonedirtsetter-6.iob new file mode 100644 index 00000000..3d513550 Binary files /dev/null and b/objects/coral/stonedirtsetter-6.iob differ diff --git a/objects/coral/stonedirtsetter-7.iob b/objects/coral/stonedirtsetter-7.iob new file mode 100644 index 00000000..612a467c Binary files /dev/null and b/objects/coral/stonedirtsetter-7.iob differ diff --git a/objects/trees/mushroom/crimsonwood-1.iob b/objects/corrupted/crimsonwood-1.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-1.iob rename to objects/corrupted/crimsonwood-1.iob diff --git a/objects/trees/mushroom/crimsonwood-2.iob b/objects/corrupted/crimsonwood-2.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-2.iob rename to objects/corrupted/crimsonwood-2.iob diff --git a/objects/trees/mushroom/crimsonwood-3.iob b/objects/corrupted/crimsonwood-3.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-3.iob rename to objects/corrupted/crimsonwood-3.iob diff --git a/objects/trees/mushroom/crimsonwood-4.iob b/objects/corrupted/crimsonwood-4.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-4.iob rename to objects/corrupted/crimsonwood-4.iob diff --git a/objects/trees/mushroom/crimsonwood-5.iob b/objects/corrupted/crimsonwood-5.iob similarity index 100% rename from objects/trees/mushroom/crimsonwood-5.iob rename to objects/corrupted/crimsonwood-5.iob diff --git a/objects/trees/mushroom/warped1.iob b/objects/corrupted/warpedwood-1.iob similarity index 100% rename from objects/trees/mushroom/warped1.iob rename to objects/corrupted/warpedwood-1.iob diff --git a/objects/trees/mushroom/warped2.iob b/objects/corrupted/warpedwood-2.iob similarity index 100% rename from objects/trees/mushroom/warped2.iob rename to objects/corrupted/warpedwood-2.iob diff --git a/objects/trees/mushroom/warped3.iob b/objects/corrupted/warpedwood-3.iob similarity index 100% rename from objects/trees/mushroom/warped3.iob rename to objects/corrupted/warpedwood-3.iob diff --git a/objects/trees/mushroom/warped4.iob b/objects/corrupted/warpedwood-4.iob similarity index 100% rename from objects/trees/mushroom/warped4.iob rename to objects/corrupted/warpedwood-4.iob diff --git a/objects/trees/mushroom/warped5.iob b/objects/corrupted/warpedwood-5.iob similarity index 100% rename from objects/trees/mushroom/warped5.iob rename to objects/corrupted/warpedwood-5.iob diff --git a/objects/trees/mushroom/warped6.iob b/objects/corrupted/warpedwood-6.iob similarity index 100% rename from objects/trees/mushroom/warped6.iob rename to objects/corrupted/warpedwood-6.iob diff --git a/objects/trees/oak/croak1.iob b/objects/creepy-oak/FantasyOak1.iob similarity index 100% rename from objects/trees/oak/croak1.iob rename to objects/creepy-oak/FantasyOak1.iob diff --git a/objects/trees/oak/croak2.iob b/objects/creepy-oak/FantasyOak10.iob similarity index 100% rename from objects/trees/oak/croak2.iob rename to objects/creepy-oak/FantasyOak10.iob diff --git a/objects/trees/oak/croak3.iob b/objects/creepy-oak/FantasyOak11.iob similarity index 100% rename from objects/trees/oak/croak3.iob rename to objects/creepy-oak/FantasyOak11.iob diff --git a/objects/trees/oak/croak4.iob b/objects/creepy-oak/FantasyOak12.iob similarity index 100% rename from objects/trees/oak/croak4.iob rename to objects/creepy-oak/FantasyOak12.iob diff --git a/objects/trees/oak/croak5.iob b/objects/creepy-oak/FantasyOak13.iob similarity index 100% rename from objects/trees/oak/croak5.iob rename to objects/creepy-oak/FantasyOak13.iob diff --git a/objects/trees/oak/croak6.iob b/objects/creepy-oak/FantasyOak14.iob similarity index 100% rename from objects/trees/oak/croak6.iob rename to objects/creepy-oak/FantasyOak14.iob diff --git a/objects/trees/oak/croak7.iob b/objects/creepy-oak/FantasyOak15.iob similarity index 100% rename from objects/trees/oak/croak7.iob rename to objects/creepy-oak/FantasyOak15.iob diff --git a/objects/trees/oak/croak8.iob b/objects/creepy-oak/FantasyOak16.iob similarity index 100% rename from objects/trees/oak/croak8.iob rename to objects/creepy-oak/FantasyOak16.iob diff --git a/objects/trees/oak/croak9.iob b/objects/creepy-oak/FantasyOak17.iob similarity index 100% rename from objects/trees/oak/croak9.iob rename to objects/creepy-oak/FantasyOak17.iob diff --git a/objects/trees/oak/croak10.iob b/objects/creepy-oak/FantasyOak18.iob similarity index 100% rename from objects/trees/oak/croak10.iob rename to objects/creepy-oak/FantasyOak18.iob diff --git a/objects/trees/oak/croak11.iob b/objects/creepy-oak/FantasyOak19.iob similarity index 100% rename from objects/trees/oak/croak11.iob rename to objects/creepy-oak/FantasyOak19.iob diff --git a/objects/trees/oak/croak12.iob b/objects/creepy-oak/FantasyOak2.iob similarity index 100% rename from objects/trees/oak/croak12.iob rename to objects/creepy-oak/FantasyOak2.iob diff --git a/objects/trees/oak/croak13.iob b/objects/creepy-oak/FantasyOak3.iob similarity index 100% rename from objects/trees/oak/croak13.iob rename to objects/creepy-oak/FantasyOak3.iob diff --git a/objects/trees/oak/croak14.iob b/objects/creepy-oak/FantasyOak4.iob similarity index 100% rename from objects/trees/oak/croak14.iob rename to objects/creepy-oak/FantasyOak4.iob diff --git a/objects/trees/oak/croak15.iob b/objects/creepy-oak/FantasyOak5.iob similarity index 100% rename from objects/trees/oak/croak15.iob rename to objects/creepy-oak/FantasyOak5.iob diff --git a/objects/trees/oak/croak16.iob b/objects/creepy-oak/FantasyOak6.iob similarity index 100% rename from objects/trees/oak/croak16.iob rename to objects/creepy-oak/FantasyOak6.iob diff --git a/objects/trees/oak/croak17.iob b/objects/creepy-oak/FantasyOak7.iob similarity index 100% rename from objects/trees/oak/croak17.iob rename to objects/creepy-oak/FantasyOak7.iob diff --git a/objects/trees/oak/croak18.iob b/objects/creepy-oak/FantasyOak8.iob similarity index 100% rename from objects/trees/oak/croak18.iob rename to objects/creepy-oak/FantasyOak8.iob diff --git a/objects/trees/oak/croak19.iob b/objects/creepy-oak/FantasyOak9.iob similarity index 100% rename from objects/trees/oak/croak19.iob rename to objects/creepy-oak/FantasyOak9.iob diff --git a/objects/crystal/crystal-1.iob b/objects/crystal/crystal-1.iob new file mode 100644 index 00000000..1b006397 Binary files /dev/null and b/objects/crystal/crystal-1.iob differ diff --git a/objects/crystal/crystal-10.iob b/objects/crystal/crystal-10.iob new file mode 100644 index 00000000..bbc5c29b Binary files /dev/null and b/objects/crystal/crystal-10.iob differ diff --git a/objects/crystal/crystal-2.iob b/objects/crystal/crystal-2.iob new file mode 100644 index 00000000..fcd8ed23 Binary files /dev/null and b/objects/crystal/crystal-2.iob differ diff --git a/objects/crystal/crystal-3.iob b/objects/crystal/crystal-3.iob new file mode 100644 index 00000000..be73b748 Binary files /dev/null and b/objects/crystal/crystal-3.iob differ diff --git a/objects/crystal/crystal-4.iob b/objects/crystal/crystal-4.iob new file mode 100644 index 00000000..d356b699 Binary files /dev/null and b/objects/crystal/crystal-4.iob differ diff --git a/objects/crystal/crystal-5.iob b/objects/crystal/crystal-5.iob new file mode 100644 index 00000000..6a6b6d7e Binary files /dev/null and b/objects/crystal/crystal-5.iob differ diff --git a/objects/crystal/crystal-6.iob b/objects/crystal/crystal-6.iob new file mode 100644 index 00000000..d32fb8d9 Binary files /dev/null and b/objects/crystal/crystal-6.iob differ diff --git a/objects/crystal/crystal-7.iob b/objects/crystal/crystal-7.iob new file mode 100644 index 00000000..3c34ee00 Binary files /dev/null and b/objects/crystal/crystal-7.iob differ diff --git a/objects/crystal/crystal-8.iob b/objects/crystal/crystal-8.iob new file mode 100644 index 00000000..36dc71cb Binary files /dev/null and b/objects/crystal/crystal-8.iob differ diff --git a/objects/crystal/crystal-9.iob b/objects/crystal/crystal-9.iob new file mode 100644 index 00000000..6408ed70 Binary files /dev/null and b/objects/crystal/crystal-9.iob differ diff --git a/objects/trees/darkoak/denmyre1.iob b/objects/dark-oak-medium/dark-oak-denmyre-1.iob similarity index 100% rename from objects/trees/darkoak/denmyre1.iob rename to objects/dark-oak-medium/dark-oak-denmyre-1.iob diff --git a/objects/trees/darkoak/denmyre2.iob b/objects/dark-oak-medium/dark-oak-denmyre-10.iob similarity index 100% rename from objects/trees/darkoak/denmyre2.iob rename to objects/dark-oak-medium/dark-oak-denmyre-10.iob diff --git a/objects/trees/darkoak/denmyre3.iob b/objects/dark-oak-medium/dark-oak-denmyre-11.iob similarity index 100% rename from objects/trees/darkoak/denmyre3.iob rename to objects/dark-oak-medium/dark-oak-denmyre-11.iob diff --git a/objects/trees/darkoak/denmyre4.iob b/objects/dark-oak-medium/dark-oak-denmyre-12.iob similarity index 100% rename from objects/trees/darkoak/denmyre4.iob rename to objects/dark-oak-medium/dark-oak-denmyre-12.iob diff --git a/objects/trees/darkoak/denmyre5.iob b/objects/dark-oak-medium/dark-oak-denmyre-13.iob similarity index 100% rename from objects/trees/darkoak/denmyre5.iob rename to objects/dark-oak-medium/dark-oak-denmyre-13.iob diff --git a/objects/trees/darkoak/denmyre6.iob b/objects/dark-oak-medium/dark-oak-denmyre-14.iob similarity index 100% rename from objects/trees/darkoak/denmyre6.iob rename to objects/dark-oak-medium/dark-oak-denmyre-14.iob diff --git a/objects/trees/darkoak/denmyre7.iob b/objects/dark-oak-medium/dark-oak-denmyre-15.iob similarity index 100% rename from objects/trees/darkoak/denmyre7.iob rename to objects/dark-oak-medium/dark-oak-denmyre-15.iob diff --git a/objects/trees/darkoak/denmyre8.iob b/objects/dark-oak-medium/dark-oak-denmyre-16.iob similarity index 100% rename from objects/trees/darkoak/denmyre8.iob rename to objects/dark-oak-medium/dark-oak-denmyre-16.iob diff --git a/objects/trees/darkoak/denmyre9.iob b/objects/dark-oak-medium/dark-oak-denmyre-2.iob similarity index 100% rename from objects/trees/darkoak/denmyre9.iob rename to objects/dark-oak-medium/dark-oak-denmyre-2.iob diff --git a/objects/trees/darkoak/denmyre10.iob b/objects/dark-oak-medium/dark-oak-denmyre-3.iob similarity index 100% rename from objects/trees/darkoak/denmyre10.iob rename to objects/dark-oak-medium/dark-oak-denmyre-3.iob diff --git a/objects/trees/darkoak/denmyre11.iob b/objects/dark-oak-medium/dark-oak-denmyre-4.iob similarity index 100% rename from objects/trees/darkoak/denmyre11.iob rename to objects/dark-oak-medium/dark-oak-denmyre-4.iob diff --git a/objects/trees/darkoak/denmyre12.iob b/objects/dark-oak-medium/dark-oak-denmyre-5.iob similarity index 100% rename from objects/trees/darkoak/denmyre12.iob rename to objects/dark-oak-medium/dark-oak-denmyre-5.iob diff --git a/objects/trees/darkoak/denmyre13.iob b/objects/dark-oak-medium/dark-oak-denmyre-6.iob similarity index 100% rename from objects/trees/darkoak/denmyre13.iob rename to objects/dark-oak-medium/dark-oak-denmyre-6.iob diff --git a/objects/trees/darkoak/denmyre14.iob b/objects/dark-oak-medium/dark-oak-denmyre-7.iob similarity index 100% rename from objects/trees/darkoak/denmyre14.iob rename to objects/dark-oak-medium/dark-oak-denmyre-7.iob diff --git a/objects/trees/darkoak/denmyre15.iob b/objects/dark-oak-medium/dark-oak-denmyre-8.iob similarity index 100% rename from objects/trees/darkoak/denmyre15.iob rename to objects/dark-oak-medium/dark-oak-denmyre-8.iob diff --git a/objects/trees/darkoak/denmyre16.iob b/objects/dark-oak-medium/dark-oak-denmyre-9.iob similarity index 100% rename from objects/trees/darkoak/denmyre16.iob rename to objects/dark-oak-medium/dark-oak-denmyre-9.iob diff --git a/objects/trees/darkoak/tallgeneric1.iob b/objects/dark-oak-medium/r1.iob similarity index 100% rename from objects/trees/darkoak/tallgeneric1.iob rename to objects/dark-oak-medium/r1.iob diff --git a/objects/trees/darkoak/tallgeneric2.iob b/objects/dark-oak-medium/r2.iob similarity index 100% rename from objects/trees/darkoak/tallgeneric2.iob rename to objects/dark-oak-medium/r2.iob diff --git a/objects/trees/jungle/vgeneric1.iob b/objects/darkjungle-large/JunLarge1.iob similarity index 100% rename from objects/trees/jungle/vgeneric1.iob rename to objects/darkjungle-large/JunLarge1.iob diff --git a/objects/trees/jungle/vgeneric2.iob b/objects/darkjungle-large/JunLarge2.iob similarity index 100% rename from objects/trees/jungle/vgeneric2.iob rename to objects/darkjungle-large/JunLarge2.iob diff --git a/objects/trees/jungle/vgeneric3.iob b/objects/darkjungle-large/JunLarge3.iob similarity index 100% rename from objects/trees/jungle/vgeneric3.iob rename to objects/darkjungle-large/JunLarge3.iob diff --git a/objects/trees/jungle/vgeneric4.iob b/objects/darkjungle-large/JunLarge4.iob similarity index 100% rename from objects/trees/jungle/vgeneric4.iob rename to objects/darkjungle-large/JunLarge4.iob diff --git a/objects/trees/jungle/vgeneric5.iob b/objects/darkjungle-medium/J11.iob similarity index 100% rename from objects/trees/jungle/vgeneric5.iob rename to objects/darkjungle-medium/J11.iob diff --git a/objects/trees/jungle/vgeneric8.iob b/objects/darkjungle-medium/J12.iob similarity index 100% rename from objects/trees/jungle/vgeneric8.iob rename to objects/darkjungle-medium/J12.iob diff --git a/objects/trees/jungle/vgeneric9.iob b/objects/darkjungle-medium/J13.iob similarity index 100% rename from objects/trees/jungle/vgeneric9.iob rename to objects/darkjungle-medium/J13.iob diff --git a/objects/trees/jungle/vgeneric12.iob b/objects/darkjungle-medium/J4.iob similarity index 100% rename from objects/trees/jungle/vgeneric12.iob rename to objects/darkjungle-medium/J4.iob diff --git a/objects/trees/jungle/vgeneric13.iob b/objects/darkjungle-medium/J5.iob similarity index 100% rename from objects/trees/jungle/vgeneric13.iob rename to objects/darkjungle-medium/J5.iob diff --git a/objects/trees/jungle/vgeneric14.iob b/objects/darkjungle-medium/J6.iob similarity index 100% rename from objects/trees/jungle/vgeneric14.iob rename to objects/darkjungle-medium/J6.iob diff --git a/objects/trees/jungle/vgeneric15.iob b/objects/darkjungle-medium/J7.iob similarity index 100% rename from objects/trees/jungle/vgeneric15.iob rename to objects/darkjungle-medium/J7.iob diff --git a/objects/trees/jungle/vgeneric6.iob b/objects/darkjungle-medium/J8.iob similarity index 100% rename from objects/trees/jungle/vgeneric6.iob rename to objects/darkjungle-medium/J8.iob diff --git a/objects/trees/jungle/vgeneric7.iob b/objects/darkjungle-medium/J9.iob similarity index 100% rename from objects/trees/jungle/vgeneric7.iob rename to objects/darkjungle-medium/J9.iob diff --git a/objects/trees/jungle/vgeneric10.iob b/objects/darkjungle-medium/j2.iob similarity index 100% rename from objects/trees/jungle/vgeneric10.iob rename to objects/darkjungle-medium/j2.iob diff --git a/objects/trees/jungle/vgeneric11.iob b/objects/darkjungle-medium/j3.iob similarity index 100% rename from objects/trees/jungle/vgeneric11.iob rename to objects/darkjungle-medium/j3.iob diff --git a/objects/trees/darkoak/floral1.iob b/objects/darkoak-large/j1.iob similarity index 100% rename from objects/trees/darkoak/floral1.iob rename to objects/darkoak-large/j1.iob diff --git a/objects/trees/darkoak/smolgeneric1.iob b/objects/darkoak-small/oak1.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric1.iob rename to objects/darkoak-small/oak1.iob diff --git a/objects/trees/darkoak/smolgeneric2.iob b/objects/darkoak-small/oak10.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric2.iob rename to objects/darkoak-small/oak10.iob diff --git a/objects/trees/darkoak/smolgeneric3.iob b/objects/darkoak-small/oak11.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric3.iob rename to objects/darkoak-small/oak11.iob diff --git a/objects/trees/darkoak/smolgeneric4.iob b/objects/darkoak-small/oak12.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric4.iob rename to objects/darkoak-small/oak12.iob diff --git a/objects/trees/darkoak/smolgeneric5.iob b/objects/darkoak-small/oak13.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric5.iob rename to objects/darkoak-small/oak13.iob diff --git a/objects/trees/darkoak/smolgeneric6.iob b/objects/darkoak-small/oak14.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric6.iob rename to objects/darkoak-small/oak14.iob diff --git a/objects/trees/darkoak/smolgeneric7.iob b/objects/darkoak-small/oak15.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric7.iob rename to objects/darkoak-small/oak15.iob diff --git a/objects/trees/darkoak/smolgeneric8.iob b/objects/darkoak-small/oak2.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric8.iob rename to objects/darkoak-small/oak2.iob diff --git a/objects/trees/darkoak/smolgeneric9.iob b/objects/darkoak-small/oak3.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric9.iob rename to objects/darkoak-small/oak3.iob diff --git a/objects/trees/darkoak/smolgeneric10.iob b/objects/darkoak-small/oak4.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric10.iob rename to objects/darkoak-small/oak4.iob diff --git a/objects/trees/darkoak/smolgeneric11.iob b/objects/darkoak-small/oak5.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric11.iob rename to objects/darkoak-small/oak5.iob diff --git a/objects/trees/darkoak/smolgeneric12.iob b/objects/darkoak-small/oak6.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric12.iob rename to objects/darkoak-small/oak6.iob diff --git a/objects/trees/darkoak/smolgeneric13.iob b/objects/darkoak-small/oak7.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric13.iob rename to objects/darkoak-small/oak7.iob diff --git a/objects/trees/darkoak/smolgeneric14.iob b/objects/darkoak-small/oak8.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric14.iob rename to objects/darkoak-small/oak8.iob diff --git a/objects/trees/darkoak/smolgeneric15.iob b/objects/darkoak-small/oak9.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric15.iob rename to objects/darkoak-small/oak9.iob diff --git a/objects/trees/oak/deadfallen1.iob b/objects/deadwood-fallen/dead1.iob similarity index 100% rename from objects/trees/oak/deadfallen1.iob rename to objects/deadwood-fallen/dead1.iob diff --git a/objects/trees/oak/mdeadwood1.iob b/objects/deadwood-massive/dead1.iob similarity index 100% rename from objects/trees/oak/mdeadwood1.iob rename to objects/deadwood-massive/dead1.iob diff --git a/objects/trees/oak/mdeadwood2.iob b/objects/deadwood-massive/dead2.iob similarity index 100% rename from objects/trees/oak/mdeadwood2.iob rename to objects/deadwood-massive/dead2.iob diff --git a/objects/trees/oak/mdeadwood3.iob b/objects/deadwood-massive/dead3.iob similarity index 100% rename from objects/trees/oak/mdeadwood3.iob rename to objects/deadwood-massive/dead3.iob diff --git a/objects/trees/oak/smdeadwood1.iob b/objects/deadwood-supermassive/dead1.iob similarity index 100% rename from objects/trees/oak/smdeadwood1.iob rename to objects/deadwood-supermassive/dead1.iob diff --git a/objects/trees/oak/smdeadwood2.iob b/objects/deadwood-supermassive/dead2.iob similarity index 100% rename from objects/trees/oak/smdeadwood2.iob rename to objects/deadwood-supermassive/dead2.iob diff --git a/objects/trees/oak/smdeadwood3.iob b/objects/deadwood-supermassive/dead3.iob similarity index 100% rename from objects/trees/oak/smdeadwood3.iob rename to objects/deadwood-supermassive/dead3.iob diff --git a/objects/deadwood-tainted/dead1.iob b/objects/deadwood-tainted/dead1.iob new file mode 100644 index 00000000..13fa6d63 Binary files /dev/null and b/objects/deadwood-tainted/dead1.iob differ diff --git a/objects/trees/oak/smdeadwilt1.iob b/objects/deadwood-wilted-supermassive/dead1.iob similarity index 100% rename from objects/trees/oak/smdeadwilt1.iob rename to objects/deadwood-wilted-supermassive/dead1.iob diff --git a/objects/trees/oak/dadwood1.iob b/objects/deadwood/dadwood1.iob similarity index 100% rename from objects/trees/oak/dadwood1.iob rename to objects/deadwood/dadwood1.iob diff --git a/objects/trees/oak/dadwood2.iob b/objects/deadwood/dadwood2.iob similarity index 100% rename from objects/trees/oak/dadwood2.iob rename to objects/deadwood/dadwood2.iob diff --git a/objects/trees/oak/dadwood3.iob b/objects/deadwood/dadwood3.iob similarity index 100% rename from objects/trees/oak/dadwood3.iob rename to objects/deadwood/dadwood3.iob diff --git a/objects/trees/oak/dadwood4.iob b/objects/deadwood/dadwood4.iob similarity index 100% rename from objects/trees/oak/dadwood4.iob rename to objects/deadwood/dadwood4.iob diff --git a/objects/trees/oak/dadwood5.iob b/objects/deadwood/dadwood5.iob similarity index 100% rename from objects/trees/oak/dadwood5.iob rename to objects/deadwood/dadwood5.iob diff --git a/objects/trees/oak/dadwood6.iob b/objects/deadwood/dadwood6.iob similarity index 100% rename from objects/trees/oak/dadwood6.iob rename to objects/deadwood/dadwood6.iob diff --git a/objects/trees/oak/dead-6.iob b/objects/deadwood/deadwood1.iob similarity index 100% rename from objects/trees/oak/dead-6.iob rename to objects/deadwood/deadwood1.iob diff --git a/objects/trees/oak/dead-5.iob b/objects/deadwood/deadwood2.iob similarity index 100% rename from objects/trees/oak/dead-5.iob rename to objects/deadwood/deadwood2.iob diff --git a/objects/trees/oak/dead-4.iob b/objects/deadwood/deadwood3.iob similarity index 100% rename from objects/trees/oak/dead-4.iob rename to objects/deadwood/deadwood3.iob diff --git a/objects/trees/oak/dead-3.iob b/objects/deadwood/deadwood4.iob similarity index 100% rename from objects/trees/oak/dead-3.iob rename to objects/deadwood/deadwood4.iob diff --git a/objects/trees/oak/dead-2.iob b/objects/deadwood/deadwood5.iob similarity index 100% rename from objects/trees/oak/dead-2.iob rename to objects/deadwood/deadwood5.iob diff --git a/objects/trees/oak/dead-1.iob b/objects/deadwood/deadwood6.iob similarity index 100% rename from objects/trees/oak/dead-1.iob rename to objects/deadwood/deadwood6.iob diff --git a/objects/deepslate/ds1.iob b/objects/deepslate/ds1.iob new file mode 100644 index 00000000..d960031a Binary files /dev/null and b/objects/deepslate/ds1.iob differ diff --git a/objects/deepslate/ds2.iob b/objects/deepslate/ds2.iob new file mode 100644 index 00000000..9df90fb8 Binary files /dev/null and b/objects/deepslate/ds2.iob differ diff --git a/objects/deepslate/ds3.iob b/objects/deepslate/ds3.iob new file mode 100644 index 00000000..4bd3db29 Binary files /dev/null and b/objects/deepslate/ds3.iob differ diff --git a/objects/denmyre/oak-denmyre-clutter-1.iob b/objects/denmyre/oak-denmyre-clutter-1.iob new file mode 100644 index 00000000..60dfe52f Binary files /dev/null and b/objects/denmyre/oak-denmyre-clutter-1.iob differ diff --git a/objects/denmyre/oak-denmyre-clutter-10.iob b/objects/denmyre/oak-denmyre-clutter-10.iob new file mode 100644 index 00000000..36e7b72f Binary files /dev/null and b/objects/denmyre/oak-denmyre-clutter-10.iob differ diff --git a/objects/denmyre/oak-denmyre-clutter-2.iob b/objects/denmyre/oak-denmyre-clutter-2.iob new file mode 100644 index 00000000..a66133b4 Binary files /dev/null and b/objects/denmyre/oak-denmyre-clutter-2.iob differ diff --git a/objects/denmyre/oak-denmyre-clutter-3.iob b/objects/denmyre/oak-denmyre-clutter-3.iob new file mode 100644 index 00000000..325ef959 Binary files /dev/null and b/objects/denmyre/oak-denmyre-clutter-3.iob differ diff --git a/objects/denmyre/oak-denmyre-clutter-4.iob b/objects/denmyre/oak-denmyre-clutter-4.iob new file mode 100644 index 00000000..ef8c4954 Binary files /dev/null and b/objects/denmyre/oak-denmyre-clutter-4.iob differ diff --git a/objects/denmyre/oak-denmyre-clutter-5.iob b/objects/denmyre/oak-denmyre-clutter-5.iob new file mode 100644 index 00000000..c05bc4d2 Binary files /dev/null and b/objects/denmyre/oak-denmyre-clutter-5.iob differ diff --git a/objects/denmyre/oak-denmyre-clutter-6.iob b/objects/denmyre/oak-denmyre-clutter-6.iob new file mode 100644 index 00000000..1ab30796 Binary files /dev/null and b/objects/denmyre/oak-denmyre-clutter-6.iob differ diff --git a/objects/denmyre/oak-denmyre-clutter-7.iob b/objects/denmyre/oak-denmyre-clutter-7.iob new file mode 100644 index 00000000..a1ea0256 Binary files /dev/null and b/objects/denmyre/oak-denmyre-clutter-7.iob differ diff --git a/objects/denmyre/oak-denmyre-clutter-8.iob b/objects/denmyre/oak-denmyre-clutter-8.iob new file mode 100644 index 00000000..ee35ebf2 Binary files /dev/null and b/objects/denmyre/oak-denmyre-clutter-8.iob differ diff --git a/objects/denmyre/oak-denmyre-clutter-9.iob b/objects/denmyre/oak-denmyre-clutter-9.iob new file mode 100644 index 00000000..259e266d Binary files /dev/null and b/objects/denmyre/oak-denmyre-clutter-9.iob differ diff --git a/objects/jigsaw/desert-pyramid/bottom.iob b/objects/desert-pyramid/bottom.iob similarity index 100% rename from objects/jigsaw/desert-pyramid/bottom.iob rename to objects/desert-pyramid/bottom.iob diff --git a/objects/jigsaw/desert-pyramid/top.iob b/objects/desert-pyramid/top.iob similarity index 100% rename from objects/jigsaw/desert-pyramid/top.iob rename to objects/desert-pyramid/top.iob diff --git a/objects/structures/hut.iob b/objects/desert/hut.iob similarity index 100% rename from objects/structures/hut.iob rename to objects/desert/hut.iob diff --git a/objects/structures/tower-twin.iob b/objects/desert/tower-twin.iob similarity index 100% rename from objects/structures/tower-twin.iob rename to objects/desert/tower-twin.iob diff --git a/objects/structures/tower.iob b/objects/desert/tower.iob similarity index 100% rename from objects/structures/tower.iob rename to objects/desert/tower.iob diff --git a/objects/dual-tree/corrupted-swamp-1.iob b/objects/dual-tree/corrupted-swamp-1.iob new file mode 100644 index 00000000..da657fb0 Binary files /dev/null and b/objects/dual-tree/corrupted-swamp-1.iob differ diff --git a/objects/dual-tree/corrupted-swamp-10.iob b/objects/dual-tree/corrupted-swamp-10.iob new file mode 100644 index 00000000..3abf6843 Binary files /dev/null and b/objects/dual-tree/corrupted-swamp-10.iob differ diff --git a/objects/dual-tree/corrupted-swamp-2.iob b/objects/dual-tree/corrupted-swamp-2.iob new file mode 100644 index 00000000..38603b5b Binary files /dev/null and b/objects/dual-tree/corrupted-swamp-2.iob differ diff --git a/objects/dual-tree/corrupted-swamp-3.iob b/objects/dual-tree/corrupted-swamp-3.iob new file mode 100644 index 00000000..460f67ec Binary files /dev/null and b/objects/dual-tree/corrupted-swamp-3.iob differ diff --git a/objects/dual-tree/corrupted-swamp-4.iob b/objects/dual-tree/corrupted-swamp-4.iob new file mode 100644 index 00000000..a13edd11 Binary files /dev/null and b/objects/dual-tree/corrupted-swamp-4.iob differ diff --git a/objects/dual-tree/corrupted-swamp-5.iob b/objects/dual-tree/corrupted-swamp-5.iob new file mode 100644 index 00000000..16740149 Binary files /dev/null and b/objects/dual-tree/corrupted-swamp-5.iob differ diff --git a/objects/dual-tree/corrupted-swamp-6.iob b/objects/dual-tree/corrupted-swamp-6.iob new file mode 100644 index 00000000..8d7de12f Binary files /dev/null and b/objects/dual-tree/corrupted-swamp-6.iob differ diff --git a/objects/dual-tree/corrupted-swamp-7.iob b/objects/dual-tree/corrupted-swamp-7.iob new file mode 100644 index 00000000..cf22b370 Binary files /dev/null and b/objects/dual-tree/corrupted-swamp-7.iob differ diff --git a/objects/dual-tree/corrupted-swamp-8.iob b/objects/dual-tree/corrupted-swamp-8.iob new file mode 100644 index 00000000..ea4236f9 Binary files /dev/null and b/objects/dual-tree/corrupted-swamp-8.iob differ diff --git a/objects/dual-tree/corrupted-swamp-9.iob b/objects/dual-tree/corrupted-swamp-9.iob new file mode 100644 index 00000000..c1bab8da Binary files /dev/null and b/objects/dual-tree/corrupted-swamp-9.iob differ diff --git a/objects/dual-tree/infested-palm-1.iob b/objects/dual-tree/infested-palm-1.iob new file mode 100644 index 00000000..6ab71873 Binary files /dev/null and b/objects/dual-tree/infested-palm-1.iob differ diff --git a/objects/dual-tree/infested-palm-2.iob b/objects/dual-tree/infested-palm-2.iob new file mode 100644 index 00000000..e6ef7d6a Binary files /dev/null and b/objects/dual-tree/infested-palm-2.iob differ diff --git a/objects/dual-tree/infested-palm-3.iob b/objects/dual-tree/infested-palm-3.iob new file mode 100644 index 00000000..f0db7a38 Binary files /dev/null and b/objects/dual-tree/infested-palm-3.iob differ diff --git a/objects/dual-tree/infested-palm-4.iob b/objects/dual-tree/infested-palm-4.iob new file mode 100644 index 00000000..79478cb7 Binary files /dev/null and b/objects/dual-tree/infested-palm-4.iob differ diff --git a/objects/dual-tree/infested-palm-5.iob b/objects/dual-tree/infested-palm-5.iob new file mode 100644 index 00000000..439ea8f9 Binary files /dev/null and b/objects/dual-tree/infested-palm-5.iob differ diff --git a/objects/dual-tree/sandy-jungle-1.iob b/objects/dual-tree/sandy-jungle-1.iob new file mode 100644 index 00000000..fbe3459d Binary files /dev/null and b/objects/dual-tree/sandy-jungle-1.iob differ diff --git a/objects/dual-tree/sandy-jungle-2.iob b/objects/dual-tree/sandy-jungle-2.iob new file mode 100644 index 00000000..e009f3a1 Binary files /dev/null and b/objects/dual-tree/sandy-jungle-2.iob differ diff --git a/objects/dual-tree/sandy-jungle-3.iob b/objects/dual-tree/sandy-jungle-3.iob new file mode 100644 index 00000000..456d1ac2 Binary files /dev/null and b/objects/dual-tree/sandy-jungle-3.iob differ diff --git a/objects/dual-tree/sandy-jungle-4.iob b/objects/dual-tree/sandy-jungle-4.iob new file mode 100644 index 00000000..16f5b18a Binary files /dev/null and b/objects/dual-tree/sandy-jungle-4.iob differ diff --git a/objects/jigsaw/dungeon/spawner-room.iob b/objects/dungeon/spawner-room.iob similarity index 100% rename from objects/jigsaw/dungeon/spawner-room.iob rename to objects/dungeon/spawner-room.iob diff --git a/objects/elder-wood/ElderRedwood1.iob b/objects/elder-wood/ElderRedwood1.iob new file mode 100644 index 00000000..3c4235e3 Binary files /dev/null and b/objects/elder-wood/ElderRedwood1.iob differ diff --git a/objects/elder-wood/ElderRedwood10.iob b/objects/elder-wood/ElderRedwood10.iob new file mode 100644 index 00000000..a7f60fb4 Binary files /dev/null and b/objects/elder-wood/ElderRedwood10.iob differ diff --git a/objects/elder-wood/ElderRedwood2.iob b/objects/elder-wood/ElderRedwood2.iob new file mode 100644 index 00000000..d519f3cd Binary files /dev/null and b/objects/elder-wood/ElderRedwood2.iob differ diff --git a/objects/elder-wood/ElderRedwood3.iob b/objects/elder-wood/ElderRedwood3.iob new file mode 100644 index 00000000..f8455af2 Binary files /dev/null and b/objects/elder-wood/ElderRedwood3.iob differ diff --git a/objects/elder-wood/ElderRedwood4.iob b/objects/elder-wood/ElderRedwood4.iob new file mode 100644 index 00000000..2ce15721 Binary files /dev/null and b/objects/elder-wood/ElderRedwood4.iob differ diff --git a/objects/elder-wood/ElderRedwood5.iob b/objects/elder-wood/ElderRedwood5.iob new file mode 100644 index 00000000..4d6dedda Binary files /dev/null and b/objects/elder-wood/ElderRedwood5.iob differ diff --git a/objects/elder-wood/ElderRedwood6.iob b/objects/elder-wood/ElderRedwood6.iob new file mode 100644 index 00000000..c2c878a1 Binary files /dev/null and b/objects/elder-wood/ElderRedwood6.iob differ diff --git a/objects/elder-wood/ElderRedwood7.iob b/objects/elder-wood/ElderRedwood7.iob new file mode 100644 index 00000000..a8f85135 Binary files /dev/null and b/objects/elder-wood/ElderRedwood7.iob differ diff --git a/objects/elder-wood/ElderRedwood8.iob b/objects/elder-wood/ElderRedwood8.iob new file mode 100644 index 00000000..49330341 Binary files /dev/null and b/objects/elder-wood/ElderRedwood8.iob differ diff --git a/objects/elder-wood/ElderRedwood9.iob b/objects/elder-wood/ElderRedwood9.iob new file mode 100644 index 00000000..d215f5fd Binary files /dev/null and b/objects/elder-wood/ElderRedwood9.iob differ diff --git a/objects/jigsaw/end_city/base_floor.iob b/objects/end_city/base_floor.iob similarity index 100% rename from objects/jigsaw/end_city/base_floor.iob rename to objects/end_city/base_floor.iob diff --git a/objects/jigsaw/end_city/base_roof.iob b/objects/end_city/base_roof.iob similarity index 100% rename from objects/jigsaw/end_city/base_roof.iob rename to objects/end_city/base_roof.iob diff --git a/objects/jigsaw/end_city/bridge_end.iob b/objects/end_city/bridge_end.iob similarity index 100% rename from objects/jigsaw/end_city/bridge_end.iob rename to objects/end_city/bridge_end.iob diff --git a/objects/jigsaw/end_city/bridge_gentle_stairs.iob b/objects/end_city/bridge_gentle_stairs.iob similarity index 100% rename from objects/jigsaw/end_city/bridge_gentle_stairs.iob rename to objects/end_city/bridge_gentle_stairs.iob diff --git a/objects/jigsaw/end_city/bridge_piece.iob b/objects/end_city/bridge_piece.iob similarity index 100% rename from objects/jigsaw/end_city/bridge_piece.iob rename to objects/end_city/bridge_piece.iob diff --git a/objects/jigsaw/end_city/bridge_steep_stairs.iob b/objects/end_city/bridge_steep_stairs.iob similarity index 100% rename from objects/jigsaw/end_city/bridge_steep_stairs.iob rename to objects/end_city/bridge_steep_stairs.iob diff --git a/objects/jigsaw/end_city/fat_tower_base.iob b/objects/end_city/fat_tower_base.iob similarity index 100% rename from objects/jigsaw/end_city/fat_tower_base.iob rename to objects/end_city/fat_tower_base.iob diff --git a/objects/jigsaw/end_city/fat_tower_middle.iob b/objects/end_city/fat_tower_middle.iob similarity index 100% rename from objects/jigsaw/end_city/fat_tower_middle.iob rename to objects/end_city/fat_tower_middle.iob diff --git a/objects/jigsaw/end_city/fat_tower_top.iob b/objects/end_city/fat_tower_top.iob similarity index 100% rename from objects/jigsaw/end_city/fat_tower_top.iob rename to objects/end_city/fat_tower_top.iob diff --git a/objects/jigsaw/end_city/second_floor_1.iob b/objects/end_city/second_floor_1.iob similarity index 100% rename from objects/jigsaw/end_city/second_floor_1.iob rename to objects/end_city/second_floor_1.iob diff --git a/objects/jigsaw/end_city/second_floor_2.iob b/objects/end_city/second_floor_2.iob similarity index 100% rename from objects/jigsaw/end_city/second_floor_2.iob rename to objects/end_city/second_floor_2.iob diff --git a/objects/jigsaw/end_city/second_roof.iob b/objects/end_city/second_roof.iob similarity index 100% rename from objects/jigsaw/end_city/second_roof.iob rename to objects/end_city/second_roof.iob diff --git a/objects/jigsaw/end_city/ship.iob b/objects/end_city/ship.iob similarity index 100% rename from objects/jigsaw/end_city/ship.iob rename to objects/end_city/ship.iob diff --git a/objects/jigsaw/end_city/third_floor_1.iob b/objects/end_city/third_floor_1.iob similarity index 100% rename from objects/jigsaw/end_city/third_floor_1.iob rename to objects/end_city/third_floor_1.iob diff --git a/objects/jigsaw/end_city/third_floor_2.iob b/objects/end_city/third_floor_2.iob similarity index 100% rename from objects/jigsaw/end_city/third_floor_2.iob rename to objects/end_city/third_floor_2.iob diff --git a/objects/jigsaw/end_city/third_roof.iob b/objects/end_city/third_roof.iob similarity index 100% rename from objects/jigsaw/end_city/third_roof.iob rename to objects/end_city/third_roof.iob diff --git a/objects/jigsaw/end_city/tower_base.iob b/objects/end_city/tower_base.iob similarity index 100% rename from objects/jigsaw/end_city/tower_base.iob rename to objects/end_city/tower_base.iob diff --git a/objects/jigsaw/end_city/tower_floor.iob b/objects/end_city/tower_floor.iob similarity index 100% rename from objects/jigsaw/end_city/tower_floor.iob rename to objects/end_city/tower_floor.iob diff --git a/objects/jigsaw/end_city/tower_piece.iob b/objects/end_city/tower_piece.iob similarity index 100% rename from objects/jigsaw/end_city/tower_piece.iob rename to objects/end_city/tower_piece.iob diff --git a/objects/jigsaw/end_city/tower_top.iob b/objects/end_city/tower_top.iob similarity index 100% rename from objects/jigsaw/end_city/tower_top.iob rename to objects/end_city/tower_top.iob diff --git a/objects/trees/spruce/levergreen1.iob b/objects/evergreen/fantasy_evergreen_large1.iob similarity index 100% rename from objects/trees/spruce/levergreen1.iob rename to objects/evergreen/fantasy_evergreen_large1.iob diff --git a/objects/trees/spruce/levergreen2.iob b/objects/evergreen/fantasy_evergreen_large2.iob similarity index 100% rename from objects/trees/spruce/levergreen2.iob rename to objects/evergreen/fantasy_evergreen_large2.iob diff --git a/objects/trees/spruce/levergreen3.iob b/objects/evergreen/fantasy_evergreen_large3.iob similarity index 100% rename from objects/trees/spruce/levergreen3.iob rename to objects/evergreen/fantasy_evergreen_large3.iob diff --git a/objects/trees/spruce/levergreen4.iob b/objects/evergreen/fantasy_evergreen_large4.iob similarity index 100% rename from objects/trees/spruce/levergreen4.iob rename to objects/evergreen/fantasy_evergreen_large4.iob diff --git a/objects/trees/spruce/levergreen5.iob b/objects/evergreen/fantasy_evergreen_large5.iob similarity index 100% rename from objects/trees/spruce/levergreen5.iob rename to objects/evergreen/fantasy_evergreen_large5.iob diff --git a/objects/trees/spruce/levergreen6.iob b/objects/evergreen/fantasy_evergreen_large6.iob similarity index 100% rename from objects/trees/spruce/levergreen6.iob rename to objects/evergreen/fantasy_evergreen_large6.iob diff --git a/objects/trees/spruce/mevergreen1.iob b/objects/evergreen/fantasy_evergreen_medium1.iob similarity index 100% rename from objects/trees/spruce/mevergreen1.iob rename to objects/evergreen/fantasy_evergreen_medium1.iob diff --git a/objects/trees/spruce/mevergreen2.iob b/objects/evergreen/fantasy_evergreen_medium2.iob similarity index 100% rename from objects/trees/spruce/mevergreen2.iob rename to objects/evergreen/fantasy_evergreen_medium2.iob diff --git a/objects/trees/spruce/mevergreen3.iob b/objects/evergreen/fantasy_evergreen_medium3.iob similarity index 100% rename from objects/trees/spruce/mevergreen3.iob rename to objects/evergreen/fantasy_evergreen_medium3.iob diff --git a/objects/trees/spruce/severgreen1.iob b/objects/evergreen/fantasy_evergreen_small1.iob similarity index 100% rename from objects/trees/spruce/severgreen1.iob rename to objects/evergreen/fantasy_evergreen_small1.iob diff --git a/objects/trees/spruce/severgreen2.iob b/objects/evergreen/fantasy_evergreen_small2.iob similarity index 100% rename from objects/trees/spruce/severgreen2.iob rename to objects/evergreen/fantasy_evergreen_small2.iob diff --git a/objects/trees/oak/foak1.iob b/objects/fantasyoak-large/fantasy_oak_large1.iob similarity index 100% rename from objects/trees/oak/foak1.iob rename to objects/fantasyoak-large/fantasy_oak_large1.iob diff --git a/objects/trees/oak/foakm1.iob b/objects/fantasyoak-medium/fantasy_oak_medium1.iob similarity index 100% rename from objects/trees/oak/foakm1.iob rename to objects/fantasyoak-medium/fantasy_oak_medium1.iob diff --git a/objects/trees/oak/foakm2.iob b/objects/fantasyoak-medium/fantasy_oak_medium2.iob similarity index 100% rename from objects/trees/oak/foakm2.iob rename to objects/fantasyoak-medium/fantasy_oak_medium2.iob diff --git a/objects/trees/oak/foakm3.iob b/objects/fantasyoak-medium/fantasy_oak_medium3.iob similarity index 100% rename from objects/trees/oak/foakm3.iob rename to objects/fantasyoak-medium/fantasy_oak_medium3.iob diff --git a/objects/trees/oak/foakm4.iob b/objects/fantasyoak-medium/fantasy_oak_medium4.iob similarity index 100% rename from objects/trees/oak/foakm4.iob rename to objects/fantasyoak-medium/fantasy_oak_medium4.iob diff --git a/objects/fossil/skull_1.iob b/objects/fossil/skull_1.iob new file mode 100644 index 00000000..8384c9cb Binary files /dev/null and b/objects/fossil/skull_1.iob differ diff --git a/objects/fossil/skull_1_coal.iob b/objects/fossil/skull_1_coal.iob new file mode 100644 index 00000000..15252e55 Binary files /dev/null and b/objects/fossil/skull_1_coal.iob differ diff --git a/objects/fossil/skull_2.iob b/objects/fossil/skull_2.iob new file mode 100644 index 00000000..eefc0e0d Binary files /dev/null and b/objects/fossil/skull_2.iob differ diff --git a/objects/fossil/skull_2_coal.iob b/objects/fossil/skull_2_coal.iob new file mode 100644 index 00000000..3a0076ce Binary files /dev/null and b/objects/fossil/skull_2_coal.iob differ diff --git a/objects/fossil/skull_3.iob b/objects/fossil/skull_3.iob new file mode 100644 index 00000000..d6ae8722 Binary files /dev/null and b/objects/fossil/skull_3.iob differ diff --git a/objects/fossil/skull_3_coal.iob b/objects/fossil/skull_3_coal.iob new file mode 100644 index 00000000..1ee33adb Binary files /dev/null and b/objects/fossil/skull_3_coal.iob differ diff --git a/objects/fossil/skull_4.iob b/objects/fossil/skull_4.iob new file mode 100644 index 00000000..f8692b95 Binary files /dev/null and b/objects/fossil/skull_4.iob differ diff --git a/objects/fossil/skull_4_coal.iob b/objects/fossil/skull_4_coal.iob new file mode 100644 index 00000000..8093e1f7 Binary files /dev/null and b/objects/fossil/skull_4_coal.iob differ diff --git a/objects/fossil/spine_1.iob b/objects/fossil/spine_1.iob new file mode 100644 index 00000000..38bcdb8b Binary files /dev/null and b/objects/fossil/spine_1.iob differ diff --git a/objects/fossil/spine_1_coal.iob b/objects/fossil/spine_1_coal.iob new file mode 100644 index 00000000..9702415c Binary files /dev/null and b/objects/fossil/spine_1_coal.iob differ diff --git a/objects/fossil/spine_2.iob b/objects/fossil/spine_2.iob new file mode 100644 index 00000000..1879cbde Binary files /dev/null and b/objects/fossil/spine_2.iob differ diff --git a/objects/fossil/spine_2_coal.iob b/objects/fossil/spine_2_coal.iob new file mode 100644 index 00000000..c70782b4 Binary files /dev/null and b/objects/fossil/spine_2_coal.iob differ diff --git a/objects/fossil/spine_3.iob b/objects/fossil/spine_3.iob new file mode 100644 index 00000000..5572b5ba Binary files /dev/null and b/objects/fossil/spine_3.iob differ diff --git a/objects/fossil/spine_3_coal.iob b/objects/fossil/spine_3_coal.iob new file mode 100644 index 00000000..b94413ea Binary files /dev/null and b/objects/fossil/spine_3_coal.iob differ diff --git a/objects/fossil/spine_4.iob b/objects/fossil/spine_4.iob new file mode 100644 index 00000000..7988c157 Binary files /dev/null and b/objects/fossil/spine_4.iob differ diff --git a/objects/fossil/spine_4_coal.iob b/objects/fossil/spine_4_coal.iob new file mode 100644 index 00000000..4ddeadf6 Binary files /dev/null and b/objects/fossil/spine_4_coal.iob differ diff --git a/objects/trees/sproak/generic1.iob b/objects/frosted-sproak/med-1.iob similarity index 100% rename from objects/trees/sproak/generic1.iob rename to objects/frosted-sproak/med-1.iob diff --git a/objects/trees/sproak/generic2.iob b/objects/frosted-sproak/med-10.iob similarity index 100% rename from objects/trees/sproak/generic2.iob rename to objects/frosted-sproak/med-10.iob diff --git a/objects/trees/sproak/generic3.iob b/objects/frosted-sproak/med-11.iob similarity index 100% rename from objects/trees/sproak/generic3.iob rename to objects/frosted-sproak/med-11.iob diff --git a/objects/trees/sproak/generic4.iob b/objects/frosted-sproak/med-12.iob similarity index 100% rename from objects/trees/sproak/generic4.iob rename to objects/frosted-sproak/med-12.iob diff --git a/objects/trees/sproak/generic5.iob b/objects/frosted-sproak/med-13.iob similarity index 100% rename from objects/trees/sproak/generic5.iob rename to objects/frosted-sproak/med-13.iob diff --git a/objects/trees/sproak/generic6.iob b/objects/frosted-sproak/med-2.iob similarity index 100% rename from objects/trees/sproak/generic6.iob rename to objects/frosted-sproak/med-2.iob diff --git a/objects/trees/sproak/generic7.iob b/objects/frosted-sproak/med-3.iob similarity index 100% rename from objects/trees/sproak/generic7.iob rename to objects/frosted-sproak/med-3.iob diff --git a/objects/trees/sproak/generic8.iob b/objects/frosted-sproak/med-4.iob similarity index 100% rename from objects/trees/sproak/generic8.iob rename to objects/frosted-sproak/med-4.iob diff --git a/objects/trees/sproak/generic9.iob b/objects/frosted-sproak/med-5.iob similarity index 100% rename from objects/trees/sproak/generic9.iob rename to objects/frosted-sproak/med-5.iob diff --git a/objects/trees/sproak/generic10.iob b/objects/frosted-sproak/med-7.iob similarity index 100% rename from objects/trees/sproak/generic10.iob rename to objects/frosted-sproak/med-7.iob diff --git a/objects/trees/sproak/generic11.iob b/objects/frosted-sproak/med-8.iob similarity index 100% rename from objects/trees/sproak/generic11.iob rename to objects/frosted-sproak/med-8.iob diff --git a/objects/trees/sproak/generic12.iob b/objects/frosted-sproak/med-9.iob similarity index 100% rename from objects/trees/sproak/generic12.iob rename to objects/frosted-sproak/med-9.iob diff --git a/objects/trees/spruce/sfrostgeneric1.iob b/objects/frosted-spruce/[Iced Variants]/smol-1.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric1.iob rename to objects/frosted-spruce/[Iced Variants]/smol-1.iob diff --git a/objects/trees/spruce/sfrostgeneric2.iob b/objects/frosted-spruce/[Iced Variants]/smol-10.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric2.iob rename to objects/frosted-spruce/[Iced Variants]/smol-10.iob diff --git a/objects/trees/spruce/sfrostgeneric3.iob b/objects/frosted-spruce/[Iced Variants]/smol-11.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric3.iob rename to objects/frosted-spruce/[Iced Variants]/smol-11.iob diff --git a/objects/trees/spruce/sfrostgeneric4.iob b/objects/frosted-spruce/[Iced Variants]/smol-12.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric4.iob rename to objects/frosted-spruce/[Iced Variants]/smol-12.iob diff --git a/objects/trees/spruce/sfrostgeneric5.iob b/objects/frosted-spruce/[Iced Variants]/smol-13.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric5.iob rename to objects/frosted-spruce/[Iced Variants]/smol-13.iob diff --git a/objects/trees/spruce/sfrostgeneric6.iob b/objects/frosted-spruce/[Iced Variants]/smol-14.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric6.iob rename to objects/frosted-spruce/[Iced Variants]/smol-14.iob diff --git a/objects/trees/spruce/sfrostgeneric7.iob b/objects/frosted-spruce/[Iced Variants]/smol-15.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric7.iob rename to objects/frosted-spruce/[Iced Variants]/smol-15.iob diff --git a/objects/trees/spruce/sfrostgeneric8.iob b/objects/frosted-spruce/[Iced Variants]/smol-16.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric8.iob rename to objects/frosted-spruce/[Iced Variants]/smol-16.iob diff --git a/objects/trees/spruce/sfrostgeneric9.iob b/objects/frosted-spruce/[Iced Variants]/smol-17.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric9.iob rename to objects/frosted-spruce/[Iced Variants]/smol-17.iob diff --git a/objects/trees/spruce/sfrostgeneric10.iob b/objects/frosted-spruce/[Iced Variants]/smol-18.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric10.iob rename to objects/frosted-spruce/[Iced Variants]/smol-18.iob diff --git a/objects/trees/spruce/sfrostgeneric11.iob b/objects/frosted-spruce/[Iced Variants]/smol-19.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric11.iob rename to objects/frosted-spruce/[Iced Variants]/smol-19.iob diff --git a/objects/trees/spruce/sfrostgeneric12.iob b/objects/frosted-spruce/[Iced Variants]/smol-2.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric12.iob rename to objects/frosted-spruce/[Iced Variants]/smol-2.iob diff --git a/objects/trees/spruce/sfrostgeneric13.iob b/objects/frosted-spruce/[Iced Variants]/smol-20.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric13.iob rename to objects/frosted-spruce/[Iced Variants]/smol-20.iob diff --git a/objects/trees/spruce/sfrostgeneric14.iob b/objects/frosted-spruce/[Iced Variants]/smol-3.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric14.iob rename to objects/frosted-spruce/[Iced Variants]/smol-3.iob diff --git a/objects/trees/spruce/sfrostgeneric15.iob b/objects/frosted-spruce/[Iced Variants]/smol-4.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric15.iob rename to objects/frosted-spruce/[Iced Variants]/smol-4.iob diff --git a/objects/trees/spruce/sfrostgeneric16.iob b/objects/frosted-spruce/[Iced Variants]/smol-5.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric16.iob rename to objects/frosted-spruce/[Iced Variants]/smol-5.iob diff --git a/objects/trees/spruce/sfrostgeneric17.iob b/objects/frosted-spruce/[Iced Variants]/smol-6.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric17.iob rename to objects/frosted-spruce/[Iced Variants]/smol-6.iob diff --git a/objects/trees/spruce/sfrostgeneric18.iob b/objects/frosted-spruce/[Iced Variants]/smol-7.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric18.iob rename to objects/frosted-spruce/[Iced Variants]/smol-7.iob diff --git a/objects/trees/spruce/sfrostgeneric19.iob b/objects/frosted-spruce/[Iced Variants]/smol-8.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric19.iob rename to objects/frosted-spruce/[Iced Variants]/smol-8.iob diff --git a/objects/trees/spruce/sfrostgeneric20.iob b/objects/frosted-spruce/[Iced Variants]/smol-9.iob similarity index 100% rename from objects/trees/spruce/sfrostgeneric20.iob rename to objects/frosted-spruce/[Iced Variants]/smol-9.iob diff --git a/objects/trees/spruce/lfrostgeneric1.iob b/objects/frosted-spruce/large-10..iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric1.iob rename to objects/frosted-spruce/large-10..iob diff --git a/objects/trees/spruce/lfrostgeneric2.iob b/objects/frosted-spruce/large-10.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric2.iob rename to objects/frosted-spruce/large-10.iob diff --git a/objects/trees/spruce/lfrostgeneric3.iob b/objects/frosted-spruce/large-11.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric3.iob rename to objects/frosted-spruce/large-11.iob diff --git a/objects/trees/spruce/lfrostgeneric4.iob b/objects/frosted-spruce/large-12.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric4.iob rename to objects/frosted-spruce/large-12.iob diff --git a/objects/trees/spruce/lfrostgeneric5.iob b/objects/frosted-spruce/large-13.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric5.iob rename to objects/frosted-spruce/large-13.iob diff --git a/objects/trees/spruce/lfrostgeneric6.iob b/objects/frosted-spruce/large-14.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric6.iob rename to objects/frosted-spruce/large-14.iob diff --git a/objects/trees/spruce/lfrostgeneric7.iob b/objects/frosted-spruce/large-15.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric7.iob rename to objects/frosted-spruce/large-15.iob diff --git a/objects/trees/spruce/lfrostgeneric8.iob b/objects/frosted-spruce/large-16.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric8.iob rename to objects/frosted-spruce/large-16.iob diff --git a/objects/trees/spruce/lfrostgeneric9.iob b/objects/frosted-spruce/large-17.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric9.iob rename to objects/frosted-spruce/large-17.iob diff --git a/objects/trees/spruce/lfrostgeneric10.iob b/objects/frosted-spruce/large-18.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric10.iob rename to objects/frosted-spruce/large-18.iob diff --git a/objects/trees/spruce/lfrostgeneric11.iob b/objects/frosted-spruce/large-19.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric11.iob rename to objects/frosted-spruce/large-19.iob diff --git a/objects/trees/spruce/lfrostgeneric12.iob b/objects/frosted-spruce/large-20.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric12.iob rename to objects/frosted-spruce/large-20.iob diff --git a/objects/trees/spruce/lfrostgeneric13.iob b/objects/frosted-spruce/large-21.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric13.iob rename to objects/frosted-spruce/large-21.iob diff --git a/objects/trees/spruce/lfrostgeneric14.iob b/objects/frosted-spruce/large-22-b.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric14.iob rename to objects/frosted-spruce/large-22-b.iob diff --git a/objects/trees/spruce/lfrostgeneric15.iob b/objects/frosted-spruce/large-22.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric15.iob rename to objects/frosted-spruce/large-22.iob diff --git a/objects/trees/spruce/lfrostgeneric16.iob b/objects/frosted-spruce/large-23-b.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric16.iob rename to objects/frosted-spruce/large-23-b.iob diff --git a/objects/trees/spruce/lfrostgeneric17.iob b/objects/frosted-spruce/large-23.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric17.iob rename to objects/frosted-spruce/large-23.iob diff --git a/objects/trees/spruce/lfrostgeneric18.iob b/objects/frosted-spruce/large-24-b.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric18.iob rename to objects/frosted-spruce/large-24-b.iob diff --git a/objects/trees/spruce/lfrostgeneric19.iob b/objects/frosted-spruce/large-24.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric19.iob rename to objects/frosted-spruce/large-24.iob diff --git a/objects/trees/spruce/lfrostgeneric20.iob b/objects/frosted-spruce/large-25-b.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric20.iob rename to objects/frosted-spruce/large-25-b.iob diff --git a/objects/trees/spruce/lfrostgeneric21.iob b/objects/frosted-spruce/large-25.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric21.iob rename to objects/frosted-spruce/large-25.iob diff --git a/objects/trees/spruce/lfrostgeneric22.iob b/objects/frosted-spruce/large-5.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric22.iob rename to objects/frosted-spruce/large-5.iob diff --git a/objects/trees/spruce/lfrostgeneric23.iob b/objects/frosted-spruce/large-6.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric23.iob rename to objects/frosted-spruce/large-6.iob diff --git a/objects/trees/spruce/lfrostgeneric24.iob b/objects/frosted-spruce/large-7.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric24.iob rename to objects/frosted-spruce/large-7.iob diff --git a/objects/trees/spruce/lfrostgeneric25.iob b/objects/frosted-spruce/large-8.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric25.iob rename to objects/frosted-spruce/large-8.iob diff --git a/objects/trees/spruce/lfrostgeneric26.iob b/objects/frosted-spruce/large-9.iob similarity index 100% rename from objects/trees/spruce/lfrostgeneric26.iob rename to objects/frosted-spruce/large-9.iob diff --git a/objects/garbage/clutter-1.iob b/objects/garbage/clutter-1.iob new file mode 100644 index 00000000..97cf5061 Binary files /dev/null and b/objects/garbage/clutter-1.iob differ diff --git a/objects/garbage/clutter-2.iob b/objects/garbage/clutter-2.iob new file mode 100644 index 00000000..6f666386 Binary files /dev/null and b/objects/garbage/clutter-2.iob differ diff --git a/objects/garbage/clutter-3.iob b/objects/garbage/clutter-3.iob new file mode 100644 index 00000000..5db54929 Binary files /dev/null and b/objects/garbage/clutter-3.iob differ diff --git a/objects/garbage/clutter-4.iob b/objects/garbage/clutter-4.iob new file mode 100644 index 00000000..6e576713 Binary files /dev/null and b/objects/garbage/clutter-4.iob differ diff --git a/objects/gifts/blue-a.iob b/objects/gifts/blue-a.iob new file mode 100644 index 00000000..58c8763c Binary files /dev/null and b/objects/gifts/blue-a.iob differ diff --git a/objects/gifts/blue.iob b/objects/gifts/blue.iob new file mode 100644 index 00000000..6e2d1790 Binary files /dev/null and b/objects/gifts/blue.iob differ diff --git a/objects/gifts/medium-blue-a.iob b/objects/gifts/medium-blue-a.iob new file mode 100644 index 00000000..177c4397 Binary files /dev/null and b/objects/gifts/medium-blue-a.iob differ diff --git a/objects/gifts/medium-blue.iob b/objects/gifts/medium-blue.iob new file mode 100644 index 00000000..9d075c42 Binary files /dev/null and b/objects/gifts/medium-blue.iob differ diff --git a/objects/gifts/medium-red-a.iob b/objects/gifts/medium-red-a.iob new file mode 100644 index 00000000..35f7a391 Binary files /dev/null and b/objects/gifts/medium-red-a.iob differ diff --git a/objects/gifts/medium-red.iob b/objects/gifts/medium-red.iob new file mode 100644 index 00000000..d313968f Binary files /dev/null and b/objects/gifts/medium-red.iob differ diff --git a/objects/gifts/red-a.iob b/objects/gifts/red-a.iob new file mode 100644 index 00000000..8e26bc04 Binary files /dev/null and b/objects/gifts/red-a.iob differ diff --git a/objects/gifts/red.iob b/objects/gifts/red.iob new file mode 100644 index 00000000..6ee28790 Binary files /dev/null and b/objects/gifts/red.iob differ diff --git a/objects/gifts/supermassive-blue-a.iob b/objects/gifts/supermassive-blue-a.iob new file mode 100644 index 00000000..d6101657 Binary files /dev/null and b/objects/gifts/supermassive-blue-a.iob differ diff --git a/objects/gifts/supermassive-blue.iob b/objects/gifts/supermassive-blue.iob new file mode 100644 index 00000000..a1f366e6 Binary files /dev/null and b/objects/gifts/supermassive-blue.iob differ diff --git a/objects/gifts/supermassive-green-a.iob b/objects/gifts/supermassive-green-a.iob new file mode 100644 index 00000000..8a457d97 Binary files /dev/null and b/objects/gifts/supermassive-green-a.iob differ diff --git a/objects/gifts/supermassive-green.iob b/objects/gifts/supermassive-green.iob new file mode 100644 index 00000000..8b745b4a Binary files /dev/null and b/objects/gifts/supermassive-green.iob differ diff --git a/objects/gifts/supermassive-orange-a.iob b/objects/gifts/supermassive-orange-a.iob new file mode 100644 index 00000000..e3cc0074 Binary files /dev/null and b/objects/gifts/supermassive-orange-a.iob differ diff --git a/objects/gifts/supermassive-orange.iob b/objects/gifts/supermassive-orange.iob new file mode 100644 index 00000000..e7645a27 Binary files /dev/null and b/objects/gifts/supermassive-orange.iob differ diff --git a/objects/gifts/supermassive-purple-a.iob b/objects/gifts/supermassive-purple-a.iob new file mode 100644 index 00000000..46e408cc Binary files /dev/null and b/objects/gifts/supermassive-purple-a.iob differ diff --git a/objects/gifts/supermassive-purple.iob b/objects/gifts/supermassive-purple.iob new file mode 100644 index 00000000..d3f2e36b Binary files /dev/null and b/objects/gifts/supermassive-purple.iob differ diff --git a/objects/gifts/supermassive-red-a.iob b/objects/gifts/supermassive-red-a.iob new file mode 100644 index 00000000..42767740 Binary files /dev/null and b/objects/gifts/supermassive-red-a.iob differ diff --git a/objects/gifts/supermassive-red.iob b/objects/gifts/supermassive-red.iob new file mode 100644 index 00000000..5d8ffb4b Binary files /dev/null and b/objects/gifts/supermassive-red.iob differ diff --git a/objects/gifts/supermassive-yellow-a.iob b/objects/gifts/supermassive-yellow-a.iob new file mode 100644 index 00000000..ff6f3f48 Binary files /dev/null and b/objects/gifts/supermassive-yellow-a.iob differ diff --git a/objects/gifts/supermassive-yellow.iob b/objects/gifts/supermassive-yellow.iob new file mode 100644 index 00000000..f7e0c7c4 Binary files /dev/null and b/objects/gifts/supermassive-yellow.iob differ diff --git a/objects/global-clutter/BigSwordPortal-lit-1.iob b/objects/global-clutter/BigSwordPortal-lit-1.iob new file mode 100644 index 00000000..a5c69203 Binary files /dev/null and b/objects/global-clutter/BigSwordPortal-lit-1.iob differ diff --git a/objects/global-clutter/BigSwordPortal-unlit-1.iob b/objects/global-clutter/BigSwordPortal-unlit-1.iob new file mode 100644 index 00000000..03f04e84 Binary files /dev/null and b/objects/global-clutter/BigSwordPortal-unlit-1.iob differ diff --git a/objects/global-clutter/BigSwordPortalSTR-lit-2.iob b/objects/global-clutter/BigSwordPortalSTR-lit-2.iob new file mode 100644 index 00000000..c79522dd Binary files /dev/null and b/objects/global-clutter/BigSwordPortalSTR-lit-2.iob differ diff --git a/objects/global-clutter/BigSwordPortalSTR-unlit-2.iob b/objects/global-clutter/BigSwordPortalSTR-unlit-2.iob new file mode 100644 index 00000000..f10182a5 Binary files /dev/null and b/objects/global-clutter/BigSwordPortalSTR-unlit-2.iob differ diff --git a/objects/global-clutter/BrokSphinxToomb-1.iob b/objects/global-clutter/BrokSphinxToomb-1.iob new file mode 100644 index 00000000..4b1631be Binary files /dev/null and b/objects/global-clutter/BrokSphinxToomb-1.iob differ diff --git a/objects/global-clutter/sphinxToomb-1.iob b/objects/global-clutter/sphinxToomb-1.iob new file mode 100644 index 00000000..fe6f2173 Binary files /dev/null and b/objects/global-clutter/sphinxToomb-1.iob differ diff --git a/objects/grave/grave.iob b/objects/grave/grave.iob new file mode 100644 index 00000000..b0dba8b0 Binary files /dev/null and b/objects/grave/grave.iob differ diff --git a/objects/hand-bone/boneHand1.iob b/objects/hand-bone/boneHand1.iob new file mode 100644 index 00000000..381966f5 Binary files /dev/null and b/objects/hand-bone/boneHand1.iob differ diff --git a/objects/hand-bone/boneHand2.iob b/objects/hand-bone/boneHand2.iob new file mode 100644 index 00000000..9103b9b1 Binary files /dev/null and b/objects/hand-bone/boneHand2.iob differ diff --git a/objects/hand-bone/boneHand3.iob b/objects/hand-bone/boneHand3.iob new file mode 100644 index 00000000..4b4a589c Binary files /dev/null and b/objects/hand-bone/boneHand3.iob differ diff --git a/objects/hand-wood/HandJung1.iob b/objects/hand-wood/HandJung1.iob new file mode 100644 index 00000000..686ddf80 Binary files /dev/null and b/objects/hand-wood/HandJung1.iob differ diff --git a/objects/hand-wood/HandJung2.iob b/objects/hand-wood/HandJung2.iob new file mode 100644 index 00000000..522e13fa Binary files /dev/null and b/objects/hand-wood/HandJung2.iob differ diff --git a/objects/hand-wood/HandJung3.iob b/objects/hand-wood/HandJung3.iob new file mode 100644 index 00000000..028f53cc Binary files /dev/null and b/objects/hand-wood/HandJung3.iob differ diff --git a/objects/haybale/hay1.iob b/objects/haybale/hay1.iob new file mode 100644 index 00000000..ec8d3168 Binary files /dev/null and b/objects/haybale/hay1.iob differ diff --git a/objects/haybale/hay2.iob b/objects/haybale/hay2.iob new file mode 100644 index 00000000..9e39049d Binary files /dev/null and b/objects/haybale/hay2.iob differ diff --git a/objects/haybale/hay3.iob b/objects/haybale/hay3.iob new file mode 100644 index 00000000..a78f031f Binary files /dev/null and b/objects/haybale/hay3.iob differ diff --git a/objects/trees/oak/hoakgeneric1.iob b/objects/hazel-oak/hoak-1.iob similarity index 100% rename from objects/trees/oak/hoakgeneric1.iob rename to objects/hazel-oak/hoak-1.iob diff --git a/objects/trees/oak/hoakgeneric2.iob b/objects/hazel-oak/hoak-2.iob similarity index 100% rename from objects/trees/oak/hoakgeneric2.iob rename to objects/hazel-oak/hoak-2.iob diff --git a/objects/trees/oak/hoakgeneric3.iob b/objects/hazel-oak/hoak-3.iob similarity index 100% rename from objects/trees/oak/hoakgeneric3.iob rename to objects/hazel-oak/hoak-3.iob diff --git a/objects/trees/oak/hoakgeneric4.iob b/objects/hazel-oak/hoak-4.iob similarity index 100% rename from objects/trees/oak/hoakgeneric4.iob rename to objects/hazel-oak/hoak-4.iob diff --git a/objects/trees/oak/hoakgeneric5.iob b/objects/hazel-oak/hoak-5.iob similarity index 100% rename from objects/trees/oak/hoakgeneric5.iob rename to objects/hazel-oak/hoak-5.iob diff --git a/objects/trees/oak/hoakgeneric6.iob b/objects/hazel-oak/hoak-6.iob similarity index 100% rename from objects/trees/oak/hoakgeneric6.iob rename to objects/hazel-oak/hoak-6.iob diff --git a/objects/trees/oak/hoakgeneric7.iob b/objects/hazel-oak/hoak-7.iob similarity index 100% rename from objects/trees/oak/hoakgeneric7.iob rename to objects/hazel-oak/hoak-7.iob diff --git a/objects/trees/oak/hoakgeneric8.iob b/objects/hazel-oak/hoak-8.iob similarity index 100% rename from objects/trees/oak/hoakgeneric8.iob rename to objects/hazel-oak/hoak-8.iob diff --git a/objects/trees/oak/hoakgeneric9.iob b/objects/hazel-oak/hoak-9.iob similarity index 100% rename from objects/trees/oak/hoakgeneric9.iob rename to objects/hazel-oak/hoak-9.iob diff --git a/objects/trees/oak/shoakgeneric1.iob b/objects/hazel-oak/s-hoak-1.iob similarity index 100% rename from objects/trees/oak/shoakgeneric1.iob rename to objects/hazel-oak/s-hoak-1.iob diff --git a/objects/trees/oak/shoakgeneric2.iob b/objects/hazel-oak/s-hoak-10.iob similarity index 100% rename from objects/trees/oak/shoakgeneric2.iob rename to objects/hazel-oak/s-hoak-10.iob diff --git a/objects/trees/oak/shoakgeneric3.iob b/objects/hazel-oak/s-hoak-2.iob similarity index 100% rename from objects/trees/oak/shoakgeneric3.iob rename to objects/hazel-oak/s-hoak-2.iob diff --git a/objects/trees/oak/shoakgeneric4.iob b/objects/hazel-oak/s-hoak-3.iob similarity index 100% rename from objects/trees/oak/shoakgeneric4.iob rename to objects/hazel-oak/s-hoak-3.iob diff --git a/objects/trees/oak/shoakgeneric5.iob b/objects/hazel-oak/s-hoak-4.iob similarity index 100% rename from objects/trees/oak/shoakgeneric5.iob rename to objects/hazel-oak/s-hoak-4.iob diff --git a/objects/trees/oak/shoakgeneric6.iob b/objects/hazel-oak/s-hoak-5.iob similarity index 100% rename from objects/trees/oak/shoakgeneric6.iob rename to objects/hazel-oak/s-hoak-5.iob diff --git a/objects/trees/oak/shoakgeneric7.iob b/objects/hazel-oak/s-hoak-6.iob similarity index 100% rename from objects/trees/oak/shoakgeneric7.iob rename to objects/hazel-oak/s-hoak-6.iob diff --git a/objects/trees/oak/shoakgeneric8.iob b/objects/hazel-oak/s-hoak-7.iob similarity index 100% rename from objects/trees/oak/shoakgeneric8.iob rename to objects/hazel-oak/s-hoak-7.iob diff --git a/objects/trees/oak/shoakgeneric9.iob b/objects/hazel-oak/s-hoak-8.iob similarity index 100% rename from objects/trees/oak/shoakgeneric9.iob rename to objects/hazel-oak/s-hoak-8.iob diff --git a/objects/trees/oak/shoakgeneric10.iob b/objects/hazel-oak/s-hoak-9.iob similarity index 100% rename from objects/trees/oak/shoakgeneric10.iob rename to objects/hazel-oak/s-hoak-9.iob diff --git a/objects/trees/oak/thoakgeneric1.iob b/objects/hazel-oak/taller-oak-1.iob similarity index 100% rename from objects/trees/oak/thoakgeneric1.iob rename to objects/hazel-oak/taller-oak-1.iob diff --git a/objects/trees/oak/thoakgeneric2.iob b/objects/hazel-oak/taller-oak-10.iob similarity index 100% rename from objects/trees/oak/thoakgeneric2.iob rename to objects/hazel-oak/taller-oak-10.iob diff --git a/objects/trees/oak/thoakgeneric3.iob b/objects/hazel-oak/taller-oak-2.iob similarity index 100% rename from objects/trees/oak/thoakgeneric3.iob rename to objects/hazel-oak/taller-oak-2.iob diff --git a/objects/trees/oak/thoakgeneric4.iob b/objects/hazel-oak/taller-oak-3.iob similarity index 100% rename from objects/trees/oak/thoakgeneric4.iob rename to objects/hazel-oak/taller-oak-3.iob diff --git a/objects/trees/oak/thoakgeneric5.iob b/objects/hazel-oak/taller-oak-4.iob similarity index 100% rename from objects/trees/oak/thoakgeneric5.iob rename to objects/hazel-oak/taller-oak-4.iob diff --git a/objects/trees/oak/thoakgeneric6.iob b/objects/hazel-oak/taller-oak-5.iob similarity index 100% rename from objects/trees/oak/thoakgeneric6.iob rename to objects/hazel-oak/taller-oak-5.iob diff --git a/objects/trees/oak/thoakgeneric7.iob b/objects/hazel-oak/taller-oak-6.iob similarity index 100% rename from objects/trees/oak/thoakgeneric7.iob rename to objects/hazel-oak/taller-oak-6.iob diff --git a/objects/trees/oak/thoakgeneric8.iob b/objects/hazel-oak/taller-oak-7.iob similarity index 100% rename from objects/trees/oak/thoakgeneric8.iob rename to objects/hazel-oak/taller-oak-7.iob diff --git a/objects/trees/oak/thoakgeneric9.iob b/objects/hazel-oak/taller-oak-8.iob similarity index 100% rename from objects/trees/oak/thoakgeneric9.iob rename to objects/hazel-oak/taller-oak-8.iob diff --git a/objects/trees/oak/thoakgeneric10.iob b/objects/hazel-oak/taller-oak-9.iob similarity index 100% rename from objects/trees/oak/thoakgeneric10.iob rename to objects/hazel-oak/taller-oak-9.iob diff --git a/objects/hive/honey-nest-1.iob b/objects/hive/honey-nest-1.iob new file mode 100644 index 00000000..c491071f Binary files /dev/null and b/objects/hive/honey-nest-1.iob differ diff --git a/objects/hive/honey-nest-10.iob b/objects/hive/honey-nest-10.iob new file mode 100644 index 00000000..09f36226 Binary files /dev/null and b/objects/hive/honey-nest-10.iob differ diff --git a/objects/hive/honey-nest-2.iob b/objects/hive/honey-nest-2.iob new file mode 100644 index 00000000..f1f32da1 Binary files /dev/null and b/objects/hive/honey-nest-2.iob differ diff --git a/objects/hive/honey-nest-3.iob b/objects/hive/honey-nest-3.iob new file mode 100644 index 00000000..67af2760 Binary files /dev/null and b/objects/hive/honey-nest-3.iob differ diff --git a/objects/hive/honey-nest-4.iob b/objects/hive/honey-nest-4.iob new file mode 100644 index 00000000..fd5e7ba7 Binary files /dev/null and b/objects/hive/honey-nest-4.iob differ diff --git a/objects/hive/honey-nest-5.iob b/objects/hive/honey-nest-5.iob new file mode 100644 index 00000000..50a8f5a4 Binary files /dev/null and b/objects/hive/honey-nest-5.iob differ diff --git a/objects/hive/honey-nest-6.iob b/objects/hive/honey-nest-6.iob new file mode 100644 index 00000000..a2321c0f Binary files /dev/null and b/objects/hive/honey-nest-6.iob differ diff --git a/objects/hive/honey-nest-7.iob b/objects/hive/honey-nest-7.iob new file mode 100644 index 00000000..bdbe77ea Binary files /dev/null and b/objects/hive/honey-nest-7.iob differ diff --git a/objects/hive/honey-nest-8.iob b/objects/hive/honey-nest-8.iob new file mode 100644 index 00000000..ad85dd2d Binary files /dev/null and b/objects/hive/honey-nest-8.iob differ diff --git a/objects/hive/honey-nest-9.iob b/objects/hive/honey-nest-9.iob new file mode 100644 index 00000000..918a4d50 Binary files /dev/null and b/objects/hive/honey-nest-9.iob differ diff --git a/objects/honey-tree/honey-1.iob b/objects/honey-tree/honey-1.iob new file mode 100644 index 00000000..b971020d Binary files /dev/null and b/objects/honey-tree/honey-1.iob differ diff --git a/objects/honey-tree/honey-10.iob b/objects/honey-tree/honey-10.iob new file mode 100644 index 00000000..02ad5467 Binary files /dev/null and b/objects/honey-tree/honey-10.iob differ diff --git a/objects/honey-tree/honey-11.iob b/objects/honey-tree/honey-11.iob new file mode 100644 index 00000000..dc7f71d3 Binary files /dev/null and b/objects/honey-tree/honey-11.iob differ diff --git a/objects/honey-tree/honey-12.iob b/objects/honey-tree/honey-12.iob new file mode 100644 index 00000000..52d0debb Binary files /dev/null and b/objects/honey-tree/honey-12.iob differ diff --git a/objects/honey-tree/honey-13.iob b/objects/honey-tree/honey-13.iob new file mode 100644 index 00000000..e0121694 Binary files /dev/null and b/objects/honey-tree/honey-13.iob differ diff --git a/objects/honey-tree/honey-14.iob b/objects/honey-tree/honey-14.iob new file mode 100644 index 00000000..feb22967 Binary files /dev/null and b/objects/honey-tree/honey-14.iob differ diff --git a/objects/honey-tree/honey-15.iob b/objects/honey-tree/honey-15.iob new file mode 100644 index 00000000..b4f385b5 Binary files /dev/null and b/objects/honey-tree/honey-15.iob differ diff --git a/objects/honey-tree/honey-16.iob b/objects/honey-tree/honey-16.iob new file mode 100644 index 00000000..f6fbd5cd Binary files /dev/null and b/objects/honey-tree/honey-16.iob differ diff --git a/objects/honey-tree/honey-17.iob b/objects/honey-tree/honey-17.iob new file mode 100644 index 00000000..60d1f564 Binary files /dev/null and b/objects/honey-tree/honey-17.iob differ diff --git a/objects/honey-tree/honey-18.iob b/objects/honey-tree/honey-18.iob new file mode 100644 index 00000000..1faf2bc2 Binary files /dev/null and b/objects/honey-tree/honey-18.iob differ diff --git a/objects/honey-tree/honey-19.iob b/objects/honey-tree/honey-19.iob new file mode 100644 index 00000000..3790ab7e Binary files /dev/null and b/objects/honey-tree/honey-19.iob differ diff --git a/objects/honey-tree/honey-2.iob b/objects/honey-tree/honey-2.iob new file mode 100644 index 00000000..55846db9 Binary files /dev/null and b/objects/honey-tree/honey-2.iob differ diff --git a/objects/honey-tree/honey-20.iob b/objects/honey-tree/honey-20.iob new file mode 100644 index 00000000..19125f07 Binary files /dev/null and b/objects/honey-tree/honey-20.iob differ diff --git a/objects/honey-tree/honey-3.iob b/objects/honey-tree/honey-3.iob new file mode 100644 index 00000000..89f3effe Binary files /dev/null and b/objects/honey-tree/honey-3.iob differ diff --git a/objects/honey-tree/honey-4.iob b/objects/honey-tree/honey-4.iob new file mode 100644 index 00000000..8e2800ac Binary files /dev/null and b/objects/honey-tree/honey-4.iob differ diff --git a/objects/honey-tree/honey-5.iob b/objects/honey-tree/honey-5.iob new file mode 100644 index 00000000..87b673b0 Binary files /dev/null and b/objects/honey-tree/honey-5.iob differ diff --git a/objects/honey-tree/honey-6.iob b/objects/honey-tree/honey-6.iob new file mode 100644 index 00000000..67080c51 Binary files /dev/null and b/objects/honey-tree/honey-6.iob differ diff --git a/objects/honey-tree/honey-7.iob b/objects/honey-tree/honey-7.iob new file mode 100644 index 00000000..509ef129 Binary files /dev/null and b/objects/honey-tree/honey-7.iob differ diff --git a/objects/honey-tree/honey-8.iob b/objects/honey-tree/honey-8.iob new file mode 100644 index 00000000..8f29439f Binary files /dev/null and b/objects/honey-tree/honey-8.iob differ diff --git a/objects/honey-tree/honey-9.iob b/objects/honey-tree/honey-9.iob new file mode 100644 index 00000000..04d2d61b Binary files /dev/null and b/objects/honey-tree/honey-9.iob differ diff --git a/objects/house-jap/MedJap1.iob b/objects/house-jap/MedJap1.iob new file mode 100644 index 00000000..fe0da7fa Binary files /dev/null and b/objects/house-jap/MedJap1.iob differ diff --git a/objects/house-jap/MedJap10.iob b/objects/house-jap/MedJap10.iob new file mode 100644 index 00000000..a7f99377 Binary files /dev/null and b/objects/house-jap/MedJap10.iob differ diff --git a/objects/house-jap/MedJap2.iob b/objects/house-jap/MedJap2.iob new file mode 100644 index 00000000..5d4e4f37 Binary files /dev/null and b/objects/house-jap/MedJap2.iob differ diff --git a/objects/house-jap/MedJap3.iob b/objects/house-jap/MedJap3.iob new file mode 100644 index 00000000..8d3fa82b Binary files /dev/null and b/objects/house-jap/MedJap3.iob differ diff --git a/objects/house-jap/MedJap4.iob b/objects/house-jap/MedJap4.iob new file mode 100644 index 00000000..390f3d11 Binary files /dev/null and b/objects/house-jap/MedJap4.iob differ diff --git a/objects/house-jap/MedJap5.iob b/objects/house-jap/MedJap5.iob new file mode 100644 index 00000000..1e527139 Binary files /dev/null and b/objects/house-jap/MedJap5.iob differ diff --git a/objects/house-jap/MedJap6.iob b/objects/house-jap/MedJap6.iob new file mode 100644 index 00000000..430d042b Binary files /dev/null and b/objects/house-jap/MedJap6.iob differ diff --git a/objects/house-jap/MedJap7.iob b/objects/house-jap/MedJap7.iob new file mode 100644 index 00000000..0a47d1ea Binary files /dev/null and b/objects/house-jap/MedJap7.iob differ diff --git a/objects/house-jap/MedJap8.iob b/objects/house-jap/MedJap8.iob new file mode 100644 index 00000000..312df849 Binary files /dev/null and b/objects/house-jap/MedJap8.iob differ diff --git a/objects/house-jap/MedJap9.iob b/objects/house-jap/MedJap9.iob new file mode 100644 index 00000000..1aa3f3b2 Binary files /dev/null and b/objects/house-jap/MedJap9.iob differ diff --git a/objects/jigsaw/house-norm/Med1.iob b/objects/house-norm/Med1.iob similarity index 100% rename from objects/jigsaw/house-norm/Med1.iob rename to objects/house-norm/Med1.iob diff --git a/objects/jigsaw/house-norm/Med10.iob b/objects/house-norm/Med10.iob similarity index 100% rename from objects/jigsaw/house-norm/Med10.iob rename to objects/house-norm/Med10.iob diff --git a/objects/jigsaw/house-norm/Med2.iob b/objects/house-norm/Med2.iob similarity index 100% rename from objects/jigsaw/house-norm/Med2.iob rename to objects/house-norm/Med2.iob diff --git a/objects/jigsaw/house-norm/Med3.iob b/objects/house-norm/Med3.iob similarity index 100% rename from objects/jigsaw/house-norm/Med3.iob rename to objects/house-norm/Med3.iob diff --git a/objects/jigsaw/house-norm/Med4.iob b/objects/house-norm/Med4.iob similarity index 100% rename from objects/jigsaw/house-norm/Med4.iob rename to objects/house-norm/Med4.iob diff --git a/objects/jigsaw/house-norm/Med5.iob b/objects/house-norm/Med5.iob similarity index 100% rename from objects/jigsaw/house-norm/Med5.iob rename to objects/house-norm/Med5.iob diff --git a/objects/jigsaw/house-norm/Med6.iob b/objects/house-norm/Med6.iob similarity index 100% rename from objects/jigsaw/house-norm/Med6.iob rename to objects/house-norm/Med6.iob diff --git a/objects/jigsaw/house-norm/Med7.iob b/objects/house-norm/Med7.iob similarity index 100% rename from objects/jigsaw/house-norm/Med7.iob rename to objects/house-norm/Med7.iob diff --git a/objects/jigsaw/house-norm/Med8.iob b/objects/house-norm/Med8.iob similarity index 100% rename from objects/jigsaw/house-norm/Med8.iob rename to objects/house-norm/Med8.iob diff --git a/objects/jigsaw/house-norm/Med9.iob b/objects/house-norm/Med9.iob similarity index 100% rename from objects/jigsaw/house-norm/Med9.iob rename to objects/house-norm/Med9.iob diff --git a/objects/jigsaw/house-purjap/PurJap1.iob b/objects/house-purjap/PurJap1.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap1.iob rename to objects/house-purjap/PurJap1.iob diff --git a/objects/jigsaw/house-purjap/PurJap10.iob b/objects/house-purjap/PurJap10.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap10.iob rename to objects/house-purjap/PurJap10.iob diff --git a/objects/jigsaw/house-purjap/PurJap2.iob b/objects/house-purjap/PurJap2.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap2.iob rename to objects/house-purjap/PurJap2.iob diff --git a/objects/jigsaw/house-purjap/PurJap3.iob b/objects/house-purjap/PurJap3.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap3.iob rename to objects/house-purjap/PurJap3.iob diff --git a/objects/jigsaw/house-purjap/PurJap4.iob b/objects/house-purjap/PurJap4.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap4.iob rename to objects/house-purjap/PurJap4.iob diff --git a/objects/jigsaw/house-purjap/PurJap5.iob b/objects/house-purjap/PurJap5.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap5.iob rename to objects/house-purjap/PurJap5.iob diff --git a/objects/jigsaw/house-purjap/PurJap6.iob b/objects/house-purjap/PurJap6.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap6.iob rename to objects/house-purjap/PurJap6.iob diff --git a/objects/jigsaw/house-purjap/PurJap7.iob b/objects/house-purjap/PurJap7.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap7.iob rename to objects/house-purjap/PurJap7.iob diff --git a/objects/jigsaw/house-purjap/PurJap8.iob b/objects/house-purjap/PurJap8.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap8.iob rename to objects/house-purjap/PurJap8.iob diff --git a/objects/jigsaw/house-purjap/PurJap9.iob b/objects/house-purjap/PurJap9.iob similarity index 100% rename from objects/jigsaw/house-purjap/PurJap9.iob rename to objects/house-purjap/PurJap9.iob diff --git a/objects/structures/rustic4.iob b/objects/house-rustic/rustic4.iob similarity index 100% rename from objects/structures/rustic4.iob rename to objects/house-rustic/rustic4.iob diff --git a/objects/jigsaw/houses/jap/j1.iob b/objects/houses/jap/j1.iob similarity index 100% rename from objects/jigsaw/houses/jap/j1.iob rename to objects/houses/jap/j1.iob diff --git a/objects/jigsaw/houses/jap/j10.iob b/objects/houses/jap/j10.iob similarity index 100% rename from objects/jigsaw/houses/jap/j10.iob rename to objects/houses/jap/j10.iob diff --git a/objects/jigsaw/houses/jap/j2.iob b/objects/houses/jap/j2.iob similarity index 100% rename from objects/jigsaw/houses/jap/j2.iob rename to objects/houses/jap/j2.iob diff --git a/objects/jigsaw/houses/jap/j3.iob b/objects/houses/jap/j3.iob similarity index 100% rename from objects/jigsaw/houses/jap/j3.iob rename to objects/houses/jap/j3.iob diff --git a/objects/jigsaw/houses/jap/j4.iob b/objects/houses/jap/j4.iob similarity index 100% rename from objects/jigsaw/houses/jap/j4.iob rename to objects/houses/jap/j4.iob diff --git a/objects/jigsaw/houses/jap/j5.iob b/objects/houses/jap/j5.iob similarity index 100% rename from objects/jigsaw/houses/jap/j5.iob rename to objects/houses/jap/j5.iob diff --git a/objects/jigsaw/houses/jap/j6.iob b/objects/houses/jap/j6.iob similarity index 100% rename from objects/jigsaw/houses/jap/j6.iob rename to objects/houses/jap/j6.iob diff --git a/objects/jigsaw/houses/jap/j7.iob b/objects/houses/jap/j7.iob similarity index 100% rename from objects/jigsaw/houses/jap/j7.iob rename to objects/houses/jap/j7.iob diff --git a/objects/jigsaw/houses/jap/j8.iob b/objects/houses/jap/j8.iob similarity index 100% rename from objects/jigsaw/houses/jap/j8.iob rename to objects/houses/jap/j8.iob diff --git a/objects/jigsaw/houses/jap/j9.iob b/objects/houses/jap/j9.iob similarity index 100% rename from objects/jigsaw/houses/jap/j9.iob rename to objects/houses/jap/j9.iob diff --git a/objects/jigsaw/houses/paths/corner1.iob b/objects/houses/paths/corner1.iob similarity index 100% rename from objects/jigsaw/houses/paths/corner1.iob rename to objects/houses/paths/corner1.iob diff --git a/objects/jigsaw/houses/paths/cross.iob b/objects/houses/paths/cross.iob similarity index 100% rename from objects/jigsaw/houses/paths/cross.iob rename to objects/houses/paths/cross.iob diff --git a/objects/jigsaw/houses/paths/end1.iob b/objects/houses/paths/end1.iob similarity index 100% rename from objects/jigsaw/houses/paths/end1.iob rename to objects/houses/paths/end1.iob diff --git a/objects/jigsaw/houses/paths/hall1.iob b/objects/houses/paths/hall1.iob similarity index 100% rename from objects/jigsaw/houses/paths/hall1.iob rename to objects/houses/paths/hall1.iob diff --git a/objects/jigsaw/houses/paths/tjunct.iob b/objects/houses/paths/tjunct.iob similarity index 100% rename from objects/jigsaw/houses/paths/tjunct.iob rename to objects/houses/paths/tjunct.iob diff --git a/objects/ice-spikes/ic-1.iob b/objects/ice-spikes/ic-1.iob new file mode 100644 index 00000000..590438c2 Binary files /dev/null and b/objects/ice-spikes/ic-1.iob differ diff --git a/objects/ice-spikes/ic-10.iob b/objects/ice-spikes/ic-10.iob new file mode 100644 index 00000000..174ab968 Binary files /dev/null and b/objects/ice-spikes/ic-10.iob differ diff --git a/objects/ice-spikes/ic-11.iob b/objects/ice-spikes/ic-11.iob new file mode 100644 index 00000000..382b85e5 Binary files /dev/null and b/objects/ice-spikes/ic-11.iob differ diff --git a/objects/ice-spikes/ic-2.iob b/objects/ice-spikes/ic-2.iob new file mode 100644 index 00000000..9c8ffea9 Binary files /dev/null and b/objects/ice-spikes/ic-2.iob differ diff --git a/objects/ice-spikes/ic-3.iob b/objects/ice-spikes/ic-3.iob new file mode 100644 index 00000000..eeb29498 Binary files /dev/null and b/objects/ice-spikes/ic-3.iob differ diff --git a/objects/ice-spikes/ic-4.iob b/objects/ice-spikes/ic-4.iob new file mode 100644 index 00000000..a9c4a07d Binary files /dev/null and b/objects/ice-spikes/ic-4.iob differ diff --git a/objects/ice-spikes/ic-5.iob b/objects/ice-spikes/ic-5.iob new file mode 100644 index 00000000..980336cd Binary files /dev/null and b/objects/ice-spikes/ic-5.iob differ diff --git a/objects/ice-spikes/ic-6.iob b/objects/ice-spikes/ic-6.iob new file mode 100644 index 00000000..6f5ac881 Binary files /dev/null and b/objects/ice-spikes/ic-6.iob differ diff --git a/objects/ice-spikes/ic-7.iob b/objects/ice-spikes/ic-7.iob new file mode 100644 index 00000000..960bff67 Binary files /dev/null and b/objects/ice-spikes/ic-7.iob differ diff --git a/objects/ice-spikes/ic-8.iob b/objects/ice-spikes/ic-8.iob new file mode 100644 index 00000000..8c1585c8 Binary files /dev/null and b/objects/ice-spikes/ic-8.iob differ diff --git a/objects/ice-spikes/ic-9.iob b/objects/ice-spikes/ic-9.iob new file mode 100644 index 00000000..d85665b1 Binary files /dev/null and b/objects/ice-spikes/ic-9.iob differ diff --git a/objects/ice-spikes/ice-spec-1.iob b/objects/ice-spikes/ice-spec-1.iob new file mode 100644 index 00000000..cef052c8 Binary files /dev/null and b/objects/ice-spikes/ice-spec-1.iob differ diff --git a/objects/ice-spikes/ice-spec-2.iob b/objects/ice-spikes/ice-spec-2.iob new file mode 100644 index 00000000..88c77cbd Binary files /dev/null and b/objects/ice-spikes/ice-spec-2.iob differ diff --git a/objects/ice-spikes/ice-spec-3.iob b/objects/ice-spikes/ice-spec-3.iob new file mode 100644 index 00000000..ca0a877e Binary files /dev/null and b/objects/ice-spikes/ice-spec-3.iob differ diff --git a/objects/ice-spikes/ice-spec-4.iob b/objects/ice-spikes/ice-spec-4.iob new file mode 100644 index 00000000..61ef8907 Binary files /dev/null and b/objects/ice-spikes/ice-spec-4.iob differ diff --git a/objects/ice-spikes/ice-spec-5.iob b/objects/ice-spikes/ice-spec-5.iob new file mode 100644 index 00000000..ff53b7bd Binary files /dev/null and b/objects/ice-spikes/ice-spec-5.iob differ diff --git a/objects/ice-spikes/smol-ice-spike-1.iob b/objects/ice-spikes/smol-ice-spike-1.iob new file mode 100644 index 00000000..f146bbac Binary files /dev/null and b/objects/ice-spikes/smol-ice-spike-1.iob differ diff --git a/objects/ice-spikes/smol-ice-spike-2.iob b/objects/ice-spikes/smol-ice-spike-2.iob new file mode 100644 index 00000000..7f4f267e Binary files /dev/null and b/objects/ice-spikes/smol-ice-spike-2.iob differ diff --git a/objects/ice-spikes/smol-ice-spike-3.iob b/objects/ice-spikes/smol-ice-spike-3.iob new file mode 100644 index 00000000..261b01ee Binary files /dev/null and b/objects/ice-spikes/smol-ice-spike-3.iob differ diff --git a/objects/ice-spikes/smol-ice-spike-4.iob b/objects/ice-spikes/smol-ice-spike-4.iob new file mode 100644 index 00000000..9cc92b27 Binary files /dev/null and b/objects/ice-spikes/smol-ice-spike-4.iob differ diff --git a/objects/ice-spikes/smol-ice-spike-5.iob b/objects/ice-spikes/smol-ice-spike-5.iob new file mode 100644 index 00000000..a88282b1 Binary files /dev/null and b/objects/ice-spikes/smol-ice-spike-5.iob differ diff --git a/objects/ice-spikes/smol-ice-spike-6.iob b/objects/ice-spikes/smol-ice-spike-6.iob new file mode 100644 index 00000000..61eb0892 Binary files /dev/null and b/objects/ice-spikes/smol-ice-spike-6.iob differ diff --git a/objects/ice-spikes/smol-ice-spike-7.iob b/objects/ice-spikes/smol-ice-spike-7.iob new file mode 100644 index 00000000..6d47bfa9 Binary files /dev/null and b/objects/ice-spikes/smol-ice-spike-7.iob differ diff --git a/objects/ice-spikes/smol-ice-spike-8.iob b/objects/ice-spikes/smol-ice-spike-8.iob new file mode 100644 index 00000000..54d60398 Binary files /dev/null and b/objects/ice-spikes/smol-ice-spike-8.iob differ diff --git a/objects/ice-spikes/smol-ice-spike-9.iob b/objects/ice-spikes/smol-ice-spike-9.iob new file mode 100644 index 00000000..2cd04144 Binary files /dev/null and b/objects/ice-spikes/smol-ice-spike-9.iob differ diff --git a/objects/ice-spikes/sp-1.iob b/objects/ice-spikes/sp-1.iob new file mode 100644 index 00000000..a3302d8a Binary files /dev/null and b/objects/ice-spikes/sp-1.iob differ diff --git a/objects/ice-spikes/sp-2.iob b/objects/ice-spikes/sp-2.iob new file mode 100644 index 00000000..7e51c67c Binary files /dev/null and b/objects/ice-spikes/sp-2.iob differ diff --git a/objects/ice-spikes/sp-3.iob b/objects/ice-spikes/sp-3.iob new file mode 100644 index 00000000..d1262405 Binary files /dev/null and b/objects/ice-spikes/sp-3.iob differ diff --git a/objects/ice-spikes/sp-4.iob b/objects/ice-spikes/sp-4.iob new file mode 100644 index 00000000..a7d1b4dd Binary files /dev/null and b/objects/ice-spikes/sp-4.iob differ diff --git a/objects/ice-spikes/sp-5.iob b/objects/ice-spikes/sp-5.iob new file mode 100644 index 00000000..bd75e539 Binary files /dev/null and b/objects/ice-spikes/sp-5.iob differ diff --git a/objects/ice-spikes/tp-1.iob b/objects/ice-spikes/tp-1.iob new file mode 100644 index 00000000..04afb8e3 Binary files /dev/null and b/objects/ice-spikes/tp-1.iob differ diff --git a/objects/ice-spikes/tp-2.iob b/objects/ice-spikes/tp-2.iob new file mode 100644 index 00000000..caf4601e Binary files /dev/null and b/objects/ice-spikes/tp-2.iob differ diff --git a/objects/ice-spikes/tp-3.iob b/objects/ice-spikes/tp-3.iob new file mode 100644 index 00000000..733aae72 Binary files /dev/null and b/objects/ice-spikes/tp-3.iob differ diff --git a/objects/ice-spikes/tp-4.iob b/objects/ice-spikes/tp-4.iob new file mode 100644 index 00000000..6fcd4b83 Binary files /dev/null and b/objects/ice-spikes/tp-4.iob differ diff --git a/objects/jigsaw/igloo/bottom.iob b/objects/igloo/bottom.iob similarity index 100% rename from objects/jigsaw/igloo/bottom.iob rename to objects/igloo/bottom.iob diff --git a/objects/jigsaw/igloo/middle.iob b/objects/igloo/middle.iob similarity index 100% rename from objects/jigsaw/igloo/middle.iob rename to objects/igloo/middle.iob diff --git a/objects/jigsaw/igloo/top1.iob b/objects/igloo/top1.iob similarity index 100% rename from objects/jigsaw/igloo/top1.iob rename to objects/igloo/top1.iob diff --git a/objects/jigsaw/igloo/top2.iob b/objects/igloo/top2.iob similarity index 100% rename from objects/jigsaw/igloo/top2.iob rename to objects/igloo/top2.iob diff --git a/objects/trees/jungle/denmyre1.iob b/objects/jungle-medium/jungle-denmyre-1.iob similarity index 100% rename from objects/trees/jungle/denmyre1.iob rename to objects/jungle-medium/jungle-denmyre-1.iob diff --git a/objects/trees/jungle/denmyre2.iob b/objects/jungle-medium/jungle-denmyre-10.iob similarity index 100% rename from objects/trees/jungle/denmyre2.iob rename to objects/jungle-medium/jungle-denmyre-10.iob diff --git a/objects/trees/jungle/denmyre3.iob b/objects/jungle-medium/jungle-denmyre-11.iob similarity index 100% rename from objects/trees/jungle/denmyre3.iob rename to objects/jungle-medium/jungle-denmyre-11.iob diff --git a/objects/trees/jungle/denmyre4.iob b/objects/jungle-medium/jungle-denmyre-12.iob similarity index 100% rename from objects/trees/jungle/denmyre4.iob rename to objects/jungle-medium/jungle-denmyre-12.iob diff --git a/objects/trees/jungle/denmyre5.iob b/objects/jungle-medium/jungle-denmyre-13.iob similarity index 100% rename from objects/trees/jungle/denmyre5.iob rename to objects/jungle-medium/jungle-denmyre-13.iob diff --git a/objects/trees/jungle/denmyre6.iob b/objects/jungle-medium/jungle-denmyre-14.iob similarity index 100% rename from objects/trees/jungle/denmyre6.iob rename to objects/jungle-medium/jungle-denmyre-14.iob diff --git a/objects/trees/jungle/denmyre7.iob b/objects/jungle-medium/jungle-denmyre-15.iob similarity index 100% rename from objects/trees/jungle/denmyre7.iob rename to objects/jungle-medium/jungle-denmyre-15.iob diff --git a/objects/trees/jungle/denmyre8.iob b/objects/jungle-medium/jungle-denmyre-16.iob similarity index 100% rename from objects/trees/jungle/denmyre8.iob rename to objects/jungle-medium/jungle-denmyre-16.iob diff --git a/objects/trees/jungle/denmyre9.iob b/objects/jungle-medium/jungle-denmyre-2.iob similarity index 100% rename from objects/trees/jungle/denmyre9.iob rename to objects/jungle-medium/jungle-denmyre-2.iob diff --git a/objects/trees/jungle/denmyre10.iob b/objects/jungle-medium/jungle-denmyre-3.iob similarity index 100% rename from objects/trees/jungle/denmyre10.iob rename to objects/jungle-medium/jungle-denmyre-3.iob diff --git a/objects/trees/jungle/denmyre11.iob b/objects/jungle-medium/jungle-denmyre-4.iob similarity index 100% rename from objects/trees/jungle/denmyre11.iob rename to objects/jungle-medium/jungle-denmyre-4.iob diff --git a/objects/trees/jungle/denmyre12.iob b/objects/jungle-medium/jungle-denmyre-5.iob similarity index 100% rename from objects/trees/jungle/denmyre12.iob rename to objects/jungle-medium/jungle-denmyre-5.iob diff --git a/objects/trees/jungle/denmyre13.iob b/objects/jungle-medium/jungle-denmyre-6.iob similarity index 100% rename from objects/trees/jungle/denmyre13.iob rename to objects/jungle-medium/jungle-denmyre-6.iob diff --git a/objects/trees/jungle/denmyre14.iob b/objects/jungle-medium/jungle-denmyre-7.iob similarity index 100% rename from objects/trees/jungle/denmyre14.iob rename to objects/jungle-medium/jungle-denmyre-7.iob diff --git a/objects/trees/jungle/denmyre15.iob b/objects/jungle-medium/jungle-denmyre-8.iob similarity index 100% rename from objects/trees/jungle/denmyre15.iob rename to objects/jungle-medium/jungle-denmyre-8.iob diff --git a/objects/trees/jungle/denmyre16.iob b/objects/jungle-medium/jungle-denmyre-9.iob similarity index 100% rename from objects/trees/jungle/denmyre16.iob rename to objects/jungle-medium/jungle-denmyre-9.iob diff --git a/objects/jigsaw/jungle-pyramid/jungle_pyramid.iob b/objects/jungle-pyramid/jungle_pyramid.iob similarity index 100% rename from objects/jigsaw/jungle-pyramid/jungle_pyramid.iob rename to objects/jungle-pyramid/jungle_pyramid.iob diff --git a/objects/trees/jungle/lgeneric1.iob b/objects/jungle-remade/J11.iob similarity index 100% rename from objects/trees/jungle/lgeneric1.iob rename to objects/jungle-remade/J11.iob diff --git a/objects/trees/jungle/lgeneric2.iob b/objects/jungle-remade/J12.iob similarity index 100% rename from objects/trees/jungle/lgeneric2.iob rename to objects/jungle-remade/J12.iob diff --git a/objects/trees/jungle/lgeneric3.iob b/objects/jungle-remade/J13.iob similarity index 100% rename from objects/trees/jungle/lgeneric3.iob rename to objects/jungle-remade/J13.iob diff --git a/objects/trees/jungle/lgeneric4.iob b/objects/jungle-remade/J4.iob similarity index 100% rename from objects/trees/jungle/lgeneric4.iob rename to objects/jungle-remade/J4.iob diff --git a/objects/trees/jungle/lgeneric5.iob b/objects/jungle-remade/J5.iob similarity index 100% rename from objects/trees/jungle/lgeneric5.iob rename to objects/jungle-remade/J5.iob diff --git a/objects/trees/jungle/lgeneric6.iob b/objects/jungle-remade/J6.iob similarity index 100% rename from objects/trees/jungle/lgeneric6.iob rename to objects/jungle-remade/J6.iob diff --git a/objects/trees/jungle/lgeneric7.iob b/objects/jungle-remade/J7.iob similarity index 100% rename from objects/trees/jungle/lgeneric7.iob rename to objects/jungle-remade/J7.iob diff --git a/objects/trees/jungle/lgeneric8.iob b/objects/jungle-remade/J8.iob similarity index 100% rename from objects/trees/jungle/lgeneric8.iob rename to objects/jungle-remade/J8.iob diff --git a/objects/trees/jungle/lgeneric9.iob b/objects/jungle-remade/J9.iob similarity index 100% rename from objects/trees/jungle/lgeneric9.iob rename to objects/jungle-remade/J9.iob diff --git a/objects/jungle-remade/bbjungle-1.iob b/objects/jungle-remade/bbjungle-1.iob new file mode 100644 index 00000000..bd9c4e90 Binary files /dev/null and b/objects/jungle-remade/bbjungle-1.iob differ diff --git a/objects/trees/jungle/largegeneric1.iob b/objects/jungle-remade/bjungle-1.iob similarity index 100% rename from objects/trees/jungle/largegeneric1.iob rename to objects/jungle-remade/bjungle-1.iob diff --git a/objects/trees/jungle/largegeneric2.iob b/objects/jungle-remade/bjungle-2.iob similarity index 100% rename from objects/trees/jungle/largegeneric2.iob rename to objects/jungle-remade/bjungle-2.iob diff --git a/objects/trees/jungle/largegeneric3.iob b/objects/jungle-remade/bjungle-3.iob similarity index 100% rename from objects/trees/jungle/largegeneric3.iob rename to objects/jungle-remade/bjungle-3.iob diff --git a/objects/trees/jungle/largegeneric4.iob b/objects/jungle-remade/bjungle-4.iob similarity index 100% rename from objects/trees/jungle/largegeneric4.iob rename to objects/jungle-remade/bjungle-4.iob diff --git a/objects/trees/jungle/largegeneric5.iob b/objects/jungle-remade/bjungle-5.iob similarity index 100% rename from objects/trees/jungle/largegeneric5.iob rename to objects/jungle-remade/bjungle-5.iob diff --git a/objects/trees/jungle/bmbogeneric1.iob b/objects/jungle-remade/bmbo-1.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric1.iob rename to objects/jungle-remade/bmbo-1.iob diff --git a/objects/trees/jungle/bmbogeneric2.iob b/objects/jungle-remade/bmbo-2.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric2.iob rename to objects/jungle-remade/bmbo-2.iob diff --git a/objects/trees/jungle/bmbogeneric3.iob b/objects/jungle-remade/bmbo-3.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric3.iob rename to objects/jungle-remade/bmbo-3.iob diff --git a/objects/trees/jungle/bmbogeneric4.iob b/objects/jungle-remade/bmbo-4.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric4.iob rename to objects/jungle-remade/bmbo-4.iob diff --git a/objects/trees/jungle/bmbogeneric5.iob b/objects/jungle-remade/bmbo-5.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric5.iob rename to objects/jungle-remade/bmbo-5.iob diff --git a/objects/trees/jungle/bmbogeneric6.iob b/objects/jungle-remade/bmbo-6.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric6.iob rename to objects/jungle-remade/bmbo-6.iob diff --git a/objects/trees/jungle/bmbogeneric7.iob b/objects/jungle-remade/bmbo-7.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric7.iob rename to objects/jungle-remade/bmbo-7.iob diff --git a/objects/trees/jungle/bmbogeneric8.iob b/objects/jungle-remade/bmbo-8.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric8.iob rename to objects/jungle-remade/bmbo-8.iob diff --git a/objects/trees/jungle/bmbogeneric9.iob b/objects/jungle-remade/bmbo-9.iob similarity index 100% rename from objects/trees/jungle/bmbogeneric9.iob rename to objects/jungle-remade/bmbo-9.iob diff --git a/objects/trees/jungle/mgeneric4.iob b/objects/jungle-remade/j2.iob similarity index 100% rename from objects/trees/jungle/mgeneric4.iob rename to objects/jungle-remade/j2.iob diff --git a/objects/trees/jungle/mgeneric3.iob b/objects/jungle-remade/j3.iob similarity index 100% rename from objects/trees/jungle/mgeneric3.iob rename to objects/jungle-remade/j3.iob diff --git a/objects/trees/jungle/cocogeneric1.iob b/objects/jungle-remade/jcoco-1.iob similarity index 100% rename from objects/trees/jungle/cocogeneric1.iob rename to objects/jungle-remade/jcoco-1.iob diff --git a/objects/trees/jungle/cocogeneric2.iob b/objects/jungle-remade/jcoco-2.iob similarity index 100% rename from objects/trees/jungle/cocogeneric2.iob rename to objects/jungle-remade/jcoco-2.iob diff --git a/objects/trees/jungle/cocogeneric3.iob b/objects/jungle-remade/jcoco-3.iob similarity index 100% rename from objects/trees/jungle/cocogeneric3.iob rename to objects/jungle-remade/jcoco-3.iob diff --git a/objects/trees/jungle/cocogeneric4.iob b/objects/jungle-remade/jcoco-4.iob similarity index 100% rename from objects/trees/jungle/cocogeneric4.iob rename to objects/jungle-remade/jcoco-4.iob diff --git a/objects/trees/jungle/cocogeneric5.iob b/objects/jungle-remade/jcoco-5.iob similarity index 100% rename from objects/trees/jungle/cocogeneric5.iob rename to objects/jungle-remade/jcoco-5.iob diff --git a/objects/trees/jungle/spire1.iob b/objects/jungle-remade/jspire-1.iob similarity index 100% rename from objects/trees/jungle/spire1.iob rename to objects/jungle-remade/jspire-1.iob diff --git a/objects/trees/jungle/spire2.iob b/objects/jungle-remade/jspire-2.iob similarity index 100% rename from objects/trees/jungle/spire2.iob rename to objects/jungle-remade/jspire-2.iob diff --git a/objects/trees/jungle/spire3.iob b/objects/jungle-remade/jspire-3.iob similarity index 100% rename from objects/trees/jungle/spire3.iob rename to objects/jungle-remade/jspire-3.iob diff --git a/objects/trees/jungle/spire4.iob b/objects/jungle-remade/jspire-4.iob similarity index 100% rename from objects/trees/jungle/spire4.iob rename to objects/jungle-remade/jspire-4.iob diff --git a/objects/trees/jungle/spire5.iob b/objects/jungle-remade/jspire-5.iob similarity index 100% rename from objects/trees/jungle/spire5.iob rename to objects/jungle-remade/jspire-5.iob diff --git a/objects/trees/jungle/spire6.iob b/objects/jungle-remade/jspire-6.iob similarity index 100% rename from objects/trees/jungle/spire6.iob rename to objects/jungle-remade/jspire-6.iob diff --git a/objects/trees/jungle/spire7.iob b/objects/jungle-remade/jspire-7.iob similarity index 100% rename from objects/trees/jungle/spire7.iob rename to objects/jungle-remade/jspire-7.iob diff --git a/objects/trees/jungle/sgeneric1.iob b/objects/jungle-remade/sjungle-1.iob similarity index 100% rename from objects/trees/jungle/sgeneric1.iob rename to objects/jungle-remade/sjungle-1.iob diff --git a/objects/trees/jungle/sgeneric2.iob b/objects/jungle-remade/sjungle-2.iob similarity index 100% rename from objects/trees/jungle/sgeneric2.iob rename to objects/jungle-remade/sjungle-2.iob diff --git a/objects/trees/jungle/sgeneric3.iob b/objects/jungle-remade/sjungle-3.iob similarity index 100% rename from objects/trees/jungle/sgeneric3.iob rename to objects/jungle-remade/sjungle-3.iob diff --git a/objects/trees/jungle/sgeneric4.iob b/objects/jungle-remade/sjungle-4.iob similarity index 100% rename from objects/trees/jungle/sgeneric4.iob rename to objects/jungle-remade/sjungle-4.iob diff --git a/objects/trees/jungle/smgeneric1.iob b/objects/jungle-remade/ssmjungle1.iob similarity index 100% rename from objects/trees/jungle/smgeneric1.iob rename to objects/jungle-remade/ssmjungle1.iob diff --git a/objects/landform/spikes/1.iob b/objects/landform/spikes/1.iob new file mode 100644 index 00000000..d6c81f18 Binary files /dev/null and b/objects/landform/spikes/1.iob differ diff --git a/objects/landform/spikes/2.iob b/objects/landform/spikes/2.iob new file mode 100644 index 00000000..f149948b Binary files /dev/null and b/objects/landform/spikes/2.iob differ diff --git a/objects/landform/spikes/3.iob b/objects/landform/spikes/3.iob new file mode 100644 index 00000000..5104a6e1 Binary files /dev/null and b/objects/landform/spikes/3.iob differ diff --git a/objects/landform/stone/1.iob b/objects/landform/stone/1.iob new file mode 100644 index 00000000..dd13deb6 Binary files /dev/null and b/objects/landform/stone/1.iob differ diff --git a/objects/landform/stone/2.iob b/objects/landform/stone/2.iob new file mode 100644 index 00000000..11c71cf4 Binary files /dev/null and b/objects/landform/stone/2.iob differ diff --git a/objects/landform/stone/3.iob b/objects/landform/stone/3.iob new file mode 100644 index 00000000..96e95c7d Binary files /dev/null and b/objects/landform/stone/3.iob differ diff --git a/objects/landform/stone/4.iob b/objects/landform/stone/4.iob new file mode 100644 index 00000000..1ce9b93e Binary files /dev/null and b/objects/landform/stone/4.iob differ diff --git a/objects/landform/stone/5.iob b/objects/landform/stone/5.iob new file mode 100644 index 00000000..663b63c7 Binary files /dev/null and b/objects/landform/stone/5.iob differ diff --git a/objects/landform/underwater/ellipsoid-1.iob b/objects/landform/underwater/ellipsoid-1.iob new file mode 100644 index 00000000..53f3b2cf Binary files /dev/null and b/objects/landform/underwater/ellipsoid-1.iob differ diff --git a/objects/lith/concrete-lith-1.iob b/objects/lith/concrete-lith-1.iob new file mode 100644 index 00000000..9c75b1d4 Binary files /dev/null and b/objects/lith/concrete-lith-1.iob differ diff --git a/objects/lith/concrete-lith-2.iob b/objects/lith/concrete-lith-2.iob new file mode 100644 index 00000000..d76b9b03 Binary files /dev/null and b/objects/lith/concrete-lith-2.iob differ diff --git a/objects/lith/concrete-lith-3.iob b/objects/lith/concrete-lith-3.iob new file mode 100644 index 00000000..75c3ddd2 Binary files /dev/null and b/objects/lith/concrete-lith-3.iob differ diff --git a/objects/lith/concrete-lith-4.iob b/objects/lith/concrete-lith-4.iob new file mode 100644 index 00000000..fd5fb19e Binary files /dev/null and b/objects/lith/concrete-lith-4.iob differ diff --git a/objects/lith/concrete-lith-5.iob b/objects/lith/concrete-lith-5.iob new file mode 100644 index 00000000..35ffa883 Binary files /dev/null and b/objects/lith/concrete-lith-5.iob differ diff --git a/objects/lith/concrete-lith-6.iob b/objects/lith/concrete-lith-6.iob new file mode 100644 index 00000000..939d5836 Binary files /dev/null and b/objects/lith/concrete-lith-6.iob differ diff --git a/objects/lith/concrete-lith-7.iob b/objects/lith/concrete-lith-7.iob new file mode 100644 index 00000000..a9e758f0 Binary files /dev/null and b/objects/lith/concrete-lith-7.iob differ diff --git a/objects/trees/mushroom/lumo1.iob b/objects/lumoshroom/subnauti-1.iob similarity index 100% rename from objects/trees/mushroom/lumo1.iob rename to objects/lumoshroom/subnauti-1.iob diff --git a/objects/trees/mushroom/lumo10.iob b/objects/lumoshroom/subnauti-10.iob similarity index 100% rename from objects/trees/mushroom/lumo10.iob rename to objects/lumoshroom/subnauti-10.iob diff --git a/objects/trees/mushroom/lumo2.iob b/objects/lumoshroom/subnauti-2.iob similarity index 100% rename from objects/trees/mushroom/lumo2.iob rename to objects/lumoshroom/subnauti-2.iob diff --git a/objects/trees/mushroom/lumo3.iob b/objects/lumoshroom/subnauti-3.iob similarity index 100% rename from objects/trees/mushroom/lumo3.iob rename to objects/lumoshroom/subnauti-3.iob diff --git a/objects/trees/mushroom/lumo4.iob b/objects/lumoshroom/subnauti-4.iob similarity index 100% rename from objects/trees/mushroom/lumo4.iob rename to objects/lumoshroom/subnauti-4.iob diff --git a/objects/trees/mushroom/lumo5.iob b/objects/lumoshroom/subnauti-5.iob similarity index 100% rename from objects/trees/mushroom/lumo5.iob rename to objects/lumoshroom/subnauti-5.iob diff --git a/objects/trees/mushroom/lumo6.iob b/objects/lumoshroom/subnauti-6.iob similarity index 100% rename from objects/trees/mushroom/lumo6.iob rename to objects/lumoshroom/subnauti-6.iob diff --git a/objects/trees/mushroom/lumo7.iob b/objects/lumoshroom/subnauti-7.iob similarity index 100% rename from objects/trees/mushroom/lumo7.iob rename to objects/lumoshroom/subnauti-7.iob diff --git a/objects/trees/mushroom/lumo8.iob b/objects/lumoshroom/subnauti-8.iob similarity index 100% rename from objects/trees/mushroom/lumo8.iob rename to objects/lumoshroom/subnauti-8.iob diff --git a/objects/trees/mushroom/lumo9.iob b/objects/lumoshroom/subnauti-9.iob similarity index 100% rename from objects/trees/mushroom/lumo9.iob rename to objects/lumoshroom/subnauti-9.iob diff --git a/objects/trees/spruce/lushgenericpine1.iob b/objects/lush-pine/lush-pine1.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine1.iob rename to objects/lush-pine/lush-pine1.iob diff --git a/objects/trees/spruce/lushgenericpine2.iob b/objects/lush-pine/lush-pine10.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine2.iob rename to objects/lush-pine/lush-pine10.iob diff --git a/objects/trees/spruce/lushgenericpine3.iob b/objects/lush-pine/lush-pine2.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine3.iob rename to objects/lush-pine/lush-pine2.iob diff --git a/objects/trees/spruce/lushgenericpine4.iob b/objects/lush-pine/lush-pine3.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine4.iob rename to objects/lush-pine/lush-pine3.iob diff --git a/objects/trees/spruce/lushgenericpine5.iob b/objects/lush-pine/lush-pine4.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine5.iob rename to objects/lush-pine/lush-pine4.iob diff --git a/objects/trees/spruce/lushgenericpine6.iob b/objects/lush-pine/lush-pine5.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine6.iob rename to objects/lush-pine/lush-pine5.iob diff --git a/objects/trees/spruce/lushgenericpine7.iob b/objects/lush-pine/lush-pine6.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine7.iob rename to objects/lush-pine/lush-pine6.iob diff --git a/objects/trees/spruce/lushgenericpine8.iob b/objects/lush-pine/lush-pine7.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine8.iob rename to objects/lush-pine/lush-pine7.iob diff --git a/objects/trees/spruce/lushgenericpine9.iob b/objects/lush-pine/lush-pine8.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine9.iob rename to objects/lush-pine/lush-pine8.iob diff --git a/objects/trees/spruce/lushgenericpine10.iob b/objects/lush-pine/lush-pine9.iob similarity index 100% rename from objects/trees/spruce/lushgenericpine10.iob rename to objects/lush-pine/lush-pine9.iob diff --git a/objects/misc/shrub-1.iob b/objects/misc/shrub-1.iob new file mode 100644 index 00000000..87af0038 Binary files /dev/null and b/objects/misc/shrub-1.iob differ diff --git a/objects/misc/shrub-10.iob b/objects/misc/shrub-10.iob new file mode 100644 index 00000000..284cd22d Binary files /dev/null and b/objects/misc/shrub-10.iob differ diff --git a/objects/misc/shrub-11.iob b/objects/misc/shrub-11.iob new file mode 100644 index 00000000..e2e08261 Binary files /dev/null and b/objects/misc/shrub-11.iob differ diff --git a/objects/misc/shrub-13.iob b/objects/misc/shrub-13.iob new file mode 100644 index 00000000..606a88e5 Binary files /dev/null and b/objects/misc/shrub-13.iob differ diff --git a/objects/misc/shrub-2.iob b/objects/misc/shrub-2.iob new file mode 100644 index 00000000..d82701e4 Binary files /dev/null and b/objects/misc/shrub-2.iob differ diff --git a/objects/misc/shrub-3.iob b/objects/misc/shrub-3.iob new file mode 100644 index 00000000..a5f22e0c Binary files /dev/null and b/objects/misc/shrub-3.iob differ diff --git a/objects/misc/shrub-4.iob b/objects/misc/shrub-4.iob new file mode 100644 index 00000000..1e76b377 Binary files /dev/null and b/objects/misc/shrub-4.iob differ diff --git a/objects/misc/shrub-5.iob b/objects/misc/shrub-5.iob new file mode 100644 index 00000000..ee891d78 Binary files /dev/null and b/objects/misc/shrub-5.iob differ diff --git a/objects/misc/shrub-6.iob b/objects/misc/shrub-6.iob new file mode 100644 index 00000000..6348cf49 Binary files /dev/null and b/objects/misc/shrub-6.iob differ diff --git a/objects/misc/shrub-7.iob b/objects/misc/shrub-7.iob new file mode 100644 index 00000000..7d2fe223 Binary files /dev/null and b/objects/misc/shrub-7.iob differ diff --git a/objects/misc/shrub-8.iob b/objects/misc/shrub-8.iob new file mode 100644 index 00000000..4daa6391 Binary files /dev/null and b/objects/misc/shrub-8.iob differ diff --git a/objects/misc/shrub-9.iob b/objects/misc/shrub-9.iob new file mode 100644 index 00000000..0c3bc4c1 Binary files /dev/null and b/objects/misc/shrub-9.iob differ diff --git a/objects/misc/tntower-1.iob b/objects/misc/tntower-1.iob new file mode 100644 index 00000000..dc15ae33 Binary files /dev/null and b/objects/misc/tntower-1.iob differ diff --git a/objects/monolith/black-1.iob b/objects/monolith/black-1.iob new file mode 100644 index 00000000..d21cde20 Binary files /dev/null and b/objects/monolith/black-1.iob differ diff --git a/objects/monolith/black-2.iob b/objects/monolith/black-2.iob new file mode 100644 index 00000000..aba95a0c Binary files /dev/null and b/objects/monolith/black-2.iob differ diff --git a/objects/monolith/black-3.iob b/objects/monolith/black-3.iob new file mode 100644 index 00000000..3fd73cb3 Binary files /dev/null and b/objects/monolith/black-3.iob differ diff --git a/objects/monolith/black-4.iob b/objects/monolith/black-4.iob new file mode 100644 index 00000000..703b32f5 Binary files /dev/null and b/objects/monolith/black-4.iob differ diff --git a/objects/monolith/black-5.iob b/objects/monolith/black-5.iob new file mode 100644 index 00000000..1d0c0f5d Binary files /dev/null and b/objects/monolith/black-5.iob differ diff --git a/objects/monolith/black-6.iob b/objects/monolith/black-6.iob new file mode 100644 index 00000000..fb0ecd85 Binary files /dev/null and b/objects/monolith/black-6.iob differ diff --git a/objects/mrock/mrock-1.iob b/objects/mrock/mrock-1.iob new file mode 100644 index 00000000..d1a620ef Binary files /dev/null and b/objects/mrock/mrock-1.iob differ diff --git a/objects/mrock/mrock-2.iob b/objects/mrock/mrock-2.iob new file mode 100644 index 00000000..2d654d58 Binary files /dev/null and b/objects/mrock/mrock-2.iob differ diff --git a/objects/mrock/mrock-3.iob b/objects/mrock/mrock-3.iob new file mode 100644 index 00000000..840c696b Binary files /dev/null and b/objects/mrock/mrock-3.iob differ diff --git a/objects/mrock/mrock-4.iob b/objects/mrock/mrock-4.iob new file mode 100644 index 00000000..0cdc8a9d Binary files /dev/null and b/objects/mrock/mrock-4.iob differ diff --git a/objects/mrock/mrock-5.iob b/objects/mrock/mrock-5.iob new file mode 100644 index 00000000..48bd5dcf Binary files /dev/null and b/objects/mrock/mrock-5.iob differ diff --git a/objects/jigsaw/murky_stronghold/c-n-1.iob b/objects/murky_stronghold/c-n-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-n-1.iob rename to objects/murky_stronghold/c-n-1.iob diff --git a/objects/jigsaw/murky_stronghold/c-n-2.iob b/objects/murky_stronghold/c-n-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-n-2.iob rename to objects/murky_stronghold/c-n-2.iob diff --git a/objects/jigsaw/murky_stronghold/c-n-3.iob b/objects/murky_stronghold/c-n-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-n-3.iob rename to objects/murky_stronghold/c-n-3.iob diff --git a/objects/jigsaw/murky_stronghold/c-n-4.iob b/objects/murky_stronghold/c-n-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-n-4.iob rename to objects/murky_stronghold/c-n-4.iob diff --git a/objects/jigsaw/murky_stronghold/c-ns-1.iob b/objects/murky_stronghold/c-ns-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-ns-1.iob rename to objects/murky_stronghold/c-ns-1.iob diff --git a/objects/jigsaw/murky_stronghold/c-ns-2.iob b/objects/murky_stronghold/c-ns-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-ns-2.iob rename to objects/murky_stronghold/c-ns-2.iob diff --git a/objects/jigsaw/murky_stronghold/c-ns-3.iob b/objects/murky_stronghold/c-ns-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-ns-3.iob rename to objects/murky_stronghold/c-ns-3.iob diff --git a/objects/jigsaw/murky_stronghold/c-ns-4.iob b/objects/murky_stronghold/c-ns-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-ns-4.iob rename to objects/murky_stronghold/c-ns-4.iob diff --git a/objects/jigsaw/murky_stronghold/c-nsw-1.iob b/objects/murky_stronghold/c-nsw-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-nsw-1.iob rename to objects/murky_stronghold/c-nsw-1.iob diff --git a/objects/jigsaw/murky_stronghold/c-nsw-2.iob b/objects/murky_stronghold/c-nsw-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-nsw-2.iob rename to objects/murky_stronghold/c-nsw-2.iob diff --git a/objects/jigsaw/murky_stronghold/c-nsw-3.iob b/objects/murky_stronghold/c-nsw-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-nsw-3.iob rename to objects/murky_stronghold/c-nsw-3.iob diff --git a/objects/jigsaw/murky_stronghold/c-nsw-4.iob b/objects/murky_stronghold/c-nsw-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-nsw-4.iob rename to objects/murky_stronghold/c-nsw-4.iob diff --git a/objects/jigsaw/murky_stronghold/c-sw-1.iob b/objects/murky_stronghold/c-sw-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-sw-1.iob rename to objects/murky_stronghold/c-sw-1.iob diff --git a/objects/jigsaw/murky_stronghold/c-sw-2.iob b/objects/murky_stronghold/c-sw-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-sw-2.iob rename to objects/murky_stronghold/c-sw-2.iob diff --git a/objects/jigsaw/murky_stronghold/c-sw-3.iob b/objects/murky_stronghold/c-sw-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-sw-3.iob rename to objects/murky_stronghold/c-sw-3.iob diff --git a/objects/jigsaw/murky_stronghold/c-sw-4.iob b/objects/murky_stronghold/c-sw-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-sw-4.iob rename to objects/murky_stronghold/c-sw-4.iob diff --git a/objects/jigsaw/murky_stronghold/c-x-1.iob b/objects/murky_stronghold/c-x-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-x-1.iob rename to objects/murky_stronghold/c-x-1.iob diff --git a/objects/jigsaw/murky_stronghold/c-x-2.iob b/objects/murky_stronghold/c-x-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-x-2.iob rename to objects/murky_stronghold/c-x-2.iob diff --git a/objects/jigsaw/murky_stronghold/c-x-3.iob b/objects/murky_stronghold/c-x-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-x-3.iob rename to objects/murky_stronghold/c-x-3.iob diff --git a/objects/jigsaw/murky_stronghold/c-x-4.iob b/objects/murky_stronghold/c-x-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-x-4.iob rename to objects/murky_stronghold/c-x-4.iob diff --git a/objects/jigsaw/murky_stronghold/c-x-5.iob b/objects/murky_stronghold/c-x-5.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-x-5.iob rename to objects/murky_stronghold/c-x-5.iob diff --git a/objects/jigsaw/murky_stronghold/c-x-6.iob b/objects/murky_stronghold/c-x-6.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/c-x-6.iob rename to objects/murky_stronghold/c-x-6.iob diff --git a/objects/jigsaw/murky_stronghold/f-n-1.iob b/objects/murky_stronghold/f-n-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-n-1.iob rename to objects/murky_stronghold/f-n-1.iob diff --git a/objects/jigsaw/murky_stronghold/f-n-2.iob b/objects/murky_stronghold/f-n-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-n-2.iob rename to objects/murky_stronghold/f-n-2.iob diff --git a/objects/jigsaw/murky_stronghold/f-n-3.iob b/objects/murky_stronghold/f-n-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-n-3.iob rename to objects/murky_stronghold/f-n-3.iob diff --git a/objects/jigsaw/murky_stronghold/f-n-4.iob b/objects/murky_stronghold/f-n-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-n-4.iob rename to objects/murky_stronghold/f-n-4.iob diff --git a/objects/jigsaw/murky_stronghold/f-ns-1.iob b/objects/murky_stronghold/f-ns-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-ns-1.iob rename to objects/murky_stronghold/f-ns-1.iob diff --git a/objects/jigsaw/murky_stronghold/f-ns-2.iob b/objects/murky_stronghold/f-ns-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-ns-2.iob rename to objects/murky_stronghold/f-ns-2.iob diff --git a/objects/jigsaw/murky_stronghold/f-ns-3.iob b/objects/murky_stronghold/f-ns-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-ns-3.iob rename to objects/murky_stronghold/f-ns-3.iob diff --git a/objects/jigsaw/murky_stronghold/f-ns-4.iob b/objects/murky_stronghold/f-ns-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-ns-4.iob rename to objects/murky_stronghold/f-ns-4.iob diff --git a/objects/jigsaw/murky_stronghold/f-nsw-1.iob b/objects/murky_stronghold/f-nsw-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-nsw-1.iob rename to objects/murky_stronghold/f-nsw-1.iob diff --git a/objects/jigsaw/murky_stronghold/f-nsw-2.iob b/objects/murky_stronghold/f-nsw-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-nsw-2.iob rename to objects/murky_stronghold/f-nsw-2.iob diff --git a/objects/jigsaw/murky_stronghold/f-nsw-3.iob b/objects/murky_stronghold/f-nsw-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-nsw-3.iob rename to objects/murky_stronghold/f-nsw-3.iob diff --git a/objects/jigsaw/murky_stronghold/f-nsw-4.iob b/objects/murky_stronghold/f-nsw-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-nsw-4.iob rename to objects/murky_stronghold/f-nsw-4.iob diff --git a/objects/jigsaw/murky_stronghold/f-sw-1.iob b/objects/murky_stronghold/f-sw-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-sw-1.iob rename to objects/murky_stronghold/f-sw-1.iob diff --git a/objects/jigsaw/murky_stronghold/f-sw-2.iob b/objects/murky_stronghold/f-sw-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-sw-2.iob rename to objects/murky_stronghold/f-sw-2.iob diff --git a/objects/jigsaw/murky_stronghold/f-sw-3.iob b/objects/murky_stronghold/f-sw-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-sw-3.iob rename to objects/murky_stronghold/f-sw-3.iob diff --git a/objects/jigsaw/murky_stronghold/f-sw-4.iob b/objects/murky_stronghold/f-sw-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-sw-4.iob rename to objects/murky_stronghold/f-sw-4.iob diff --git a/objects/jigsaw/murky_stronghold/f-x-1.iob b/objects/murky_stronghold/f-x-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-x-1.iob rename to objects/murky_stronghold/f-x-1.iob diff --git a/objects/jigsaw/murky_stronghold/f-x-2.iob b/objects/murky_stronghold/f-x-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-x-2.iob rename to objects/murky_stronghold/f-x-2.iob diff --git a/objects/jigsaw/murky_stronghold/f-x-3.iob b/objects/murky_stronghold/f-x-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-x-3.iob rename to objects/murky_stronghold/f-x-3.iob diff --git a/objects/jigsaw/murky_stronghold/f-x-4.iob b/objects/murky_stronghold/f-x-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-x-4.iob rename to objects/murky_stronghold/f-x-4.iob diff --git a/objects/jigsaw/murky_stronghold/f-x-5.iob b/objects/murky_stronghold/f-x-5.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-x-5.iob rename to objects/murky_stronghold/f-x-5.iob diff --git a/objects/jigsaw/murky_stronghold/f-x-6.iob b/objects/murky_stronghold/f-x-6.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/f-x-6.iob rename to objects/murky_stronghold/f-x-6.iob diff --git a/objects/jigsaw/murky_stronghold/fc-n-1.iob b/objects/murky_stronghold/fc-n-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-n-1.iob rename to objects/murky_stronghold/fc-n-1.iob diff --git a/objects/jigsaw/murky_stronghold/fc-n-2.iob b/objects/murky_stronghold/fc-n-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-n-2.iob rename to objects/murky_stronghold/fc-n-2.iob diff --git a/objects/jigsaw/murky_stronghold/fc-n-3.iob b/objects/murky_stronghold/fc-n-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-n-3.iob rename to objects/murky_stronghold/fc-n-3.iob diff --git a/objects/jigsaw/murky_stronghold/fc-n-4.iob b/objects/murky_stronghold/fc-n-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-n-4.iob rename to objects/murky_stronghold/fc-n-4.iob diff --git a/objects/jigsaw/murky_stronghold/fc-ns-1.iob b/objects/murky_stronghold/fc-ns-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-ns-1.iob rename to objects/murky_stronghold/fc-ns-1.iob diff --git a/objects/jigsaw/murky_stronghold/fc-ns-2.iob b/objects/murky_stronghold/fc-ns-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-ns-2.iob rename to objects/murky_stronghold/fc-ns-2.iob diff --git a/objects/jigsaw/murky_stronghold/fc-ns-3.iob b/objects/murky_stronghold/fc-ns-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-ns-3.iob rename to objects/murky_stronghold/fc-ns-3.iob diff --git a/objects/jigsaw/murky_stronghold/fc-ns-4.iob b/objects/murky_stronghold/fc-ns-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-ns-4.iob rename to objects/murky_stronghold/fc-ns-4.iob diff --git a/objects/jigsaw/murky_stronghold/fc-nsw-1.iob b/objects/murky_stronghold/fc-nsw-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-nsw-1.iob rename to objects/murky_stronghold/fc-nsw-1.iob diff --git a/objects/jigsaw/murky_stronghold/fc-nsw-2.iob b/objects/murky_stronghold/fc-nsw-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-nsw-2.iob rename to objects/murky_stronghold/fc-nsw-2.iob diff --git a/objects/jigsaw/murky_stronghold/fc-nsw-3.iob b/objects/murky_stronghold/fc-nsw-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-nsw-3.iob rename to objects/murky_stronghold/fc-nsw-3.iob diff --git a/objects/jigsaw/murky_stronghold/fc-nsw-4.iob b/objects/murky_stronghold/fc-nsw-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-nsw-4.iob rename to objects/murky_stronghold/fc-nsw-4.iob diff --git a/objects/jigsaw/murky_stronghold/fc-sw-1.iob b/objects/murky_stronghold/fc-sw-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-sw-1.iob rename to objects/murky_stronghold/fc-sw-1.iob diff --git a/objects/jigsaw/murky_stronghold/fc-sw-2.iob b/objects/murky_stronghold/fc-sw-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-sw-2.iob rename to objects/murky_stronghold/fc-sw-2.iob diff --git a/objects/jigsaw/murky_stronghold/fc-sw-3.iob b/objects/murky_stronghold/fc-sw-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-sw-3.iob rename to objects/murky_stronghold/fc-sw-3.iob diff --git a/objects/jigsaw/murky_stronghold/fc-sw-4.iob b/objects/murky_stronghold/fc-sw-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-sw-4.iob rename to objects/murky_stronghold/fc-sw-4.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-1.iob b/objects/murky_stronghold/fc-x-1.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-1.iob rename to objects/murky_stronghold/fc-x-1.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-2.iob b/objects/murky_stronghold/fc-x-2.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-2.iob rename to objects/murky_stronghold/fc-x-2.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-3.iob b/objects/murky_stronghold/fc-x-3.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-3.iob rename to objects/murky_stronghold/fc-x-3.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-4.iob b/objects/murky_stronghold/fc-x-4.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-4.iob rename to objects/murky_stronghold/fc-x-4.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-5.iob b/objects/murky_stronghold/fc-x-5.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-5.iob rename to objects/murky_stronghold/fc-x-5.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-6.iob b/objects/murky_stronghold/fc-x-6.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-6.iob rename to objects/murky_stronghold/fc-x-6.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-7.iob b/objects/murky_stronghold/fc-x-7.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-7.iob rename to objects/murky_stronghold/fc-x-7.iob diff --git a/objects/jigsaw/murky_stronghold/fc-x-8.iob b/objects/murky_stronghold/fc-x-8.iob similarity index 100% rename from objects/jigsaw/murky_stronghold/fc-x-8.iob rename to objects/murky_stronghold/fc-x-8.iob diff --git a/objects/jigsaw/mushhut/hut/hut1.iob b/objects/mushhut/hut/hut1.iob similarity index 100% rename from objects/jigsaw/mushhut/hut/hut1.iob rename to objects/mushhut/hut/hut1.iob diff --git a/objects/jigsaw/mushhut/hut/hut2.iob b/objects/mushhut/hut/hut2.iob similarity index 100% rename from objects/jigsaw/mushhut/hut/hut2.iob rename to objects/mushhut/hut/hut2.iob diff --git a/objects/jigsaw/mushhut/hut/hut3.iob b/objects/mushhut/hut/hut3.iob similarity index 100% rename from objects/jigsaw/mushhut/hut/hut3.iob rename to objects/mushhut/hut/hut3.iob diff --git a/objects/jigsaw/mushhut/hut/hut4.iob b/objects/mushhut/hut/hut4.iob similarity index 100% rename from objects/jigsaw/mushhut/hut/hut4.iob rename to objects/mushhut/hut/hut4.iob diff --git a/objects/jigsaw/mushhut/hut/hut5.iob b/objects/mushhut/hut/hut5.iob similarity index 100% rename from objects/jigsaw/mushhut/hut/hut5.iob rename to objects/mushhut/hut/hut5.iob diff --git a/objects/jigsaw/mushhut/hut/hut6.iob b/objects/mushhut/hut/hut6.iob similarity index 100% rename from objects/jigsaw/mushhut/hut/hut6.iob rename to objects/mushhut/hut/hut6.iob diff --git a/objects/jigsaw/mushhut/hut/hut7.iob b/objects/mushhut/hut/hut7.iob similarity index 100% rename from objects/jigsaw/mushhut/hut/hut7.iob rename to objects/mushhut/hut/hut7.iob diff --git a/objects/jigsaw/mushhut/paths/path1.iob b/objects/mushhut/paths/path1.iob similarity index 100% rename from objects/jigsaw/mushhut/paths/path1.iob rename to objects/mushhut/paths/path1.iob diff --git a/objects/jigsaw/mushhut/paths/path2.iob b/objects/mushhut/paths/path2.iob similarity index 100% rename from objects/jigsaw/mushhut/paths/path2.iob rename to objects/mushhut/paths/path2.iob diff --git a/objects/jigsaw/mushhut/paths/path3.iob b/objects/mushhut/paths/path3.iob similarity index 100% rename from objects/jigsaw/mushhut/paths/path3.iob rename to objects/mushhut/paths/path3.iob diff --git a/objects/jigsaw/mushhut/paths/path4.iob b/objects/mushhut/paths/path4.iob similarity index 100% rename from objects/jigsaw/mushhut/paths/path4.iob rename to objects/mushhut/paths/path4.iob diff --git a/objects/trees/mushroom/blackgeneric1.iob b/objects/mushroom-black/BMush1.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric1.iob rename to objects/mushroom-black/BMush1.iob diff --git a/objects/trees/mushroom/blackgeneric2.iob b/objects/mushroom-black/BMush10.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric2.iob rename to objects/mushroom-black/BMush10.iob diff --git a/objects/trees/mushroom/blackgeneric3.iob b/objects/mushroom-black/BMush2.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric3.iob rename to objects/mushroom-black/BMush2.iob diff --git a/objects/trees/mushroom/blackgeneric4.iob b/objects/mushroom-black/BMush3.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric4.iob rename to objects/mushroom-black/BMush3.iob diff --git a/objects/trees/mushroom/blackgeneric5.iob b/objects/mushroom-black/BMush4.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric5.iob rename to objects/mushroom-black/BMush4.iob diff --git a/objects/trees/mushroom/blackgeneric6.iob b/objects/mushroom-black/BMush5.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric6.iob rename to objects/mushroom-black/BMush5.iob diff --git a/objects/trees/mushroom/blackgeneric7.iob b/objects/mushroom-black/BMush6.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric7.iob rename to objects/mushroom-black/BMush6.iob diff --git a/objects/trees/mushroom/blackgeneric8.iob b/objects/mushroom-black/BMush7.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric8.iob rename to objects/mushroom-black/BMush7.iob diff --git a/objects/trees/mushroom/blackgeneric9.iob b/objects/mushroom-black/BMush8.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric9.iob rename to objects/mushroom-black/BMush8.iob diff --git a/objects/trees/mushroom/blackgeneric10.iob b/objects/mushroom-black/BMush9.iob similarity index 100% rename from objects/trees/mushroom/blackgeneric10.iob rename to objects/mushroom-black/BMush9.iob diff --git a/objects/trees/mushroom/greygeneric1.iob b/objects/mushroom-gray/GMush1.iob similarity index 100% rename from objects/trees/mushroom/greygeneric1.iob rename to objects/mushroom-gray/GMush1.iob diff --git a/objects/trees/mushroom/greygeneric2.iob b/objects/mushroom-gray/GMush2.iob similarity index 100% rename from objects/trees/mushroom/greygeneric2.iob rename to objects/mushroom-gray/GMush2.iob diff --git a/objects/trees/mushroom/greygeneric3.iob b/objects/mushroom-gray/GMush3.iob similarity index 100% rename from objects/trees/mushroom/greygeneric3.iob rename to objects/mushroom-gray/GMush3.iob diff --git a/objects/trees/mushroom/greygeneric4.iob b/objects/mushroom-gray/GMush4.iob similarity index 100% rename from objects/trees/mushroom/greygeneric4.iob rename to objects/mushroom-gray/GMush4.iob diff --git a/objects/trees/mushroom/greygeneric5.iob b/objects/mushroom-gray/GMush5.iob similarity index 100% rename from objects/trees/mushroom/greygeneric5.iob rename to objects/mushroom-gray/GMush5.iob diff --git a/objects/trees/mushroom/greygeneric6.iob b/objects/mushroom-gray/GMush6.iob similarity index 100% rename from objects/trees/mushroom/greygeneric6.iob rename to objects/mushroom-gray/GMush6.iob diff --git a/objects/trees/mushroom/greygeneric7.iob b/objects/mushroom-gray/GMush8.iob similarity index 100% rename from objects/trees/mushroom/greygeneric7.iob rename to objects/mushroom-gray/GMush8.iob diff --git a/objects/trees/mushroom/greygeneric8.iob b/objects/mushroom-gray/GMush9.iob similarity index 100% rename from objects/trees/mushroom/greygeneric8.iob rename to objects/mushroom-gray/GMush9.iob diff --git a/objects/trees/mushroom/ice1.iob b/objects/mushroom-ice/ICEMush1.iob similarity index 100% rename from objects/trees/mushroom/ice1.iob rename to objects/mushroom-ice/ICEMush1.iob diff --git a/objects/trees/mushroom/ice2.iob b/objects/mushroom-ice/ICEMush2.iob similarity index 100% rename from objects/trees/mushroom/ice2.iob rename to objects/mushroom-ice/ICEMush2.iob diff --git a/objects/trees/mushroom/ice3.iob b/objects/mushroom-ice/ICEMush3.iob similarity index 100% rename from objects/trees/mushroom/ice3.iob rename to objects/mushroom-ice/ICEMush3.iob diff --git a/objects/trees/mushroom/ice4.iob b/objects/mushroom-ice/ICEMush4.iob similarity index 100% rename from objects/trees/mushroom/ice4.iob rename to objects/mushroom-ice/ICEMush4.iob diff --git a/objects/trees/mushroom/ice5.iob b/objects/mushroom-ice/ICEMush5.iob similarity index 100% rename from objects/trees/mushroom/ice5.iob rename to objects/mushroom-ice/ICEMush5.iob diff --git a/objects/trees/mushroom/ice6.iob b/objects/mushroom-ice/ICEMush6.iob similarity index 100% rename from objects/trees/mushroom/ice6.iob rename to objects/mushroom-ice/ICEMush6.iob diff --git a/objects/trees/mushroom/ice7.iob b/objects/mushroom-ice/ICEMush7.iob similarity index 100% rename from objects/trees/mushroom/ice7.iob rename to objects/mushroom-ice/ICEMush7.iob diff --git a/objects/trees/mushroom/ice8.iob b/objects/mushroom-ice/ICEMush8.iob similarity index 100% rename from objects/trees/mushroom/ice8.iob rename to objects/mushroom-ice/ICEMush8.iob diff --git a/objects/trees/mushroom/ice9.iob b/objects/mushroom-ice/ICEMush9.iob similarity index 100% rename from objects/trees/mushroom/ice9.iob rename to objects/mushroom-ice/ICEMush9.iob diff --git a/objects/trees/mushroom/purplegeneric1.iob b/objects/mushroom-purple/PMush1.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric1.iob rename to objects/mushroom-purple/PMush1.iob diff --git a/objects/trees/mushroom/purplegeneric2.iob b/objects/mushroom-purple/PMush10.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric2.iob rename to objects/mushroom-purple/PMush10.iob diff --git a/objects/trees/mushroom/purplegeneric3.iob b/objects/mushroom-purple/PMush2.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric3.iob rename to objects/mushroom-purple/PMush2.iob diff --git a/objects/trees/mushroom/purplegeneric4.iob b/objects/mushroom-purple/PMush3.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric4.iob rename to objects/mushroom-purple/PMush3.iob diff --git a/objects/trees/mushroom/purplegeneric5.iob b/objects/mushroom-purple/PMush4.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric5.iob rename to objects/mushroom-purple/PMush4.iob diff --git a/objects/trees/mushroom/purplegeneric6.iob b/objects/mushroom-purple/PMush5.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric6.iob rename to objects/mushroom-purple/PMush5.iob diff --git a/objects/trees/mushroom/purplegeneric7.iob b/objects/mushroom-purple/PMush6.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric7.iob rename to objects/mushroom-purple/PMush6.iob diff --git a/objects/trees/mushroom/purplegeneric8.iob b/objects/mushroom-purple/PMush7.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric8.iob rename to objects/mushroom-purple/PMush7.iob diff --git a/objects/trees/mushroom/purplegeneric9.iob b/objects/mushroom-purple/PMush8.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric9.iob rename to objects/mushroom-purple/PMush8.iob diff --git a/objects/trees/mushroom/purplegeneric10.iob b/objects/mushroom-purple/PMush9.iob similarity index 100% rename from objects/trees/mushroom/purplegeneric10.iob rename to objects/mushroom-purple/PMush9.iob diff --git a/objects/trees/mushroom/xredgeneric1.iob b/objects/mushroom-red/RMush1.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric1.iob rename to objects/mushroom-red/RMush1.iob diff --git a/objects/trees/mushroom/xredgeneric2.iob b/objects/mushroom-red/RMush10.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric2.iob rename to objects/mushroom-red/RMush10.iob diff --git a/objects/trees/mushroom/xredgeneric3.iob b/objects/mushroom-red/RMush2.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric3.iob rename to objects/mushroom-red/RMush2.iob diff --git a/objects/trees/mushroom/xredgeneric4.iob b/objects/mushroom-red/RMush3.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric4.iob rename to objects/mushroom-red/RMush3.iob diff --git a/objects/trees/mushroom/xredgeneric5.iob b/objects/mushroom-red/RMush4.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric5.iob rename to objects/mushroom-red/RMush4.iob diff --git a/objects/trees/mushroom/xredgeneric6.iob b/objects/mushroom-red/RMush5.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric6.iob rename to objects/mushroom-red/RMush5.iob diff --git a/objects/trees/mushroom/xredgeneric7.iob b/objects/mushroom-red/RMush6.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric7.iob rename to objects/mushroom-red/RMush6.iob diff --git a/objects/trees/mushroom/xredgeneric8.iob b/objects/mushroom-red/RMush7.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric8.iob rename to objects/mushroom-red/RMush7.iob diff --git a/objects/trees/mushroom/xredgeneric9.iob b/objects/mushroom-red/RMush8.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric9.iob rename to objects/mushroom-red/RMush8.iob diff --git a/objects/trees/mushroom/xredgeneric10.iob b/objects/mushroom-red/RMush9.iob similarity index 100% rename from objects/trees/mushroom/xredgeneric10.iob rename to objects/mushroom-red/RMush9.iob diff --git a/objects/trees/mushroom/fantasygenericred1.iob b/objects/mushroom-red/fantasy_mushroom_red1.iob similarity index 100% rename from objects/trees/mushroom/fantasygenericred1.iob rename to objects/mushroom-red/fantasy_mushroom_red1.iob diff --git a/objects/trees/mushroom/fantasygenericred2.iob b/objects/mushroom-red/fantasy_mushroom_red2.iob similarity index 100% rename from objects/trees/mushroom/fantasygenericred2.iob rename to objects/mushroom-red/fantasy_mushroom_red2.iob diff --git a/objects/trees/mushroom/fantasygenericred3.iob b/objects/mushroom-red/fantasy_mushroom_red3.iob similarity index 100% rename from objects/trees/mushroom/fantasygenericred3.iob rename to objects/mushroom-red/fantasy_mushroom_red3.iob diff --git a/objects/trees/mushroom/fantasygenericred4.iob b/objects/mushroom-red/fantasy_mushroom_red4.iob similarity index 100% rename from objects/trees/mushroom/fantasygenericred4.iob rename to objects/mushroom-red/fantasy_mushroom_red4.iob diff --git a/objects/trees/mushroom/redlumotall1.iob b/objects/mushroom-red/illuminorganell-r-1.iob similarity index 100% rename from objects/trees/mushroom/redlumotall1.iob rename to objects/mushroom-red/illuminorganell-r-1.iob diff --git a/objects/trees/mushroom/redlumotall2.iob b/objects/mushroom-red/illuminorganell-r-10.iob similarity index 100% rename from objects/trees/mushroom/redlumotall2.iob rename to objects/mushroom-red/illuminorganell-r-10.iob diff --git a/objects/trees/mushroom/redlumotall3.iob b/objects/mushroom-red/illuminorganell-r-11.iob similarity index 100% rename from objects/trees/mushroom/redlumotall3.iob rename to objects/mushroom-red/illuminorganell-r-11.iob diff --git a/objects/trees/mushroom/redlumotall4.iob b/objects/mushroom-red/illuminorganell-r-2.iob similarity index 100% rename from objects/trees/mushroom/redlumotall4.iob rename to objects/mushroom-red/illuminorganell-r-2.iob diff --git a/objects/trees/mushroom/redlumotall5.iob b/objects/mushroom-red/illuminorganell-r-3.iob similarity index 100% rename from objects/trees/mushroom/redlumotall5.iob rename to objects/mushroom-red/illuminorganell-r-3.iob diff --git a/objects/trees/mushroom/redlumotall6.iob b/objects/mushroom-red/illuminorganell-r-4.iob similarity index 100% rename from objects/trees/mushroom/redlumotall6.iob rename to objects/mushroom-red/illuminorganell-r-4.iob diff --git a/objects/trees/mushroom/redlumotall7.iob b/objects/mushroom-red/illuminorganell-r-5.iob similarity index 100% rename from objects/trees/mushroom/redlumotall7.iob rename to objects/mushroom-red/illuminorganell-r-5.iob diff --git a/objects/trees/mushroom/redlumotall8.iob b/objects/mushroom-red/illuminorganell-r-6.iob similarity index 100% rename from objects/trees/mushroom/redlumotall8.iob rename to objects/mushroom-red/illuminorganell-r-6.iob diff --git a/objects/trees/mushroom/redlumotall9.iob b/objects/mushroom-red/illuminorganell-r-7.iob similarity index 100% rename from objects/trees/mushroom/redlumotall9.iob rename to objects/mushroom-red/illuminorganell-r-7.iob diff --git a/objects/trees/mushroom/redlumotall10.iob b/objects/mushroom-red/illuminorganell-r-8.iob similarity index 100% rename from objects/trees/mushroom/redlumotall10.iob rename to objects/mushroom-red/illuminorganell-r-8.iob diff --git a/objects/trees/mushroom/redlumotall11.iob b/objects/mushroom-red/illuminorganell-r-9.iob similarity index 100% rename from objects/trees/mushroom/redlumotall11.iob rename to objects/mushroom-red/illuminorganell-r-9.iob diff --git a/objects/trees/mushroom/browngeneric1.iob b/objects/mushroom-red/organell-b-1.iob similarity index 100% rename from objects/trees/mushroom/browngeneric1.iob rename to objects/mushroom-red/organell-b-1.iob diff --git a/objects/trees/mushroom/browngeneric2.iob b/objects/mushroom-red/organell-b-2.iob similarity index 100% rename from objects/trees/mushroom/browngeneric2.iob rename to objects/mushroom-red/organell-b-2.iob diff --git a/objects/trees/mushroom/redgeneric1.iob b/objects/mushroom-red/organell-r-1.iob similarity index 100% rename from objects/trees/mushroom/redgeneric1.iob rename to objects/mushroom-red/organell-r-1.iob diff --git a/objects/trees/mushroom/redgeneric2.iob b/objects/mushroom-red/organell-r-10.iob similarity index 100% rename from objects/trees/mushroom/redgeneric2.iob rename to objects/mushroom-red/organell-r-10.iob diff --git a/objects/trees/mushroom/redgeneric3.iob b/objects/mushroom-red/organell-r-11.iob similarity index 100% rename from objects/trees/mushroom/redgeneric3.iob rename to objects/mushroom-red/organell-r-11.iob diff --git a/objects/trees/mushroom/redgeneric4.iob b/objects/mushroom-red/organell-r-2.iob similarity index 100% rename from objects/trees/mushroom/redgeneric4.iob rename to objects/mushroom-red/organell-r-2.iob diff --git a/objects/trees/mushroom/redgeneric5.iob b/objects/mushroom-red/organell-r-3.iob similarity index 100% rename from objects/trees/mushroom/redgeneric5.iob rename to objects/mushroom-red/organell-r-3.iob diff --git a/objects/trees/mushroom/redgeneric6.iob b/objects/mushroom-red/organell-r-4.iob similarity index 100% rename from objects/trees/mushroom/redgeneric6.iob rename to objects/mushroom-red/organell-r-4.iob diff --git a/objects/trees/mushroom/redgeneric7.iob b/objects/mushroom-red/organell-r-5.iob similarity index 100% rename from objects/trees/mushroom/redgeneric7.iob rename to objects/mushroom-red/organell-r-5.iob diff --git a/objects/trees/mushroom/redgeneric8.iob b/objects/mushroom-red/organell-r-6.iob similarity index 100% rename from objects/trees/mushroom/redgeneric8.iob rename to objects/mushroom-red/organell-r-6.iob diff --git a/objects/trees/mushroom/redgeneric9.iob b/objects/mushroom-red/organell-r-7.iob similarity index 100% rename from objects/trees/mushroom/redgeneric9.iob rename to objects/mushroom-red/organell-r-7.iob diff --git a/objects/trees/mushroom/redgeneric10.iob b/objects/mushroom-red/organell-r-8.iob similarity index 100% rename from objects/trees/mushroom/redgeneric10.iob rename to objects/mushroom-red/organell-r-8.iob diff --git a/objects/trees/mushroom/redgeneric11.iob b/objects/mushroom-red/organell-r-9.iob similarity index 100% rename from objects/trees/mushroom/redgeneric11.iob rename to objects/mushroom-red/organell-r-9.iob diff --git a/objects/trees/mushroom/mushclut1.iob b/objects/mushroom-red/small-organell-r-1.iob similarity index 100% rename from objects/trees/mushroom/mushclut1.iob rename to objects/mushroom-red/small-organell-r-1.iob diff --git a/objects/trees/mushroom/mushclut2.iob b/objects/mushroom-red/small-organell-r-10.iob similarity index 100% rename from objects/trees/mushroom/mushclut2.iob rename to objects/mushroom-red/small-organell-r-10.iob diff --git a/objects/trees/mushroom/mushclut3.iob b/objects/mushroom-red/small-organell-r-2.iob similarity index 100% rename from objects/trees/mushroom/mushclut3.iob rename to objects/mushroom-red/small-organell-r-2.iob diff --git a/objects/trees/mushroom/mushclut4.iob b/objects/mushroom-red/small-organell-r-3.iob similarity index 100% rename from objects/trees/mushroom/mushclut4.iob rename to objects/mushroom-red/small-organell-r-3.iob diff --git a/objects/trees/mushroom/mushclut5.iob b/objects/mushroom-red/small-organell-r-4.iob similarity index 100% rename from objects/trees/mushroom/mushclut5.iob rename to objects/mushroom-red/small-organell-r-4.iob diff --git a/objects/trees/mushroom/mushclut6.iob b/objects/mushroom-red/small-organell-r-5.iob similarity index 100% rename from objects/trees/mushroom/mushclut6.iob rename to objects/mushroom-red/small-organell-r-5.iob diff --git a/objects/trees/mushroom/mushclut7.iob b/objects/mushroom-red/small-organell-r-6.iob similarity index 100% rename from objects/trees/mushroom/mushclut7.iob rename to objects/mushroom-red/small-organell-r-6.iob diff --git a/objects/trees/mushroom/mushclut8.iob b/objects/mushroom-red/small-organell-r-7.iob similarity index 100% rename from objects/trees/mushroom/mushclut8.iob rename to objects/mushroom-red/small-organell-r-7.iob diff --git a/objects/trees/mushroom/mushclut9.iob b/objects/mushroom-red/small-organell-r-8.iob similarity index 100% rename from objects/trees/mushroom/mushclut9.iob rename to objects/mushroom-red/small-organell-r-8.iob diff --git a/objects/trees/mushroom/mushclut10.iob b/objects/mushroom-red/small-organell-r-9.iob similarity index 100% rename from objects/trees/mushroom/mushclut10.iob rename to objects/mushroom-red/small-organell-r-9.iob diff --git a/objects/mystic-trees/dotree1.iob b/objects/mystic-trees/dotree1.iob new file mode 100644 index 00000000..ca153802 Binary files /dev/null and b/objects/mystic-trees/dotree1.iob differ diff --git a/objects/mystic-trees/dotree10.iob b/objects/mystic-trees/dotree10.iob new file mode 100644 index 00000000..f7c92f6d Binary files /dev/null and b/objects/mystic-trees/dotree10.iob differ diff --git a/objects/mystic-trees/dotree2.iob b/objects/mystic-trees/dotree2.iob new file mode 100644 index 00000000..070cac5f Binary files /dev/null and b/objects/mystic-trees/dotree2.iob differ diff --git a/objects/mystic-trees/dotree3.iob b/objects/mystic-trees/dotree3.iob new file mode 100644 index 00000000..79d29f17 Binary files /dev/null and b/objects/mystic-trees/dotree3.iob differ diff --git a/objects/mystic-trees/dotree4.iob b/objects/mystic-trees/dotree4.iob new file mode 100644 index 00000000..25c9f1cd Binary files /dev/null and b/objects/mystic-trees/dotree4.iob differ diff --git a/objects/mystic-trees/dotree5.iob b/objects/mystic-trees/dotree5.iob new file mode 100644 index 00000000..8cf59d4c Binary files /dev/null and b/objects/mystic-trees/dotree5.iob differ diff --git a/objects/mystic-trees/dotree6.iob b/objects/mystic-trees/dotree6.iob new file mode 100644 index 00000000..e3634ab6 Binary files /dev/null and b/objects/mystic-trees/dotree6.iob differ diff --git a/objects/mystic-trees/dotree7.iob b/objects/mystic-trees/dotree7.iob new file mode 100644 index 00000000..3ab1fd3a Binary files /dev/null and b/objects/mystic-trees/dotree7.iob differ diff --git a/objects/mystic-trees/dotree8.iob b/objects/mystic-trees/dotree8.iob new file mode 100644 index 00000000..2a2aa782 Binary files /dev/null and b/objects/mystic-trees/dotree8.iob differ diff --git a/objects/mystic-trees/dotree9.iob b/objects/mystic-trees/dotree9.iob new file mode 100644 index 00000000..240c88b4 Binary files /dev/null and b/objects/mystic-trees/dotree9.iob differ diff --git a/objects/nether_fossils/fossil_1.iob b/objects/nether_fossils/fossil_1.iob new file mode 100644 index 00000000..ef326541 Binary files /dev/null and b/objects/nether_fossils/fossil_1.iob differ diff --git a/objects/nether_fossils/fossil_10.iob b/objects/nether_fossils/fossil_10.iob new file mode 100644 index 00000000..c7fbcd1d Binary files /dev/null and b/objects/nether_fossils/fossil_10.iob differ diff --git a/objects/nether_fossils/fossil_11.iob b/objects/nether_fossils/fossil_11.iob new file mode 100644 index 00000000..276b8009 Binary files /dev/null and b/objects/nether_fossils/fossil_11.iob differ diff --git a/objects/nether_fossils/fossil_12.iob b/objects/nether_fossils/fossil_12.iob new file mode 100644 index 00000000..9d899227 Binary files /dev/null and b/objects/nether_fossils/fossil_12.iob differ diff --git a/objects/nether_fossils/fossil_13.iob b/objects/nether_fossils/fossil_13.iob new file mode 100644 index 00000000..8a639b2c Binary files /dev/null and b/objects/nether_fossils/fossil_13.iob differ diff --git a/objects/nether_fossils/fossil_14.iob b/objects/nether_fossils/fossil_14.iob new file mode 100644 index 00000000..41de28f7 Binary files /dev/null and b/objects/nether_fossils/fossil_14.iob differ diff --git a/objects/nether_fossils/fossil_2.iob b/objects/nether_fossils/fossil_2.iob new file mode 100644 index 00000000..d5173feb Binary files /dev/null and b/objects/nether_fossils/fossil_2.iob differ diff --git a/objects/nether_fossils/fossil_3.iob b/objects/nether_fossils/fossil_3.iob new file mode 100644 index 00000000..becc3bc3 Binary files /dev/null and b/objects/nether_fossils/fossil_3.iob differ diff --git a/objects/nether_fossils/fossil_4.iob b/objects/nether_fossils/fossil_4.iob new file mode 100644 index 00000000..10d7aff9 Binary files /dev/null and b/objects/nether_fossils/fossil_4.iob differ diff --git a/objects/nether_fossils/fossil_5.iob b/objects/nether_fossils/fossil_5.iob new file mode 100644 index 00000000..49f7cc92 Binary files /dev/null and b/objects/nether_fossils/fossil_5.iob differ diff --git a/objects/nether_fossils/fossil_6.iob b/objects/nether_fossils/fossil_6.iob new file mode 100644 index 00000000..4504dd4f Binary files /dev/null and b/objects/nether_fossils/fossil_6.iob differ diff --git a/objects/nether_fossils/fossil_7.iob b/objects/nether_fossils/fossil_7.iob new file mode 100644 index 00000000..3ae919f5 Binary files /dev/null and b/objects/nether_fossils/fossil_7.iob differ diff --git a/objects/nether_fossils/fossil_8.iob b/objects/nether_fossils/fossil_8.iob new file mode 100644 index 00000000..082aa83c Binary files /dev/null and b/objects/nether_fossils/fossil_8.iob differ diff --git a/objects/nether_fossils/fossil_9.iob b/objects/nether_fossils/fossil_9.iob new file mode 100644 index 00000000..5b7ea6c3 Binary files /dev/null and b/objects/nether_fossils/fossil_9.iob differ diff --git a/objects/oak-bush/bush1.iob b/objects/oak-bush/bush1.iob new file mode 100644 index 00000000..ed85f0e8 Binary files /dev/null and b/objects/oak-bush/bush1.iob differ diff --git a/objects/oak-bush/bush2.iob b/objects/oak-bush/bush2.iob new file mode 100644 index 00000000..2d804b4d Binary files /dev/null and b/objects/oak-bush/bush2.iob differ diff --git a/objects/oak-bush/bush3.iob b/objects/oak-bush/bush3.iob new file mode 100644 index 00000000..1d2d8a46 Binary files /dev/null and b/objects/oak-bush/bush3.iob differ diff --git a/objects/oak-bush/bush4.iob b/objects/oak-bush/bush4.iob new file mode 100644 index 00000000..6b352647 Binary files /dev/null and b/objects/oak-bush/bush4.iob differ diff --git a/objects/trees/oak/smfallen1.iob b/objects/oak-fallen-massive/oak1.iob similarity index 100% rename from objects/trees/oak/smfallen1.iob rename to objects/oak-fallen-massive/oak1.iob diff --git a/objects/oak-log/log1.iob b/objects/oak-log/log1.iob new file mode 100644 index 00000000..223268fb Binary files /dev/null and b/objects/oak-log/log1.iob differ diff --git a/objects/oak-log/log2.iob b/objects/oak-log/log2.iob new file mode 100644 index 00000000..35f5c061 Binary files /dev/null and b/objects/oak-log/log2.iob differ diff --git a/objects/oak-log/log3.iob b/objects/oak-log/log3.iob new file mode 100644 index 00000000..12f8b574 Binary files /dev/null and b/objects/oak-log/log3.iob differ diff --git a/objects/trees/oak/massivegeneric1.iob b/objects/oak-massive/oak1.iob similarity index 100% rename from objects/trees/oak/massivegeneric1.iob rename to objects/oak-massive/oak1.iob diff --git a/objects/trees/oak/massivegeneric2.iob b/objects/oak-massive/oak2.iob similarity index 100% rename from objects/trees/oak/massivegeneric2.iob rename to objects/oak-massive/oak2.iob diff --git a/objects/trees/oak/massivegeneric3.iob b/objects/oak-massive/oak3.iob similarity index 100% rename from objects/trees/oak/massivegeneric3.iob rename to objects/oak-massive/oak3.iob diff --git a/objects/trees/oak/denmyre1.iob b/objects/oak-medium/oak-denmyre-1.iob similarity index 100% rename from objects/trees/oak/denmyre1.iob rename to objects/oak-medium/oak-denmyre-1.iob diff --git a/objects/trees/oak/denmyre2.iob b/objects/oak-medium/oak-denmyre-10.iob similarity index 100% rename from objects/trees/oak/denmyre2.iob rename to objects/oak-medium/oak-denmyre-10.iob diff --git a/objects/trees/oak/denmyre3.iob b/objects/oak-medium/oak-denmyre-11.iob similarity index 100% rename from objects/trees/oak/denmyre3.iob rename to objects/oak-medium/oak-denmyre-11.iob diff --git a/objects/trees/oak/denmyre4.iob b/objects/oak-medium/oak-denmyre-12.iob similarity index 100% rename from objects/trees/oak/denmyre4.iob rename to objects/oak-medium/oak-denmyre-12.iob diff --git a/objects/trees/oak/denmyre5.iob b/objects/oak-medium/oak-denmyre-13.iob similarity index 100% rename from objects/trees/oak/denmyre5.iob rename to objects/oak-medium/oak-denmyre-13.iob diff --git a/objects/trees/oak/denmyre6.iob b/objects/oak-medium/oak-denmyre-14.iob similarity index 100% rename from objects/trees/oak/denmyre6.iob rename to objects/oak-medium/oak-denmyre-14.iob diff --git a/objects/trees/oak/denmyre7.iob b/objects/oak-medium/oak-denmyre-15.iob similarity index 100% rename from objects/trees/oak/denmyre7.iob rename to objects/oak-medium/oak-denmyre-15.iob diff --git a/objects/trees/oak/denmyre8.iob b/objects/oak-medium/oak-denmyre-16.iob similarity index 100% rename from objects/trees/oak/denmyre8.iob rename to objects/oak-medium/oak-denmyre-16.iob diff --git a/objects/trees/oak/denmyre9.iob b/objects/oak-medium/oak-denmyre-2.iob similarity index 100% rename from objects/trees/oak/denmyre9.iob rename to objects/oak-medium/oak-denmyre-2.iob diff --git a/objects/trees/oak/denmyre10.iob b/objects/oak-medium/oak-denmyre-3.iob similarity index 100% rename from objects/trees/oak/denmyre10.iob rename to objects/oak-medium/oak-denmyre-3.iob diff --git a/objects/trees/oak/denmyre11.iob b/objects/oak-medium/oak-denmyre-4.iob similarity index 100% rename from objects/trees/oak/denmyre11.iob rename to objects/oak-medium/oak-denmyre-4.iob diff --git a/objects/trees/oak/denmyre12.iob b/objects/oak-medium/oak-denmyre-5.iob similarity index 100% rename from objects/trees/oak/denmyre12.iob rename to objects/oak-medium/oak-denmyre-5.iob diff --git a/objects/trees/oak/denmyre13.iob b/objects/oak-medium/oak-denmyre-6.iob similarity index 100% rename from objects/trees/oak/denmyre13.iob rename to objects/oak-medium/oak-denmyre-6.iob diff --git a/objects/trees/oak/denmyre14.iob b/objects/oak-medium/oak-denmyre-7.iob similarity index 100% rename from objects/trees/oak/denmyre14.iob rename to objects/oak-medium/oak-denmyre-7.iob diff --git a/objects/trees/oak/denmyre15.iob b/objects/oak-medium/oak-denmyre-8.iob similarity index 100% rename from objects/trees/oak/denmyre15.iob rename to objects/oak-medium/oak-denmyre-8.iob diff --git a/objects/trees/oak/denmyre16.iob b/objects/oak-medium/oak-denmyre-9.iob similarity index 100% rename from objects/trees/oak/denmyre16.iob rename to objects/oak-medium/oak-denmyre-9.iob diff --git a/objects/trees/oak/truegeneric21.iob b/objects/oak-medium/oak1.iob similarity index 100% rename from objects/trees/oak/truegeneric21.iob rename to objects/oak-medium/oak1.iob diff --git a/objects/trees/oak/truegeneric22.iob b/objects/oak-medium/oak2.iob similarity index 100% rename from objects/trees/oak/truegeneric22.iob rename to objects/oak-medium/oak2.iob diff --git a/objects/trees/oak/truegeneric23.iob b/objects/oak-medium/oak3.iob similarity index 100% rename from objects/trees/oak/truegeneric23.iob rename to objects/oak-medium/oak3.iob diff --git a/objects/trees/oak/truegeneric24.iob b/objects/oak-medium/oak5.iob similarity index 100% rename from objects/trees/oak/truegeneric24.iob rename to objects/oak-medium/oak5.iob diff --git a/objects/trees/oak/lponderosa1.iob b/objects/oak-ponderosa/large-1.iob similarity index 100% rename from objects/trees/oak/lponderosa1.iob rename to objects/oak-ponderosa/large-1.iob diff --git a/objects/trees/oak/lponderosa2.iob b/objects/oak-ponderosa/large-10.iob similarity index 100% rename from objects/trees/oak/lponderosa2.iob rename to objects/oak-ponderosa/large-10.iob diff --git a/objects/trees/oak/lponderosa3.iob b/objects/oak-ponderosa/large-11.iob similarity index 100% rename from objects/trees/oak/lponderosa3.iob rename to objects/oak-ponderosa/large-11.iob diff --git a/objects/trees/oak/lponderosa4.iob b/objects/oak-ponderosa/large-12.iob similarity index 100% rename from objects/trees/oak/lponderosa4.iob rename to objects/oak-ponderosa/large-12.iob diff --git a/objects/trees/oak/lponderosa5.iob b/objects/oak-ponderosa/large-13.iob similarity index 100% rename from objects/trees/oak/lponderosa5.iob rename to objects/oak-ponderosa/large-13.iob diff --git a/objects/trees/oak/lponderosa6.iob b/objects/oak-ponderosa/large-14..iob similarity index 100% rename from objects/trees/oak/lponderosa6.iob rename to objects/oak-ponderosa/large-14..iob diff --git a/objects/trees/oak/lponderosa7.iob b/objects/oak-ponderosa/large-15.iob similarity index 100% rename from objects/trees/oak/lponderosa7.iob rename to objects/oak-ponderosa/large-15.iob diff --git a/objects/trees/oak/lponderosa8.iob b/objects/oak-ponderosa/large-2.iob similarity index 100% rename from objects/trees/oak/lponderosa8.iob rename to objects/oak-ponderosa/large-2.iob diff --git a/objects/trees/oak/lponderosa9.iob b/objects/oak-ponderosa/large-3.iob similarity index 100% rename from objects/trees/oak/lponderosa9.iob rename to objects/oak-ponderosa/large-3.iob diff --git a/objects/trees/oak/lponderosa10.iob b/objects/oak-ponderosa/large-4.iob similarity index 100% rename from objects/trees/oak/lponderosa10.iob rename to objects/oak-ponderosa/large-4.iob diff --git a/objects/trees/oak/lponderosa11.iob b/objects/oak-ponderosa/large-5.iob similarity index 100% rename from objects/trees/oak/lponderosa11.iob rename to objects/oak-ponderosa/large-5.iob diff --git a/objects/trees/oak/lponderosa12.iob b/objects/oak-ponderosa/large-6.iob similarity index 100% rename from objects/trees/oak/lponderosa12.iob rename to objects/oak-ponderosa/large-6.iob diff --git a/objects/trees/oak/lponderosa13.iob b/objects/oak-ponderosa/large-7.iob similarity index 100% rename from objects/trees/oak/lponderosa13.iob rename to objects/oak-ponderosa/large-7.iob diff --git a/objects/trees/oak/lponderosa14.iob b/objects/oak-ponderosa/large-8.iob similarity index 100% rename from objects/trees/oak/lponderosa14.iob rename to objects/oak-ponderosa/large-8.iob diff --git a/objects/trees/oak/lponderosa15.iob b/objects/oak-ponderosa/large-9.iob similarity index 100% rename from objects/trees/oak/lponderosa15.iob rename to objects/oak-ponderosa/large-9.iob diff --git a/objects/trees/oak/mponderosa1.iob b/objects/oak-ponderosa/med-1.iob similarity index 100% rename from objects/trees/oak/mponderosa1.iob rename to objects/oak-ponderosa/med-1.iob diff --git a/objects/trees/oak/mponderosa2.iob b/objects/oak-ponderosa/med-10.iob similarity index 100% rename from objects/trees/oak/mponderosa2.iob rename to objects/oak-ponderosa/med-10.iob diff --git a/objects/trees/oak/mponderosa3.iob b/objects/oak-ponderosa/med-11.iob similarity index 100% rename from objects/trees/oak/mponderosa3.iob rename to objects/oak-ponderosa/med-11.iob diff --git a/objects/trees/oak/mponderosa4.iob b/objects/oak-ponderosa/med-12.iob similarity index 100% rename from objects/trees/oak/mponderosa4.iob rename to objects/oak-ponderosa/med-12.iob diff --git a/objects/trees/oak/mponderosa5.iob b/objects/oak-ponderosa/med-13.iob similarity index 100% rename from objects/trees/oak/mponderosa5.iob rename to objects/oak-ponderosa/med-13.iob diff --git a/objects/trees/oak/mponderosa6.iob b/objects/oak-ponderosa/med-14.iob similarity index 100% rename from objects/trees/oak/mponderosa6.iob rename to objects/oak-ponderosa/med-14.iob diff --git a/objects/trees/oak/mponderosa7.iob b/objects/oak-ponderosa/med-15.iob similarity index 100% rename from objects/trees/oak/mponderosa7.iob rename to objects/oak-ponderosa/med-15.iob diff --git a/objects/trees/oak/mponderosa8.iob b/objects/oak-ponderosa/med-16.iob similarity index 100% rename from objects/trees/oak/mponderosa8.iob rename to objects/oak-ponderosa/med-16.iob diff --git a/objects/trees/oak/mponderosa9.iob b/objects/oak-ponderosa/med-17.iob similarity index 100% rename from objects/trees/oak/mponderosa9.iob rename to objects/oak-ponderosa/med-17.iob diff --git a/objects/trees/oak/mponderosa10.iob b/objects/oak-ponderosa/med-18.iob similarity index 100% rename from objects/trees/oak/mponderosa10.iob rename to objects/oak-ponderosa/med-18.iob diff --git a/objects/trees/oak/mponderosa11.iob b/objects/oak-ponderosa/med-19.iob similarity index 100% rename from objects/trees/oak/mponderosa11.iob rename to objects/oak-ponderosa/med-19.iob diff --git a/objects/trees/oak/mponderosa12.iob b/objects/oak-ponderosa/med-2.iob similarity index 100% rename from objects/trees/oak/mponderosa12.iob rename to objects/oak-ponderosa/med-2.iob diff --git a/objects/trees/oak/mponderosa13.iob b/objects/oak-ponderosa/med-20.iob similarity index 100% rename from objects/trees/oak/mponderosa13.iob rename to objects/oak-ponderosa/med-20.iob diff --git a/objects/trees/oak/mponderosa14.iob b/objects/oak-ponderosa/med-3.iob similarity index 100% rename from objects/trees/oak/mponderosa14.iob rename to objects/oak-ponderosa/med-3.iob diff --git a/objects/trees/oak/mponderosa15.iob b/objects/oak-ponderosa/med-4.iob similarity index 100% rename from objects/trees/oak/mponderosa15.iob rename to objects/oak-ponderosa/med-4.iob diff --git a/objects/trees/oak/mponderosa16.iob b/objects/oak-ponderosa/med-5.iob similarity index 100% rename from objects/trees/oak/mponderosa16.iob rename to objects/oak-ponderosa/med-5.iob diff --git a/objects/trees/oak/mponderosa17.iob b/objects/oak-ponderosa/med-6.iob similarity index 100% rename from objects/trees/oak/mponderosa17.iob rename to objects/oak-ponderosa/med-6.iob diff --git a/objects/trees/oak/mponderosa18.iob b/objects/oak-ponderosa/med-7.iob similarity index 100% rename from objects/trees/oak/mponderosa18.iob rename to objects/oak-ponderosa/med-7.iob diff --git a/objects/trees/oak/mponderosa19.iob b/objects/oak-ponderosa/med-8.iob similarity index 100% rename from objects/trees/oak/mponderosa19.iob rename to objects/oak-ponderosa/med-8.iob diff --git a/objects/trees/oak/mponderosa20.iob b/objects/oak-ponderosa/med-9.iob similarity index 100% rename from objects/trees/oak/mponderosa20.iob rename to objects/oak-ponderosa/med-9.iob diff --git a/objects/trees/oak/sponderosa1.iob b/objects/oak-ponderosa/smol-1.iob similarity index 100% rename from objects/trees/oak/sponderosa1.iob rename to objects/oak-ponderosa/smol-1.iob diff --git a/objects/trees/oak/sponderosa2.iob b/objects/oak-ponderosa/smol-10.iob similarity index 100% rename from objects/trees/oak/sponderosa2.iob rename to objects/oak-ponderosa/smol-10.iob diff --git a/objects/trees/oak/sponderosa3.iob b/objects/oak-ponderosa/smol-11.iob similarity index 100% rename from objects/trees/oak/sponderosa3.iob rename to objects/oak-ponderosa/smol-11.iob diff --git a/objects/trees/oak/sponderosa4.iob b/objects/oak-ponderosa/smol-12.iob similarity index 100% rename from objects/trees/oak/sponderosa4.iob rename to objects/oak-ponderosa/smol-12.iob diff --git a/objects/trees/oak/sponderosa5.iob b/objects/oak-ponderosa/smol-13.iob similarity index 100% rename from objects/trees/oak/sponderosa5.iob rename to objects/oak-ponderosa/smol-13.iob diff --git a/objects/trees/oak/sponderosa6.iob b/objects/oak-ponderosa/smol-14.iob similarity index 100% rename from objects/trees/oak/sponderosa6.iob rename to objects/oak-ponderosa/smol-14.iob diff --git a/objects/trees/oak/sponderosa7.iob b/objects/oak-ponderosa/smol-15.iob similarity index 100% rename from objects/trees/oak/sponderosa7.iob rename to objects/oak-ponderosa/smol-15.iob diff --git a/objects/trees/oak/sponderosa8.iob b/objects/oak-ponderosa/smol-2.iob similarity index 100% rename from objects/trees/oak/sponderosa8.iob rename to objects/oak-ponderosa/smol-2.iob diff --git a/objects/trees/oak/sponderosa9.iob b/objects/oak-ponderosa/smol-3.iob similarity index 100% rename from objects/trees/oak/sponderosa9.iob rename to objects/oak-ponderosa/smol-3.iob diff --git a/objects/trees/oak/sponderosa10.iob b/objects/oak-ponderosa/smol-4.iob similarity index 100% rename from objects/trees/oak/sponderosa10.iob rename to objects/oak-ponderosa/smol-4.iob diff --git a/objects/trees/oak/sponderosa11.iob b/objects/oak-ponderosa/smol-5.iob similarity index 100% rename from objects/trees/oak/sponderosa11.iob rename to objects/oak-ponderosa/smol-5.iob diff --git a/objects/trees/oak/sponderosa12.iob b/objects/oak-ponderosa/smol-6.iob similarity index 100% rename from objects/trees/oak/sponderosa12.iob rename to objects/oak-ponderosa/smol-6.iob diff --git a/objects/trees/oak/sponderosa13.iob b/objects/oak-ponderosa/smol-7.iob similarity index 100% rename from objects/trees/oak/sponderosa13.iob rename to objects/oak-ponderosa/smol-7.iob diff --git a/objects/trees/oak/sponderosa14.iob b/objects/oak-ponderosa/smol-8.iob similarity index 100% rename from objects/trees/oak/sponderosa14.iob rename to objects/oak-ponderosa/smol-8.iob diff --git a/objects/trees/oak/sponderosa15.iob b/objects/oak-ponderosa/smol-9.iob similarity index 100% rename from objects/trees/oak/sponderosa15.iob rename to objects/oak-ponderosa/smol-9.iob diff --git a/objects/trees/oak/smol1.iob b/objects/oak-small/oak1.iob similarity index 100% rename from objects/trees/oak/smol1.iob rename to objects/oak-small/oak1.iob diff --git a/objects/trees/oak/smol2.iob b/objects/oak-small/oak10.iob similarity index 100% rename from objects/trees/oak/smol2.iob rename to objects/oak-small/oak10.iob diff --git a/objects/trees/oak/smol3.iob b/objects/oak-small/oak11.iob similarity index 100% rename from objects/trees/oak/smol3.iob rename to objects/oak-small/oak11.iob diff --git a/objects/trees/oak/smol4.iob b/objects/oak-small/oak12.iob similarity index 100% rename from objects/trees/oak/smol4.iob rename to objects/oak-small/oak12.iob diff --git a/objects/trees/oak/smol5.iob b/objects/oak-small/oak13.iob similarity index 100% rename from objects/trees/oak/smol5.iob rename to objects/oak-small/oak13.iob diff --git a/objects/trees/oak/smol6.iob b/objects/oak-small/oak14.iob similarity index 100% rename from objects/trees/oak/smol6.iob rename to objects/oak-small/oak14.iob diff --git a/objects/trees/oak/smol7.iob b/objects/oak-small/oak15.iob similarity index 100% rename from objects/trees/oak/smol7.iob rename to objects/oak-small/oak15.iob diff --git a/objects/trees/oak/smol8.iob b/objects/oak-small/oak2.iob similarity index 100% rename from objects/trees/oak/smol8.iob rename to objects/oak-small/oak2.iob diff --git a/objects/trees/oak/smol9.iob b/objects/oak-small/oak3.iob similarity index 100% rename from objects/trees/oak/smol9.iob rename to objects/oak-small/oak3.iob diff --git a/objects/trees/oak/smol10.iob b/objects/oak-small/oak4.iob similarity index 100% rename from objects/trees/oak/smol10.iob rename to objects/oak-small/oak4.iob diff --git a/objects/trees/oak/smol11.iob b/objects/oak-small/oak5.iob similarity index 100% rename from objects/trees/oak/smol11.iob rename to objects/oak-small/oak5.iob diff --git a/objects/trees/oak/smol12.iob b/objects/oak-small/oak6.iob similarity index 100% rename from objects/trees/oak/smol12.iob rename to objects/oak-small/oak6.iob diff --git a/objects/trees/oak/smol13.iob b/objects/oak-small/oak7.iob similarity index 100% rename from objects/trees/oak/smol13.iob rename to objects/oak-small/oak7.iob diff --git a/objects/trees/oak/smol14.iob b/objects/oak-small/oak8.iob similarity index 100% rename from objects/trees/oak/smol14.iob rename to objects/oak-small/oak8.iob diff --git a/objects/trees/oak/smol15.iob b/objects/oak-small/oak9.iob similarity index 100% rename from objects/trees/oak/smol15.iob rename to objects/oak-small/oak9.iob diff --git a/objects/trees/oak/sloak1.iob b/objects/oak-superlarge/oak1.iob similarity index 100% rename from objects/trees/oak/sloak1.iob rename to objects/oak-superlarge/oak1.iob diff --git a/objects/trees/oak/smoak1.iob b/objects/oak-supermassive/oak1.iob similarity index 100% rename from objects/trees/oak/smoak1.iob rename to objects/oak-supermassive/oak1.iob diff --git a/objects/trees/oak/smtoak1.iob b/objects/oak-tainted-massive/oak1.iob similarity index 100% rename from objects/trees/oak/smtoak1.iob rename to objects/oak-tainted-massive/oak1.iob diff --git a/objects/trees/oak/toak1.iob b/objects/oak-tall/tall-oak1.iob similarity index 100% rename from objects/trees/oak/toak1.iob rename to objects/oak-tall/tall-oak1.iob diff --git a/objects/trees/oak/toak2.iob b/objects/oak-tall/tall-oak10.iob similarity index 100% rename from objects/trees/oak/toak2.iob rename to objects/oak-tall/tall-oak10.iob diff --git a/objects/trees/oak/toak3.iob b/objects/oak-tall/tall-oak11.iob similarity index 100% rename from objects/trees/oak/toak3.iob rename to objects/oak-tall/tall-oak11.iob diff --git a/objects/trees/oak/toak4.iob b/objects/oak-tall/tall-oak2.iob similarity index 100% rename from objects/trees/oak/toak4.iob rename to objects/oak-tall/tall-oak2.iob diff --git a/objects/trees/oak/toak5.iob b/objects/oak-tall/tall-oak3.iob similarity index 100% rename from objects/trees/oak/toak5.iob rename to objects/oak-tall/tall-oak3.iob diff --git a/objects/trees/oak/toak6.iob b/objects/oak-tall/tall-oak4.iob similarity index 100% rename from objects/trees/oak/toak6.iob rename to objects/oak-tall/tall-oak4.iob diff --git a/objects/trees/oak/toak7.iob b/objects/oak-tall/tall-oak5.iob similarity index 100% rename from objects/trees/oak/toak7.iob rename to objects/oak-tall/tall-oak5.iob diff --git a/objects/trees/oak/toak8.iob b/objects/oak-tall/tall-oak6.iob similarity index 100% rename from objects/trees/oak/toak8.iob rename to objects/oak-tall/tall-oak6.iob diff --git a/objects/trees/oak/toak9.iob b/objects/oak-tall/tall-oak7.iob similarity index 100% rename from objects/trees/oak/toak9.iob rename to objects/oak-tall/tall-oak7.iob diff --git a/objects/trees/oak/toak10.iob b/objects/oak-tall/tall-oak8.iob similarity index 100% rename from objects/trees/oak/toak10.iob rename to objects/oak-tall/tall-oak8.iob diff --git a/objects/trees/oak/toak11.iob b/objects/oak-tall/tall-oak9.iob similarity index 100% rename from objects/trees/oak/toak11.iob rename to objects/oak-tall/tall-oak9.iob diff --git a/objects/trees/oak/smwiltedoak1.iob b/objects/oak-wilted-supermassive/oak1.iob similarity index 100% rename from objects/trees/oak/smwiltedoak1.iob rename to objects/oak-wilted-supermassive/oak1.iob diff --git a/objects/trees/oak/truegeneric1.iob b/objects/oak/oak1.iob similarity index 100% rename from objects/trees/oak/truegeneric1.iob rename to objects/oak/oak1.iob diff --git a/objects/trees/oak/truegeneric18.iob b/objects/oak/oak10.iob similarity index 100% rename from objects/trees/oak/truegeneric18.iob rename to objects/oak/oak10.iob diff --git a/objects/trees/oak/truegeneric19.iob b/objects/oak/oak11.iob similarity index 100% rename from objects/trees/oak/truegeneric19.iob rename to objects/oak/oak11.iob diff --git a/objects/trees/oak/truegeneric20.iob b/objects/oak/oak12.iob similarity index 100% rename from objects/trees/oak/truegeneric20.iob rename to objects/oak/oak12.iob diff --git a/objects/trees/oak/truegeneric2.iob b/objects/oak/oak2.iob similarity index 100% rename from objects/trees/oak/truegeneric2.iob rename to objects/oak/oak2.iob diff --git a/objects/trees/oak/truegeneric3.iob b/objects/oak/oak3.iob similarity index 100% rename from objects/trees/oak/truegeneric3.iob rename to objects/oak/oak3.iob diff --git a/objects/trees/oak/truegeneric4.iob b/objects/oak/oak4.iob similarity index 100% rename from objects/trees/oak/truegeneric4.iob rename to objects/oak/oak4.iob diff --git a/objects/trees/oak/truegeneric5.iob b/objects/oak/oak5.iob similarity index 100% rename from objects/trees/oak/truegeneric5.iob rename to objects/oak/oak5.iob diff --git a/objects/trees/oak/truegeneric6.iob b/objects/oak/oak6.iob similarity index 100% rename from objects/trees/oak/truegeneric6.iob rename to objects/oak/oak6.iob diff --git a/objects/trees/oak/truegeneric12.iob b/objects/oak/oak7.iob similarity index 100% rename from objects/trees/oak/truegeneric12.iob rename to objects/oak/oak7.iob diff --git a/objects/trees/oak/truegeneric14.iob b/objects/oak/oak8.iob similarity index 100% rename from objects/trees/oak/truegeneric14.iob rename to objects/oak/oak8.iob diff --git a/objects/trees/oak/truegeneric15.iob b/objects/oak/oak9.iob similarity index 100% rename from objects/trees/oak/truegeneric15.iob rename to objects/oak/oak9.iob diff --git a/objects/oakbush-tclutter/TClutter1.iob b/objects/oakbush-tclutter/TClutter1.iob new file mode 100644 index 00000000..f650d1cd Binary files /dev/null and b/objects/oakbush-tclutter/TClutter1.iob differ diff --git a/objects/oakbush-tclutter/TClutter10.iob b/objects/oakbush-tclutter/TClutter10.iob new file mode 100644 index 00000000..ee6775b1 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter10.iob differ diff --git a/objects/oakbush-tclutter/TClutter11.iob b/objects/oakbush-tclutter/TClutter11.iob new file mode 100644 index 00000000..051775c1 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter11.iob differ diff --git a/objects/oakbush-tclutter/TClutter12.iob b/objects/oakbush-tclutter/TClutter12.iob new file mode 100644 index 00000000..e74e4e6d Binary files /dev/null and b/objects/oakbush-tclutter/TClutter12.iob differ diff --git a/objects/oakbush-tclutter/TClutter13.iob b/objects/oakbush-tclutter/TClutter13.iob new file mode 100644 index 00000000..aa148b18 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter13.iob differ diff --git a/objects/oakbush-tclutter/TClutter14.iob b/objects/oakbush-tclutter/TClutter14.iob new file mode 100644 index 00000000..4fa7e1eb Binary files /dev/null and b/objects/oakbush-tclutter/TClutter14.iob differ diff --git a/objects/oakbush-tclutter/TClutter15.iob b/objects/oakbush-tclutter/TClutter15.iob new file mode 100644 index 00000000..5c967dc2 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter15.iob differ diff --git a/objects/oakbush-tclutter/TClutter16.iob b/objects/oakbush-tclutter/TClutter16.iob new file mode 100644 index 00000000..8b9616c6 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter16.iob differ diff --git a/objects/oakbush-tclutter/TClutter17.iob b/objects/oakbush-tclutter/TClutter17.iob new file mode 100644 index 00000000..96ef7763 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter17.iob differ diff --git a/objects/oakbush-tclutter/TClutter18.iob b/objects/oakbush-tclutter/TClutter18.iob new file mode 100644 index 00000000..d6a3c1d9 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter18.iob differ diff --git a/objects/oakbush-tclutter/TClutter19.iob b/objects/oakbush-tclutter/TClutter19.iob new file mode 100644 index 00000000..29050e54 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter19.iob differ diff --git a/objects/oakbush-tclutter/TClutter2.iob b/objects/oakbush-tclutter/TClutter2.iob new file mode 100644 index 00000000..c64d2e0a Binary files /dev/null and b/objects/oakbush-tclutter/TClutter2.iob differ diff --git a/objects/oakbush-tclutter/TClutter20.iob b/objects/oakbush-tclutter/TClutter20.iob new file mode 100644 index 00000000..59bf85c1 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter20.iob differ diff --git a/objects/oakbush-tclutter/TClutter21.iob b/objects/oakbush-tclutter/TClutter21.iob new file mode 100644 index 00000000..3435dafb Binary files /dev/null and b/objects/oakbush-tclutter/TClutter21.iob differ diff --git a/objects/oakbush-tclutter/TClutter22.iob b/objects/oakbush-tclutter/TClutter22.iob new file mode 100644 index 00000000..c443a267 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter22.iob differ diff --git a/objects/oakbush-tclutter/TClutter23.iob b/objects/oakbush-tclutter/TClutter23.iob new file mode 100644 index 00000000..2211ec21 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter23.iob differ diff --git a/objects/oakbush-tclutter/TClutter24.iob b/objects/oakbush-tclutter/TClutter24.iob new file mode 100644 index 00000000..8b5e47b4 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter24.iob differ diff --git a/objects/oakbush-tclutter/TClutter25.iob b/objects/oakbush-tclutter/TClutter25.iob new file mode 100644 index 00000000..3112547c Binary files /dev/null and b/objects/oakbush-tclutter/TClutter25.iob differ diff --git a/objects/oakbush-tclutter/TClutter3.iob b/objects/oakbush-tclutter/TClutter3.iob new file mode 100644 index 00000000..a9b50890 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter3.iob differ diff --git a/objects/oakbush-tclutter/TClutter4.iob b/objects/oakbush-tclutter/TClutter4.iob new file mode 100644 index 00000000..fb8f4400 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter4.iob differ diff --git a/objects/oakbush-tclutter/TClutter5.iob b/objects/oakbush-tclutter/TClutter5.iob new file mode 100644 index 00000000..085e5662 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter5.iob differ diff --git a/objects/oakbush-tclutter/TClutter6.iob b/objects/oakbush-tclutter/TClutter6.iob new file mode 100644 index 00000000..18884391 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter6.iob differ diff --git a/objects/oakbush-tclutter/TClutter7.iob b/objects/oakbush-tclutter/TClutter7.iob new file mode 100644 index 00000000..a2fce8c0 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter7.iob differ diff --git a/objects/oakbush-tclutter/TClutter8.iob b/objects/oakbush-tclutter/TClutter8.iob new file mode 100644 index 00000000..bdbe0e91 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter8.iob differ diff --git a/objects/oakbush-tclutter/TClutter9.iob b/objects/oakbush-tclutter/TClutter9.iob new file mode 100644 index 00000000..d9911fb6 Binary files /dev/null and b/objects/oakbush-tclutter/TClutter9.iob differ diff --git a/objects/oakbush-tgarb/TGarb1.iob b/objects/oakbush-tgarb/TGarb1.iob new file mode 100644 index 00000000..627d198b Binary files /dev/null and b/objects/oakbush-tgarb/TGarb1.iob differ diff --git a/objects/oakbush-tgarb/TGarb10.iob b/objects/oakbush-tgarb/TGarb10.iob new file mode 100644 index 00000000..4641d158 Binary files /dev/null and b/objects/oakbush-tgarb/TGarb10.iob differ diff --git a/objects/oakbush-tgarb/TGarb11.iob b/objects/oakbush-tgarb/TGarb11.iob new file mode 100644 index 00000000..36d9aceb Binary files /dev/null and b/objects/oakbush-tgarb/TGarb11.iob differ diff --git a/objects/oakbush-tgarb/TGarb12.iob b/objects/oakbush-tgarb/TGarb12.iob new file mode 100644 index 00000000..bd3272eb Binary files /dev/null and b/objects/oakbush-tgarb/TGarb12.iob differ diff --git a/objects/oakbush-tgarb/TGarb13.iob b/objects/oakbush-tgarb/TGarb13.iob new file mode 100644 index 00000000..3dd8f47b Binary files /dev/null and b/objects/oakbush-tgarb/TGarb13.iob differ diff --git a/objects/oakbush-tgarb/TGarb14.iob b/objects/oakbush-tgarb/TGarb14.iob new file mode 100644 index 00000000..3732f398 Binary files /dev/null and b/objects/oakbush-tgarb/TGarb14.iob differ diff --git a/objects/oakbush-tgarb/TGarb15.iob b/objects/oakbush-tgarb/TGarb15.iob new file mode 100644 index 00000000..0dad7399 Binary files /dev/null and b/objects/oakbush-tgarb/TGarb15.iob differ diff --git a/objects/oakbush-tgarb/TGarb16.iob b/objects/oakbush-tgarb/TGarb16.iob new file mode 100644 index 00000000..1370e97c Binary files /dev/null and b/objects/oakbush-tgarb/TGarb16.iob differ diff --git a/objects/oakbush-tgarb/TGarb17.iob b/objects/oakbush-tgarb/TGarb17.iob new file mode 100644 index 00000000..3d3952d9 Binary files /dev/null and b/objects/oakbush-tgarb/TGarb17.iob differ diff --git a/objects/oakbush-tgarb/TGarb18.iob b/objects/oakbush-tgarb/TGarb18.iob new file mode 100644 index 00000000..4615cc76 Binary files /dev/null and b/objects/oakbush-tgarb/TGarb18.iob differ diff --git a/objects/oakbush-tgarb/TGarb19.iob b/objects/oakbush-tgarb/TGarb19.iob new file mode 100644 index 00000000..064ffd0f Binary files /dev/null and b/objects/oakbush-tgarb/TGarb19.iob differ diff --git a/objects/oakbush-tgarb/TGarb2.iob b/objects/oakbush-tgarb/TGarb2.iob new file mode 100644 index 00000000..bbd2e7f0 Binary files /dev/null and b/objects/oakbush-tgarb/TGarb2.iob differ diff --git a/objects/oakbush-tgarb/TGarb20.iob b/objects/oakbush-tgarb/TGarb20.iob new file mode 100644 index 00000000..9c77e3ea Binary files /dev/null and b/objects/oakbush-tgarb/TGarb20.iob differ diff --git a/objects/oakbush-tgarb/TGarb3.iob b/objects/oakbush-tgarb/TGarb3.iob new file mode 100644 index 00000000..5903036a Binary files /dev/null and b/objects/oakbush-tgarb/TGarb3.iob differ diff --git a/objects/oakbush-tgarb/TGarb4.iob b/objects/oakbush-tgarb/TGarb4.iob new file mode 100644 index 00000000..42888577 Binary files /dev/null and b/objects/oakbush-tgarb/TGarb4.iob differ diff --git a/objects/oakbush-tgarb/TGarb5.iob b/objects/oakbush-tgarb/TGarb5.iob new file mode 100644 index 00000000..b0836606 Binary files /dev/null and b/objects/oakbush-tgarb/TGarb5.iob differ diff --git a/objects/oakbush-tgarb/TGarb6.iob b/objects/oakbush-tgarb/TGarb6.iob new file mode 100644 index 00000000..83a1617f Binary files /dev/null and b/objects/oakbush-tgarb/TGarb6.iob differ diff --git a/objects/oakbush-tgarb/TGarb7.iob b/objects/oakbush-tgarb/TGarb7.iob new file mode 100644 index 00000000..ee83fbf3 Binary files /dev/null and b/objects/oakbush-tgarb/TGarb7.iob differ diff --git a/objects/oakbush-tgarb/TGarb8.iob b/objects/oakbush-tgarb/TGarb8.iob new file mode 100644 index 00000000..e1ae1fcc Binary files /dev/null and b/objects/oakbush-tgarb/TGarb8.iob differ diff --git a/objects/oakbush-tgarb/TGarb9.iob b/objects/oakbush-tgarb/TGarb9.iob new file mode 100644 index 00000000..7c9c3b69 Binary files /dev/null and b/objects/oakbush-tgarb/TGarb9.iob differ diff --git a/objects/trees/sakura/genericsak1.iob b/objects/ob-sakura/sakura1.iob similarity index 100% rename from objects/trees/sakura/genericsak1.iob rename to objects/ob-sakura/sakura1.iob diff --git a/objects/trees/sakura/genericsak2.iob b/objects/ob-sakura/sakura2.iob similarity index 100% rename from objects/trees/sakura/genericsak2.iob rename to objects/ob-sakura/sakura2.iob diff --git a/objects/trees/sakura/genericsak3.iob b/objects/ob-sakura/sakura3.iob similarity index 100% rename from objects/trees/sakura/genericsak3.iob rename to objects/ob-sakura/sakura3.iob diff --git a/objects/trees/sakura/genericsak4.iob b/objects/ob-sakura/sakura4.iob similarity index 100% rename from objects/trees/sakura/genericsak4.iob rename to objects/ob-sakura/sakura4.iob diff --git a/objects/trees/sakura/genericsak5.iob b/objects/ob-sakura/sakura5.iob similarity index 100% rename from objects/trees/sakura/genericsak5.iob rename to objects/ob-sakura/sakura5.iob diff --git a/objects/ocean-ruins/ruin1.iob b/objects/ocean-ruins/ruin1.iob new file mode 100644 index 00000000..156bbfb4 Binary files /dev/null and b/objects/ocean-ruins/ruin1.iob differ diff --git a/objects/ocean-ruins/ruin2.iob b/objects/ocean-ruins/ruin2.iob new file mode 100644 index 00000000..f4fc167b Binary files /dev/null and b/objects/ocean-ruins/ruin2.iob differ diff --git a/objects/ocean-ruins/ruin3.iob b/objects/ocean-ruins/ruin3.iob new file mode 100644 index 00000000..bf5c9ad1 Binary files /dev/null and b/objects/ocean-ruins/ruin3.iob differ diff --git a/objects/other/ICEMush1.ish b/objects/other/ICEMush1.ish new file mode 100644 index 00000000..ec01a7fe Binary files /dev/null and b/objects/other/ICEMush1.ish differ diff --git a/objects/other/ICEMush2.ish b/objects/other/ICEMush2.ish new file mode 100644 index 00000000..3a9f6308 Binary files /dev/null and b/objects/other/ICEMush2.ish differ diff --git a/objects/other/ICEMush3.ish b/objects/other/ICEMush3.ish new file mode 100644 index 00000000..b4f98302 Binary files /dev/null and b/objects/other/ICEMush3.ish differ diff --git a/objects/other/ICEMush4.ish b/objects/other/ICEMush4.ish new file mode 100644 index 00000000..4f8e0c34 Binary files /dev/null and b/objects/other/ICEMush4.ish differ diff --git a/objects/other/ICEMush5.ish b/objects/other/ICEMush5.ish new file mode 100644 index 00000000..a24d25e1 Binary files /dev/null and b/objects/other/ICEMush5.ish differ diff --git a/objects/other/ICEMush6.ish b/objects/other/ICEMush6.ish new file mode 100644 index 00000000..9c79f868 Binary files /dev/null and b/objects/other/ICEMush6.ish differ diff --git a/objects/other/ICEMush7.ish b/objects/other/ICEMush7.ish new file mode 100644 index 00000000..5422bebc Binary files /dev/null and b/objects/other/ICEMush7.ish differ diff --git a/objects/other/ICEMush8.ish b/objects/other/ICEMush8.ish new file mode 100644 index 00000000..3d9f239a Binary files /dev/null and b/objects/other/ICEMush8.ish differ diff --git a/objects/other/ICEMush9.ish b/objects/other/ICEMush9.ish new file mode 100644 index 00000000..d7fc07d1 Binary files /dev/null and b/objects/other/ICEMush9.ish differ diff --git a/objects/other/IceSpire1.ish b/objects/other/IceSpire1.ish new file mode 100644 index 00000000..da62a698 Binary files /dev/null and b/objects/other/IceSpire1.ish differ diff --git a/objects/other/IceSpire2.ish b/objects/other/IceSpire2.ish new file mode 100644 index 00000000..2edc76be Binary files /dev/null and b/objects/other/IceSpire2.ish differ diff --git a/objects/other/IceSpire3.ish b/objects/other/IceSpire3.ish new file mode 100644 index 00000000..441b65ff Binary files /dev/null and b/objects/other/IceSpire3.ish differ diff --git a/objects/other/IceSpire4.ish b/objects/other/IceSpire4.ish new file mode 100644 index 00000000..655a4f2e Binary files /dev/null and b/objects/other/IceSpire4.ish differ diff --git a/objects/other/IceSpire5.ish b/objects/other/IceSpire5.ish new file mode 100644 index 00000000..6679c2b6 Binary files /dev/null and b/objects/other/IceSpire5.ish differ diff --git a/objects/other/IceSpire6.ish b/objects/other/IceSpire6.ish new file mode 100644 index 00000000..2ac3cfc4 Binary files /dev/null and b/objects/other/IceSpire6.ish differ diff --git a/objects/trees/jungle/spalm1.iob b/objects/palm-small/palm1.iob similarity index 100% rename from objects/trees/jungle/spalm1.iob rename to objects/palm-small/palm1.iob diff --git a/objects/trees/jungle/spalm2.iob b/objects/palm-small/palm2.iob similarity index 100% rename from objects/trees/jungle/spalm2.iob rename to objects/palm-small/palm2.iob diff --git a/objects/trees/jungle/spalm3.iob b/objects/palm-small/palm3.iob similarity index 100% rename from objects/trees/jungle/spalm3.iob rename to objects/palm-small/palm3.iob diff --git a/objects/trees/jungle/spalm4.iob b/objects/palm-small/palm4.iob similarity index 100% rename from objects/trees/jungle/spalm4.iob rename to objects/palm-small/palm4.iob diff --git a/objects/trees/jungle/spalm5.iob b/objects/palm-small/palm5.iob similarity index 100% rename from objects/trees/jungle/spalm5.iob rename to objects/palm-small/palm5.iob diff --git a/objects/trees/jungle/palm12.iob b/objects/palm/palm-4.iob similarity index 100% rename from objects/trees/jungle/palm12.iob rename to objects/palm/palm-4.iob diff --git a/objects/trees/jungle/palm13.iob b/objects/palm/palm-5.iob similarity index 100% rename from objects/trees/jungle/palm13.iob rename to objects/palm/palm-5.iob diff --git a/objects/trees/jungle/palm11.iob b/objects/palm/palm-6.iob similarity index 100% rename from objects/trees/jungle/palm11.iob rename to objects/palm/palm-6.iob diff --git a/objects/trees/jungle/palm10.iob b/objects/palm/palm-7.iob similarity index 100% rename from objects/trees/jungle/palm10.iob rename to objects/palm/palm-7.iob diff --git a/objects/trees/jungle/palm9.iob b/objects/palm/palm-8.iob similarity index 100% rename from objects/trees/jungle/palm9.iob rename to objects/palm/palm-8.iob diff --git a/objects/trees/jungle/palm1.iob b/objects/palm/palm1.iob similarity index 100% rename from objects/trees/jungle/palm1.iob rename to objects/palm/palm1.iob diff --git a/objects/trees/jungle/palm2.iob b/objects/palm/palm2.iob similarity index 100% rename from objects/trees/jungle/palm2.iob rename to objects/palm/palm2.iob diff --git a/objects/trees/jungle/palm3.iob b/objects/palm/palm3.iob similarity index 100% rename from objects/trees/jungle/palm3.iob rename to objects/palm/palm3.iob diff --git a/objects/trees/jungle/palm4.iob b/objects/palm/palm4.iob similarity index 100% rename from objects/trees/jungle/palm4.iob rename to objects/palm/palm4.iob diff --git a/objects/trees/jungle/palm5.iob b/objects/palm/palm5.iob similarity index 100% rename from objects/trees/jungle/palm5.iob rename to objects/palm/palm5.iob diff --git a/objects/trees/jungle/palm6.iob b/objects/palm/palm6.iob similarity index 100% rename from objects/trees/jungle/palm6.iob rename to objects/palm/palm6.iob diff --git a/objects/trees/jungle/palm7.iob b/objects/palm/palm7.iob similarity index 100% rename from objects/trees/jungle/palm7.iob rename to objects/palm/palm7.iob diff --git a/objects/trees/jungle/palm8.iob b/objects/palm/palm8.iob similarity index 100% rename from objects/trees/jungle/palm8.iob rename to objects/palm/palm8.iob diff --git a/objects/patch/graveldirt1.iob b/objects/patch/graveldirt1.iob new file mode 100644 index 00000000..aea69e03 Binary files /dev/null and b/objects/patch/graveldirt1.iob differ diff --git a/objects/patch/graveldirt2.iob b/objects/patch/graveldirt2.iob new file mode 100644 index 00000000..fa413bda Binary files /dev/null and b/objects/patch/graveldirt2.iob differ diff --git a/objects/patch/graveldirt3.iob b/objects/patch/graveldirt3.iob new file mode 100644 index 00000000..0c55caaf Binary files /dev/null and b/objects/patch/graveldirt3.iob differ diff --git a/objects/patch/graveldirt4.iob b/objects/patch/graveldirt4.iob new file mode 100644 index 00000000..85cc80da Binary files /dev/null and b/objects/patch/graveldirt4.iob differ diff --git a/objects/peaks/p1.iob b/objects/peaks/p1.iob new file mode 100644 index 00000000..ec9a80d2 Binary files /dev/null and b/objects/peaks/p1.iob differ diff --git a/objects/peaks/p2.iob b/objects/peaks/p2.iob new file mode 100644 index 00000000..b36abb9b Binary files /dev/null and b/objects/peaks/p2.iob differ diff --git a/objects/peaks/p3.iob b/objects/peaks/p3.iob new file mode 100644 index 00000000..dc87514e Binary files /dev/null and b/objects/peaks/p3.iob differ diff --git a/objects/peaks/p4.iob b/objects/peaks/p4.iob new file mode 100644 index 00000000..bf4ed700 Binary files /dev/null and b/objects/peaks/p4.iob differ diff --git a/objects/peaks/p5.iob b/objects/peaks/p5.iob new file mode 100644 index 00000000..ac3b21b4 Binary files /dev/null and b/objects/peaks/p5.iob differ diff --git a/objects/peaks/p6.iob b/objects/peaks/p6.iob new file mode 100644 index 00000000..22975d8a Binary files /dev/null and b/objects/peaks/p6.iob differ diff --git a/objects/jigsaw/pillager_outpost/base_plate.iob b/objects/pillager_outpost/base_plate.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/base_plate.iob rename to objects/pillager_outpost/base_plate.iob diff --git a/objects/jigsaw/pillager_outpost/feature_plate.iob b/objects/pillager_outpost/feature_plate.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/feature_plate.iob rename to objects/pillager_outpost/feature_plate.iob diff --git a/objects/jigsaw/pillager_outpost/overgrown/cage.iob b/objects/pillager_outpost/overgrown/cage.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/overgrown/cage.iob rename to objects/pillager_outpost/overgrown/cage.iob diff --git a/objects/jigsaw/pillager_outpost/overgrown/pumpkins1.iob b/objects/pillager_outpost/overgrown/pumpkins1.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/overgrown/pumpkins1.iob rename to objects/pillager_outpost/overgrown/pumpkins1.iob diff --git a/objects/jigsaw/pillager_outpost/overgrown/pumpkins2.iob b/objects/pillager_outpost/overgrown/pumpkins2.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/overgrown/pumpkins2.iob rename to objects/pillager_outpost/overgrown/pumpkins2.iob diff --git a/objects/jigsaw/pillager_outpost/overgrown/tent.iob b/objects/pillager_outpost/overgrown/tent.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/overgrown/tent.iob rename to objects/pillager_outpost/overgrown/tent.iob diff --git a/objects/jigsaw/pillager_outpost/regular/feature_cage1.iob b/objects/pillager_outpost/regular/feature_cage1.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/regular/feature_cage1.iob rename to objects/pillager_outpost/regular/feature_cage1.iob diff --git a/objects/jigsaw/pillager_outpost/regular/feature_cage2.iob b/objects/pillager_outpost/regular/feature_cage2.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/regular/feature_cage2.iob rename to objects/pillager_outpost/regular/feature_cage2.iob diff --git a/objects/jigsaw/pillager_outpost/regular/feature_logs.iob b/objects/pillager_outpost/regular/feature_logs.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/regular/feature_logs.iob rename to objects/pillager_outpost/regular/feature_logs.iob diff --git a/objects/jigsaw/pillager_outpost/regular/feature_targets.iob b/objects/pillager_outpost/regular/feature_targets.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/regular/feature_targets.iob rename to objects/pillager_outpost/regular/feature_targets.iob diff --git a/objects/jigsaw/pillager_outpost/regular/feature_tent1.iob b/objects/pillager_outpost/regular/feature_tent1.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/regular/feature_tent1.iob rename to objects/pillager_outpost/regular/feature_tent1.iob diff --git a/objects/jigsaw/pillager_outpost/regular/feature_tent2.iob b/objects/pillager_outpost/regular/feature_tent2.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/regular/feature_tent2.iob rename to objects/pillager_outpost/regular/feature_tent2.iob diff --git a/objects/jigsaw/pillager_outpost/watchtower.iob b/objects/pillager_outpost/watchtower.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/watchtower.iob rename to objects/pillager_outpost/watchtower.iob diff --git a/objects/jigsaw/pillager_outpost/watchtower_overgrown.iob b/objects/pillager_outpost/watchtower_overgrown.iob similarity index 100% rename from objects/jigsaw/pillager_outpost/watchtower_overgrown.iob rename to objects/pillager_outpost/watchtower_overgrown.iob diff --git a/objects/trees/spruce/pine1.iob b/objects/pine/pine1.iob similarity index 100% rename from objects/trees/spruce/pine1.iob rename to objects/pine/pine1.iob diff --git a/objects/trees/spruce/pine10.iob b/objects/pine/pine10.iob similarity index 100% rename from objects/trees/spruce/pine10.iob rename to objects/pine/pine10.iob diff --git a/objects/trees/spruce/pine11.iob b/objects/pine/pine11.iob similarity index 100% rename from objects/trees/spruce/pine11.iob rename to objects/pine/pine11.iob diff --git a/objects/trees/spruce/pine12.iob b/objects/pine/pine12.iob similarity index 100% rename from objects/trees/spruce/pine12.iob rename to objects/pine/pine12.iob diff --git a/objects/trees/spruce/pine2.iob b/objects/pine/pine2.iob similarity index 100% rename from objects/trees/spruce/pine2.iob rename to objects/pine/pine2.iob diff --git a/objects/trees/spruce/pine3.iob b/objects/pine/pine3.iob similarity index 100% rename from objects/trees/spruce/pine3.iob rename to objects/pine/pine3.iob diff --git a/objects/trees/spruce/pine4.iob b/objects/pine/pine4.iob similarity index 100% rename from objects/trees/spruce/pine4.iob rename to objects/pine/pine4.iob diff --git a/objects/trees/spruce/pine5.iob b/objects/pine/pine5.iob similarity index 100% rename from objects/trees/spruce/pine5.iob rename to objects/pine/pine5.iob diff --git a/objects/trees/spruce/pine6.iob b/objects/pine/pine6.iob similarity index 100% rename from objects/trees/spruce/pine6.iob rename to objects/pine/pine6.iob diff --git a/objects/trees/spruce/pine7.iob b/objects/pine/pine7.iob similarity index 100% rename from objects/trees/spruce/pine7.iob rename to objects/pine/pine7.iob diff --git a/objects/trees/spruce/pine8.iob b/objects/pine/pine8.iob similarity index 100% rename from objects/trees/spruce/pine8.iob rename to objects/pine/pine8.iob diff --git a/objects/trees/spruce/pine9.iob b/objects/pine/pine9.iob similarity index 100% rename from objects/trees/spruce/pine9.iob rename to objects/pine/pine9.iob diff --git a/objects/trees/spruce/sup-pine-1.iob b/objects/pine/sup-pine-1.iob similarity index 100% rename from objects/trees/spruce/sup-pine-1.iob rename to objects/pine/sup-pine-1.iob diff --git a/objects/trees/spruce/sup-pine-10.iob b/objects/pine/sup-pine-10.iob similarity index 100% rename from objects/trees/spruce/sup-pine-10.iob rename to objects/pine/sup-pine-10.iob diff --git a/objects/trees/spruce/sup-pine-11.iob b/objects/pine/sup-pine-11.iob similarity index 100% rename from objects/trees/spruce/sup-pine-11.iob rename to objects/pine/sup-pine-11.iob diff --git a/objects/trees/spruce/sup-pine-12.iob b/objects/pine/sup-pine-12.iob similarity index 100% rename from objects/trees/spruce/sup-pine-12.iob rename to objects/pine/sup-pine-12.iob diff --git a/objects/trees/spruce/sup-pine-13.iob b/objects/pine/sup-pine-13.iob similarity index 100% rename from objects/trees/spruce/sup-pine-13.iob rename to objects/pine/sup-pine-13.iob diff --git a/objects/trees/spruce/sup-pine-2.iob b/objects/pine/sup-pine-2.iob similarity index 100% rename from objects/trees/spruce/sup-pine-2.iob rename to objects/pine/sup-pine-2.iob diff --git a/objects/trees/spruce/sup-pine-3.iob b/objects/pine/sup-pine-3.iob similarity index 100% rename from objects/trees/spruce/sup-pine-3.iob rename to objects/pine/sup-pine-3.iob diff --git a/objects/trees/spruce/sup-pine-4.iob b/objects/pine/sup-pine-4.iob similarity index 100% rename from objects/trees/spruce/sup-pine-4.iob rename to objects/pine/sup-pine-4.iob diff --git a/objects/trees/spruce/sup-pine-5.iob b/objects/pine/sup-pine-5.iob similarity index 100% rename from objects/trees/spruce/sup-pine-5.iob rename to objects/pine/sup-pine-5.iob diff --git a/objects/trees/spruce/sup-pine-6.iob b/objects/pine/sup-pine-6.iob similarity index 100% rename from objects/trees/spruce/sup-pine-6.iob rename to objects/pine/sup-pine-6.iob diff --git a/objects/trees/spruce/sup-pine-7.iob b/objects/pine/sup-pine-7.iob similarity index 100% rename from objects/trees/spruce/sup-pine-7.iob rename to objects/pine/sup-pine-7.iob diff --git a/objects/trees/spruce/sup-pine-8.iob b/objects/pine/sup-pine-8.iob similarity index 100% rename from objects/trees/spruce/sup-pine-8.iob rename to objects/pine/sup-pine-8.iob diff --git a/objects/trees/spruce/sup-pine-9.iob b/objects/pine/sup-pine-9.iob similarity index 100% rename from objects/trees/spruce/sup-pine-9.iob rename to objects/pine/sup-pine-9.iob diff --git a/objects/trees/oak/truegeneric16.iob b/objects/plains/tree1.iob similarity index 100% rename from objects/trees/oak/truegeneric16.iob rename to objects/plains/tree1.iob diff --git a/objects/trees/oak/truegeneric17.iob b/objects/plains/tree2.iob similarity index 100% rename from objects/trees/oak/truegeneric17.iob rename to objects/plains/tree2.iob diff --git a/objects/jigsaw/pyramid/py.iob b/objects/pyramid/py.iob similarity index 100% rename from objects/jigsaw/pyramid/py.iob rename to objects/pyramid/py.iob diff --git a/objects/jigsaw/pyramid/pyramid-extreme.iob b/objects/pyramid/pyramid-extreme.iob similarity index 100% rename from objects/jigsaw/pyramid/pyramid-extreme.iob rename to objects/pyramid/pyramid-extreme.iob diff --git a/objects/jigsaw/pyramid/pyramid1.iob b/objects/pyramid/pyramid1.iob similarity index 100% rename from objects/jigsaw/pyramid/pyramid1.iob rename to objects/pyramid/pyramid1.iob diff --git a/objects/redwood-recluse/large-1.iob b/objects/redwood-recluse/large-1.iob new file mode 100644 index 00000000..a07d267f Binary files /dev/null and b/objects/redwood-recluse/large-1.iob differ diff --git a/objects/redwood-recluse/large-10.iob b/objects/redwood-recluse/large-10.iob new file mode 100644 index 00000000..4cbd9c4e Binary files /dev/null and b/objects/redwood-recluse/large-10.iob differ diff --git a/objects/redwood-recluse/large-2.iob b/objects/redwood-recluse/large-2.iob new file mode 100644 index 00000000..62a59cb3 Binary files /dev/null and b/objects/redwood-recluse/large-2.iob differ diff --git a/objects/redwood-recluse/large-3.iob b/objects/redwood-recluse/large-3.iob new file mode 100644 index 00000000..42507285 Binary files /dev/null and b/objects/redwood-recluse/large-3.iob differ diff --git a/objects/redwood-recluse/large-4.iob b/objects/redwood-recluse/large-4.iob new file mode 100644 index 00000000..2c66130e Binary files /dev/null and b/objects/redwood-recluse/large-4.iob differ diff --git a/objects/redwood-recluse/large-5.iob b/objects/redwood-recluse/large-5.iob new file mode 100644 index 00000000..e876c596 Binary files /dev/null and b/objects/redwood-recluse/large-5.iob differ diff --git a/objects/redwood-recluse/large-6.iob b/objects/redwood-recluse/large-6.iob new file mode 100644 index 00000000..5eab5d71 Binary files /dev/null and b/objects/redwood-recluse/large-6.iob differ diff --git a/objects/redwood-recluse/large-7.iob b/objects/redwood-recluse/large-7.iob new file mode 100644 index 00000000..ba49e773 Binary files /dev/null and b/objects/redwood-recluse/large-7.iob differ diff --git a/objects/redwood-recluse/large-8.iob b/objects/redwood-recluse/large-8.iob new file mode 100644 index 00000000..acfc2804 Binary files /dev/null and b/objects/redwood-recluse/large-8.iob differ diff --git a/objects/redwood-recluse/large-9.iob b/objects/redwood-recluse/large-9.iob new file mode 100644 index 00000000..4b450c27 Binary files /dev/null and b/objects/redwood-recluse/large-9.iob differ diff --git a/objects/redwood/bush-1.iob b/objects/redwood/bush-1.iob new file mode 100644 index 00000000..3449aa03 Binary files /dev/null and b/objects/redwood/bush-1.iob differ diff --git a/objects/redwood/bush-2.iob b/objects/redwood/bush-2.iob new file mode 100644 index 00000000..6b2ce4d8 Binary files /dev/null and b/objects/redwood/bush-2.iob differ diff --git a/objects/redwood/rock-1.iob b/objects/redwood/rock-1.iob new file mode 100644 index 00000000..f10bb231 Binary files /dev/null and b/objects/redwood/rock-1.iob differ diff --git a/objects/redwood/rock-2.iob b/objects/redwood/rock-2.iob new file mode 100644 index 00000000..184f41cc Binary files /dev/null and b/objects/redwood/rock-2.iob differ diff --git a/objects/redwood/small-redwood-1.iob b/objects/redwood/small-redwood-1.iob new file mode 100644 index 00000000..b11d3ed6 Binary files /dev/null and b/objects/redwood/small-redwood-1.iob differ diff --git a/objects/redwood/small-redwood-2.iob b/objects/redwood/small-redwood-2.iob new file mode 100644 index 00000000..227b3229 Binary files /dev/null and b/objects/redwood/small-redwood-2.iob differ diff --git a/objects/redwood/small-redwood-3.iob b/objects/redwood/small-redwood-3.iob new file mode 100644 index 00000000..92d6fbb1 Binary files /dev/null and b/objects/redwood/small-redwood-3.iob differ diff --git a/objects/redwood/small-redwood.iob b/objects/redwood/small-redwood.iob new file mode 100644 index 00000000..b22babbb Binary files /dev/null and b/objects/redwood/small-redwood.iob differ diff --git a/objects/rocks/r1.iob b/objects/rocks/r1.iob new file mode 100644 index 00000000..6581fe5d Binary files /dev/null and b/objects/rocks/r1.iob differ diff --git a/objects/rocks/r2.iob b/objects/rocks/r2.iob new file mode 100644 index 00000000..d382a9be Binary files /dev/null and b/objects/rocks/r2.iob differ diff --git a/objects/rocks/r3.iob b/objects/rocks/r3.iob new file mode 100644 index 00000000..6df6b4b6 Binary files /dev/null and b/objects/rocks/r3.iob differ diff --git a/objects/rocks/r4.iob b/objects/rocks/r4.iob new file mode 100644 index 00000000..05f10255 Binary files /dev/null and b/objects/rocks/r4.iob differ diff --git a/objects/trees/oak/mroofed1.iob b/objects/roofed-wayward/med-1.iob similarity index 100% rename from objects/trees/oak/mroofed1.iob rename to objects/roofed-wayward/med-1.iob diff --git a/objects/trees/oak/mroofed2.iob b/objects/roofed-wayward/med-10.iob similarity index 100% rename from objects/trees/oak/mroofed2.iob rename to objects/roofed-wayward/med-10.iob diff --git a/objects/trees/oak/mroofed3.iob b/objects/roofed-wayward/med-11.iob similarity index 100% rename from objects/trees/oak/mroofed3.iob rename to objects/roofed-wayward/med-11.iob diff --git a/objects/trees/oak/mroofed4.iob b/objects/roofed-wayward/med-12.iob similarity index 100% rename from objects/trees/oak/mroofed4.iob rename to objects/roofed-wayward/med-12.iob diff --git a/objects/trees/oak/mroofed5.iob b/objects/roofed-wayward/med-2.iob similarity index 100% rename from objects/trees/oak/mroofed5.iob rename to objects/roofed-wayward/med-2.iob diff --git a/objects/trees/oak/mroofed6.iob b/objects/roofed-wayward/med-3.iob similarity index 100% rename from objects/trees/oak/mroofed6.iob rename to objects/roofed-wayward/med-3.iob diff --git a/objects/trees/oak/mroofed7.iob b/objects/roofed-wayward/med-4.iob similarity index 100% rename from objects/trees/oak/mroofed7.iob rename to objects/roofed-wayward/med-4.iob diff --git a/objects/trees/oak/mroofed8.iob b/objects/roofed-wayward/med-5.iob similarity index 100% rename from objects/trees/oak/mroofed8.iob rename to objects/roofed-wayward/med-5.iob diff --git a/objects/trees/oak/mroofed9.iob b/objects/roofed-wayward/med-6.iob similarity index 100% rename from objects/trees/oak/mroofed9.iob rename to objects/roofed-wayward/med-6.iob diff --git a/objects/trees/oak/mroofed10.iob b/objects/roofed-wayward/med-7.iob similarity index 100% rename from objects/trees/oak/mroofed10.iob rename to objects/roofed-wayward/med-7.iob diff --git a/objects/trees/oak/mroofed11.iob b/objects/roofed-wayward/med-8.iob similarity index 100% rename from objects/trees/oak/mroofed11.iob rename to objects/roofed-wayward/med-8.iob diff --git a/objects/trees/oak/mroofed12.iob b/objects/roofed-wayward/med-9.iob similarity index 100% rename from objects/trees/oak/mroofed12.iob rename to objects/roofed-wayward/med-9.iob diff --git a/objects/trees/oak/troofed1.iob b/objects/roofed-wayward/taller-roof-1.iob similarity index 100% rename from objects/trees/oak/troofed1.iob rename to objects/roofed-wayward/taller-roof-1.iob diff --git a/objects/trees/oak/troofed2.iob b/objects/roofed-wayward/taller-roof-10.iob similarity index 100% rename from objects/trees/oak/troofed2.iob rename to objects/roofed-wayward/taller-roof-10.iob diff --git a/objects/trees/oak/troofed3.iob b/objects/roofed-wayward/taller-roof-2.iob similarity index 100% rename from objects/trees/oak/troofed3.iob rename to objects/roofed-wayward/taller-roof-2.iob diff --git a/objects/trees/oak/troofed4.iob b/objects/roofed-wayward/taller-roof-3.iob similarity index 100% rename from objects/trees/oak/troofed4.iob rename to objects/roofed-wayward/taller-roof-3.iob diff --git a/objects/trees/oak/troofed5.iob b/objects/roofed-wayward/taller-roof-4.iob similarity index 100% rename from objects/trees/oak/troofed5.iob rename to objects/roofed-wayward/taller-roof-4.iob diff --git a/objects/trees/oak/troofed6.iob b/objects/roofed-wayward/taller-roof-5.iob similarity index 100% rename from objects/trees/oak/troofed6.iob rename to objects/roofed-wayward/taller-roof-5.iob diff --git a/objects/trees/oak/troofed7.iob b/objects/roofed-wayward/taller-roof-6.iob similarity index 100% rename from objects/trees/oak/troofed7.iob rename to objects/roofed-wayward/taller-roof-6.iob diff --git a/objects/trees/oak/troofed8.iob b/objects/roofed-wayward/taller-roof-7.iob similarity index 100% rename from objects/trees/oak/troofed8.iob rename to objects/roofed-wayward/taller-roof-7.iob diff --git a/objects/trees/oak/troofed9.iob b/objects/roofed-wayward/taller-roof-8.iob similarity index 100% rename from objects/trees/oak/troofed9.iob rename to objects/roofed-wayward/taller-roof-8.iob diff --git a/objects/trees/oak/troofed10.iob b/objects/roofed-wayward/taller-roof-9.iob similarity index 100% rename from objects/trees/oak/troofed10.iob rename to objects/roofed-wayward/taller-roof-9.iob diff --git a/objects/trees/oak/troofedroot1.iob b/objects/roofed-wayward/taller-roof-rooted-1.iob similarity index 100% rename from objects/trees/oak/troofedroot1.iob rename to objects/roofed-wayward/taller-roof-rooted-1.iob diff --git a/objects/trees/oak/troofedroot2.iob b/objects/roofed-wayward/taller-roof-rooted-10.iob similarity index 100% rename from objects/trees/oak/troofedroot2.iob rename to objects/roofed-wayward/taller-roof-rooted-10.iob diff --git a/objects/trees/oak/troofedroot3.iob b/objects/roofed-wayward/taller-roof-rooted-2.iob similarity index 100% rename from objects/trees/oak/troofedroot3.iob rename to objects/roofed-wayward/taller-roof-rooted-2.iob diff --git a/objects/trees/oak/troofedroot4.iob b/objects/roofed-wayward/taller-roof-rooted-3.iob similarity index 100% rename from objects/trees/oak/troofedroot4.iob rename to objects/roofed-wayward/taller-roof-rooted-3.iob diff --git a/objects/trees/oak/troofedroot5.iob b/objects/roofed-wayward/taller-roof-rooted-4.iob similarity index 100% rename from objects/trees/oak/troofedroot5.iob rename to objects/roofed-wayward/taller-roof-rooted-4.iob diff --git a/objects/trees/oak/troofedroot6.iob b/objects/roofed-wayward/taller-roof-rooted-5.iob similarity index 100% rename from objects/trees/oak/troofedroot6.iob rename to objects/roofed-wayward/taller-roof-rooted-5.iob diff --git a/objects/trees/oak/troofedroot7.iob b/objects/roofed-wayward/taller-roof-rooted-6.iob similarity index 100% rename from objects/trees/oak/troofedroot7.iob rename to objects/roofed-wayward/taller-roof-rooted-6.iob diff --git a/objects/trees/oak/troofedroot8.iob b/objects/roofed-wayward/taller-roof-rooted-7.iob similarity index 100% rename from objects/trees/oak/troofedroot8.iob rename to objects/roofed-wayward/taller-roof-rooted-7.iob diff --git a/objects/trees/oak/troofedroot9.iob b/objects/roofed-wayward/taller-roof-rooted-8.iob similarity index 100% rename from objects/trees/oak/troofedroot9.iob rename to objects/roofed-wayward/taller-roof-rooted-8.iob diff --git a/objects/trees/oak/troofedroot10.iob b/objects/roofed-wayward/taller-roof-rooted-9.iob similarity index 100% rename from objects/trees/oak/troofedroot10.iob rename to objects/roofed-wayward/taller-roof-rooted-9.iob diff --git a/objects/jigsaw/ruined_portal/giant_portal_1.iob b/objects/ruined_portal/giant_portal_1.iob similarity index 100% rename from objects/jigsaw/ruined_portal/giant_portal_1.iob rename to objects/ruined_portal/giant_portal_1.iob diff --git a/objects/jigsaw/ruined_portal/giant_portal_2.iob b/objects/ruined_portal/giant_portal_2.iob similarity index 100% rename from objects/jigsaw/ruined_portal/giant_portal_2.iob rename to objects/ruined_portal/giant_portal_2.iob diff --git a/objects/jigsaw/ruined_portal/giant_portal_3.iob b/objects/ruined_portal/giant_portal_3.iob similarity index 100% rename from objects/jigsaw/ruined_portal/giant_portal_3.iob rename to objects/ruined_portal/giant_portal_3.iob diff --git a/objects/jigsaw/ruined_portal/portal_1.iob b/objects/ruined_portal/portal_1.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_1.iob rename to objects/ruined_portal/portal_1.iob diff --git a/objects/jigsaw/ruined_portal/portal_10.iob b/objects/ruined_portal/portal_10.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_10.iob rename to objects/ruined_portal/portal_10.iob diff --git a/objects/jigsaw/ruined_portal/portal_2.iob b/objects/ruined_portal/portal_2.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_2.iob rename to objects/ruined_portal/portal_2.iob diff --git a/objects/jigsaw/ruined_portal/portal_3.iob b/objects/ruined_portal/portal_3.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_3.iob rename to objects/ruined_portal/portal_3.iob diff --git a/objects/jigsaw/ruined_portal/portal_4.iob b/objects/ruined_portal/portal_4.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_4.iob rename to objects/ruined_portal/portal_4.iob diff --git a/objects/jigsaw/ruined_portal/portal_5.iob b/objects/ruined_portal/portal_5.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_5.iob rename to objects/ruined_portal/portal_5.iob diff --git a/objects/jigsaw/ruined_portal/portal_6.iob b/objects/ruined_portal/portal_6.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_6.iob rename to objects/ruined_portal/portal_6.iob diff --git a/objects/jigsaw/ruined_portal/portal_7.iob b/objects/ruined_portal/portal_7.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_7.iob rename to objects/ruined_portal/portal_7.iob diff --git a/objects/jigsaw/ruined_portal/portal_8.iob b/objects/ruined_portal/portal_8.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_8.iob rename to objects/ruined_portal/portal_8.iob diff --git a/objects/jigsaw/ruined_portal/portal_9.iob b/objects/ruined_portal/portal_9.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_9.iob rename to objects/ruined_portal/portal_9.iob diff --git a/objects/ruins/ruin1.iob b/objects/ruins/ruin1.iob new file mode 100644 index 00000000..c0aaee68 Binary files /dev/null and b/objects/ruins/ruin1.iob differ diff --git a/objects/trees/sakura/ogabsurd2.iob b/objects/sacred-bonsai/OGabsurd-1.iob similarity index 100% rename from objects/trees/sakura/ogabsurd2.iob rename to objects/sacred-bonsai/OGabsurd-1.iob diff --git a/objects/trees/sakura/ogabsurd1.iob b/objects/sacred-bonsai/absurd-1.iob similarity index 100% rename from objects/trees/sakura/ogabsurd1.iob rename to objects/sacred-bonsai/absurd-1.iob diff --git a/objects/trees/bonsai/medtilt1.iob b/objects/sacred-bonsai/med-1.iob similarity index 100% rename from objects/trees/bonsai/medtilt1.iob rename to objects/sacred-bonsai/med-1.iob diff --git a/objects/trees/bonsai/medtilt2.iob b/objects/sacred-bonsai/med-2.iob similarity index 100% rename from objects/trees/bonsai/medtilt2.iob rename to objects/sacred-bonsai/med-2.iob diff --git a/objects/trees/bonsai/medtilt3.iob b/objects/sacred-bonsai/med-3.iob similarity index 100% rename from objects/trees/bonsai/medtilt3.iob rename to objects/sacred-bonsai/med-3.iob diff --git a/objects/trees/bonsai/medtilt4.iob b/objects/sacred-bonsai/med-4.iob similarity index 100% rename from objects/trees/bonsai/medtilt4.iob rename to objects/sacred-bonsai/med-4.iob diff --git a/objects/trees/bonsai/medtilt5.iob b/objects/sacred-bonsai/med-5.iob similarity index 100% rename from objects/trees/bonsai/medtilt5.iob rename to objects/sacred-bonsai/med-5.iob diff --git a/objects/trees/sakura/ogabsurdfallen1.iob b/objects/sakura-fallen/sakura1.iob similarity index 100% rename from objects/trees/sakura/ogabsurdfallen1.iob rename to objects/sakura-fallen/sakura1.iob diff --git a/objects/trees/sakura/mlarge1.iob b/objects/sakura-massive/sakura1.iob similarity index 100% rename from objects/trees/sakura/mlarge1.iob rename to objects/sakura-massive/sakura1.iob diff --git a/objects/trees/sakura/mlarge2.iob b/objects/sakura-massive/sakura2.iob similarity index 100% rename from objects/trees/sakura/mlarge2.iob rename to objects/sakura-massive/sakura2.iob diff --git a/objects/trees/sakura/mlarge3.iob b/objects/sakura-massive/sakura3.iob similarity index 100% rename from objects/trees/sakura/mlarge3.iob rename to objects/sakura-massive/sakura3.iob diff --git a/objects/trees/sakura/ogbase1.iob b/objects/sakura-superlarge/sakura1.iob similarity index 100% rename from objects/trees/sakura/ogbase1.iob rename to objects/sakura-superlarge/sakura1.iob diff --git a/objects/trees/sakura/smtaint2.iob b/objects/sakura-tainted-supermassive/sakura1.iob similarity index 100% rename from objects/trees/sakura/smtaint2.iob rename to objects/sakura-tainted-supermassive/sakura1.iob diff --git a/objects/trees/sakura/smwilt2.iob b/objects/sakura-wilted-supermassive/sakura1.iob similarity index 100% rename from objects/trees/sakura/smwilt2.iob rename to objects/sakura-wilted-supermassive/sakura1.iob diff --git a/objects/clutter/arbusto1.iob b/objects/sakura/arbusto1.iob similarity index 100% rename from objects/clutter/arbusto1.iob rename to objects/sakura/arbusto1.iob diff --git a/objects/clutter/arbusto2.iob b/objects/sakura/arbusto2.iob similarity index 100% rename from objects/clutter/arbusto2.iob rename to objects/sakura/arbusto2.iob diff --git a/objects/clutter/arbusto3.iob b/objects/sakura/arbusto3.iob similarity index 100% rename from objects/clutter/arbusto3.iob rename to objects/sakura/arbusto3.iob diff --git a/objects/clutter/arbusto4.iob b/objects/sakura/arbusto4.iob similarity index 100% rename from objects/clutter/arbusto4.iob rename to objects/sakura/arbusto4.iob diff --git a/objects/clutter/arbusto5.iob b/objects/sakura/arbusto5.iob similarity index 100% rename from objects/clutter/arbusto5.iob rename to objects/sakura/arbusto5.iob diff --git a/objects/clutter/corazoncaido.iob b/objects/sakura/corazoncaido.iob similarity index 100% rename from objects/clutter/corazoncaido.iob rename to objects/sakura/corazoncaido.iob diff --git a/objects/clutter/corazoncristal.iob b/objects/sakura/corazoncristal.iob similarity index 100% rename from objects/clutter/corazoncristal.iob rename to objects/sakura/corazoncristal.iob diff --git a/objects/clutter/pond.iob b/objects/sakura/manantial.iob similarity index 100% rename from objects/clutter/pond.iob rename to objects/sakura/manantial.iob diff --git a/objects/trees/sakura/mlarge4.iob b/objects/sakura/sakura1.iob similarity index 100% rename from objects/trees/sakura/mlarge4.iob rename to objects/sakura/sakura1.iob diff --git a/objects/trees/sakura/mlarge5.iob b/objects/sakura/sakura2.iob similarity index 100% rename from objects/trees/sakura/mlarge5.iob rename to objects/sakura/sakura2.iob diff --git a/objects/trees/sakura/mlarge6.iob b/objects/sakura/sakura3.iob similarity index 100% rename from objects/trees/sakura/mlarge6.iob rename to objects/sakura/sakura3.iob diff --git a/objects/trees/sakura/mlarge7.iob b/objects/sakura/sakura4.iob similarity index 100% rename from objects/trees/sakura/mlarge7.iob rename to objects/sakura/sakura4.iob diff --git a/objects/trees/sakura/mlarge8.iob b/objects/sakura/sakura5.iob similarity index 100% rename from objects/trees/sakura/mlarge8.iob rename to objects/sakura/sakura5.iob diff --git a/objects/clutter/log.iob b/objects/sakura/tronco.iob similarity index 100% rename from objects/clutter/log.iob rename to objects/sakura/tronco.iob diff --git a/objects/savanna-clutter/SavanaClutter1.iob b/objects/savanna-clutter/SavanaClutter1.iob new file mode 100644 index 00000000..26e3bd0e Binary files /dev/null and b/objects/savanna-clutter/SavanaClutter1.iob differ diff --git a/objects/savanna-clutter/SavanaClutter2.iob b/objects/savanna-clutter/SavanaClutter2.iob new file mode 100644 index 00000000..ad24cc27 Binary files /dev/null and b/objects/savanna-clutter/SavanaClutter2.iob differ diff --git a/objects/savanna-clutter/SavanaClutter3.iob b/objects/savanna-clutter/SavanaClutter3.iob new file mode 100644 index 00000000..1ac5b98f Binary files /dev/null and b/objects/savanna-clutter/SavanaClutter3.iob differ diff --git a/objects/savanna-clutter/SavanaClutter4.iob b/objects/savanna-clutter/SavanaClutter4.iob new file mode 100644 index 00000000..f5d4e906 Binary files /dev/null and b/objects/savanna-clutter/SavanaClutter4.iob differ diff --git a/objects/savanna-clutter/SavanaClutter5.iob b/objects/savanna-clutter/SavanaClutter5.iob new file mode 100644 index 00000000..f05a7162 Binary files /dev/null and b/objects/savanna-clutter/SavanaClutter5.iob differ diff --git a/objects/savanna-clutter/SavanaClutter6.iob b/objects/savanna-clutter/SavanaClutter6.iob new file mode 100644 index 00000000..190a1027 Binary files /dev/null and b/objects/savanna-clutter/SavanaClutter6.iob differ diff --git a/objects/savanna-clutter/SavanaClutter7.iob b/objects/savanna-clutter/SavanaClutter7.iob new file mode 100644 index 00000000..dd1feefc Binary files /dev/null and b/objects/savanna-clutter/SavanaClutter7.iob differ diff --git a/objects/savanna-clutter/SavanaClutter8.iob b/objects/savanna-clutter/SavanaClutter8.iob new file mode 100644 index 00000000..9b40d2b5 Binary files /dev/null and b/objects/savanna-clutter/SavanaClutter8.iob differ diff --git a/objects/trees/acacia/savannaD1.iob b/objects/savanna-gen/savannaD-1.iob similarity index 100% rename from objects/trees/acacia/savannaD1.iob rename to objects/savanna-gen/savannaD-1.iob diff --git a/objects/trees/acacia/savannaD2.iob b/objects/savanna-gen/savannaD-2.iob similarity index 100% rename from objects/trees/acacia/savannaD2.iob rename to objects/savanna-gen/savannaD-2.iob diff --git a/objects/trees/acacia/savannaD3.iob b/objects/savanna-gen/savannaD-3.iob similarity index 100% rename from objects/trees/acacia/savannaD3.iob rename to objects/savanna-gen/savannaD-3.iob diff --git a/objects/trees/acacia/savannaF1.iob b/objects/savanna-gen/savannaF-1.iob similarity index 100% rename from objects/trees/acacia/savannaF1.iob rename to objects/savanna-gen/savannaF-1.iob diff --git a/objects/trees/acacia/savannaF10.iob b/objects/savanna-gen/savannaF-10.iob similarity index 100% rename from objects/trees/acacia/savannaF10.iob rename to objects/savanna-gen/savannaF-10.iob diff --git a/objects/trees/acacia/savannaF11.iob b/objects/savanna-gen/savannaF-11.iob similarity index 100% rename from objects/trees/acacia/savannaF11.iob rename to objects/savanna-gen/savannaF-11.iob diff --git a/objects/trees/acacia/savannaF13.iob b/objects/savanna-gen/savannaF-13.iob similarity index 100% rename from objects/trees/acacia/savannaF13.iob rename to objects/savanna-gen/savannaF-13.iob diff --git a/objects/trees/acacia/savannaF14.iob b/objects/savanna-gen/savannaF-14.iob similarity index 100% rename from objects/trees/acacia/savannaF14.iob rename to objects/savanna-gen/savannaF-14.iob diff --git a/objects/trees/acacia/savannaF15.iob b/objects/savanna-gen/savannaF-15.iob similarity index 100% rename from objects/trees/acacia/savannaF15.iob rename to objects/savanna-gen/savannaF-15.iob diff --git a/objects/trees/acacia/savannaF16.iob b/objects/savanna-gen/savannaF-16.iob similarity index 100% rename from objects/trees/acacia/savannaF16.iob rename to objects/savanna-gen/savannaF-16.iob diff --git a/objects/trees/acacia/savannaF17.iob b/objects/savanna-gen/savannaF-17.iob similarity index 100% rename from objects/trees/acacia/savannaF17.iob rename to objects/savanna-gen/savannaF-17.iob diff --git a/objects/trees/acacia/savannaF2.iob b/objects/savanna-gen/savannaF-2.iob similarity index 100% rename from objects/trees/acacia/savannaF2.iob rename to objects/savanna-gen/savannaF-2.iob diff --git a/objects/trees/acacia/savannaF3.iob b/objects/savanna-gen/savannaF-3.iob similarity index 100% rename from objects/trees/acacia/savannaF3.iob rename to objects/savanna-gen/savannaF-3.iob diff --git a/objects/trees/acacia/savannaF4.iob b/objects/savanna-gen/savannaF-4.iob similarity index 100% rename from objects/trees/acacia/savannaF4.iob rename to objects/savanna-gen/savannaF-4.iob diff --git a/objects/trees/acacia/savannaF5.iob b/objects/savanna-gen/savannaF-5.iob similarity index 100% rename from objects/trees/acacia/savannaF5.iob rename to objects/savanna-gen/savannaF-5.iob diff --git a/objects/trees/acacia/savannaF6.iob b/objects/savanna-gen/savannaF-6.iob similarity index 100% rename from objects/trees/acacia/savannaF6.iob rename to objects/savanna-gen/savannaF-6.iob diff --git a/objects/trees/acacia/savannaF7.iob b/objects/savanna-gen/savannaF-7.iob similarity index 100% rename from objects/trees/acacia/savannaF7.iob rename to objects/savanna-gen/savannaF-7.iob diff --git a/objects/trees/acacia/savannaF8.iob b/objects/savanna-gen/savannaF-8.iob similarity index 100% rename from objects/trees/acacia/savannaF8.iob rename to objects/savanna-gen/savannaF-8.iob diff --git a/objects/trees/acacia/savannaF9.iob b/objects/savanna-gen/savannaF-9.iob similarity index 100% rename from objects/trees/acacia/savannaF9.iob rename to objects/savanna-gen/savannaF-9.iob diff --git a/objects/trees/acacia/savannaS1.iob b/objects/savanna-gen/savannaS-1.iob similarity index 100% rename from objects/trees/acacia/savannaS1.iob rename to objects/savanna-gen/savannaS-1.iob diff --git a/objects/trees/acacia/savannaS2.iob b/objects/savanna-gen/savannaS-2.iob similarity index 100% rename from objects/trees/acacia/savannaS2.iob rename to objects/savanna-gen/savannaS-2.iob diff --git a/objects/trees/acacia/savannaS3.iob b/objects/savanna-gen/savannaS-3.iob similarity index 100% rename from objects/trees/acacia/savannaS3.iob rename to objects/savanna-gen/savannaS-3.iob diff --git a/objects/trees/acacia/savannaS4.iob b/objects/savanna-gen/savannaS-4.iob similarity index 100% rename from objects/trees/acacia/savannaS4.iob rename to objects/savanna-gen/savannaS-4.iob diff --git a/objects/trees/acacia/savannaS5.iob b/objects/savanna-gen/savannaS-5.iob similarity index 100% rename from objects/trees/acacia/savannaS5.iob rename to objects/savanna-gen/savannaS-5.iob diff --git a/objects/trees/acacia/savannaS6.iob b/objects/savanna-gen/savannaS-6.iob similarity index 100% rename from objects/trees/acacia/savannaS6.iob rename to objects/savanna-gen/savannaS-6.iob diff --git a/objects/trees/acacia/savannaS7.iob b/objects/savanna-gen/savannaS-7.iob similarity index 100% rename from objects/trees/acacia/savannaS7.iob rename to objects/savanna-gen/savannaS-7.iob diff --git a/objects/trees/acacia/savannaS8.iob b/objects/savanna-gen/savannaS-8.iob similarity index 100% rename from objects/trees/acacia/savannaS8.iob rename to objects/savanna-gen/savannaS-8.iob diff --git a/objects/trees/acacia/savannas10.iob b/objects/savanna-gen/savannas-10.iob similarity index 100% rename from objects/trees/acacia/savannas10.iob rename to objects/savanna-gen/savannas-10.iob diff --git a/objects/trees/acacia/savannas11.iob b/objects/savanna-gen/savannas-11.iob similarity index 100% rename from objects/trees/acacia/savannas11.iob rename to objects/savanna-gen/savannas-11.iob diff --git a/objects/trees/acacia/savannas12.iob b/objects/savanna-gen/savannas-12.iob similarity index 100% rename from objects/trees/acacia/savannas12.iob rename to objects/savanna-gen/savannas-12.iob diff --git a/objects/trees/acacia/savannas9.iob b/objects/savanna-gen/savannas-9.iob similarity index 100% rename from objects/trees/acacia/savannas9.iob rename to objects/savanna-gen/savannas-9.iob diff --git a/objects/savanna-rock/SavanaRock1.iob b/objects/savanna-rock/SavanaRock1.iob new file mode 100644 index 00000000..8f3a7baf Binary files /dev/null and b/objects/savanna-rock/SavanaRock1.iob differ diff --git a/objects/savanna-rock/SavanaRock2.iob b/objects/savanna-rock/SavanaRock2.iob new file mode 100644 index 00000000..d6896c1e Binary files /dev/null and b/objects/savanna-rock/SavanaRock2.iob differ diff --git a/objects/savanna-rock/SavanaRock3.iob b/objects/savanna-rock/SavanaRock3.iob new file mode 100644 index 00000000..b31791bf Binary files /dev/null and b/objects/savanna-rock/SavanaRock3.iob differ diff --git a/objects/savanna-rock/SavanaRock4.iob b/objects/savanna-rock/SavanaRock4.iob new file mode 100644 index 00000000..cc59b044 Binary files /dev/null and b/objects/savanna-rock/SavanaRock4.iob differ diff --git a/objects/savanna-rock/SavanaRock5.iob b/objects/savanna-rock/SavanaRock5.iob new file mode 100644 index 00000000..62724e73 Binary files /dev/null and b/objects/savanna-rock/SavanaRock5.iob differ diff --git a/objects/savanna-rock/SavanaRock6.iob b/objects/savanna-rock/SavanaRock6.iob new file mode 100644 index 00000000..65e109bb Binary files /dev/null and b/objects/savanna-rock/SavanaRock6.iob differ diff --git a/objects/savanna-rock/SavanaRock7.iob b/objects/savanna-rock/SavanaRock7.iob new file mode 100644 index 00000000..0153e9fa Binary files /dev/null and b/objects/savanna-rock/SavanaRock7.iob differ diff --git a/objects/savanna-rock/SavanaRock8.iob b/objects/savanna-rock/SavanaRock8.iob new file mode 100644 index 00000000..c512878f Binary files /dev/null and b/objects/savanna-rock/SavanaRock8.iob differ diff --git a/objects/trees/acacia/thin1.iob b/objects/savanna-small/SavanaNimble1.iob similarity index 100% rename from objects/trees/acacia/thin1.iob rename to objects/savanna-small/SavanaNimble1.iob diff --git a/objects/trees/acacia/thin10.iob b/objects/savanna-small/SavanaNimble10.iob similarity index 100% rename from objects/trees/acacia/thin10.iob rename to objects/savanna-small/SavanaNimble10.iob diff --git a/objects/trees/acacia/thin11.iob b/objects/savanna-small/SavanaNimble11.iob similarity index 100% rename from objects/trees/acacia/thin11.iob rename to objects/savanna-small/SavanaNimble11.iob diff --git a/objects/trees/acacia/thin12.iob b/objects/savanna-small/SavanaNimble12.iob similarity index 100% rename from objects/trees/acacia/thin12.iob rename to objects/savanna-small/SavanaNimble12.iob diff --git a/objects/trees/acacia/thin13.iob b/objects/savanna-small/SavanaNimble13.iob similarity index 100% rename from objects/trees/acacia/thin13.iob rename to objects/savanna-small/SavanaNimble13.iob diff --git a/objects/trees/acacia/thin14.iob b/objects/savanna-small/SavanaNimble14.iob similarity index 100% rename from objects/trees/acacia/thin14.iob rename to objects/savanna-small/SavanaNimble14.iob diff --git a/objects/trees/acacia/thin15.iob b/objects/savanna-small/SavanaNimble15.iob similarity index 100% rename from objects/trees/acacia/thin15.iob rename to objects/savanna-small/SavanaNimble15.iob diff --git a/objects/trees/acacia/thin16.iob b/objects/savanna-small/SavanaNimble16.iob similarity index 100% rename from objects/trees/acacia/thin16.iob rename to objects/savanna-small/SavanaNimble16.iob diff --git a/objects/trees/acacia/thin2.iob b/objects/savanna-small/SavanaNimble2.iob similarity index 100% rename from objects/trees/acacia/thin2.iob rename to objects/savanna-small/SavanaNimble2.iob diff --git a/objects/trees/acacia/thin3.iob b/objects/savanna-small/SavanaNimble3.iob similarity index 100% rename from objects/trees/acacia/thin3.iob rename to objects/savanna-small/SavanaNimble3.iob diff --git a/objects/trees/acacia/thin4.iob b/objects/savanna-small/SavanaNimble4.iob similarity index 100% rename from objects/trees/acacia/thin4.iob rename to objects/savanna-small/SavanaNimble4.iob diff --git a/objects/trees/acacia/thin5.iob b/objects/savanna-small/SavanaNimble5.iob similarity index 100% rename from objects/trees/acacia/thin5.iob rename to objects/savanna-small/SavanaNimble5.iob diff --git a/objects/trees/acacia/thin6.iob b/objects/savanna-small/SavanaNimble6.iob similarity index 100% rename from objects/trees/acacia/thin6.iob rename to objects/savanna-small/SavanaNimble6.iob diff --git a/objects/trees/acacia/thin7.iob b/objects/savanna-small/SavanaNimble7.iob similarity index 100% rename from objects/trees/acacia/thin7.iob rename to objects/savanna-small/SavanaNimble7.iob diff --git a/objects/trees/acacia/thin8.iob b/objects/savanna-small/SavanaNimble8.iob similarity index 100% rename from objects/trees/acacia/thin8.iob rename to objects/savanna-small/SavanaNimble8.iob diff --git a/objects/trees/acacia/thin9.iob b/objects/savanna-small/SavanaNimble9.iob similarity index 100% rename from objects/trees/acacia/thin9.iob rename to objects/savanna-small/SavanaNimble9.iob diff --git a/objects/trees/acacia/savana1.iob b/objects/savanna/SavanaTree1.iob similarity index 100% rename from objects/trees/acacia/savana1.iob rename to objects/savanna/SavanaTree1.iob diff --git a/objects/trees/acacia/savana2.iob b/objects/savanna/SavanaTree2.iob similarity index 100% rename from objects/trees/acacia/savana2.iob rename to objects/savanna/SavanaTree2.iob diff --git a/objects/trees/acacia/savana3.iob b/objects/savanna/SavanaTree3.iob similarity index 100% rename from objects/trees/acacia/savana3.iob rename to objects/savanna/SavanaTree3.iob diff --git a/objects/trees/acacia/savana4.iob b/objects/savanna/SavanaTree4.iob similarity index 100% rename from objects/trees/acacia/savana4.iob rename to objects/savanna/SavanaTree4.iob diff --git a/objects/trees/acacia/savana5.iob b/objects/savanna/SavanaTree5.iob similarity index 100% rename from objects/trees/acacia/savana5.iob rename to objects/savanna/SavanaTree5.iob diff --git a/objects/serrulata-bleeding-alt/ableed1.iob b/objects/serrulata-bleeding-alt/ableed1.iob new file mode 100644 index 00000000..09c70574 Binary files /dev/null and b/objects/serrulata-bleeding-alt/ableed1.iob differ diff --git a/objects/serrulata-bleeding-alt/ableed10.iob b/objects/serrulata-bleeding-alt/ableed10.iob new file mode 100644 index 00000000..9f10d2df Binary files /dev/null and b/objects/serrulata-bleeding-alt/ableed10.iob differ diff --git a/objects/serrulata-bleeding-alt/ableed2.iob b/objects/serrulata-bleeding-alt/ableed2.iob new file mode 100644 index 00000000..872094fc Binary files /dev/null and b/objects/serrulata-bleeding-alt/ableed2.iob differ diff --git a/objects/serrulata-bleeding-alt/ableed3.iob b/objects/serrulata-bleeding-alt/ableed3.iob new file mode 100644 index 00000000..8e2a7ece Binary files /dev/null and b/objects/serrulata-bleeding-alt/ableed3.iob differ diff --git a/objects/serrulata-bleeding-alt/ableed4.iob b/objects/serrulata-bleeding-alt/ableed4.iob new file mode 100644 index 00000000..5caa0f42 Binary files /dev/null and b/objects/serrulata-bleeding-alt/ableed4.iob differ diff --git a/objects/serrulata-bleeding-alt/ableed5.iob b/objects/serrulata-bleeding-alt/ableed5.iob new file mode 100644 index 00000000..b8317081 Binary files /dev/null and b/objects/serrulata-bleeding-alt/ableed5.iob differ diff --git a/objects/serrulata-bleeding-alt/ableed6.iob b/objects/serrulata-bleeding-alt/ableed6.iob new file mode 100644 index 00000000..7dc14d1a Binary files /dev/null and b/objects/serrulata-bleeding-alt/ableed6.iob differ diff --git a/objects/serrulata-bleeding-alt/ableed7.iob b/objects/serrulata-bleeding-alt/ableed7.iob new file mode 100644 index 00000000..1efc24c1 Binary files /dev/null and b/objects/serrulata-bleeding-alt/ableed7.iob differ diff --git a/objects/serrulata-bleeding-alt/ableed8.iob b/objects/serrulata-bleeding-alt/ableed8.iob new file mode 100644 index 00000000..57b1caab Binary files /dev/null and b/objects/serrulata-bleeding-alt/ableed8.iob differ diff --git a/objects/serrulata-bleeding-alt/ableed9.iob b/objects/serrulata-bleeding-alt/ableed9.iob new file mode 100644 index 00000000..79183ef5 Binary files /dev/null and b/objects/serrulata-bleeding-alt/ableed9.iob differ diff --git a/objects/serrulata-bleeding-large/T-bleed1.iob b/objects/serrulata-bleeding-large/T-bleed1.iob new file mode 100644 index 00000000..76667f8f Binary files /dev/null and b/objects/serrulata-bleeding-large/T-bleed1.iob differ diff --git a/objects/serrulata-bleeding-large/T-bleed2.iob b/objects/serrulata-bleeding-large/T-bleed2.iob new file mode 100644 index 00000000..d720f69f Binary files /dev/null and b/objects/serrulata-bleeding-large/T-bleed2.iob differ diff --git a/objects/serrulata-bleeding-large/T-bleed3.iob b/objects/serrulata-bleeding-large/T-bleed3.iob new file mode 100644 index 00000000..1fb92dba Binary files /dev/null and b/objects/serrulata-bleeding-large/T-bleed3.iob differ diff --git a/objects/serrulata-bleeding-large/T-bleed4.iob b/objects/serrulata-bleeding-large/T-bleed4.iob new file mode 100644 index 00000000..4832d5fd Binary files /dev/null and b/objects/serrulata-bleeding-large/T-bleed4.iob differ diff --git a/objects/serrulata-bleeding-large/T-bleed5.iob b/objects/serrulata-bleeding-large/T-bleed5.iob new file mode 100644 index 00000000..60798827 Binary files /dev/null and b/objects/serrulata-bleeding-large/T-bleed5.iob differ diff --git a/objects/serrulata-bleeding-medium/bleed1.iob b/objects/serrulata-bleeding-medium/bleed1.iob new file mode 100644 index 00000000..cd9287c8 Binary files /dev/null and b/objects/serrulata-bleeding-medium/bleed1.iob differ diff --git a/objects/serrulata-bleeding-medium/bleed10.iob b/objects/serrulata-bleeding-medium/bleed10.iob new file mode 100644 index 00000000..65c077fa Binary files /dev/null and b/objects/serrulata-bleeding-medium/bleed10.iob differ diff --git a/objects/serrulata-bleeding-medium/bleed2.iob b/objects/serrulata-bleeding-medium/bleed2.iob new file mode 100644 index 00000000..42b7d1cd Binary files /dev/null and b/objects/serrulata-bleeding-medium/bleed2.iob differ diff --git a/objects/serrulata-bleeding-medium/bleed3.iob b/objects/serrulata-bleeding-medium/bleed3.iob new file mode 100644 index 00000000..363b3e5a Binary files /dev/null and b/objects/serrulata-bleeding-medium/bleed3.iob differ diff --git a/objects/serrulata-bleeding-medium/bleed4.iob b/objects/serrulata-bleeding-medium/bleed4.iob new file mode 100644 index 00000000..c0ed37c4 Binary files /dev/null and b/objects/serrulata-bleeding-medium/bleed4.iob differ diff --git a/objects/serrulata-bleeding-medium/bleed5.iob b/objects/serrulata-bleeding-medium/bleed5.iob new file mode 100644 index 00000000..6997dd69 Binary files /dev/null and b/objects/serrulata-bleeding-medium/bleed5.iob differ diff --git a/objects/serrulata-bleeding-medium/bleed6.iob b/objects/serrulata-bleeding-medium/bleed6.iob new file mode 100644 index 00000000..32883786 Binary files /dev/null and b/objects/serrulata-bleeding-medium/bleed6.iob differ diff --git a/objects/serrulata-bleeding-medium/bleed7.iob b/objects/serrulata-bleeding-medium/bleed7.iob new file mode 100644 index 00000000..f2f718ff Binary files /dev/null and b/objects/serrulata-bleeding-medium/bleed7.iob differ diff --git a/objects/serrulata-bleeding-medium/bleed8.iob b/objects/serrulata-bleeding-medium/bleed8.iob new file mode 100644 index 00000000..35b9fd23 Binary files /dev/null and b/objects/serrulata-bleeding-medium/bleed8.iob differ diff --git a/objects/serrulata-bleeding-medium/bleed9.iob b/objects/serrulata-bleeding-medium/bleed9.iob new file mode 100644 index 00000000..3bc336ec Binary files /dev/null and b/objects/serrulata-bleeding-medium/bleed9.iob differ diff --git a/objects/serrulata/nb-bleed1.iob b/objects/serrulata/nb-bleed1.iob new file mode 100644 index 00000000..aa6c5752 Binary files /dev/null and b/objects/serrulata/nb-bleed1.iob differ diff --git a/objects/serrulata/nb-bleed10.iob b/objects/serrulata/nb-bleed10.iob new file mode 100644 index 00000000..1accc964 Binary files /dev/null and b/objects/serrulata/nb-bleed10.iob differ diff --git a/objects/serrulata/nb-bleed2.iob b/objects/serrulata/nb-bleed2.iob new file mode 100644 index 00000000..d5e332fa Binary files /dev/null and b/objects/serrulata/nb-bleed2.iob differ diff --git a/objects/serrulata/nb-bleed3.iob b/objects/serrulata/nb-bleed3.iob new file mode 100644 index 00000000..9aced8a9 Binary files /dev/null and b/objects/serrulata/nb-bleed3.iob differ diff --git a/objects/serrulata/nb-bleed4.iob b/objects/serrulata/nb-bleed4.iob new file mode 100644 index 00000000..58272f3f Binary files /dev/null and b/objects/serrulata/nb-bleed4.iob differ diff --git a/objects/serrulata/nb-bleed5.iob b/objects/serrulata/nb-bleed5.iob new file mode 100644 index 00000000..73c10e74 Binary files /dev/null and b/objects/serrulata/nb-bleed5.iob differ diff --git a/objects/serrulata/nb-bleed6.iob b/objects/serrulata/nb-bleed6.iob new file mode 100644 index 00000000..e4e95f74 Binary files /dev/null and b/objects/serrulata/nb-bleed6.iob differ diff --git a/objects/serrulata/nb-bleed7.iob b/objects/serrulata/nb-bleed7.iob new file mode 100644 index 00000000..0b0eae8e Binary files /dev/null and b/objects/serrulata/nb-bleed7.iob differ diff --git a/objects/serrulata/nb-bleed8.iob b/objects/serrulata/nb-bleed8.iob new file mode 100644 index 00000000..0bd0f77d Binary files /dev/null and b/objects/serrulata/nb-bleed8.iob differ diff --git a/objects/serrulata/nb-bleed9.iob b/objects/serrulata/nb-bleed9.iob new file mode 100644 index 00000000..da40b0b3 Binary files /dev/null and b/objects/serrulata/nb-bleed9.iob differ diff --git a/objects/shack/wornWorkshop.iob b/objects/shack/wornWorkshop.iob new file mode 100644 index 00000000..60ff30ea Binary files /dev/null and b/objects/shack/wornWorkshop.iob differ diff --git a/objects/ships/gall-1.iob b/objects/ships/gall-1.iob new file mode 100644 index 00000000..77f0e5c1 Binary files /dev/null and b/objects/ships/gall-1.iob differ diff --git a/objects/ships/gall-2.iob b/objects/ships/gall-2.iob new file mode 100644 index 00000000..3fd95b89 Binary files /dev/null and b/objects/ships/gall-2.iob differ diff --git a/objects/ships/gall-3.iob b/objects/ships/gall-3.iob new file mode 100644 index 00000000..b4b7b92c Binary files /dev/null and b/objects/ships/gall-3.iob differ diff --git a/objects/ships/generic-c.iob b/objects/ships/generic-c.iob new file mode 100644 index 00000000..81b7f7fc Binary files /dev/null and b/objects/ships/generic-c.iob differ diff --git a/objects/ships/generic-g.iob b/objects/ships/generic-g.iob new file mode 100644 index 00000000..656a251a Binary files /dev/null and b/objects/ships/generic-g.iob differ diff --git a/objects/ships/generic-r.iob b/objects/ships/generic-r.iob new file mode 100644 index 00000000..52a0c603 Binary files /dev/null and b/objects/ships/generic-r.iob differ diff --git a/objects/ships/generic-u.iob b/objects/ships/generic-u.iob new file mode 100644 index 00000000..d94bb0bf Binary files /dev/null and b/objects/ships/generic-u.iob differ diff --git a/objects/ships/generic-w.iob b/objects/ships/generic-w.iob new file mode 100644 index 00000000..9721493a Binary files /dev/null and b/objects/ships/generic-w.iob differ diff --git a/objects/ships/generic.iob b/objects/ships/generic.iob new file mode 100644 index 00000000..519d42f6 Binary files /dev/null and b/objects/ships/generic.iob differ diff --git a/objects/ships/ship-1.iob b/objects/ships/ship-1.iob new file mode 100644 index 00000000..c3ca45a7 Binary files /dev/null and b/objects/ships/ship-1.iob differ diff --git a/objects/ships/ship-2.iob b/objects/ships/ship-2.iob new file mode 100644 index 00000000..91457d6b Binary files /dev/null and b/objects/ships/ship-2.iob differ diff --git a/objects/ships/swreck-1.iob b/objects/ships/swreck-1.iob new file mode 100644 index 00000000..5a69ef01 Binary files /dev/null and b/objects/ships/swreck-1.iob differ diff --git a/objects/ships/usd-ship-1.iob b/objects/ships/usd-ship-1.iob new file mode 100644 index 00000000..60621872 Binary files /dev/null and b/objects/ships/usd-ship-1.iob differ diff --git a/objects/ships/usd-ship-2.iob b/objects/ships/usd-ship-2.iob new file mode 100644 index 00000000..e9962267 Binary files /dev/null and b/objects/ships/usd-ship-2.iob differ diff --git a/objects/shipwreck/rightsideup-backhalf-degraded.iob b/objects/shipwreck/rightsideup-backhalf-degraded.iob new file mode 100644 index 00000000..166d6ad7 Binary files /dev/null and b/objects/shipwreck/rightsideup-backhalf-degraded.iob differ diff --git a/objects/shipwreck/rightsideup-backhalf.iob b/objects/shipwreck/rightsideup-backhalf.iob new file mode 100644 index 00000000..3d8f0696 Binary files /dev/null and b/objects/shipwreck/rightsideup-backhalf.iob differ diff --git a/objects/shipwreck/rightsideup-fronthalf-degraded.iob b/objects/shipwreck/rightsideup-fronthalf-degraded.iob new file mode 100644 index 00000000..c42f7e1e Binary files /dev/null and b/objects/shipwreck/rightsideup-fronthalf-degraded.iob differ diff --git a/objects/shipwreck/rightsideup-fronthalf.iob b/objects/shipwreck/rightsideup-fronthalf.iob new file mode 100644 index 00000000..759fe3f3 Binary files /dev/null and b/objects/shipwreck/rightsideup-fronthalf.iob differ diff --git a/objects/shipwreck/rightsideup-full-degraded.iob b/objects/shipwreck/rightsideup-full-degraded.iob new file mode 100644 index 00000000..e8e9e15a Binary files /dev/null and b/objects/shipwreck/rightsideup-full-degraded.iob differ diff --git a/objects/shipwreck/rightsideup-full.iob b/objects/shipwreck/rightsideup-full.iob new file mode 100644 index 00000000..da0933ab Binary files /dev/null and b/objects/shipwreck/rightsideup-full.iob differ diff --git a/objects/shipwreck/sideways-backhalf-degraded.iob b/objects/shipwreck/sideways-backhalf-degraded.iob new file mode 100644 index 00000000..c90d90e0 Binary files /dev/null and b/objects/shipwreck/sideways-backhalf-degraded.iob differ diff --git a/objects/shipwreck/sideways-backhalf.iob b/objects/shipwreck/sideways-backhalf.iob new file mode 100644 index 00000000..700d593b Binary files /dev/null and b/objects/shipwreck/sideways-backhalf.iob differ diff --git a/objects/shipwreck/sideways-fronthalf-degraded.iob b/objects/shipwreck/sideways-fronthalf-degraded.iob new file mode 100644 index 00000000..45e13897 Binary files /dev/null and b/objects/shipwreck/sideways-fronthalf-degraded.iob differ diff --git a/objects/shipwreck/sideways-fronthalf.iob b/objects/shipwreck/sideways-fronthalf.iob new file mode 100644 index 00000000..25d62d14 Binary files /dev/null and b/objects/shipwreck/sideways-fronthalf.iob differ diff --git a/objects/shipwreck/sideways-full-degraded.iob b/objects/shipwreck/sideways-full-degraded.iob new file mode 100644 index 00000000..10c620a3 Binary files /dev/null and b/objects/shipwreck/sideways-full-degraded.iob differ diff --git a/objects/shipwreck/sideways-full.iob b/objects/shipwreck/sideways-full.iob new file mode 100644 index 00000000..4243abfb Binary files /dev/null and b/objects/shipwreck/sideways-full.iob differ diff --git a/objects/shipwreck/upsidedown-backhalf-degraded.iob b/objects/shipwreck/upsidedown-backhalf-degraded.iob new file mode 100644 index 00000000..82129eee Binary files /dev/null and b/objects/shipwreck/upsidedown-backhalf-degraded.iob differ diff --git a/objects/shipwreck/upsidedown-backhalf.iob b/objects/shipwreck/upsidedown-backhalf.iob new file mode 100644 index 00000000..fe53ff4f Binary files /dev/null and b/objects/shipwreck/upsidedown-backhalf.iob differ diff --git a/objects/shipwreck/upsidedown-fronthalf-degraded.iob b/objects/shipwreck/upsidedown-fronthalf-degraded.iob new file mode 100644 index 00000000..f13e80c9 Binary files /dev/null and b/objects/shipwreck/upsidedown-fronthalf-degraded.iob differ diff --git a/objects/shipwreck/upsidedown-fronthalf.iob b/objects/shipwreck/upsidedown-fronthalf.iob new file mode 100644 index 00000000..e82ba277 Binary files /dev/null and b/objects/shipwreck/upsidedown-fronthalf.iob differ diff --git a/objects/shipwreck/upsidedown-full-degraded.iob b/objects/shipwreck/upsidedown-full-degraded.iob new file mode 100644 index 00000000..ee093e9b Binary files /dev/null and b/objects/shipwreck/upsidedown-full-degraded.iob differ diff --git a/objects/shipwreck/upsidedown-full.iob b/objects/shipwreck/upsidedown-full.iob new file mode 100644 index 00000000..2f7ce26c Binary files /dev/null and b/objects/shipwreck/upsidedown-full.iob differ diff --git a/objects/shipwreck/with-mast-degraded.iob b/objects/shipwreck/with-mast-degraded.iob new file mode 100644 index 00000000..3c85e7bb Binary files /dev/null and b/objects/shipwreck/with-mast-degraded.iob differ diff --git a/objects/shipwreck/with-mast.iob b/objects/shipwreck/with-mast.iob new file mode 100644 index 00000000..1d724d93 Binary files /dev/null and b/objects/shipwreck/with-mast.iob differ diff --git a/objects/trees/mushroom/smolshroom1.iob b/objects/shroom/mushclutt1.iob similarity index 100% rename from objects/trees/mushroom/smolshroom1.iob rename to objects/shroom/mushclutt1.iob diff --git a/objects/trees/mushroom/smolshroom2.iob b/objects/shroom/mushclutt2.iob similarity index 100% rename from objects/trees/mushroom/smolshroom2.iob rename to objects/shroom/mushclutt2.iob diff --git a/objects/trees/mushroom/smolshroom3.iob b/objects/shroom/mushclutt3.iob similarity index 100% rename from objects/trees/mushroom/smolshroom3.iob rename to objects/shroom/mushclutt3.iob diff --git a/objects/trees/mushroom/smolshroom4.iob b/objects/shroom/mushclutt4.iob similarity index 100% rename from objects/trees/mushroom/smolshroom4.iob rename to objects/shroom/mushclutt4.iob diff --git a/objects/trees/mushroom/smolshroom5.iob b/objects/shroom/mushclutt5.iob similarity index 100% rename from objects/trees/mushroom/smolshroom5.iob rename to objects/shroom/mushclutt5.iob diff --git a/objects/shrub/shrub1.iob b/objects/shrub/shrub1.iob new file mode 100644 index 00000000..27884ded Binary files /dev/null and b/objects/shrub/shrub1.iob differ diff --git a/objects/shrub/shrub2.iob b/objects/shrub/shrub2.iob new file mode 100644 index 00000000..d385312b Binary files /dev/null and b/objects/shrub/shrub2.iob differ diff --git a/objects/shrub/shrub3.iob b/objects/shrub/shrub3.iob new file mode 100644 index 00000000..49f14a20 Binary files /dev/null and b/objects/shrub/shrub3.iob differ diff --git a/objects/skulls/giant-skull.iob b/objects/skulls/giant-skull.iob new file mode 100644 index 00000000..7ed4342f Binary files /dev/null and b/objects/skulls/giant-skull.iob differ diff --git a/objects/sm-tree/oakw-oakl-160.iob b/objects/sm-tree/oakw-oakl-160.iob new file mode 100644 index 00000000..bb65b0b9 Binary files /dev/null and b/objects/sm-tree/oakw-oakl-160.iob differ diff --git a/objects/sm-tree/oakw-oakl-80.iob b/objects/sm-tree/oakw-oakl-80.iob new file mode 100644 index 00000000..94edcee1 Binary files /dev/null and b/objects/sm-tree/oakw-oakl-80.iob differ diff --git a/objects/sm-tree/oakw-oakl.iob b/objects/sm-tree/oakw-oakl.iob new file mode 100644 index 00000000..3d15febd Binary files /dev/null and b/objects/sm-tree/oakw-oakl.iob differ diff --git a/objects/trees/birch/smallgeneric1.iob b/objects/small-birch/small-birch1.iob similarity index 100% rename from objects/trees/birch/smallgeneric1.iob rename to objects/small-birch/small-birch1.iob diff --git a/objects/trees/birch/smallgeneric2.iob b/objects/small-birch/small-birch10.iob similarity index 100% rename from objects/trees/birch/smallgeneric2.iob rename to objects/small-birch/small-birch10.iob diff --git a/objects/trees/birch/smallgeneric3.iob b/objects/small-birch/small-birch11.iob similarity index 100% rename from objects/trees/birch/smallgeneric3.iob rename to objects/small-birch/small-birch11.iob diff --git a/objects/trees/birch/smallgeneric4.iob b/objects/small-birch/small-birch2.iob similarity index 100% rename from objects/trees/birch/smallgeneric4.iob rename to objects/small-birch/small-birch2.iob diff --git a/objects/trees/birch/smallgeneric5.iob b/objects/small-birch/small-birch3.iob similarity index 100% rename from objects/trees/birch/smallgeneric5.iob rename to objects/small-birch/small-birch3.iob diff --git a/objects/trees/birch/smallgeneric6.iob b/objects/small-birch/small-birch4.iob similarity index 100% rename from objects/trees/birch/smallgeneric6.iob rename to objects/small-birch/small-birch4.iob diff --git a/objects/trees/birch/smallgeneric7.iob b/objects/small-birch/small-birch5.iob similarity index 100% rename from objects/trees/birch/smallgeneric7.iob rename to objects/small-birch/small-birch5.iob diff --git a/objects/trees/birch/smallgeneric8.iob b/objects/small-birch/small-birch6.iob similarity index 100% rename from objects/trees/birch/smallgeneric8.iob rename to objects/small-birch/small-birch6.iob diff --git a/objects/trees/birch/smallgeneric9.iob b/objects/small-birch/small-birch7.iob similarity index 100% rename from objects/trees/birch/smallgeneric9.iob rename to objects/small-birch/small-birch7.iob diff --git a/objects/trees/birch/smallgeneric10.iob b/objects/small-birch/small-birch8.iob similarity index 100% rename from objects/trees/birch/smallgeneric10.iob rename to objects/small-birch/small-birch8.iob diff --git a/objects/trees/birch/smallgeneric11.iob b/objects/small-birch/small-birch9.iob similarity index 100% rename from objects/trees/birch/smallgeneric11.iob rename to objects/small-birch/small-birch9.iob diff --git a/objects/trees/oak/smoak2.iob b/objects/small-oak/small-oak1.iob similarity index 100% rename from objects/trees/oak/smoak2.iob rename to objects/small-oak/small-oak1.iob diff --git a/objects/trees/oak/smoak13.iob b/objects/small-oak/small-oak10.iob similarity index 100% rename from objects/trees/oak/smoak13.iob rename to objects/small-oak/small-oak10.iob diff --git a/objects/trees/oak/smoak15.iob b/objects/small-oak/small-oak11.iob similarity index 100% rename from objects/trees/oak/smoak15.iob rename to objects/small-oak/small-oak11.iob diff --git a/objects/trees/oak/smoak16.iob b/objects/small-oak/small-oak12.iob similarity index 100% rename from objects/trees/oak/smoak16.iob rename to objects/small-oak/small-oak12.iob diff --git a/objects/trees/oak/smoak17.iob b/objects/small-oak/small-oak13.iob similarity index 100% rename from objects/trees/oak/smoak17.iob rename to objects/small-oak/small-oak13.iob diff --git a/objects/trees/oak/smoak18.iob b/objects/small-oak/small-oak14.iob similarity index 100% rename from objects/trees/oak/smoak18.iob rename to objects/small-oak/small-oak14.iob diff --git a/objects/trees/oak/smoak19.iob b/objects/small-oak/small-oak15.iob similarity index 100% rename from objects/trees/oak/smoak19.iob rename to objects/small-oak/small-oak15.iob diff --git a/objects/trees/oak/smoak20.iob b/objects/small-oak/small-oak16.iob similarity index 100% rename from objects/trees/oak/smoak20.iob rename to objects/small-oak/small-oak16.iob diff --git a/objects/trees/oak/smoak21.iob b/objects/small-oak/small-oak17.iob similarity index 100% rename from objects/trees/oak/smoak21.iob rename to objects/small-oak/small-oak17.iob diff --git a/objects/trees/oak/smoak3.iob b/objects/small-oak/small-oak18.iob similarity index 100% rename from objects/trees/oak/smoak3.iob rename to objects/small-oak/small-oak18.iob diff --git a/objects/trees/oak/smoak4.iob b/objects/small-oak/small-oak19.iob similarity index 100% rename from objects/trees/oak/smoak4.iob rename to objects/small-oak/small-oak19.iob diff --git a/objects/trees/oak/smoak5.iob b/objects/small-oak/small-oak2.iob similarity index 100% rename from objects/trees/oak/smoak5.iob rename to objects/small-oak/small-oak2.iob diff --git a/objects/trees/oak/smoak6.iob b/objects/small-oak/small-oak20.iob similarity index 100% rename from objects/trees/oak/smoak6.iob rename to objects/small-oak/small-oak20.iob diff --git a/objects/trees/oak/smoak7.iob b/objects/small-oak/small-oak3.iob similarity index 100% rename from objects/trees/oak/smoak7.iob rename to objects/small-oak/small-oak3.iob diff --git a/objects/trees/oak/smoak8.iob b/objects/small-oak/small-oak4.iob similarity index 100% rename from objects/trees/oak/smoak8.iob rename to objects/small-oak/small-oak4.iob diff --git a/objects/trees/oak/smoak9.iob b/objects/small-oak/small-oak5.iob similarity index 100% rename from objects/trees/oak/smoak9.iob rename to objects/small-oak/small-oak5.iob diff --git a/objects/trees/oak/smoak10.iob b/objects/small-oak/small-oak6.iob similarity index 100% rename from objects/trees/oak/smoak10.iob rename to objects/small-oak/small-oak6.iob diff --git a/objects/trees/oak/smoak11.iob b/objects/small-oak/small-oak7.iob similarity index 100% rename from objects/trees/oak/smoak11.iob rename to objects/small-oak/small-oak7.iob diff --git a/objects/trees/oak/smoak12.iob b/objects/small-oak/small-oak8.iob similarity index 100% rename from objects/trees/oak/smoak12.iob rename to objects/small-oak/small-oak8.iob diff --git a/objects/trees/oak/smoak14.iob b/objects/small-oak/small-oak9.iob similarity index 100% rename from objects/trees/oak/smoak14.iob rename to objects/small-oak/small-oak9.iob diff --git a/objects/structures/snowulder.iob b/objects/snowy/snowulder.iob similarity index 100% rename from objects/structures/snowulder.iob rename to objects/snowy/snowulder.iob diff --git a/objects/spire-ice-medium/IceSpire4.iob b/objects/spire-ice-medium/IceSpire4.iob new file mode 100644 index 00000000..f7b21fea Binary files /dev/null and b/objects/spire-ice-medium/IceSpire4.iob differ diff --git a/objects/spire-ice-medium/IceSpire5.iob b/objects/spire-ice-medium/IceSpire5.iob new file mode 100644 index 00000000..dc60ca06 Binary files /dev/null and b/objects/spire-ice-medium/IceSpire5.iob differ diff --git a/objects/spire-ice-medium/IceSpire6.iob b/objects/spire-ice-medium/IceSpire6.iob new file mode 100644 index 00000000..0e5fe105 Binary files /dev/null and b/objects/spire-ice-medium/IceSpire6.iob differ diff --git a/objects/spire-ice-small/IceSpire1.iob b/objects/spire-ice-small/IceSpire1.iob new file mode 100644 index 00000000..1c38e911 Binary files /dev/null and b/objects/spire-ice-small/IceSpire1.iob differ diff --git a/objects/spire-ice-small/IceSpire2.iob b/objects/spire-ice-small/IceSpire2.iob new file mode 100644 index 00000000..0a41b82c Binary files /dev/null and b/objects/spire-ice-small/IceSpire2.iob differ diff --git a/objects/spire-ice-small/IceSpire3.iob b/objects/spire-ice-small/IceSpire3.iob new file mode 100644 index 00000000..06ee6ccb Binary files /dev/null and b/objects/spire-ice-small/IceSpire3.iob differ diff --git a/objects/spire-magma/MagmaSpire1.iob b/objects/spire-magma/MagmaSpire1.iob new file mode 100644 index 00000000..1c38e911 Binary files /dev/null and b/objects/spire-magma/MagmaSpire1.iob differ diff --git a/objects/spire-magma/MagmaSpire2.iob b/objects/spire-magma/MagmaSpire2.iob new file mode 100644 index 00000000..0a41b82c Binary files /dev/null and b/objects/spire-magma/MagmaSpire2.iob differ diff --git a/objects/spire-magma/MagmaSpire3.iob b/objects/spire-magma/MagmaSpire3.iob new file mode 100644 index 00000000..06ee6ccb Binary files /dev/null and b/objects/spire-magma/MagmaSpire3.iob differ diff --git a/objects/trees/spruce/genericdead1.iob b/objects/spruce-dead/spruce_dead1.iob similarity index 100% rename from objects/trees/spruce/genericdead1.iob rename to objects/spruce-dead/spruce_dead1.iob diff --git a/objects/trees/spruce/genericdead2.iob b/objects/spruce-dead/spruce_dead2.iob similarity index 100% rename from objects/trees/spruce/genericdead2.iob rename to objects/spruce-dead/spruce_dead2.iob diff --git a/objects/trees/spruce/genericdead3.iob b/objects/spruce-dead/spruce_dead3.iob similarity index 100% rename from objects/trees/spruce/genericdead3.iob rename to objects/spruce-dead/spruce_dead3.iob diff --git a/objects/trees/spruce/denmyre1.iob b/objects/spruce-medium/spruce-denmyre-1.iob similarity index 100% rename from objects/trees/spruce/denmyre1.iob rename to objects/spruce-medium/spruce-denmyre-1.iob diff --git a/objects/trees/spruce/denmyre2.iob b/objects/spruce-medium/spruce-denmyre-10.iob similarity index 100% rename from objects/trees/spruce/denmyre2.iob rename to objects/spruce-medium/spruce-denmyre-10.iob diff --git a/objects/trees/spruce/denmyre3.iob b/objects/spruce-medium/spruce-denmyre-11.iob similarity index 100% rename from objects/trees/spruce/denmyre3.iob rename to objects/spruce-medium/spruce-denmyre-11.iob diff --git a/objects/trees/spruce/denmyre4.iob b/objects/spruce-medium/spruce-denmyre-12.iob similarity index 100% rename from objects/trees/spruce/denmyre4.iob rename to objects/spruce-medium/spruce-denmyre-12.iob diff --git a/objects/trees/spruce/denmyre5.iob b/objects/spruce-medium/spruce-denmyre-13.iob similarity index 100% rename from objects/trees/spruce/denmyre5.iob rename to objects/spruce-medium/spruce-denmyre-13.iob diff --git a/objects/trees/spruce/denmyre6.iob b/objects/spruce-medium/spruce-denmyre-14.iob similarity index 100% rename from objects/trees/spruce/denmyre6.iob rename to objects/spruce-medium/spruce-denmyre-14.iob diff --git a/objects/trees/spruce/denmyre7.iob b/objects/spruce-medium/spruce-denmyre-15.iob similarity index 100% rename from objects/trees/spruce/denmyre7.iob rename to objects/spruce-medium/spruce-denmyre-15.iob diff --git a/objects/trees/spruce/denmyre8.iob b/objects/spruce-medium/spruce-denmyre-16.iob similarity index 100% rename from objects/trees/spruce/denmyre8.iob rename to objects/spruce-medium/spruce-denmyre-16.iob diff --git a/objects/trees/spruce/denmyre9.iob b/objects/spruce-medium/spruce-denmyre-2.iob similarity index 100% rename from objects/trees/spruce/denmyre9.iob rename to objects/spruce-medium/spruce-denmyre-2.iob diff --git a/objects/trees/spruce/denmyre10.iob b/objects/spruce-medium/spruce-denmyre-3.iob similarity index 100% rename from objects/trees/spruce/denmyre10.iob rename to objects/spruce-medium/spruce-denmyre-3.iob diff --git a/objects/trees/spruce/denmyre11.iob b/objects/spruce-medium/spruce-denmyre-4.iob similarity index 100% rename from objects/trees/spruce/denmyre11.iob rename to objects/spruce-medium/spruce-denmyre-4.iob diff --git a/objects/trees/spruce/denmyre12.iob b/objects/spruce-medium/spruce-denmyre-5.iob similarity index 100% rename from objects/trees/spruce/denmyre12.iob rename to objects/spruce-medium/spruce-denmyre-5.iob diff --git a/objects/trees/spruce/denmyre13.iob b/objects/spruce-medium/spruce-denmyre-6.iob similarity index 100% rename from objects/trees/spruce/denmyre13.iob rename to objects/spruce-medium/spruce-denmyre-6.iob diff --git a/objects/trees/spruce/denmyre14.iob b/objects/spruce-medium/spruce-denmyre-7.iob similarity index 100% rename from objects/trees/spruce/denmyre14.iob rename to objects/spruce-medium/spruce-denmyre-7.iob diff --git a/objects/trees/spruce/denmyre15.iob b/objects/spruce-medium/spruce-denmyre-8.iob similarity index 100% rename from objects/trees/spruce/denmyre15.iob rename to objects/spruce-medium/spruce-denmyre-8.iob diff --git a/objects/trees/spruce/denmyre16.iob b/objects/spruce-medium/spruce-denmyre-9.iob similarity index 100% rename from objects/trees/spruce/denmyre16.iob rename to objects/spruce-medium/spruce-denmyre-9.iob diff --git a/objects/trees/spruce/vgeneric1.iob b/objects/spruce-medium/spruce1.iob similarity index 100% rename from objects/trees/spruce/vgeneric1.iob rename to objects/spruce-medium/spruce1.iob diff --git a/objects/trees/spruce/vgeneric2.iob b/objects/spruce-medium/spruce10.iob similarity index 100% rename from objects/trees/spruce/vgeneric2.iob rename to objects/spruce-medium/spruce10.iob diff --git a/objects/trees/spruce/vgeneric3.iob b/objects/spruce-medium/spruce11.iob similarity index 100% rename from objects/trees/spruce/vgeneric3.iob rename to objects/spruce-medium/spruce11.iob diff --git a/objects/trees/spruce/vgeneric4.iob b/objects/spruce-medium/spruce12.iob similarity index 100% rename from objects/trees/spruce/vgeneric4.iob rename to objects/spruce-medium/spruce12.iob diff --git a/objects/trees/spruce/vgeneric5.iob b/objects/spruce-medium/spruce13.iob similarity index 100% rename from objects/trees/spruce/vgeneric5.iob rename to objects/spruce-medium/spruce13.iob diff --git a/objects/trees/spruce/vgeneric6.iob b/objects/spruce-medium/spruce14.iob similarity index 100% rename from objects/trees/spruce/vgeneric6.iob rename to objects/spruce-medium/spruce14.iob diff --git a/objects/trees/spruce/vgeneric7.iob b/objects/spruce-medium/spruce16.iob similarity index 100% rename from objects/trees/spruce/vgeneric7.iob rename to objects/spruce-medium/spruce16.iob diff --git a/objects/trees/spruce/vgeneric8.iob b/objects/spruce-medium/spruce17.iob similarity index 100% rename from objects/trees/spruce/vgeneric8.iob rename to objects/spruce-medium/spruce17.iob diff --git a/objects/trees/spruce/vgeneric9.iob b/objects/spruce-medium/spruce18.iob similarity index 100% rename from objects/trees/spruce/vgeneric9.iob rename to objects/spruce-medium/spruce18.iob diff --git a/objects/trees/spruce/vgeneric10.iob b/objects/spruce-medium/spruce19.iob similarity index 100% rename from objects/trees/spruce/vgeneric10.iob rename to objects/spruce-medium/spruce19.iob diff --git a/objects/trees/spruce/vgeneric11.iob b/objects/spruce-medium/spruce2.iob similarity index 100% rename from objects/trees/spruce/vgeneric11.iob rename to objects/spruce-medium/spruce2.iob diff --git a/objects/trees/spruce/vgeneric12.iob b/objects/spruce-medium/spruce20.iob similarity index 100% rename from objects/trees/spruce/vgeneric12.iob rename to objects/spruce-medium/spruce20.iob diff --git a/objects/trees/spruce/vgeneric13.iob b/objects/spruce-medium/spruce27.iob similarity index 100% rename from objects/trees/spruce/vgeneric13.iob rename to objects/spruce-medium/spruce27.iob diff --git a/objects/trees/spruce/vgeneric14.iob b/objects/spruce-medium/spruce28.iob similarity index 100% rename from objects/trees/spruce/vgeneric14.iob rename to objects/spruce-medium/spruce28.iob diff --git a/objects/trees/spruce/vgeneric15.iob b/objects/spruce-medium/spruce29.iob similarity index 100% rename from objects/trees/spruce/vgeneric15.iob rename to objects/spruce-medium/spruce29.iob diff --git a/objects/trees/spruce/vgeneric16.iob b/objects/spruce-medium/spruce3.iob similarity index 100% rename from objects/trees/spruce/vgeneric16.iob rename to objects/spruce-medium/spruce3.iob diff --git a/objects/trees/spruce/vgeneric17.iob b/objects/spruce-medium/spruce30.iob similarity index 100% rename from objects/trees/spruce/vgeneric17.iob rename to objects/spruce-medium/spruce30.iob diff --git a/objects/trees/spruce/vgeneric18.iob b/objects/spruce-medium/spruce31.iob similarity index 100% rename from objects/trees/spruce/vgeneric18.iob rename to objects/spruce-medium/spruce31.iob diff --git a/objects/trees/spruce/vgeneric19.iob b/objects/spruce-medium/spruce32.iob similarity index 100% rename from objects/trees/spruce/vgeneric19.iob rename to objects/spruce-medium/spruce32.iob diff --git a/objects/trees/spruce/vgeneric20.iob b/objects/spruce-medium/spruce33.iob similarity index 100% rename from objects/trees/spruce/vgeneric20.iob rename to objects/spruce-medium/spruce33.iob diff --git a/objects/trees/spruce/vgeneric21.iob b/objects/spruce-medium/spruce34.iob similarity index 100% rename from objects/trees/spruce/vgeneric21.iob rename to objects/spruce-medium/spruce34.iob diff --git a/objects/trees/spruce/vgeneric22.iob b/objects/spruce-medium/spruce37.iob similarity index 100% rename from objects/trees/spruce/vgeneric22.iob rename to objects/spruce-medium/spruce37.iob diff --git a/objects/trees/spruce/vgeneric23.iob b/objects/spruce-medium/spruce39.iob similarity index 100% rename from objects/trees/spruce/vgeneric23.iob rename to objects/spruce-medium/spruce39.iob diff --git a/objects/trees/spruce/vgeneric24.iob b/objects/spruce-medium/spruce4.iob similarity index 100% rename from objects/trees/spruce/vgeneric24.iob rename to objects/spruce-medium/spruce4.iob diff --git a/objects/trees/spruce/vgeneric25.iob b/objects/spruce-medium/spruce41.iob similarity index 100% rename from objects/trees/spruce/vgeneric25.iob rename to objects/spruce-medium/spruce41.iob diff --git a/objects/trees/spruce/vgeneric26.iob b/objects/spruce-medium/spruce42.iob similarity index 100% rename from objects/trees/spruce/vgeneric26.iob rename to objects/spruce-medium/spruce42.iob diff --git a/objects/trees/spruce/vgeneric27.iob b/objects/spruce-medium/spruce43.iob similarity index 100% rename from objects/trees/spruce/vgeneric27.iob rename to objects/spruce-medium/spruce43.iob diff --git a/objects/trees/spruce/vgeneric28.iob b/objects/spruce-medium/spruce5.iob similarity index 100% rename from objects/trees/spruce/vgeneric28.iob rename to objects/spruce-medium/spruce5.iob diff --git a/objects/trees/spruce/vgeneric29.iob b/objects/spruce-medium/spruce6.iob similarity index 100% rename from objects/trees/spruce/vgeneric29.iob rename to objects/spruce-medium/spruce6.iob diff --git a/objects/trees/spruce/vgeneric30.iob b/objects/spruce-medium/spruce7.iob similarity index 100% rename from objects/trees/spruce/vgeneric30.iob rename to objects/spruce-medium/spruce7.iob diff --git a/objects/trees/spruce/vgeneric31.iob b/objects/spruce-medium/spruce8.iob similarity index 100% rename from objects/trees/spruce/vgeneric31.iob rename to objects/spruce-medium/spruce8.iob diff --git a/objects/trees/spruce/vgeneric32.iob b/objects/spruce-medium/spruce9.iob similarity index 100% rename from objects/trees/spruce/vgeneric32.iob rename to objects/spruce-medium/spruce9.iob diff --git a/objects/trees/spruce/smol1.iob b/objects/spruce-small/spruce1.iob similarity index 100% rename from objects/trees/spruce/smol1.iob rename to objects/spruce-small/spruce1.iob diff --git a/objects/trees/spruce/smol2.iob b/objects/spruce-small/spruce10.iob similarity index 100% rename from objects/trees/spruce/smol2.iob rename to objects/spruce-small/spruce10.iob diff --git a/objects/trees/spruce/smol3.iob b/objects/spruce-small/spruce11.iob similarity index 100% rename from objects/trees/spruce/smol3.iob rename to objects/spruce-small/spruce11.iob diff --git a/objects/trees/spruce/smol4.iob b/objects/spruce-small/spruce12.iob similarity index 100% rename from objects/trees/spruce/smol4.iob rename to objects/spruce-small/spruce12.iob diff --git a/objects/trees/spruce/smol5.iob b/objects/spruce-small/spruce13.iob similarity index 100% rename from objects/trees/spruce/smol5.iob rename to objects/spruce-small/spruce13.iob diff --git a/objects/trees/spruce/smol6.iob b/objects/spruce-small/spruce2.iob similarity index 100% rename from objects/trees/spruce/smol6.iob rename to objects/spruce-small/spruce2.iob diff --git a/objects/trees/spruce/smol7.iob b/objects/spruce-small/spruce3.iob similarity index 100% rename from objects/trees/spruce/smol7.iob rename to objects/spruce-small/spruce3.iob diff --git a/objects/trees/spruce/smol8.iob b/objects/spruce-small/spruce4.iob similarity index 100% rename from objects/trees/spruce/smol8.iob rename to objects/spruce-small/spruce4.iob diff --git a/objects/trees/spruce/smol9.iob b/objects/spruce-small/spruce5.iob similarity index 100% rename from objects/trees/spruce/smol9.iob rename to objects/spruce-small/spruce5.iob diff --git a/objects/trees/spruce/smol10.iob b/objects/spruce-small/spruce6.iob similarity index 100% rename from objects/trees/spruce/smol10.iob rename to objects/spruce-small/spruce6.iob diff --git a/objects/trees/spruce/smol11.iob b/objects/spruce-small/spruce7.iob similarity index 100% rename from objects/trees/spruce/smol11.iob rename to objects/spruce-small/spruce7.iob diff --git a/objects/trees/spruce/smol12.iob b/objects/spruce-small/spruce8.iob similarity index 100% rename from objects/trees/spruce/smol12.iob rename to objects/spruce-small/spruce8.iob diff --git a/objects/trees/spruce/smol13.iob b/objects/spruce-small/spruce9.iob similarity index 100% rename from objects/trees/spruce/smol13.iob rename to objects/spruce-small/spruce9.iob diff --git a/objects/statue/sub-stat-1.iob b/objects/statue/sub-stat-1.iob new file mode 100644 index 00000000..f1c98ef2 Binary files /dev/null and b/objects/statue/sub-stat-1.iob differ diff --git a/objects/statue/sub-stat-2.iob b/objects/statue/sub-stat-2.iob new file mode 100644 index 00000000..65a4a5d0 Binary files /dev/null and b/objects/statue/sub-stat-2.iob differ diff --git a/objects/statue/sub-stat-3.iob b/objects/statue/sub-stat-3.iob new file mode 100644 index 00000000..425c920c Binary files /dev/null and b/objects/statue/sub-stat-3.iob differ diff --git a/objects/statue/sub-stat-4.iob b/objects/statue/sub-stat-4.iob new file mode 100644 index 00000000..c0f03b3f Binary files /dev/null and b/objects/statue/sub-stat-4.iob differ diff --git a/objects/statue/sub-stat-5.iob b/objects/statue/sub-stat-5.iob new file mode 100644 index 00000000..4a2967c1 Binary files /dev/null and b/objects/statue/sub-stat-5.iob differ diff --git a/objects/stone-clutt/obelisk-1.iob b/objects/stone-clutt/obelisk-1.iob new file mode 100644 index 00000000..6c7634dc Binary files /dev/null and b/objects/stone-clutt/obelisk-1.iob differ diff --git a/objects/stone-clutt/obelisk-2.iob b/objects/stone-clutt/obelisk-2.iob new file mode 100644 index 00000000..c76965d3 Binary files /dev/null and b/objects/stone-clutt/obelisk-2.iob differ diff --git a/objects/stone-clutt/obelisk-3.iob b/objects/stone-clutt/obelisk-3.iob new file mode 100644 index 00000000..66826251 Binary files /dev/null and b/objects/stone-clutt/obelisk-3.iob differ diff --git a/objects/stone-clutt/obelisk-4.iob b/objects/stone-clutt/obelisk-4.iob new file mode 100644 index 00000000..2ac99d73 Binary files /dev/null and b/objects/stone-clutt/obelisk-4.iob differ diff --git a/objects/stone-clutt/obelisk-5.iob b/objects/stone-clutt/obelisk-5.iob new file mode 100644 index 00000000..570c14d6 Binary files /dev/null and b/objects/stone-clutt/obelisk-5.iob differ diff --git a/objects/stone-clutt/obelisk-6.iob b/objects/stone-clutt/obelisk-6.iob new file mode 100644 index 00000000..133ee092 Binary files /dev/null and b/objects/stone-clutt/obelisk-6.iob differ diff --git a/objects/stone-clutt/obelisk-7.iob b/objects/stone-clutt/obelisk-7.iob new file mode 100644 index 00000000..03fad75c Binary files /dev/null and b/objects/stone-clutt/obelisk-7.iob differ diff --git a/objects/stone-clutt/stone-spike-1.iob b/objects/stone-clutt/stone-spike-1.iob new file mode 100644 index 00000000..ace7fec4 Binary files /dev/null and b/objects/stone-clutt/stone-spike-1.iob differ diff --git a/objects/stone-clutt/stone-spike-2.iob b/objects/stone-clutt/stone-spike-2.iob new file mode 100644 index 00000000..b9a56472 Binary files /dev/null and b/objects/stone-clutt/stone-spike-2.iob differ diff --git a/objects/stone-clutt/stone-spike-3.iob b/objects/stone-clutt/stone-spike-3.iob new file mode 100644 index 00000000..c1cf3feb Binary files /dev/null and b/objects/stone-clutt/stone-spike-3.iob differ diff --git a/objects/stone-clutt/stone-spike-4.iob b/objects/stone-clutt/stone-spike-4.iob new file mode 100644 index 00000000..48b446f4 Binary files /dev/null and b/objects/stone-clutt/stone-spike-4.iob differ diff --git a/objects/stone-clutt/stone-spike-5.iob b/objects/stone-clutt/stone-spike-5.iob new file mode 100644 index 00000000..c512745d Binary files /dev/null and b/objects/stone-clutt/stone-spike-5.iob differ diff --git a/objects/stone-clutt/stone-spike-6.iob b/objects/stone-clutt/stone-spike-6.iob new file mode 100644 index 00000000..1106edc5 Binary files /dev/null and b/objects/stone-clutt/stone-spike-6.iob differ diff --git a/objects/stone-clutt/stone-spike-7.iob b/objects/stone-clutt/stone-spike-7.iob new file mode 100644 index 00000000..7d232d58 Binary files /dev/null and b/objects/stone-clutt/stone-spike-7.iob differ diff --git a/objects/stone-clutt/stone-spike-8.iob b/objects/stone-clutt/stone-spike-8.iob new file mode 100644 index 00000000..8f33b48b Binary files /dev/null and b/objects/stone-clutt/stone-spike-8.iob differ diff --git a/objects/jigsaw/stronghold/ceiling/5x5/bar-lamp.iob b/objects/stronghold/ceiling/5x5/bar-lamp.iob similarity index 100% rename from objects/jigsaw/stronghold/ceiling/5x5/bar-lamp.iob rename to objects/stronghold/ceiling/5x5/bar-lamp.iob diff --git a/objects/jigsaw/stronghold/ceiling/5x5/lamp.iob b/objects/stronghold/ceiling/5x5/lamp.iob similarity index 100% rename from objects/jigsaw/stronghold/ceiling/5x5/lamp.iob rename to objects/stronghold/ceiling/5x5/lamp.iob diff --git a/objects/jigsaw/stronghold/ceiling/5x5/wood-beams.iob b/objects/stronghold/ceiling/5x5/wood-beams.iob similarity index 100% rename from objects/jigsaw/stronghold/ceiling/5x5/wood-beams.iob rename to objects/stronghold/ceiling/5x5/wood-beams.iob diff --git a/objects/jigsaw/stronghold/ceiling/7x7/flat.iob b/objects/stronghold/ceiling/7x7/flat.iob similarity index 100% rename from objects/jigsaw/stronghold/ceiling/7x7/flat.iob rename to objects/stronghold/ceiling/7x7/flat.iob diff --git a/objects/jigsaw/stronghold/ceiling/7x7/wood-beams.iob b/objects/stronghold/ceiling/7x7/wood-beams.iob similarity index 100% rename from objects/jigsaw/stronghold/ceiling/7x7/wood-beams.iob rename to objects/stronghold/ceiling/7x7/wood-beams.iob diff --git a/objects/jigsaw/stronghold/floor/3x3/flat.iob b/objects/stronghold/floor/3x3/flat.iob similarity index 100% rename from objects/jigsaw/stronghold/floor/3x3/flat.iob rename to objects/stronghold/floor/3x3/flat.iob diff --git a/objects/jigsaw/stronghold/floor/3x3/tnt.iob b/objects/stronghold/floor/3x3/tnt.iob similarity index 100% rename from objects/jigsaw/stronghold/floor/3x3/tnt.iob rename to objects/stronghold/floor/3x3/tnt.iob diff --git a/objects/jigsaw/stronghold/jail/1.iob b/objects/stronghold/jail/1.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/1.iob rename to objects/stronghold/jail/1.iob diff --git a/objects/jigsaw/stronghold/jail/10.iob b/objects/stronghold/jail/10.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/10.iob rename to objects/stronghold/jail/10.iob diff --git a/objects/jigsaw/stronghold/jail/11.iob b/objects/stronghold/jail/11.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/11.iob rename to objects/stronghold/jail/11.iob diff --git a/objects/jigsaw/stronghold/jail/12.iob b/objects/stronghold/jail/12.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/12.iob rename to objects/stronghold/jail/12.iob diff --git a/objects/jigsaw/stronghold/jail/2.iob b/objects/stronghold/jail/2.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/2.iob rename to objects/stronghold/jail/2.iob diff --git a/objects/jigsaw/stronghold/jail/3.iob b/objects/stronghold/jail/3.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/3.iob rename to objects/stronghold/jail/3.iob diff --git a/objects/jigsaw/stronghold/jail/4.iob b/objects/stronghold/jail/4.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/4.iob rename to objects/stronghold/jail/4.iob diff --git a/objects/jigsaw/stronghold/jail/5.iob b/objects/stronghold/jail/5.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/5.iob rename to objects/stronghold/jail/5.iob diff --git a/objects/jigsaw/stronghold/jail/6.iob b/objects/stronghold/jail/6.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/6.iob rename to objects/stronghold/jail/6.iob diff --git a/objects/jigsaw/stronghold/jail/7.iob b/objects/stronghold/jail/7.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/7.iob rename to objects/stronghold/jail/7.iob diff --git a/objects/jigsaw/stronghold/jail/8.iob b/objects/stronghold/jail/8.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/8.iob rename to objects/stronghold/jail/8.iob diff --git a/objects/jigsaw/stronghold/jail/9.iob b/objects/stronghold/jail/9.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/9.iob rename to objects/stronghold/jail/9.iob diff --git a/objects/jigsaw/stronghold/jail/blank.iob b/objects/stronghold/jail/blank.iob similarity index 100% rename from objects/jigsaw/stronghold/jail/blank.iob rename to objects/stronghold/jail/blank.iob diff --git a/objects/jigsaw/stronghold/path/4way-spiral-staircase.iob b/objects/stronghold/path/4way-spiral-staircase.iob similarity index 100% rename from objects/jigsaw/stronghold/path/4way-spiral-staircase.iob rename to objects/stronghold/path/4way-spiral-staircase.iob diff --git a/objects/jigsaw/stronghold/path/cap.iob b/objects/stronghold/path/cap.iob similarity index 100% rename from objects/jigsaw/stronghold/path/cap.iob rename to objects/stronghold/path/cap.iob diff --git a/objects/jigsaw/stronghold/path/corner-cross.iob b/objects/stronghold/path/corner-cross.iob similarity index 100% rename from objects/jigsaw/stronghold/path/corner-cross.iob rename to objects/stronghold/path/corner-cross.iob diff --git a/objects/jigsaw/stronghold/path/corner-cross.iob.bak b/objects/stronghold/path/corner-cross.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/path/corner-cross.iob.bak rename to objects/stronghold/path/corner-cross.iob.bak diff --git a/objects/jigsaw/stronghold/path/corridor-cross.iob b/objects/stronghold/path/corridor-cross.iob similarity index 100% rename from objects/jigsaw/stronghold/path/corridor-cross.iob rename to objects/stronghold/path/corridor-cross.iob diff --git a/objects/jigsaw/stronghold/path/fancy-cross.iob b/objects/stronghold/path/fancy-cross.iob similarity index 100% rename from objects/jigsaw/stronghold/path/fancy-cross.iob rename to objects/stronghold/path/fancy-cross.iob diff --git a/objects/jigsaw/stronghold/path/hall-5x7x5.iob b/objects/stronghold/path/hall-5x7x5.iob similarity index 100% rename from objects/jigsaw/stronghold/path/hall-5x7x5.iob rename to objects/stronghold/path/hall-5x7x5.iob diff --git a/objects/jigsaw/stronghold/path/hazard-hall1.iob b/objects/stronghold/path/hazard-hall1.iob similarity index 100% rename from objects/jigsaw/stronghold/path/hazard-hall1.iob rename to objects/stronghold/path/hazard-hall1.iob diff --git a/objects/jigsaw/stronghold/path/hazard-hall2.iob b/objects/stronghold/path/hazard-hall2.iob similarity index 100% rename from objects/jigsaw/stronghold/path/hazard-hall2.iob rename to objects/stronghold/path/hazard-hall2.iob diff --git a/objects/jigsaw/stronghold/path/hazard-hall3.iob b/objects/stronghold/path/hazard-hall3.iob similarity index 100% rename from objects/jigsaw/stronghold/path/hazard-hall3.iob rename to objects/stronghold/path/hazard-hall3.iob diff --git a/objects/jigsaw/stronghold/path/iron-door.iob b/objects/stronghold/path/iron-door.iob similarity index 100% rename from objects/jigsaw/stronghold/path/iron-door.iob rename to objects/stronghold/path/iron-door.iob diff --git a/objects/jigsaw/stronghold/path/iron-door2.iob b/objects/stronghold/path/iron-door2.iob similarity index 100% rename from objects/jigsaw/stronghold/path/iron-door2.iob rename to objects/stronghold/path/iron-door2.iob diff --git a/objects/jigsaw/stronghold/path/jail-room1.iob b/objects/stronghold/path/jail-room1.iob similarity index 100% rename from objects/jigsaw/stronghold/path/jail-room1.iob rename to objects/stronghold/path/jail-room1.iob diff --git a/objects/jigsaw/stronghold/path/jail-room1.iob.bak b/objects/stronghold/path/jail-room1.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/path/jail-room1.iob.bak rename to objects/stronghold/path/jail-room1.iob.bak diff --git a/objects/jigsaw/stronghold/path/jail-room2.iob b/objects/stronghold/path/jail-room2.iob similarity index 100% rename from objects/jigsaw/stronghold/path/jail-room2.iob rename to objects/stronghold/path/jail-room2.iob diff --git a/objects/jigsaw/stronghold/path/jail-room2.iob.bak b/objects/stronghold/path/jail-room2.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/path/jail-room2.iob.bak rename to objects/stronghold/path/jail-room2.iob.bak diff --git a/objects/jigsaw/stronghold/path/large-corridor.iob b/objects/stronghold/path/large-corridor.iob similarity index 100% rename from objects/jigsaw/stronghold/path/large-corridor.iob rename to objects/stronghold/path/large-corridor.iob diff --git a/objects/jigsaw/stronghold/path/large-cross-stairs.iob b/objects/stronghold/path/large-cross-stairs.iob similarity index 100% rename from objects/jigsaw/stronghold/path/large-cross-stairs.iob rename to objects/stronghold/path/large-cross-stairs.iob diff --git a/objects/jigsaw/stronghold/path/large-cross-stairs.iob.old b/objects/stronghold/path/large-cross-stairs.iob.old similarity index 100% rename from objects/jigsaw/stronghold/path/large-cross-stairs.iob.old rename to objects/stronghold/path/large-cross-stairs.iob.old diff --git a/objects/jigsaw/stronghold/path/large-spiral-staircase.iob b/objects/stronghold/path/large-spiral-staircase.iob similarity index 100% rename from objects/jigsaw/stronghold/path/large-spiral-staircase.iob rename to objects/stronghold/path/large-spiral-staircase.iob diff --git a/objects/jigsaw/stronghold/path/long-corridor.iob b/objects/stronghold/path/long-corridor.iob similarity index 100% rename from objects/jigsaw/stronghold/path/long-corridor.iob rename to objects/stronghold/path/long-corridor.iob diff --git a/objects/jigsaw/stronghold/path/medium-corridor.iob b/objects/stronghold/path/medium-corridor.iob similarity index 100% rename from objects/jigsaw/stronghold/path/medium-corridor.iob rename to objects/stronghold/path/medium-corridor.iob diff --git a/objects/jigsaw/stronghold/path/medium-corridor2.iob b/objects/stronghold/path/medium-corridor2.iob similarity index 100% rename from objects/jigsaw/stronghold/path/medium-corridor2.iob rename to objects/stronghold/path/medium-corridor2.iob diff --git a/objects/jigsaw/stronghold/path/medium-cross.iob b/objects/stronghold/path/medium-cross.iob similarity index 100% rename from objects/jigsaw/stronghold/path/medium-cross.iob rename to objects/stronghold/path/medium-cross.iob diff --git a/objects/jigsaw/stronghold/path/medium-wide-corridor1.iob b/objects/stronghold/path/medium-wide-corridor1.iob similarity index 100% rename from objects/jigsaw/stronghold/path/medium-wide-corridor1.iob rename to objects/stronghold/path/medium-wide-corridor1.iob diff --git a/objects/jigsaw/stronghold/path/portal-hall.iob b/objects/stronghold/path/portal-hall.iob similarity index 100% rename from objects/jigsaw/stronghold/path/portal-hall.iob rename to objects/stronghold/path/portal-hall.iob diff --git a/objects/jigsaw/stronghold/path/small-corridor.iob b/objects/stronghold/path/small-corridor.iob similarity index 100% rename from objects/jigsaw/stronghold/path/small-corridor.iob rename to objects/stronghold/path/small-corridor.iob diff --git a/objects/jigsaw/stronghold/path/small-corridor2.iob b/objects/stronghold/path/small-corridor2.iob similarity index 100% rename from objects/jigsaw/stronghold/path/small-corridor2.iob rename to objects/stronghold/path/small-corridor2.iob diff --git a/objects/jigsaw/stronghold/path/small-cross.iob b/objects/stronghold/path/small-cross.iob similarity index 100% rename from objects/jigsaw/stronghold/path/small-cross.iob rename to objects/stronghold/path/small-cross.iob diff --git a/objects/jigsaw/stronghold/path/small-spiral-staircase.iob b/objects/stronghold/path/small-spiral-staircase.iob similarity index 100% rename from objects/jigsaw/stronghold/path/small-spiral-staircase.iob rename to objects/stronghold/path/small-spiral-staircase.iob diff --git a/objects/jigsaw/stronghold/path/stair-split.iob b/objects/stronghold/path/stair-split.iob similarity index 100% rename from objects/jigsaw/stronghold/path/stair-split.iob rename to objects/stronghold/path/stair-split.iob diff --git a/objects/jigsaw/stronghold/path/stairs1.iob b/objects/stronghold/path/stairs1.iob similarity index 100% rename from objects/jigsaw/stronghold/path/stairs1.iob rename to objects/stronghold/path/stairs1.iob diff --git a/objects/jigsaw/stronghold/path/straight-staircase.iob b/objects/stronghold/path/straight-staircase.iob similarity index 100% rename from objects/jigsaw/stronghold/path/straight-staircase.iob rename to objects/stronghold/path/straight-staircase.iob diff --git a/objects/jigsaw/stronghold/path/tee-cross.iob b/objects/stronghold/path/tee-cross.iob similarity index 100% rename from objects/jigsaw/stronghold/path/tee-cross.iob rename to objects/stronghold/path/tee-cross.iob diff --git a/objects/jigsaw/stronghold/path/tee-cross.iob.bak b/objects/stronghold/path/tee-cross.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/path/tee-cross.iob.bak rename to objects/stronghold/path/tee-cross.iob.bak diff --git a/objects/jigsaw/stronghold/path/tee-cross2.iob b/objects/stronghold/path/tee-cross2.iob similarity index 100% rename from objects/jigsaw/stronghold/path/tee-cross2.iob rename to objects/stronghold/path/tee-cross2.iob diff --git a/objects/jigsaw/stronghold/path/tee-cross2.iob.bak b/objects/stronghold/path/tee-cross2.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/path/tee-cross2.iob.bak rename to objects/stronghold/path/tee-cross2.iob.bak diff --git a/objects/jigsaw/stronghold/path/tiny-cross.iob b/objects/stronghold/path/tiny-cross.iob similarity index 100% rename from objects/jigsaw/stronghold/path/tiny-cross.iob rename to objects/stronghold/path/tiny-cross.iob diff --git a/objects/jigsaw/stronghold/path/wood-door.iob b/objects/stronghold/path/wood-door.iob similarity index 100% rename from objects/jigsaw/stronghold/path/wood-door.iob rename to objects/stronghold/path/wood-door.iob diff --git a/objects/jigsaw/stronghold/path/wood-door2.iob b/objects/stronghold/path/wood-door2.iob similarity index 100% rename from objects/jigsaw/stronghold/path/wood-door2.iob rename to objects/stronghold/path/wood-door2.iob diff --git a/objects/jigsaw/stronghold/portal/main.iob b/objects/stronghold/portal/main.iob similarity index 100% rename from objects/jigsaw/stronghold/portal/main.iob rename to objects/stronghold/portal/main.iob diff --git a/objects/jigsaw/stronghold/portal/top.iob b/objects/stronghold/portal/top.iob similarity index 100% rename from objects/jigsaw/stronghold/portal/top.iob rename to objects/stronghold/portal/top.iob diff --git a/objects/jigsaw/stronghold/portal/top_new.iob b/objects/stronghold/portal/top_new.iob similarity index 100% rename from objects/jigsaw/stronghold/portal/top_new.iob rename to objects/stronghold/portal/top_new.iob diff --git a/objects/jigsaw/stronghold/room/portal-room.iob b/objects/stronghold/room/portal-room.iob similarity index 100% rename from objects/jigsaw/stronghold/room/portal-room.iob rename to objects/stronghold/room/portal-room.iob diff --git a/objects/jigsaw/stronghold/room/sleeping-quarters.iob b/objects/stronghold/room/sleeping-quarters.iob similarity index 100% rename from objects/jigsaw/stronghold/room/sleeping-quarters.iob rename to objects/stronghold/room/sleeping-quarters.iob diff --git a/objects/jigsaw/stronghold/room/small-cell.iob b/objects/stronghold/room/small-cell.iob similarity index 100% rename from objects/jigsaw/stronghold/room/small-cell.iob rename to objects/stronghold/room/small-cell.iob diff --git a/objects/jigsaw/stronghold/room/stairs-down.iob b/objects/stronghold/room/stairs-down.iob similarity index 100% rename from objects/jigsaw/stronghold/room/stairs-down.iob rename to objects/stronghold/room/stairs-down.iob diff --git a/objects/jigsaw/stronghold/room/stairs-up-down.iob b/objects/stronghold/room/stairs-up-down.iob similarity index 100% rename from objects/jigsaw/stronghold/room/stairs-up-down.iob rename to objects/stronghold/room/stairs-up-down.iob diff --git a/objects/jigsaw/stronghold/room/stairs-up.iob b/objects/stronghold/room/stairs-up.iob similarity index 100% rename from objects/jigsaw/stronghold/room/stairs-up.iob rename to objects/stronghold/room/stairs-up.iob diff --git a/objects/jigsaw/stronghold/room/study.iob b/objects/stronghold/room/study.iob similarity index 100% rename from objects/jigsaw/stronghold/room/study.iob rename to objects/stronghold/room/study.iob diff --git a/objects/jigsaw/stronghold/room/witch-room-end.iob b/objects/stronghold/room/witch-room-end.iob similarity index 100% rename from objects/jigsaw/stronghold/room/witch-room-end.iob rename to objects/stronghold/room/witch-room-end.iob diff --git a/objects/jigsaw/stronghold/room/witch-room.iob b/objects/stronghold/room/witch-room.iob similarity index 100% rename from objects/jigsaw/stronghold/room/witch-room.iob rename to objects/stronghold/room/witch-room.iob diff --git a/objects/jigsaw/stronghold/rooms/alter1.iob b/objects/stronghold/rooms/alter1.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/alter1.iob rename to objects/stronghold/rooms/alter1.iob diff --git a/objects/jigsaw/stronghold/rooms/alter1.iob.bak b/objects/stronghold/rooms/alter1.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/alter1.iob.bak rename to objects/stronghold/rooms/alter1.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/boomtube-test.iob b/objects/stronghold/rooms/boomtube-test.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/boomtube-test.iob rename to objects/stronghold/rooms/boomtube-test.iob diff --git a/objects/jigsaw/stronghold/rooms/chestroom1-trap.iob b/objects/stronghold/rooms/chestroom1-trap.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom1-trap.iob rename to objects/stronghold/rooms/chestroom1-trap.iob diff --git a/objects/jigsaw/stronghold/rooms/chestroom1-trap.iob.bak b/objects/stronghold/rooms/chestroom1-trap.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom1-trap.iob.bak rename to objects/stronghold/rooms/chestroom1-trap.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/chestroom1.iob b/objects/stronghold/rooms/chestroom1.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom1.iob rename to objects/stronghold/rooms/chestroom1.iob diff --git a/objects/jigsaw/stronghold/rooms/chestroom1.iob.bak b/objects/stronghold/rooms/chestroom1.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom1.iob.bak rename to objects/stronghold/rooms/chestroom1.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/chestroom2-trap.iob b/objects/stronghold/rooms/chestroom2-trap.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom2-trap.iob rename to objects/stronghold/rooms/chestroom2-trap.iob diff --git a/objects/jigsaw/stronghold/rooms/chestroom2-trap.iob.bak b/objects/stronghold/rooms/chestroom2-trap.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom2-trap.iob.bak rename to objects/stronghold/rooms/chestroom2-trap.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/chestroom2.iob b/objects/stronghold/rooms/chestroom2.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom2.iob rename to objects/stronghold/rooms/chestroom2.iob diff --git a/objects/jigsaw/stronghold/rooms/chestroom2.iob.bak b/objects/stronghold/rooms/chestroom2.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/chestroom2.iob.bak rename to objects/stronghold/rooms/chestroom2.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/jail-complex.iob b/objects/stronghold/rooms/jail-complex.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/jail-complex.iob rename to objects/stronghold/rooms/jail-complex.iob diff --git a/objects/jigsaw/stronghold/rooms/library-large.iob b/objects/stronghold/rooms/library-large.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/library-large.iob rename to objects/stronghold/rooms/library-large.iob diff --git a/objects/jigsaw/stronghold/rooms/library.iob b/objects/stronghold/rooms/library.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/library.iob rename to objects/stronghold/rooms/library.iob diff --git a/objects/jigsaw/stronghold/rooms/library.iob.bak b/objects/stronghold/rooms/library.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/library.iob.bak rename to objects/stronghold/rooms/library.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/maze1.iob b/objects/stronghold/rooms/maze1.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/maze1.iob rename to objects/stronghold/rooms/maze1.iob diff --git a/objects/jigsaw/stronghold/rooms/maze1.iob.bak b/objects/stronghold/rooms/maze1.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/maze1.iob.bak rename to objects/stronghold/rooms/maze1.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/maze2.iob b/objects/stronghold/rooms/maze2.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/maze2.iob rename to objects/stronghold/rooms/maze2.iob diff --git a/objects/jigsaw/stronghold/rooms/maze2.iob.bak b/objects/stronghold/rooms/maze2.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/maze2.iob.bak rename to objects/stronghold/rooms/maze2.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/maze3.iob b/objects/stronghold/rooms/maze3.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/maze3.iob rename to objects/stronghold/rooms/maze3.iob diff --git a/objects/jigsaw/stronghold/rooms/maze3.iob.bak b/objects/stronghold/rooms/maze3.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/maze3.iob.bak rename to objects/stronghold/rooms/maze3.iob.bak diff --git a/objects/jigsaw/stronghold/rooms/oreroom.iob b/objects/stronghold/rooms/oreroom.iob similarity index 100% rename from objects/jigsaw/stronghold/rooms/oreroom.iob rename to objects/stronghold/rooms/oreroom.iob diff --git a/objects/jigsaw/stronghold/rooms/oreroom.iob.bak b/objects/stronghold/rooms/oreroom.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/rooms/oreroom.iob.bak rename to objects/stronghold/rooms/oreroom.iob.bak diff --git a/objects/jigsaw/stronghold/stairs/casing-floor-hollow.iob b/objects/stronghold/stairs/casing-floor-hollow.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/casing-floor-hollow.iob rename to objects/stronghold/stairs/casing-floor-hollow.iob diff --git a/objects/jigsaw/stronghold/stairs/casing-floor-solid.iob b/objects/stronghold/stairs/casing-floor-solid.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/casing-floor-solid.iob rename to objects/stronghold/stairs/casing-floor-solid.iob diff --git a/objects/jigsaw/stronghold/stairs/casing-tight.iob b/objects/stronghold/stairs/casing-tight.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/casing-tight.iob rename to objects/stronghold/stairs/casing-tight.iob diff --git a/objects/jigsaw/stronghold/stairs/casing-top.iob b/objects/stronghold/stairs/casing-top.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/casing-top.iob rename to objects/stronghold/stairs/casing-top.iob diff --git a/objects/jigsaw/stronghold/stairs/casing.iob b/objects/stronghold/stairs/casing.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/casing.iob rename to objects/stronghold/stairs/casing.iob diff --git a/objects/jigsaw/stronghold/stairs/med-vertical-complete1.iob b/objects/stronghold/stairs/med-vertical-complete1.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/med-vertical-complete1.iob rename to objects/stronghold/stairs/med-vertical-complete1.iob diff --git a/objects/jigsaw/stronghold/stairs/med-vertical-complete2.iob b/objects/stronghold/stairs/med-vertical-complete2.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/med-vertical-complete2.iob rename to objects/stronghold/stairs/med-vertical-complete2.iob diff --git a/objects/jigsaw/stronghold/stairs/med-vertical-extension.iob b/objects/stronghold/stairs/med-vertical-extension.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/med-vertical-extension.iob rename to objects/stronghold/stairs/med-vertical-extension.iob diff --git a/objects/jigsaw/stronghold/stairs/med-vertical-naked.iob b/objects/stronghold/stairs/med-vertical-naked.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/med-vertical-naked.iob rename to objects/stronghold/stairs/med-vertical-naked.iob diff --git a/objects/jigsaw/stronghold/stairs/sml-vertical-naked.iob b/objects/stronghold/stairs/sml-vertical-naked.iob similarity index 100% rename from objects/jigsaw/stronghold/stairs/sml-vertical-naked.iob rename to objects/stronghold/stairs/sml-vertical-naked.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/anvil-furnace.iob b/objects/stronghold/wall-fixture/5x3/anvil-furnace.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/anvil-furnace.iob rename to objects/stronghold/wall-fixture/5x3/anvil-furnace.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/brew-set.iob b/objects/stronghold/wall-fixture/5x3/brew-set.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/brew-set.iob rename to objects/stronghold/wall-fixture/5x3/brew-set.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/brewing-shelf.iob b/objects/stronghold/wall-fixture/5x3/brewing-shelf.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/brewing-shelf.iob rename to objects/stronghold/wall-fixture/5x3/brewing-shelf.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/chains.iob b/objects/stronghold/wall-fixture/5x3/chains.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/chains.iob rename to objects/stronghold/wall-fixture/5x3/chains.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/chest.iob b/objects/stronghold/wall-fixture/5x3/chest.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/chest.iob rename to objects/stronghold/wall-fixture/5x3/chest.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/crafting-station.iob b/objects/stronghold/wall-fixture/5x3/crafting-station.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/crafting-station.iob rename to objects/stronghold/wall-fixture/5x3/crafting-station.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/double-chest.iob b/objects/stronghold/wall-fixture/5x3/double-chest.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/double-chest.iob rename to objects/stronghold/wall-fixture/5x3/double-chest.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/lantern.iob b/objects/stronghold/wall-fixture/5x3/lantern.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/lantern.iob rename to objects/stronghold/wall-fixture/5x3/lantern.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/mixed1.iob b/objects/stronghold/wall-fixture/5x3/mixed1.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/mixed1.iob rename to objects/stronghold/wall-fixture/5x3/mixed1.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/mixed1.iob.bak b/objects/stronghold/wall-fixture/5x3/mixed1.iob.bak similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/mixed1.iob.bak rename to objects/stronghold/wall-fixture/5x3/mixed1.iob.bak diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/shelf.iob b/objects/stronghold/wall-fixture/5x3/shelf.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/shelf.iob rename to objects/stronghold/wall-fixture/5x3/shelf.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3/study.iob b/objects/stronghold/wall-fixture/5x3/study.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3/study.iob rename to objects/stronghold/wall-fixture/5x3/study.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3x3/chains.iob b/objects/stronghold/wall-fixture/5x3x3/chains.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3x3/chains.iob rename to objects/stronghold/wall-fixture/5x3x3/chains.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/5x3x3/cobweb.iob b/objects/stronghold/wall-fixture/5x3x3/cobweb.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/5x3x3/cobweb.iob rename to objects/stronghold/wall-fixture/5x3x3/cobweb.iob diff --git a/objects/jigsaw/stronghold/wall-fixture/blank.iob b/objects/stronghold/wall-fixture/blank.iob similarity index 100% rename from objects/jigsaw/stronghold/wall-fixture/blank.iob rename to objects/stronghold/wall-fixture/blank.iob diff --git a/objects/jigsaw/stronghold/wall/1.iob b/objects/stronghold/wall/1.iob similarity index 100% rename from objects/jigsaw/stronghold/wall/1.iob rename to objects/stronghold/wall/1.iob diff --git a/objects/jigsaw/stronghold/wall/2.iob b/objects/stronghold/wall/2.iob similarity index 100% rename from objects/jigsaw/stronghold/wall/2.iob rename to objects/stronghold/wall/2.iob diff --git a/objects/jigsaw/stronghold/wall/3.iob b/objects/stronghold/wall/3.iob similarity index 100% rename from objects/jigsaw/stronghold/wall/3.iob rename to objects/stronghold/wall/3.iob diff --git a/objects/jigsaw/structure/Example Temple/corner-1.iob b/objects/structure/Example Temple/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/Example Temple/corner-1.iob rename to objects/structure/Example Temple/corner-1.iob diff --git a/objects/jigsaw/structure/Example Temple/cross-1.iob b/objects/structure/Example Temple/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/Example Temple/cross-1.iob rename to objects/structure/Example Temple/cross-1.iob diff --git a/objects/jigsaw/structure/Example Temple/hall-1.iob b/objects/structure/Example Temple/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/Example Temple/hall-1.iob rename to objects/structure/Example Temple/hall-1.iob diff --git a/objects/jigsaw/structure/Example Temple/room-1.iob b/objects/structure/Example Temple/room-1.iob similarity index 100% rename from objects/jigsaw/structure/Example Temple/room-1.iob rename to objects/structure/Example Temple/room-1.iob diff --git a/objects/jigsaw/structure/Example Temple/t-connect-1.iob b/objects/structure/Example Temple/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/Example Temple/t-connect-1.iob rename to objects/structure/Example Temple/t-connect-1.iob diff --git a/objects/jigsaw/structure/Example Temple/walled-room-1.iob b/objects/structure/Example Temple/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/Example Temple/walled-room-1.iob rename to objects/structure/Example Temple/walled-room-1.iob diff --git a/objects/jigsaw/structure/RedMineshaft/corner-1.iob b/objects/structure/RedMineshaft/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/corner-1.iob rename to objects/structure/RedMineshaft/corner-1.iob diff --git a/objects/jigsaw/structure/RedMineshaft/corner-2.iob b/objects/structure/RedMineshaft/corner-2.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/corner-2.iob rename to objects/structure/RedMineshaft/corner-2.iob diff --git a/objects/jigsaw/structure/RedMineshaft/corner-3.iob b/objects/structure/RedMineshaft/corner-3.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/corner-3.iob rename to objects/structure/RedMineshaft/corner-3.iob diff --git a/objects/jigsaw/structure/RedMineshaft/corner-4.iob b/objects/structure/RedMineshaft/corner-4.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/corner-4.iob rename to objects/structure/RedMineshaft/corner-4.iob diff --git a/objects/jigsaw/structure/RedMineshaft/corner-5.iob b/objects/structure/RedMineshaft/corner-5.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/corner-5.iob rename to objects/structure/RedMineshaft/corner-5.iob diff --git a/objects/jigsaw/structure/RedMineshaft/cross-1.iob b/objects/structure/RedMineshaft/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/cross-1.iob rename to objects/structure/RedMineshaft/cross-1.iob diff --git a/objects/jigsaw/structure/RedMineshaft/cross-2.iob b/objects/structure/RedMineshaft/cross-2.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/cross-2.iob rename to objects/structure/RedMineshaft/cross-2.iob diff --git a/objects/jigsaw/structure/RedMineshaft/cross-3.iob b/objects/structure/RedMineshaft/cross-3.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/cross-3.iob rename to objects/structure/RedMineshaft/cross-3.iob diff --git a/objects/jigsaw/structure/RedMineshaft/cross-4.iob b/objects/structure/RedMineshaft/cross-4.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/cross-4.iob rename to objects/structure/RedMineshaft/cross-4.iob diff --git a/objects/jigsaw/structure/RedMineshaft/cross-5.iob b/objects/structure/RedMineshaft/cross-5.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/cross-5.iob rename to objects/structure/RedMineshaft/cross-5.iob diff --git a/objects/jigsaw/structure/RedMineshaft/hall-1.iob b/objects/structure/RedMineshaft/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/hall-1.iob rename to objects/structure/RedMineshaft/hall-1.iob diff --git a/objects/jigsaw/structure/RedMineshaft/hall-2.iob b/objects/structure/RedMineshaft/hall-2.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/hall-2.iob rename to objects/structure/RedMineshaft/hall-2.iob diff --git a/objects/jigsaw/structure/RedMineshaft/hall-3.iob b/objects/structure/RedMineshaft/hall-3.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/hall-3.iob rename to objects/structure/RedMineshaft/hall-3.iob diff --git a/objects/jigsaw/structure/RedMineshaft/hall-4.iob b/objects/structure/RedMineshaft/hall-4.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/hall-4.iob rename to objects/structure/RedMineshaft/hall-4.iob diff --git a/objects/jigsaw/structure/RedMineshaft/hall-5.iob b/objects/structure/RedMineshaft/hall-5.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/hall-5.iob rename to objects/structure/RedMineshaft/hall-5.iob diff --git a/objects/jigsaw/structure/RedMineshaft/hall-6.iob b/objects/structure/RedMineshaft/hall-6.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/hall-6.iob rename to objects/structure/RedMineshaft/hall-6.iob diff --git a/objects/jigsaw/structure/RedMineshaft/room-1.iob b/objects/structure/RedMineshaft/room-1.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/room-1.iob rename to objects/structure/RedMineshaft/room-1.iob diff --git a/objects/jigsaw/structure/RedMineshaft/room-2.iob b/objects/structure/RedMineshaft/room-2.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/room-2.iob rename to objects/structure/RedMineshaft/room-2.iob diff --git a/objects/jigsaw/structure/RedMineshaft/room-3.iob b/objects/structure/RedMineshaft/room-3.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/room-3.iob rename to objects/structure/RedMineshaft/room-3.iob diff --git a/objects/jigsaw/structure/RedMineshaft/room-4.iob b/objects/structure/RedMineshaft/room-4.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/room-4.iob rename to objects/structure/RedMineshaft/room-4.iob diff --git a/objects/jigsaw/structure/RedMineshaft/room-5.iob b/objects/structure/RedMineshaft/room-5.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/room-5.iob rename to objects/structure/RedMineshaft/room-5.iob diff --git a/objects/jigsaw/structure/RedMineshaft/t-connect-1.iob b/objects/structure/RedMineshaft/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/t-connect-1.iob rename to objects/structure/RedMineshaft/t-connect-1.iob diff --git a/objects/jigsaw/structure/RedMineshaft/t-connect-2.iob b/objects/structure/RedMineshaft/t-connect-2.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/t-connect-2.iob rename to objects/structure/RedMineshaft/t-connect-2.iob diff --git a/objects/jigsaw/structure/RedMineshaft/t-connect-3.iob b/objects/structure/RedMineshaft/t-connect-3.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/t-connect-3.iob rename to objects/structure/RedMineshaft/t-connect-3.iob diff --git a/objects/jigsaw/structure/RedMineshaft/t-connect-4.iob b/objects/structure/RedMineshaft/t-connect-4.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/t-connect-4.iob rename to objects/structure/RedMineshaft/t-connect-4.iob diff --git a/objects/jigsaw/structure/RedMineshaft/t-connect-5.iob b/objects/structure/RedMineshaft/t-connect-5.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/t-connect-5.iob rename to objects/structure/RedMineshaft/t-connect-5.iob diff --git a/objects/jigsaw/structure/RedMineshaft/t-connect-6.iob b/objects/structure/RedMineshaft/t-connect-6.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/t-connect-6.iob rename to objects/structure/RedMineshaft/t-connect-6.iob diff --git a/objects/jigsaw/structure/RedMineshaft/t-connect-7.iob b/objects/structure/RedMineshaft/t-connect-7.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/t-connect-7.iob rename to objects/structure/RedMineshaft/t-connect-7.iob diff --git a/objects/jigsaw/structure/RedMineshaft/walled-room-1.iob b/objects/structure/RedMineshaft/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/walled-room-1.iob rename to objects/structure/RedMineshaft/walled-room-1.iob diff --git a/objects/jigsaw/structure/RedMineshaft/walled-room-2.iob b/objects/structure/RedMineshaft/walled-room-2.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/walled-room-2.iob rename to objects/structure/RedMineshaft/walled-room-2.iob diff --git a/objects/jigsaw/structure/RedMineshaft/walled-room-3.iob b/objects/structure/RedMineshaft/walled-room-3.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/walled-room-3.iob rename to objects/structure/RedMineshaft/walled-room-3.iob diff --git a/objects/jigsaw/structure/RedMineshaft/walled-room-4.iob b/objects/structure/RedMineshaft/walled-room-4.iob similarity index 100% rename from objects/jigsaw/structure/RedMineshaft/walled-room-4.iob rename to objects/structure/RedMineshaft/walled-room-4.iob diff --git a/objects/jigsaw/structure/cottage-lot/corner-1.iob b/objects/structure/cottage-lot/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/corner-1.iob rename to objects/structure/cottage-lot/corner-1.iob diff --git a/objects/jigsaw/structure/cottage-lot/cross-1.iob b/objects/structure/cottage-lot/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/cross-1.iob rename to objects/structure/cottage-lot/cross-1.iob diff --git a/objects/jigsaw/structure/cottage-lot/hall-1.iob b/objects/structure/cottage-lot/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/hall-1.iob rename to objects/structure/cottage-lot/hall-1.iob diff --git a/objects/jigsaw/structure/cottage-lot/room-1.iob b/objects/structure/cottage-lot/room-1.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/room-1.iob rename to objects/structure/cottage-lot/room-1.iob diff --git a/objects/jigsaw/structure/cottage-lot/room-2.iob b/objects/structure/cottage-lot/room-2.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/room-2.iob rename to objects/structure/cottage-lot/room-2.iob diff --git a/objects/jigsaw/structure/cottage-lot/room-3.iob b/objects/structure/cottage-lot/room-3.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/room-3.iob rename to objects/structure/cottage-lot/room-3.iob diff --git a/objects/jigsaw/structure/cottage-lot/room-4.iob b/objects/structure/cottage-lot/room-4.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/room-4.iob rename to objects/structure/cottage-lot/room-4.iob diff --git a/objects/jigsaw/structure/cottage-lot/t-connect-1.iob b/objects/structure/cottage-lot/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/t-connect-1.iob rename to objects/structure/cottage-lot/t-connect-1.iob diff --git a/objects/jigsaw/structure/cottage-lot/walled-room-1.iob b/objects/structure/cottage-lot/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/cottage-lot/walled-room-1.iob rename to objects/structure/cottage-lot/walled-room-1.iob diff --git a/objects/jigsaw/structure/desert-base.iob b/objects/structure/desert-base.iob similarity index 100% rename from objects/jigsaw/structure/desert-base.iob rename to objects/structure/desert-base.iob diff --git a/objects/jigsaw/structure/mush-huts/room-1.iob b/objects/structure/mush-huts/room-1.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/room-1.iob rename to objects/structure/mush-huts/room-1.iob diff --git a/objects/jigsaw/structure/mush-huts/room-2.iob b/objects/structure/mush-huts/room-2.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/room-2.iob rename to objects/structure/mush-huts/room-2.iob diff --git a/objects/jigsaw/structure/mush-huts/room-3.iob b/objects/structure/mush-huts/room-3.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/room-3.iob rename to objects/structure/mush-huts/room-3.iob diff --git a/objects/jigsaw/structure/mush-huts/room-4.iob b/objects/structure/mush-huts/room-4.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/room-4.iob rename to objects/structure/mush-huts/room-4.iob diff --git a/objects/jigsaw/structure/mush-huts/walled-room-1.iob b/objects/structure/mush-huts/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/walled-room-1.iob rename to objects/structure/mush-huts/walled-room-1.iob diff --git a/objects/jigsaw/structure/mush-huts/walled-room-2.iob b/objects/structure/mush-huts/walled-room-2.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/walled-room-2.iob rename to objects/structure/mush-huts/walled-room-2.iob diff --git a/objects/jigsaw/structure/mush-huts/walled-room-3.iob b/objects/structure/mush-huts/walled-room-3.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/walled-room-3.iob rename to objects/structure/mush-huts/walled-room-3.iob diff --git a/objects/jigsaw/structure/mush-huts/walled-room-4.iob b/objects/structure/mush-huts/walled-room-4.iob similarity index 100% rename from objects/jigsaw/structure/mush-huts/walled-room-4.iob rename to objects/structure/mush-huts/walled-room-4.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/corner-1.iob b/objects/structure/ogMurkyCavern/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/corner-1.iob rename to objects/structure/ogMurkyCavern/corner-1.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/corner-2.iob b/objects/structure/ogMurkyCavern/corner-2.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/corner-2.iob rename to objects/structure/ogMurkyCavern/corner-2.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/corner-3.iob b/objects/structure/ogMurkyCavern/corner-3.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/corner-3.iob rename to objects/structure/ogMurkyCavern/corner-3.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/corner-4.iob b/objects/structure/ogMurkyCavern/corner-4.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/corner-4.iob rename to objects/structure/ogMurkyCavern/corner-4.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-1.iob b/objects/structure/ogMurkyCavern/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-1.iob rename to objects/structure/ogMurkyCavern/cross-1.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-2.iob b/objects/structure/ogMurkyCavern/cross-2.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-2.iob rename to objects/structure/ogMurkyCavern/cross-2.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-3.iob b/objects/structure/ogMurkyCavern/cross-3.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-3.iob rename to objects/structure/ogMurkyCavern/cross-3.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-4.iob b/objects/structure/ogMurkyCavern/cross-4.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-4.iob rename to objects/structure/ogMurkyCavern/cross-4.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-5.iob b/objects/structure/ogMurkyCavern/cross-5.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-5.iob rename to objects/structure/ogMurkyCavern/cross-5.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-6.iob b/objects/structure/ogMurkyCavern/cross-6.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-6.iob rename to objects/structure/ogMurkyCavern/cross-6.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-7.iob b/objects/structure/ogMurkyCavern/cross-7.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-7.iob rename to objects/structure/ogMurkyCavern/cross-7.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/cross-8.iob b/objects/structure/ogMurkyCavern/cross-8.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/cross-8.iob rename to objects/structure/ogMurkyCavern/cross-8.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/hall-1.iob b/objects/structure/ogMurkyCavern/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/hall-1.iob rename to objects/structure/ogMurkyCavern/hall-1.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/hall-2.iob b/objects/structure/ogMurkyCavern/hall-2.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/hall-2.iob rename to objects/structure/ogMurkyCavern/hall-2.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/hall-3.iob b/objects/structure/ogMurkyCavern/hall-3.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/hall-3.iob rename to objects/structure/ogMurkyCavern/hall-3.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/hall-4.iob b/objects/structure/ogMurkyCavern/hall-4.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/hall-4.iob rename to objects/structure/ogMurkyCavern/hall-4.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/room-1.iob b/objects/structure/ogMurkyCavern/room-1.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/room-1.iob rename to objects/structure/ogMurkyCavern/room-1.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/room-2.iob b/objects/structure/ogMurkyCavern/room-2.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/room-2.iob rename to objects/structure/ogMurkyCavern/room-2.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/room-3.iob b/objects/structure/ogMurkyCavern/room-3.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/room-3.iob rename to objects/structure/ogMurkyCavern/room-3.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/room-4.iob b/objects/structure/ogMurkyCavern/room-4.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/room-4.iob rename to objects/structure/ogMurkyCavern/room-4.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/t-connect-1.iob b/objects/structure/ogMurkyCavern/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/t-connect-1.iob rename to objects/structure/ogMurkyCavern/t-connect-1.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/t-connect-2.iob b/objects/structure/ogMurkyCavern/t-connect-2.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/t-connect-2.iob rename to objects/structure/ogMurkyCavern/t-connect-2.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/t-connect-3.iob b/objects/structure/ogMurkyCavern/t-connect-3.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/t-connect-3.iob rename to objects/structure/ogMurkyCavern/t-connect-3.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/t-connect-4.iob b/objects/structure/ogMurkyCavern/t-connect-4.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/t-connect-4.iob rename to objects/structure/ogMurkyCavern/t-connect-4.iob diff --git a/objects/jigsaw/structure/ogMurkyCavern/walled-room-1.iob b/objects/structure/ogMurkyCavern/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/ogMurkyCavern/walled-room-1.iob rename to objects/structure/ogMurkyCavern/walled-room-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/corner-ceiling-1.iob b/objects/structure/prismarine_temple/corner-ceiling-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/corner-ceiling-1.iob rename to objects/structure/prismarine_temple/corner-ceiling-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/corner-encased-1.iob b/objects/structure/prismarine_temple/corner-encased-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/corner-encased-1.iob rename to objects/structure/prismarine_temple/corner-encased-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/corner-encased-2.iob b/objects/structure/prismarine_temple/corner-encased-2.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/corner-encased-2.iob rename to objects/structure/prismarine_temple/corner-encased-2.iob diff --git a/objects/jigsaw/structure/prismarine_temple/corner-encased-3.iob b/objects/structure/prismarine_temple/corner-encased-3.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/corner-encased-3.iob rename to objects/structure/prismarine_temple/corner-encased-3.iob diff --git a/objects/jigsaw/structure/prismarine_temple/corner-floor-1.iob b/objects/structure/prismarine_temple/corner-floor-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/corner-floor-1.iob rename to objects/structure/prismarine_temple/corner-floor-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/corner-opening-1.iob b/objects/structure/prismarine_temple/corner-opening-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/corner-opening-1.iob rename to objects/structure/prismarine_temple/corner-opening-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/corner-opening-2.iob b/objects/structure/prismarine_temple/corner-opening-2.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/corner-opening-2.iob rename to objects/structure/prismarine_temple/corner-opening-2.iob diff --git a/objects/jigsaw/structure/prismarine_temple/cross-ceiling-1.iob b/objects/structure/prismarine_temple/cross-ceiling-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/cross-ceiling-1.iob rename to objects/structure/prismarine_temple/cross-ceiling-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/cross-encased-1.iob b/objects/structure/prismarine_temple/cross-encased-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/cross-encased-1.iob rename to objects/structure/prismarine_temple/cross-encased-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/cross-floor-1.iob b/objects/structure/prismarine_temple/cross-floor-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/cross-floor-1.iob rename to objects/structure/prismarine_temple/cross-floor-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/cross-opening-1.iob b/objects/structure/prismarine_temple/cross-opening-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/cross-opening-1.iob rename to objects/structure/prismarine_temple/cross-opening-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/hall-ceiling-1.iob b/objects/structure/prismarine_temple/hall-ceiling-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/hall-ceiling-1.iob rename to objects/structure/prismarine_temple/hall-ceiling-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/hall-encased-1.iob b/objects/structure/prismarine_temple/hall-encased-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/hall-encased-1.iob rename to objects/structure/prismarine_temple/hall-encased-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/hall-floor-1.iob b/objects/structure/prismarine_temple/hall-floor-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/hall-floor-1.iob rename to objects/structure/prismarine_temple/hall-floor-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/hall-floor-2.iob b/objects/structure/prismarine_temple/hall-floor-2.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/hall-floor-2.iob rename to objects/structure/prismarine_temple/hall-floor-2.iob diff --git a/objects/jigsaw/structure/prismarine_temple/hall-opening-1.iob b/objects/structure/prismarine_temple/hall-opening-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/hall-opening-1.iob rename to objects/structure/prismarine_temple/hall-opening-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/room-ceiling-1.iob b/objects/structure/prismarine_temple/room-ceiling-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/room-ceiling-1.iob rename to objects/structure/prismarine_temple/room-ceiling-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/room-encased-1.iob b/objects/structure/prismarine_temple/room-encased-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/room-encased-1.iob rename to objects/structure/prismarine_temple/room-encased-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/room-floor-1.iob b/objects/structure/prismarine_temple/room-floor-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/room-floor-1.iob rename to objects/structure/prismarine_temple/room-floor-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/room-opening-1.iob b/objects/structure/prismarine_temple/room-opening-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/room-opening-1.iob rename to objects/structure/prismarine_temple/room-opening-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/room-opening-2.iob b/objects/structure/prismarine_temple/room-opening-2.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/room-opening-2.iob rename to objects/structure/prismarine_temple/room-opening-2.iob diff --git a/objects/jigsaw/structure/prismarine_temple/t-connect-ceiling-1.iob b/objects/structure/prismarine_temple/t-connect-ceiling-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/t-connect-ceiling-1.iob rename to objects/structure/prismarine_temple/t-connect-ceiling-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/t-connect-encased-1.iob b/objects/structure/prismarine_temple/t-connect-encased-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/t-connect-encased-1.iob rename to objects/structure/prismarine_temple/t-connect-encased-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/t-connect-encased-2.iob b/objects/structure/prismarine_temple/t-connect-encased-2.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/t-connect-encased-2.iob rename to objects/structure/prismarine_temple/t-connect-encased-2.iob diff --git a/objects/jigsaw/structure/prismarine_temple/t-connect-encased-3.iob b/objects/structure/prismarine_temple/t-connect-encased-3.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/t-connect-encased-3.iob rename to objects/structure/prismarine_temple/t-connect-encased-3.iob diff --git a/objects/jigsaw/structure/prismarine_temple/t-connect-floor-1.iob b/objects/structure/prismarine_temple/t-connect-floor-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/t-connect-floor-1.iob rename to objects/structure/prismarine_temple/t-connect-floor-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/t-connect-floor-2.iob b/objects/structure/prismarine_temple/t-connect-floor-2.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/t-connect-floor-2.iob rename to objects/structure/prismarine_temple/t-connect-floor-2.iob diff --git a/objects/jigsaw/structure/prismarine_temple/t-connect-opening-1.iob b/objects/structure/prismarine_temple/t-connect-opening-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/t-connect-opening-1.iob rename to objects/structure/prismarine_temple/t-connect-opening-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/walled-room-ceiling-1.iob b/objects/structure/prismarine_temple/walled-room-ceiling-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/walled-room-ceiling-1.iob rename to objects/structure/prismarine_temple/walled-room-ceiling-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/walled-room-encased-1.iob b/objects/structure/prismarine_temple/walled-room-encased-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/walled-room-encased-1.iob rename to objects/structure/prismarine_temple/walled-room-encased-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/walled-room-floor-1.iob b/objects/structure/prismarine_temple/walled-room-floor-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/walled-room-floor-1.iob rename to objects/structure/prismarine_temple/walled-room-floor-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/walled-room-opening-1.iob b/objects/structure/prismarine_temple/walled-room-opening-1.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/walled-room-opening-1.iob rename to objects/structure/prismarine_temple/walled-room-opening-1.iob diff --git a/objects/jigsaw/structure/prismarine_temple/walled-room-opening-2.iob b/objects/structure/prismarine_temple/walled-room-opening-2.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/walled-room-opening-2.iob rename to objects/structure/prismarine_temple/walled-room-opening-2.iob diff --git a/objects/jigsaw/structure/prismarine_temple/walled-room-opening-3.iob b/objects/structure/prismarine_temple/walled-room-opening-3.iob similarity index 100% rename from objects/jigsaw/structure/prismarine_temple/walled-room-opening-3.iob rename to objects/structure/prismarine_temple/walled-room-opening-3.iob diff --git a/objects/jigsaw/structure/ruins/corner-1.iob b/objects/structure/ruins/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/ruins/corner-1.iob rename to objects/structure/ruins/corner-1.iob diff --git a/objects/jigsaw/structure/ruins/cross-1.iob b/objects/structure/ruins/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/ruins/cross-1.iob rename to objects/structure/ruins/cross-1.iob diff --git a/objects/jigsaw/structure/ruins/cross-2.iob b/objects/structure/ruins/cross-2.iob similarity index 100% rename from objects/jigsaw/structure/ruins/cross-2.iob rename to objects/structure/ruins/cross-2.iob diff --git a/objects/jigsaw/structure/ruins/cross-3.iob b/objects/structure/ruins/cross-3.iob similarity index 100% rename from objects/jigsaw/structure/ruins/cross-3.iob rename to objects/structure/ruins/cross-3.iob diff --git a/objects/jigsaw/structure/ruins/hall-1.iob b/objects/structure/ruins/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/ruins/hall-1.iob rename to objects/structure/ruins/hall-1.iob diff --git a/objects/jigsaw/structure/ruins/hall-2.iob b/objects/structure/ruins/hall-2.iob similarity index 100% rename from objects/jigsaw/structure/ruins/hall-2.iob rename to objects/structure/ruins/hall-2.iob diff --git a/objects/jigsaw/structure/ruins/room-1.iob b/objects/structure/ruins/room-1.iob similarity index 100% rename from objects/jigsaw/structure/ruins/room-1.iob rename to objects/structure/ruins/room-1.iob diff --git a/objects/jigsaw/structure/ruins/t-connect-1.iob b/objects/structure/ruins/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/ruins/t-connect-1.iob rename to objects/structure/ruins/t-connect-1.iob diff --git a/objects/jigsaw/structure/ruins/t-connect-2.iob b/objects/structure/ruins/t-connect-2.iob similarity index 100% rename from objects/jigsaw/structure/ruins/t-connect-2.iob rename to objects/structure/ruins/t-connect-2.iob diff --git a/objects/jigsaw/structure/ruins/walled-room-1.iob b/objects/structure/ruins/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/ruins/walled-room-1.iob rename to objects/structure/ruins/walled-room-1.iob diff --git a/objects/jigsaw/structure/soul-temple/corner-1.iob b/objects/structure/soul-temple/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/corner-1.iob rename to objects/structure/soul-temple/corner-1.iob diff --git a/objects/jigsaw/structure/soul-temple/cross-1.iob b/objects/structure/soul-temple/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/cross-1.iob rename to objects/structure/soul-temple/cross-1.iob diff --git a/objects/jigsaw/structure/soul-temple/cross-2.iob b/objects/structure/soul-temple/cross-2.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/cross-2.iob rename to objects/structure/soul-temple/cross-2.iob diff --git a/objects/jigsaw/structure/soul-temple/hall-1.iob b/objects/structure/soul-temple/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/hall-1.iob rename to objects/structure/soul-temple/hall-1.iob diff --git a/objects/jigsaw/structure/soul-temple/room-1.iob b/objects/structure/soul-temple/room-1.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/room-1.iob rename to objects/structure/soul-temple/room-1.iob diff --git a/objects/jigsaw/structure/soul-temple/room-2.iob b/objects/structure/soul-temple/room-2.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/room-2.iob rename to objects/structure/soul-temple/room-2.iob diff --git a/objects/jigsaw/structure/soul-temple/room-3.iob b/objects/structure/soul-temple/room-3.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/room-3.iob rename to objects/structure/soul-temple/room-3.iob diff --git a/objects/jigsaw/structure/soul-temple/room-4.iob b/objects/structure/soul-temple/room-4.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/room-4.iob rename to objects/structure/soul-temple/room-4.iob diff --git a/objects/jigsaw/structure/soul-temple/t-connect-1.iob b/objects/structure/soul-temple/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/t-connect-1.iob rename to objects/structure/soul-temple/t-connect-1.iob diff --git a/objects/jigsaw/structure/soul-temple/walled-room-1.iob b/objects/structure/soul-temple/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/soul-temple/walled-room-1.iob rename to objects/structure/soul-temple/walled-room-1.iob diff --git a/objects/jigsaw/structure/stone-village/corner-1.iob b/objects/structure/stone-village/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/corner-1.iob rename to objects/structure/stone-village/corner-1.iob diff --git a/objects/jigsaw/structure/stone-village/corner-2.iob b/objects/structure/stone-village/corner-2.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/corner-2.iob rename to objects/structure/stone-village/corner-2.iob diff --git a/objects/jigsaw/structure/stone-village/corner-3.iob b/objects/structure/stone-village/corner-3.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/corner-3.iob rename to objects/structure/stone-village/corner-3.iob diff --git a/objects/jigsaw/structure/stone-village/corner-4.iob b/objects/structure/stone-village/corner-4.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/corner-4.iob rename to objects/structure/stone-village/corner-4.iob diff --git a/objects/jigsaw/structure/stone-village/cross-1.iob b/objects/structure/stone-village/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/cross-1.iob rename to objects/structure/stone-village/cross-1.iob diff --git a/objects/jigsaw/structure/stone-village/cross-2.iob b/objects/structure/stone-village/cross-2.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/cross-2.iob rename to objects/structure/stone-village/cross-2.iob diff --git a/objects/jigsaw/structure/stone-village/cross-3.iob b/objects/structure/stone-village/cross-3.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/cross-3.iob rename to objects/structure/stone-village/cross-3.iob diff --git a/objects/jigsaw/structure/stone-village/cross-4.iob b/objects/structure/stone-village/cross-4.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/cross-4.iob rename to objects/structure/stone-village/cross-4.iob diff --git a/objects/jigsaw/structure/stone-village/cross-5.iob b/objects/structure/stone-village/cross-5.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/cross-5.iob rename to objects/structure/stone-village/cross-5.iob diff --git a/objects/jigsaw/structure/stone-village/hall-1.iob b/objects/structure/stone-village/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/hall-1.iob rename to objects/structure/stone-village/hall-1.iob diff --git a/objects/jigsaw/structure/stone-village/hall-2.iob b/objects/structure/stone-village/hall-2.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/hall-2.iob rename to objects/structure/stone-village/hall-2.iob diff --git a/objects/jigsaw/structure/stone-village/hall-3.iob b/objects/structure/stone-village/hall-3.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/hall-3.iob rename to objects/structure/stone-village/hall-3.iob diff --git a/objects/jigsaw/structure/stone-village/hall-4.iob b/objects/structure/stone-village/hall-4.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/hall-4.iob rename to objects/structure/stone-village/hall-4.iob diff --git a/objects/jigsaw/structure/stone-village/room-1.iob b/objects/structure/stone-village/room-1.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-1.iob rename to objects/structure/stone-village/room-1.iob diff --git a/objects/jigsaw/structure/stone-village/room-2.iob b/objects/structure/stone-village/room-2.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-2.iob rename to objects/structure/stone-village/room-2.iob diff --git a/objects/jigsaw/structure/stone-village/room-3.iob b/objects/structure/stone-village/room-3.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-3.iob rename to objects/structure/stone-village/room-3.iob diff --git a/objects/jigsaw/structure/stone-village/room-4.iob b/objects/structure/stone-village/room-4.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-4.iob rename to objects/structure/stone-village/room-4.iob diff --git a/objects/jigsaw/structure/stone-village/room-5.iob b/objects/structure/stone-village/room-5.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-5.iob rename to objects/structure/stone-village/room-5.iob diff --git a/objects/jigsaw/structure/stone-village/room-6.iob b/objects/structure/stone-village/room-6.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-6.iob rename to objects/structure/stone-village/room-6.iob diff --git a/objects/jigsaw/structure/stone-village/room-7.iob b/objects/structure/stone-village/room-7.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-7.iob rename to objects/structure/stone-village/room-7.iob diff --git a/objects/jigsaw/structure/stone-village/room-8.iob b/objects/structure/stone-village/room-8.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/room-8.iob rename to objects/structure/stone-village/room-8.iob diff --git a/objects/jigsaw/structure/stone-village/t-connect-1.iob b/objects/structure/stone-village/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/t-connect-1.iob rename to objects/structure/stone-village/t-connect-1.iob diff --git a/objects/jigsaw/structure/stone-village/t-connect-2.iob b/objects/structure/stone-village/t-connect-2.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/t-connect-2.iob rename to objects/structure/stone-village/t-connect-2.iob diff --git a/objects/jigsaw/structure/stone-village/t-connect-3.iob b/objects/structure/stone-village/t-connect-3.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/t-connect-3.iob rename to objects/structure/stone-village/t-connect-3.iob diff --git a/objects/jigsaw/structure/stone-village/t-connect-4.iob b/objects/structure/stone-village/t-connect-4.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/t-connect-4.iob rename to objects/structure/stone-village/t-connect-4.iob diff --git a/objects/jigsaw/structure/stone-village/t-connect-5.iob b/objects/structure/stone-village/t-connect-5.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/t-connect-5.iob rename to objects/structure/stone-village/t-connect-5.iob diff --git a/objects/jigsaw/structure/stone-village/walled-room-1.iob b/objects/structure/stone-village/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/walled-room-1.iob rename to objects/structure/stone-village/walled-room-1.iob diff --git a/objects/jigsaw/structure/stone-village/walled-room-2.iob b/objects/structure/stone-village/walled-room-2.iob similarity index 100% rename from objects/jigsaw/structure/stone-village/walled-room-2.iob rename to objects/structure/stone-village/walled-room-2.iob diff --git a/objects/jigsaw/structure/village-stone/corner-1.iob b/objects/structure/village-stone/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/corner-1.iob rename to objects/structure/village-stone/corner-1.iob diff --git a/objects/jigsaw/structure/village-stone/corner-2.iob b/objects/structure/village-stone/corner-2.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/corner-2.iob rename to objects/structure/village-stone/corner-2.iob diff --git a/objects/jigsaw/structure/village-stone/corner-3.iob b/objects/structure/village-stone/corner-3.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/corner-3.iob rename to objects/structure/village-stone/corner-3.iob diff --git a/objects/jigsaw/structure/village-stone/corner-4.iob b/objects/structure/village-stone/corner-4.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/corner-4.iob rename to objects/structure/village-stone/corner-4.iob diff --git a/objects/jigsaw/structure/village-stone/cross-1.iob b/objects/structure/village-stone/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/cross-1.iob rename to objects/structure/village-stone/cross-1.iob diff --git a/objects/jigsaw/structure/village-stone/cross-2.iob b/objects/structure/village-stone/cross-2.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/cross-2.iob rename to objects/structure/village-stone/cross-2.iob diff --git a/objects/jigsaw/structure/village-stone/cross-3.iob b/objects/structure/village-stone/cross-3.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/cross-3.iob rename to objects/structure/village-stone/cross-3.iob diff --git a/objects/jigsaw/structure/village-stone/cross-4.iob b/objects/structure/village-stone/cross-4.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/cross-4.iob rename to objects/structure/village-stone/cross-4.iob diff --git a/objects/jigsaw/structure/village-stone/cross-5.iob b/objects/structure/village-stone/cross-5.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/cross-5.iob rename to objects/structure/village-stone/cross-5.iob diff --git a/objects/jigsaw/structure/village-stone/hall-1.iob b/objects/structure/village-stone/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/hall-1.iob rename to objects/structure/village-stone/hall-1.iob diff --git a/objects/jigsaw/structure/village-stone/hall-2.iob b/objects/structure/village-stone/hall-2.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/hall-2.iob rename to objects/structure/village-stone/hall-2.iob diff --git a/objects/jigsaw/structure/village-stone/hall-3.iob b/objects/structure/village-stone/hall-3.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/hall-3.iob rename to objects/structure/village-stone/hall-3.iob diff --git a/objects/jigsaw/structure/village-stone/hall-4.iob b/objects/structure/village-stone/hall-4.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/hall-4.iob rename to objects/structure/village-stone/hall-4.iob diff --git a/objects/jigsaw/structure/village-stone/room-..iob b/objects/structure/village-stone/room-..iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-..iob rename to objects/structure/village-stone/room-..iob diff --git a/objects/jigsaw/structure/village-stone/room-1.iob b/objects/structure/village-stone/room-1.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-1.iob rename to objects/structure/village-stone/room-1.iob diff --git a/objects/jigsaw/structure/village-stone/room-2.iob b/objects/structure/village-stone/room-2.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-2.iob rename to objects/structure/village-stone/room-2.iob diff --git a/objects/jigsaw/structure/village-stone/room-3.iob b/objects/structure/village-stone/room-3.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-3.iob rename to objects/structure/village-stone/room-3.iob diff --git a/objects/jigsaw/structure/village-stone/room-4.iob b/objects/structure/village-stone/room-4.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-4.iob rename to objects/structure/village-stone/room-4.iob diff --git a/objects/jigsaw/structure/village-stone/room-5.iob b/objects/structure/village-stone/room-5.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-5.iob rename to objects/structure/village-stone/room-5.iob diff --git a/objects/jigsaw/structure/village-stone/room-6.iob b/objects/structure/village-stone/room-6.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-6.iob rename to objects/structure/village-stone/room-6.iob diff --git a/objects/jigsaw/structure/village-stone/room-7.iob b/objects/structure/village-stone/room-7.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-7.iob rename to objects/structure/village-stone/room-7.iob diff --git a/objects/jigsaw/structure/village-stone/room-8.iob b/objects/structure/village-stone/room-8.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/room-8.iob rename to objects/structure/village-stone/room-8.iob diff --git a/objects/jigsaw/structure/village-stone/t-connect-1.iob b/objects/structure/village-stone/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/t-connect-1.iob rename to objects/structure/village-stone/t-connect-1.iob diff --git a/objects/jigsaw/structure/village-stone/t-connect-2.iob b/objects/structure/village-stone/t-connect-2.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/t-connect-2.iob rename to objects/structure/village-stone/t-connect-2.iob diff --git a/objects/jigsaw/structure/village-stone/t-connect-3.iob b/objects/structure/village-stone/t-connect-3.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/t-connect-3.iob rename to objects/structure/village-stone/t-connect-3.iob diff --git a/objects/jigsaw/structure/village-stone/t-connect-4.iob b/objects/structure/village-stone/t-connect-4.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/t-connect-4.iob rename to objects/structure/village-stone/t-connect-4.iob diff --git a/objects/jigsaw/structure/village-stone/t-connect-5.iob b/objects/structure/village-stone/t-connect-5.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/t-connect-5.iob rename to objects/structure/village-stone/t-connect-5.iob diff --git a/objects/jigsaw/structure/village-stone/walled-room-1.iob b/objects/structure/village-stone/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/village-stone/walled-room-1.iob rename to objects/structure/village-stone/walled-room-1.iob diff --git a/objects/jigsaw/structure/village-temperate/f-ew.iob b/objects/structure/village-temperate/f-ew.iob similarity index 100% rename from objects/jigsaw/structure/village-temperate/f-ew.iob rename to objects/structure/village-temperate/f-ew.iob diff --git a/objects/jigsaw/structure/village-temperate/f-ne.iob b/objects/structure/village-temperate/f-ne.iob similarity index 100% rename from objects/jigsaw/structure/village-temperate/f-ne.iob rename to objects/structure/village-temperate/f-ne.iob diff --git a/objects/jigsaw/structure/village-temperate/f-nes.iob b/objects/structure/village-temperate/f-nes.iob similarity index 100% rename from objects/jigsaw/structure/village-temperate/f-nes.iob rename to objects/structure/village-temperate/f-nes.iob diff --git a/objects/jigsaw/structure/village-temperate/f-x.iob b/objects/structure/village-temperate/f-x.iob similarity index 100% rename from objects/jigsaw/structure/village-temperate/f-x.iob rename to objects/structure/village-temperate/f-x.iob diff --git a/objects/jigsaw/structure/village/corner-1.iob b/objects/structure/village/corner-1.iob similarity index 100% rename from objects/jigsaw/structure/village/corner-1.iob rename to objects/structure/village/corner-1.iob diff --git a/objects/jigsaw/structure/village/corner-se-1.iob b/objects/structure/village/corner-se-1.iob similarity index 100% rename from objects/jigsaw/structure/village/corner-se-1.iob rename to objects/structure/village/corner-se-1.iob diff --git a/objects/jigsaw/structure/village/corner-se-2.iob b/objects/structure/village/corner-se-2.iob similarity index 100% rename from objects/jigsaw/structure/village/corner-se-2.iob rename to objects/structure/village/corner-se-2.iob diff --git a/objects/jigsaw/structure/village/corner-se-3.iob b/objects/structure/village/corner-se-3.iob similarity index 100% rename from objects/jigsaw/structure/village/corner-se-3.iob rename to objects/structure/village/corner-se-3.iob diff --git a/objects/jigsaw/structure/village/corner-se-4.iob b/objects/structure/village/corner-se-4.iob similarity index 100% rename from objects/jigsaw/structure/village/corner-se-4.iob rename to objects/structure/village/corner-se-4.iob diff --git a/objects/jigsaw/structure/village/cross-1.iob b/objects/structure/village/cross-1.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-1.iob rename to objects/structure/village/cross-1.iob diff --git a/objects/jigsaw/structure/village/cross-10.iob b/objects/structure/village/cross-10.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-10.iob rename to objects/structure/village/cross-10.iob diff --git a/objects/jigsaw/structure/village/cross-11.iob b/objects/structure/village/cross-11.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-11.iob rename to objects/structure/village/cross-11.iob diff --git a/objects/jigsaw/structure/village/cross-12.iob b/objects/structure/village/cross-12.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-12.iob rename to objects/structure/village/cross-12.iob diff --git a/objects/jigsaw/structure/village/cross-2.iob b/objects/structure/village/cross-2.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-2.iob rename to objects/structure/village/cross-2.iob diff --git a/objects/jigsaw/structure/village/cross-3.iob b/objects/structure/village/cross-3.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-3.iob rename to objects/structure/village/cross-3.iob diff --git a/objects/jigsaw/structure/village/cross-4.iob b/objects/structure/village/cross-4.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-4.iob rename to objects/structure/village/cross-4.iob diff --git a/objects/jigsaw/structure/village/cross-5.iob b/objects/structure/village/cross-5.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-5.iob rename to objects/structure/village/cross-5.iob diff --git a/objects/jigsaw/structure/village/cross-6.iob b/objects/structure/village/cross-6.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-6.iob rename to objects/structure/village/cross-6.iob diff --git a/objects/jigsaw/structure/village/cross-7.iob b/objects/structure/village/cross-7.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-7.iob rename to objects/structure/village/cross-7.iob diff --git a/objects/jigsaw/structure/village/cross-8.iob b/objects/structure/village/cross-8.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-8.iob rename to objects/structure/village/cross-8.iob diff --git a/objects/jigsaw/structure/village/cross-9.iob b/objects/structure/village/cross-9.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-9.iob rename to objects/structure/village/cross-9.iob diff --git a/objects/jigsaw/structure/village/cross-a-1.iob b/objects/structure/village/cross-a-1.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-a-1.iob rename to objects/structure/village/cross-a-1.iob diff --git a/objects/jigsaw/structure/village/cross-a-2.iob b/objects/structure/village/cross-a-2.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-a-2.iob rename to objects/structure/village/cross-a-2.iob diff --git a/objects/jigsaw/structure/village/cross-a-3.iob b/objects/structure/village/cross-a-3.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-a-3.iob rename to objects/structure/village/cross-a-3.iob diff --git a/objects/jigsaw/structure/village/cross-a-4.iob b/objects/structure/village/cross-a-4.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-a-4.iob rename to objects/structure/village/cross-a-4.iob diff --git a/objects/jigsaw/structure/village/cross-a-5.iob b/objects/structure/village/cross-a-5.iob similarity index 100% rename from objects/jigsaw/structure/village/cross-a-5.iob rename to objects/structure/village/cross-a-5.iob diff --git a/objects/jigsaw/structure/village/hall-1.iob b/objects/structure/village/hall-1.iob similarity index 100% rename from objects/jigsaw/structure/village/hall-1.iob rename to objects/structure/village/hall-1.iob diff --git a/objects/jigsaw/structure/village/hall-we-1.iob b/objects/structure/village/hall-we-1.iob similarity index 100% rename from objects/jigsaw/structure/village/hall-we-1.iob rename to objects/structure/village/hall-we-1.iob diff --git a/objects/jigsaw/structure/village/hall-we-2.iob b/objects/structure/village/hall-we-2.iob similarity index 100% rename from objects/jigsaw/structure/village/hall-we-2.iob rename to objects/structure/village/hall-we-2.iob diff --git a/objects/jigsaw/structure/village/hall-we-3.iob b/objects/structure/village/hall-we-3.iob similarity index 100% rename from objects/jigsaw/structure/village/hall-we-3.iob rename to objects/structure/village/hall-we-3.iob diff --git a/objects/jigsaw/structure/village/hall-we-4.iob b/objects/structure/village/hall-we-4.iob similarity index 100% rename from objects/jigsaw/structure/village/hall-we-4.iob rename to objects/structure/village/hall-we-4.iob diff --git a/objects/jigsaw/structure/village/room-1.iob b/objects/structure/village/room-1.iob similarity index 100% rename from objects/jigsaw/structure/village/room-1.iob rename to objects/structure/village/room-1.iob diff --git a/objects/jigsaw/structure/village/room-crop-sew-1.iob b/objects/structure/village/room-crop-sew-1.iob similarity index 100% rename from objects/jigsaw/structure/village/room-crop-sew-1.iob rename to objects/structure/village/room-crop-sew-1.iob diff --git a/objects/jigsaw/structure/village/room-crop-sew-2.iob b/objects/structure/village/room-crop-sew-2.iob similarity index 100% rename from objects/jigsaw/structure/village/room-crop-sew-2.iob rename to objects/structure/village/room-crop-sew-2.iob diff --git a/objects/jigsaw/structure/village/room-crop-sew-3.iob b/objects/structure/village/room-crop-sew-3.iob similarity index 100% rename from objects/jigsaw/structure/village/room-crop-sew-3.iob rename to objects/structure/village/room-crop-sew-3.iob diff --git a/objects/jigsaw/structure/village/room-crop-wheat-sew-1.iob b/objects/structure/village/room-crop-wheat-sew-1.iob similarity index 100% rename from objects/jigsaw/structure/village/room-crop-wheat-sew-1.iob rename to objects/structure/village/room-crop-wheat-sew-1.iob diff --git a/objects/jigsaw/structure/village/room-crop-wheat-sew-2.iob b/objects/structure/village/room-crop-wheat-sew-2.iob similarity index 100% rename from objects/jigsaw/structure/village/room-crop-wheat-sew-2.iob rename to objects/structure/village/room-crop-wheat-sew-2.iob diff --git a/objects/jigsaw/structure/village/room-crop-wheat-sew-3.iob b/objects/structure/village/room-crop-wheat-sew-3.iob similarity index 100% rename from objects/jigsaw/structure/village/room-crop-wheat-sew-3.iob rename to objects/structure/village/room-crop-wheat-sew-3.iob diff --git a/objects/jigsaw/structure/village/room-dirt-sew-1.iob b/objects/structure/village/room-dirt-sew-1.iob similarity index 100% rename from objects/jigsaw/structure/village/room-dirt-sew-1.iob rename to objects/structure/village/room-dirt-sew-1.iob diff --git a/objects/jigsaw/structure/village/t-connect-1.iob b/objects/structure/village/t-connect-1.iob similarity index 100% rename from objects/jigsaw/structure/village/t-connect-1.iob rename to objects/structure/village/t-connect-1.iob diff --git a/objects/jigsaw/structure/village/tcross-e-1.iob b/objects/structure/village/tcross-e-1.iob similarity index 100% rename from objects/jigsaw/structure/village/tcross-e-1.iob rename to objects/structure/village/tcross-e-1.iob diff --git a/objects/jigsaw/structure/village/tcross-e-2.iob b/objects/structure/village/tcross-e-2.iob similarity index 100% rename from objects/jigsaw/structure/village/tcross-e-2.iob rename to objects/structure/village/tcross-e-2.iob diff --git a/objects/jigsaw/structure/village/tcross-e-3.iob b/objects/structure/village/tcross-e-3.iob similarity index 100% rename from objects/jigsaw/structure/village/tcross-e-3.iob rename to objects/structure/village/tcross-e-3.iob diff --git a/objects/jigsaw/structure/village/tcross-e-4.iob b/objects/structure/village/tcross-e-4.iob similarity index 100% rename from objects/jigsaw/structure/village/tcross-e-4.iob rename to objects/structure/village/tcross-e-4.iob diff --git a/objects/jigsaw/structure/village/walled-room-1.iob b/objects/structure/village/walled-room-1.iob similarity index 100% rename from objects/jigsaw/structure/village/walled-room-1.iob rename to objects/structure/village/walled-room-1.iob diff --git a/objects/stump-dark/stump3.iob b/objects/stump-dark/stump3.iob new file mode 100644 index 00000000..b3aeead2 Binary files /dev/null and b/objects/stump-dark/stump3.iob differ diff --git a/objects/stump/grave-1.iob b/objects/stump/grave-1.iob new file mode 100644 index 00000000..ba7c1185 Binary files /dev/null and b/objects/stump/grave-1.iob differ diff --git a/objects/stump/stump1.iob b/objects/stump/stump1.iob new file mode 100644 index 00000000..0ebe709a Binary files /dev/null and b/objects/stump/stump1.iob differ diff --git a/objects/stump/stump2.iob b/objects/stump/stump2.iob new file mode 100644 index 00000000..11426d20 Binary files /dev/null and b/objects/stump/stump2.iob differ diff --git a/objects/stump/stump3.iob b/objects/stump/stump3.iob new file mode 100644 index 00000000..1e1be6cd Binary files /dev/null and b/objects/stump/stump3.iob differ diff --git a/objects/stump/stump4.iob b/objects/stump/stump4.iob new file mode 100644 index 00000000..a4978c0e Binary files /dev/null and b/objects/stump/stump4.iob differ diff --git a/objects/stump/stump5.iob b/objects/stump/stump5.iob new file mode 100644 index 00000000..c77a9b20 Binary files /dev/null and b/objects/stump/stump5.iob differ diff --git a/objects/stump/stump6.iob b/objects/stump/stump6.iob new file mode 100644 index 00000000..c06f5a85 Binary files /dev/null and b/objects/stump/stump6.iob differ diff --git a/objects/trees/oak/swoak1.iob b/objects/swampy-oak/swampy1.iob similarity index 100% rename from objects/trees/oak/swoak1.iob rename to objects/swampy-oak/swampy1.iob diff --git a/objects/trees/oak/swoak2.iob b/objects/swampy-oak/swampy2.iob similarity index 100% rename from objects/trees/oak/swoak2.iob rename to objects/swampy-oak/swampy2.iob diff --git a/objects/trees/oak/swoak3.iob b/objects/swampy-oak/swampy3.iob similarity index 100% rename from objects/trees/oak/swoak3.iob rename to objects/swampy-oak/swampy3.iob diff --git a/objects/trees/oak/swoak4.iob b/objects/swampy-oak/swampy4.iob similarity index 100% rename from objects/trees/oak/swoak4.iob rename to objects/swampy-oak/swampy4.iob diff --git a/objects/trees/oak/swoak5.iob b/objects/swampy-oak/swampy5.iob similarity index 100% rename from objects/trees/oak/swoak5.iob rename to objects/swampy-oak/swampy5.iob diff --git a/objects/tentacle-cold/TentacleCold1.iob b/objects/tentacle-cold/TentacleCold1.iob new file mode 100644 index 00000000..7134cb34 Binary files /dev/null and b/objects/tentacle-cold/TentacleCold1.iob differ diff --git a/objects/tentacle-cold/TentacleCold2.iob b/objects/tentacle-cold/TentacleCold2.iob new file mode 100644 index 00000000..75d1325f Binary files /dev/null and b/objects/tentacle-cold/TentacleCold2.iob differ diff --git a/objects/tentacle-cold/TentacleCold3.iob b/objects/tentacle-cold/TentacleCold3.iob new file mode 100644 index 00000000..1da6d344 Binary files /dev/null and b/objects/tentacle-cold/TentacleCold3.iob differ diff --git a/objects/tentacle-cold/TentacleCold4.iob b/objects/tentacle-cold/TentacleCold4.iob new file mode 100644 index 00000000..9732becd Binary files /dev/null and b/objects/tentacle-cold/TentacleCold4.iob differ diff --git a/objects/tentacle-cold/TentacleCold5.iob b/objects/tentacle-cold/TentacleCold5.iob new file mode 100644 index 00000000..5ec6cfff Binary files /dev/null and b/objects/tentacle-cold/TentacleCold5.iob differ diff --git a/objects/tentacle-cold/TentacleCold6.iob b/objects/tentacle-cold/TentacleCold6.iob new file mode 100644 index 00000000..2ce9afad Binary files /dev/null and b/objects/tentacle-cold/TentacleCold6.iob differ diff --git a/objects/tentacle-cold/TentacleCold7.iob b/objects/tentacle-cold/TentacleCold7.iob new file mode 100644 index 00000000..a8fe1583 Binary files /dev/null and b/objects/tentacle-cold/TentacleCold7.iob differ diff --git a/objects/tentacle-cold/TentacleCold8.iob b/objects/tentacle-cold/TentacleCold8.iob new file mode 100644 index 00000000..5b4e7a19 Binary files /dev/null and b/objects/tentacle-cold/TentacleCold8.iob differ diff --git a/objects/tentacle-darkwood/TentacleDarkWood3.iob b/objects/tentacle-darkwood/TentacleDarkWood3.iob new file mode 100644 index 00000000..467e7e3e Binary files /dev/null and b/objects/tentacle-darkwood/TentacleDarkWood3.iob differ diff --git a/objects/tentacle-darkwood/TentacleDarkWood6.iob b/objects/tentacle-darkwood/TentacleDarkWood6.iob new file mode 100644 index 00000000..d158fae8 Binary files /dev/null and b/objects/tentacle-darkwood/TentacleDarkWood6.iob differ diff --git a/objects/tentacle-darkwood/TentacleDarkWood8.iob b/objects/tentacle-darkwood/TentacleDarkWood8.iob new file mode 100644 index 00000000..ad9a86fa Binary files /dev/null and b/objects/tentacle-darkwood/TentacleDarkWood8.iob differ diff --git a/objects/tentacle-fire/TentacleFire1.iob b/objects/tentacle-fire/TentacleFire1.iob new file mode 100644 index 00000000..98776b4e Binary files /dev/null and b/objects/tentacle-fire/TentacleFire1.iob differ diff --git a/objects/tentacle-fire/TentacleFire2.iob b/objects/tentacle-fire/TentacleFire2.iob new file mode 100644 index 00000000..78f2d1ad Binary files /dev/null and b/objects/tentacle-fire/TentacleFire2.iob differ diff --git a/objects/tentacle-fire/TentacleFire3.iob b/objects/tentacle-fire/TentacleFire3.iob new file mode 100644 index 00000000..b3d5a8cb Binary files /dev/null and b/objects/tentacle-fire/TentacleFire3.iob differ diff --git a/objects/tentacle-fire/TentacleFire4.iob b/objects/tentacle-fire/TentacleFire4.iob new file mode 100644 index 00000000..7b099286 Binary files /dev/null and b/objects/tentacle-fire/TentacleFire4.iob differ diff --git a/objects/tentacle-fire/TentacleFire5.iob b/objects/tentacle-fire/TentacleFire5.iob new file mode 100644 index 00000000..2b566cfb Binary files /dev/null and b/objects/tentacle-fire/TentacleFire5.iob differ diff --git a/objects/tentacle-fire/TentacleFire6.iob b/objects/tentacle-fire/TentacleFire6.iob new file mode 100644 index 00000000..ca165c74 Binary files /dev/null and b/objects/tentacle-fire/TentacleFire6.iob differ diff --git a/objects/tentacle-fire/TentacleFire7.iob b/objects/tentacle-fire/TentacleFire7.iob new file mode 100644 index 00000000..98982dca Binary files /dev/null and b/objects/tentacle-fire/TentacleFire7.iob differ diff --git a/objects/tentacle-fire/TentacleFire8.iob b/objects/tentacle-fire/TentacleFire8.iob new file mode 100644 index 00000000..3abef0f5 Binary files /dev/null and b/objects/tentacle-fire/TentacleFire8.iob differ diff --git a/objects/tentacle-oak/TentacleOak1.iob b/objects/tentacle-oak/TentacleOak1.iob new file mode 100644 index 00000000..739481cc Binary files /dev/null and b/objects/tentacle-oak/TentacleOak1.iob differ diff --git a/objects/tentacle-oak/TentacleOak2.iob b/objects/tentacle-oak/TentacleOak2.iob new file mode 100644 index 00000000..4f495c4b Binary files /dev/null and b/objects/tentacle-oak/TentacleOak2.iob differ diff --git a/objects/tentacle-oak/TentacleOak3.iob b/objects/tentacle-oak/TentacleOak3.iob new file mode 100644 index 00000000..3f6d2afa Binary files /dev/null and b/objects/tentacle-oak/TentacleOak3.iob differ diff --git a/objects/tentacle-oak/TentacleOak4.iob b/objects/tentacle-oak/TentacleOak4.iob new file mode 100644 index 00000000..30bb5003 Binary files /dev/null and b/objects/tentacle-oak/TentacleOak4.iob differ diff --git a/objects/tentacle-oak/TentacleOak5.iob b/objects/tentacle-oak/TentacleOak5.iob new file mode 100644 index 00000000..1f52d2dd Binary files /dev/null and b/objects/tentacle-oak/TentacleOak5.iob differ diff --git a/objects/tentacle-oak/TentacleOak6.iob b/objects/tentacle-oak/TentacleOak6.iob new file mode 100644 index 00000000..30342af0 Binary files /dev/null and b/objects/tentacle-oak/TentacleOak6.iob differ diff --git a/objects/tentacle-oak/TentacleOak7.iob b/objects/tentacle-oak/TentacleOak7.iob new file mode 100644 index 00000000..9dedc281 Binary files /dev/null and b/objects/tentacle-oak/TentacleOak7.iob differ diff --git a/objects/tentacle-oak/TentacleOak8.iob b/objects/tentacle-oak/TentacleOak8.iob new file mode 100644 index 00000000..d72fca6e Binary files /dev/null and b/objects/tentacle-oak/TentacleOak8.iob differ diff --git a/objects/tentacle-slime/TentacleSlimy1.iob b/objects/tentacle-slime/TentacleSlimy1.iob new file mode 100644 index 00000000..c82bcfd7 Binary files /dev/null and b/objects/tentacle-slime/TentacleSlimy1.iob differ diff --git a/objects/tentacle-slime/TentacleSlimy2.iob b/objects/tentacle-slime/TentacleSlimy2.iob new file mode 100644 index 00000000..080169e6 Binary files /dev/null and b/objects/tentacle-slime/TentacleSlimy2.iob differ diff --git a/objects/tentacle-slime/TentacleSlimy3.iob b/objects/tentacle-slime/TentacleSlimy3.iob new file mode 100644 index 00000000..480838fc Binary files /dev/null and b/objects/tentacle-slime/TentacleSlimy3.iob differ diff --git a/objects/tentacle-slime/TentacleSlimy4.iob b/objects/tentacle-slime/TentacleSlimy4.iob new file mode 100644 index 00000000..8176f05e Binary files /dev/null and b/objects/tentacle-slime/TentacleSlimy4.iob differ diff --git a/objects/tentacle-slime/TentacleSlimy5.iob b/objects/tentacle-slime/TentacleSlimy5.iob new file mode 100644 index 00000000..aff922fe Binary files /dev/null and b/objects/tentacle-slime/TentacleSlimy5.iob differ diff --git a/objects/tentacle-slime/TentacleSlimy7.iob b/objects/tentacle-slime/TentacleSlimy7.iob new file mode 100644 index 00000000..0812387b Binary files /dev/null and b/objects/tentacle-slime/TentacleSlimy7.iob differ diff --git a/objects/tentacle-slime/TentacleSlimy8.iob b/objects/tentacle-slime/TentacleSlimy8.iob new file mode 100644 index 00000000..51a300c4 Binary files /dev/null and b/objects/tentacle-slime/TentacleSlimy8.iob differ diff --git a/objects/tourmaline-large/purp1.iob b/objects/tourmaline-large/purp1.iob new file mode 100644 index 00000000..efd69f72 Binary files /dev/null and b/objects/tourmaline-large/purp1.iob differ diff --git a/objects/tourmaline-large/purp10.iob b/objects/tourmaline-large/purp10.iob new file mode 100644 index 00000000..7dc6cacc Binary files /dev/null and b/objects/tourmaline-large/purp10.iob differ diff --git a/objects/tourmaline-large/purp2.iob b/objects/tourmaline-large/purp2.iob new file mode 100644 index 00000000..2870e338 Binary files /dev/null and b/objects/tourmaline-large/purp2.iob differ diff --git a/objects/tourmaline-large/purp3.iob b/objects/tourmaline-large/purp3.iob new file mode 100644 index 00000000..0df05700 Binary files /dev/null and b/objects/tourmaline-large/purp3.iob differ diff --git a/objects/tourmaline-large/purp4.iob b/objects/tourmaline-large/purp4.iob new file mode 100644 index 00000000..a008fcf3 Binary files /dev/null and b/objects/tourmaline-large/purp4.iob differ diff --git a/objects/tourmaline-large/purp5.iob b/objects/tourmaline-large/purp5.iob new file mode 100644 index 00000000..64076eb4 Binary files /dev/null and b/objects/tourmaline-large/purp5.iob differ diff --git a/objects/tourmaline-large/purp6.iob b/objects/tourmaline-large/purp6.iob new file mode 100644 index 00000000..15dd137c Binary files /dev/null and b/objects/tourmaline-large/purp6.iob differ diff --git a/objects/tourmaline-large/purp7.iob b/objects/tourmaline-large/purp7.iob new file mode 100644 index 00000000..87a299a3 Binary files /dev/null and b/objects/tourmaline-large/purp7.iob differ diff --git a/objects/tourmaline-large/purp8.iob b/objects/tourmaline-large/purp8.iob new file mode 100644 index 00000000..3a6cc870 Binary files /dev/null and b/objects/tourmaline-large/purp8.iob differ diff --git a/objects/tourmaline-large/purp9.iob b/objects/tourmaline-large/purp9.iob new file mode 100644 index 00000000..e624a03e Binary files /dev/null and b/objects/tourmaline-large/purp9.iob differ diff --git a/objects/tourmaline-medium/Lpurp1.iob b/objects/tourmaline-medium/Lpurp1.iob new file mode 100644 index 00000000..6bd86e68 Binary files /dev/null and b/objects/tourmaline-medium/Lpurp1.iob differ diff --git a/objects/tourmaline-medium/Lpurp10.iob b/objects/tourmaline-medium/Lpurp10.iob new file mode 100644 index 00000000..5913774d Binary files /dev/null and b/objects/tourmaline-medium/Lpurp10.iob differ diff --git a/objects/tourmaline-medium/Lpurp2.iob b/objects/tourmaline-medium/Lpurp2.iob new file mode 100644 index 00000000..c76dd94c Binary files /dev/null and b/objects/tourmaline-medium/Lpurp2.iob differ diff --git a/objects/tourmaline-medium/Lpurp3.iob b/objects/tourmaline-medium/Lpurp3.iob new file mode 100644 index 00000000..c50f3f5d Binary files /dev/null and b/objects/tourmaline-medium/Lpurp3.iob differ diff --git a/objects/tourmaline-medium/Lpurp4.iob b/objects/tourmaline-medium/Lpurp4.iob new file mode 100644 index 00000000..ef4dedeb Binary files /dev/null and b/objects/tourmaline-medium/Lpurp4.iob differ diff --git a/objects/tourmaline-medium/Lpurp5.iob b/objects/tourmaline-medium/Lpurp5.iob new file mode 100644 index 00000000..d09a43af Binary files /dev/null and b/objects/tourmaline-medium/Lpurp5.iob differ diff --git a/objects/tourmaline-medium/Lpurp6.iob b/objects/tourmaline-medium/Lpurp6.iob new file mode 100644 index 00000000..08f2b417 Binary files /dev/null and b/objects/tourmaline-medium/Lpurp6.iob differ diff --git a/objects/tourmaline-medium/Lpurp7.iob b/objects/tourmaline-medium/Lpurp7.iob new file mode 100644 index 00000000..3e664ecc Binary files /dev/null and b/objects/tourmaline-medium/Lpurp7.iob differ diff --git a/objects/tourmaline-medium/Lpurp8.iob b/objects/tourmaline-medium/Lpurp8.iob new file mode 100644 index 00000000..dbae7d41 Binary files /dev/null and b/objects/tourmaline-medium/Lpurp8.iob differ diff --git a/objects/tourmaline-medium/Lpurp9.iob b/objects/tourmaline-medium/Lpurp9.iob new file mode 100644 index 00000000..4ceac9b0 Binary files /dev/null and b/objects/tourmaline-medium/Lpurp9.iob differ diff --git a/objects/tourmaline-medium/Spurp1.iob b/objects/tourmaline-medium/Spurp1.iob new file mode 100644 index 00000000..48ed0650 Binary files /dev/null and b/objects/tourmaline-medium/Spurp1.iob differ diff --git a/objects/tourmaline-medium/Spurp10.iob b/objects/tourmaline-medium/Spurp10.iob new file mode 100644 index 00000000..2d7de875 Binary files /dev/null and b/objects/tourmaline-medium/Spurp10.iob differ diff --git a/objects/tourmaline-medium/Spurp2.iob b/objects/tourmaline-medium/Spurp2.iob new file mode 100644 index 00000000..34d7a3b9 Binary files /dev/null and b/objects/tourmaline-medium/Spurp2.iob differ diff --git a/objects/tourmaline-medium/Spurp3.iob b/objects/tourmaline-medium/Spurp3.iob new file mode 100644 index 00000000..9adeea7c Binary files /dev/null and b/objects/tourmaline-medium/Spurp3.iob differ diff --git a/objects/tourmaline-medium/Spurp4.iob b/objects/tourmaline-medium/Spurp4.iob new file mode 100644 index 00000000..f3ce396b Binary files /dev/null and b/objects/tourmaline-medium/Spurp4.iob differ diff --git a/objects/tourmaline-medium/Spurp5.iob b/objects/tourmaline-medium/Spurp5.iob new file mode 100644 index 00000000..6a6503c7 Binary files /dev/null and b/objects/tourmaline-medium/Spurp5.iob differ diff --git a/objects/tourmaline-medium/Spurp6.iob b/objects/tourmaline-medium/Spurp6.iob new file mode 100644 index 00000000..c50c8ec1 Binary files /dev/null and b/objects/tourmaline-medium/Spurp6.iob differ diff --git a/objects/tourmaline-medium/Spurp7.iob b/objects/tourmaline-medium/Spurp7.iob new file mode 100644 index 00000000..d5cc7451 Binary files /dev/null and b/objects/tourmaline-medium/Spurp7.iob differ diff --git a/objects/tourmaline-medium/Spurp8.iob b/objects/tourmaline-medium/Spurp8.iob new file mode 100644 index 00000000..e4e12696 Binary files /dev/null and b/objects/tourmaline-medium/Spurp8.iob differ diff --git a/objects/tourmaline-medium/Spurp9.iob b/objects/tourmaline-medium/Spurp9.iob new file mode 100644 index 00000000..4a9c0401 Binary files /dev/null and b/objects/tourmaline-medium/Spurp9.iob differ diff --git a/objects/tourmaline-prob/prob1.iob b/objects/tourmaline-prob/prob1.iob new file mode 100644 index 00000000..766f9f75 Binary files /dev/null and b/objects/tourmaline-prob/prob1.iob differ diff --git a/objects/tourmaline-prob/prob2.iob b/objects/tourmaline-prob/prob2.iob new file mode 100644 index 00000000..9f0804dd Binary files /dev/null and b/objects/tourmaline-prob/prob2.iob differ diff --git a/objects/trees/acacia/vexed1.iob b/objects/tree/acacia/1.iob similarity index 100% rename from objects/trees/acacia/vexed1.iob rename to objects/tree/acacia/1.iob diff --git a/objects/trees/acacia/vexed2.iob b/objects/tree/acacia/2.iob similarity index 100% rename from objects/trees/acacia/vexed2.iob rename to objects/tree/acacia/2.iob diff --git a/objects/trees/acacia/vexed3.iob b/objects/tree/acacia/3.iob similarity index 100% rename from objects/trees/acacia/vexed3.iob rename to objects/tree/acacia/3.iob diff --git a/objects/trees/jungle/mgeneric1.iob b/objects/tree/jungle/1.iob similarity index 100% rename from objects/trees/jungle/mgeneric1.iob rename to objects/tree/jungle/1.iob diff --git a/objects/trees/jungle/mgeneric2.iob b/objects/tree/jungle/2.iob similarity index 100% rename from objects/trees/jungle/mgeneric2.iob rename to objects/tree/jungle/2.iob diff --git a/objects/trees/jungle/vgeneric16.iob b/objects/tree/jungle/3.iob similarity index 100% rename from objects/trees/jungle/vgeneric16.iob rename to objects/tree/jungle/3.iob diff --git a/objects/trees/jungle/vgeneric17.iob b/objects/tree/jungle/4.iob similarity index 100% rename from objects/trees/jungle/vgeneric17.iob rename to objects/tree/jungle/4.iob diff --git a/objects/trees/jungle/vgeneric18.iob b/objects/tree/jungle/5.iob similarity index 100% rename from objects/trees/jungle/vgeneric18.iob rename to objects/tree/jungle/5.iob diff --git a/objects/trees/jungle/vgeneric19.iob b/objects/tree/jungle/6.iob similarity index 100% rename from objects/trees/jungle/vgeneric19.iob rename to objects/tree/jungle/6.iob diff --git a/objects/trees/jungle/vgeneric20.iob b/objects/tree/jungle/7.iob similarity index 100% rename from objects/trees/jungle/vgeneric20.iob rename to objects/tree/jungle/7.iob diff --git a/objects/trees/jungle/vgeneric21.iob b/objects/tree/jungle/8.iob similarity index 100% rename from objects/trees/jungle/vgeneric21.iob rename to objects/tree/jungle/8.iob diff --git a/objects/trees/jungle/vgeneric22.iob b/objects/tree/jungle/9.iob similarity index 100% rename from objects/trees/jungle/vgeneric22.iob rename to objects/tree/jungle/9.iob diff --git a/objects/trees/oak/truegeneric7.iob b/objects/tree/oak/1.iob similarity index 100% rename from objects/trees/oak/truegeneric7.iob rename to objects/tree/oak/1.iob diff --git a/objects/trees/oak/truegeneric8.iob b/objects/tree/oak/2.iob similarity index 100% rename from objects/trees/oak/truegeneric8.iob rename to objects/tree/oak/2.iob diff --git a/objects/trees/oak/truegeneric9.iob b/objects/tree/oak/3.iob similarity index 100% rename from objects/trees/oak/truegeneric9.iob rename to objects/tree/oak/3.iob diff --git a/objects/trees/oak/truegeneric10.iob b/objects/tree/oak/4.iob similarity index 100% rename from objects/trees/oak/truegeneric10.iob rename to objects/tree/oak/4.iob diff --git a/objects/trees/oak/truegeneric11.iob b/objects/tree/oak/5.iob similarity index 100% rename from objects/trees/oak/truegeneric11.iob rename to objects/tree/oak/5.iob diff --git a/objects/trees/oak/truegeneric13.iob b/objects/tree/oak/6.iob similarity index 100% rename from objects/trees/oak/truegeneric13.iob rename to objects/tree/oak/6.iob diff --git a/objects/trees/spruce/generic1.iob b/objects/tree/spruce/1.iob similarity index 100% rename from objects/trees/spruce/generic1.iob rename to objects/tree/spruce/1.iob diff --git a/objects/trees/spruce/generic2.iob b/objects/tree/spruce/2.iob similarity index 100% rename from objects/trees/spruce/generic2.iob rename to objects/tree/spruce/2.iob diff --git a/objects/trees/spruce/generic3.iob b/objects/tree/spruce/3.iob similarity index 100% rename from objects/trees/spruce/generic3.iob rename to objects/tree/spruce/3.iob diff --git a/objects/trees/jungle/deligeneric1.iob b/objects/tropical-delux/tropi-1.iob similarity index 100% rename from objects/trees/jungle/deligeneric1.iob rename to objects/tropical-delux/tropi-1.iob diff --git a/objects/trees/jungle/deligeneric2.iob b/objects/tropical-delux/tropi-2.iob similarity index 100% rename from objects/trees/jungle/deligeneric2.iob rename to objects/tropical-delux/tropi-2.iob diff --git a/objects/trees/jungle/deligeneric3.iob b/objects/tropical-delux/tropi-3.iob similarity index 100% rename from objects/trees/jungle/deligeneric3.iob rename to objects/tropical-delux/tropi-3.iob diff --git a/objects/trees/jungle/deligeneric4.iob b/objects/tropical-delux/tropi-4.iob similarity index 100% rename from objects/trees/jungle/deligeneric4.iob rename to objects/tropical-delux/tropi-4.iob diff --git a/objects/trees/jungle/deligeneric5.iob b/objects/tropical-delux/tropi-5.iob similarity index 100% rename from objects/trees/jungle/deligeneric5.iob rename to objects/tropical-delux/tropi-5.iob diff --git a/objects/trees/jungle/deligeneric6.iob b/objects/tropical-delux/tropi-6.iob similarity index 100% rename from objects/trees/jungle/deligeneric6.iob rename to objects/tropical-delux/tropi-6.iob diff --git a/objects/true-redwood/true-redwood-1.iob b/objects/true-redwood/true-redwood-1.iob new file mode 100644 index 00000000..dcbb9d4c Binary files /dev/null and b/objects/true-redwood/true-redwood-1.iob differ diff --git a/objects/true-redwood/true-redwood-10-b.iob b/objects/true-redwood/true-redwood-10-b.iob new file mode 100644 index 00000000..73bea9c0 Binary files /dev/null and b/objects/true-redwood/true-redwood-10-b.iob differ diff --git a/objects/true-redwood/true-redwood-10.iob b/objects/true-redwood/true-redwood-10.iob new file mode 100644 index 00000000..e71be8c7 Binary files /dev/null and b/objects/true-redwood/true-redwood-10.iob differ diff --git a/objects/true-redwood/true-redwood-2.iob b/objects/true-redwood/true-redwood-2.iob new file mode 100644 index 00000000..d3e39b8f Binary files /dev/null and b/objects/true-redwood/true-redwood-2.iob differ diff --git a/objects/true-redwood/true-redwood-3.iob b/objects/true-redwood/true-redwood-3.iob new file mode 100644 index 00000000..f7cc38ec Binary files /dev/null and b/objects/true-redwood/true-redwood-3.iob differ diff --git a/objects/true-redwood/true-redwood-4.iob b/objects/true-redwood/true-redwood-4.iob new file mode 100644 index 00000000..204df8fd Binary files /dev/null and b/objects/true-redwood/true-redwood-4.iob differ diff --git a/objects/true-redwood/true-redwood-5.iob b/objects/true-redwood/true-redwood-5.iob new file mode 100644 index 00000000..b14e5ebc Binary files /dev/null and b/objects/true-redwood/true-redwood-5.iob differ diff --git a/objects/true-redwood/true-redwood-6.iob b/objects/true-redwood/true-redwood-6.iob new file mode 100644 index 00000000..17183aad Binary files /dev/null and b/objects/true-redwood/true-redwood-6.iob differ diff --git a/objects/true-redwood/true-redwood-7-b.iob b/objects/true-redwood/true-redwood-7-b.iob new file mode 100644 index 00000000..1424f8c0 Binary files /dev/null and b/objects/true-redwood/true-redwood-7-b.iob differ diff --git a/objects/true-redwood/true-redwood-7.iob b/objects/true-redwood/true-redwood-7.iob new file mode 100644 index 00000000..5ce45812 Binary files /dev/null and b/objects/true-redwood/true-redwood-7.iob differ diff --git a/objects/true-redwood/true-redwood-8-b.iob b/objects/true-redwood/true-redwood-8-b.iob new file mode 100644 index 00000000..3ef63e34 Binary files /dev/null and b/objects/true-redwood/true-redwood-8-b.iob differ diff --git a/objects/true-redwood/true-redwood-8.iob b/objects/true-redwood/true-redwood-8.iob new file mode 100644 index 00000000..bbd49036 Binary files /dev/null and b/objects/true-redwood/true-redwood-8.iob differ diff --git a/objects/true-redwood/true-redwood-9-b.iob b/objects/true-redwood/true-redwood-9-b.iob new file mode 100644 index 00000000..d90979fa Binary files /dev/null and b/objects/true-redwood/true-redwood-9-b.iob differ diff --git a/objects/true-redwood/true-redwood-9.iob b/objects/true-redwood/true-redwood-9.iob new file mode 100644 index 00000000..9d200615 Binary files /dev/null and b/objects/true-redwood/true-redwood-9.iob differ diff --git a/objects/true-redwood/true-redwood-small-1.iob b/objects/true-redwood/true-redwood-small-1.iob new file mode 100644 index 00000000..823626b6 Binary files /dev/null and b/objects/true-redwood/true-redwood-small-1.iob differ diff --git a/objects/true-redwood/true-redwood-small-2.iob b/objects/true-redwood/true-redwood-small-2.iob new file mode 100644 index 00000000..230b8941 Binary files /dev/null and b/objects/true-redwood/true-redwood-small-2.iob differ diff --git a/objects/true-redwood/true-redwood-small-3.iob b/objects/true-redwood/true-redwood-small-3.iob new file mode 100644 index 00000000..29eee7cd Binary files /dev/null and b/objects/true-redwood/true-redwood-small-3.iob differ diff --git a/objects/true-redwood/true-redwood-small-4.iob b/objects/true-redwood/true-redwood-small-4.iob new file mode 100644 index 00000000..9b7aee7e Binary files /dev/null and b/objects/true-redwood/true-redwood-small-4.iob differ diff --git a/objects/true-redwood/true-redwood-small-5.iob b/objects/true-redwood/true-redwood-small-5.iob new file mode 100644 index 00000000..1450c14c Binary files /dev/null and b/objects/true-redwood/true-redwood-small-5.iob differ diff --git a/objects/clutter/cobble-spike.iob b/objects/underwater/cobble-spike.iob similarity index 100% rename from objects/clutter/cobble-spike.iob rename to objects/underwater/cobble-spike.iob diff --git a/objects/jigsaw/underwater_ruin/big_brick_1.iob b/objects/underwater/underwater_ruin/big_brick_1.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_brick_1.iob rename to objects/underwater/underwater_ruin/big_brick_1.iob diff --git a/objects/jigsaw/underwater_ruin/big_brick_2.iob b/objects/underwater/underwater_ruin/big_brick_2.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_brick_2.iob rename to objects/underwater/underwater_ruin/big_brick_2.iob diff --git a/objects/jigsaw/underwater_ruin/big_brick_3.iob b/objects/underwater/underwater_ruin/big_brick_3.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_brick_3.iob rename to objects/underwater/underwater_ruin/big_brick_3.iob diff --git a/objects/jigsaw/underwater_ruin/big_brick_8.iob b/objects/underwater/underwater_ruin/big_brick_8.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_brick_8.iob rename to objects/underwater/underwater_ruin/big_brick_8.iob diff --git a/objects/jigsaw/underwater_ruin/big_cracked_1.iob b/objects/underwater/underwater_ruin/big_cracked_1.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_cracked_1.iob rename to objects/underwater/underwater_ruin/big_cracked_1.iob diff --git a/objects/jigsaw/underwater_ruin/big_cracked_2.iob b/objects/underwater/underwater_ruin/big_cracked_2.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_cracked_2.iob rename to objects/underwater/underwater_ruin/big_cracked_2.iob diff --git a/objects/jigsaw/underwater_ruin/big_cracked_3.iob b/objects/underwater/underwater_ruin/big_cracked_3.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_cracked_3.iob rename to objects/underwater/underwater_ruin/big_cracked_3.iob diff --git a/objects/jigsaw/underwater_ruin/big_cracked_8.iob b/objects/underwater/underwater_ruin/big_cracked_8.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_cracked_8.iob rename to objects/underwater/underwater_ruin/big_cracked_8.iob diff --git a/objects/jigsaw/underwater_ruin/big_mossy_1.iob b/objects/underwater/underwater_ruin/big_mossy_1.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_mossy_1.iob rename to objects/underwater/underwater_ruin/big_mossy_1.iob diff --git a/objects/jigsaw/underwater_ruin/big_mossy_2.iob b/objects/underwater/underwater_ruin/big_mossy_2.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_mossy_2.iob rename to objects/underwater/underwater_ruin/big_mossy_2.iob diff --git a/objects/jigsaw/underwater_ruin/big_mossy_3.iob b/objects/underwater/underwater_ruin/big_mossy_3.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_mossy_3.iob rename to objects/underwater/underwater_ruin/big_mossy_3.iob diff --git a/objects/jigsaw/underwater_ruin/big_mossy_8.iob b/objects/underwater/underwater_ruin/big_mossy_8.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_mossy_8.iob rename to objects/underwater/underwater_ruin/big_mossy_8.iob diff --git a/objects/jigsaw/underwater_ruin/big_warm_4.iob b/objects/underwater/underwater_ruin/big_warm_4.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_warm_4.iob rename to objects/underwater/underwater_ruin/big_warm_4.iob diff --git a/objects/jigsaw/underwater_ruin/big_warm_5.iob b/objects/underwater/underwater_ruin/big_warm_5.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_warm_5.iob rename to objects/underwater/underwater_ruin/big_warm_5.iob diff --git a/objects/jigsaw/underwater_ruin/big_warm_6.iob b/objects/underwater/underwater_ruin/big_warm_6.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_warm_6.iob rename to objects/underwater/underwater_ruin/big_warm_6.iob diff --git a/objects/jigsaw/underwater_ruin/big_warm_7.iob b/objects/underwater/underwater_ruin/big_warm_7.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/big_warm_7.iob rename to objects/underwater/underwater_ruin/big_warm_7.iob diff --git a/objects/jigsaw/underwater_ruin/brick_1.iob b/objects/underwater/underwater_ruin/brick_1.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_1.iob rename to objects/underwater/underwater_ruin/brick_1.iob diff --git a/objects/jigsaw/underwater_ruin/brick_2.iob b/objects/underwater/underwater_ruin/brick_2.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_2.iob rename to objects/underwater/underwater_ruin/brick_2.iob diff --git a/objects/jigsaw/underwater_ruin/brick_3.iob b/objects/underwater/underwater_ruin/brick_3.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_3.iob rename to objects/underwater/underwater_ruin/brick_3.iob diff --git a/objects/jigsaw/underwater_ruin/brick_4.iob b/objects/underwater/underwater_ruin/brick_4.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_4.iob rename to objects/underwater/underwater_ruin/brick_4.iob diff --git a/objects/jigsaw/underwater_ruin/brick_5.iob b/objects/underwater/underwater_ruin/brick_5.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_5.iob rename to objects/underwater/underwater_ruin/brick_5.iob diff --git a/objects/jigsaw/underwater_ruin/brick_6.iob b/objects/underwater/underwater_ruin/brick_6.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_6.iob rename to objects/underwater/underwater_ruin/brick_6.iob diff --git a/objects/jigsaw/underwater_ruin/brick_7.iob b/objects/underwater/underwater_ruin/brick_7.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_7.iob rename to objects/underwater/underwater_ruin/brick_7.iob diff --git a/objects/jigsaw/underwater_ruin/brick_8.iob b/objects/underwater/underwater_ruin/brick_8.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/brick_8.iob rename to objects/underwater/underwater_ruin/brick_8.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_1.iob b/objects/underwater/underwater_ruin/cracked_1.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_1.iob rename to objects/underwater/underwater_ruin/cracked_1.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_2.iob b/objects/underwater/underwater_ruin/cracked_2.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_2.iob rename to objects/underwater/underwater_ruin/cracked_2.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_3.iob b/objects/underwater/underwater_ruin/cracked_3.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_3.iob rename to objects/underwater/underwater_ruin/cracked_3.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_4.iob b/objects/underwater/underwater_ruin/cracked_4.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_4.iob rename to objects/underwater/underwater_ruin/cracked_4.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_5.iob b/objects/underwater/underwater_ruin/cracked_5.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_5.iob rename to objects/underwater/underwater_ruin/cracked_5.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_6.iob b/objects/underwater/underwater_ruin/cracked_6.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_6.iob rename to objects/underwater/underwater_ruin/cracked_6.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_7.iob b/objects/underwater/underwater_ruin/cracked_7.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_7.iob rename to objects/underwater/underwater_ruin/cracked_7.iob diff --git a/objects/jigsaw/underwater_ruin/cracked_8.iob b/objects/underwater/underwater_ruin/cracked_8.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/cracked_8.iob rename to objects/underwater/underwater_ruin/cracked_8.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_1.iob b/objects/underwater/underwater_ruin/mossy_1.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_1.iob rename to objects/underwater/underwater_ruin/mossy_1.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_2.iob b/objects/underwater/underwater_ruin/mossy_2.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_2.iob rename to objects/underwater/underwater_ruin/mossy_2.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_3.iob b/objects/underwater/underwater_ruin/mossy_3.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_3.iob rename to objects/underwater/underwater_ruin/mossy_3.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_4.iob b/objects/underwater/underwater_ruin/mossy_4.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_4.iob rename to objects/underwater/underwater_ruin/mossy_4.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_5.iob b/objects/underwater/underwater_ruin/mossy_5.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_5.iob rename to objects/underwater/underwater_ruin/mossy_5.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_6.iob b/objects/underwater/underwater_ruin/mossy_6.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_6.iob rename to objects/underwater/underwater_ruin/mossy_6.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_7.iob b/objects/underwater/underwater_ruin/mossy_7.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_7.iob rename to objects/underwater/underwater_ruin/mossy_7.iob diff --git a/objects/jigsaw/underwater_ruin/mossy_8.iob b/objects/underwater/underwater_ruin/mossy_8.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/mossy_8.iob rename to objects/underwater/underwater_ruin/mossy_8.iob diff --git a/objects/jigsaw/underwater_ruin/warm_1.iob b/objects/underwater/underwater_ruin/warm_1.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_1.iob rename to objects/underwater/underwater_ruin/warm_1.iob diff --git a/objects/jigsaw/underwater_ruin/warm_2.iob b/objects/underwater/underwater_ruin/warm_2.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_2.iob rename to objects/underwater/underwater_ruin/warm_2.iob diff --git a/objects/jigsaw/underwater_ruin/warm_3.iob b/objects/underwater/underwater_ruin/warm_3.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_3.iob rename to objects/underwater/underwater_ruin/warm_3.iob diff --git a/objects/jigsaw/underwater_ruin/warm_4.iob b/objects/underwater/underwater_ruin/warm_4.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_4.iob rename to objects/underwater/underwater_ruin/warm_4.iob diff --git a/objects/jigsaw/underwater_ruin/warm_5.iob b/objects/underwater/underwater_ruin/warm_5.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_5.iob rename to objects/underwater/underwater_ruin/warm_5.iob diff --git a/objects/jigsaw/underwater_ruin/warm_6.iob b/objects/underwater/underwater_ruin/warm_6.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_6.iob rename to objects/underwater/underwater_ruin/warm_6.iob diff --git a/objects/jigsaw/underwater_ruin/warm_7.iob b/objects/underwater/underwater_ruin/warm_7.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_7.iob rename to objects/underwater/underwater_ruin/warm_7.iob diff --git a/objects/jigsaw/underwater_ruin/warm_8.iob b/objects/underwater/underwater_ruin/warm_8.iob similarity index 100% rename from objects/jigsaw/underwater_ruin/warm_8.iob rename to objects/underwater/underwater_ruin/warm_8.iob diff --git a/objects/trees/spruce/xmasbaby1.iob b/objects/unfrosted-spruce/bab-1.iob similarity index 100% rename from objects/trees/spruce/xmasbaby1.iob rename to objects/unfrosted-spruce/bab-1.iob diff --git a/objects/trees/spruce/xmasbaby2.iob b/objects/unfrosted-spruce/bab-2.iob similarity index 100% rename from objects/trees/spruce/xmasbaby2.iob rename to objects/unfrosted-spruce/bab-2.iob diff --git a/objects/trees/spruce/xmasbaby3.iob b/objects/unfrosted-spruce/bab-3.iob similarity index 100% rename from objects/trees/spruce/xmasbaby3.iob rename to objects/unfrosted-spruce/bab-3.iob diff --git a/objects/trees/spruce/xmasbaby4.iob b/objects/unfrosted-spruce/bab-4.iob similarity index 100% rename from objects/trees/spruce/xmasbaby4.iob rename to objects/unfrosted-spruce/bab-4.iob diff --git a/objects/trees/spruce/xmasbaby5.iob b/objects/unfrosted-spruce/bab-5.iob similarity index 100% rename from objects/trees/spruce/xmasbaby5.iob rename to objects/unfrosted-spruce/bab-5.iob diff --git a/objects/trees/spruce/unfrostedmed1.iob b/objects/unfrosted-spruce/big-1.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed1.iob rename to objects/unfrosted-spruce/big-1.iob diff --git a/objects/trees/spruce/unfrostedmed2.iob b/objects/unfrosted-spruce/big-2.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed2.iob rename to objects/unfrosted-spruce/big-2.iob diff --git a/objects/trees/spruce/unfrostedmed3.iob b/objects/unfrosted-spruce/big-3.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed3.iob rename to objects/unfrosted-spruce/big-3.iob diff --git a/objects/trees/spruce/unfrostedlarge1.iob b/objects/unfrosted-spruce/large-1.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge1.iob rename to objects/unfrosted-spruce/large-1.iob diff --git a/objects/trees/spruce/unfrostedlarge2.iob b/objects/unfrosted-spruce/large-10.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge2.iob rename to objects/unfrosted-spruce/large-10.iob diff --git a/objects/trees/spruce/unfrostedlarge3.iob b/objects/unfrosted-spruce/large-11.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge3.iob rename to objects/unfrosted-spruce/large-11.iob diff --git a/objects/trees/spruce/unfrostedlarge4.iob b/objects/unfrosted-spruce/large-12.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge4.iob rename to objects/unfrosted-spruce/large-12.iob diff --git a/objects/trees/spruce/unfrostedlarge5.iob b/objects/unfrosted-spruce/large-13.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge5.iob rename to objects/unfrosted-spruce/large-13.iob diff --git a/objects/trees/spruce/unfrostedlarge6.iob b/objects/unfrosted-spruce/large-14.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge6.iob rename to objects/unfrosted-spruce/large-14.iob diff --git a/objects/trees/spruce/unfrostedlarge7.iob b/objects/unfrosted-spruce/large-15.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge7.iob rename to objects/unfrosted-spruce/large-15.iob diff --git a/objects/trees/spruce/unfrostedlarge8.iob b/objects/unfrosted-spruce/large-16.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge8.iob rename to objects/unfrosted-spruce/large-16.iob diff --git a/objects/trees/spruce/unfrostedlarge9.iob b/objects/unfrosted-spruce/large-17.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge9.iob rename to objects/unfrosted-spruce/large-17.iob diff --git a/objects/trees/spruce/unfrostedlarge10.iob b/objects/unfrosted-spruce/large-18.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge10.iob rename to objects/unfrosted-spruce/large-18.iob diff --git a/objects/trees/spruce/unfrostedlarge11.iob b/objects/unfrosted-spruce/large-19.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge11.iob rename to objects/unfrosted-spruce/large-19.iob diff --git a/objects/trees/spruce/unfrostedlarge12.iob b/objects/unfrosted-spruce/large-2.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge12.iob rename to objects/unfrosted-spruce/large-2.iob diff --git a/objects/trees/spruce/unfrostedlarge13.iob b/objects/unfrosted-spruce/large-20.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge13.iob rename to objects/unfrosted-spruce/large-20.iob diff --git a/objects/trees/spruce/unfrostedlarge14.iob b/objects/unfrosted-spruce/large-21.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge14.iob rename to objects/unfrosted-spruce/large-21.iob diff --git a/objects/trees/spruce/unfrostedlarge15.iob b/objects/unfrosted-spruce/large-22.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge15.iob rename to objects/unfrosted-spruce/large-22.iob diff --git a/objects/trees/spruce/unfrostedlarge16.iob b/objects/unfrosted-spruce/large-23.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge16.iob rename to objects/unfrosted-spruce/large-23.iob diff --git a/objects/trees/spruce/unfrostedlarge17.iob b/objects/unfrosted-spruce/large-24.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge17.iob rename to objects/unfrosted-spruce/large-24.iob diff --git a/objects/trees/spruce/unfrostedlarge18.iob b/objects/unfrosted-spruce/large-3.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge18.iob rename to objects/unfrosted-spruce/large-3.iob diff --git a/objects/trees/spruce/unfrostedlarge19.iob b/objects/unfrosted-spruce/large-4.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge19.iob rename to objects/unfrosted-spruce/large-4.iob diff --git a/objects/trees/spruce/unfrostedlarge20.iob b/objects/unfrosted-spruce/large-5.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge20.iob rename to objects/unfrosted-spruce/large-5.iob diff --git a/objects/trees/spruce/unfrostedlarge21.iob b/objects/unfrosted-spruce/large-6.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge21.iob rename to objects/unfrosted-spruce/large-6.iob diff --git a/objects/trees/spruce/unfrostedlarge22.iob b/objects/unfrosted-spruce/large-7.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge22.iob rename to objects/unfrosted-spruce/large-7.iob diff --git a/objects/trees/spruce/unfrostedlarge23.iob b/objects/unfrosted-spruce/large-8.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge23.iob rename to objects/unfrosted-spruce/large-8.iob diff --git a/objects/trees/spruce/unfrostedlarge24.iob b/objects/unfrosted-spruce/large-9.iob similarity index 100% rename from objects/trees/spruce/unfrostedlarge24.iob rename to objects/unfrosted-spruce/large-9.iob diff --git a/objects/trees/spruce/unfrostedmed4.iob b/objects/unfrosted-spruce/med-1.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed4.iob rename to objects/unfrosted-spruce/med-1.iob diff --git a/objects/trees/spruce/unfrostedmed5.iob b/objects/unfrosted-spruce/med-2.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed5.iob rename to objects/unfrosted-spruce/med-2.iob diff --git a/objects/trees/spruce/unfrostedmed6.iob b/objects/unfrosted-spruce/med-3.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed6.iob rename to objects/unfrosted-spruce/med-3.iob diff --git a/objects/trees/spruce/unfrostedmed7.iob b/objects/unfrosted-spruce/med-4.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed7.iob rename to objects/unfrosted-spruce/med-4.iob diff --git a/objects/trees/spruce/unfrostedmed8.iob b/objects/unfrosted-spruce/med-5.iob similarity index 100% rename from objects/trees/spruce/unfrostedmed8.iob rename to objects/unfrosted-spruce/med-5.iob diff --git a/objects/trees/spruce/unfrostedsmol1.iob b/objects/unfrosted-spruce/smol-1.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol1.iob rename to objects/unfrosted-spruce/smol-1.iob diff --git a/objects/trees/spruce/unfrostedsmol2.iob b/objects/unfrosted-spruce/smol-2.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol2.iob rename to objects/unfrosted-spruce/smol-2.iob diff --git a/objects/trees/spruce/unfrostedsmol3.iob b/objects/unfrosted-spruce/smol-3.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol3.iob rename to objects/unfrosted-spruce/smol-3.iob diff --git a/objects/trees/spruce/unfrostedsmol4.iob b/objects/unfrosted-spruce/smol-4.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol4.iob rename to objects/unfrosted-spruce/smol-4.iob diff --git a/objects/trees/spruce/unfrostedsmol5.iob b/objects/unfrosted-spruce/smol-5.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol5.iob rename to objects/unfrosted-spruce/smol-5.iob diff --git a/objects/trees/spruce/unfrostedsmol6.iob b/objects/unfrosted-spruce/smol-6.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol6.iob rename to objects/unfrosted-spruce/smol-6.iob diff --git a/objects/trees/spruce/unfrostedsmol7.iob b/objects/unfrosted-spruce/smol-7.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol7.iob rename to objects/unfrosted-spruce/smol-7.iob diff --git a/objects/trees/spruce/unfrostedsmol8.iob b/objects/unfrosted-spruce/smol-8.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol8.iob rename to objects/unfrosted-spruce/smol-8.iob diff --git a/objects/trees/spruce/unfrostedsmol9.iob b/objects/unfrosted-spruce/smol-9.iob similarity index 100% rename from objects/trees/spruce/unfrostedsmol9.iob rename to objects/unfrosted-spruce/smol-9.iob diff --git a/objects/jigsaw/village-bits/bland-e-1.iob b/objects/village-bits/bland-e-1.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-e-1.iob rename to objects/village-bits/bland-e-1.iob diff --git a/objects/jigsaw/village-bits/bland-e-2.iob b/objects/village-bits/bland-e-2.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-e-2.iob rename to objects/village-bits/bland-e-2.iob diff --git a/objects/jigsaw/village-bits/bland-e-3.iob b/objects/village-bits/bland-e-3.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-e-3.iob rename to objects/village-bits/bland-e-3.iob diff --git a/objects/jigsaw/village-bits/bland-e-4.iob b/objects/village-bits/bland-e-4.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-e-4.iob rename to objects/village-bits/bland-e-4.iob diff --git a/objects/jigsaw/village-bits/bland-e-5.iob b/objects/village-bits/bland-e-5.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-e-5.iob rename to objects/village-bits/bland-e-5.iob diff --git a/objects/jigsaw/village-bits/bland-ne-1.iob b/objects/village-bits/bland-ne-1.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ne-1.iob rename to objects/village-bits/bland-ne-1.iob diff --git a/objects/jigsaw/village-bits/bland-ne-2.iob b/objects/village-bits/bland-ne-2.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ne-2.iob rename to objects/village-bits/bland-ne-2.iob diff --git a/objects/jigsaw/village-bits/bland-ne-3.iob b/objects/village-bits/bland-ne-3.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ne-3.iob rename to objects/village-bits/bland-ne-3.iob diff --git a/objects/jigsaw/village-bits/bland-ne-4.iob b/objects/village-bits/bland-ne-4.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ne-4.iob rename to objects/village-bits/bland-ne-4.iob diff --git a/objects/jigsaw/village-bits/bland-ne-5.iob b/objects/village-bits/bland-ne-5.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ne-5.iob rename to objects/village-bits/bland-ne-5.iob diff --git a/objects/jigsaw/village-bits/bland-nes-1.iob b/objects/village-bits/bland-nes-1.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-nes-1.iob rename to objects/village-bits/bland-nes-1.iob diff --git a/objects/jigsaw/village-bits/bland-nes-2.iob b/objects/village-bits/bland-nes-2.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-nes-2.iob rename to objects/village-bits/bland-nes-2.iob diff --git a/objects/jigsaw/village-bits/bland-nes-3.iob b/objects/village-bits/bland-nes-3.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-nes-3.iob rename to objects/village-bits/bland-nes-3.iob diff --git a/objects/jigsaw/village-bits/bland-nes-4.iob b/objects/village-bits/bland-nes-4.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-nes-4.iob rename to objects/village-bits/bland-nes-4.iob diff --git a/objects/jigsaw/village-bits/bland-nes-5.iob b/objects/village-bits/bland-nes-5.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-nes-5.iob rename to objects/village-bits/bland-nes-5.iob diff --git a/objects/jigsaw/village-bits/bland-ns-1.iob b/objects/village-bits/bland-ns-1.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ns-1.iob rename to objects/village-bits/bland-ns-1.iob diff --git a/objects/jigsaw/village-bits/bland-ns-2.iob b/objects/village-bits/bland-ns-2.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ns-2.iob rename to objects/village-bits/bland-ns-2.iob diff --git a/objects/jigsaw/village-bits/bland-ns-3.iob b/objects/village-bits/bland-ns-3.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ns-3.iob rename to objects/village-bits/bland-ns-3.iob diff --git a/objects/jigsaw/village-bits/bland-ns-4.iob b/objects/village-bits/bland-ns-4.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ns-4.iob rename to objects/village-bits/bland-ns-4.iob diff --git a/objects/jigsaw/village-bits/bland-ns-5.iob b/objects/village-bits/bland-ns-5.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-ns-5.iob rename to objects/village-bits/bland-ns-5.iob diff --git a/objects/jigsaw/village-bits/bland-x-1.iob b/objects/village-bits/bland-x-1.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-x-1.iob rename to objects/village-bits/bland-x-1.iob diff --git a/objects/jigsaw/village-bits/bland-x-2.iob b/objects/village-bits/bland-x-2.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-x-2.iob rename to objects/village-bits/bland-x-2.iob diff --git a/objects/jigsaw/village-bits/bland-x-3.iob b/objects/village-bits/bland-x-3.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-x-3.iob rename to objects/village-bits/bland-x-3.iob diff --git a/objects/jigsaw/village-bits/bland-x-4.iob b/objects/village-bits/bland-x-4.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-x-4.iob rename to objects/village-bits/bland-x-4.iob diff --git a/objects/jigsaw/village-bits/bland-x-5.iob b/objects/village-bits/bland-x-5.iob similarity index 100% rename from objects/jigsaw/village-bits/bland-x-5.iob rename to objects/village-bits/bland-x-5.iob diff --git a/objects/jigsaw/village-bits/hay-e-1.iob b/objects/village-bits/hay-e-1.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-e-1.iob rename to objects/village-bits/hay-e-1.iob diff --git a/objects/jigsaw/village-bits/hay-e-2.iob b/objects/village-bits/hay-e-2.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-e-2.iob rename to objects/village-bits/hay-e-2.iob diff --git a/objects/jigsaw/village-bits/hay-e-3.iob b/objects/village-bits/hay-e-3.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-e-3.iob rename to objects/village-bits/hay-e-3.iob diff --git a/objects/jigsaw/village-bits/hay-e-4.iob b/objects/village-bits/hay-e-4.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-e-4.iob rename to objects/village-bits/hay-e-4.iob diff --git a/objects/jigsaw/village-bits/hay-e-5.iob b/objects/village-bits/hay-e-5.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-e-5.iob rename to objects/village-bits/hay-e-5.iob diff --git a/objects/jigsaw/village-bits/hay-ne-1.iob b/objects/village-bits/hay-ne-1.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ne-1.iob rename to objects/village-bits/hay-ne-1.iob diff --git a/objects/jigsaw/village-bits/hay-ne-2.iob b/objects/village-bits/hay-ne-2.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ne-2.iob rename to objects/village-bits/hay-ne-2.iob diff --git a/objects/jigsaw/village-bits/hay-ne-3.iob b/objects/village-bits/hay-ne-3.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ne-3.iob rename to objects/village-bits/hay-ne-3.iob diff --git a/objects/jigsaw/village-bits/hay-ne-4.iob b/objects/village-bits/hay-ne-4.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ne-4.iob rename to objects/village-bits/hay-ne-4.iob diff --git a/objects/jigsaw/village-bits/hay-ne-5.iob b/objects/village-bits/hay-ne-5.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ne-5.iob rename to objects/village-bits/hay-ne-5.iob diff --git a/objects/jigsaw/village-bits/hay-nes-1.iob b/objects/village-bits/hay-nes-1.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-nes-1.iob rename to objects/village-bits/hay-nes-1.iob diff --git a/objects/jigsaw/village-bits/hay-nes-2.iob b/objects/village-bits/hay-nes-2.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-nes-2.iob rename to objects/village-bits/hay-nes-2.iob diff --git a/objects/jigsaw/village-bits/hay-nes-3.iob b/objects/village-bits/hay-nes-3.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-nes-3.iob rename to objects/village-bits/hay-nes-3.iob diff --git a/objects/jigsaw/village-bits/hay-nes-4.iob b/objects/village-bits/hay-nes-4.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-nes-4.iob rename to objects/village-bits/hay-nes-4.iob diff --git a/objects/jigsaw/village-bits/hay-nes-5.iob b/objects/village-bits/hay-nes-5.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-nes-5.iob rename to objects/village-bits/hay-nes-5.iob diff --git a/objects/jigsaw/village-bits/hay-ns-1.iob b/objects/village-bits/hay-ns-1.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ns-1.iob rename to objects/village-bits/hay-ns-1.iob diff --git a/objects/jigsaw/village-bits/hay-ns-2.iob b/objects/village-bits/hay-ns-2.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ns-2.iob rename to objects/village-bits/hay-ns-2.iob diff --git a/objects/jigsaw/village-bits/hay-ns-3.iob b/objects/village-bits/hay-ns-3.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ns-3.iob rename to objects/village-bits/hay-ns-3.iob diff --git a/objects/jigsaw/village-bits/hay-ns-4.iob b/objects/village-bits/hay-ns-4.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ns-4.iob rename to objects/village-bits/hay-ns-4.iob diff --git a/objects/jigsaw/village-bits/hay-ns-5.iob b/objects/village-bits/hay-ns-5.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-ns-5.iob rename to objects/village-bits/hay-ns-5.iob diff --git a/objects/jigsaw/village-bits/hay-x-1.iob b/objects/village-bits/hay-x-1.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-x-1.iob rename to objects/village-bits/hay-x-1.iob diff --git a/objects/jigsaw/village-bits/hay-x-2.iob b/objects/village-bits/hay-x-2.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-x-2.iob rename to objects/village-bits/hay-x-2.iob diff --git a/objects/jigsaw/village-bits/hay-x-3.iob b/objects/village-bits/hay-x-3.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-x-3.iob rename to objects/village-bits/hay-x-3.iob diff --git a/objects/jigsaw/village-bits/hay-x-4.iob b/objects/village-bits/hay-x-4.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-x-4.iob rename to objects/village-bits/hay-x-4.iob diff --git a/objects/jigsaw/village-bits/hay-x-5.iob b/objects/village-bits/hay-x-5.iob similarity index 100% rename from objects/jigsaw/village-bits/hay-x-5.iob rename to objects/village-bits/hay-x-5.iob diff --git a/objects/jigsaw/village-bits/lantern-ne-1.iob b/objects/village-bits/lantern-ne-1.iob similarity index 100% rename from objects/jigsaw/village-bits/lantern-ne-1.iob rename to objects/village-bits/lantern-ne-1.iob diff --git a/objects/jigsaw/village-bits/lantern-ne-2.iob b/objects/village-bits/lantern-ne-2.iob similarity index 100% rename from objects/jigsaw/village-bits/lantern-ne-2.iob rename to objects/village-bits/lantern-ne-2.iob diff --git a/objects/jigsaw/village-bits/lantern-ne-3.iob b/objects/village-bits/lantern-ne-3.iob similarity index 100% rename from objects/jigsaw/village-bits/lantern-ne-3.iob rename to objects/village-bits/lantern-ne-3.iob diff --git a/objects/jigsaw/village-bits/lantern-ne-4.iob b/objects/village-bits/lantern-ne-4.iob similarity index 100% rename from objects/jigsaw/village-bits/lantern-ne-4.iob rename to objects/village-bits/lantern-ne-4.iob diff --git a/objects/jigsaw/village-bits/lantern-ne-5.iob b/objects/village-bits/lantern-ne-5.iob similarity index 100% rename from objects/jigsaw/village-bits/lantern-ne-5.iob rename to objects/village-bits/lantern-ne-5.iob diff --git a/objects/jigsaw/village-bits/lanterns-e-1.iob b/objects/village-bits/lanterns-e-1.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-e-1.iob rename to objects/village-bits/lanterns-e-1.iob diff --git a/objects/jigsaw/village-bits/lanterns-e-2.iob b/objects/village-bits/lanterns-e-2.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-e-2.iob rename to objects/village-bits/lanterns-e-2.iob diff --git a/objects/jigsaw/village-bits/lanterns-e-3.iob b/objects/village-bits/lanterns-e-3.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-e-3.iob rename to objects/village-bits/lanterns-e-3.iob diff --git a/objects/jigsaw/village-bits/lanterns-e-4.iob b/objects/village-bits/lanterns-e-4.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-e-4.iob rename to objects/village-bits/lanterns-e-4.iob diff --git a/objects/jigsaw/village-bits/lanterns-e-5.iob b/objects/village-bits/lanterns-e-5.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-e-5.iob rename to objects/village-bits/lanterns-e-5.iob diff --git a/objects/jigsaw/village-bits/lanterns-nes-1.iob b/objects/village-bits/lanterns-nes-1.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-nes-1.iob rename to objects/village-bits/lanterns-nes-1.iob diff --git a/objects/jigsaw/village-bits/lanterns-nes-2.iob b/objects/village-bits/lanterns-nes-2.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-nes-2.iob rename to objects/village-bits/lanterns-nes-2.iob diff --git a/objects/jigsaw/village-bits/lanterns-nes-3.iob b/objects/village-bits/lanterns-nes-3.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-nes-3.iob rename to objects/village-bits/lanterns-nes-3.iob diff --git a/objects/jigsaw/village-bits/lanterns-nes-4.iob b/objects/village-bits/lanterns-nes-4.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-nes-4.iob rename to objects/village-bits/lanterns-nes-4.iob diff --git a/objects/jigsaw/village-bits/lanterns-nes-5.iob b/objects/village-bits/lanterns-nes-5.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-nes-5.iob rename to objects/village-bits/lanterns-nes-5.iob diff --git a/objects/jigsaw/village-bits/lanterns-ns-1.iob b/objects/village-bits/lanterns-ns-1.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-ns-1.iob rename to objects/village-bits/lanterns-ns-1.iob diff --git a/objects/jigsaw/village-bits/lanterns-ns-2.iob b/objects/village-bits/lanterns-ns-2.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-ns-2.iob rename to objects/village-bits/lanterns-ns-2.iob diff --git a/objects/jigsaw/village-bits/lanterns-ns-3.iob b/objects/village-bits/lanterns-ns-3.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-ns-3.iob rename to objects/village-bits/lanterns-ns-3.iob diff --git a/objects/jigsaw/village-bits/lanterns-ns-4.iob b/objects/village-bits/lanterns-ns-4.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-ns-4.iob rename to objects/village-bits/lanterns-ns-4.iob diff --git a/objects/jigsaw/village-bits/lanterns-ns-5.iob b/objects/village-bits/lanterns-ns-5.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-ns-5.iob rename to objects/village-bits/lanterns-ns-5.iob diff --git a/objects/jigsaw/village-bits/lanterns-x-1.iob b/objects/village-bits/lanterns-x-1.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-x-1.iob rename to objects/village-bits/lanterns-x-1.iob diff --git a/objects/jigsaw/village-bits/lanterns-x-2.iob b/objects/village-bits/lanterns-x-2.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-x-2.iob rename to objects/village-bits/lanterns-x-2.iob diff --git a/objects/jigsaw/village-bits/lanterns-x-3.iob b/objects/village-bits/lanterns-x-3.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-x-3.iob rename to objects/village-bits/lanterns-x-3.iob diff --git a/objects/jigsaw/village-bits/lanterns-x-4.iob b/objects/village-bits/lanterns-x-4.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-x-4.iob rename to objects/village-bits/lanterns-x-4.iob diff --git a/objects/jigsaw/village-bits/lanterns-x-5.iob b/objects/village-bits/lanterns-x-5.iob similarity index 100% rename from objects/jigsaw/village-bits/lanterns-x-5.iob rename to objects/village-bits/lanterns-x-5.iob diff --git a/objects/jigsaw/village-bits/logger-e-1.iob b/objects/village-bits/logger-e-1.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-e-1.iob rename to objects/village-bits/logger-e-1.iob diff --git a/objects/jigsaw/village-bits/logger-e-2.iob b/objects/village-bits/logger-e-2.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-e-2.iob rename to objects/village-bits/logger-e-2.iob diff --git a/objects/jigsaw/village-bits/logger-e-3.iob b/objects/village-bits/logger-e-3.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-e-3.iob rename to objects/village-bits/logger-e-3.iob diff --git a/objects/jigsaw/village-bits/logger-e-4.iob b/objects/village-bits/logger-e-4.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-e-4.iob rename to objects/village-bits/logger-e-4.iob diff --git a/objects/jigsaw/village-bits/logger-e-5.iob b/objects/village-bits/logger-e-5.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-e-5.iob rename to objects/village-bits/logger-e-5.iob diff --git a/objects/jigsaw/village-bits/logger-ne-1.iob b/objects/village-bits/logger-ne-1.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ne-1.iob rename to objects/village-bits/logger-ne-1.iob diff --git a/objects/jigsaw/village-bits/logger-ne-2.iob b/objects/village-bits/logger-ne-2.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ne-2.iob rename to objects/village-bits/logger-ne-2.iob diff --git a/objects/jigsaw/village-bits/logger-ne-3.iob b/objects/village-bits/logger-ne-3.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ne-3.iob rename to objects/village-bits/logger-ne-3.iob diff --git a/objects/jigsaw/village-bits/logger-ne-4.iob b/objects/village-bits/logger-ne-4.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ne-4.iob rename to objects/village-bits/logger-ne-4.iob diff --git a/objects/jigsaw/village-bits/logger-ne-5.iob b/objects/village-bits/logger-ne-5.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ne-5.iob rename to objects/village-bits/logger-ne-5.iob diff --git a/objects/jigsaw/village-bits/logger-nes-1.iob b/objects/village-bits/logger-nes-1.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-nes-1.iob rename to objects/village-bits/logger-nes-1.iob diff --git a/objects/jigsaw/village-bits/logger-nes-2.iob b/objects/village-bits/logger-nes-2.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-nes-2.iob rename to objects/village-bits/logger-nes-2.iob diff --git a/objects/jigsaw/village-bits/logger-nes-3.iob b/objects/village-bits/logger-nes-3.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-nes-3.iob rename to objects/village-bits/logger-nes-3.iob diff --git a/objects/jigsaw/village-bits/logger-nes-4.iob b/objects/village-bits/logger-nes-4.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-nes-4.iob rename to objects/village-bits/logger-nes-4.iob diff --git a/objects/jigsaw/village-bits/logger-nes-5.iob b/objects/village-bits/logger-nes-5.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-nes-5.iob rename to objects/village-bits/logger-nes-5.iob diff --git a/objects/jigsaw/village-bits/logger-ns-1.iob b/objects/village-bits/logger-ns-1.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ns-1.iob rename to objects/village-bits/logger-ns-1.iob diff --git a/objects/jigsaw/village-bits/logger-ns-2.iob b/objects/village-bits/logger-ns-2.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ns-2.iob rename to objects/village-bits/logger-ns-2.iob diff --git a/objects/jigsaw/village-bits/logger-ns-3.iob b/objects/village-bits/logger-ns-3.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ns-3.iob rename to objects/village-bits/logger-ns-3.iob diff --git a/objects/jigsaw/village-bits/logger-ns-4.iob b/objects/village-bits/logger-ns-4.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ns-4.iob rename to objects/village-bits/logger-ns-4.iob diff --git a/objects/jigsaw/village-bits/logger-ns-5.iob b/objects/village-bits/logger-ns-5.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-ns-5.iob rename to objects/village-bits/logger-ns-5.iob diff --git a/objects/jigsaw/village-bits/logger-x-1.iob b/objects/village-bits/logger-x-1.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-x-1.iob rename to objects/village-bits/logger-x-1.iob diff --git a/objects/jigsaw/village-bits/logger-x-2.iob b/objects/village-bits/logger-x-2.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-x-2.iob rename to objects/village-bits/logger-x-2.iob diff --git a/objects/jigsaw/village-bits/logger-x-3.iob b/objects/village-bits/logger-x-3.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-x-3.iob rename to objects/village-bits/logger-x-3.iob diff --git a/objects/jigsaw/village-bits/logger-x-4.iob b/objects/village-bits/logger-x-4.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-x-4.iob rename to objects/village-bits/logger-x-4.iob diff --git a/objects/jigsaw/village-bits/logger-x-5.iob b/objects/village-bits/logger-x-5.iob similarity index 100% rename from objects/jigsaw/village-bits/logger-x-5.iob rename to objects/village-bits/logger-x-5.iob diff --git a/objects/jigsaw/village-bits/stonehome-esw-1.iob b/objects/village-bits/stonehome-esw-1.iob similarity index 100% rename from objects/jigsaw/village-bits/stonehome-esw-1.iob rename to objects/village-bits/stonehome-esw-1.iob diff --git a/objects/jigsaw/village-bits/stonehome-esw-2.iob b/objects/village-bits/stonehome-esw-2.iob similarity index 100% rename from objects/jigsaw/village-bits/stonehome-esw-2.iob rename to objects/village-bits/stonehome-esw-2.iob diff --git a/objects/jigsaw/village-bits/stonehome-esw-3.iob b/objects/village-bits/stonehome-esw-3.iob similarity index 100% rename from objects/jigsaw/village-bits/stonehome-esw-3.iob rename to objects/village-bits/stonehome-esw-3.iob diff --git a/objects/jigsaw/village-bits/stonehome-esw-4.iob b/objects/village-bits/stonehome-esw-4.iob similarity index 100% rename from objects/jigsaw/village-bits/stonehome-esw-4.iob rename to objects/village-bits/stonehome-esw-4.iob diff --git a/objects/jigsaw/village/common/animals/cat_black.iob b/objects/village/common/animals/cat_black.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_black.iob rename to objects/village/common/animals/cat_black.iob diff --git a/objects/jigsaw/village/common/animals/cat_british.iob b/objects/village/common/animals/cat_british.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_british.iob rename to objects/village/common/animals/cat_british.iob diff --git a/objects/jigsaw/village/common/animals/cat_calico.iob b/objects/village/common/animals/cat_calico.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_calico.iob rename to objects/village/common/animals/cat_calico.iob diff --git a/objects/jigsaw/village/common/animals/cat_jellie.iob b/objects/village/common/animals/cat_jellie.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_jellie.iob rename to objects/village/common/animals/cat_jellie.iob diff --git a/objects/jigsaw/village/common/animals/cat_persian.iob b/objects/village/common/animals/cat_persian.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_persian.iob rename to objects/village/common/animals/cat_persian.iob diff --git a/objects/jigsaw/village/common/animals/cat_ragdoll.iob b/objects/village/common/animals/cat_ragdoll.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_ragdoll.iob rename to objects/village/common/animals/cat_ragdoll.iob diff --git a/objects/jigsaw/village/common/animals/cat_red.iob b/objects/village/common/animals/cat_red.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_red.iob rename to objects/village/common/animals/cat_red.iob diff --git a/objects/jigsaw/village/common/animals/cat_siamese.iob b/objects/village/common/animals/cat_siamese.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_siamese.iob rename to objects/village/common/animals/cat_siamese.iob diff --git a/objects/jigsaw/village/common/animals/cat_tabby.iob b/objects/village/common/animals/cat_tabby.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_tabby.iob rename to objects/village/common/animals/cat_tabby.iob diff --git a/objects/jigsaw/village/common/animals/cat_white.iob b/objects/village/common/animals/cat_white.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cat_white.iob rename to objects/village/common/animals/cat_white.iob diff --git a/objects/jigsaw/village/common/animals/cows_1.iob b/objects/village/common/animals/cows_1.iob similarity index 100% rename from objects/jigsaw/village/common/animals/cows_1.iob rename to objects/village/common/animals/cows_1.iob diff --git a/objects/jigsaw/village/common/animals/horses_1.iob b/objects/village/common/animals/horses_1.iob similarity index 100% rename from objects/jigsaw/village/common/animals/horses_1.iob rename to objects/village/common/animals/horses_1.iob diff --git a/objects/jigsaw/village/common/animals/horses_2.iob b/objects/village/common/animals/horses_2.iob similarity index 100% rename from objects/jigsaw/village/common/animals/horses_2.iob rename to objects/village/common/animals/horses_2.iob diff --git a/objects/jigsaw/village/common/animals/horses_3.iob b/objects/village/common/animals/horses_3.iob similarity index 100% rename from objects/jigsaw/village/common/animals/horses_3.iob rename to objects/village/common/animals/horses_3.iob diff --git a/objects/jigsaw/village/common/animals/horses_4.iob b/objects/village/common/animals/horses_4.iob similarity index 100% rename from objects/jigsaw/village/common/animals/horses_4.iob rename to objects/village/common/animals/horses_4.iob diff --git a/objects/jigsaw/village/common/animals/horses_5.iob b/objects/village/common/animals/horses_5.iob similarity index 100% rename from objects/jigsaw/village/common/animals/horses_5.iob rename to objects/village/common/animals/horses_5.iob diff --git a/objects/jigsaw/village/common/animals/pigs_1.iob b/objects/village/common/animals/pigs_1.iob similarity index 100% rename from objects/jigsaw/village/common/animals/pigs_1.iob rename to objects/village/common/animals/pigs_1.iob diff --git a/objects/jigsaw/village/common/animals/sheep_1.iob b/objects/village/common/animals/sheep_1.iob similarity index 100% rename from objects/jigsaw/village/common/animals/sheep_1.iob rename to objects/village/common/animals/sheep_1.iob diff --git a/objects/jigsaw/village/common/animals/sheep_2.iob b/objects/village/common/animals/sheep_2.iob similarity index 100% rename from objects/jigsaw/village/common/animals/sheep_2.iob rename to objects/village/common/animals/sheep_2.iob diff --git a/objects/jigsaw/village/common/iron_golem.iob b/objects/village/common/iron_golem.iob similarity index 100% rename from objects/jigsaw/village/common/iron_golem.iob rename to objects/village/common/iron_golem.iob diff --git a/objects/jigsaw/village/common/well_bottom.iob b/objects/village/common/well_bottom.iob similarity index 100% rename from objects/jigsaw/village/common/well_bottom.iob rename to objects/village/common/well_bottom.iob diff --git a/objects/jigsaw/village/decays/grass_11x13.iob b/objects/village/decays/grass_11x13.iob similarity index 100% rename from objects/jigsaw/village/decays/grass_11x13.iob rename to objects/village/decays/grass_11x13.iob diff --git a/objects/jigsaw/village/decays/grass_16x16.iob b/objects/village/decays/grass_16x16.iob similarity index 100% rename from objects/jigsaw/village/decays/grass_16x16.iob rename to objects/village/decays/grass_16x16.iob diff --git a/objects/jigsaw/village/decays/grass_9x9.iob b/objects/village/decays/grass_9x9.iob similarity index 100% rename from objects/jigsaw/village/decays/grass_9x9.iob rename to objects/village/decays/grass_9x9.iob diff --git a/objects/jigsaw/village/desert/desert_lamp_1.iob b/objects/village/desert/desert_lamp_1.iob similarity index 100% rename from objects/jigsaw/village/desert/desert_lamp_1.iob rename to objects/village/desert/desert_lamp_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_animal_pen_1.iob b/objects/village/desert/houses/desert_animal_pen_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_animal_pen_1.iob rename to objects/village/desert/houses/desert_animal_pen_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_animal_pen_2.iob b/objects/village/desert/houses/desert_animal_pen_2.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_animal_pen_2.iob rename to objects/village/desert/houses/desert_animal_pen_2.iob diff --git a/objects/jigsaw/village/desert/houses/desert_armorer_1.iob b/objects/village/desert/houses/desert_armorer_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_armorer_1.iob rename to objects/village/desert/houses/desert_armorer_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_butcher_shop_1.iob b/objects/village/desert/houses/desert_butcher_shop_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_butcher_shop_1.iob rename to objects/village/desert/houses/desert_butcher_shop_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_cartographer_house_1.iob b/objects/village/desert/houses/desert_cartographer_house_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_cartographer_house_1.iob rename to objects/village/desert/houses/desert_cartographer_house_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_farm_1.iob b/objects/village/desert/houses/desert_farm_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_farm_1.iob rename to objects/village/desert/houses/desert_farm_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_farm_2.iob b/objects/village/desert/houses/desert_farm_2.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_farm_2.iob rename to objects/village/desert/houses/desert_farm_2.iob diff --git a/objects/jigsaw/village/desert/houses/desert_fisher_1.iob b/objects/village/desert/houses/desert_fisher_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_fisher_1.iob rename to objects/village/desert/houses/desert_fisher_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_fletcher_house_1.iob b/objects/village/desert/houses/desert_fletcher_house_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_fletcher_house_1.iob rename to objects/village/desert/houses/desert_fletcher_house_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_large_farm_1.iob b/objects/village/desert/houses/desert_large_farm_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_large_farm_1.iob rename to objects/village/desert/houses/desert_large_farm_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_library_1.iob b/objects/village/desert/houses/desert_library_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_library_1.iob rename to objects/village/desert/houses/desert_library_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_mason_1.iob b/objects/village/desert/houses/desert_mason_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_mason_1.iob rename to objects/village/desert/houses/desert_mason_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_medium_house_1.iob b/objects/village/desert/houses/desert_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_medium_house_1.iob rename to objects/village/desert/houses/desert_medium_house_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_medium_house_2.iob b/objects/village/desert/houses/desert_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_medium_house_2.iob rename to objects/village/desert/houses/desert_medium_house_2.iob diff --git a/objects/jigsaw/village/desert/houses/desert_shepherd_house_1.iob b/objects/village/desert/houses/desert_shepherd_house_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_shepherd_house_1.iob rename to objects/village/desert/houses/desert_shepherd_house_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_1.iob b/objects/village/desert/houses/desert_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_1.iob rename to objects/village/desert/houses/desert_small_house_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_2.iob b/objects/village/desert/houses/desert_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_2.iob rename to objects/village/desert/houses/desert_small_house_2.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_3.iob b/objects/village/desert/houses/desert_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_3.iob rename to objects/village/desert/houses/desert_small_house_3.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_4.iob b/objects/village/desert/houses/desert_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_4.iob rename to objects/village/desert/houses/desert_small_house_4.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_5.iob b/objects/village/desert/houses/desert_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_5.iob rename to objects/village/desert/houses/desert_small_house_5.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_6.iob b/objects/village/desert/houses/desert_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_6.iob rename to objects/village/desert/houses/desert_small_house_6.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_7.iob b/objects/village/desert/houses/desert_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_7.iob rename to objects/village/desert/houses/desert_small_house_7.iob diff --git a/objects/jigsaw/village/desert/houses/desert_small_house_8.iob b/objects/village/desert/houses/desert_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_small_house_8.iob rename to objects/village/desert/houses/desert_small_house_8.iob diff --git a/objects/jigsaw/village/desert/houses/desert_tannery_1.iob b/objects/village/desert/houses/desert_tannery_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_tannery_1.iob rename to objects/village/desert/houses/desert_tannery_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_temple_1.iob b/objects/village/desert/houses/desert_temple_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_temple_1.iob rename to objects/village/desert/houses/desert_temple_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_temple_2.iob b/objects/village/desert/houses/desert_temple_2.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_temple_2.iob rename to objects/village/desert/houses/desert_temple_2.iob diff --git a/objects/jigsaw/village/desert/houses/desert_tool_smith_1.iob b/objects/village/desert/houses/desert_tool_smith_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_tool_smith_1.iob rename to objects/village/desert/houses/desert_tool_smith_1.iob diff --git a/objects/jigsaw/village/desert/houses/desert_weaponsmith_1.iob b/objects/village/desert/houses/desert_weaponsmith_1.iob similarity index 100% rename from objects/jigsaw/village/desert/houses/desert_weaponsmith_1.iob rename to objects/village/desert/houses/desert_weaponsmith_1.iob diff --git a/objects/jigsaw/village/desert/streets/corner_01.iob b/objects/village/desert/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/corner_01.iob rename to objects/village/desert/streets/corner_01.iob diff --git a/objects/jigsaw/village/desert/streets/corner_02.iob b/objects/village/desert/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/corner_02.iob rename to objects/village/desert/streets/corner_02.iob diff --git a/objects/jigsaw/village/desert/streets/crossroad_01.iob b/objects/village/desert/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/crossroad_01.iob rename to objects/village/desert/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/desert/streets/crossroad_02.iob b/objects/village/desert/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/crossroad_02.iob rename to objects/village/desert/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/desert/streets/crossroad_03.iob b/objects/village/desert/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/crossroad_03.iob rename to objects/village/desert/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/desert/streets/square_01.iob b/objects/village/desert/streets/square_01.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/square_01.iob rename to objects/village/desert/streets/square_01.iob diff --git a/objects/jigsaw/village/desert/streets/square_02.iob b/objects/village/desert/streets/square_02.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/square_02.iob rename to objects/village/desert/streets/square_02.iob diff --git a/objects/jigsaw/village/desert/streets/straight_01.iob b/objects/village/desert/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/straight_01.iob rename to objects/village/desert/streets/straight_01.iob diff --git a/objects/jigsaw/village/desert/streets/straight_02.iob b/objects/village/desert/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/straight_02.iob rename to objects/village/desert/streets/straight_02.iob diff --git a/objects/jigsaw/village/desert/streets/straight_03.iob b/objects/village/desert/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/straight_03.iob rename to objects/village/desert/streets/straight_03.iob diff --git a/objects/jigsaw/village/desert/streets/turn_01.iob b/objects/village/desert/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/desert/streets/turn_01.iob rename to objects/village/desert/streets/turn_01.iob diff --git a/objects/jigsaw/village/desert/terminators/terminator_01.iob b/objects/village/desert/terminators/terminator_01.iob similarity index 100% rename from objects/jigsaw/village/desert/terminators/terminator_01.iob rename to objects/village/desert/terminators/terminator_01.iob diff --git a/objects/jigsaw/village/desert/terminators/terminator_02.iob b/objects/village/desert/terminators/terminator_02.iob similarity index 100% rename from objects/jigsaw/village/desert/terminators/terminator_02.iob rename to objects/village/desert/terminators/terminator_02.iob diff --git a/objects/jigsaw/village/desert/town_centers/desert_meeting_point_1.iob b/objects/village/desert/town_centers/desert_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/desert/town_centers/desert_meeting_point_1.iob rename to objects/village/desert/town_centers/desert_meeting_point_1.iob diff --git a/objects/jigsaw/village/desert/town_centers/desert_meeting_point_2.iob b/objects/village/desert/town_centers/desert_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/desert/town_centers/desert_meeting_point_2.iob rename to objects/village/desert/town_centers/desert_meeting_point_2.iob diff --git a/objects/jigsaw/village/desert/town_centers/desert_meeting_point_3.iob b/objects/village/desert/town_centers/desert_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/desert/town_centers/desert_meeting_point_3.iob rename to objects/village/desert/town_centers/desert_meeting_point_3.iob diff --git a/objects/jigsaw/village/desert/villagers/baby.iob b/objects/village/desert/villagers/baby.iob similarity index 100% rename from objects/jigsaw/village/desert/villagers/baby.iob rename to objects/village/desert/villagers/baby.iob diff --git a/objects/jigsaw/village/desert/villagers/nitwit.iob b/objects/village/desert/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/desert/villagers/nitwit.iob rename to objects/village/desert/villagers/nitwit.iob diff --git a/objects/jigsaw/village/desert/villagers/unemployed.iob b/objects/village/desert/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/desert/villagers/unemployed.iob rename to objects/village/desert/villagers/unemployed.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_medium_house_1.iob b/objects/village/desert/zombie/houses/desert_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_medium_house_1.iob rename to objects/village/desert/zombie/houses/desert_medium_house_1.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_medium_house_2.iob b/objects/village/desert/zombie/houses/desert_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_medium_house_2.iob rename to objects/village/desert/zombie/houses/desert_medium_house_2.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_1.iob b/objects/village/desert/zombie/houses/desert_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_1.iob rename to objects/village/desert/zombie/houses/desert_small_house_1.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_2.iob b/objects/village/desert/zombie/houses/desert_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_2.iob rename to objects/village/desert/zombie/houses/desert_small_house_2.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_3.iob b/objects/village/desert/zombie/houses/desert_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_3.iob rename to objects/village/desert/zombie/houses/desert_small_house_3.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_4.iob b/objects/village/desert/zombie/houses/desert_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_4.iob rename to objects/village/desert/zombie/houses/desert_small_house_4.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_5.iob b/objects/village/desert/zombie/houses/desert_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_5.iob rename to objects/village/desert/zombie/houses/desert_small_house_5.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_6.iob b/objects/village/desert/zombie/houses/desert_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_6.iob rename to objects/village/desert/zombie/houses/desert_small_house_6.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_7.iob b/objects/village/desert/zombie/houses/desert_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_7.iob rename to objects/village/desert/zombie/houses/desert_small_house_7.iob diff --git a/objects/jigsaw/village/desert/zombie/houses/desert_small_house_8.iob b/objects/village/desert/zombie/houses/desert_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/houses/desert_small_house_8.iob rename to objects/village/desert/zombie/houses/desert_small_house_8.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/corner_01.iob b/objects/village/desert/zombie/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/corner_01.iob rename to objects/village/desert/zombie/streets/corner_01.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/corner_02.iob b/objects/village/desert/zombie/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/corner_02.iob rename to objects/village/desert/zombie/streets/corner_02.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/crossroad_01.iob b/objects/village/desert/zombie/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/crossroad_01.iob rename to objects/village/desert/zombie/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/crossroad_02.iob b/objects/village/desert/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/crossroad_02.iob rename to objects/village/desert/zombie/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/crossroad_03.iob b/objects/village/desert/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/crossroad_03.iob rename to objects/village/desert/zombie/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/square_01.iob b/objects/village/desert/zombie/streets/square_01.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/square_01.iob rename to objects/village/desert/zombie/streets/square_01.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/square_02.iob b/objects/village/desert/zombie/streets/square_02.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/square_02.iob rename to objects/village/desert/zombie/streets/square_02.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/straight_01.iob b/objects/village/desert/zombie/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/straight_01.iob rename to objects/village/desert/zombie/streets/straight_01.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/straight_02.iob b/objects/village/desert/zombie/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/straight_02.iob rename to objects/village/desert/zombie/streets/straight_02.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/straight_03.iob b/objects/village/desert/zombie/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/straight_03.iob rename to objects/village/desert/zombie/streets/straight_03.iob diff --git a/objects/jigsaw/village/desert/zombie/streets/turn_01.iob b/objects/village/desert/zombie/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/streets/turn_01.iob rename to objects/village/desert/zombie/streets/turn_01.iob diff --git a/objects/jigsaw/village/desert/zombie/terminators/terminator_02.iob b/objects/village/desert/zombie/terminators/terminator_02.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/terminators/terminator_02.iob rename to objects/village/desert/zombie/terminators/terminator_02.iob diff --git a/objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_1.iob b/objects/village/desert/zombie/town_centers/desert_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_1.iob rename to objects/village/desert/zombie/town_centers/desert_meeting_point_1.iob diff --git a/objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_2.iob b/objects/village/desert/zombie/town_centers/desert_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_2.iob rename to objects/village/desert/zombie/town_centers/desert_meeting_point_2.iob diff --git a/objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_3.iob b/objects/village/desert/zombie/town_centers/desert_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_3.iob rename to objects/village/desert/zombie/town_centers/desert_meeting_point_3.iob diff --git a/objects/jigsaw/village/desert/zombie/villagers/nitwit.iob b/objects/village/desert/zombie/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/villagers/nitwit.iob rename to objects/village/desert/zombie/villagers/nitwit.iob diff --git a/objects/jigsaw/village/desert/zombie/villagers/unemployed.iob b/objects/village/desert/zombie/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/desert/zombie/villagers/unemployed.iob rename to objects/village/desert/zombie/villagers/unemployed.iob diff --git a/objects/jigsaw/village/plains/houses/plains_accessory_1.iob b/objects/village/plains/houses/plains_accessory_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_accessory_1.iob rename to objects/village/plains/houses/plains_accessory_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_animal_pen_1.iob b/objects/village/plains/houses/plains_animal_pen_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_animal_pen_1.iob rename to objects/village/plains/houses/plains_animal_pen_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_animal_pen_2.iob b/objects/village/plains/houses/plains_animal_pen_2.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_animal_pen_2.iob rename to objects/village/plains/houses/plains_animal_pen_2.iob diff --git a/objects/jigsaw/village/plains/houses/plains_animal_pen_3.iob b/objects/village/plains/houses/plains_animal_pen_3.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_animal_pen_3.iob rename to objects/village/plains/houses/plains_animal_pen_3.iob diff --git a/objects/jigsaw/village/plains/houses/plains_armorer_house_1.iob b/objects/village/plains/houses/plains_armorer_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_armorer_house_1.iob rename to objects/village/plains/houses/plains_armorer_house_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_big_house_1.iob b/objects/village/plains/houses/plains_big_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_big_house_1.iob rename to objects/village/plains/houses/plains_big_house_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_butcher_shop_1.iob b/objects/village/plains/houses/plains_butcher_shop_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_butcher_shop_1.iob rename to objects/village/plains/houses/plains_butcher_shop_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_butcher_shop_2.iob b/objects/village/plains/houses/plains_butcher_shop_2.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_butcher_shop_2.iob rename to objects/village/plains/houses/plains_butcher_shop_2.iob diff --git a/objects/jigsaw/village/plains/houses/plains_cartographer_1.iob b/objects/village/plains/houses/plains_cartographer_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_cartographer_1.iob rename to objects/village/plains/houses/plains_cartographer_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_fisher_cottage_1.iob b/objects/village/plains/houses/plains_fisher_cottage_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_fisher_cottage_1.iob rename to objects/village/plains/houses/plains_fisher_cottage_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_fletcher_house_1.iob b/objects/village/plains/houses/plains_fletcher_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_fletcher_house_1.iob rename to objects/village/plains/houses/plains_fletcher_house_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_large_farm_1.iob b/objects/village/plains/houses/plains_large_farm_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_large_farm_1.iob rename to objects/village/plains/houses/plains_large_farm_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_library_1.iob b/objects/village/plains/houses/plains_library_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_library_1.iob rename to objects/village/plains/houses/plains_library_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_library_2.iob b/objects/village/plains/houses/plains_library_2.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_library_2.iob rename to objects/village/plains/houses/plains_library_2.iob diff --git a/objects/jigsaw/village/plains/houses/plains_masons_house_1.iob b/objects/village/plains/houses/plains_masons_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_masons_house_1.iob rename to objects/village/plains/houses/plains_masons_house_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_medium_house_1.iob b/objects/village/plains/houses/plains_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_medium_house_1.iob rename to objects/village/plains/houses/plains_medium_house_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_medium_house_2.iob b/objects/village/plains/houses/plains_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_medium_house_2.iob rename to objects/village/plains/houses/plains_medium_house_2.iob diff --git a/objects/jigsaw/village/plains/houses/plains_meeting_point_4.iob b/objects/village/plains/houses/plains_meeting_point_4.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_meeting_point_4.iob rename to objects/village/plains/houses/plains_meeting_point_4.iob diff --git a/objects/jigsaw/village/plains/houses/plains_meeting_point_5.iob b/objects/village/plains/houses/plains_meeting_point_5.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_meeting_point_5.iob rename to objects/village/plains/houses/plains_meeting_point_5.iob diff --git a/objects/jigsaw/village/plains/houses/plains_shepherds_house_1.iob b/objects/village/plains/houses/plains_shepherds_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_shepherds_house_1.iob rename to objects/village/plains/houses/plains_shepherds_house_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_farm_1.iob b/objects/village/plains/houses/plains_small_farm_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_farm_1.iob rename to objects/village/plains/houses/plains_small_farm_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_1.iob b/objects/village/plains/houses/plains_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_1.iob rename to objects/village/plains/houses/plains_small_house_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_2.iob b/objects/village/plains/houses/plains_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_2.iob rename to objects/village/plains/houses/plains_small_house_2.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_3.iob b/objects/village/plains/houses/plains_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_3.iob rename to objects/village/plains/houses/plains_small_house_3.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_4.iob b/objects/village/plains/houses/plains_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_4.iob rename to objects/village/plains/houses/plains_small_house_4.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_5.iob b/objects/village/plains/houses/plains_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_5.iob rename to objects/village/plains/houses/plains_small_house_5.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_6.iob b/objects/village/plains/houses/plains_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_6.iob rename to objects/village/plains/houses/plains_small_house_6.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_7.iob b/objects/village/plains/houses/plains_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_7.iob rename to objects/village/plains/houses/plains_small_house_7.iob diff --git a/objects/jigsaw/village/plains/houses/plains_small_house_8.iob b/objects/village/plains/houses/plains_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_small_house_8.iob rename to objects/village/plains/houses/plains_small_house_8.iob diff --git a/objects/jigsaw/village/plains/houses/plains_stable_1.iob b/objects/village/plains/houses/plains_stable_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_stable_1.iob rename to objects/village/plains/houses/plains_stable_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_stable_2.iob b/objects/village/plains/houses/plains_stable_2.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_stable_2.iob rename to objects/village/plains/houses/plains_stable_2.iob diff --git a/objects/jigsaw/village/plains/houses/plains_tannery_1.iob b/objects/village/plains/houses/plains_tannery_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_tannery_1.iob rename to objects/village/plains/houses/plains_tannery_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_temple_3.iob b/objects/village/plains/houses/plains_temple_3.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_temple_3.iob rename to objects/village/plains/houses/plains_temple_3.iob diff --git a/objects/jigsaw/village/plains/houses/plains_temple_4.iob b/objects/village/plains/houses/plains_temple_4.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_temple_4.iob rename to objects/village/plains/houses/plains_temple_4.iob diff --git a/objects/jigsaw/village/plains/houses/plains_tool_smith_1.iob b/objects/village/plains/houses/plains_tool_smith_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_tool_smith_1.iob rename to objects/village/plains/houses/plains_tool_smith_1.iob diff --git a/objects/jigsaw/village/plains/houses/plains_weaponsmith_1.iob b/objects/village/plains/houses/plains_weaponsmith_1.iob similarity index 100% rename from objects/jigsaw/village/plains/houses/plains_weaponsmith_1.iob rename to objects/village/plains/houses/plains_weaponsmith_1.iob diff --git a/objects/jigsaw/village/plains/plains_lamp_1.iob b/objects/village/plains/plains_lamp_1.iob similarity index 100% rename from objects/jigsaw/village/plains/plains_lamp_1.iob rename to objects/village/plains/plains_lamp_1.iob diff --git a/objects/jigsaw/village/plains/streets/corner_01.iob b/objects/village/plains/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/corner_01.iob rename to objects/village/plains/streets/corner_01.iob diff --git a/objects/jigsaw/village/plains/streets/corner_02.iob b/objects/village/plains/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/corner_02.iob rename to objects/village/plains/streets/corner_02.iob diff --git a/objects/jigsaw/village/plains/streets/corner_03.iob b/objects/village/plains/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/corner_03.iob rename to objects/village/plains/streets/corner_03.iob diff --git a/objects/jigsaw/village/plains/streets/crossroad_01.iob b/objects/village/plains/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/crossroad_01.iob rename to objects/village/plains/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/plains/streets/crossroad_02.iob b/objects/village/plains/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/crossroad_02.iob rename to objects/village/plains/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/plains/streets/crossroad_03.iob b/objects/village/plains/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/crossroad_03.iob rename to objects/village/plains/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/plains/streets/crossroad_04.iob b/objects/village/plains/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/crossroad_04.iob rename to objects/village/plains/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/plains/streets/crossroad_05.iob b/objects/village/plains/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/crossroad_05.iob rename to objects/village/plains/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/plains/streets/crossroad_06.iob b/objects/village/plains/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/crossroad_06.iob rename to objects/village/plains/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/plains/streets/straight_01.iob b/objects/village/plains/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/straight_01.iob rename to objects/village/plains/streets/straight_01.iob diff --git a/objects/jigsaw/village/plains/streets/straight_02.iob b/objects/village/plains/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/straight_02.iob rename to objects/village/plains/streets/straight_02.iob diff --git a/objects/jigsaw/village/plains/streets/straight_03.iob b/objects/village/plains/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/straight_03.iob rename to objects/village/plains/streets/straight_03.iob diff --git a/objects/jigsaw/village/plains/streets/straight_04.iob b/objects/village/plains/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/straight_04.iob rename to objects/village/plains/streets/straight_04.iob diff --git a/objects/jigsaw/village/plains/streets/straight_05.iob b/objects/village/plains/streets/straight_05.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/straight_05.iob rename to objects/village/plains/streets/straight_05.iob diff --git a/objects/jigsaw/village/plains/streets/straight_06.iob b/objects/village/plains/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/straight_06.iob rename to objects/village/plains/streets/straight_06.iob diff --git a/objects/jigsaw/village/plains/streets/turn_01.iob b/objects/village/plains/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/plains/streets/turn_01.iob rename to objects/village/plains/streets/turn_01.iob diff --git a/objects/jigsaw/village/plains/terminators/terminator_01.iob b/objects/village/plains/terminators/terminator_01.iob similarity index 100% rename from objects/jigsaw/village/plains/terminators/terminator_01.iob rename to objects/village/plains/terminators/terminator_01.iob diff --git a/objects/jigsaw/village/plains/terminators/terminator_02.iob b/objects/village/plains/terminators/terminator_02.iob similarity index 100% rename from objects/jigsaw/village/plains/terminators/terminator_02.iob rename to objects/village/plains/terminators/terminator_02.iob diff --git a/objects/jigsaw/village/plains/terminators/terminator_03.iob b/objects/village/plains/terminators/terminator_03.iob similarity index 100% rename from objects/jigsaw/village/plains/terminators/terminator_03.iob rename to objects/village/plains/terminators/terminator_03.iob diff --git a/objects/jigsaw/village/plains/terminators/terminator_04.iob b/objects/village/plains/terminators/terminator_04.iob similarity index 100% rename from objects/jigsaw/village/plains/terminators/terminator_04.iob rename to objects/village/plains/terminators/terminator_04.iob diff --git a/objects/jigsaw/village/plains/town_centers/plains_fountain_01.iob b/objects/village/plains/town_centers/plains_fountain_01.iob similarity index 100% rename from objects/jigsaw/village/plains/town_centers/plains_fountain_01.iob rename to objects/village/plains/town_centers/plains_fountain_01.iob diff --git a/objects/jigsaw/village/plains/town_centers/plains_meeting_point_1.iob b/objects/village/plains/town_centers/plains_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/plains/town_centers/plains_meeting_point_1.iob rename to objects/village/plains/town_centers/plains_meeting_point_1.iob diff --git a/objects/jigsaw/village/plains/town_centers/plains_meeting_point_2.iob b/objects/village/plains/town_centers/plains_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/plains/town_centers/plains_meeting_point_2.iob rename to objects/village/plains/town_centers/plains_meeting_point_2.iob diff --git a/objects/jigsaw/village/plains/town_centers/plains_meeting_point_3.iob b/objects/village/plains/town_centers/plains_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/plains/town_centers/plains_meeting_point_3.iob rename to objects/village/plains/town_centers/plains_meeting_point_3.iob diff --git a/objects/jigsaw/village/plains/villagers/baby.iob b/objects/village/plains/villagers/baby.iob similarity index 100% rename from objects/jigsaw/village/plains/villagers/baby.iob rename to objects/village/plains/villagers/baby.iob diff --git a/objects/jigsaw/village/plains/villagers/nitwit.iob b/objects/village/plains/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/plains/villagers/nitwit.iob rename to objects/village/plains/villagers/nitwit.iob diff --git a/objects/jigsaw/village/plains/villagers/unemployed.iob b/objects/village/plains/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/plains/villagers/unemployed.iob rename to objects/village/plains/villagers/unemployed.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_animal_pen_3.iob b/objects/village/plains/zombie/houses/plains_animal_pen_3.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_animal_pen_3.iob rename to objects/village/plains/zombie/houses/plains_animal_pen_3.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_big_house_1.iob b/objects/village/plains/zombie/houses/plains_big_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_big_house_1.iob rename to objects/village/plains/zombie/houses/plains_big_house_1.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_butcher_shop_2.iob b/objects/village/plains/zombie/houses/plains_butcher_shop_2.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_butcher_shop_2.iob rename to objects/village/plains/zombie/houses/plains_butcher_shop_2.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_fletcher_house_1.iob b/objects/village/plains/zombie/houses/plains_fletcher_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_fletcher_house_1.iob rename to objects/village/plains/zombie/houses/plains_fletcher_house_1.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_medium_house_1.iob b/objects/village/plains/zombie/houses/plains_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_medium_house_1.iob rename to objects/village/plains/zombie/houses/plains_medium_house_1.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_medium_house_2.iob b/objects/village/plains/zombie/houses/plains_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_medium_house_2.iob rename to objects/village/plains/zombie/houses/plains_medium_house_2.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_meeting_point_4.iob b/objects/village/plains/zombie/houses/plains_meeting_point_4.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_meeting_point_4.iob rename to objects/village/plains/zombie/houses/plains_meeting_point_4.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_meeting_point_5.iob b/objects/village/plains/zombie/houses/plains_meeting_point_5.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_meeting_point_5.iob rename to objects/village/plains/zombie/houses/plains_meeting_point_5.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_shepherds_house_1.iob b/objects/village/plains/zombie/houses/plains_shepherds_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_shepherds_house_1.iob rename to objects/village/plains/zombie/houses/plains_shepherds_house_1.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_1.iob b/objects/village/plains/zombie/houses/plains_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_1.iob rename to objects/village/plains/zombie/houses/plains_small_house_1.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_2.iob b/objects/village/plains/zombie/houses/plains_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_2.iob rename to objects/village/plains/zombie/houses/plains_small_house_2.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_3.iob b/objects/village/plains/zombie/houses/plains_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_3.iob rename to objects/village/plains/zombie/houses/plains_small_house_3.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_4.iob b/objects/village/plains/zombie/houses/plains_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_4.iob rename to objects/village/plains/zombie/houses/plains_small_house_4.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_5.iob b/objects/village/plains/zombie/houses/plains_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_5.iob rename to objects/village/plains/zombie/houses/plains_small_house_5.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_6.iob b/objects/village/plains/zombie/houses/plains_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_6.iob rename to objects/village/plains/zombie/houses/plains_small_house_6.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_7.iob b/objects/village/plains/zombie/houses/plains_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_7.iob rename to objects/village/plains/zombie/houses/plains_small_house_7.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_small_house_8.iob b/objects/village/plains/zombie/houses/plains_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_small_house_8.iob rename to objects/village/plains/zombie/houses/plains_small_house_8.iob diff --git a/objects/jigsaw/village/plains/zombie/houses/plains_stable_1.iob b/objects/village/plains/zombie/houses/plains_stable_1.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/houses/plains_stable_1.iob rename to objects/village/plains/zombie/houses/plains_stable_1.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/corner_01.iob b/objects/village/plains/zombie/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/corner_01.iob rename to objects/village/plains/zombie/streets/corner_01.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/corner_02.iob b/objects/village/plains/zombie/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/corner_02.iob rename to objects/village/plains/zombie/streets/corner_02.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/corner_03.iob b/objects/village/plains/zombie/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/corner_03.iob rename to objects/village/plains/zombie/streets/corner_03.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/crossroad_01.iob b/objects/village/plains/zombie/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/crossroad_01.iob rename to objects/village/plains/zombie/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/crossroad_02.iob b/objects/village/plains/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/crossroad_02.iob rename to objects/village/plains/zombie/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/crossroad_03.iob b/objects/village/plains/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/crossroad_03.iob rename to objects/village/plains/zombie/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/crossroad_04.iob b/objects/village/plains/zombie/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/crossroad_04.iob rename to objects/village/plains/zombie/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/crossroad_05.iob b/objects/village/plains/zombie/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/crossroad_05.iob rename to objects/village/plains/zombie/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/crossroad_06.iob b/objects/village/plains/zombie/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/crossroad_06.iob rename to objects/village/plains/zombie/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/straight_01.iob b/objects/village/plains/zombie/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/straight_01.iob rename to objects/village/plains/zombie/streets/straight_01.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/straight_02.iob b/objects/village/plains/zombie/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/straight_02.iob rename to objects/village/plains/zombie/streets/straight_02.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/straight_03.iob b/objects/village/plains/zombie/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/straight_03.iob rename to objects/village/plains/zombie/streets/straight_03.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/straight_04.iob b/objects/village/plains/zombie/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/straight_04.iob rename to objects/village/plains/zombie/streets/straight_04.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/straight_05.iob b/objects/village/plains/zombie/streets/straight_05.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/straight_05.iob rename to objects/village/plains/zombie/streets/straight_05.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/straight_06.iob b/objects/village/plains/zombie/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/straight_06.iob rename to objects/village/plains/zombie/streets/straight_06.iob diff --git a/objects/jigsaw/village/plains/zombie/streets/turn_01.iob b/objects/village/plains/zombie/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/streets/turn_01.iob rename to objects/village/plains/zombie/streets/turn_01.iob diff --git a/objects/jigsaw/village/plains/zombie/town_centers/plains_fountain_01.iob b/objects/village/plains/zombie/town_centers/plains_fountain_01.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/town_centers/plains_fountain_01.iob rename to objects/village/plains/zombie/town_centers/plains_fountain_01.iob diff --git a/objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_1.iob b/objects/village/plains/zombie/town_centers/plains_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_1.iob rename to objects/village/plains/zombie/town_centers/plains_meeting_point_1.iob diff --git a/objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_2.iob b/objects/village/plains/zombie/town_centers/plains_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_2.iob rename to objects/village/plains/zombie/town_centers/plains_meeting_point_2.iob diff --git a/objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_3.iob b/objects/village/plains/zombie/town_centers/plains_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_3.iob rename to objects/village/plains/zombie/town_centers/plains_meeting_point_3.iob diff --git a/objects/jigsaw/village/plains/zombie/villagers/nitwit.iob b/objects/village/plains/zombie/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/villagers/nitwit.iob rename to objects/village/plains/zombie/villagers/nitwit.iob diff --git a/objects/jigsaw/village/plains/zombie/villagers/unemployed.iob b/objects/village/plains/zombie/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/plains/zombie/villagers/unemployed.iob rename to objects/village/plains/zombie/villagers/unemployed.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_animal_pen_1.iob b/objects/village/savanna/houses/savanna_animal_pen_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_animal_pen_1.iob rename to objects/village/savanna/houses/savanna_animal_pen_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_animal_pen_2.iob b/objects/village/savanna/houses/savanna_animal_pen_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_animal_pen_2.iob rename to objects/village/savanna/houses/savanna_animal_pen_2.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_animal_pen_3.iob b/objects/village/savanna/houses/savanna_animal_pen_3.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_animal_pen_3.iob rename to objects/village/savanna/houses/savanna_animal_pen_3.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_armorer_1.iob b/objects/village/savanna/houses/savanna_armorer_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_armorer_1.iob rename to objects/village/savanna/houses/savanna_armorer_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_butchers_shop_1.iob b/objects/village/savanna/houses/savanna_butchers_shop_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_butchers_shop_1.iob rename to objects/village/savanna/houses/savanna_butchers_shop_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_butchers_shop_2.iob b/objects/village/savanna/houses/savanna_butchers_shop_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_butchers_shop_2.iob rename to objects/village/savanna/houses/savanna_butchers_shop_2.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_cartographer_1.iob b/objects/village/savanna/houses/savanna_cartographer_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_cartographer_1.iob rename to objects/village/savanna/houses/savanna_cartographer_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_fisher_cottage_1.iob b/objects/village/savanna/houses/savanna_fisher_cottage_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_fisher_cottage_1.iob rename to objects/village/savanna/houses/savanna_fisher_cottage_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_fletcher_house_1.iob b/objects/village/savanna/houses/savanna_fletcher_house_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_fletcher_house_1.iob rename to objects/village/savanna/houses/savanna_fletcher_house_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_large_farm_1.iob b/objects/village/savanna/houses/savanna_large_farm_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_large_farm_1.iob rename to objects/village/savanna/houses/savanna_large_farm_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_large_farm_2.iob b/objects/village/savanna/houses/savanna_large_farm_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_large_farm_2.iob rename to objects/village/savanna/houses/savanna_large_farm_2.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_library_1.iob b/objects/village/savanna/houses/savanna_library_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_library_1.iob rename to objects/village/savanna/houses/savanna_library_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_mason_1.iob b/objects/village/savanna/houses/savanna_mason_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_mason_1.iob rename to objects/village/savanna/houses/savanna_mason_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_medium_house_1.iob b/objects/village/savanna/houses/savanna_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_medium_house_1.iob rename to objects/village/savanna/houses/savanna_medium_house_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_medium_house_2.iob b/objects/village/savanna/houses/savanna_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_medium_house_2.iob rename to objects/village/savanna/houses/savanna_medium_house_2.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_shepherd_1.iob b/objects/village/savanna/houses/savanna_shepherd_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_shepherd_1.iob rename to objects/village/savanna/houses/savanna_shepherd_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_farm.iob b/objects/village/savanna/houses/savanna_small_farm.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_farm.iob rename to objects/village/savanna/houses/savanna_small_farm.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_1.iob b/objects/village/savanna/houses/savanna_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_1.iob rename to objects/village/savanna/houses/savanna_small_house_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_2.iob b/objects/village/savanna/houses/savanna_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_2.iob rename to objects/village/savanna/houses/savanna_small_house_2.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_3.iob b/objects/village/savanna/houses/savanna_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_3.iob rename to objects/village/savanna/houses/savanna_small_house_3.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_4.iob b/objects/village/savanna/houses/savanna_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_4.iob rename to objects/village/savanna/houses/savanna_small_house_4.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_5.iob b/objects/village/savanna/houses/savanna_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_5.iob rename to objects/village/savanna/houses/savanna_small_house_5.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_6.iob b/objects/village/savanna/houses/savanna_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_6.iob rename to objects/village/savanna/houses/savanna_small_house_6.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_7.iob b/objects/village/savanna/houses/savanna_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_7.iob rename to objects/village/savanna/houses/savanna_small_house_7.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_small_house_8.iob b/objects/village/savanna/houses/savanna_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_small_house_8.iob rename to objects/village/savanna/houses/savanna_small_house_8.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_tannery_1.iob b/objects/village/savanna/houses/savanna_tannery_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_tannery_1.iob rename to objects/village/savanna/houses/savanna_tannery_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_temple_1.iob b/objects/village/savanna/houses/savanna_temple_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_temple_1.iob rename to objects/village/savanna/houses/savanna_temple_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_temple_2.iob b/objects/village/savanna/houses/savanna_temple_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_temple_2.iob rename to objects/village/savanna/houses/savanna_temple_2.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_tool_smith_1.iob b/objects/village/savanna/houses/savanna_tool_smith_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_tool_smith_1.iob rename to objects/village/savanna/houses/savanna_tool_smith_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_weaponsmith_1.iob b/objects/village/savanna/houses/savanna_weaponsmith_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_weaponsmith_1.iob rename to objects/village/savanna/houses/savanna_weaponsmith_1.iob diff --git a/objects/jigsaw/village/savanna/houses/savanna_weaponsmith_2.iob b/objects/village/savanna/houses/savanna_weaponsmith_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/houses/savanna_weaponsmith_2.iob rename to objects/village/savanna/houses/savanna_weaponsmith_2.iob diff --git a/objects/jigsaw/village/savanna/savanna_lamp_post_01.iob b/objects/village/savanna/savanna_lamp_post_01.iob similarity index 100% rename from objects/jigsaw/village/savanna/savanna_lamp_post_01.iob rename to objects/village/savanna/savanna_lamp_post_01.iob diff --git a/objects/jigsaw/village/savanna/streets/corner_01.iob b/objects/village/savanna/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/corner_01.iob rename to objects/village/savanna/streets/corner_01.iob diff --git a/objects/jigsaw/village/savanna/streets/corner_03.iob b/objects/village/savanna/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/corner_03.iob rename to objects/village/savanna/streets/corner_03.iob diff --git a/objects/jigsaw/village/savanna/streets/crossroad_02.iob b/objects/village/savanna/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/crossroad_02.iob rename to objects/village/savanna/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/savanna/streets/crossroad_03.iob b/objects/village/savanna/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/crossroad_03.iob rename to objects/village/savanna/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/savanna/streets/crossroad_04.iob b/objects/village/savanna/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/crossroad_04.iob rename to objects/village/savanna/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/savanna/streets/crossroad_05.iob b/objects/village/savanna/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/crossroad_05.iob rename to objects/village/savanna/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/savanna/streets/crossroad_06.iob b/objects/village/savanna/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/crossroad_06.iob rename to objects/village/savanna/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/savanna/streets/crossroad_07.iob b/objects/village/savanna/streets/crossroad_07.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/crossroad_07.iob rename to objects/village/savanna/streets/crossroad_07.iob diff --git a/objects/jigsaw/village/savanna/streets/split_01.iob b/objects/village/savanna/streets/split_01.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/split_01.iob rename to objects/village/savanna/streets/split_01.iob diff --git a/objects/jigsaw/village/savanna/streets/split_02.iob b/objects/village/savanna/streets/split_02.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/split_02.iob rename to objects/village/savanna/streets/split_02.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_02.iob b/objects/village/savanna/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_02.iob rename to objects/village/savanna/streets/straight_02.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_04.iob b/objects/village/savanna/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_04.iob rename to objects/village/savanna/streets/straight_04.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_05.iob b/objects/village/savanna/streets/straight_05.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_05.iob rename to objects/village/savanna/streets/straight_05.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_06.iob b/objects/village/savanna/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_06.iob rename to objects/village/savanna/streets/straight_06.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_08.iob b/objects/village/savanna/streets/straight_08.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_08.iob rename to objects/village/savanna/streets/straight_08.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_09.iob b/objects/village/savanna/streets/straight_09.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_09.iob rename to objects/village/savanna/streets/straight_09.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_10.iob b/objects/village/savanna/streets/straight_10.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_10.iob rename to objects/village/savanna/streets/straight_10.iob diff --git a/objects/jigsaw/village/savanna/streets/straight_11.iob b/objects/village/savanna/streets/straight_11.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/straight_11.iob rename to objects/village/savanna/streets/straight_11.iob diff --git a/objects/jigsaw/village/savanna/streets/turn_01.iob b/objects/village/savanna/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/savanna/streets/turn_01.iob rename to objects/village/savanna/streets/turn_01.iob diff --git a/objects/jigsaw/village/savanna/terminators/terminator_05.iob b/objects/village/savanna/terminators/terminator_05.iob similarity index 100% rename from objects/jigsaw/village/savanna/terminators/terminator_05.iob rename to objects/village/savanna/terminators/terminator_05.iob diff --git a/objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_1.iob b/objects/village/savanna/town_centers/savanna_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_1.iob rename to objects/village/savanna/town_centers/savanna_meeting_point_1.iob diff --git a/objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_2.iob b/objects/village/savanna/town_centers/savanna_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_2.iob rename to objects/village/savanna/town_centers/savanna_meeting_point_2.iob diff --git a/objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_3.iob b/objects/village/savanna/town_centers/savanna_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_3.iob rename to objects/village/savanna/town_centers/savanna_meeting_point_3.iob diff --git a/objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_4.iob b/objects/village/savanna/town_centers/savanna_meeting_point_4.iob similarity index 100% rename from objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_4.iob rename to objects/village/savanna/town_centers/savanna_meeting_point_4.iob diff --git a/objects/jigsaw/village/savanna/villagers/baby.iob b/objects/village/savanna/villagers/baby.iob similarity index 100% rename from objects/jigsaw/village/savanna/villagers/baby.iob rename to objects/village/savanna/villagers/baby.iob diff --git a/objects/jigsaw/village/savanna/villagers/nitwit.iob b/objects/village/savanna/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/savanna/villagers/nitwit.iob rename to objects/village/savanna/villagers/nitwit.iob diff --git a/objects/jigsaw/village/savanna/villagers/unemployed.iob b/objects/village/savanna/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/savanna/villagers/unemployed.iob rename to objects/village/savanna/villagers/unemployed.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_animal_pen_2.iob b/objects/village/savanna/zombie/houses/savanna_animal_pen_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_animal_pen_2.iob rename to objects/village/savanna/zombie/houses/savanna_animal_pen_2.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_animal_pen_3.iob b/objects/village/savanna/zombie/houses/savanna_animal_pen_3.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_animal_pen_3.iob rename to objects/village/savanna/zombie/houses/savanna_animal_pen_3.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_large_farm_2.iob b/objects/village/savanna/zombie/houses/savanna_large_farm_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_large_farm_2.iob rename to objects/village/savanna/zombie/houses/savanna_large_farm_2.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_medium_house_1.iob b/objects/village/savanna/zombie/houses/savanna_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_medium_house_1.iob rename to objects/village/savanna/zombie/houses/savanna_medium_house_1.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_medium_house_2.iob b/objects/village/savanna/zombie/houses/savanna_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_medium_house_2.iob rename to objects/village/savanna/zombie/houses/savanna_medium_house_2.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_1.iob b/objects/village/savanna/zombie/houses/savanna_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_1.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_1.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_2.iob b/objects/village/savanna/zombie/houses/savanna_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_2.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_2.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_3.iob b/objects/village/savanna/zombie/houses/savanna_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_3.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_3.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_4.iob b/objects/village/savanna/zombie/houses/savanna_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_4.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_4.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_5.iob b/objects/village/savanna/zombie/houses/savanna_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_5.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_5.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_6.iob b/objects/village/savanna/zombie/houses/savanna_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_6.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_6.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_7.iob b/objects/village/savanna/zombie/houses/savanna_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_7.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_7.iob diff --git a/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_8.iob b/objects/village/savanna/zombie/houses/savanna_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_8.iob rename to objects/village/savanna/zombie/houses/savanna_small_house_8.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/corner_01.iob b/objects/village/savanna/zombie/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/corner_01.iob rename to objects/village/savanna/zombie/streets/corner_01.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/corner_03.iob b/objects/village/savanna/zombie/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/corner_03.iob rename to objects/village/savanna/zombie/streets/corner_03.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/crossroad_02.iob b/objects/village/savanna/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/crossroad_02.iob rename to objects/village/savanna/zombie/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/crossroad_03.iob b/objects/village/savanna/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/crossroad_03.iob rename to objects/village/savanna/zombie/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/crossroad_04.iob b/objects/village/savanna/zombie/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/crossroad_04.iob rename to objects/village/savanna/zombie/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/crossroad_05.iob b/objects/village/savanna/zombie/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/crossroad_05.iob rename to objects/village/savanna/zombie/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/crossroad_06.iob b/objects/village/savanna/zombie/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/crossroad_06.iob rename to objects/village/savanna/zombie/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/crossroad_07.iob b/objects/village/savanna/zombie/streets/crossroad_07.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/crossroad_07.iob rename to objects/village/savanna/zombie/streets/crossroad_07.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/split_01.iob b/objects/village/savanna/zombie/streets/split_01.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/split_01.iob rename to objects/village/savanna/zombie/streets/split_01.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/split_02.iob b/objects/village/savanna/zombie/streets/split_02.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/split_02.iob rename to objects/village/savanna/zombie/streets/split_02.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_02.iob b/objects/village/savanna/zombie/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_02.iob rename to objects/village/savanna/zombie/streets/straight_02.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_04.iob b/objects/village/savanna/zombie/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_04.iob rename to objects/village/savanna/zombie/streets/straight_04.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_05.iob b/objects/village/savanna/zombie/streets/straight_05.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_05.iob rename to objects/village/savanna/zombie/streets/straight_05.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_06.iob b/objects/village/savanna/zombie/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_06.iob rename to objects/village/savanna/zombie/streets/straight_06.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_08.iob b/objects/village/savanna/zombie/streets/straight_08.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_08.iob rename to objects/village/savanna/zombie/streets/straight_08.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_09.iob b/objects/village/savanna/zombie/streets/straight_09.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_09.iob rename to objects/village/savanna/zombie/streets/straight_09.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_10.iob b/objects/village/savanna/zombie/streets/straight_10.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_10.iob rename to objects/village/savanna/zombie/streets/straight_10.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/straight_11.iob b/objects/village/savanna/zombie/streets/straight_11.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/straight_11.iob rename to objects/village/savanna/zombie/streets/straight_11.iob diff --git a/objects/jigsaw/village/savanna/zombie/streets/turn_01.iob b/objects/village/savanna/zombie/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/streets/turn_01.iob rename to objects/village/savanna/zombie/streets/turn_01.iob diff --git a/objects/jigsaw/village/savanna/zombie/terminators/terminator_05.iob b/objects/village/savanna/zombie/terminators/terminator_05.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/terminators/terminator_05.iob rename to objects/village/savanna/zombie/terminators/terminator_05.iob diff --git a/objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_1.iob b/objects/village/savanna/zombie/town_centers/savanna_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_1.iob rename to objects/village/savanna/zombie/town_centers/savanna_meeting_point_1.iob diff --git a/objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_2.iob b/objects/village/savanna/zombie/town_centers/savanna_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_2.iob rename to objects/village/savanna/zombie/town_centers/savanna_meeting_point_2.iob diff --git a/objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_3.iob b/objects/village/savanna/zombie/town_centers/savanna_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_3.iob rename to objects/village/savanna/zombie/town_centers/savanna_meeting_point_3.iob diff --git a/objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_4.iob b/objects/village/savanna/zombie/town_centers/savanna_meeting_point_4.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_4.iob rename to objects/village/savanna/zombie/town_centers/savanna_meeting_point_4.iob diff --git a/objects/jigsaw/village/savanna/zombie/villagers/nitwit.iob b/objects/village/savanna/zombie/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/villagers/nitwit.iob rename to objects/village/savanna/zombie/villagers/nitwit.iob diff --git a/objects/jigsaw/village/savanna/zombie/villagers/unemployed.iob b/objects/village/savanna/zombie/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/savanna/zombie/villagers/unemployed.iob rename to objects/village/savanna/zombie/villagers/unemployed.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_animal_pen_1.iob b/objects/village/snowy/houses/snowy_animal_pen_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_animal_pen_1.iob rename to objects/village/snowy/houses/snowy_animal_pen_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_animal_pen_2.iob b/objects/village/snowy/houses/snowy_animal_pen_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_animal_pen_2.iob rename to objects/village/snowy/houses/snowy_animal_pen_2.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_armorer_house_1.iob b/objects/village/snowy/houses/snowy_armorer_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_armorer_house_1.iob rename to objects/village/snowy/houses/snowy_armorer_house_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_armorer_house_2.iob b/objects/village/snowy/houses/snowy_armorer_house_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_armorer_house_2.iob rename to objects/village/snowy/houses/snowy_armorer_house_2.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_butchers_shop_1.iob b/objects/village/snowy/houses/snowy_butchers_shop_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_butchers_shop_1.iob rename to objects/village/snowy/houses/snowy_butchers_shop_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_butchers_shop_2.iob b/objects/village/snowy/houses/snowy_butchers_shop_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_butchers_shop_2.iob rename to objects/village/snowy/houses/snowy_butchers_shop_2.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_cartographer_house_1.iob b/objects/village/snowy/houses/snowy_cartographer_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_cartographer_house_1.iob rename to objects/village/snowy/houses/snowy_cartographer_house_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_farm_1.iob b/objects/village/snowy/houses/snowy_farm_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_farm_1.iob rename to objects/village/snowy/houses/snowy_farm_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_farm_2.iob b/objects/village/snowy/houses/snowy_farm_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_farm_2.iob rename to objects/village/snowy/houses/snowy_farm_2.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_fisher_cottage.iob b/objects/village/snowy/houses/snowy_fisher_cottage.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_fisher_cottage.iob rename to objects/village/snowy/houses/snowy_fisher_cottage.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_fletcher_house_1.iob b/objects/village/snowy/houses/snowy_fletcher_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_fletcher_house_1.iob rename to objects/village/snowy/houses/snowy_fletcher_house_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_library_1.iob b/objects/village/snowy/houses/snowy_library_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_library_1.iob rename to objects/village/snowy/houses/snowy_library_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_masons_house_1.iob b/objects/village/snowy/houses/snowy_masons_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_masons_house_1.iob rename to objects/village/snowy/houses/snowy_masons_house_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_masons_house_2.iob b/objects/village/snowy/houses/snowy_masons_house_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_masons_house_2.iob rename to objects/village/snowy/houses/snowy_masons_house_2.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_medium_house_1.iob b/objects/village/snowy/houses/snowy_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_medium_house_1.iob rename to objects/village/snowy/houses/snowy_medium_house_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_medium_house_2.iob b/objects/village/snowy/houses/snowy_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_medium_house_2.iob rename to objects/village/snowy/houses/snowy_medium_house_2.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_medium_house_3.iob b/objects/village/snowy/houses/snowy_medium_house_3.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_medium_house_3.iob rename to objects/village/snowy/houses/snowy_medium_house_3.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_shepherds_house_1.iob b/objects/village/snowy/houses/snowy_shepherds_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_shepherds_house_1.iob rename to objects/village/snowy/houses/snowy_shepherds_house_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_1.iob b/objects/village/snowy/houses/snowy_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_1.iob rename to objects/village/snowy/houses/snowy_small_house_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_2.iob b/objects/village/snowy/houses/snowy_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_2.iob rename to objects/village/snowy/houses/snowy_small_house_2.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_3.iob b/objects/village/snowy/houses/snowy_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_3.iob rename to objects/village/snowy/houses/snowy_small_house_3.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_4.iob b/objects/village/snowy/houses/snowy_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_4.iob rename to objects/village/snowy/houses/snowy_small_house_4.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_5.iob b/objects/village/snowy/houses/snowy_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_5.iob rename to objects/village/snowy/houses/snowy_small_house_5.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_6.iob b/objects/village/snowy/houses/snowy_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_6.iob rename to objects/village/snowy/houses/snowy_small_house_6.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_7.iob b/objects/village/snowy/houses/snowy_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_7.iob rename to objects/village/snowy/houses/snowy_small_house_7.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_small_house_8.iob b/objects/village/snowy/houses/snowy_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_small_house_8.iob rename to objects/village/snowy/houses/snowy_small_house_8.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_tannery_1.iob b/objects/village/snowy/houses/snowy_tannery_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_tannery_1.iob rename to objects/village/snowy/houses/snowy_tannery_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_temple_1.iob b/objects/village/snowy/houses/snowy_temple_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_temple_1.iob rename to objects/village/snowy/houses/snowy_temple_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_tool_smith_1.iob b/objects/village/snowy/houses/snowy_tool_smith_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_tool_smith_1.iob rename to objects/village/snowy/houses/snowy_tool_smith_1.iob diff --git a/objects/jigsaw/village/snowy/houses/snowy_weapon_smith_1.iob b/objects/village/snowy/houses/snowy_weapon_smith_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/houses/snowy_weapon_smith_1.iob rename to objects/village/snowy/houses/snowy_weapon_smith_1.iob diff --git a/objects/jigsaw/village/snowy/snowy_lamp_post_01.iob b/objects/village/snowy/snowy_lamp_post_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/snowy_lamp_post_01.iob rename to objects/village/snowy/snowy_lamp_post_01.iob diff --git a/objects/jigsaw/village/snowy/snowy_lamp_post_02.iob b/objects/village/snowy/snowy_lamp_post_02.iob similarity index 100% rename from objects/jigsaw/village/snowy/snowy_lamp_post_02.iob rename to objects/village/snowy/snowy_lamp_post_02.iob diff --git a/objects/jigsaw/village/snowy/snowy_lamp_post_03.iob b/objects/village/snowy/snowy_lamp_post_03.iob similarity index 100% rename from objects/jigsaw/village/snowy/snowy_lamp_post_03.iob rename to objects/village/snowy/snowy_lamp_post_03.iob diff --git a/objects/jigsaw/village/snowy/streets/corner_01.iob b/objects/village/snowy/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/corner_01.iob rename to objects/village/snowy/streets/corner_01.iob diff --git a/objects/jigsaw/village/snowy/streets/corner_02.iob b/objects/village/snowy/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/corner_02.iob rename to objects/village/snowy/streets/corner_02.iob diff --git a/objects/jigsaw/village/snowy/streets/corner_03.iob b/objects/village/snowy/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/corner_03.iob rename to objects/village/snowy/streets/corner_03.iob diff --git a/objects/jigsaw/village/snowy/streets/crossroad_01.iob b/objects/village/snowy/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/crossroad_01.iob rename to objects/village/snowy/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/snowy/streets/crossroad_02.iob b/objects/village/snowy/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/crossroad_02.iob rename to objects/village/snowy/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/snowy/streets/crossroad_03.iob b/objects/village/snowy/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/crossroad_03.iob rename to objects/village/snowy/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/snowy/streets/crossroad_04.iob b/objects/village/snowy/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/crossroad_04.iob rename to objects/village/snowy/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/snowy/streets/crossroad_05.iob b/objects/village/snowy/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/crossroad_05.iob rename to objects/village/snowy/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/snowy/streets/crossroad_06.iob b/objects/village/snowy/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/crossroad_06.iob rename to objects/village/snowy/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/snowy/streets/square_01.iob b/objects/village/snowy/streets/square_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/square_01.iob rename to objects/village/snowy/streets/square_01.iob diff --git a/objects/jigsaw/village/snowy/streets/straight_01.iob b/objects/village/snowy/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/straight_01.iob rename to objects/village/snowy/streets/straight_01.iob diff --git a/objects/jigsaw/village/snowy/streets/straight_02.iob b/objects/village/snowy/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/straight_02.iob rename to objects/village/snowy/streets/straight_02.iob diff --git a/objects/jigsaw/village/snowy/streets/straight_03.iob b/objects/village/snowy/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/straight_03.iob rename to objects/village/snowy/streets/straight_03.iob diff --git a/objects/jigsaw/village/snowy/streets/straight_04.iob b/objects/village/snowy/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/straight_04.iob rename to objects/village/snowy/streets/straight_04.iob diff --git a/objects/jigsaw/village/snowy/streets/straight_06.iob b/objects/village/snowy/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/straight_06.iob rename to objects/village/snowy/streets/straight_06.iob diff --git a/objects/jigsaw/village/snowy/streets/straight_08.iob b/objects/village/snowy/streets/straight_08.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/straight_08.iob rename to objects/village/snowy/streets/straight_08.iob diff --git a/objects/jigsaw/village/snowy/streets/turn_01.iob b/objects/village/snowy/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/streets/turn_01.iob rename to objects/village/snowy/streets/turn_01.iob diff --git a/objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_1.iob b/objects/village/snowy/town_centers/snowy_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_1.iob rename to objects/village/snowy/town_centers/snowy_meeting_point_1.iob diff --git a/objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_2.iob b/objects/village/snowy/town_centers/snowy_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_2.iob rename to objects/village/snowy/town_centers/snowy_meeting_point_2.iob diff --git a/objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_3.iob b/objects/village/snowy/town_centers/snowy_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_3.iob rename to objects/village/snowy/town_centers/snowy_meeting_point_3.iob diff --git a/objects/jigsaw/village/snowy/villagers/baby.iob b/objects/village/snowy/villagers/baby.iob similarity index 100% rename from objects/jigsaw/village/snowy/villagers/baby.iob rename to objects/village/snowy/villagers/baby.iob diff --git a/objects/jigsaw/village/snowy/villagers/nitwit.iob b/objects/village/snowy/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/snowy/villagers/nitwit.iob rename to objects/village/snowy/villagers/nitwit.iob diff --git a/objects/jigsaw/village/snowy/villagers/unemployed.iob b/objects/village/snowy/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/snowy/villagers/unemployed.iob rename to objects/village/snowy/villagers/unemployed.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_1.iob b/objects/village/snowy/zombie/houses/snowy_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_1.iob rename to objects/village/snowy/zombie/houses/snowy_medium_house_1.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_2.iob b/objects/village/snowy/zombie/houses/snowy_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_2.iob rename to objects/village/snowy/zombie/houses/snowy_medium_house_2.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_3.iob b/objects/village/snowy/zombie/houses/snowy_medium_house_3.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_3.iob rename to objects/village/snowy/zombie/houses/snowy_medium_house_3.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_1.iob b/objects/village/snowy/zombie/houses/snowy_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_1.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_1.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_2.iob b/objects/village/snowy/zombie/houses/snowy_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_2.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_2.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_3.iob b/objects/village/snowy/zombie/houses/snowy_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_3.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_3.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_4.iob b/objects/village/snowy/zombie/houses/snowy_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_4.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_4.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_5.iob b/objects/village/snowy/zombie/houses/snowy_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_5.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_5.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_6.iob b/objects/village/snowy/zombie/houses/snowy_small_house_6.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_6.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_6.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_7.iob b/objects/village/snowy/zombie/houses/snowy_small_house_7.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_7.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_7.iob diff --git a/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_8.iob b/objects/village/snowy/zombie/houses/snowy_small_house_8.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_8.iob rename to objects/village/snowy/zombie/houses/snowy_small_house_8.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/corner_01.iob b/objects/village/snowy/zombie/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/corner_01.iob rename to objects/village/snowy/zombie/streets/corner_01.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/corner_02.iob b/objects/village/snowy/zombie/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/corner_02.iob rename to objects/village/snowy/zombie/streets/corner_02.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/corner_03.iob b/objects/village/snowy/zombie/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/corner_03.iob rename to objects/village/snowy/zombie/streets/corner_03.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/crossroad_01.iob b/objects/village/snowy/zombie/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/crossroad_01.iob rename to objects/village/snowy/zombie/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/crossroad_02.iob b/objects/village/snowy/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/crossroad_02.iob rename to objects/village/snowy/zombie/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/crossroad_03.iob b/objects/village/snowy/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/crossroad_03.iob rename to objects/village/snowy/zombie/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/crossroad_04.iob b/objects/village/snowy/zombie/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/crossroad_04.iob rename to objects/village/snowy/zombie/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/crossroad_05.iob b/objects/village/snowy/zombie/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/crossroad_05.iob rename to objects/village/snowy/zombie/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/crossroad_06.iob b/objects/village/snowy/zombie/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/crossroad_06.iob rename to objects/village/snowy/zombie/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/square_01.iob b/objects/village/snowy/zombie/streets/square_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/square_01.iob rename to objects/village/snowy/zombie/streets/square_01.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/straight_01.iob b/objects/village/snowy/zombie/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/straight_01.iob rename to objects/village/snowy/zombie/streets/straight_01.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/straight_02.iob b/objects/village/snowy/zombie/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/straight_02.iob rename to objects/village/snowy/zombie/streets/straight_02.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/straight_03.iob b/objects/village/snowy/zombie/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/straight_03.iob rename to objects/village/snowy/zombie/streets/straight_03.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/straight_04.iob b/objects/village/snowy/zombie/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/straight_04.iob rename to objects/village/snowy/zombie/streets/straight_04.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/straight_06.iob b/objects/village/snowy/zombie/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/straight_06.iob rename to objects/village/snowy/zombie/streets/straight_06.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/straight_08.iob b/objects/village/snowy/zombie/streets/straight_08.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/straight_08.iob rename to objects/village/snowy/zombie/streets/straight_08.iob diff --git a/objects/jigsaw/village/snowy/zombie/streets/turn_01.iob b/objects/village/snowy/zombie/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/streets/turn_01.iob rename to objects/village/snowy/zombie/streets/turn_01.iob diff --git a/objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_1.iob b/objects/village/snowy/zombie/town_centers/snowy_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_1.iob rename to objects/village/snowy/zombie/town_centers/snowy_meeting_point_1.iob diff --git a/objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_2.iob b/objects/village/snowy/zombie/town_centers/snowy_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_2.iob rename to objects/village/snowy/zombie/town_centers/snowy_meeting_point_2.iob diff --git a/objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_3.iob b/objects/village/snowy/zombie/town_centers/snowy_meeting_point_3.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_3.iob rename to objects/village/snowy/zombie/town_centers/snowy_meeting_point_3.iob diff --git a/objects/jigsaw/village/snowy/zombie/villagers/nitwit.iob b/objects/village/snowy/zombie/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/villagers/nitwit.iob rename to objects/village/snowy/zombie/villagers/nitwit.iob diff --git a/objects/jigsaw/village/snowy/zombie/villagers/unemployed.iob b/objects/village/snowy/zombie/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/snowy/zombie/villagers/unemployed.iob rename to objects/village/snowy/zombie/villagers/unemployed.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_animal_pen_1.iob b/objects/village/taiga/houses/taiga_animal_pen_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_animal_pen_1.iob rename to objects/village/taiga/houses/taiga_animal_pen_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_armorer_2.iob b/objects/village/taiga/houses/taiga_armorer_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_armorer_2.iob rename to objects/village/taiga/houses/taiga_armorer_2.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_armorer_house_1.iob b/objects/village/taiga/houses/taiga_armorer_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_armorer_house_1.iob rename to objects/village/taiga/houses/taiga_armorer_house_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_butcher_shop_1.iob b/objects/village/taiga/houses/taiga_butcher_shop_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_butcher_shop_1.iob rename to objects/village/taiga/houses/taiga_butcher_shop_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_cartographer_house_1.iob b/objects/village/taiga/houses/taiga_cartographer_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_cartographer_house_1.iob rename to objects/village/taiga/houses/taiga_cartographer_house_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_fisher_cottage_1.iob b/objects/village/taiga/houses/taiga_fisher_cottage_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_fisher_cottage_1.iob rename to objects/village/taiga/houses/taiga_fisher_cottage_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_fletcher_house_1.iob b/objects/village/taiga/houses/taiga_fletcher_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_fletcher_house_1.iob rename to objects/village/taiga/houses/taiga_fletcher_house_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_large_farm_1.iob b/objects/village/taiga/houses/taiga_large_farm_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_large_farm_1.iob rename to objects/village/taiga/houses/taiga_large_farm_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_large_farm_2.iob b/objects/village/taiga/houses/taiga_large_farm_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_large_farm_2.iob rename to objects/village/taiga/houses/taiga_large_farm_2.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_library_1.iob b/objects/village/taiga/houses/taiga_library_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_library_1.iob rename to objects/village/taiga/houses/taiga_library_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_masons_house_1.iob b/objects/village/taiga/houses/taiga_masons_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_masons_house_1.iob rename to objects/village/taiga/houses/taiga_masons_house_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_medium_house_1.iob b/objects/village/taiga/houses/taiga_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_medium_house_1.iob rename to objects/village/taiga/houses/taiga_medium_house_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_medium_house_2.iob b/objects/village/taiga/houses/taiga_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_medium_house_2.iob rename to objects/village/taiga/houses/taiga_medium_house_2.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_medium_house_3.iob b/objects/village/taiga/houses/taiga_medium_house_3.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_medium_house_3.iob rename to objects/village/taiga/houses/taiga_medium_house_3.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_medium_house_4.iob b/objects/village/taiga/houses/taiga_medium_house_4.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_medium_house_4.iob rename to objects/village/taiga/houses/taiga_medium_house_4.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_shepherds_house_1.iob b/objects/village/taiga/houses/taiga_shepherds_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_shepherds_house_1.iob rename to objects/village/taiga/houses/taiga_shepherds_house_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_small_farm_1.iob b/objects/village/taiga/houses/taiga_small_farm_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_small_farm_1.iob rename to objects/village/taiga/houses/taiga_small_farm_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_small_house_1.iob b/objects/village/taiga/houses/taiga_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_small_house_1.iob rename to objects/village/taiga/houses/taiga_small_house_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_small_house_2.iob b/objects/village/taiga/houses/taiga_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_small_house_2.iob rename to objects/village/taiga/houses/taiga_small_house_2.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_small_house_3.iob b/objects/village/taiga/houses/taiga_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_small_house_3.iob rename to objects/village/taiga/houses/taiga_small_house_3.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_small_house_4.iob b/objects/village/taiga/houses/taiga_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_small_house_4.iob rename to objects/village/taiga/houses/taiga_small_house_4.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_small_house_5.iob b/objects/village/taiga/houses/taiga_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_small_house_5.iob rename to objects/village/taiga/houses/taiga_small_house_5.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_tannery_1.iob b/objects/village/taiga/houses/taiga_tannery_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_tannery_1.iob rename to objects/village/taiga/houses/taiga_tannery_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_temple_1.iob b/objects/village/taiga/houses/taiga_temple_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_temple_1.iob rename to objects/village/taiga/houses/taiga_temple_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_tool_smith_1.iob b/objects/village/taiga/houses/taiga_tool_smith_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_tool_smith_1.iob rename to objects/village/taiga/houses/taiga_tool_smith_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_weaponsmith_1.iob b/objects/village/taiga/houses/taiga_weaponsmith_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_weaponsmith_1.iob rename to objects/village/taiga/houses/taiga_weaponsmith_1.iob diff --git a/objects/jigsaw/village/taiga/houses/taiga_weaponsmith_2.iob b/objects/village/taiga/houses/taiga_weaponsmith_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/houses/taiga_weaponsmith_2.iob rename to objects/village/taiga/houses/taiga_weaponsmith_2.iob diff --git a/objects/jigsaw/village/taiga/streets/corner_01.iob b/objects/village/taiga/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/corner_01.iob rename to objects/village/taiga/streets/corner_01.iob diff --git a/objects/jigsaw/village/taiga/streets/corner_02.iob b/objects/village/taiga/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/corner_02.iob rename to objects/village/taiga/streets/corner_02.iob diff --git a/objects/jigsaw/village/taiga/streets/corner_03.iob b/objects/village/taiga/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/corner_03.iob rename to objects/village/taiga/streets/corner_03.iob diff --git a/objects/jigsaw/village/taiga/streets/crossroad_01.iob b/objects/village/taiga/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/crossroad_01.iob rename to objects/village/taiga/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/taiga/streets/crossroad_02.iob b/objects/village/taiga/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/crossroad_02.iob rename to objects/village/taiga/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/taiga/streets/crossroad_03.iob b/objects/village/taiga/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/crossroad_03.iob rename to objects/village/taiga/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/taiga/streets/crossroad_04.iob b/objects/village/taiga/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/crossroad_04.iob rename to objects/village/taiga/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/taiga/streets/crossroad_05.iob b/objects/village/taiga/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/crossroad_05.iob rename to objects/village/taiga/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/taiga/streets/crossroad_06.iob b/objects/village/taiga/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/crossroad_06.iob rename to objects/village/taiga/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/taiga/streets/straight_01.iob b/objects/village/taiga/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/straight_01.iob rename to objects/village/taiga/streets/straight_01.iob diff --git a/objects/jigsaw/village/taiga/streets/straight_02.iob b/objects/village/taiga/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/straight_02.iob rename to objects/village/taiga/streets/straight_02.iob diff --git a/objects/jigsaw/village/taiga/streets/straight_03.iob b/objects/village/taiga/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/straight_03.iob rename to objects/village/taiga/streets/straight_03.iob diff --git a/objects/jigsaw/village/taiga/streets/straight_04.iob b/objects/village/taiga/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/straight_04.iob rename to objects/village/taiga/streets/straight_04.iob diff --git a/objects/jigsaw/village/taiga/streets/straight_05.iob b/objects/village/taiga/streets/straight_05.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/straight_05.iob rename to objects/village/taiga/streets/straight_05.iob diff --git a/objects/jigsaw/village/taiga/streets/straight_06.iob b/objects/village/taiga/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/straight_06.iob rename to objects/village/taiga/streets/straight_06.iob diff --git a/objects/jigsaw/village/taiga/streets/turn_01.iob b/objects/village/taiga/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/streets/turn_01.iob rename to objects/village/taiga/streets/turn_01.iob diff --git a/objects/jigsaw/village/taiga/taiga_decoration_1.iob b/objects/village/taiga/taiga_decoration_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/taiga_decoration_1.iob rename to objects/village/taiga/taiga_decoration_1.iob diff --git a/objects/jigsaw/village/taiga/taiga_decoration_2.iob b/objects/village/taiga/taiga_decoration_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/taiga_decoration_2.iob rename to objects/village/taiga/taiga_decoration_2.iob diff --git a/objects/jigsaw/village/taiga/taiga_decoration_3.iob b/objects/village/taiga/taiga_decoration_3.iob similarity index 100% rename from objects/jigsaw/village/taiga/taiga_decoration_3.iob rename to objects/village/taiga/taiga_decoration_3.iob diff --git a/objects/jigsaw/village/taiga/taiga_decoration_4.iob b/objects/village/taiga/taiga_decoration_4.iob similarity index 100% rename from objects/jigsaw/village/taiga/taiga_decoration_4.iob rename to objects/village/taiga/taiga_decoration_4.iob diff --git a/objects/jigsaw/village/taiga/taiga_decoration_5.iob b/objects/village/taiga/taiga_decoration_5.iob similarity index 100% rename from objects/jigsaw/village/taiga/taiga_decoration_5.iob rename to objects/village/taiga/taiga_decoration_5.iob diff --git a/objects/jigsaw/village/taiga/taiga_decoration_6.iob b/objects/village/taiga/taiga_decoration_6.iob similarity index 100% rename from objects/jigsaw/village/taiga/taiga_decoration_6.iob rename to objects/village/taiga/taiga_decoration_6.iob diff --git a/objects/jigsaw/village/taiga/taiga_lamp_post_1.iob b/objects/village/taiga/taiga_lamp_post_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/taiga_lamp_post_1.iob rename to objects/village/taiga/taiga_lamp_post_1.iob diff --git a/objects/jigsaw/village/taiga/town_centers/taiga_meeting_point_1.iob b/objects/village/taiga/town_centers/taiga_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/town_centers/taiga_meeting_point_1.iob rename to objects/village/taiga/town_centers/taiga_meeting_point_1.iob diff --git a/objects/jigsaw/village/taiga/town_centers/taiga_meeting_point_2.iob b/objects/village/taiga/town_centers/taiga_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/town_centers/taiga_meeting_point_2.iob rename to objects/village/taiga/town_centers/taiga_meeting_point_2.iob diff --git a/objects/jigsaw/village/taiga/villagers/baby.iob b/objects/village/taiga/villagers/baby.iob similarity index 100% rename from objects/jigsaw/village/taiga/villagers/baby.iob rename to objects/village/taiga/villagers/baby.iob diff --git a/objects/jigsaw/village/taiga/villagers/nitwit.iob b/objects/village/taiga/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/taiga/villagers/nitwit.iob rename to objects/village/taiga/villagers/nitwit.iob diff --git a/objects/jigsaw/village/taiga/villagers/unemployed.iob b/objects/village/taiga/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/taiga/villagers/unemployed.iob rename to objects/village/taiga/villagers/unemployed.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_cartographer_house_1.iob b/objects/village/taiga/zombie/houses/taiga_cartographer_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_cartographer_house_1.iob rename to objects/village/taiga/zombie/houses/taiga_cartographer_house_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_fisher_cottage_1.iob b/objects/village/taiga/zombie/houses/taiga_fisher_cottage_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_fisher_cottage_1.iob rename to objects/village/taiga/zombie/houses/taiga_fisher_cottage_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_large_farm_2.iob b/objects/village/taiga/zombie/houses/taiga_large_farm_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_large_farm_2.iob rename to objects/village/taiga/zombie/houses/taiga_large_farm_2.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_library_1.iob b/objects/village/taiga/zombie/houses/taiga_library_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_library_1.iob rename to objects/village/taiga/zombie/houses/taiga_library_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_1.iob b/objects/village/taiga/zombie/houses/taiga_medium_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_1.iob rename to objects/village/taiga/zombie/houses/taiga_medium_house_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_2.iob b/objects/village/taiga/zombie/houses/taiga_medium_house_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_2.iob rename to objects/village/taiga/zombie/houses/taiga_medium_house_2.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_3.iob b/objects/village/taiga/zombie/houses/taiga_medium_house_3.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_3.iob rename to objects/village/taiga/zombie/houses/taiga_medium_house_3.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_4.iob b/objects/village/taiga/zombie/houses/taiga_medium_house_4.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_4.iob rename to objects/village/taiga/zombie/houses/taiga_medium_house_4.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_shepherds_house_1.iob b/objects/village/taiga/zombie/houses/taiga_shepherds_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_shepherds_house_1.iob rename to objects/village/taiga/zombie/houses/taiga_shepherds_house_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_1.iob b/objects/village/taiga/zombie/houses/taiga_small_house_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_1.iob rename to objects/village/taiga/zombie/houses/taiga_small_house_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_2.iob b/objects/village/taiga/zombie/houses/taiga_small_house_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_2.iob rename to objects/village/taiga/zombie/houses/taiga_small_house_2.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_3.iob b/objects/village/taiga/zombie/houses/taiga_small_house_3.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_3.iob rename to objects/village/taiga/zombie/houses/taiga_small_house_3.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_4.iob b/objects/village/taiga/zombie/houses/taiga_small_house_4.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_4.iob rename to objects/village/taiga/zombie/houses/taiga_small_house_4.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_5.iob b/objects/village/taiga/zombie/houses/taiga_small_house_5.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_5.iob rename to objects/village/taiga/zombie/houses/taiga_small_house_5.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_temple_1.iob b/objects/village/taiga/zombie/houses/taiga_temple_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_temple_1.iob rename to objects/village/taiga/zombie/houses/taiga_temple_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_tool_smith_1.iob b/objects/village/taiga/zombie/houses/taiga_tool_smith_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_tool_smith_1.iob rename to objects/village/taiga/zombie/houses/taiga_tool_smith_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/houses/taiga_weaponsmith_2.iob b/objects/village/taiga/zombie/houses/taiga_weaponsmith_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/houses/taiga_weaponsmith_2.iob rename to objects/village/taiga/zombie/houses/taiga_weaponsmith_2.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/corner_01.iob b/objects/village/taiga/zombie/streets/corner_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/corner_01.iob rename to objects/village/taiga/zombie/streets/corner_01.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/corner_02.iob b/objects/village/taiga/zombie/streets/corner_02.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/corner_02.iob rename to objects/village/taiga/zombie/streets/corner_02.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/corner_03.iob b/objects/village/taiga/zombie/streets/corner_03.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/corner_03.iob rename to objects/village/taiga/zombie/streets/corner_03.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/crossroad_01.iob b/objects/village/taiga/zombie/streets/crossroad_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/crossroad_01.iob rename to objects/village/taiga/zombie/streets/crossroad_01.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/crossroad_02.iob b/objects/village/taiga/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/crossroad_02.iob rename to objects/village/taiga/zombie/streets/crossroad_02.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/crossroad_03.iob b/objects/village/taiga/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/crossroad_03.iob rename to objects/village/taiga/zombie/streets/crossroad_03.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/crossroad_04.iob b/objects/village/taiga/zombie/streets/crossroad_04.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/crossroad_04.iob rename to objects/village/taiga/zombie/streets/crossroad_04.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/crossroad_05.iob b/objects/village/taiga/zombie/streets/crossroad_05.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/crossroad_05.iob rename to objects/village/taiga/zombie/streets/crossroad_05.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/crossroad_06.iob b/objects/village/taiga/zombie/streets/crossroad_06.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/crossroad_06.iob rename to objects/village/taiga/zombie/streets/crossroad_06.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/straight_01.iob b/objects/village/taiga/zombie/streets/straight_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/straight_01.iob rename to objects/village/taiga/zombie/streets/straight_01.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/straight_02.iob b/objects/village/taiga/zombie/streets/straight_02.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/straight_02.iob rename to objects/village/taiga/zombie/streets/straight_02.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/straight_03.iob b/objects/village/taiga/zombie/streets/straight_03.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/straight_03.iob rename to objects/village/taiga/zombie/streets/straight_03.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/straight_04.iob b/objects/village/taiga/zombie/streets/straight_04.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/straight_04.iob rename to objects/village/taiga/zombie/streets/straight_04.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/straight_05.iob b/objects/village/taiga/zombie/streets/straight_05.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/straight_05.iob rename to objects/village/taiga/zombie/streets/straight_05.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/straight_06.iob b/objects/village/taiga/zombie/streets/straight_06.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/straight_06.iob rename to objects/village/taiga/zombie/streets/straight_06.iob diff --git a/objects/jigsaw/village/taiga/zombie/streets/turn_01.iob b/objects/village/taiga/zombie/streets/turn_01.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/streets/turn_01.iob rename to objects/village/taiga/zombie/streets/turn_01.iob diff --git a/objects/jigsaw/village/taiga/zombie/town_centers/taiga_meeting_point_1.iob b/objects/village/taiga/zombie/town_centers/taiga_meeting_point_1.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/town_centers/taiga_meeting_point_1.iob rename to objects/village/taiga/zombie/town_centers/taiga_meeting_point_1.iob diff --git a/objects/jigsaw/village/taiga/zombie/town_centers/taiga_meeting_point_2.iob b/objects/village/taiga/zombie/town_centers/taiga_meeting_point_2.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/town_centers/taiga_meeting_point_2.iob rename to objects/village/taiga/zombie/town_centers/taiga_meeting_point_2.iob diff --git a/objects/jigsaw/village/taiga/zombie/villagers/nitwit.iob b/objects/village/taiga/zombie/villagers/nitwit.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/villagers/nitwit.iob rename to objects/village/taiga/zombie/villagers/nitwit.iob diff --git a/objects/jigsaw/village/taiga/zombie/villagers/unemployed.iob b/objects/village/taiga/zombie/villagers/unemployed.iob similarity index 100% rename from objects/jigsaw/village/taiga/zombie/villagers/unemployed.iob rename to objects/village/taiga/zombie/villagers/unemployed.iob diff --git a/objects/wasteland/dead-1.iob b/objects/wasteland/dead-1.iob new file mode 100644 index 00000000..4898353a Binary files /dev/null and b/objects/wasteland/dead-1.iob differ diff --git a/objects/wasteland/dead-2.iob b/objects/wasteland/dead-2.iob new file mode 100644 index 00000000..3ff72ed7 Binary files /dev/null and b/objects/wasteland/dead-2.iob differ diff --git a/objects/wasteland/dead-3.iob b/objects/wasteland/dead-3.iob new file mode 100644 index 00000000..79c4bc7d Binary files /dev/null and b/objects/wasteland/dead-3.iob differ diff --git a/objects/wasteland/dead-4.iob b/objects/wasteland/dead-4.iob new file mode 100644 index 00000000..9eddd3a0 Binary files /dev/null and b/objects/wasteland/dead-4.iob differ diff --git a/objects/wasteland/dead-5.iob b/objects/wasteland/dead-5.iob new file mode 100644 index 00000000..b4bf92ac Binary files /dev/null and b/objects/wasteland/dead-5.iob differ diff --git a/objects/wasteland/dead-6.iob b/objects/wasteland/dead-6.iob new file mode 100644 index 00000000..36e22119 Binary files /dev/null and b/objects/wasteland/dead-6.iob differ diff --git a/objects/wasteland/stone-1.iob b/objects/wasteland/stone-1.iob new file mode 100644 index 00000000..91c8c6d0 Binary files /dev/null and b/objects/wasteland/stone-1.iob differ diff --git a/objects/wasteland/stone-2.iob b/objects/wasteland/stone-2.iob new file mode 100644 index 00000000..2fc64260 Binary files /dev/null and b/objects/wasteland/stone-2.iob differ diff --git a/objects/wasteland/stone-3.iob b/objects/wasteland/stone-3.iob new file mode 100644 index 00000000..e56e5e51 Binary files /dev/null and b/objects/wasteland/stone-3.iob differ diff --git a/objects/wasteland/stone-4.iob b/objects/wasteland/stone-4.iob new file mode 100644 index 00000000..626ee06b Binary files /dev/null and b/objects/wasteland/stone-4.iob differ diff --git a/objects/clutter/stone-5.iob b/objects/wasteland/stone-5.iob similarity index 100% rename from objects/clutter/stone-5.iob rename to objects/wasteland/stone-5.iob diff --git a/objects/wasteland/stone-6.iob b/objects/wasteland/stone-6.iob new file mode 100644 index 00000000..0d23793d Binary files /dev/null and b/objects/wasteland/stone-6.iob differ diff --git a/objects/wasteland/stone-7.iob b/objects/wasteland/stone-7.iob new file mode 100644 index 00000000..877e71b1 Binary files /dev/null and b/objects/wasteland/stone-7.iob differ diff --git a/objects/trees/spruce/sprucetree-1.iob b/objects/wastelands/sprucetree-1.iob similarity index 100% rename from objects/trees/spruce/sprucetree-1.iob rename to objects/wastelands/sprucetree-1.iob diff --git a/objects/trees/spruce/sprucetree-10.iob b/objects/wastelands/sprucetree-10.iob similarity index 100% rename from objects/trees/spruce/sprucetree-10.iob rename to objects/wastelands/sprucetree-10.iob diff --git a/objects/trees/spruce/sprucetree-11.iob b/objects/wastelands/sprucetree-11.iob similarity index 100% rename from objects/trees/spruce/sprucetree-11.iob rename to objects/wastelands/sprucetree-11.iob diff --git a/objects/trees/spruce/sprucetree-12.iob b/objects/wastelands/sprucetree-12.iob similarity index 100% rename from objects/trees/spruce/sprucetree-12.iob rename to objects/wastelands/sprucetree-12.iob diff --git a/objects/trees/spruce/sprucetree-13.iob b/objects/wastelands/sprucetree-13.iob similarity index 100% rename from objects/trees/spruce/sprucetree-13.iob rename to objects/wastelands/sprucetree-13.iob diff --git a/objects/trees/spruce/sprucetree-14.iob b/objects/wastelands/sprucetree-14.iob similarity index 100% rename from objects/trees/spruce/sprucetree-14.iob rename to objects/wastelands/sprucetree-14.iob diff --git a/objects/trees/spruce/sprucetree-15.iob b/objects/wastelands/sprucetree-15.iob similarity index 100% rename from objects/trees/spruce/sprucetree-15.iob rename to objects/wastelands/sprucetree-15.iob diff --git a/objects/trees/spruce/sprucetree-2.iob b/objects/wastelands/sprucetree-2.iob similarity index 100% rename from objects/trees/spruce/sprucetree-2.iob rename to objects/wastelands/sprucetree-2.iob diff --git a/objects/trees/spruce/sprucetree-3.iob b/objects/wastelands/sprucetree-3.iob similarity index 100% rename from objects/trees/spruce/sprucetree-3.iob rename to objects/wastelands/sprucetree-3.iob diff --git a/objects/trees/spruce/sprucetree-4.iob b/objects/wastelands/sprucetree-4.iob similarity index 100% rename from objects/trees/spruce/sprucetree-4.iob rename to objects/wastelands/sprucetree-4.iob diff --git a/objects/trees/spruce/sprucetree-5.iob b/objects/wastelands/sprucetree-5.iob similarity index 100% rename from objects/trees/spruce/sprucetree-5.iob rename to objects/wastelands/sprucetree-5.iob diff --git a/objects/trees/spruce/sprucetree-6.iob b/objects/wastelands/sprucetree-6.iob similarity index 100% rename from objects/trees/spruce/sprucetree-6.iob rename to objects/wastelands/sprucetree-6.iob diff --git a/objects/trees/spruce/sprucetree-7.iob b/objects/wastelands/sprucetree-7.iob similarity index 100% rename from objects/trees/spruce/sprucetree-7.iob rename to objects/wastelands/sprucetree-7.iob diff --git a/objects/trees/spruce/sprucetree-8.iob b/objects/wastelands/sprucetree-8.iob similarity index 100% rename from objects/trees/spruce/sprucetree-8.iob rename to objects/wastelands/sprucetree-8.iob diff --git a/objects/trees/spruce/sprucetree-9.iob b/objects/wastelands/sprucetree-9.iob similarity index 100% rename from objects/trees/spruce/sprucetree-9.iob rename to objects/wastelands/sprucetree-9.iob diff --git a/objects/trees/darkoak/large-10.iob b/objects/waterlogged-darkwood/large-10.iob similarity index 100% rename from objects/trees/darkoak/large-10.iob rename to objects/waterlogged-darkwood/large-10.iob diff --git a/objects/trees/darkoak/large-3.iob b/objects/waterlogged-darkwood/large-3.iob similarity index 100% rename from objects/trees/darkoak/large-3.iob rename to objects/waterlogged-darkwood/large-3.iob diff --git a/objects/trees/darkoak/medgeneric1.iob b/objects/waterlogged-darkwood/med-1.iob similarity index 100% rename from objects/trees/darkoak/medgeneric1.iob rename to objects/waterlogged-darkwood/med-1.iob diff --git a/objects/trees/darkoak/medgeneric2.iob b/objects/waterlogged-darkwood/med-2.iob similarity index 100% rename from objects/trees/darkoak/medgeneric2.iob rename to objects/waterlogged-darkwood/med-2.iob diff --git a/objects/trees/darkoak/medgeneric3.iob b/objects/waterlogged-darkwood/med-3.iob similarity index 100% rename from objects/trees/darkoak/medgeneric3.iob rename to objects/waterlogged-darkwood/med-3.iob diff --git a/objects/trees/darkoak/medgeneric4.iob b/objects/waterlogged-darkwood/med-4.iob similarity index 100% rename from objects/trees/darkoak/medgeneric4.iob rename to objects/waterlogged-darkwood/med-4.iob diff --git a/objects/trees/darkoak/medgeneric5.iob b/objects/waterlogged-darkwood/med-5.iob similarity index 100% rename from objects/trees/darkoak/medgeneric5.iob rename to objects/waterlogged-darkwood/med-5.iob diff --git a/objects/trees/darkoak/medgeneric6.iob b/objects/waterlogged-darkwood/med-6.iob similarity index 100% rename from objects/trees/darkoak/medgeneric6.iob rename to objects/waterlogged-darkwood/med-6.iob diff --git a/objects/trees/darkoak/medgeneric7.iob b/objects/waterlogged-darkwood/med-7.iob similarity index 100% rename from objects/trees/darkoak/medgeneric7.iob rename to objects/waterlogged-darkwood/med-7.iob diff --git a/objects/trees/darkoak/medgeneric8.iob b/objects/waterlogged-darkwood/med-8.iob similarity index 100% rename from objects/trees/darkoak/medgeneric8.iob rename to objects/waterlogged-darkwood/med-8.iob diff --git a/objects/trees/darkoak/medgeneric9.iob b/objects/waterlogged-darkwood/med-9.iob similarity index 100% rename from objects/trees/darkoak/medgeneric9.iob rename to objects/waterlogged-darkwood/med-9.iob diff --git a/objects/trees/darkoak/smolgeneric16.iob b/objects/waterlogged-darkwood/smol-1.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric16.iob rename to objects/waterlogged-darkwood/smol-1.iob diff --git a/objects/trees/darkoak/smolgeneric17.iob b/objects/waterlogged-darkwood/smol-10.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric17.iob rename to objects/waterlogged-darkwood/smol-10.iob diff --git a/objects/trees/darkoak/smolgeneric18.iob b/objects/waterlogged-darkwood/smol-11.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric18.iob rename to objects/waterlogged-darkwood/smol-11.iob diff --git a/objects/trees/darkoak/smolgeneric19.iob b/objects/waterlogged-darkwood/smol-12.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric19.iob rename to objects/waterlogged-darkwood/smol-12.iob diff --git a/objects/trees/darkoak/smolgeneric20.iob b/objects/waterlogged-darkwood/smol-13.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric20.iob rename to objects/waterlogged-darkwood/smol-13.iob diff --git a/objects/trees/darkoak/smolgeneric21.iob b/objects/waterlogged-darkwood/smol-14.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric21.iob rename to objects/waterlogged-darkwood/smol-14.iob diff --git a/objects/trees/darkoak/smolgeneric22.iob b/objects/waterlogged-darkwood/smol-15.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric22.iob rename to objects/waterlogged-darkwood/smol-15.iob diff --git a/objects/trees/darkoak/smolgeneric23.iob b/objects/waterlogged-darkwood/smol-16.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric23.iob rename to objects/waterlogged-darkwood/smol-16.iob diff --git a/objects/trees/darkoak/smolgeneric24.iob b/objects/waterlogged-darkwood/smol-2.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric24.iob rename to objects/waterlogged-darkwood/smol-2.iob diff --git a/objects/trees/darkoak/smolgeneric25.iob b/objects/waterlogged-darkwood/smol-3.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric25.iob rename to objects/waterlogged-darkwood/smol-3.iob diff --git a/objects/trees/darkoak/smolgeneric26.iob b/objects/waterlogged-darkwood/smol-4.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric26.iob rename to objects/waterlogged-darkwood/smol-4.iob diff --git a/objects/trees/darkoak/smolgeneric27.iob b/objects/waterlogged-darkwood/smol-5.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric27.iob rename to objects/waterlogged-darkwood/smol-5.iob diff --git a/objects/trees/darkoak/smolgeneric28.iob b/objects/waterlogged-darkwood/smol-6.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric28.iob rename to objects/waterlogged-darkwood/smol-6.iob diff --git a/objects/trees/darkoak/smolgeneric29.iob b/objects/waterlogged-darkwood/smol-7.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric29.iob rename to objects/waterlogged-darkwood/smol-7.iob diff --git a/objects/trees/darkoak/smolgeneric30.iob b/objects/waterlogged-darkwood/smol-8.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric30.iob rename to objects/waterlogged-darkwood/smol-8.iob diff --git a/objects/trees/darkoak/smolgeneric31.iob b/objects/waterlogged-darkwood/smol-9.iob similarity index 100% rename from objects/trees/darkoak/smolgeneric31.iob rename to objects/waterlogged-darkwood/smol-9.iob diff --git a/objects/trees/darkoak/smdeadwillow1.iob b/objects/willow-dead-supermassive/dead1.iob similarity index 100% rename from objects/trees/darkoak/smdeadwillow1.iob rename to objects/willow-dead-supermassive/dead1.iob diff --git a/objects/trees/darkoak/smdeadwillow2.iob b/objects/willow-dead-supermassive/dead2.iob similarity index 100% rename from objects/trees/darkoak/smdeadwillow2.iob rename to objects/willow-dead-supermassive/dead2.iob diff --git a/objects/trees/darkoak/smwillow1.iob b/objects/willow-supermassive/willow1.iob similarity index 100% rename from objects/trees/darkoak/smwillow1.iob rename to objects/willow-supermassive/willow1.iob diff --git a/objects/trees/darkoak/smwillow2.iob b/objects/willow-supermassive/willow2.iob similarity index 100% rename from objects/trees/darkoak/smwillow2.iob rename to objects/willow-supermassive/willow2.iob diff --git a/objects/trees/darkoak/smwillow3.iob b/objects/willow-supermassive/willow3.iob similarity index 100% rename from objects/trees/darkoak/smwillow3.iob rename to objects/willow-supermassive/willow3.iob diff --git a/objects/trees/darkoak/smwillow4.iob b/objects/willow-supermassive/willow4.iob similarity index 100% rename from objects/trees/darkoak/smwillow4.iob rename to objects/willow-supermassive/willow4.iob diff --git a/objects/trees/darkoak/willowgeneric1.iob b/objects/willowbutbigger/o1.iob similarity index 100% rename from objects/trees/darkoak/willowgeneric1.iob rename to objects/willowbutbigger/o1.iob diff --git a/objects/trees/darkoak/willowgeneric2.iob b/objects/willowbutbigger/o2.iob similarity index 100% rename from objects/trees/darkoak/willowgeneric2.iob rename to objects/willowbutbigger/o2.iob diff --git a/objects/trees/darkoak/willowbutbigger-1.iob b/objects/willwo/willowbutbigger-1.iob similarity index 100% rename from objects/trees/darkoak/willowbutbigger-1.iob rename to objects/willwo/willowbutbigger-1.iob diff --git a/objects/trees/darkoak/willowbutbigger-2.iob b/objects/willwo/willowbutbigger-2.iob similarity index 100% rename from objects/trees/darkoak/willowbutbigger-2.iob rename to objects/willwo/willowbutbigger-2.iob diff --git a/objects/trees/darkoak/generic1.iob b/objects/willwo/willwo-1.iob similarity index 100% rename from objects/trees/darkoak/generic1.iob rename to objects/willwo/willwo-1.iob diff --git a/objects/trees/darkoak/generic2.iob b/objects/willwo/willwo-10.iob similarity index 100% rename from objects/trees/darkoak/generic2.iob rename to objects/willwo/willwo-10.iob diff --git a/objects/trees/darkoak/generic3.iob b/objects/willwo/willwo-11.iob similarity index 100% rename from objects/trees/darkoak/generic3.iob rename to objects/willwo/willwo-11.iob diff --git a/objects/trees/darkoak/generic4.iob b/objects/willwo/willwo-2.iob similarity index 100% rename from objects/trees/darkoak/generic4.iob rename to objects/willwo/willwo-2.iob diff --git a/objects/trees/darkoak/generic5.iob b/objects/willwo/willwo-3.iob similarity index 100% rename from objects/trees/darkoak/generic5.iob rename to objects/willwo/willwo-3.iob diff --git a/objects/trees/darkoak/generic6.iob b/objects/willwo/willwo-4.iob similarity index 100% rename from objects/trees/darkoak/generic6.iob rename to objects/willwo/willwo-4.iob diff --git a/objects/trees/darkoak/generic7.iob b/objects/willwo/willwo-5.iob similarity index 100% rename from objects/trees/darkoak/generic7.iob rename to objects/willwo/willwo-5.iob diff --git a/objects/trees/darkoak/generic10.iob b/objects/willwo/willwo-6.iob similarity index 100% rename from objects/trees/darkoak/generic10.iob rename to objects/willwo/willwo-6.iob diff --git a/objects/trees/darkoak/generic9.iob b/objects/willwo/willwo-7.iob similarity index 100% rename from objects/trees/darkoak/generic9.iob rename to objects/willwo/willwo-7.iob diff --git a/objects/trees/darkoak/generic8.iob b/objects/willwo/willwo-8.iob similarity index 100% rename from objects/trees/darkoak/generic8.iob rename to objects/willwo/willwo-8.iob diff --git a/objects/trees/darkoak/generic11.iob b/objects/willwo/willwo-9.iob similarity index 100% rename from objects/trees/darkoak/generic11.iob rename to objects/willwo/willwo-9.iob diff --git a/objects/trees/mushroom/froShroom-1.iob b/objects/wonderland/froShroom-1.iob similarity index 100% rename from objects/trees/mushroom/froShroom-1.iob rename to objects/wonderland/froShroom-1.iob diff --git a/objects/trees/mushroom/froShroom-2.iob b/objects/wonderland/froShroom-2.iob similarity index 100% rename from objects/trees/mushroom/froShroom-2.iob rename to objects/wonderland/froShroom-2.iob diff --git a/objects/trees/mushroom/froShroom-3.iob b/objects/wonderland/froShroom-3.iob similarity index 100% rename from objects/trees/mushroom/froShroom-3.iob rename to objects/wonderland/froShroom-3.iob diff --git a/objects/trees/mushroom/froShroom-4.iob b/objects/wonderland/froShroom-4.iob similarity index 100% rename from objects/trees/mushroom/froShroom-4.iob rename to objects/wonderland/froShroom-4.iob diff --git a/objects/trees/mushroom/froShroom-5.iob b/objects/wonderland/froShroom-5.iob similarity index 100% rename from objects/trees/mushroom/froShroom-5.iob rename to objects/wonderland/froShroom-5.iob diff --git a/objects/trees/mushroom/froShroom-6.iob b/objects/wonderland/froShroom-6.iob similarity index 100% rename from objects/trees/mushroom/froShroom-6.iob rename to objects/wonderland/froShroom-6.iob diff --git a/objects/trees/mushroom/froShroom-7.iob b/objects/wonderland/froShroom-7.iob similarity index 100% rename from objects/trees/mushroom/froShroom-7.iob rename to objects/wonderland/froShroom-7.iob diff --git a/objects/trees/mushroom/froShroom-8.iob b/objects/wonderland/froShroom-8.iob similarity index 100% rename from objects/trees/mushroom/froShroom-8.iob rename to objects/wonderland/froShroom-8.iob diff --git a/objects/trees/mushroom/froShroom-9.iob b/objects/wonderland/froShroom-9.iob similarity index 100% rename from objects/trees/mushroom/froShroom-9.iob rename to objects/wonderland/froShroom-9.iob diff --git a/objects/trees/spruce/twirl1.iob b/objects/wonderland/twirlSpruce-1.iob similarity index 100% rename from objects/trees/spruce/twirl1.iob rename to objects/wonderland/twirlSpruce-1.iob diff --git a/objects/trees/spruce/twirl2.iob b/objects/wonderland/twirlSpruce-10.iob similarity index 100% rename from objects/trees/spruce/twirl2.iob rename to objects/wonderland/twirlSpruce-10.iob diff --git a/objects/trees/spruce/twirl3.iob b/objects/wonderland/twirlSpruce-2.iob similarity index 100% rename from objects/trees/spruce/twirl3.iob rename to objects/wonderland/twirlSpruce-2.iob diff --git a/objects/trees/spruce/twirl4.iob b/objects/wonderland/twirlSpruce-3.iob similarity index 100% rename from objects/trees/spruce/twirl4.iob rename to objects/wonderland/twirlSpruce-3.iob diff --git a/objects/trees/spruce/twirl5.iob b/objects/wonderland/twirlSpruce-4.iob similarity index 100% rename from objects/trees/spruce/twirl5.iob rename to objects/wonderland/twirlSpruce-4.iob diff --git a/objects/trees/spruce/twirl6.iob b/objects/wonderland/twirlSpruce-5.iob similarity index 100% rename from objects/trees/spruce/twirl6.iob rename to objects/wonderland/twirlSpruce-5.iob diff --git a/objects/trees/spruce/twirl7.iob b/objects/wonderland/twirlSpruce-6.iob similarity index 100% rename from objects/trees/spruce/twirl7.iob rename to objects/wonderland/twirlSpruce-6.iob diff --git a/objects/trees/spruce/twirl8.iob b/objects/wonderland/twirlSpruce-7.iob similarity index 100% rename from objects/trees/spruce/twirl8.iob rename to objects/wonderland/twirlSpruce-7.iob diff --git a/objects/trees/spruce/twirl9.iob b/objects/wonderland/twirlSpruce-8.iob similarity index 100% rename from objects/trees/spruce/twirl9.iob rename to objects/wonderland/twirlSpruce-8.iob diff --git a/objects/trees/spruce/twirl10.iob b/objects/wonderland/twirlSpruce-9.iob similarity index 100% rename from objects/trees/spruce/twirl10.iob rename to objects/wonderland/twirlSpruce-9.iob diff --git a/objects/wonderland/wonder-1.iob b/objects/wonderland/wonder-1.iob new file mode 100644 index 00000000..e7aee1d9 Binary files /dev/null and b/objects/wonderland/wonder-1.iob differ diff --git a/objects/wonderland/wonder-10.iob b/objects/wonderland/wonder-10.iob new file mode 100644 index 00000000..d92d58a1 Binary files /dev/null and b/objects/wonderland/wonder-10.iob differ diff --git a/objects/wonderland/wonder-2.iob b/objects/wonderland/wonder-2.iob new file mode 100644 index 00000000..3317c878 Binary files /dev/null and b/objects/wonderland/wonder-2.iob differ diff --git a/objects/wonderland/wonder-3.iob b/objects/wonderland/wonder-3.iob new file mode 100644 index 00000000..6b21ccc5 Binary files /dev/null and b/objects/wonderland/wonder-3.iob differ diff --git a/objects/wonderland/wonder-4.iob b/objects/wonderland/wonder-4.iob new file mode 100644 index 00000000..5d31f0b5 Binary files /dev/null and b/objects/wonderland/wonder-4.iob differ diff --git a/objects/wonderland/wonder-5.iob b/objects/wonderland/wonder-5.iob new file mode 100644 index 00000000..31d62b35 Binary files /dev/null and b/objects/wonderland/wonder-5.iob differ diff --git a/objects/wonderland/wonder-6.iob b/objects/wonderland/wonder-6.iob new file mode 100644 index 00000000..ceb1b31f Binary files /dev/null and b/objects/wonderland/wonder-6.iob differ diff --git a/objects/wonderland/wonder-7.iob b/objects/wonderland/wonder-7.iob new file mode 100644 index 00000000..8a23290a Binary files /dev/null and b/objects/wonderland/wonder-7.iob differ diff --git a/objects/wonderland/wonder-8.iob b/objects/wonderland/wonder-8.iob new file mode 100644 index 00000000..e2131382 Binary files /dev/null and b/objects/wonderland/wonder-8.iob differ diff --git a/objects/wonderland/wonder-9.iob b/objects/wonderland/wonder-9.iob new file mode 100644 index 00000000..7306d767 Binary files /dev/null and b/objects/wonderland/wonder-9.iob differ diff --git a/objects/jigsaw/woodland_mansion/1x1/a1.iob b/objects/woodland_mansion/1x1/a1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/a1.iob rename to objects/woodland_mansion/1x1/a1.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/a2.iob b/objects/woodland_mansion/1x1/a2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/a2.iob rename to objects/woodland_mansion/1x1/a2.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/a3.iob b/objects/woodland_mansion/1x1/a3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/a3.iob rename to objects/woodland_mansion/1x1/a3.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/a4.iob b/objects/woodland_mansion/1x1/a4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/a4.iob rename to objects/woodland_mansion/1x1/a4.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/a5.iob b/objects/woodland_mansion/1x1/a5.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/a5.iob rename to objects/woodland_mansion/1x1/a5.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/as1.iob b/objects/woodland_mansion/1x1/as1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/as1.iob rename to objects/woodland_mansion/1x1/as1.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/as2.iob b/objects/woodland_mansion/1x1/as2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/as2.iob rename to objects/woodland_mansion/1x1/as2.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/as3.iob b/objects/woodland_mansion/1x1/as3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/as3.iob rename to objects/woodland_mansion/1x1/as3.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/as4.iob b/objects/woodland_mansion/1x1/as4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/as4.iob rename to objects/woodland_mansion/1x1/as4.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/b1.iob b/objects/woodland_mansion/1x1/b1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/b1.iob rename to objects/woodland_mansion/1x1/b1.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/b2.iob b/objects/woodland_mansion/1x1/b2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/b2.iob rename to objects/woodland_mansion/1x1/b2.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/b3.iob b/objects/woodland_mansion/1x1/b3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/b3.iob rename to objects/woodland_mansion/1x1/b3.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/b4.iob b/objects/woodland_mansion/1x1/b4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/b4.iob rename to objects/woodland_mansion/1x1/b4.iob diff --git a/objects/jigsaw/woodland_mansion/1x1/b5.iob b/objects/woodland_mansion/1x1/b5.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x1/b5.iob rename to objects/woodland_mansion/1x1/b5.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a1.iob b/objects/woodland_mansion/1x2/a1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a1.iob rename to objects/woodland_mansion/1x2/a1.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a2.iob b/objects/woodland_mansion/1x2/a2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a2.iob rename to objects/woodland_mansion/1x2/a2.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a3.iob b/objects/woodland_mansion/1x2/a3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a3.iob rename to objects/woodland_mansion/1x2/a3.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a4.iob b/objects/woodland_mansion/1x2/a4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a4.iob rename to objects/woodland_mansion/1x2/a4.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a5.iob b/objects/woodland_mansion/1x2/a5.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a5.iob rename to objects/woodland_mansion/1x2/a5.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a6.iob b/objects/woodland_mansion/1x2/a6.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a6.iob rename to objects/woodland_mansion/1x2/a6.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a7.iob b/objects/woodland_mansion/1x2/a7.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a7.iob rename to objects/woodland_mansion/1x2/a7.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a8.iob b/objects/woodland_mansion/1x2/a8.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a8.iob rename to objects/woodland_mansion/1x2/a8.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/a9.iob b/objects/woodland_mansion/1x2/a9.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/a9.iob rename to objects/woodland_mansion/1x2/a9.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/b1.iob b/objects/woodland_mansion/1x2/b1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/b1.iob rename to objects/woodland_mansion/1x2/b1.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/b2.iob b/objects/woodland_mansion/1x2/b2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/b2.iob rename to objects/woodland_mansion/1x2/b2.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/b3.iob b/objects/woodland_mansion/1x2/b3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/b3.iob rename to objects/woodland_mansion/1x2/b3.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/b4.iob b/objects/woodland_mansion/1x2/b4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/b4.iob rename to objects/woodland_mansion/1x2/b4.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/b5.iob b/objects/woodland_mansion/1x2/b5.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/b5.iob rename to objects/woodland_mansion/1x2/b5.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/c1.iob b/objects/woodland_mansion/1x2/c1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/c1.iob rename to objects/woodland_mansion/1x2/c1.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/c2.iob b/objects/woodland_mansion/1x2/c2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/c2.iob rename to objects/woodland_mansion/1x2/c2.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/c3.iob b/objects/woodland_mansion/1x2/c3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/c3.iob rename to objects/woodland_mansion/1x2/c3.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/c4.iob b/objects/woodland_mansion/1x2/c4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/c4.iob rename to objects/woodland_mansion/1x2/c4.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/d1.iob b/objects/woodland_mansion/1x2/d1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/d1.iob rename to objects/woodland_mansion/1x2/d1.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/d2.iob b/objects/woodland_mansion/1x2/d2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/d2.iob rename to objects/woodland_mansion/1x2/d2.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/d3.iob b/objects/woodland_mansion/1x2/d3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/d3.iob rename to objects/woodland_mansion/1x2/d3.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/d4.iob b/objects/woodland_mansion/1x2/d4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/d4.iob rename to objects/woodland_mansion/1x2/d4.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/d5.iob b/objects/woodland_mansion/1x2/d5.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/d5.iob rename to objects/woodland_mansion/1x2/d5.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/s1.iob b/objects/woodland_mansion/1x2/s1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/s1.iob rename to objects/woodland_mansion/1x2/s1.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/s2.iob b/objects/woodland_mansion/1x2/s2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/s2.iob rename to objects/woodland_mansion/1x2/s2.iob diff --git a/objects/jigsaw/woodland_mansion/1x2/se1.iob b/objects/woodland_mansion/1x2/se1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/1x2/se1.iob rename to objects/woodland_mansion/1x2/se1.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/a1.iob b/objects/woodland_mansion/2x2/a1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/a1.iob rename to objects/woodland_mansion/2x2/a1.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/a2.iob b/objects/woodland_mansion/2x2/a2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/a2.iob rename to objects/woodland_mansion/2x2/a2.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/a3.iob b/objects/woodland_mansion/2x2/a3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/a3.iob rename to objects/woodland_mansion/2x2/a3.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/a4.iob b/objects/woodland_mansion/2x2/a4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/a4.iob rename to objects/woodland_mansion/2x2/a4.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/b1.iob b/objects/woodland_mansion/2x2/b1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/b1.iob rename to objects/woodland_mansion/2x2/b1.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/b2.iob b/objects/woodland_mansion/2x2/b2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/b2.iob rename to objects/woodland_mansion/2x2/b2.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/b3.iob b/objects/woodland_mansion/2x2/b3.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/b3.iob rename to objects/woodland_mansion/2x2/b3.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/b4.iob b/objects/woodland_mansion/2x2/b4.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/b4.iob rename to objects/woodland_mansion/2x2/b4.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/b5.iob b/objects/woodland_mansion/2x2/b5.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/b5.iob rename to objects/woodland_mansion/2x2/b5.iob diff --git a/objects/jigsaw/woodland_mansion/2x2/s1.iob b/objects/woodland_mansion/2x2/s1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/2x2/s1.iob rename to objects/woodland_mansion/2x2/s1.iob diff --git a/objects/jigsaw/woodland_mansion/main/a1.iob b/objects/woodland_mansion/main/a1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/main/a1.iob rename to objects/woodland_mansion/main/a1.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/carpet_east.iob b/objects/woodland_mansion/oldstuff/carpet_east.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/carpet_east.iob rename to objects/woodland_mansion/oldstuff/carpet_east.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/carpet_north.iob b/objects/woodland_mansion/oldstuff/carpet_north.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/carpet_north.iob rename to objects/woodland_mansion/oldstuff/carpet_north.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/carpet_south_1.iob b/objects/woodland_mansion/oldstuff/carpet_south_1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/carpet_south_1.iob rename to objects/woodland_mansion/oldstuff/carpet_south_1.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/carpet_south_2.iob b/objects/woodland_mansion/oldstuff/carpet_south_2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/carpet_south_2.iob rename to objects/woodland_mansion/oldstuff/carpet_south_2.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/carpet_west_1.iob b/objects/woodland_mansion/oldstuff/carpet_west_1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/carpet_west_1.iob rename to objects/woodland_mansion/oldstuff/carpet_west_1.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/carpet_west_2.iob b/objects/woodland_mansion/oldstuff/carpet_west_2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/carpet_west_2.iob rename to objects/woodland_mansion/oldstuff/carpet_west_2.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/corridor_floor.iob b/objects/woodland_mansion/oldstuff/corridor_floor.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/corridor_floor.iob rename to objects/woodland_mansion/oldstuff/corridor_floor.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/entrance.iob b/objects/woodland_mansion/oldstuff/entrance.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/entrance.iob rename to objects/woodland_mansion/oldstuff/entrance.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/indoors_door_1.iob b/objects/woodland_mansion/oldstuff/indoors_door_1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/indoors_door_1.iob rename to objects/woodland_mansion/oldstuff/indoors_door_1.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/indoors_door_2.iob b/objects/woodland_mansion/oldstuff/indoors_door_2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/indoors_door_2.iob rename to objects/woodland_mansion/oldstuff/indoors_door_2.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/indoors_wall_1.iob b/objects/woodland_mansion/oldstuff/indoors_wall_1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/indoors_wall_1.iob rename to objects/woodland_mansion/oldstuff/indoors_wall_1.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/indoors_wall_2.iob b/objects/woodland_mansion/oldstuff/indoors_wall_2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/indoors_wall_2.iob rename to objects/woodland_mansion/oldstuff/indoors_wall_2.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/roof.iob b/objects/woodland_mansion/oldstuff/roof.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/roof.iob rename to objects/woodland_mansion/oldstuff/roof.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/roof_corner.iob b/objects/woodland_mansion/oldstuff/roof_corner.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/roof_corner.iob rename to objects/woodland_mansion/oldstuff/roof_corner.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/roof_front.iob b/objects/woodland_mansion/oldstuff/roof_front.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/roof_front.iob rename to objects/woodland_mansion/oldstuff/roof_front.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/roof_inner_corner.iob b/objects/woodland_mansion/oldstuff/roof_inner_corner.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/roof_inner_corner.iob rename to objects/woodland_mansion/oldstuff/roof_inner_corner.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/small_wall.iob b/objects/woodland_mansion/oldstuff/small_wall.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/small_wall.iob rename to objects/woodland_mansion/oldstuff/small_wall.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/small_wall_corner.iob b/objects/woodland_mansion/oldstuff/small_wall_corner.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/small_wall_corner.iob rename to objects/woodland_mansion/oldstuff/small_wall_corner.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/wall_corner.iob b/objects/woodland_mansion/oldstuff/wall_corner.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/wall_corner.iob rename to objects/woodland_mansion/oldstuff/wall_corner.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/wall_flat.iob b/objects/woodland_mansion/oldstuff/wall_flat.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/wall_flat.iob rename to objects/woodland_mansion/oldstuff/wall_flat.iob diff --git a/objects/jigsaw/woodland_mansion/oldstuff/wall_window.iob b/objects/woodland_mansion/oldstuff/wall_window.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/oldstuff/wall_window.iob rename to objects/woodland_mansion/oldstuff/wall_window.iob diff --git a/objects/jigsaw/woodland_mansion/path/path_1.iob b/objects/woodland_mansion/path/path_1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/path/path_1.iob rename to objects/woodland_mansion/path/path_1.iob diff --git a/objects/jigsaw/woodland_mansion/path/path_2.iob b/objects/woodland_mansion/path/path_2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/path/path_2.iob rename to objects/woodland_mansion/path/path_2.iob diff --git a/objects/jigsaw/woodland_mansion/path_2/path_1.iob b/objects/woodland_mansion/path_2/path_1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/path_2/path_1.iob rename to objects/woodland_mansion/path_2/path_1.iob diff --git a/objects/jigsaw/woodland_mansion/path_2/path_2.iob b/objects/woodland_mansion/path_2/path_2.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/path_2/path_2.iob rename to objects/woodland_mansion/path_2/path_2.iob diff --git a/objects/jigsaw/woodland_mansion/roof/roof_1.iob b/objects/woodland_mansion/roof/roof_1.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/roof/roof_1.iob rename to objects/woodland_mansion/roof/roof_1.iob diff --git a/objects/jigsaw/woodland_mansion/stairs/stairs_left.iob b/objects/woodland_mansion/stairs/stairs_left.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/stairs/stairs_left.iob rename to objects/woodland_mansion/stairs/stairs_left.iob diff --git a/objects/jigsaw/woodland_mansion/stairs/stairs_right.iob b/objects/woodland_mansion/stairs/stairs_right.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/stairs/stairs_right.iob rename to objects/woodland_mansion/stairs/stairs_right.iob diff --git a/objects/jigsaw/woodland_mansion/stairs/stairs_straight.iob b/objects/woodland_mansion/stairs/stairs_straight.iob similarity index 100% rename from objects/jigsaw/woodland_mansion/stairs/stairs_straight.iob rename to objects/woodland_mansion/stairs/stairs_straight.iob diff --git a/objects/trees/sproak/sp1.iob b/objects/wwland/DoSp-1.iob similarity index 100% rename from objects/trees/sproak/sp1.iob rename to objects/wwland/DoSp-1.iob diff --git a/objects/trees/sproak/sp2.iob b/objects/wwland/DoSp-2.iob similarity index 100% rename from objects/trees/sproak/sp2.iob rename to objects/wwland/DoSp-2.iob diff --git a/objects/trees/sproak/sp3.iob b/objects/wwland/DoSp-3.iob similarity index 100% rename from objects/trees/sproak/sp3.iob rename to objects/wwland/DoSp-3.iob diff --git a/objects/trees/sproak/sp4.iob b/objects/wwland/DoSp-4.iob similarity index 100% rename from objects/trees/sproak/sp4.iob rename to objects/wwland/DoSp-4.iob diff --git a/objects/trees/sproak/sp5.iob b/objects/wwland/DoSp-5.iob similarity index 100% rename from objects/trees/sproak/sp5.iob rename to objects/wwland/DoSp-5.iob diff --git a/objects/trees/sproak/sp6.iob b/objects/wwland/DoSp-6.iob similarity index 100% rename from objects/trees/sproak/sp6.iob rename to objects/wwland/DoSp-6.iob diff --git a/objects/trees/sproak/msapling1.iob b/objects/wwland/DoSp-sapling-10.iob similarity index 100% rename from objects/trees/sproak/msapling1.iob rename to objects/wwland/DoSp-sapling-10.iob diff --git a/objects/trees/sproak/msapling2.iob b/objects/wwland/DoSp-sapling-2.iob similarity index 100% rename from objects/trees/sproak/msapling2.iob rename to objects/wwland/DoSp-sapling-2.iob diff --git a/objects/trees/sproak/msapling3.iob b/objects/wwland/DoSp-sapling-3.iob similarity index 100% rename from objects/trees/sproak/msapling3.iob rename to objects/wwland/DoSp-sapling-3.iob diff --git a/objects/trees/sproak/msapling4.iob b/objects/wwland/DoSp-sapling-4.iob similarity index 100% rename from objects/trees/sproak/msapling4.iob rename to objects/wwland/DoSp-sapling-4.iob diff --git a/objects/trees/sproak/msapling5.iob b/objects/wwland/DoSp-sapling-5.iob similarity index 100% rename from objects/trees/sproak/msapling5.iob rename to objects/wwland/DoSp-sapling-5.iob diff --git a/objects/trees/sproak/msapling6.iob b/objects/wwland/DoSp-sapling-6.iob similarity index 100% rename from objects/trees/sproak/msapling6.iob rename to objects/wwland/DoSp-sapling-6.iob diff --git a/objects/trees/sproak/msapling7.iob b/objects/wwland/DoSp-sapling-7.iob similarity index 100% rename from objects/trees/sproak/msapling7.iob rename to objects/wwland/DoSp-sapling-7.iob diff --git a/objects/trees/sproak/msapling8.iob b/objects/wwland/DoSp-sapling-8.iob similarity index 100% rename from objects/trees/sproak/msapling8.iob rename to objects/wwland/DoSp-sapling-8.iob diff --git a/objects/trees/sproak/msapling9.iob b/objects/wwland/DoSp-sapling-9.iob similarity index 100% rename from objects/trees/sproak/msapling9.iob rename to objects/wwland/DoSp-sapling-9.iob diff --git a/objects/trees/sproak/msapling10.iob b/objects/wwland/DoSp-sapling.iob similarity index 100% rename from objects/trees/sproak/msapling10.iob rename to objects/wwland/DoSp-sapling.iob diff --git a/objects/structures/BarcoPirataGriffer.iob b/objects/zzz/BarcoPirataGriffer.iob similarity index 100% rename from objects/structures/BarcoPirataGriffer.iob rename to objects/zzz/BarcoPirataGriffer.iob diff --git a/objects/structures/FT_1.iob b/objects/zzz/FT_1.iob similarity index 100% rename from objects/structures/FT_1.iob rename to objects/zzz/FT_1.iob diff --git a/objects/zzz/cave1.iob b/objects/zzz/cave1.iob new file mode 100644 index 00000000..4c4763ce Binary files /dev/null and b/objects/zzz/cave1.iob differ diff --git a/objects/zzz/cave2.iob b/objects/zzz/cave2.iob new file mode 100644 index 00000000..f9ee54f3 Binary files /dev/null and b/objects/zzz/cave2.iob differ diff --git a/objects/zzz/grass.iob b/objects/zzz/grass.iob new file mode 100644 index 00000000..7c3a0c0f Binary files /dev/null and b/objects/zzz/grass.iob differ diff --git a/objects/jigsaw/mansion/grid.iob b/objects/zzz/grid.iob similarity index 100% rename from objects/jigsaw/mansion/grid.iob rename to objects/zzz/grid.iob diff --git a/objects/jigsaw/mansion/mansion_roof.iob b/objects/zzz/mansion_roof.iob similarity index 100% rename from objects/jigsaw/mansion/mansion_roof.iob rename to objects/zzz/mansion_roof.iob diff --git a/objects/jigsaw/mansion/mansion_vanilla_1.iob b/objects/zzz/mansion_vanilla_1.iob similarity index 100% rename from objects/jigsaw/mansion/mansion_vanilla_1.iob rename to objects/zzz/mansion_vanilla_1.iob diff --git a/objects/jigsaw/mansion/mansion_vanilla_2.iob b/objects/zzz/mansion_vanilla_2.iob similarity index 100% rename from objects/jigsaw/mansion/mansion_vanilla_2.iob rename to objects/zzz/mansion_vanilla_2.iob diff --git a/objects/jigsaw/mansion/mansion_vanilla_3.iob b/objects/zzz/mansion_vanilla_3.iob similarity index 100% rename from objects/jigsaw/mansion/mansion_vanilla_3.iob rename to objects/zzz/mansion_vanilla_3.iob diff --git a/regions/frozen.json b/regions/frozen.json index edc3990d..ece8e33f 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -38,38 +38,6 @@ "zoom": 5 } }, - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "polar-bear", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 20 - } - ], "deposits": [ { "minHeight": 8, diff --git a/regions/hot.json b/regions/hot.json index 60cc5082..e84c35ba 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -8,13 +8,7 @@ "hot/sav-savanna", "hot/sav-forest", "hot/sav-plateau", - "hot/sav-acacia-denmyre", - "hot/msa-plateau", - "hot/msa-valleys", - "hot/msa-plateau-high", - "hot/msa-valleys", - "hot/msa-mesa", - "hot/msa-cliffs" + "hot/sav-acacia-denmyre" ], "shoreBiomes": ["hot/hot-beach"], "seaBiomes": ["ocean/oce-hot-ocean"], @@ -31,37 +25,6 @@ "zoom": 5 } }, - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 12 - }, - { - "entity": "donkey", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 50 - }, - { - "entity": "mule", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 50 - },{ - "entity": "rabbit", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 20 - }, - { - "entity": "wanderingtrader", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 190 - } - ], "spotBiomes": [{ "biome": "hot/hot-oasis", "scale": 5, diff --git a/regions/mesa.json b/regions/mesa.json new file mode 100644 index 00000000..49fbdde6 --- /dev/null +++ b/regions/mesa.json @@ -0,0 +1,130 @@ +{ + "name": "Mesa", + "color": "#E79200", + "landBiomes": [ + "mesa/msa-plateau", + "mesa/msa-valleys", + "mesa/msa-plateau-high", + "mesa/msa-valleys", + "mesa/msa-mesa", + "mesa/msa-cliffs" + ], + "shoreBiomes": ["mesa/msa-beach"], + "seaBiomes": ["ocean/oce-hot-river"], + "jigsawStructures": [{ + "structure": "murky_stronghold", + "rarity": 750 + }], + "caveBiomes": [ + "cave/old-cavern", + "cave/sandy-cave", + "cave/sandy-red-cave" + ], + "riverBiomes": ["ocean/oce-hot-river"], + "spotBiomes": [{ + "biome": "ocean/oce-hot-ocean", + "scale": 25, + "type": "SEA", + "shuffle": 328, + "rarity": 15 + }], + "biomeImplosionRatio": 0.75, + "riverStyle": { + "style": "VASCULAR", + "zoom": 4.77, + "fracture": { + "multiplier": 240, + "style": "IRIS", + "zoom": 5 + } + }, + "objects": [{ + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 5 + }, + "chance": 0.05, + "bottom": true, + "density": 1, + "place": [ + "amethyst/ame1", + "amethyst/ame2", + "amethyst/ame3", + "amethyst/ame4", + "amethyst/ame5", + "amethyst/ame6" + ], + "edit": [{ + "find": [{"block": "glass"}], + "replace": {"palette": [{"block": "void_air"}]} + }], + "enabled": true, + "xAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "yAxis": { + "interval": 90, + "max": 360, + "min": 0 + }, + "translate": { + "yRandom": 10, + "y": 2 + } + }], + "deposits": [ + { + "minHeight": 25, + "maxPerChunk": 9, + "maxHeight": 50, + "minPerChunk": 3, + "minSize": 3, + "maxSize": 4, + "palette": [{"block": "gold_ore"}], + "varience": 5 + }, + { + "minHeight": 15, + "maxPerChunk": 4, + "maxHeight": 35, + "minPerChunk": 2, + "minSize": 3, + "maxSize": 5, + "palette": [{"block": "lapis_ore"}], + "varience": 5 + }, + { + "minHeight": 8, + "maxPerChunk": 12, + "maxHeight": 57, + "minPerChunk": 7, + "minSize": 12, + "maxSize": 22, + "palette": [{"block": "blackstone"}], + "varience": 4 + } + ], + "loot": { + "mode": "ADD", + "multiplier": 1, + "tables": [ + "global-clutter", + "global-tools", + "hot-treasure", + "hot-food" + ] + }, + "riverRarity": 1, + "landBiomeZoom": 1.5, + "shoreHeightMin": 4, + "shoreHeightMax": 6, + "shoreHeightZoom": 1.14, + "riverThickness": 0.006, + "rarity": 4 +} diff --git a/regions/mushroom.json b/regions/mushroom.json index ab9740ef..323d9147 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -123,19 +123,6 @@ "interval": 60000, "soundDistance": 3 } - ], - "entityInitialSpawns": [ - { - "entity": "mooshroom", - "maxSpawns": 4, - "minSpawns": 1, - "rarity": 12 - }, - { - "entity": "cow", - "maxSpawns": 2, - "rarity": 20 - } ], "shoreHeightMin": 3.2, "shoreHeightMax": 6.2, diff --git a/regions/ocean.json b/regions/ocean.json index a2b1672d..d5874c5c 100644 --- a/regions/ocean.json +++ b/regions/ocean.json @@ -25,18 +25,6 @@ "ocean-clutter", "tropical-treasure" ]}, - "entityInitialSpawns": [ - { - "entity": "glowsquid", - "maxSpawns": 2, - "rarity": 40 - }, - { - "entity": "drowned", - "maxSpawns": 2, - "rarity": 45 - } - ], "rarity": 3, "effects": [ { diff --git a/regions/swamp.json b/regions/swamp.json index fbdb2640..1d26392c 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -30,38 +30,6 @@ "zoom": 5 } }, - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 16 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 16 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 8 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 12 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 28 - } - ], "biomeImplosionRatio": 0.26, "deposits": [ { diff --git a/regions/temperate.json b/regions/temperate.json index eefd4ed0..ebd6d4e0 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -31,68 +31,6 @@ "structure": "murky_stronghold", "rarity": 750 }], - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 0, - "rarity": 18 - }, - { - "entity": "goat", - "maxSpawns": 2, - "minSpawns": 0, - "rarity": 38 - }, - { - "entity": "horse", - "maxSpawns": 3, - "minSpawns": 0, - "rarity": 60 - }, - { - "entity": "llama", - "maxSpawns": 3, - "minSpawns": 0, - "rarity": 65 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 0, - "rarity": 40 - }, - { - "entity": "bee", - "maxSpawns": 1, - "minSpawns": 0, - "rarity": 30 - } - ], "shoreRatio": 0.1, "shoreBiomeZoom": 0.15, "biomeImplosionRatio": 0.7, diff --git a/regions/tropical.json b/regions/tropical.json index f237fd69..d05a2310 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -5,24 +5,26 @@ "tropical/tro-rainforest", "tropical/tro-plains", "tropical/tro-bamboo-forest", + "tropical/tro-plains", "tropical/tro-rainforest-wicked", + "tropical/tro-wilds", "tropical/tro-volcanic-plains", - "tropical/tro-mountain", "tropical/tro-mountain-extreme", - "tropical/tro-mountain-plains", + "tropical/tro-mountain", + "tropical/tro-plains", + "tropical/tro-mountain", + "tropical/tro-plains", + "tropical/tro-mountain-extreme", "tropical/tro-wilds", "tropical/tro-plains-hills" ], "shoreBiomes": [ "tropical/tro-island-beach", "tropical/tro-beach", - "tropical/tro-submerged-volcanic", "tropical/tro-beach-bamboo" ], "seaBiomes": [ - "tropical/tro-submerged-volcanic", "ocean/oce-tro-ocean", - "tropical/tro-rainforest-island", "ocean/oce-tro-river-soft" ], "caveBiomes": [ @@ -40,74 +42,6 @@ "zoom": 5 } }, - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 39 - }, - { - "entity": "ocelot", - "maxSpawns": 2, - "minSpawns": 0, - "rarity": 10 - }, - { - "entity": "parrot", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 15 - }, - { - "entity": "turtle", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 80 - }, - { - "entity": "panda", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 40 - }, - { - "entity": "pandaUwU", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 150 - }, - { - "entity": "aeternum", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 200 - } - ], "jigsawStructures": [{ "structure": "murky_stronghold", "rarity": 750 diff --git a/regions/tundra.json b/regions/tundra.json index 8ce4c837..b6936214 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -29,44 +29,6 @@ "caveBiomes": [ "cave/tundra-cavern", "cave/spiked-cavern" - ], - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 29 - }, - { - "entity": "polar-bear", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 20 - } ], "riverBiomes": ["ocean/oce-tun-river"], "biomeImplosionRatio": 0.25,