diff --git a/biomes/frozen/fzn-beach.json b/biomes/frozen/fzn-beach.json index 9c4869b4..f0184232 100644 --- a/biomes/frozen/fzn-beach.json +++ b/biomes/frozen/fzn-beach.json @@ -26,6 +26,7 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", + "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -41,12 +42,6 @@ "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 1be92ee0..1ec21e5a 100644 --- a/biomes/frozen/fzn-hills.json +++ b/biomes/frozen/fzn-hills.json @@ -35,6 +35,7 @@ "id": "fznhills", "waterColor": "#216FC4", "downfallType": "snow", + "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", @@ -148,11 +149,5 @@ "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 c19454d1..73754b99 100644 --- a/biomes/frozen/fzn-mountain-cliffs.json +++ b/biomes/frozen/fzn-mountain-cliffs.json @@ -36,6 +36,7 @@ "customDerivitives": [{ "id": "fznmountaincliff", "downfallType": "snow", + "temperature": -3, "waterColor": "#216FC4", "fogColor": "#B8D0E1", "waterFogColor": "#216FC4", @@ -248,20 +249,7 @@ } ] }], - "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 9ed52341..f61381b3 100644 --- a/biomes/frozen/fzn-mountain-middle.json +++ b/biomes/frozen/fzn-mountain-middle.json @@ -21,6 +21,7 @@ "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 952e5037..83f828e0 100644 --- a/biomes/frozen/fzn-mountain.json +++ b/biomes/frozen/fzn-mountain.json @@ -13,6 +13,7 @@ "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 c20b2607..717e0ac9 100644 --- a/biomes/frozen/fzn-mountains.json +++ b/biomes/frozen/fzn-mountains.json @@ -12,6 +12,7 @@ "id": "fznmountains", "waterColor": "#216FC4", "downfallType": "snow", + "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", @@ -199,20 +200,6 @@ } } ], - "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 2344ba24..8c8dad04 100644 --- a/biomes/frozen/fzn-peak.json +++ b/biomes/frozen/fzn-peak.json @@ -8,6 +8,7 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", + "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -180,20 +181,6 @@ } } ], - "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 c5b4f25b..8164de53 100644 --- a/biomes/frozen/fzn-pine-hills.json +++ b/biomes/frozen/fzn-pine-hills.json @@ -34,6 +34,7 @@ "customDerivitives": [{ "id": "fznpinehills", "downfallType": "snow", + "temperature": -3, "waterColor": "#216FC4", "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", @@ -111,11 +112,5 @@ "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 b996cecf..6d1587ae 100644 --- a/biomes/frozen/fzn-pine-plains.json +++ b/biomes/frozen/fzn-pine-plains.json @@ -22,6 +22,7 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", + "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -120,11 +121,5 @@ "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 527a8c3b..33c7a454 100644 --- a/biomes/frozen/fzn-pines.json +++ b/biomes/frozen/fzn-pines.json @@ -40,6 +40,7 @@ "id": "fznpines", "waterColor": "#216FC4", "downfallType": "snow", + "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", @@ -188,20 +189,6 @@ {"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 ee79a741..b5d99c37 100644 --- a/biomes/frozen/fzn-plains.json +++ b/biomes/frozen/fzn-plains.json @@ -23,6 +23,7 @@ "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "downfallType": "snow", + "temperature": -3, "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" }], @@ -264,25 +265,6 @@ "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 8ac57268..82566ab8 100644 --- a/biomes/frozen/fzn-redwood-forest.json +++ b/biomes/frozen/fzn-redwood-forest.json @@ -21,6 +21,7 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", + "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -179,20 +180,6 @@ } } ], - "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 401d696f..63d78497 100644 --- a/biomes/frozen/fzn-spruce-hills.json +++ b/biomes/frozen/fzn-spruce-hills.json @@ -36,6 +36,7 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", + "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" @@ -107,11 +108,5 @@ "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 9fa9a63f..dc585c16 100644 --- a/biomes/frozen/fzn-spruce-plains.json +++ b/biomes/frozen/fzn-spruce-plains.json @@ -37,6 +37,7 @@ "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "downfallType": "snow", + "temperature": -3, "fogColor": "#A6D1FF", "grassColor": "#D0E1FF" }], @@ -115,11 +116,5 @@ "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 c723a61d..459ea0de 100644 --- a/biomes/frozen/fzn-vander.json +++ b/biomes/frozen/fzn-vander.json @@ -36,6 +36,7 @@ "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "downfallType": "snow", + "temperature": -3, "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" }], @@ -228,20 +229,6 @@ } } ], - "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/mesa/msa-beach.json b/biomes/hot/msa-beach.json similarity index 100% rename from biomes/mesa/msa-beach.json rename to biomes/hot/msa-beach.json diff --git a/biomes/mesa/msa-blue.json b/biomes/hot/msa-blue.json similarity index 92% rename from biomes/mesa/msa-blue.json rename to biomes/hot/msa-blue.json index edcf379c..e6676414 100644 --- a/biomes/mesa/msa-blue.json +++ b/biomes/hot/msa-blue.json @@ -120,20 +120,7 @@ "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/mesa/msa-cliffs.json b/biomes/hot/msa-cliffs.json similarity index 89% rename from biomes/mesa/msa-cliffs.json rename to biomes/hot/msa-cliffs.json index 846b5b7a..d0a246e7 100644 --- a/biomes/mesa/msa-cliffs.json +++ b/biomes/hot/msa-cliffs.json @@ -87,20 +87,7 @@ "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/mesa/msa-dark.json b/biomes/hot/msa-dark.json similarity index 91% rename from biomes/mesa/msa-dark.json rename to biomes/hot/msa-dark.json index 839bfccc..670a81c1 100644 --- a/biomes/mesa/msa-dark.json +++ b/biomes/hot/msa-dark.json @@ -5,10 +5,10 @@ "derivative": "SHATTERED_SAVANNA", "vanillaDerivative": "ERODED_BADLANDS", "children": [ - "mesa/msa-cliffs", - "mesa/msa-red", - "mesa/msa-green", - "mesa/msa-blue" + "hot/msa-cliffs", + "hot/msa-red", + "hot/msa-green", + "hot/msa-blue" ], "generators": [ { @@ -138,20 +138,7 @@ "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/mesa/msa-green.json b/biomes/hot/msa-green.json similarity index 92% rename from biomes/mesa/msa-green.json rename to biomes/hot/msa-green.json index df5879bd..a6d52031 100644 --- a/biomes/mesa/msa-green.json +++ b/biomes/hot/msa-green.json @@ -120,20 +120,7 @@ "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/mesa/msa-mesa.json b/biomes/hot/msa-mesa.json similarity index 95% rename from biomes/mesa/msa-mesa.json rename to biomes/hot/msa-mesa.json index e961b17a..e40211e6 100644 --- a/biomes/mesa/msa-mesa.json +++ b/biomes/hot/msa-mesa.json @@ -10,14 +10,14 @@ "ERODED_BADLANDS" ], "children": [ - "mesa/msa-valleys", - "mesa/msa-red", - "mesa/msa-blue", - "mesa/msa-dark", - "mesa/msa-green", - "mesa/msa-red", - "mesa/msa-yellow", - "mesa/msa-blue" + "hot/msa-valleys", + "hot/msa-red", + "hot/msa-blue", + "hot/msa-dark", + "hot/msa-green", + "hot/msa-red", + "hot/msa-yellow", + "hot/msa-blue" ], "generators": [{ "min": 25, diff --git a/biomes/mesa/msa-plateau-dirt-high.json b/biomes/hot/msa-plateau-dirt-high.json similarity index 100% rename from biomes/mesa/msa-plateau-dirt-high.json rename to biomes/hot/msa-plateau-dirt-high.json diff --git a/biomes/mesa/msa-plateau-dirt.json b/biomes/hot/msa-plateau-dirt.json similarity index 83% rename from biomes/mesa/msa-plateau-dirt.json rename to biomes/hot/msa-plateau-dirt.json index 20c78a05..01076e02 100644 --- a/biomes/mesa/msa-plateau-dirt.json +++ b/biomes/hot/msa-plateau-dirt.json @@ -72,32 +72,6 @@ }], "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/mesa/msa-plateau-high.json b/biomes/hot/msa-plateau-high.json similarity index 98% rename from biomes/mesa/msa-plateau-high.json rename to biomes/hot/msa-plateau-high.json index 9d626589..eea354e2 100644 --- a/biomes/mesa/msa-plateau-high.json +++ b/biomes/hot/msa-plateau-high.json @@ -9,7 +9,7 @@ "BADLANDS_PLATEAU", "ERODED_BADLANDS" ], - "children": ["mesa/msa-plateau-dirt-high"], + "children": ["hot/msa-plateau-dirt-high"], "generators": [ { "min": 55, diff --git a/biomes/mesa/msa-plateau.json b/biomes/hot/msa-plateau.json similarity index 99% rename from biomes/mesa/msa-plateau.json rename to biomes/hot/msa-plateau.json index 97ce71fb..ec3cb1a9 100644 --- a/biomes/mesa/msa-plateau.json +++ b/biomes/hot/msa-plateau.json @@ -9,7 +9,7 @@ "BADLANDS_PLATEAU", "ERODED_BADLANDS" ], - "children": ["mesa/msa-plateau-dirt"], + "children": ["hot/msa-plateau-dirt"], "generators": [ { "min": 35, diff --git a/biomes/mesa/msa-red.json b/biomes/hot/msa-red.json similarity index 93% rename from biomes/mesa/msa-red.json rename to biomes/hot/msa-red.json index f2aab863..2addba46 100644 --- a/biomes/mesa/msa-red.json +++ b/biomes/hot/msa-red.json @@ -126,20 +126,7 @@ "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/mesa/msa-valleys.json b/biomes/hot/msa-valleys.json similarity index 93% rename from biomes/mesa/msa-valleys.json rename to biomes/hot/msa-valleys.json index d61d67c9..4305b681 100644 --- a/biomes/mesa/msa-valleys.json +++ b/biomes/hot/msa-valleys.json @@ -107,32 +107,6 @@ "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/mesa/msa-yellow.json b/biomes/hot/msa-yellow.json similarity index 90% rename from biomes/mesa/msa-yellow.json rename to biomes/hot/msa-yellow.json index 331b55bb..91449252 100644 --- a/biomes/mesa/msa-yellow.json +++ b/biomes/hot/msa-yellow.json @@ -4,7 +4,7 @@ "rarity": 1, "color": "#BDBF05", "vanillaDerivative": "BADLANDS", - "children": ["mesa/msa-dark"], + "children": ["hot/msa-dark"], "generators": [ { "min": 9, @@ -100,20 +100,7 @@ "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/hot/sav-acacia-denmyre.json b/biomes/hot/sav-acacia-denmyre.json index df139160..8bce2e5e 100644 --- a/biomes/hot/sav-acacia-denmyre.json +++ b/biomes/hot/sav-acacia-denmyre.json @@ -149,20 +149,7 @@ "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 38010ce2..09182ab8 100644 --- a/biomes/hot/sav-beach.json +++ b/biomes/hot/sav-beach.json @@ -41,32 +41,6 @@ ] } ], - "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 5e26a902..df8b9175 100644 --- a/biomes/hot/sav-cliff.json +++ b/biomes/hot/sav-cliff.json @@ -103,20 +103,7 @@ "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 d8946798..daacb798 100644 --- a/biomes/hot/sav-forest.json +++ b/biomes/hot/sav-forest.json @@ -257,20 +257,7 @@ } } ], - "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 0a55e2ae..5e6c5103 100644 --- a/biomes/hot/sav-plateau.json +++ b/biomes/hot/sav-plateau.json @@ -67,20 +67,7 @@ "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 caf1d4d7..0e407124 100644 --- a/biomes/hot/sav-savanna.json +++ b/biomes/hot/sav-savanna.json @@ -75,20 +75,7 @@ "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/mountain/mtn-forest-hills.json b/biomes/mountain/mtn-forest-hills.json index 8cd332a5..95c8961c 100644 --- a/biomes/mountain/mtn-forest-hills.json +++ b/biomes/mountain/mtn-forest-hills.json @@ -74,26 +74,7 @@ "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 2fdfd5ae..e6a7d447 100644 --- a/biomes/mountain/mtn-forest.json +++ b/biomes/mountain/mtn-forest.json @@ -74,26 +74,6 @@ "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 13f2cf46..d6722440 100644 --- a/biomes/mountain/mtn-hills.json +++ b/biomes/mountain/mtn-hills.json @@ -145,32 +145,6 @@ }] } ], - "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 e98f0355..c997bec1 100644 --- a/biomes/mountain/mtn-plains.json +++ b/biomes/mountain/mtn-plains.json @@ -152,32 +152,7 @@ }] } ], - "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 dab1ac94..f4cbdf65 100644 --- a/biomes/mushroom/mus-forest-hills.json +++ b/biomes/mushroom/mus-forest-hills.json @@ -90,12 +90,7 @@ ] } ], - "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 bf368620..4843dc02 100644 --- a/biomes/mushroom/mus-forest.json +++ b/biomes/mushroom/mus-forest.json @@ -91,12 +91,6 @@ "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 d5fd765a..372b9e61 100644 --- a/biomes/mushroom/mus-plains.json +++ b/biomes/mushroom/mus-plains.json @@ -55,12 +55,7 @@ "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 78dbb2bf..a97d649b 100644 --- a/biomes/ocean/oce-mtn-lake.json +++ b/biomes/ocean/oce-mtn-lake.json @@ -130,32 +130,7 @@ }] } ], - "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 8708408f..861df01c 100644 --- a/biomes/ocean/oce-mus-lake.json +++ b/biomes/ocean/oce-mus-lake.json @@ -43,12 +43,7 @@ "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 feffb30b..29c6cbf4 100644 --- a/biomes/swamp/swa-beach.json +++ b/biomes/swamp/swa-beach.json @@ -77,20 +77,7 @@ "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 398898c8..97e29f6a 100644 --- a/biomes/swamp/swa-denmyre.json +++ b/biomes/swamp/swa-denmyre.json @@ -239,20 +239,7 @@ } } ], - "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 66961539..44043283 100644 --- a/biomes/swamp/swa-lake.json +++ b/biomes/swamp/swa-lake.json @@ -78,20 +78,7 @@ "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 be7473bb..8a5d2dfa 100644 --- a/biomes/swamp/swa-marsh-rotten.json +++ b/biomes/swamp/swa-marsh-rotten.json @@ -5,10 +5,23 @@ "derivative": "SWAMP_HILLS", "vanillaDerivative": "SWAMP", "generators": [{ - "min": 7, - "max": 3, - "generator": "mountain" + "min": -5, + "max": 4, + "generator": "plain" }], + "customDerivitives": [ + { + "id": "swamprottenmarsh", + "waterColor": "#684D1A", + "grassColor": "#5C581A", + "spawnRarity": 20, + "spawns": [ + { + "type": "SLIME" + } + ] + } + ], "layers": [ { "style": {"style": "IRIS"}, @@ -78,20 +91,7 @@ "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 b830a695..1e322b06 100644 --- a/biomes/swamp/swa-marsh.json +++ b/biomes/swamp/swa-marsh.json @@ -78,20 +78,7 @@ "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 1a2162ac..4bda3656 100644 --- a/biomes/swamp/swa-roofed-forest.json +++ b/biomes/swamp/swa-roofed-forest.json @@ -378,20 +378,7 @@ } } ], - "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 4802bac8..9a86ad85 100644 --- a/biomes/swamp/swa-roofed-wayward.json +++ b/biomes/swamp/swa-roofed-wayward.json @@ -366,20 +366,7 @@ } } ], - "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 366ef043..90009253 100644 --- a/biomes/temperate/tem-beach.json +++ b/biomes/temperate/tem-beach.json @@ -60,32 +60,7 @@ "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 33a15649..7b9614c3 100644 --- a/biomes/temperate/tem-birch-denmyre.json +++ b/biomes/temperate/tem-birch-denmyre.json @@ -234,28 +234,10 @@ ], "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": 2, + "rarity": 3 } ], "wall": { diff --git a/biomes/temperate/tem-birch-forest.json b/biomes/temperate/tem-birch-forest.json index 0e8de67f..9af7e1a5 100644 --- a/biomes/temperate/tem-birch-forest.json +++ b/biomes/temperate/tem-birch-forest.json @@ -62,38 +62,7 @@ ] } ], - "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 81e01316..df3978e5 100644 --- a/biomes/temperate/tem-flower-forest.json +++ b/biomes/temperate/tem-flower-forest.json @@ -62,34 +62,10 @@ } ], "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": 1, + "minSpawns": 2, "rarity": 3 } ], diff --git a/biomes/temperate/tem-highlands.json b/biomes/temperate/tem-highlands.json index 6961b81b..4fcb3cb9 100644 --- a/biomes/temperate/tem-highlands.json +++ b/biomes/temperate/tem-highlands.json @@ -57,28 +57,10 @@ ], "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": 2, + "rarity": 3 } ], "decorators": [ diff --git a/biomes/temperate/tem-island.json b/biomes/temperate/tem-island.json index 0a5c4526..198c76d7 100644 --- a/biomes/temperate/tem-island.json +++ b/biomes/temperate/tem-island.json @@ -39,32 +39,7 @@ ] } ], - "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 5d8c7044..7badcd76 100644 --- a/biomes/temperate/tem-longtree-forest.json +++ b/biomes/temperate/tem-longtree-forest.json @@ -252,31 +252,7 @@ ] } ], - "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 48049352..478d1586 100644 --- a/biomes/temperate/tem-oak-beach.json +++ b/biomes/temperate/tem-oak-beach.json @@ -44,32 +44,7 @@ "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 ed5ae7f9..d2f3030a 100644 --- a/biomes/temperate/tem-oak-denmyre.json +++ b/biomes/temperate/tem-oak-denmyre.json @@ -114,32 +114,7 @@ "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 bee18eb8..f3c2c8b5 100644 --- a/biomes/temperate/tem-oak-forest.json +++ b/biomes/temperate/tem-oak-forest.json @@ -52,32 +52,7 @@ "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 3d2989c0..f6c22805 100644 --- a/biomes/temperate/tem-plains.json +++ b/biomes/temperate/tem-plains.json @@ -411,32 +411,7 @@ } } ], - "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 e4fc560a..8fde6c03 100644 --- a/biomes/temperate/tem-plateau.json +++ b/biomes/temperate/tem-plateau.json @@ -63,32 +63,7 @@ ] } ], - "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 382ece15..bcf06db1 100644 --- a/biomes/temperate/tem-sakura-pink-child.json +++ b/biomes/temperate/tem-sakura-pink-child.json @@ -41,32 +41,7 @@ ] } ], - "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 64c5b711..43383554 100644 --- a/biomes/temperate/tem-sakura-pink-forest.json +++ b/biomes/temperate/tem-sakura-pink-forest.json @@ -49,28 +49,10 @@ ], "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": 2, + "rarity": 3 } ], "objects": [ diff --git a/biomes/temperate/tem-stranged-plains.json b/biomes/temperate/tem-stranged-plains.json index 189c8ad6..70369e93 100644 --- a/biomes/temperate/tem-stranged-plains.json +++ b/biomes/temperate/tem-stranged-plains.json @@ -225,32 +225,6 @@ ] } ], - "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 4162c1e5..d2c701dd 100644 --- a/biomes/temperate/tem-wilds.json +++ b/biomes/temperate/tem-wilds.json @@ -81,32 +81,7 @@ "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 17686d08..10a62c8a 100644 --- a/biomes/tropical/tro-bamboo-forest.json +++ b/biomes/tropical/tro-bamboo-forest.json @@ -12,7 +12,7 @@ }], "customDerivitives": [{ "id": "trobamboo", - "foliageColor": "#44A906", + "foliageColor": "#20A52F", "grassColor": "#1E7307", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2", @@ -99,7 +99,7 @@ "replace": {"palette": [{"block": "air"}]} }, { - "find": [{"block": "acacia_leaves"}], + "find": [{"block": "birch_leaves"}], "replace": {"palette": [{ "block": "jungle_leaves", "data": {"persistent": true} @@ -107,11 +107,11 @@ }, { "find": [{"block": "stripped_birch_log"}], - "replace": {"palette": [{"block": "stripped_jungle_log"}]} + "replace": {"palette": [{"block": "jungle_wood"}]} }, { "find": [{"block": "stripped_birch_wood"}], - "replace": {"palette": [{"block": "stripped_jungle_wood"}]} + "replace": {"palette": [{"block": "oak_wood"}]} } ], "place": [ @@ -176,32 +176,7 @@ } } ], - "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 a5328c20..6157f238 100644 --- a/biomes/tropical/tro-beach-bamboo.json +++ b/biomes/tropical/tro-beach-bamboo.json @@ -31,20 +31,6 @@ "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 fffc56f3..c204e878 100644 --- a/biomes/tropical/tro-beach-charred.json +++ b/biomes/tropical/tro-beach-charred.json @@ -31,12 +31,6 @@ "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 24615200..6b527029 100644 --- a/biomes/tropical/tro-beach.json +++ b/biomes/tropical/tro-beach.json @@ -31,20 +31,6 @@ "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 4c066c52..4c272ad2 100644 --- a/biomes/tropical/tro-highlands.json +++ b/biomes/tropical/tro-highlands.json @@ -11,7 +11,7 @@ }], "customDerivitives": [{ "id": "trohighlands", - "foliageColor": "#40C42B", + "foliageColor": "#478F04", "grassColor": "#41A726", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2", @@ -67,32 +67,7 @@ ] } ], - "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 0f996cea..a496ba12 100644 --- a/biomes/tropical/tro-island-beach.json +++ b/biomes/tropical/tro-island-beach.json @@ -31,20 +31,7 @@ "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 dd0e1272..e3f3240e 100644 --- a/biomes/tropical/tro-jungle-denmyre.json +++ b/biomes/tropical/tro-jungle-denmyre.json @@ -56,20 +56,7 @@ "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 5ace1524..16688bcb 100644 --- a/biomes/tropical/tro-mountain-extreme.json +++ b/biomes/tropical/tro-mountain-extreme.json @@ -12,10 +12,10 @@ }], "customDerivitives": [{ "id": "tromtnextreme", - "foliageColor": "#40C42B", - "grassColor": "#5CCA52", + "foliageColor": "#478F04", + "grassColor": "#41A726", "waterColor": "#3AB2A2", - "waterFogColor": "#3AB2A2", + "waterFogColor": "#3FE727", "category": "jungle" }], "layers": [ diff --git a/biomes/tropical/tro-mountain-middle.json b/biomes/tropical/tro-mountain-middle.json index be0959f5..87632bd9 100644 --- a/biomes/tropical/tro-mountain-middle.json +++ b/biomes/tropical/tro-mountain-middle.json @@ -19,8 +19,8 @@ ], "customDerivitives": [{ "id": "tromtnmiddle", - "foliageColor": "#40C42B", - "grassColor": "#1E7307", + "foliageColor": "#478F04", + "grassColor": "#41A726", "waterColor": "#3AB2A2", "fogColor": "#6DCA87", "category": "jungle" diff --git a/biomes/tropical/tro-mountain-plains.json b/biomes/tropical/tro-mountain-plains.json index 94c6bbcf..27866edb 100644 --- a/biomes/tropical/tro-mountain-plains.json +++ b/biomes/tropical/tro-mountain-plains.json @@ -11,8 +11,8 @@ }], "customDerivitives": [{ "id": "tromtnplains", - "foliageColor": "#40C42B", - "grassColor": "#5CCA52", + "foliageColor": "#258F04", + "grassColor": "#41A726", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" diff --git a/biomes/tropical/tro-mountain.json b/biomes/tropical/tro-mountain.json index ffd1b666..0928a1ca 100644 --- a/biomes/tropical/tro-mountain.json +++ b/biomes/tropical/tro-mountain.json @@ -12,8 +12,8 @@ }], "customDerivitives": [{ "id": "tromountain", - "foliageColor": "#40C42B", - "grassColor": "#5CCA52", + "foliageColor": "#478F04", + "grassColor": "#41A726", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" diff --git a/biomes/tropical/tro-plains-hills.json b/biomes/tropical/tro-plains-hills.json index c96ae9ea..fd3459ef 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": "#1E7307", + "grassColor": "#41A726", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" diff --git a/biomes/tropical/tro-rainforest-hills.json b/biomes/tropical/tro-rainforest-hills.json index bc766bab..c3f5650b 100644 --- a/biomes/tropical/tro-rainforest-hills.json +++ b/biomes/tropical/tro-rainforest-hills.json @@ -11,7 +11,7 @@ }], "customDerivitives": [{ "id": "trohills", - "foliageColor": "#40C42B", + "foliageColor": "#258F04", "grassColor": "#41A726", "category": "jungle", "waterColor": "#3AB2A2", @@ -73,20 +73,7 @@ "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 4fa3df1c..37d19b98 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": 49, + "min": 25, "max": 65, - "generator": "plain" + "generator": "mountain" }], "customDerivitives": [{ "id": "troisle", - "foliageColor": "#40C42B", - "grassColor": "#2DAF09", + "foliageColor": "#258F04", + "grassColor": "#3FE727", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" @@ -54,20 +54,7 @@ "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 2152adc9..b8e1bc74 100644 --- a/biomes/tropical/tro-rainforest-wicked-child.json +++ b/biomes/tropical/tro-rainforest-wicked-child.json @@ -73,20 +73,7 @@ "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 69f121b0..ec61d5c8 100644 --- a/biomes/tropical/tro-rainforest-wicked-village.json +++ b/biomes/tropical/tro-rainforest-wicked-village.json @@ -59,20 +59,7 @@ "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 be6aed6f..e10cfa53 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,20 +64,6 @@ "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 874361c1..0a1e6904 100644 --- a/biomes/tropical/tro-rainforest.json +++ b/biomes/tropical/tro-rainforest.json @@ -15,7 +15,7 @@ }], "customDerivitives": [{ "id": "trorainforest", - "foliageColor": "#40C42B", + "foliageColor": "#258F04", "grassColor": "#2DAF09", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2", @@ -63,20 +63,6 @@ "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 04353851..7062586a 100644 --- a/biomes/tropical/tro-volcanic-plains.json +++ b/biomes/tropical/tro-volcanic-plains.json @@ -10,6 +10,15 @@ "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 c980e9cd..183ce214 100644 --- a/biomes/tropical/tro-volcanoes-lava.json +++ b/biomes/tropical/tro-volcanoes-lava.json @@ -4,6 +4,15 @@ "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 57247faf..c1b4a7d3 100644 --- a/biomes/tropical/tro-volcanoes.json +++ b/biomes/tropical/tro-volcanoes.json @@ -4,6 +4,15 @@ "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 01e128e3..e07e43d2 100644 --- a/biomes/tropical/tro-wilds.json +++ b/biomes/tropical/tro-wilds.json @@ -11,7 +11,7 @@ "generator": "mountain" }], "customDerivitives": [{ - "id": "tromtnextreme", + "id": "trowilds", "foliageColor": "#2C8806", "grassColor": "#183F0E", "waterColor": "#11BA89", @@ -113,32 +113,7 @@ "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 611d43fc..07429ca9 100644 --- a/biomes/tundra/tun-beach.json +++ b/biomes/tundra/tun-beach.json @@ -116,26 +116,7 @@ "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 ac3b09fb..f19edb12 100644 --- a/biomes/tundra/tun-bonsai-forest.json +++ b/biomes/tundra/tun-bonsai-forest.json @@ -127,26 +127,7 @@ "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 fe9ad151..a9a277fa 100644 --- a/biomes/tundra/tun-forest-cliffs.json +++ b/biomes/tundra/tun-forest-cliffs.json @@ -60,26 +60,7 @@ "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 4cb691b8..d62265a5 100644 --- a/biomes/tundra/tun-forest.json +++ b/biomes/tundra/tun-forest.json @@ -60,26 +60,7 @@ ] } ], - "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 9c470b71..1f1cc72a 100644 --- a/biomes/tundra/tun-lake.json +++ b/biomes/tundra/tun-lake.json @@ -123,26 +123,7 @@ ] } ], - "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 2133cd40..482fa7db 100644 --- a/biomes/tundra/tun-magic-forest.json +++ b/biomes/tundra/tun-magic-forest.json @@ -62,26 +62,7 @@ ] } ], - "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 ee1cbe62..60d4e657 100644 --- a/biomes/tundra/tun-mountains-cliffs.json +++ b/biomes/tundra/tun-mountains-cliffs.json @@ -60,26 +60,7 @@ "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 52619e74..4c58ebd1 100644 --- a/biomes/tundra/tun-mountains.json +++ b/biomes/tundra/tun-mountains.json @@ -64,26 +64,7 @@ "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 92959531..75074d91 100644 --- a/biomes/tundra/tun-redwood-cliffs.json +++ b/biomes/tundra/tun-redwood-cliffs.json @@ -58,26 +58,7 @@ ] } ], - "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 6f7b9d3a..66c6ca99 100644 --- a/biomes/tundra/tun-redwood-forest.json +++ b/biomes/tundra/tun-redwood-forest.json @@ -62,26 +62,7 @@ ] } ], - "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 923ae5a7..92d4dc5d 100644 --- a/biomes/tundra/tun-sequia-redwoods.json +++ b/biomes/tundra/tun-sequia-redwoods.json @@ -156,26 +156,7 @@ "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 5086b44d..1605001a 100644 --- a/biomes/tundra/tun-spruce-denmyre.json +++ b/biomes/tundra/tun-spruce-denmyre.json @@ -133,26 +133,7 @@ "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 85299ad8..2a85fbbf 100644 --- a/biomes/tundra/tun-taiga.json +++ b/biomes/tundra/tun-taiga.json @@ -288,26 +288,7 @@ } } ], - "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 f8fb6369..aaeb1512 100644 --- a/biomes/tundra/tun-tundra-beach-stone.json +++ b/biomes/tundra/tun-tundra-beach-stone.json @@ -24,26 +24,7 @@ "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 a457152c..e335bae4 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -18,23 +18,17 @@ "regions": [ "mushroom", "swamp", - "ocean", + "frozen", "tundra", "temperate", - "frozen", - "hot", + "ocean", "tropical", - "mesa" + "hot" + ], "regionStyle": { "style": "NOWHERE_CELLULAR", - "zoom": 1, - "fracture": { - "multiplier": 18, - "maxFractureAccuracy": true, - "style": "FRACTAL_SMOKE", - "zoom": 1 - } + "zoom": 1 }, "islandBiomeChanceStyle": { "style": "NOWHERE_CELLULAR", diff --git a/entities/donkey.json b/entities/donkey.json new file mode 100644 index 00000000..a571a5a4 --- /dev/null +++ b/entities/donkey.json @@ -0,0 +1 @@ +{"type": "DONKEY"} diff --git a/entities/glowsquid.json b/entities/glowsquid.json new file mode 100644 index 00000000..cb763085 --- /dev/null +++ b/entities/glowsquid.json @@ -0,0 +1,4 @@ +{ + "type": "GLOW_SQUID", + "glowing": true +} diff --git a/entities/goat.json b/entities/goat.json new file mode 100644 index 00000000..3477a173 --- /dev/null +++ b/entities/goat.json @@ -0,0 +1 @@ +{"type": "GOAT"} diff --git a/entities/horse.json b/entities/horse.json new file mode 100644 index 00000000..e4655c8b --- /dev/null +++ b/entities/horse.json @@ -0,0 +1 @@ +{"type": "HORSE"} diff --git a/entities/llama.json b/entities/llama.json new file mode 100644 index 00000000..f60cee71 --- /dev/null +++ b/entities/llama.json @@ -0,0 +1 @@ +{"type": "LLAMA"} diff --git a/entities/mule.json b/entities/mule.json new file mode 100644 index 00000000..6e12d13b --- /dev/null +++ b/entities/mule.json @@ -0,0 +1 @@ +{"type": "MULE"} diff --git a/entities/parrot.json b/entities/parrot.json new file mode 100644 index 00000000..f5371701 --- /dev/null +++ b/entities/parrot.json @@ -0,0 +1 @@ +{"type": "PARROT"} diff --git a/entities/rabbit.json b/entities/rabbit.json new file mode 100644 index 00000000..bd623b85 --- /dev/null +++ b/entities/rabbit.json @@ -0,0 +1 @@ +{"type": "RABBIT"} diff --git a/entities/turtle.json b/entities/turtle.json new file mode 100644 index 00000000..659fd6b6 --- /dev/null +++ b/entities/turtle.json @@ -0,0 +1 @@ +{"type": "TURTLE"} diff --git a/entities/wanderingtrader.json b/entities/wanderingtrader.json new file mode 100644 index 00000000..1f51f397 --- /dev/null +++ b/entities/wanderingtrader.json @@ -0,0 +1,10 @@ +{"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 deleted file mode 100644 index 2114b325..00000000 Binary files a/objects/FloatIsle/f-1.iob and /dev/null differ diff --git a/objects/amethyst/ame1.iob b/objects/amethyst/ame1.iob deleted file mode 100644 index 3dbb6f55..00000000 Binary files a/objects/amethyst/ame1.iob and /dev/null differ diff --git a/objects/amethyst/ame2.iob b/objects/amethyst/ame2.iob deleted file mode 100644 index 8d73f5f9..00000000 Binary files a/objects/amethyst/ame2.iob and /dev/null differ diff --git a/objects/amethyst/ame3.iob b/objects/amethyst/ame3.iob deleted file mode 100644 index d05c4e2d..00000000 Binary files a/objects/amethyst/ame3.iob and /dev/null differ diff --git a/objects/amethyst/ame4.iob b/objects/amethyst/ame4.iob deleted file mode 100644 index f598a0be..00000000 Binary files a/objects/amethyst/ame4.iob and /dev/null differ diff --git a/objects/amethyst/ame5.iob b/objects/amethyst/ame5.iob deleted file mode 100644 index c2fc945c..00000000 Binary files a/objects/amethyst/ame5.iob and /dev/null differ diff --git a/objects/amethyst/ame6.iob b/objects/amethyst/ame6.iob deleted file mode 100644 index 3ca7aa51..00000000 Binary files a/objects/amethyst/ame6.iob and /dev/null differ diff --git a/objects/beach-islander/easterHead1.iob b/objects/beach-islander/easterHead1.iob deleted file mode 100644 index 2896d275..00000000 Binary files a/objects/beach-islander/easterHead1.iob and /dev/null differ diff --git a/objects/bee/hive.iob b/objects/bee/hive.iob deleted file mode 100644 index bb579862..00000000 Binary files a/objects/bee/hive.iob and /dev/null differ diff --git a/objects/bee/hive1.iob b/objects/bee/hive1.iob deleted file mode 100644 index b8a84a21..00000000 Binary files a/objects/bee/hive1.iob and /dev/null differ diff --git a/objects/bombs/bomb.iob b/objects/bombs/bomb.iob deleted file mode 100644 index 163affef..00000000 Binary files a/objects/bombs/bomb.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire1.iob b/objects/bone-spire/BoneSpire1.iob deleted file mode 100644 index 8712d080..00000000 Binary files a/objects/bone-spire/BoneSpire1.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire10.iob b/objects/bone-spire/BoneSpire10.iob deleted file mode 100644 index aea3556a..00000000 Binary files a/objects/bone-spire/BoneSpire10.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire11.iob b/objects/bone-spire/BoneSpire11.iob deleted file mode 100644 index fe09b6c7..00000000 Binary files a/objects/bone-spire/BoneSpire11.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire12.iob b/objects/bone-spire/BoneSpire12.iob deleted file mode 100644 index aae8787c..00000000 Binary files a/objects/bone-spire/BoneSpire12.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire13.iob b/objects/bone-spire/BoneSpire13.iob deleted file mode 100644 index f0886954..00000000 Binary files a/objects/bone-spire/BoneSpire13.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire14.iob b/objects/bone-spire/BoneSpire14.iob deleted file mode 100644 index 73f72d9e..00000000 Binary files a/objects/bone-spire/BoneSpire14.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire15.iob b/objects/bone-spire/BoneSpire15.iob deleted file mode 100644 index 2ffd69c3..00000000 Binary files a/objects/bone-spire/BoneSpire15.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire16.iob b/objects/bone-spire/BoneSpire16.iob deleted file mode 100644 index c7c0ee3e..00000000 Binary files a/objects/bone-spire/BoneSpire16.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire17.iob b/objects/bone-spire/BoneSpire17.iob deleted file mode 100644 index 8a8574fa..00000000 Binary files a/objects/bone-spire/BoneSpire17.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire18.iob b/objects/bone-spire/BoneSpire18.iob deleted file mode 100644 index 808e652d..00000000 Binary files a/objects/bone-spire/BoneSpire18.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire19.iob b/objects/bone-spire/BoneSpire19.iob deleted file mode 100644 index 41dd4e06..00000000 Binary files a/objects/bone-spire/BoneSpire19.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire2.iob b/objects/bone-spire/BoneSpire2.iob deleted file mode 100644 index fd40d6ca..00000000 Binary files a/objects/bone-spire/BoneSpire2.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire20.iob b/objects/bone-spire/BoneSpire20.iob deleted file mode 100644 index e4ac47a8..00000000 Binary files a/objects/bone-spire/BoneSpire20.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire3.iob b/objects/bone-spire/BoneSpire3.iob deleted file mode 100644 index 3429fb50..00000000 Binary files a/objects/bone-spire/BoneSpire3.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire4.iob b/objects/bone-spire/BoneSpire4.iob deleted file mode 100644 index 666ae1ef..00000000 Binary files a/objects/bone-spire/BoneSpire4.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire5.iob b/objects/bone-spire/BoneSpire5.iob deleted file mode 100644 index 9cb2c890..00000000 Binary files a/objects/bone-spire/BoneSpire5.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire6.iob b/objects/bone-spire/BoneSpire6.iob deleted file mode 100644 index 25bd71e2..00000000 Binary files a/objects/bone-spire/BoneSpire6.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire7.iob b/objects/bone-spire/BoneSpire7.iob deleted file mode 100644 index 22fb6595..00000000 Binary files a/objects/bone-spire/BoneSpire7.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire8.iob b/objects/bone-spire/BoneSpire8.iob deleted file mode 100644 index 0cf17b96..00000000 Binary files a/objects/bone-spire/BoneSpire8.iob and /dev/null differ diff --git a/objects/bone-spire/BoneSpire9.iob b/objects/bone-spire/BoneSpire9.iob deleted file mode 100644 index 9ff16011..00000000 Binary files a/objects/bone-spire/BoneSpire9.iob and /dev/null differ diff --git a/objects/bones/Bone1.iob b/objects/bones/Bone1.iob deleted file mode 100644 index 74c1d24a..00000000 Binary files a/objects/bones/Bone1.iob and /dev/null differ diff --git a/objects/bones/Bone2.iob b/objects/bones/Bone2.iob deleted file mode 100644 index 31ad98fa..00000000 Binary files a/objects/bones/Bone2.iob and /dev/null differ diff --git a/objects/bones/Bone3.iob b/objects/bones/Bone3.iob deleted file mode 100644 index bcb50b03..00000000 Binary files a/objects/bones/Bone3.iob and /dev/null differ diff --git a/objects/bones/Bone4.iob b/objects/bones/Bone4.iob deleted file mode 100644 index 83fc5b97..00000000 Binary files a/objects/bones/Bone4.iob and /dev/null differ diff --git a/objects/bones/Bone5.iob b/objects/bones/Bone5.iob deleted file mode 100644 index f193a6e0..00000000 Binary files a/objects/bones/Bone5.iob and /dev/null differ diff --git a/objects/bones/Bone6.iob b/objects/bones/Bone6.iob deleted file mode 100644 index a56140c5..00000000 Binary files a/objects/bones/Bone6.iob and /dev/null differ diff --git a/objects/bones/Bone7.iob b/objects/bones/Bone7.iob deleted file mode 100644 index 0a78f5d7..00000000 Binary files a/objects/bones/Bone7.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder1.iob b/objects/boulder-stone/boulder1.iob deleted file mode 100644 index 9d003ac0..00000000 Binary files a/objects/boulder-stone/boulder1.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder10.iob b/objects/boulder-stone/boulder10.iob deleted file mode 100644 index c83aea72..00000000 Binary files a/objects/boulder-stone/boulder10.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder11.iob b/objects/boulder-stone/boulder11.iob deleted file mode 100644 index 637cd42e..00000000 Binary files a/objects/boulder-stone/boulder11.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder12.iob b/objects/boulder-stone/boulder12.iob deleted file mode 100644 index 9e983674..00000000 Binary files a/objects/boulder-stone/boulder12.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder13.iob b/objects/boulder-stone/boulder13.iob deleted file mode 100644 index db01083f..00000000 Binary files a/objects/boulder-stone/boulder13.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder14.iob b/objects/boulder-stone/boulder14.iob deleted file mode 100644 index ae25d665..00000000 Binary files a/objects/boulder-stone/boulder14.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder15.iob b/objects/boulder-stone/boulder15.iob deleted file mode 100644 index 4c51b470..00000000 Binary files a/objects/boulder-stone/boulder15.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder2.iob b/objects/boulder-stone/boulder2.iob deleted file mode 100644 index cdb66fe0..00000000 Binary files a/objects/boulder-stone/boulder2.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder3.iob b/objects/boulder-stone/boulder3.iob deleted file mode 100644 index e4e92107..00000000 Binary files a/objects/boulder-stone/boulder3.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder4.iob b/objects/boulder-stone/boulder4.iob deleted file mode 100644 index 0805ab2c..00000000 Binary files a/objects/boulder-stone/boulder4.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder5.iob b/objects/boulder-stone/boulder5.iob deleted file mode 100644 index f8d0bedd..00000000 Binary files a/objects/boulder-stone/boulder5.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder6.iob b/objects/boulder-stone/boulder6.iob deleted file mode 100644 index 21ec4bea..00000000 Binary files a/objects/boulder-stone/boulder6.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder7.iob b/objects/boulder-stone/boulder7.iob deleted file mode 100644 index 9d2668b7..00000000 Binary files a/objects/boulder-stone/boulder7.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder8.iob b/objects/boulder-stone/boulder8.iob deleted file mode 100644 index 62c99213..00000000 Binary files a/objects/boulder-stone/boulder8.iob and /dev/null differ diff --git a/objects/boulder-stone/boulder9.iob b/objects/boulder-stone/boulder9.iob deleted file mode 100644 index 112f717d..00000000 Binary files a/objects/boulder-stone/boulder9.iob and /dev/null differ diff --git a/objects/boulder/boulder1.iob b/objects/boulder/boulder1.iob deleted file mode 100644 index 0d23793d..00000000 Binary files a/objects/boulder/boulder1.iob and /dev/null differ diff --git a/objects/boulder/boulder10.iob b/objects/boulder/boulder10.iob deleted file mode 100644 index 2fc64260..00000000 Binary files a/objects/boulder/boulder10.iob and /dev/null differ diff --git a/objects/boulder/boulder11.iob b/objects/boulder/boulder11.iob deleted file mode 100644 index 9185dbcc..00000000 Binary files a/objects/boulder/boulder11.iob and /dev/null differ diff --git a/objects/boulder/boulder12.iob b/objects/boulder/boulder12.iob deleted file mode 100644 index e56e5e51..00000000 Binary files a/objects/boulder/boulder12.iob and /dev/null differ diff --git a/objects/boulder/boulder13.iob b/objects/boulder/boulder13.iob deleted file mode 100644 index 626ee06b..00000000 Binary files a/objects/boulder/boulder13.iob and /dev/null differ diff --git a/objects/boulder/boulder14.iob b/objects/boulder/boulder14.iob deleted file mode 100644 index 0a920d2e..00000000 Binary files a/objects/boulder/boulder14.iob and /dev/null differ diff --git a/objects/boulder/boulder15.iob b/objects/boulder/boulder15.iob deleted file mode 100644 index 3442af79..00000000 Binary files a/objects/boulder/boulder15.iob and /dev/null differ diff --git a/objects/boulder/boulder2.iob b/objects/boulder/boulder2.iob deleted file mode 100644 index 97c2b4e0..00000000 Binary files a/objects/boulder/boulder2.iob and /dev/null differ diff --git a/objects/boulder/boulder3.iob b/objects/boulder/boulder3.iob deleted file mode 100644 index 877e71b1..00000000 Binary files a/objects/boulder/boulder3.iob and /dev/null differ diff --git a/objects/boulder/boulder4.iob b/objects/boulder/boulder4.iob deleted file mode 100644 index 95c8808c..00000000 Binary files a/objects/boulder/boulder4.iob and /dev/null differ diff --git a/objects/boulder/boulder5.iob b/objects/boulder/boulder5.iob deleted file mode 100644 index 0633b2fa..00000000 Binary files a/objects/boulder/boulder5.iob and /dev/null differ diff --git a/objects/boulder/boulder6.iob b/objects/boulder/boulder6.iob deleted file mode 100644 index f663612a..00000000 Binary files a/objects/boulder/boulder6.iob and /dev/null differ diff --git a/objects/boulder/boulder7.iob b/objects/boulder/boulder7.iob deleted file mode 100644 index aa804f95..00000000 Binary files a/objects/boulder/boulder7.iob and /dev/null differ diff --git a/objects/boulder/boulder8.iob b/objects/boulder/boulder8.iob deleted file mode 100644 index 134f75c6..00000000 Binary files a/objects/boulder/boulder8.iob and /dev/null differ diff --git a/objects/boulder/boulder9.iob b/objects/boulder/boulder9.iob deleted file mode 100644 index 91c8c6d0..00000000 Binary files a/objects/boulder/boulder9.iob and /dev/null differ diff --git a/objects/bush/small/1.iob b/objects/bush/small/1.iob deleted file mode 100644 index 189bd22c..00000000 Binary files a/objects/bush/small/1.iob and /dev/null differ diff --git a/objects/bush/small/2.iob b/objects/bush/small/2.iob deleted file mode 100644 index 027c5297..00000000 Binary files a/objects/bush/small/2.iob and /dev/null differ diff --git a/objects/bush/small/3.iob b/objects/bush/small/3.iob deleted file mode 100644 index f39bbc97..00000000 Binary files a/objects/bush/small/3.iob and /dev/null differ diff --git a/objects/cactus-white/c1.iob b/objects/cactus-white/c1.iob deleted file mode 100644 index 7586f1e7..00000000 Binary files a/objects/cactus-white/c1.iob and /dev/null differ diff --git a/objects/cactus-white/c2.iob b/objects/cactus-white/c2.iob deleted file mode 100644 index 0797b52d..00000000 Binary files a/objects/cactus-white/c2.iob and /dev/null differ diff --git a/objects/cactus-white/c3.iob b/objects/cactus-white/c3.iob deleted file mode 100644 index 795f9eb3..00000000 Binary files a/objects/cactus-white/c3.iob and /dev/null differ diff --git a/objects/cactus-white/c4.iob b/objects/cactus-white/c4.iob deleted file mode 100644 index eb67dc36..00000000 Binary files a/objects/cactus-white/c4.iob and /dev/null differ diff --git a/objects/camp/barrel-bin.iob b/objects/camp/barrel-bin.iob deleted file mode 100644 index 5566381d..00000000 Binary files a/objects/camp/barrel-bin.iob and /dev/null differ diff --git a/objects/camp/camp.iob b/objects/camp/camp.iob deleted file mode 100644 index 5c3ef3ea..00000000 Binary files a/objects/camp/camp.iob and /dev/null differ diff --git a/objects/camp/camp2.iob b/objects/camp/camp2.iob deleted file mode 100644 index f889eb59..00000000 Binary files a/objects/camp/camp2.iob and /dev/null differ diff --git a/objects/camp/camp3.iob b/objects/camp/camp3.iob deleted file mode 100644 index b041e9e5..00000000 Binary files a/objects/camp/camp3.iob and /dev/null differ diff --git a/objects/camp/camp4.iob b/objects/camp/camp4.iob deleted file mode 100644 index f31a90c4..00000000 Binary files a/objects/camp/camp4.iob and /dev/null differ diff --git a/objects/camp/camp5.iob b/objects/camp/camp5.iob deleted file mode 100644 index 06da6752..00000000 Binary files a/objects/camp/camp5.iob and /dev/null differ diff --git a/objects/camp/soul-camp.iob b/objects/camp/soul-camp.iob deleted file mode 100644 index dc0f1ba0..00000000 Binary files a/objects/camp/soul-camp.iob and /dev/null differ diff --git a/objects/caves/cave1.iob b/objects/caves/cave1.iob deleted file mode 100644 index 0212172e..00000000 Binary files a/objects/caves/cave1.iob and /dev/null differ diff --git a/objects/caves/cave2.iob b/objects/caves/cave2.iob deleted file mode 100644 index c728a936..00000000 Binary files a/objects/caves/cave2.iob and /dev/null differ diff --git a/objects/caves/cave3.iob b/objects/caves/cave3.iob deleted file mode 100644 index 16425106..00000000 Binary files a/objects/caves/cave3.iob and /dev/null differ diff --git a/objects/caves/cave4.iob b/objects/caves/cave4.iob deleted file mode 100644 index c3fc6afb..00000000 Binary files a/objects/caves/cave4.iob and /dev/null differ diff --git a/objects/caves/cave5.iob b/objects/caves/cave5.iob deleted file mode 100644 index aa14047d..00000000 Binary files a/objects/caves/cave5.iob and /dev/null differ diff --git a/objects/caves/cave6.iob b/objects/caves/cave6.iob deleted file mode 100644 index 24c79420..00000000 Binary files a/objects/caves/cave6.iob and /dev/null differ diff --git a/objects/clutter/JClutter1.iob b/objects/clutter/JClutter1.iob deleted file mode 100644 index ede30434..00000000 Binary files a/objects/clutter/JClutter1.iob and /dev/null differ diff --git a/objects/clutter/JClutter10.iob b/objects/clutter/JClutter10.iob deleted file mode 100644 index 9afecc87..00000000 Binary files a/objects/clutter/JClutter10.iob and /dev/null differ diff --git a/objects/clutter/JClutter11.iob b/objects/clutter/JClutter11.iob deleted file mode 100644 index 875bd332..00000000 Binary files a/objects/clutter/JClutter11.iob and /dev/null differ diff --git a/objects/clutter/JClutter12.iob b/objects/clutter/JClutter12.iob deleted file mode 100644 index ad09a0ba..00000000 Binary files a/objects/clutter/JClutter12.iob and /dev/null differ diff --git a/objects/clutter/JClutter13.iob b/objects/clutter/JClutter13.iob deleted file mode 100644 index 7f1333a4..00000000 Binary files a/objects/clutter/JClutter13.iob and /dev/null differ diff --git a/objects/clutter/JClutter2.iob b/objects/clutter/JClutter2.iob deleted file mode 100644 index dc575b93..00000000 Binary files a/objects/clutter/JClutter2.iob and /dev/null differ diff --git a/objects/clutter/JClutter3.iob b/objects/clutter/JClutter3.iob deleted file mode 100644 index 3aa704b7..00000000 Binary files a/objects/clutter/JClutter3.iob and /dev/null differ diff --git a/objects/clutter/JClutter4.iob b/objects/clutter/JClutter4.iob deleted file mode 100644 index c3ad5387..00000000 Binary files a/objects/clutter/JClutter4.iob and /dev/null differ diff --git a/objects/clutter/JClutter5.iob b/objects/clutter/JClutter5.iob deleted file mode 100644 index 68e97363..00000000 Binary files a/objects/clutter/JClutter5.iob and /dev/null differ diff --git a/objects/clutter/JClutter6.iob b/objects/clutter/JClutter6.iob deleted file mode 100644 index ba32727d..00000000 Binary files a/objects/clutter/JClutter6.iob and /dev/null differ diff --git a/objects/clutter/JClutter7.iob b/objects/clutter/JClutter7.iob deleted file mode 100644 index 674b185c..00000000 Binary files a/objects/clutter/JClutter7.iob and /dev/null differ diff --git a/objects/clutter/JClutter8.iob b/objects/clutter/JClutter8.iob deleted file mode 100644 index 93cc003c..00000000 Binary files a/objects/clutter/JClutter8.iob and /dev/null differ diff --git a/objects/clutter/JClutter9.iob b/objects/clutter/JClutter9.iob deleted file mode 100644 index f051bf64..00000000 Binary files a/objects/clutter/JClutter9.iob and /dev/null differ diff --git a/objects/clutter/Jstone1.iob b/objects/clutter/Jstone1.iob deleted file mode 100644 index 23feb5b8..00000000 Binary files a/objects/clutter/Jstone1.iob and /dev/null differ diff --git a/objects/clutter/Jstone2.iob b/objects/clutter/Jstone2.iob deleted file mode 100644 index 85ebdfb5..00000000 Binary files a/objects/clutter/Jstone2.iob and /dev/null differ diff --git a/objects/sakura/arbusto1.iob b/objects/clutter/arbusto1.iob similarity index 100% rename from objects/sakura/arbusto1.iob rename to objects/clutter/arbusto1.iob diff --git a/objects/sakura/arbusto2.iob b/objects/clutter/arbusto2.iob similarity index 100% rename from objects/sakura/arbusto2.iob rename to objects/clutter/arbusto2.iob diff --git a/objects/sakura/arbusto3.iob b/objects/clutter/arbusto3.iob similarity index 100% rename from objects/sakura/arbusto3.iob rename to objects/clutter/arbusto3.iob diff --git a/objects/sakura/arbusto4.iob b/objects/clutter/arbusto4.iob similarity index 100% rename from objects/sakura/arbusto4.iob rename to objects/clutter/arbusto4.iob diff --git a/objects/sakura/arbusto5.iob b/objects/clutter/arbusto5.iob similarity index 100% rename from objects/sakura/arbusto5.iob rename to objects/clutter/arbusto5.iob diff --git a/objects/clutter/birch-clutt-1.iob b/objects/clutter/birch-clutt-1.iob deleted file mode 100644 index c529bf8f..00000000 Binary files a/objects/clutter/birch-clutt-1.iob and /dev/null differ diff --git a/objects/clutter/birch-clutt-2.iob b/objects/clutter/birch-clutt-2.iob deleted file mode 100644 index 3b2ecc8c..00000000 Binary files a/objects/clutter/birch-clutt-2.iob and /dev/null differ diff --git a/objects/clutter/birch-clutt-3.iob b/objects/clutter/birch-clutt-3.iob deleted file mode 100644 index ce2f42ef..00000000 Binary files a/objects/clutter/birch-clutt-3.iob and /dev/null differ diff --git a/objects/clutter/birch-clutt-4.iob b/objects/clutter/birch-clutt-4.iob deleted file mode 100644 index 3788bf1e..00000000 Binary files a/objects/clutter/birch-clutt-4.iob and /dev/null differ diff --git a/objects/clutter/birch-clutt-5.iob b/objects/clutter/birch-clutt-5.iob deleted file mode 100644 index ea0c4595..00000000 Binary files a/objects/clutter/birch-clutt-5.iob and /dev/null differ diff --git a/objects/underwater/cobble-spike.iob b/objects/clutter/cobble-spike.iob similarity index 100% rename from objects/underwater/cobble-spike.iob rename to objects/clutter/cobble-spike.iob diff --git a/objects/sakura/corazoncaido.iob b/objects/clutter/corazoncaido.iob similarity index 100% rename from objects/sakura/corazoncaido.iob rename to objects/clutter/corazoncaido.iob diff --git a/objects/sakura/corazoncristal.iob b/objects/clutter/corazoncristal.iob similarity index 100% rename from objects/sakura/corazoncristal.iob rename to objects/clutter/corazoncristal.iob diff --git a/objects/clutter/desert-post1.iob b/objects/clutter/desert-post1.iob deleted file mode 100644 index 5581722e..00000000 Binary files a/objects/clutter/desert-post1.iob and /dev/null differ diff --git a/objects/clutter/desert-post2.iob b/objects/clutter/desert-post2.iob deleted file mode 100644 index 792012f0..00000000 Binary files a/objects/clutter/desert-post2.iob and /dev/null differ diff --git a/objects/clutter/desert-post3.iob b/objects/clutter/desert-post3.iob deleted file mode 100644 index ba802739..00000000 Binary files a/objects/clutter/desert-post3.iob and /dev/null differ diff --git a/objects/clutter/doak-spec-1.iob b/objects/clutter/doak-spec-1.iob deleted file mode 100644 index 26ea63c6..00000000 Binary files a/objects/clutter/doak-spec-1.iob and /dev/null differ diff --git a/objects/clutter/doak-spec-2.iob b/objects/clutter/doak-spec-2.iob deleted file mode 100644 index 1211a38c..00000000 Binary files a/objects/clutter/doak-spec-2.iob and /dev/null differ diff --git a/objects/clutter/doak-spec-3.iob b/objects/clutter/doak-spec-3.iob deleted file mode 100644 index bccc6a48..00000000 Binary files a/objects/clutter/doak-spec-3.iob and /dev/null differ diff --git a/objects/sakura/tronco.iob b/objects/clutter/log.iob similarity index 100% rename from objects/sakura/tronco.iob rename to objects/clutter/log.iob diff --git a/objects/clutter/oak-clutt-1.iob b/objects/clutter/oak-clutt-1.iob deleted file mode 100644 index d0c57a54..00000000 Binary files a/objects/clutter/oak-clutt-1.iob and /dev/null differ diff --git a/objects/clutter/oak-clutt-2.iob b/objects/clutter/oak-clutt-2.iob deleted file mode 100644 index 150b2111..00000000 Binary files a/objects/clutter/oak-clutt-2.iob and /dev/null differ diff --git a/objects/clutter/oak-clutt-3.iob b/objects/clutter/oak-clutt-3.iob deleted file mode 100644 index efe9c561..00000000 Binary files a/objects/clutter/oak-clutt-3.iob and /dev/null differ diff --git a/objects/clutter/oak-clutt-4.iob b/objects/clutter/oak-clutt-4.iob deleted file mode 100644 index 2649225f..00000000 Binary files a/objects/clutter/oak-clutt-4.iob and /dev/null differ diff --git a/objects/clutter/oak-clutt-5.iob b/objects/clutter/oak-clutt-5.iob deleted file mode 100644 index 4c89981e..00000000 Binary files a/objects/clutter/oak-clutt-5.iob and /dev/null differ diff --git a/objects/sakura/manantial.iob b/objects/clutter/pond.iob similarity index 100% rename from objects/sakura/manantial.iob rename to objects/clutter/pond.iob diff --git a/objects/clutter/spruce-clutt-1.iob b/objects/clutter/spruce-clutt-1.iob deleted file mode 100644 index e6fa6dc9..00000000 Binary files a/objects/clutter/spruce-clutt-1.iob and /dev/null differ diff --git a/objects/clutter/spruce-clutt-2.iob b/objects/clutter/spruce-clutt-2.iob deleted file mode 100644 index 40bf40d0..00000000 Binary files a/objects/clutter/spruce-clutt-2.iob and /dev/null differ diff --git a/objects/clutter/spruce-clutt-3.iob b/objects/clutter/spruce-clutt-3.iob deleted file mode 100644 index 85e807a7..00000000 Binary files a/objects/clutter/spruce-clutt-3.iob and /dev/null differ diff --git a/objects/clutter/spruce-clutt-4.iob b/objects/clutter/spruce-clutt-4.iob deleted file mode 100644 index d470bfa2..00000000 Binary files a/objects/clutter/spruce-clutt-4.iob and /dev/null differ diff --git a/objects/clutter/spruce-clutt-5.iob b/objects/clutter/spruce-clutt-5.iob deleted file mode 100644 index a604ed4d..00000000 Binary files a/objects/clutter/spruce-clutt-5.iob and /dev/null differ diff --git a/objects/clutter/spruce-clutter.iob b/objects/clutter/spruce-clutter.iob deleted file mode 100644 index b0feb511..00000000 Binary files a/objects/clutter/spruce-clutter.iob and /dev/null differ diff --git a/objects/wasteland/stone-1.iob b/objects/clutter/stone-1.iob similarity index 100% rename from objects/wasteland/stone-1.iob rename to objects/clutter/stone-1.iob diff --git a/objects/wasteland/stone-2.iob b/objects/clutter/stone-2.iob similarity index 100% rename from objects/wasteland/stone-2.iob rename to objects/clutter/stone-2.iob diff --git a/objects/wasteland/stone-3.iob b/objects/clutter/stone-3.iob similarity index 100% rename from objects/wasteland/stone-3.iob rename to objects/clutter/stone-3.iob diff --git a/objects/wasteland/stone-4.iob b/objects/clutter/stone-4.iob similarity index 100% rename from objects/wasteland/stone-4.iob rename to objects/clutter/stone-4.iob diff --git a/objects/wasteland/stone-5.iob b/objects/clutter/stone-5.iob similarity index 100% rename from objects/wasteland/stone-5.iob rename to objects/clutter/stone-5.iob diff --git a/objects/wasteland/stone-6.iob b/objects/clutter/stone-6.iob similarity index 100% rename from objects/wasteland/stone-6.iob rename to objects/clutter/stone-6.iob diff --git a/objects/wasteland/stone-7.iob b/objects/clutter/stone-7.iob similarity index 100% rename from objects/wasteland/stone-7.iob rename to objects/clutter/stone-7.iob diff --git a/objects/clutter/stone-clutt-1.iob b/objects/clutter/stone-clutt-1.iob deleted file mode 100644 index 7e09542c..00000000 Binary files a/objects/clutter/stone-clutt-1.iob and /dev/null differ diff --git a/objects/clutter/stone-clutt-2.iob b/objects/clutter/stone-clutt-2.iob deleted file mode 100644 index 97c3af68..00000000 Binary files a/objects/clutter/stone-clutt-2.iob and /dev/null differ diff --git a/objects/clutter/stone-clutt-3.iob b/objects/clutter/stone-clutt-3.iob deleted file mode 100644 index ddcecfdc..00000000 Binary files a/objects/clutter/stone-clutt-3.iob and /dev/null differ diff --git a/objects/clutter/stone-clutt-4.iob b/objects/clutter/stone-clutt-4.iob deleted file mode 100644 index 58d28bd2..00000000 Binary files a/objects/clutter/stone-clutt-4.iob and /dev/null differ diff --git a/objects/clutter/stone-clutt-5.iob b/objects/clutter/stone-clutt-5.iob deleted file mode 100644 index 66d15293..00000000 Binary files a/objects/clutter/stone-clutt-5.iob and /dev/null differ diff --git a/objects/clutter/stone-clutt-6.iob b/objects/clutter/stone-clutt-6.iob deleted file mode 100644 index 84e4bded..00000000 Binary files a/objects/clutter/stone-clutt-6.iob and /dev/null differ diff --git a/objects/clutter/stone-clutt-7.iob b/objects/clutter/stone-clutt-7.iob deleted file mode 100644 index 2985919d..00000000 Binary files a/objects/clutter/stone-clutt-7.iob and /dev/null differ diff --git a/objects/clutter/subporta.iob b/objects/clutter/subporta.iob deleted file mode 100644 index 1450fc27..00000000 Binary files a/objects/clutter/subporta.iob and /dev/null differ diff --git a/objects/coral-rgb/coral-by-1.iob b/objects/coral-rgb/coral-by-1.iob deleted file mode 100644 index 495c3cfd..00000000 Binary files a/objects/coral-rgb/coral-by-1.iob and /dev/null differ diff --git a/objects/coral-rgb/coral-by-2.iob b/objects/coral-rgb/coral-by-2.iob deleted file mode 100644 index 0f274322..00000000 Binary files a/objects/coral-rgb/coral-by-2.iob and /dev/null differ diff --git a/objects/coral-rgb/coral-by-3.iob b/objects/coral-rgb/coral-by-3.iob deleted file mode 100644 index dc8cadaa..00000000 Binary files a/objects/coral-rgb/coral-by-3.iob and /dev/null differ diff --git a/objects/coral-rgb/coral-by-4.iob b/objects/coral-rgb/coral-by-4.iob deleted file mode 100644 index 4acf3f21..00000000 Binary files a/objects/coral-rgb/coral-by-4.iob and /dev/null differ diff --git a/objects/coral-rgb/coral-pink-1.iob b/objects/coral-rgb/coral-pink-1.iob deleted file mode 100644 index df6e063e..00000000 Binary files a/objects/coral-rgb/coral-pink-1.iob and /dev/null differ diff --git a/objects/coral-rgb/coral-pink-2.iob b/objects/coral-rgb/coral-pink-2.iob deleted file mode 100644 index 874b0ef4..00000000 Binary files a/objects/coral-rgb/coral-pink-2.iob and /dev/null differ diff --git a/objects/coral-rgb/coral-pink-3.iob b/objects/coral-rgb/coral-pink-3.iob deleted file mode 100644 index a399611e..00000000 Binary files a/objects/coral-rgb/coral-pink-3.iob and /dev/null differ diff --git a/objects/coral-rgb/coral-pink-4.iob b/objects/coral-rgb/coral-pink-4.iob deleted file mode 100644 index dff0b836..00000000 Binary files a/objects/coral-rgb/coral-pink-4.iob and /dev/null differ diff --git a/objects/coral-rgb/coral-purp-1.iob b/objects/coral-rgb/coral-purp-1.iob deleted file mode 100644 index 33aab052..00000000 Binary files a/objects/coral-rgb/coral-purp-1.iob and /dev/null differ diff --git a/objects/coral-rgb/coral-purp-2.iob b/objects/coral-rgb/coral-purp-2.iob deleted file mode 100644 index 0ad5b120..00000000 Binary files a/objects/coral-rgb/coral-purp-2.iob and /dev/null differ diff --git a/objects/coral-rgb/coral-purp-3.iob b/objects/coral-rgb/coral-purp-3.iob deleted file mode 100644 index 06f3e491..00000000 Binary files a/objects/coral-rgb/coral-purp-3.iob and /dev/null differ diff --git a/objects/coral-rgb/coral-red-1.iob b/objects/coral-rgb/coral-red-1.iob deleted file mode 100644 index a8afab3a..00000000 Binary files a/objects/coral-rgb/coral-red-1.iob and /dev/null differ diff --git a/objects/coral-rgb/coral-yellow-3.iob b/objects/coral-rgb/coral-yellow-3.iob deleted file mode 100644 index 4af6a8eb..00000000 Binary files a/objects/coral-rgb/coral-yellow-3.iob and /dev/null differ diff --git a/objects/coral/coral-by-1.iob b/objects/coral/coral-by-1.iob deleted file mode 100644 index 495c3cfd..00000000 Binary files a/objects/coral/coral-by-1.iob and /dev/null differ diff --git a/objects/coral/coral-by-2.iob b/objects/coral/coral-by-2.iob deleted file mode 100644 index 0f274322..00000000 Binary files a/objects/coral/coral-by-2.iob and /dev/null differ diff --git a/objects/coral/coral-by-3.iob b/objects/coral/coral-by-3.iob deleted file mode 100644 index dc8cadaa..00000000 Binary files a/objects/coral/coral-by-3.iob and /dev/null differ diff --git a/objects/coral/coral-by-4.iob b/objects/coral/coral-by-4.iob deleted file mode 100644 index 4acf3f21..00000000 Binary files a/objects/coral/coral-by-4.iob and /dev/null differ diff --git a/objects/coral/coral-pink-1.iob b/objects/coral/coral-pink-1.iob deleted file mode 100644 index df6e063e..00000000 Binary files a/objects/coral/coral-pink-1.iob and /dev/null differ diff --git a/objects/coral/coral-pink-2.iob b/objects/coral/coral-pink-2.iob deleted file mode 100644 index 874b0ef4..00000000 Binary files a/objects/coral/coral-pink-2.iob and /dev/null differ diff --git a/objects/coral/coral-pink-3.iob b/objects/coral/coral-pink-3.iob deleted file mode 100644 index a399611e..00000000 Binary files a/objects/coral/coral-pink-3.iob and /dev/null differ diff --git a/objects/coral/coral-pink-4.iob b/objects/coral/coral-pink-4.iob deleted file mode 100644 index dff0b836..00000000 Binary files a/objects/coral/coral-pink-4.iob and /dev/null differ diff --git a/objects/coral/coral-purp-1.iob b/objects/coral/coral-purp-1.iob deleted file mode 100644 index 33aab052..00000000 Binary files a/objects/coral/coral-purp-1.iob and /dev/null differ diff --git a/objects/coral/coral-purp-2.iob b/objects/coral/coral-purp-2.iob deleted file mode 100644 index 0ad5b120..00000000 Binary files a/objects/coral/coral-purp-2.iob and /dev/null differ diff --git a/objects/coral/coral-purp-3.iob b/objects/coral/coral-purp-3.iob deleted file mode 100644 index 06f3e491..00000000 Binary files a/objects/coral/coral-purp-3.iob and /dev/null differ diff --git a/objects/coral/coral-red-1.iob b/objects/coral/coral-red-1.iob deleted file mode 100644 index a8afab3a..00000000 Binary files a/objects/coral/coral-red-1.iob and /dev/null differ diff --git a/objects/coral/stonedirtsetter-1.iob b/objects/coral/stonedirtsetter-1.iob deleted file mode 100644 index 37597c70..00000000 Binary files a/objects/coral/stonedirtsetter-1.iob and /dev/null differ diff --git a/objects/coral/stonedirtsetter-2.iob b/objects/coral/stonedirtsetter-2.iob deleted file mode 100644 index 0233b920..00000000 Binary files a/objects/coral/stonedirtsetter-2.iob and /dev/null differ diff --git a/objects/coral/stonedirtsetter-3.iob b/objects/coral/stonedirtsetter-3.iob deleted file mode 100644 index eeee451b..00000000 Binary files a/objects/coral/stonedirtsetter-3.iob and /dev/null differ diff --git a/objects/coral/stonedirtsetter-4.iob b/objects/coral/stonedirtsetter-4.iob deleted file mode 100644 index 06bf9687..00000000 Binary files a/objects/coral/stonedirtsetter-4.iob and /dev/null differ diff --git a/objects/coral/stonedirtsetter-5.iob b/objects/coral/stonedirtsetter-5.iob deleted file mode 100644 index 8405f093..00000000 Binary files a/objects/coral/stonedirtsetter-5.iob and /dev/null differ diff --git a/objects/coral/stonedirtsetter-6.iob b/objects/coral/stonedirtsetter-6.iob deleted file mode 100644 index 3d513550..00000000 Binary files a/objects/coral/stonedirtsetter-6.iob and /dev/null differ diff --git a/objects/coral/stonedirtsetter-7.iob b/objects/coral/stonedirtsetter-7.iob deleted file mode 100644 index 612a467c..00000000 Binary files a/objects/coral/stonedirtsetter-7.iob and /dev/null differ diff --git a/objects/crystal/crystal-1.iob b/objects/crystal/crystal-1.iob deleted file mode 100644 index 1b006397..00000000 Binary files a/objects/crystal/crystal-1.iob and /dev/null differ diff --git a/objects/crystal/crystal-10.iob b/objects/crystal/crystal-10.iob deleted file mode 100644 index bbc5c29b..00000000 Binary files a/objects/crystal/crystal-10.iob and /dev/null differ diff --git a/objects/crystal/crystal-2.iob b/objects/crystal/crystal-2.iob deleted file mode 100644 index fcd8ed23..00000000 Binary files a/objects/crystal/crystal-2.iob and /dev/null differ diff --git a/objects/crystal/crystal-3.iob b/objects/crystal/crystal-3.iob deleted file mode 100644 index be73b748..00000000 Binary files a/objects/crystal/crystal-3.iob and /dev/null differ diff --git a/objects/crystal/crystal-4.iob b/objects/crystal/crystal-4.iob deleted file mode 100644 index d356b699..00000000 Binary files a/objects/crystal/crystal-4.iob and /dev/null differ diff --git a/objects/crystal/crystal-5.iob b/objects/crystal/crystal-5.iob deleted file mode 100644 index 6a6b6d7e..00000000 Binary files a/objects/crystal/crystal-5.iob and /dev/null differ diff --git a/objects/crystal/crystal-6.iob b/objects/crystal/crystal-6.iob deleted file mode 100644 index d32fb8d9..00000000 Binary files a/objects/crystal/crystal-6.iob and /dev/null differ diff --git a/objects/crystal/crystal-7.iob b/objects/crystal/crystal-7.iob deleted file mode 100644 index 3c34ee00..00000000 Binary files a/objects/crystal/crystal-7.iob and /dev/null differ diff --git a/objects/crystal/crystal-8.iob b/objects/crystal/crystal-8.iob deleted file mode 100644 index 36dc71cb..00000000 Binary files a/objects/crystal/crystal-8.iob and /dev/null differ diff --git a/objects/crystal/crystal-9.iob b/objects/crystal/crystal-9.iob deleted file mode 100644 index 6408ed70..00000000 Binary files a/objects/crystal/crystal-9.iob and /dev/null differ diff --git a/objects/deadwood-tainted/dead1.iob b/objects/deadwood-tainted/dead1.iob deleted file mode 100644 index 13fa6d63..00000000 Binary files a/objects/deadwood-tainted/dead1.iob and /dev/null differ diff --git a/objects/deadwood/deadwood1.iob b/objects/deadwood/deadwood1.iob deleted file mode 100644 index 36e22119..00000000 Binary files a/objects/deadwood/deadwood1.iob and /dev/null differ diff --git a/objects/deadwood/deadwood2.iob b/objects/deadwood/deadwood2.iob deleted file mode 100644 index b4bf92ac..00000000 Binary files a/objects/deadwood/deadwood2.iob and /dev/null differ diff --git a/objects/deadwood/deadwood3.iob b/objects/deadwood/deadwood3.iob deleted file mode 100644 index 9eddd3a0..00000000 Binary files a/objects/deadwood/deadwood3.iob and /dev/null differ diff --git a/objects/deadwood/deadwood4.iob b/objects/deadwood/deadwood4.iob deleted file mode 100644 index 79c4bc7d..00000000 Binary files a/objects/deadwood/deadwood4.iob and /dev/null differ diff --git a/objects/deadwood/deadwood5.iob b/objects/deadwood/deadwood5.iob deleted file mode 100644 index 3ff72ed7..00000000 Binary files a/objects/deadwood/deadwood5.iob and /dev/null differ diff --git a/objects/deadwood/deadwood6.iob b/objects/deadwood/deadwood6.iob deleted file mode 100644 index 4898353a..00000000 Binary files a/objects/deadwood/deadwood6.iob and /dev/null differ diff --git a/objects/deepslate/ds1.iob b/objects/deepslate/ds1.iob deleted file mode 100644 index d960031a..00000000 Binary files a/objects/deepslate/ds1.iob and /dev/null differ diff --git a/objects/deepslate/ds2.iob b/objects/deepslate/ds2.iob deleted file mode 100644 index 9df90fb8..00000000 Binary files a/objects/deepslate/ds2.iob and /dev/null differ diff --git a/objects/deepslate/ds3.iob b/objects/deepslate/ds3.iob deleted file mode 100644 index 4bd3db29..00000000 Binary files a/objects/deepslate/ds3.iob and /dev/null differ diff --git a/objects/denmyre/oak-denmyre-clutter-1.iob b/objects/denmyre/oak-denmyre-clutter-1.iob deleted file mode 100644 index 60dfe52f..00000000 Binary files a/objects/denmyre/oak-denmyre-clutter-1.iob and /dev/null differ diff --git a/objects/denmyre/oak-denmyre-clutter-10.iob b/objects/denmyre/oak-denmyre-clutter-10.iob deleted file mode 100644 index 36e7b72f..00000000 Binary files a/objects/denmyre/oak-denmyre-clutter-10.iob and /dev/null differ diff --git a/objects/denmyre/oak-denmyre-clutter-2.iob b/objects/denmyre/oak-denmyre-clutter-2.iob deleted file mode 100644 index a66133b4..00000000 Binary files a/objects/denmyre/oak-denmyre-clutter-2.iob and /dev/null differ diff --git a/objects/denmyre/oak-denmyre-clutter-3.iob b/objects/denmyre/oak-denmyre-clutter-3.iob deleted file mode 100644 index 325ef959..00000000 Binary files a/objects/denmyre/oak-denmyre-clutter-3.iob and /dev/null differ diff --git a/objects/denmyre/oak-denmyre-clutter-4.iob b/objects/denmyre/oak-denmyre-clutter-4.iob deleted file mode 100644 index ef8c4954..00000000 Binary files a/objects/denmyre/oak-denmyre-clutter-4.iob and /dev/null differ diff --git a/objects/denmyre/oak-denmyre-clutter-5.iob b/objects/denmyre/oak-denmyre-clutter-5.iob deleted file mode 100644 index c05bc4d2..00000000 Binary files a/objects/denmyre/oak-denmyre-clutter-5.iob and /dev/null differ diff --git a/objects/denmyre/oak-denmyre-clutter-6.iob b/objects/denmyre/oak-denmyre-clutter-6.iob deleted file mode 100644 index 1ab30796..00000000 Binary files a/objects/denmyre/oak-denmyre-clutter-6.iob and /dev/null differ diff --git a/objects/denmyre/oak-denmyre-clutter-7.iob b/objects/denmyre/oak-denmyre-clutter-7.iob deleted file mode 100644 index a1ea0256..00000000 Binary files a/objects/denmyre/oak-denmyre-clutter-7.iob and /dev/null differ diff --git a/objects/denmyre/oak-denmyre-clutter-8.iob b/objects/denmyre/oak-denmyre-clutter-8.iob deleted file mode 100644 index ee35ebf2..00000000 Binary files a/objects/denmyre/oak-denmyre-clutter-8.iob and /dev/null differ diff --git a/objects/denmyre/oak-denmyre-clutter-9.iob b/objects/denmyre/oak-denmyre-clutter-9.iob deleted file mode 100644 index 259e266d..00000000 Binary files a/objects/denmyre/oak-denmyre-clutter-9.iob and /dev/null differ diff --git a/objects/dual-tree/corrupted-swamp-1.iob b/objects/dual-tree/corrupted-swamp-1.iob deleted file mode 100644 index da657fb0..00000000 Binary files a/objects/dual-tree/corrupted-swamp-1.iob and /dev/null differ diff --git a/objects/dual-tree/corrupted-swamp-10.iob b/objects/dual-tree/corrupted-swamp-10.iob deleted file mode 100644 index 3abf6843..00000000 Binary files a/objects/dual-tree/corrupted-swamp-10.iob and /dev/null differ diff --git a/objects/dual-tree/corrupted-swamp-2.iob b/objects/dual-tree/corrupted-swamp-2.iob deleted file mode 100644 index 38603b5b..00000000 Binary files a/objects/dual-tree/corrupted-swamp-2.iob and /dev/null differ diff --git a/objects/dual-tree/corrupted-swamp-3.iob b/objects/dual-tree/corrupted-swamp-3.iob deleted file mode 100644 index 460f67ec..00000000 Binary files a/objects/dual-tree/corrupted-swamp-3.iob and /dev/null differ diff --git a/objects/dual-tree/corrupted-swamp-4.iob b/objects/dual-tree/corrupted-swamp-4.iob deleted file mode 100644 index a13edd11..00000000 Binary files a/objects/dual-tree/corrupted-swamp-4.iob and /dev/null differ diff --git a/objects/dual-tree/corrupted-swamp-5.iob b/objects/dual-tree/corrupted-swamp-5.iob deleted file mode 100644 index 16740149..00000000 Binary files a/objects/dual-tree/corrupted-swamp-5.iob and /dev/null differ diff --git a/objects/dual-tree/corrupted-swamp-6.iob b/objects/dual-tree/corrupted-swamp-6.iob deleted file mode 100644 index 8d7de12f..00000000 Binary files a/objects/dual-tree/corrupted-swamp-6.iob and /dev/null differ diff --git a/objects/dual-tree/corrupted-swamp-7.iob b/objects/dual-tree/corrupted-swamp-7.iob deleted file mode 100644 index cf22b370..00000000 Binary files a/objects/dual-tree/corrupted-swamp-7.iob and /dev/null differ diff --git a/objects/dual-tree/corrupted-swamp-8.iob b/objects/dual-tree/corrupted-swamp-8.iob deleted file mode 100644 index ea4236f9..00000000 Binary files a/objects/dual-tree/corrupted-swamp-8.iob and /dev/null differ diff --git a/objects/dual-tree/corrupted-swamp-9.iob b/objects/dual-tree/corrupted-swamp-9.iob deleted file mode 100644 index c1bab8da..00000000 Binary files a/objects/dual-tree/corrupted-swamp-9.iob and /dev/null differ diff --git a/objects/dual-tree/infested-palm-1.iob b/objects/dual-tree/infested-palm-1.iob deleted file mode 100644 index 6ab71873..00000000 Binary files a/objects/dual-tree/infested-palm-1.iob and /dev/null differ diff --git a/objects/dual-tree/infested-palm-2.iob b/objects/dual-tree/infested-palm-2.iob deleted file mode 100644 index e6ef7d6a..00000000 Binary files a/objects/dual-tree/infested-palm-2.iob and /dev/null differ diff --git a/objects/dual-tree/infested-palm-3.iob b/objects/dual-tree/infested-palm-3.iob deleted file mode 100644 index f0db7a38..00000000 Binary files a/objects/dual-tree/infested-palm-3.iob and /dev/null differ diff --git a/objects/dual-tree/infested-palm-4.iob b/objects/dual-tree/infested-palm-4.iob deleted file mode 100644 index 79478cb7..00000000 Binary files a/objects/dual-tree/infested-palm-4.iob and /dev/null differ diff --git a/objects/dual-tree/infested-palm-5.iob b/objects/dual-tree/infested-palm-5.iob deleted file mode 100644 index 439ea8f9..00000000 Binary files a/objects/dual-tree/infested-palm-5.iob and /dev/null differ diff --git a/objects/dual-tree/sandy-jungle-1.iob b/objects/dual-tree/sandy-jungle-1.iob deleted file mode 100644 index fbe3459d..00000000 Binary files a/objects/dual-tree/sandy-jungle-1.iob and /dev/null differ diff --git a/objects/dual-tree/sandy-jungle-2.iob b/objects/dual-tree/sandy-jungle-2.iob deleted file mode 100644 index e009f3a1..00000000 Binary files a/objects/dual-tree/sandy-jungle-2.iob and /dev/null differ diff --git a/objects/dual-tree/sandy-jungle-3.iob b/objects/dual-tree/sandy-jungle-3.iob deleted file mode 100644 index 456d1ac2..00000000 Binary files a/objects/dual-tree/sandy-jungle-3.iob and /dev/null differ diff --git a/objects/dual-tree/sandy-jungle-4.iob b/objects/dual-tree/sandy-jungle-4.iob deleted file mode 100644 index 16f5b18a..00000000 Binary files a/objects/dual-tree/sandy-jungle-4.iob and /dev/null differ diff --git a/objects/elder-wood/ElderRedwood1.iob b/objects/elder-wood/ElderRedwood1.iob deleted file mode 100644 index 3c4235e3..00000000 Binary files a/objects/elder-wood/ElderRedwood1.iob and /dev/null differ diff --git a/objects/elder-wood/ElderRedwood10.iob b/objects/elder-wood/ElderRedwood10.iob deleted file mode 100644 index a7f60fb4..00000000 Binary files a/objects/elder-wood/ElderRedwood10.iob and /dev/null differ diff --git a/objects/elder-wood/ElderRedwood2.iob b/objects/elder-wood/ElderRedwood2.iob deleted file mode 100644 index d519f3cd..00000000 Binary files a/objects/elder-wood/ElderRedwood2.iob and /dev/null differ diff --git a/objects/elder-wood/ElderRedwood3.iob b/objects/elder-wood/ElderRedwood3.iob deleted file mode 100644 index f8455af2..00000000 Binary files a/objects/elder-wood/ElderRedwood3.iob and /dev/null differ diff --git a/objects/elder-wood/ElderRedwood4.iob b/objects/elder-wood/ElderRedwood4.iob deleted file mode 100644 index 2ce15721..00000000 Binary files a/objects/elder-wood/ElderRedwood4.iob and /dev/null differ diff --git a/objects/elder-wood/ElderRedwood5.iob b/objects/elder-wood/ElderRedwood5.iob deleted file mode 100644 index 4d6dedda..00000000 Binary files a/objects/elder-wood/ElderRedwood5.iob and /dev/null differ diff --git a/objects/elder-wood/ElderRedwood6.iob b/objects/elder-wood/ElderRedwood6.iob deleted file mode 100644 index c2c878a1..00000000 Binary files a/objects/elder-wood/ElderRedwood6.iob and /dev/null differ diff --git a/objects/elder-wood/ElderRedwood7.iob b/objects/elder-wood/ElderRedwood7.iob deleted file mode 100644 index a8f85135..00000000 Binary files a/objects/elder-wood/ElderRedwood7.iob and /dev/null differ diff --git a/objects/elder-wood/ElderRedwood8.iob b/objects/elder-wood/ElderRedwood8.iob deleted file mode 100644 index 49330341..00000000 Binary files a/objects/elder-wood/ElderRedwood8.iob and /dev/null differ diff --git a/objects/elder-wood/ElderRedwood9.iob b/objects/elder-wood/ElderRedwood9.iob deleted file mode 100644 index d215f5fd..00000000 Binary files a/objects/elder-wood/ElderRedwood9.iob and /dev/null differ diff --git a/objects/fossil/skull_1.iob b/objects/fossil/skull_1.iob deleted file mode 100644 index 8384c9cb..00000000 Binary files a/objects/fossil/skull_1.iob and /dev/null differ diff --git a/objects/fossil/skull_1_coal.iob b/objects/fossil/skull_1_coal.iob deleted file mode 100644 index 15252e55..00000000 Binary files a/objects/fossil/skull_1_coal.iob and /dev/null differ diff --git a/objects/fossil/skull_2.iob b/objects/fossil/skull_2.iob deleted file mode 100644 index eefc0e0d..00000000 Binary files a/objects/fossil/skull_2.iob and /dev/null differ diff --git a/objects/fossil/skull_2_coal.iob b/objects/fossil/skull_2_coal.iob deleted file mode 100644 index 3a0076ce..00000000 Binary files a/objects/fossil/skull_2_coal.iob and /dev/null differ diff --git a/objects/fossil/skull_3.iob b/objects/fossil/skull_3.iob deleted file mode 100644 index d6ae8722..00000000 Binary files a/objects/fossil/skull_3.iob and /dev/null differ diff --git a/objects/fossil/skull_3_coal.iob b/objects/fossil/skull_3_coal.iob deleted file mode 100644 index 1ee33adb..00000000 Binary files a/objects/fossil/skull_3_coal.iob and /dev/null differ diff --git a/objects/fossil/skull_4.iob b/objects/fossil/skull_4.iob deleted file mode 100644 index f8692b95..00000000 Binary files a/objects/fossil/skull_4.iob and /dev/null differ diff --git a/objects/fossil/skull_4_coal.iob b/objects/fossil/skull_4_coal.iob deleted file mode 100644 index 8093e1f7..00000000 Binary files a/objects/fossil/skull_4_coal.iob and /dev/null differ diff --git a/objects/fossil/spine_1.iob b/objects/fossil/spine_1.iob deleted file mode 100644 index 38bcdb8b..00000000 Binary files a/objects/fossil/spine_1.iob and /dev/null differ diff --git a/objects/fossil/spine_1_coal.iob b/objects/fossil/spine_1_coal.iob deleted file mode 100644 index 9702415c..00000000 Binary files a/objects/fossil/spine_1_coal.iob and /dev/null differ diff --git a/objects/fossil/spine_2.iob b/objects/fossil/spine_2.iob deleted file mode 100644 index 1879cbde..00000000 Binary files a/objects/fossil/spine_2.iob and /dev/null differ diff --git a/objects/fossil/spine_2_coal.iob b/objects/fossil/spine_2_coal.iob deleted file mode 100644 index c70782b4..00000000 Binary files a/objects/fossil/spine_2_coal.iob and /dev/null differ diff --git a/objects/fossil/spine_3.iob b/objects/fossil/spine_3.iob deleted file mode 100644 index 5572b5ba..00000000 Binary files a/objects/fossil/spine_3.iob and /dev/null differ diff --git a/objects/fossil/spine_3_coal.iob b/objects/fossil/spine_3_coal.iob deleted file mode 100644 index b94413ea..00000000 Binary files a/objects/fossil/spine_3_coal.iob and /dev/null differ diff --git a/objects/fossil/spine_4.iob b/objects/fossil/spine_4.iob deleted file mode 100644 index 7988c157..00000000 Binary files a/objects/fossil/spine_4.iob and /dev/null differ diff --git a/objects/fossil/spine_4_coal.iob b/objects/fossil/spine_4_coal.iob deleted file mode 100644 index 4ddeadf6..00000000 Binary files a/objects/fossil/spine_4_coal.iob and /dev/null differ diff --git a/objects/garbage/clutter-1.iob b/objects/garbage/clutter-1.iob deleted file mode 100644 index 97cf5061..00000000 Binary files a/objects/garbage/clutter-1.iob and /dev/null differ diff --git a/objects/garbage/clutter-2.iob b/objects/garbage/clutter-2.iob deleted file mode 100644 index 6f666386..00000000 Binary files a/objects/garbage/clutter-2.iob and /dev/null differ diff --git a/objects/garbage/clutter-3.iob b/objects/garbage/clutter-3.iob deleted file mode 100644 index 5db54929..00000000 Binary files a/objects/garbage/clutter-3.iob and /dev/null differ diff --git a/objects/garbage/clutter-4.iob b/objects/garbage/clutter-4.iob deleted file mode 100644 index 6e576713..00000000 Binary files a/objects/garbage/clutter-4.iob and /dev/null differ diff --git a/objects/gifts/blue-a.iob b/objects/gifts/blue-a.iob deleted file mode 100644 index 58c8763c..00000000 Binary files a/objects/gifts/blue-a.iob and /dev/null differ diff --git a/objects/gifts/blue.iob b/objects/gifts/blue.iob deleted file mode 100644 index 6e2d1790..00000000 Binary files a/objects/gifts/blue.iob and /dev/null differ diff --git a/objects/gifts/medium-blue-a.iob b/objects/gifts/medium-blue-a.iob deleted file mode 100644 index 177c4397..00000000 Binary files a/objects/gifts/medium-blue-a.iob and /dev/null differ diff --git a/objects/gifts/medium-blue.iob b/objects/gifts/medium-blue.iob deleted file mode 100644 index 9d075c42..00000000 Binary files a/objects/gifts/medium-blue.iob and /dev/null differ diff --git a/objects/gifts/medium-red-a.iob b/objects/gifts/medium-red-a.iob deleted file mode 100644 index 35f7a391..00000000 Binary files a/objects/gifts/medium-red-a.iob and /dev/null differ diff --git a/objects/gifts/medium-red.iob b/objects/gifts/medium-red.iob deleted file mode 100644 index d313968f..00000000 Binary files a/objects/gifts/medium-red.iob and /dev/null differ diff --git a/objects/gifts/red-a.iob b/objects/gifts/red-a.iob deleted file mode 100644 index 8e26bc04..00000000 Binary files a/objects/gifts/red-a.iob and /dev/null differ diff --git a/objects/gifts/red.iob b/objects/gifts/red.iob deleted file mode 100644 index 6ee28790..00000000 Binary files a/objects/gifts/red.iob and /dev/null differ diff --git a/objects/gifts/supermassive-blue-a.iob b/objects/gifts/supermassive-blue-a.iob deleted file mode 100644 index d6101657..00000000 Binary files a/objects/gifts/supermassive-blue-a.iob and /dev/null differ diff --git a/objects/gifts/supermassive-blue.iob b/objects/gifts/supermassive-blue.iob deleted file mode 100644 index a1f366e6..00000000 Binary files a/objects/gifts/supermassive-blue.iob and /dev/null differ diff --git a/objects/gifts/supermassive-green-a.iob b/objects/gifts/supermassive-green-a.iob deleted file mode 100644 index 8a457d97..00000000 Binary files a/objects/gifts/supermassive-green-a.iob and /dev/null differ diff --git a/objects/gifts/supermassive-green.iob b/objects/gifts/supermassive-green.iob deleted file mode 100644 index 8b745b4a..00000000 Binary files a/objects/gifts/supermassive-green.iob and /dev/null differ diff --git a/objects/gifts/supermassive-orange-a.iob b/objects/gifts/supermassive-orange-a.iob deleted file mode 100644 index e3cc0074..00000000 Binary files a/objects/gifts/supermassive-orange-a.iob and /dev/null differ diff --git a/objects/gifts/supermassive-orange.iob b/objects/gifts/supermassive-orange.iob deleted file mode 100644 index e7645a27..00000000 Binary files a/objects/gifts/supermassive-orange.iob and /dev/null differ diff --git a/objects/gifts/supermassive-purple-a.iob b/objects/gifts/supermassive-purple-a.iob deleted file mode 100644 index 46e408cc..00000000 Binary files a/objects/gifts/supermassive-purple-a.iob and /dev/null differ diff --git a/objects/gifts/supermassive-purple.iob b/objects/gifts/supermassive-purple.iob deleted file mode 100644 index d3f2e36b..00000000 Binary files a/objects/gifts/supermassive-purple.iob and /dev/null differ diff --git a/objects/gifts/supermassive-red-a.iob b/objects/gifts/supermassive-red-a.iob deleted file mode 100644 index 42767740..00000000 Binary files a/objects/gifts/supermassive-red-a.iob and /dev/null differ diff --git a/objects/gifts/supermassive-red.iob b/objects/gifts/supermassive-red.iob deleted file mode 100644 index 5d8ffb4b..00000000 Binary files a/objects/gifts/supermassive-red.iob and /dev/null differ diff --git a/objects/gifts/supermassive-yellow-a.iob b/objects/gifts/supermassive-yellow-a.iob deleted file mode 100644 index ff6f3f48..00000000 Binary files a/objects/gifts/supermassive-yellow-a.iob and /dev/null differ diff --git a/objects/gifts/supermassive-yellow.iob b/objects/gifts/supermassive-yellow.iob deleted file mode 100644 index f7e0c7c4..00000000 Binary files a/objects/gifts/supermassive-yellow.iob and /dev/null differ diff --git a/objects/global-clutter/BigSwordPortal-lit-1.iob b/objects/global-clutter/BigSwordPortal-lit-1.iob deleted file mode 100644 index a5c69203..00000000 Binary files a/objects/global-clutter/BigSwordPortal-lit-1.iob and /dev/null differ diff --git a/objects/global-clutter/BigSwordPortal-unlit-1.iob b/objects/global-clutter/BigSwordPortal-unlit-1.iob deleted file mode 100644 index 03f04e84..00000000 Binary files a/objects/global-clutter/BigSwordPortal-unlit-1.iob and /dev/null differ diff --git a/objects/global-clutter/BigSwordPortalSTR-lit-2.iob b/objects/global-clutter/BigSwordPortalSTR-lit-2.iob deleted file mode 100644 index c79522dd..00000000 Binary files a/objects/global-clutter/BigSwordPortalSTR-lit-2.iob and /dev/null differ diff --git a/objects/global-clutter/BigSwordPortalSTR-unlit-2.iob b/objects/global-clutter/BigSwordPortalSTR-unlit-2.iob deleted file mode 100644 index f10182a5..00000000 Binary files a/objects/global-clutter/BigSwordPortalSTR-unlit-2.iob and /dev/null differ diff --git a/objects/global-clutter/BrokSphinxToomb-1.iob b/objects/global-clutter/BrokSphinxToomb-1.iob deleted file mode 100644 index 4b1631be..00000000 Binary files a/objects/global-clutter/BrokSphinxToomb-1.iob and /dev/null differ diff --git a/objects/global-clutter/sphinxToomb-1.iob b/objects/global-clutter/sphinxToomb-1.iob deleted file mode 100644 index fe6f2173..00000000 Binary files a/objects/global-clutter/sphinxToomb-1.iob and /dev/null differ diff --git a/objects/grave/grave.iob b/objects/grave/grave.iob deleted file mode 100644 index b0dba8b0..00000000 Binary files a/objects/grave/grave.iob and /dev/null differ diff --git a/objects/hand-bone/boneHand1.iob b/objects/hand-bone/boneHand1.iob deleted file mode 100644 index 381966f5..00000000 Binary files a/objects/hand-bone/boneHand1.iob and /dev/null differ diff --git a/objects/hand-bone/boneHand2.iob b/objects/hand-bone/boneHand2.iob deleted file mode 100644 index 9103b9b1..00000000 Binary files a/objects/hand-bone/boneHand2.iob and /dev/null differ diff --git a/objects/hand-bone/boneHand3.iob b/objects/hand-bone/boneHand3.iob deleted file mode 100644 index 4b4a589c..00000000 Binary files a/objects/hand-bone/boneHand3.iob and /dev/null differ diff --git a/objects/hand-wood/HandJung1.iob b/objects/hand-wood/HandJung1.iob deleted file mode 100644 index 686ddf80..00000000 Binary files a/objects/hand-wood/HandJung1.iob and /dev/null differ diff --git a/objects/hand-wood/HandJung2.iob b/objects/hand-wood/HandJung2.iob deleted file mode 100644 index 522e13fa..00000000 Binary files a/objects/hand-wood/HandJung2.iob and /dev/null differ diff --git a/objects/hand-wood/HandJung3.iob b/objects/hand-wood/HandJung3.iob deleted file mode 100644 index 028f53cc..00000000 Binary files a/objects/hand-wood/HandJung3.iob and /dev/null differ diff --git a/objects/haybale/hay1.iob b/objects/haybale/hay1.iob deleted file mode 100644 index ec8d3168..00000000 Binary files a/objects/haybale/hay1.iob and /dev/null differ diff --git a/objects/haybale/hay2.iob b/objects/haybale/hay2.iob deleted file mode 100644 index 9e39049d..00000000 Binary files a/objects/haybale/hay2.iob and /dev/null differ diff --git a/objects/haybale/hay3.iob b/objects/haybale/hay3.iob deleted file mode 100644 index a78f031f..00000000 Binary files a/objects/haybale/hay3.iob and /dev/null differ diff --git a/objects/hive/honey-nest-1.iob b/objects/hive/honey-nest-1.iob deleted file mode 100644 index c491071f..00000000 Binary files a/objects/hive/honey-nest-1.iob and /dev/null differ diff --git a/objects/hive/honey-nest-10.iob b/objects/hive/honey-nest-10.iob deleted file mode 100644 index 09f36226..00000000 Binary files a/objects/hive/honey-nest-10.iob and /dev/null differ diff --git a/objects/hive/honey-nest-2.iob b/objects/hive/honey-nest-2.iob deleted file mode 100644 index f1f32da1..00000000 Binary files a/objects/hive/honey-nest-2.iob and /dev/null differ diff --git a/objects/hive/honey-nest-3.iob b/objects/hive/honey-nest-3.iob deleted file mode 100644 index 67af2760..00000000 Binary files a/objects/hive/honey-nest-3.iob and /dev/null differ diff --git a/objects/hive/honey-nest-4.iob b/objects/hive/honey-nest-4.iob deleted file mode 100644 index fd5e7ba7..00000000 Binary files a/objects/hive/honey-nest-4.iob and /dev/null differ diff --git a/objects/hive/honey-nest-5.iob b/objects/hive/honey-nest-5.iob deleted file mode 100644 index 50a8f5a4..00000000 Binary files a/objects/hive/honey-nest-5.iob and /dev/null differ diff --git a/objects/hive/honey-nest-6.iob b/objects/hive/honey-nest-6.iob deleted file mode 100644 index a2321c0f..00000000 Binary files a/objects/hive/honey-nest-6.iob and /dev/null differ diff --git a/objects/hive/honey-nest-7.iob b/objects/hive/honey-nest-7.iob deleted file mode 100644 index bdbe77ea..00000000 Binary files a/objects/hive/honey-nest-7.iob and /dev/null differ diff --git a/objects/hive/honey-nest-8.iob b/objects/hive/honey-nest-8.iob deleted file mode 100644 index ad85dd2d..00000000 Binary files a/objects/hive/honey-nest-8.iob and /dev/null differ diff --git a/objects/hive/honey-nest-9.iob b/objects/hive/honey-nest-9.iob deleted file mode 100644 index 918a4d50..00000000 Binary files a/objects/hive/honey-nest-9.iob and /dev/null differ diff --git a/objects/honey-tree/honey-1.iob b/objects/honey-tree/honey-1.iob deleted file mode 100644 index b971020d..00000000 Binary files a/objects/honey-tree/honey-1.iob and /dev/null differ diff --git a/objects/honey-tree/honey-10.iob b/objects/honey-tree/honey-10.iob deleted file mode 100644 index 02ad5467..00000000 Binary files a/objects/honey-tree/honey-10.iob and /dev/null differ diff --git a/objects/honey-tree/honey-11.iob b/objects/honey-tree/honey-11.iob deleted file mode 100644 index dc7f71d3..00000000 Binary files a/objects/honey-tree/honey-11.iob and /dev/null differ diff --git a/objects/honey-tree/honey-12.iob b/objects/honey-tree/honey-12.iob deleted file mode 100644 index 52d0debb..00000000 Binary files a/objects/honey-tree/honey-12.iob and /dev/null differ diff --git a/objects/honey-tree/honey-13.iob b/objects/honey-tree/honey-13.iob deleted file mode 100644 index e0121694..00000000 Binary files a/objects/honey-tree/honey-13.iob and /dev/null differ diff --git a/objects/honey-tree/honey-14.iob b/objects/honey-tree/honey-14.iob deleted file mode 100644 index feb22967..00000000 Binary files a/objects/honey-tree/honey-14.iob and /dev/null differ diff --git a/objects/honey-tree/honey-15.iob b/objects/honey-tree/honey-15.iob deleted file mode 100644 index b4f385b5..00000000 Binary files a/objects/honey-tree/honey-15.iob and /dev/null differ diff --git a/objects/honey-tree/honey-16.iob b/objects/honey-tree/honey-16.iob deleted file mode 100644 index f6fbd5cd..00000000 Binary files a/objects/honey-tree/honey-16.iob and /dev/null differ diff --git a/objects/honey-tree/honey-17.iob b/objects/honey-tree/honey-17.iob deleted file mode 100644 index 60d1f564..00000000 Binary files a/objects/honey-tree/honey-17.iob and /dev/null differ diff --git a/objects/honey-tree/honey-18.iob b/objects/honey-tree/honey-18.iob deleted file mode 100644 index 1faf2bc2..00000000 Binary files a/objects/honey-tree/honey-18.iob and /dev/null differ diff --git a/objects/honey-tree/honey-19.iob b/objects/honey-tree/honey-19.iob deleted file mode 100644 index 3790ab7e..00000000 Binary files a/objects/honey-tree/honey-19.iob and /dev/null differ diff --git a/objects/honey-tree/honey-2.iob b/objects/honey-tree/honey-2.iob deleted file mode 100644 index 55846db9..00000000 Binary files a/objects/honey-tree/honey-2.iob and /dev/null differ diff --git a/objects/honey-tree/honey-20.iob b/objects/honey-tree/honey-20.iob deleted file mode 100644 index 19125f07..00000000 Binary files a/objects/honey-tree/honey-20.iob and /dev/null differ diff --git a/objects/honey-tree/honey-3.iob b/objects/honey-tree/honey-3.iob deleted file mode 100644 index 89f3effe..00000000 Binary files a/objects/honey-tree/honey-3.iob and /dev/null differ diff --git a/objects/honey-tree/honey-4.iob b/objects/honey-tree/honey-4.iob deleted file mode 100644 index 8e2800ac..00000000 Binary files a/objects/honey-tree/honey-4.iob and /dev/null differ diff --git a/objects/honey-tree/honey-5.iob b/objects/honey-tree/honey-5.iob deleted file mode 100644 index 87b673b0..00000000 Binary files a/objects/honey-tree/honey-5.iob and /dev/null differ diff --git a/objects/honey-tree/honey-6.iob b/objects/honey-tree/honey-6.iob deleted file mode 100644 index 67080c51..00000000 Binary files a/objects/honey-tree/honey-6.iob and /dev/null differ diff --git a/objects/honey-tree/honey-7.iob b/objects/honey-tree/honey-7.iob deleted file mode 100644 index 509ef129..00000000 Binary files a/objects/honey-tree/honey-7.iob and /dev/null differ diff --git a/objects/honey-tree/honey-8.iob b/objects/honey-tree/honey-8.iob deleted file mode 100644 index 8f29439f..00000000 Binary files a/objects/honey-tree/honey-8.iob and /dev/null differ diff --git a/objects/honey-tree/honey-9.iob b/objects/honey-tree/honey-9.iob deleted file mode 100644 index 04d2d61b..00000000 Binary files a/objects/honey-tree/honey-9.iob and /dev/null differ diff --git a/objects/house-jap/MedJap1.iob b/objects/house-jap/MedJap1.iob deleted file mode 100644 index fe0da7fa..00000000 Binary files a/objects/house-jap/MedJap1.iob and /dev/null differ diff --git a/objects/house-jap/MedJap10.iob b/objects/house-jap/MedJap10.iob deleted file mode 100644 index a7f99377..00000000 Binary files a/objects/house-jap/MedJap10.iob and /dev/null differ diff --git a/objects/house-jap/MedJap2.iob b/objects/house-jap/MedJap2.iob deleted file mode 100644 index 5d4e4f37..00000000 Binary files a/objects/house-jap/MedJap2.iob and /dev/null differ diff --git a/objects/house-jap/MedJap3.iob b/objects/house-jap/MedJap3.iob deleted file mode 100644 index 8d3fa82b..00000000 Binary files a/objects/house-jap/MedJap3.iob and /dev/null differ diff --git a/objects/house-jap/MedJap4.iob b/objects/house-jap/MedJap4.iob deleted file mode 100644 index 390f3d11..00000000 Binary files a/objects/house-jap/MedJap4.iob and /dev/null differ diff --git a/objects/house-jap/MedJap5.iob b/objects/house-jap/MedJap5.iob deleted file mode 100644 index 1e527139..00000000 Binary files a/objects/house-jap/MedJap5.iob and /dev/null differ diff --git a/objects/house-jap/MedJap6.iob b/objects/house-jap/MedJap6.iob deleted file mode 100644 index 430d042b..00000000 Binary files a/objects/house-jap/MedJap6.iob and /dev/null differ diff --git a/objects/house-jap/MedJap7.iob b/objects/house-jap/MedJap7.iob deleted file mode 100644 index 0a47d1ea..00000000 Binary files a/objects/house-jap/MedJap7.iob and /dev/null differ diff --git a/objects/house-jap/MedJap8.iob b/objects/house-jap/MedJap8.iob deleted file mode 100644 index 312df849..00000000 Binary files a/objects/house-jap/MedJap8.iob and /dev/null differ diff --git a/objects/house-jap/MedJap9.iob b/objects/house-jap/MedJap9.iob deleted file mode 100644 index 1aa3f3b2..00000000 Binary files a/objects/house-jap/MedJap9.iob and /dev/null differ diff --git a/objects/ice-spikes/ic-1.iob b/objects/ice-spikes/ic-1.iob deleted file mode 100644 index 590438c2..00000000 Binary files a/objects/ice-spikes/ic-1.iob and /dev/null differ diff --git a/objects/ice-spikes/ic-10.iob b/objects/ice-spikes/ic-10.iob deleted file mode 100644 index 174ab968..00000000 Binary files a/objects/ice-spikes/ic-10.iob and /dev/null differ diff --git a/objects/ice-spikes/ic-11.iob b/objects/ice-spikes/ic-11.iob deleted file mode 100644 index 382b85e5..00000000 Binary files a/objects/ice-spikes/ic-11.iob and /dev/null differ diff --git a/objects/ice-spikes/ic-2.iob b/objects/ice-spikes/ic-2.iob deleted file mode 100644 index 9c8ffea9..00000000 Binary files a/objects/ice-spikes/ic-2.iob and /dev/null differ diff --git a/objects/ice-spikes/ic-3.iob b/objects/ice-spikes/ic-3.iob deleted file mode 100644 index eeb29498..00000000 Binary files a/objects/ice-spikes/ic-3.iob and /dev/null differ diff --git a/objects/ice-spikes/ic-4.iob b/objects/ice-spikes/ic-4.iob deleted file mode 100644 index a9c4a07d..00000000 Binary files a/objects/ice-spikes/ic-4.iob and /dev/null differ diff --git a/objects/ice-spikes/ic-5.iob b/objects/ice-spikes/ic-5.iob deleted file mode 100644 index 980336cd..00000000 Binary files a/objects/ice-spikes/ic-5.iob and /dev/null differ diff --git a/objects/ice-spikes/ic-6.iob b/objects/ice-spikes/ic-6.iob deleted file mode 100644 index 6f5ac881..00000000 Binary files a/objects/ice-spikes/ic-6.iob and /dev/null differ diff --git a/objects/ice-spikes/ic-7.iob b/objects/ice-spikes/ic-7.iob deleted file mode 100644 index 960bff67..00000000 Binary files a/objects/ice-spikes/ic-7.iob and /dev/null differ diff --git a/objects/ice-spikes/ic-8.iob b/objects/ice-spikes/ic-8.iob deleted file mode 100644 index 8c1585c8..00000000 Binary files a/objects/ice-spikes/ic-8.iob and /dev/null differ diff --git a/objects/ice-spikes/ic-9.iob b/objects/ice-spikes/ic-9.iob deleted file mode 100644 index d85665b1..00000000 Binary files a/objects/ice-spikes/ic-9.iob and /dev/null differ diff --git a/objects/ice-spikes/ice-spec-1.iob b/objects/ice-spikes/ice-spec-1.iob deleted file mode 100644 index cef052c8..00000000 Binary files a/objects/ice-spikes/ice-spec-1.iob and /dev/null differ diff --git a/objects/ice-spikes/ice-spec-2.iob b/objects/ice-spikes/ice-spec-2.iob deleted file mode 100644 index 88c77cbd..00000000 Binary files a/objects/ice-spikes/ice-spec-2.iob and /dev/null differ diff --git a/objects/ice-spikes/ice-spec-3.iob b/objects/ice-spikes/ice-spec-3.iob deleted file mode 100644 index ca0a877e..00000000 Binary files a/objects/ice-spikes/ice-spec-3.iob and /dev/null differ diff --git a/objects/ice-spikes/ice-spec-4.iob b/objects/ice-spikes/ice-spec-4.iob deleted file mode 100644 index 61ef8907..00000000 Binary files a/objects/ice-spikes/ice-spec-4.iob and /dev/null differ diff --git a/objects/ice-spikes/ice-spec-5.iob b/objects/ice-spikes/ice-spec-5.iob deleted file mode 100644 index ff53b7bd..00000000 Binary files a/objects/ice-spikes/ice-spec-5.iob and /dev/null differ diff --git a/objects/ice-spikes/smol-ice-spike-1.iob b/objects/ice-spikes/smol-ice-spike-1.iob deleted file mode 100644 index f146bbac..00000000 Binary files a/objects/ice-spikes/smol-ice-spike-1.iob and /dev/null differ diff --git a/objects/ice-spikes/smol-ice-spike-2.iob b/objects/ice-spikes/smol-ice-spike-2.iob deleted file mode 100644 index 7f4f267e..00000000 Binary files a/objects/ice-spikes/smol-ice-spike-2.iob and /dev/null differ diff --git a/objects/ice-spikes/smol-ice-spike-3.iob b/objects/ice-spikes/smol-ice-spike-3.iob deleted file mode 100644 index 261b01ee..00000000 Binary files a/objects/ice-spikes/smol-ice-spike-3.iob and /dev/null differ diff --git a/objects/ice-spikes/smol-ice-spike-4.iob b/objects/ice-spikes/smol-ice-spike-4.iob deleted file mode 100644 index 9cc92b27..00000000 Binary files a/objects/ice-spikes/smol-ice-spike-4.iob and /dev/null differ diff --git a/objects/ice-spikes/smol-ice-spike-5.iob b/objects/ice-spikes/smol-ice-spike-5.iob deleted file mode 100644 index a88282b1..00000000 Binary files a/objects/ice-spikes/smol-ice-spike-5.iob and /dev/null differ diff --git a/objects/ice-spikes/smol-ice-spike-6.iob b/objects/ice-spikes/smol-ice-spike-6.iob deleted file mode 100644 index 61eb0892..00000000 Binary files a/objects/ice-spikes/smol-ice-spike-6.iob and /dev/null differ diff --git a/objects/ice-spikes/smol-ice-spike-7.iob b/objects/ice-spikes/smol-ice-spike-7.iob deleted file mode 100644 index 6d47bfa9..00000000 Binary files a/objects/ice-spikes/smol-ice-spike-7.iob and /dev/null differ diff --git a/objects/ice-spikes/smol-ice-spike-8.iob b/objects/ice-spikes/smol-ice-spike-8.iob deleted file mode 100644 index 54d60398..00000000 Binary files a/objects/ice-spikes/smol-ice-spike-8.iob and /dev/null differ diff --git a/objects/ice-spikes/smol-ice-spike-9.iob b/objects/ice-spikes/smol-ice-spike-9.iob deleted file mode 100644 index 2cd04144..00000000 Binary files a/objects/ice-spikes/smol-ice-spike-9.iob and /dev/null differ diff --git a/objects/ice-spikes/sp-1.iob b/objects/ice-spikes/sp-1.iob deleted file mode 100644 index a3302d8a..00000000 Binary files a/objects/ice-spikes/sp-1.iob and /dev/null differ diff --git a/objects/ice-spikes/sp-2.iob b/objects/ice-spikes/sp-2.iob deleted file mode 100644 index 7e51c67c..00000000 Binary files a/objects/ice-spikes/sp-2.iob and /dev/null differ diff --git a/objects/ice-spikes/sp-3.iob b/objects/ice-spikes/sp-3.iob deleted file mode 100644 index d1262405..00000000 Binary files a/objects/ice-spikes/sp-3.iob and /dev/null differ diff --git a/objects/ice-spikes/sp-4.iob b/objects/ice-spikes/sp-4.iob deleted file mode 100644 index a7d1b4dd..00000000 Binary files a/objects/ice-spikes/sp-4.iob and /dev/null differ diff --git a/objects/ice-spikes/sp-5.iob b/objects/ice-spikes/sp-5.iob deleted file mode 100644 index bd75e539..00000000 Binary files a/objects/ice-spikes/sp-5.iob and /dev/null differ diff --git a/objects/ice-spikes/tp-1.iob b/objects/ice-spikes/tp-1.iob deleted file mode 100644 index 04afb8e3..00000000 Binary files a/objects/ice-spikes/tp-1.iob and /dev/null differ diff --git a/objects/ice-spikes/tp-2.iob b/objects/ice-spikes/tp-2.iob deleted file mode 100644 index caf4601e..00000000 Binary files a/objects/ice-spikes/tp-2.iob and /dev/null differ diff --git a/objects/ice-spikes/tp-3.iob b/objects/ice-spikes/tp-3.iob deleted file mode 100644 index 733aae72..00000000 Binary files a/objects/ice-spikes/tp-3.iob and /dev/null differ diff --git a/objects/ice-spikes/tp-4.iob b/objects/ice-spikes/tp-4.iob deleted file mode 100644 index 6fcd4b83..00000000 Binary files a/objects/ice-spikes/tp-4.iob and /dev/null differ diff --git a/objects/bastion/blocks/air.iob b/objects/jigsaw/bastion/blocks/air.iob similarity index 100% rename from objects/bastion/blocks/air.iob rename to objects/jigsaw/bastion/blocks/air.iob diff --git a/objects/bastion/blocks/gold.iob b/objects/jigsaw/bastion/blocks/gold.iob similarity index 100% rename from objects/bastion/blocks/gold.iob rename to objects/jigsaw/bastion/blocks/gold.iob diff --git a/objects/bastion/bridge/bridge_pieces/bridge.iob b/objects/jigsaw/bastion/bridge/bridge_pieces/bridge.iob similarity index 100% rename from objects/bastion/bridge/bridge_pieces/bridge.iob rename to objects/jigsaw/bastion/bridge/bridge_pieces/bridge.iob diff --git a/objects/bastion/bridge/connectors/back_bridge_bottom.iob b/objects/jigsaw/bastion/bridge/connectors/back_bridge_bottom.iob similarity index 100% rename from objects/bastion/bridge/connectors/back_bridge_bottom.iob rename to objects/jigsaw/bastion/bridge/connectors/back_bridge_bottom.iob diff --git a/objects/bastion/bridge/connectors/back_bridge_top.iob b/objects/jigsaw/bastion/bridge/connectors/back_bridge_top.iob similarity index 100% rename from objects/bastion/bridge/connectors/back_bridge_top.iob rename to objects/jigsaw/bastion/bridge/connectors/back_bridge_top.iob diff --git a/objects/bastion/bridge/legs/leg_0.iob b/objects/jigsaw/bastion/bridge/legs/leg_0.iob similarity index 100% rename from objects/bastion/bridge/legs/leg_0.iob rename to objects/jigsaw/bastion/bridge/legs/leg_0.iob diff --git a/objects/bastion/bridge/legs/leg_1.iob b/objects/jigsaw/bastion/bridge/legs/leg_1.iob similarity index 100% rename from objects/bastion/bridge/legs/leg_1.iob rename to objects/jigsaw/bastion/bridge/legs/leg_1.iob diff --git a/objects/bastion/bridge/rampart_plates/plate_0.iob b/objects/jigsaw/bastion/bridge/rampart_plates/plate_0.iob similarity index 100% rename from objects/bastion/bridge/rampart_plates/plate_0.iob rename to objects/jigsaw/bastion/bridge/rampart_plates/plate_0.iob diff --git a/objects/bastion/bridge/ramparts/rampart_0.iob b/objects/jigsaw/bastion/bridge/ramparts/rampart_0.iob similarity index 100% rename from objects/bastion/bridge/ramparts/rampart_0.iob rename to objects/jigsaw/bastion/bridge/ramparts/rampart_0.iob diff --git a/objects/bastion/bridge/ramparts/rampart_1.iob b/objects/jigsaw/bastion/bridge/ramparts/rampart_1.iob similarity index 100% rename from objects/bastion/bridge/ramparts/rampart_1.iob rename to objects/jigsaw/bastion/bridge/ramparts/rampart_1.iob diff --git a/objects/bastion/bridge/starting_pieces/entrance.iob b/objects/jigsaw/bastion/bridge/starting_pieces/entrance.iob similarity index 100% rename from objects/bastion/bridge/starting_pieces/entrance.iob rename to objects/jigsaw/bastion/bridge/starting_pieces/entrance.iob diff --git a/objects/bastion/bridge/starting_pieces/entrance_base.iob b/objects/jigsaw/bastion/bridge/starting_pieces/entrance_base.iob similarity index 100% rename from objects/bastion/bridge/starting_pieces/entrance_base.iob rename to objects/jigsaw/bastion/bridge/starting_pieces/entrance_base.iob diff --git a/objects/bastion/bridge/starting_pieces/entrance_face.iob b/objects/jigsaw/bastion/bridge/starting_pieces/entrance_face.iob similarity index 100% rename from objects/bastion/bridge/starting_pieces/entrance_face.iob rename to objects/jigsaw/bastion/bridge/starting_pieces/entrance_face.iob diff --git a/objects/bastion/bridge/walls/wall_base_0.iob b/objects/jigsaw/bastion/bridge/walls/wall_base_0.iob similarity index 100% rename from objects/bastion/bridge/walls/wall_base_0.iob rename to objects/jigsaw/bastion/bridge/walls/wall_base_0.iob diff --git a/objects/bastion/bridge/walls/wall_base_1.iob b/objects/jigsaw/bastion/bridge/walls/wall_base_1.iob similarity index 100% rename from objects/bastion/bridge/walls/wall_base_1.iob rename to objects/jigsaw/bastion/bridge/walls/wall_base_1.iob diff --git a/objects/bastion/hoglin_stable/air_base.iob b/objects/jigsaw/bastion/hoglin_stable/air_base.iob similarity index 100% rename from objects/bastion/hoglin_stable/air_base.iob rename to objects/jigsaw/bastion/hoglin_stable/air_base.iob diff --git a/objects/bastion/hoglin_stable/connectors/end_post_connector.iob b/objects/jigsaw/bastion/hoglin_stable/connectors/end_post_connector.iob similarity index 100% rename from objects/bastion/hoglin_stable/connectors/end_post_connector.iob rename to objects/jigsaw/bastion/hoglin_stable/connectors/end_post_connector.iob diff --git a/objects/bastion/hoglin_stable/large_stables/inner_0.iob b/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_0.iob similarity index 100% rename from objects/bastion/hoglin_stable/large_stables/inner_0.iob rename to objects/jigsaw/bastion/hoglin_stable/large_stables/inner_0.iob diff --git a/objects/bastion/hoglin_stable/large_stables/inner_1.iob b/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_1.iob similarity index 100% rename from objects/bastion/hoglin_stable/large_stables/inner_1.iob rename to objects/jigsaw/bastion/hoglin_stable/large_stables/inner_1.iob diff --git a/objects/bastion/hoglin_stable/large_stables/inner_2.iob b/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_2.iob similarity index 100% rename from objects/bastion/hoglin_stable/large_stables/inner_2.iob rename to objects/jigsaw/bastion/hoglin_stable/large_stables/inner_2.iob diff --git a/objects/bastion/hoglin_stable/large_stables/inner_3.iob b/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_3.iob similarity index 100% rename from objects/bastion/hoglin_stable/large_stables/inner_3.iob rename to objects/jigsaw/bastion/hoglin_stable/large_stables/inner_3.iob diff --git a/objects/bastion/hoglin_stable/large_stables/inner_4.iob b/objects/jigsaw/bastion/hoglin_stable/large_stables/inner_4.iob similarity index 100% rename from objects/bastion/hoglin_stable/large_stables/inner_4.iob rename to objects/jigsaw/bastion/hoglin_stable/large_stables/inner_4.iob diff --git a/objects/bastion/hoglin_stable/large_stables/outer_0.iob b/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_0.iob similarity index 100% rename from objects/bastion/hoglin_stable/large_stables/outer_0.iob rename to objects/jigsaw/bastion/hoglin_stable/large_stables/outer_0.iob diff --git a/objects/bastion/hoglin_stable/large_stables/outer_1.iob b/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_1.iob similarity index 100% rename from objects/bastion/hoglin_stable/large_stables/outer_1.iob rename to objects/jigsaw/bastion/hoglin_stable/large_stables/outer_1.iob diff --git a/objects/bastion/hoglin_stable/large_stables/outer_2.iob b/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_2.iob similarity index 100% rename from objects/bastion/hoglin_stable/large_stables/outer_2.iob rename to objects/jigsaw/bastion/hoglin_stable/large_stables/outer_2.iob diff --git a/objects/bastion/hoglin_stable/large_stables/outer_3.iob b/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_3.iob similarity index 100% rename from objects/bastion/hoglin_stable/large_stables/outer_3.iob rename to objects/jigsaw/bastion/hoglin_stable/large_stables/outer_3.iob diff --git a/objects/bastion/hoglin_stable/large_stables/outer_4.iob b/objects/jigsaw/bastion/hoglin_stable/large_stables/outer_4.iob similarity index 100% rename from objects/bastion/hoglin_stable/large_stables/outer_4.iob rename to objects/jigsaw/bastion/hoglin_stable/large_stables/outer_4.iob diff --git a/objects/bastion/hoglin_stable/posts/end_post.iob b/objects/jigsaw/bastion/hoglin_stable/posts/end_post.iob similarity index 100% rename from objects/bastion/hoglin_stable/posts/end_post.iob rename to objects/jigsaw/bastion/hoglin_stable/posts/end_post.iob diff --git a/objects/bastion/hoglin_stable/posts/stair_post.iob b/objects/jigsaw/bastion/hoglin_stable/posts/stair_post.iob similarity index 100% rename from objects/bastion/hoglin_stable/posts/stair_post.iob rename to objects/jigsaw/bastion/hoglin_stable/posts/stair_post.iob diff --git a/objects/bastion/hoglin_stable/rampart_plates/rampart_plate_1.iob b/objects/jigsaw/bastion/hoglin_stable/rampart_plates/rampart_plate_1.iob similarity index 100% rename from objects/bastion/hoglin_stable/rampart_plates/rampart_plate_1.iob rename to objects/jigsaw/bastion/hoglin_stable/rampart_plates/rampart_plate_1.iob diff --git a/objects/bastion/hoglin_stable/ramparts/ramparts_1.iob b/objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_1.iob similarity index 100% rename from objects/bastion/hoglin_stable/ramparts/ramparts_1.iob rename to objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_1.iob diff --git a/objects/bastion/hoglin_stable/ramparts/ramparts_2.iob b/objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_2.iob similarity index 100% rename from objects/bastion/hoglin_stable/ramparts/ramparts_2.iob rename to objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_2.iob diff --git a/objects/bastion/hoglin_stable/ramparts/ramparts_3.iob b/objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_3.iob similarity index 100% rename from objects/bastion/hoglin_stable/ramparts/ramparts_3.iob rename to objects/jigsaw/bastion/hoglin_stable/ramparts/ramparts_3.iob diff --git a/objects/bastion/hoglin_stable/small_stables/inner_0.iob b/objects/jigsaw/bastion/hoglin_stable/small_stables/inner_0.iob similarity index 100% rename from objects/bastion/hoglin_stable/small_stables/inner_0.iob rename to objects/jigsaw/bastion/hoglin_stable/small_stables/inner_0.iob diff --git a/objects/bastion/hoglin_stable/small_stables/inner_1.iob b/objects/jigsaw/bastion/hoglin_stable/small_stables/inner_1.iob similarity index 100% rename from objects/bastion/hoglin_stable/small_stables/inner_1.iob rename to objects/jigsaw/bastion/hoglin_stable/small_stables/inner_1.iob diff --git a/objects/bastion/hoglin_stable/small_stables/inner_2.iob b/objects/jigsaw/bastion/hoglin_stable/small_stables/inner_2.iob similarity index 100% rename from objects/bastion/hoglin_stable/small_stables/inner_2.iob rename to objects/jigsaw/bastion/hoglin_stable/small_stables/inner_2.iob diff --git a/objects/bastion/hoglin_stable/small_stables/inner_3.iob b/objects/jigsaw/bastion/hoglin_stable/small_stables/inner_3.iob similarity index 100% rename from objects/bastion/hoglin_stable/small_stables/inner_3.iob rename to objects/jigsaw/bastion/hoglin_stable/small_stables/inner_3.iob diff --git a/objects/bastion/hoglin_stable/small_stables/outer_0.iob b/objects/jigsaw/bastion/hoglin_stable/small_stables/outer_0.iob similarity index 100% rename from objects/bastion/hoglin_stable/small_stables/outer_0.iob rename to objects/jigsaw/bastion/hoglin_stable/small_stables/outer_0.iob diff --git a/objects/bastion/hoglin_stable/small_stables/outer_1.iob b/objects/jigsaw/bastion/hoglin_stable/small_stables/outer_1.iob similarity index 100% rename from objects/bastion/hoglin_stable/small_stables/outer_1.iob rename to objects/jigsaw/bastion/hoglin_stable/small_stables/outer_1.iob diff --git a/objects/bastion/hoglin_stable/small_stables/outer_2.iob b/objects/jigsaw/bastion/hoglin_stable/small_stables/outer_2.iob similarity index 100% rename from objects/bastion/hoglin_stable/small_stables/outer_2.iob rename to objects/jigsaw/bastion/hoglin_stable/small_stables/outer_2.iob diff --git a/objects/bastion/hoglin_stable/small_stables/outer_3.iob b/objects/jigsaw/bastion/hoglin_stable/small_stables/outer_3.iob similarity index 100% rename from objects/bastion/hoglin_stable/small_stables/outer_3.iob rename to objects/jigsaw/bastion/hoglin_stable/small_stables/outer_3.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_1_0.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_0.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_1_0.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_0.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_1_1.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_1.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_1_1.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_1.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_1_2.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_2.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_1_2.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_2.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_1_3.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_3.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_1_3.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_3.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_1_4.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_4.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_1_4.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_1_4.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_2_0.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_0.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_2_0.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_0.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_2_1.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_1.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_2_1.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_1.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_2_2.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_2.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_2_2.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_2.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_2_3.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_3.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_2_3.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_3.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_2_4.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_4.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_2_4.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_2_4.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_3_0.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_0.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_3_0.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_0.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_3_1.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_1.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_3_1.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_1.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_3_2.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_2.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_3_2.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_2.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_3_3.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_3.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_3_3.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_3.iob diff --git a/objects/bastion/hoglin_stable/stairs/stairs_3_4.iob b/objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_4.iob similarity index 100% rename from objects/bastion/hoglin_stable/stairs/stairs_3_4.iob rename to objects/jigsaw/bastion/hoglin_stable/stairs/stairs_3_4.iob diff --git a/objects/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.iob b/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.iob similarity index 100% rename from objects/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.iob rename to objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_0_mirrored.iob diff --git a/objects/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.iob b/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.iob similarity index 100% rename from objects/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.iob rename to objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_1_mirrored.iob diff --git a/objects/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.iob b/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.iob similarity index 100% rename from objects/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.iob rename to objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_2_mirrored.iob diff --git a/objects/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.iob b/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.iob similarity index 100% rename from objects/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.iob rename to objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_3_mirrored.iob diff --git a/objects/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.iob b/objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.iob similarity index 100% rename from objects/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.iob rename to objects/jigsaw/bastion/hoglin_stable/starting_pieces/stairs_4_mirrored.iob diff --git a/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_0.iob b/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_0.iob similarity index 100% rename from objects/bastion/hoglin_stable/starting_pieces/starting_stairs_0.iob rename to objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_0.iob diff --git a/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_1.iob b/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_1.iob similarity index 100% rename from objects/bastion/hoglin_stable/starting_pieces/starting_stairs_1.iob rename to objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_1.iob diff --git a/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_2.iob b/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_2.iob similarity index 100% rename from objects/bastion/hoglin_stable/starting_pieces/starting_stairs_2.iob rename to objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_2.iob diff --git a/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_3.iob b/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_3.iob similarity index 100% rename from objects/bastion/hoglin_stable/starting_pieces/starting_stairs_3.iob rename to objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_3.iob diff --git a/objects/bastion/hoglin_stable/starting_pieces/starting_stairs_4.iob b/objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_4.iob similarity index 100% rename from objects/bastion/hoglin_stable/starting_pieces/starting_stairs_4.iob rename to objects/jigsaw/bastion/hoglin_stable/starting_pieces/starting_stairs_4.iob diff --git a/objects/bastion/hoglin_stable/walls/side_wall_0.iob b/objects/jigsaw/bastion/hoglin_stable/walls/side_wall_0.iob similarity index 100% rename from objects/bastion/hoglin_stable/walls/side_wall_0.iob rename to objects/jigsaw/bastion/hoglin_stable/walls/side_wall_0.iob diff --git a/objects/bastion/hoglin_stable/walls/side_wall_1.iob b/objects/jigsaw/bastion/hoglin_stable/walls/side_wall_1.iob similarity index 100% rename from objects/bastion/hoglin_stable/walls/side_wall_1.iob rename to objects/jigsaw/bastion/hoglin_stable/walls/side_wall_1.iob diff --git a/objects/bastion/hoglin_stable/walls/wall_base.iob b/objects/jigsaw/bastion/hoglin_stable/walls/wall_base.iob similarity index 100% rename from objects/bastion/hoglin_stable/walls/wall_base.iob rename to objects/jigsaw/bastion/hoglin_stable/walls/wall_base.iob diff --git a/objects/bastion/mobs/crossbow_piglin.iob b/objects/jigsaw/bastion/mobs/crossbow_piglin.iob similarity index 100% rename from objects/bastion/mobs/crossbow_piglin.iob rename to objects/jigsaw/bastion/mobs/crossbow_piglin.iob diff --git a/objects/bastion/mobs/empty.iob b/objects/jigsaw/bastion/mobs/empty.iob similarity index 100% rename from objects/bastion/mobs/empty.iob rename to objects/jigsaw/bastion/mobs/empty.iob diff --git a/objects/bastion/mobs/hoglin.iob b/objects/jigsaw/bastion/mobs/hoglin.iob similarity index 100% rename from objects/bastion/mobs/hoglin.iob rename to objects/jigsaw/bastion/mobs/hoglin.iob diff --git a/objects/bastion/mobs/melee_piglin.iob b/objects/jigsaw/bastion/mobs/melee_piglin.iob similarity index 100% rename from objects/bastion/mobs/melee_piglin.iob rename to objects/jigsaw/bastion/mobs/melee_piglin.iob diff --git a/objects/bastion/mobs/melee_piglin_always.iob b/objects/jigsaw/bastion/mobs/melee_piglin_always.iob similarity index 100% rename from objects/bastion/mobs/melee_piglin_always.iob rename to objects/jigsaw/bastion/mobs/melee_piglin_always.iob diff --git a/objects/bastion/mobs/sword_piglin.iob b/objects/jigsaw/bastion/mobs/sword_piglin.iob similarity index 100% rename from objects/bastion/mobs/sword_piglin.iob rename to objects/jigsaw/bastion/mobs/sword_piglin.iob diff --git a/objects/bastion/treasure/bases/centers/center_0.iob b/objects/jigsaw/bastion/treasure/bases/centers/center_0.iob similarity index 100% rename from objects/bastion/treasure/bases/centers/center_0.iob rename to objects/jigsaw/bastion/treasure/bases/centers/center_0.iob diff --git a/objects/bastion/treasure/bases/centers/center_1.iob b/objects/jigsaw/bastion/treasure/bases/centers/center_1.iob similarity index 100% rename from objects/bastion/treasure/bases/centers/center_1.iob rename to objects/jigsaw/bastion/treasure/bases/centers/center_1.iob diff --git a/objects/bastion/treasure/bases/centers/center_2.iob b/objects/jigsaw/bastion/treasure/bases/centers/center_2.iob similarity index 100% rename from objects/bastion/treasure/bases/centers/center_2.iob rename to objects/jigsaw/bastion/treasure/bases/centers/center_2.iob diff --git a/objects/bastion/treasure/bases/centers/center_3.iob b/objects/jigsaw/bastion/treasure/bases/centers/center_3.iob similarity index 100% rename from objects/bastion/treasure/bases/centers/center_3.iob rename to objects/jigsaw/bastion/treasure/bases/centers/center_3.iob diff --git a/objects/bastion/treasure/bases/lava_basin.iob b/objects/jigsaw/bastion/treasure/bases/lava_basin.iob similarity index 100% rename from objects/bastion/treasure/bases/lava_basin.iob rename to objects/jigsaw/bastion/treasure/bases/lava_basin.iob diff --git a/objects/bastion/treasure/big_air_full.iob b/objects/jigsaw/bastion/treasure/big_air_full.iob similarity index 100% rename from objects/bastion/treasure/big_air_full.iob rename to objects/jigsaw/bastion/treasure/big_air_full.iob diff --git a/objects/bastion/treasure/brains/center_brain.iob b/objects/jigsaw/bastion/treasure/brains/center_brain.iob similarity index 100% rename from objects/bastion/treasure/brains/center_brain.iob rename to objects/jigsaw/bastion/treasure/brains/center_brain.iob diff --git a/objects/bastion/treasure/connectors/center_to_wall_middle.iob b/objects/jigsaw/bastion/treasure/connectors/center_to_wall_middle.iob similarity index 100% rename from objects/bastion/treasure/connectors/center_to_wall_middle.iob rename to objects/jigsaw/bastion/treasure/connectors/center_to_wall_middle.iob diff --git a/objects/bastion/treasure/connectors/center_to_wall_top.iob b/objects/jigsaw/bastion/treasure/connectors/center_to_wall_top.iob similarity index 100% rename from objects/bastion/treasure/connectors/center_to_wall_top.iob rename to objects/jigsaw/bastion/treasure/connectors/center_to_wall_top.iob diff --git a/objects/bastion/treasure/connectors/center_to_wall_top_entrance.iob b/objects/jigsaw/bastion/treasure/connectors/center_to_wall_top_entrance.iob similarity index 100% rename from objects/bastion/treasure/connectors/center_to_wall_top_entrance.iob rename to objects/jigsaw/bastion/treasure/connectors/center_to_wall_top_entrance.iob diff --git a/objects/bastion/treasure/corners/bottom/corner_0.iob b/objects/jigsaw/bastion/treasure/corners/bottom/corner_0.iob similarity index 100% rename from objects/bastion/treasure/corners/bottom/corner_0.iob rename to objects/jigsaw/bastion/treasure/corners/bottom/corner_0.iob diff --git a/objects/bastion/treasure/corners/bottom/corner_1.iob b/objects/jigsaw/bastion/treasure/corners/bottom/corner_1.iob similarity index 100% rename from objects/bastion/treasure/corners/bottom/corner_1.iob rename to objects/jigsaw/bastion/treasure/corners/bottom/corner_1.iob diff --git a/objects/bastion/treasure/corners/edges/bottom.iob b/objects/jigsaw/bastion/treasure/corners/edges/bottom.iob similarity index 100% rename from objects/bastion/treasure/corners/edges/bottom.iob rename to objects/jigsaw/bastion/treasure/corners/edges/bottom.iob diff --git a/objects/bastion/treasure/corners/edges/middle.iob b/objects/jigsaw/bastion/treasure/corners/edges/middle.iob similarity index 100% rename from objects/bastion/treasure/corners/edges/middle.iob rename to objects/jigsaw/bastion/treasure/corners/edges/middle.iob diff --git a/objects/bastion/treasure/corners/edges/top.iob b/objects/jigsaw/bastion/treasure/corners/edges/top.iob similarity index 100% rename from objects/bastion/treasure/corners/edges/top.iob rename to objects/jigsaw/bastion/treasure/corners/edges/top.iob diff --git a/objects/bastion/treasure/corners/middle/corner_0.iob b/objects/jigsaw/bastion/treasure/corners/middle/corner_0.iob similarity index 100% rename from objects/bastion/treasure/corners/middle/corner_0.iob rename to objects/jigsaw/bastion/treasure/corners/middle/corner_0.iob diff --git a/objects/bastion/treasure/corners/middle/corner_1.iob b/objects/jigsaw/bastion/treasure/corners/middle/corner_1.iob similarity index 100% rename from objects/bastion/treasure/corners/middle/corner_1.iob rename to objects/jigsaw/bastion/treasure/corners/middle/corner_1.iob diff --git a/objects/bastion/treasure/corners/top/corner_0.iob b/objects/jigsaw/bastion/treasure/corners/top/corner_0.iob similarity index 100% rename from objects/bastion/treasure/corners/top/corner_0.iob rename to objects/jigsaw/bastion/treasure/corners/top/corner_0.iob diff --git a/objects/bastion/treasure/corners/top/corner_1.iob b/objects/jigsaw/bastion/treasure/corners/top/corner_1.iob similarity index 100% rename from objects/bastion/treasure/corners/top/corner_1.iob rename to objects/jigsaw/bastion/treasure/corners/top/corner_1.iob diff --git a/objects/bastion/treasure/entrances/entrance_0.iob b/objects/jigsaw/bastion/treasure/entrances/entrance_0.iob similarity index 100% rename from objects/bastion/treasure/entrances/entrance_0.iob rename to objects/jigsaw/bastion/treasure/entrances/entrance_0.iob diff --git a/objects/bastion/treasure/extensions/empty.iob b/objects/jigsaw/bastion/treasure/extensions/empty.iob similarity index 100% rename from objects/bastion/treasure/extensions/empty.iob rename to objects/jigsaw/bastion/treasure/extensions/empty.iob diff --git a/objects/bastion/treasure/extensions/fire_room.iob b/objects/jigsaw/bastion/treasure/extensions/fire_room.iob similarity index 100% rename from objects/bastion/treasure/extensions/fire_room.iob rename to objects/jigsaw/bastion/treasure/extensions/fire_room.iob diff --git a/objects/bastion/treasure/extensions/house_0.iob b/objects/jigsaw/bastion/treasure/extensions/house_0.iob similarity index 100% rename from objects/bastion/treasure/extensions/house_0.iob rename to objects/jigsaw/bastion/treasure/extensions/house_0.iob diff --git a/objects/bastion/treasure/extensions/house_1.iob b/objects/jigsaw/bastion/treasure/extensions/house_1.iob similarity index 100% rename from objects/bastion/treasure/extensions/house_1.iob rename to objects/jigsaw/bastion/treasure/extensions/house_1.iob diff --git a/objects/bastion/treasure/extensions/large_bridge_0.iob b/objects/jigsaw/bastion/treasure/extensions/large_bridge_0.iob similarity index 100% rename from objects/bastion/treasure/extensions/large_bridge_0.iob rename to objects/jigsaw/bastion/treasure/extensions/large_bridge_0.iob diff --git a/objects/bastion/treasure/extensions/large_bridge_1.iob b/objects/jigsaw/bastion/treasure/extensions/large_bridge_1.iob similarity index 100% rename from objects/bastion/treasure/extensions/large_bridge_1.iob rename to objects/jigsaw/bastion/treasure/extensions/large_bridge_1.iob diff --git a/objects/bastion/treasure/extensions/large_bridge_2.iob b/objects/jigsaw/bastion/treasure/extensions/large_bridge_2.iob similarity index 100% rename from objects/bastion/treasure/extensions/large_bridge_2.iob rename to objects/jigsaw/bastion/treasure/extensions/large_bridge_2.iob diff --git a/objects/bastion/treasure/extensions/large_bridge_3.iob b/objects/jigsaw/bastion/treasure/extensions/large_bridge_3.iob similarity index 100% rename from objects/bastion/treasure/extensions/large_bridge_3.iob rename to objects/jigsaw/bastion/treasure/extensions/large_bridge_3.iob diff --git a/objects/bastion/treasure/extensions/roofed_bridge.iob b/objects/jigsaw/bastion/treasure/extensions/roofed_bridge.iob similarity index 100% rename from objects/bastion/treasure/extensions/roofed_bridge.iob rename to objects/jigsaw/bastion/treasure/extensions/roofed_bridge.iob diff --git a/objects/bastion/treasure/extensions/small_bridge_0.iob b/objects/jigsaw/bastion/treasure/extensions/small_bridge_0.iob similarity index 100% rename from objects/bastion/treasure/extensions/small_bridge_0.iob rename to objects/jigsaw/bastion/treasure/extensions/small_bridge_0.iob diff --git a/objects/bastion/treasure/extensions/small_bridge_1.iob b/objects/jigsaw/bastion/treasure/extensions/small_bridge_1.iob similarity index 100% rename from objects/bastion/treasure/extensions/small_bridge_1.iob rename to objects/jigsaw/bastion/treasure/extensions/small_bridge_1.iob diff --git a/objects/bastion/treasure/extensions/small_bridge_2.iob b/objects/jigsaw/bastion/treasure/extensions/small_bridge_2.iob similarity index 100% rename from objects/bastion/treasure/extensions/small_bridge_2.iob rename to objects/jigsaw/bastion/treasure/extensions/small_bridge_2.iob diff --git a/objects/bastion/treasure/extensions/small_bridge_3.iob b/objects/jigsaw/bastion/treasure/extensions/small_bridge_3.iob similarity index 100% rename from objects/bastion/treasure/extensions/small_bridge_3.iob rename to objects/jigsaw/bastion/treasure/extensions/small_bridge_3.iob diff --git a/objects/bastion/treasure/ramparts/bottom_wall_0.iob b/objects/jigsaw/bastion/treasure/ramparts/bottom_wall_0.iob similarity index 100% rename from objects/bastion/treasure/ramparts/bottom_wall_0.iob rename to objects/jigsaw/bastion/treasure/ramparts/bottom_wall_0.iob diff --git a/objects/bastion/treasure/ramparts/lava_basin_main.iob b/objects/jigsaw/bastion/treasure/ramparts/lava_basin_main.iob similarity index 100% rename from objects/bastion/treasure/ramparts/lava_basin_main.iob rename to objects/jigsaw/bastion/treasure/ramparts/lava_basin_main.iob diff --git a/objects/bastion/treasure/ramparts/lava_basin_side.iob b/objects/jigsaw/bastion/treasure/ramparts/lava_basin_side.iob similarity index 100% rename from objects/bastion/treasure/ramparts/lava_basin_side.iob rename to objects/jigsaw/bastion/treasure/ramparts/lava_basin_side.iob diff --git a/objects/bastion/treasure/ramparts/mid_wall_main.iob b/objects/jigsaw/bastion/treasure/ramparts/mid_wall_main.iob similarity index 100% rename from objects/bastion/treasure/ramparts/mid_wall_main.iob rename to objects/jigsaw/bastion/treasure/ramparts/mid_wall_main.iob diff --git a/objects/bastion/treasure/ramparts/mid_wall_side.iob b/objects/jigsaw/bastion/treasure/ramparts/mid_wall_side.iob similarity index 100% rename from objects/bastion/treasure/ramparts/mid_wall_side.iob rename to objects/jigsaw/bastion/treasure/ramparts/mid_wall_side.iob diff --git a/objects/bastion/treasure/ramparts/top_wall.iob b/objects/jigsaw/bastion/treasure/ramparts/top_wall.iob similarity index 100% rename from objects/bastion/treasure/ramparts/top_wall.iob rename to objects/jigsaw/bastion/treasure/ramparts/top_wall.iob diff --git a/objects/bastion/treasure/roofs/center_roof.iob b/objects/jigsaw/bastion/treasure/roofs/center_roof.iob similarity index 100% rename from objects/bastion/treasure/roofs/center_roof.iob rename to objects/jigsaw/bastion/treasure/roofs/center_roof.iob diff --git a/objects/bastion/treasure/roofs/corner_roof.iob b/objects/jigsaw/bastion/treasure/roofs/corner_roof.iob similarity index 100% rename from objects/bastion/treasure/roofs/corner_roof.iob rename to objects/jigsaw/bastion/treasure/roofs/corner_roof.iob diff --git a/objects/bastion/treasure/roofs/wall_roof.iob b/objects/jigsaw/bastion/treasure/roofs/wall_roof.iob similarity index 100% rename from objects/bastion/treasure/roofs/wall_roof.iob rename to objects/jigsaw/bastion/treasure/roofs/wall_roof.iob diff --git a/objects/bastion/treasure/stairs/lower_stairs.iob b/objects/jigsaw/bastion/treasure/stairs/lower_stairs.iob similarity index 100% rename from objects/bastion/treasure/stairs/lower_stairs.iob rename to objects/jigsaw/bastion/treasure/stairs/lower_stairs.iob diff --git a/objects/bastion/treasure/walls/bottom/wall_0.iob b/objects/jigsaw/bastion/treasure/walls/bottom/wall_0.iob similarity index 100% rename from objects/bastion/treasure/walls/bottom/wall_0.iob rename to objects/jigsaw/bastion/treasure/walls/bottom/wall_0.iob diff --git a/objects/bastion/treasure/walls/bottom/wall_1.iob b/objects/jigsaw/bastion/treasure/walls/bottom/wall_1.iob similarity index 100% rename from objects/bastion/treasure/walls/bottom/wall_1.iob rename to objects/jigsaw/bastion/treasure/walls/bottom/wall_1.iob diff --git a/objects/bastion/treasure/walls/bottom/wall_2.iob b/objects/jigsaw/bastion/treasure/walls/bottom/wall_2.iob similarity index 100% rename from objects/bastion/treasure/walls/bottom/wall_2.iob rename to objects/jigsaw/bastion/treasure/walls/bottom/wall_2.iob diff --git a/objects/bastion/treasure/walls/bottom/wall_3.iob b/objects/jigsaw/bastion/treasure/walls/bottom/wall_3.iob similarity index 100% rename from objects/bastion/treasure/walls/bottom/wall_3.iob rename to objects/jigsaw/bastion/treasure/walls/bottom/wall_3.iob diff --git a/objects/bastion/treasure/walls/entrance_wall.iob b/objects/jigsaw/bastion/treasure/walls/entrance_wall.iob similarity index 100% rename from objects/bastion/treasure/walls/entrance_wall.iob rename to objects/jigsaw/bastion/treasure/walls/entrance_wall.iob diff --git a/objects/bastion/treasure/walls/lava_wall.iob b/objects/jigsaw/bastion/treasure/walls/lava_wall.iob similarity index 100% rename from objects/bastion/treasure/walls/lava_wall.iob rename to objects/jigsaw/bastion/treasure/walls/lava_wall.iob diff --git a/objects/bastion/treasure/walls/mid/wall_0.iob b/objects/jigsaw/bastion/treasure/walls/mid/wall_0.iob similarity index 100% rename from objects/bastion/treasure/walls/mid/wall_0.iob rename to objects/jigsaw/bastion/treasure/walls/mid/wall_0.iob diff --git a/objects/bastion/treasure/walls/mid/wall_1.iob b/objects/jigsaw/bastion/treasure/walls/mid/wall_1.iob similarity index 100% rename from objects/bastion/treasure/walls/mid/wall_1.iob rename to objects/jigsaw/bastion/treasure/walls/mid/wall_1.iob diff --git a/objects/bastion/treasure/walls/mid/wall_2.iob b/objects/jigsaw/bastion/treasure/walls/mid/wall_2.iob similarity index 100% rename from objects/bastion/treasure/walls/mid/wall_2.iob rename to objects/jigsaw/bastion/treasure/walls/mid/wall_2.iob diff --git a/objects/bastion/treasure/walls/outer/bottom_corner.iob b/objects/jigsaw/bastion/treasure/walls/outer/bottom_corner.iob similarity index 100% rename from objects/bastion/treasure/walls/outer/bottom_corner.iob rename to objects/jigsaw/bastion/treasure/walls/outer/bottom_corner.iob diff --git a/objects/bastion/treasure/walls/outer/medium_outer_wall.iob b/objects/jigsaw/bastion/treasure/walls/outer/medium_outer_wall.iob similarity index 100% rename from objects/bastion/treasure/walls/outer/medium_outer_wall.iob rename to objects/jigsaw/bastion/treasure/walls/outer/medium_outer_wall.iob diff --git a/objects/bastion/treasure/walls/outer/mid_corner.iob b/objects/jigsaw/bastion/treasure/walls/outer/mid_corner.iob similarity index 100% rename from objects/bastion/treasure/walls/outer/mid_corner.iob rename to objects/jigsaw/bastion/treasure/walls/outer/mid_corner.iob diff --git a/objects/bastion/treasure/walls/outer/outer_wall.iob b/objects/jigsaw/bastion/treasure/walls/outer/outer_wall.iob similarity index 100% rename from objects/bastion/treasure/walls/outer/outer_wall.iob rename to objects/jigsaw/bastion/treasure/walls/outer/outer_wall.iob diff --git a/objects/bastion/treasure/walls/outer/tall_outer_wall.iob b/objects/jigsaw/bastion/treasure/walls/outer/tall_outer_wall.iob similarity index 100% rename from objects/bastion/treasure/walls/outer/tall_outer_wall.iob rename to objects/jigsaw/bastion/treasure/walls/outer/tall_outer_wall.iob diff --git a/objects/bastion/treasure/walls/outer/top_corner.iob b/objects/jigsaw/bastion/treasure/walls/outer/top_corner.iob similarity index 100% rename from objects/bastion/treasure/walls/outer/top_corner.iob rename to objects/jigsaw/bastion/treasure/walls/outer/top_corner.iob diff --git a/objects/bastion/treasure/walls/top/main_entrance.iob b/objects/jigsaw/bastion/treasure/walls/top/main_entrance.iob similarity index 100% rename from objects/bastion/treasure/walls/top/main_entrance.iob rename to objects/jigsaw/bastion/treasure/walls/top/main_entrance.iob diff --git a/objects/bastion/treasure/walls/top/wall_0.iob b/objects/jigsaw/bastion/treasure/walls/top/wall_0.iob similarity index 100% rename from objects/bastion/treasure/walls/top/wall_0.iob rename to objects/jigsaw/bastion/treasure/walls/top/wall_0.iob diff --git a/objects/bastion/treasure/walls/top/wall_1.iob b/objects/jigsaw/bastion/treasure/walls/top/wall_1.iob similarity index 100% rename from objects/bastion/treasure/walls/top/wall_1.iob rename to objects/jigsaw/bastion/treasure/walls/top/wall_1.iob diff --git a/objects/bastion/units/air_base.iob b/objects/jigsaw/bastion/units/air_base.iob similarity index 100% rename from objects/bastion/units/air_base.iob rename to objects/jigsaw/bastion/units/air_base.iob diff --git a/objects/bastion/units/center_pieces/center_0.iob b/objects/jigsaw/bastion/units/center_pieces/center_0.iob similarity index 100% rename from objects/bastion/units/center_pieces/center_0.iob rename to objects/jigsaw/bastion/units/center_pieces/center_0.iob diff --git a/objects/bastion/units/center_pieces/center_1.iob b/objects/jigsaw/bastion/units/center_pieces/center_1.iob similarity index 100% rename from objects/bastion/units/center_pieces/center_1.iob rename to objects/jigsaw/bastion/units/center_pieces/center_1.iob diff --git a/objects/bastion/units/center_pieces/center_2.iob b/objects/jigsaw/bastion/units/center_pieces/center_2.iob similarity index 100% rename from objects/bastion/units/center_pieces/center_2.iob rename to objects/jigsaw/bastion/units/center_pieces/center_2.iob diff --git a/objects/bastion/units/edges/edge_0.iob b/objects/jigsaw/bastion/units/edges/edge_0.iob similarity index 100% rename from objects/bastion/units/edges/edge_0.iob rename to objects/jigsaw/bastion/units/edges/edge_0.iob diff --git a/objects/bastion/units/fillers/stage_0.iob b/objects/jigsaw/bastion/units/fillers/stage_0.iob similarity index 100% rename from objects/bastion/units/fillers/stage_0.iob rename to objects/jigsaw/bastion/units/fillers/stage_0.iob diff --git a/objects/bastion/units/pathways/pathway_0.iob b/objects/jigsaw/bastion/units/pathways/pathway_0.iob similarity index 100% rename from objects/bastion/units/pathways/pathway_0.iob rename to objects/jigsaw/bastion/units/pathways/pathway_0.iob diff --git a/objects/bastion/units/pathways/pathway_wall_0.iob b/objects/jigsaw/bastion/units/pathways/pathway_wall_0.iob similarity index 100% rename from objects/bastion/units/pathways/pathway_wall_0.iob rename to objects/jigsaw/bastion/units/pathways/pathway_wall_0.iob diff --git a/objects/bastion/units/rampart_plates/plate_0.iob b/objects/jigsaw/bastion/units/rampart_plates/plate_0.iob similarity index 100% rename from objects/bastion/units/rampart_plates/plate_0.iob rename to objects/jigsaw/bastion/units/rampart_plates/plate_0.iob diff --git a/objects/bastion/units/ramparts/ramparts_0.iob b/objects/jigsaw/bastion/units/ramparts/ramparts_0.iob similarity index 100% rename from objects/bastion/units/ramparts/ramparts_0.iob rename to objects/jigsaw/bastion/units/ramparts/ramparts_0.iob diff --git a/objects/bastion/units/ramparts/ramparts_1.iob b/objects/jigsaw/bastion/units/ramparts/ramparts_1.iob similarity index 100% rename from objects/bastion/units/ramparts/ramparts_1.iob rename to objects/jigsaw/bastion/units/ramparts/ramparts_1.iob diff --git a/objects/bastion/units/ramparts/ramparts_2.iob b/objects/jigsaw/bastion/units/ramparts/ramparts_2.iob similarity index 100% rename from objects/bastion/units/ramparts/ramparts_2.iob rename to objects/jigsaw/bastion/units/ramparts/ramparts_2.iob diff --git a/objects/bastion/units/stages/rot/stage_1_0.iob b/objects/jigsaw/bastion/units/stages/rot/stage_1_0.iob similarity index 100% rename from objects/bastion/units/stages/rot/stage_1_0.iob rename to objects/jigsaw/bastion/units/stages/rot/stage_1_0.iob diff --git a/objects/bastion/units/stages/stage_0_0.iob b/objects/jigsaw/bastion/units/stages/stage_0_0.iob similarity index 100% rename from objects/bastion/units/stages/stage_0_0.iob rename to objects/jigsaw/bastion/units/stages/stage_0_0.iob diff --git a/objects/bastion/units/stages/stage_0_1.iob b/objects/jigsaw/bastion/units/stages/stage_0_1.iob similarity index 100% rename from objects/bastion/units/stages/stage_0_1.iob rename to objects/jigsaw/bastion/units/stages/stage_0_1.iob diff --git a/objects/bastion/units/stages/stage_0_2.iob b/objects/jigsaw/bastion/units/stages/stage_0_2.iob similarity index 100% rename from objects/bastion/units/stages/stage_0_2.iob rename to objects/jigsaw/bastion/units/stages/stage_0_2.iob diff --git a/objects/bastion/units/stages/stage_0_3.iob b/objects/jigsaw/bastion/units/stages/stage_0_3.iob similarity index 100% rename from objects/bastion/units/stages/stage_0_3.iob rename to objects/jigsaw/bastion/units/stages/stage_0_3.iob diff --git a/objects/bastion/units/stages/stage_1_0.iob b/objects/jigsaw/bastion/units/stages/stage_1_0.iob similarity index 100% rename from objects/bastion/units/stages/stage_1_0.iob rename to objects/jigsaw/bastion/units/stages/stage_1_0.iob diff --git a/objects/bastion/units/stages/stage_1_1.iob b/objects/jigsaw/bastion/units/stages/stage_1_1.iob similarity index 100% rename from objects/bastion/units/stages/stage_1_1.iob rename to objects/jigsaw/bastion/units/stages/stage_1_1.iob diff --git a/objects/bastion/units/stages/stage_1_2.iob b/objects/jigsaw/bastion/units/stages/stage_1_2.iob similarity index 100% rename from objects/bastion/units/stages/stage_1_2.iob rename to objects/jigsaw/bastion/units/stages/stage_1_2.iob diff --git a/objects/bastion/units/stages/stage_1_3.iob b/objects/jigsaw/bastion/units/stages/stage_1_3.iob similarity index 100% rename from objects/bastion/units/stages/stage_1_3.iob rename to objects/jigsaw/bastion/units/stages/stage_1_3.iob diff --git a/objects/bastion/units/stages/stage_2_0.iob b/objects/jigsaw/bastion/units/stages/stage_2_0.iob similarity index 100% rename from objects/bastion/units/stages/stage_2_0.iob rename to objects/jigsaw/bastion/units/stages/stage_2_0.iob diff --git a/objects/bastion/units/stages/stage_2_1.iob b/objects/jigsaw/bastion/units/stages/stage_2_1.iob similarity index 100% rename from objects/bastion/units/stages/stage_2_1.iob rename to objects/jigsaw/bastion/units/stages/stage_2_1.iob diff --git a/objects/bastion/units/stages/stage_3_0.iob b/objects/jigsaw/bastion/units/stages/stage_3_0.iob similarity index 100% rename from objects/bastion/units/stages/stage_3_0.iob rename to objects/jigsaw/bastion/units/stages/stage_3_0.iob diff --git a/objects/bastion/units/stages/stage_3_1.iob b/objects/jigsaw/bastion/units/stages/stage_3_1.iob similarity index 100% rename from objects/bastion/units/stages/stage_3_1.iob rename to objects/jigsaw/bastion/units/stages/stage_3_1.iob diff --git a/objects/bastion/units/stages/stage_3_2.iob b/objects/jigsaw/bastion/units/stages/stage_3_2.iob similarity index 100% rename from objects/bastion/units/stages/stage_3_2.iob rename to objects/jigsaw/bastion/units/stages/stage_3_2.iob diff --git a/objects/bastion/units/stages/stage_3_3.iob b/objects/jigsaw/bastion/units/stages/stage_3_3.iob similarity index 100% rename from objects/bastion/units/stages/stage_3_3.iob rename to objects/jigsaw/bastion/units/stages/stage_3_3.iob diff --git a/objects/bastion/units/wall_units/edge_0_large.iob b/objects/jigsaw/bastion/units/wall_units/edge_0_large.iob similarity index 100% rename from objects/bastion/units/wall_units/edge_0_large.iob rename to objects/jigsaw/bastion/units/wall_units/edge_0_large.iob diff --git a/objects/bastion/units/wall_units/unit_0.iob b/objects/jigsaw/bastion/units/wall_units/unit_0.iob similarity index 100% rename from objects/bastion/units/wall_units/unit_0.iob rename to objects/jigsaw/bastion/units/wall_units/unit_0.iob diff --git a/objects/bastion/units/walls/connected_wall.iob b/objects/jigsaw/bastion/units/walls/connected_wall.iob similarity index 100% rename from objects/bastion/units/walls/connected_wall.iob rename to objects/jigsaw/bastion/units/walls/connected_wall.iob diff --git a/objects/bastion/units/walls/wall_base.iob b/objects/jigsaw/bastion/units/walls/wall_base.iob similarity index 100% rename from objects/bastion/units/walls/wall_base.iob rename to objects/jigsaw/bastion/units/walls/wall_base.iob diff --git a/objects/desert-pyramid/bottom.iob b/objects/jigsaw/desert-pyramid/bottom.iob similarity index 100% rename from objects/desert-pyramid/bottom.iob rename to objects/jigsaw/desert-pyramid/bottom.iob diff --git a/objects/desert-pyramid/top.iob b/objects/jigsaw/desert-pyramid/top.iob similarity index 100% rename from objects/desert-pyramid/top.iob rename to objects/jigsaw/desert-pyramid/top.iob diff --git a/objects/dungeon/spawner-room.iob b/objects/jigsaw/dungeon/spawner-room.iob similarity index 100% rename from objects/dungeon/spawner-room.iob rename to objects/jigsaw/dungeon/spawner-room.iob diff --git a/objects/end_city/base_floor.iob b/objects/jigsaw/end_city/base_floor.iob similarity index 100% rename from objects/end_city/base_floor.iob rename to objects/jigsaw/end_city/base_floor.iob diff --git a/objects/end_city/base_roof.iob b/objects/jigsaw/end_city/base_roof.iob similarity index 100% rename from objects/end_city/base_roof.iob rename to objects/jigsaw/end_city/base_roof.iob diff --git a/objects/end_city/bridge_end.iob b/objects/jigsaw/end_city/bridge_end.iob similarity index 100% rename from objects/end_city/bridge_end.iob rename to objects/jigsaw/end_city/bridge_end.iob diff --git a/objects/end_city/bridge_gentle_stairs.iob b/objects/jigsaw/end_city/bridge_gentle_stairs.iob similarity index 100% rename from objects/end_city/bridge_gentle_stairs.iob rename to objects/jigsaw/end_city/bridge_gentle_stairs.iob diff --git a/objects/end_city/bridge_piece.iob b/objects/jigsaw/end_city/bridge_piece.iob similarity index 100% rename from objects/end_city/bridge_piece.iob rename to objects/jigsaw/end_city/bridge_piece.iob diff --git a/objects/end_city/bridge_steep_stairs.iob b/objects/jigsaw/end_city/bridge_steep_stairs.iob similarity index 100% rename from objects/end_city/bridge_steep_stairs.iob rename to objects/jigsaw/end_city/bridge_steep_stairs.iob diff --git a/objects/end_city/fat_tower_base.iob b/objects/jigsaw/end_city/fat_tower_base.iob similarity index 100% rename from objects/end_city/fat_tower_base.iob rename to objects/jigsaw/end_city/fat_tower_base.iob diff --git a/objects/end_city/fat_tower_middle.iob b/objects/jigsaw/end_city/fat_tower_middle.iob similarity index 100% rename from objects/end_city/fat_tower_middle.iob rename to objects/jigsaw/end_city/fat_tower_middle.iob diff --git a/objects/end_city/fat_tower_top.iob b/objects/jigsaw/end_city/fat_tower_top.iob similarity index 100% rename from objects/end_city/fat_tower_top.iob rename to objects/jigsaw/end_city/fat_tower_top.iob diff --git a/objects/end_city/second_floor_1.iob b/objects/jigsaw/end_city/second_floor_1.iob similarity index 100% rename from objects/end_city/second_floor_1.iob rename to objects/jigsaw/end_city/second_floor_1.iob diff --git a/objects/end_city/second_floor_2.iob b/objects/jigsaw/end_city/second_floor_2.iob similarity index 100% rename from objects/end_city/second_floor_2.iob rename to objects/jigsaw/end_city/second_floor_2.iob diff --git a/objects/end_city/second_roof.iob b/objects/jigsaw/end_city/second_roof.iob similarity index 100% rename from objects/end_city/second_roof.iob rename to objects/jigsaw/end_city/second_roof.iob diff --git a/objects/end_city/ship.iob b/objects/jigsaw/end_city/ship.iob similarity index 100% rename from objects/end_city/ship.iob rename to objects/jigsaw/end_city/ship.iob diff --git a/objects/end_city/third_floor_1.iob b/objects/jigsaw/end_city/third_floor_1.iob similarity index 100% rename from objects/end_city/third_floor_1.iob rename to objects/jigsaw/end_city/third_floor_1.iob diff --git a/objects/end_city/third_floor_2.iob b/objects/jigsaw/end_city/third_floor_2.iob similarity index 100% rename from objects/end_city/third_floor_2.iob rename to objects/jigsaw/end_city/third_floor_2.iob diff --git a/objects/end_city/third_roof.iob b/objects/jigsaw/end_city/third_roof.iob similarity index 100% rename from objects/end_city/third_roof.iob rename to objects/jigsaw/end_city/third_roof.iob diff --git a/objects/end_city/tower_base.iob b/objects/jigsaw/end_city/tower_base.iob similarity index 100% rename from objects/end_city/tower_base.iob rename to objects/jigsaw/end_city/tower_base.iob diff --git a/objects/end_city/tower_floor.iob b/objects/jigsaw/end_city/tower_floor.iob similarity index 100% rename from objects/end_city/tower_floor.iob rename to objects/jigsaw/end_city/tower_floor.iob diff --git a/objects/end_city/tower_piece.iob b/objects/jigsaw/end_city/tower_piece.iob similarity index 100% rename from objects/end_city/tower_piece.iob rename to objects/jigsaw/end_city/tower_piece.iob diff --git a/objects/end_city/tower_top.iob b/objects/jigsaw/end_city/tower_top.iob similarity index 100% rename from objects/end_city/tower_top.iob rename to objects/jigsaw/end_city/tower_top.iob diff --git a/objects/house-norm/Med1.iob b/objects/jigsaw/house-norm/Med1.iob similarity index 100% rename from objects/house-norm/Med1.iob rename to objects/jigsaw/house-norm/Med1.iob diff --git a/objects/house-norm/Med10.iob b/objects/jigsaw/house-norm/Med10.iob similarity index 100% rename from objects/house-norm/Med10.iob rename to objects/jigsaw/house-norm/Med10.iob diff --git a/objects/house-norm/Med2.iob b/objects/jigsaw/house-norm/Med2.iob similarity index 100% rename from objects/house-norm/Med2.iob rename to objects/jigsaw/house-norm/Med2.iob diff --git a/objects/house-norm/Med3.iob b/objects/jigsaw/house-norm/Med3.iob similarity index 100% rename from objects/house-norm/Med3.iob rename to objects/jigsaw/house-norm/Med3.iob diff --git a/objects/house-norm/Med4.iob b/objects/jigsaw/house-norm/Med4.iob similarity index 100% rename from objects/house-norm/Med4.iob rename to objects/jigsaw/house-norm/Med4.iob diff --git a/objects/house-norm/Med5.iob b/objects/jigsaw/house-norm/Med5.iob similarity index 100% rename from objects/house-norm/Med5.iob rename to objects/jigsaw/house-norm/Med5.iob diff --git a/objects/house-norm/Med6.iob b/objects/jigsaw/house-norm/Med6.iob similarity index 100% rename from objects/house-norm/Med6.iob rename to objects/jigsaw/house-norm/Med6.iob diff --git a/objects/house-norm/Med7.iob b/objects/jigsaw/house-norm/Med7.iob similarity index 100% rename from objects/house-norm/Med7.iob rename to objects/jigsaw/house-norm/Med7.iob diff --git a/objects/house-norm/Med8.iob b/objects/jigsaw/house-norm/Med8.iob similarity index 100% rename from objects/house-norm/Med8.iob rename to objects/jigsaw/house-norm/Med8.iob diff --git a/objects/house-norm/Med9.iob b/objects/jigsaw/house-norm/Med9.iob similarity index 100% rename from objects/house-norm/Med9.iob rename to objects/jigsaw/house-norm/Med9.iob diff --git a/objects/house-purjap/PurJap1.iob b/objects/jigsaw/house-purjap/PurJap1.iob similarity index 100% rename from objects/house-purjap/PurJap1.iob rename to objects/jigsaw/house-purjap/PurJap1.iob diff --git a/objects/house-purjap/PurJap10.iob b/objects/jigsaw/house-purjap/PurJap10.iob similarity index 100% rename from objects/house-purjap/PurJap10.iob rename to objects/jigsaw/house-purjap/PurJap10.iob diff --git a/objects/house-purjap/PurJap2.iob b/objects/jigsaw/house-purjap/PurJap2.iob similarity index 100% rename from objects/house-purjap/PurJap2.iob rename to objects/jigsaw/house-purjap/PurJap2.iob diff --git a/objects/house-purjap/PurJap3.iob b/objects/jigsaw/house-purjap/PurJap3.iob similarity index 100% rename from objects/house-purjap/PurJap3.iob rename to objects/jigsaw/house-purjap/PurJap3.iob diff --git a/objects/house-purjap/PurJap4.iob b/objects/jigsaw/house-purjap/PurJap4.iob similarity index 100% rename from objects/house-purjap/PurJap4.iob rename to objects/jigsaw/house-purjap/PurJap4.iob diff --git a/objects/house-purjap/PurJap5.iob b/objects/jigsaw/house-purjap/PurJap5.iob similarity index 100% rename from objects/house-purjap/PurJap5.iob rename to objects/jigsaw/house-purjap/PurJap5.iob diff --git a/objects/house-purjap/PurJap6.iob b/objects/jigsaw/house-purjap/PurJap6.iob similarity index 100% rename from objects/house-purjap/PurJap6.iob rename to objects/jigsaw/house-purjap/PurJap6.iob diff --git a/objects/house-purjap/PurJap7.iob b/objects/jigsaw/house-purjap/PurJap7.iob similarity index 100% rename from objects/house-purjap/PurJap7.iob rename to objects/jigsaw/house-purjap/PurJap7.iob diff --git a/objects/house-purjap/PurJap8.iob b/objects/jigsaw/house-purjap/PurJap8.iob similarity index 100% rename from objects/house-purjap/PurJap8.iob rename to objects/jigsaw/house-purjap/PurJap8.iob diff --git a/objects/house-purjap/PurJap9.iob b/objects/jigsaw/house-purjap/PurJap9.iob similarity index 100% rename from objects/house-purjap/PurJap9.iob rename to objects/jigsaw/house-purjap/PurJap9.iob diff --git a/objects/houses/jap/j1.iob b/objects/jigsaw/houses/jap/j1.iob similarity index 100% rename from objects/houses/jap/j1.iob rename to objects/jigsaw/houses/jap/j1.iob diff --git a/objects/houses/jap/j10.iob b/objects/jigsaw/houses/jap/j10.iob similarity index 100% rename from objects/houses/jap/j10.iob rename to objects/jigsaw/houses/jap/j10.iob diff --git a/objects/houses/jap/j2.iob b/objects/jigsaw/houses/jap/j2.iob similarity index 100% rename from objects/houses/jap/j2.iob rename to objects/jigsaw/houses/jap/j2.iob diff --git a/objects/houses/jap/j3.iob b/objects/jigsaw/houses/jap/j3.iob similarity index 100% rename from objects/houses/jap/j3.iob rename to objects/jigsaw/houses/jap/j3.iob diff --git a/objects/houses/jap/j4.iob b/objects/jigsaw/houses/jap/j4.iob similarity index 100% rename from objects/houses/jap/j4.iob rename to objects/jigsaw/houses/jap/j4.iob diff --git a/objects/houses/jap/j5.iob b/objects/jigsaw/houses/jap/j5.iob similarity index 100% rename from objects/houses/jap/j5.iob rename to objects/jigsaw/houses/jap/j5.iob diff --git a/objects/houses/jap/j6.iob b/objects/jigsaw/houses/jap/j6.iob similarity index 100% rename from objects/houses/jap/j6.iob rename to objects/jigsaw/houses/jap/j6.iob diff --git a/objects/houses/jap/j7.iob b/objects/jigsaw/houses/jap/j7.iob similarity index 100% rename from objects/houses/jap/j7.iob rename to objects/jigsaw/houses/jap/j7.iob diff --git a/objects/houses/jap/j8.iob b/objects/jigsaw/houses/jap/j8.iob similarity index 100% rename from objects/houses/jap/j8.iob rename to objects/jigsaw/houses/jap/j8.iob diff --git a/objects/houses/jap/j9.iob b/objects/jigsaw/houses/jap/j9.iob similarity index 100% rename from objects/houses/jap/j9.iob rename to objects/jigsaw/houses/jap/j9.iob diff --git a/objects/houses/paths/corner1.iob b/objects/jigsaw/houses/paths/corner1.iob similarity index 100% rename from objects/houses/paths/corner1.iob rename to objects/jigsaw/houses/paths/corner1.iob diff --git a/objects/houses/paths/cross.iob b/objects/jigsaw/houses/paths/cross.iob similarity index 100% rename from objects/houses/paths/cross.iob rename to objects/jigsaw/houses/paths/cross.iob diff --git a/objects/houses/paths/end1.iob b/objects/jigsaw/houses/paths/end1.iob similarity index 100% rename from objects/houses/paths/end1.iob rename to objects/jigsaw/houses/paths/end1.iob diff --git a/objects/houses/paths/hall1.iob b/objects/jigsaw/houses/paths/hall1.iob similarity index 100% rename from objects/houses/paths/hall1.iob rename to objects/jigsaw/houses/paths/hall1.iob diff --git a/objects/houses/paths/tjunct.iob b/objects/jigsaw/houses/paths/tjunct.iob similarity index 100% rename from objects/houses/paths/tjunct.iob rename to objects/jigsaw/houses/paths/tjunct.iob diff --git a/objects/igloo/bottom.iob b/objects/jigsaw/igloo/bottom.iob similarity index 100% rename from objects/igloo/bottom.iob rename to objects/jigsaw/igloo/bottom.iob diff --git a/objects/igloo/middle.iob b/objects/jigsaw/igloo/middle.iob similarity index 100% rename from objects/igloo/middle.iob rename to objects/jigsaw/igloo/middle.iob diff --git a/objects/igloo/top1.iob b/objects/jigsaw/igloo/top1.iob similarity index 100% rename from objects/igloo/top1.iob rename to objects/jigsaw/igloo/top1.iob diff --git a/objects/igloo/top2.iob b/objects/jigsaw/igloo/top2.iob similarity index 100% rename from objects/igloo/top2.iob rename to objects/jigsaw/igloo/top2.iob diff --git a/objects/jungle-pyramid/jungle_pyramid.iob b/objects/jigsaw/jungle-pyramid/jungle_pyramid.iob similarity index 100% rename from objects/jungle-pyramid/jungle_pyramid.iob rename to objects/jigsaw/jungle-pyramid/jungle_pyramid.iob diff --git a/objects/zzz/grid.iob b/objects/jigsaw/mansion/grid.iob similarity index 100% rename from objects/zzz/grid.iob rename to objects/jigsaw/mansion/grid.iob diff --git a/objects/zzz/mansion_roof.iob b/objects/jigsaw/mansion/mansion_roof.iob similarity index 100% rename from objects/zzz/mansion_roof.iob rename to objects/jigsaw/mansion/mansion_roof.iob diff --git a/objects/zzz/mansion_vanilla_1.iob b/objects/jigsaw/mansion/mansion_vanilla_1.iob similarity index 100% rename from objects/zzz/mansion_vanilla_1.iob rename to objects/jigsaw/mansion/mansion_vanilla_1.iob diff --git a/objects/zzz/mansion_vanilla_2.iob b/objects/jigsaw/mansion/mansion_vanilla_2.iob similarity index 100% rename from objects/zzz/mansion_vanilla_2.iob rename to objects/jigsaw/mansion/mansion_vanilla_2.iob diff --git a/objects/zzz/mansion_vanilla_3.iob b/objects/jigsaw/mansion/mansion_vanilla_3.iob similarity index 100% rename from objects/zzz/mansion_vanilla_3.iob rename to objects/jigsaw/mansion/mansion_vanilla_3.iob diff --git a/objects/murky_stronghold/c-n-1.iob b/objects/jigsaw/murky_stronghold/c-n-1.iob similarity index 100% rename from objects/murky_stronghold/c-n-1.iob rename to objects/jigsaw/murky_stronghold/c-n-1.iob diff --git a/objects/murky_stronghold/c-n-2.iob b/objects/jigsaw/murky_stronghold/c-n-2.iob similarity index 100% rename from objects/murky_stronghold/c-n-2.iob rename to objects/jigsaw/murky_stronghold/c-n-2.iob diff --git a/objects/murky_stronghold/c-n-3.iob b/objects/jigsaw/murky_stronghold/c-n-3.iob similarity index 100% rename from objects/murky_stronghold/c-n-3.iob rename to objects/jigsaw/murky_stronghold/c-n-3.iob diff --git a/objects/murky_stronghold/c-n-4.iob b/objects/jigsaw/murky_stronghold/c-n-4.iob similarity index 100% rename from objects/murky_stronghold/c-n-4.iob rename to objects/jigsaw/murky_stronghold/c-n-4.iob diff --git a/objects/murky_stronghold/c-ns-1.iob b/objects/jigsaw/murky_stronghold/c-ns-1.iob similarity index 100% rename from objects/murky_stronghold/c-ns-1.iob rename to objects/jigsaw/murky_stronghold/c-ns-1.iob diff --git a/objects/murky_stronghold/c-ns-2.iob b/objects/jigsaw/murky_stronghold/c-ns-2.iob similarity index 100% rename from objects/murky_stronghold/c-ns-2.iob rename to objects/jigsaw/murky_stronghold/c-ns-2.iob diff --git a/objects/murky_stronghold/c-ns-3.iob b/objects/jigsaw/murky_stronghold/c-ns-3.iob similarity index 100% rename from objects/murky_stronghold/c-ns-3.iob rename to objects/jigsaw/murky_stronghold/c-ns-3.iob diff --git a/objects/murky_stronghold/c-ns-4.iob b/objects/jigsaw/murky_stronghold/c-ns-4.iob similarity index 100% rename from objects/murky_stronghold/c-ns-4.iob rename to objects/jigsaw/murky_stronghold/c-ns-4.iob diff --git a/objects/murky_stronghold/c-nsw-1.iob b/objects/jigsaw/murky_stronghold/c-nsw-1.iob similarity index 100% rename from objects/murky_stronghold/c-nsw-1.iob rename to objects/jigsaw/murky_stronghold/c-nsw-1.iob diff --git a/objects/murky_stronghold/c-nsw-2.iob b/objects/jigsaw/murky_stronghold/c-nsw-2.iob similarity index 100% rename from objects/murky_stronghold/c-nsw-2.iob rename to objects/jigsaw/murky_stronghold/c-nsw-2.iob diff --git a/objects/murky_stronghold/c-nsw-3.iob b/objects/jigsaw/murky_stronghold/c-nsw-3.iob similarity index 100% rename from objects/murky_stronghold/c-nsw-3.iob rename to objects/jigsaw/murky_stronghold/c-nsw-3.iob diff --git a/objects/murky_stronghold/c-nsw-4.iob b/objects/jigsaw/murky_stronghold/c-nsw-4.iob similarity index 100% rename from objects/murky_stronghold/c-nsw-4.iob rename to objects/jigsaw/murky_stronghold/c-nsw-4.iob diff --git a/objects/murky_stronghold/c-sw-1.iob b/objects/jigsaw/murky_stronghold/c-sw-1.iob similarity index 100% rename from objects/murky_stronghold/c-sw-1.iob rename to objects/jigsaw/murky_stronghold/c-sw-1.iob diff --git a/objects/murky_stronghold/c-sw-2.iob b/objects/jigsaw/murky_stronghold/c-sw-2.iob similarity index 100% rename from objects/murky_stronghold/c-sw-2.iob rename to objects/jigsaw/murky_stronghold/c-sw-2.iob diff --git a/objects/murky_stronghold/c-sw-3.iob b/objects/jigsaw/murky_stronghold/c-sw-3.iob similarity index 100% rename from objects/murky_stronghold/c-sw-3.iob rename to objects/jigsaw/murky_stronghold/c-sw-3.iob diff --git a/objects/murky_stronghold/c-sw-4.iob b/objects/jigsaw/murky_stronghold/c-sw-4.iob similarity index 100% rename from objects/murky_stronghold/c-sw-4.iob rename to objects/jigsaw/murky_stronghold/c-sw-4.iob diff --git a/objects/murky_stronghold/c-x-1.iob b/objects/jigsaw/murky_stronghold/c-x-1.iob similarity index 100% rename from objects/murky_stronghold/c-x-1.iob rename to objects/jigsaw/murky_stronghold/c-x-1.iob diff --git a/objects/murky_stronghold/c-x-2.iob b/objects/jigsaw/murky_stronghold/c-x-2.iob similarity index 100% rename from objects/murky_stronghold/c-x-2.iob rename to objects/jigsaw/murky_stronghold/c-x-2.iob diff --git a/objects/murky_stronghold/c-x-3.iob b/objects/jigsaw/murky_stronghold/c-x-3.iob similarity index 100% rename from objects/murky_stronghold/c-x-3.iob rename to objects/jigsaw/murky_stronghold/c-x-3.iob diff --git a/objects/murky_stronghold/c-x-4.iob b/objects/jigsaw/murky_stronghold/c-x-4.iob similarity index 100% rename from objects/murky_stronghold/c-x-4.iob rename to objects/jigsaw/murky_stronghold/c-x-4.iob diff --git a/objects/murky_stronghold/c-x-5.iob b/objects/jigsaw/murky_stronghold/c-x-5.iob similarity index 100% rename from objects/murky_stronghold/c-x-5.iob rename to objects/jigsaw/murky_stronghold/c-x-5.iob diff --git a/objects/murky_stronghold/c-x-6.iob b/objects/jigsaw/murky_stronghold/c-x-6.iob similarity index 100% rename from objects/murky_stronghold/c-x-6.iob rename to objects/jigsaw/murky_stronghold/c-x-6.iob diff --git a/objects/murky_stronghold/f-n-1.iob b/objects/jigsaw/murky_stronghold/f-n-1.iob similarity index 100% rename from objects/murky_stronghold/f-n-1.iob rename to objects/jigsaw/murky_stronghold/f-n-1.iob diff --git a/objects/murky_stronghold/f-n-2.iob b/objects/jigsaw/murky_stronghold/f-n-2.iob similarity index 100% rename from objects/murky_stronghold/f-n-2.iob rename to objects/jigsaw/murky_stronghold/f-n-2.iob diff --git a/objects/murky_stronghold/f-n-3.iob b/objects/jigsaw/murky_stronghold/f-n-3.iob similarity index 100% rename from objects/murky_stronghold/f-n-3.iob rename to objects/jigsaw/murky_stronghold/f-n-3.iob diff --git a/objects/murky_stronghold/f-n-4.iob b/objects/jigsaw/murky_stronghold/f-n-4.iob similarity index 100% rename from objects/murky_stronghold/f-n-4.iob rename to objects/jigsaw/murky_stronghold/f-n-4.iob diff --git a/objects/murky_stronghold/f-ns-1.iob b/objects/jigsaw/murky_stronghold/f-ns-1.iob similarity index 100% rename from objects/murky_stronghold/f-ns-1.iob rename to objects/jigsaw/murky_stronghold/f-ns-1.iob diff --git a/objects/murky_stronghold/f-ns-2.iob b/objects/jigsaw/murky_stronghold/f-ns-2.iob similarity index 100% rename from objects/murky_stronghold/f-ns-2.iob rename to objects/jigsaw/murky_stronghold/f-ns-2.iob diff --git a/objects/murky_stronghold/f-ns-3.iob b/objects/jigsaw/murky_stronghold/f-ns-3.iob similarity index 100% rename from objects/murky_stronghold/f-ns-3.iob rename to objects/jigsaw/murky_stronghold/f-ns-3.iob diff --git a/objects/murky_stronghold/f-ns-4.iob b/objects/jigsaw/murky_stronghold/f-ns-4.iob similarity index 100% rename from objects/murky_stronghold/f-ns-4.iob rename to objects/jigsaw/murky_stronghold/f-ns-4.iob diff --git a/objects/murky_stronghold/f-nsw-1.iob b/objects/jigsaw/murky_stronghold/f-nsw-1.iob similarity index 100% rename from objects/murky_stronghold/f-nsw-1.iob rename to objects/jigsaw/murky_stronghold/f-nsw-1.iob diff --git a/objects/murky_stronghold/f-nsw-2.iob b/objects/jigsaw/murky_stronghold/f-nsw-2.iob similarity index 100% rename from objects/murky_stronghold/f-nsw-2.iob rename to objects/jigsaw/murky_stronghold/f-nsw-2.iob diff --git a/objects/murky_stronghold/f-nsw-3.iob b/objects/jigsaw/murky_stronghold/f-nsw-3.iob similarity index 100% rename from objects/murky_stronghold/f-nsw-3.iob rename to objects/jigsaw/murky_stronghold/f-nsw-3.iob diff --git a/objects/murky_stronghold/f-nsw-4.iob b/objects/jigsaw/murky_stronghold/f-nsw-4.iob similarity index 100% rename from objects/murky_stronghold/f-nsw-4.iob rename to objects/jigsaw/murky_stronghold/f-nsw-4.iob diff --git a/objects/murky_stronghold/f-sw-1.iob b/objects/jigsaw/murky_stronghold/f-sw-1.iob similarity index 100% rename from objects/murky_stronghold/f-sw-1.iob rename to objects/jigsaw/murky_stronghold/f-sw-1.iob diff --git a/objects/murky_stronghold/f-sw-2.iob b/objects/jigsaw/murky_stronghold/f-sw-2.iob similarity index 100% rename from objects/murky_stronghold/f-sw-2.iob rename to objects/jigsaw/murky_stronghold/f-sw-2.iob diff --git a/objects/murky_stronghold/f-sw-3.iob b/objects/jigsaw/murky_stronghold/f-sw-3.iob similarity index 100% rename from objects/murky_stronghold/f-sw-3.iob rename to objects/jigsaw/murky_stronghold/f-sw-3.iob diff --git a/objects/murky_stronghold/f-sw-4.iob b/objects/jigsaw/murky_stronghold/f-sw-4.iob similarity index 100% rename from objects/murky_stronghold/f-sw-4.iob rename to objects/jigsaw/murky_stronghold/f-sw-4.iob diff --git a/objects/murky_stronghold/f-x-1.iob b/objects/jigsaw/murky_stronghold/f-x-1.iob similarity index 100% rename from objects/murky_stronghold/f-x-1.iob rename to objects/jigsaw/murky_stronghold/f-x-1.iob diff --git a/objects/murky_stronghold/f-x-2.iob b/objects/jigsaw/murky_stronghold/f-x-2.iob similarity index 100% rename from objects/murky_stronghold/f-x-2.iob rename to objects/jigsaw/murky_stronghold/f-x-2.iob diff --git a/objects/murky_stronghold/f-x-3.iob b/objects/jigsaw/murky_stronghold/f-x-3.iob similarity index 100% rename from objects/murky_stronghold/f-x-3.iob rename to objects/jigsaw/murky_stronghold/f-x-3.iob diff --git a/objects/murky_stronghold/f-x-4.iob b/objects/jigsaw/murky_stronghold/f-x-4.iob similarity index 100% rename from objects/murky_stronghold/f-x-4.iob rename to objects/jigsaw/murky_stronghold/f-x-4.iob diff --git a/objects/murky_stronghold/f-x-5.iob b/objects/jigsaw/murky_stronghold/f-x-5.iob similarity index 100% rename from objects/murky_stronghold/f-x-5.iob rename to objects/jigsaw/murky_stronghold/f-x-5.iob diff --git a/objects/murky_stronghold/f-x-6.iob b/objects/jigsaw/murky_stronghold/f-x-6.iob similarity index 100% rename from objects/murky_stronghold/f-x-6.iob rename to objects/jigsaw/murky_stronghold/f-x-6.iob diff --git a/objects/murky_stronghold/fc-n-1.iob b/objects/jigsaw/murky_stronghold/fc-n-1.iob similarity index 100% rename from objects/murky_stronghold/fc-n-1.iob rename to objects/jigsaw/murky_stronghold/fc-n-1.iob diff --git a/objects/murky_stronghold/fc-n-2.iob b/objects/jigsaw/murky_stronghold/fc-n-2.iob similarity index 100% rename from objects/murky_stronghold/fc-n-2.iob rename to objects/jigsaw/murky_stronghold/fc-n-2.iob diff --git a/objects/murky_stronghold/fc-n-3.iob b/objects/jigsaw/murky_stronghold/fc-n-3.iob similarity index 100% rename from objects/murky_stronghold/fc-n-3.iob rename to objects/jigsaw/murky_stronghold/fc-n-3.iob diff --git a/objects/murky_stronghold/fc-n-4.iob b/objects/jigsaw/murky_stronghold/fc-n-4.iob similarity index 100% rename from objects/murky_stronghold/fc-n-4.iob rename to objects/jigsaw/murky_stronghold/fc-n-4.iob diff --git a/objects/murky_stronghold/fc-ns-1.iob b/objects/jigsaw/murky_stronghold/fc-ns-1.iob similarity index 100% rename from objects/murky_stronghold/fc-ns-1.iob rename to objects/jigsaw/murky_stronghold/fc-ns-1.iob diff --git a/objects/murky_stronghold/fc-ns-2.iob b/objects/jigsaw/murky_stronghold/fc-ns-2.iob similarity index 100% rename from objects/murky_stronghold/fc-ns-2.iob rename to objects/jigsaw/murky_stronghold/fc-ns-2.iob diff --git a/objects/murky_stronghold/fc-ns-3.iob b/objects/jigsaw/murky_stronghold/fc-ns-3.iob similarity index 100% rename from objects/murky_stronghold/fc-ns-3.iob rename to objects/jigsaw/murky_stronghold/fc-ns-3.iob diff --git a/objects/murky_stronghold/fc-ns-4.iob b/objects/jigsaw/murky_stronghold/fc-ns-4.iob similarity index 100% rename from objects/murky_stronghold/fc-ns-4.iob rename to objects/jigsaw/murky_stronghold/fc-ns-4.iob diff --git a/objects/murky_stronghold/fc-nsw-1.iob b/objects/jigsaw/murky_stronghold/fc-nsw-1.iob similarity index 100% rename from objects/murky_stronghold/fc-nsw-1.iob rename to objects/jigsaw/murky_stronghold/fc-nsw-1.iob diff --git a/objects/murky_stronghold/fc-nsw-2.iob b/objects/jigsaw/murky_stronghold/fc-nsw-2.iob similarity index 100% rename from objects/murky_stronghold/fc-nsw-2.iob rename to objects/jigsaw/murky_stronghold/fc-nsw-2.iob diff --git a/objects/murky_stronghold/fc-nsw-3.iob b/objects/jigsaw/murky_stronghold/fc-nsw-3.iob similarity index 100% rename from objects/murky_stronghold/fc-nsw-3.iob rename to objects/jigsaw/murky_stronghold/fc-nsw-3.iob diff --git a/objects/murky_stronghold/fc-nsw-4.iob b/objects/jigsaw/murky_stronghold/fc-nsw-4.iob similarity index 100% rename from objects/murky_stronghold/fc-nsw-4.iob rename to objects/jigsaw/murky_stronghold/fc-nsw-4.iob diff --git a/objects/murky_stronghold/fc-sw-1.iob b/objects/jigsaw/murky_stronghold/fc-sw-1.iob similarity index 100% rename from objects/murky_stronghold/fc-sw-1.iob rename to objects/jigsaw/murky_stronghold/fc-sw-1.iob diff --git a/objects/murky_stronghold/fc-sw-2.iob b/objects/jigsaw/murky_stronghold/fc-sw-2.iob similarity index 100% rename from objects/murky_stronghold/fc-sw-2.iob rename to objects/jigsaw/murky_stronghold/fc-sw-2.iob diff --git a/objects/murky_stronghold/fc-sw-3.iob b/objects/jigsaw/murky_stronghold/fc-sw-3.iob similarity index 100% rename from objects/murky_stronghold/fc-sw-3.iob rename to objects/jigsaw/murky_stronghold/fc-sw-3.iob diff --git a/objects/murky_stronghold/fc-sw-4.iob b/objects/jigsaw/murky_stronghold/fc-sw-4.iob similarity index 100% rename from objects/murky_stronghold/fc-sw-4.iob rename to objects/jigsaw/murky_stronghold/fc-sw-4.iob diff --git a/objects/murky_stronghold/fc-x-1.iob b/objects/jigsaw/murky_stronghold/fc-x-1.iob similarity index 100% rename from objects/murky_stronghold/fc-x-1.iob rename to objects/jigsaw/murky_stronghold/fc-x-1.iob diff --git a/objects/murky_stronghold/fc-x-2.iob b/objects/jigsaw/murky_stronghold/fc-x-2.iob similarity index 100% rename from objects/murky_stronghold/fc-x-2.iob rename to objects/jigsaw/murky_stronghold/fc-x-2.iob diff --git a/objects/murky_stronghold/fc-x-3.iob b/objects/jigsaw/murky_stronghold/fc-x-3.iob similarity index 100% rename from objects/murky_stronghold/fc-x-3.iob rename to objects/jigsaw/murky_stronghold/fc-x-3.iob diff --git a/objects/murky_stronghold/fc-x-4.iob b/objects/jigsaw/murky_stronghold/fc-x-4.iob similarity index 100% rename from objects/murky_stronghold/fc-x-4.iob rename to objects/jigsaw/murky_stronghold/fc-x-4.iob diff --git a/objects/murky_stronghold/fc-x-5.iob b/objects/jigsaw/murky_stronghold/fc-x-5.iob similarity index 100% rename from objects/murky_stronghold/fc-x-5.iob rename to objects/jigsaw/murky_stronghold/fc-x-5.iob diff --git a/objects/murky_stronghold/fc-x-6.iob b/objects/jigsaw/murky_stronghold/fc-x-6.iob similarity index 100% rename from objects/murky_stronghold/fc-x-6.iob rename to objects/jigsaw/murky_stronghold/fc-x-6.iob diff --git a/objects/murky_stronghold/fc-x-7.iob b/objects/jigsaw/murky_stronghold/fc-x-7.iob similarity index 100% rename from objects/murky_stronghold/fc-x-7.iob rename to objects/jigsaw/murky_stronghold/fc-x-7.iob diff --git a/objects/murky_stronghold/fc-x-8.iob b/objects/jigsaw/murky_stronghold/fc-x-8.iob similarity index 100% rename from objects/murky_stronghold/fc-x-8.iob rename to objects/jigsaw/murky_stronghold/fc-x-8.iob diff --git a/objects/mushhut/hut/hut1.iob b/objects/jigsaw/mushhut/hut/hut1.iob similarity index 100% rename from objects/mushhut/hut/hut1.iob rename to objects/jigsaw/mushhut/hut/hut1.iob diff --git a/objects/mushhut/hut/hut2.iob b/objects/jigsaw/mushhut/hut/hut2.iob similarity index 100% rename from objects/mushhut/hut/hut2.iob rename to objects/jigsaw/mushhut/hut/hut2.iob diff --git a/objects/mushhut/hut/hut3.iob b/objects/jigsaw/mushhut/hut/hut3.iob similarity index 100% rename from objects/mushhut/hut/hut3.iob rename to objects/jigsaw/mushhut/hut/hut3.iob diff --git a/objects/mushhut/hut/hut4.iob b/objects/jigsaw/mushhut/hut/hut4.iob similarity index 100% rename from objects/mushhut/hut/hut4.iob rename to objects/jigsaw/mushhut/hut/hut4.iob diff --git a/objects/mushhut/hut/hut5.iob b/objects/jigsaw/mushhut/hut/hut5.iob similarity index 100% rename from objects/mushhut/hut/hut5.iob rename to objects/jigsaw/mushhut/hut/hut5.iob diff --git a/objects/mushhut/hut/hut6.iob b/objects/jigsaw/mushhut/hut/hut6.iob similarity index 100% rename from objects/mushhut/hut/hut6.iob rename to objects/jigsaw/mushhut/hut/hut6.iob diff --git a/objects/mushhut/hut/hut7.iob b/objects/jigsaw/mushhut/hut/hut7.iob similarity index 100% rename from objects/mushhut/hut/hut7.iob rename to objects/jigsaw/mushhut/hut/hut7.iob diff --git a/objects/mushhut/paths/path1.iob b/objects/jigsaw/mushhut/paths/path1.iob similarity index 100% rename from objects/mushhut/paths/path1.iob rename to objects/jigsaw/mushhut/paths/path1.iob diff --git a/objects/mushhut/paths/path2.iob b/objects/jigsaw/mushhut/paths/path2.iob similarity index 100% rename from objects/mushhut/paths/path2.iob rename to objects/jigsaw/mushhut/paths/path2.iob diff --git a/objects/mushhut/paths/path3.iob b/objects/jigsaw/mushhut/paths/path3.iob similarity index 100% rename from objects/mushhut/paths/path3.iob rename to objects/jigsaw/mushhut/paths/path3.iob diff --git a/objects/mushhut/paths/path4.iob b/objects/jigsaw/mushhut/paths/path4.iob similarity index 100% rename from objects/mushhut/paths/path4.iob rename to objects/jigsaw/mushhut/paths/path4.iob diff --git a/objects/pillager_outpost/base_plate.iob b/objects/jigsaw/pillager_outpost/base_plate.iob similarity index 100% rename from objects/pillager_outpost/base_plate.iob rename to objects/jigsaw/pillager_outpost/base_plate.iob diff --git a/objects/pillager_outpost/feature_plate.iob b/objects/jigsaw/pillager_outpost/feature_plate.iob similarity index 100% rename from objects/pillager_outpost/feature_plate.iob rename to objects/jigsaw/pillager_outpost/feature_plate.iob diff --git a/objects/pillager_outpost/overgrown/cage.iob b/objects/jigsaw/pillager_outpost/overgrown/cage.iob similarity index 100% rename from objects/pillager_outpost/overgrown/cage.iob rename to objects/jigsaw/pillager_outpost/overgrown/cage.iob diff --git a/objects/pillager_outpost/overgrown/pumpkins1.iob b/objects/jigsaw/pillager_outpost/overgrown/pumpkins1.iob similarity index 100% rename from objects/pillager_outpost/overgrown/pumpkins1.iob rename to objects/jigsaw/pillager_outpost/overgrown/pumpkins1.iob diff --git a/objects/pillager_outpost/overgrown/pumpkins2.iob b/objects/jigsaw/pillager_outpost/overgrown/pumpkins2.iob similarity index 100% rename from objects/pillager_outpost/overgrown/pumpkins2.iob rename to objects/jigsaw/pillager_outpost/overgrown/pumpkins2.iob diff --git a/objects/pillager_outpost/overgrown/tent.iob b/objects/jigsaw/pillager_outpost/overgrown/tent.iob similarity index 100% rename from objects/pillager_outpost/overgrown/tent.iob rename to objects/jigsaw/pillager_outpost/overgrown/tent.iob diff --git a/objects/pillager_outpost/regular/feature_cage1.iob b/objects/jigsaw/pillager_outpost/regular/feature_cage1.iob similarity index 100% rename from objects/pillager_outpost/regular/feature_cage1.iob rename to objects/jigsaw/pillager_outpost/regular/feature_cage1.iob diff --git a/objects/pillager_outpost/regular/feature_cage2.iob b/objects/jigsaw/pillager_outpost/regular/feature_cage2.iob similarity index 100% rename from objects/pillager_outpost/regular/feature_cage2.iob rename to objects/jigsaw/pillager_outpost/regular/feature_cage2.iob diff --git a/objects/pillager_outpost/regular/feature_logs.iob b/objects/jigsaw/pillager_outpost/regular/feature_logs.iob similarity index 100% rename from objects/pillager_outpost/regular/feature_logs.iob rename to objects/jigsaw/pillager_outpost/regular/feature_logs.iob diff --git a/objects/pillager_outpost/regular/feature_targets.iob b/objects/jigsaw/pillager_outpost/regular/feature_targets.iob similarity index 100% rename from objects/pillager_outpost/regular/feature_targets.iob rename to objects/jigsaw/pillager_outpost/regular/feature_targets.iob diff --git a/objects/pillager_outpost/regular/feature_tent1.iob b/objects/jigsaw/pillager_outpost/regular/feature_tent1.iob similarity index 100% rename from objects/pillager_outpost/regular/feature_tent1.iob rename to objects/jigsaw/pillager_outpost/regular/feature_tent1.iob diff --git a/objects/pillager_outpost/regular/feature_tent2.iob b/objects/jigsaw/pillager_outpost/regular/feature_tent2.iob similarity index 100% rename from objects/pillager_outpost/regular/feature_tent2.iob rename to objects/jigsaw/pillager_outpost/regular/feature_tent2.iob diff --git a/objects/pillager_outpost/watchtower.iob b/objects/jigsaw/pillager_outpost/watchtower.iob similarity index 100% rename from objects/pillager_outpost/watchtower.iob rename to objects/jigsaw/pillager_outpost/watchtower.iob diff --git a/objects/pillager_outpost/watchtower_overgrown.iob b/objects/jigsaw/pillager_outpost/watchtower_overgrown.iob similarity index 100% rename from objects/pillager_outpost/watchtower_overgrown.iob rename to objects/jigsaw/pillager_outpost/watchtower_overgrown.iob diff --git a/objects/pyramid/py.iob b/objects/jigsaw/pyramid/py.iob similarity index 100% rename from objects/pyramid/py.iob rename to objects/jigsaw/pyramid/py.iob diff --git a/objects/pyramid/pyramid-extreme.iob b/objects/jigsaw/pyramid/pyramid-extreme.iob similarity index 100% rename from objects/pyramid/pyramid-extreme.iob rename to objects/jigsaw/pyramid/pyramid-extreme.iob diff --git a/objects/pyramid/pyramid1.iob b/objects/jigsaw/pyramid/pyramid1.iob similarity index 100% rename from objects/pyramid/pyramid1.iob rename to objects/jigsaw/pyramid/pyramid1.iob diff --git a/objects/ruined_portal/giant_portal_1.iob b/objects/jigsaw/ruined_portal/giant_portal_1.iob similarity index 100% rename from objects/ruined_portal/giant_portal_1.iob rename to objects/jigsaw/ruined_portal/giant_portal_1.iob diff --git a/objects/ruined_portal/giant_portal_2.iob b/objects/jigsaw/ruined_portal/giant_portal_2.iob similarity index 100% rename from objects/ruined_portal/giant_portal_2.iob rename to objects/jigsaw/ruined_portal/giant_portal_2.iob diff --git a/objects/ruined_portal/giant_portal_3.iob b/objects/jigsaw/ruined_portal/giant_portal_3.iob similarity index 100% rename from objects/ruined_portal/giant_portal_3.iob rename to objects/jigsaw/ruined_portal/giant_portal_3.iob diff --git a/objects/ruined_portal/portal_1.iob b/objects/jigsaw/ruined_portal/portal_1.iob similarity index 100% rename from objects/ruined_portal/portal_1.iob rename to objects/jigsaw/ruined_portal/portal_1.iob diff --git a/objects/ruined_portal/portal_10.iob b/objects/jigsaw/ruined_portal/portal_10.iob similarity index 100% rename from objects/ruined_portal/portal_10.iob rename to objects/jigsaw/ruined_portal/portal_10.iob diff --git a/objects/ruined_portal/portal_2.iob b/objects/jigsaw/ruined_portal/portal_2.iob similarity index 100% rename from objects/ruined_portal/portal_2.iob rename to objects/jigsaw/ruined_portal/portal_2.iob diff --git a/objects/ruined_portal/portal_3.iob b/objects/jigsaw/ruined_portal/portal_3.iob similarity index 100% rename from objects/ruined_portal/portal_3.iob rename to objects/jigsaw/ruined_portal/portal_3.iob diff --git a/objects/ruined_portal/portal_4.iob b/objects/jigsaw/ruined_portal/portal_4.iob similarity index 100% rename from objects/ruined_portal/portal_4.iob rename to objects/jigsaw/ruined_portal/portal_4.iob diff --git a/objects/ruined_portal/portal_5.iob b/objects/jigsaw/ruined_portal/portal_5.iob similarity index 100% rename from objects/ruined_portal/portal_5.iob rename to objects/jigsaw/ruined_portal/portal_5.iob diff --git a/objects/ruined_portal/portal_6.iob b/objects/jigsaw/ruined_portal/portal_6.iob similarity index 100% rename from objects/ruined_portal/portal_6.iob rename to objects/jigsaw/ruined_portal/portal_6.iob diff --git a/objects/ruined_portal/portal_7.iob b/objects/jigsaw/ruined_portal/portal_7.iob similarity index 100% rename from objects/ruined_portal/portal_7.iob rename to objects/jigsaw/ruined_portal/portal_7.iob diff --git a/objects/ruined_portal/portal_8.iob b/objects/jigsaw/ruined_portal/portal_8.iob similarity index 100% rename from objects/ruined_portal/portal_8.iob rename to objects/jigsaw/ruined_portal/portal_8.iob diff --git a/objects/ruined_portal/portal_9.iob b/objects/jigsaw/ruined_portal/portal_9.iob similarity index 100% rename from objects/ruined_portal/portal_9.iob rename to objects/jigsaw/ruined_portal/portal_9.iob diff --git a/objects/stronghold/ceiling/5x5/bar-lamp.iob b/objects/jigsaw/stronghold/ceiling/5x5/bar-lamp.iob similarity index 100% rename from objects/stronghold/ceiling/5x5/bar-lamp.iob rename to objects/jigsaw/stronghold/ceiling/5x5/bar-lamp.iob diff --git a/objects/stronghold/ceiling/5x5/lamp.iob b/objects/jigsaw/stronghold/ceiling/5x5/lamp.iob similarity index 100% rename from objects/stronghold/ceiling/5x5/lamp.iob rename to objects/jigsaw/stronghold/ceiling/5x5/lamp.iob diff --git a/objects/stronghold/ceiling/5x5/wood-beams.iob b/objects/jigsaw/stronghold/ceiling/5x5/wood-beams.iob similarity index 100% rename from objects/stronghold/ceiling/5x5/wood-beams.iob rename to objects/jigsaw/stronghold/ceiling/5x5/wood-beams.iob diff --git a/objects/stronghold/ceiling/7x7/flat.iob b/objects/jigsaw/stronghold/ceiling/7x7/flat.iob similarity index 100% rename from objects/stronghold/ceiling/7x7/flat.iob rename to objects/jigsaw/stronghold/ceiling/7x7/flat.iob diff --git a/objects/stronghold/ceiling/7x7/wood-beams.iob b/objects/jigsaw/stronghold/ceiling/7x7/wood-beams.iob similarity index 100% rename from objects/stronghold/ceiling/7x7/wood-beams.iob rename to objects/jigsaw/stronghold/ceiling/7x7/wood-beams.iob diff --git a/objects/stronghold/floor/3x3/flat.iob b/objects/jigsaw/stronghold/floor/3x3/flat.iob similarity index 100% rename from objects/stronghold/floor/3x3/flat.iob rename to objects/jigsaw/stronghold/floor/3x3/flat.iob diff --git a/objects/stronghold/floor/3x3/tnt.iob b/objects/jigsaw/stronghold/floor/3x3/tnt.iob similarity index 100% rename from objects/stronghold/floor/3x3/tnt.iob rename to objects/jigsaw/stronghold/floor/3x3/tnt.iob diff --git a/objects/stronghold/jail/1.iob b/objects/jigsaw/stronghold/jail/1.iob similarity index 100% rename from objects/stronghold/jail/1.iob rename to objects/jigsaw/stronghold/jail/1.iob diff --git a/objects/stronghold/jail/10.iob b/objects/jigsaw/stronghold/jail/10.iob similarity index 100% rename from objects/stronghold/jail/10.iob rename to objects/jigsaw/stronghold/jail/10.iob diff --git a/objects/stronghold/jail/11.iob b/objects/jigsaw/stronghold/jail/11.iob similarity index 100% rename from objects/stronghold/jail/11.iob rename to objects/jigsaw/stronghold/jail/11.iob diff --git a/objects/stronghold/jail/12.iob b/objects/jigsaw/stronghold/jail/12.iob similarity index 100% rename from objects/stronghold/jail/12.iob rename to objects/jigsaw/stronghold/jail/12.iob diff --git a/objects/stronghold/jail/2.iob b/objects/jigsaw/stronghold/jail/2.iob similarity index 100% rename from objects/stronghold/jail/2.iob rename to objects/jigsaw/stronghold/jail/2.iob diff --git a/objects/stronghold/jail/3.iob b/objects/jigsaw/stronghold/jail/3.iob similarity index 100% rename from objects/stronghold/jail/3.iob rename to objects/jigsaw/stronghold/jail/3.iob diff --git a/objects/stronghold/jail/4.iob b/objects/jigsaw/stronghold/jail/4.iob similarity index 100% rename from objects/stronghold/jail/4.iob rename to objects/jigsaw/stronghold/jail/4.iob diff --git a/objects/stronghold/jail/5.iob b/objects/jigsaw/stronghold/jail/5.iob similarity index 100% rename from objects/stronghold/jail/5.iob rename to objects/jigsaw/stronghold/jail/5.iob diff --git a/objects/stronghold/jail/6.iob b/objects/jigsaw/stronghold/jail/6.iob similarity index 100% rename from objects/stronghold/jail/6.iob rename to objects/jigsaw/stronghold/jail/6.iob diff --git a/objects/stronghold/jail/7.iob b/objects/jigsaw/stronghold/jail/7.iob similarity index 100% rename from objects/stronghold/jail/7.iob rename to objects/jigsaw/stronghold/jail/7.iob diff --git a/objects/stronghold/jail/8.iob b/objects/jigsaw/stronghold/jail/8.iob similarity index 100% rename from objects/stronghold/jail/8.iob rename to objects/jigsaw/stronghold/jail/8.iob diff --git a/objects/stronghold/jail/9.iob b/objects/jigsaw/stronghold/jail/9.iob similarity index 100% rename from objects/stronghold/jail/9.iob rename to objects/jigsaw/stronghold/jail/9.iob diff --git a/objects/stronghold/jail/blank.iob b/objects/jigsaw/stronghold/jail/blank.iob similarity index 100% rename from objects/stronghold/jail/blank.iob rename to objects/jigsaw/stronghold/jail/blank.iob diff --git a/objects/stronghold/path/4way-spiral-staircase.iob b/objects/jigsaw/stronghold/path/4way-spiral-staircase.iob similarity index 100% rename from objects/stronghold/path/4way-spiral-staircase.iob rename to objects/jigsaw/stronghold/path/4way-spiral-staircase.iob diff --git a/objects/stronghold/path/cap.iob b/objects/jigsaw/stronghold/path/cap.iob similarity index 100% rename from objects/stronghold/path/cap.iob rename to objects/jigsaw/stronghold/path/cap.iob diff --git a/objects/stronghold/path/corner-cross.iob b/objects/jigsaw/stronghold/path/corner-cross.iob similarity index 100% rename from objects/stronghold/path/corner-cross.iob rename to objects/jigsaw/stronghold/path/corner-cross.iob diff --git a/objects/stronghold/path/corner-cross.iob.bak b/objects/jigsaw/stronghold/path/corner-cross.iob.bak similarity index 100% rename from objects/stronghold/path/corner-cross.iob.bak rename to objects/jigsaw/stronghold/path/corner-cross.iob.bak diff --git a/objects/stronghold/path/corridor-cross.iob b/objects/jigsaw/stronghold/path/corridor-cross.iob similarity index 100% rename from objects/stronghold/path/corridor-cross.iob rename to objects/jigsaw/stronghold/path/corridor-cross.iob diff --git a/objects/stronghold/path/fancy-cross.iob b/objects/jigsaw/stronghold/path/fancy-cross.iob similarity index 100% rename from objects/stronghold/path/fancy-cross.iob rename to objects/jigsaw/stronghold/path/fancy-cross.iob diff --git a/objects/stronghold/path/hall-5x7x5.iob b/objects/jigsaw/stronghold/path/hall-5x7x5.iob similarity index 100% rename from objects/stronghold/path/hall-5x7x5.iob rename to objects/jigsaw/stronghold/path/hall-5x7x5.iob diff --git a/objects/stronghold/path/hazard-hall1.iob b/objects/jigsaw/stronghold/path/hazard-hall1.iob similarity index 100% rename from objects/stronghold/path/hazard-hall1.iob rename to objects/jigsaw/stronghold/path/hazard-hall1.iob diff --git a/objects/stronghold/path/hazard-hall2.iob b/objects/jigsaw/stronghold/path/hazard-hall2.iob similarity index 100% rename from objects/stronghold/path/hazard-hall2.iob rename to objects/jigsaw/stronghold/path/hazard-hall2.iob diff --git a/objects/stronghold/path/hazard-hall3.iob b/objects/jigsaw/stronghold/path/hazard-hall3.iob similarity index 100% rename from objects/stronghold/path/hazard-hall3.iob rename to objects/jigsaw/stronghold/path/hazard-hall3.iob diff --git a/objects/stronghold/path/iron-door.iob b/objects/jigsaw/stronghold/path/iron-door.iob similarity index 100% rename from objects/stronghold/path/iron-door.iob rename to objects/jigsaw/stronghold/path/iron-door.iob diff --git a/objects/stronghold/path/iron-door2.iob b/objects/jigsaw/stronghold/path/iron-door2.iob similarity index 100% rename from objects/stronghold/path/iron-door2.iob rename to objects/jigsaw/stronghold/path/iron-door2.iob diff --git a/objects/stronghold/path/jail-room1.iob b/objects/jigsaw/stronghold/path/jail-room1.iob similarity index 100% rename from objects/stronghold/path/jail-room1.iob rename to objects/jigsaw/stronghold/path/jail-room1.iob diff --git a/objects/stronghold/path/jail-room1.iob.bak b/objects/jigsaw/stronghold/path/jail-room1.iob.bak similarity index 100% rename from objects/stronghold/path/jail-room1.iob.bak rename to objects/jigsaw/stronghold/path/jail-room1.iob.bak diff --git a/objects/stronghold/path/jail-room2.iob b/objects/jigsaw/stronghold/path/jail-room2.iob similarity index 100% rename from objects/stronghold/path/jail-room2.iob rename to objects/jigsaw/stronghold/path/jail-room2.iob diff --git a/objects/stronghold/path/jail-room2.iob.bak b/objects/jigsaw/stronghold/path/jail-room2.iob.bak similarity index 100% rename from objects/stronghold/path/jail-room2.iob.bak rename to objects/jigsaw/stronghold/path/jail-room2.iob.bak diff --git a/objects/stronghold/path/large-corridor.iob b/objects/jigsaw/stronghold/path/large-corridor.iob similarity index 100% rename from objects/stronghold/path/large-corridor.iob rename to objects/jigsaw/stronghold/path/large-corridor.iob diff --git a/objects/stronghold/path/large-cross-stairs.iob b/objects/jigsaw/stronghold/path/large-cross-stairs.iob similarity index 100% rename from objects/stronghold/path/large-cross-stairs.iob rename to objects/jigsaw/stronghold/path/large-cross-stairs.iob diff --git a/objects/stronghold/path/large-cross-stairs.iob.old b/objects/jigsaw/stronghold/path/large-cross-stairs.iob.old similarity index 100% rename from objects/stronghold/path/large-cross-stairs.iob.old rename to objects/jigsaw/stronghold/path/large-cross-stairs.iob.old diff --git a/objects/stronghold/path/large-spiral-staircase.iob b/objects/jigsaw/stronghold/path/large-spiral-staircase.iob similarity index 100% rename from objects/stronghold/path/large-spiral-staircase.iob rename to objects/jigsaw/stronghold/path/large-spiral-staircase.iob diff --git a/objects/stronghold/path/long-corridor.iob b/objects/jigsaw/stronghold/path/long-corridor.iob similarity index 100% rename from objects/stronghold/path/long-corridor.iob rename to objects/jigsaw/stronghold/path/long-corridor.iob diff --git a/objects/stronghold/path/medium-corridor.iob b/objects/jigsaw/stronghold/path/medium-corridor.iob similarity index 100% rename from objects/stronghold/path/medium-corridor.iob rename to objects/jigsaw/stronghold/path/medium-corridor.iob diff --git a/objects/stronghold/path/medium-corridor2.iob b/objects/jigsaw/stronghold/path/medium-corridor2.iob similarity index 100% rename from objects/stronghold/path/medium-corridor2.iob rename to objects/jigsaw/stronghold/path/medium-corridor2.iob diff --git a/objects/stronghold/path/medium-cross.iob b/objects/jigsaw/stronghold/path/medium-cross.iob similarity index 100% rename from objects/stronghold/path/medium-cross.iob rename to objects/jigsaw/stronghold/path/medium-cross.iob diff --git a/objects/stronghold/path/medium-wide-corridor1.iob b/objects/jigsaw/stronghold/path/medium-wide-corridor1.iob similarity index 100% rename from objects/stronghold/path/medium-wide-corridor1.iob rename to objects/jigsaw/stronghold/path/medium-wide-corridor1.iob diff --git a/objects/stronghold/path/portal-hall.iob b/objects/jigsaw/stronghold/path/portal-hall.iob similarity index 100% rename from objects/stronghold/path/portal-hall.iob rename to objects/jigsaw/stronghold/path/portal-hall.iob diff --git a/objects/stronghold/path/small-corridor.iob b/objects/jigsaw/stronghold/path/small-corridor.iob similarity index 100% rename from objects/stronghold/path/small-corridor.iob rename to objects/jigsaw/stronghold/path/small-corridor.iob diff --git a/objects/stronghold/path/small-corridor2.iob b/objects/jigsaw/stronghold/path/small-corridor2.iob similarity index 100% rename from objects/stronghold/path/small-corridor2.iob rename to objects/jigsaw/stronghold/path/small-corridor2.iob diff --git a/objects/stronghold/path/small-cross.iob b/objects/jigsaw/stronghold/path/small-cross.iob similarity index 100% rename from objects/stronghold/path/small-cross.iob rename to objects/jigsaw/stronghold/path/small-cross.iob diff --git a/objects/stronghold/path/small-spiral-staircase.iob b/objects/jigsaw/stronghold/path/small-spiral-staircase.iob similarity index 100% rename from objects/stronghold/path/small-spiral-staircase.iob rename to objects/jigsaw/stronghold/path/small-spiral-staircase.iob diff --git a/objects/stronghold/path/stair-split.iob b/objects/jigsaw/stronghold/path/stair-split.iob similarity index 100% rename from objects/stronghold/path/stair-split.iob rename to objects/jigsaw/stronghold/path/stair-split.iob diff --git a/objects/stronghold/path/stairs1.iob b/objects/jigsaw/stronghold/path/stairs1.iob similarity index 100% rename from objects/stronghold/path/stairs1.iob rename to objects/jigsaw/stronghold/path/stairs1.iob diff --git a/objects/stronghold/path/straight-staircase.iob b/objects/jigsaw/stronghold/path/straight-staircase.iob similarity index 100% rename from objects/stronghold/path/straight-staircase.iob rename to objects/jigsaw/stronghold/path/straight-staircase.iob diff --git a/objects/stronghold/path/tee-cross.iob b/objects/jigsaw/stronghold/path/tee-cross.iob similarity index 100% rename from objects/stronghold/path/tee-cross.iob rename to objects/jigsaw/stronghold/path/tee-cross.iob diff --git a/objects/stronghold/path/tee-cross.iob.bak b/objects/jigsaw/stronghold/path/tee-cross.iob.bak similarity index 100% rename from objects/stronghold/path/tee-cross.iob.bak rename to objects/jigsaw/stronghold/path/tee-cross.iob.bak diff --git a/objects/stronghold/path/tee-cross2.iob b/objects/jigsaw/stronghold/path/tee-cross2.iob similarity index 100% rename from objects/stronghold/path/tee-cross2.iob rename to objects/jigsaw/stronghold/path/tee-cross2.iob diff --git a/objects/stronghold/path/tee-cross2.iob.bak b/objects/jigsaw/stronghold/path/tee-cross2.iob.bak similarity index 100% rename from objects/stronghold/path/tee-cross2.iob.bak rename to objects/jigsaw/stronghold/path/tee-cross2.iob.bak diff --git a/objects/stronghold/path/tiny-cross.iob b/objects/jigsaw/stronghold/path/tiny-cross.iob similarity index 100% rename from objects/stronghold/path/tiny-cross.iob rename to objects/jigsaw/stronghold/path/tiny-cross.iob diff --git a/objects/stronghold/path/wood-door.iob b/objects/jigsaw/stronghold/path/wood-door.iob similarity index 100% rename from objects/stronghold/path/wood-door.iob rename to objects/jigsaw/stronghold/path/wood-door.iob diff --git a/objects/stronghold/path/wood-door2.iob b/objects/jigsaw/stronghold/path/wood-door2.iob similarity index 100% rename from objects/stronghold/path/wood-door2.iob rename to objects/jigsaw/stronghold/path/wood-door2.iob diff --git a/objects/stronghold/portal/main.iob b/objects/jigsaw/stronghold/portal/main.iob similarity index 100% rename from objects/stronghold/portal/main.iob rename to objects/jigsaw/stronghold/portal/main.iob diff --git a/objects/stronghold/portal/top.iob b/objects/jigsaw/stronghold/portal/top.iob similarity index 100% rename from objects/stronghold/portal/top.iob rename to objects/jigsaw/stronghold/portal/top.iob diff --git a/objects/stronghold/portal/top_new.iob b/objects/jigsaw/stronghold/portal/top_new.iob similarity index 100% rename from objects/stronghold/portal/top_new.iob rename to objects/jigsaw/stronghold/portal/top_new.iob diff --git a/objects/stronghold/room/portal-room.iob b/objects/jigsaw/stronghold/room/portal-room.iob similarity index 100% rename from objects/stronghold/room/portal-room.iob rename to objects/jigsaw/stronghold/room/portal-room.iob diff --git a/objects/stronghold/room/sleeping-quarters.iob b/objects/jigsaw/stronghold/room/sleeping-quarters.iob similarity index 100% rename from objects/stronghold/room/sleeping-quarters.iob rename to objects/jigsaw/stronghold/room/sleeping-quarters.iob diff --git a/objects/stronghold/room/small-cell.iob b/objects/jigsaw/stronghold/room/small-cell.iob similarity index 100% rename from objects/stronghold/room/small-cell.iob rename to objects/jigsaw/stronghold/room/small-cell.iob diff --git a/objects/stronghold/room/stairs-down.iob b/objects/jigsaw/stronghold/room/stairs-down.iob similarity index 100% rename from objects/stronghold/room/stairs-down.iob rename to objects/jigsaw/stronghold/room/stairs-down.iob diff --git a/objects/stronghold/room/stairs-up-down.iob b/objects/jigsaw/stronghold/room/stairs-up-down.iob similarity index 100% rename from objects/stronghold/room/stairs-up-down.iob rename to objects/jigsaw/stronghold/room/stairs-up-down.iob diff --git a/objects/stronghold/room/stairs-up.iob b/objects/jigsaw/stronghold/room/stairs-up.iob similarity index 100% rename from objects/stronghold/room/stairs-up.iob rename to objects/jigsaw/stronghold/room/stairs-up.iob diff --git a/objects/stronghold/room/study.iob b/objects/jigsaw/stronghold/room/study.iob similarity index 100% rename from objects/stronghold/room/study.iob rename to objects/jigsaw/stronghold/room/study.iob diff --git a/objects/stronghold/room/witch-room-end.iob b/objects/jigsaw/stronghold/room/witch-room-end.iob similarity index 100% rename from objects/stronghold/room/witch-room-end.iob rename to objects/jigsaw/stronghold/room/witch-room-end.iob diff --git a/objects/stronghold/room/witch-room.iob b/objects/jigsaw/stronghold/room/witch-room.iob similarity index 100% rename from objects/stronghold/room/witch-room.iob rename to objects/jigsaw/stronghold/room/witch-room.iob diff --git a/objects/stronghold/rooms/alter1.iob b/objects/jigsaw/stronghold/rooms/alter1.iob similarity index 100% rename from objects/stronghold/rooms/alter1.iob rename to objects/jigsaw/stronghold/rooms/alter1.iob diff --git a/objects/stronghold/rooms/alter1.iob.bak b/objects/jigsaw/stronghold/rooms/alter1.iob.bak similarity index 100% rename from objects/stronghold/rooms/alter1.iob.bak rename to objects/jigsaw/stronghold/rooms/alter1.iob.bak diff --git a/objects/stronghold/rooms/boomtube-test.iob b/objects/jigsaw/stronghold/rooms/boomtube-test.iob similarity index 100% rename from objects/stronghold/rooms/boomtube-test.iob rename to objects/jigsaw/stronghold/rooms/boomtube-test.iob diff --git a/objects/stronghold/rooms/chestroom1-trap.iob b/objects/jigsaw/stronghold/rooms/chestroom1-trap.iob similarity index 100% rename from objects/stronghold/rooms/chestroom1-trap.iob rename to objects/jigsaw/stronghold/rooms/chestroom1-trap.iob diff --git a/objects/stronghold/rooms/chestroom1-trap.iob.bak b/objects/jigsaw/stronghold/rooms/chestroom1-trap.iob.bak similarity index 100% rename from objects/stronghold/rooms/chestroom1-trap.iob.bak rename to objects/jigsaw/stronghold/rooms/chestroom1-trap.iob.bak diff --git a/objects/stronghold/rooms/chestroom1.iob b/objects/jigsaw/stronghold/rooms/chestroom1.iob similarity index 100% rename from objects/stronghold/rooms/chestroom1.iob rename to objects/jigsaw/stronghold/rooms/chestroom1.iob diff --git a/objects/stronghold/rooms/chestroom1.iob.bak b/objects/jigsaw/stronghold/rooms/chestroom1.iob.bak similarity index 100% rename from objects/stronghold/rooms/chestroom1.iob.bak rename to objects/jigsaw/stronghold/rooms/chestroom1.iob.bak diff --git a/objects/stronghold/rooms/chestroom2-trap.iob b/objects/jigsaw/stronghold/rooms/chestroom2-trap.iob similarity index 100% rename from objects/stronghold/rooms/chestroom2-trap.iob rename to objects/jigsaw/stronghold/rooms/chestroom2-trap.iob diff --git a/objects/stronghold/rooms/chestroom2-trap.iob.bak b/objects/jigsaw/stronghold/rooms/chestroom2-trap.iob.bak similarity index 100% rename from objects/stronghold/rooms/chestroom2-trap.iob.bak rename to objects/jigsaw/stronghold/rooms/chestroom2-trap.iob.bak diff --git a/objects/stronghold/rooms/chestroom2.iob b/objects/jigsaw/stronghold/rooms/chestroom2.iob similarity index 100% rename from objects/stronghold/rooms/chestroom2.iob rename to objects/jigsaw/stronghold/rooms/chestroom2.iob diff --git a/objects/stronghold/rooms/chestroom2.iob.bak b/objects/jigsaw/stronghold/rooms/chestroom2.iob.bak similarity index 100% rename from objects/stronghold/rooms/chestroom2.iob.bak rename to objects/jigsaw/stronghold/rooms/chestroom2.iob.bak diff --git a/objects/stronghold/rooms/jail-complex.iob b/objects/jigsaw/stronghold/rooms/jail-complex.iob similarity index 100% rename from objects/stronghold/rooms/jail-complex.iob rename to objects/jigsaw/stronghold/rooms/jail-complex.iob diff --git a/objects/stronghold/rooms/library-large.iob b/objects/jigsaw/stronghold/rooms/library-large.iob similarity index 100% rename from objects/stronghold/rooms/library-large.iob rename to objects/jigsaw/stronghold/rooms/library-large.iob diff --git a/objects/stronghold/rooms/library.iob b/objects/jigsaw/stronghold/rooms/library.iob similarity index 100% rename from objects/stronghold/rooms/library.iob rename to objects/jigsaw/stronghold/rooms/library.iob diff --git a/objects/stronghold/rooms/library.iob.bak b/objects/jigsaw/stronghold/rooms/library.iob.bak similarity index 100% rename from objects/stronghold/rooms/library.iob.bak rename to objects/jigsaw/stronghold/rooms/library.iob.bak diff --git a/objects/stronghold/rooms/maze1.iob b/objects/jigsaw/stronghold/rooms/maze1.iob similarity index 100% rename from objects/stronghold/rooms/maze1.iob rename to objects/jigsaw/stronghold/rooms/maze1.iob diff --git a/objects/stronghold/rooms/maze1.iob.bak b/objects/jigsaw/stronghold/rooms/maze1.iob.bak similarity index 100% rename from objects/stronghold/rooms/maze1.iob.bak rename to objects/jigsaw/stronghold/rooms/maze1.iob.bak diff --git a/objects/stronghold/rooms/maze2.iob b/objects/jigsaw/stronghold/rooms/maze2.iob similarity index 100% rename from objects/stronghold/rooms/maze2.iob rename to objects/jigsaw/stronghold/rooms/maze2.iob diff --git a/objects/stronghold/rooms/maze2.iob.bak b/objects/jigsaw/stronghold/rooms/maze2.iob.bak similarity index 100% rename from objects/stronghold/rooms/maze2.iob.bak rename to objects/jigsaw/stronghold/rooms/maze2.iob.bak diff --git a/objects/stronghold/rooms/maze3.iob b/objects/jigsaw/stronghold/rooms/maze3.iob similarity index 100% rename from objects/stronghold/rooms/maze3.iob rename to objects/jigsaw/stronghold/rooms/maze3.iob diff --git a/objects/stronghold/rooms/maze3.iob.bak b/objects/jigsaw/stronghold/rooms/maze3.iob.bak similarity index 100% rename from objects/stronghold/rooms/maze3.iob.bak rename to objects/jigsaw/stronghold/rooms/maze3.iob.bak diff --git a/objects/stronghold/rooms/oreroom.iob b/objects/jigsaw/stronghold/rooms/oreroom.iob similarity index 100% rename from objects/stronghold/rooms/oreroom.iob rename to objects/jigsaw/stronghold/rooms/oreroom.iob diff --git a/objects/stronghold/rooms/oreroom.iob.bak b/objects/jigsaw/stronghold/rooms/oreroom.iob.bak similarity index 100% rename from objects/stronghold/rooms/oreroom.iob.bak rename to objects/jigsaw/stronghold/rooms/oreroom.iob.bak diff --git a/objects/stronghold/stairs/casing-floor-hollow.iob b/objects/jigsaw/stronghold/stairs/casing-floor-hollow.iob similarity index 100% rename from objects/stronghold/stairs/casing-floor-hollow.iob rename to objects/jigsaw/stronghold/stairs/casing-floor-hollow.iob diff --git a/objects/stronghold/stairs/casing-floor-solid.iob b/objects/jigsaw/stronghold/stairs/casing-floor-solid.iob similarity index 100% rename from objects/stronghold/stairs/casing-floor-solid.iob rename to objects/jigsaw/stronghold/stairs/casing-floor-solid.iob diff --git a/objects/stronghold/stairs/casing-tight.iob b/objects/jigsaw/stronghold/stairs/casing-tight.iob similarity index 100% rename from objects/stronghold/stairs/casing-tight.iob rename to objects/jigsaw/stronghold/stairs/casing-tight.iob diff --git a/objects/stronghold/stairs/casing-top.iob b/objects/jigsaw/stronghold/stairs/casing-top.iob similarity index 100% rename from objects/stronghold/stairs/casing-top.iob rename to objects/jigsaw/stronghold/stairs/casing-top.iob diff --git a/objects/stronghold/stairs/casing.iob b/objects/jigsaw/stronghold/stairs/casing.iob similarity index 100% rename from objects/stronghold/stairs/casing.iob rename to objects/jigsaw/stronghold/stairs/casing.iob diff --git a/objects/stronghold/stairs/med-vertical-complete1.iob b/objects/jigsaw/stronghold/stairs/med-vertical-complete1.iob similarity index 100% rename from objects/stronghold/stairs/med-vertical-complete1.iob rename to objects/jigsaw/stronghold/stairs/med-vertical-complete1.iob diff --git a/objects/stronghold/stairs/med-vertical-complete2.iob b/objects/jigsaw/stronghold/stairs/med-vertical-complete2.iob similarity index 100% rename from objects/stronghold/stairs/med-vertical-complete2.iob rename to objects/jigsaw/stronghold/stairs/med-vertical-complete2.iob diff --git a/objects/stronghold/stairs/med-vertical-extension.iob b/objects/jigsaw/stronghold/stairs/med-vertical-extension.iob similarity index 100% rename from objects/stronghold/stairs/med-vertical-extension.iob rename to objects/jigsaw/stronghold/stairs/med-vertical-extension.iob diff --git a/objects/stronghold/stairs/med-vertical-naked.iob b/objects/jigsaw/stronghold/stairs/med-vertical-naked.iob similarity index 100% rename from objects/stronghold/stairs/med-vertical-naked.iob rename to objects/jigsaw/stronghold/stairs/med-vertical-naked.iob diff --git a/objects/stronghold/stairs/sml-vertical-naked.iob b/objects/jigsaw/stronghold/stairs/sml-vertical-naked.iob similarity index 100% rename from objects/stronghold/stairs/sml-vertical-naked.iob rename to objects/jigsaw/stronghold/stairs/sml-vertical-naked.iob diff --git a/objects/stronghold/wall-fixture/5x3/anvil-furnace.iob b/objects/jigsaw/stronghold/wall-fixture/5x3/anvil-furnace.iob similarity index 100% rename from objects/stronghold/wall-fixture/5x3/anvil-furnace.iob rename to objects/jigsaw/stronghold/wall-fixture/5x3/anvil-furnace.iob diff --git a/objects/stronghold/wall-fixture/5x3/brew-set.iob b/objects/jigsaw/stronghold/wall-fixture/5x3/brew-set.iob similarity index 100% rename from objects/stronghold/wall-fixture/5x3/brew-set.iob rename to objects/jigsaw/stronghold/wall-fixture/5x3/brew-set.iob diff --git a/objects/stronghold/wall-fixture/5x3/brewing-shelf.iob b/objects/jigsaw/stronghold/wall-fixture/5x3/brewing-shelf.iob similarity index 100% rename from objects/stronghold/wall-fixture/5x3/brewing-shelf.iob rename to objects/jigsaw/stronghold/wall-fixture/5x3/brewing-shelf.iob diff --git a/objects/stronghold/wall-fixture/5x3/chains.iob b/objects/jigsaw/stronghold/wall-fixture/5x3/chains.iob similarity index 100% rename from objects/stronghold/wall-fixture/5x3/chains.iob rename to objects/jigsaw/stronghold/wall-fixture/5x3/chains.iob diff --git a/objects/stronghold/wall-fixture/5x3/chest.iob b/objects/jigsaw/stronghold/wall-fixture/5x3/chest.iob similarity index 100% rename from objects/stronghold/wall-fixture/5x3/chest.iob rename to objects/jigsaw/stronghold/wall-fixture/5x3/chest.iob diff --git a/objects/stronghold/wall-fixture/5x3/crafting-station.iob b/objects/jigsaw/stronghold/wall-fixture/5x3/crafting-station.iob similarity index 100% rename from objects/stronghold/wall-fixture/5x3/crafting-station.iob rename to objects/jigsaw/stronghold/wall-fixture/5x3/crafting-station.iob diff --git a/objects/stronghold/wall-fixture/5x3/double-chest.iob b/objects/jigsaw/stronghold/wall-fixture/5x3/double-chest.iob similarity index 100% rename from objects/stronghold/wall-fixture/5x3/double-chest.iob rename to objects/jigsaw/stronghold/wall-fixture/5x3/double-chest.iob diff --git a/objects/stronghold/wall-fixture/5x3/lantern.iob b/objects/jigsaw/stronghold/wall-fixture/5x3/lantern.iob similarity index 100% rename from objects/stronghold/wall-fixture/5x3/lantern.iob rename to objects/jigsaw/stronghold/wall-fixture/5x3/lantern.iob diff --git a/objects/stronghold/wall-fixture/5x3/mixed1.iob b/objects/jigsaw/stronghold/wall-fixture/5x3/mixed1.iob similarity index 100% rename from objects/stronghold/wall-fixture/5x3/mixed1.iob rename to objects/jigsaw/stronghold/wall-fixture/5x3/mixed1.iob diff --git a/objects/stronghold/wall-fixture/5x3/mixed1.iob.bak b/objects/jigsaw/stronghold/wall-fixture/5x3/mixed1.iob.bak similarity index 100% rename from objects/stronghold/wall-fixture/5x3/mixed1.iob.bak rename to objects/jigsaw/stronghold/wall-fixture/5x3/mixed1.iob.bak diff --git a/objects/stronghold/wall-fixture/5x3/shelf.iob b/objects/jigsaw/stronghold/wall-fixture/5x3/shelf.iob similarity index 100% rename from objects/stronghold/wall-fixture/5x3/shelf.iob rename to objects/jigsaw/stronghold/wall-fixture/5x3/shelf.iob diff --git a/objects/stronghold/wall-fixture/5x3/study.iob b/objects/jigsaw/stronghold/wall-fixture/5x3/study.iob similarity index 100% rename from objects/stronghold/wall-fixture/5x3/study.iob rename to objects/jigsaw/stronghold/wall-fixture/5x3/study.iob diff --git a/objects/stronghold/wall-fixture/5x3x3/chains.iob b/objects/jigsaw/stronghold/wall-fixture/5x3x3/chains.iob similarity index 100% rename from objects/stronghold/wall-fixture/5x3x3/chains.iob rename to objects/jigsaw/stronghold/wall-fixture/5x3x3/chains.iob diff --git a/objects/stronghold/wall-fixture/5x3x3/cobweb.iob b/objects/jigsaw/stronghold/wall-fixture/5x3x3/cobweb.iob similarity index 100% rename from objects/stronghold/wall-fixture/5x3x3/cobweb.iob rename to objects/jigsaw/stronghold/wall-fixture/5x3x3/cobweb.iob diff --git a/objects/stronghold/wall-fixture/blank.iob b/objects/jigsaw/stronghold/wall-fixture/blank.iob similarity index 100% rename from objects/stronghold/wall-fixture/blank.iob rename to objects/jigsaw/stronghold/wall-fixture/blank.iob diff --git a/objects/stronghold/wall/1.iob b/objects/jigsaw/stronghold/wall/1.iob similarity index 100% rename from objects/stronghold/wall/1.iob rename to objects/jigsaw/stronghold/wall/1.iob diff --git a/objects/stronghold/wall/2.iob b/objects/jigsaw/stronghold/wall/2.iob similarity index 100% rename from objects/stronghold/wall/2.iob rename to objects/jigsaw/stronghold/wall/2.iob diff --git a/objects/stronghold/wall/3.iob b/objects/jigsaw/stronghold/wall/3.iob similarity index 100% rename from objects/stronghold/wall/3.iob rename to objects/jigsaw/stronghold/wall/3.iob diff --git a/objects/structure/Example Temple/corner-1.iob b/objects/jigsaw/structure/Example Temple/corner-1.iob similarity index 100% rename from objects/structure/Example Temple/corner-1.iob rename to objects/jigsaw/structure/Example Temple/corner-1.iob diff --git a/objects/structure/Example Temple/cross-1.iob b/objects/jigsaw/structure/Example Temple/cross-1.iob similarity index 100% rename from objects/structure/Example Temple/cross-1.iob rename to objects/jigsaw/structure/Example Temple/cross-1.iob diff --git a/objects/structure/Example Temple/hall-1.iob b/objects/jigsaw/structure/Example Temple/hall-1.iob similarity index 100% rename from objects/structure/Example Temple/hall-1.iob rename to objects/jigsaw/structure/Example Temple/hall-1.iob diff --git a/objects/structure/Example Temple/room-1.iob b/objects/jigsaw/structure/Example Temple/room-1.iob similarity index 100% rename from objects/structure/Example Temple/room-1.iob rename to objects/jigsaw/structure/Example Temple/room-1.iob diff --git a/objects/structure/Example Temple/t-connect-1.iob b/objects/jigsaw/structure/Example Temple/t-connect-1.iob similarity index 100% rename from objects/structure/Example Temple/t-connect-1.iob rename to objects/jigsaw/structure/Example Temple/t-connect-1.iob diff --git a/objects/structure/Example Temple/walled-room-1.iob b/objects/jigsaw/structure/Example Temple/walled-room-1.iob similarity index 100% rename from objects/structure/Example Temple/walled-room-1.iob rename to objects/jigsaw/structure/Example Temple/walled-room-1.iob diff --git a/objects/structure/RedMineshaft/corner-1.iob b/objects/jigsaw/structure/RedMineshaft/corner-1.iob similarity index 100% rename from objects/structure/RedMineshaft/corner-1.iob rename to objects/jigsaw/structure/RedMineshaft/corner-1.iob diff --git a/objects/structure/RedMineshaft/corner-2.iob b/objects/jigsaw/structure/RedMineshaft/corner-2.iob similarity index 100% rename from objects/structure/RedMineshaft/corner-2.iob rename to objects/jigsaw/structure/RedMineshaft/corner-2.iob diff --git a/objects/structure/RedMineshaft/corner-3.iob b/objects/jigsaw/structure/RedMineshaft/corner-3.iob similarity index 100% rename from objects/structure/RedMineshaft/corner-3.iob rename to objects/jigsaw/structure/RedMineshaft/corner-3.iob diff --git a/objects/structure/RedMineshaft/corner-4.iob b/objects/jigsaw/structure/RedMineshaft/corner-4.iob similarity index 100% rename from objects/structure/RedMineshaft/corner-4.iob rename to objects/jigsaw/structure/RedMineshaft/corner-4.iob diff --git a/objects/structure/RedMineshaft/corner-5.iob b/objects/jigsaw/structure/RedMineshaft/corner-5.iob similarity index 100% rename from objects/structure/RedMineshaft/corner-5.iob rename to objects/jigsaw/structure/RedMineshaft/corner-5.iob diff --git a/objects/structure/RedMineshaft/cross-1.iob b/objects/jigsaw/structure/RedMineshaft/cross-1.iob similarity index 100% rename from objects/structure/RedMineshaft/cross-1.iob rename to objects/jigsaw/structure/RedMineshaft/cross-1.iob diff --git a/objects/structure/RedMineshaft/cross-2.iob b/objects/jigsaw/structure/RedMineshaft/cross-2.iob similarity index 100% rename from objects/structure/RedMineshaft/cross-2.iob rename to objects/jigsaw/structure/RedMineshaft/cross-2.iob diff --git a/objects/structure/RedMineshaft/cross-3.iob b/objects/jigsaw/structure/RedMineshaft/cross-3.iob similarity index 100% rename from objects/structure/RedMineshaft/cross-3.iob rename to objects/jigsaw/structure/RedMineshaft/cross-3.iob diff --git a/objects/structure/RedMineshaft/cross-4.iob b/objects/jigsaw/structure/RedMineshaft/cross-4.iob similarity index 100% rename from objects/structure/RedMineshaft/cross-4.iob rename to objects/jigsaw/structure/RedMineshaft/cross-4.iob diff --git a/objects/structure/RedMineshaft/cross-5.iob b/objects/jigsaw/structure/RedMineshaft/cross-5.iob similarity index 100% rename from objects/structure/RedMineshaft/cross-5.iob rename to objects/jigsaw/structure/RedMineshaft/cross-5.iob diff --git a/objects/structure/RedMineshaft/hall-1.iob b/objects/jigsaw/structure/RedMineshaft/hall-1.iob similarity index 100% rename from objects/structure/RedMineshaft/hall-1.iob rename to objects/jigsaw/structure/RedMineshaft/hall-1.iob diff --git a/objects/structure/RedMineshaft/hall-2.iob b/objects/jigsaw/structure/RedMineshaft/hall-2.iob similarity index 100% rename from objects/structure/RedMineshaft/hall-2.iob rename to objects/jigsaw/structure/RedMineshaft/hall-2.iob diff --git a/objects/structure/RedMineshaft/hall-3.iob b/objects/jigsaw/structure/RedMineshaft/hall-3.iob similarity index 100% rename from objects/structure/RedMineshaft/hall-3.iob rename to objects/jigsaw/structure/RedMineshaft/hall-3.iob diff --git a/objects/structure/RedMineshaft/hall-4.iob b/objects/jigsaw/structure/RedMineshaft/hall-4.iob similarity index 100% rename from objects/structure/RedMineshaft/hall-4.iob rename to objects/jigsaw/structure/RedMineshaft/hall-4.iob diff --git a/objects/structure/RedMineshaft/hall-5.iob b/objects/jigsaw/structure/RedMineshaft/hall-5.iob similarity index 100% rename from objects/structure/RedMineshaft/hall-5.iob rename to objects/jigsaw/structure/RedMineshaft/hall-5.iob diff --git a/objects/structure/RedMineshaft/hall-6.iob b/objects/jigsaw/structure/RedMineshaft/hall-6.iob similarity index 100% rename from objects/structure/RedMineshaft/hall-6.iob rename to objects/jigsaw/structure/RedMineshaft/hall-6.iob diff --git a/objects/structure/RedMineshaft/room-1.iob b/objects/jigsaw/structure/RedMineshaft/room-1.iob similarity index 100% rename from objects/structure/RedMineshaft/room-1.iob rename to objects/jigsaw/structure/RedMineshaft/room-1.iob diff --git a/objects/structure/RedMineshaft/room-2.iob b/objects/jigsaw/structure/RedMineshaft/room-2.iob similarity index 100% rename from objects/structure/RedMineshaft/room-2.iob rename to objects/jigsaw/structure/RedMineshaft/room-2.iob diff --git a/objects/structure/RedMineshaft/room-3.iob b/objects/jigsaw/structure/RedMineshaft/room-3.iob similarity index 100% rename from objects/structure/RedMineshaft/room-3.iob rename to objects/jigsaw/structure/RedMineshaft/room-3.iob diff --git a/objects/structure/RedMineshaft/room-4.iob b/objects/jigsaw/structure/RedMineshaft/room-4.iob similarity index 100% rename from objects/structure/RedMineshaft/room-4.iob rename to objects/jigsaw/structure/RedMineshaft/room-4.iob diff --git a/objects/structure/RedMineshaft/room-5.iob b/objects/jigsaw/structure/RedMineshaft/room-5.iob similarity index 100% rename from objects/structure/RedMineshaft/room-5.iob rename to objects/jigsaw/structure/RedMineshaft/room-5.iob diff --git a/objects/structure/RedMineshaft/t-connect-1.iob b/objects/jigsaw/structure/RedMineshaft/t-connect-1.iob similarity index 100% rename from objects/structure/RedMineshaft/t-connect-1.iob rename to objects/jigsaw/structure/RedMineshaft/t-connect-1.iob diff --git a/objects/structure/RedMineshaft/t-connect-2.iob b/objects/jigsaw/structure/RedMineshaft/t-connect-2.iob similarity index 100% rename from objects/structure/RedMineshaft/t-connect-2.iob rename to objects/jigsaw/structure/RedMineshaft/t-connect-2.iob diff --git a/objects/structure/RedMineshaft/t-connect-3.iob b/objects/jigsaw/structure/RedMineshaft/t-connect-3.iob similarity index 100% rename from objects/structure/RedMineshaft/t-connect-3.iob rename to objects/jigsaw/structure/RedMineshaft/t-connect-3.iob diff --git a/objects/structure/RedMineshaft/t-connect-4.iob b/objects/jigsaw/structure/RedMineshaft/t-connect-4.iob similarity index 100% rename from objects/structure/RedMineshaft/t-connect-4.iob rename to objects/jigsaw/structure/RedMineshaft/t-connect-4.iob diff --git a/objects/structure/RedMineshaft/t-connect-5.iob b/objects/jigsaw/structure/RedMineshaft/t-connect-5.iob similarity index 100% rename from objects/structure/RedMineshaft/t-connect-5.iob rename to objects/jigsaw/structure/RedMineshaft/t-connect-5.iob diff --git a/objects/structure/RedMineshaft/t-connect-6.iob b/objects/jigsaw/structure/RedMineshaft/t-connect-6.iob similarity index 100% rename from objects/structure/RedMineshaft/t-connect-6.iob rename to objects/jigsaw/structure/RedMineshaft/t-connect-6.iob diff --git a/objects/structure/RedMineshaft/t-connect-7.iob b/objects/jigsaw/structure/RedMineshaft/t-connect-7.iob similarity index 100% rename from objects/structure/RedMineshaft/t-connect-7.iob rename to objects/jigsaw/structure/RedMineshaft/t-connect-7.iob diff --git a/objects/structure/RedMineshaft/walled-room-1.iob b/objects/jigsaw/structure/RedMineshaft/walled-room-1.iob similarity index 100% rename from objects/structure/RedMineshaft/walled-room-1.iob rename to objects/jigsaw/structure/RedMineshaft/walled-room-1.iob diff --git a/objects/structure/RedMineshaft/walled-room-2.iob b/objects/jigsaw/structure/RedMineshaft/walled-room-2.iob similarity index 100% rename from objects/structure/RedMineshaft/walled-room-2.iob rename to objects/jigsaw/structure/RedMineshaft/walled-room-2.iob diff --git a/objects/structure/RedMineshaft/walled-room-3.iob b/objects/jigsaw/structure/RedMineshaft/walled-room-3.iob similarity index 100% rename from objects/structure/RedMineshaft/walled-room-3.iob rename to objects/jigsaw/structure/RedMineshaft/walled-room-3.iob diff --git a/objects/structure/RedMineshaft/walled-room-4.iob b/objects/jigsaw/structure/RedMineshaft/walled-room-4.iob similarity index 100% rename from objects/structure/RedMineshaft/walled-room-4.iob rename to objects/jigsaw/structure/RedMineshaft/walled-room-4.iob diff --git a/objects/structure/cottage-lot/corner-1.iob b/objects/jigsaw/structure/cottage-lot/corner-1.iob similarity index 100% rename from objects/structure/cottage-lot/corner-1.iob rename to objects/jigsaw/structure/cottage-lot/corner-1.iob diff --git a/objects/structure/cottage-lot/cross-1.iob b/objects/jigsaw/structure/cottage-lot/cross-1.iob similarity index 100% rename from objects/structure/cottage-lot/cross-1.iob rename to objects/jigsaw/structure/cottage-lot/cross-1.iob diff --git a/objects/structure/cottage-lot/hall-1.iob b/objects/jigsaw/structure/cottage-lot/hall-1.iob similarity index 100% rename from objects/structure/cottage-lot/hall-1.iob rename to objects/jigsaw/structure/cottage-lot/hall-1.iob diff --git a/objects/structure/cottage-lot/room-1.iob b/objects/jigsaw/structure/cottage-lot/room-1.iob similarity index 100% rename from objects/structure/cottage-lot/room-1.iob rename to objects/jigsaw/structure/cottage-lot/room-1.iob diff --git a/objects/structure/cottage-lot/room-2.iob b/objects/jigsaw/structure/cottage-lot/room-2.iob similarity index 100% rename from objects/structure/cottage-lot/room-2.iob rename to objects/jigsaw/structure/cottage-lot/room-2.iob diff --git a/objects/structure/cottage-lot/room-3.iob b/objects/jigsaw/structure/cottage-lot/room-3.iob similarity index 100% rename from objects/structure/cottage-lot/room-3.iob rename to objects/jigsaw/structure/cottage-lot/room-3.iob diff --git a/objects/structure/cottage-lot/room-4.iob b/objects/jigsaw/structure/cottage-lot/room-4.iob similarity index 100% rename from objects/structure/cottage-lot/room-4.iob rename to objects/jigsaw/structure/cottage-lot/room-4.iob diff --git a/objects/structure/cottage-lot/t-connect-1.iob b/objects/jigsaw/structure/cottage-lot/t-connect-1.iob similarity index 100% rename from objects/structure/cottage-lot/t-connect-1.iob rename to objects/jigsaw/structure/cottage-lot/t-connect-1.iob diff --git a/objects/structure/cottage-lot/walled-room-1.iob b/objects/jigsaw/structure/cottage-lot/walled-room-1.iob similarity index 100% rename from objects/structure/cottage-lot/walled-room-1.iob rename to objects/jigsaw/structure/cottage-lot/walled-room-1.iob diff --git a/objects/structure/desert-base.iob b/objects/jigsaw/structure/desert-base.iob similarity index 100% rename from objects/structure/desert-base.iob rename to objects/jigsaw/structure/desert-base.iob diff --git a/objects/structure/mush-huts/room-1.iob b/objects/jigsaw/structure/mush-huts/room-1.iob similarity index 100% rename from objects/structure/mush-huts/room-1.iob rename to objects/jigsaw/structure/mush-huts/room-1.iob diff --git a/objects/structure/mush-huts/room-2.iob b/objects/jigsaw/structure/mush-huts/room-2.iob similarity index 100% rename from objects/structure/mush-huts/room-2.iob rename to objects/jigsaw/structure/mush-huts/room-2.iob diff --git a/objects/structure/mush-huts/room-3.iob b/objects/jigsaw/structure/mush-huts/room-3.iob similarity index 100% rename from objects/structure/mush-huts/room-3.iob rename to objects/jigsaw/structure/mush-huts/room-3.iob diff --git a/objects/structure/mush-huts/room-4.iob b/objects/jigsaw/structure/mush-huts/room-4.iob similarity index 100% rename from objects/structure/mush-huts/room-4.iob rename to objects/jigsaw/structure/mush-huts/room-4.iob diff --git a/objects/structure/mush-huts/walled-room-1.iob b/objects/jigsaw/structure/mush-huts/walled-room-1.iob similarity index 100% rename from objects/structure/mush-huts/walled-room-1.iob rename to objects/jigsaw/structure/mush-huts/walled-room-1.iob diff --git a/objects/structure/mush-huts/walled-room-2.iob b/objects/jigsaw/structure/mush-huts/walled-room-2.iob similarity index 100% rename from objects/structure/mush-huts/walled-room-2.iob rename to objects/jigsaw/structure/mush-huts/walled-room-2.iob diff --git a/objects/structure/mush-huts/walled-room-3.iob b/objects/jigsaw/structure/mush-huts/walled-room-3.iob similarity index 100% rename from objects/structure/mush-huts/walled-room-3.iob rename to objects/jigsaw/structure/mush-huts/walled-room-3.iob diff --git a/objects/structure/mush-huts/walled-room-4.iob b/objects/jigsaw/structure/mush-huts/walled-room-4.iob similarity index 100% rename from objects/structure/mush-huts/walled-room-4.iob rename to objects/jigsaw/structure/mush-huts/walled-room-4.iob diff --git a/objects/structure/ogMurkyCavern/corner-1.iob b/objects/jigsaw/structure/ogMurkyCavern/corner-1.iob similarity index 100% rename from objects/structure/ogMurkyCavern/corner-1.iob rename to objects/jigsaw/structure/ogMurkyCavern/corner-1.iob diff --git a/objects/structure/ogMurkyCavern/corner-2.iob b/objects/jigsaw/structure/ogMurkyCavern/corner-2.iob similarity index 100% rename from objects/structure/ogMurkyCavern/corner-2.iob rename to objects/jigsaw/structure/ogMurkyCavern/corner-2.iob diff --git a/objects/structure/ogMurkyCavern/corner-3.iob b/objects/jigsaw/structure/ogMurkyCavern/corner-3.iob similarity index 100% rename from objects/structure/ogMurkyCavern/corner-3.iob rename to objects/jigsaw/structure/ogMurkyCavern/corner-3.iob diff --git a/objects/structure/ogMurkyCavern/corner-4.iob b/objects/jigsaw/structure/ogMurkyCavern/corner-4.iob similarity index 100% rename from objects/structure/ogMurkyCavern/corner-4.iob rename to objects/jigsaw/structure/ogMurkyCavern/corner-4.iob diff --git a/objects/structure/ogMurkyCavern/cross-1.iob b/objects/jigsaw/structure/ogMurkyCavern/cross-1.iob similarity index 100% rename from objects/structure/ogMurkyCavern/cross-1.iob rename to objects/jigsaw/structure/ogMurkyCavern/cross-1.iob diff --git a/objects/structure/ogMurkyCavern/cross-2.iob b/objects/jigsaw/structure/ogMurkyCavern/cross-2.iob similarity index 100% rename from objects/structure/ogMurkyCavern/cross-2.iob rename to objects/jigsaw/structure/ogMurkyCavern/cross-2.iob diff --git a/objects/structure/ogMurkyCavern/cross-3.iob b/objects/jigsaw/structure/ogMurkyCavern/cross-3.iob similarity index 100% rename from objects/structure/ogMurkyCavern/cross-3.iob rename to objects/jigsaw/structure/ogMurkyCavern/cross-3.iob diff --git a/objects/structure/ogMurkyCavern/cross-4.iob b/objects/jigsaw/structure/ogMurkyCavern/cross-4.iob similarity index 100% rename from objects/structure/ogMurkyCavern/cross-4.iob rename to objects/jigsaw/structure/ogMurkyCavern/cross-4.iob diff --git a/objects/structure/ogMurkyCavern/cross-5.iob b/objects/jigsaw/structure/ogMurkyCavern/cross-5.iob similarity index 100% rename from objects/structure/ogMurkyCavern/cross-5.iob rename to objects/jigsaw/structure/ogMurkyCavern/cross-5.iob diff --git a/objects/structure/ogMurkyCavern/cross-6.iob b/objects/jigsaw/structure/ogMurkyCavern/cross-6.iob similarity index 100% rename from objects/structure/ogMurkyCavern/cross-6.iob rename to objects/jigsaw/structure/ogMurkyCavern/cross-6.iob diff --git a/objects/structure/ogMurkyCavern/cross-7.iob b/objects/jigsaw/structure/ogMurkyCavern/cross-7.iob similarity index 100% rename from objects/structure/ogMurkyCavern/cross-7.iob rename to objects/jigsaw/structure/ogMurkyCavern/cross-7.iob diff --git a/objects/structure/ogMurkyCavern/cross-8.iob b/objects/jigsaw/structure/ogMurkyCavern/cross-8.iob similarity index 100% rename from objects/structure/ogMurkyCavern/cross-8.iob rename to objects/jigsaw/structure/ogMurkyCavern/cross-8.iob diff --git a/objects/structure/ogMurkyCavern/hall-1.iob b/objects/jigsaw/structure/ogMurkyCavern/hall-1.iob similarity index 100% rename from objects/structure/ogMurkyCavern/hall-1.iob rename to objects/jigsaw/structure/ogMurkyCavern/hall-1.iob diff --git a/objects/structure/ogMurkyCavern/hall-2.iob b/objects/jigsaw/structure/ogMurkyCavern/hall-2.iob similarity index 100% rename from objects/structure/ogMurkyCavern/hall-2.iob rename to objects/jigsaw/structure/ogMurkyCavern/hall-2.iob diff --git a/objects/structure/ogMurkyCavern/hall-3.iob b/objects/jigsaw/structure/ogMurkyCavern/hall-3.iob similarity index 100% rename from objects/structure/ogMurkyCavern/hall-3.iob rename to objects/jigsaw/structure/ogMurkyCavern/hall-3.iob diff --git a/objects/structure/ogMurkyCavern/hall-4.iob b/objects/jigsaw/structure/ogMurkyCavern/hall-4.iob similarity index 100% rename from objects/structure/ogMurkyCavern/hall-4.iob rename to objects/jigsaw/structure/ogMurkyCavern/hall-4.iob diff --git a/objects/structure/ogMurkyCavern/room-1.iob b/objects/jigsaw/structure/ogMurkyCavern/room-1.iob similarity index 100% rename from objects/structure/ogMurkyCavern/room-1.iob rename to objects/jigsaw/structure/ogMurkyCavern/room-1.iob diff --git a/objects/structure/ogMurkyCavern/room-2.iob b/objects/jigsaw/structure/ogMurkyCavern/room-2.iob similarity index 100% rename from objects/structure/ogMurkyCavern/room-2.iob rename to objects/jigsaw/structure/ogMurkyCavern/room-2.iob diff --git a/objects/structure/ogMurkyCavern/room-3.iob b/objects/jigsaw/structure/ogMurkyCavern/room-3.iob similarity index 100% rename from objects/structure/ogMurkyCavern/room-3.iob rename to objects/jigsaw/structure/ogMurkyCavern/room-3.iob diff --git a/objects/structure/ogMurkyCavern/room-4.iob b/objects/jigsaw/structure/ogMurkyCavern/room-4.iob similarity index 100% rename from objects/structure/ogMurkyCavern/room-4.iob rename to objects/jigsaw/structure/ogMurkyCavern/room-4.iob diff --git a/objects/structure/ogMurkyCavern/t-connect-1.iob b/objects/jigsaw/structure/ogMurkyCavern/t-connect-1.iob similarity index 100% rename from objects/structure/ogMurkyCavern/t-connect-1.iob rename to objects/jigsaw/structure/ogMurkyCavern/t-connect-1.iob diff --git a/objects/structure/ogMurkyCavern/t-connect-2.iob b/objects/jigsaw/structure/ogMurkyCavern/t-connect-2.iob similarity index 100% rename from objects/structure/ogMurkyCavern/t-connect-2.iob rename to objects/jigsaw/structure/ogMurkyCavern/t-connect-2.iob diff --git a/objects/structure/ogMurkyCavern/t-connect-3.iob b/objects/jigsaw/structure/ogMurkyCavern/t-connect-3.iob similarity index 100% rename from objects/structure/ogMurkyCavern/t-connect-3.iob rename to objects/jigsaw/structure/ogMurkyCavern/t-connect-3.iob diff --git a/objects/structure/ogMurkyCavern/t-connect-4.iob b/objects/jigsaw/structure/ogMurkyCavern/t-connect-4.iob similarity index 100% rename from objects/structure/ogMurkyCavern/t-connect-4.iob rename to objects/jigsaw/structure/ogMurkyCavern/t-connect-4.iob diff --git a/objects/structure/ogMurkyCavern/walled-room-1.iob b/objects/jigsaw/structure/ogMurkyCavern/walled-room-1.iob similarity index 100% rename from objects/structure/ogMurkyCavern/walled-room-1.iob rename to objects/jigsaw/structure/ogMurkyCavern/walled-room-1.iob diff --git a/objects/structure/prismarine_temple/corner-ceiling-1.iob b/objects/jigsaw/structure/prismarine_temple/corner-ceiling-1.iob similarity index 100% rename from objects/structure/prismarine_temple/corner-ceiling-1.iob rename to objects/jigsaw/structure/prismarine_temple/corner-ceiling-1.iob diff --git a/objects/structure/prismarine_temple/corner-encased-1.iob b/objects/jigsaw/structure/prismarine_temple/corner-encased-1.iob similarity index 100% rename from objects/structure/prismarine_temple/corner-encased-1.iob rename to objects/jigsaw/structure/prismarine_temple/corner-encased-1.iob diff --git a/objects/structure/prismarine_temple/corner-encased-2.iob b/objects/jigsaw/structure/prismarine_temple/corner-encased-2.iob similarity index 100% rename from objects/structure/prismarine_temple/corner-encased-2.iob rename to objects/jigsaw/structure/prismarine_temple/corner-encased-2.iob diff --git a/objects/structure/prismarine_temple/corner-encased-3.iob b/objects/jigsaw/structure/prismarine_temple/corner-encased-3.iob similarity index 100% rename from objects/structure/prismarine_temple/corner-encased-3.iob rename to objects/jigsaw/structure/prismarine_temple/corner-encased-3.iob diff --git a/objects/structure/prismarine_temple/corner-floor-1.iob b/objects/jigsaw/structure/prismarine_temple/corner-floor-1.iob similarity index 100% rename from objects/structure/prismarine_temple/corner-floor-1.iob rename to objects/jigsaw/structure/prismarine_temple/corner-floor-1.iob diff --git a/objects/structure/prismarine_temple/corner-opening-1.iob b/objects/jigsaw/structure/prismarine_temple/corner-opening-1.iob similarity index 100% rename from objects/structure/prismarine_temple/corner-opening-1.iob rename to objects/jigsaw/structure/prismarine_temple/corner-opening-1.iob diff --git a/objects/structure/prismarine_temple/corner-opening-2.iob b/objects/jigsaw/structure/prismarine_temple/corner-opening-2.iob similarity index 100% rename from objects/structure/prismarine_temple/corner-opening-2.iob rename to objects/jigsaw/structure/prismarine_temple/corner-opening-2.iob diff --git a/objects/structure/prismarine_temple/cross-ceiling-1.iob b/objects/jigsaw/structure/prismarine_temple/cross-ceiling-1.iob similarity index 100% rename from objects/structure/prismarine_temple/cross-ceiling-1.iob rename to objects/jigsaw/structure/prismarine_temple/cross-ceiling-1.iob diff --git a/objects/structure/prismarine_temple/cross-encased-1.iob b/objects/jigsaw/structure/prismarine_temple/cross-encased-1.iob similarity index 100% rename from objects/structure/prismarine_temple/cross-encased-1.iob rename to objects/jigsaw/structure/prismarine_temple/cross-encased-1.iob diff --git a/objects/structure/prismarine_temple/cross-floor-1.iob b/objects/jigsaw/structure/prismarine_temple/cross-floor-1.iob similarity index 100% rename from objects/structure/prismarine_temple/cross-floor-1.iob rename to objects/jigsaw/structure/prismarine_temple/cross-floor-1.iob diff --git a/objects/structure/prismarine_temple/cross-opening-1.iob b/objects/jigsaw/structure/prismarine_temple/cross-opening-1.iob similarity index 100% rename from objects/structure/prismarine_temple/cross-opening-1.iob rename to objects/jigsaw/structure/prismarine_temple/cross-opening-1.iob diff --git a/objects/structure/prismarine_temple/hall-ceiling-1.iob b/objects/jigsaw/structure/prismarine_temple/hall-ceiling-1.iob similarity index 100% rename from objects/structure/prismarine_temple/hall-ceiling-1.iob rename to objects/jigsaw/structure/prismarine_temple/hall-ceiling-1.iob diff --git a/objects/structure/prismarine_temple/hall-encased-1.iob b/objects/jigsaw/structure/prismarine_temple/hall-encased-1.iob similarity index 100% rename from objects/structure/prismarine_temple/hall-encased-1.iob rename to objects/jigsaw/structure/prismarine_temple/hall-encased-1.iob diff --git a/objects/structure/prismarine_temple/hall-floor-1.iob b/objects/jigsaw/structure/prismarine_temple/hall-floor-1.iob similarity index 100% rename from objects/structure/prismarine_temple/hall-floor-1.iob rename to objects/jigsaw/structure/prismarine_temple/hall-floor-1.iob diff --git a/objects/structure/prismarine_temple/hall-floor-2.iob b/objects/jigsaw/structure/prismarine_temple/hall-floor-2.iob similarity index 100% rename from objects/structure/prismarine_temple/hall-floor-2.iob rename to objects/jigsaw/structure/prismarine_temple/hall-floor-2.iob diff --git a/objects/structure/prismarine_temple/hall-opening-1.iob b/objects/jigsaw/structure/prismarine_temple/hall-opening-1.iob similarity index 100% rename from objects/structure/prismarine_temple/hall-opening-1.iob rename to objects/jigsaw/structure/prismarine_temple/hall-opening-1.iob diff --git a/objects/structure/prismarine_temple/room-ceiling-1.iob b/objects/jigsaw/structure/prismarine_temple/room-ceiling-1.iob similarity index 100% rename from objects/structure/prismarine_temple/room-ceiling-1.iob rename to objects/jigsaw/structure/prismarine_temple/room-ceiling-1.iob diff --git a/objects/structure/prismarine_temple/room-encased-1.iob b/objects/jigsaw/structure/prismarine_temple/room-encased-1.iob similarity index 100% rename from objects/structure/prismarine_temple/room-encased-1.iob rename to objects/jigsaw/structure/prismarine_temple/room-encased-1.iob diff --git a/objects/structure/prismarine_temple/room-floor-1.iob b/objects/jigsaw/structure/prismarine_temple/room-floor-1.iob similarity index 100% rename from objects/structure/prismarine_temple/room-floor-1.iob rename to objects/jigsaw/structure/prismarine_temple/room-floor-1.iob diff --git a/objects/structure/prismarine_temple/room-opening-1.iob b/objects/jigsaw/structure/prismarine_temple/room-opening-1.iob similarity index 100% rename from objects/structure/prismarine_temple/room-opening-1.iob rename to objects/jigsaw/structure/prismarine_temple/room-opening-1.iob diff --git a/objects/structure/prismarine_temple/room-opening-2.iob b/objects/jigsaw/structure/prismarine_temple/room-opening-2.iob similarity index 100% rename from objects/structure/prismarine_temple/room-opening-2.iob rename to objects/jigsaw/structure/prismarine_temple/room-opening-2.iob diff --git a/objects/structure/prismarine_temple/t-connect-ceiling-1.iob b/objects/jigsaw/structure/prismarine_temple/t-connect-ceiling-1.iob similarity index 100% rename from objects/structure/prismarine_temple/t-connect-ceiling-1.iob rename to objects/jigsaw/structure/prismarine_temple/t-connect-ceiling-1.iob diff --git a/objects/structure/prismarine_temple/t-connect-encased-1.iob b/objects/jigsaw/structure/prismarine_temple/t-connect-encased-1.iob similarity index 100% rename from objects/structure/prismarine_temple/t-connect-encased-1.iob rename to objects/jigsaw/structure/prismarine_temple/t-connect-encased-1.iob diff --git a/objects/structure/prismarine_temple/t-connect-encased-2.iob b/objects/jigsaw/structure/prismarine_temple/t-connect-encased-2.iob similarity index 100% rename from objects/structure/prismarine_temple/t-connect-encased-2.iob rename to objects/jigsaw/structure/prismarine_temple/t-connect-encased-2.iob diff --git a/objects/structure/prismarine_temple/t-connect-encased-3.iob b/objects/jigsaw/structure/prismarine_temple/t-connect-encased-3.iob similarity index 100% rename from objects/structure/prismarine_temple/t-connect-encased-3.iob rename to objects/jigsaw/structure/prismarine_temple/t-connect-encased-3.iob diff --git a/objects/structure/prismarine_temple/t-connect-floor-1.iob b/objects/jigsaw/structure/prismarine_temple/t-connect-floor-1.iob similarity index 100% rename from objects/structure/prismarine_temple/t-connect-floor-1.iob rename to objects/jigsaw/structure/prismarine_temple/t-connect-floor-1.iob diff --git a/objects/structure/prismarine_temple/t-connect-floor-2.iob b/objects/jigsaw/structure/prismarine_temple/t-connect-floor-2.iob similarity index 100% rename from objects/structure/prismarine_temple/t-connect-floor-2.iob rename to objects/jigsaw/structure/prismarine_temple/t-connect-floor-2.iob diff --git a/objects/structure/prismarine_temple/t-connect-opening-1.iob b/objects/jigsaw/structure/prismarine_temple/t-connect-opening-1.iob similarity index 100% rename from objects/structure/prismarine_temple/t-connect-opening-1.iob rename to objects/jigsaw/structure/prismarine_temple/t-connect-opening-1.iob diff --git a/objects/structure/prismarine_temple/walled-room-ceiling-1.iob b/objects/jigsaw/structure/prismarine_temple/walled-room-ceiling-1.iob similarity index 100% rename from objects/structure/prismarine_temple/walled-room-ceiling-1.iob rename to objects/jigsaw/structure/prismarine_temple/walled-room-ceiling-1.iob diff --git a/objects/structure/prismarine_temple/walled-room-encased-1.iob b/objects/jigsaw/structure/prismarine_temple/walled-room-encased-1.iob similarity index 100% rename from objects/structure/prismarine_temple/walled-room-encased-1.iob rename to objects/jigsaw/structure/prismarine_temple/walled-room-encased-1.iob diff --git a/objects/structure/prismarine_temple/walled-room-floor-1.iob b/objects/jigsaw/structure/prismarine_temple/walled-room-floor-1.iob similarity index 100% rename from objects/structure/prismarine_temple/walled-room-floor-1.iob rename to objects/jigsaw/structure/prismarine_temple/walled-room-floor-1.iob diff --git a/objects/structure/prismarine_temple/walled-room-opening-1.iob b/objects/jigsaw/structure/prismarine_temple/walled-room-opening-1.iob similarity index 100% rename from objects/structure/prismarine_temple/walled-room-opening-1.iob rename to objects/jigsaw/structure/prismarine_temple/walled-room-opening-1.iob diff --git a/objects/structure/prismarine_temple/walled-room-opening-2.iob b/objects/jigsaw/structure/prismarine_temple/walled-room-opening-2.iob similarity index 100% rename from objects/structure/prismarine_temple/walled-room-opening-2.iob rename to objects/jigsaw/structure/prismarine_temple/walled-room-opening-2.iob diff --git a/objects/structure/prismarine_temple/walled-room-opening-3.iob b/objects/jigsaw/structure/prismarine_temple/walled-room-opening-3.iob similarity index 100% rename from objects/structure/prismarine_temple/walled-room-opening-3.iob rename to objects/jigsaw/structure/prismarine_temple/walled-room-opening-3.iob diff --git a/objects/structure/ruins/corner-1.iob b/objects/jigsaw/structure/ruins/corner-1.iob similarity index 100% rename from objects/structure/ruins/corner-1.iob rename to objects/jigsaw/structure/ruins/corner-1.iob diff --git a/objects/structure/ruins/cross-1.iob b/objects/jigsaw/structure/ruins/cross-1.iob similarity index 100% rename from objects/structure/ruins/cross-1.iob rename to objects/jigsaw/structure/ruins/cross-1.iob diff --git a/objects/structure/ruins/cross-2.iob b/objects/jigsaw/structure/ruins/cross-2.iob similarity index 100% rename from objects/structure/ruins/cross-2.iob rename to objects/jigsaw/structure/ruins/cross-2.iob diff --git a/objects/structure/ruins/cross-3.iob b/objects/jigsaw/structure/ruins/cross-3.iob similarity index 100% rename from objects/structure/ruins/cross-3.iob rename to objects/jigsaw/structure/ruins/cross-3.iob diff --git a/objects/structure/ruins/hall-1.iob b/objects/jigsaw/structure/ruins/hall-1.iob similarity index 100% rename from objects/structure/ruins/hall-1.iob rename to objects/jigsaw/structure/ruins/hall-1.iob diff --git a/objects/structure/ruins/hall-2.iob b/objects/jigsaw/structure/ruins/hall-2.iob similarity index 100% rename from objects/structure/ruins/hall-2.iob rename to objects/jigsaw/structure/ruins/hall-2.iob diff --git a/objects/structure/ruins/room-1.iob b/objects/jigsaw/structure/ruins/room-1.iob similarity index 100% rename from objects/structure/ruins/room-1.iob rename to objects/jigsaw/structure/ruins/room-1.iob diff --git a/objects/structure/ruins/t-connect-1.iob b/objects/jigsaw/structure/ruins/t-connect-1.iob similarity index 100% rename from objects/structure/ruins/t-connect-1.iob rename to objects/jigsaw/structure/ruins/t-connect-1.iob diff --git a/objects/structure/ruins/t-connect-2.iob b/objects/jigsaw/structure/ruins/t-connect-2.iob similarity index 100% rename from objects/structure/ruins/t-connect-2.iob rename to objects/jigsaw/structure/ruins/t-connect-2.iob diff --git a/objects/structure/ruins/walled-room-1.iob b/objects/jigsaw/structure/ruins/walled-room-1.iob similarity index 100% rename from objects/structure/ruins/walled-room-1.iob rename to objects/jigsaw/structure/ruins/walled-room-1.iob diff --git a/objects/structure/soul-temple/corner-1.iob b/objects/jigsaw/structure/soul-temple/corner-1.iob similarity index 100% rename from objects/structure/soul-temple/corner-1.iob rename to objects/jigsaw/structure/soul-temple/corner-1.iob diff --git a/objects/structure/soul-temple/cross-1.iob b/objects/jigsaw/structure/soul-temple/cross-1.iob similarity index 100% rename from objects/structure/soul-temple/cross-1.iob rename to objects/jigsaw/structure/soul-temple/cross-1.iob diff --git a/objects/structure/soul-temple/cross-2.iob b/objects/jigsaw/structure/soul-temple/cross-2.iob similarity index 100% rename from objects/structure/soul-temple/cross-2.iob rename to objects/jigsaw/structure/soul-temple/cross-2.iob diff --git a/objects/structure/soul-temple/hall-1.iob b/objects/jigsaw/structure/soul-temple/hall-1.iob similarity index 100% rename from objects/structure/soul-temple/hall-1.iob rename to objects/jigsaw/structure/soul-temple/hall-1.iob diff --git a/objects/structure/soul-temple/room-1.iob b/objects/jigsaw/structure/soul-temple/room-1.iob similarity index 100% rename from objects/structure/soul-temple/room-1.iob rename to objects/jigsaw/structure/soul-temple/room-1.iob diff --git a/objects/structure/soul-temple/room-2.iob b/objects/jigsaw/structure/soul-temple/room-2.iob similarity index 100% rename from objects/structure/soul-temple/room-2.iob rename to objects/jigsaw/structure/soul-temple/room-2.iob diff --git a/objects/structure/soul-temple/room-3.iob b/objects/jigsaw/structure/soul-temple/room-3.iob similarity index 100% rename from objects/structure/soul-temple/room-3.iob rename to objects/jigsaw/structure/soul-temple/room-3.iob diff --git a/objects/structure/soul-temple/room-4.iob b/objects/jigsaw/structure/soul-temple/room-4.iob similarity index 100% rename from objects/structure/soul-temple/room-4.iob rename to objects/jigsaw/structure/soul-temple/room-4.iob diff --git a/objects/structure/soul-temple/t-connect-1.iob b/objects/jigsaw/structure/soul-temple/t-connect-1.iob similarity index 100% rename from objects/structure/soul-temple/t-connect-1.iob rename to objects/jigsaw/structure/soul-temple/t-connect-1.iob diff --git a/objects/structure/soul-temple/walled-room-1.iob b/objects/jigsaw/structure/soul-temple/walled-room-1.iob similarity index 100% rename from objects/structure/soul-temple/walled-room-1.iob rename to objects/jigsaw/structure/soul-temple/walled-room-1.iob diff --git a/objects/structure/stone-village/corner-1.iob b/objects/jigsaw/structure/stone-village/corner-1.iob similarity index 100% rename from objects/structure/stone-village/corner-1.iob rename to objects/jigsaw/structure/stone-village/corner-1.iob diff --git a/objects/structure/stone-village/corner-2.iob b/objects/jigsaw/structure/stone-village/corner-2.iob similarity index 100% rename from objects/structure/stone-village/corner-2.iob rename to objects/jigsaw/structure/stone-village/corner-2.iob diff --git a/objects/structure/stone-village/corner-3.iob b/objects/jigsaw/structure/stone-village/corner-3.iob similarity index 100% rename from objects/structure/stone-village/corner-3.iob rename to objects/jigsaw/structure/stone-village/corner-3.iob diff --git a/objects/structure/stone-village/corner-4.iob b/objects/jigsaw/structure/stone-village/corner-4.iob similarity index 100% rename from objects/structure/stone-village/corner-4.iob rename to objects/jigsaw/structure/stone-village/corner-4.iob diff --git a/objects/structure/stone-village/cross-1.iob b/objects/jigsaw/structure/stone-village/cross-1.iob similarity index 100% rename from objects/structure/stone-village/cross-1.iob rename to objects/jigsaw/structure/stone-village/cross-1.iob diff --git a/objects/structure/stone-village/cross-2.iob b/objects/jigsaw/structure/stone-village/cross-2.iob similarity index 100% rename from objects/structure/stone-village/cross-2.iob rename to objects/jigsaw/structure/stone-village/cross-2.iob diff --git a/objects/structure/stone-village/cross-3.iob b/objects/jigsaw/structure/stone-village/cross-3.iob similarity index 100% rename from objects/structure/stone-village/cross-3.iob rename to objects/jigsaw/structure/stone-village/cross-3.iob diff --git a/objects/structure/stone-village/cross-4.iob b/objects/jigsaw/structure/stone-village/cross-4.iob similarity index 100% rename from objects/structure/stone-village/cross-4.iob rename to objects/jigsaw/structure/stone-village/cross-4.iob diff --git a/objects/structure/stone-village/cross-5.iob b/objects/jigsaw/structure/stone-village/cross-5.iob similarity index 100% rename from objects/structure/stone-village/cross-5.iob rename to objects/jigsaw/structure/stone-village/cross-5.iob diff --git a/objects/structure/stone-village/hall-1.iob b/objects/jigsaw/structure/stone-village/hall-1.iob similarity index 100% rename from objects/structure/stone-village/hall-1.iob rename to objects/jigsaw/structure/stone-village/hall-1.iob diff --git a/objects/structure/stone-village/hall-2.iob b/objects/jigsaw/structure/stone-village/hall-2.iob similarity index 100% rename from objects/structure/stone-village/hall-2.iob rename to objects/jigsaw/structure/stone-village/hall-2.iob diff --git a/objects/structure/stone-village/hall-3.iob b/objects/jigsaw/structure/stone-village/hall-3.iob similarity index 100% rename from objects/structure/stone-village/hall-3.iob rename to objects/jigsaw/structure/stone-village/hall-3.iob diff --git a/objects/structure/stone-village/hall-4.iob b/objects/jigsaw/structure/stone-village/hall-4.iob similarity index 100% rename from objects/structure/stone-village/hall-4.iob rename to objects/jigsaw/structure/stone-village/hall-4.iob diff --git a/objects/structure/stone-village/room-1.iob b/objects/jigsaw/structure/stone-village/room-1.iob similarity index 100% rename from objects/structure/stone-village/room-1.iob rename to objects/jigsaw/structure/stone-village/room-1.iob diff --git a/objects/structure/stone-village/room-2.iob b/objects/jigsaw/structure/stone-village/room-2.iob similarity index 100% rename from objects/structure/stone-village/room-2.iob rename to objects/jigsaw/structure/stone-village/room-2.iob diff --git a/objects/structure/stone-village/room-3.iob b/objects/jigsaw/structure/stone-village/room-3.iob similarity index 100% rename from objects/structure/stone-village/room-3.iob rename to objects/jigsaw/structure/stone-village/room-3.iob diff --git a/objects/structure/stone-village/room-4.iob b/objects/jigsaw/structure/stone-village/room-4.iob similarity index 100% rename from objects/structure/stone-village/room-4.iob rename to objects/jigsaw/structure/stone-village/room-4.iob diff --git a/objects/structure/stone-village/room-5.iob b/objects/jigsaw/structure/stone-village/room-5.iob similarity index 100% rename from objects/structure/stone-village/room-5.iob rename to objects/jigsaw/structure/stone-village/room-5.iob diff --git a/objects/structure/stone-village/room-6.iob b/objects/jigsaw/structure/stone-village/room-6.iob similarity index 100% rename from objects/structure/stone-village/room-6.iob rename to objects/jigsaw/structure/stone-village/room-6.iob diff --git a/objects/structure/stone-village/room-7.iob b/objects/jigsaw/structure/stone-village/room-7.iob similarity index 100% rename from objects/structure/stone-village/room-7.iob rename to objects/jigsaw/structure/stone-village/room-7.iob diff --git a/objects/structure/stone-village/room-8.iob b/objects/jigsaw/structure/stone-village/room-8.iob similarity index 100% rename from objects/structure/stone-village/room-8.iob rename to objects/jigsaw/structure/stone-village/room-8.iob diff --git a/objects/structure/stone-village/t-connect-1.iob b/objects/jigsaw/structure/stone-village/t-connect-1.iob similarity index 100% rename from objects/structure/stone-village/t-connect-1.iob rename to objects/jigsaw/structure/stone-village/t-connect-1.iob diff --git a/objects/structure/stone-village/t-connect-2.iob b/objects/jigsaw/structure/stone-village/t-connect-2.iob similarity index 100% rename from objects/structure/stone-village/t-connect-2.iob rename to objects/jigsaw/structure/stone-village/t-connect-2.iob diff --git a/objects/structure/stone-village/t-connect-3.iob b/objects/jigsaw/structure/stone-village/t-connect-3.iob similarity index 100% rename from objects/structure/stone-village/t-connect-3.iob rename to objects/jigsaw/structure/stone-village/t-connect-3.iob diff --git a/objects/structure/stone-village/t-connect-4.iob b/objects/jigsaw/structure/stone-village/t-connect-4.iob similarity index 100% rename from objects/structure/stone-village/t-connect-4.iob rename to objects/jigsaw/structure/stone-village/t-connect-4.iob diff --git a/objects/structure/stone-village/t-connect-5.iob b/objects/jigsaw/structure/stone-village/t-connect-5.iob similarity index 100% rename from objects/structure/stone-village/t-connect-5.iob rename to objects/jigsaw/structure/stone-village/t-connect-5.iob diff --git a/objects/structure/stone-village/walled-room-1.iob b/objects/jigsaw/structure/stone-village/walled-room-1.iob similarity index 100% rename from objects/structure/stone-village/walled-room-1.iob rename to objects/jigsaw/structure/stone-village/walled-room-1.iob diff --git a/objects/structure/stone-village/walled-room-2.iob b/objects/jigsaw/structure/stone-village/walled-room-2.iob similarity index 100% rename from objects/structure/stone-village/walled-room-2.iob rename to objects/jigsaw/structure/stone-village/walled-room-2.iob diff --git a/objects/structure/village-stone/corner-1.iob b/objects/jigsaw/structure/village-stone/corner-1.iob similarity index 100% rename from objects/structure/village-stone/corner-1.iob rename to objects/jigsaw/structure/village-stone/corner-1.iob diff --git a/objects/structure/village-stone/corner-2.iob b/objects/jigsaw/structure/village-stone/corner-2.iob similarity index 100% rename from objects/structure/village-stone/corner-2.iob rename to objects/jigsaw/structure/village-stone/corner-2.iob diff --git a/objects/structure/village-stone/corner-3.iob b/objects/jigsaw/structure/village-stone/corner-3.iob similarity index 100% rename from objects/structure/village-stone/corner-3.iob rename to objects/jigsaw/structure/village-stone/corner-3.iob diff --git a/objects/structure/village-stone/corner-4.iob b/objects/jigsaw/structure/village-stone/corner-4.iob similarity index 100% rename from objects/structure/village-stone/corner-4.iob rename to objects/jigsaw/structure/village-stone/corner-4.iob diff --git a/objects/structure/village-stone/cross-1.iob b/objects/jigsaw/structure/village-stone/cross-1.iob similarity index 100% rename from objects/structure/village-stone/cross-1.iob rename to objects/jigsaw/structure/village-stone/cross-1.iob diff --git a/objects/structure/village-stone/cross-2.iob b/objects/jigsaw/structure/village-stone/cross-2.iob similarity index 100% rename from objects/structure/village-stone/cross-2.iob rename to objects/jigsaw/structure/village-stone/cross-2.iob diff --git a/objects/structure/village-stone/cross-3.iob b/objects/jigsaw/structure/village-stone/cross-3.iob similarity index 100% rename from objects/structure/village-stone/cross-3.iob rename to objects/jigsaw/structure/village-stone/cross-3.iob diff --git a/objects/structure/village-stone/cross-4.iob b/objects/jigsaw/structure/village-stone/cross-4.iob similarity index 100% rename from objects/structure/village-stone/cross-4.iob rename to objects/jigsaw/structure/village-stone/cross-4.iob diff --git a/objects/structure/village-stone/cross-5.iob b/objects/jigsaw/structure/village-stone/cross-5.iob similarity index 100% rename from objects/structure/village-stone/cross-5.iob rename to objects/jigsaw/structure/village-stone/cross-5.iob diff --git a/objects/structure/village-stone/hall-1.iob b/objects/jigsaw/structure/village-stone/hall-1.iob similarity index 100% rename from objects/structure/village-stone/hall-1.iob rename to objects/jigsaw/structure/village-stone/hall-1.iob diff --git a/objects/structure/village-stone/hall-2.iob b/objects/jigsaw/structure/village-stone/hall-2.iob similarity index 100% rename from objects/structure/village-stone/hall-2.iob rename to objects/jigsaw/structure/village-stone/hall-2.iob diff --git a/objects/structure/village-stone/hall-3.iob b/objects/jigsaw/structure/village-stone/hall-3.iob similarity index 100% rename from objects/structure/village-stone/hall-3.iob rename to objects/jigsaw/structure/village-stone/hall-3.iob diff --git a/objects/structure/village-stone/hall-4.iob b/objects/jigsaw/structure/village-stone/hall-4.iob similarity index 100% rename from objects/structure/village-stone/hall-4.iob rename to objects/jigsaw/structure/village-stone/hall-4.iob diff --git a/objects/structure/village-stone/room-..iob b/objects/jigsaw/structure/village-stone/room-..iob similarity index 100% rename from objects/structure/village-stone/room-..iob rename to objects/jigsaw/structure/village-stone/room-..iob diff --git a/objects/structure/village-stone/room-1.iob b/objects/jigsaw/structure/village-stone/room-1.iob similarity index 100% rename from objects/structure/village-stone/room-1.iob rename to objects/jigsaw/structure/village-stone/room-1.iob diff --git a/objects/structure/village-stone/room-2.iob b/objects/jigsaw/structure/village-stone/room-2.iob similarity index 100% rename from objects/structure/village-stone/room-2.iob rename to objects/jigsaw/structure/village-stone/room-2.iob diff --git a/objects/structure/village-stone/room-3.iob b/objects/jigsaw/structure/village-stone/room-3.iob similarity index 100% rename from objects/structure/village-stone/room-3.iob rename to objects/jigsaw/structure/village-stone/room-3.iob diff --git a/objects/structure/village-stone/room-4.iob b/objects/jigsaw/structure/village-stone/room-4.iob similarity index 100% rename from objects/structure/village-stone/room-4.iob rename to objects/jigsaw/structure/village-stone/room-4.iob diff --git a/objects/structure/village-stone/room-5.iob b/objects/jigsaw/structure/village-stone/room-5.iob similarity index 100% rename from objects/structure/village-stone/room-5.iob rename to objects/jigsaw/structure/village-stone/room-5.iob diff --git a/objects/structure/village-stone/room-6.iob b/objects/jigsaw/structure/village-stone/room-6.iob similarity index 100% rename from objects/structure/village-stone/room-6.iob rename to objects/jigsaw/structure/village-stone/room-6.iob diff --git a/objects/structure/village-stone/room-7.iob b/objects/jigsaw/structure/village-stone/room-7.iob similarity index 100% rename from objects/structure/village-stone/room-7.iob rename to objects/jigsaw/structure/village-stone/room-7.iob diff --git a/objects/structure/village-stone/room-8.iob b/objects/jigsaw/structure/village-stone/room-8.iob similarity index 100% rename from objects/structure/village-stone/room-8.iob rename to objects/jigsaw/structure/village-stone/room-8.iob diff --git a/objects/structure/village-stone/t-connect-1.iob b/objects/jigsaw/structure/village-stone/t-connect-1.iob similarity index 100% rename from objects/structure/village-stone/t-connect-1.iob rename to objects/jigsaw/structure/village-stone/t-connect-1.iob diff --git a/objects/structure/village-stone/t-connect-2.iob b/objects/jigsaw/structure/village-stone/t-connect-2.iob similarity index 100% rename from objects/structure/village-stone/t-connect-2.iob rename to objects/jigsaw/structure/village-stone/t-connect-2.iob diff --git a/objects/structure/village-stone/t-connect-3.iob b/objects/jigsaw/structure/village-stone/t-connect-3.iob similarity index 100% rename from objects/structure/village-stone/t-connect-3.iob rename to objects/jigsaw/structure/village-stone/t-connect-3.iob diff --git a/objects/structure/village-stone/t-connect-4.iob b/objects/jigsaw/structure/village-stone/t-connect-4.iob similarity index 100% rename from objects/structure/village-stone/t-connect-4.iob rename to objects/jigsaw/structure/village-stone/t-connect-4.iob diff --git a/objects/structure/village-stone/t-connect-5.iob b/objects/jigsaw/structure/village-stone/t-connect-5.iob similarity index 100% rename from objects/structure/village-stone/t-connect-5.iob rename to objects/jigsaw/structure/village-stone/t-connect-5.iob diff --git a/objects/structure/village-stone/walled-room-1.iob b/objects/jigsaw/structure/village-stone/walled-room-1.iob similarity index 100% rename from objects/structure/village-stone/walled-room-1.iob rename to objects/jigsaw/structure/village-stone/walled-room-1.iob diff --git a/objects/structure/village-temperate/f-ew.iob b/objects/jigsaw/structure/village-temperate/f-ew.iob similarity index 100% rename from objects/structure/village-temperate/f-ew.iob rename to objects/jigsaw/structure/village-temperate/f-ew.iob diff --git a/objects/structure/village-temperate/f-ne.iob b/objects/jigsaw/structure/village-temperate/f-ne.iob similarity index 100% rename from objects/structure/village-temperate/f-ne.iob rename to objects/jigsaw/structure/village-temperate/f-ne.iob diff --git a/objects/structure/village-temperate/f-nes.iob b/objects/jigsaw/structure/village-temperate/f-nes.iob similarity index 100% rename from objects/structure/village-temperate/f-nes.iob rename to objects/jigsaw/structure/village-temperate/f-nes.iob diff --git a/objects/structure/village-temperate/f-x.iob b/objects/jigsaw/structure/village-temperate/f-x.iob similarity index 100% rename from objects/structure/village-temperate/f-x.iob rename to objects/jigsaw/structure/village-temperate/f-x.iob diff --git a/objects/structure/village/corner-1.iob b/objects/jigsaw/structure/village/corner-1.iob similarity index 100% rename from objects/structure/village/corner-1.iob rename to objects/jigsaw/structure/village/corner-1.iob diff --git a/objects/structure/village/corner-se-1.iob b/objects/jigsaw/structure/village/corner-se-1.iob similarity index 100% rename from objects/structure/village/corner-se-1.iob rename to objects/jigsaw/structure/village/corner-se-1.iob diff --git a/objects/structure/village/corner-se-2.iob b/objects/jigsaw/structure/village/corner-se-2.iob similarity index 100% rename from objects/structure/village/corner-se-2.iob rename to objects/jigsaw/structure/village/corner-se-2.iob diff --git a/objects/structure/village/corner-se-3.iob b/objects/jigsaw/structure/village/corner-se-3.iob similarity index 100% rename from objects/structure/village/corner-se-3.iob rename to objects/jigsaw/structure/village/corner-se-3.iob diff --git a/objects/structure/village/corner-se-4.iob b/objects/jigsaw/structure/village/corner-se-4.iob similarity index 100% rename from objects/structure/village/corner-se-4.iob rename to objects/jigsaw/structure/village/corner-se-4.iob diff --git a/objects/structure/village/cross-1.iob b/objects/jigsaw/structure/village/cross-1.iob similarity index 100% rename from objects/structure/village/cross-1.iob rename to objects/jigsaw/structure/village/cross-1.iob diff --git a/objects/structure/village/cross-10.iob b/objects/jigsaw/structure/village/cross-10.iob similarity index 100% rename from objects/structure/village/cross-10.iob rename to objects/jigsaw/structure/village/cross-10.iob diff --git a/objects/structure/village/cross-11.iob b/objects/jigsaw/structure/village/cross-11.iob similarity index 100% rename from objects/structure/village/cross-11.iob rename to objects/jigsaw/structure/village/cross-11.iob diff --git a/objects/structure/village/cross-12.iob b/objects/jigsaw/structure/village/cross-12.iob similarity index 100% rename from objects/structure/village/cross-12.iob rename to objects/jigsaw/structure/village/cross-12.iob diff --git a/objects/structure/village/cross-2.iob b/objects/jigsaw/structure/village/cross-2.iob similarity index 100% rename from objects/structure/village/cross-2.iob rename to objects/jigsaw/structure/village/cross-2.iob diff --git a/objects/structure/village/cross-3.iob b/objects/jigsaw/structure/village/cross-3.iob similarity index 100% rename from objects/structure/village/cross-3.iob rename to objects/jigsaw/structure/village/cross-3.iob diff --git a/objects/structure/village/cross-4.iob b/objects/jigsaw/structure/village/cross-4.iob similarity index 100% rename from objects/structure/village/cross-4.iob rename to objects/jigsaw/structure/village/cross-4.iob diff --git a/objects/structure/village/cross-5.iob b/objects/jigsaw/structure/village/cross-5.iob similarity index 100% rename from objects/structure/village/cross-5.iob rename to objects/jigsaw/structure/village/cross-5.iob diff --git a/objects/structure/village/cross-6.iob b/objects/jigsaw/structure/village/cross-6.iob similarity index 100% rename from objects/structure/village/cross-6.iob rename to objects/jigsaw/structure/village/cross-6.iob diff --git a/objects/structure/village/cross-7.iob b/objects/jigsaw/structure/village/cross-7.iob similarity index 100% rename from objects/structure/village/cross-7.iob rename to objects/jigsaw/structure/village/cross-7.iob diff --git a/objects/structure/village/cross-8.iob b/objects/jigsaw/structure/village/cross-8.iob similarity index 100% rename from objects/structure/village/cross-8.iob rename to objects/jigsaw/structure/village/cross-8.iob diff --git a/objects/structure/village/cross-9.iob b/objects/jigsaw/structure/village/cross-9.iob similarity index 100% rename from objects/structure/village/cross-9.iob rename to objects/jigsaw/structure/village/cross-9.iob diff --git a/objects/structure/village/cross-a-1.iob b/objects/jigsaw/structure/village/cross-a-1.iob similarity index 100% rename from objects/structure/village/cross-a-1.iob rename to objects/jigsaw/structure/village/cross-a-1.iob diff --git a/objects/structure/village/cross-a-2.iob b/objects/jigsaw/structure/village/cross-a-2.iob similarity index 100% rename from objects/structure/village/cross-a-2.iob rename to objects/jigsaw/structure/village/cross-a-2.iob diff --git a/objects/structure/village/cross-a-3.iob b/objects/jigsaw/structure/village/cross-a-3.iob similarity index 100% rename from objects/structure/village/cross-a-3.iob rename to objects/jigsaw/structure/village/cross-a-3.iob diff --git a/objects/structure/village/cross-a-4.iob b/objects/jigsaw/structure/village/cross-a-4.iob similarity index 100% rename from objects/structure/village/cross-a-4.iob rename to objects/jigsaw/structure/village/cross-a-4.iob diff --git a/objects/structure/village/cross-a-5.iob b/objects/jigsaw/structure/village/cross-a-5.iob similarity index 100% rename from objects/structure/village/cross-a-5.iob rename to objects/jigsaw/structure/village/cross-a-5.iob diff --git a/objects/structure/village/hall-1.iob b/objects/jigsaw/structure/village/hall-1.iob similarity index 100% rename from objects/structure/village/hall-1.iob rename to objects/jigsaw/structure/village/hall-1.iob diff --git a/objects/structure/village/hall-we-1.iob b/objects/jigsaw/structure/village/hall-we-1.iob similarity index 100% rename from objects/structure/village/hall-we-1.iob rename to objects/jigsaw/structure/village/hall-we-1.iob diff --git a/objects/structure/village/hall-we-2.iob b/objects/jigsaw/structure/village/hall-we-2.iob similarity index 100% rename from objects/structure/village/hall-we-2.iob rename to objects/jigsaw/structure/village/hall-we-2.iob diff --git a/objects/structure/village/hall-we-3.iob b/objects/jigsaw/structure/village/hall-we-3.iob similarity index 100% rename from objects/structure/village/hall-we-3.iob rename to objects/jigsaw/structure/village/hall-we-3.iob diff --git a/objects/structure/village/hall-we-4.iob b/objects/jigsaw/structure/village/hall-we-4.iob similarity index 100% rename from objects/structure/village/hall-we-4.iob rename to objects/jigsaw/structure/village/hall-we-4.iob diff --git a/objects/structure/village/room-1.iob b/objects/jigsaw/structure/village/room-1.iob similarity index 100% rename from objects/structure/village/room-1.iob rename to objects/jigsaw/structure/village/room-1.iob diff --git a/objects/structure/village/room-crop-sew-1.iob b/objects/jigsaw/structure/village/room-crop-sew-1.iob similarity index 100% rename from objects/structure/village/room-crop-sew-1.iob rename to objects/jigsaw/structure/village/room-crop-sew-1.iob diff --git a/objects/structure/village/room-crop-sew-2.iob b/objects/jigsaw/structure/village/room-crop-sew-2.iob similarity index 100% rename from objects/structure/village/room-crop-sew-2.iob rename to objects/jigsaw/structure/village/room-crop-sew-2.iob diff --git a/objects/structure/village/room-crop-sew-3.iob b/objects/jigsaw/structure/village/room-crop-sew-3.iob similarity index 100% rename from objects/structure/village/room-crop-sew-3.iob rename to objects/jigsaw/structure/village/room-crop-sew-3.iob diff --git a/objects/structure/village/room-crop-wheat-sew-1.iob b/objects/jigsaw/structure/village/room-crop-wheat-sew-1.iob similarity index 100% rename from objects/structure/village/room-crop-wheat-sew-1.iob rename to objects/jigsaw/structure/village/room-crop-wheat-sew-1.iob diff --git a/objects/structure/village/room-crop-wheat-sew-2.iob b/objects/jigsaw/structure/village/room-crop-wheat-sew-2.iob similarity index 100% rename from objects/structure/village/room-crop-wheat-sew-2.iob rename to objects/jigsaw/structure/village/room-crop-wheat-sew-2.iob diff --git a/objects/structure/village/room-crop-wheat-sew-3.iob b/objects/jigsaw/structure/village/room-crop-wheat-sew-3.iob similarity index 100% rename from objects/structure/village/room-crop-wheat-sew-3.iob rename to objects/jigsaw/structure/village/room-crop-wheat-sew-3.iob diff --git a/objects/structure/village/room-dirt-sew-1.iob b/objects/jigsaw/structure/village/room-dirt-sew-1.iob similarity index 100% rename from objects/structure/village/room-dirt-sew-1.iob rename to objects/jigsaw/structure/village/room-dirt-sew-1.iob diff --git a/objects/structure/village/t-connect-1.iob b/objects/jigsaw/structure/village/t-connect-1.iob similarity index 100% rename from objects/structure/village/t-connect-1.iob rename to objects/jigsaw/structure/village/t-connect-1.iob diff --git a/objects/structure/village/tcross-e-1.iob b/objects/jigsaw/structure/village/tcross-e-1.iob similarity index 100% rename from objects/structure/village/tcross-e-1.iob rename to objects/jigsaw/structure/village/tcross-e-1.iob diff --git a/objects/structure/village/tcross-e-2.iob b/objects/jigsaw/structure/village/tcross-e-2.iob similarity index 100% rename from objects/structure/village/tcross-e-2.iob rename to objects/jigsaw/structure/village/tcross-e-2.iob diff --git a/objects/structure/village/tcross-e-3.iob b/objects/jigsaw/structure/village/tcross-e-3.iob similarity index 100% rename from objects/structure/village/tcross-e-3.iob rename to objects/jigsaw/structure/village/tcross-e-3.iob diff --git a/objects/structure/village/tcross-e-4.iob b/objects/jigsaw/structure/village/tcross-e-4.iob similarity index 100% rename from objects/structure/village/tcross-e-4.iob rename to objects/jigsaw/structure/village/tcross-e-4.iob diff --git a/objects/structure/village/walled-room-1.iob b/objects/jigsaw/structure/village/walled-room-1.iob similarity index 100% rename from objects/structure/village/walled-room-1.iob rename to objects/jigsaw/structure/village/walled-room-1.iob diff --git a/objects/underwater/underwater_ruin/big_brick_1.iob b/objects/jigsaw/underwater_ruin/big_brick_1.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_brick_1.iob rename to objects/jigsaw/underwater_ruin/big_brick_1.iob diff --git a/objects/underwater/underwater_ruin/big_brick_2.iob b/objects/jigsaw/underwater_ruin/big_brick_2.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_brick_2.iob rename to objects/jigsaw/underwater_ruin/big_brick_2.iob diff --git a/objects/underwater/underwater_ruin/big_brick_3.iob b/objects/jigsaw/underwater_ruin/big_brick_3.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_brick_3.iob rename to objects/jigsaw/underwater_ruin/big_brick_3.iob diff --git a/objects/underwater/underwater_ruin/big_brick_8.iob b/objects/jigsaw/underwater_ruin/big_brick_8.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_brick_8.iob rename to objects/jigsaw/underwater_ruin/big_brick_8.iob diff --git a/objects/underwater/underwater_ruin/big_cracked_1.iob b/objects/jigsaw/underwater_ruin/big_cracked_1.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_cracked_1.iob rename to objects/jigsaw/underwater_ruin/big_cracked_1.iob diff --git a/objects/underwater/underwater_ruin/big_cracked_2.iob b/objects/jigsaw/underwater_ruin/big_cracked_2.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_cracked_2.iob rename to objects/jigsaw/underwater_ruin/big_cracked_2.iob diff --git a/objects/underwater/underwater_ruin/big_cracked_3.iob b/objects/jigsaw/underwater_ruin/big_cracked_3.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_cracked_3.iob rename to objects/jigsaw/underwater_ruin/big_cracked_3.iob diff --git a/objects/underwater/underwater_ruin/big_cracked_8.iob b/objects/jigsaw/underwater_ruin/big_cracked_8.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_cracked_8.iob rename to objects/jigsaw/underwater_ruin/big_cracked_8.iob diff --git a/objects/underwater/underwater_ruin/big_mossy_1.iob b/objects/jigsaw/underwater_ruin/big_mossy_1.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_mossy_1.iob rename to objects/jigsaw/underwater_ruin/big_mossy_1.iob diff --git a/objects/underwater/underwater_ruin/big_mossy_2.iob b/objects/jigsaw/underwater_ruin/big_mossy_2.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_mossy_2.iob rename to objects/jigsaw/underwater_ruin/big_mossy_2.iob diff --git a/objects/underwater/underwater_ruin/big_mossy_3.iob b/objects/jigsaw/underwater_ruin/big_mossy_3.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_mossy_3.iob rename to objects/jigsaw/underwater_ruin/big_mossy_3.iob diff --git a/objects/underwater/underwater_ruin/big_mossy_8.iob b/objects/jigsaw/underwater_ruin/big_mossy_8.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_mossy_8.iob rename to objects/jigsaw/underwater_ruin/big_mossy_8.iob diff --git a/objects/underwater/underwater_ruin/big_warm_4.iob b/objects/jigsaw/underwater_ruin/big_warm_4.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_warm_4.iob rename to objects/jigsaw/underwater_ruin/big_warm_4.iob diff --git a/objects/underwater/underwater_ruin/big_warm_5.iob b/objects/jigsaw/underwater_ruin/big_warm_5.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_warm_5.iob rename to objects/jigsaw/underwater_ruin/big_warm_5.iob diff --git a/objects/underwater/underwater_ruin/big_warm_6.iob b/objects/jigsaw/underwater_ruin/big_warm_6.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_warm_6.iob rename to objects/jigsaw/underwater_ruin/big_warm_6.iob diff --git a/objects/underwater/underwater_ruin/big_warm_7.iob b/objects/jigsaw/underwater_ruin/big_warm_7.iob similarity index 100% rename from objects/underwater/underwater_ruin/big_warm_7.iob rename to objects/jigsaw/underwater_ruin/big_warm_7.iob diff --git a/objects/underwater/underwater_ruin/brick_1.iob b/objects/jigsaw/underwater_ruin/brick_1.iob similarity index 100% rename from objects/underwater/underwater_ruin/brick_1.iob rename to objects/jigsaw/underwater_ruin/brick_1.iob diff --git a/objects/underwater/underwater_ruin/brick_2.iob b/objects/jigsaw/underwater_ruin/brick_2.iob similarity index 100% rename from objects/underwater/underwater_ruin/brick_2.iob rename to objects/jigsaw/underwater_ruin/brick_2.iob diff --git a/objects/underwater/underwater_ruin/brick_3.iob b/objects/jigsaw/underwater_ruin/brick_3.iob similarity index 100% rename from objects/underwater/underwater_ruin/brick_3.iob rename to objects/jigsaw/underwater_ruin/brick_3.iob diff --git a/objects/underwater/underwater_ruin/brick_4.iob b/objects/jigsaw/underwater_ruin/brick_4.iob similarity index 100% rename from objects/underwater/underwater_ruin/brick_4.iob rename to objects/jigsaw/underwater_ruin/brick_4.iob diff --git a/objects/underwater/underwater_ruin/brick_5.iob b/objects/jigsaw/underwater_ruin/brick_5.iob similarity index 100% rename from objects/underwater/underwater_ruin/brick_5.iob rename to objects/jigsaw/underwater_ruin/brick_5.iob diff --git a/objects/underwater/underwater_ruin/brick_6.iob b/objects/jigsaw/underwater_ruin/brick_6.iob similarity index 100% rename from objects/underwater/underwater_ruin/brick_6.iob rename to objects/jigsaw/underwater_ruin/brick_6.iob diff --git a/objects/underwater/underwater_ruin/brick_7.iob b/objects/jigsaw/underwater_ruin/brick_7.iob similarity index 100% rename from objects/underwater/underwater_ruin/brick_7.iob rename to objects/jigsaw/underwater_ruin/brick_7.iob diff --git a/objects/underwater/underwater_ruin/brick_8.iob b/objects/jigsaw/underwater_ruin/brick_8.iob similarity index 100% rename from objects/underwater/underwater_ruin/brick_8.iob rename to objects/jigsaw/underwater_ruin/brick_8.iob diff --git a/objects/underwater/underwater_ruin/cracked_1.iob b/objects/jigsaw/underwater_ruin/cracked_1.iob similarity index 100% rename from objects/underwater/underwater_ruin/cracked_1.iob rename to objects/jigsaw/underwater_ruin/cracked_1.iob diff --git a/objects/underwater/underwater_ruin/cracked_2.iob b/objects/jigsaw/underwater_ruin/cracked_2.iob similarity index 100% rename from objects/underwater/underwater_ruin/cracked_2.iob rename to objects/jigsaw/underwater_ruin/cracked_2.iob diff --git a/objects/underwater/underwater_ruin/cracked_3.iob b/objects/jigsaw/underwater_ruin/cracked_3.iob similarity index 100% rename from objects/underwater/underwater_ruin/cracked_3.iob rename to objects/jigsaw/underwater_ruin/cracked_3.iob diff --git a/objects/underwater/underwater_ruin/cracked_4.iob b/objects/jigsaw/underwater_ruin/cracked_4.iob similarity index 100% rename from objects/underwater/underwater_ruin/cracked_4.iob rename to objects/jigsaw/underwater_ruin/cracked_4.iob diff --git a/objects/underwater/underwater_ruin/cracked_5.iob b/objects/jigsaw/underwater_ruin/cracked_5.iob similarity index 100% rename from objects/underwater/underwater_ruin/cracked_5.iob rename to objects/jigsaw/underwater_ruin/cracked_5.iob diff --git a/objects/underwater/underwater_ruin/cracked_6.iob b/objects/jigsaw/underwater_ruin/cracked_6.iob similarity index 100% rename from objects/underwater/underwater_ruin/cracked_6.iob rename to objects/jigsaw/underwater_ruin/cracked_6.iob diff --git a/objects/underwater/underwater_ruin/cracked_7.iob b/objects/jigsaw/underwater_ruin/cracked_7.iob similarity index 100% rename from objects/underwater/underwater_ruin/cracked_7.iob rename to objects/jigsaw/underwater_ruin/cracked_7.iob diff --git a/objects/underwater/underwater_ruin/cracked_8.iob b/objects/jigsaw/underwater_ruin/cracked_8.iob similarity index 100% rename from objects/underwater/underwater_ruin/cracked_8.iob rename to objects/jigsaw/underwater_ruin/cracked_8.iob diff --git a/objects/underwater/underwater_ruin/mossy_1.iob b/objects/jigsaw/underwater_ruin/mossy_1.iob similarity index 100% rename from objects/underwater/underwater_ruin/mossy_1.iob rename to objects/jigsaw/underwater_ruin/mossy_1.iob diff --git a/objects/underwater/underwater_ruin/mossy_2.iob b/objects/jigsaw/underwater_ruin/mossy_2.iob similarity index 100% rename from objects/underwater/underwater_ruin/mossy_2.iob rename to objects/jigsaw/underwater_ruin/mossy_2.iob diff --git a/objects/underwater/underwater_ruin/mossy_3.iob b/objects/jigsaw/underwater_ruin/mossy_3.iob similarity index 100% rename from objects/underwater/underwater_ruin/mossy_3.iob rename to objects/jigsaw/underwater_ruin/mossy_3.iob diff --git a/objects/underwater/underwater_ruin/mossy_4.iob b/objects/jigsaw/underwater_ruin/mossy_4.iob similarity index 100% rename from objects/underwater/underwater_ruin/mossy_4.iob rename to objects/jigsaw/underwater_ruin/mossy_4.iob diff --git a/objects/underwater/underwater_ruin/mossy_5.iob b/objects/jigsaw/underwater_ruin/mossy_5.iob similarity index 100% rename from objects/underwater/underwater_ruin/mossy_5.iob rename to objects/jigsaw/underwater_ruin/mossy_5.iob diff --git a/objects/underwater/underwater_ruin/mossy_6.iob b/objects/jigsaw/underwater_ruin/mossy_6.iob similarity index 100% rename from objects/underwater/underwater_ruin/mossy_6.iob rename to objects/jigsaw/underwater_ruin/mossy_6.iob diff --git a/objects/underwater/underwater_ruin/mossy_7.iob b/objects/jigsaw/underwater_ruin/mossy_7.iob similarity index 100% rename from objects/underwater/underwater_ruin/mossy_7.iob rename to objects/jigsaw/underwater_ruin/mossy_7.iob diff --git a/objects/underwater/underwater_ruin/mossy_8.iob b/objects/jigsaw/underwater_ruin/mossy_8.iob similarity index 100% rename from objects/underwater/underwater_ruin/mossy_8.iob rename to objects/jigsaw/underwater_ruin/mossy_8.iob diff --git a/objects/underwater/underwater_ruin/warm_1.iob b/objects/jigsaw/underwater_ruin/warm_1.iob similarity index 100% rename from objects/underwater/underwater_ruin/warm_1.iob rename to objects/jigsaw/underwater_ruin/warm_1.iob diff --git a/objects/underwater/underwater_ruin/warm_2.iob b/objects/jigsaw/underwater_ruin/warm_2.iob similarity index 100% rename from objects/underwater/underwater_ruin/warm_2.iob rename to objects/jigsaw/underwater_ruin/warm_2.iob diff --git a/objects/underwater/underwater_ruin/warm_3.iob b/objects/jigsaw/underwater_ruin/warm_3.iob similarity index 100% rename from objects/underwater/underwater_ruin/warm_3.iob rename to objects/jigsaw/underwater_ruin/warm_3.iob diff --git a/objects/underwater/underwater_ruin/warm_4.iob b/objects/jigsaw/underwater_ruin/warm_4.iob similarity index 100% rename from objects/underwater/underwater_ruin/warm_4.iob rename to objects/jigsaw/underwater_ruin/warm_4.iob diff --git a/objects/underwater/underwater_ruin/warm_5.iob b/objects/jigsaw/underwater_ruin/warm_5.iob similarity index 100% rename from objects/underwater/underwater_ruin/warm_5.iob rename to objects/jigsaw/underwater_ruin/warm_5.iob diff --git a/objects/underwater/underwater_ruin/warm_6.iob b/objects/jigsaw/underwater_ruin/warm_6.iob similarity index 100% rename from objects/underwater/underwater_ruin/warm_6.iob rename to objects/jigsaw/underwater_ruin/warm_6.iob diff --git a/objects/underwater/underwater_ruin/warm_7.iob b/objects/jigsaw/underwater_ruin/warm_7.iob similarity index 100% rename from objects/underwater/underwater_ruin/warm_7.iob rename to objects/jigsaw/underwater_ruin/warm_7.iob diff --git a/objects/underwater/underwater_ruin/warm_8.iob b/objects/jigsaw/underwater_ruin/warm_8.iob similarity index 100% rename from objects/underwater/underwater_ruin/warm_8.iob rename to objects/jigsaw/underwater_ruin/warm_8.iob diff --git a/objects/village-bits/bland-e-1.iob b/objects/jigsaw/village-bits/bland-e-1.iob similarity index 100% rename from objects/village-bits/bland-e-1.iob rename to objects/jigsaw/village-bits/bland-e-1.iob diff --git a/objects/village-bits/bland-e-2.iob b/objects/jigsaw/village-bits/bland-e-2.iob similarity index 100% rename from objects/village-bits/bland-e-2.iob rename to objects/jigsaw/village-bits/bland-e-2.iob diff --git a/objects/village-bits/bland-e-3.iob b/objects/jigsaw/village-bits/bland-e-3.iob similarity index 100% rename from objects/village-bits/bland-e-3.iob rename to objects/jigsaw/village-bits/bland-e-3.iob diff --git a/objects/village-bits/bland-e-4.iob b/objects/jigsaw/village-bits/bland-e-4.iob similarity index 100% rename from objects/village-bits/bland-e-4.iob rename to objects/jigsaw/village-bits/bland-e-4.iob diff --git a/objects/village-bits/bland-e-5.iob b/objects/jigsaw/village-bits/bland-e-5.iob similarity index 100% rename from objects/village-bits/bland-e-5.iob rename to objects/jigsaw/village-bits/bland-e-5.iob diff --git a/objects/village-bits/bland-ne-1.iob b/objects/jigsaw/village-bits/bland-ne-1.iob similarity index 100% rename from objects/village-bits/bland-ne-1.iob rename to objects/jigsaw/village-bits/bland-ne-1.iob diff --git a/objects/village-bits/bland-ne-2.iob b/objects/jigsaw/village-bits/bland-ne-2.iob similarity index 100% rename from objects/village-bits/bland-ne-2.iob rename to objects/jigsaw/village-bits/bland-ne-2.iob diff --git a/objects/village-bits/bland-ne-3.iob b/objects/jigsaw/village-bits/bland-ne-3.iob similarity index 100% rename from objects/village-bits/bland-ne-3.iob rename to objects/jigsaw/village-bits/bland-ne-3.iob diff --git a/objects/village-bits/bland-ne-4.iob b/objects/jigsaw/village-bits/bland-ne-4.iob similarity index 100% rename from objects/village-bits/bland-ne-4.iob rename to objects/jigsaw/village-bits/bland-ne-4.iob diff --git a/objects/village-bits/bland-ne-5.iob b/objects/jigsaw/village-bits/bland-ne-5.iob similarity index 100% rename from objects/village-bits/bland-ne-5.iob rename to objects/jigsaw/village-bits/bland-ne-5.iob diff --git a/objects/village-bits/bland-nes-1.iob b/objects/jigsaw/village-bits/bland-nes-1.iob similarity index 100% rename from objects/village-bits/bland-nes-1.iob rename to objects/jigsaw/village-bits/bland-nes-1.iob diff --git a/objects/village-bits/bland-nes-2.iob b/objects/jigsaw/village-bits/bland-nes-2.iob similarity index 100% rename from objects/village-bits/bland-nes-2.iob rename to objects/jigsaw/village-bits/bland-nes-2.iob diff --git a/objects/village-bits/bland-nes-3.iob b/objects/jigsaw/village-bits/bland-nes-3.iob similarity index 100% rename from objects/village-bits/bland-nes-3.iob rename to objects/jigsaw/village-bits/bland-nes-3.iob diff --git a/objects/village-bits/bland-nes-4.iob b/objects/jigsaw/village-bits/bland-nes-4.iob similarity index 100% rename from objects/village-bits/bland-nes-4.iob rename to objects/jigsaw/village-bits/bland-nes-4.iob diff --git a/objects/village-bits/bland-nes-5.iob b/objects/jigsaw/village-bits/bland-nes-5.iob similarity index 100% rename from objects/village-bits/bland-nes-5.iob rename to objects/jigsaw/village-bits/bland-nes-5.iob diff --git a/objects/village-bits/bland-ns-1.iob b/objects/jigsaw/village-bits/bland-ns-1.iob similarity index 100% rename from objects/village-bits/bland-ns-1.iob rename to objects/jigsaw/village-bits/bland-ns-1.iob diff --git a/objects/village-bits/bland-ns-2.iob b/objects/jigsaw/village-bits/bland-ns-2.iob similarity index 100% rename from objects/village-bits/bland-ns-2.iob rename to objects/jigsaw/village-bits/bland-ns-2.iob diff --git a/objects/village-bits/bland-ns-3.iob b/objects/jigsaw/village-bits/bland-ns-3.iob similarity index 100% rename from objects/village-bits/bland-ns-3.iob rename to objects/jigsaw/village-bits/bland-ns-3.iob diff --git a/objects/village-bits/bland-ns-4.iob b/objects/jigsaw/village-bits/bland-ns-4.iob similarity index 100% rename from objects/village-bits/bland-ns-4.iob rename to objects/jigsaw/village-bits/bland-ns-4.iob diff --git a/objects/village-bits/bland-ns-5.iob b/objects/jigsaw/village-bits/bland-ns-5.iob similarity index 100% rename from objects/village-bits/bland-ns-5.iob rename to objects/jigsaw/village-bits/bland-ns-5.iob diff --git a/objects/village-bits/bland-x-1.iob b/objects/jigsaw/village-bits/bland-x-1.iob similarity index 100% rename from objects/village-bits/bland-x-1.iob rename to objects/jigsaw/village-bits/bland-x-1.iob diff --git a/objects/village-bits/bland-x-2.iob b/objects/jigsaw/village-bits/bland-x-2.iob similarity index 100% rename from objects/village-bits/bland-x-2.iob rename to objects/jigsaw/village-bits/bland-x-2.iob diff --git a/objects/village-bits/bland-x-3.iob b/objects/jigsaw/village-bits/bland-x-3.iob similarity index 100% rename from objects/village-bits/bland-x-3.iob rename to objects/jigsaw/village-bits/bland-x-3.iob diff --git a/objects/village-bits/bland-x-4.iob b/objects/jigsaw/village-bits/bland-x-4.iob similarity index 100% rename from objects/village-bits/bland-x-4.iob rename to objects/jigsaw/village-bits/bland-x-4.iob diff --git a/objects/village-bits/bland-x-5.iob b/objects/jigsaw/village-bits/bland-x-5.iob similarity index 100% rename from objects/village-bits/bland-x-5.iob rename to objects/jigsaw/village-bits/bland-x-5.iob diff --git a/objects/village-bits/hay-e-1.iob b/objects/jigsaw/village-bits/hay-e-1.iob similarity index 100% rename from objects/village-bits/hay-e-1.iob rename to objects/jigsaw/village-bits/hay-e-1.iob diff --git a/objects/village-bits/hay-e-2.iob b/objects/jigsaw/village-bits/hay-e-2.iob similarity index 100% rename from objects/village-bits/hay-e-2.iob rename to objects/jigsaw/village-bits/hay-e-2.iob diff --git a/objects/village-bits/hay-e-3.iob b/objects/jigsaw/village-bits/hay-e-3.iob similarity index 100% rename from objects/village-bits/hay-e-3.iob rename to objects/jigsaw/village-bits/hay-e-3.iob diff --git a/objects/village-bits/hay-e-4.iob b/objects/jigsaw/village-bits/hay-e-4.iob similarity index 100% rename from objects/village-bits/hay-e-4.iob rename to objects/jigsaw/village-bits/hay-e-4.iob diff --git a/objects/village-bits/hay-e-5.iob b/objects/jigsaw/village-bits/hay-e-5.iob similarity index 100% rename from objects/village-bits/hay-e-5.iob rename to objects/jigsaw/village-bits/hay-e-5.iob diff --git a/objects/village-bits/hay-ne-1.iob b/objects/jigsaw/village-bits/hay-ne-1.iob similarity index 100% rename from objects/village-bits/hay-ne-1.iob rename to objects/jigsaw/village-bits/hay-ne-1.iob diff --git a/objects/village-bits/hay-ne-2.iob b/objects/jigsaw/village-bits/hay-ne-2.iob similarity index 100% rename from objects/village-bits/hay-ne-2.iob rename to objects/jigsaw/village-bits/hay-ne-2.iob diff --git a/objects/village-bits/hay-ne-3.iob b/objects/jigsaw/village-bits/hay-ne-3.iob similarity index 100% rename from objects/village-bits/hay-ne-3.iob rename to objects/jigsaw/village-bits/hay-ne-3.iob diff --git a/objects/village-bits/hay-ne-4.iob b/objects/jigsaw/village-bits/hay-ne-4.iob similarity index 100% rename from objects/village-bits/hay-ne-4.iob rename to objects/jigsaw/village-bits/hay-ne-4.iob diff --git a/objects/village-bits/hay-ne-5.iob b/objects/jigsaw/village-bits/hay-ne-5.iob similarity index 100% rename from objects/village-bits/hay-ne-5.iob rename to objects/jigsaw/village-bits/hay-ne-5.iob diff --git a/objects/village-bits/hay-nes-1.iob b/objects/jigsaw/village-bits/hay-nes-1.iob similarity index 100% rename from objects/village-bits/hay-nes-1.iob rename to objects/jigsaw/village-bits/hay-nes-1.iob diff --git a/objects/village-bits/hay-nes-2.iob b/objects/jigsaw/village-bits/hay-nes-2.iob similarity index 100% rename from objects/village-bits/hay-nes-2.iob rename to objects/jigsaw/village-bits/hay-nes-2.iob diff --git a/objects/village-bits/hay-nes-3.iob b/objects/jigsaw/village-bits/hay-nes-3.iob similarity index 100% rename from objects/village-bits/hay-nes-3.iob rename to objects/jigsaw/village-bits/hay-nes-3.iob diff --git a/objects/village-bits/hay-nes-4.iob b/objects/jigsaw/village-bits/hay-nes-4.iob similarity index 100% rename from objects/village-bits/hay-nes-4.iob rename to objects/jigsaw/village-bits/hay-nes-4.iob diff --git a/objects/village-bits/hay-nes-5.iob b/objects/jigsaw/village-bits/hay-nes-5.iob similarity index 100% rename from objects/village-bits/hay-nes-5.iob rename to objects/jigsaw/village-bits/hay-nes-5.iob diff --git a/objects/village-bits/hay-ns-1.iob b/objects/jigsaw/village-bits/hay-ns-1.iob similarity index 100% rename from objects/village-bits/hay-ns-1.iob rename to objects/jigsaw/village-bits/hay-ns-1.iob diff --git a/objects/village-bits/hay-ns-2.iob b/objects/jigsaw/village-bits/hay-ns-2.iob similarity index 100% rename from objects/village-bits/hay-ns-2.iob rename to objects/jigsaw/village-bits/hay-ns-2.iob diff --git a/objects/village-bits/hay-ns-3.iob b/objects/jigsaw/village-bits/hay-ns-3.iob similarity index 100% rename from objects/village-bits/hay-ns-3.iob rename to objects/jigsaw/village-bits/hay-ns-3.iob diff --git a/objects/village-bits/hay-ns-4.iob b/objects/jigsaw/village-bits/hay-ns-4.iob similarity index 100% rename from objects/village-bits/hay-ns-4.iob rename to objects/jigsaw/village-bits/hay-ns-4.iob diff --git a/objects/village-bits/hay-ns-5.iob b/objects/jigsaw/village-bits/hay-ns-5.iob similarity index 100% rename from objects/village-bits/hay-ns-5.iob rename to objects/jigsaw/village-bits/hay-ns-5.iob diff --git a/objects/village-bits/hay-x-1.iob b/objects/jigsaw/village-bits/hay-x-1.iob similarity index 100% rename from objects/village-bits/hay-x-1.iob rename to objects/jigsaw/village-bits/hay-x-1.iob diff --git a/objects/village-bits/hay-x-2.iob b/objects/jigsaw/village-bits/hay-x-2.iob similarity index 100% rename from objects/village-bits/hay-x-2.iob rename to objects/jigsaw/village-bits/hay-x-2.iob diff --git a/objects/village-bits/hay-x-3.iob b/objects/jigsaw/village-bits/hay-x-3.iob similarity index 100% rename from objects/village-bits/hay-x-3.iob rename to objects/jigsaw/village-bits/hay-x-3.iob diff --git a/objects/village-bits/hay-x-4.iob b/objects/jigsaw/village-bits/hay-x-4.iob similarity index 100% rename from objects/village-bits/hay-x-4.iob rename to objects/jigsaw/village-bits/hay-x-4.iob diff --git a/objects/village-bits/hay-x-5.iob b/objects/jigsaw/village-bits/hay-x-5.iob similarity index 100% rename from objects/village-bits/hay-x-5.iob rename to objects/jigsaw/village-bits/hay-x-5.iob diff --git a/objects/village-bits/lantern-ne-1.iob b/objects/jigsaw/village-bits/lantern-ne-1.iob similarity index 100% rename from objects/village-bits/lantern-ne-1.iob rename to objects/jigsaw/village-bits/lantern-ne-1.iob diff --git a/objects/village-bits/lantern-ne-2.iob b/objects/jigsaw/village-bits/lantern-ne-2.iob similarity index 100% rename from objects/village-bits/lantern-ne-2.iob rename to objects/jigsaw/village-bits/lantern-ne-2.iob diff --git a/objects/village-bits/lantern-ne-3.iob b/objects/jigsaw/village-bits/lantern-ne-3.iob similarity index 100% rename from objects/village-bits/lantern-ne-3.iob rename to objects/jigsaw/village-bits/lantern-ne-3.iob diff --git a/objects/village-bits/lantern-ne-4.iob b/objects/jigsaw/village-bits/lantern-ne-4.iob similarity index 100% rename from objects/village-bits/lantern-ne-4.iob rename to objects/jigsaw/village-bits/lantern-ne-4.iob diff --git a/objects/village-bits/lantern-ne-5.iob b/objects/jigsaw/village-bits/lantern-ne-5.iob similarity index 100% rename from objects/village-bits/lantern-ne-5.iob rename to objects/jigsaw/village-bits/lantern-ne-5.iob diff --git a/objects/village-bits/lanterns-e-1.iob b/objects/jigsaw/village-bits/lanterns-e-1.iob similarity index 100% rename from objects/village-bits/lanterns-e-1.iob rename to objects/jigsaw/village-bits/lanterns-e-1.iob diff --git a/objects/village-bits/lanterns-e-2.iob b/objects/jigsaw/village-bits/lanterns-e-2.iob similarity index 100% rename from objects/village-bits/lanterns-e-2.iob rename to objects/jigsaw/village-bits/lanterns-e-2.iob diff --git a/objects/village-bits/lanterns-e-3.iob b/objects/jigsaw/village-bits/lanterns-e-3.iob similarity index 100% rename from objects/village-bits/lanterns-e-3.iob rename to objects/jigsaw/village-bits/lanterns-e-3.iob diff --git a/objects/village-bits/lanterns-e-4.iob b/objects/jigsaw/village-bits/lanterns-e-4.iob similarity index 100% rename from objects/village-bits/lanterns-e-4.iob rename to objects/jigsaw/village-bits/lanterns-e-4.iob diff --git a/objects/village-bits/lanterns-e-5.iob b/objects/jigsaw/village-bits/lanterns-e-5.iob similarity index 100% rename from objects/village-bits/lanterns-e-5.iob rename to objects/jigsaw/village-bits/lanterns-e-5.iob diff --git a/objects/village-bits/lanterns-nes-1.iob b/objects/jigsaw/village-bits/lanterns-nes-1.iob similarity index 100% rename from objects/village-bits/lanterns-nes-1.iob rename to objects/jigsaw/village-bits/lanterns-nes-1.iob diff --git a/objects/village-bits/lanterns-nes-2.iob b/objects/jigsaw/village-bits/lanterns-nes-2.iob similarity index 100% rename from objects/village-bits/lanterns-nes-2.iob rename to objects/jigsaw/village-bits/lanterns-nes-2.iob diff --git a/objects/village-bits/lanterns-nes-3.iob b/objects/jigsaw/village-bits/lanterns-nes-3.iob similarity index 100% rename from objects/village-bits/lanterns-nes-3.iob rename to objects/jigsaw/village-bits/lanterns-nes-3.iob diff --git a/objects/village-bits/lanterns-nes-4.iob b/objects/jigsaw/village-bits/lanterns-nes-4.iob similarity index 100% rename from objects/village-bits/lanterns-nes-4.iob rename to objects/jigsaw/village-bits/lanterns-nes-4.iob diff --git a/objects/village-bits/lanterns-nes-5.iob b/objects/jigsaw/village-bits/lanterns-nes-5.iob similarity index 100% rename from objects/village-bits/lanterns-nes-5.iob rename to objects/jigsaw/village-bits/lanterns-nes-5.iob diff --git a/objects/village-bits/lanterns-ns-1.iob b/objects/jigsaw/village-bits/lanterns-ns-1.iob similarity index 100% rename from objects/village-bits/lanterns-ns-1.iob rename to objects/jigsaw/village-bits/lanterns-ns-1.iob diff --git a/objects/village-bits/lanterns-ns-2.iob b/objects/jigsaw/village-bits/lanterns-ns-2.iob similarity index 100% rename from objects/village-bits/lanterns-ns-2.iob rename to objects/jigsaw/village-bits/lanterns-ns-2.iob diff --git a/objects/village-bits/lanterns-ns-3.iob b/objects/jigsaw/village-bits/lanterns-ns-3.iob similarity index 100% rename from objects/village-bits/lanterns-ns-3.iob rename to objects/jigsaw/village-bits/lanterns-ns-3.iob diff --git a/objects/village-bits/lanterns-ns-4.iob b/objects/jigsaw/village-bits/lanterns-ns-4.iob similarity index 100% rename from objects/village-bits/lanterns-ns-4.iob rename to objects/jigsaw/village-bits/lanterns-ns-4.iob diff --git a/objects/village-bits/lanterns-ns-5.iob b/objects/jigsaw/village-bits/lanterns-ns-5.iob similarity index 100% rename from objects/village-bits/lanterns-ns-5.iob rename to objects/jigsaw/village-bits/lanterns-ns-5.iob diff --git a/objects/village-bits/lanterns-x-1.iob b/objects/jigsaw/village-bits/lanterns-x-1.iob similarity index 100% rename from objects/village-bits/lanterns-x-1.iob rename to objects/jigsaw/village-bits/lanterns-x-1.iob diff --git a/objects/village-bits/lanterns-x-2.iob b/objects/jigsaw/village-bits/lanterns-x-2.iob similarity index 100% rename from objects/village-bits/lanterns-x-2.iob rename to objects/jigsaw/village-bits/lanterns-x-2.iob diff --git a/objects/village-bits/lanterns-x-3.iob b/objects/jigsaw/village-bits/lanterns-x-3.iob similarity index 100% rename from objects/village-bits/lanterns-x-3.iob rename to objects/jigsaw/village-bits/lanterns-x-3.iob diff --git a/objects/village-bits/lanterns-x-4.iob b/objects/jigsaw/village-bits/lanterns-x-4.iob similarity index 100% rename from objects/village-bits/lanterns-x-4.iob rename to objects/jigsaw/village-bits/lanterns-x-4.iob diff --git a/objects/village-bits/lanterns-x-5.iob b/objects/jigsaw/village-bits/lanterns-x-5.iob similarity index 100% rename from objects/village-bits/lanterns-x-5.iob rename to objects/jigsaw/village-bits/lanterns-x-5.iob diff --git a/objects/village-bits/logger-e-1.iob b/objects/jigsaw/village-bits/logger-e-1.iob similarity index 100% rename from objects/village-bits/logger-e-1.iob rename to objects/jigsaw/village-bits/logger-e-1.iob diff --git a/objects/village-bits/logger-e-2.iob b/objects/jigsaw/village-bits/logger-e-2.iob similarity index 100% rename from objects/village-bits/logger-e-2.iob rename to objects/jigsaw/village-bits/logger-e-2.iob diff --git a/objects/village-bits/logger-e-3.iob b/objects/jigsaw/village-bits/logger-e-3.iob similarity index 100% rename from objects/village-bits/logger-e-3.iob rename to objects/jigsaw/village-bits/logger-e-3.iob diff --git a/objects/village-bits/logger-e-4.iob b/objects/jigsaw/village-bits/logger-e-4.iob similarity index 100% rename from objects/village-bits/logger-e-4.iob rename to objects/jigsaw/village-bits/logger-e-4.iob diff --git a/objects/village-bits/logger-e-5.iob b/objects/jigsaw/village-bits/logger-e-5.iob similarity index 100% rename from objects/village-bits/logger-e-5.iob rename to objects/jigsaw/village-bits/logger-e-5.iob diff --git a/objects/village-bits/logger-ne-1.iob b/objects/jigsaw/village-bits/logger-ne-1.iob similarity index 100% rename from objects/village-bits/logger-ne-1.iob rename to objects/jigsaw/village-bits/logger-ne-1.iob diff --git a/objects/village-bits/logger-ne-2.iob b/objects/jigsaw/village-bits/logger-ne-2.iob similarity index 100% rename from objects/village-bits/logger-ne-2.iob rename to objects/jigsaw/village-bits/logger-ne-2.iob diff --git a/objects/village-bits/logger-ne-3.iob b/objects/jigsaw/village-bits/logger-ne-3.iob similarity index 100% rename from objects/village-bits/logger-ne-3.iob rename to objects/jigsaw/village-bits/logger-ne-3.iob diff --git a/objects/village-bits/logger-ne-4.iob b/objects/jigsaw/village-bits/logger-ne-4.iob similarity index 100% rename from objects/village-bits/logger-ne-4.iob rename to objects/jigsaw/village-bits/logger-ne-4.iob diff --git a/objects/village-bits/logger-ne-5.iob b/objects/jigsaw/village-bits/logger-ne-5.iob similarity index 100% rename from objects/village-bits/logger-ne-5.iob rename to objects/jigsaw/village-bits/logger-ne-5.iob diff --git a/objects/village-bits/logger-nes-1.iob b/objects/jigsaw/village-bits/logger-nes-1.iob similarity index 100% rename from objects/village-bits/logger-nes-1.iob rename to objects/jigsaw/village-bits/logger-nes-1.iob diff --git a/objects/village-bits/logger-nes-2.iob b/objects/jigsaw/village-bits/logger-nes-2.iob similarity index 100% rename from objects/village-bits/logger-nes-2.iob rename to objects/jigsaw/village-bits/logger-nes-2.iob diff --git a/objects/village-bits/logger-nes-3.iob b/objects/jigsaw/village-bits/logger-nes-3.iob similarity index 100% rename from objects/village-bits/logger-nes-3.iob rename to objects/jigsaw/village-bits/logger-nes-3.iob diff --git a/objects/village-bits/logger-nes-4.iob b/objects/jigsaw/village-bits/logger-nes-4.iob similarity index 100% rename from objects/village-bits/logger-nes-4.iob rename to objects/jigsaw/village-bits/logger-nes-4.iob diff --git a/objects/village-bits/logger-nes-5.iob b/objects/jigsaw/village-bits/logger-nes-5.iob similarity index 100% rename from objects/village-bits/logger-nes-5.iob rename to objects/jigsaw/village-bits/logger-nes-5.iob diff --git a/objects/village-bits/logger-ns-1.iob b/objects/jigsaw/village-bits/logger-ns-1.iob similarity index 100% rename from objects/village-bits/logger-ns-1.iob rename to objects/jigsaw/village-bits/logger-ns-1.iob diff --git a/objects/village-bits/logger-ns-2.iob b/objects/jigsaw/village-bits/logger-ns-2.iob similarity index 100% rename from objects/village-bits/logger-ns-2.iob rename to objects/jigsaw/village-bits/logger-ns-2.iob diff --git a/objects/village-bits/logger-ns-3.iob b/objects/jigsaw/village-bits/logger-ns-3.iob similarity index 100% rename from objects/village-bits/logger-ns-3.iob rename to objects/jigsaw/village-bits/logger-ns-3.iob diff --git a/objects/village-bits/logger-ns-4.iob b/objects/jigsaw/village-bits/logger-ns-4.iob similarity index 100% rename from objects/village-bits/logger-ns-4.iob rename to objects/jigsaw/village-bits/logger-ns-4.iob diff --git a/objects/village-bits/logger-ns-5.iob b/objects/jigsaw/village-bits/logger-ns-5.iob similarity index 100% rename from objects/village-bits/logger-ns-5.iob rename to objects/jigsaw/village-bits/logger-ns-5.iob diff --git a/objects/village-bits/logger-x-1.iob b/objects/jigsaw/village-bits/logger-x-1.iob similarity index 100% rename from objects/village-bits/logger-x-1.iob rename to objects/jigsaw/village-bits/logger-x-1.iob diff --git a/objects/village-bits/logger-x-2.iob b/objects/jigsaw/village-bits/logger-x-2.iob similarity index 100% rename from objects/village-bits/logger-x-2.iob rename to objects/jigsaw/village-bits/logger-x-2.iob diff --git a/objects/village-bits/logger-x-3.iob b/objects/jigsaw/village-bits/logger-x-3.iob similarity index 100% rename from objects/village-bits/logger-x-3.iob rename to objects/jigsaw/village-bits/logger-x-3.iob diff --git a/objects/village-bits/logger-x-4.iob b/objects/jigsaw/village-bits/logger-x-4.iob similarity index 100% rename from objects/village-bits/logger-x-4.iob rename to objects/jigsaw/village-bits/logger-x-4.iob diff --git a/objects/village-bits/logger-x-5.iob b/objects/jigsaw/village-bits/logger-x-5.iob similarity index 100% rename from objects/village-bits/logger-x-5.iob rename to objects/jigsaw/village-bits/logger-x-5.iob diff --git a/objects/village-bits/stonehome-esw-1.iob b/objects/jigsaw/village-bits/stonehome-esw-1.iob similarity index 100% rename from objects/village-bits/stonehome-esw-1.iob rename to objects/jigsaw/village-bits/stonehome-esw-1.iob diff --git a/objects/village-bits/stonehome-esw-2.iob b/objects/jigsaw/village-bits/stonehome-esw-2.iob similarity index 100% rename from objects/village-bits/stonehome-esw-2.iob rename to objects/jigsaw/village-bits/stonehome-esw-2.iob diff --git a/objects/village-bits/stonehome-esw-3.iob b/objects/jigsaw/village-bits/stonehome-esw-3.iob similarity index 100% rename from objects/village-bits/stonehome-esw-3.iob rename to objects/jigsaw/village-bits/stonehome-esw-3.iob diff --git a/objects/village-bits/stonehome-esw-4.iob b/objects/jigsaw/village-bits/stonehome-esw-4.iob similarity index 100% rename from objects/village-bits/stonehome-esw-4.iob rename to objects/jigsaw/village-bits/stonehome-esw-4.iob diff --git a/objects/village/common/animals/cat_black.iob b/objects/jigsaw/village/common/animals/cat_black.iob similarity index 100% rename from objects/village/common/animals/cat_black.iob rename to objects/jigsaw/village/common/animals/cat_black.iob diff --git a/objects/village/common/animals/cat_british.iob b/objects/jigsaw/village/common/animals/cat_british.iob similarity index 100% rename from objects/village/common/animals/cat_british.iob rename to objects/jigsaw/village/common/animals/cat_british.iob diff --git a/objects/village/common/animals/cat_calico.iob b/objects/jigsaw/village/common/animals/cat_calico.iob similarity index 100% rename from objects/village/common/animals/cat_calico.iob rename to objects/jigsaw/village/common/animals/cat_calico.iob diff --git a/objects/village/common/animals/cat_jellie.iob b/objects/jigsaw/village/common/animals/cat_jellie.iob similarity index 100% rename from objects/village/common/animals/cat_jellie.iob rename to objects/jigsaw/village/common/animals/cat_jellie.iob diff --git a/objects/village/common/animals/cat_persian.iob b/objects/jigsaw/village/common/animals/cat_persian.iob similarity index 100% rename from objects/village/common/animals/cat_persian.iob rename to objects/jigsaw/village/common/animals/cat_persian.iob diff --git a/objects/village/common/animals/cat_ragdoll.iob b/objects/jigsaw/village/common/animals/cat_ragdoll.iob similarity index 100% rename from objects/village/common/animals/cat_ragdoll.iob rename to objects/jigsaw/village/common/animals/cat_ragdoll.iob diff --git a/objects/village/common/animals/cat_red.iob b/objects/jigsaw/village/common/animals/cat_red.iob similarity index 100% rename from objects/village/common/animals/cat_red.iob rename to objects/jigsaw/village/common/animals/cat_red.iob diff --git a/objects/village/common/animals/cat_siamese.iob b/objects/jigsaw/village/common/animals/cat_siamese.iob similarity index 100% rename from objects/village/common/animals/cat_siamese.iob rename to objects/jigsaw/village/common/animals/cat_siamese.iob diff --git a/objects/village/common/animals/cat_tabby.iob b/objects/jigsaw/village/common/animals/cat_tabby.iob similarity index 100% rename from objects/village/common/animals/cat_tabby.iob rename to objects/jigsaw/village/common/animals/cat_tabby.iob diff --git a/objects/village/common/animals/cat_white.iob b/objects/jigsaw/village/common/animals/cat_white.iob similarity index 100% rename from objects/village/common/animals/cat_white.iob rename to objects/jigsaw/village/common/animals/cat_white.iob diff --git a/objects/village/common/animals/cows_1.iob b/objects/jigsaw/village/common/animals/cows_1.iob similarity index 100% rename from objects/village/common/animals/cows_1.iob rename to objects/jigsaw/village/common/animals/cows_1.iob diff --git a/objects/village/common/animals/horses_1.iob b/objects/jigsaw/village/common/animals/horses_1.iob similarity index 100% rename from objects/village/common/animals/horses_1.iob rename to objects/jigsaw/village/common/animals/horses_1.iob diff --git a/objects/village/common/animals/horses_2.iob b/objects/jigsaw/village/common/animals/horses_2.iob similarity index 100% rename from objects/village/common/animals/horses_2.iob rename to objects/jigsaw/village/common/animals/horses_2.iob diff --git a/objects/village/common/animals/horses_3.iob b/objects/jigsaw/village/common/animals/horses_3.iob similarity index 100% rename from objects/village/common/animals/horses_3.iob rename to objects/jigsaw/village/common/animals/horses_3.iob diff --git a/objects/village/common/animals/horses_4.iob b/objects/jigsaw/village/common/animals/horses_4.iob similarity index 100% rename from objects/village/common/animals/horses_4.iob rename to objects/jigsaw/village/common/animals/horses_4.iob diff --git a/objects/village/common/animals/horses_5.iob b/objects/jigsaw/village/common/animals/horses_5.iob similarity index 100% rename from objects/village/common/animals/horses_5.iob rename to objects/jigsaw/village/common/animals/horses_5.iob diff --git a/objects/village/common/animals/pigs_1.iob b/objects/jigsaw/village/common/animals/pigs_1.iob similarity index 100% rename from objects/village/common/animals/pigs_1.iob rename to objects/jigsaw/village/common/animals/pigs_1.iob diff --git a/objects/village/common/animals/sheep_1.iob b/objects/jigsaw/village/common/animals/sheep_1.iob similarity index 100% rename from objects/village/common/animals/sheep_1.iob rename to objects/jigsaw/village/common/animals/sheep_1.iob diff --git a/objects/village/common/animals/sheep_2.iob b/objects/jigsaw/village/common/animals/sheep_2.iob similarity index 100% rename from objects/village/common/animals/sheep_2.iob rename to objects/jigsaw/village/common/animals/sheep_2.iob diff --git a/objects/village/common/iron_golem.iob b/objects/jigsaw/village/common/iron_golem.iob similarity index 100% rename from objects/village/common/iron_golem.iob rename to objects/jigsaw/village/common/iron_golem.iob diff --git a/objects/village/common/well_bottom.iob b/objects/jigsaw/village/common/well_bottom.iob similarity index 100% rename from objects/village/common/well_bottom.iob rename to objects/jigsaw/village/common/well_bottom.iob diff --git a/objects/village/decays/grass_11x13.iob b/objects/jigsaw/village/decays/grass_11x13.iob similarity index 100% rename from objects/village/decays/grass_11x13.iob rename to objects/jigsaw/village/decays/grass_11x13.iob diff --git a/objects/village/decays/grass_16x16.iob b/objects/jigsaw/village/decays/grass_16x16.iob similarity index 100% rename from objects/village/decays/grass_16x16.iob rename to objects/jigsaw/village/decays/grass_16x16.iob diff --git a/objects/village/decays/grass_9x9.iob b/objects/jigsaw/village/decays/grass_9x9.iob similarity index 100% rename from objects/village/decays/grass_9x9.iob rename to objects/jigsaw/village/decays/grass_9x9.iob diff --git a/objects/village/desert/desert_lamp_1.iob b/objects/jigsaw/village/desert/desert_lamp_1.iob similarity index 100% rename from objects/village/desert/desert_lamp_1.iob rename to objects/jigsaw/village/desert/desert_lamp_1.iob diff --git a/objects/village/desert/houses/desert_animal_pen_1.iob b/objects/jigsaw/village/desert/houses/desert_animal_pen_1.iob similarity index 100% rename from objects/village/desert/houses/desert_animal_pen_1.iob rename to objects/jigsaw/village/desert/houses/desert_animal_pen_1.iob diff --git a/objects/village/desert/houses/desert_animal_pen_2.iob b/objects/jigsaw/village/desert/houses/desert_animal_pen_2.iob similarity index 100% rename from objects/village/desert/houses/desert_animal_pen_2.iob rename to objects/jigsaw/village/desert/houses/desert_animal_pen_2.iob diff --git a/objects/village/desert/houses/desert_armorer_1.iob b/objects/jigsaw/village/desert/houses/desert_armorer_1.iob similarity index 100% rename from objects/village/desert/houses/desert_armorer_1.iob rename to objects/jigsaw/village/desert/houses/desert_armorer_1.iob diff --git a/objects/village/desert/houses/desert_butcher_shop_1.iob b/objects/jigsaw/village/desert/houses/desert_butcher_shop_1.iob similarity index 100% rename from objects/village/desert/houses/desert_butcher_shop_1.iob rename to objects/jigsaw/village/desert/houses/desert_butcher_shop_1.iob diff --git a/objects/village/desert/houses/desert_cartographer_house_1.iob b/objects/jigsaw/village/desert/houses/desert_cartographer_house_1.iob similarity index 100% rename from objects/village/desert/houses/desert_cartographer_house_1.iob rename to objects/jigsaw/village/desert/houses/desert_cartographer_house_1.iob diff --git a/objects/village/desert/houses/desert_farm_1.iob b/objects/jigsaw/village/desert/houses/desert_farm_1.iob similarity index 100% rename from objects/village/desert/houses/desert_farm_1.iob rename to objects/jigsaw/village/desert/houses/desert_farm_1.iob diff --git a/objects/village/desert/houses/desert_farm_2.iob b/objects/jigsaw/village/desert/houses/desert_farm_2.iob similarity index 100% rename from objects/village/desert/houses/desert_farm_2.iob rename to objects/jigsaw/village/desert/houses/desert_farm_2.iob diff --git a/objects/village/desert/houses/desert_fisher_1.iob b/objects/jigsaw/village/desert/houses/desert_fisher_1.iob similarity index 100% rename from objects/village/desert/houses/desert_fisher_1.iob rename to objects/jigsaw/village/desert/houses/desert_fisher_1.iob diff --git a/objects/village/desert/houses/desert_fletcher_house_1.iob b/objects/jigsaw/village/desert/houses/desert_fletcher_house_1.iob similarity index 100% rename from objects/village/desert/houses/desert_fletcher_house_1.iob rename to objects/jigsaw/village/desert/houses/desert_fletcher_house_1.iob diff --git a/objects/village/desert/houses/desert_large_farm_1.iob b/objects/jigsaw/village/desert/houses/desert_large_farm_1.iob similarity index 100% rename from objects/village/desert/houses/desert_large_farm_1.iob rename to objects/jigsaw/village/desert/houses/desert_large_farm_1.iob diff --git a/objects/village/desert/houses/desert_library_1.iob b/objects/jigsaw/village/desert/houses/desert_library_1.iob similarity index 100% rename from objects/village/desert/houses/desert_library_1.iob rename to objects/jigsaw/village/desert/houses/desert_library_1.iob diff --git a/objects/village/desert/houses/desert_mason_1.iob b/objects/jigsaw/village/desert/houses/desert_mason_1.iob similarity index 100% rename from objects/village/desert/houses/desert_mason_1.iob rename to objects/jigsaw/village/desert/houses/desert_mason_1.iob diff --git a/objects/village/desert/houses/desert_medium_house_1.iob b/objects/jigsaw/village/desert/houses/desert_medium_house_1.iob similarity index 100% rename from objects/village/desert/houses/desert_medium_house_1.iob rename to objects/jigsaw/village/desert/houses/desert_medium_house_1.iob diff --git a/objects/village/desert/houses/desert_medium_house_2.iob b/objects/jigsaw/village/desert/houses/desert_medium_house_2.iob similarity index 100% rename from objects/village/desert/houses/desert_medium_house_2.iob rename to objects/jigsaw/village/desert/houses/desert_medium_house_2.iob diff --git a/objects/village/desert/houses/desert_shepherd_house_1.iob b/objects/jigsaw/village/desert/houses/desert_shepherd_house_1.iob similarity index 100% rename from objects/village/desert/houses/desert_shepherd_house_1.iob rename to objects/jigsaw/village/desert/houses/desert_shepherd_house_1.iob diff --git a/objects/village/desert/houses/desert_small_house_1.iob b/objects/jigsaw/village/desert/houses/desert_small_house_1.iob similarity index 100% rename from objects/village/desert/houses/desert_small_house_1.iob rename to objects/jigsaw/village/desert/houses/desert_small_house_1.iob diff --git a/objects/village/desert/houses/desert_small_house_2.iob b/objects/jigsaw/village/desert/houses/desert_small_house_2.iob similarity index 100% rename from objects/village/desert/houses/desert_small_house_2.iob rename to objects/jigsaw/village/desert/houses/desert_small_house_2.iob diff --git a/objects/village/desert/houses/desert_small_house_3.iob b/objects/jigsaw/village/desert/houses/desert_small_house_3.iob similarity index 100% rename from objects/village/desert/houses/desert_small_house_3.iob rename to objects/jigsaw/village/desert/houses/desert_small_house_3.iob diff --git a/objects/village/desert/houses/desert_small_house_4.iob b/objects/jigsaw/village/desert/houses/desert_small_house_4.iob similarity index 100% rename from objects/village/desert/houses/desert_small_house_4.iob rename to objects/jigsaw/village/desert/houses/desert_small_house_4.iob diff --git a/objects/village/desert/houses/desert_small_house_5.iob b/objects/jigsaw/village/desert/houses/desert_small_house_5.iob similarity index 100% rename from objects/village/desert/houses/desert_small_house_5.iob rename to objects/jigsaw/village/desert/houses/desert_small_house_5.iob diff --git a/objects/village/desert/houses/desert_small_house_6.iob b/objects/jigsaw/village/desert/houses/desert_small_house_6.iob similarity index 100% rename from objects/village/desert/houses/desert_small_house_6.iob rename to objects/jigsaw/village/desert/houses/desert_small_house_6.iob diff --git a/objects/village/desert/houses/desert_small_house_7.iob b/objects/jigsaw/village/desert/houses/desert_small_house_7.iob similarity index 100% rename from objects/village/desert/houses/desert_small_house_7.iob rename to objects/jigsaw/village/desert/houses/desert_small_house_7.iob diff --git a/objects/village/desert/houses/desert_small_house_8.iob b/objects/jigsaw/village/desert/houses/desert_small_house_8.iob similarity index 100% rename from objects/village/desert/houses/desert_small_house_8.iob rename to objects/jigsaw/village/desert/houses/desert_small_house_8.iob diff --git a/objects/village/desert/houses/desert_tannery_1.iob b/objects/jigsaw/village/desert/houses/desert_tannery_1.iob similarity index 100% rename from objects/village/desert/houses/desert_tannery_1.iob rename to objects/jigsaw/village/desert/houses/desert_tannery_1.iob diff --git a/objects/village/desert/houses/desert_temple_1.iob b/objects/jigsaw/village/desert/houses/desert_temple_1.iob similarity index 100% rename from objects/village/desert/houses/desert_temple_1.iob rename to objects/jigsaw/village/desert/houses/desert_temple_1.iob diff --git a/objects/village/desert/houses/desert_temple_2.iob b/objects/jigsaw/village/desert/houses/desert_temple_2.iob similarity index 100% rename from objects/village/desert/houses/desert_temple_2.iob rename to objects/jigsaw/village/desert/houses/desert_temple_2.iob diff --git a/objects/village/desert/houses/desert_tool_smith_1.iob b/objects/jigsaw/village/desert/houses/desert_tool_smith_1.iob similarity index 100% rename from objects/village/desert/houses/desert_tool_smith_1.iob rename to objects/jigsaw/village/desert/houses/desert_tool_smith_1.iob diff --git a/objects/village/desert/houses/desert_weaponsmith_1.iob b/objects/jigsaw/village/desert/houses/desert_weaponsmith_1.iob similarity index 100% rename from objects/village/desert/houses/desert_weaponsmith_1.iob rename to objects/jigsaw/village/desert/houses/desert_weaponsmith_1.iob diff --git a/objects/village/desert/streets/corner_01.iob b/objects/jigsaw/village/desert/streets/corner_01.iob similarity index 100% rename from objects/village/desert/streets/corner_01.iob rename to objects/jigsaw/village/desert/streets/corner_01.iob diff --git a/objects/village/desert/streets/corner_02.iob b/objects/jigsaw/village/desert/streets/corner_02.iob similarity index 100% rename from objects/village/desert/streets/corner_02.iob rename to objects/jigsaw/village/desert/streets/corner_02.iob diff --git a/objects/village/desert/streets/crossroad_01.iob b/objects/jigsaw/village/desert/streets/crossroad_01.iob similarity index 100% rename from objects/village/desert/streets/crossroad_01.iob rename to objects/jigsaw/village/desert/streets/crossroad_01.iob diff --git a/objects/village/desert/streets/crossroad_02.iob b/objects/jigsaw/village/desert/streets/crossroad_02.iob similarity index 100% rename from objects/village/desert/streets/crossroad_02.iob rename to objects/jigsaw/village/desert/streets/crossroad_02.iob diff --git a/objects/village/desert/streets/crossroad_03.iob b/objects/jigsaw/village/desert/streets/crossroad_03.iob similarity index 100% rename from objects/village/desert/streets/crossroad_03.iob rename to objects/jigsaw/village/desert/streets/crossroad_03.iob diff --git a/objects/village/desert/streets/square_01.iob b/objects/jigsaw/village/desert/streets/square_01.iob similarity index 100% rename from objects/village/desert/streets/square_01.iob rename to objects/jigsaw/village/desert/streets/square_01.iob diff --git a/objects/village/desert/streets/square_02.iob b/objects/jigsaw/village/desert/streets/square_02.iob similarity index 100% rename from objects/village/desert/streets/square_02.iob rename to objects/jigsaw/village/desert/streets/square_02.iob diff --git a/objects/village/desert/streets/straight_01.iob b/objects/jigsaw/village/desert/streets/straight_01.iob similarity index 100% rename from objects/village/desert/streets/straight_01.iob rename to objects/jigsaw/village/desert/streets/straight_01.iob diff --git a/objects/village/desert/streets/straight_02.iob b/objects/jigsaw/village/desert/streets/straight_02.iob similarity index 100% rename from objects/village/desert/streets/straight_02.iob rename to objects/jigsaw/village/desert/streets/straight_02.iob diff --git a/objects/village/desert/streets/straight_03.iob b/objects/jigsaw/village/desert/streets/straight_03.iob similarity index 100% rename from objects/village/desert/streets/straight_03.iob rename to objects/jigsaw/village/desert/streets/straight_03.iob diff --git a/objects/village/desert/streets/turn_01.iob b/objects/jigsaw/village/desert/streets/turn_01.iob similarity index 100% rename from objects/village/desert/streets/turn_01.iob rename to objects/jigsaw/village/desert/streets/turn_01.iob diff --git a/objects/village/desert/terminators/terminator_01.iob b/objects/jigsaw/village/desert/terminators/terminator_01.iob similarity index 100% rename from objects/village/desert/terminators/terminator_01.iob rename to objects/jigsaw/village/desert/terminators/terminator_01.iob diff --git a/objects/village/desert/terminators/terminator_02.iob b/objects/jigsaw/village/desert/terminators/terminator_02.iob similarity index 100% rename from objects/village/desert/terminators/terminator_02.iob rename to objects/jigsaw/village/desert/terminators/terminator_02.iob diff --git a/objects/village/desert/town_centers/desert_meeting_point_1.iob b/objects/jigsaw/village/desert/town_centers/desert_meeting_point_1.iob similarity index 100% rename from objects/village/desert/town_centers/desert_meeting_point_1.iob rename to objects/jigsaw/village/desert/town_centers/desert_meeting_point_1.iob diff --git a/objects/village/desert/town_centers/desert_meeting_point_2.iob b/objects/jigsaw/village/desert/town_centers/desert_meeting_point_2.iob similarity index 100% rename from objects/village/desert/town_centers/desert_meeting_point_2.iob rename to objects/jigsaw/village/desert/town_centers/desert_meeting_point_2.iob diff --git a/objects/village/desert/town_centers/desert_meeting_point_3.iob b/objects/jigsaw/village/desert/town_centers/desert_meeting_point_3.iob similarity index 100% rename from objects/village/desert/town_centers/desert_meeting_point_3.iob rename to objects/jigsaw/village/desert/town_centers/desert_meeting_point_3.iob diff --git a/objects/village/desert/villagers/baby.iob b/objects/jigsaw/village/desert/villagers/baby.iob similarity index 100% rename from objects/village/desert/villagers/baby.iob rename to objects/jigsaw/village/desert/villagers/baby.iob diff --git a/objects/village/desert/villagers/nitwit.iob b/objects/jigsaw/village/desert/villagers/nitwit.iob similarity index 100% rename from objects/village/desert/villagers/nitwit.iob rename to objects/jigsaw/village/desert/villagers/nitwit.iob diff --git a/objects/village/desert/villagers/unemployed.iob b/objects/jigsaw/village/desert/villagers/unemployed.iob similarity index 100% rename from objects/village/desert/villagers/unemployed.iob rename to objects/jigsaw/village/desert/villagers/unemployed.iob diff --git a/objects/village/desert/zombie/houses/desert_medium_house_1.iob b/objects/jigsaw/village/desert/zombie/houses/desert_medium_house_1.iob similarity index 100% rename from objects/village/desert/zombie/houses/desert_medium_house_1.iob rename to objects/jigsaw/village/desert/zombie/houses/desert_medium_house_1.iob diff --git a/objects/village/desert/zombie/houses/desert_medium_house_2.iob b/objects/jigsaw/village/desert/zombie/houses/desert_medium_house_2.iob similarity index 100% rename from objects/village/desert/zombie/houses/desert_medium_house_2.iob rename to objects/jigsaw/village/desert/zombie/houses/desert_medium_house_2.iob diff --git a/objects/village/desert/zombie/houses/desert_small_house_1.iob b/objects/jigsaw/village/desert/zombie/houses/desert_small_house_1.iob similarity index 100% rename from objects/village/desert/zombie/houses/desert_small_house_1.iob rename to objects/jigsaw/village/desert/zombie/houses/desert_small_house_1.iob diff --git a/objects/village/desert/zombie/houses/desert_small_house_2.iob b/objects/jigsaw/village/desert/zombie/houses/desert_small_house_2.iob similarity index 100% rename from objects/village/desert/zombie/houses/desert_small_house_2.iob rename to objects/jigsaw/village/desert/zombie/houses/desert_small_house_2.iob diff --git a/objects/village/desert/zombie/houses/desert_small_house_3.iob b/objects/jigsaw/village/desert/zombie/houses/desert_small_house_3.iob similarity index 100% rename from objects/village/desert/zombie/houses/desert_small_house_3.iob rename to objects/jigsaw/village/desert/zombie/houses/desert_small_house_3.iob diff --git a/objects/village/desert/zombie/houses/desert_small_house_4.iob b/objects/jigsaw/village/desert/zombie/houses/desert_small_house_4.iob similarity index 100% rename from objects/village/desert/zombie/houses/desert_small_house_4.iob rename to objects/jigsaw/village/desert/zombie/houses/desert_small_house_4.iob diff --git a/objects/village/desert/zombie/houses/desert_small_house_5.iob b/objects/jigsaw/village/desert/zombie/houses/desert_small_house_5.iob similarity index 100% rename from objects/village/desert/zombie/houses/desert_small_house_5.iob rename to objects/jigsaw/village/desert/zombie/houses/desert_small_house_5.iob diff --git a/objects/village/desert/zombie/houses/desert_small_house_6.iob b/objects/jigsaw/village/desert/zombie/houses/desert_small_house_6.iob similarity index 100% rename from objects/village/desert/zombie/houses/desert_small_house_6.iob rename to objects/jigsaw/village/desert/zombie/houses/desert_small_house_6.iob diff --git a/objects/village/desert/zombie/houses/desert_small_house_7.iob b/objects/jigsaw/village/desert/zombie/houses/desert_small_house_7.iob similarity index 100% rename from objects/village/desert/zombie/houses/desert_small_house_7.iob rename to objects/jigsaw/village/desert/zombie/houses/desert_small_house_7.iob diff --git a/objects/village/desert/zombie/houses/desert_small_house_8.iob b/objects/jigsaw/village/desert/zombie/houses/desert_small_house_8.iob similarity index 100% rename from objects/village/desert/zombie/houses/desert_small_house_8.iob rename to objects/jigsaw/village/desert/zombie/houses/desert_small_house_8.iob diff --git a/objects/village/desert/zombie/streets/corner_01.iob b/objects/jigsaw/village/desert/zombie/streets/corner_01.iob similarity index 100% rename from objects/village/desert/zombie/streets/corner_01.iob rename to objects/jigsaw/village/desert/zombie/streets/corner_01.iob diff --git a/objects/village/desert/zombie/streets/corner_02.iob b/objects/jigsaw/village/desert/zombie/streets/corner_02.iob similarity index 100% rename from objects/village/desert/zombie/streets/corner_02.iob rename to objects/jigsaw/village/desert/zombie/streets/corner_02.iob diff --git a/objects/village/desert/zombie/streets/crossroad_01.iob b/objects/jigsaw/village/desert/zombie/streets/crossroad_01.iob similarity index 100% rename from objects/village/desert/zombie/streets/crossroad_01.iob rename to objects/jigsaw/village/desert/zombie/streets/crossroad_01.iob diff --git a/objects/village/desert/zombie/streets/crossroad_02.iob b/objects/jigsaw/village/desert/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/village/desert/zombie/streets/crossroad_02.iob rename to objects/jigsaw/village/desert/zombie/streets/crossroad_02.iob diff --git a/objects/village/desert/zombie/streets/crossroad_03.iob b/objects/jigsaw/village/desert/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/village/desert/zombie/streets/crossroad_03.iob rename to objects/jigsaw/village/desert/zombie/streets/crossroad_03.iob diff --git a/objects/village/desert/zombie/streets/square_01.iob b/objects/jigsaw/village/desert/zombie/streets/square_01.iob similarity index 100% rename from objects/village/desert/zombie/streets/square_01.iob rename to objects/jigsaw/village/desert/zombie/streets/square_01.iob diff --git a/objects/village/desert/zombie/streets/square_02.iob b/objects/jigsaw/village/desert/zombie/streets/square_02.iob similarity index 100% rename from objects/village/desert/zombie/streets/square_02.iob rename to objects/jigsaw/village/desert/zombie/streets/square_02.iob diff --git a/objects/village/desert/zombie/streets/straight_01.iob b/objects/jigsaw/village/desert/zombie/streets/straight_01.iob similarity index 100% rename from objects/village/desert/zombie/streets/straight_01.iob rename to objects/jigsaw/village/desert/zombie/streets/straight_01.iob diff --git a/objects/village/desert/zombie/streets/straight_02.iob b/objects/jigsaw/village/desert/zombie/streets/straight_02.iob similarity index 100% rename from objects/village/desert/zombie/streets/straight_02.iob rename to objects/jigsaw/village/desert/zombie/streets/straight_02.iob diff --git a/objects/village/desert/zombie/streets/straight_03.iob b/objects/jigsaw/village/desert/zombie/streets/straight_03.iob similarity index 100% rename from objects/village/desert/zombie/streets/straight_03.iob rename to objects/jigsaw/village/desert/zombie/streets/straight_03.iob diff --git a/objects/village/desert/zombie/streets/turn_01.iob b/objects/jigsaw/village/desert/zombie/streets/turn_01.iob similarity index 100% rename from objects/village/desert/zombie/streets/turn_01.iob rename to objects/jigsaw/village/desert/zombie/streets/turn_01.iob diff --git a/objects/village/desert/zombie/terminators/terminator_02.iob b/objects/jigsaw/village/desert/zombie/terminators/terminator_02.iob similarity index 100% rename from objects/village/desert/zombie/terminators/terminator_02.iob rename to objects/jigsaw/village/desert/zombie/terminators/terminator_02.iob diff --git a/objects/village/desert/zombie/town_centers/desert_meeting_point_1.iob b/objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_1.iob similarity index 100% rename from objects/village/desert/zombie/town_centers/desert_meeting_point_1.iob rename to objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_1.iob diff --git a/objects/village/desert/zombie/town_centers/desert_meeting_point_2.iob b/objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_2.iob similarity index 100% rename from objects/village/desert/zombie/town_centers/desert_meeting_point_2.iob rename to objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_2.iob diff --git a/objects/village/desert/zombie/town_centers/desert_meeting_point_3.iob b/objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_3.iob similarity index 100% rename from objects/village/desert/zombie/town_centers/desert_meeting_point_3.iob rename to objects/jigsaw/village/desert/zombie/town_centers/desert_meeting_point_3.iob diff --git a/objects/village/desert/zombie/villagers/nitwit.iob b/objects/jigsaw/village/desert/zombie/villagers/nitwit.iob similarity index 100% rename from objects/village/desert/zombie/villagers/nitwit.iob rename to objects/jigsaw/village/desert/zombie/villagers/nitwit.iob diff --git a/objects/village/desert/zombie/villagers/unemployed.iob b/objects/jigsaw/village/desert/zombie/villagers/unemployed.iob similarity index 100% rename from objects/village/desert/zombie/villagers/unemployed.iob rename to objects/jigsaw/village/desert/zombie/villagers/unemployed.iob diff --git a/objects/village/plains/houses/plains_accessory_1.iob b/objects/jigsaw/village/plains/houses/plains_accessory_1.iob similarity index 100% rename from objects/village/plains/houses/plains_accessory_1.iob rename to objects/jigsaw/village/plains/houses/plains_accessory_1.iob diff --git a/objects/village/plains/houses/plains_animal_pen_1.iob b/objects/jigsaw/village/plains/houses/plains_animal_pen_1.iob similarity index 100% rename from objects/village/plains/houses/plains_animal_pen_1.iob rename to objects/jigsaw/village/plains/houses/plains_animal_pen_1.iob diff --git a/objects/village/plains/houses/plains_animal_pen_2.iob b/objects/jigsaw/village/plains/houses/plains_animal_pen_2.iob similarity index 100% rename from objects/village/plains/houses/plains_animal_pen_2.iob rename to objects/jigsaw/village/plains/houses/plains_animal_pen_2.iob diff --git a/objects/village/plains/houses/plains_animal_pen_3.iob b/objects/jigsaw/village/plains/houses/plains_animal_pen_3.iob similarity index 100% rename from objects/village/plains/houses/plains_animal_pen_3.iob rename to objects/jigsaw/village/plains/houses/plains_animal_pen_3.iob diff --git a/objects/village/plains/houses/plains_armorer_house_1.iob b/objects/jigsaw/village/plains/houses/plains_armorer_house_1.iob similarity index 100% rename from objects/village/plains/houses/plains_armorer_house_1.iob rename to objects/jigsaw/village/plains/houses/plains_armorer_house_1.iob diff --git a/objects/village/plains/houses/plains_big_house_1.iob b/objects/jigsaw/village/plains/houses/plains_big_house_1.iob similarity index 100% rename from objects/village/plains/houses/plains_big_house_1.iob rename to objects/jigsaw/village/plains/houses/plains_big_house_1.iob diff --git a/objects/village/plains/houses/plains_butcher_shop_1.iob b/objects/jigsaw/village/plains/houses/plains_butcher_shop_1.iob similarity index 100% rename from objects/village/plains/houses/plains_butcher_shop_1.iob rename to objects/jigsaw/village/plains/houses/plains_butcher_shop_1.iob diff --git a/objects/village/plains/houses/plains_butcher_shop_2.iob b/objects/jigsaw/village/plains/houses/plains_butcher_shop_2.iob similarity index 100% rename from objects/village/plains/houses/plains_butcher_shop_2.iob rename to objects/jigsaw/village/plains/houses/plains_butcher_shop_2.iob diff --git a/objects/village/plains/houses/plains_cartographer_1.iob b/objects/jigsaw/village/plains/houses/plains_cartographer_1.iob similarity index 100% rename from objects/village/plains/houses/plains_cartographer_1.iob rename to objects/jigsaw/village/plains/houses/plains_cartographer_1.iob diff --git a/objects/village/plains/houses/plains_fisher_cottage_1.iob b/objects/jigsaw/village/plains/houses/plains_fisher_cottage_1.iob similarity index 100% rename from objects/village/plains/houses/plains_fisher_cottage_1.iob rename to objects/jigsaw/village/plains/houses/plains_fisher_cottage_1.iob diff --git a/objects/village/plains/houses/plains_fletcher_house_1.iob b/objects/jigsaw/village/plains/houses/plains_fletcher_house_1.iob similarity index 100% rename from objects/village/plains/houses/plains_fletcher_house_1.iob rename to objects/jigsaw/village/plains/houses/plains_fletcher_house_1.iob diff --git a/objects/village/plains/houses/plains_large_farm_1.iob b/objects/jigsaw/village/plains/houses/plains_large_farm_1.iob similarity index 100% rename from objects/village/plains/houses/plains_large_farm_1.iob rename to objects/jigsaw/village/plains/houses/plains_large_farm_1.iob diff --git a/objects/village/plains/houses/plains_library_1.iob b/objects/jigsaw/village/plains/houses/plains_library_1.iob similarity index 100% rename from objects/village/plains/houses/plains_library_1.iob rename to objects/jigsaw/village/plains/houses/plains_library_1.iob diff --git a/objects/village/plains/houses/plains_library_2.iob b/objects/jigsaw/village/plains/houses/plains_library_2.iob similarity index 100% rename from objects/village/plains/houses/plains_library_2.iob rename to objects/jigsaw/village/plains/houses/plains_library_2.iob diff --git a/objects/village/plains/houses/plains_masons_house_1.iob b/objects/jigsaw/village/plains/houses/plains_masons_house_1.iob similarity index 100% rename from objects/village/plains/houses/plains_masons_house_1.iob rename to objects/jigsaw/village/plains/houses/plains_masons_house_1.iob diff --git a/objects/village/plains/houses/plains_medium_house_1.iob b/objects/jigsaw/village/plains/houses/plains_medium_house_1.iob similarity index 100% rename from objects/village/plains/houses/plains_medium_house_1.iob rename to objects/jigsaw/village/plains/houses/plains_medium_house_1.iob diff --git a/objects/village/plains/houses/plains_medium_house_2.iob b/objects/jigsaw/village/plains/houses/plains_medium_house_2.iob similarity index 100% rename from objects/village/plains/houses/plains_medium_house_2.iob rename to objects/jigsaw/village/plains/houses/plains_medium_house_2.iob diff --git a/objects/village/plains/houses/plains_meeting_point_4.iob b/objects/jigsaw/village/plains/houses/plains_meeting_point_4.iob similarity index 100% rename from objects/village/plains/houses/plains_meeting_point_4.iob rename to objects/jigsaw/village/plains/houses/plains_meeting_point_4.iob diff --git a/objects/village/plains/houses/plains_meeting_point_5.iob b/objects/jigsaw/village/plains/houses/plains_meeting_point_5.iob similarity index 100% rename from objects/village/plains/houses/plains_meeting_point_5.iob rename to objects/jigsaw/village/plains/houses/plains_meeting_point_5.iob diff --git a/objects/village/plains/houses/plains_shepherds_house_1.iob b/objects/jigsaw/village/plains/houses/plains_shepherds_house_1.iob similarity index 100% rename from objects/village/plains/houses/plains_shepherds_house_1.iob rename to objects/jigsaw/village/plains/houses/plains_shepherds_house_1.iob diff --git a/objects/village/plains/houses/plains_small_farm_1.iob b/objects/jigsaw/village/plains/houses/plains_small_farm_1.iob similarity index 100% rename from objects/village/plains/houses/plains_small_farm_1.iob rename to objects/jigsaw/village/plains/houses/plains_small_farm_1.iob diff --git a/objects/village/plains/houses/plains_small_house_1.iob b/objects/jigsaw/village/plains/houses/plains_small_house_1.iob similarity index 100% rename from objects/village/plains/houses/plains_small_house_1.iob rename to objects/jigsaw/village/plains/houses/plains_small_house_1.iob diff --git a/objects/village/plains/houses/plains_small_house_2.iob b/objects/jigsaw/village/plains/houses/plains_small_house_2.iob similarity index 100% rename from objects/village/plains/houses/plains_small_house_2.iob rename to objects/jigsaw/village/plains/houses/plains_small_house_2.iob diff --git a/objects/village/plains/houses/plains_small_house_3.iob b/objects/jigsaw/village/plains/houses/plains_small_house_3.iob similarity index 100% rename from objects/village/plains/houses/plains_small_house_3.iob rename to objects/jigsaw/village/plains/houses/plains_small_house_3.iob diff --git a/objects/village/plains/houses/plains_small_house_4.iob b/objects/jigsaw/village/plains/houses/plains_small_house_4.iob similarity index 100% rename from objects/village/plains/houses/plains_small_house_4.iob rename to objects/jigsaw/village/plains/houses/plains_small_house_4.iob diff --git a/objects/village/plains/houses/plains_small_house_5.iob b/objects/jigsaw/village/plains/houses/plains_small_house_5.iob similarity index 100% rename from objects/village/plains/houses/plains_small_house_5.iob rename to objects/jigsaw/village/plains/houses/plains_small_house_5.iob diff --git a/objects/village/plains/houses/plains_small_house_6.iob b/objects/jigsaw/village/plains/houses/plains_small_house_6.iob similarity index 100% rename from objects/village/plains/houses/plains_small_house_6.iob rename to objects/jigsaw/village/plains/houses/plains_small_house_6.iob diff --git a/objects/village/plains/houses/plains_small_house_7.iob b/objects/jigsaw/village/plains/houses/plains_small_house_7.iob similarity index 100% rename from objects/village/plains/houses/plains_small_house_7.iob rename to objects/jigsaw/village/plains/houses/plains_small_house_7.iob diff --git a/objects/village/plains/houses/plains_small_house_8.iob b/objects/jigsaw/village/plains/houses/plains_small_house_8.iob similarity index 100% rename from objects/village/plains/houses/plains_small_house_8.iob rename to objects/jigsaw/village/plains/houses/plains_small_house_8.iob diff --git a/objects/village/plains/houses/plains_stable_1.iob b/objects/jigsaw/village/plains/houses/plains_stable_1.iob similarity index 100% rename from objects/village/plains/houses/plains_stable_1.iob rename to objects/jigsaw/village/plains/houses/plains_stable_1.iob diff --git a/objects/village/plains/houses/plains_stable_2.iob b/objects/jigsaw/village/plains/houses/plains_stable_2.iob similarity index 100% rename from objects/village/plains/houses/plains_stable_2.iob rename to objects/jigsaw/village/plains/houses/plains_stable_2.iob diff --git a/objects/village/plains/houses/plains_tannery_1.iob b/objects/jigsaw/village/plains/houses/plains_tannery_1.iob similarity index 100% rename from objects/village/plains/houses/plains_tannery_1.iob rename to objects/jigsaw/village/plains/houses/plains_tannery_1.iob diff --git a/objects/village/plains/houses/plains_temple_3.iob b/objects/jigsaw/village/plains/houses/plains_temple_3.iob similarity index 100% rename from objects/village/plains/houses/plains_temple_3.iob rename to objects/jigsaw/village/plains/houses/plains_temple_3.iob diff --git a/objects/village/plains/houses/plains_temple_4.iob b/objects/jigsaw/village/plains/houses/plains_temple_4.iob similarity index 100% rename from objects/village/plains/houses/plains_temple_4.iob rename to objects/jigsaw/village/plains/houses/plains_temple_4.iob diff --git a/objects/village/plains/houses/plains_tool_smith_1.iob b/objects/jigsaw/village/plains/houses/plains_tool_smith_1.iob similarity index 100% rename from objects/village/plains/houses/plains_tool_smith_1.iob rename to objects/jigsaw/village/plains/houses/plains_tool_smith_1.iob diff --git a/objects/village/plains/houses/plains_weaponsmith_1.iob b/objects/jigsaw/village/plains/houses/plains_weaponsmith_1.iob similarity index 100% rename from objects/village/plains/houses/plains_weaponsmith_1.iob rename to objects/jigsaw/village/plains/houses/plains_weaponsmith_1.iob diff --git a/objects/village/plains/plains_lamp_1.iob b/objects/jigsaw/village/plains/plains_lamp_1.iob similarity index 100% rename from objects/village/plains/plains_lamp_1.iob rename to objects/jigsaw/village/plains/plains_lamp_1.iob diff --git a/objects/village/plains/streets/corner_01.iob b/objects/jigsaw/village/plains/streets/corner_01.iob similarity index 100% rename from objects/village/plains/streets/corner_01.iob rename to objects/jigsaw/village/plains/streets/corner_01.iob diff --git a/objects/village/plains/streets/corner_02.iob b/objects/jigsaw/village/plains/streets/corner_02.iob similarity index 100% rename from objects/village/plains/streets/corner_02.iob rename to objects/jigsaw/village/plains/streets/corner_02.iob diff --git a/objects/village/plains/streets/corner_03.iob b/objects/jigsaw/village/plains/streets/corner_03.iob similarity index 100% rename from objects/village/plains/streets/corner_03.iob rename to objects/jigsaw/village/plains/streets/corner_03.iob diff --git a/objects/village/plains/streets/crossroad_01.iob b/objects/jigsaw/village/plains/streets/crossroad_01.iob similarity index 100% rename from objects/village/plains/streets/crossroad_01.iob rename to objects/jigsaw/village/plains/streets/crossroad_01.iob diff --git a/objects/village/plains/streets/crossroad_02.iob b/objects/jigsaw/village/plains/streets/crossroad_02.iob similarity index 100% rename from objects/village/plains/streets/crossroad_02.iob rename to objects/jigsaw/village/plains/streets/crossroad_02.iob diff --git a/objects/village/plains/streets/crossroad_03.iob b/objects/jigsaw/village/plains/streets/crossroad_03.iob similarity index 100% rename from objects/village/plains/streets/crossroad_03.iob rename to objects/jigsaw/village/plains/streets/crossroad_03.iob diff --git a/objects/village/plains/streets/crossroad_04.iob b/objects/jigsaw/village/plains/streets/crossroad_04.iob similarity index 100% rename from objects/village/plains/streets/crossroad_04.iob rename to objects/jigsaw/village/plains/streets/crossroad_04.iob diff --git a/objects/village/plains/streets/crossroad_05.iob b/objects/jigsaw/village/plains/streets/crossroad_05.iob similarity index 100% rename from objects/village/plains/streets/crossroad_05.iob rename to objects/jigsaw/village/plains/streets/crossroad_05.iob diff --git a/objects/village/plains/streets/crossroad_06.iob b/objects/jigsaw/village/plains/streets/crossroad_06.iob similarity index 100% rename from objects/village/plains/streets/crossroad_06.iob rename to objects/jigsaw/village/plains/streets/crossroad_06.iob diff --git a/objects/village/plains/streets/straight_01.iob b/objects/jigsaw/village/plains/streets/straight_01.iob similarity index 100% rename from objects/village/plains/streets/straight_01.iob rename to objects/jigsaw/village/plains/streets/straight_01.iob diff --git a/objects/village/plains/streets/straight_02.iob b/objects/jigsaw/village/plains/streets/straight_02.iob similarity index 100% rename from objects/village/plains/streets/straight_02.iob rename to objects/jigsaw/village/plains/streets/straight_02.iob diff --git a/objects/village/plains/streets/straight_03.iob b/objects/jigsaw/village/plains/streets/straight_03.iob similarity index 100% rename from objects/village/plains/streets/straight_03.iob rename to objects/jigsaw/village/plains/streets/straight_03.iob diff --git a/objects/village/plains/streets/straight_04.iob b/objects/jigsaw/village/plains/streets/straight_04.iob similarity index 100% rename from objects/village/plains/streets/straight_04.iob rename to objects/jigsaw/village/plains/streets/straight_04.iob diff --git a/objects/village/plains/streets/straight_05.iob b/objects/jigsaw/village/plains/streets/straight_05.iob similarity index 100% rename from objects/village/plains/streets/straight_05.iob rename to objects/jigsaw/village/plains/streets/straight_05.iob diff --git a/objects/village/plains/streets/straight_06.iob b/objects/jigsaw/village/plains/streets/straight_06.iob similarity index 100% rename from objects/village/plains/streets/straight_06.iob rename to objects/jigsaw/village/plains/streets/straight_06.iob diff --git a/objects/village/plains/streets/turn_01.iob b/objects/jigsaw/village/plains/streets/turn_01.iob similarity index 100% rename from objects/village/plains/streets/turn_01.iob rename to objects/jigsaw/village/plains/streets/turn_01.iob diff --git a/objects/village/plains/terminators/terminator_01.iob b/objects/jigsaw/village/plains/terminators/terminator_01.iob similarity index 100% rename from objects/village/plains/terminators/terminator_01.iob rename to objects/jigsaw/village/plains/terminators/terminator_01.iob diff --git a/objects/village/plains/terminators/terminator_02.iob b/objects/jigsaw/village/plains/terminators/terminator_02.iob similarity index 100% rename from objects/village/plains/terminators/terminator_02.iob rename to objects/jigsaw/village/plains/terminators/terminator_02.iob diff --git a/objects/village/plains/terminators/terminator_03.iob b/objects/jigsaw/village/plains/terminators/terminator_03.iob similarity index 100% rename from objects/village/plains/terminators/terminator_03.iob rename to objects/jigsaw/village/plains/terminators/terminator_03.iob diff --git a/objects/village/plains/terminators/terminator_04.iob b/objects/jigsaw/village/plains/terminators/terminator_04.iob similarity index 100% rename from objects/village/plains/terminators/terminator_04.iob rename to objects/jigsaw/village/plains/terminators/terminator_04.iob diff --git a/objects/village/plains/town_centers/plains_fountain_01.iob b/objects/jigsaw/village/plains/town_centers/plains_fountain_01.iob similarity index 100% rename from objects/village/plains/town_centers/plains_fountain_01.iob rename to objects/jigsaw/village/plains/town_centers/plains_fountain_01.iob diff --git a/objects/village/plains/town_centers/plains_meeting_point_1.iob b/objects/jigsaw/village/plains/town_centers/plains_meeting_point_1.iob similarity index 100% rename from objects/village/plains/town_centers/plains_meeting_point_1.iob rename to objects/jigsaw/village/plains/town_centers/plains_meeting_point_1.iob diff --git a/objects/village/plains/town_centers/plains_meeting_point_2.iob b/objects/jigsaw/village/plains/town_centers/plains_meeting_point_2.iob similarity index 100% rename from objects/village/plains/town_centers/plains_meeting_point_2.iob rename to objects/jigsaw/village/plains/town_centers/plains_meeting_point_2.iob diff --git a/objects/village/plains/town_centers/plains_meeting_point_3.iob b/objects/jigsaw/village/plains/town_centers/plains_meeting_point_3.iob similarity index 100% rename from objects/village/plains/town_centers/plains_meeting_point_3.iob rename to objects/jigsaw/village/plains/town_centers/plains_meeting_point_3.iob diff --git a/objects/village/plains/villagers/baby.iob b/objects/jigsaw/village/plains/villagers/baby.iob similarity index 100% rename from objects/village/plains/villagers/baby.iob rename to objects/jigsaw/village/plains/villagers/baby.iob diff --git a/objects/village/plains/villagers/nitwit.iob b/objects/jigsaw/village/plains/villagers/nitwit.iob similarity index 100% rename from objects/village/plains/villagers/nitwit.iob rename to objects/jigsaw/village/plains/villagers/nitwit.iob diff --git a/objects/village/plains/villagers/unemployed.iob b/objects/jigsaw/village/plains/villagers/unemployed.iob similarity index 100% rename from objects/village/plains/villagers/unemployed.iob rename to objects/jigsaw/village/plains/villagers/unemployed.iob diff --git a/objects/village/plains/zombie/houses/plains_animal_pen_3.iob b/objects/jigsaw/village/plains/zombie/houses/plains_animal_pen_3.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_animal_pen_3.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_animal_pen_3.iob diff --git a/objects/village/plains/zombie/houses/plains_big_house_1.iob b/objects/jigsaw/village/plains/zombie/houses/plains_big_house_1.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_big_house_1.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_big_house_1.iob diff --git a/objects/village/plains/zombie/houses/plains_butcher_shop_2.iob b/objects/jigsaw/village/plains/zombie/houses/plains_butcher_shop_2.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_butcher_shop_2.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_butcher_shop_2.iob diff --git a/objects/village/plains/zombie/houses/plains_fletcher_house_1.iob b/objects/jigsaw/village/plains/zombie/houses/plains_fletcher_house_1.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_fletcher_house_1.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_fletcher_house_1.iob diff --git a/objects/village/plains/zombie/houses/plains_medium_house_1.iob b/objects/jigsaw/village/plains/zombie/houses/plains_medium_house_1.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_medium_house_1.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_medium_house_1.iob diff --git a/objects/village/plains/zombie/houses/plains_medium_house_2.iob b/objects/jigsaw/village/plains/zombie/houses/plains_medium_house_2.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_medium_house_2.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_medium_house_2.iob diff --git a/objects/village/plains/zombie/houses/plains_meeting_point_4.iob b/objects/jigsaw/village/plains/zombie/houses/plains_meeting_point_4.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_meeting_point_4.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_meeting_point_4.iob diff --git a/objects/village/plains/zombie/houses/plains_meeting_point_5.iob b/objects/jigsaw/village/plains/zombie/houses/plains_meeting_point_5.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_meeting_point_5.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_meeting_point_5.iob diff --git a/objects/village/plains/zombie/houses/plains_shepherds_house_1.iob b/objects/jigsaw/village/plains/zombie/houses/plains_shepherds_house_1.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_shepherds_house_1.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_shepherds_house_1.iob diff --git a/objects/village/plains/zombie/houses/plains_small_house_1.iob b/objects/jigsaw/village/plains/zombie/houses/plains_small_house_1.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_small_house_1.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_small_house_1.iob diff --git a/objects/village/plains/zombie/houses/plains_small_house_2.iob b/objects/jigsaw/village/plains/zombie/houses/plains_small_house_2.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_small_house_2.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_small_house_2.iob diff --git a/objects/village/plains/zombie/houses/plains_small_house_3.iob b/objects/jigsaw/village/plains/zombie/houses/plains_small_house_3.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_small_house_3.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_small_house_3.iob diff --git a/objects/village/plains/zombie/houses/plains_small_house_4.iob b/objects/jigsaw/village/plains/zombie/houses/plains_small_house_4.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_small_house_4.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_small_house_4.iob diff --git a/objects/village/plains/zombie/houses/plains_small_house_5.iob b/objects/jigsaw/village/plains/zombie/houses/plains_small_house_5.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_small_house_5.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_small_house_5.iob diff --git a/objects/village/plains/zombie/houses/plains_small_house_6.iob b/objects/jigsaw/village/plains/zombie/houses/plains_small_house_6.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_small_house_6.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_small_house_6.iob diff --git a/objects/village/plains/zombie/houses/plains_small_house_7.iob b/objects/jigsaw/village/plains/zombie/houses/plains_small_house_7.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_small_house_7.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_small_house_7.iob diff --git a/objects/village/plains/zombie/houses/plains_small_house_8.iob b/objects/jigsaw/village/plains/zombie/houses/plains_small_house_8.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_small_house_8.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_small_house_8.iob diff --git a/objects/village/plains/zombie/houses/plains_stable_1.iob b/objects/jigsaw/village/plains/zombie/houses/plains_stable_1.iob similarity index 100% rename from objects/village/plains/zombie/houses/plains_stable_1.iob rename to objects/jigsaw/village/plains/zombie/houses/plains_stable_1.iob diff --git a/objects/village/plains/zombie/streets/corner_01.iob b/objects/jigsaw/village/plains/zombie/streets/corner_01.iob similarity index 100% rename from objects/village/plains/zombie/streets/corner_01.iob rename to objects/jigsaw/village/plains/zombie/streets/corner_01.iob diff --git a/objects/village/plains/zombie/streets/corner_02.iob b/objects/jigsaw/village/plains/zombie/streets/corner_02.iob similarity index 100% rename from objects/village/plains/zombie/streets/corner_02.iob rename to objects/jigsaw/village/plains/zombie/streets/corner_02.iob diff --git a/objects/village/plains/zombie/streets/corner_03.iob b/objects/jigsaw/village/plains/zombie/streets/corner_03.iob similarity index 100% rename from objects/village/plains/zombie/streets/corner_03.iob rename to objects/jigsaw/village/plains/zombie/streets/corner_03.iob diff --git a/objects/village/plains/zombie/streets/crossroad_01.iob b/objects/jigsaw/village/plains/zombie/streets/crossroad_01.iob similarity index 100% rename from objects/village/plains/zombie/streets/crossroad_01.iob rename to objects/jigsaw/village/plains/zombie/streets/crossroad_01.iob diff --git a/objects/village/plains/zombie/streets/crossroad_02.iob b/objects/jigsaw/village/plains/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/village/plains/zombie/streets/crossroad_02.iob rename to objects/jigsaw/village/plains/zombie/streets/crossroad_02.iob diff --git a/objects/village/plains/zombie/streets/crossroad_03.iob b/objects/jigsaw/village/plains/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/village/plains/zombie/streets/crossroad_03.iob rename to objects/jigsaw/village/plains/zombie/streets/crossroad_03.iob diff --git a/objects/village/plains/zombie/streets/crossroad_04.iob b/objects/jigsaw/village/plains/zombie/streets/crossroad_04.iob similarity index 100% rename from objects/village/plains/zombie/streets/crossroad_04.iob rename to objects/jigsaw/village/plains/zombie/streets/crossroad_04.iob diff --git a/objects/village/plains/zombie/streets/crossroad_05.iob b/objects/jigsaw/village/plains/zombie/streets/crossroad_05.iob similarity index 100% rename from objects/village/plains/zombie/streets/crossroad_05.iob rename to objects/jigsaw/village/plains/zombie/streets/crossroad_05.iob diff --git a/objects/village/plains/zombie/streets/crossroad_06.iob b/objects/jigsaw/village/plains/zombie/streets/crossroad_06.iob similarity index 100% rename from objects/village/plains/zombie/streets/crossroad_06.iob rename to objects/jigsaw/village/plains/zombie/streets/crossroad_06.iob diff --git a/objects/village/plains/zombie/streets/straight_01.iob b/objects/jigsaw/village/plains/zombie/streets/straight_01.iob similarity index 100% rename from objects/village/plains/zombie/streets/straight_01.iob rename to objects/jigsaw/village/plains/zombie/streets/straight_01.iob diff --git a/objects/village/plains/zombie/streets/straight_02.iob b/objects/jigsaw/village/plains/zombie/streets/straight_02.iob similarity index 100% rename from objects/village/plains/zombie/streets/straight_02.iob rename to objects/jigsaw/village/plains/zombie/streets/straight_02.iob diff --git a/objects/village/plains/zombie/streets/straight_03.iob b/objects/jigsaw/village/plains/zombie/streets/straight_03.iob similarity index 100% rename from objects/village/plains/zombie/streets/straight_03.iob rename to objects/jigsaw/village/plains/zombie/streets/straight_03.iob diff --git a/objects/village/plains/zombie/streets/straight_04.iob b/objects/jigsaw/village/plains/zombie/streets/straight_04.iob similarity index 100% rename from objects/village/plains/zombie/streets/straight_04.iob rename to objects/jigsaw/village/plains/zombie/streets/straight_04.iob diff --git a/objects/village/plains/zombie/streets/straight_05.iob b/objects/jigsaw/village/plains/zombie/streets/straight_05.iob similarity index 100% rename from objects/village/plains/zombie/streets/straight_05.iob rename to objects/jigsaw/village/plains/zombie/streets/straight_05.iob diff --git a/objects/village/plains/zombie/streets/straight_06.iob b/objects/jigsaw/village/plains/zombie/streets/straight_06.iob similarity index 100% rename from objects/village/plains/zombie/streets/straight_06.iob rename to objects/jigsaw/village/plains/zombie/streets/straight_06.iob diff --git a/objects/village/plains/zombie/streets/turn_01.iob b/objects/jigsaw/village/plains/zombie/streets/turn_01.iob similarity index 100% rename from objects/village/plains/zombie/streets/turn_01.iob rename to objects/jigsaw/village/plains/zombie/streets/turn_01.iob diff --git a/objects/village/plains/zombie/town_centers/plains_fountain_01.iob b/objects/jigsaw/village/plains/zombie/town_centers/plains_fountain_01.iob similarity index 100% rename from objects/village/plains/zombie/town_centers/plains_fountain_01.iob rename to objects/jigsaw/village/plains/zombie/town_centers/plains_fountain_01.iob diff --git a/objects/village/plains/zombie/town_centers/plains_meeting_point_1.iob b/objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_1.iob similarity index 100% rename from objects/village/plains/zombie/town_centers/plains_meeting_point_1.iob rename to objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_1.iob diff --git a/objects/village/plains/zombie/town_centers/plains_meeting_point_2.iob b/objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_2.iob similarity index 100% rename from objects/village/plains/zombie/town_centers/plains_meeting_point_2.iob rename to objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_2.iob diff --git a/objects/village/plains/zombie/town_centers/plains_meeting_point_3.iob b/objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_3.iob similarity index 100% rename from objects/village/plains/zombie/town_centers/plains_meeting_point_3.iob rename to objects/jigsaw/village/plains/zombie/town_centers/plains_meeting_point_3.iob diff --git a/objects/village/plains/zombie/villagers/nitwit.iob b/objects/jigsaw/village/plains/zombie/villagers/nitwit.iob similarity index 100% rename from objects/village/plains/zombie/villagers/nitwit.iob rename to objects/jigsaw/village/plains/zombie/villagers/nitwit.iob diff --git a/objects/village/plains/zombie/villagers/unemployed.iob b/objects/jigsaw/village/plains/zombie/villagers/unemployed.iob similarity index 100% rename from objects/village/plains/zombie/villagers/unemployed.iob rename to objects/jigsaw/village/plains/zombie/villagers/unemployed.iob diff --git a/objects/village/savanna/houses/savanna_animal_pen_1.iob b/objects/jigsaw/village/savanna/houses/savanna_animal_pen_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_animal_pen_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_animal_pen_1.iob diff --git a/objects/village/savanna/houses/savanna_animal_pen_2.iob b/objects/jigsaw/village/savanna/houses/savanna_animal_pen_2.iob similarity index 100% rename from objects/village/savanna/houses/savanna_animal_pen_2.iob rename to objects/jigsaw/village/savanna/houses/savanna_animal_pen_2.iob diff --git a/objects/village/savanna/houses/savanna_animal_pen_3.iob b/objects/jigsaw/village/savanna/houses/savanna_animal_pen_3.iob similarity index 100% rename from objects/village/savanna/houses/savanna_animal_pen_3.iob rename to objects/jigsaw/village/savanna/houses/savanna_animal_pen_3.iob diff --git a/objects/village/savanna/houses/savanna_armorer_1.iob b/objects/jigsaw/village/savanna/houses/savanna_armorer_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_armorer_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_armorer_1.iob diff --git a/objects/village/savanna/houses/savanna_butchers_shop_1.iob b/objects/jigsaw/village/savanna/houses/savanna_butchers_shop_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_butchers_shop_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_butchers_shop_1.iob diff --git a/objects/village/savanna/houses/savanna_butchers_shop_2.iob b/objects/jigsaw/village/savanna/houses/savanna_butchers_shop_2.iob similarity index 100% rename from objects/village/savanna/houses/savanna_butchers_shop_2.iob rename to objects/jigsaw/village/savanna/houses/savanna_butchers_shop_2.iob diff --git a/objects/village/savanna/houses/savanna_cartographer_1.iob b/objects/jigsaw/village/savanna/houses/savanna_cartographer_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_cartographer_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_cartographer_1.iob diff --git a/objects/village/savanna/houses/savanna_fisher_cottage_1.iob b/objects/jigsaw/village/savanna/houses/savanna_fisher_cottage_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_fisher_cottage_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_fisher_cottage_1.iob diff --git a/objects/village/savanna/houses/savanna_fletcher_house_1.iob b/objects/jigsaw/village/savanna/houses/savanna_fletcher_house_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_fletcher_house_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_fletcher_house_1.iob diff --git a/objects/village/savanna/houses/savanna_large_farm_1.iob b/objects/jigsaw/village/savanna/houses/savanna_large_farm_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_large_farm_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_large_farm_1.iob diff --git a/objects/village/savanna/houses/savanna_large_farm_2.iob b/objects/jigsaw/village/savanna/houses/savanna_large_farm_2.iob similarity index 100% rename from objects/village/savanna/houses/savanna_large_farm_2.iob rename to objects/jigsaw/village/savanna/houses/savanna_large_farm_2.iob diff --git a/objects/village/savanna/houses/savanna_library_1.iob b/objects/jigsaw/village/savanna/houses/savanna_library_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_library_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_library_1.iob diff --git a/objects/village/savanna/houses/savanna_mason_1.iob b/objects/jigsaw/village/savanna/houses/savanna_mason_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_mason_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_mason_1.iob diff --git a/objects/village/savanna/houses/savanna_medium_house_1.iob b/objects/jigsaw/village/savanna/houses/savanna_medium_house_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_medium_house_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_medium_house_1.iob diff --git a/objects/village/savanna/houses/savanna_medium_house_2.iob b/objects/jigsaw/village/savanna/houses/savanna_medium_house_2.iob similarity index 100% rename from objects/village/savanna/houses/savanna_medium_house_2.iob rename to objects/jigsaw/village/savanna/houses/savanna_medium_house_2.iob diff --git a/objects/village/savanna/houses/savanna_shepherd_1.iob b/objects/jigsaw/village/savanna/houses/savanna_shepherd_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_shepherd_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_shepherd_1.iob diff --git a/objects/village/savanna/houses/savanna_small_farm.iob b/objects/jigsaw/village/savanna/houses/savanna_small_farm.iob similarity index 100% rename from objects/village/savanna/houses/savanna_small_farm.iob rename to objects/jigsaw/village/savanna/houses/savanna_small_farm.iob diff --git a/objects/village/savanna/houses/savanna_small_house_1.iob b/objects/jigsaw/village/savanna/houses/savanna_small_house_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_small_house_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_small_house_1.iob diff --git a/objects/village/savanna/houses/savanna_small_house_2.iob b/objects/jigsaw/village/savanna/houses/savanna_small_house_2.iob similarity index 100% rename from objects/village/savanna/houses/savanna_small_house_2.iob rename to objects/jigsaw/village/savanna/houses/savanna_small_house_2.iob diff --git a/objects/village/savanna/houses/savanna_small_house_3.iob b/objects/jigsaw/village/savanna/houses/savanna_small_house_3.iob similarity index 100% rename from objects/village/savanna/houses/savanna_small_house_3.iob rename to objects/jigsaw/village/savanna/houses/savanna_small_house_3.iob diff --git a/objects/village/savanna/houses/savanna_small_house_4.iob b/objects/jigsaw/village/savanna/houses/savanna_small_house_4.iob similarity index 100% rename from objects/village/savanna/houses/savanna_small_house_4.iob rename to objects/jigsaw/village/savanna/houses/savanna_small_house_4.iob diff --git a/objects/village/savanna/houses/savanna_small_house_5.iob b/objects/jigsaw/village/savanna/houses/savanna_small_house_5.iob similarity index 100% rename from objects/village/savanna/houses/savanna_small_house_5.iob rename to objects/jigsaw/village/savanna/houses/savanna_small_house_5.iob diff --git a/objects/village/savanna/houses/savanna_small_house_6.iob b/objects/jigsaw/village/savanna/houses/savanna_small_house_6.iob similarity index 100% rename from objects/village/savanna/houses/savanna_small_house_6.iob rename to objects/jigsaw/village/savanna/houses/savanna_small_house_6.iob diff --git a/objects/village/savanna/houses/savanna_small_house_7.iob b/objects/jigsaw/village/savanna/houses/savanna_small_house_7.iob similarity index 100% rename from objects/village/savanna/houses/savanna_small_house_7.iob rename to objects/jigsaw/village/savanna/houses/savanna_small_house_7.iob diff --git a/objects/village/savanna/houses/savanna_small_house_8.iob b/objects/jigsaw/village/savanna/houses/savanna_small_house_8.iob similarity index 100% rename from objects/village/savanna/houses/savanna_small_house_8.iob rename to objects/jigsaw/village/savanna/houses/savanna_small_house_8.iob diff --git a/objects/village/savanna/houses/savanna_tannery_1.iob b/objects/jigsaw/village/savanna/houses/savanna_tannery_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_tannery_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_tannery_1.iob diff --git a/objects/village/savanna/houses/savanna_temple_1.iob b/objects/jigsaw/village/savanna/houses/savanna_temple_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_temple_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_temple_1.iob diff --git a/objects/village/savanna/houses/savanna_temple_2.iob b/objects/jigsaw/village/savanna/houses/savanna_temple_2.iob similarity index 100% rename from objects/village/savanna/houses/savanna_temple_2.iob rename to objects/jigsaw/village/savanna/houses/savanna_temple_2.iob diff --git a/objects/village/savanna/houses/savanna_tool_smith_1.iob b/objects/jigsaw/village/savanna/houses/savanna_tool_smith_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_tool_smith_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_tool_smith_1.iob diff --git a/objects/village/savanna/houses/savanna_weaponsmith_1.iob b/objects/jigsaw/village/savanna/houses/savanna_weaponsmith_1.iob similarity index 100% rename from objects/village/savanna/houses/savanna_weaponsmith_1.iob rename to objects/jigsaw/village/savanna/houses/savanna_weaponsmith_1.iob diff --git a/objects/village/savanna/houses/savanna_weaponsmith_2.iob b/objects/jigsaw/village/savanna/houses/savanna_weaponsmith_2.iob similarity index 100% rename from objects/village/savanna/houses/savanna_weaponsmith_2.iob rename to objects/jigsaw/village/savanna/houses/savanna_weaponsmith_2.iob diff --git a/objects/village/savanna/savanna_lamp_post_01.iob b/objects/jigsaw/village/savanna/savanna_lamp_post_01.iob similarity index 100% rename from objects/village/savanna/savanna_lamp_post_01.iob rename to objects/jigsaw/village/savanna/savanna_lamp_post_01.iob diff --git a/objects/village/savanna/streets/corner_01.iob b/objects/jigsaw/village/savanna/streets/corner_01.iob similarity index 100% rename from objects/village/savanna/streets/corner_01.iob rename to objects/jigsaw/village/savanna/streets/corner_01.iob diff --git a/objects/village/savanna/streets/corner_03.iob b/objects/jigsaw/village/savanna/streets/corner_03.iob similarity index 100% rename from objects/village/savanna/streets/corner_03.iob rename to objects/jigsaw/village/savanna/streets/corner_03.iob diff --git a/objects/village/savanna/streets/crossroad_02.iob b/objects/jigsaw/village/savanna/streets/crossroad_02.iob similarity index 100% rename from objects/village/savanna/streets/crossroad_02.iob rename to objects/jigsaw/village/savanna/streets/crossroad_02.iob diff --git a/objects/village/savanna/streets/crossroad_03.iob b/objects/jigsaw/village/savanna/streets/crossroad_03.iob similarity index 100% rename from objects/village/savanna/streets/crossroad_03.iob rename to objects/jigsaw/village/savanna/streets/crossroad_03.iob diff --git a/objects/village/savanna/streets/crossroad_04.iob b/objects/jigsaw/village/savanna/streets/crossroad_04.iob similarity index 100% rename from objects/village/savanna/streets/crossroad_04.iob rename to objects/jigsaw/village/savanna/streets/crossroad_04.iob diff --git a/objects/village/savanna/streets/crossroad_05.iob b/objects/jigsaw/village/savanna/streets/crossroad_05.iob similarity index 100% rename from objects/village/savanna/streets/crossroad_05.iob rename to objects/jigsaw/village/savanna/streets/crossroad_05.iob diff --git a/objects/village/savanna/streets/crossroad_06.iob b/objects/jigsaw/village/savanna/streets/crossroad_06.iob similarity index 100% rename from objects/village/savanna/streets/crossroad_06.iob rename to objects/jigsaw/village/savanna/streets/crossroad_06.iob diff --git a/objects/village/savanna/streets/crossroad_07.iob b/objects/jigsaw/village/savanna/streets/crossroad_07.iob similarity index 100% rename from objects/village/savanna/streets/crossroad_07.iob rename to objects/jigsaw/village/savanna/streets/crossroad_07.iob diff --git a/objects/village/savanna/streets/split_01.iob b/objects/jigsaw/village/savanna/streets/split_01.iob similarity index 100% rename from objects/village/savanna/streets/split_01.iob rename to objects/jigsaw/village/savanna/streets/split_01.iob diff --git a/objects/village/savanna/streets/split_02.iob b/objects/jigsaw/village/savanna/streets/split_02.iob similarity index 100% rename from objects/village/savanna/streets/split_02.iob rename to objects/jigsaw/village/savanna/streets/split_02.iob diff --git a/objects/village/savanna/streets/straight_02.iob b/objects/jigsaw/village/savanna/streets/straight_02.iob similarity index 100% rename from objects/village/savanna/streets/straight_02.iob rename to objects/jigsaw/village/savanna/streets/straight_02.iob diff --git a/objects/village/savanna/streets/straight_04.iob b/objects/jigsaw/village/savanna/streets/straight_04.iob similarity index 100% rename from objects/village/savanna/streets/straight_04.iob rename to objects/jigsaw/village/savanna/streets/straight_04.iob diff --git a/objects/village/savanna/streets/straight_05.iob b/objects/jigsaw/village/savanna/streets/straight_05.iob similarity index 100% rename from objects/village/savanna/streets/straight_05.iob rename to objects/jigsaw/village/savanna/streets/straight_05.iob diff --git a/objects/village/savanna/streets/straight_06.iob b/objects/jigsaw/village/savanna/streets/straight_06.iob similarity index 100% rename from objects/village/savanna/streets/straight_06.iob rename to objects/jigsaw/village/savanna/streets/straight_06.iob diff --git a/objects/village/savanna/streets/straight_08.iob b/objects/jigsaw/village/savanna/streets/straight_08.iob similarity index 100% rename from objects/village/savanna/streets/straight_08.iob rename to objects/jigsaw/village/savanna/streets/straight_08.iob diff --git a/objects/village/savanna/streets/straight_09.iob b/objects/jigsaw/village/savanna/streets/straight_09.iob similarity index 100% rename from objects/village/savanna/streets/straight_09.iob rename to objects/jigsaw/village/savanna/streets/straight_09.iob diff --git a/objects/village/savanna/streets/straight_10.iob b/objects/jigsaw/village/savanna/streets/straight_10.iob similarity index 100% rename from objects/village/savanna/streets/straight_10.iob rename to objects/jigsaw/village/savanna/streets/straight_10.iob diff --git a/objects/village/savanna/streets/straight_11.iob b/objects/jigsaw/village/savanna/streets/straight_11.iob similarity index 100% rename from objects/village/savanna/streets/straight_11.iob rename to objects/jigsaw/village/savanna/streets/straight_11.iob diff --git a/objects/village/savanna/streets/turn_01.iob b/objects/jigsaw/village/savanna/streets/turn_01.iob similarity index 100% rename from objects/village/savanna/streets/turn_01.iob rename to objects/jigsaw/village/savanna/streets/turn_01.iob diff --git a/objects/village/savanna/terminators/terminator_05.iob b/objects/jigsaw/village/savanna/terminators/terminator_05.iob similarity index 100% rename from objects/village/savanna/terminators/terminator_05.iob rename to objects/jigsaw/village/savanna/terminators/terminator_05.iob diff --git a/objects/village/savanna/town_centers/savanna_meeting_point_1.iob b/objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_1.iob similarity index 100% rename from objects/village/savanna/town_centers/savanna_meeting_point_1.iob rename to objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_1.iob diff --git a/objects/village/savanna/town_centers/savanna_meeting_point_2.iob b/objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_2.iob similarity index 100% rename from objects/village/savanna/town_centers/savanna_meeting_point_2.iob rename to objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_2.iob diff --git a/objects/village/savanna/town_centers/savanna_meeting_point_3.iob b/objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_3.iob similarity index 100% rename from objects/village/savanna/town_centers/savanna_meeting_point_3.iob rename to objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_3.iob diff --git a/objects/village/savanna/town_centers/savanna_meeting_point_4.iob b/objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_4.iob similarity index 100% rename from objects/village/savanna/town_centers/savanna_meeting_point_4.iob rename to objects/jigsaw/village/savanna/town_centers/savanna_meeting_point_4.iob diff --git a/objects/village/savanna/villagers/baby.iob b/objects/jigsaw/village/savanna/villagers/baby.iob similarity index 100% rename from objects/village/savanna/villagers/baby.iob rename to objects/jigsaw/village/savanna/villagers/baby.iob diff --git a/objects/village/savanna/villagers/nitwit.iob b/objects/jigsaw/village/savanna/villagers/nitwit.iob similarity index 100% rename from objects/village/savanna/villagers/nitwit.iob rename to objects/jigsaw/village/savanna/villagers/nitwit.iob diff --git a/objects/village/savanna/villagers/unemployed.iob b/objects/jigsaw/village/savanna/villagers/unemployed.iob similarity index 100% rename from objects/village/savanna/villagers/unemployed.iob rename to objects/jigsaw/village/savanna/villagers/unemployed.iob diff --git a/objects/village/savanna/zombie/houses/savanna_animal_pen_2.iob b/objects/jigsaw/village/savanna/zombie/houses/savanna_animal_pen_2.iob similarity index 100% rename from objects/village/savanna/zombie/houses/savanna_animal_pen_2.iob rename to objects/jigsaw/village/savanna/zombie/houses/savanna_animal_pen_2.iob diff --git a/objects/village/savanna/zombie/houses/savanna_animal_pen_3.iob b/objects/jigsaw/village/savanna/zombie/houses/savanna_animal_pen_3.iob similarity index 100% rename from objects/village/savanna/zombie/houses/savanna_animal_pen_3.iob rename to objects/jigsaw/village/savanna/zombie/houses/savanna_animal_pen_3.iob diff --git a/objects/village/savanna/zombie/houses/savanna_large_farm_2.iob b/objects/jigsaw/village/savanna/zombie/houses/savanna_large_farm_2.iob similarity index 100% rename from objects/village/savanna/zombie/houses/savanna_large_farm_2.iob rename to objects/jigsaw/village/savanna/zombie/houses/savanna_large_farm_2.iob diff --git a/objects/village/savanna/zombie/houses/savanna_medium_house_1.iob b/objects/jigsaw/village/savanna/zombie/houses/savanna_medium_house_1.iob similarity index 100% rename from objects/village/savanna/zombie/houses/savanna_medium_house_1.iob rename to objects/jigsaw/village/savanna/zombie/houses/savanna_medium_house_1.iob diff --git a/objects/village/savanna/zombie/houses/savanna_medium_house_2.iob b/objects/jigsaw/village/savanna/zombie/houses/savanna_medium_house_2.iob similarity index 100% rename from objects/village/savanna/zombie/houses/savanna_medium_house_2.iob rename to objects/jigsaw/village/savanna/zombie/houses/savanna_medium_house_2.iob diff --git a/objects/village/savanna/zombie/houses/savanna_small_house_1.iob b/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_1.iob similarity index 100% rename from objects/village/savanna/zombie/houses/savanna_small_house_1.iob rename to objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_1.iob diff --git a/objects/village/savanna/zombie/houses/savanna_small_house_2.iob b/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_2.iob similarity index 100% rename from objects/village/savanna/zombie/houses/savanna_small_house_2.iob rename to objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_2.iob diff --git a/objects/village/savanna/zombie/houses/savanna_small_house_3.iob b/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_3.iob similarity index 100% rename from objects/village/savanna/zombie/houses/savanna_small_house_3.iob rename to objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_3.iob diff --git a/objects/village/savanna/zombie/houses/savanna_small_house_4.iob b/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_4.iob similarity index 100% rename from objects/village/savanna/zombie/houses/savanna_small_house_4.iob rename to objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_4.iob diff --git a/objects/village/savanna/zombie/houses/savanna_small_house_5.iob b/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_5.iob similarity index 100% rename from objects/village/savanna/zombie/houses/savanna_small_house_5.iob rename to objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_5.iob diff --git a/objects/village/savanna/zombie/houses/savanna_small_house_6.iob b/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_6.iob similarity index 100% rename from objects/village/savanna/zombie/houses/savanna_small_house_6.iob rename to objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_6.iob diff --git a/objects/village/savanna/zombie/houses/savanna_small_house_7.iob b/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_7.iob similarity index 100% rename from objects/village/savanna/zombie/houses/savanna_small_house_7.iob rename to objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_7.iob diff --git a/objects/village/savanna/zombie/houses/savanna_small_house_8.iob b/objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_8.iob similarity index 100% rename from objects/village/savanna/zombie/houses/savanna_small_house_8.iob rename to objects/jigsaw/village/savanna/zombie/houses/savanna_small_house_8.iob diff --git a/objects/village/savanna/zombie/streets/corner_01.iob b/objects/jigsaw/village/savanna/zombie/streets/corner_01.iob similarity index 100% rename from objects/village/savanna/zombie/streets/corner_01.iob rename to objects/jigsaw/village/savanna/zombie/streets/corner_01.iob diff --git a/objects/village/savanna/zombie/streets/corner_03.iob b/objects/jigsaw/village/savanna/zombie/streets/corner_03.iob similarity index 100% rename from objects/village/savanna/zombie/streets/corner_03.iob rename to objects/jigsaw/village/savanna/zombie/streets/corner_03.iob diff --git a/objects/village/savanna/zombie/streets/crossroad_02.iob b/objects/jigsaw/village/savanna/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/village/savanna/zombie/streets/crossroad_02.iob rename to objects/jigsaw/village/savanna/zombie/streets/crossroad_02.iob diff --git a/objects/village/savanna/zombie/streets/crossroad_03.iob b/objects/jigsaw/village/savanna/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/village/savanna/zombie/streets/crossroad_03.iob rename to objects/jigsaw/village/savanna/zombie/streets/crossroad_03.iob diff --git a/objects/village/savanna/zombie/streets/crossroad_04.iob b/objects/jigsaw/village/savanna/zombie/streets/crossroad_04.iob similarity index 100% rename from objects/village/savanna/zombie/streets/crossroad_04.iob rename to objects/jigsaw/village/savanna/zombie/streets/crossroad_04.iob diff --git a/objects/village/savanna/zombie/streets/crossroad_05.iob b/objects/jigsaw/village/savanna/zombie/streets/crossroad_05.iob similarity index 100% rename from objects/village/savanna/zombie/streets/crossroad_05.iob rename to objects/jigsaw/village/savanna/zombie/streets/crossroad_05.iob diff --git a/objects/village/savanna/zombie/streets/crossroad_06.iob b/objects/jigsaw/village/savanna/zombie/streets/crossroad_06.iob similarity index 100% rename from objects/village/savanna/zombie/streets/crossroad_06.iob rename to objects/jigsaw/village/savanna/zombie/streets/crossroad_06.iob diff --git a/objects/village/savanna/zombie/streets/crossroad_07.iob b/objects/jigsaw/village/savanna/zombie/streets/crossroad_07.iob similarity index 100% rename from objects/village/savanna/zombie/streets/crossroad_07.iob rename to objects/jigsaw/village/savanna/zombie/streets/crossroad_07.iob diff --git a/objects/village/savanna/zombie/streets/split_01.iob b/objects/jigsaw/village/savanna/zombie/streets/split_01.iob similarity index 100% rename from objects/village/savanna/zombie/streets/split_01.iob rename to objects/jigsaw/village/savanna/zombie/streets/split_01.iob diff --git a/objects/village/savanna/zombie/streets/split_02.iob b/objects/jigsaw/village/savanna/zombie/streets/split_02.iob similarity index 100% rename from objects/village/savanna/zombie/streets/split_02.iob rename to objects/jigsaw/village/savanna/zombie/streets/split_02.iob diff --git a/objects/village/savanna/zombie/streets/straight_02.iob b/objects/jigsaw/village/savanna/zombie/streets/straight_02.iob similarity index 100% rename from objects/village/savanna/zombie/streets/straight_02.iob rename to objects/jigsaw/village/savanna/zombie/streets/straight_02.iob diff --git a/objects/village/savanna/zombie/streets/straight_04.iob b/objects/jigsaw/village/savanna/zombie/streets/straight_04.iob similarity index 100% rename from objects/village/savanna/zombie/streets/straight_04.iob rename to objects/jigsaw/village/savanna/zombie/streets/straight_04.iob diff --git a/objects/village/savanna/zombie/streets/straight_05.iob b/objects/jigsaw/village/savanna/zombie/streets/straight_05.iob similarity index 100% rename from objects/village/savanna/zombie/streets/straight_05.iob rename to objects/jigsaw/village/savanna/zombie/streets/straight_05.iob diff --git a/objects/village/savanna/zombie/streets/straight_06.iob b/objects/jigsaw/village/savanna/zombie/streets/straight_06.iob similarity index 100% rename from objects/village/savanna/zombie/streets/straight_06.iob rename to objects/jigsaw/village/savanna/zombie/streets/straight_06.iob diff --git a/objects/village/savanna/zombie/streets/straight_08.iob b/objects/jigsaw/village/savanna/zombie/streets/straight_08.iob similarity index 100% rename from objects/village/savanna/zombie/streets/straight_08.iob rename to objects/jigsaw/village/savanna/zombie/streets/straight_08.iob diff --git a/objects/village/savanna/zombie/streets/straight_09.iob b/objects/jigsaw/village/savanna/zombie/streets/straight_09.iob similarity index 100% rename from objects/village/savanna/zombie/streets/straight_09.iob rename to objects/jigsaw/village/savanna/zombie/streets/straight_09.iob diff --git a/objects/village/savanna/zombie/streets/straight_10.iob b/objects/jigsaw/village/savanna/zombie/streets/straight_10.iob similarity index 100% rename from objects/village/savanna/zombie/streets/straight_10.iob rename to objects/jigsaw/village/savanna/zombie/streets/straight_10.iob diff --git a/objects/village/savanna/zombie/streets/straight_11.iob b/objects/jigsaw/village/savanna/zombie/streets/straight_11.iob similarity index 100% rename from objects/village/savanna/zombie/streets/straight_11.iob rename to objects/jigsaw/village/savanna/zombie/streets/straight_11.iob diff --git a/objects/village/savanna/zombie/streets/turn_01.iob b/objects/jigsaw/village/savanna/zombie/streets/turn_01.iob similarity index 100% rename from objects/village/savanna/zombie/streets/turn_01.iob rename to objects/jigsaw/village/savanna/zombie/streets/turn_01.iob diff --git a/objects/village/savanna/zombie/terminators/terminator_05.iob b/objects/jigsaw/village/savanna/zombie/terminators/terminator_05.iob similarity index 100% rename from objects/village/savanna/zombie/terminators/terminator_05.iob rename to objects/jigsaw/village/savanna/zombie/terminators/terminator_05.iob diff --git a/objects/village/savanna/zombie/town_centers/savanna_meeting_point_1.iob b/objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_1.iob similarity index 100% rename from objects/village/savanna/zombie/town_centers/savanna_meeting_point_1.iob rename to objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_1.iob diff --git a/objects/village/savanna/zombie/town_centers/savanna_meeting_point_2.iob b/objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_2.iob similarity index 100% rename from objects/village/savanna/zombie/town_centers/savanna_meeting_point_2.iob rename to objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_2.iob diff --git a/objects/village/savanna/zombie/town_centers/savanna_meeting_point_3.iob b/objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_3.iob similarity index 100% rename from objects/village/savanna/zombie/town_centers/savanna_meeting_point_3.iob rename to objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_3.iob diff --git a/objects/village/savanna/zombie/town_centers/savanna_meeting_point_4.iob b/objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_4.iob similarity index 100% rename from objects/village/savanna/zombie/town_centers/savanna_meeting_point_4.iob rename to objects/jigsaw/village/savanna/zombie/town_centers/savanna_meeting_point_4.iob diff --git a/objects/village/savanna/zombie/villagers/nitwit.iob b/objects/jigsaw/village/savanna/zombie/villagers/nitwit.iob similarity index 100% rename from objects/village/savanna/zombie/villagers/nitwit.iob rename to objects/jigsaw/village/savanna/zombie/villagers/nitwit.iob diff --git a/objects/village/savanna/zombie/villagers/unemployed.iob b/objects/jigsaw/village/savanna/zombie/villagers/unemployed.iob similarity index 100% rename from objects/village/savanna/zombie/villagers/unemployed.iob rename to objects/jigsaw/village/savanna/zombie/villagers/unemployed.iob diff --git a/objects/village/snowy/houses/snowy_animal_pen_1.iob b/objects/jigsaw/village/snowy/houses/snowy_animal_pen_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_animal_pen_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_animal_pen_1.iob diff --git a/objects/village/snowy/houses/snowy_animal_pen_2.iob b/objects/jigsaw/village/snowy/houses/snowy_animal_pen_2.iob similarity index 100% rename from objects/village/snowy/houses/snowy_animal_pen_2.iob rename to objects/jigsaw/village/snowy/houses/snowy_animal_pen_2.iob diff --git a/objects/village/snowy/houses/snowy_armorer_house_1.iob b/objects/jigsaw/village/snowy/houses/snowy_armorer_house_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_armorer_house_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_armorer_house_1.iob diff --git a/objects/village/snowy/houses/snowy_armorer_house_2.iob b/objects/jigsaw/village/snowy/houses/snowy_armorer_house_2.iob similarity index 100% rename from objects/village/snowy/houses/snowy_armorer_house_2.iob rename to objects/jigsaw/village/snowy/houses/snowy_armorer_house_2.iob diff --git a/objects/village/snowy/houses/snowy_butchers_shop_1.iob b/objects/jigsaw/village/snowy/houses/snowy_butchers_shop_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_butchers_shop_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_butchers_shop_1.iob diff --git a/objects/village/snowy/houses/snowy_butchers_shop_2.iob b/objects/jigsaw/village/snowy/houses/snowy_butchers_shop_2.iob similarity index 100% rename from objects/village/snowy/houses/snowy_butchers_shop_2.iob rename to objects/jigsaw/village/snowy/houses/snowy_butchers_shop_2.iob diff --git a/objects/village/snowy/houses/snowy_cartographer_house_1.iob b/objects/jigsaw/village/snowy/houses/snowy_cartographer_house_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_cartographer_house_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_cartographer_house_1.iob diff --git a/objects/village/snowy/houses/snowy_farm_1.iob b/objects/jigsaw/village/snowy/houses/snowy_farm_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_farm_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_farm_1.iob diff --git a/objects/village/snowy/houses/snowy_farm_2.iob b/objects/jigsaw/village/snowy/houses/snowy_farm_2.iob similarity index 100% rename from objects/village/snowy/houses/snowy_farm_2.iob rename to objects/jigsaw/village/snowy/houses/snowy_farm_2.iob diff --git a/objects/village/snowy/houses/snowy_fisher_cottage.iob b/objects/jigsaw/village/snowy/houses/snowy_fisher_cottage.iob similarity index 100% rename from objects/village/snowy/houses/snowy_fisher_cottage.iob rename to objects/jigsaw/village/snowy/houses/snowy_fisher_cottage.iob diff --git a/objects/village/snowy/houses/snowy_fletcher_house_1.iob b/objects/jigsaw/village/snowy/houses/snowy_fletcher_house_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_fletcher_house_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_fletcher_house_1.iob diff --git a/objects/village/snowy/houses/snowy_library_1.iob b/objects/jigsaw/village/snowy/houses/snowy_library_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_library_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_library_1.iob diff --git a/objects/village/snowy/houses/snowy_masons_house_1.iob b/objects/jigsaw/village/snowy/houses/snowy_masons_house_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_masons_house_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_masons_house_1.iob diff --git a/objects/village/snowy/houses/snowy_masons_house_2.iob b/objects/jigsaw/village/snowy/houses/snowy_masons_house_2.iob similarity index 100% rename from objects/village/snowy/houses/snowy_masons_house_2.iob rename to objects/jigsaw/village/snowy/houses/snowy_masons_house_2.iob diff --git a/objects/village/snowy/houses/snowy_medium_house_1.iob b/objects/jigsaw/village/snowy/houses/snowy_medium_house_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_medium_house_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_medium_house_1.iob diff --git a/objects/village/snowy/houses/snowy_medium_house_2.iob b/objects/jigsaw/village/snowy/houses/snowy_medium_house_2.iob similarity index 100% rename from objects/village/snowy/houses/snowy_medium_house_2.iob rename to objects/jigsaw/village/snowy/houses/snowy_medium_house_2.iob diff --git a/objects/village/snowy/houses/snowy_medium_house_3.iob b/objects/jigsaw/village/snowy/houses/snowy_medium_house_3.iob similarity index 100% rename from objects/village/snowy/houses/snowy_medium_house_3.iob rename to objects/jigsaw/village/snowy/houses/snowy_medium_house_3.iob diff --git a/objects/village/snowy/houses/snowy_shepherds_house_1.iob b/objects/jigsaw/village/snowy/houses/snowy_shepherds_house_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_shepherds_house_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_shepherds_house_1.iob diff --git a/objects/village/snowy/houses/snowy_small_house_1.iob b/objects/jigsaw/village/snowy/houses/snowy_small_house_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_small_house_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_small_house_1.iob diff --git a/objects/village/snowy/houses/snowy_small_house_2.iob b/objects/jigsaw/village/snowy/houses/snowy_small_house_2.iob similarity index 100% rename from objects/village/snowy/houses/snowy_small_house_2.iob rename to objects/jigsaw/village/snowy/houses/snowy_small_house_2.iob diff --git a/objects/village/snowy/houses/snowy_small_house_3.iob b/objects/jigsaw/village/snowy/houses/snowy_small_house_3.iob similarity index 100% rename from objects/village/snowy/houses/snowy_small_house_3.iob rename to objects/jigsaw/village/snowy/houses/snowy_small_house_3.iob diff --git a/objects/village/snowy/houses/snowy_small_house_4.iob b/objects/jigsaw/village/snowy/houses/snowy_small_house_4.iob similarity index 100% rename from objects/village/snowy/houses/snowy_small_house_4.iob rename to objects/jigsaw/village/snowy/houses/snowy_small_house_4.iob diff --git a/objects/village/snowy/houses/snowy_small_house_5.iob b/objects/jigsaw/village/snowy/houses/snowy_small_house_5.iob similarity index 100% rename from objects/village/snowy/houses/snowy_small_house_5.iob rename to objects/jigsaw/village/snowy/houses/snowy_small_house_5.iob diff --git a/objects/village/snowy/houses/snowy_small_house_6.iob b/objects/jigsaw/village/snowy/houses/snowy_small_house_6.iob similarity index 100% rename from objects/village/snowy/houses/snowy_small_house_6.iob rename to objects/jigsaw/village/snowy/houses/snowy_small_house_6.iob diff --git a/objects/village/snowy/houses/snowy_small_house_7.iob b/objects/jigsaw/village/snowy/houses/snowy_small_house_7.iob similarity index 100% rename from objects/village/snowy/houses/snowy_small_house_7.iob rename to objects/jigsaw/village/snowy/houses/snowy_small_house_7.iob diff --git a/objects/village/snowy/houses/snowy_small_house_8.iob b/objects/jigsaw/village/snowy/houses/snowy_small_house_8.iob similarity index 100% rename from objects/village/snowy/houses/snowy_small_house_8.iob rename to objects/jigsaw/village/snowy/houses/snowy_small_house_8.iob diff --git a/objects/village/snowy/houses/snowy_tannery_1.iob b/objects/jigsaw/village/snowy/houses/snowy_tannery_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_tannery_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_tannery_1.iob diff --git a/objects/village/snowy/houses/snowy_temple_1.iob b/objects/jigsaw/village/snowy/houses/snowy_temple_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_temple_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_temple_1.iob diff --git a/objects/village/snowy/houses/snowy_tool_smith_1.iob b/objects/jigsaw/village/snowy/houses/snowy_tool_smith_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_tool_smith_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_tool_smith_1.iob diff --git a/objects/village/snowy/houses/snowy_weapon_smith_1.iob b/objects/jigsaw/village/snowy/houses/snowy_weapon_smith_1.iob similarity index 100% rename from objects/village/snowy/houses/snowy_weapon_smith_1.iob rename to objects/jigsaw/village/snowy/houses/snowy_weapon_smith_1.iob diff --git a/objects/village/snowy/snowy_lamp_post_01.iob b/objects/jigsaw/village/snowy/snowy_lamp_post_01.iob similarity index 100% rename from objects/village/snowy/snowy_lamp_post_01.iob rename to objects/jigsaw/village/snowy/snowy_lamp_post_01.iob diff --git a/objects/village/snowy/snowy_lamp_post_02.iob b/objects/jigsaw/village/snowy/snowy_lamp_post_02.iob similarity index 100% rename from objects/village/snowy/snowy_lamp_post_02.iob rename to objects/jigsaw/village/snowy/snowy_lamp_post_02.iob diff --git a/objects/village/snowy/snowy_lamp_post_03.iob b/objects/jigsaw/village/snowy/snowy_lamp_post_03.iob similarity index 100% rename from objects/village/snowy/snowy_lamp_post_03.iob rename to objects/jigsaw/village/snowy/snowy_lamp_post_03.iob diff --git a/objects/village/snowy/streets/corner_01.iob b/objects/jigsaw/village/snowy/streets/corner_01.iob similarity index 100% rename from objects/village/snowy/streets/corner_01.iob rename to objects/jigsaw/village/snowy/streets/corner_01.iob diff --git a/objects/village/snowy/streets/corner_02.iob b/objects/jigsaw/village/snowy/streets/corner_02.iob similarity index 100% rename from objects/village/snowy/streets/corner_02.iob rename to objects/jigsaw/village/snowy/streets/corner_02.iob diff --git a/objects/village/snowy/streets/corner_03.iob b/objects/jigsaw/village/snowy/streets/corner_03.iob similarity index 100% rename from objects/village/snowy/streets/corner_03.iob rename to objects/jigsaw/village/snowy/streets/corner_03.iob diff --git a/objects/village/snowy/streets/crossroad_01.iob b/objects/jigsaw/village/snowy/streets/crossroad_01.iob similarity index 100% rename from objects/village/snowy/streets/crossroad_01.iob rename to objects/jigsaw/village/snowy/streets/crossroad_01.iob diff --git a/objects/village/snowy/streets/crossroad_02.iob b/objects/jigsaw/village/snowy/streets/crossroad_02.iob similarity index 100% rename from objects/village/snowy/streets/crossroad_02.iob rename to objects/jigsaw/village/snowy/streets/crossroad_02.iob diff --git a/objects/village/snowy/streets/crossroad_03.iob b/objects/jigsaw/village/snowy/streets/crossroad_03.iob similarity index 100% rename from objects/village/snowy/streets/crossroad_03.iob rename to objects/jigsaw/village/snowy/streets/crossroad_03.iob diff --git a/objects/village/snowy/streets/crossroad_04.iob b/objects/jigsaw/village/snowy/streets/crossroad_04.iob similarity index 100% rename from objects/village/snowy/streets/crossroad_04.iob rename to objects/jigsaw/village/snowy/streets/crossroad_04.iob diff --git a/objects/village/snowy/streets/crossroad_05.iob b/objects/jigsaw/village/snowy/streets/crossroad_05.iob similarity index 100% rename from objects/village/snowy/streets/crossroad_05.iob rename to objects/jigsaw/village/snowy/streets/crossroad_05.iob diff --git a/objects/village/snowy/streets/crossroad_06.iob b/objects/jigsaw/village/snowy/streets/crossroad_06.iob similarity index 100% rename from objects/village/snowy/streets/crossroad_06.iob rename to objects/jigsaw/village/snowy/streets/crossroad_06.iob diff --git a/objects/village/snowy/streets/square_01.iob b/objects/jigsaw/village/snowy/streets/square_01.iob similarity index 100% rename from objects/village/snowy/streets/square_01.iob rename to objects/jigsaw/village/snowy/streets/square_01.iob diff --git a/objects/village/snowy/streets/straight_01.iob b/objects/jigsaw/village/snowy/streets/straight_01.iob similarity index 100% rename from objects/village/snowy/streets/straight_01.iob rename to objects/jigsaw/village/snowy/streets/straight_01.iob diff --git a/objects/village/snowy/streets/straight_02.iob b/objects/jigsaw/village/snowy/streets/straight_02.iob similarity index 100% rename from objects/village/snowy/streets/straight_02.iob rename to objects/jigsaw/village/snowy/streets/straight_02.iob diff --git a/objects/village/snowy/streets/straight_03.iob b/objects/jigsaw/village/snowy/streets/straight_03.iob similarity index 100% rename from objects/village/snowy/streets/straight_03.iob rename to objects/jigsaw/village/snowy/streets/straight_03.iob diff --git a/objects/village/snowy/streets/straight_04.iob b/objects/jigsaw/village/snowy/streets/straight_04.iob similarity index 100% rename from objects/village/snowy/streets/straight_04.iob rename to objects/jigsaw/village/snowy/streets/straight_04.iob diff --git a/objects/village/snowy/streets/straight_06.iob b/objects/jigsaw/village/snowy/streets/straight_06.iob similarity index 100% rename from objects/village/snowy/streets/straight_06.iob rename to objects/jigsaw/village/snowy/streets/straight_06.iob diff --git a/objects/village/snowy/streets/straight_08.iob b/objects/jigsaw/village/snowy/streets/straight_08.iob similarity index 100% rename from objects/village/snowy/streets/straight_08.iob rename to objects/jigsaw/village/snowy/streets/straight_08.iob diff --git a/objects/village/snowy/streets/turn_01.iob b/objects/jigsaw/village/snowy/streets/turn_01.iob similarity index 100% rename from objects/village/snowy/streets/turn_01.iob rename to objects/jigsaw/village/snowy/streets/turn_01.iob diff --git a/objects/village/snowy/town_centers/snowy_meeting_point_1.iob b/objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_1.iob similarity index 100% rename from objects/village/snowy/town_centers/snowy_meeting_point_1.iob rename to objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_1.iob diff --git a/objects/village/snowy/town_centers/snowy_meeting_point_2.iob b/objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_2.iob similarity index 100% rename from objects/village/snowy/town_centers/snowy_meeting_point_2.iob rename to objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_2.iob diff --git a/objects/village/snowy/town_centers/snowy_meeting_point_3.iob b/objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_3.iob similarity index 100% rename from objects/village/snowy/town_centers/snowy_meeting_point_3.iob rename to objects/jigsaw/village/snowy/town_centers/snowy_meeting_point_3.iob diff --git a/objects/village/snowy/villagers/baby.iob b/objects/jigsaw/village/snowy/villagers/baby.iob similarity index 100% rename from objects/village/snowy/villagers/baby.iob rename to objects/jigsaw/village/snowy/villagers/baby.iob diff --git a/objects/village/snowy/villagers/nitwit.iob b/objects/jigsaw/village/snowy/villagers/nitwit.iob similarity index 100% rename from objects/village/snowy/villagers/nitwit.iob rename to objects/jigsaw/village/snowy/villagers/nitwit.iob diff --git a/objects/village/snowy/villagers/unemployed.iob b/objects/jigsaw/village/snowy/villagers/unemployed.iob similarity index 100% rename from objects/village/snowy/villagers/unemployed.iob rename to objects/jigsaw/village/snowy/villagers/unemployed.iob diff --git a/objects/village/snowy/zombie/houses/snowy_medium_house_1.iob b/objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_1.iob similarity index 100% rename from objects/village/snowy/zombie/houses/snowy_medium_house_1.iob rename to objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_1.iob diff --git a/objects/village/snowy/zombie/houses/snowy_medium_house_2.iob b/objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_2.iob similarity index 100% rename from objects/village/snowy/zombie/houses/snowy_medium_house_2.iob rename to objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_2.iob diff --git a/objects/village/snowy/zombie/houses/snowy_medium_house_3.iob b/objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_3.iob similarity index 100% rename from objects/village/snowy/zombie/houses/snowy_medium_house_3.iob rename to objects/jigsaw/village/snowy/zombie/houses/snowy_medium_house_3.iob diff --git a/objects/village/snowy/zombie/houses/snowy_small_house_1.iob b/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_1.iob similarity index 100% rename from objects/village/snowy/zombie/houses/snowy_small_house_1.iob rename to objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_1.iob diff --git a/objects/village/snowy/zombie/houses/snowy_small_house_2.iob b/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_2.iob similarity index 100% rename from objects/village/snowy/zombie/houses/snowy_small_house_2.iob rename to objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_2.iob diff --git a/objects/village/snowy/zombie/houses/snowy_small_house_3.iob b/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_3.iob similarity index 100% rename from objects/village/snowy/zombie/houses/snowy_small_house_3.iob rename to objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_3.iob diff --git a/objects/village/snowy/zombie/houses/snowy_small_house_4.iob b/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_4.iob similarity index 100% rename from objects/village/snowy/zombie/houses/snowy_small_house_4.iob rename to objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_4.iob diff --git a/objects/village/snowy/zombie/houses/snowy_small_house_5.iob b/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_5.iob similarity index 100% rename from objects/village/snowy/zombie/houses/snowy_small_house_5.iob rename to objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_5.iob diff --git a/objects/village/snowy/zombie/houses/snowy_small_house_6.iob b/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_6.iob similarity index 100% rename from objects/village/snowy/zombie/houses/snowy_small_house_6.iob rename to objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_6.iob diff --git a/objects/village/snowy/zombie/houses/snowy_small_house_7.iob b/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_7.iob similarity index 100% rename from objects/village/snowy/zombie/houses/snowy_small_house_7.iob rename to objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_7.iob diff --git a/objects/village/snowy/zombie/houses/snowy_small_house_8.iob b/objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_8.iob similarity index 100% rename from objects/village/snowy/zombie/houses/snowy_small_house_8.iob rename to objects/jigsaw/village/snowy/zombie/houses/snowy_small_house_8.iob diff --git a/objects/village/snowy/zombie/streets/corner_01.iob b/objects/jigsaw/village/snowy/zombie/streets/corner_01.iob similarity index 100% rename from objects/village/snowy/zombie/streets/corner_01.iob rename to objects/jigsaw/village/snowy/zombie/streets/corner_01.iob diff --git a/objects/village/snowy/zombie/streets/corner_02.iob b/objects/jigsaw/village/snowy/zombie/streets/corner_02.iob similarity index 100% rename from objects/village/snowy/zombie/streets/corner_02.iob rename to objects/jigsaw/village/snowy/zombie/streets/corner_02.iob diff --git a/objects/village/snowy/zombie/streets/corner_03.iob b/objects/jigsaw/village/snowy/zombie/streets/corner_03.iob similarity index 100% rename from objects/village/snowy/zombie/streets/corner_03.iob rename to objects/jigsaw/village/snowy/zombie/streets/corner_03.iob diff --git a/objects/village/snowy/zombie/streets/crossroad_01.iob b/objects/jigsaw/village/snowy/zombie/streets/crossroad_01.iob similarity index 100% rename from objects/village/snowy/zombie/streets/crossroad_01.iob rename to objects/jigsaw/village/snowy/zombie/streets/crossroad_01.iob diff --git a/objects/village/snowy/zombie/streets/crossroad_02.iob b/objects/jigsaw/village/snowy/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/village/snowy/zombie/streets/crossroad_02.iob rename to objects/jigsaw/village/snowy/zombie/streets/crossroad_02.iob diff --git a/objects/village/snowy/zombie/streets/crossroad_03.iob b/objects/jigsaw/village/snowy/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/village/snowy/zombie/streets/crossroad_03.iob rename to objects/jigsaw/village/snowy/zombie/streets/crossroad_03.iob diff --git a/objects/village/snowy/zombie/streets/crossroad_04.iob b/objects/jigsaw/village/snowy/zombie/streets/crossroad_04.iob similarity index 100% rename from objects/village/snowy/zombie/streets/crossroad_04.iob rename to objects/jigsaw/village/snowy/zombie/streets/crossroad_04.iob diff --git a/objects/village/snowy/zombie/streets/crossroad_05.iob b/objects/jigsaw/village/snowy/zombie/streets/crossroad_05.iob similarity index 100% rename from objects/village/snowy/zombie/streets/crossroad_05.iob rename to objects/jigsaw/village/snowy/zombie/streets/crossroad_05.iob diff --git a/objects/village/snowy/zombie/streets/crossroad_06.iob b/objects/jigsaw/village/snowy/zombie/streets/crossroad_06.iob similarity index 100% rename from objects/village/snowy/zombie/streets/crossroad_06.iob rename to objects/jigsaw/village/snowy/zombie/streets/crossroad_06.iob diff --git a/objects/village/snowy/zombie/streets/square_01.iob b/objects/jigsaw/village/snowy/zombie/streets/square_01.iob similarity index 100% rename from objects/village/snowy/zombie/streets/square_01.iob rename to objects/jigsaw/village/snowy/zombie/streets/square_01.iob diff --git a/objects/village/snowy/zombie/streets/straight_01.iob b/objects/jigsaw/village/snowy/zombie/streets/straight_01.iob similarity index 100% rename from objects/village/snowy/zombie/streets/straight_01.iob rename to objects/jigsaw/village/snowy/zombie/streets/straight_01.iob diff --git a/objects/village/snowy/zombie/streets/straight_02.iob b/objects/jigsaw/village/snowy/zombie/streets/straight_02.iob similarity index 100% rename from objects/village/snowy/zombie/streets/straight_02.iob rename to objects/jigsaw/village/snowy/zombie/streets/straight_02.iob diff --git a/objects/village/snowy/zombie/streets/straight_03.iob b/objects/jigsaw/village/snowy/zombie/streets/straight_03.iob similarity index 100% rename from objects/village/snowy/zombie/streets/straight_03.iob rename to objects/jigsaw/village/snowy/zombie/streets/straight_03.iob diff --git a/objects/village/snowy/zombie/streets/straight_04.iob b/objects/jigsaw/village/snowy/zombie/streets/straight_04.iob similarity index 100% rename from objects/village/snowy/zombie/streets/straight_04.iob rename to objects/jigsaw/village/snowy/zombie/streets/straight_04.iob diff --git a/objects/village/snowy/zombie/streets/straight_06.iob b/objects/jigsaw/village/snowy/zombie/streets/straight_06.iob similarity index 100% rename from objects/village/snowy/zombie/streets/straight_06.iob rename to objects/jigsaw/village/snowy/zombie/streets/straight_06.iob diff --git a/objects/village/snowy/zombie/streets/straight_08.iob b/objects/jigsaw/village/snowy/zombie/streets/straight_08.iob similarity index 100% rename from objects/village/snowy/zombie/streets/straight_08.iob rename to objects/jigsaw/village/snowy/zombie/streets/straight_08.iob diff --git a/objects/village/snowy/zombie/streets/turn_01.iob b/objects/jigsaw/village/snowy/zombie/streets/turn_01.iob similarity index 100% rename from objects/village/snowy/zombie/streets/turn_01.iob rename to objects/jigsaw/village/snowy/zombie/streets/turn_01.iob diff --git a/objects/village/snowy/zombie/town_centers/snowy_meeting_point_1.iob b/objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_1.iob similarity index 100% rename from objects/village/snowy/zombie/town_centers/snowy_meeting_point_1.iob rename to objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_1.iob diff --git a/objects/village/snowy/zombie/town_centers/snowy_meeting_point_2.iob b/objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_2.iob similarity index 100% rename from objects/village/snowy/zombie/town_centers/snowy_meeting_point_2.iob rename to objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_2.iob diff --git a/objects/village/snowy/zombie/town_centers/snowy_meeting_point_3.iob b/objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_3.iob similarity index 100% rename from objects/village/snowy/zombie/town_centers/snowy_meeting_point_3.iob rename to objects/jigsaw/village/snowy/zombie/town_centers/snowy_meeting_point_3.iob diff --git a/objects/village/snowy/zombie/villagers/nitwit.iob b/objects/jigsaw/village/snowy/zombie/villagers/nitwit.iob similarity index 100% rename from objects/village/snowy/zombie/villagers/nitwit.iob rename to objects/jigsaw/village/snowy/zombie/villagers/nitwit.iob diff --git a/objects/village/snowy/zombie/villagers/unemployed.iob b/objects/jigsaw/village/snowy/zombie/villagers/unemployed.iob similarity index 100% rename from objects/village/snowy/zombie/villagers/unemployed.iob rename to objects/jigsaw/village/snowy/zombie/villagers/unemployed.iob diff --git a/objects/village/taiga/houses/taiga_animal_pen_1.iob b/objects/jigsaw/village/taiga/houses/taiga_animal_pen_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_animal_pen_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_animal_pen_1.iob diff --git a/objects/village/taiga/houses/taiga_armorer_2.iob b/objects/jigsaw/village/taiga/houses/taiga_armorer_2.iob similarity index 100% rename from objects/village/taiga/houses/taiga_armorer_2.iob rename to objects/jigsaw/village/taiga/houses/taiga_armorer_2.iob diff --git a/objects/village/taiga/houses/taiga_armorer_house_1.iob b/objects/jigsaw/village/taiga/houses/taiga_armorer_house_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_armorer_house_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_armorer_house_1.iob diff --git a/objects/village/taiga/houses/taiga_butcher_shop_1.iob b/objects/jigsaw/village/taiga/houses/taiga_butcher_shop_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_butcher_shop_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_butcher_shop_1.iob diff --git a/objects/village/taiga/houses/taiga_cartographer_house_1.iob b/objects/jigsaw/village/taiga/houses/taiga_cartographer_house_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_cartographer_house_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_cartographer_house_1.iob diff --git a/objects/village/taiga/houses/taiga_fisher_cottage_1.iob b/objects/jigsaw/village/taiga/houses/taiga_fisher_cottage_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_fisher_cottage_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_fisher_cottage_1.iob diff --git a/objects/village/taiga/houses/taiga_fletcher_house_1.iob b/objects/jigsaw/village/taiga/houses/taiga_fletcher_house_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_fletcher_house_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_fletcher_house_1.iob diff --git a/objects/village/taiga/houses/taiga_large_farm_1.iob b/objects/jigsaw/village/taiga/houses/taiga_large_farm_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_large_farm_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_large_farm_1.iob diff --git a/objects/village/taiga/houses/taiga_large_farm_2.iob b/objects/jigsaw/village/taiga/houses/taiga_large_farm_2.iob similarity index 100% rename from objects/village/taiga/houses/taiga_large_farm_2.iob rename to objects/jigsaw/village/taiga/houses/taiga_large_farm_2.iob diff --git a/objects/village/taiga/houses/taiga_library_1.iob b/objects/jigsaw/village/taiga/houses/taiga_library_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_library_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_library_1.iob diff --git a/objects/village/taiga/houses/taiga_masons_house_1.iob b/objects/jigsaw/village/taiga/houses/taiga_masons_house_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_masons_house_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_masons_house_1.iob diff --git a/objects/village/taiga/houses/taiga_medium_house_1.iob b/objects/jigsaw/village/taiga/houses/taiga_medium_house_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_medium_house_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_medium_house_1.iob diff --git a/objects/village/taiga/houses/taiga_medium_house_2.iob b/objects/jigsaw/village/taiga/houses/taiga_medium_house_2.iob similarity index 100% rename from objects/village/taiga/houses/taiga_medium_house_2.iob rename to objects/jigsaw/village/taiga/houses/taiga_medium_house_2.iob diff --git a/objects/village/taiga/houses/taiga_medium_house_3.iob b/objects/jigsaw/village/taiga/houses/taiga_medium_house_3.iob similarity index 100% rename from objects/village/taiga/houses/taiga_medium_house_3.iob rename to objects/jigsaw/village/taiga/houses/taiga_medium_house_3.iob diff --git a/objects/village/taiga/houses/taiga_medium_house_4.iob b/objects/jigsaw/village/taiga/houses/taiga_medium_house_4.iob similarity index 100% rename from objects/village/taiga/houses/taiga_medium_house_4.iob rename to objects/jigsaw/village/taiga/houses/taiga_medium_house_4.iob diff --git a/objects/village/taiga/houses/taiga_shepherds_house_1.iob b/objects/jigsaw/village/taiga/houses/taiga_shepherds_house_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_shepherds_house_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_shepherds_house_1.iob diff --git a/objects/village/taiga/houses/taiga_small_farm_1.iob b/objects/jigsaw/village/taiga/houses/taiga_small_farm_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_small_farm_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_small_farm_1.iob diff --git a/objects/village/taiga/houses/taiga_small_house_1.iob b/objects/jigsaw/village/taiga/houses/taiga_small_house_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_small_house_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_small_house_1.iob diff --git a/objects/village/taiga/houses/taiga_small_house_2.iob b/objects/jigsaw/village/taiga/houses/taiga_small_house_2.iob similarity index 100% rename from objects/village/taiga/houses/taiga_small_house_2.iob rename to objects/jigsaw/village/taiga/houses/taiga_small_house_2.iob diff --git a/objects/village/taiga/houses/taiga_small_house_3.iob b/objects/jigsaw/village/taiga/houses/taiga_small_house_3.iob similarity index 100% rename from objects/village/taiga/houses/taiga_small_house_3.iob rename to objects/jigsaw/village/taiga/houses/taiga_small_house_3.iob diff --git a/objects/village/taiga/houses/taiga_small_house_4.iob b/objects/jigsaw/village/taiga/houses/taiga_small_house_4.iob similarity index 100% rename from objects/village/taiga/houses/taiga_small_house_4.iob rename to objects/jigsaw/village/taiga/houses/taiga_small_house_4.iob diff --git a/objects/village/taiga/houses/taiga_small_house_5.iob b/objects/jigsaw/village/taiga/houses/taiga_small_house_5.iob similarity index 100% rename from objects/village/taiga/houses/taiga_small_house_5.iob rename to objects/jigsaw/village/taiga/houses/taiga_small_house_5.iob diff --git a/objects/village/taiga/houses/taiga_tannery_1.iob b/objects/jigsaw/village/taiga/houses/taiga_tannery_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_tannery_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_tannery_1.iob diff --git a/objects/village/taiga/houses/taiga_temple_1.iob b/objects/jigsaw/village/taiga/houses/taiga_temple_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_temple_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_temple_1.iob diff --git a/objects/village/taiga/houses/taiga_tool_smith_1.iob b/objects/jigsaw/village/taiga/houses/taiga_tool_smith_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_tool_smith_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_tool_smith_1.iob diff --git a/objects/village/taiga/houses/taiga_weaponsmith_1.iob b/objects/jigsaw/village/taiga/houses/taiga_weaponsmith_1.iob similarity index 100% rename from objects/village/taiga/houses/taiga_weaponsmith_1.iob rename to objects/jigsaw/village/taiga/houses/taiga_weaponsmith_1.iob diff --git a/objects/village/taiga/houses/taiga_weaponsmith_2.iob b/objects/jigsaw/village/taiga/houses/taiga_weaponsmith_2.iob similarity index 100% rename from objects/village/taiga/houses/taiga_weaponsmith_2.iob rename to objects/jigsaw/village/taiga/houses/taiga_weaponsmith_2.iob diff --git a/objects/village/taiga/streets/corner_01.iob b/objects/jigsaw/village/taiga/streets/corner_01.iob similarity index 100% rename from objects/village/taiga/streets/corner_01.iob rename to objects/jigsaw/village/taiga/streets/corner_01.iob diff --git a/objects/village/taiga/streets/corner_02.iob b/objects/jigsaw/village/taiga/streets/corner_02.iob similarity index 100% rename from objects/village/taiga/streets/corner_02.iob rename to objects/jigsaw/village/taiga/streets/corner_02.iob diff --git a/objects/village/taiga/streets/corner_03.iob b/objects/jigsaw/village/taiga/streets/corner_03.iob similarity index 100% rename from objects/village/taiga/streets/corner_03.iob rename to objects/jigsaw/village/taiga/streets/corner_03.iob diff --git a/objects/village/taiga/streets/crossroad_01.iob b/objects/jigsaw/village/taiga/streets/crossroad_01.iob similarity index 100% rename from objects/village/taiga/streets/crossroad_01.iob rename to objects/jigsaw/village/taiga/streets/crossroad_01.iob diff --git a/objects/village/taiga/streets/crossroad_02.iob b/objects/jigsaw/village/taiga/streets/crossroad_02.iob similarity index 100% rename from objects/village/taiga/streets/crossroad_02.iob rename to objects/jigsaw/village/taiga/streets/crossroad_02.iob diff --git a/objects/village/taiga/streets/crossroad_03.iob b/objects/jigsaw/village/taiga/streets/crossroad_03.iob similarity index 100% rename from objects/village/taiga/streets/crossroad_03.iob rename to objects/jigsaw/village/taiga/streets/crossroad_03.iob diff --git a/objects/village/taiga/streets/crossroad_04.iob b/objects/jigsaw/village/taiga/streets/crossroad_04.iob similarity index 100% rename from objects/village/taiga/streets/crossroad_04.iob rename to objects/jigsaw/village/taiga/streets/crossroad_04.iob diff --git a/objects/village/taiga/streets/crossroad_05.iob b/objects/jigsaw/village/taiga/streets/crossroad_05.iob similarity index 100% rename from objects/village/taiga/streets/crossroad_05.iob rename to objects/jigsaw/village/taiga/streets/crossroad_05.iob diff --git a/objects/village/taiga/streets/crossroad_06.iob b/objects/jigsaw/village/taiga/streets/crossroad_06.iob similarity index 100% rename from objects/village/taiga/streets/crossroad_06.iob rename to objects/jigsaw/village/taiga/streets/crossroad_06.iob diff --git a/objects/village/taiga/streets/straight_01.iob b/objects/jigsaw/village/taiga/streets/straight_01.iob similarity index 100% rename from objects/village/taiga/streets/straight_01.iob rename to objects/jigsaw/village/taiga/streets/straight_01.iob diff --git a/objects/village/taiga/streets/straight_02.iob b/objects/jigsaw/village/taiga/streets/straight_02.iob similarity index 100% rename from objects/village/taiga/streets/straight_02.iob rename to objects/jigsaw/village/taiga/streets/straight_02.iob diff --git a/objects/village/taiga/streets/straight_03.iob b/objects/jigsaw/village/taiga/streets/straight_03.iob similarity index 100% rename from objects/village/taiga/streets/straight_03.iob rename to objects/jigsaw/village/taiga/streets/straight_03.iob diff --git a/objects/village/taiga/streets/straight_04.iob b/objects/jigsaw/village/taiga/streets/straight_04.iob similarity index 100% rename from objects/village/taiga/streets/straight_04.iob rename to objects/jigsaw/village/taiga/streets/straight_04.iob diff --git a/objects/village/taiga/streets/straight_05.iob b/objects/jigsaw/village/taiga/streets/straight_05.iob similarity index 100% rename from objects/village/taiga/streets/straight_05.iob rename to objects/jigsaw/village/taiga/streets/straight_05.iob diff --git a/objects/village/taiga/streets/straight_06.iob b/objects/jigsaw/village/taiga/streets/straight_06.iob similarity index 100% rename from objects/village/taiga/streets/straight_06.iob rename to objects/jigsaw/village/taiga/streets/straight_06.iob diff --git a/objects/village/taiga/streets/turn_01.iob b/objects/jigsaw/village/taiga/streets/turn_01.iob similarity index 100% rename from objects/village/taiga/streets/turn_01.iob rename to objects/jigsaw/village/taiga/streets/turn_01.iob diff --git a/objects/village/taiga/taiga_decoration_1.iob b/objects/jigsaw/village/taiga/taiga_decoration_1.iob similarity index 100% rename from objects/village/taiga/taiga_decoration_1.iob rename to objects/jigsaw/village/taiga/taiga_decoration_1.iob diff --git a/objects/village/taiga/taiga_decoration_2.iob b/objects/jigsaw/village/taiga/taiga_decoration_2.iob similarity index 100% rename from objects/village/taiga/taiga_decoration_2.iob rename to objects/jigsaw/village/taiga/taiga_decoration_2.iob diff --git a/objects/village/taiga/taiga_decoration_3.iob b/objects/jigsaw/village/taiga/taiga_decoration_3.iob similarity index 100% rename from objects/village/taiga/taiga_decoration_3.iob rename to objects/jigsaw/village/taiga/taiga_decoration_3.iob diff --git a/objects/village/taiga/taiga_decoration_4.iob b/objects/jigsaw/village/taiga/taiga_decoration_4.iob similarity index 100% rename from objects/village/taiga/taiga_decoration_4.iob rename to objects/jigsaw/village/taiga/taiga_decoration_4.iob diff --git a/objects/village/taiga/taiga_decoration_5.iob b/objects/jigsaw/village/taiga/taiga_decoration_5.iob similarity index 100% rename from objects/village/taiga/taiga_decoration_5.iob rename to objects/jigsaw/village/taiga/taiga_decoration_5.iob diff --git a/objects/village/taiga/taiga_decoration_6.iob b/objects/jigsaw/village/taiga/taiga_decoration_6.iob similarity index 100% rename from objects/village/taiga/taiga_decoration_6.iob rename to objects/jigsaw/village/taiga/taiga_decoration_6.iob diff --git a/objects/village/taiga/taiga_lamp_post_1.iob b/objects/jigsaw/village/taiga/taiga_lamp_post_1.iob similarity index 100% rename from objects/village/taiga/taiga_lamp_post_1.iob rename to objects/jigsaw/village/taiga/taiga_lamp_post_1.iob diff --git a/objects/village/taiga/town_centers/taiga_meeting_point_1.iob b/objects/jigsaw/village/taiga/town_centers/taiga_meeting_point_1.iob similarity index 100% rename from objects/village/taiga/town_centers/taiga_meeting_point_1.iob rename to objects/jigsaw/village/taiga/town_centers/taiga_meeting_point_1.iob diff --git a/objects/village/taiga/town_centers/taiga_meeting_point_2.iob b/objects/jigsaw/village/taiga/town_centers/taiga_meeting_point_2.iob similarity index 100% rename from objects/village/taiga/town_centers/taiga_meeting_point_2.iob rename to objects/jigsaw/village/taiga/town_centers/taiga_meeting_point_2.iob diff --git a/objects/village/taiga/villagers/baby.iob b/objects/jigsaw/village/taiga/villagers/baby.iob similarity index 100% rename from objects/village/taiga/villagers/baby.iob rename to objects/jigsaw/village/taiga/villagers/baby.iob diff --git a/objects/village/taiga/villagers/nitwit.iob b/objects/jigsaw/village/taiga/villagers/nitwit.iob similarity index 100% rename from objects/village/taiga/villagers/nitwit.iob rename to objects/jigsaw/village/taiga/villagers/nitwit.iob diff --git a/objects/village/taiga/villagers/unemployed.iob b/objects/jigsaw/village/taiga/villagers/unemployed.iob similarity index 100% rename from objects/village/taiga/villagers/unemployed.iob rename to objects/jigsaw/village/taiga/villagers/unemployed.iob diff --git a/objects/village/taiga/zombie/houses/taiga_cartographer_house_1.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_cartographer_house_1.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_cartographer_house_1.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_cartographer_house_1.iob diff --git a/objects/village/taiga/zombie/houses/taiga_fisher_cottage_1.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_fisher_cottage_1.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_fisher_cottage_1.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_fisher_cottage_1.iob diff --git a/objects/village/taiga/zombie/houses/taiga_large_farm_2.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_large_farm_2.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_large_farm_2.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_large_farm_2.iob diff --git a/objects/village/taiga/zombie/houses/taiga_library_1.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_library_1.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_library_1.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_library_1.iob diff --git a/objects/village/taiga/zombie/houses/taiga_medium_house_1.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_1.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_medium_house_1.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_1.iob diff --git a/objects/village/taiga/zombie/houses/taiga_medium_house_2.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_2.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_medium_house_2.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_2.iob diff --git a/objects/village/taiga/zombie/houses/taiga_medium_house_3.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_3.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_medium_house_3.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_3.iob diff --git a/objects/village/taiga/zombie/houses/taiga_medium_house_4.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_4.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_medium_house_4.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_medium_house_4.iob diff --git a/objects/village/taiga/zombie/houses/taiga_shepherds_house_1.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_shepherds_house_1.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_shepherds_house_1.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_shepherds_house_1.iob diff --git a/objects/village/taiga/zombie/houses/taiga_small_house_1.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_1.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_small_house_1.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_1.iob diff --git a/objects/village/taiga/zombie/houses/taiga_small_house_2.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_2.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_small_house_2.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_2.iob diff --git a/objects/village/taiga/zombie/houses/taiga_small_house_3.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_3.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_small_house_3.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_3.iob diff --git a/objects/village/taiga/zombie/houses/taiga_small_house_4.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_4.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_small_house_4.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_4.iob diff --git a/objects/village/taiga/zombie/houses/taiga_small_house_5.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_5.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_small_house_5.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_small_house_5.iob diff --git a/objects/village/taiga/zombie/houses/taiga_temple_1.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_temple_1.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_temple_1.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_temple_1.iob diff --git a/objects/village/taiga/zombie/houses/taiga_tool_smith_1.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_tool_smith_1.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_tool_smith_1.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_tool_smith_1.iob diff --git a/objects/village/taiga/zombie/houses/taiga_weaponsmith_2.iob b/objects/jigsaw/village/taiga/zombie/houses/taiga_weaponsmith_2.iob similarity index 100% rename from objects/village/taiga/zombie/houses/taiga_weaponsmith_2.iob rename to objects/jigsaw/village/taiga/zombie/houses/taiga_weaponsmith_2.iob diff --git a/objects/village/taiga/zombie/streets/corner_01.iob b/objects/jigsaw/village/taiga/zombie/streets/corner_01.iob similarity index 100% rename from objects/village/taiga/zombie/streets/corner_01.iob rename to objects/jigsaw/village/taiga/zombie/streets/corner_01.iob diff --git a/objects/village/taiga/zombie/streets/corner_02.iob b/objects/jigsaw/village/taiga/zombie/streets/corner_02.iob similarity index 100% rename from objects/village/taiga/zombie/streets/corner_02.iob rename to objects/jigsaw/village/taiga/zombie/streets/corner_02.iob diff --git a/objects/village/taiga/zombie/streets/corner_03.iob b/objects/jigsaw/village/taiga/zombie/streets/corner_03.iob similarity index 100% rename from objects/village/taiga/zombie/streets/corner_03.iob rename to objects/jigsaw/village/taiga/zombie/streets/corner_03.iob diff --git a/objects/village/taiga/zombie/streets/crossroad_01.iob b/objects/jigsaw/village/taiga/zombie/streets/crossroad_01.iob similarity index 100% rename from objects/village/taiga/zombie/streets/crossroad_01.iob rename to objects/jigsaw/village/taiga/zombie/streets/crossroad_01.iob diff --git a/objects/village/taiga/zombie/streets/crossroad_02.iob b/objects/jigsaw/village/taiga/zombie/streets/crossroad_02.iob similarity index 100% rename from objects/village/taiga/zombie/streets/crossroad_02.iob rename to objects/jigsaw/village/taiga/zombie/streets/crossroad_02.iob diff --git a/objects/village/taiga/zombie/streets/crossroad_03.iob b/objects/jigsaw/village/taiga/zombie/streets/crossroad_03.iob similarity index 100% rename from objects/village/taiga/zombie/streets/crossroad_03.iob rename to objects/jigsaw/village/taiga/zombie/streets/crossroad_03.iob diff --git a/objects/village/taiga/zombie/streets/crossroad_04.iob b/objects/jigsaw/village/taiga/zombie/streets/crossroad_04.iob similarity index 100% rename from objects/village/taiga/zombie/streets/crossroad_04.iob rename to objects/jigsaw/village/taiga/zombie/streets/crossroad_04.iob diff --git a/objects/village/taiga/zombie/streets/crossroad_05.iob b/objects/jigsaw/village/taiga/zombie/streets/crossroad_05.iob similarity index 100% rename from objects/village/taiga/zombie/streets/crossroad_05.iob rename to objects/jigsaw/village/taiga/zombie/streets/crossroad_05.iob diff --git a/objects/village/taiga/zombie/streets/crossroad_06.iob b/objects/jigsaw/village/taiga/zombie/streets/crossroad_06.iob similarity index 100% rename from objects/village/taiga/zombie/streets/crossroad_06.iob rename to objects/jigsaw/village/taiga/zombie/streets/crossroad_06.iob diff --git a/objects/village/taiga/zombie/streets/straight_01.iob b/objects/jigsaw/village/taiga/zombie/streets/straight_01.iob similarity index 100% rename from objects/village/taiga/zombie/streets/straight_01.iob rename to objects/jigsaw/village/taiga/zombie/streets/straight_01.iob diff --git a/objects/village/taiga/zombie/streets/straight_02.iob b/objects/jigsaw/village/taiga/zombie/streets/straight_02.iob similarity index 100% rename from objects/village/taiga/zombie/streets/straight_02.iob rename to objects/jigsaw/village/taiga/zombie/streets/straight_02.iob diff --git a/objects/village/taiga/zombie/streets/straight_03.iob b/objects/jigsaw/village/taiga/zombie/streets/straight_03.iob similarity index 100% rename from objects/village/taiga/zombie/streets/straight_03.iob rename to objects/jigsaw/village/taiga/zombie/streets/straight_03.iob diff --git a/objects/village/taiga/zombie/streets/straight_04.iob b/objects/jigsaw/village/taiga/zombie/streets/straight_04.iob similarity index 100% rename from objects/village/taiga/zombie/streets/straight_04.iob rename to objects/jigsaw/village/taiga/zombie/streets/straight_04.iob diff --git a/objects/village/taiga/zombie/streets/straight_05.iob b/objects/jigsaw/village/taiga/zombie/streets/straight_05.iob similarity index 100% rename from objects/village/taiga/zombie/streets/straight_05.iob rename to objects/jigsaw/village/taiga/zombie/streets/straight_05.iob diff --git a/objects/village/taiga/zombie/streets/straight_06.iob b/objects/jigsaw/village/taiga/zombie/streets/straight_06.iob similarity index 100% rename from objects/village/taiga/zombie/streets/straight_06.iob rename to objects/jigsaw/village/taiga/zombie/streets/straight_06.iob diff --git a/objects/village/taiga/zombie/streets/turn_01.iob b/objects/jigsaw/village/taiga/zombie/streets/turn_01.iob similarity index 100% rename from objects/village/taiga/zombie/streets/turn_01.iob rename to objects/jigsaw/village/taiga/zombie/streets/turn_01.iob diff --git a/objects/village/taiga/zombie/town_centers/taiga_meeting_point_1.iob b/objects/jigsaw/village/taiga/zombie/town_centers/taiga_meeting_point_1.iob similarity index 100% rename from objects/village/taiga/zombie/town_centers/taiga_meeting_point_1.iob rename to objects/jigsaw/village/taiga/zombie/town_centers/taiga_meeting_point_1.iob diff --git a/objects/village/taiga/zombie/town_centers/taiga_meeting_point_2.iob b/objects/jigsaw/village/taiga/zombie/town_centers/taiga_meeting_point_2.iob similarity index 100% rename from objects/village/taiga/zombie/town_centers/taiga_meeting_point_2.iob rename to objects/jigsaw/village/taiga/zombie/town_centers/taiga_meeting_point_2.iob diff --git a/objects/village/taiga/zombie/villagers/nitwit.iob b/objects/jigsaw/village/taiga/zombie/villagers/nitwit.iob similarity index 100% rename from objects/village/taiga/zombie/villagers/nitwit.iob rename to objects/jigsaw/village/taiga/zombie/villagers/nitwit.iob diff --git a/objects/village/taiga/zombie/villagers/unemployed.iob b/objects/jigsaw/village/taiga/zombie/villagers/unemployed.iob similarity index 100% rename from objects/village/taiga/zombie/villagers/unemployed.iob rename to objects/jigsaw/village/taiga/zombie/villagers/unemployed.iob diff --git a/objects/woodland_mansion/1x1/a1.iob b/objects/jigsaw/woodland_mansion/1x1/a1.iob similarity index 100% rename from objects/woodland_mansion/1x1/a1.iob rename to objects/jigsaw/woodland_mansion/1x1/a1.iob diff --git a/objects/woodland_mansion/1x1/a2.iob b/objects/jigsaw/woodland_mansion/1x1/a2.iob similarity index 100% rename from objects/woodland_mansion/1x1/a2.iob rename to objects/jigsaw/woodland_mansion/1x1/a2.iob diff --git a/objects/woodland_mansion/1x1/a3.iob b/objects/jigsaw/woodland_mansion/1x1/a3.iob similarity index 100% rename from objects/woodland_mansion/1x1/a3.iob rename to objects/jigsaw/woodland_mansion/1x1/a3.iob diff --git a/objects/woodland_mansion/1x1/a4.iob b/objects/jigsaw/woodland_mansion/1x1/a4.iob similarity index 100% rename from objects/woodland_mansion/1x1/a4.iob rename to objects/jigsaw/woodland_mansion/1x1/a4.iob diff --git a/objects/woodland_mansion/1x1/a5.iob b/objects/jigsaw/woodland_mansion/1x1/a5.iob similarity index 100% rename from objects/woodland_mansion/1x1/a5.iob rename to objects/jigsaw/woodland_mansion/1x1/a5.iob diff --git a/objects/woodland_mansion/1x1/as1.iob b/objects/jigsaw/woodland_mansion/1x1/as1.iob similarity index 100% rename from objects/woodland_mansion/1x1/as1.iob rename to objects/jigsaw/woodland_mansion/1x1/as1.iob diff --git a/objects/woodland_mansion/1x1/as2.iob b/objects/jigsaw/woodland_mansion/1x1/as2.iob similarity index 100% rename from objects/woodland_mansion/1x1/as2.iob rename to objects/jigsaw/woodland_mansion/1x1/as2.iob diff --git a/objects/woodland_mansion/1x1/as3.iob b/objects/jigsaw/woodland_mansion/1x1/as3.iob similarity index 100% rename from objects/woodland_mansion/1x1/as3.iob rename to objects/jigsaw/woodland_mansion/1x1/as3.iob diff --git a/objects/woodland_mansion/1x1/as4.iob b/objects/jigsaw/woodland_mansion/1x1/as4.iob similarity index 100% rename from objects/woodland_mansion/1x1/as4.iob rename to objects/jigsaw/woodland_mansion/1x1/as4.iob diff --git a/objects/woodland_mansion/1x1/b1.iob b/objects/jigsaw/woodland_mansion/1x1/b1.iob similarity index 100% rename from objects/woodland_mansion/1x1/b1.iob rename to objects/jigsaw/woodland_mansion/1x1/b1.iob diff --git a/objects/woodland_mansion/1x1/b2.iob b/objects/jigsaw/woodland_mansion/1x1/b2.iob similarity index 100% rename from objects/woodland_mansion/1x1/b2.iob rename to objects/jigsaw/woodland_mansion/1x1/b2.iob diff --git a/objects/woodland_mansion/1x1/b3.iob b/objects/jigsaw/woodland_mansion/1x1/b3.iob similarity index 100% rename from objects/woodland_mansion/1x1/b3.iob rename to objects/jigsaw/woodland_mansion/1x1/b3.iob diff --git a/objects/woodland_mansion/1x1/b4.iob b/objects/jigsaw/woodland_mansion/1x1/b4.iob similarity index 100% rename from objects/woodland_mansion/1x1/b4.iob rename to objects/jigsaw/woodland_mansion/1x1/b4.iob diff --git a/objects/woodland_mansion/1x1/b5.iob b/objects/jigsaw/woodland_mansion/1x1/b5.iob similarity index 100% rename from objects/woodland_mansion/1x1/b5.iob rename to objects/jigsaw/woodland_mansion/1x1/b5.iob diff --git a/objects/woodland_mansion/1x2/a1.iob b/objects/jigsaw/woodland_mansion/1x2/a1.iob similarity index 100% rename from objects/woodland_mansion/1x2/a1.iob rename to objects/jigsaw/woodland_mansion/1x2/a1.iob diff --git a/objects/woodland_mansion/1x2/a2.iob b/objects/jigsaw/woodland_mansion/1x2/a2.iob similarity index 100% rename from objects/woodland_mansion/1x2/a2.iob rename to objects/jigsaw/woodland_mansion/1x2/a2.iob diff --git a/objects/woodland_mansion/1x2/a3.iob b/objects/jigsaw/woodland_mansion/1x2/a3.iob similarity index 100% rename from objects/woodland_mansion/1x2/a3.iob rename to objects/jigsaw/woodland_mansion/1x2/a3.iob diff --git a/objects/woodland_mansion/1x2/a4.iob b/objects/jigsaw/woodland_mansion/1x2/a4.iob similarity index 100% rename from objects/woodland_mansion/1x2/a4.iob rename to objects/jigsaw/woodland_mansion/1x2/a4.iob diff --git a/objects/woodland_mansion/1x2/a5.iob b/objects/jigsaw/woodland_mansion/1x2/a5.iob similarity index 100% rename from objects/woodland_mansion/1x2/a5.iob rename to objects/jigsaw/woodland_mansion/1x2/a5.iob diff --git a/objects/woodland_mansion/1x2/a6.iob b/objects/jigsaw/woodland_mansion/1x2/a6.iob similarity index 100% rename from objects/woodland_mansion/1x2/a6.iob rename to objects/jigsaw/woodland_mansion/1x2/a6.iob diff --git a/objects/woodland_mansion/1x2/a7.iob b/objects/jigsaw/woodland_mansion/1x2/a7.iob similarity index 100% rename from objects/woodland_mansion/1x2/a7.iob rename to objects/jigsaw/woodland_mansion/1x2/a7.iob diff --git a/objects/woodland_mansion/1x2/a8.iob b/objects/jigsaw/woodland_mansion/1x2/a8.iob similarity index 100% rename from objects/woodland_mansion/1x2/a8.iob rename to objects/jigsaw/woodland_mansion/1x2/a8.iob diff --git a/objects/woodland_mansion/1x2/a9.iob b/objects/jigsaw/woodland_mansion/1x2/a9.iob similarity index 100% rename from objects/woodland_mansion/1x2/a9.iob rename to objects/jigsaw/woodland_mansion/1x2/a9.iob diff --git a/objects/woodland_mansion/1x2/b1.iob b/objects/jigsaw/woodland_mansion/1x2/b1.iob similarity index 100% rename from objects/woodland_mansion/1x2/b1.iob rename to objects/jigsaw/woodland_mansion/1x2/b1.iob diff --git a/objects/woodland_mansion/1x2/b2.iob b/objects/jigsaw/woodland_mansion/1x2/b2.iob similarity index 100% rename from objects/woodland_mansion/1x2/b2.iob rename to objects/jigsaw/woodland_mansion/1x2/b2.iob diff --git a/objects/woodland_mansion/1x2/b3.iob b/objects/jigsaw/woodland_mansion/1x2/b3.iob similarity index 100% rename from objects/woodland_mansion/1x2/b3.iob rename to objects/jigsaw/woodland_mansion/1x2/b3.iob diff --git a/objects/woodland_mansion/1x2/b4.iob b/objects/jigsaw/woodland_mansion/1x2/b4.iob similarity index 100% rename from objects/woodland_mansion/1x2/b4.iob rename to objects/jigsaw/woodland_mansion/1x2/b4.iob diff --git a/objects/woodland_mansion/1x2/b5.iob b/objects/jigsaw/woodland_mansion/1x2/b5.iob similarity index 100% rename from objects/woodland_mansion/1x2/b5.iob rename to objects/jigsaw/woodland_mansion/1x2/b5.iob diff --git a/objects/woodland_mansion/1x2/c1.iob b/objects/jigsaw/woodland_mansion/1x2/c1.iob similarity index 100% rename from objects/woodland_mansion/1x2/c1.iob rename to objects/jigsaw/woodland_mansion/1x2/c1.iob diff --git a/objects/woodland_mansion/1x2/c2.iob b/objects/jigsaw/woodland_mansion/1x2/c2.iob similarity index 100% rename from objects/woodland_mansion/1x2/c2.iob rename to objects/jigsaw/woodland_mansion/1x2/c2.iob diff --git a/objects/woodland_mansion/1x2/c3.iob b/objects/jigsaw/woodland_mansion/1x2/c3.iob similarity index 100% rename from objects/woodland_mansion/1x2/c3.iob rename to objects/jigsaw/woodland_mansion/1x2/c3.iob diff --git a/objects/woodland_mansion/1x2/c4.iob b/objects/jigsaw/woodland_mansion/1x2/c4.iob similarity index 100% rename from objects/woodland_mansion/1x2/c4.iob rename to objects/jigsaw/woodland_mansion/1x2/c4.iob diff --git a/objects/woodland_mansion/1x2/d1.iob b/objects/jigsaw/woodland_mansion/1x2/d1.iob similarity index 100% rename from objects/woodland_mansion/1x2/d1.iob rename to objects/jigsaw/woodland_mansion/1x2/d1.iob diff --git a/objects/woodland_mansion/1x2/d2.iob b/objects/jigsaw/woodland_mansion/1x2/d2.iob similarity index 100% rename from objects/woodland_mansion/1x2/d2.iob rename to objects/jigsaw/woodland_mansion/1x2/d2.iob diff --git a/objects/woodland_mansion/1x2/d3.iob b/objects/jigsaw/woodland_mansion/1x2/d3.iob similarity index 100% rename from objects/woodland_mansion/1x2/d3.iob rename to objects/jigsaw/woodland_mansion/1x2/d3.iob diff --git a/objects/woodland_mansion/1x2/d4.iob b/objects/jigsaw/woodland_mansion/1x2/d4.iob similarity index 100% rename from objects/woodland_mansion/1x2/d4.iob rename to objects/jigsaw/woodland_mansion/1x2/d4.iob diff --git a/objects/woodland_mansion/1x2/d5.iob b/objects/jigsaw/woodland_mansion/1x2/d5.iob similarity index 100% rename from objects/woodland_mansion/1x2/d5.iob rename to objects/jigsaw/woodland_mansion/1x2/d5.iob diff --git a/objects/woodland_mansion/1x2/s1.iob b/objects/jigsaw/woodland_mansion/1x2/s1.iob similarity index 100% rename from objects/woodland_mansion/1x2/s1.iob rename to objects/jigsaw/woodland_mansion/1x2/s1.iob diff --git a/objects/woodland_mansion/1x2/s2.iob b/objects/jigsaw/woodland_mansion/1x2/s2.iob similarity index 100% rename from objects/woodland_mansion/1x2/s2.iob rename to objects/jigsaw/woodland_mansion/1x2/s2.iob diff --git a/objects/woodland_mansion/1x2/se1.iob b/objects/jigsaw/woodland_mansion/1x2/se1.iob similarity index 100% rename from objects/woodland_mansion/1x2/se1.iob rename to objects/jigsaw/woodland_mansion/1x2/se1.iob diff --git a/objects/woodland_mansion/2x2/a1.iob b/objects/jigsaw/woodland_mansion/2x2/a1.iob similarity index 100% rename from objects/woodland_mansion/2x2/a1.iob rename to objects/jigsaw/woodland_mansion/2x2/a1.iob diff --git a/objects/woodland_mansion/2x2/a2.iob b/objects/jigsaw/woodland_mansion/2x2/a2.iob similarity index 100% rename from objects/woodland_mansion/2x2/a2.iob rename to objects/jigsaw/woodland_mansion/2x2/a2.iob diff --git a/objects/woodland_mansion/2x2/a3.iob b/objects/jigsaw/woodland_mansion/2x2/a3.iob similarity index 100% rename from objects/woodland_mansion/2x2/a3.iob rename to objects/jigsaw/woodland_mansion/2x2/a3.iob diff --git a/objects/woodland_mansion/2x2/a4.iob b/objects/jigsaw/woodland_mansion/2x2/a4.iob similarity index 100% rename from objects/woodland_mansion/2x2/a4.iob rename to objects/jigsaw/woodland_mansion/2x2/a4.iob diff --git a/objects/woodland_mansion/2x2/b1.iob b/objects/jigsaw/woodland_mansion/2x2/b1.iob similarity index 100% rename from objects/woodland_mansion/2x2/b1.iob rename to objects/jigsaw/woodland_mansion/2x2/b1.iob diff --git a/objects/woodland_mansion/2x2/b2.iob b/objects/jigsaw/woodland_mansion/2x2/b2.iob similarity index 100% rename from objects/woodland_mansion/2x2/b2.iob rename to objects/jigsaw/woodland_mansion/2x2/b2.iob diff --git a/objects/woodland_mansion/2x2/b3.iob b/objects/jigsaw/woodland_mansion/2x2/b3.iob similarity index 100% rename from objects/woodland_mansion/2x2/b3.iob rename to objects/jigsaw/woodland_mansion/2x2/b3.iob diff --git a/objects/woodland_mansion/2x2/b4.iob b/objects/jigsaw/woodland_mansion/2x2/b4.iob similarity index 100% rename from objects/woodland_mansion/2x2/b4.iob rename to objects/jigsaw/woodland_mansion/2x2/b4.iob diff --git a/objects/woodland_mansion/2x2/b5.iob b/objects/jigsaw/woodland_mansion/2x2/b5.iob similarity index 100% rename from objects/woodland_mansion/2x2/b5.iob rename to objects/jigsaw/woodland_mansion/2x2/b5.iob diff --git a/objects/woodland_mansion/2x2/s1.iob b/objects/jigsaw/woodland_mansion/2x2/s1.iob similarity index 100% rename from objects/woodland_mansion/2x2/s1.iob rename to objects/jigsaw/woodland_mansion/2x2/s1.iob diff --git a/objects/woodland_mansion/main/a1.iob b/objects/jigsaw/woodland_mansion/main/a1.iob similarity index 100% rename from objects/woodland_mansion/main/a1.iob rename to objects/jigsaw/woodland_mansion/main/a1.iob diff --git a/objects/woodland_mansion/oldstuff/carpet_east.iob b/objects/jigsaw/woodland_mansion/oldstuff/carpet_east.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/carpet_east.iob rename to objects/jigsaw/woodland_mansion/oldstuff/carpet_east.iob diff --git a/objects/woodland_mansion/oldstuff/carpet_north.iob b/objects/jigsaw/woodland_mansion/oldstuff/carpet_north.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/carpet_north.iob rename to objects/jigsaw/woodland_mansion/oldstuff/carpet_north.iob diff --git a/objects/woodland_mansion/oldstuff/carpet_south_1.iob b/objects/jigsaw/woodland_mansion/oldstuff/carpet_south_1.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/carpet_south_1.iob rename to objects/jigsaw/woodland_mansion/oldstuff/carpet_south_1.iob diff --git a/objects/woodland_mansion/oldstuff/carpet_south_2.iob b/objects/jigsaw/woodland_mansion/oldstuff/carpet_south_2.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/carpet_south_2.iob rename to objects/jigsaw/woodland_mansion/oldstuff/carpet_south_2.iob diff --git a/objects/woodland_mansion/oldstuff/carpet_west_1.iob b/objects/jigsaw/woodland_mansion/oldstuff/carpet_west_1.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/carpet_west_1.iob rename to objects/jigsaw/woodland_mansion/oldstuff/carpet_west_1.iob diff --git a/objects/woodland_mansion/oldstuff/carpet_west_2.iob b/objects/jigsaw/woodland_mansion/oldstuff/carpet_west_2.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/carpet_west_2.iob rename to objects/jigsaw/woodland_mansion/oldstuff/carpet_west_2.iob diff --git a/objects/woodland_mansion/oldstuff/corridor_floor.iob b/objects/jigsaw/woodland_mansion/oldstuff/corridor_floor.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/corridor_floor.iob rename to objects/jigsaw/woodland_mansion/oldstuff/corridor_floor.iob diff --git a/objects/woodland_mansion/oldstuff/entrance.iob b/objects/jigsaw/woodland_mansion/oldstuff/entrance.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/entrance.iob rename to objects/jigsaw/woodland_mansion/oldstuff/entrance.iob diff --git a/objects/woodland_mansion/oldstuff/indoors_door_1.iob b/objects/jigsaw/woodland_mansion/oldstuff/indoors_door_1.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/indoors_door_1.iob rename to objects/jigsaw/woodland_mansion/oldstuff/indoors_door_1.iob diff --git a/objects/woodland_mansion/oldstuff/indoors_door_2.iob b/objects/jigsaw/woodland_mansion/oldstuff/indoors_door_2.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/indoors_door_2.iob rename to objects/jigsaw/woodland_mansion/oldstuff/indoors_door_2.iob diff --git a/objects/woodland_mansion/oldstuff/indoors_wall_1.iob b/objects/jigsaw/woodland_mansion/oldstuff/indoors_wall_1.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/indoors_wall_1.iob rename to objects/jigsaw/woodland_mansion/oldstuff/indoors_wall_1.iob diff --git a/objects/woodland_mansion/oldstuff/indoors_wall_2.iob b/objects/jigsaw/woodland_mansion/oldstuff/indoors_wall_2.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/indoors_wall_2.iob rename to objects/jigsaw/woodland_mansion/oldstuff/indoors_wall_2.iob diff --git a/objects/woodland_mansion/oldstuff/roof.iob b/objects/jigsaw/woodland_mansion/oldstuff/roof.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/roof.iob rename to objects/jigsaw/woodland_mansion/oldstuff/roof.iob diff --git a/objects/woodland_mansion/oldstuff/roof_corner.iob b/objects/jigsaw/woodland_mansion/oldstuff/roof_corner.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/roof_corner.iob rename to objects/jigsaw/woodland_mansion/oldstuff/roof_corner.iob diff --git a/objects/woodland_mansion/oldstuff/roof_front.iob b/objects/jigsaw/woodland_mansion/oldstuff/roof_front.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/roof_front.iob rename to objects/jigsaw/woodland_mansion/oldstuff/roof_front.iob diff --git a/objects/woodland_mansion/oldstuff/roof_inner_corner.iob b/objects/jigsaw/woodland_mansion/oldstuff/roof_inner_corner.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/roof_inner_corner.iob rename to objects/jigsaw/woodland_mansion/oldstuff/roof_inner_corner.iob diff --git a/objects/woodland_mansion/oldstuff/small_wall.iob b/objects/jigsaw/woodland_mansion/oldstuff/small_wall.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/small_wall.iob rename to objects/jigsaw/woodland_mansion/oldstuff/small_wall.iob diff --git a/objects/woodland_mansion/oldstuff/small_wall_corner.iob b/objects/jigsaw/woodland_mansion/oldstuff/small_wall_corner.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/small_wall_corner.iob rename to objects/jigsaw/woodland_mansion/oldstuff/small_wall_corner.iob diff --git a/objects/woodland_mansion/oldstuff/wall_corner.iob b/objects/jigsaw/woodland_mansion/oldstuff/wall_corner.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/wall_corner.iob rename to objects/jigsaw/woodland_mansion/oldstuff/wall_corner.iob diff --git a/objects/woodland_mansion/oldstuff/wall_flat.iob b/objects/jigsaw/woodland_mansion/oldstuff/wall_flat.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/wall_flat.iob rename to objects/jigsaw/woodland_mansion/oldstuff/wall_flat.iob diff --git a/objects/woodland_mansion/oldstuff/wall_window.iob b/objects/jigsaw/woodland_mansion/oldstuff/wall_window.iob similarity index 100% rename from objects/woodland_mansion/oldstuff/wall_window.iob rename to objects/jigsaw/woodland_mansion/oldstuff/wall_window.iob diff --git a/objects/woodland_mansion/path/path_1.iob b/objects/jigsaw/woodland_mansion/path/path_1.iob similarity index 100% rename from objects/woodland_mansion/path/path_1.iob rename to objects/jigsaw/woodland_mansion/path/path_1.iob diff --git a/objects/woodland_mansion/path/path_2.iob b/objects/jigsaw/woodland_mansion/path/path_2.iob similarity index 100% rename from objects/woodland_mansion/path/path_2.iob rename to objects/jigsaw/woodland_mansion/path/path_2.iob diff --git a/objects/woodland_mansion/path_2/path_1.iob b/objects/jigsaw/woodland_mansion/path_2/path_1.iob similarity index 100% rename from objects/woodland_mansion/path_2/path_1.iob rename to objects/jigsaw/woodland_mansion/path_2/path_1.iob diff --git a/objects/woodland_mansion/path_2/path_2.iob b/objects/jigsaw/woodland_mansion/path_2/path_2.iob similarity index 100% rename from objects/woodland_mansion/path_2/path_2.iob rename to objects/jigsaw/woodland_mansion/path_2/path_2.iob diff --git a/objects/woodland_mansion/roof/roof_1.iob b/objects/jigsaw/woodland_mansion/roof/roof_1.iob similarity index 100% rename from objects/woodland_mansion/roof/roof_1.iob rename to objects/jigsaw/woodland_mansion/roof/roof_1.iob diff --git a/objects/woodland_mansion/stairs/stairs_left.iob b/objects/jigsaw/woodland_mansion/stairs/stairs_left.iob similarity index 100% rename from objects/woodland_mansion/stairs/stairs_left.iob rename to objects/jigsaw/woodland_mansion/stairs/stairs_left.iob diff --git a/objects/woodland_mansion/stairs/stairs_right.iob b/objects/jigsaw/woodland_mansion/stairs/stairs_right.iob similarity index 100% rename from objects/woodland_mansion/stairs/stairs_right.iob rename to objects/jigsaw/woodland_mansion/stairs/stairs_right.iob diff --git a/objects/woodland_mansion/stairs/stairs_straight.iob b/objects/jigsaw/woodland_mansion/stairs/stairs_straight.iob similarity index 100% rename from objects/woodland_mansion/stairs/stairs_straight.iob rename to objects/jigsaw/woodland_mansion/stairs/stairs_straight.iob diff --git a/objects/jungle-remade/bbjungle-1.iob b/objects/jungle-remade/bbjungle-1.iob deleted file mode 100644 index bd9c4e90..00000000 Binary files a/objects/jungle-remade/bbjungle-1.iob and /dev/null differ diff --git a/objects/landform/spikes/1.iob b/objects/landform/spikes/1.iob deleted file mode 100644 index d6c81f18..00000000 Binary files a/objects/landform/spikes/1.iob and /dev/null differ diff --git a/objects/landform/spikes/2.iob b/objects/landform/spikes/2.iob deleted file mode 100644 index f149948b..00000000 Binary files a/objects/landform/spikes/2.iob and /dev/null differ diff --git a/objects/landform/spikes/3.iob b/objects/landform/spikes/3.iob deleted file mode 100644 index 5104a6e1..00000000 Binary files a/objects/landform/spikes/3.iob and /dev/null differ diff --git a/objects/landform/stone/1.iob b/objects/landform/stone/1.iob deleted file mode 100644 index dd13deb6..00000000 Binary files a/objects/landform/stone/1.iob and /dev/null differ diff --git a/objects/landform/stone/2.iob b/objects/landform/stone/2.iob deleted file mode 100644 index 11c71cf4..00000000 Binary files a/objects/landform/stone/2.iob and /dev/null differ diff --git a/objects/landform/stone/3.iob b/objects/landform/stone/3.iob deleted file mode 100644 index 96e95c7d..00000000 Binary files a/objects/landform/stone/3.iob and /dev/null differ diff --git a/objects/landform/stone/4.iob b/objects/landform/stone/4.iob deleted file mode 100644 index 1ce9b93e..00000000 Binary files a/objects/landform/stone/4.iob and /dev/null differ diff --git a/objects/landform/stone/5.iob b/objects/landform/stone/5.iob deleted file mode 100644 index 663b63c7..00000000 Binary files a/objects/landform/stone/5.iob and /dev/null differ diff --git a/objects/landform/underwater/ellipsoid-1.iob b/objects/landform/underwater/ellipsoid-1.iob deleted file mode 100644 index 53f3b2cf..00000000 Binary files a/objects/landform/underwater/ellipsoid-1.iob and /dev/null differ diff --git a/objects/lith/concrete-lith-1.iob b/objects/lith/concrete-lith-1.iob deleted file mode 100644 index 9c75b1d4..00000000 Binary files a/objects/lith/concrete-lith-1.iob and /dev/null differ diff --git a/objects/lith/concrete-lith-2.iob b/objects/lith/concrete-lith-2.iob deleted file mode 100644 index d76b9b03..00000000 Binary files a/objects/lith/concrete-lith-2.iob and /dev/null differ diff --git a/objects/lith/concrete-lith-3.iob b/objects/lith/concrete-lith-3.iob deleted file mode 100644 index 75c3ddd2..00000000 Binary files a/objects/lith/concrete-lith-3.iob and /dev/null differ diff --git a/objects/lith/concrete-lith-4.iob b/objects/lith/concrete-lith-4.iob deleted file mode 100644 index fd5fb19e..00000000 Binary files a/objects/lith/concrete-lith-4.iob and /dev/null differ diff --git a/objects/lith/concrete-lith-5.iob b/objects/lith/concrete-lith-5.iob deleted file mode 100644 index 35ffa883..00000000 Binary files a/objects/lith/concrete-lith-5.iob and /dev/null differ diff --git a/objects/lith/concrete-lith-6.iob b/objects/lith/concrete-lith-6.iob deleted file mode 100644 index 939d5836..00000000 Binary files a/objects/lith/concrete-lith-6.iob and /dev/null differ diff --git a/objects/lith/concrete-lith-7.iob b/objects/lith/concrete-lith-7.iob deleted file mode 100644 index a9e758f0..00000000 Binary files a/objects/lith/concrete-lith-7.iob and /dev/null differ diff --git a/objects/misc/shrub-1.iob b/objects/misc/shrub-1.iob deleted file mode 100644 index 87af0038..00000000 Binary files a/objects/misc/shrub-1.iob and /dev/null differ diff --git a/objects/misc/shrub-10.iob b/objects/misc/shrub-10.iob deleted file mode 100644 index 284cd22d..00000000 Binary files a/objects/misc/shrub-10.iob and /dev/null differ diff --git a/objects/misc/shrub-11.iob b/objects/misc/shrub-11.iob deleted file mode 100644 index e2e08261..00000000 Binary files a/objects/misc/shrub-11.iob and /dev/null differ diff --git a/objects/misc/shrub-13.iob b/objects/misc/shrub-13.iob deleted file mode 100644 index 606a88e5..00000000 Binary files a/objects/misc/shrub-13.iob and /dev/null differ diff --git a/objects/misc/shrub-2.iob b/objects/misc/shrub-2.iob deleted file mode 100644 index d82701e4..00000000 Binary files a/objects/misc/shrub-2.iob and /dev/null differ diff --git a/objects/misc/shrub-3.iob b/objects/misc/shrub-3.iob deleted file mode 100644 index a5f22e0c..00000000 Binary files a/objects/misc/shrub-3.iob and /dev/null differ diff --git a/objects/misc/shrub-4.iob b/objects/misc/shrub-4.iob deleted file mode 100644 index 1e76b377..00000000 Binary files a/objects/misc/shrub-4.iob and /dev/null differ diff --git a/objects/misc/shrub-5.iob b/objects/misc/shrub-5.iob deleted file mode 100644 index ee891d78..00000000 Binary files a/objects/misc/shrub-5.iob and /dev/null differ diff --git a/objects/misc/shrub-6.iob b/objects/misc/shrub-6.iob deleted file mode 100644 index 6348cf49..00000000 Binary files a/objects/misc/shrub-6.iob and /dev/null differ diff --git a/objects/misc/shrub-7.iob b/objects/misc/shrub-7.iob deleted file mode 100644 index 7d2fe223..00000000 Binary files a/objects/misc/shrub-7.iob and /dev/null differ diff --git a/objects/misc/shrub-8.iob b/objects/misc/shrub-8.iob deleted file mode 100644 index 4daa6391..00000000 Binary files a/objects/misc/shrub-8.iob and /dev/null differ diff --git a/objects/misc/shrub-9.iob b/objects/misc/shrub-9.iob deleted file mode 100644 index 0c3bc4c1..00000000 Binary files a/objects/misc/shrub-9.iob and /dev/null differ diff --git a/objects/misc/tntower-1.iob b/objects/misc/tntower-1.iob deleted file mode 100644 index dc15ae33..00000000 Binary files a/objects/misc/tntower-1.iob and /dev/null differ diff --git a/objects/monolith/black-1.iob b/objects/monolith/black-1.iob deleted file mode 100644 index d21cde20..00000000 Binary files a/objects/monolith/black-1.iob and /dev/null differ diff --git a/objects/monolith/black-2.iob b/objects/monolith/black-2.iob deleted file mode 100644 index aba95a0c..00000000 Binary files a/objects/monolith/black-2.iob and /dev/null differ diff --git a/objects/monolith/black-3.iob b/objects/monolith/black-3.iob deleted file mode 100644 index 3fd73cb3..00000000 Binary files a/objects/monolith/black-3.iob and /dev/null differ diff --git a/objects/monolith/black-4.iob b/objects/monolith/black-4.iob deleted file mode 100644 index 703b32f5..00000000 Binary files a/objects/monolith/black-4.iob and /dev/null differ diff --git a/objects/monolith/black-5.iob b/objects/monolith/black-5.iob deleted file mode 100644 index 1d0c0f5d..00000000 Binary files a/objects/monolith/black-5.iob and /dev/null differ diff --git a/objects/monolith/black-6.iob b/objects/monolith/black-6.iob deleted file mode 100644 index fb0ecd85..00000000 Binary files a/objects/monolith/black-6.iob and /dev/null differ diff --git a/objects/mrock/mrock-1.iob b/objects/mrock/mrock-1.iob deleted file mode 100644 index d1a620ef..00000000 Binary files a/objects/mrock/mrock-1.iob and /dev/null differ diff --git a/objects/mrock/mrock-2.iob b/objects/mrock/mrock-2.iob deleted file mode 100644 index 2d654d58..00000000 Binary files a/objects/mrock/mrock-2.iob and /dev/null differ diff --git a/objects/mrock/mrock-3.iob b/objects/mrock/mrock-3.iob deleted file mode 100644 index 840c696b..00000000 Binary files a/objects/mrock/mrock-3.iob and /dev/null differ diff --git a/objects/mrock/mrock-4.iob b/objects/mrock/mrock-4.iob deleted file mode 100644 index 0cdc8a9d..00000000 Binary files a/objects/mrock/mrock-4.iob and /dev/null differ diff --git a/objects/mrock/mrock-5.iob b/objects/mrock/mrock-5.iob deleted file mode 100644 index 48bd5dcf..00000000 Binary files a/objects/mrock/mrock-5.iob and /dev/null differ diff --git a/objects/mystic-trees/dotree1.iob b/objects/mystic-trees/dotree1.iob deleted file mode 100644 index ca153802..00000000 Binary files a/objects/mystic-trees/dotree1.iob and /dev/null differ diff --git a/objects/mystic-trees/dotree10.iob b/objects/mystic-trees/dotree10.iob deleted file mode 100644 index f7c92f6d..00000000 Binary files a/objects/mystic-trees/dotree10.iob and /dev/null differ diff --git a/objects/mystic-trees/dotree2.iob b/objects/mystic-trees/dotree2.iob deleted file mode 100644 index 070cac5f..00000000 Binary files a/objects/mystic-trees/dotree2.iob and /dev/null differ diff --git a/objects/mystic-trees/dotree3.iob b/objects/mystic-trees/dotree3.iob deleted file mode 100644 index 79d29f17..00000000 Binary files a/objects/mystic-trees/dotree3.iob and /dev/null differ diff --git a/objects/mystic-trees/dotree4.iob b/objects/mystic-trees/dotree4.iob deleted file mode 100644 index 25c9f1cd..00000000 Binary files a/objects/mystic-trees/dotree4.iob and /dev/null differ diff --git a/objects/mystic-trees/dotree5.iob b/objects/mystic-trees/dotree5.iob deleted file mode 100644 index 8cf59d4c..00000000 Binary files a/objects/mystic-trees/dotree5.iob and /dev/null differ diff --git a/objects/mystic-trees/dotree6.iob b/objects/mystic-trees/dotree6.iob deleted file mode 100644 index e3634ab6..00000000 Binary files a/objects/mystic-trees/dotree6.iob and /dev/null differ diff --git a/objects/mystic-trees/dotree7.iob b/objects/mystic-trees/dotree7.iob deleted file mode 100644 index 3ab1fd3a..00000000 Binary files a/objects/mystic-trees/dotree7.iob and /dev/null differ diff --git a/objects/mystic-trees/dotree8.iob b/objects/mystic-trees/dotree8.iob deleted file mode 100644 index 2a2aa782..00000000 Binary files a/objects/mystic-trees/dotree8.iob and /dev/null differ diff --git a/objects/mystic-trees/dotree9.iob b/objects/mystic-trees/dotree9.iob deleted file mode 100644 index 240c88b4..00000000 Binary files a/objects/mystic-trees/dotree9.iob and /dev/null differ diff --git a/objects/nether_fossils/fossil_1.iob b/objects/nether_fossils/fossil_1.iob deleted file mode 100644 index ef326541..00000000 Binary files a/objects/nether_fossils/fossil_1.iob and /dev/null differ diff --git a/objects/nether_fossils/fossil_10.iob b/objects/nether_fossils/fossil_10.iob deleted file mode 100644 index c7fbcd1d..00000000 Binary files a/objects/nether_fossils/fossil_10.iob and /dev/null differ diff --git a/objects/nether_fossils/fossil_11.iob b/objects/nether_fossils/fossil_11.iob deleted file mode 100644 index 276b8009..00000000 Binary files a/objects/nether_fossils/fossil_11.iob and /dev/null differ diff --git a/objects/nether_fossils/fossil_12.iob b/objects/nether_fossils/fossil_12.iob deleted file mode 100644 index 9d899227..00000000 Binary files a/objects/nether_fossils/fossil_12.iob and /dev/null differ diff --git a/objects/nether_fossils/fossil_13.iob b/objects/nether_fossils/fossil_13.iob deleted file mode 100644 index 8a639b2c..00000000 Binary files a/objects/nether_fossils/fossil_13.iob and /dev/null differ diff --git a/objects/nether_fossils/fossil_14.iob b/objects/nether_fossils/fossil_14.iob deleted file mode 100644 index 41de28f7..00000000 Binary files a/objects/nether_fossils/fossil_14.iob and /dev/null differ diff --git a/objects/nether_fossils/fossil_2.iob b/objects/nether_fossils/fossil_2.iob deleted file mode 100644 index d5173feb..00000000 Binary files a/objects/nether_fossils/fossil_2.iob and /dev/null differ diff --git a/objects/nether_fossils/fossil_3.iob b/objects/nether_fossils/fossil_3.iob deleted file mode 100644 index becc3bc3..00000000 Binary files a/objects/nether_fossils/fossil_3.iob and /dev/null differ diff --git a/objects/nether_fossils/fossil_4.iob b/objects/nether_fossils/fossil_4.iob deleted file mode 100644 index 10d7aff9..00000000 Binary files a/objects/nether_fossils/fossil_4.iob and /dev/null differ diff --git a/objects/nether_fossils/fossil_5.iob b/objects/nether_fossils/fossil_5.iob deleted file mode 100644 index 49f7cc92..00000000 Binary files a/objects/nether_fossils/fossil_5.iob and /dev/null differ diff --git a/objects/nether_fossils/fossil_6.iob b/objects/nether_fossils/fossil_6.iob deleted file mode 100644 index 4504dd4f..00000000 Binary files a/objects/nether_fossils/fossil_6.iob and /dev/null differ diff --git a/objects/nether_fossils/fossil_7.iob b/objects/nether_fossils/fossil_7.iob deleted file mode 100644 index 3ae919f5..00000000 Binary files a/objects/nether_fossils/fossil_7.iob and /dev/null differ diff --git a/objects/nether_fossils/fossil_8.iob b/objects/nether_fossils/fossil_8.iob deleted file mode 100644 index 082aa83c..00000000 Binary files a/objects/nether_fossils/fossil_8.iob and /dev/null differ diff --git a/objects/nether_fossils/fossil_9.iob b/objects/nether_fossils/fossil_9.iob deleted file mode 100644 index 5b7ea6c3..00000000 Binary files a/objects/nether_fossils/fossil_9.iob and /dev/null differ diff --git a/objects/oak-bush/bush1.iob b/objects/oak-bush/bush1.iob deleted file mode 100644 index ed85f0e8..00000000 Binary files a/objects/oak-bush/bush1.iob and /dev/null differ diff --git a/objects/oak-bush/bush2.iob b/objects/oak-bush/bush2.iob deleted file mode 100644 index 2d804b4d..00000000 Binary files a/objects/oak-bush/bush2.iob and /dev/null differ diff --git a/objects/oak-bush/bush3.iob b/objects/oak-bush/bush3.iob deleted file mode 100644 index 1d2d8a46..00000000 Binary files a/objects/oak-bush/bush3.iob and /dev/null differ diff --git a/objects/oak-bush/bush4.iob b/objects/oak-bush/bush4.iob deleted file mode 100644 index 6b352647..00000000 Binary files a/objects/oak-bush/bush4.iob and /dev/null differ diff --git a/objects/oak-log/log1.iob b/objects/oak-log/log1.iob deleted file mode 100644 index 223268fb..00000000 Binary files a/objects/oak-log/log1.iob and /dev/null differ diff --git a/objects/oak-log/log2.iob b/objects/oak-log/log2.iob deleted file mode 100644 index 35f5c061..00000000 Binary files a/objects/oak-log/log2.iob and /dev/null differ diff --git a/objects/oak-log/log3.iob b/objects/oak-log/log3.iob deleted file mode 100644 index 12f8b574..00000000 Binary files a/objects/oak-log/log3.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter1.iob b/objects/oakbush-tclutter/TClutter1.iob deleted file mode 100644 index f650d1cd..00000000 Binary files a/objects/oakbush-tclutter/TClutter1.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter10.iob b/objects/oakbush-tclutter/TClutter10.iob deleted file mode 100644 index ee6775b1..00000000 Binary files a/objects/oakbush-tclutter/TClutter10.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter11.iob b/objects/oakbush-tclutter/TClutter11.iob deleted file mode 100644 index 051775c1..00000000 Binary files a/objects/oakbush-tclutter/TClutter11.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter12.iob b/objects/oakbush-tclutter/TClutter12.iob deleted file mode 100644 index e74e4e6d..00000000 Binary files a/objects/oakbush-tclutter/TClutter12.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter13.iob b/objects/oakbush-tclutter/TClutter13.iob deleted file mode 100644 index aa148b18..00000000 Binary files a/objects/oakbush-tclutter/TClutter13.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter14.iob b/objects/oakbush-tclutter/TClutter14.iob deleted file mode 100644 index 4fa7e1eb..00000000 Binary files a/objects/oakbush-tclutter/TClutter14.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter15.iob b/objects/oakbush-tclutter/TClutter15.iob deleted file mode 100644 index 5c967dc2..00000000 Binary files a/objects/oakbush-tclutter/TClutter15.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter16.iob b/objects/oakbush-tclutter/TClutter16.iob deleted file mode 100644 index 8b9616c6..00000000 Binary files a/objects/oakbush-tclutter/TClutter16.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter17.iob b/objects/oakbush-tclutter/TClutter17.iob deleted file mode 100644 index 96ef7763..00000000 Binary files a/objects/oakbush-tclutter/TClutter17.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter18.iob b/objects/oakbush-tclutter/TClutter18.iob deleted file mode 100644 index d6a3c1d9..00000000 Binary files a/objects/oakbush-tclutter/TClutter18.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter19.iob b/objects/oakbush-tclutter/TClutter19.iob deleted file mode 100644 index 29050e54..00000000 Binary files a/objects/oakbush-tclutter/TClutter19.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter2.iob b/objects/oakbush-tclutter/TClutter2.iob deleted file mode 100644 index c64d2e0a..00000000 Binary files a/objects/oakbush-tclutter/TClutter2.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter20.iob b/objects/oakbush-tclutter/TClutter20.iob deleted file mode 100644 index 59bf85c1..00000000 Binary files a/objects/oakbush-tclutter/TClutter20.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter21.iob b/objects/oakbush-tclutter/TClutter21.iob deleted file mode 100644 index 3435dafb..00000000 Binary files a/objects/oakbush-tclutter/TClutter21.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter22.iob b/objects/oakbush-tclutter/TClutter22.iob deleted file mode 100644 index c443a267..00000000 Binary files a/objects/oakbush-tclutter/TClutter22.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter23.iob b/objects/oakbush-tclutter/TClutter23.iob deleted file mode 100644 index 2211ec21..00000000 Binary files a/objects/oakbush-tclutter/TClutter23.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter24.iob b/objects/oakbush-tclutter/TClutter24.iob deleted file mode 100644 index 8b5e47b4..00000000 Binary files a/objects/oakbush-tclutter/TClutter24.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter25.iob b/objects/oakbush-tclutter/TClutter25.iob deleted file mode 100644 index 3112547c..00000000 Binary files a/objects/oakbush-tclutter/TClutter25.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter3.iob b/objects/oakbush-tclutter/TClutter3.iob deleted file mode 100644 index a9b50890..00000000 Binary files a/objects/oakbush-tclutter/TClutter3.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter4.iob b/objects/oakbush-tclutter/TClutter4.iob deleted file mode 100644 index fb8f4400..00000000 Binary files a/objects/oakbush-tclutter/TClutter4.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter5.iob b/objects/oakbush-tclutter/TClutter5.iob deleted file mode 100644 index 085e5662..00000000 Binary files a/objects/oakbush-tclutter/TClutter5.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter6.iob b/objects/oakbush-tclutter/TClutter6.iob deleted file mode 100644 index 18884391..00000000 Binary files a/objects/oakbush-tclutter/TClutter6.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter7.iob b/objects/oakbush-tclutter/TClutter7.iob deleted file mode 100644 index a2fce8c0..00000000 Binary files a/objects/oakbush-tclutter/TClutter7.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter8.iob b/objects/oakbush-tclutter/TClutter8.iob deleted file mode 100644 index bdbe0e91..00000000 Binary files a/objects/oakbush-tclutter/TClutter8.iob and /dev/null differ diff --git a/objects/oakbush-tclutter/TClutter9.iob b/objects/oakbush-tclutter/TClutter9.iob deleted file mode 100644 index d9911fb6..00000000 Binary files a/objects/oakbush-tclutter/TClutter9.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb1.iob b/objects/oakbush-tgarb/TGarb1.iob deleted file mode 100644 index 627d198b..00000000 Binary files a/objects/oakbush-tgarb/TGarb1.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb10.iob b/objects/oakbush-tgarb/TGarb10.iob deleted file mode 100644 index 4641d158..00000000 Binary files a/objects/oakbush-tgarb/TGarb10.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb11.iob b/objects/oakbush-tgarb/TGarb11.iob deleted file mode 100644 index 36d9aceb..00000000 Binary files a/objects/oakbush-tgarb/TGarb11.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb12.iob b/objects/oakbush-tgarb/TGarb12.iob deleted file mode 100644 index bd3272eb..00000000 Binary files a/objects/oakbush-tgarb/TGarb12.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb13.iob b/objects/oakbush-tgarb/TGarb13.iob deleted file mode 100644 index 3dd8f47b..00000000 Binary files a/objects/oakbush-tgarb/TGarb13.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb14.iob b/objects/oakbush-tgarb/TGarb14.iob deleted file mode 100644 index 3732f398..00000000 Binary files a/objects/oakbush-tgarb/TGarb14.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb15.iob b/objects/oakbush-tgarb/TGarb15.iob deleted file mode 100644 index 0dad7399..00000000 Binary files a/objects/oakbush-tgarb/TGarb15.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb16.iob b/objects/oakbush-tgarb/TGarb16.iob deleted file mode 100644 index 1370e97c..00000000 Binary files a/objects/oakbush-tgarb/TGarb16.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb17.iob b/objects/oakbush-tgarb/TGarb17.iob deleted file mode 100644 index 3d3952d9..00000000 Binary files a/objects/oakbush-tgarb/TGarb17.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb18.iob b/objects/oakbush-tgarb/TGarb18.iob deleted file mode 100644 index 4615cc76..00000000 Binary files a/objects/oakbush-tgarb/TGarb18.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb19.iob b/objects/oakbush-tgarb/TGarb19.iob deleted file mode 100644 index 064ffd0f..00000000 Binary files a/objects/oakbush-tgarb/TGarb19.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb2.iob b/objects/oakbush-tgarb/TGarb2.iob deleted file mode 100644 index bbd2e7f0..00000000 Binary files a/objects/oakbush-tgarb/TGarb2.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb20.iob b/objects/oakbush-tgarb/TGarb20.iob deleted file mode 100644 index 9c77e3ea..00000000 Binary files a/objects/oakbush-tgarb/TGarb20.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb3.iob b/objects/oakbush-tgarb/TGarb3.iob deleted file mode 100644 index 5903036a..00000000 Binary files a/objects/oakbush-tgarb/TGarb3.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb4.iob b/objects/oakbush-tgarb/TGarb4.iob deleted file mode 100644 index 42888577..00000000 Binary files a/objects/oakbush-tgarb/TGarb4.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb5.iob b/objects/oakbush-tgarb/TGarb5.iob deleted file mode 100644 index b0836606..00000000 Binary files a/objects/oakbush-tgarb/TGarb5.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb6.iob b/objects/oakbush-tgarb/TGarb6.iob deleted file mode 100644 index 83a1617f..00000000 Binary files a/objects/oakbush-tgarb/TGarb6.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb7.iob b/objects/oakbush-tgarb/TGarb7.iob deleted file mode 100644 index ee83fbf3..00000000 Binary files a/objects/oakbush-tgarb/TGarb7.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb8.iob b/objects/oakbush-tgarb/TGarb8.iob deleted file mode 100644 index e1ae1fcc..00000000 Binary files a/objects/oakbush-tgarb/TGarb8.iob and /dev/null differ diff --git a/objects/oakbush-tgarb/TGarb9.iob b/objects/oakbush-tgarb/TGarb9.iob deleted file mode 100644 index 7c9c3b69..00000000 Binary files a/objects/oakbush-tgarb/TGarb9.iob and /dev/null differ diff --git a/objects/ocean-ruins/ruin1.iob b/objects/ocean-ruins/ruin1.iob deleted file mode 100644 index 156bbfb4..00000000 Binary files a/objects/ocean-ruins/ruin1.iob and /dev/null differ diff --git a/objects/ocean-ruins/ruin2.iob b/objects/ocean-ruins/ruin2.iob deleted file mode 100644 index f4fc167b..00000000 Binary files a/objects/ocean-ruins/ruin2.iob and /dev/null differ diff --git a/objects/ocean-ruins/ruin3.iob b/objects/ocean-ruins/ruin3.iob deleted file mode 100644 index bf5c9ad1..00000000 Binary files a/objects/ocean-ruins/ruin3.iob and /dev/null differ diff --git a/objects/other/ICEMush1.ish b/objects/other/ICEMush1.ish deleted file mode 100644 index ec01a7fe..00000000 Binary files a/objects/other/ICEMush1.ish and /dev/null differ diff --git a/objects/other/ICEMush2.ish b/objects/other/ICEMush2.ish deleted file mode 100644 index 3a9f6308..00000000 Binary files a/objects/other/ICEMush2.ish and /dev/null differ diff --git a/objects/other/ICEMush3.ish b/objects/other/ICEMush3.ish deleted file mode 100644 index b4f98302..00000000 Binary files a/objects/other/ICEMush3.ish and /dev/null differ diff --git a/objects/other/ICEMush4.ish b/objects/other/ICEMush4.ish deleted file mode 100644 index 4f8e0c34..00000000 Binary files a/objects/other/ICEMush4.ish and /dev/null differ diff --git a/objects/other/ICEMush5.ish b/objects/other/ICEMush5.ish deleted file mode 100644 index a24d25e1..00000000 Binary files a/objects/other/ICEMush5.ish and /dev/null differ diff --git a/objects/other/ICEMush6.ish b/objects/other/ICEMush6.ish deleted file mode 100644 index 9c79f868..00000000 Binary files a/objects/other/ICEMush6.ish and /dev/null differ diff --git a/objects/other/ICEMush7.ish b/objects/other/ICEMush7.ish deleted file mode 100644 index 5422bebc..00000000 Binary files a/objects/other/ICEMush7.ish and /dev/null differ diff --git a/objects/other/ICEMush8.ish b/objects/other/ICEMush8.ish deleted file mode 100644 index 3d9f239a..00000000 Binary files a/objects/other/ICEMush8.ish and /dev/null differ diff --git a/objects/other/ICEMush9.ish b/objects/other/ICEMush9.ish deleted file mode 100644 index d7fc07d1..00000000 Binary files a/objects/other/ICEMush9.ish and /dev/null differ diff --git a/objects/other/IceSpire1.ish b/objects/other/IceSpire1.ish deleted file mode 100644 index da62a698..00000000 Binary files a/objects/other/IceSpire1.ish and /dev/null differ diff --git a/objects/other/IceSpire2.ish b/objects/other/IceSpire2.ish deleted file mode 100644 index 2edc76be..00000000 Binary files a/objects/other/IceSpire2.ish and /dev/null differ diff --git a/objects/other/IceSpire3.ish b/objects/other/IceSpire3.ish deleted file mode 100644 index 441b65ff..00000000 Binary files a/objects/other/IceSpire3.ish and /dev/null differ diff --git a/objects/other/IceSpire4.ish b/objects/other/IceSpire4.ish deleted file mode 100644 index 655a4f2e..00000000 Binary files a/objects/other/IceSpire4.ish and /dev/null differ diff --git a/objects/other/IceSpire5.ish b/objects/other/IceSpire5.ish deleted file mode 100644 index 6679c2b6..00000000 Binary files a/objects/other/IceSpire5.ish and /dev/null differ diff --git a/objects/other/IceSpire6.ish b/objects/other/IceSpire6.ish deleted file mode 100644 index 2ac3cfc4..00000000 Binary files a/objects/other/IceSpire6.ish and /dev/null differ diff --git a/objects/patch/graveldirt1.iob b/objects/patch/graveldirt1.iob deleted file mode 100644 index aea69e03..00000000 Binary files a/objects/patch/graveldirt1.iob and /dev/null differ diff --git a/objects/patch/graveldirt2.iob b/objects/patch/graveldirt2.iob deleted file mode 100644 index fa413bda..00000000 Binary files a/objects/patch/graveldirt2.iob and /dev/null differ diff --git a/objects/patch/graveldirt3.iob b/objects/patch/graveldirt3.iob deleted file mode 100644 index 0c55caaf..00000000 Binary files a/objects/patch/graveldirt3.iob and /dev/null differ diff --git a/objects/patch/graveldirt4.iob b/objects/patch/graveldirt4.iob deleted file mode 100644 index 85cc80da..00000000 Binary files a/objects/patch/graveldirt4.iob and /dev/null differ diff --git a/objects/peaks/p1.iob b/objects/peaks/p1.iob deleted file mode 100644 index ec9a80d2..00000000 Binary files a/objects/peaks/p1.iob and /dev/null differ diff --git a/objects/peaks/p2.iob b/objects/peaks/p2.iob deleted file mode 100644 index b36abb9b..00000000 Binary files a/objects/peaks/p2.iob and /dev/null differ diff --git a/objects/peaks/p3.iob b/objects/peaks/p3.iob deleted file mode 100644 index dc87514e..00000000 Binary files a/objects/peaks/p3.iob and /dev/null differ diff --git a/objects/peaks/p4.iob b/objects/peaks/p4.iob deleted file mode 100644 index bf4ed700..00000000 Binary files a/objects/peaks/p4.iob and /dev/null differ diff --git a/objects/peaks/p5.iob b/objects/peaks/p5.iob deleted file mode 100644 index ac3b21b4..00000000 Binary files a/objects/peaks/p5.iob and /dev/null differ diff --git a/objects/peaks/p6.iob b/objects/peaks/p6.iob deleted file mode 100644 index 22975d8a..00000000 Binary files a/objects/peaks/p6.iob and /dev/null differ diff --git a/objects/redwood-recluse/large-1.iob b/objects/redwood-recluse/large-1.iob deleted file mode 100644 index a07d267f..00000000 Binary files a/objects/redwood-recluse/large-1.iob and /dev/null differ diff --git a/objects/redwood-recluse/large-10.iob b/objects/redwood-recluse/large-10.iob deleted file mode 100644 index 4cbd9c4e..00000000 Binary files a/objects/redwood-recluse/large-10.iob and /dev/null differ diff --git a/objects/redwood-recluse/large-2.iob b/objects/redwood-recluse/large-2.iob deleted file mode 100644 index 62a59cb3..00000000 Binary files a/objects/redwood-recluse/large-2.iob and /dev/null differ diff --git a/objects/redwood-recluse/large-3.iob b/objects/redwood-recluse/large-3.iob deleted file mode 100644 index 42507285..00000000 Binary files a/objects/redwood-recluse/large-3.iob and /dev/null differ diff --git a/objects/redwood-recluse/large-4.iob b/objects/redwood-recluse/large-4.iob deleted file mode 100644 index 2c66130e..00000000 Binary files a/objects/redwood-recluse/large-4.iob and /dev/null differ diff --git a/objects/redwood-recluse/large-5.iob b/objects/redwood-recluse/large-5.iob deleted file mode 100644 index e876c596..00000000 Binary files a/objects/redwood-recluse/large-5.iob and /dev/null differ diff --git a/objects/redwood-recluse/large-6.iob b/objects/redwood-recluse/large-6.iob deleted file mode 100644 index 5eab5d71..00000000 Binary files a/objects/redwood-recluse/large-6.iob and /dev/null differ diff --git a/objects/redwood-recluse/large-7.iob b/objects/redwood-recluse/large-7.iob deleted file mode 100644 index ba49e773..00000000 Binary files a/objects/redwood-recluse/large-7.iob and /dev/null differ diff --git a/objects/redwood-recluse/large-8.iob b/objects/redwood-recluse/large-8.iob deleted file mode 100644 index acfc2804..00000000 Binary files a/objects/redwood-recluse/large-8.iob and /dev/null differ diff --git a/objects/redwood-recluse/large-9.iob b/objects/redwood-recluse/large-9.iob deleted file mode 100644 index 4b450c27..00000000 Binary files a/objects/redwood-recluse/large-9.iob and /dev/null differ diff --git a/objects/redwood/bush-1.iob b/objects/redwood/bush-1.iob deleted file mode 100644 index 3449aa03..00000000 Binary files a/objects/redwood/bush-1.iob and /dev/null differ diff --git a/objects/redwood/bush-2.iob b/objects/redwood/bush-2.iob deleted file mode 100644 index 6b2ce4d8..00000000 Binary files a/objects/redwood/bush-2.iob and /dev/null differ diff --git a/objects/redwood/rock-1.iob b/objects/redwood/rock-1.iob deleted file mode 100644 index f10bb231..00000000 Binary files a/objects/redwood/rock-1.iob and /dev/null differ diff --git a/objects/redwood/rock-2.iob b/objects/redwood/rock-2.iob deleted file mode 100644 index 184f41cc..00000000 Binary files a/objects/redwood/rock-2.iob and /dev/null differ diff --git a/objects/redwood/small-redwood-1.iob b/objects/redwood/small-redwood-1.iob deleted file mode 100644 index b11d3ed6..00000000 Binary files a/objects/redwood/small-redwood-1.iob and /dev/null differ diff --git a/objects/redwood/small-redwood-2.iob b/objects/redwood/small-redwood-2.iob deleted file mode 100644 index 227b3229..00000000 Binary files a/objects/redwood/small-redwood-2.iob and /dev/null differ diff --git a/objects/redwood/small-redwood-3.iob b/objects/redwood/small-redwood-3.iob deleted file mode 100644 index 92d6fbb1..00000000 Binary files a/objects/redwood/small-redwood-3.iob and /dev/null differ diff --git a/objects/redwood/small-redwood.iob b/objects/redwood/small-redwood.iob deleted file mode 100644 index b22babbb..00000000 Binary files a/objects/redwood/small-redwood.iob and /dev/null differ diff --git a/objects/rocks/r1.iob b/objects/rocks/r1.iob deleted file mode 100644 index 6581fe5d..00000000 Binary files a/objects/rocks/r1.iob and /dev/null differ diff --git a/objects/rocks/r2.iob b/objects/rocks/r2.iob deleted file mode 100644 index d382a9be..00000000 Binary files a/objects/rocks/r2.iob and /dev/null differ diff --git a/objects/rocks/r3.iob b/objects/rocks/r3.iob deleted file mode 100644 index 6df6b4b6..00000000 Binary files a/objects/rocks/r3.iob and /dev/null differ diff --git a/objects/rocks/r4.iob b/objects/rocks/r4.iob deleted file mode 100644 index 05f10255..00000000 Binary files a/objects/rocks/r4.iob and /dev/null differ diff --git a/objects/ruins/ruin1.iob b/objects/ruins/ruin1.iob deleted file mode 100644 index c0aaee68..00000000 Binary files a/objects/ruins/ruin1.iob and /dev/null differ diff --git a/objects/savanna-clutter/SavanaClutter1.iob b/objects/savanna-clutter/SavanaClutter1.iob deleted file mode 100644 index 26e3bd0e..00000000 Binary files a/objects/savanna-clutter/SavanaClutter1.iob and /dev/null differ diff --git a/objects/savanna-clutter/SavanaClutter2.iob b/objects/savanna-clutter/SavanaClutter2.iob deleted file mode 100644 index ad24cc27..00000000 Binary files a/objects/savanna-clutter/SavanaClutter2.iob and /dev/null differ diff --git a/objects/savanna-clutter/SavanaClutter3.iob b/objects/savanna-clutter/SavanaClutter3.iob deleted file mode 100644 index 1ac5b98f..00000000 Binary files a/objects/savanna-clutter/SavanaClutter3.iob and /dev/null differ diff --git a/objects/savanna-clutter/SavanaClutter4.iob b/objects/savanna-clutter/SavanaClutter4.iob deleted file mode 100644 index f5d4e906..00000000 Binary files a/objects/savanna-clutter/SavanaClutter4.iob and /dev/null differ diff --git a/objects/savanna-clutter/SavanaClutter5.iob b/objects/savanna-clutter/SavanaClutter5.iob deleted file mode 100644 index f05a7162..00000000 Binary files a/objects/savanna-clutter/SavanaClutter5.iob and /dev/null differ diff --git a/objects/savanna-clutter/SavanaClutter6.iob b/objects/savanna-clutter/SavanaClutter6.iob deleted file mode 100644 index 190a1027..00000000 Binary files a/objects/savanna-clutter/SavanaClutter6.iob and /dev/null differ diff --git a/objects/savanna-clutter/SavanaClutter7.iob b/objects/savanna-clutter/SavanaClutter7.iob deleted file mode 100644 index dd1feefc..00000000 Binary files a/objects/savanna-clutter/SavanaClutter7.iob and /dev/null differ diff --git a/objects/savanna-clutter/SavanaClutter8.iob b/objects/savanna-clutter/SavanaClutter8.iob deleted file mode 100644 index 9b40d2b5..00000000 Binary files a/objects/savanna-clutter/SavanaClutter8.iob and /dev/null differ diff --git a/objects/savanna-rock/SavanaRock1.iob b/objects/savanna-rock/SavanaRock1.iob deleted file mode 100644 index 8f3a7baf..00000000 Binary files a/objects/savanna-rock/SavanaRock1.iob and /dev/null differ diff --git a/objects/savanna-rock/SavanaRock2.iob b/objects/savanna-rock/SavanaRock2.iob deleted file mode 100644 index d6896c1e..00000000 Binary files a/objects/savanna-rock/SavanaRock2.iob and /dev/null differ diff --git a/objects/savanna-rock/SavanaRock3.iob b/objects/savanna-rock/SavanaRock3.iob deleted file mode 100644 index b31791bf..00000000 Binary files a/objects/savanna-rock/SavanaRock3.iob and /dev/null differ diff --git a/objects/savanna-rock/SavanaRock4.iob b/objects/savanna-rock/SavanaRock4.iob deleted file mode 100644 index cc59b044..00000000 Binary files a/objects/savanna-rock/SavanaRock4.iob and /dev/null differ diff --git a/objects/savanna-rock/SavanaRock5.iob b/objects/savanna-rock/SavanaRock5.iob deleted file mode 100644 index 62724e73..00000000 Binary files a/objects/savanna-rock/SavanaRock5.iob and /dev/null differ diff --git a/objects/savanna-rock/SavanaRock6.iob b/objects/savanna-rock/SavanaRock6.iob deleted file mode 100644 index 65e109bb..00000000 Binary files a/objects/savanna-rock/SavanaRock6.iob and /dev/null differ diff --git a/objects/savanna-rock/SavanaRock7.iob b/objects/savanna-rock/SavanaRock7.iob deleted file mode 100644 index 0153e9fa..00000000 Binary files a/objects/savanna-rock/SavanaRock7.iob and /dev/null differ diff --git a/objects/savanna-rock/SavanaRock8.iob b/objects/savanna-rock/SavanaRock8.iob deleted file mode 100644 index c512878f..00000000 Binary files a/objects/savanna-rock/SavanaRock8.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-alt/ableed1.iob b/objects/serrulata-bleeding-alt/ableed1.iob deleted file mode 100644 index 09c70574..00000000 Binary files a/objects/serrulata-bleeding-alt/ableed1.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-alt/ableed10.iob b/objects/serrulata-bleeding-alt/ableed10.iob deleted file mode 100644 index 9f10d2df..00000000 Binary files a/objects/serrulata-bleeding-alt/ableed10.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-alt/ableed2.iob b/objects/serrulata-bleeding-alt/ableed2.iob deleted file mode 100644 index 872094fc..00000000 Binary files a/objects/serrulata-bleeding-alt/ableed2.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-alt/ableed3.iob b/objects/serrulata-bleeding-alt/ableed3.iob deleted file mode 100644 index 8e2a7ece..00000000 Binary files a/objects/serrulata-bleeding-alt/ableed3.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-alt/ableed4.iob b/objects/serrulata-bleeding-alt/ableed4.iob deleted file mode 100644 index 5caa0f42..00000000 Binary files a/objects/serrulata-bleeding-alt/ableed4.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-alt/ableed5.iob b/objects/serrulata-bleeding-alt/ableed5.iob deleted file mode 100644 index b8317081..00000000 Binary files a/objects/serrulata-bleeding-alt/ableed5.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-alt/ableed6.iob b/objects/serrulata-bleeding-alt/ableed6.iob deleted file mode 100644 index 7dc14d1a..00000000 Binary files a/objects/serrulata-bleeding-alt/ableed6.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-alt/ableed7.iob b/objects/serrulata-bleeding-alt/ableed7.iob deleted file mode 100644 index 1efc24c1..00000000 Binary files a/objects/serrulata-bleeding-alt/ableed7.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-alt/ableed8.iob b/objects/serrulata-bleeding-alt/ableed8.iob deleted file mode 100644 index 57b1caab..00000000 Binary files a/objects/serrulata-bleeding-alt/ableed8.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-alt/ableed9.iob b/objects/serrulata-bleeding-alt/ableed9.iob deleted file mode 100644 index 79183ef5..00000000 Binary files a/objects/serrulata-bleeding-alt/ableed9.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-large/T-bleed1.iob b/objects/serrulata-bleeding-large/T-bleed1.iob deleted file mode 100644 index 76667f8f..00000000 Binary files a/objects/serrulata-bleeding-large/T-bleed1.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-large/T-bleed2.iob b/objects/serrulata-bleeding-large/T-bleed2.iob deleted file mode 100644 index d720f69f..00000000 Binary files a/objects/serrulata-bleeding-large/T-bleed2.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-large/T-bleed3.iob b/objects/serrulata-bleeding-large/T-bleed3.iob deleted file mode 100644 index 1fb92dba..00000000 Binary files a/objects/serrulata-bleeding-large/T-bleed3.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-large/T-bleed4.iob b/objects/serrulata-bleeding-large/T-bleed4.iob deleted file mode 100644 index 4832d5fd..00000000 Binary files a/objects/serrulata-bleeding-large/T-bleed4.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-large/T-bleed5.iob b/objects/serrulata-bleeding-large/T-bleed5.iob deleted file mode 100644 index 60798827..00000000 Binary files a/objects/serrulata-bleeding-large/T-bleed5.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-medium/bleed1.iob b/objects/serrulata-bleeding-medium/bleed1.iob deleted file mode 100644 index cd9287c8..00000000 Binary files a/objects/serrulata-bleeding-medium/bleed1.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-medium/bleed10.iob b/objects/serrulata-bleeding-medium/bleed10.iob deleted file mode 100644 index 65c077fa..00000000 Binary files a/objects/serrulata-bleeding-medium/bleed10.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-medium/bleed2.iob b/objects/serrulata-bleeding-medium/bleed2.iob deleted file mode 100644 index 42b7d1cd..00000000 Binary files a/objects/serrulata-bleeding-medium/bleed2.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-medium/bleed3.iob b/objects/serrulata-bleeding-medium/bleed3.iob deleted file mode 100644 index 363b3e5a..00000000 Binary files a/objects/serrulata-bleeding-medium/bleed3.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-medium/bleed4.iob b/objects/serrulata-bleeding-medium/bleed4.iob deleted file mode 100644 index c0ed37c4..00000000 Binary files a/objects/serrulata-bleeding-medium/bleed4.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-medium/bleed5.iob b/objects/serrulata-bleeding-medium/bleed5.iob deleted file mode 100644 index 6997dd69..00000000 Binary files a/objects/serrulata-bleeding-medium/bleed5.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-medium/bleed6.iob b/objects/serrulata-bleeding-medium/bleed6.iob deleted file mode 100644 index 32883786..00000000 Binary files a/objects/serrulata-bleeding-medium/bleed6.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-medium/bleed7.iob b/objects/serrulata-bleeding-medium/bleed7.iob deleted file mode 100644 index f2f718ff..00000000 Binary files a/objects/serrulata-bleeding-medium/bleed7.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-medium/bleed8.iob b/objects/serrulata-bleeding-medium/bleed8.iob deleted file mode 100644 index 35b9fd23..00000000 Binary files a/objects/serrulata-bleeding-medium/bleed8.iob and /dev/null differ diff --git a/objects/serrulata-bleeding-medium/bleed9.iob b/objects/serrulata-bleeding-medium/bleed9.iob deleted file mode 100644 index 3bc336ec..00000000 Binary files a/objects/serrulata-bleeding-medium/bleed9.iob and /dev/null differ diff --git a/objects/serrulata/nb-bleed1.iob b/objects/serrulata/nb-bleed1.iob deleted file mode 100644 index aa6c5752..00000000 Binary files a/objects/serrulata/nb-bleed1.iob and /dev/null differ diff --git a/objects/serrulata/nb-bleed10.iob b/objects/serrulata/nb-bleed10.iob deleted file mode 100644 index 1accc964..00000000 Binary files a/objects/serrulata/nb-bleed10.iob and /dev/null differ diff --git a/objects/serrulata/nb-bleed2.iob b/objects/serrulata/nb-bleed2.iob deleted file mode 100644 index d5e332fa..00000000 Binary files a/objects/serrulata/nb-bleed2.iob and /dev/null differ diff --git a/objects/serrulata/nb-bleed3.iob b/objects/serrulata/nb-bleed3.iob deleted file mode 100644 index 9aced8a9..00000000 Binary files a/objects/serrulata/nb-bleed3.iob and /dev/null differ diff --git a/objects/serrulata/nb-bleed4.iob b/objects/serrulata/nb-bleed4.iob deleted file mode 100644 index 58272f3f..00000000 Binary files a/objects/serrulata/nb-bleed4.iob and /dev/null differ diff --git a/objects/serrulata/nb-bleed5.iob b/objects/serrulata/nb-bleed5.iob deleted file mode 100644 index 73c10e74..00000000 Binary files a/objects/serrulata/nb-bleed5.iob and /dev/null differ diff --git a/objects/serrulata/nb-bleed6.iob b/objects/serrulata/nb-bleed6.iob deleted file mode 100644 index e4e95f74..00000000 Binary files a/objects/serrulata/nb-bleed6.iob and /dev/null differ diff --git a/objects/serrulata/nb-bleed7.iob b/objects/serrulata/nb-bleed7.iob deleted file mode 100644 index 0b0eae8e..00000000 Binary files a/objects/serrulata/nb-bleed7.iob and /dev/null differ diff --git a/objects/serrulata/nb-bleed8.iob b/objects/serrulata/nb-bleed8.iob deleted file mode 100644 index 0bd0f77d..00000000 Binary files a/objects/serrulata/nb-bleed8.iob and /dev/null differ diff --git a/objects/serrulata/nb-bleed9.iob b/objects/serrulata/nb-bleed9.iob deleted file mode 100644 index da40b0b3..00000000 Binary files a/objects/serrulata/nb-bleed9.iob and /dev/null differ diff --git a/objects/shack/wornWorkshop.iob b/objects/shack/wornWorkshop.iob deleted file mode 100644 index 60ff30ea..00000000 Binary files a/objects/shack/wornWorkshop.iob and /dev/null differ diff --git a/objects/ships/gall-1.iob b/objects/ships/gall-1.iob deleted file mode 100644 index 77f0e5c1..00000000 Binary files a/objects/ships/gall-1.iob and /dev/null differ diff --git a/objects/ships/gall-2.iob b/objects/ships/gall-2.iob deleted file mode 100644 index 3fd95b89..00000000 Binary files a/objects/ships/gall-2.iob and /dev/null differ diff --git a/objects/ships/gall-3.iob b/objects/ships/gall-3.iob deleted file mode 100644 index b4b7b92c..00000000 Binary files a/objects/ships/gall-3.iob and /dev/null differ diff --git a/objects/ships/generic-c.iob b/objects/ships/generic-c.iob deleted file mode 100644 index 81b7f7fc..00000000 Binary files a/objects/ships/generic-c.iob and /dev/null differ diff --git a/objects/ships/generic-g.iob b/objects/ships/generic-g.iob deleted file mode 100644 index 656a251a..00000000 Binary files a/objects/ships/generic-g.iob and /dev/null differ diff --git a/objects/ships/generic-r.iob b/objects/ships/generic-r.iob deleted file mode 100644 index 52a0c603..00000000 Binary files a/objects/ships/generic-r.iob and /dev/null differ diff --git a/objects/ships/generic-u.iob b/objects/ships/generic-u.iob deleted file mode 100644 index d94bb0bf..00000000 Binary files a/objects/ships/generic-u.iob and /dev/null differ diff --git a/objects/ships/generic-w.iob b/objects/ships/generic-w.iob deleted file mode 100644 index 9721493a..00000000 Binary files a/objects/ships/generic-w.iob and /dev/null differ diff --git a/objects/ships/generic.iob b/objects/ships/generic.iob deleted file mode 100644 index 519d42f6..00000000 Binary files a/objects/ships/generic.iob and /dev/null differ diff --git a/objects/ships/ship-1.iob b/objects/ships/ship-1.iob deleted file mode 100644 index c3ca45a7..00000000 Binary files a/objects/ships/ship-1.iob and /dev/null differ diff --git a/objects/ships/ship-2.iob b/objects/ships/ship-2.iob deleted file mode 100644 index 91457d6b..00000000 Binary files a/objects/ships/ship-2.iob and /dev/null differ diff --git a/objects/ships/swreck-1.iob b/objects/ships/swreck-1.iob deleted file mode 100644 index 5a69ef01..00000000 Binary files a/objects/ships/swreck-1.iob and /dev/null differ diff --git a/objects/ships/usd-ship-1.iob b/objects/ships/usd-ship-1.iob deleted file mode 100644 index 60621872..00000000 Binary files a/objects/ships/usd-ship-1.iob and /dev/null differ diff --git a/objects/ships/usd-ship-2.iob b/objects/ships/usd-ship-2.iob deleted file mode 100644 index e9962267..00000000 Binary files a/objects/ships/usd-ship-2.iob and /dev/null differ diff --git a/objects/shipwreck/rightsideup-backhalf-degraded.iob b/objects/shipwreck/rightsideup-backhalf-degraded.iob deleted file mode 100644 index 166d6ad7..00000000 Binary files a/objects/shipwreck/rightsideup-backhalf-degraded.iob and /dev/null differ diff --git a/objects/shipwreck/rightsideup-backhalf.iob b/objects/shipwreck/rightsideup-backhalf.iob deleted file mode 100644 index 3d8f0696..00000000 Binary files a/objects/shipwreck/rightsideup-backhalf.iob and /dev/null differ diff --git a/objects/shipwreck/rightsideup-fronthalf-degraded.iob b/objects/shipwreck/rightsideup-fronthalf-degraded.iob deleted file mode 100644 index c42f7e1e..00000000 Binary files a/objects/shipwreck/rightsideup-fronthalf-degraded.iob and /dev/null differ diff --git a/objects/shipwreck/rightsideup-fronthalf.iob b/objects/shipwreck/rightsideup-fronthalf.iob deleted file mode 100644 index 759fe3f3..00000000 Binary files a/objects/shipwreck/rightsideup-fronthalf.iob and /dev/null differ diff --git a/objects/shipwreck/rightsideup-full-degraded.iob b/objects/shipwreck/rightsideup-full-degraded.iob deleted file mode 100644 index e8e9e15a..00000000 Binary files a/objects/shipwreck/rightsideup-full-degraded.iob and /dev/null differ diff --git a/objects/shipwreck/rightsideup-full.iob b/objects/shipwreck/rightsideup-full.iob deleted file mode 100644 index da0933ab..00000000 Binary files a/objects/shipwreck/rightsideup-full.iob and /dev/null differ diff --git a/objects/shipwreck/sideways-backhalf-degraded.iob b/objects/shipwreck/sideways-backhalf-degraded.iob deleted file mode 100644 index c90d90e0..00000000 Binary files a/objects/shipwreck/sideways-backhalf-degraded.iob and /dev/null differ diff --git a/objects/shipwreck/sideways-backhalf.iob b/objects/shipwreck/sideways-backhalf.iob deleted file mode 100644 index 700d593b..00000000 Binary files a/objects/shipwreck/sideways-backhalf.iob and /dev/null differ diff --git a/objects/shipwreck/sideways-fronthalf-degraded.iob b/objects/shipwreck/sideways-fronthalf-degraded.iob deleted file mode 100644 index 45e13897..00000000 Binary files a/objects/shipwreck/sideways-fronthalf-degraded.iob and /dev/null differ diff --git a/objects/shipwreck/sideways-fronthalf.iob b/objects/shipwreck/sideways-fronthalf.iob deleted file mode 100644 index 25d62d14..00000000 Binary files a/objects/shipwreck/sideways-fronthalf.iob and /dev/null differ diff --git a/objects/shipwreck/sideways-full-degraded.iob b/objects/shipwreck/sideways-full-degraded.iob deleted file mode 100644 index 10c620a3..00000000 Binary files a/objects/shipwreck/sideways-full-degraded.iob and /dev/null differ diff --git a/objects/shipwreck/sideways-full.iob b/objects/shipwreck/sideways-full.iob deleted file mode 100644 index 4243abfb..00000000 Binary files a/objects/shipwreck/sideways-full.iob and /dev/null differ diff --git a/objects/shipwreck/upsidedown-backhalf-degraded.iob b/objects/shipwreck/upsidedown-backhalf-degraded.iob deleted file mode 100644 index 82129eee..00000000 Binary files a/objects/shipwreck/upsidedown-backhalf-degraded.iob and /dev/null differ diff --git a/objects/shipwreck/upsidedown-backhalf.iob b/objects/shipwreck/upsidedown-backhalf.iob deleted file mode 100644 index fe53ff4f..00000000 Binary files a/objects/shipwreck/upsidedown-backhalf.iob and /dev/null differ diff --git a/objects/shipwreck/upsidedown-fronthalf-degraded.iob b/objects/shipwreck/upsidedown-fronthalf-degraded.iob deleted file mode 100644 index f13e80c9..00000000 Binary files a/objects/shipwreck/upsidedown-fronthalf-degraded.iob and /dev/null differ diff --git a/objects/shipwreck/upsidedown-fronthalf.iob b/objects/shipwreck/upsidedown-fronthalf.iob deleted file mode 100644 index e82ba277..00000000 Binary files a/objects/shipwreck/upsidedown-fronthalf.iob and /dev/null differ diff --git a/objects/shipwreck/upsidedown-full-degraded.iob b/objects/shipwreck/upsidedown-full-degraded.iob deleted file mode 100644 index ee093e9b..00000000 Binary files a/objects/shipwreck/upsidedown-full-degraded.iob and /dev/null differ diff --git a/objects/shipwreck/upsidedown-full.iob b/objects/shipwreck/upsidedown-full.iob deleted file mode 100644 index 2f7ce26c..00000000 Binary files a/objects/shipwreck/upsidedown-full.iob and /dev/null differ diff --git a/objects/shipwreck/with-mast-degraded.iob b/objects/shipwreck/with-mast-degraded.iob deleted file mode 100644 index 3c85e7bb..00000000 Binary files a/objects/shipwreck/with-mast-degraded.iob and /dev/null differ diff --git a/objects/shipwreck/with-mast.iob b/objects/shipwreck/with-mast.iob deleted file mode 100644 index 1d724d93..00000000 Binary files a/objects/shipwreck/with-mast.iob and /dev/null differ diff --git a/objects/shrub/shrub1.iob b/objects/shrub/shrub1.iob deleted file mode 100644 index 27884ded..00000000 Binary files a/objects/shrub/shrub1.iob and /dev/null differ diff --git a/objects/shrub/shrub2.iob b/objects/shrub/shrub2.iob deleted file mode 100644 index d385312b..00000000 Binary files a/objects/shrub/shrub2.iob and /dev/null differ diff --git a/objects/shrub/shrub3.iob b/objects/shrub/shrub3.iob deleted file mode 100644 index 49f14a20..00000000 Binary files a/objects/shrub/shrub3.iob and /dev/null differ diff --git a/objects/skulls/giant-skull.iob b/objects/skulls/giant-skull.iob deleted file mode 100644 index 7ed4342f..00000000 Binary files a/objects/skulls/giant-skull.iob and /dev/null differ diff --git a/objects/sm-tree/oakw-oakl-160.iob b/objects/sm-tree/oakw-oakl-160.iob deleted file mode 100644 index bb65b0b9..00000000 Binary files a/objects/sm-tree/oakw-oakl-160.iob and /dev/null differ diff --git a/objects/sm-tree/oakw-oakl-80.iob b/objects/sm-tree/oakw-oakl-80.iob deleted file mode 100644 index 94edcee1..00000000 Binary files a/objects/sm-tree/oakw-oakl-80.iob and /dev/null differ diff --git a/objects/sm-tree/oakw-oakl.iob b/objects/sm-tree/oakw-oakl.iob deleted file mode 100644 index 3d15febd..00000000 Binary files a/objects/sm-tree/oakw-oakl.iob and /dev/null differ diff --git a/objects/spire-ice-medium/IceSpire4.iob b/objects/spire-ice-medium/IceSpire4.iob deleted file mode 100644 index f7b21fea..00000000 Binary files a/objects/spire-ice-medium/IceSpire4.iob and /dev/null differ diff --git a/objects/spire-ice-medium/IceSpire5.iob b/objects/spire-ice-medium/IceSpire5.iob deleted file mode 100644 index dc60ca06..00000000 Binary files a/objects/spire-ice-medium/IceSpire5.iob and /dev/null differ diff --git a/objects/spire-ice-medium/IceSpire6.iob b/objects/spire-ice-medium/IceSpire6.iob deleted file mode 100644 index 0e5fe105..00000000 Binary files a/objects/spire-ice-medium/IceSpire6.iob and /dev/null differ diff --git a/objects/spire-ice-small/IceSpire1.iob b/objects/spire-ice-small/IceSpire1.iob deleted file mode 100644 index 1c38e911..00000000 Binary files a/objects/spire-ice-small/IceSpire1.iob and /dev/null differ diff --git a/objects/spire-ice-small/IceSpire2.iob b/objects/spire-ice-small/IceSpire2.iob deleted file mode 100644 index 0a41b82c..00000000 Binary files a/objects/spire-ice-small/IceSpire2.iob and /dev/null differ diff --git a/objects/spire-ice-small/IceSpire3.iob b/objects/spire-ice-small/IceSpire3.iob deleted file mode 100644 index 06ee6ccb..00000000 Binary files a/objects/spire-ice-small/IceSpire3.iob and /dev/null differ diff --git a/objects/spire-magma/MagmaSpire1.iob b/objects/spire-magma/MagmaSpire1.iob deleted file mode 100644 index 1c38e911..00000000 Binary files a/objects/spire-magma/MagmaSpire1.iob and /dev/null differ diff --git a/objects/spire-magma/MagmaSpire2.iob b/objects/spire-magma/MagmaSpire2.iob deleted file mode 100644 index 0a41b82c..00000000 Binary files a/objects/spire-magma/MagmaSpire2.iob and /dev/null differ diff --git a/objects/spire-magma/MagmaSpire3.iob b/objects/spire-magma/MagmaSpire3.iob deleted file mode 100644 index 06ee6ccb..00000000 Binary files a/objects/spire-magma/MagmaSpire3.iob and /dev/null differ diff --git a/objects/statue/sub-stat-1.iob b/objects/statue/sub-stat-1.iob deleted file mode 100644 index f1c98ef2..00000000 Binary files a/objects/statue/sub-stat-1.iob and /dev/null differ diff --git a/objects/statue/sub-stat-2.iob b/objects/statue/sub-stat-2.iob deleted file mode 100644 index 65a4a5d0..00000000 Binary files a/objects/statue/sub-stat-2.iob and /dev/null differ diff --git a/objects/statue/sub-stat-3.iob b/objects/statue/sub-stat-3.iob deleted file mode 100644 index 425c920c..00000000 Binary files a/objects/statue/sub-stat-3.iob and /dev/null differ diff --git a/objects/statue/sub-stat-4.iob b/objects/statue/sub-stat-4.iob deleted file mode 100644 index c0f03b3f..00000000 Binary files a/objects/statue/sub-stat-4.iob and /dev/null differ diff --git a/objects/statue/sub-stat-5.iob b/objects/statue/sub-stat-5.iob deleted file mode 100644 index 4a2967c1..00000000 Binary files a/objects/statue/sub-stat-5.iob and /dev/null differ diff --git a/objects/stone-clutt/obelisk-1.iob b/objects/stone-clutt/obelisk-1.iob deleted file mode 100644 index 6c7634dc..00000000 Binary files a/objects/stone-clutt/obelisk-1.iob and /dev/null differ diff --git a/objects/stone-clutt/obelisk-2.iob b/objects/stone-clutt/obelisk-2.iob deleted file mode 100644 index c76965d3..00000000 Binary files a/objects/stone-clutt/obelisk-2.iob and /dev/null differ diff --git a/objects/stone-clutt/obelisk-3.iob b/objects/stone-clutt/obelisk-3.iob deleted file mode 100644 index 66826251..00000000 Binary files a/objects/stone-clutt/obelisk-3.iob and /dev/null differ diff --git a/objects/stone-clutt/obelisk-4.iob b/objects/stone-clutt/obelisk-4.iob deleted file mode 100644 index 2ac99d73..00000000 Binary files a/objects/stone-clutt/obelisk-4.iob and /dev/null differ diff --git a/objects/stone-clutt/obelisk-5.iob b/objects/stone-clutt/obelisk-5.iob deleted file mode 100644 index 570c14d6..00000000 Binary files a/objects/stone-clutt/obelisk-5.iob and /dev/null differ diff --git a/objects/stone-clutt/obelisk-6.iob b/objects/stone-clutt/obelisk-6.iob deleted file mode 100644 index 133ee092..00000000 Binary files a/objects/stone-clutt/obelisk-6.iob and /dev/null differ diff --git a/objects/stone-clutt/obelisk-7.iob b/objects/stone-clutt/obelisk-7.iob deleted file mode 100644 index 03fad75c..00000000 Binary files a/objects/stone-clutt/obelisk-7.iob and /dev/null differ diff --git a/objects/stone-clutt/stone-spike-1.iob b/objects/stone-clutt/stone-spike-1.iob deleted file mode 100644 index ace7fec4..00000000 Binary files a/objects/stone-clutt/stone-spike-1.iob and /dev/null differ diff --git a/objects/stone-clutt/stone-spike-2.iob b/objects/stone-clutt/stone-spike-2.iob deleted file mode 100644 index b9a56472..00000000 Binary files a/objects/stone-clutt/stone-spike-2.iob and /dev/null differ diff --git a/objects/stone-clutt/stone-spike-3.iob b/objects/stone-clutt/stone-spike-3.iob deleted file mode 100644 index c1cf3feb..00000000 Binary files a/objects/stone-clutt/stone-spike-3.iob and /dev/null differ diff --git a/objects/stone-clutt/stone-spike-4.iob b/objects/stone-clutt/stone-spike-4.iob deleted file mode 100644 index 48b446f4..00000000 Binary files a/objects/stone-clutt/stone-spike-4.iob and /dev/null differ diff --git a/objects/stone-clutt/stone-spike-5.iob b/objects/stone-clutt/stone-spike-5.iob deleted file mode 100644 index c512745d..00000000 Binary files a/objects/stone-clutt/stone-spike-5.iob and /dev/null differ diff --git a/objects/stone-clutt/stone-spike-6.iob b/objects/stone-clutt/stone-spike-6.iob deleted file mode 100644 index 1106edc5..00000000 Binary files a/objects/stone-clutt/stone-spike-6.iob and /dev/null differ diff --git a/objects/stone-clutt/stone-spike-7.iob b/objects/stone-clutt/stone-spike-7.iob deleted file mode 100644 index 7d232d58..00000000 Binary files a/objects/stone-clutt/stone-spike-7.iob and /dev/null differ diff --git a/objects/stone-clutt/stone-spike-8.iob b/objects/stone-clutt/stone-spike-8.iob deleted file mode 100644 index 8f33b48b..00000000 Binary files a/objects/stone-clutt/stone-spike-8.iob and /dev/null differ diff --git a/objects/zzz/BarcoPirataGriffer.iob b/objects/structures/BarcoPirataGriffer.iob similarity index 100% rename from objects/zzz/BarcoPirataGriffer.iob rename to objects/structures/BarcoPirataGriffer.iob diff --git a/objects/zzz/FT_1.iob b/objects/structures/FT_1.iob similarity index 100% rename from objects/zzz/FT_1.iob rename to objects/structures/FT_1.iob diff --git a/objects/desert/hut.iob b/objects/structures/hut.iob similarity index 100% rename from objects/desert/hut.iob rename to objects/structures/hut.iob diff --git a/objects/house-rustic/rustic4.iob b/objects/structures/rustic4.iob similarity index 100% rename from objects/house-rustic/rustic4.iob rename to objects/structures/rustic4.iob diff --git a/objects/snowy/snowulder.iob b/objects/structures/snowulder.iob similarity index 100% rename from objects/snowy/snowulder.iob rename to objects/structures/snowulder.iob diff --git a/objects/desert/tower-twin.iob b/objects/structures/tower-twin.iob similarity index 100% rename from objects/desert/tower-twin.iob rename to objects/structures/tower-twin.iob diff --git a/objects/desert/tower.iob b/objects/structures/tower.iob similarity index 100% rename from objects/desert/tower.iob rename to objects/structures/tower.iob diff --git a/objects/stump-dark/stump3.iob b/objects/stump-dark/stump3.iob deleted file mode 100644 index b3aeead2..00000000 Binary files a/objects/stump-dark/stump3.iob and /dev/null differ diff --git a/objects/stump/grave-1.iob b/objects/stump/grave-1.iob deleted file mode 100644 index ba7c1185..00000000 Binary files a/objects/stump/grave-1.iob and /dev/null differ diff --git a/objects/stump/stump1.iob b/objects/stump/stump1.iob deleted file mode 100644 index 0ebe709a..00000000 Binary files a/objects/stump/stump1.iob and /dev/null differ diff --git a/objects/stump/stump2.iob b/objects/stump/stump2.iob deleted file mode 100644 index 11426d20..00000000 Binary files a/objects/stump/stump2.iob and /dev/null differ diff --git a/objects/stump/stump3.iob b/objects/stump/stump3.iob deleted file mode 100644 index 1e1be6cd..00000000 Binary files a/objects/stump/stump3.iob and /dev/null differ diff --git a/objects/stump/stump4.iob b/objects/stump/stump4.iob deleted file mode 100644 index a4978c0e..00000000 Binary files a/objects/stump/stump4.iob and /dev/null differ diff --git a/objects/stump/stump5.iob b/objects/stump/stump5.iob deleted file mode 100644 index c77a9b20..00000000 Binary files a/objects/stump/stump5.iob and /dev/null differ diff --git a/objects/stump/stump6.iob b/objects/stump/stump6.iob deleted file mode 100644 index c06f5a85..00000000 Binary files a/objects/stump/stump6.iob and /dev/null differ diff --git a/objects/tentacle-cold/TentacleCold1.iob b/objects/tentacle-cold/TentacleCold1.iob deleted file mode 100644 index 7134cb34..00000000 Binary files a/objects/tentacle-cold/TentacleCold1.iob and /dev/null differ diff --git a/objects/tentacle-cold/TentacleCold2.iob b/objects/tentacle-cold/TentacleCold2.iob deleted file mode 100644 index 75d1325f..00000000 Binary files a/objects/tentacle-cold/TentacleCold2.iob and /dev/null differ diff --git a/objects/tentacle-cold/TentacleCold3.iob b/objects/tentacle-cold/TentacleCold3.iob deleted file mode 100644 index 1da6d344..00000000 Binary files a/objects/tentacle-cold/TentacleCold3.iob and /dev/null differ diff --git a/objects/tentacle-cold/TentacleCold4.iob b/objects/tentacle-cold/TentacleCold4.iob deleted file mode 100644 index 9732becd..00000000 Binary files a/objects/tentacle-cold/TentacleCold4.iob and /dev/null differ diff --git a/objects/tentacle-cold/TentacleCold5.iob b/objects/tentacle-cold/TentacleCold5.iob deleted file mode 100644 index 5ec6cfff..00000000 Binary files a/objects/tentacle-cold/TentacleCold5.iob and /dev/null differ diff --git a/objects/tentacle-cold/TentacleCold6.iob b/objects/tentacle-cold/TentacleCold6.iob deleted file mode 100644 index 2ce9afad..00000000 Binary files a/objects/tentacle-cold/TentacleCold6.iob and /dev/null differ diff --git a/objects/tentacle-cold/TentacleCold7.iob b/objects/tentacle-cold/TentacleCold7.iob deleted file mode 100644 index a8fe1583..00000000 Binary files a/objects/tentacle-cold/TentacleCold7.iob and /dev/null differ diff --git a/objects/tentacle-cold/TentacleCold8.iob b/objects/tentacle-cold/TentacleCold8.iob deleted file mode 100644 index 5b4e7a19..00000000 Binary files a/objects/tentacle-cold/TentacleCold8.iob and /dev/null differ diff --git a/objects/tentacle-darkwood/TentacleDarkWood3.iob b/objects/tentacle-darkwood/TentacleDarkWood3.iob deleted file mode 100644 index 467e7e3e..00000000 Binary files a/objects/tentacle-darkwood/TentacleDarkWood3.iob and /dev/null differ diff --git a/objects/tentacle-darkwood/TentacleDarkWood6.iob b/objects/tentacle-darkwood/TentacleDarkWood6.iob deleted file mode 100644 index d158fae8..00000000 Binary files a/objects/tentacle-darkwood/TentacleDarkWood6.iob and /dev/null differ diff --git a/objects/tentacle-darkwood/TentacleDarkWood8.iob b/objects/tentacle-darkwood/TentacleDarkWood8.iob deleted file mode 100644 index ad9a86fa..00000000 Binary files a/objects/tentacle-darkwood/TentacleDarkWood8.iob and /dev/null differ diff --git a/objects/tentacle-fire/TentacleFire1.iob b/objects/tentacle-fire/TentacleFire1.iob deleted file mode 100644 index 98776b4e..00000000 Binary files a/objects/tentacle-fire/TentacleFire1.iob and /dev/null differ diff --git a/objects/tentacle-fire/TentacleFire2.iob b/objects/tentacle-fire/TentacleFire2.iob deleted file mode 100644 index 78f2d1ad..00000000 Binary files a/objects/tentacle-fire/TentacleFire2.iob and /dev/null differ diff --git a/objects/tentacle-fire/TentacleFire3.iob b/objects/tentacle-fire/TentacleFire3.iob deleted file mode 100644 index b3d5a8cb..00000000 Binary files a/objects/tentacle-fire/TentacleFire3.iob and /dev/null differ diff --git a/objects/tentacle-fire/TentacleFire4.iob b/objects/tentacle-fire/TentacleFire4.iob deleted file mode 100644 index 7b099286..00000000 Binary files a/objects/tentacle-fire/TentacleFire4.iob and /dev/null differ diff --git a/objects/tentacle-fire/TentacleFire5.iob b/objects/tentacle-fire/TentacleFire5.iob deleted file mode 100644 index 2b566cfb..00000000 Binary files a/objects/tentacle-fire/TentacleFire5.iob and /dev/null differ diff --git a/objects/tentacle-fire/TentacleFire6.iob b/objects/tentacle-fire/TentacleFire6.iob deleted file mode 100644 index ca165c74..00000000 Binary files a/objects/tentacle-fire/TentacleFire6.iob and /dev/null differ diff --git a/objects/tentacle-fire/TentacleFire7.iob b/objects/tentacle-fire/TentacleFire7.iob deleted file mode 100644 index 98982dca..00000000 Binary files a/objects/tentacle-fire/TentacleFire7.iob and /dev/null differ diff --git a/objects/tentacle-fire/TentacleFire8.iob b/objects/tentacle-fire/TentacleFire8.iob deleted file mode 100644 index 3abef0f5..00000000 Binary files a/objects/tentacle-fire/TentacleFire8.iob and /dev/null differ diff --git a/objects/tentacle-oak/TentacleOak1.iob b/objects/tentacle-oak/TentacleOak1.iob deleted file mode 100644 index 739481cc..00000000 Binary files a/objects/tentacle-oak/TentacleOak1.iob and /dev/null differ diff --git a/objects/tentacle-oak/TentacleOak2.iob b/objects/tentacle-oak/TentacleOak2.iob deleted file mode 100644 index 4f495c4b..00000000 Binary files a/objects/tentacle-oak/TentacleOak2.iob and /dev/null differ diff --git a/objects/tentacle-oak/TentacleOak3.iob b/objects/tentacle-oak/TentacleOak3.iob deleted file mode 100644 index 3f6d2afa..00000000 Binary files a/objects/tentacle-oak/TentacleOak3.iob and /dev/null differ diff --git a/objects/tentacle-oak/TentacleOak4.iob b/objects/tentacle-oak/TentacleOak4.iob deleted file mode 100644 index 30bb5003..00000000 Binary files a/objects/tentacle-oak/TentacleOak4.iob and /dev/null differ diff --git a/objects/tentacle-oak/TentacleOak5.iob b/objects/tentacle-oak/TentacleOak5.iob deleted file mode 100644 index 1f52d2dd..00000000 Binary files a/objects/tentacle-oak/TentacleOak5.iob and /dev/null differ diff --git a/objects/tentacle-oak/TentacleOak6.iob b/objects/tentacle-oak/TentacleOak6.iob deleted file mode 100644 index 30342af0..00000000 Binary files a/objects/tentacle-oak/TentacleOak6.iob and /dev/null differ diff --git a/objects/tentacle-oak/TentacleOak7.iob b/objects/tentacle-oak/TentacleOak7.iob deleted file mode 100644 index 9dedc281..00000000 Binary files a/objects/tentacle-oak/TentacleOak7.iob and /dev/null differ diff --git a/objects/tentacle-oak/TentacleOak8.iob b/objects/tentacle-oak/TentacleOak8.iob deleted file mode 100644 index d72fca6e..00000000 Binary files a/objects/tentacle-oak/TentacleOak8.iob and /dev/null differ diff --git a/objects/tentacle-slime/TentacleSlimy1.iob b/objects/tentacle-slime/TentacleSlimy1.iob deleted file mode 100644 index c82bcfd7..00000000 Binary files a/objects/tentacle-slime/TentacleSlimy1.iob and /dev/null differ diff --git a/objects/tentacle-slime/TentacleSlimy2.iob b/objects/tentacle-slime/TentacleSlimy2.iob deleted file mode 100644 index 080169e6..00000000 Binary files a/objects/tentacle-slime/TentacleSlimy2.iob and /dev/null differ diff --git a/objects/tentacle-slime/TentacleSlimy3.iob b/objects/tentacle-slime/TentacleSlimy3.iob deleted file mode 100644 index 480838fc..00000000 Binary files a/objects/tentacle-slime/TentacleSlimy3.iob and /dev/null differ diff --git a/objects/tentacle-slime/TentacleSlimy4.iob b/objects/tentacle-slime/TentacleSlimy4.iob deleted file mode 100644 index 8176f05e..00000000 Binary files a/objects/tentacle-slime/TentacleSlimy4.iob and /dev/null differ diff --git a/objects/tentacle-slime/TentacleSlimy5.iob b/objects/tentacle-slime/TentacleSlimy5.iob deleted file mode 100644 index aff922fe..00000000 Binary files a/objects/tentacle-slime/TentacleSlimy5.iob and /dev/null differ diff --git a/objects/tentacle-slime/TentacleSlimy7.iob b/objects/tentacle-slime/TentacleSlimy7.iob deleted file mode 100644 index 0812387b..00000000 Binary files a/objects/tentacle-slime/TentacleSlimy7.iob and /dev/null differ diff --git a/objects/tentacle-slime/TentacleSlimy8.iob b/objects/tentacle-slime/TentacleSlimy8.iob deleted file mode 100644 index 51a300c4..00000000 Binary files a/objects/tentacle-slime/TentacleSlimy8.iob and /dev/null differ diff --git a/objects/tourmaline-large/purp1.iob b/objects/tourmaline-large/purp1.iob deleted file mode 100644 index efd69f72..00000000 Binary files a/objects/tourmaline-large/purp1.iob and /dev/null differ diff --git a/objects/tourmaline-large/purp10.iob b/objects/tourmaline-large/purp10.iob deleted file mode 100644 index 7dc6cacc..00000000 Binary files a/objects/tourmaline-large/purp10.iob and /dev/null differ diff --git a/objects/tourmaline-large/purp2.iob b/objects/tourmaline-large/purp2.iob deleted file mode 100644 index 2870e338..00000000 Binary files a/objects/tourmaline-large/purp2.iob and /dev/null differ diff --git a/objects/tourmaline-large/purp3.iob b/objects/tourmaline-large/purp3.iob deleted file mode 100644 index 0df05700..00000000 Binary files a/objects/tourmaline-large/purp3.iob and /dev/null differ diff --git a/objects/tourmaline-large/purp4.iob b/objects/tourmaline-large/purp4.iob deleted file mode 100644 index a008fcf3..00000000 Binary files a/objects/tourmaline-large/purp4.iob and /dev/null differ diff --git a/objects/tourmaline-large/purp5.iob b/objects/tourmaline-large/purp5.iob deleted file mode 100644 index 64076eb4..00000000 Binary files a/objects/tourmaline-large/purp5.iob and /dev/null differ diff --git a/objects/tourmaline-large/purp6.iob b/objects/tourmaline-large/purp6.iob deleted file mode 100644 index 15dd137c..00000000 Binary files a/objects/tourmaline-large/purp6.iob and /dev/null differ diff --git a/objects/tourmaline-large/purp7.iob b/objects/tourmaline-large/purp7.iob deleted file mode 100644 index 87a299a3..00000000 Binary files a/objects/tourmaline-large/purp7.iob and /dev/null differ diff --git a/objects/tourmaline-large/purp8.iob b/objects/tourmaline-large/purp8.iob deleted file mode 100644 index 3a6cc870..00000000 Binary files a/objects/tourmaline-large/purp8.iob and /dev/null differ diff --git a/objects/tourmaline-large/purp9.iob b/objects/tourmaline-large/purp9.iob deleted file mode 100644 index e624a03e..00000000 Binary files a/objects/tourmaline-large/purp9.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Lpurp1.iob b/objects/tourmaline-medium/Lpurp1.iob deleted file mode 100644 index 6bd86e68..00000000 Binary files a/objects/tourmaline-medium/Lpurp1.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Lpurp10.iob b/objects/tourmaline-medium/Lpurp10.iob deleted file mode 100644 index 5913774d..00000000 Binary files a/objects/tourmaline-medium/Lpurp10.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Lpurp2.iob b/objects/tourmaline-medium/Lpurp2.iob deleted file mode 100644 index c76dd94c..00000000 Binary files a/objects/tourmaline-medium/Lpurp2.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Lpurp3.iob b/objects/tourmaline-medium/Lpurp3.iob deleted file mode 100644 index c50f3f5d..00000000 Binary files a/objects/tourmaline-medium/Lpurp3.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Lpurp4.iob b/objects/tourmaline-medium/Lpurp4.iob deleted file mode 100644 index ef4dedeb..00000000 Binary files a/objects/tourmaline-medium/Lpurp4.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Lpurp5.iob b/objects/tourmaline-medium/Lpurp5.iob deleted file mode 100644 index d09a43af..00000000 Binary files a/objects/tourmaline-medium/Lpurp5.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Lpurp6.iob b/objects/tourmaline-medium/Lpurp6.iob deleted file mode 100644 index 08f2b417..00000000 Binary files a/objects/tourmaline-medium/Lpurp6.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Lpurp7.iob b/objects/tourmaline-medium/Lpurp7.iob deleted file mode 100644 index 3e664ecc..00000000 Binary files a/objects/tourmaline-medium/Lpurp7.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Lpurp8.iob b/objects/tourmaline-medium/Lpurp8.iob deleted file mode 100644 index dbae7d41..00000000 Binary files a/objects/tourmaline-medium/Lpurp8.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Lpurp9.iob b/objects/tourmaline-medium/Lpurp9.iob deleted file mode 100644 index 4ceac9b0..00000000 Binary files a/objects/tourmaline-medium/Lpurp9.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Spurp1.iob b/objects/tourmaline-medium/Spurp1.iob deleted file mode 100644 index 48ed0650..00000000 Binary files a/objects/tourmaline-medium/Spurp1.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Spurp10.iob b/objects/tourmaline-medium/Spurp10.iob deleted file mode 100644 index 2d7de875..00000000 Binary files a/objects/tourmaline-medium/Spurp10.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Spurp2.iob b/objects/tourmaline-medium/Spurp2.iob deleted file mode 100644 index 34d7a3b9..00000000 Binary files a/objects/tourmaline-medium/Spurp2.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Spurp3.iob b/objects/tourmaline-medium/Spurp3.iob deleted file mode 100644 index 9adeea7c..00000000 Binary files a/objects/tourmaline-medium/Spurp3.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Spurp4.iob b/objects/tourmaline-medium/Spurp4.iob deleted file mode 100644 index f3ce396b..00000000 Binary files a/objects/tourmaline-medium/Spurp4.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Spurp5.iob b/objects/tourmaline-medium/Spurp5.iob deleted file mode 100644 index 6a6503c7..00000000 Binary files a/objects/tourmaline-medium/Spurp5.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Spurp6.iob b/objects/tourmaline-medium/Spurp6.iob deleted file mode 100644 index c50c8ec1..00000000 Binary files a/objects/tourmaline-medium/Spurp6.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Spurp7.iob b/objects/tourmaline-medium/Spurp7.iob deleted file mode 100644 index d5cc7451..00000000 Binary files a/objects/tourmaline-medium/Spurp7.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Spurp8.iob b/objects/tourmaline-medium/Spurp8.iob deleted file mode 100644 index e4e12696..00000000 Binary files a/objects/tourmaline-medium/Spurp8.iob and /dev/null differ diff --git a/objects/tourmaline-medium/Spurp9.iob b/objects/tourmaline-medium/Spurp9.iob deleted file mode 100644 index 4a9c0401..00000000 Binary files a/objects/tourmaline-medium/Spurp9.iob and /dev/null differ diff --git a/objects/tourmaline-prob/prob1.iob b/objects/tourmaline-prob/prob1.iob deleted file mode 100644 index 766f9f75..00000000 Binary files a/objects/tourmaline-prob/prob1.iob and /dev/null differ diff --git a/objects/tourmaline-prob/prob2.iob b/objects/tourmaline-prob/prob2.iob deleted file mode 100644 index 9f0804dd..00000000 Binary files a/objects/tourmaline-prob/prob2.iob and /dev/null differ diff --git a/objects/acacia-medium/acacia-denmyre-1.iob b/objects/trees/acacia/denmyre1.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-1.iob rename to objects/trees/acacia/denmyre1.iob diff --git a/objects/acacia-medium/acacia-denmyre-3.iob b/objects/trees/acacia/denmyre10.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-3.iob rename to objects/trees/acacia/denmyre10.iob diff --git a/objects/acacia-medium/acacia-denmyre-4.iob b/objects/trees/acacia/denmyre11.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-4.iob rename to objects/trees/acacia/denmyre11.iob diff --git a/objects/acacia-medium/acacia-denmyre-5.iob b/objects/trees/acacia/denmyre12.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-5.iob rename to objects/trees/acacia/denmyre12.iob diff --git a/objects/acacia-medium/acacia-denmyre-6.iob b/objects/trees/acacia/denmyre13.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-6.iob rename to objects/trees/acacia/denmyre13.iob diff --git a/objects/acacia-medium/acacia-denmyre-7.iob b/objects/trees/acacia/denmyre14.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-7.iob rename to objects/trees/acacia/denmyre14.iob diff --git a/objects/acacia-medium/acacia-denmyre-8.iob b/objects/trees/acacia/denmyre15.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-8.iob rename to objects/trees/acacia/denmyre15.iob diff --git a/objects/acacia-medium/acacia-denmyre-9.iob b/objects/trees/acacia/denmyre16.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-9.iob rename to objects/trees/acacia/denmyre16.iob diff --git a/objects/acacia-medium/acacia-denmyre-10.iob b/objects/trees/acacia/denmyre2.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-10.iob rename to objects/trees/acacia/denmyre2.iob diff --git a/objects/acacia-medium/acacia-denmyre-11.iob b/objects/trees/acacia/denmyre3.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-11.iob rename to objects/trees/acacia/denmyre3.iob diff --git a/objects/acacia-medium/acacia-denmyre-12.iob b/objects/trees/acacia/denmyre4.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-12.iob rename to objects/trees/acacia/denmyre4.iob diff --git a/objects/acacia-medium/acacia-denmyre-13.iob b/objects/trees/acacia/denmyre5.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-13.iob rename to objects/trees/acacia/denmyre5.iob diff --git a/objects/acacia-medium/acacia-denmyre-14.iob b/objects/trees/acacia/denmyre6.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-14.iob rename to objects/trees/acacia/denmyre6.iob diff --git a/objects/acacia-medium/acacia-denmyre-15.iob b/objects/trees/acacia/denmyre7.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-15.iob rename to objects/trees/acacia/denmyre7.iob diff --git a/objects/acacia-medium/acacia-denmyre-16.iob b/objects/trees/acacia/denmyre8.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-16.iob rename to objects/trees/acacia/denmyre8.iob diff --git a/objects/acacia-medium/acacia-denmyre-2.iob b/objects/trees/acacia/denmyre9.iob similarity index 100% rename from objects/acacia-medium/acacia-denmyre-2.iob rename to objects/trees/acacia/denmyre9.iob diff --git a/objects/savanna/SavanaTree1.iob b/objects/trees/acacia/savana1.iob similarity index 100% rename from objects/savanna/SavanaTree1.iob rename to objects/trees/acacia/savana1.iob diff --git a/objects/savanna/SavanaTree2.iob b/objects/trees/acacia/savana2.iob similarity index 100% rename from objects/savanna/SavanaTree2.iob rename to objects/trees/acacia/savana2.iob diff --git a/objects/savanna/SavanaTree3.iob b/objects/trees/acacia/savana3.iob similarity index 100% rename from objects/savanna/SavanaTree3.iob rename to objects/trees/acacia/savana3.iob diff --git a/objects/savanna/SavanaTree4.iob b/objects/trees/acacia/savana4.iob similarity index 100% rename from objects/savanna/SavanaTree4.iob rename to objects/trees/acacia/savana4.iob diff --git a/objects/savanna/SavanaTree5.iob b/objects/trees/acacia/savana5.iob similarity index 100% rename from objects/savanna/SavanaTree5.iob rename to objects/trees/acacia/savana5.iob diff --git a/objects/savanna-gen/savannaD-1.iob b/objects/trees/acacia/savannaD1.iob similarity index 100% rename from objects/savanna-gen/savannaD-1.iob rename to objects/trees/acacia/savannaD1.iob diff --git a/objects/savanna-gen/savannaD-2.iob b/objects/trees/acacia/savannaD2.iob similarity index 100% rename from objects/savanna-gen/savannaD-2.iob rename to objects/trees/acacia/savannaD2.iob diff --git a/objects/savanna-gen/savannaD-3.iob b/objects/trees/acacia/savannaD3.iob similarity index 100% rename from objects/savanna-gen/savannaD-3.iob rename to objects/trees/acacia/savannaD3.iob diff --git a/objects/savanna-gen/savannaF-1.iob b/objects/trees/acacia/savannaF1.iob similarity index 100% rename from objects/savanna-gen/savannaF-1.iob rename to objects/trees/acacia/savannaF1.iob diff --git a/objects/savanna-gen/savannaF-10.iob b/objects/trees/acacia/savannaF10.iob similarity index 100% rename from objects/savanna-gen/savannaF-10.iob rename to objects/trees/acacia/savannaF10.iob diff --git a/objects/savanna-gen/savannaF-11.iob b/objects/trees/acacia/savannaF11.iob similarity index 100% rename from objects/savanna-gen/savannaF-11.iob rename to objects/trees/acacia/savannaF11.iob diff --git a/objects/savanna-gen/savannaF-13.iob b/objects/trees/acacia/savannaF13.iob similarity index 100% rename from objects/savanna-gen/savannaF-13.iob rename to objects/trees/acacia/savannaF13.iob diff --git a/objects/savanna-gen/savannaF-14.iob b/objects/trees/acacia/savannaF14.iob similarity index 100% rename from objects/savanna-gen/savannaF-14.iob rename to objects/trees/acacia/savannaF14.iob diff --git a/objects/savanna-gen/savannaF-15.iob b/objects/trees/acacia/savannaF15.iob similarity index 100% rename from objects/savanna-gen/savannaF-15.iob rename to objects/trees/acacia/savannaF15.iob diff --git a/objects/savanna-gen/savannaF-16.iob b/objects/trees/acacia/savannaF16.iob similarity index 100% rename from objects/savanna-gen/savannaF-16.iob rename to objects/trees/acacia/savannaF16.iob diff --git a/objects/savanna-gen/savannaF-17.iob b/objects/trees/acacia/savannaF17.iob similarity index 100% rename from objects/savanna-gen/savannaF-17.iob rename to objects/trees/acacia/savannaF17.iob diff --git a/objects/savanna-gen/savannaF-2.iob b/objects/trees/acacia/savannaF2.iob similarity index 100% rename from objects/savanna-gen/savannaF-2.iob rename to objects/trees/acacia/savannaF2.iob diff --git a/objects/savanna-gen/savannaF-3.iob b/objects/trees/acacia/savannaF3.iob similarity index 100% rename from objects/savanna-gen/savannaF-3.iob rename to objects/trees/acacia/savannaF3.iob diff --git a/objects/savanna-gen/savannaF-4.iob b/objects/trees/acacia/savannaF4.iob similarity index 100% rename from objects/savanna-gen/savannaF-4.iob rename to objects/trees/acacia/savannaF4.iob diff --git a/objects/savanna-gen/savannaF-5.iob b/objects/trees/acacia/savannaF5.iob similarity index 100% rename from objects/savanna-gen/savannaF-5.iob rename to objects/trees/acacia/savannaF5.iob diff --git a/objects/savanna-gen/savannaF-6.iob b/objects/trees/acacia/savannaF6.iob similarity index 100% rename from objects/savanna-gen/savannaF-6.iob rename to objects/trees/acacia/savannaF6.iob diff --git a/objects/savanna-gen/savannaF-7.iob b/objects/trees/acacia/savannaF7.iob similarity index 100% rename from objects/savanna-gen/savannaF-7.iob rename to objects/trees/acacia/savannaF7.iob diff --git a/objects/savanna-gen/savannaF-8.iob b/objects/trees/acacia/savannaF8.iob similarity index 100% rename from objects/savanna-gen/savannaF-8.iob rename to objects/trees/acacia/savannaF8.iob diff --git a/objects/savanna-gen/savannaF-9.iob b/objects/trees/acacia/savannaF9.iob similarity index 100% rename from objects/savanna-gen/savannaF-9.iob rename to objects/trees/acacia/savannaF9.iob diff --git a/objects/savanna-gen/savannaS-1.iob b/objects/trees/acacia/savannaS1.iob similarity index 100% rename from objects/savanna-gen/savannaS-1.iob rename to objects/trees/acacia/savannaS1.iob diff --git a/objects/savanna-gen/savannaS-2.iob b/objects/trees/acacia/savannaS2.iob similarity index 100% rename from objects/savanna-gen/savannaS-2.iob rename to objects/trees/acacia/savannaS2.iob diff --git a/objects/savanna-gen/savannaS-3.iob b/objects/trees/acacia/savannaS3.iob similarity index 100% rename from objects/savanna-gen/savannaS-3.iob rename to objects/trees/acacia/savannaS3.iob diff --git a/objects/savanna-gen/savannaS-4.iob b/objects/trees/acacia/savannaS4.iob similarity index 100% rename from objects/savanna-gen/savannaS-4.iob rename to objects/trees/acacia/savannaS4.iob diff --git a/objects/savanna-gen/savannaS-5.iob b/objects/trees/acacia/savannaS5.iob similarity index 100% rename from objects/savanna-gen/savannaS-5.iob rename to objects/trees/acacia/savannaS5.iob diff --git a/objects/savanna-gen/savannaS-6.iob b/objects/trees/acacia/savannaS6.iob similarity index 100% rename from objects/savanna-gen/savannaS-6.iob rename to objects/trees/acacia/savannaS6.iob diff --git a/objects/savanna-gen/savannaS-7.iob b/objects/trees/acacia/savannaS7.iob similarity index 100% rename from objects/savanna-gen/savannaS-7.iob rename to objects/trees/acacia/savannaS7.iob diff --git a/objects/savanna-gen/savannaS-8.iob b/objects/trees/acacia/savannaS8.iob similarity index 100% rename from objects/savanna-gen/savannaS-8.iob rename to objects/trees/acacia/savannaS8.iob diff --git a/objects/savanna-gen/savannas-10.iob b/objects/trees/acacia/savannas10.iob similarity index 100% rename from objects/savanna-gen/savannas-10.iob rename to objects/trees/acacia/savannas10.iob diff --git a/objects/savanna-gen/savannas-11.iob b/objects/trees/acacia/savannas11.iob similarity index 100% rename from objects/savanna-gen/savannas-11.iob rename to objects/trees/acacia/savannas11.iob diff --git a/objects/savanna-gen/savannas-12.iob b/objects/trees/acacia/savannas12.iob similarity index 100% rename from objects/savanna-gen/savannas-12.iob rename to objects/trees/acacia/savannas12.iob diff --git a/objects/savanna-gen/savannas-9.iob b/objects/trees/acacia/savannas9.iob similarity index 100% rename from objects/savanna-gen/savannas-9.iob rename to objects/trees/acacia/savannas9.iob diff --git a/objects/savanna-small/SavanaNimble1.iob b/objects/trees/acacia/thin1.iob similarity index 100% rename from objects/savanna-small/SavanaNimble1.iob rename to objects/trees/acacia/thin1.iob diff --git a/objects/savanna-small/SavanaNimble10.iob b/objects/trees/acacia/thin10.iob similarity index 100% rename from objects/savanna-small/SavanaNimble10.iob rename to objects/trees/acacia/thin10.iob diff --git a/objects/savanna-small/SavanaNimble11.iob b/objects/trees/acacia/thin11.iob similarity index 100% rename from objects/savanna-small/SavanaNimble11.iob rename to objects/trees/acacia/thin11.iob diff --git a/objects/savanna-small/SavanaNimble12.iob b/objects/trees/acacia/thin12.iob similarity index 100% rename from objects/savanna-small/SavanaNimble12.iob rename to objects/trees/acacia/thin12.iob diff --git a/objects/savanna-small/SavanaNimble13.iob b/objects/trees/acacia/thin13.iob similarity index 100% rename from objects/savanna-small/SavanaNimble13.iob rename to objects/trees/acacia/thin13.iob diff --git a/objects/savanna-small/SavanaNimble14.iob b/objects/trees/acacia/thin14.iob similarity index 100% rename from objects/savanna-small/SavanaNimble14.iob rename to objects/trees/acacia/thin14.iob diff --git a/objects/savanna-small/SavanaNimble15.iob b/objects/trees/acacia/thin15.iob similarity index 100% rename from objects/savanna-small/SavanaNimble15.iob rename to objects/trees/acacia/thin15.iob diff --git a/objects/savanna-small/SavanaNimble16.iob b/objects/trees/acacia/thin16.iob similarity index 100% rename from objects/savanna-small/SavanaNimble16.iob rename to objects/trees/acacia/thin16.iob diff --git a/objects/savanna-small/SavanaNimble2.iob b/objects/trees/acacia/thin2.iob similarity index 100% rename from objects/savanna-small/SavanaNimble2.iob rename to objects/trees/acacia/thin2.iob diff --git a/objects/savanna-small/SavanaNimble3.iob b/objects/trees/acacia/thin3.iob similarity index 100% rename from objects/savanna-small/SavanaNimble3.iob rename to objects/trees/acacia/thin3.iob diff --git a/objects/savanna-small/SavanaNimble4.iob b/objects/trees/acacia/thin4.iob similarity index 100% rename from objects/savanna-small/SavanaNimble4.iob rename to objects/trees/acacia/thin4.iob diff --git a/objects/savanna-small/SavanaNimble5.iob b/objects/trees/acacia/thin5.iob similarity index 100% rename from objects/savanna-small/SavanaNimble5.iob rename to objects/trees/acacia/thin5.iob diff --git a/objects/savanna-small/SavanaNimble6.iob b/objects/trees/acacia/thin6.iob similarity index 100% rename from objects/savanna-small/SavanaNimble6.iob rename to objects/trees/acacia/thin6.iob diff --git a/objects/savanna-small/SavanaNimble7.iob b/objects/trees/acacia/thin7.iob similarity index 100% rename from objects/savanna-small/SavanaNimble7.iob rename to objects/trees/acacia/thin7.iob diff --git a/objects/savanna-small/SavanaNimble8.iob b/objects/trees/acacia/thin8.iob similarity index 100% rename from objects/savanna-small/SavanaNimble8.iob rename to objects/trees/acacia/thin8.iob diff --git a/objects/savanna-small/SavanaNimble9.iob b/objects/trees/acacia/thin9.iob similarity index 100% rename from objects/savanna-small/SavanaNimble9.iob rename to objects/trees/acacia/thin9.iob diff --git a/objects/tree/acacia/1.iob b/objects/trees/acacia/vexed1.iob similarity index 100% rename from objects/tree/acacia/1.iob rename to objects/trees/acacia/vexed1.iob diff --git a/objects/tree/acacia/2.iob b/objects/trees/acacia/vexed2.iob similarity index 100% rename from objects/tree/acacia/2.iob rename to objects/trees/acacia/vexed2.iob diff --git a/objects/tree/acacia/3.iob b/objects/trees/acacia/vexed3.iob similarity index 100% rename from objects/tree/acacia/3.iob rename to objects/trees/acacia/vexed3.iob diff --git a/objects/birch-antioch/antioch-1.iob b/objects/trees/birch/antioch1.iob similarity index 100% rename from objects/birch-antioch/antioch-1.iob rename to objects/trees/birch/antioch1.iob diff --git a/objects/birch-antioch/antioch-10.iob b/objects/trees/birch/antioch10.iob similarity index 100% rename from objects/birch-antioch/antioch-10.iob rename to objects/trees/birch/antioch10.iob diff --git a/objects/birch-antioch/antioch-11.iob b/objects/trees/birch/antioch11.iob similarity index 100% rename from objects/birch-antioch/antioch-11.iob rename to objects/trees/birch/antioch11.iob diff --git a/objects/birch-antioch/antioch-12.iob b/objects/trees/birch/antioch12.iob similarity index 100% rename from objects/birch-antioch/antioch-12.iob rename to objects/trees/birch/antioch12.iob diff --git a/objects/birch-antioch/antioch-13.iob b/objects/trees/birch/antioch13.iob similarity index 100% rename from objects/birch-antioch/antioch-13.iob rename to objects/trees/birch/antioch13.iob diff --git a/objects/birch-antioch/antioch-2.iob b/objects/trees/birch/antioch2.iob similarity index 100% rename from objects/birch-antioch/antioch-2.iob rename to objects/trees/birch/antioch2.iob diff --git a/objects/birch-antioch/antioch-3.iob b/objects/trees/birch/antioch3.iob similarity index 100% rename from objects/birch-antioch/antioch-3.iob rename to objects/trees/birch/antioch3.iob diff --git a/objects/birch-antioch/antioch-3-b.iob b/objects/trees/birch/antioch3b.iob similarity index 100% rename from objects/birch-antioch/antioch-3-b.iob rename to objects/trees/birch/antioch3b.iob diff --git a/objects/birch-antioch/antioch-4.iob b/objects/trees/birch/antioch4.iob similarity index 100% rename from objects/birch-antioch/antioch-4.iob rename to objects/trees/birch/antioch4.iob diff --git a/objects/birch-antioch/antioch-4-b.iob b/objects/trees/birch/antioch4b.iob similarity index 100% rename from objects/birch-antioch/antioch-4-b.iob rename to objects/trees/birch/antioch4b.iob diff --git a/objects/birch-antioch/antioch-5.iob b/objects/trees/birch/antioch5.iob similarity index 100% rename from objects/birch-antioch/antioch-5.iob rename to objects/trees/birch/antioch5.iob diff --git a/objects/birch-antioch/antioch-5-b.iob b/objects/trees/birch/antioch5b.iob similarity index 100% rename from objects/birch-antioch/antioch-5-b.iob rename to objects/trees/birch/antioch5b.iob diff --git a/objects/birch-antioch/antioch-6.iob b/objects/trees/birch/antioch6.iob similarity index 100% rename from objects/birch-antioch/antioch-6.iob rename to objects/trees/birch/antioch6.iob diff --git a/objects/birch-antioch/antioch-6-b.iob b/objects/trees/birch/antioch6b.iob similarity index 100% rename from objects/birch-antioch/antioch-6-b.iob rename to objects/trees/birch/antioch6b.iob diff --git a/objects/birch-antioch/antioch-7.iob b/objects/trees/birch/antioch7.iob similarity index 100% rename from objects/birch-antioch/antioch-7.iob rename to objects/trees/birch/antioch7.iob diff --git a/objects/birch-antioch/antioch-8.iob b/objects/trees/birch/antioch8.iob similarity index 100% rename from objects/birch-antioch/antioch-8.iob rename to objects/trees/birch/antioch8.iob diff --git a/objects/birch-antioch/antioch-9.iob b/objects/trees/birch/antioch9.iob similarity index 100% rename from objects/birch-antioch/antioch-9.iob rename to objects/trees/birch/antioch9.iob diff --git a/objects/arid-birch/arid-birch1.iob b/objects/trees/birch/arid1.iob similarity index 100% rename from objects/arid-birch/arid-birch1.iob rename to objects/trees/birch/arid1.iob diff --git a/objects/arid-birch/arid-birch2.iob b/objects/trees/birch/arid2.iob similarity index 100% rename from objects/arid-birch/arid-birch2.iob rename to objects/trees/birch/arid2.iob diff --git a/objects/arid-birch/arid-birch3.iob b/objects/trees/birch/arid3.iob similarity index 100% rename from objects/arid-birch/arid-birch3.iob rename to objects/trees/birch/arid3.iob diff --git a/objects/arid-birch/arid-birch4.iob b/objects/trees/birch/arid4.iob similarity index 100% rename from objects/arid-birch/arid-birch4.iob rename to objects/trees/birch/arid4.iob diff --git a/objects/arid-birch/arid-birch5.iob b/objects/trees/birch/arid5.iob similarity index 100% rename from objects/arid-birch/arid-birch5.iob rename to objects/trees/birch/arid5.iob diff --git a/objects/arid-birch/arid-birch6.iob b/objects/trees/birch/arid6.iob similarity index 100% rename from objects/arid-birch/arid-birch6.iob rename to objects/trees/birch/arid6.iob diff --git a/objects/arid-birch/arid-birch7.iob b/objects/trees/birch/arid7.iob similarity index 100% rename from objects/arid-birch/arid-birch7.iob rename to objects/trees/birch/arid7.iob diff --git a/objects/birch-medium/birch-denmyre-1.iob b/objects/trees/birch/denmyre1.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-1.iob rename to objects/trees/birch/denmyre1.iob diff --git a/objects/birch-medium/birch-denmyre-3.iob b/objects/trees/birch/denmyre10.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-3.iob rename to objects/trees/birch/denmyre10.iob diff --git a/objects/birch-medium/birch-denmyre-4.iob b/objects/trees/birch/denmyre11.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-4.iob rename to objects/trees/birch/denmyre11.iob diff --git a/objects/birch-medium/birch-denmyre-5.iob b/objects/trees/birch/denmyre12.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-5.iob rename to objects/trees/birch/denmyre12.iob diff --git a/objects/birch-medium/birch-denmyre-6.iob b/objects/trees/birch/denmyre13.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-6.iob rename to objects/trees/birch/denmyre13.iob diff --git a/objects/birch-medium/birch-denmyre-7.iob b/objects/trees/birch/denmyre14.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-7.iob rename to objects/trees/birch/denmyre14.iob diff --git a/objects/birch-medium/birch-denmyre-8.iob b/objects/trees/birch/denmyre15.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-8.iob rename to objects/trees/birch/denmyre15.iob diff --git a/objects/birch-medium/birch-denmyre-9.iob b/objects/trees/birch/denmyre16.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-9.iob rename to objects/trees/birch/denmyre16.iob diff --git a/objects/birch-medium/birch-denmyre-10.iob b/objects/trees/birch/denmyre2.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-10.iob rename to objects/trees/birch/denmyre2.iob diff --git a/objects/birch-medium/birch-denmyre-11.iob b/objects/trees/birch/denmyre3.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-11.iob rename to objects/trees/birch/denmyre3.iob diff --git a/objects/birch-medium/birch-denmyre-12.iob b/objects/trees/birch/denmyre4.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-12.iob rename to objects/trees/birch/denmyre4.iob diff --git a/objects/birch-medium/birch-denmyre-13.iob b/objects/trees/birch/denmyre5.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-13.iob rename to objects/trees/birch/denmyre5.iob diff --git a/objects/birch-medium/birch-denmyre-14.iob b/objects/trees/birch/denmyre6.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-14.iob rename to objects/trees/birch/denmyre6.iob diff --git a/objects/birch-medium/birch-denmyre-15.iob b/objects/trees/birch/denmyre7.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-15.iob rename to objects/trees/birch/denmyre7.iob diff --git a/objects/birch-medium/birch-denmyre-16.iob b/objects/trees/birch/denmyre8.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-16.iob rename to objects/trees/birch/denmyre8.iob diff --git a/objects/birch-medium/birch-denmyre-2.iob b/objects/trees/birch/denmyre9.iob similarity index 100% rename from objects/birch-medium/birch-denmyre-2.iob rename to objects/trees/birch/denmyre9.iob diff --git a/objects/birch-remade/b1.iob b/objects/trees/birch/forest1.iob similarity index 100% rename from objects/birch-remade/b1.iob rename to objects/trees/birch/forest1.iob diff --git a/objects/birch-remade/b2.iob b/objects/trees/birch/forest2.iob similarity index 100% rename from objects/birch-remade/b2.iob rename to objects/trees/birch/forest2.iob diff --git a/objects/birch-remade/b3.iob b/objects/trees/birch/forest3.iob similarity index 100% rename from objects/birch-remade/b3.iob rename to objects/trees/birch/forest3.iob diff --git a/objects/birch-remade/b4.iob b/objects/trees/birch/forest4.iob similarity index 100% rename from objects/birch-remade/b4.iob rename to objects/trees/birch/forest4.iob diff --git a/objects/birch/birch1.iob b/objects/trees/birch/generic1.iob similarity index 100% rename from objects/birch/birch1.iob rename to objects/trees/birch/generic1.iob diff --git a/objects/birch-sespire/birch-2.iob b/objects/trees/birch/generic10.iob similarity index 100% rename from objects/birch-sespire/birch-2.iob rename to objects/trees/birch/generic10.iob diff --git a/objects/birch-sespire/birch-3.iob b/objects/trees/birch/generic11.iob similarity index 100% rename from objects/birch-sespire/birch-3.iob rename to objects/trees/birch/generic11.iob diff --git a/objects/birch-sespire/birch-4.iob b/objects/trees/birch/generic12.iob similarity index 100% rename from objects/birch-sespire/birch-4.iob rename to objects/trees/birch/generic12.iob diff --git a/objects/birch-sespire/birch-5.iob b/objects/trees/birch/generic13.iob similarity index 100% rename from objects/birch-sespire/birch-5.iob rename to objects/trees/birch/generic13.iob diff --git a/objects/birch-sespire/birch-6.iob b/objects/trees/birch/generic14.iob similarity index 100% rename from objects/birch-sespire/birch-6.iob rename to objects/trees/birch/generic14.iob diff --git a/objects/birch-sespire/birch-7.iob b/objects/trees/birch/generic15.iob similarity index 100% rename from objects/birch-sespire/birch-7.iob rename to objects/trees/birch/generic15.iob diff --git a/objects/birch-sespire/birch-8.iob b/objects/trees/birch/generic16.iob similarity index 100% rename from objects/birch-sespire/birch-8.iob rename to objects/trees/birch/generic16.iob diff --git a/objects/birch-small/birch1.iob b/objects/trees/birch/generic17.iob similarity index 100% rename from objects/birch-small/birch1.iob rename to objects/trees/birch/generic17.iob diff --git a/objects/birch-small/birch4.iob b/objects/trees/birch/generic18.iob similarity index 100% rename from objects/birch-small/birch4.iob rename to objects/trees/birch/generic18.iob diff --git a/objects/birch-small/birch5.iob b/objects/trees/birch/generic19.iob similarity index 100% rename from objects/birch-small/birch5.iob rename to objects/trees/birch/generic19.iob diff --git a/objects/birch/birch2.iob b/objects/trees/birch/generic2.iob similarity index 100% rename from objects/birch/birch2.iob rename to objects/trees/birch/generic2.iob diff --git a/objects/birch-small/birch6.iob b/objects/trees/birch/generic20.iob similarity index 100% rename from objects/birch-small/birch6.iob rename to objects/trees/birch/generic20.iob diff --git a/objects/birch-small/birch7.iob b/objects/trees/birch/generic21.iob similarity index 100% rename from objects/birch-small/birch7.iob rename to objects/trees/birch/generic21.iob diff --git a/objects/birch-small/birch8.iob b/objects/trees/birch/generic22.iob similarity index 100% rename from objects/birch-small/birch8.iob rename to objects/trees/birch/generic22.iob diff --git a/objects/birch-small/birch9.iob b/objects/trees/birch/generic23.iob similarity index 100% rename from objects/birch-small/birch9.iob rename to objects/trees/birch/generic23.iob diff --git a/objects/birch-small/birch10.iob b/objects/trees/birch/generic24.iob similarity index 100% rename from objects/birch-small/birch10.iob rename to objects/trees/birch/generic24.iob diff --git a/objects/birch-small/birch11.iob b/objects/trees/birch/generic25.iob similarity index 100% rename from objects/birch-small/birch11.iob rename to objects/trees/birch/generic25.iob diff --git a/objects/birch-small/birch12.iob b/objects/trees/birch/generic26.iob similarity index 100% rename from objects/birch-small/birch12.iob rename to objects/trees/birch/generic26.iob diff --git a/objects/birch-small/birch13.iob b/objects/trees/birch/generic27.iob similarity index 100% rename from objects/birch-small/birch13.iob rename to objects/trees/birch/generic27.iob diff --git a/objects/birch-small/birch14.iob b/objects/trees/birch/generic28.iob similarity index 100% rename from objects/birch-small/birch14.iob rename to objects/trees/birch/generic28.iob diff --git a/objects/birch-small/birch15.iob b/objects/trees/birch/generic29.iob similarity index 100% rename from objects/birch-small/birch15.iob rename to objects/trees/birch/generic29.iob diff --git a/objects/birch/birch3.iob b/objects/trees/birch/generic3.iob similarity index 100% rename from objects/birch/birch3.iob rename to objects/trees/birch/generic3.iob diff --git a/objects/birch-small/birch2.iob b/objects/trees/birch/generic30.iob similarity index 100% rename from objects/birch-small/birch2.iob rename to objects/trees/birch/generic30.iob diff --git a/objects/birch-small/birch3.iob b/objects/trees/birch/generic31.iob similarity index 100% rename from objects/birch-small/birch3.iob rename to objects/trees/birch/generic31.iob diff --git a/objects/birch/birch4.iob b/objects/trees/birch/generic4.iob similarity index 100% rename from objects/birch/birch4.iob rename to objects/trees/birch/generic4.iob diff --git a/objects/birch/birch5.iob b/objects/trees/birch/generic5.iob similarity index 100% rename from objects/birch/birch5.iob rename to objects/trees/birch/generic5.iob diff --git a/objects/birch/birch6.iob b/objects/trees/birch/generic6.iob similarity index 100% rename from objects/birch/birch6.iob rename to objects/trees/birch/generic6.iob diff --git a/objects/birch/birch7.iob b/objects/trees/birch/generic7.iob similarity index 100% rename from objects/birch/birch7.iob rename to objects/trees/birch/generic7.iob diff --git a/objects/birch/birch8.iob b/objects/trees/birch/generic8.iob similarity index 100% rename from objects/birch/birch8.iob rename to objects/trees/birch/generic8.iob diff --git a/objects/birch-sespire/birch-1.iob b/objects/trees/birch/generic9.iob similarity index 100% rename from objects/birch-sespire/birch-1.iob rename to objects/trees/birch/generic9.iob diff --git a/objects/birch-large/birch1.iob b/objects/trees/birch/largegeneric1.iob similarity index 100% rename from objects/birch-large/birch1.iob rename to objects/trees/birch/largegeneric1.iob diff --git a/objects/birch-large/birch18.iob b/objects/trees/birch/largegeneric10.iob similarity index 100% rename from objects/birch-large/birch18.iob rename to objects/trees/birch/largegeneric10.iob diff --git a/objects/birch-large/birch19.iob b/objects/trees/birch/largegeneric11.iob similarity index 100% rename from objects/birch-large/birch19.iob rename to objects/trees/birch/largegeneric11.iob diff --git a/objects/birch-large/birch2.iob b/objects/trees/birch/largegeneric12.iob similarity index 100% rename from objects/birch-large/birch2.iob rename to objects/trees/birch/largegeneric12.iob diff --git a/objects/birch-large/birch20.iob b/objects/trees/birch/largegeneric13.iob similarity index 100% rename from objects/birch-large/birch20.iob rename to objects/trees/birch/largegeneric13.iob diff --git a/objects/birch-large/birch3.iob b/objects/trees/birch/largegeneric14.iob similarity index 100% rename from objects/birch-large/birch3.iob rename to objects/trees/birch/largegeneric14.iob diff --git a/objects/birch-large/birch4.iob b/objects/trees/birch/largegeneric15.iob similarity index 100% rename from objects/birch-large/birch4.iob rename to objects/trees/birch/largegeneric15.iob diff --git a/objects/birch-large/birch5.iob b/objects/trees/birch/largegeneric16.iob similarity index 100% rename from objects/birch-large/birch5.iob rename to objects/trees/birch/largegeneric16.iob diff --git a/objects/birch-large/birch6.iob b/objects/trees/birch/largegeneric17.iob similarity index 100% rename from objects/birch-large/birch6.iob rename to objects/trees/birch/largegeneric17.iob diff --git a/objects/birch-large/birch7.iob b/objects/trees/birch/largegeneric18.iob similarity index 100% rename from objects/birch-large/birch7.iob rename to objects/trees/birch/largegeneric18.iob diff --git a/objects/birch-large/birch8.iob b/objects/trees/birch/largegeneric19.iob similarity index 100% rename from objects/birch-large/birch8.iob rename to objects/trees/birch/largegeneric19.iob diff --git a/objects/birch-large/birch10.iob b/objects/trees/birch/largegeneric2.iob similarity index 100% rename from objects/birch-large/birch10.iob rename to objects/trees/birch/largegeneric2.iob diff --git a/objects/birch-large/birch9.iob b/objects/trees/birch/largegeneric20.iob similarity index 100% rename from objects/birch-large/birch9.iob rename to objects/trees/birch/largegeneric20.iob diff --git a/objects/birch-large/birch11.iob b/objects/trees/birch/largegeneric3.iob similarity index 100% rename from objects/birch-large/birch11.iob rename to objects/trees/birch/largegeneric3.iob diff --git a/objects/birch-large/birch12.iob b/objects/trees/birch/largegeneric4.iob similarity index 100% rename from objects/birch-large/birch12.iob rename to objects/trees/birch/largegeneric4.iob diff --git a/objects/birch-large/birch13.iob b/objects/trees/birch/largegeneric5.iob similarity index 100% rename from objects/birch-large/birch13.iob rename to objects/trees/birch/largegeneric5.iob diff --git a/objects/birch-large/birch14.iob b/objects/trees/birch/largegeneric6.iob similarity index 100% rename from objects/birch-large/birch14.iob rename to objects/trees/birch/largegeneric6.iob diff --git a/objects/birch-large/birch15.iob b/objects/trees/birch/largegeneric7.iob similarity index 100% rename from objects/birch-large/birch15.iob rename to objects/trees/birch/largegeneric7.iob diff --git a/objects/birch-large/birch16.iob b/objects/trees/birch/largegeneric8.iob similarity index 100% rename from objects/birch-large/birch16.iob rename to objects/trees/birch/largegeneric8.iob diff --git a/objects/birch-large/birch17.iob b/objects/trees/birch/largegeneric9.iob similarity index 100% rename from objects/birch-large/birch17.iob rename to objects/trees/birch/largegeneric9.iob diff --git a/objects/birch-ponderosa/large-1.iob b/objects/trees/birch/largeponderosa1.iob similarity index 100% rename from objects/birch-ponderosa/large-1.iob rename to objects/trees/birch/largeponderosa1.iob diff --git a/objects/birch-ponderosa/large-18.iob b/objects/trees/birch/largeponderosa10.iob similarity index 100% rename from objects/birch-ponderosa/large-18.iob rename to objects/trees/birch/largeponderosa10.iob diff --git a/objects/birch-ponderosa/large-19.iob b/objects/trees/birch/largeponderosa11.iob similarity index 100% rename from objects/birch-ponderosa/large-19.iob rename to objects/trees/birch/largeponderosa11.iob diff --git a/objects/birch-ponderosa/large-2.iob b/objects/trees/birch/largeponderosa12.iob similarity index 100% rename from objects/birch-ponderosa/large-2.iob rename to objects/trees/birch/largeponderosa12.iob diff --git a/objects/birch-ponderosa/large-20.iob b/objects/trees/birch/largeponderosa13.iob similarity index 100% rename from objects/birch-ponderosa/large-20.iob rename to objects/trees/birch/largeponderosa13.iob diff --git a/objects/birch-ponderosa/large-3.iob b/objects/trees/birch/largeponderosa14.iob similarity index 100% rename from objects/birch-ponderosa/large-3.iob rename to objects/trees/birch/largeponderosa14.iob diff --git a/objects/birch-ponderosa/large-4.iob b/objects/trees/birch/largeponderosa15.iob similarity index 100% rename from objects/birch-ponderosa/large-4.iob rename to objects/trees/birch/largeponderosa15.iob diff --git a/objects/birch-ponderosa/large-5.iob b/objects/trees/birch/largeponderosa16.iob similarity index 100% rename from objects/birch-ponderosa/large-5.iob rename to objects/trees/birch/largeponderosa16.iob diff --git a/objects/birch-ponderosa/large-6.iob b/objects/trees/birch/largeponderosa17.iob similarity index 100% rename from objects/birch-ponderosa/large-6.iob rename to objects/trees/birch/largeponderosa17.iob diff --git a/objects/birch-ponderosa/large-7.iob b/objects/trees/birch/largeponderosa18.iob similarity index 100% rename from objects/birch-ponderosa/large-7.iob rename to objects/trees/birch/largeponderosa18.iob diff --git a/objects/birch-ponderosa/large-8.iob b/objects/trees/birch/largeponderosa19.iob similarity index 100% rename from objects/birch-ponderosa/large-8.iob rename to objects/trees/birch/largeponderosa19.iob diff --git a/objects/birch-ponderosa/large-10.iob b/objects/trees/birch/largeponderosa2.iob similarity index 100% rename from objects/birch-ponderosa/large-10.iob rename to objects/trees/birch/largeponderosa2.iob diff --git a/objects/birch-ponderosa/large-9.iob b/objects/trees/birch/largeponderosa20.iob similarity index 100% rename from objects/birch-ponderosa/large-9.iob rename to objects/trees/birch/largeponderosa20.iob diff --git a/objects/birch-ponderosa/large-11.iob b/objects/trees/birch/largeponderosa3.iob similarity index 100% rename from objects/birch-ponderosa/large-11.iob rename to objects/trees/birch/largeponderosa3.iob diff --git a/objects/birch-ponderosa/large-12.iob b/objects/trees/birch/largeponderosa4.iob similarity index 100% rename from objects/birch-ponderosa/large-12.iob rename to objects/trees/birch/largeponderosa4.iob diff --git a/objects/birch-ponderosa/large-13.iob b/objects/trees/birch/largeponderosa5.iob similarity index 100% rename from objects/birch-ponderosa/large-13.iob rename to objects/trees/birch/largeponderosa5.iob diff --git a/objects/birch-ponderosa/large-14.iob b/objects/trees/birch/largeponderosa6.iob similarity index 100% rename from objects/birch-ponderosa/large-14.iob rename to objects/trees/birch/largeponderosa6.iob diff --git a/objects/birch-ponderosa/large-15.iob b/objects/trees/birch/largeponderosa7.iob similarity index 100% rename from objects/birch-ponderosa/large-15.iob rename to objects/trees/birch/largeponderosa7.iob diff --git a/objects/birch-ponderosa/large-16.iob b/objects/trees/birch/largeponderosa8.iob similarity index 100% rename from objects/birch-ponderosa/large-16.iob rename to objects/trees/birch/largeponderosa8.iob diff --git a/objects/birch-ponderosa/large-17.iob b/objects/trees/birch/largeponderosa9.iob similarity index 100% rename from objects/birch-ponderosa/large-17.iob rename to objects/trees/birch/largeponderosa9.iob diff --git a/objects/birch-medium/birch2.iob b/objects/trees/birch/mediumgeneric1.iob similarity index 100% rename from objects/birch-medium/birch2.iob rename to objects/trees/birch/mediumgeneric1.iob diff --git a/objects/birch-medium/birch3.iob b/objects/trees/birch/mediumgeneric2.iob similarity index 100% rename from objects/birch-medium/birch3.iob rename to objects/trees/birch/mediumgeneric2.iob diff --git a/objects/birch-medium/birch4.iob b/objects/trees/birch/mediumgeneric3.iob similarity index 100% rename from objects/birch-medium/birch4.iob rename to objects/trees/birch/mediumgeneric3.iob diff --git a/objects/birch-ponderosa/med-1.iob b/objects/trees/birch/medponderosa1.iob similarity index 100% rename from objects/birch-ponderosa/med-1.iob rename to objects/trees/birch/medponderosa1.iob diff --git a/objects/birch-ponderosa/med-4.iob b/objects/trees/birch/medponderosa10.iob similarity index 100% rename from objects/birch-ponderosa/med-4.iob rename to objects/trees/birch/medponderosa10.iob diff --git a/objects/birch-ponderosa/med-5.iob b/objects/trees/birch/medponderosa11.iob similarity index 100% rename from objects/birch-ponderosa/med-5.iob rename to objects/trees/birch/medponderosa11.iob diff --git a/objects/birch-ponderosa/med-6.iob b/objects/trees/birch/medponderosa12.iob similarity index 100% rename from objects/birch-ponderosa/med-6.iob rename to objects/trees/birch/medponderosa12.iob diff --git a/objects/birch-ponderosa/med-7.iob b/objects/trees/birch/medponderosa13.iob similarity index 100% rename from objects/birch-ponderosa/med-7.iob rename to objects/trees/birch/medponderosa13.iob diff --git a/objects/birch-ponderosa/med-8.iob b/objects/trees/birch/medponderosa14.iob similarity index 100% rename from objects/birch-ponderosa/med-8.iob rename to objects/trees/birch/medponderosa14.iob diff --git a/objects/birch-ponderosa/med-9.iob b/objects/trees/birch/medponderosa15.iob similarity index 100% rename from objects/birch-ponderosa/med-9.iob rename to objects/trees/birch/medponderosa15.iob diff --git a/objects/birch-ponderosa/med-10.iob b/objects/trees/birch/medponderosa2.iob similarity index 100% rename from objects/birch-ponderosa/med-10.iob rename to objects/trees/birch/medponderosa2.iob diff --git a/objects/birch-ponderosa/med-11.iob b/objects/trees/birch/medponderosa3.iob similarity index 100% rename from objects/birch-ponderosa/med-11.iob rename to objects/trees/birch/medponderosa3.iob diff --git a/objects/birch-ponderosa/med-12.iob b/objects/trees/birch/medponderosa4.iob similarity index 100% rename from objects/birch-ponderosa/med-12.iob rename to objects/trees/birch/medponderosa4.iob diff --git a/objects/birch-ponderosa/med-13.iob b/objects/trees/birch/medponderosa5.iob similarity index 100% rename from objects/birch-ponderosa/med-13.iob rename to objects/trees/birch/medponderosa5.iob diff --git a/objects/birch-ponderosa/med-14.iob b/objects/trees/birch/medponderosa6.iob similarity index 100% rename from objects/birch-ponderosa/med-14.iob rename to objects/trees/birch/medponderosa6.iob diff --git a/objects/birch-ponderosa/med-15.iob b/objects/trees/birch/medponderosa7.iob similarity index 100% rename from objects/birch-ponderosa/med-15.iob rename to objects/trees/birch/medponderosa7.iob diff --git a/objects/birch-ponderosa/med-2.iob b/objects/trees/birch/medponderosa8.iob similarity index 100% rename from objects/birch-ponderosa/med-2.iob rename to objects/trees/birch/medponderosa8.iob diff --git a/objects/birch-ponderosa/med-3.iob b/objects/trees/birch/medponderosa9.iob similarity index 100% rename from objects/birch-ponderosa/med-3.iob rename to objects/trees/birch/medponderosa9.iob diff --git a/objects/small-birch/small-birch1.iob b/objects/trees/birch/smallgeneric1.iob similarity index 100% rename from objects/small-birch/small-birch1.iob rename to objects/trees/birch/smallgeneric1.iob diff --git a/objects/small-birch/small-birch8.iob b/objects/trees/birch/smallgeneric10.iob similarity index 100% rename from objects/small-birch/small-birch8.iob rename to objects/trees/birch/smallgeneric10.iob diff --git a/objects/small-birch/small-birch9.iob b/objects/trees/birch/smallgeneric11.iob similarity index 100% rename from objects/small-birch/small-birch9.iob rename to objects/trees/birch/smallgeneric11.iob diff --git a/objects/small-birch/small-birch10.iob b/objects/trees/birch/smallgeneric2.iob similarity index 100% rename from objects/small-birch/small-birch10.iob rename to objects/trees/birch/smallgeneric2.iob diff --git a/objects/small-birch/small-birch11.iob b/objects/trees/birch/smallgeneric3.iob similarity index 100% rename from objects/small-birch/small-birch11.iob rename to objects/trees/birch/smallgeneric3.iob diff --git a/objects/small-birch/small-birch2.iob b/objects/trees/birch/smallgeneric4.iob similarity index 100% rename from objects/small-birch/small-birch2.iob rename to objects/trees/birch/smallgeneric4.iob diff --git a/objects/small-birch/small-birch3.iob b/objects/trees/birch/smallgeneric5.iob similarity index 100% rename from objects/small-birch/small-birch3.iob rename to objects/trees/birch/smallgeneric5.iob diff --git a/objects/small-birch/small-birch4.iob b/objects/trees/birch/smallgeneric6.iob similarity index 100% rename from objects/small-birch/small-birch4.iob rename to objects/trees/birch/smallgeneric6.iob diff --git a/objects/small-birch/small-birch5.iob b/objects/trees/birch/smallgeneric7.iob similarity index 100% rename from objects/small-birch/small-birch5.iob rename to objects/trees/birch/smallgeneric7.iob diff --git a/objects/small-birch/small-birch6.iob b/objects/trees/birch/smallgeneric8.iob similarity index 100% rename from objects/small-birch/small-birch6.iob rename to objects/trees/birch/smallgeneric8.iob diff --git a/objects/small-birch/small-birch7.iob b/objects/trees/birch/smallgeneric9.iob similarity index 100% rename from objects/small-birch/small-birch7.iob rename to objects/trees/birch/smallgeneric9.iob diff --git a/objects/birch-ponderosa/smol-1.iob b/objects/trees/birch/smolponderosa1.iob similarity index 100% rename from objects/birch-ponderosa/smol-1.iob rename to objects/trees/birch/smolponderosa1.iob diff --git a/objects/birch-ponderosa/smol-4.iob b/objects/trees/birch/smolponderosa10.iob similarity index 100% rename from objects/birch-ponderosa/smol-4.iob rename to objects/trees/birch/smolponderosa10.iob diff --git a/objects/birch-ponderosa/smol-5.iob b/objects/trees/birch/smolponderosa11.iob similarity index 100% rename from objects/birch-ponderosa/smol-5.iob rename to objects/trees/birch/smolponderosa11.iob diff --git a/objects/birch-ponderosa/smol-6.iob b/objects/trees/birch/smolponderosa12.iob similarity index 100% rename from objects/birch-ponderosa/smol-6.iob rename to objects/trees/birch/smolponderosa12.iob diff --git a/objects/birch-ponderosa/smol-7.iob b/objects/trees/birch/smolponderosa13.iob similarity index 100% rename from objects/birch-ponderosa/smol-7.iob rename to objects/trees/birch/smolponderosa13.iob diff --git a/objects/birch-ponderosa/smol-8.iob b/objects/trees/birch/smolponderosa14.iob similarity index 100% rename from objects/birch-ponderosa/smol-8.iob rename to objects/trees/birch/smolponderosa14.iob diff --git a/objects/birch-ponderosa/smol-9.iob b/objects/trees/birch/smolponderosa15.iob similarity index 100% rename from objects/birch-ponderosa/smol-9.iob rename to objects/trees/birch/smolponderosa15.iob diff --git a/objects/birch-ponderosa/smol-10.iob b/objects/trees/birch/smolponderosa2.iob similarity index 100% rename from objects/birch-ponderosa/smol-10.iob rename to objects/trees/birch/smolponderosa2.iob diff --git a/objects/birch-ponderosa/smol-11.iob b/objects/trees/birch/smolponderosa3.iob similarity index 100% rename from objects/birch-ponderosa/smol-11.iob rename to objects/trees/birch/smolponderosa3.iob diff --git a/objects/birch-ponderosa/smol-12.iob b/objects/trees/birch/smolponderosa4.iob similarity index 100% rename from objects/birch-ponderosa/smol-12.iob rename to objects/trees/birch/smolponderosa4.iob diff --git a/objects/birch-ponderosa/smol-13.iob b/objects/trees/birch/smolponderosa5.iob similarity index 100% rename from objects/birch-ponderosa/smol-13.iob rename to objects/trees/birch/smolponderosa5.iob diff --git a/objects/birch-ponderosa/smol-14.iob b/objects/trees/birch/smolponderosa6.iob similarity index 100% rename from objects/birch-ponderosa/smol-14.iob rename to objects/trees/birch/smolponderosa6.iob diff --git a/objects/birch-ponderosa/smol-15.iob b/objects/trees/birch/smolponderosa7.iob similarity index 100% rename from objects/birch-ponderosa/smol-15.iob rename to objects/trees/birch/smolponderosa7.iob diff --git a/objects/birch-ponderosa/smol-2.iob b/objects/trees/birch/smolponderosa8.iob similarity index 100% rename from objects/birch-ponderosa/smol-2.iob rename to objects/trees/birch/smolponderosa8.iob diff --git a/objects/birch-ponderosa/smol-3.iob b/objects/trees/birch/smolponderosa9.iob similarity index 100% rename from objects/birch-ponderosa/smol-3.iob rename to objects/trees/birch/smolponderosa9.iob diff --git a/objects/birch-sespire/altbirch-1.iob b/objects/trees/birch/variantforest1.iob similarity index 100% rename from objects/birch-sespire/altbirch-1.iob rename to objects/trees/birch/variantforest1.iob diff --git a/objects/birch-sespire/altbirch-18.iob b/objects/trees/birch/variantforest10.iob similarity index 100% rename from objects/birch-sespire/altbirch-18.iob rename to objects/trees/birch/variantforest10.iob diff --git a/objects/birch-sespire/altbirch-19.iob b/objects/trees/birch/variantforest11.iob similarity index 100% rename from objects/birch-sespire/altbirch-19.iob rename to objects/trees/birch/variantforest11.iob diff --git a/objects/birch-sespire/altbirch-2.iob b/objects/trees/birch/variantforest12.iob similarity index 100% rename from objects/birch-sespire/altbirch-2.iob rename to objects/trees/birch/variantforest12.iob diff --git a/objects/birch-sespire/altbirch-20.iob b/objects/trees/birch/variantforest13.iob similarity index 100% rename from objects/birch-sespire/altbirch-20.iob rename to objects/trees/birch/variantforest13.iob diff --git a/objects/birch-sespire/altbirch-3.iob b/objects/trees/birch/variantforest14.iob similarity index 100% rename from objects/birch-sespire/altbirch-3.iob rename to objects/trees/birch/variantforest14.iob diff --git a/objects/birch-sespire/altbirch-4.iob b/objects/trees/birch/variantforest15.iob similarity index 100% rename from objects/birch-sespire/altbirch-4.iob rename to objects/trees/birch/variantforest15.iob diff --git a/objects/birch-sespire/altbirch-5.iob b/objects/trees/birch/variantforest16.iob similarity index 100% rename from objects/birch-sespire/altbirch-5.iob rename to objects/trees/birch/variantforest16.iob diff --git a/objects/birch-sespire/altbirch-6.iob b/objects/trees/birch/variantforest17.iob similarity index 100% rename from objects/birch-sespire/altbirch-6.iob rename to objects/trees/birch/variantforest17.iob diff --git a/objects/birch-sespire/altbirch-7.iob b/objects/trees/birch/variantforest18.iob similarity index 100% rename from objects/birch-sespire/altbirch-7.iob rename to objects/trees/birch/variantforest18.iob diff --git a/objects/birch-sespire/altbirch-8.iob b/objects/trees/birch/variantforest19.iob similarity index 100% rename from objects/birch-sespire/altbirch-8.iob rename to objects/trees/birch/variantforest19.iob diff --git a/objects/birch-sespire/altbirch-10.iob b/objects/trees/birch/variantforest2.iob similarity index 100% rename from objects/birch-sespire/altbirch-10.iob rename to objects/trees/birch/variantforest2.iob diff --git a/objects/birch-sespire/altbirch-9.iob b/objects/trees/birch/variantforest20.iob similarity index 100% rename from objects/birch-sespire/altbirch-9.iob rename to objects/trees/birch/variantforest20.iob diff --git a/objects/birch-sespire/altbirch-11.iob b/objects/trees/birch/variantforest3.iob similarity index 100% rename from objects/birch-sespire/altbirch-11.iob rename to objects/trees/birch/variantforest3.iob diff --git a/objects/birch-sespire/altbirch-12.iob b/objects/trees/birch/variantforest4.iob similarity index 100% rename from objects/birch-sespire/altbirch-12.iob rename to objects/trees/birch/variantforest4.iob diff --git a/objects/birch-sespire/altbirch-13.iob b/objects/trees/birch/variantforest5.iob similarity index 100% rename from objects/birch-sespire/altbirch-13.iob rename to objects/trees/birch/variantforest5.iob diff --git a/objects/birch-sespire/altbirch-14.iob b/objects/trees/birch/variantforest6.iob similarity index 100% rename from objects/birch-sespire/altbirch-14.iob rename to objects/trees/birch/variantforest6.iob diff --git a/objects/birch-sespire/altbirch-15.iob b/objects/trees/birch/variantforest7.iob similarity index 100% rename from objects/birch-sespire/altbirch-15.iob rename to objects/trees/birch/variantforest7.iob diff --git a/objects/birch-sespire/altbirch-16.iob b/objects/trees/birch/variantforest8.iob similarity index 100% rename from objects/birch-sespire/altbirch-16.iob rename to objects/trees/birch/variantforest8.iob diff --git a/objects/birch-sespire/altbirch-17.iob b/objects/trees/birch/variantforest9.iob similarity index 100% rename from objects/birch-sespire/altbirch-17.iob rename to objects/trees/birch/variantforest9.iob diff --git a/objects/bonsai/big-1.iob b/objects/trees/bonsai/big-1.iob similarity index 100% rename from objects/bonsai/big-1.iob rename to objects/trees/bonsai/big-1.iob diff --git a/objects/bonsai/big-2.iob b/objects/trees/bonsai/big-2.iob similarity index 100% rename from objects/bonsai/big-2.iob rename to objects/trees/bonsai/big-2.iob diff --git a/objects/bonsai/big-3.iob b/objects/trees/bonsai/big-3.iob similarity index 100% rename from objects/bonsai/big-3.iob rename to objects/trees/bonsai/big-3.iob diff --git a/objects/bonsai/big-4.iob b/objects/trees/bonsai/big-4.iob similarity index 100% rename from objects/bonsai/big-4.iob rename to objects/trees/bonsai/big-4.iob diff --git a/objects/bonsai/big-5.iob b/objects/trees/bonsai/big-5.iob similarity index 100% rename from objects/bonsai/big-5.iob rename to objects/trees/bonsai/big-5.iob diff --git a/objects/bonsai/big-6.iob b/objects/trees/bonsai/big-6.iob similarity index 100% rename from objects/bonsai/big-6.iob rename to objects/trees/bonsai/big-6.iob diff --git a/objects/bonsai/big-7.iob b/objects/trees/bonsai/big-7.iob similarity index 100% rename from objects/bonsai/big-7.iob rename to objects/trees/bonsai/big-7.iob diff --git a/objects/bonsai-ice/IcePadBonsai1.iob b/objects/trees/bonsai/frolow1.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai1.iob rename to objects/trees/bonsai/frolow1.iob diff --git a/objects/bonsai-ice/IcePadBonsai3.iob b/objects/trees/bonsai/frolow10.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai3.iob rename to objects/trees/bonsai/frolow10.iob diff --git a/objects/bonsai-ice/IcePadBonsai4.iob b/objects/trees/bonsai/frolow11.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai4.iob rename to objects/trees/bonsai/frolow11.iob diff --git a/objects/bonsai-ice/IcePadBonsai5.iob b/objects/trees/bonsai/frolow12.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai5.iob rename to objects/trees/bonsai/frolow12.iob diff --git a/objects/bonsai-ice/IcePadBonsai6.iob b/objects/trees/bonsai/frolow13.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai6.iob rename to objects/trees/bonsai/frolow13.iob diff --git a/objects/bonsai-ice/IcePadBonsai7.iob b/objects/trees/bonsai/frolow14.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai7.iob rename to objects/trees/bonsai/frolow14.iob diff --git a/objects/bonsai-ice/IcePadBonsai8.iob b/objects/trees/bonsai/frolow15.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai8.iob rename to objects/trees/bonsai/frolow15.iob diff --git a/objects/bonsai-ice/IcePadBonsai9.iob b/objects/trees/bonsai/frolow16.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai9.iob rename to objects/trees/bonsai/frolow16.iob diff --git a/objects/bonsai-ice/IcePadBonsai10.iob b/objects/trees/bonsai/frolow2.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai10.iob rename to objects/trees/bonsai/frolow2.iob diff --git a/objects/bonsai-ice/IcePadBonsai11.iob b/objects/trees/bonsai/frolow3.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai11.iob rename to objects/trees/bonsai/frolow3.iob diff --git a/objects/bonsai-ice/IcePadBonsai12.iob b/objects/trees/bonsai/frolow4.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai12.iob rename to objects/trees/bonsai/frolow4.iob diff --git a/objects/bonsai-ice/IcePadBonsai13.iob b/objects/trees/bonsai/frolow5.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai13.iob rename to objects/trees/bonsai/frolow5.iob diff --git a/objects/bonsai-ice/IcePadBonsai14.iob b/objects/trees/bonsai/frolow6.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai14.iob rename to objects/trees/bonsai/frolow6.iob diff --git a/objects/bonsai-ice/IcePadBonsai15.iob b/objects/trees/bonsai/frolow7.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai15.iob rename to objects/trees/bonsai/frolow7.iob diff --git a/objects/bonsai-ice/IcePadBonsai16.iob b/objects/trees/bonsai/frolow8.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai16.iob rename to objects/trees/bonsai/frolow8.iob diff --git a/objects/bonsai-ice/IcePadBonsai2.iob b/objects/trees/bonsai/frolow9.iob similarity index 100% rename from objects/bonsai-ice/IcePadBonsai2.iob rename to objects/trees/bonsai/frolow9.iob diff --git a/objects/bonsai/med-1.iob b/objects/trees/bonsai/med-1.iob similarity index 100% rename from objects/bonsai/med-1.iob rename to objects/trees/bonsai/med-1.iob diff --git a/objects/bonsai/med-2.iob b/objects/trees/bonsai/med-2.iob similarity index 100% rename from objects/bonsai/med-2.iob rename to objects/trees/bonsai/med-2.iob diff --git a/objects/bonsai/med-3.iob b/objects/trees/bonsai/med-3.iob similarity index 100% rename from objects/bonsai/med-3.iob rename to objects/trees/bonsai/med-3.iob diff --git a/objects/bonsai/med-4.iob b/objects/trees/bonsai/med-4.iob similarity index 100% rename from objects/bonsai/med-4.iob rename to objects/trees/bonsai/med-4.iob diff --git a/objects/sacred-bonsai/med-1.iob b/objects/trees/bonsai/medtilt1.iob similarity index 100% rename from objects/sacred-bonsai/med-1.iob rename to objects/trees/bonsai/medtilt1.iob diff --git a/objects/sacred-bonsai/med-2.iob b/objects/trees/bonsai/medtilt2.iob similarity index 100% rename from objects/sacred-bonsai/med-2.iob rename to objects/trees/bonsai/medtilt2.iob diff --git a/objects/sacred-bonsai/med-3.iob b/objects/trees/bonsai/medtilt3.iob similarity index 100% rename from objects/sacred-bonsai/med-3.iob rename to objects/trees/bonsai/medtilt3.iob diff --git a/objects/sacred-bonsai/med-4.iob b/objects/trees/bonsai/medtilt4.iob similarity index 100% rename from objects/sacred-bonsai/med-4.iob rename to objects/trees/bonsai/medtilt4.iob diff --git a/objects/sacred-bonsai/med-5.iob b/objects/trees/bonsai/medtilt5.iob similarity index 100% rename from objects/sacred-bonsai/med-5.iob rename to objects/trees/bonsai/medtilt5.iob diff --git a/objects/blossom-supermassive/blossom1.iob b/objects/trees/bonsai/smbase1.iob similarity index 100% rename from objects/blossom-supermassive/blossom1.iob rename to objects/trees/bonsai/smbase1.iob diff --git a/objects/bonsai-massive/bonsai1.iob b/objects/trees/bonsai/smbon1.iob similarity index 100% rename from objects/bonsai-massive/bonsai1.iob rename to objects/trees/bonsai/smbon1.iob diff --git a/objects/bonsai-massive/bonsai2.iob b/objects/trees/bonsai/smbon2.iob similarity index 100% rename from objects/bonsai-massive/bonsai2.iob rename to objects/trees/bonsai/smbon2.iob diff --git a/objects/bonsai-massive/bonsai3.iob b/objects/trees/bonsai/smbon3.iob similarity index 100% rename from objects/bonsai-massive/bonsai3.iob rename to objects/trees/bonsai/smbon3.iob diff --git a/objects/blossom-fallen/blossom1.iob b/objects/trees/bonsai/smfallen1.iob similarity index 100% rename from objects/blossom-fallen/blossom1.iob rename to objects/trees/bonsai/smfallen1.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-1.iob b/objects/trees/darkoak/denmyre1.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-1.iob rename to objects/trees/darkoak/denmyre1.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-3.iob b/objects/trees/darkoak/denmyre10.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-3.iob rename to objects/trees/darkoak/denmyre10.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-4.iob b/objects/trees/darkoak/denmyre11.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-4.iob rename to objects/trees/darkoak/denmyre11.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-5.iob b/objects/trees/darkoak/denmyre12.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-5.iob rename to objects/trees/darkoak/denmyre12.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-6.iob b/objects/trees/darkoak/denmyre13.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-6.iob rename to objects/trees/darkoak/denmyre13.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-7.iob b/objects/trees/darkoak/denmyre14.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-7.iob rename to objects/trees/darkoak/denmyre14.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-8.iob b/objects/trees/darkoak/denmyre15.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-8.iob rename to objects/trees/darkoak/denmyre15.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-9.iob b/objects/trees/darkoak/denmyre16.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-9.iob rename to objects/trees/darkoak/denmyre16.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-10.iob b/objects/trees/darkoak/denmyre2.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-10.iob rename to objects/trees/darkoak/denmyre2.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-11.iob b/objects/trees/darkoak/denmyre3.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-11.iob rename to objects/trees/darkoak/denmyre3.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-12.iob b/objects/trees/darkoak/denmyre4.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-12.iob rename to objects/trees/darkoak/denmyre4.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-13.iob b/objects/trees/darkoak/denmyre5.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-13.iob rename to objects/trees/darkoak/denmyre5.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-14.iob b/objects/trees/darkoak/denmyre6.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-14.iob rename to objects/trees/darkoak/denmyre6.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-15.iob b/objects/trees/darkoak/denmyre7.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-15.iob rename to objects/trees/darkoak/denmyre7.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-16.iob b/objects/trees/darkoak/denmyre8.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-16.iob rename to objects/trees/darkoak/denmyre8.iob diff --git a/objects/dark-oak-medium/dark-oak-denmyre-2.iob b/objects/trees/darkoak/denmyre9.iob similarity index 100% rename from objects/dark-oak-medium/dark-oak-denmyre-2.iob rename to objects/trees/darkoak/denmyre9.iob diff --git a/objects/darkoak-large/j1.iob b/objects/trees/darkoak/floral1.iob similarity index 100% rename from objects/darkoak-large/j1.iob rename to objects/trees/darkoak/floral1.iob diff --git a/objects/willwo/willwo-1.iob b/objects/trees/darkoak/generic1.iob similarity index 100% rename from objects/willwo/willwo-1.iob rename to objects/trees/darkoak/generic1.iob diff --git a/objects/willwo/willwo-6.iob b/objects/trees/darkoak/generic10.iob similarity index 100% rename from objects/willwo/willwo-6.iob rename to objects/trees/darkoak/generic10.iob diff --git a/objects/willwo/willwo-9.iob b/objects/trees/darkoak/generic11.iob similarity index 100% rename from objects/willwo/willwo-9.iob rename to objects/trees/darkoak/generic11.iob diff --git a/objects/willwo/willwo-10.iob b/objects/trees/darkoak/generic2.iob similarity index 100% rename from objects/willwo/willwo-10.iob rename to objects/trees/darkoak/generic2.iob diff --git a/objects/willwo/willwo-11.iob b/objects/trees/darkoak/generic3.iob similarity index 100% rename from objects/willwo/willwo-11.iob rename to objects/trees/darkoak/generic3.iob diff --git a/objects/willwo/willwo-2.iob b/objects/trees/darkoak/generic4.iob similarity index 100% rename from objects/willwo/willwo-2.iob rename to objects/trees/darkoak/generic4.iob diff --git a/objects/willwo/willwo-3.iob b/objects/trees/darkoak/generic5.iob similarity index 100% rename from objects/willwo/willwo-3.iob rename to objects/trees/darkoak/generic5.iob diff --git a/objects/willwo/willwo-4.iob b/objects/trees/darkoak/generic6.iob similarity index 100% rename from objects/willwo/willwo-4.iob rename to objects/trees/darkoak/generic6.iob diff --git a/objects/willwo/willwo-5.iob b/objects/trees/darkoak/generic7.iob similarity index 100% rename from objects/willwo/willwo-5.iob rename to objects/trees/darkoak/generic7.iob diff --git a/objects/willwo/willwo-8.iob b/objects/trees/darkoak/generic8.iob similarity index 100% rename from objects/willwo/willwo-8.iob rename to objects/trees/darkoak/generic8.iob diff --git a/objects/willwo/willwo-7.iob b/objects/trees/darkoak/generic9.iob similarity index 100% rename from objects/willwo/willwo-7.iob rename to objects/trees/darkoak/generic9.iob diff --git a/objects/waterlogged-darkwood/large-10.iob b/objects/trees/darkoak/large-10.iob similarity index 100% rename from objects/waterlogged-darkwood/large-10.iob rename to objects/trees/darkoak/large-10.iob diff --git a/objects/waterlogged-darkwood/large-3.iob b/objects/trees/darkoak/large-3.iob similarity index 100% rename from objects/waterlogged-darkwood/large-3.iob rename to objects/trees/darkoak/large-3.iob diff --git a/objects/waterlogged-darkwood/med-1.iob b/objects/trees/darkoak/medgeneric1.iob similarity index 100% rename from objects/waterlogged-darkwood/med-1.iob rename to objects/trees/darkoak/medgeneric1.iob diff --git a/objects/waterlogged-darkwood/med-2.iob b/objects/trees/darkoak/medgeneric2.iob similarity index 100% rename from objects/waterlogged-darkwood/med-2.iob rename to objects/trees/darkoak/medgeneric2.iob diff --git a/objects/waterlogged-darkwood/med-3.iob b/objects/trees/darkoak/medgeneric3.iob similarity index 100% rename from objects/waterlogged-darkwood/med-3.iob rename to objects/trees/darkoak/medgeneric3.iob diff --git a/objects/waterlogged-darkwood/med-4.iob b/objects/trees/darkoak/medgeneric4.iob similarity index 100% rename from objects/waterlogged-darkwood/med-4.iob rename to objects/trees/darkoak/medgeneric4.iob diff --git a/objects/waterlogged-darkwood/med-5.iob b/objects/trees/darkoak/medgeneric5.iob similarity index 100% rename from objects/waterlogged-darkwood/med-5.iob rename to objects/trees/darkoak/medgeneric5.iob diff --git a/objects/waterlogged-darkwood/med-6.iob b/objects/trees/darkoak/medgeneric6.iob similarity index 100% rename from objects/waterlogged-darkwood/med-6.iob rename to objects/trees/darkoak/medgeneric6.iob diff --git a/objects/waterlogged-darkwood/med-7.iob b/objects/trees/darkoak/medgeneric7.iob similarity index 100% rename from objects/waterlogged-darkwood/med-7.iob rename to objects/trees/darkoak/medgeneric7.iob diff --git a/objects/waterlogged-darkwood/med-8.iob b/objects/trees/darkoak/medgeneric8.iob similarity index 100% rename from objects/waterlogged-darkwood/med-8.iob rename to objects/trees/darkoak/medgeneric8.iob diff --git a/objects/waterlogged-darkwood/med-9.iob b/objects/trees/darkoak/medgeneric9.iob similarity index 100% rename from objects/waterlogged-darkwood/med-9.iob rename to objects/trees/darkoak/medgeneric9.iob diff --git a/objects/willow-dead-supermassive/dead1.iob b/objects/trees/darkoak/smdeadwillow1.iob similarity index 100% rename from objects/willow-dead-supermassive/dead1.iob rename to objects/trees/darkoak/smdeadwillow1.iob diff --git a/objects/willow-dead-supermassive/dead2.iob b/objects/trees/darkoak/smdeadwillow2.iob similarity index 100% rename from objects/willow-dead-supermassive/dead2.iob rename to objects/trees/darkoak/smdeadwillow2.iob diff --git a/objects/darkoak-small/oak1.iob b/objects/trees/darkoak/smolgeneric1.iob similarity index 100% rename from objects/darkoak-small/oak1.iob rename to objects/trees/darkoak/smolgeneric1.iob diff --git a/objects/darkoak-small/oak4.iob b/objects/trees/darkoak/smolgeneric10.iob similarity index 100% rename from objects/darkoak-small/oak4.iob rename to objects/trees/darkoak/smolgeneric10.iob diff --git a/objects/darkoak-small/oak5.iob b/objects/trees/darkoak/smolgeneric11.iob similarity index 100% rename from objects/darkoak-small/oak5.iob rename to objects/trees/darkoak/smolgeneric11.iob diff --git a/objects/darkoak-small/oak6.iob b/objects/trees/darkoak/smolgeneric12.iob similarity index 100% rename from objects/darkoak-small/oak6.iob rename to objects/trees/darkoak/smolgeneric12.iob diff --git a/objects/darkoak-small/oak7.iob b/objects/trees/darkoak/smolgeneric13.iob similarity index 100% rename from objects/darkoak-small/oak7.iob rename to objects/trees/darkoak/smolgeneric13.iob diff --git a/objects/darkoak-small/oak8.iob b/objects/trees/darkoak/smolgeneric14.iob similarity index 100% rename from objects/darkoak-small/oak8.iob rename to objects/trees/darkoak/smolgeneric14.iob diff --git a/objects/darkoak-small/oak9.iob b/objects/trees/darkoak/smolgeneric15.iob similarity index 100% rename from objects/darkoak-small/oak9.iob rename to objects/trees/darkoak/smolgeneric15.iob diff --git a/objects/waterlogged-darkwood/smol-1.iob b/objects/trees/darkoak/smolgeneric16.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-1.iob rename to objects/trees/darkoak/smolgeneric16.iob diff --git a/objects/waterlogged-darkwood/smol-10.iob b/objects/trees/darkoak/smolgeneric17.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-10.iob rename to objects/trees/darkoak/smolgeneric17.iob diff --git a/objects/waterlogged-darkwood/smol-11.iob b/objects/trees/darkoak/smolgeneric18.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-11.iob rename to objects/trees/darkoak/smolgeneric18.iob diff --git a/objects/waterlogged-darkwood/smol-12.iob b/objects/trees/darkoak/smolgeneric19.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-12.iob rename to objects/trees/darkoak/smolgeneric19.iob diff --git a/objects/darkoak-small/oak10.iob b/objects/trees/darkoak/smolgeneric2.iob similarity index 100% rename from objects/darkoak-small/oak10.iob rename to objects/trees/darkoak/smolgeneric2.iob diff --git a/objects/waterlogged-darkwood/smol-13.iob b/objects/trees/darkoak/smolgeneric20.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-13.iob rename to objects/trees/darkoak/smolgeneric20.iob diff --git a/objects/waterlogged-darkwood/smol-14.iob b/objects/trees/darkoak/smolgeneric21.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-14.iob rename to objects/trees/darkoak/smolgeneric21.iob diff --git a/objects/waterlogged-darkwood/smol-15.iob b/objects/trees/darkoak/smolgeneric22.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-15.iob rename to objects/trees/darkoak/smolgeneric22.iob diff --git a/objects/waterlogged-darkwood/smol-16.iob b/objects/trees/darkoak/smolgeneric23.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-16.iob rename to objects/trees/darkoak/smolgeneric23.iob diff --git a/objects/waterlogged-darkwood/smol-2.iob b/objects/trees/darkoak/smolgeneric24.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-2.iob rename to objects/trees/darkoak/smolgeneric24.iob diff --git a/objects/waterlogged-darkwood/smol-3.iob b/objects/trees/darkoak/smolgeneric25.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-3.iob rename to objects/trees/darkoak/smolgeneric25.iob diff --git a/objects/waterlogged-darkwood/smol-4.iob b/objects/trees/darkoak/smolgeneric26.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-4.iob rename to objects/trees/darkoak/smolgeneric26.iob diff --git a/objects/waterlogged-darkwood/smol-5.iob b/objects/trees/darkoak/smolgeneric27.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-5.iob rename to objects/trees/darkoak/smolgeneric27.iob diff --git a/objects/waterlogged-darkwood/smol-6.iob b/objects/trees/darkoak/smolgeneric28.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-6.iob rename to objects/trees/darkoak/smolgeneric28.iob diff --git a/objects/waterlogged-darkwood/smol-7.iob b/objects/trees/darkoak/smolgeneric29.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-7.iob rename to objects/trees/darkoak/smolgeneric29.iob diff --git a/objects/darkoak-small/oak11.iob b/objects/trees/darkoak/smolgeneric3.iob similarity index 100% rename from objects/darkoak-small/oak11.iob rename to objects/trees/darkoak/smolgeneric3.iob diff --git a/objects/waterlogged-darkwood/smol-8.iob b/objects/trees/darkoak/smolgeneric30.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-8.iob rename to objects/trees/darkoak/smolgeneric30.iob diff --git a/objects/waterlogged-darkwood/smol-9.iob b/objects/trees/darkoak/smolgeneric31.iob similarity index 100% rename from objects/waterlogged-darkwood/smol-9.iob rename to objects/trees/darkoak/smolgeneric31.iob diff --git a/objects/darkoak-small/oak12.iob b/objects/trees/darkoak/smolgeneric4.iob similarity index 100% rename from objects/darkoak-small/oak12.iob rename to objects/trees/darkoak/smolgeneric4.iob diff --git a/objects/darkoak-small/oak13.iob b/objects/trees/darkoak/smolgeneric5.iob similarity index 100% rename from objects/darkoak-small/oak13.iob rename to objects/trees/darkoak/smolgeneric5.iob diff --git a/objects/darkoak-small/oak14.iob b/objects/trees/darkoak/smolgeneric6.iob similarity index 100% rename from objects/darkoak-small/oak14.iob rename to objects/trees/darkoak/smolgeneric6.iob diff --git a/objects/darkoak-small/oak15.iob b/objects/trees/darkoak/smolgeneric7.iob similarity index 100% rename from objects/darkoak-small/oak15.iob rename to objects/trees/darkoak/smolgeneric7.iob diff --git a/objects/darkoak-small/oak2.iob b/objects/trees/darkoak/smolgeneric8.iob similarity index 100% rename from objects/darkoak-small/oak2.iob rename to objects/trees/darkoak/smolgeneric8.iob diff --git a/objects/darkoak-small/oak3.iob b/objects/trees/darkoak/smolgeneric9.iob similarity index 100% rename from objects/darkoak-small/oak3.iob rename to objects/trees/darkoak/smolgeneric9.iob diff --git a/objects/willow-supermassive/willow1.iob b/objects/trees/darkoak/smwillow1.iob similarity index 100% rename from objects/willow-supermassive/willow1.iob rename to objects/trees/darkoak/smwillow1.iob diff --git a/objects/willow-supermassive/willow2.iob b/objects/trees/darkoak/smwillow2.iob similarity index 100% rename from objects/willow-supermassive/willow2.iob rename to objects/trees/darkoak/smwillow2.iob diff --git a/objects/willow-supermassive/willow3.iob b/objects/trees/darkoak/smwillow3.iob similarity index 100% rename from objects/willow-supermassive/willow3.iob rename to objects/trees/darkoak/smwillow3.iob diff --git a/objects/willow-supermassive/willow4.iob b/objects/trees/darkoak/smwillow4.iob similarity index 100% rename from objects/willow-supermassive/willow4.iob rename to objects/trees/darkoak/smwillow4.iob diff --git a/objects/cambian-drift/cambian-drift-3.iob b/objects/trees/darkoak/talldrift1.iob similarity index 100% rename from objects/cambian-drift/cambian-drift-3.iob rename to objects/trees/darkoak/talldrift1.iob diff --git a/objects/cambian-drift/cambian-drift-4.iob b/objects/trees/darkoak/talldrift2.iob similarity index 100% rename from objects/cambian-drift/cambian-drift-4.iob rename to objects/trees/darkoak/talldrift2.iob diff --git a/objects/cambian-drift/cambian-drift-5.iob b/objects/trees/darkoak/talldrift3.iob similarity index 100% rename from objects/cambian-drift/cambian-drift-5.iob rename to objects/trees/darkoak/talldrift3.iob diff --git a/objects/cambian-drift/cambian-drift-6.iob b/objects/trees/darkoak/talldrift4.iob similarity index 100% rename from objects/cambian-drift/cambian-drift-6.iob rename to objects/trees/darkoak/talldrift4.iob diff --git a/objects/cambian-drift/cambian-drift-7.iob b/objects/trees/darkoak/talldrift5.iob similarity index 100% rename from objects/cambian-drift/cambian-drift-7.iob rename to objects/trees/darkoak/talldrift5.iob diff --git a/objects/cambian-drift/cambian-drift-8.iob b/objects/trees/darkoak/talldrift6.iob similarity index 100% rename from objects/cambian-drift/cambian-drift-8.iob rename to objects/trees/darkoak/talldrift6.iob diff --git a/objects/cambian-drift/cambian-drift-9.iob b/objects/trees/darkoak/talldrift7.iob similarity index 100% rename from objects/cambian-drift/cambian-drift-9.iob rename to objects/trees/darkoak/talldrift7.iob diff --git a/objects/cambian-drift/cambian_drift-1.iob b/objects/trees/darkoak/talldrift8.iob similarity index 100% rename from objects/cambian-drift/cambian_drift-1.iob rename to objects/trees/darkoak/talldrift8.iob diff --git a/objects/cambian-drift/cambian_drift-2.iob b/objects/trees/darkoak/talldrift9.iob similarity index 100% rename from objects/cambian-drift/cambian_drift-2.iob rename to objects/trees/darkoak/talldrift9.iob diff --git a/objects/dark-oak-medium/r1.iob b/objects/trees/darkoak/tallgeneric1.iob similarity index 100% rename from objects/dark-oak-medium/r1.iob rename to objects/trees/darkoak/tallgeneric1.iob diff --git a/objects/dark-oak-medium/r2.iob b/objects/trees/darkoak/tallgeneric2.iob similarity index 100% rename from objects/dark-oak-medium/r2.iob rename to objects/trees/darkoak/tallgeneric2.iob diff --git a/objects/willwo/willowbutbigger-1.iob b/objects/trees/darkoak/willowbutbigger-1.iob similarity index 100% rename from objects/willwo/willowbutbigger-1.iob rename to objects/trees/darkoak/willowbutbigger-1.iob diff --git a/objects/willwo/willowbutbigger-2.iob b/objects/trees/darkoak/willowbutbigger-2.iob similarity index 100% rename from objects/willwo/willowbutbigger-2.iob rename to objects/trees/darkoak/willowbutbigger-2.iob diff --git a/objects/willowbutbigger/o1.iob b/objects/trees/darkoak/willowgeneric1.iob similarity index 100% rename from objects/willowbutbigger/o1.iob rename to objects/trees/darkoak/willowgeneric1.iob diff --git a/objects/willowbutbigger/o2.iob b/objects/trees/darkoak/willowgeneric2.iob similarity index 100% rename from objects/willowbutbigger/o2.iob rename to objects/trees/darkoak/willowgeneric2.iob diff --git a/objects/jungle-remade/bmbo-1.iob b/objects/trees/jungle/bmbogeneric1.iob similarity index 100% rename from objects/jungle-remade/bmbo-1.iob rename to objects/trees/jungle/bmbogeneric1.iob diff --git a/objects/jungle-remade/bmbo-2.iob b/objects/trees/jungle/bmbogeneric2.iob similarity index 100% rename from objects/jungle-remade/bmbo-2.iob rename to objects/trees/jungle/bmbogeneric2.iob diff --git a/objects/jungle-remade/bmbo-3.iob b/objects/trees/jungle/bmbogeneric3.iob similarity index 100% rename from objects/jungle-remade/bmbo-3.iob rename to objects/trees/jungle/bmbogeneric3.iob diff --git a/objects/jungle-remade/bmbo-4.iob b/objects/trees/jungle/bmbogeneric4.iob similarity index 100% rename from objects/jungle-remade/bmbo-4.iob rename to objects/trees/jungle/bmbogeneric4.iob diff --git a/objects/jungle-remade/bmbo-5.iob b/objects/trees/jungle/bmbogeneric5.iob similarity index 100% rename from objects/jungle-remade/bmbo-5.iob rename to objects/trees/jungle/bmbogeneric5.iob diff --git a/objects/jungle-remade/bmbo-6.iob b/objects/trees/jungle/bmbogeneric6.iob similarity index 100% rename from objects/jungle-remade/bmbo-6.iob rename to objects/trees/jungle/bmbogeneric6.iob diff --git a/objects/jungle-remade/bmbo-7.iob b/objects/trees/jungle/bmbogeneric7.iob similarity index 100% rename from objects/jungle-remade/bmbo-7.iob rename to objects/trees/jungle/bmbogeneric7.iob diff --git a/objects/jungle-remade/bmbo-8.iob b/objects/trees/jungle/bmbogeneric8.iob similarity index 100% rename from objects/jungle-remade/bmbo-8.iob rename to objects/trees/jungle/bmbogeneric8.iob diff --git a/objects/jungle-remade/bmbo-9.iob b/objects/trees/jungle/bmbogeneric9.iob similarity index 100% rename from objects/jungle-remade/bmbo-9.iob rename to objects/trees/jungle/bmbogeneric9.iob diff --git a/objects/jungle-remade/jcoco-1.iob b/objects/trees/jungle/cocogeneric1.iob similarity index 100% rename from objects/jungle-remade/jcoco-1.iob rename to objects/trees/jungle/cocogeneric1.iob diff --git a/objects/jungle-remade/jcoco-2.iob b/objects/trees/jungle/cocogeneric2.iob similarity index 100% rename from objects/jungle-remade/jcoco-2.iob rename to objects/trees/jungle/cocogeneric2.iob diff --git a/objects/jungle-remade/jcoco-3.iob b/objects/trees/jungle/cocogeneric3.iob similarity index 100% rename from objects/jungle-remade/jcoco-3.iob rename to objects/trees/jungle/cocogeneric3.iob diff --git a/objects/jungle-remade/jcoco-4.iob b/objects/trees/jungle/cocogeneric4.iob similarity index 100% rename from objects/jungle-remade/jcoco-4.iob rename to objects/trees/jungle/cocogeneric4.iob diff --git a/objects/jungle-remade/jcoco-5.iob b/objects/trees/jungle/cocogeneric5.iob similarity index 100% rename from objects/jungle-remade/jcoco-5.iob rename to objects/trees/jungle/cocogeneric5.iob diff --git a/objects/tropical-delux/tropi-1.iob b/objects/trees/jungle/deligeneric1.iob similarity index 100% rename from objects/tropical-delux/tropi-1.iob rename to objects/trees/jungle/deligeneric1.iob diff --git a/objects/tropical-delux/tropi-2.iob b/objects/trees/jungle/deligeneric2.iob similarity index 100% rename from objects/tropical-delux/tropi-2.iob rename to objects/trees/jungle/deligeneric2.iob diff --git a/objects/tropical-delux/tropi-3.iob b/objects/trees/jungle/deligeneric3.iob similarity index 100% rename from objects/tropical-delux/tropi-3.iob rename to objects/trees/jungle/deligeneric3.iob diff --git a/objects/tropical-delux/tropi-4.iob b/objects/trees/jungle/deligeneric4.iob similarity index 100% rename from objects/tropical-delux/tropi-4.iob rename to objects/trees/jungle/deligeneric4.iob diff --git a/objects/tropical-delux/tropi-5.iob b/objects/trees/jungle/deligeneric5.iob similarity index 100% rename from objects/tropical-delux/tropi-5.iob rename to objects/trees/jungle/deligeneric5.iob diff --git a/objects/tropical-delux/tropi-6.iob b/objects/trees/jungle/deligeneric6.iob similarity index 100% rename from objects/tropical-delux/tropi-6.iob rename to objects/trees/jungle/deligeneric6.iob diff --git a/objects/jungle-medium/jungle-denmyre-1.iob b/objects/trees/jungle/denmyre1.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-1.iob rename to objects/trees/jungle/denmyre1.iob diff --git a/objects/jungle-medium/jungle-denmyre-3.iob b/objects/trees/jungle/denmyre10.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-3.iob rename to objects/trees/jungle/denmyre10.iob diff --git a/objects/jungle-medium/jungle-denmyre-4.iob b/objects/trees/jungle/denmyre11.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-4.iob rename to objects/trees/jungle/denmyre11.iob diff --git a/objects/jungle-medium/jungle-denmyre-5.iob b/objects/trees/jungle/denmyre12.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-5.iob rename to objects/trees/jungle/denmyre12.iob diff --git a/objects/jungle-medium/jungle-denmyre-6.iob b/objects/trees/jungle/denmyre13.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-6.iob rename to objects/trees/jungle/denmyre13.iob diff --git a/objects/jungle-medium/jungle-denmyre-7.iob b/objects/trees/jungle/denmyre14.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-7.iob rename to objects/trees/jungle/denmyre14.iob diff --git a/objects/jungle-medium/jungle-denmyre-8.iob b/objects/trees/jungle/denmyre15.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-8.iob rename to objects/trees/jungle/denmyre15.iob diff --git a/objects/jungle-medium/jungle-denmyre-9.iob b/objects/trees/jungle/denmyre16.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-9.iob rename to objects/trees/jungle/denmyre16.iob diff --git a/objects/jungle-medium/jungle-denmyre-10.iob b/objects/trees/jungle/denmyre2.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-10.iob rename to objects/trees/jungle/denmyre2.iob diff --git a/objects/jungle-medium/jungle-denmyre-11.iob b/objects/trees/jungle/denmyre3.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-11.iob rename to objects/trees/jungle/denmyre3.iob diff --git a/objects/jungle-medium/jungle-denmyre-12.iob b/objects/trees/jungle/denmyre4.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-12.iob rename to objects/trees/jungle/denmyre4.iob diff --git a/objects/jungle-medium/jungle-denmyre-13.iob b/objects/trees/jungle/denmyre5.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-13.iob rename to objects/trees/jungle/denmyre5.iob diff --git a/objects/jungle-medium/jungle-denmyre-14.iob b/objects/trees/jungle/denmyre6.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-14.iob rename to objects/trees/jungle/denmyre6.iob diff --git a/objects/jungle-medium/jungle-denmyre-15.iob b/objects/trees/jungle/denmyre7.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-15.iob rename to objects/trees/jungle/denmyre7.iob diff --git a/objects/jungle-medium/jungle-denmyre-16.iob b/objects/trees/jungle/denmyre8.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-16.iob rename to objects/trees/jungle/denmyre8.iob diff --git a/objects/jungle-medium/jungle-denmyre-2.iob b/objects/trees/jungle/denmyre9.iob similarity index 100% rename from objects/jungle-medium/jungle-denmyre-2.iob rename to objects/trees/jungle/denmyre9.iob diff --git a/objects/jungle-remade/bjungle-1.iob b/objects/trees/jungle/largegeneric1.iob similarity index 100% rename from objects/jungle-remade/bjungle-1.iob rename to objects/trees/jungle/largegeneric1.iob diff --git a/objects/jungle-remade/bjungle-2.iob b/objects/trees/jungle/largegeneric2.iob similarity index 100% rename from objects/jungle-remade/bjungle-2.iob rename to objects/trees/jungle/largegeneric2.iob diff --git a/objects/jungle-remade/bjungle-3.iob b/objects/trees/jungle/largegeneric3.iob similarity index 100% rename from objects/jungle-remade/bjungle-3.iob rename to objects/trees/jungle/largegeneric3.iob diff --git a/objects/jungle-remade/bjungle-4.iob b/objects/trees/jungle/largegeneric4.iob similarity index 100% rename from objects/jungle-remade/bjungle-4.iob rename to objects/trees/jungle/largegeneric4.iob diff --git a/objects/jungle-remade/bjungle-5.iob b/objects/trees/jungle/largegeneric5.iob similarity index 100% rename from objects/jungle-remade/bjungle-5.iob rename to objects/trees/jungle/largegeneric5.iob diff --git a/objects/jungle-remade/J11.iob b/objects/trees/jungle/lgeneric1.iob similarity index 100% rename from objects/jungle-remade/J11.iob rename to objects/trees/jungle/lgeneric1.iob diff --git a/objects/jungle-remade/J12.iob b/objects/trees/jungle/lgeneric2.iob similarity index 100% rename from objects/jungle-remade/J12.iob rename to objects/trees/jungle/lgeneric2.iob diff --git a/objects/jungle-remade/J13.iob b/objects/trees/jungle/lgeneric3.iob similarity index 100% rename from objects/jungle-remade/J13.iob rename to objects/trees/jungle/lgeneric3.iob diff --git a/objects/jungle-remade/J4.iob b/objects/trees/jungle/lgeneric4.iob similarity index 100% rename from objects/jungle-remade/J4.iob rename to objects/trees/jungle/lgeneric4.iob diff --git a/objects/jungle-remade/J5.iob b/objects/trees/jungle/lgeneric5.iob similarity index 100% rename from objects/jungle-remade/J5.iob rename to objects/trees/jungle/lgeneric5.iob diff --git a/objects/jungle-remade/J6.iob b/objects/trees/jungle/lgeneric6.iob similarity index 100% rename from objects/jungle-remade/J6.iob rename to objects/trees/jungle/lgeneric6.iob diff --git a/objects/jungle-remade/J7.iob b/objects/trees/jungle/lgeneric7.iob similarity index 100% rename from objects/jungle-remade/J7.iob rename to objects/trees/jungle/lgeneric7.iob diff --git a/objects/jungle-remade/J8.iob b/objects/trees/jungle/lgeneric8.iob similarity index 100% rename from objects/jungle-remade/J8.iob rename to objects/trees/jungle/lgeneric8.iob diff --git a/objects/jungle-remade/J9.iob b/objects/trees/jungle/lgeneric9.iob similarity index 100% rename from objects/jungle-remade/J9.iob rename to objects/trees/jungle/lgeneric9.iob diff --git a/objects/tree/jungle/1.iob b/objects/trees/jungle/mgeneric1.iob similarity index 100% rename from objects/tree/jungle/1.iob rename to objects/trees/jungle/mgeneric1.iob diff --git a/objects/tree/jungle/2.iob b/objects/trees/jungle/mgeneric2.iob similarity index 100% rename from objects/tree/jungle/2.iob rename to objects/trees/jungle/mgeneric2.iob diff --git a/objects/jungle-remade/j3.iob b/objects/trees/jungle/mgeneric3.iob similarity index 100% rename from objects/jungle-remade/j3.iob rename to objects/trees/jungle/mgeneric3.iob diff --git a/objects/jungle-remade/j2.iob b/objects/trees/jungle/mgeneric4.iob similarity index 100% rename from objects/jungle-remade/j2.iob rename to objects/trees/jungle/mgeneric4.iob diff --git a/objects/palm/palm1.iob b/objects/trees/jungle/palm1.iob similarity index 100% rename from objects/palm/palm1.iob rename to objects/trees/jungle/palm1.iob diff --git a/objects/palm/palm-7.iob b/objects/trees/jungle/palm10.iob similarity index 100% rename from objects/palm/palm-7.iob rename to objects/trees/jungle/palm10.iob diff --git a/objects/palm/palm-6.iob b/objects/trees/jungle/palm11.iob similarity index 100% rename from objects/palm/palm-6.iob rename to objects/trees/jungle/palm11.iob diff --git a/objects/palm/palm-4.iob b/objects/trees/jungle/palm12.iob similarity index 100% rename from objects/palm/palm-4.iob rename to objects/trees/jungle/palm12.iob diff --git a/objects/palm/palm-5.iob b/objects/trees/jungle/palm13.iob similarity index 100% rename from objects/palm/palm-5.iob rename to objects/trees/jungle/palm13.iob diff --git a/objects/palm/palm2.iob b/objects/trees/jungle/palm2.iob similarity index 100% rename from objects/palm/palm2.iob rename to objects/trees/jungle/palm2.iob diff --git a/objects/palm/palm3.iob b/objects/trees/jungle/palm3.iob similarity index 100% rename from objects/palm/palm3.iob rename to objects/trees/jungle/palm3.iob diff --git a/objects/palm/palm4.iob b/objects/trees/jungle/palm4.iob similarity index 100% rename from objects/palm/palm4.iob rename to objects/trees/jungle/palm4.iob diff --git a/objects/palm/palm5.iob b/objects/trees/jungle/palm5.iob similarity index 100% rename from objects/palm/palm5.iob rename to objects/trees/jungle/palm5.iob diff --git a/objects/palm/palm6.iob b/objects/trees/jungle/palm6.iob similarity index 100% rename from objects/palm/palm6.iob rename to objects/trees/jungle/palm6.iob diff --git a/objects/palm/palm7.iob b/objects/trees/jungle/palm7.iob similarity index 100% rename from objects/palm/palm7.iob rename to objects/trees/jungle/palm7.iob diff --git a/objects/palm/palm8.iob b/objects/trees/jungle/palm8.iob similarity index 100% rename from objects/palm/palm8.iob rename to objects/trees/jungle/palm8.iob diff --git a/objects/palm/palm-8.iob b/objects/trees/jungle/palm9.iob similarity index 100% rename from objects/palm/palm-8.iob rename to objects/trees/jungle/palm9.iob diff --git a/objects/jungle-remade/sjungle-1.iob b/objects/trees/jungle/sgeneric1.iob similarity index 100% rename from objects/jungle-remade/sjungle-1.iob rename to objects/trees/jungle/sgeneric1.iob diff --git a/objects/jungle-remade/sjungle-2.iob b/objects/trees/jungle/sgeneric2.iob similarity index 100% rename from objects/jungle-remade/sjungle-2.iob rename to objects/trees/jungle/sgeneric2.iob diff --git a/objects/jungle-remade/sjungle-3.iob b/objects/trees/jungle/sgeneric3.iob similarity index 100% rename from objects/jungle-remade/sjungle-3.iob rename to objects/trees/jungle/sgeneric3.iob diff --git a/objects/jungle-remade/sjungle-4.iob b/objects/trees/jungle/sgeneric4.iob similarity index 100% rename from objects/jungle-remade/sjungle-4.iob rename to objects/trees/jungle/sgeneric4.iob diff --git a/objects/jungle-remade/ssmjungle1.iob b/objects/trees/jungle/smgeneric1.iob similarity index 100% rename from objects/jungle-remade/ssmjungle1.iob rename to objects/trees/jungle/smgeneric1.iob diff --git a/objects/palm-small/palm1.iob b/objects/trees/jungle/spalm1.iob similarity index 100% rename from objects/palm-small/palm1.iob rename to objects/trees/jungle/spalm1.iob diff --git a/objects/palm-small/palm2.iob b/objects/trees/jungle/spalm2.iob similarity index 100% rename from objects/palm-small/palm2.iob rename to objects/trees/jungle/spalm2.iob diff --git a/objects/palm-small/palm3.iob b/objects/trees/jungle/spalm3.iob similarity index 100% rename from objects/palm-small/palm3.iob rename to objects/trees/jungle/spalm3.iob diff --git a/objects/palm-small/palm4.iob b/objects/trees/jungle/spalm4.iob similarity index 100% rename from objects/palm-small/palm4.iob rename to objects/trees/jungle/spalm4.iob diff --git a/objects/palm-small/palm5.iob b/objects/trees/jungle/spalm5.iob similarity index 100% rename from objects/palm-small/palm5.iob rename to objects/trees/jungle/spalm5.iob diff --git a/objects/jungle-remade/jspire-1.iob b/objects/trees/jungle/spire1.iob similarity index 100% rename from objects/jungle-remade/jspire-1.iob rename to objects/trees/jungle/spire1.iob diff --git a/objects/jungle-remade/jspire-2.iob b/objects/trees/jungle/spire2.iob similarity index 100% rename from objects/jungle-remade/jspire-2.iob rename to objects/trees/jungle/spire2.iob diff --git a/objects/jungle-remade/jspire-3.iob b/objects/trees/jungle/spire3.iob similarity index 100% rename from objects/jungle-remade/jspire-3.iob rename to objects/trees/jungle/spire3.iob diff --git a/objects/jungle-remade/jspire-4.iob b/objects/trees/jungle/spire4.iob similarity index 100% rename from objects/jungle-remade/jspire-4.iob rename to objects/trees/jungle/spire4.iob diff --git a/objects/jungle-remade/jspire-5.iob b/objects/trees/jungle/spire5.iob similarity index 100% rename from objects/jungle-remade/jspire-5.iob rename to objects/trees/jungle/spire5.iob diff --git a/objects/jungle-remade/jspire-6.iob b/objects/trees/jungle/spire6.iob similarity index 100% rename from objects/jungle-remade/jspire-6.iob rename to objects/trees/jungle/spire6.iob diff --git a/objects/jungle-remade/jspire-7.iob b/objects/trees/jungle/spire7.iob similarity index 100% rename from objects/jungle-remade/jspire-7.iob rename to objects/trees/jungle/spire7.iob diff --git a/objects/darkjungle-large/JunLarge1.iob b/objects/trees/jungle/vgeneric1.iob similarity index 100% rename from objects/darkjungle-large/JunLarge1.iob rename to objects/trees/jungle/vgeneric1.iob diff --git a/objects/darkjungle-medium/j2.iob b/objects/trees/jungle/vgeneric10.iob similarity index 100% rename from objects/darkjungle-medium/j2.iob rename to objects/trees/jungle/vgeneric10.iob diff --git a/objects/darkjungle-medium/j3.iob b/objects/trees/jungle/vgeneric11.iob similarity index 100% rename from objects/darkjungle-medium/j3.iob rename to objects/trees/jungle/vgeneric11.iob diff --git a/objects/darkjungle-medium/J4.iob b/objects/trees/jungle/vgeneric12.iob similarity index 100% rename from objects/darkjungle-medium/J4.iob rename to objects/trees/jungle/vgeneric12.iob diff --git a/objects/darkjungle-medium/J5.iob b/objects/trees/jungle/vgeneric13.iob similarity index 100% rename from objects/darkjungle-medium/J5.iob rename to objects/trees/jungle/vgeneric13.iob diff --git a/objects/darkjungle-medium/J6.iob b/objects/trees/jungle/vgeneric14.iob similarity index 100% rename from objects/darkjungle-medium/J6.iob rename to objects/trees/jungle/vgeneric14.iob diff --git a/objects/darkjungle-medium/J7.iob b/objects/trees/jungle/vgeneric15.iob similarity index 100% rename from objects/darkjungle-medium/J7.iob rename to objects/trees/jungle/vgeneric15.iob diff --git a/objects/tree/jungle/3.iob b/objects/trees/jungle/vgeneric16.iob similarity index 100% rename from objects/tree/jungle/3.iob rename to objects/trees/jungle/vgeneric16.iob diff --git a/objects/tree/jungle/4.iob b/objects/trees/jungle/vgeneric17.iob similarity index 100% rename from objects/tree/jungle/4.iob rename to objects/trees/jungle/vgeneric17.iob diff --git a/objects/tree/jungle/5.iob b/objects/trees/jungle/vgeneric18.iob similarity index 100% rename from objects/tree/jungle/5.iob rename to objects/trees/jungle/vgeneric18.iob diff --git a/objects/tree/jungle/6.iob b/objects/trees/jungle/vgeneric19.iob similarity index 100% rename from objects/tree/jungle/6.iob rename to objects/trees/jungle/vgeneric19.iob diff --git a/objects/darkjungle-large/JunLarge2.iob b/objects/trees/jungle/vgeneric2.iob similarity index 100% rename from objects/darkjungle-large/JunLarge2.iob rename to objects/trees/jungle/vgeneric2.iob diff --git a/objects/tree/jungle/7.iob b/objects/trees/jungle/vgeneric20.iob similarity index 100% rename from objects/tree/jungle/7.iob rename to objects/trees/jungle/vgeneric20.iob diff --git a/objects/tree/jungle/8.iob b/objects/trees/jungle/vgeneric21.iob similarity index 100% rename from objects/tree/jungle/8.iob rename to objects/trees/jungle/vgeneric21.iob diff --git a/objects/tree/jungle/9.iob b/objects/trees/jungle/vgeneric22.iob similarity index 100% rename from objects/tree/jungle/9.iob rename to objects/trees/jungle/vgeneric22.iob diff --git a/objects/darkjungle-large/JunLarge3.iob b/objects/trees/jungle/vgeneric3.iob similarity index 100% rename from objects/darkjungle-large/JunLarge3.iob rename to objects/trees/jungle/vgeneric3.iob diff --git a/objects/darkjungle-large/JunLarge4.iob b/objects/trees/jungle/vgeneric4.iob similarity index 100% rename from objects/darkjungle-large/JunLarge4.iob rename to objects/trees/jungle/vgeneric4.iob diff --git a/objects/darkjungle-medium/J11.iob b/objects/trees/jungle/vgeneric5.iob similarity index 100% rename from objects/darkjungle-medium/J11.iob rename to objects/trees/jungle/vgeneric5.iob diff --git a/objects/darkjungle-medium/J8.iob b/objects/trees/jungle/vgeneric6.iob similarity index 100% rename from objects/darkjungle-medium/J8.iob rename to objects/trees/jungle/vgeneric6.iob diff --git a/objects/darkjungle-medium/J9.iob b/objects/trees/jungle/vgeneric7.iob similarity index 100% rename from objects/darkjungle-medium/J9.iob rename to objects/trees/jungle/vgeneric7.iob diff --git a/objects/darkjungle-medium/J12.iob b/objects/trees/jungle/vgeneric8.iob similarity index 100% rename from objects/darkjungle-medium/J12.iob rename to objects/trees/jungle/vgeneric8.iob diff --git a/objects/darkjungle-medium/J13.iob b/objects/trees/jungle/vgeneric9.iob similarity index 100% rename from objects/darkjungle-medium/J13.iob rename to objects/trees/jungle/vgeneric9.iob diff --git a/objects/mushroom-black/BMush1.iob b/objects/trees/mushroom/blackgeneric1.iob similarity index 100% rename from objects/mushroom-black/BMush1.iob rename to objects/trees/mushroom/blackgeneric1.iob diff --git a/objects/mushroom-black/BMush9.iob b/objects/trees/mushroom/blackgeneric10.iob similarity index 100% rename from objects/mushroom-black/BMush9.iob rename to objects/trees/mushroom/blackgeneric10.iob diff --git a/objects/mushroom-black/BMush10.iob b/objects/trees/mushroom/blackgeneric2.iob similarity index 100% rename from objects/mushroom-black/BMush10.iob rename to objects/trees/mushroom/blackgeneric2.iob diff --git a/objects/mushroom-black/BMush2.iob b/objects/trees/mushroom/blackgeneric3.iob similarity index 100% rename from objects/mushroom-black/BMush2.iob rename to objects/trees/mushroom/blackgeneric3.iob diff --git a/objects/mushroom-black/BMush3.iob b/objects/trees/mushroom/blackgeneric4.iob similarity index 100% rename from objects/mushroom-black/BMush3.iob rename to objects/trees/mushroom/blackgeneric4.iob diff --git a/objects/mushroom-black/BMush4.iob b/objects/trees/mushroom/blackgeneric5.iob similarity index 100% rename from objects/mushroom-black/BMush4.iob rename to objects/trees/mushroom/blackgeneric5.iob diff --git a/objects/mushroom-black/BMush5.iob b/objects/trees/mushroom/blackgeneric6.iob similarity index 100% rename from objects/mushroom-black/BMush5.iob rename to objects/trees/mushroom/blackgeneric6.iob diff --git a/objects/mushroom-black/BMush6.iob b/objects/trees/mushroom/blackgeneric7.iob similarity index 100% rename from objects/mushroom-black/BMush6.iob rename to objects/trees/mushroom/blackgeneric7.iob diff --git a/objects/mushroom-black/BMush7.iob b/objects/trees/mushroom/blackgeneric8.iob similarity index 100% rename from objects/mushroom-black/BMush7.iob rename to objects/trees/mushroom/blackgeneric8.iob diff --git a/objects/mushroom-black/BMush8.iob b/objects/trees/mushroom/blackgeneric9.iob similarity index 100% rename from objects/mushroom-black/BMush8.iob rename to objects/trees/mushroom/blackgeneric9.iob diff --git a/objects/mushroom-red/organell-b-1.iob b/objects/trees/mushroom/browngeneric1.iob similarity index 100% rename from objects/mushroom-red/organell-b-1.iob rename to objects/trees/mushroom/browngeneric1.iob diff --git a/objects/mushroom-red/organell-b-2.iob b/objects/trees/mushroom/browngeneric2.iob similarity index 100% rename from objects/mushroom-red/organell-b-2.iob rename to objects/trees/mushroom/browngeneric2.iob diff --git a/objects/corrupted/crimsonwood-1.iob b/objects/trees/mushroom/crimsonwood-1.iob similarity index 100% rename from objects/corrupted/crimsonwood-1.iob rename to objects/trees/mushroom/crimsonwood-1.iob diff --git a/objects/corrupted/crimsonwood-2.iob b/objects/trees/mushroom/crimsonwood-2.iob similarity index 100% rename from objects/corrupted/crimsonwood-2.iob rename to objects/trees/mushroom/crimsonwood-2.iob diff --git a/objects/corrupted/crimsonwood-3.iob b/objects/trees/mushroom/crimsonwood-3.iob similarity index 100% rename from objects/corrupted/crimsonwood-3.iob rename to objects/trees/mushroom/crimsonwood-3.iob diff --git a/objects/corrupted/crimsonwood-4.iob b/objects/trees/mushroom/crimsonwood-4.iob similarity index 100% rename from objects/corrupted/crimsonwood-4.iob rename to objects/trees/mushroom/crimsonwood-4.iob diff --git a/objects/corrupted/crimsonwood-5.iob b/objects/trees/mushroom/crimsonwood-5.iob similarity index 100% rename from objects/corrupted/crimsonwood-5.iob rename to objects/trees/mushroom/crimsonwood-5.iob diff --git a/objects/mushroom-red/fantasy_mushroom_red1.iob b/objects/trees/mushroom/fantasygenericred1.iob similarity index 100% rename from objects/mushroom-red/fantasy_mushroom_red1.iob rename to objects/trees/mushroom/fantasygenericred1.iob diff --git a/objects/mushroom-red/fantasy_mushroom_red2.iob b/objects/trees/mushroom/fantasygenericred2.iob similarity index 100% rename from objects/mushroom-red/fantasy_mushroom_red2.iob rename to objects/trees/mushroom/fantasygenericred2.iob diff --git a/objects/mushroom-red/fantasy_mushroom_red3.iob b/objects/trees/mushroom/fantasygenericred3.iob similarity index 100% rename from objects/mushroom-red/fantasy_mushroom_red3.iob rename to objects/trees/mushroom/fantasygenericred3.iob diff --git a/objects/mushroom-red/fantasy_mushroom_red4.iob b/objects/trees/mushroom/fantasygenericred4.iob similarity index 100% rename from objects/mushroom-red/fantasy_mushroom_red4.iob rename to objects/trees/mushroom/fantasygenericred4.iob diff --git a/objects/wonderland/froShroom-1.iob b/objects/trees/mushroom/froShroom-1.iob similarity index 100% rename from objects/wonderland/froShroom-1.iob rename to objects/trees/mushroom/froShroom-1.iob diff --git a/objects/wonderland/froShroom-2.iob b/objects/trees/mushroom/froShroom-2.iob similarity index 100% rename from objects/wonderland/froShroom-2.iob rename to objects/trees/mushroom/froShroom-2.iob diff --git a/objects/wonderland/froShroom-3.iob b/objects/trees/mushroom/froShroom-3.iob similarity index 100% rename from objects/wonderland/froShroom-3.iob rename to objects/trees/mushroom/froShroom-3.iob diff --git a/objects/wonderland/froShroom-4.iob b/objects/trees/mushroom/froShroom-4.iob similarity index 100% rename from objects/wonderland/froShroom-4.iob rename to objects/trees/mushroom/froShroom-4.iob diff --git a/objects/wonderland/froShroom-5.iob b/objects/trees/mushroom/froShroom-5.iob similarity index 100% rename from objects/wonderland/froShroom-5.iob rename to objects/trees/mushroom/froShroom-5.iob diff --git a/objects/wonderland/froShroom-6.iob b/objects/trees/mushroom/froShroom-6.iob similarity index 100% rename from objects/wonderland/froShroom-6.iob rename to objects/trees/mushroom/froShroom-6.iob diff --git a/objects/wonderland/froShroom-7.iob b/objects/trees/mushroom/froShroom-7.iob similarity index 100% rename from objects/wonderland/froShroom-7.iob rename to objects/trees/mushroom/froShroom-7.iob diff --git a/objects/wonderland/froShroom-8.iob b/objects/trees/mushroom/froShroom-8.iob similarity index 100% rename from objects/wonderland/froShroom-8.iob rename to objects/trees/mushroom/froShroom-8.iob diff --git a/objects/wonderland/froShroom-9.iob b/objects/trees/mushroom/froShroom-9.iob similarity index 100% rename from objects/wonderland/froShroom-9.iob rename to objects/trees/mushroom/froShroom-9.iob diff --git a/objects/mushroom-gray/GMush1.iob b/objects/trees/mushroom/greygeneric1.iob similarity index 100% rename from objects/mushroom-gray/GMush1.iob rename to objects/trees/mushroom/greygeneric1.iob diff --git a/objects/mushroom-gray/GMush2.iob b/objects/trees/mushroom/greygeneric2.iob similarity index 100% rename from objects/mushroom-gray/GMush2.iob rename to objects/trees/mushroom/greygeneric2.iob diff --git a/objects/mushroom-gray/GMush3.iob b/objects/trees/mushroom/greygeneric3.iob similarity index 100% rename from objects/mushroom-gray/GMush3.iob rename to objects/trees/mushroom/greygeneric3.iob diff --git a/objects/mushroom-gray/GMush4.iob b/objects/trees/mushroom/greygeneric4.iob similarity index 100% rename from objects/mushroom-gray/GMush4.iob rename to objects/trees/mushroom/greygeneric4.iob diff --git a/objects/mushroom-gray/GMush5.iob b/objects/trees/mushroom/greygeneric5.iob similarity index 100% rename from objects/mushroom-gray/GMush5.iob rename to objects/trees/mushroom/greygeneric5.iob diff --git a/objects/mushroom-gray/GMush6.iob b/objects/trees/mushroom/greygeneric6.iob similarity index 100% rename from objects/mushroom-gray/GMush6.iob rename to objects/trees/mushroom/greygeneric6.iob diff --git a/objects/mushroom-gray/GMush8.iob b/objects/trees/mushroom/greygeneric7.iob similarity index 100% rename from objects/mushroom-gray/GMush8.iob rename to objects/trees/mushroom/greygeneric7.iob diff --git a/objects/mushroom-gray/GMush9.iob b/objects/trees/mushroom/greygeneric8.iob similarity index 100% rename from objects/mushroom-gray/GMush9.iob rename to objects/trees/mushroom/greygeneric8.iob diff --git a/objects/mushroom-ice/ICEMush1.iob b/objects/trees/mushroom/ice1.iob similarity index 100% rename from objects/mushroom-ice/ICEMush1.iob rename to objects/trees/mushroom/ice1.iob diff --git a/objects/mushroom-ice/ICEMush2.iob b/objects/trees/mushroom/ice2.iob similarity index 100% rename from objects/mushroom-ice/ICEMush2.iob rename to objects/trees/mushroom/ice2.iob diff --git a/objects/mushroom-ice/ICEMush3.iob b/objects/trees/mushroom/ice3.iob similarity index 100% rename from objects/mushroom-ice/ICEMush3.iob rename to objects/trees/mushroom/ice3.iob diff --git a/objects/mushroom-ice/ICEMush4.iob b/objects/trees/mushroom/ice4.iob similarity index 100% rename from objects/mushroom-ice/ICEMush4.iob rename to objects/trees/mushroom/ice4.iob diff --git a/objects/mushroom-ice/ICEMush5.iob b/objects/trees/mushroom/ice5.iob similarity index 100% rename from objects/mushroom-ice/ICEMush5.iob rename to objects/trees/mushroom/ice5.iob diff --git a/objects/mushroom-ice/ICEMush6.iob b/objects/trees/mushroom/ice6.iob similarity index 100% rename from objects/mushroom-ice/ICEMush6.iob rename to objects/trees/mushroom/ice6.iob diff --git a/objects/mushroom-ice/ICEMush7.iob b/objects/trees/mushroom/ice7.iob similarity index 100% rename from objects/mushroom-ice/ICEMush7.iob rename to objects/trees/mushroom/ice7.iob diff --git a/objects/mushroom-ice/ICEMush8.iob b/objects/trees/mushroom/ice8.iob similarity index 100% rename from objects/mushroom-ice/ICEMush8.iob rename to objects/trees/mushroom/ice8.iob diff --git a/objects/mushroom-ice/ICEMush9.iob b/objects/trees/mushroom/ice9.iob similarity index 100% rename from objects/mushroom-ice/ICEMush9.iob rename to objects/trees/mushroom/ice9.iob diff --git a/objects/lumoshroom/subnauti-1.iob b/objects/trees/mushroom/lumo1.iob similarity index 100% rename from objects/lumoshroom/subnauti-1.iob rename to objects/trees/mushroom/lumo1.iob diff --git a/objects/lumoshroom/subnauti-10.iob b/objects/trees/mushroom/lumo10.iob similarity index 100% rename from objects/lumoshroom/subnauti-10.iob rename to objects/trees/mushroom/lumo10.iob diff --git a/objects/lumoshroom/subnauti-2.iob b/objects/trees/mushroom/lumo2.iob similarity index 100% rename from objects/lumoshroom/subnauti-2.iob rename to objects/trees/mushroom/lumo2.iob diff --git a/objects/lumoshroom/subnauti-3.iob b/objects/trees/mushroom/lumo3.iob similarity index 100% rename from objects/lumoshroom/subnauti-3.iob rename to objects/trees/mushroom/lumo3.iob diff --git a/objects/lumoshroom/subnauti-4.iob b/objects/trees/mushroom/lumo4.iob similarity index 100% rename from objects/lumoshroom/subnauti-4.iob rename to objects/trees/mushroom/lumo4.iob diff --git a/objects/lumoshroom/subnauti-5.iob b/objects/trees/mushroom/lumo5.iob similarity index 100% rename from objects/lumoshroom/subnauti-5.iob rename to objects/trees/mushroom/lumo5.iob diff --git a/objects/lumoshroom/subnauti-6.iob b/objects/trees/mushroom/lumo6.iob similarity index 100% rename from objects/lumoshroom/subnauti-6.iob rename to objects/trees/mushroom/lumo6.iob diff --git a/objects/lumoshroom/subnauti-7.iob b/objects/trees/mushroom/lumo7.iob similarity index 100% rename from objects/lumoshroom/subnauti-7.iob rename to objects/trees/mushroom/lumo7.iob diff --git a/objects/lumoshroom/subnauti-8.iob b/objects/trees/mushroom/lumo8.iob similarity index 100% rename from objects/lumoshroom/subnauti-8.iob rename to objects/trees/mushroom/lumo8.iob diff --git a/objects/lumoshroom/subnauti-9.iob b/objects/trees/mushroom/lumo9.iob similarity index 100% rename from objects/lumoshroom/subnauti-9.iob rename to objects/trees/mushroom/lumo9.iob diff --git a/objects/mushroom-red/small-organell-r-1.iob b/objects/trees/mushroom/mushclut1.iob similarity index 100% rename from objects/mushroom-red/small-organell-r-1.iob rename to objects/trees/mushroom/mushclut1.iob diff --git a/objects/mushroom-red/small-organell-r-9.iob b/objects/trees/mushroom/mushclut10.iob similarity index 100% rename from objects/mushroom-red/small-organell-r-9.iob rename to objects/trees/mushroom/mushclut10.iob diff --git a/objects/mushroom-red/small-organell-r-10.iob b/objects/trees/mushroom/mushclut2.iob similarity index 100% rename from objects/mushroom-red/small-organell-r-10.iob rename to objects/trees/mushroom/mushclut2.iob diff --git a/objects/mushroom-red/small-organell-r-2.iob b/objects/trees/mushroom/mushclut3.iob similarity index 100% rename from objects/mushroom-red/small-organell-r-2.iob rename to objects/trees/mushroom/mushclut3.iob diff --git a/objects/mushroom-red/small-organell-r-3.iob b/objects/trees/mushroom/mushclut4.iob similarity index 100% rename from objects/mushroom-red/small-organell-r-3.iob rename to objects/trees/mushroom/mushclut4.iob diff --git a/objects/mushroom-red/small-organell-r-4.iob b/objects/trees/mushroom/mushclut5.iob similarity index 100% rename from objects/mushroom-red/small-organell-r-4.iob rename to objects/trees/mushroom/mushclut5.iob diff --git a/objects/mushroom-red/small-organell-r-5.iob b/objects/trees/mushroom/mushclut6.iob similarity index 100% rename from objects/mushroom-red/small-organell-r-5.iob rename to objects/trees/mushroom/mushclut6.iob diff --git a/objects/mushroom-red/small-organell-r-6.iob b/objects/trees/mushroom/mushclut7.iob similarity index 100% rename from objects/mushroom-red/small-organell-r-6.iob rename to objects/trees/mushroom/mushclut7.iob diff --git a/objects/mushroom-red/small-organell-r-7.iob b/objects/trees/mushroom/mushclut8.iob similarity index 100% rename from objects/mushroom-red/small-organell-r-7.iob rename to objects/trees/mushroom/mushclut8.iob diff --git a/objects/mushroom-red/small-organell-r-8.iob b/objects/trees/mushroom/mushclut9.iob similarity index 100% rename from objects/mushroom-red/small-organell-r-8.iob rename to objects/trees/mushroom/mushclut9.iob diff --git a/objects/mushroom-purple/PMush1.iob b/objects/trees/mushroom/purplegeneric1.iob similarity index 100% rename from objects/mushroom-purple/PMush1.iob rename to objects/trees/mushroom/purplegeneric1.iob diff --git a/objects/mushroom-purple/PMush9.iob b/objects/trees/mushroom/purplegeneric10.iob similarity index 100% rename from objects/mushroom-purple/PMush9.iob rename to objects/trees/mushroom/purplegeneric10.iob diff --git a/objects/mushroom-purple/PMush10.iob b/objects/trees/mushroom/purplegeneric2.iob similarity index 100% rename from objects/mushroom-purple/PMush10.iob rename to objects/trees/mushroom/purplegeneric2.iob diff --git a/objects/mushroom-purple/PMush2.iob b/objects/trees/mushroom/purplegeneric3.iob similarity index 100% rename from objects/mushroom-purple/PMush2.iob rename to objects/trees/mushroom/purplegeneric3.iob diff --git a/objects/mushroom-purple/PMush3.iob b/objects/trees/mushroom/purplegeneric4.iob similarity index 100% rename from objects/mushroom-purple/PMush3.iob rename to objects/trees/mushroom/purplegeneric4.iob diff --git a/objects/mushroom-purple/PMush4.iob b/objects/trees/mushroom/purplegeneric5.iob similarity index 100% rename from objects/mushroom-purple/PMush4.iob rename to objects/trees/mushroom/purplegeneric5.iob diff --git a/objects/mushroom-purple/PMush5.iob b/objects/trees/mushroom/purplegeneric6.iob similarity index 100% rename from objects/mushroom-purple/PMush5.iob rename to objects/trees/mushroom/purplegeneric6.iob diff --git a/objects/mushroom-purple/PMush6.iob b/objects/trees/mushroom/purplegeneric7.iob similarity index 100% rename from objects/mushroom-purple/PMush6.iob rename to objects/trees/mushroom/purplegeneric7.iob diff --git a/objects/mushroom-purple/PMush7.iob b/objects/trees/mushroom/purplegeneric8.iob similarity index 100% rename from objects/mushroom-purple/PMush7.iob rename to objects/trees/mushroom/purplegeneric8.iob diff --git a/objects/mushroom-purple/PMush8.iob b/objects/trees/mushroom/purplegeneric9.iob similarity index 100% rename from objects/mushroom-purple/PMush8.iob rename to objects/trees/mushroom/purplegeneric9.iob diff --git a/objects/mushroom-red/organell-r-1.iob b/objects/trees/mushroom/redgeneric1.iob similarity index 100% rename from objects/mushroom-red/organell-r-1.iob rename to objects/trees/mushroom/redgeneric1.iob diff --git a/objects/mushroom-red/organell-r-8.iob b/objects/trees/mushroom/redgeneric10.iob similarity index 100% rename from objects/mushroom-red/organell-r-8.iob rename to objects/trees/mushroom/redgeneric10.iob diff --git a/objects/mushroom-red/organell-r-9.iob b/objects/trees/mushroom/redgeneric11.iob similarity index 100% rename from objects/mushroom-red/organell-r-9.iob rename to objects/trees/mushroom/redgeneric11.iob diff --git a/objects/mushroom-red/organell-r-10.iob b/objects/trees/mushroom/redgeneric2.iob similarity index 100% rename from objects/mushroom-red/organell-r-10.iob rename to objects/trees/mushroom/redgeneric2.iob diff --git a/objects/mushroom-red/organell-r-11.iob b/objects/trees/mushroom/redgeneric3.iob similarity index 100% rename from objects/mushroom-red/organell-r-11.iob rename to objects/trees/mushroom/redgeneric3.iob diff --git a/objects/mushroom-red/organell-r-2.iob b/objects/trees/mushroom/redgeneric4.iob similarity index 100% rename from objects/mushroom-red/organell-r-2.iob rename to objects/trees/mushroom/redgeneric4.iob diff --git a/objects/mushroom-red/organell-r-3.iob b/objects/trees/mushroom/redgeneric5.iob similarity index 100% rename from objects/mushroom-red/organell-r-3.iob rename to objects/trees/mushroom/redgeneric5.iob diff --git a/objects/mushroom-red/organell-r-4.iob b/objects/trees/mushroom/redgeneric6.iob similarity index 100% rename from objects/mushroom-red/organell-r-4.iob rename to objects/trees/mushroom/redgeneric6.iob diff --git a/objects/mushroom-red/organell-r-5.iob b/objects/trees/mushroom/redgeneric7.iob similarity index 100% rename from objects/mushroom-red/organell-r-5.iob rename to objects/trees/mushroom/redgeneric7.iob diff --git a/objects/mushroom-red/organell-r-6.iob b/objects/trees/mushroom/redgeneric8.iob similarity index 100% rename from objects/mushroom-red/organell-r-6.iob rename to objects/trees/mushroom/redgeneric8.iob diff --git a/objects/mushroom-red/organell-r-7.iob b/objects/trees/mushroom/redgeneric9.iob similarity index 100% rename from objects/mushroom-red/organell-r-7.iob rename to objects/trees/mushroom/redgeneric9.iob diff --git a/objects/mushroom-red/illuminorganell-r-1.iob b/objects/trees/mushroom/redlumotall1.iob similarity index 100% rename from objects/mushroom-red/illuminorganell-r-1.iob rename to objects/trees/mushroom/redlumotall1.iob diff --git a/objects/mushroom-red/illuminorganell-r-8.iob b/objects/trees/mushroom/redlumotall10.iob similarity index 100% rename from objects/mushroom-red/illuminorganell-r-8.iob rename to objects/trees/mushroom/redlumotall10.iob diff --git a/objects/mushroom-red/illuminorganell-r-9.iob b/objects/trees/mushroom/redlumotall11.iob similarity index 100% rename from objects/mushroom-red/illuminorganell-r-9.iob rename to objects/trees/mushroom/redlumotall11.iob diff --git a/objects/mushroom-red/illuminorganell-r-10.iob b/objects/trees/mushroom/redlumotall2.iob similarity index 100% rename from objects/mushroom-red/illuminorganell-r-10.iob rename to objects/trees/mushroom/redlumotall2.iob diff --git a/objects/mushroom-red/illuminorganell-r-11.iob b/objects/trees/mushroom/redlumotall3.iob similarity index 100% rename from objects/mushroom-red/illuminorganell-r-11.iob rename to objects/trees/mushroom/redlumotall3.iob diff --git a/objects/mushroom-red/illuminorganell-r-2.iob b/objects/trees/mushroom/redlumotall4.iob similarity index 100% rename from objects/mushroom-red/illuminorganell-r-2.iob rename to objects/trees/mushroom/redlumotall4.iob diff --git a/objects/mushroom-red/illuminorganell-r-3.iob b/objects/trees/mushroom/redlumotall5.iob similarity index 100% rename from objects/mushroom-red/illuminorganell-r-3.iob rename to objects/trees/mushroom/redlumotall5.iob diff --git a/objects/mushroom-red/illuminorganell-r-4.iob b/objects/trees/mushroom/redlumotall6.iob similarity index 100% rename from objects/mushroom-red/illuminorganell-r-4.iob rename to objects/trees/mushroom/redlumotall6.iob diff --git a/objects/mushroom-red/illuminorganell-r-5.iob b/objects/trees/mushroom/redlumotall7.iob similarity index 100% rename from objects/mushroom-red/illuminorganell-r-5.iob rename to objects/trees/mushroom/redlumotall7.iob diff --git a/objects/mushroom-red/illuminorganell-r-6.iob b/objects/trees/mushroom/redlumotall8.iob similarity index 100% rename from objects/mushroom-red/illuminorganell-r-6.iob rename to objects/trees/mushroom/redlumotall8.iob diff --git a/objects/mushroom-red/illuminorganell-r-7.iob b/objects/trees/mushroom/redlumotall9.iob similarity index 100% rename from objects/mushroom-red/illuminorganell-r-7.iob rename to objects/trees/mushroom/redlumotall9.iob diff --git a/objects/shroom/mushclutt1.iob b/objects/trees/mushroom/smolshroom1.iob similarity index 100% rename from objects/shroom/mushclutt1.iob rename to objects/trees/mushroom/smolshroom1.iob diff --git a/objects/shroom/mushclutt2.iob b/objects/trees/mushroom/smolshroom2.iob similarity index 100% rename from objects/shroom/mushclutt2.iob rename to objects/trees/mushroom/smolshroom2.iob diff --git a/objects/shroom/mushclutt3.iob b/objects/trees/mushroom/smolshroom3.iob similarity index 100% rename from objects/shroom/mushclutt3.iob rename to objects/trees/mushroom/smolshroom3.iob diff --git a/objects/shroom/mushclutt4.iob b/objects/trees/mushroom/smolshroom4.iob similarity index 100% rename from objects/shroom/mushclutt4.iob rename to objects/trees/mushroom/smolshroom4.iob diff --git a/objects/shroom/mushclutt5.iob b/objects/trees/mushroom/smolshroom5.iob similarity index 100% rename from objects/shroom/mushclutt5.iob rename to objects/trees/mushroom/smolshroom5.iob diff --git a/objects/corrupted/warpedwood-1.iob b/objects/trees/mushroom/warped1.iob similarity index 100% rename from objects/corrupted/warpedwood-1.iob rename to objects/trees/mushroom/warped1.iob diff --git a/objects/corrupted/warpedwood-2.iob b/objects/trees/mushroom/warped2.iob similarity index 100% rename from objects/corrupted/warpedwood-2.iob rename to objects/trees/mushroom/warped2.iob diff --git a/objects/corrupted/warpedwood-3.iob b/objects/trees/mushroom/warped3.iob similarity index 100% rename from objects/corrupted/warpedwood-3.iob rename to objects/trees/mushroom/warped3.iob diff --git a/objects/corrupted/warpedwood-4.iob b/objects/trees/mushroom/warped4.iob similarity index 100% rename from objects/corrupted/warpedwood-4.iob rename to objects/trees/mushroom/warped4.iob diff --git a/objects/corrupted/warpedwood-5.iob b/objects/trees/mushroom/warped5.iob similarity index 100% rename from objects/corrupted/warpedwood-5.iob rename to objects/trees/mushroom/warped5.iob diff --git a/objects/corrupted/warpedwood-6.iob b/objects/trees/mushroom/warped6.iob similarity index 100% rename from objects/corrupted/warpedwood-6.iob rename to objects/trees/mushroom/warped6.iob diff --git a/objects/mushroom-red/RMush1.iob b/objects/trees/mushroom/xredgeneric1.iob similarity index 100% rename from objects/mushroom-red/RMush1.iob rename to objects/trees/mushroom/xredgeneric1.iob diff --git a/objects/mushroom-red/RMush9.iob b/objects/trees/mushroom/xredgeneric10.iob similarity index 100% rename from objects/mushroom-red/RMush9.iob rename to objects/trees/mushroom/xredgeneric10.iob diff --git a/objects/mushroom-red/RMush10.iob b/objects/trees/mushroom/xredgeneric2.iob similarity index 100% rename from objects/mushroom-red/RMush10.iob rename to objects/trees/mushroom/xredgeneric2.iob diff --git a/objects/mushroom-red/RMush2.iob b/objects/trees/mushroom/xredgeneric3.iob similarity index 100% rename from objects/mushroom-red/RMush2.iob rename to objects/trees/mushroom/xredgeneric3.iob diff --git a/objects/mushroom-red/RMush3.iob b/objects/trees/mushroom/xredgeneric4.iob similarity index 100% rename from objects/mushroom-red/RMush3.iob rename to objects/trees/mushroom/xredgeneric4.iob diff --git a/objects/mushroom-red/RMush4.iob b/objects/trees/mushroom/xredgeneric5.iob similarity index 100% rename from objects/mushroom-red/RMush4.iob rename to objects/trees/mushroom/xredgeneric5.iob diff --git a/objects/mushroom-red/RMush5.iob b/objects/trees/mushroom/xredgeneric6.iob similarity index 100% rename from objects/mushroom-red/RMush5.iob rename to objects/trees/mushroom/xredgeneric6.iob diff --git a/objects/mushroom-red/RMush6.iob b/objects/trees/mushroom/xredgeneric7.iob similarity index 100% rename from objects/mushroom-red/RMush6.iob rename to objects/trees/mushroom/xredgeneric7.iob diff --git a/objects/mushroom-red/RMush7.iob b/objects/trees/mushroom/xredgeneric8.iob similarity index 100% rename from objects/mushroom-red/RMush7.iob rename to objects/trees/mushroom/xredgeneric8.iob diff --git a/objects/mushroom-red/RMush8.iob b/objects/trees/mushroom/xredgeneric9.iob similarity index 100% rename from objects/mushroom-red/RMush8.iob rename to objects/trees/mushroom/xredgeneric9.iob diff --git a/objects/arid-oak/arid-oak1.iob b/objects/trees/oak/arid1.iob similarity index 100% rename from objects/arid-oak/arid-oak1.iob rename to objects/trees/oak/arid1.iob diff --git a/objects/arid-oak/arid-oak2.iob b/objects/trees/oak/arid2.iob similarity index 100% rename from objects/arid-oak/arid-oak2.iob rename to objects/trees/oak/arid2.iob diff --git a/objects/arid-oak/arid-oak3.iob b/objects/trees/oak/arid3.iob similarity index 100% rename from objects/arid-oak/arid-oak3.iob rename to objects/trees/oak/arid3.iob diff --git a/objects/arid-oak/arid-oak4.iob b/objects/trees/oak/arid4.iob similarity index 100% rename from objects/arid-oak/arid-oak4.iob rename to objects/trees/oak/arid4.iob diff --git a/objects/arid-oak/arid-oak5.iob b/objects/trees/oak/arid5.iob similarity index 100% rename from objects/arid-oak/arid-oak5.iob rename to objects/trees/oak/arid5.iob diff --git a/objects/arid-oak/arid-oak6.iob b/objects/trees/oak/arid6.iob similarity index 100% rename from objects/arid-oak/arid-oak6.iob rename to objects/trees/oak/arid6.iob diff --git a/objects/arid-oak/arid-oak7.iob b/objects/trees/oak/arid7.iob similarity index 100% rename from objects/arid-oak/arid-oak7.iob rename to objects/trees/oak/arid7.iob diff --git a/objects/creepy-oak/FantasyOak1.iob b/objects/trees/oak/croak1.iob similarity index 100% rename from objects/creepy-oak/FantasyOak1.iob rename to objects/trees/oak/croak1.iob diff --git a/objects/creepy-oak/FantasyOak18.iob b/objects/trees/oak/croak10.iob similarity index 100% rename from objects/creepy-oak/FantasyOak18.iob rename to objects/trees/oak/croak10.iob diff --git a/objects/creepy-oak/FantasyOak19.iob b/objects/trees/oak/croak11.iob similarity index 100% rename from objects/creepy-oak/FantasyOak19.iob rename to objects/trees/oak/croak11.iob diff --git a/objects/creepy-oak/FantasyOak2.iob b/objects/trees/oak/croak12.iob similarity index 100% rename from objects/creepy-oak/FantasyOak2.iob rename to objects/trees/oak/croak12.iob diff --git a/objects/creepy-oak/FantasyOak3.iob b/objects/trees/oak/croak13.iob similarity index 100% rename from objects/creepy-oak/FantasyOak3.iob rename to objects/trees/oak/croak13.iob diff --git a/objects/creepy-oak/FantasyOak4.iob b/objects/trees/oak/croak14.iob similarity index 100% rename from objects/creepy-oak/FantasyOak4.iob rename to objects/trees/oak/croak14.iob diff --git a/objects/creepy-oak/FantasyOak5.iob b/objects/trees/oak/croak15.iob similarity index 100% rename from objects/creepy-oak/FantasyOak5.iob rename to objects/trees/oak/croak15.iob diff --git a/objects/creepy-oak/FantasyOak6.iob b/objects/trees/oak/croak16.iob similarity index 100% rename from objects/creepy-oak/FantasyOak6.iob rename to objects/trees/oak/croak16.iob diff --git a/objects/creepy-oak/FantasyOak7.iob b/objects/trees/oak/croak17.iob similarity index 100% rename from objects/creepy-oak/FantasyOak7.iob rename to objects/trees/oak/croak17.iob diff --git a/objects/creepy-oak/FantasyOak8.iob b/objects/trees/oak/croak18.iob similarity index 100% rename from objects/creepy-oak/FantasyOak8.iob rename to objects/trees/oak/croak18.iob diff --git a/objects/creepy-oak/FantasyOak9.iob b/objects/trees/oak/croak19.iob similarity index 100% rename from objects/creepy-oak/FantasyOak9.iob rename to objects/trees/oak/croak19.iob diff --git a/objects/creepy-oak/FantasyOak10.iob b/objects/trees/oak/croak2.iob similarity index 100% rename from objects/creepy-oak/FantasyOak10.iob rename to objects/trees/oak/croak2.iob diff --git a/objects/creepy-oak/FantasyOak11.iob b/objects/trees/oak/croak3.iob similarity index 100% rename from objects/creepy-oak/FantasyOak11.iob rename to objects/trees/oak/croak3.iob diff --git a/objects/creepy-oak/FantasyOak12.iob b/objects/trees/oak/croak4.iob similarity index 100% rename from objects/creepy-oak/FantasyOak12.iob rename to objects/trees/oak/croak4.iob diff --git a/objects/creepy-oak/FantasyOak13.iob b/objects/trees/oak/croak5.iob similarity index 100% rename from objects/creepy-oak/FantasyOak13.iob rename to objects/trees/oak/croak5.iob diff --git a/objects/creepy-oak/FantasyOak14.iob b/objects/trees/oak/croak6.iob similarity index 100% rename from objects/creepy-oak/FantasyOak14.iob rename to objects/trees/oak/croak6.iob diff --git a/objects/creepy-oak/FantasyOak15.iob b/objects/trees/oak/croak7.iob similarity index 100% rename from objects/creepy-oak/FantasyOak15.iob rename to objects/trees/oak/croak7.iob diff --git a/objects/creepy-oak/FantasyOak16.iob b/objects/trees/oak/croak8.iob similarity index 100% rename from objects/creepy-oak/FantasyOak16.iob rename to objects/trees/oak/croak8.iob diff --git a/objects/creepy-oak/FantasyOak17.iob b/objects/trees/oak/croak9.iob similarity index 100% rename from objects/creepy-oak/FantasyOak17.iob rename to objects/trees/oak/croak9.iob diff --git a/objects/deadwood/dadwood1.iob b/objects/trees/oak/dadwood1.iob similarity index 100% rename from objects/deadwood/dadwood1.iob rename to objects/trees/oak/dadwood1.iob diff --git a/objects/deadwood/dadwood2.iob b/objects/trees/oak/dadwood2.iob similarity index 100% rename from objects/deadwood/dadwood2.iob rename to objects/trees/oak/dadwood2.iob diff --git a/objects/deadwood/dadwood3.iob b/objects/trees/oak/dadwood3.iob similarity index 100% rename from objects/deadwood/dadwood3.iob rename to objects/trees/oak/dadwood3.iob diff --git a/objects/deadwood/dadwood4.iob b/objects/trees/oak/dadwood4.iob similarity index 100% rename from objects/deadwood/dadwood4.iob rename to objects/trees/oak/dadwood4.iob diff --git a/objects/deadwood/dadwood5.iob b/objects/trees/oak/dadwood5.iob similarity index 100% rename from objects/deadwood/dadwood5.iob rename to objects/trees/oak/dadwood5.iob diff --git a/objects/deadwood/dadwood6.iob b/objects/trees/oak/dadwood6.iob similarity index 100% rename from objects/deadwood/dadwood6.iob rename to objects/trees/oak/dadwood6.iob diff --git a/objects/wasteland/dead-1.iob b/objects/trees/oak/dead-1.iob similarity index 100% rename from objects/wasteland/dead-1.iob rename to objects/trees/oak/dead-1.iob diff --git a/objects/wasteland/dead-2.iob b/objects/trees/oak/dead-2.iob similarity index 100% rename from objects/wasteland/dead-2.iob rename to objects/trees/oak/dead-2.iob diff --git a/objects/wasteland/dead-3.iob b/objects/trees/oak/dead-3.iob similarity index 100% rename from objects/wasteland/dead-3.iob rename to objects/trees/oak/dead-3.iob diff --git a/objects/wasteland/dead-4.iob b/objects/trees/oak/dead-4.iob similarity index 100% rename from objects/wasteland/dead-4.iob rename to objects/trees/oak/dead-4.iob diff --git a/objects/wasteland/dead-5.iob b/objects/trees/oak/dead-5.iob similarity index 100% rename from objects/wasteland/dead-5.iob rename to objects/trees/oak/dead-5.iob diff --git a/objects/wasteland/dead-6.iob b/objects/trees/oak/dead-6.iob similarity index 100% rename from objects/wasteland/dead-6.iob rename to objects/trees/oak/dead-6.iob diff --git a/objects/deadwood-fallen/dead1.iob b/objects/trees/oak/deadfallen1.iob similarity index 100% rename from objects/deadwood-fallen/dead1.iob rename to objects/trees/oak/deadfallen1.iob diff --git a/objects/oak-medium/oak-denmyre-1.iob b/objects/trees/oak/denmyre1.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-1.iob rename to objects/trees/oak/denmyre1.iob diff --git a/objects/oak-medium/oak-denmyre-3.iob b/objects/trees/oak/denmyre10.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-3.iob rename to objects/trees/oak/denmyre10.iob diff --git a/objects/oak-medium/oak-denmyre-4.iob b/objects/trees/oak/denmyre11.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-4.iob rename to objects/trees/oak/denmyre11.iob diff --git a/objects/oak-medium/oak-denmyre-5.iob b/objects/trees/oak/denmyre12.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-5.iob rename to objects/trees/oak/denmyre12.iob diff --git a/objects/oak-medium/oak-denmyre-6.iob b/objects/trees/oak/denmyre13.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-6.iob rename to objects/trees/oak/denmyre13.iob diff --git a/objects/oak-medium/oak-denmyre-7.iob b/objects/trees/oak/denmyre14.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-7.iob rename to objects/trees/oak/denmyre14.iob diff --git a/objects/oak-medium/oak-denmyre-8.iob b/objects/trees/oak/denmyre15.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-8.iob rename to objects/trees/oak/denmyre15.iob diff --git a/objects/oak-medium/oak-denmyre-9.iob b/objects/trees/oak/denmyre16.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-9.iob rename to objects/trees/oak/denmyre16.iob diff --git a/objects/oak-medium/oak-denmyre-10.iob b/objects/trees/oak/denmyre2.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-10.iob rename to objects/trees/oak/denmyre2.iob diff --git a/objects/oak-medium/oak-denmyre-11.iob b/objects/trees/oak/denmyre3.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-11.iob rename to objects/trees/oak/denmyre3.iob diff --git a/objects/oak-medium/oak-denmyre-12.iob b/objects/trees/oak/denmyre4.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-12.iob rename to objects/trees/oak/denmyre4.iob diff --git a/objects/oak-medium/oak-denmyre-13.iob b/objects/trees/oak/denmyre5.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-13.iob rename to objects/trees/oak/denmyre5.iob diff --git a/objects/oak-medium/oak-denmyre-14.iob b/objects/trees/oak/denmyre6.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-14.iob rename to objects/trees/oak/denmyre6.iob diff --git a/objects/oak-medium/oak-denmyre-15.iob b/objects/trees/oak/denmyre7.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-15.iob rename to objects/trees/oak/denmyre7.iob diff --git a/objects/oak-medium/oak-denmyre-16.iob b/objects/trees/oak/denmyre8.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-16.iob rename to objects/trees/oak/denmyre8.iob diff --git a/objects/oak-medium/oak-denmyre-2.iob b/objects/trees/oak/denmyre9.iob similarity index 100% rename from objects/oak-medium/oak-denmyre-2.iob rename to objects/trees/oak/denmyre9.iob diff --git a/objects/fantasyoak-large/fantasy_oak_large1.iob b/objects/trees/oak/foak1.iob similarity index 100% rename from objects/fantasyoak-large/fantasy_oak_large1.iob rename to objects/trees/oak/foak1.iob diff --git a/objects/fantasyoak-medium/fantasy_oak_medium1.iob b/objects/trees/oak/foakm1.iob similarity index 100% rename from objects/fantasyoak-medium/fantasy_oak_medium1.iob rename to objects/trees/oak/foakm1.iob diff --git a/objects/fantasyoak-medium/fantasy_oak_medium2.iob b/objects/trees/oak/foakm2.iob similarity index 100% rename from objects/fantasyoak-medium/fantasy_oak_medium2.iob rename to objects/trees/oak/foakm2.iob diff --git a/objects/fantasyoak-medium/fantasy_oak_medium3.iob b/objects/trees/oak/foakm3.iob similarity index 100% rename from objects/fantasyoak-medium/fantasy_oak_medium3.iob rename to objects/trees/oak/foakm3.iob diff --git a/objects/fantasyoak-medium/fantasy_oak_medium4.iob b/objects/trees/oak/foakm4.iob similarity index 100% rename from objects/fantasyoak-medium/fantasy_oak_medium4.iob rename to objects/trees/oak/foakm4.iob diff --git a/objects/hazel-oak/hoak-1.iob b/objects/trees/oak/hoakgeneric1.iob similarity index 100% rename from objects/hazel-oak/hoak-1.iob rename to objects/trees/oak/hoakgeneric1.iob diff --git a/objects/hazel-oak/hoak-2.iob b/objects/trees/oak/hoakgeneric2.iob similarity index 100% rename from objects/hazel-oak/hoak-2.iob rename to objects/trees/oak/hoakgeneric2.iob diff --git a/objects/hazel-oak/hoak-3.iob b/objects/trees/oak/hoakgeneric3.iob similarity index 100% rename from objects/hazel-oak/hoak-3.iob rename to objects/trees/oak/hoakgeneric3.iob diff --git a/objects/hazel-oak/hoak-4.iob b/objects/trees/oak/hoakgeneric4.iob similarity index 100% rename from objects/hazel-oak/hoak-4.iob rename to objects/trees/oak/hoakgeneric4.iob diff --git a/objects/hazel-oak/hoak-5.iob b/objects/trees/oak/hoakgeneric5.iob similarity index 100% rename from objects/hazel-oak/hoak-5.iob rename to objects/trees/oak/hoakgeneric5.iob diff --git a/objects/hazel-oak/hoak-6.iob b/objects/trees/oak/hoakgeneric6.iob similarity index 100% rename from objects/hazel-oak/hoak-6.iob rename to objects/trees/oak/hoakgeneric6.iob diff --git a/objects/hazel-oak/hoak-7.iob b/objects/trees/oak/hoakgeneric7.iob similarity index 100% rename from objects/hazel-oak/hoak-7.iob rename to objects/trees/oak/hoakgeneric7.iob diff --git a/objects/hazel-oak/hoak-8.iob b/objects/trees/oak/hoakgeneric8.iob similarity index 100% rename from objects/hazel-oak/hoak-8.iob rename to objects/trees/oak/hoakgeneric8.iob diff --git a/objects/hazel-oak/hoak-9.iob b/objects/trees/oak/hoakgeneric9.iob similarity index 100% rename from objects/hazel-oak/hoak-9.iob rename to objects/trees/oak/hoakgeneric9.iob diff --git a/objects/oak-ponderosa/large-1.iob b/objects/trees/oak/lponderosa1.iob similarity index 100% rename from objects/oak-ponderosa/large-1.iob rename to objects/trees/oak/lponderosa1.iob diff --git a/objects/oak-ponderosa/large-4.iob b/objects/trees/oak/lponderosa10.iob similarity index 100% rename from objects/oak-ponderosa/large-4.iob rename to objects/trees/oak/lponderosa10.iob diff --git a/objects/oak-ponderosa/large-5.iob b/objects/trees/oak/lponderosa11.iob similarity index 100% rename from objects/oak-ponderosa/large-5.iob rename to objects/trees/oak/lponderosa11.iob diff --git a/objects/oak-ponderosa/large-6.iob b/objects/trees/oak/lponderosa12.iob similarity index 100% rename from objects/oak-ponderosa/large-6.iob rename to objects/trees/oak/lponderosa12.iob diff --git a/objects/oak-ponderosa/large-7.iob b/objects/trees/oak/lponderosa13.iob similarity index 100% rename from objects/oak-ponderosa/large-7.iob rename to objects/trees/oak/lponderosa13.iob diff --git a/objects/oak-ponderosa/large-8.iob b/objects/trees/oak/lponderosa14.iob similarity index 100% rename from objects/oak-ponderosa/large-8.iob rename to objects/trees/oak/lponderosa14.iob diff --git a/objects/oak-ponderosa/large-9.iob b/objects/trees/oak/lponderosa15.iob similarity index 100% rename from objects/oak-ponderosa/large-9.iob rename to objects/trees/oak/lponderosa15.iob diff --git a/objects/oak-ponderosa/large-10.iob b/objects/trees/oak/lponderosa2.iob similarity index 100% rename from objects/oak-ponderosa/large-10.iob rename to objects/trees/oak/lponderosa2.iob diff --git a/objects/oak-ponderosa/large-11.iob b/objects/trees/oak/lponderosa3.iob similarity index 100% rename from objects/oak-ponderosa/large-11.iob rename to objects/trees/oak/lponderosa3.iob diff --git a/objects/oak-ponderosa/large-12.iob b/objects/trees/oak/lponderosa4.iob similarity index 100% rename from objects/oak-ponderosa/large-12.iob rename to objects/trees/oak/lponderosa4.iob diff --git a/objects/oak-ponderosa/large-13.iob b/objects/trees/oak/lponderosa5.iob similarity index 100% rename from objects/oak-ponderosa/large-13.iob rename to objects/trees/oak/lponderosa5.iob diff --git a/objects/oak-ponderosa/large-14..iob b/objects/trees/oak/lponderosa6.iob similarity index 100% rename from objects/oak-ponderosa/large-14..iob rename to objects/trees/oak/lponderosa6.iob diff --git a/objects/oak-ponderosa/large-15.iob b/objects/trees/oak/lponderosa7.iob similarity index 100% rename from objects/oak-ponderosa/large-15.iob rename to objects/trees/oak/lponderosa7.iob diff --git a/objects/oak-ponderosa/large-2.iob b/objects/trees/oak/lponderosa8.iob similarity index 100% rename from objects/oak-ponderosa/large-2.iob rename to objects/trees/oak/lponderosa8.iob diff --git a/objects/oak-ponderosa/large-3.iob b/objects/trees/oak/lponderosa9.iob similarity index 100% rename from objects/oak-ponderosa/large-3.iob rename to objects/trees/oak/lponderosa9.iob diff --git a/objects/oak-massive/oak1.iob b/objects/trees/oak/massivegeneric1.iob similarity index 100% rename from objects/oak-massive/oak1.iob rename to objects/trees/oak/massivegeneric1.iob diff --git a/objects/oak-massive/oak2.iob b/objects/trees/oak/massivegeneric2.iob similarity index 100% rename from objects/oak-massive/oak2.iob rename to objects/trees/oak/massivegeneric2.iob diff --git a/objects/oak-massive/oak3.iob b/objects/trees/oak/massivegeneric3.iob similarity index 100% rename from objects/oak-massive/oak3.iob rename to objects/trees/oak/massivegeneric3.iob diff --git a/objects/deadwood-massive/dead1.iob b/objects/trees/oak/mdeadwood1.iob similarity index 100% rename from objects/deadwood-massive/dead1.iob rename to objects/trees/oak/mdeadwood1.iob diff --git a/objects/deadwood-massive/dead2.iob b/objects/trees/oak/mdeadwood2.iob similarity index 100% rename from objects/deadwood-massive/dead2.iob rename to objects/trees/oak/mdeadwood2.iob diff --git a/objects/deadwood-massive/dead3.iob b/objects/trees/oak/mdeadwood3.iob similarity index 100% rename from objects/deadwood-massive/dead3.iob rename to objects/trees/oak/mdeadwood3.iob diff --git a/objects/oak-ponderosa/med-1.iob b/objects/trees/oak/mponderosa1.iob similarity index 100% rename from objects/oak-ponderosa/med-1.iob rename to objects/trees/oak/mponderosa1.iob diff --git a/objects/oak-ponderosa/med-18.iob b/objects/trees/oak/mponderosa10.iob similarity index 100% rename from objects/oak-ponderosa/med-18.iob rename to objects/trees/oak/mponderosa10.iob diff --git a/objects/oak-ponderosa/med-19.iob b/objects/trees/oak/mponderosa11.iob similarity index 100% rename from objects/oak-ponderosa/med-19.iob rename to objects/trees/oak/mponderosa11.iob diff --git a/objects/oak-ponderosa/med-2.iob b/objects/trees/oak/mponderosa12.iob similarity index 100% rename from objects/oak-ponderosa/med-2.iob rename to objects/trees/oak/mponderosa12.iob diff --git a/objects/oak-ponderosa/med-20.iob b/objects/trees/oak/mponderosa13.iob similarity index 100% rename from objects/oak-ponderosa/med-20.iob rename to objects/trees/oak/mponderosa13.iob diff --git a/objects/oak-ponderosa/med-3.iob b/objects/trees/oak/mponderosa14.iob similarity index 100% rename from objects/oak-ponderosa/med-3.iob rename to objects/trees/oak/mponderosa14.iob diff --git a/objects/oak-ponderosa/med-4.iob b/objects/trees/oak/mponderosa15.iob similarity index 100% rename from objects/oak-ponderosa/med-4.iob rename to objects/trees/oak/mponderosa15.iob diff --git a/objects/oak-ponderosa/med-5.iob b/objects/trees/oak/mponderosa16.iob similarity index 100% rename from objects/oak-ponderosa/med-5.iob rename to objects/trees/oak/mponderosa16.iob diff --git a/objects/oak-ponderosa/med-6.iob b/objects/trees/oak/mponderosa17.iob similarity index 100% rename from objects/oak-ponderosa/med-6.iob rename to objects/trees/oak/mponderosa17.iob diff --git a/objects/oak-ponderosa/med-7.iob b/objects/trees/oak/mponderosa18.iob similarity index 100% rename from objects/oak-ponderosa/med-7.iob rename to objects/trees/oak/mponderosa18.iob diff --git a/objects/oak-ponderosa/med-8.iob b/objects/trees/oak/mponderosa19.iob similarity index 100% rename from objects/oak-ponderosa/med-8.iob rename to objects/trees/oak/mponderosa19.iob diff --git a/objects/oak-ponderosa/med-10.iob b/objects/trees/oak/mponderosa2.iob similarity index 100% rename from objects/oak-ponderosa/med-10.iob rename to objects/trees/oak/mponderosa2.iob diff --git a/objects/oak-ponderosa/med-9.iob b/objects/trees/oak/mponderosa20.iob similarity index 100% rename from objects/oak-ponderosa/med-9.iob rename to objects/trees/oak/mponderosa20.iob diff --git a/objects/oak-ponderosa/med-11.iob b/objects/trees/oak/mponderosa3.iob similarity index 100% rename from objects/oak-ponderosa/med-11.iob rename to objects/trees/oak/mponderosa3.iob diff --git a/objects/oak-ponderosa/med-12.iob b/objects/trees/oak/mponderosa4.iob similarity index 100% rename from objects/oak-ponderosa/med-12.iob rename to objects/trees/oak/mponderosa4.iob diff --git a/objects/oak-ponderosa/med-13.iob b/objects/trees/oak/mponderosa5.iob similarity index 100% rename from objects/oak-ponderosa/med-13.iob rename to objects/trees/oak/mponderosa5.iob diff --git a/objects/oak-ponderosa/med-14.iob b/objects/trees/oak/mponderosa6.iob similarity index 100% rename from objects/oak-ponderosa/med-14.iob rename to objects/trees/oak/mponderosa6.iob diff --git a/objects/oak-ponderosa/med-15.iob b/objects/trees/oak/mponderosa7.iob similarity index 100% rename from objects/oak-ponderosa/med-15.iob rename to objects/trees/oak/mponderosa7.iob diff --git a/objects/oak-ponderosa/med-16.iob b/objects/trees/oak/mponderosa8.iob similarity index 100% rename from objects/oak-ponderosa/med-16.iob rename to objects/trees/oak/mponderosa8.iob diff --git a/objects/oak-ponderosa/med-17.iob b/objects/trees/oak/mponderosa9.iob similarity index 100% rename from objects/oak-ponderosa/med-17.iob rename to objects/trees/oak/mponderosa9.iob diff --git a/objects/roofed-wayward/med-1.iob b/objects/trees/oak/mroofed1.iob similarity index 100% rename from objects/roofed-wayward/med-1.iob rename to objects/trees/oak/mroofed1.iob diff --git a/objects/roofed-wayward/med-7.iob b/objects/trees/oak/mroofed10.iob similarity index 100% rename from objects/roofed-wayward/med-7.iob rename to objects/trees/oak/mroofed10.iob diff --git a/objects/roofed-wayward/med-8.iob b/objects/trees/oak/mroofed11.iob similarity index 100% rename from objects/roofed-wayward/med-8.iob rename to objects/trees/oak/mroofed11.iob diff --git a/objects/roofed-wayward/med-9.iob b/objects/trees/oak/mroofed12.iob similarity index 100% rename from objects/roofed-wayward/med-9.iob rename to objects/trees/oak/mroofed12.iob diff --git a/objects/roofed-wayward/med-10.iob b/objects/trees/oak/mroofed2.iob similarity index 100% rename from objects/roofed-wayward/med-10.iob rename to objects/trees/oak/mroofed2.iob diff --git a/objects/roofed-wayward/med-11.iob b/objects/trees/oak/mroofed3.iob similarity index 100% rename from objects/roofed-wayward/med-11.iob rename to objects/trees/oak/mroofed3.iob diff --git a/objects/roofed-wayward/med-12.iob b/objects/trees/oak/mroofed4.iob similarity index 100% rename from objects/roofed-wayward/med-12.iob rename to objects/trees/oak/mroofed4.iob diff --git a/objects/roofed-wayward/med-2.iob b/objects/trees/oak/mroofed5.iob similarity index 100% rename from objects/roofed-wayward/med-2.iob rename to objects/trees/oak/mroofed5.iob diff --git a/objects/roofed-wayward/med-3.iob b/objects/trees/oak/mroofed6.iob similarity index 100% rename from objects/roofed-wayward/med-3.iob rename to objects/trees/oak/mroofed6.iob diff --git a/objects/roofed-wayward/med-4.iob b/objects/trees/oak/mroofed7.iob similarity index 100% rename from objects/roofed-wayward/med-4.iob rename to objects/trees/oak/mroofed7.iob diff --git a/objects/roofed-wayward/med-5.iob b/objects/trees/oak/mroofed8.iob similarity index 100% rename from objects/roofed-wayward/med-5.iob rename to objects/trees/oak/mroofed8.iob diff --git a/objects/roofed-wayward/med-6.iob b/objects/trees/oak/mroofed9.iob similarity index 100% rename from objects/roofed-wayward/med-6.iob rename to objects/trees/oak/mroofed9.iob diff --git a/objects/hazel-oak/s-hoak-1.iob b/objects/trees/oak/shoakgeneric1.iob similarity index 100% rename from objects/hazel-oak/s-hoak-1.iob rename to objects/trees/oak/shoakgeneric1.iob diff --git a/objects/hazel-oak/s-hoak-9.iob b/objects/trees/oak/shoakgeneric10.iob similarity index 100% rename from objects/hazel-oak/s-hoak-9.iob rename to objects/trees/oak/shoakgeneric10.iob diff --git a/objects/hazel-oak/s-hoak-10.iob b/objects/trees/oak/shoakgeneric2.iob similarity index 100% rename from objects/hazel-oak/s-hoak-10.iob rename to objects/trees/oak/shoakgeneric2.iob diff --git a/objects/hazel-oak/s-hoak-2.iob b/objects/trees/oak/shoakgeneric3.iob similarity index 100% rename from objects/hazel-oak/s-hoak-2.iob rename to objects/trees/oak/shoakgeneric3.iob diff --git a/objects/hazel-oak/s-hoak-3.iob b/objects/trees/oak/shoakgeneric4.iob similarity index 100% rename from objects/hazel-oak/s-hoak-3.iob rename to objects/trees/oak/shoakgeneric4.iob diff --git a/objects/hazel-oak/s-hoak-4.iob b/objects/trees/oak/shoakgeneric5.iob similarity index 100% rename from objects/hazel-oak/s-hoak-4.iob rename to objects/trees/oak/shoakgeneric5.iob diff --git a/objects/hazel-oak/s-hoak-5.iob b/objects/trees/oak/shoakgeneric6.iob similarity index 100% rename from objects/hazel-oak/s-hoak-5.iob rename to objects/trees/oak/shoakgeneric6.iob diff --git a/objects/hazel-oak/s-hoak-6.iob b/objects/trees/oak/shoakgeneric7.iob similarity index 100% rename from objects/hazel-oak/s-hoak-6.iob rename to objects/trees/oak/shoakgeneric7.iob diff --git a/objects/hazel-oak/s-hoak-7.iob b/objects/trees/oak/shoakgeneric8.iob similarity index 100% rename from objects/hazel-oak/s-hoak-7.iob rename to objects/trees/oak/shoakgeneric8.iob diff --git a/objects/hazel-oak/s-hoak-8.iob b/objects/trees/oak/shoakgeneric9.iob similarity index 100% rename from objects/hazel-oak/s-hoak-8.iob rename to objects/trees/oak/shoakgeneric9.iob diff --git a/objects/oak-superlarge/oak1.iob b/objects/trees/oak/sloak1.iob similarity index 100% rename from objects/oak-superlarge/oak1.iob rename to objects/trees/oak/sloak1.iob diff --git a/objects/deadwood-wilted-supermassive/dead1.iob b/objects/trees/oak/smdeadwilt1.iob similarity index 100% rename from objects/deadwood-wilted-supermassive/dead1.iob rename to objects/trees/oak/smdeadwilt1.iob diff --git a/objects/deadwood-supermassive/dead1.iob b/objects/trees/oak/smdeadwood1.iob similarity index 100% rename from objects/deadwood-supermassive/dead1.iob rename to objects/trees/oak/smdeadwood1.iob diff --git a/objects/deadwood-supermassive/dead2.iob b/objects/trees/oak/smdeadwood2.iob similarity index 100% rename from objects/deadwood-supermassive/dead2.iob rename to objects/trees/oak/smdeadwood2.iob diff --git a/objects/deadwood-supermassive/dead3.iob b/objects/trees/oak/smdeadwood3.iob similarity index 100% rename from objects/deadwood-supermassive/dead3.iob rename to objects/trees/oak/smdeadwood3.iob diff --git a/objects/oak-fallen-massive/oak1.iob b/objects/trees/oak/smfallen1.iob similarity index 100% rename from objects/oak-fallen-massive/oak1.iob rename to objects/trees/oak/smfallen1.iob diff --git a/objects/oak-supermassive/oak1.iob b/objects/trees/oak/smoak1.iob similarity index 100% rename from objects/oak-supermassive/oak1.iob rename to objects/trees/oak/smoak1.iob diff --git a/objects/small-oak/small-oak6.iob b/objects/trees/oak/smoak10.iob similarity index 100% rename from objects/small-oak/small-oak6.iob rename to objects/trees/oak/smoak10.iob diff --git a/objects/small-oak/small-oak7.iob b/objects/trees/oak/smoak11.iob similarity index 100% rename from objects/small-oak/small-oak7.iob rename to objects/trees/oak/smoak11.iob diff --git a/objects/small-oak/small-oak8.iob b/objects/trees/oak/smoak12.iob similarity index 100% rename from objects/small-oak/small-oak8.iob rename to objects/trees/oak/smoak12.iob diff --git a/objects/small-oak/small-oak10.iob b/objects/trees/oak/smoak13.iob similarity index 100% rename from objects/small-oak/small-oak10.iob rename to objects/trees/oak/smoak13.iob diff --git a/objects/small-oak/small-oak9.iob b/objects/trees/oak/smoak14.iob similarity index 100% rename from objects/small-oak/small-oak9.iob rename to objects/trees/oak/smoak14.iob diff --git a/objects/small-oak/small-oak11.iob b/objects/trees/oak/smoak15.iob similarity index 100% rename from objects/small-oak/small-oak11.iob rename to objects/trees/oak/smoak15.iob diff --git a/objects/small-oak/small-oak12.iob b/objects/trees/oak/smoak16.iob similarity index 100% rename from objects/small-oak/small-oak12.iob rename to objects/trees/oak/smoak16.iob diff --git a/objects/small-oak/small-oak13.iob b/objects/trees/oak/smoak17.iob similarity index 100% rename from objects/small-oak/small-oak13.iob rename to objects/trees/oak/smoak17.iob diff --git a/objects/small-oak/small-oak14.iob b/objects/trees/oak/smoak18.iob similarity index 100% rename from objects/small-oak/small-oak14.iob rename to objects/trees/oak/smoak18.iob diff --git a/objects/small-oak/small-oak15.iob b/objects/trees/oak/smoak19.iob similarity index 100% rename from objects/small-oak/small-oak15.iob rename to objects/trees/oak/smoak19.iob diff --git a/objects/small-oak/small-oak1.iob b/objects/trees/oak/smoak2.iob similarity index 100% rename from objects/small-oak/small-oak1.iob rename to objects/trees/oak/smoak2.iob diff --git a/objects/small-oak/small-oak16.iob b/objects/trees/oak/smoak20.iob similarity index 100% rename from objects/small-oak/small-oak16.iob rename to objects/trees/oak/smoak20.iob diff --git a/objects/small-oak/small-oak17.iob b/objects/trees/oak/smoak21.iob similarity index 100% rename from objects/small-oak/small-oak17.iob rename to objects/trees/oak/smoak21.iob diff --git a/objects/small-oak/small-oak18.iob b/objects/trees/oak/smoak3.iob similarity index 100% rename from objects/small-oak/small-oak18.iob rename to objects/trees/oak/smoak3.iob diff --git a/objects/small-oak/small-oak19.iob b/objects/trees/oak/smoak4.iob similarity index 100% rename from objects/small-oak/small-oak19.iob rename to objects/trees/oak/smoak4.iob diff --git a/objects/small-oak/small-oak2.iob b/objects/trees/oak/smoak5.iob similarity index 100% rename from objects/small-oak/small-oak2.iob rename to objects/trees/oak/smoak5.iob diff --git a/objects/small-oak/small-oak20.iob b/objects/trees/oak/smoak6.iob similarity index 100% rename from objects/small-oak/small-oak20.iob rename to objects/trees/oak/smoak6.iob diff --git a/objects/small-oak/small-oak3.iob b/objects/trees/oak/smoak7.iob similarity index 100% rename from objects/small-oak/small-oak3.iob rename to objects/trees/oak/smoak7.iob diff --git a/objects/small-oak/small-oak4.iob b/objects/trees/oak/smoak8.iob similarity index 100% rename from objects/small-oak/small-oak4.iob rename to objects/trees/oak/smoak8.iob diff --git a/objects/small-oak/small-oak5.iob b/objects/trees/oak/smoak9.iob similarity index 100% rename from objects/small-oak/small-oak5.iob rename to objects/trees/oak/smoak9.iob diff --git a/objects/oak-small/oak1.iob b/objects/trees/oak/smol1.iob similarity index 100% rename from objects/oak-small/oak1.iob rename to objects/trees/oak/smol1.iob diff --git a/objects/oak-small/oak4.iob b/objects/trees/oak/smol10.iob similarity index 100% rename from objects/oak-small/oak4.iob rename to objects/trees/oak/smol10.iob diff --git a/objects/oak-small/oak5.iob b/objects/trees/oak/smol11.iob similarity index 100% rename from objects/oak-small/oak5.iob rename to objects/trees/oak/smol11.iob diff --git a/objects/oak-small/oak6.iob b/objects/trees/oak/smol12.iob similarity index 100% rename from objects/oak-small/oak6.iob rename to objects/trees/oak/smol12.iob diff --git a/objects/oak-small/oak7.iob b/objects/trees/oak/smol13.iob similarity index 100% rename from objects/oak-small/oak7.iob rename to objects/trees/oak/smol13.iob diff --git a/objects/oak-small/oak8.iob b/objects/trees/oak/smol14.iob similarity index 100% rename from objects/oak-small/oak8.iob rename to objects/trees/oak/smol14.iob diff --git a/objects/oak-small/oak9.iob b/objects/trees/oak/smol15.iob similarity index 100% rename from objects/oak-small/oak9.iob rename to objects/trees/oak/smol15.iob diff --git a/objects/oak-small/oak10.iob b/objects/trees/oak/smol2.iob similarity index 100% rename from objects/oak-small/oak10.iob rename to objects/trees/oak/smol2.iob diff --git a/objects/oak-small/oak11.iob b/objects/trees/oak/smol3.iob similarity index 100% rename from objects/oak-small/oak11.iob rename to objects/trees/oak/smol3.iob diff --git a/objects/oak-small/oak12.iob b/objects/trees/oak/smol4.iob similarity index 100% rename from objects/oak-small/oak12.iob rename to objects/trees/oak/smol4.iob diff --git a/objects/oak-small/oak13.iob b/objects/trees/oak/smol5.iob similarity index 100% rename from objects/oak-small/oak13.iob rename to objects/trees/oak/smol5.iob diff --git a/objects/oak-small/oak14.iob b/objects/trees/oak/smol6.iob similarity index 100% rename from objects/oak-small/oak14.iob rename to objects/trees/oak/smol6.iob diff --git a/objects/oak-small/oak15.iob b/objects/trees/oak/smol7.iob similarity index 100% rename from objects/oak-small/oak15.iob rename to objects/trees/oak/smol7.iob diff --git a/objects/oak-small/oak2.iob b/objects/trees/oak/smol8.iob similarity index 100% rename from objects/oak-small/oak2.iob rename to objects/trees/oak/smol8.iob diff --git a/objects/oak-small/oak3.iob b/objects/trees/oak/smol9.iob similarity index 100% rename from objects/oak-small/oak3.iob rename to objects/trees/oak/smol9.iob diff --git a/objects/oak-tainted-massive/oak1.iob b/objects/trees/oak/smtoak1.iob similarity index 100% rename from objects/oak-tainted-massive/oak1.iob rename to objects/trees/oak/smtoak1.iob diff --git a/objects/oak-wilted-supermassive/oak1.iob b/objects/trees/oak/smwiltedoak1.iob similarity index 100% rename from objects/oak-wilted-supermassive/oak1.iob rename to objects/trees/oak/smwiltedoak1.iob diff --git a/objects/oak-ponderosa/smol-1.iob b/objects/trees/oak/sponderosa1.iob similarity index 100% rename from objects/oak-ponderosa/smol-1.iob rename to objects/trees/oak/sponderosa1.iob diff --git a/objects/oak-ponderosa/smol-4.iob b/objects/trees/oak/sponderosa10.iob similarity index 100% rename from objects/oak-ponderosa/smol-4.iob rename to objects/trees/oak/sponderosa10.iob diff --git a/objects/oak-ponderosa/smol-5.iob b/objects/trees/oak/sponderosa11.iob similarity index 100% rename from objects/oak-ponderosa/smol-5.iob rename to objects/trees/oak/sponderosa11.iob diff --git a/objects/oak-ponderosa/smol-6.iob b/objects/trees/oak/sponderosa12.iob similarity index 100% rename from objects/oak-ponderosa/smol-6.iob rename to objects/trees/oak/sponderosa12.iob diff --git a/objects/oak-ponderosa/smol-7.iob b/objects/trees/oak/sponderosa13.iob similarity index 100% rename from objects/oak-ponderosa/smol-7.iob rename to objects/trees/oak/sponderosa13.iob diff --git a/objects/oak-ponderosa/smol-8.iob b/objects/trees/oak/sponderosa14.iob similarity index 100% rename from objects/oak-ponderosa/smol-8.iob rename to objects/trees/oak/sponderosa14.iob diff --git a/objects/oak-ponderosa/smol-9.iob b/objects/trees/oak/sponderosa15.iob similarity index 100% rename from objects/oak-ponderosa/smol-9.iob rename to objects/trees/oak/sponderosa15.iob diff --git a/objects/oak-ponderosa/smol-10.iob b/objects/trees/oak/sponderosa2.iob similarity index 100% rename from objects/oak-ponderosa/smol-10.iob rename to objects/trees/oak/sponderosa2.iob diff --git a/objects/oak-ponderosa/smol-11.iob b/objects/trees/oak/sponderosa3.iob similarity index 100% rename from objects/oak-ponderosa/smol-11.iob rename to objects/trees/oak/sponderosa3.iob diff --git a/objects/oak-ponderosa/smol-12.iob b/objects/trees/oak/sponderosa4.iob similarity index 100% rename from objects/oak-ponderosa/smol-12.iob rename to objects/trees/oak/sponderosa4.iob diff --git a/objects/oak-ponderosa/smol-13.iob b/objects/trees/oak/sponderosa5.iob similarity index 100% rename from objects/oak-ponderosa/smol-13.iob rename to objects/trees/oak/sponderosa5.iob diff --git a/objects/oak-ponderosa/smol-14.iob b/objects/trees/oak/sponderosa6.iob similarity index 100% rename from objects/oak-ponderosa/smol-14.iob rename to objects/trees/oak/sponderosa6.iob diff --git a/objects/oak-ponderosa/smol-15.iob b/objects/trees/oak/sponderosa7.iob similarity index 100% rename from objects/oak-ponderosa/smol-15.iob rename to objects/trees/oak/sponderosa7.iob diff --git a/objects/oak-ponderosa/smol-2.iob b/objects/trees/oak/sponderosa8.iob similarity index 100% rename from objects/oak-ponderosa/smol-2.iob rename to objects/trees/oak/sponderosa8.iob diff --git a/objects/oak-ponderosa/smol-3.iob b/objects/trees/oak/sponderosa9.iob similarity index 100% rename from objects/oak-ponderosa/smol-3.iob rename to objects/trees/oak/sponderosa9.iob diff --git a/objects/swampy-oak/swampy1.iob b/objects/trees/oak/swoak1.iob similarity index 100% rename from objects/swampy-oak/swampy1.iob rename to objects/trees/oak/swoak1.iob diff --git a/objects/swampy-oak/swampy2.iob b/objects/trees/oak/swoak2.iob similarity index 100% rename from objects/swampy-oak/swampy2.iob rename to objects/trees/oak/swoak2.iob diff --git a/objects/swampy-oak/swampy3.iob b/objects/trees/oak/swoak3.iob similarity index 100% rename from objects/swampy-oak/swampy3.iob rename to objects/trees/oak/swoak3.iob diff --git a/objects/swampy-oak/swampy4.iob b/objects/trees/oak/swoak4.iob similarity index 100% rename from objects/swampy-oak/swampy4.iob rename to objects/trees/oak/swoak4.iob diff --git a/objects/swampy-oak/swampy5.iob b/objects/trees/oak/swoak5.iob similarity index 100% rename from objects/swampy-oak/swampy5.iob rename to objects/trees/oak/swoak5.iob diff --git a/objects/hazel-oak/taller-oak-1.iob b/objects/trees/oak/thoakgeneric1.iob similarity index 100% rename from objects/hazel-oak/taller-oak-1.iob rename to objects/trees/oak/thoakgeneric1.iob diff --git a/objects/hazel-oak/taller-oak-9.iob b/objects/trees/oak/thoakgeneric10.iob similarity index 100% rename from objects/hazel-oak/taller-oak-9.iob rename to objects/trees/oak/thoakgeneric10.iob diff --git a/objects/hazel-oak/taller-oak-10.iob b/objects/trees/oak/thoakgeneric2.iob similarity index 100% rename from objects/hazel-oak/taller-oak-10.iob rename to objects/trees/oak/thoakgeneric2.iob diff --git a/objects/hazel-oak/taller-oak-2.iob b/objects/trees/oak/thoakgeneric3.iob similarity index 100% rename from objects/hazel-oak/taller-oak-2.iob rename to objects/trees/oak/thoakgeneric3.iob diff --git a/objects/hazel-oak/taller-oak-3.iob b/objects/trees/oak/thoakgeneric4.iob similarity index 100% rename from objects/hazel-oak/taller-oak-3.iob rename to objects/trees/oak/thoakgeneric4.iob diff --git a/objects/hazel-oak/taller-oak-4.iob b/objects/trees/oak/thoakgeneric5.iob similarity index 100% rename from objects/hazel-oak/taller-oak-4.iob rename to objects/trees/oak/thoakgeneric5.iob diff --git a/objects/hazel-oak/taller-oak-5.iob b/objects/trees/oak/thoakgeneric6.iob similarity index 100% rename from objects/hazel-oak/taller-oak-5.iob rename to objects/trees/oak/thoakgeneric6.iob diff --git a/objects/hazel-oak/taller-oak-6.iob b/objects/trees/oak/thoakgeneric7.iob similarity index 100% rename from objects/hazel-oak/taller-oak-6.iob rename to objects/trees/oak/thoakgeneric7.iob diff --git a/objects/hazel-oak/taller-oak-7.iob b/objects/trees/oak/thoakgeneric8.iob similarity index 100% rename from objects/hazel-oak/taller-oak-7.iob rename to objects/trees/oak/thoakgeneric8.iob diff --git a/objects/hazel-oak/taller-oak-8.iob b/objects/trees/oak/thoakgeneric9.iob similarity index 100% rename from objects/hazel-oak/taller-oak-8.iob rename to objects/trees/oak/thoakgeneric9.iob diff --git a/objects/oak-tall/tall-oak1.iob b/objects/trees/oak/toak1.iob similarity index 100% rename from objects/oak-tall/tall-oak1.iob rename to objects/trees/oak/toak1.iob diff --git a/objects/oak-tall/tall-oak8.iob b/objects/trees/oak/toak10.iob similarity index 100% rename from objects/oak-tall/tall-oak8.iob rename to objects/trees/oak/toak10.iob diff --git a/objects/oak-tall/tall-oak9.iob b/objects/trees/oak/toak11.iob similarity index 100% rename from objects/oak-tall/tall-oak9.iob rename to objects/trees/oak/toak11.iob diff --git a/objects/oak-tall/tall-oak10.iob b/objects/trees/oak/toak2.iob similarity index 100% rename from objects/oak-tall/tall-oak10.iob rename to objects/trees/oak/toak2.iob diff --git a/objects/oak-tall/tall-oak11.iob b/objects/trees/oak/toak3.iob similarity index 100% rename from objects/oak-tall/tall-oak11.iob rename to objects/trees/oak/toak3.iob diff --git a/objects/oak-tall/tall-oak2.iob b/objects/trees/oak/toak4.iob similarity index 100% rename from objects/oak-tall/tall-oak2.iob rename to objects/trees/oak/toak4.iob diff --git a/objects/oak-tall/tall-oak3.iob b/objects/trees/oak/toak5.iob similarity index 100% rename from objects/oak-tall/tall-oak3.iob rename to objects/trees/oak/toak5.iob diff --git a/objects/oak-tall/tall-oak4.iob b/objects/trees/oak/toak6.iob similarity index 100% rename from objects/oak-tall/tall-oak4.iob rename to objects/trees/oak/toak6.iob diff --git a/objects/oak-tall/tall-oak5.iob b/objects/trees/oak/toak7.iob similarity index 100% rename from objects/oak-tall/tall-oak5.iob rename to objects/trees/oak/toak7.iob diff --git a/objects/oak-tall/tall-oak6.iob b/objects/trees/oak/toak8.iob similarity index 100% rename from objects/oak-tall/tall-oak6.iob rename to objects/trees/oak/toak8.iob diff --git a/objects/oak-tall/tall-oak7.iob b/objects/trees/oak/toak9.iob similarity index 100% rename from objects/oak-tall/tall-oak7.iob rename to objects/trees/oak/toak9.iob diff --git a/objects/roofed-wayward/taller-roof-1.iob b/objects/trees/oak/troofed1.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-1.iob rename to objects/trees/oak/troofed1.iob diff --git a/objects/roofed-wayward/taller-roof-9.iob b/objects/trees/oak/troofed10.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-9.iob rename to objects/trees/oak/troofed10.iob diff --git a/objects/roofed-wayward/taller-roof-10.iob b/objects/trees/oak/troofed2.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-10.iob rename to objects/trees/oak/troofed2.iob diff --git a/objects/roofed-wayward/taller-roof-2.iob b/objects/trees/oak/troofed3.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-2.iob rename to objects/trees/oak/troofed3.iob diff --git a/objects/roofed-wayward/taller-roof-3.iob b/objects/trees/oak/troofed4.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-3.iob rename to objects/trees/oak/troofed4.iob diff --git a/objects/roofed-wayward/taller-roof-4.iob b/objects/trees/oak/troofed5.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-4.iob rename to objects/trees/oak/troofed5.iob diff --git a/objects/roofed-wayward/taller-roof-5.iob b/objects/trees/oak/troofed6.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-5.iob rename to objects/trees/oak/troofed6.iob diff --git a/objects/roofed-wayward/taller-roof-6.iob b/objects/trees/oak/troofed7.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-6.iob rename to objects/trees/oak/troofed7.iob diff --git a/objects/roofed-wayward/taller-roof-7.iob b/objects/trees/oak/troofed8.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-7.iob rename to objects/trees/oak/troofed8.iob diff --git a/objects/roofed-wayward/taller-roof-8.iob b/objects/trees/oak/troofed9.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-8.iob rename to objects/trees/oak/troofed9.iob diff --git a/objects/roofed-wayward/taller-roof-rooted-1.iob b/objects/trees/oak/troofedroot1.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-rooted-1.iob rename to objects/trees/oak/troofedroot1.iob diff --git a/objects/roofed-wayward/taller-roof-rooted-9.iob b/objects/trees/oak/troofedroot10.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-rooted-9.iob rename to objects/trees/oak/troofedroot10.iob diff --git a/objects/roofed-wayward/taller-roof-rooted-10.iob b/objects/trees/oak/troofedroot2.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-rooted-10.iob rename to objects/trees/oak/troofedroot2.iob diff --git a/objects/roofed-wayward/taller-roof-rooted-2.iob b/objects/trees/oak/troofedroot3.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-rooted-2.iob rename to objects/trees/oak/troofedroot3.iob diff --git a/objects/roofed-wayward/taller-roof-rooted-3.iob b/objects/trees/oak/troofedroot4.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-rooted-3.iob rename to objects/trees/oak/troofedroot4.iob diff --git a/objects/roofed-wayward/taller-roof-rooted-4.iob b/objects/trees/oak/troofedroot5.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-rooted-4.iob rename to objects/trees/oak/troofedroot5.iob diff --git a/objects/roofed-wayward/taller-roof-rooted-5.iob b/objects/trees/oak/troofedroot6.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-rooted-5.iob rename to objects/trees/oak/troofedroot6.iob diff --git a/objects/roofed-wayward/taller-roof-rooted-6.iob b/objects/trees/oak/troofedroot7.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-rooted-6.iob rename to objects/trees/oak/troofedroot7.iob diff --git a/objects/roofed-wayward/taller-roof-rooted-7.iob b/objects/trees/oak/troofedroot8.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-rooted-7.iob rename to objects/trees/oak/troofedroot8.iob diff --git a/objects/roofed-wayward/taller-roof-rooted-8.iob b/objects/trees/oak/troofedroot9.iob similarity index 100% rename from objects/roofed-wayward/taller-roof-rooted-8.iob rename to objects/trees/oak/troofedroot9.iob diff --git a/objects/oak/oak1.iob b/objects/trees/oak/truegeneric1.iob similarity index 100% rename from objects/oak/oak1.iob rename to objects/trees/oak/truegeneric1.iob diff --git a/objects/tree/oak/4.iob b/objects/trees/oak/truegeneric10.iob similarity index 100% rename from objects/tree/oak/4.iob rename to objects/trees/oak/truegeneric10.iob diff --git a/objects/tree/oak/5.iob b/objects/trees/oak/truegeneric11.iob similarity index 100% rename from objects/tree/oak/5.iob rename to objects/trees/oak/truegeneric11.iob diff --git a/objects/oak/oak7.iob b/objects/trees/oak/truegeneric12.iob similarity index 100% rename from objects/oak/oak7.iob rename to objects/trees/oak/truegeneric12.iob diff --git a/objects/tree/oak/6.iob b/objects/trees/oak/truegeneric13.iob similarity index 100% rename from objects/tree/oak/6.iob rename to objects/trees/oak/truegeneric13.iob diff --git a/objects/oak/oak8.iob b/objects/trees/oak/truegeneric14.iob similarity index 100% rename from objects/oak/oak8.iob rename to objects/trees/oak/truegeneric14.iob diff --git a/objects/oak/oak9.iob b/objects/trees/oak/truegeneric15.iob similarity index 100% rename from objects/oak/oak9.iob rename to objects/trees/oak/truegeneric15.iob diff --git a/objects/plains/tree1.iob b/objects/trees/oak/truegeneric16.iob similarity index 100% rename from objects/plains/tree1.iob rename to objects/trees/oak/truegeneric16.iob diff --git a/objects/plains/tree2.iob b/objects/trees/oak/truegeneric17.iob similarity index 100% rename from objects/plains/tree2.iob rename to objects/trees/oak/truegeneric17.iob diff --git a/objects/oak/oak10.iob b/objects/trees/oak/truegeneric18.iob similarity index 100% rename from objects/oak/oak10.iob rename to objects/trees/oak/truegeneric18.iob diff --git a/objects/oak/oak11.iob b/objects/trees/oak/truegeneric19.iob similarity index 100% rename from objects/oak/oak11.iob rename to objects/trees/oak/truegeneric19.iob diff --git a/objects/oak/oak2.iob b/objects/trees/oak/truegeneric2.iob similarity index 100% rename from objects/oak/oak2.iob rename to objects/trees/oak/truegeneric2.iob diff --git a/objects/oak/oak12.iob b/objects/trees/oak/truegeneric20.iob similarity index 100% rename from objects/oak/oak12.iob rename to objects/trees/oak/truegeneric20.iob diff --git a/objects/oak-medium/oak1.iob b/objects/trees/oak/truegeneric21.iob similarity index 100% rename from objects/oak-medium/oak1.iob rename to objects/trees/oak/truegeneric21.iob diff --git a/objects/oak-medium/oak2.iob b/objects/trees/oak/truegeneric22.iob similarity index 100% rename from objects/oak-medium/oak2.iob rename to objects/trees/oak/truegeneric22.iob diff --git a/objects/oak-medium/oak3.iob b/objects/trees/oak/truegeneric23.iob similarity index 100% rename from objects/oak-medium/oak3.iob rename to objects/trees/oak/truegeneric23.iob diff --git a/objects/oak-medium/oak5.iob b/objects/trees/oak/truegeneric24.iob similarity index 100% rename from objects/oak-medium/oak5.iob rename to objects/trees/oak/truegeneric24.iob diff --git a/objects/oak/oak3.iob b/objects/trees/oak/truegeneric3.iob similarity index 100% rename from objects/oak/oak3.iob rename to objects/trees/oak/truegeneric3.iob diff --git a/objects/oak/oak4.iob b/objects/trees/oak/truegeneric4.iob similarity index 100% rename from objects/oak/oak4.iob rename to objects/trees/oak/truegeneric4.iob diff --git a/objects/oak/oak5.iob b/objects/trees/oak/truegeneric5.iob similarity index 100% rename from objects/oak/oak5.iob rename to objects/trees/oak/truegeneric5.iob diff --git a/objects/oak/oak6.iob b/objects/trees/oak/truegeneric6.iob similarity index 100% rename from objects/oak/oak6.iob rename to objects/trees/oak/truegeneric6.iob diff --git a/objects/tree/oak/1.iob b/objects/trees/oak/truegeneric7.iob similarity index 100% rename from objects/tree/oak/1.iob rename to objects/trees/oak/truegeneric7.iob diff --git a/objects/tree/oak/2.iob b/objects/trees/oak/truegeneric8.iob similarity index 100% rename from objects/tree/oak/2.iob rename to objects/trees/oak/truegeneric8.iob diff --git a/objects/tree/oak/3.iob b/objects/trees/oak/truegeneric9.iob similarity index 100% rename from objects/tree/oak/3.iob rename to objects/trees/oak/truegeneric9.iob diff --git a/objects/ob-sakura/sakura1.iob b/objects/trees/sakura/genericsak1.iob similarity index 100% rename from objects/ob-sakura/sakura1.iob rename to objects/trees/sakura/genericsak1.iob diff --git a/objects/ob-sakura/sakura2.iob b/objects/trees/sakura/genericsak2.iob similarity index 100% rename from objects/ob-sakura/sakura2.iob rename to objects/trees/sakura/genericsak2.iob diff --git a/objects/ob-sakura/sakura3.iob b/objects/trees/sakura/genericsak3.iob similarity index 100% rename from objects/ob-sakura/sakura3.iob rename to objects/trees/sakura/genericsak3.iob diff --git a/objects/ob-sakura/sakura4.iob b/objects/trees/sakura/genericsak4.iob similarity index 100% rename from objects/ob-sakura/sakura4.iob rename to objects/trees/sakura/genericsak4.iob diff --git a/objects/ob-sakura/sakura5.iob b/objects/trees/sakura/genericsak5.iob similarity index 100% rename from objects/ob-sakura/sakura5.iob rename to objects/trees/sakura/genericsak5.iob diff --git a/objects/sakura-massive/sakura1.iob b/objects/trees/sakura/mlarge1.iob similarity index 100% rename from objects/sakura-massive/sakura1.iob rename to objects/trees/sakura/mlarge1.iob diff --git a/objects/blossom-massive/blossom2.iob b/objects/trees/sakura/mlarge10.iob similarity index 100% rename from objects/blossom-massive/blossom2.iob rename to objects/trees/sakura/mlarge10.iob diff --git a/objects/blossom-massive/blossom3.iob b/objects/trees/sakura/mlarge11.iob similarity index 100% rename from objects/blossom-massive/blossom3.iob rename to objects/trees/sakura/mlarge11.iob diff --git a/objects/sakura-massive/sakura2.iob b/objects/trees/sakura/mlarge2.iob similarity index 100% rename from objects/sakura-massive/sakura2.iob rename to objects/trees/sakura/mlarge2.iob diff --git a/objects/sakura-massive/sakura3.iob b/objects/trees/sakura/mlarge3.iob similarity index 100% rename from objects/sakura-massive/sakura3.iob rename to objects/trees/sakura/mlarge3.iob diff --git a/objects/sakura/sakura1.iob b/objects/trees/sakura/mlarge4.iob similarity index 100% rename from objects/sakura/sakura1.iob rename to objects/trees/sakura/mlarge4.iob diff --git a/objects/sakura/sakura2.iob b/objects/trees/sakura/mlarge5.iob similarity index 100% rename from objects/sakura/sakura2.iob rename to objects/trees/sakura/mlarge5.iob diff --git a/objects/sakura/sakura3.iob b/objects/trees/sakura/mlarge6.iob similarity index 100% rename from objects/sakura/sakura3.iob rename to objects/trees/sakura/mlarge6.iob diff --git a/objects/sakura/sakura4.iob b/objects/trees/sakura/mlarge7.iob similarity index 100% rename from objects/sakura/sakura4.iob rename to objects/trees/sakura/mlarge7.iob diff --git a/objects/sakura/sakura5.iob b/objects/trees/sakura/mlarge8.iob similarity index 100% rename from objects/sakura/sakura5.iob rename to objects/trees/sakura/mlarge8.iob diff --git a/objects/blossom-massive/blossom1.iob b/objects/trees/sakura/mlarge9.iob similarity index 100% rename from objects/blossom-massive/blossom1.iob rename to objects/trees/sakura/mlarge9.iob diff --git a/objects/sacred-bonsai/absurd-1.iob b/objects/trees/sakura/ogabsurd1.iob similarity index 100% rename from objects/sacred-bonsai/absurd-1.iob rename to objects/trees/sakura/ogabsurd1.iob diff --git a/objects/sacred-bonsai/OGabsurd-1.iob b/objects/trees/sakura/ogabsurd2.iob similarity index 100% rename from objects/sacred-bonsai/OGabsurd-1.iob rename to objects/trees/sakura/ogabsurd2.iob diff --git a/objects/sakura-fallen/sakura1.iob b/objects/trees/sakura/ogabsurdfallen1.iob similarity index 100% rename from objects/sakura-fallen/sakura1.iob rename to objects/trees/sakura/ogabsurdfallen1.iob diff --git a/objects/sakura-superlarge/sakura1.iob b/objects/trees/sakura/ogbase1.iob similarity index 100% rename from objects/sakura-superlarge/sakura1.iob rename to objects/trees/sakura/ogbase1.iob diff --git a/objects/blosom-superlarge/blossom1.iob b/objects/trees/sakura/ogbase2.iob similarity index 100% rename from objects/blosom-superlarge/blossom1.iob rename to objects/trees/sakura/ogbase2.iob diff --git a/objects/blossom-tainted/blossom1.iob b/objects/trees/sakura/smtaint1.iob similarity index 100% rename from objects/blossom-tainted/blossom1.iob rename to objects/trees/sakura/smtaint1.iob diff --git a/objects/sakura-tainted-supermassive/sakura1.iob b/objects/trees/sakura/smtaint2.iob similarity index 100% rename from objects/sakura-tainted-supermassive/sakura1.iob rename to objects/trees/sakura/smtaint2.iob diff --git a/objects/blossom-wilted-supermassive/blossom1.iob b/objects/trees/sakura/smwilt1.iob similarity index 100% rename from objects/blossom-wilted-supermassive/blossom1.iob rename to objects/trees/sakura/smwilt1.iob diff --git a/objects/sakura-wilted-supermassive/sakura1.iob b/objects/trees/sakura/smwilt2.iob similarity index 100% rename from objects/sakura-wilted-supermassive/sakura1.iob rename to objects/trees/sakura/smwilt2.iob diff --git a/objects/big-blossom/big-1.iob b/objects/trees/sakura/vlarge1.iob similarity index 100% rename from objects/big-blossom/big-1.iob rename to objects/trees/sakura/vlarge1.iob diff --git a/objects/big-blossom/big-2.iob b/objects/trees/sakura/vlarge2.iob similarity index 100% rename from objects/big-blossom/big-2.iob rename to objects/trees/sakura/vlarge2.iob diff --git a/objects/big-blossom/big-3.iob b/objects/trees/sakura/vlarge3.iob similarity index 100% rename from objects/big-blossom/big-3.iob rename to objects/trees/sakura/vlarge3.iob diff --git a/objects/frosted-sproak/med-1.iob b/objects/trees/sproak/generic1.iob similarity index 100% rename from objects/frosted-sproak/med-1.iob rename to objects/trees/sproak/generic1.iob diff --git a/objects/frosted-sproak/med-7.iob b/objects/trees/sproak/generic10.iob similarity index 100% rename from objects/frosted-sproak/med-7.iob rename to objects/trees/sproak/generic10.iob diff --git a/objects/frosted-sproak/med-8.iob b/objects/trees/sproak/generic11.iob similarity index 100% rename from objects/frosted-sproak/med-8.iob rename to objects/trees/sproak/generic11.iob diff --git a/objects/frosted-sproak/med-9.iob b/objects/trees/sproak/generic12.iob similarity index 100% rename from objects/frosted-sproak/med-9.iob rename to objects/trees/sproak/generic12.iob diff --git a/objects/frosted-sproak/med-10.iob b/objects/trees/sproak/generic2.iob similarity index 100% rename from objects/frosted-sproak/med-10.iob rename to objects/trees/sproak/generic2.iob diff --git a/objects/frosted-sproak/med-11.iob b/objects/trees/sproak/generic3.iob similarity index 100% rename from objects/frosted-sproak/med-11.iob rename to objects/trees/sproak/generic3.iob diff --git a/objects/frosted-sproak/med-12.iob b/objects/trees/sproak/generic4.iob similarity index 100% rename from objects/frosted-sproak/med-12.iob rename to objects/trees/sproak/generic4.iob diff --git a/objects/frosted-sproak/med-13.iob b/objects/trees/sproak/generic5.iob similarity index 100% rename from objects/frosted-sproak/med-13.iob rename to objects/trees/sproak/generic5.iob diff --git a/objects/frosted-sproak/med-2.iob b/objects/trees/sproak/generic6.iob similarity index 100% rename from objects/frosted-sproak/med-2.iob rename to objects/trees/sproak/generic6.iob diff --git a/objects/frosted-sproak/med-3.iob b/objects/trees/sproak/generic7.iob similarity index 100% rename from objects/frosted-sproak/med-3.iob rename to objects/trees/sproak/generic7.iob diff --git a/objects/frosted-sproak/med-4.iob b/objects/trees/sproak/generic8.iob similarity index 100% rename from objects/frosted-sproak/med-4.iob rename to objects/trees/sproak/generic8.iob diff --git a/objects/frosted-sproak/med-5.iob b/objects/trees/sproak/generic9.iob similarity index 100% rename from objects/frosted-sproak/med-5.iob rename to objects/trees/sproak/generic9.iob diff --git a/objects/wwland/DoSp-sapling-10.iob b/objects/trees/sproak/msapling1.iob similarity index 100% rename from objects/wwland/DoSp-sapling-10.iob rename to objects/trees/sproak/msapling1.iob diff --git a/objects/wwland/DoSp-sapling.iob b/objects/trees/sproak/msapling10.iob similarity index 100% rename from objects/wwland/DoSp-sapling.iob rename to objects/trees/sproak/msapling10.iob diff --git a/objects/wwland/DoSp-sapling-2.iob b/objects/trees/sproak/msapling2.iob similarity index 100% rename from objects/wwland/DoSp-sapling-2.iob rename to objects/trees/sproak/msapling2.iob diff --git a/objects/wwland/DoSp-sapling-3.iob b/objects/trees/sproak/msapling3.iob similarity index 100% rename from objects/wwland/DoSp-sapling-3.iob rename to objects/trees/sproak/msapling3.iob diff --git a/objects/wwland/DoSp-sapling-4.iob b/objects/trees/sproak/msapling4.iob similarity index 100% rename from objects/wwland/DoSp-sapling-4.iob rename to objects/trees/sproak/msapling4.iob diff --git a/objects/wwland/DoSp-sapling-5.iob b/objects/trees/sproak/msapling5.iob similarity index 100% rename from objects/wwland/DoSp-sapling-5.iob rename to objects/trees/sproak/msapling5.iob diff --git a/objects/wwland/DoSp-sapling-6.iob b/objects/trees/sproak/msapling6.iob similarity index 100% rename from objects/wwland/DoSp-sapling-6.iob rename to objects/trees/sproak/msapling6.iob diff --git a/objects/wwland/DoSp-sapling-7.iob b/objects/trees/sproak/msapling7.iob similarity index 100% rename from objects/wwland/DoSp-sapling-7.iob rename to objects/trees/sproak/msapling7.iob diff --git a/objects/wwland/DoSp-sapling-8.iob b/objects/trees/sproak/msapling8.iob similarity index 100% rename from objects/wwland/DoSp-sapling-8.iob rename to objects/trees/sproak/msapling8.iob diff --git a/objects/wwland/DoSp-sapling-9.iob b/objects/trees/sproak/msapling9.iob similarity index 100% rename from objects/wwland/DoSp-sapling-9.iob rename to objects/trees/sproak/msapling9.iob diff --git a/objects/wwland/DoSp-1.iob b/objects/trees/sproak/sp1.iob similarity index 100% rename from objects/wwland/DoSp-1.iob rename to objects/trees/sproak/sp1.iob diff --git a/objects/wwland/DoSp-2.iob b/objects/trees/sproak/sp2.iob similarity index 100% rename from objects/wwland/DoSp-2.iob rename to objects/trees/sproak/sp2.iob diff --git a/objects/wwland/DoSp-3.iob b/objects/trees/sproak/sp3.iob similarity index 100% rename from objects/wwland/DoSp-3.iob rename to objects/trees/sproak/sp3.iob diff --git a/objects/wwland/DoSp-4.iob b/objects/trees/sproak/sp4.iob similarity index 100% rename from objects/wwland/DoSp-4.iob rename to objects/trees/sproak/sp4.iob diff --git a/objects/wwland/DoSp-5.iob b/objects/trees/sproak/sp5.iob similarity index 100% rename from objects/wwland/DoSp-5.iob rename to objects/trees/sproak/sp5.iob diff --git a/objects/wwland/DoSp-6.iob b/objects/trees/sproak/sp6.iob similarity index 100% rename from objects/wwland/DoSp-6.iob rename to objects/trees/sproak/sp6.iob diff --git a/objects/arid-spruce/arid-spruce1.iob b/objects/trees/spruce/aridgeneric1.iob similarity index 100% rename from objects/arid-spruce/arid-spruce1.iob rename to objects/trees/spruce/aridgeneric1.iob diff --git a/objects/arid-spruce/arid-spruce2.iob b/objects/trees/spruce/aridgeneric2.iob similarity index 100% rename from objects/arid-spruce/arid-spruce2.iob rename to objects/trees/spruce/aridgeneric2.iob diff --git a/objects/arid-spruce/arid-spruce3.iob b/objects/trees/spruce/aridgeneric3.iob similarity index 100% rename from objects/arid-spruce/arid-spruce3.iob rename to objects/trees/spruce/aridgeneric3.iob diff --git a/objects/arid-spruce/arid-spruce4.iob b/objects/trees/spruce/aridgeneric4.iob similarity index 100% rename from objects/arid-spruce/arid-spruce4.iob rename to objects/trees/spruce/aridgeneric4.iob diff --git a/objects/arid-spruce/arid-spruce5.iob b/objects/trees/spruce/aridgeneric5.iob similarity index 100% rename from objects/arid-spruce/arid-spruce5.iob rename to objects/trees/spruce/aridgeneric5.iob diff --git a/objects/arid-pine/arid-pine1.iob b/objects/trees/spruce/aridpine1.iob similarity index 100% rename from objects/arid-pine/arid-pine1.iob rename to objects/trees/spruce/aridpine1.iob diff --git a/objects/arid-pine/arid-pine2.iob b/objects/trees/spruce/aridpine2.iob similarity index 100% rename from objects/arid-pine/arid-pine2.iob rename to objects/trees/spruce/aridpine2.iob diff --git a/objects/arid-pine/arid-pine3.iob b/objects/trees/spruce/aridpine3.iob similarity index 100% rename from objects/arid-pine/arid-pine3.iob rename to objects/trees/spruce/aridpine3.iob diff --git a/objects/arid-pine/arid-pine4.iob b/objects/trees/spruce/aridpine4.iob similarity index 100% rename from objects/arid-pine/arid-pine4.iob rename to objects/trees/spruce/aridpine4.iob diff --git a/objects/arid-pine/arid-pine5.iob b/objects/trees/spruce/aridpine5.iob similarity index 100% rename from objects/arid-pine/arid-pine5.iob rename to objects/trees/spruce/aridpine5.iob diff --git a/objects/spruce-medium/spruce-denmyre-1.iob b/objects/trees/spruce/denmyre1.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-1.iob rename to objects/trees/spruce/denmyre1.iob diff --git a/objects/spruce-medium/spruce-denmyre-3.iob b/objects/trees/spruce/denmyre10.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-3.iob rename to objects/trees/spruce/denmyre10.iob diff --git a/objects/spruce-medium/spruce-denmyre-4.iob b/objects/trees/spruce/denmyre11.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-4.iob rename to objects/trees/spruce/denmyre11.iob diff --git a/objects/spruce-medium/spruce-denmyre-5.iob b/objects/trees/spruce/denmyre12.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-5.iob rename to objects/trees/spruce/denmyre12.iob diff --git a/objects/spruce-medium/spruce-denmyre-6.iob b/objects/trees/spruce/denmyre13.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-6.iob rename to objects/trees/spruce/denmyre13.iob diff --git a/objects/spruce-medium/spruce-denmyre-7.iob b/objects/trees/spruce/denmyre14.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-7.iob rename to objects/trees/spruce/denmyre14.iob diff --git a/objects/spruce-medium/spruce-denmyre-8.iob b/objects/trees/spruce/denmyre15.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-8.iob rename to objects/trees/spruce/denmyre15.iob diff --git a/objects/spruce-medium/spruce-denmyre-9.iob b/objects/trees/spruce/denmyre16.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-9.iob rename to objects/trees/spruce/denmyre16.iob diff --git a/objects/spruce-medium/spruce-denmyre-10.iob b/objects/trees/spruce/denmyre2.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-10.iob rename to objects/trees/spruce/denmyre2.iob diff --git a/objects/spruce-medium/spruce-denmyre-11.iob b/objects/trees/spruce/denmyre3.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-11.iob rename to objects/trees/spruce/denmyre3.iob diff --git a/objects/spruce-medium/spruce-denmyre-12.iob b/objects/trees/spruce/denmyre4.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-12.iob rename to objects/trees/spruce/denmyre4.iob diff --git a/objects/spruce-medium/spruce-denmyre-13.iob b/objects/trees/spruce/denmyre5.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-13.iob rename to objects/trees/spruce/denmyre5.iob diff --git a/objects/spruce-medium/spruce-denmyre-14.iob b/objects/trees/spruce/denmyre6.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-14.iob rename to objects/trees/spruce/denmyre6.iob diff --git a/objects/spruce-medium/spruce-denmyre-15.iob b/objects/trees/spruce/denmyre7.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-15.iob rename to objects/trees/spruce/denmyre7.iob diff --git a/objects/spruce-medium/spruce-denmyre-16.iob b/objects/trees/spruce/denmyre8.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-16.iob rename to objects/trees/spruce/denmyre8.iob diff --git a/objects/spruce-medium/spruce-denmyre-2.iob b/objects/trees/spruce/denmyre9.iob similarity index 100% rename from objects/spruce-medium/spruce-denmyre-2.iob rename to objects/trees/spruce/denmyre9.iob diff --git a/objects/tree/spruce/1.iob b/objects/trees/spruce/generic1.iob similarity index 100% rename from objects/tree/spruce/1.iob rename to objects/trees/spruce/generic1.iob diff --git a/objects/tree/spruce/2.iob b/objects/trees/spruce/generic2.iob similarity index 100% rename from objects/tree/spruce/2.iob rename to objects/trees/spruce/generic2.iob diff --git a/objects/tree/spruce/3.iob b/objects/trees/spruce/generic3.iob similarity index 100% rename from objects/tree/spruce/3.iob rename to objects/trees/spruce/generic3.iob diff --git a/objects/spruce-dead/spruce_dead1.iob b/objects/trees/spruce/genericdead1.iob similarity index 100% rename from objects/spruce-dead/spruce_dead1.iob rename to objects/trees/spruce/genericdead1.iob diff --git a/objects/spruce-dead/spruce_dead2.iob b/objects/trees/spruce/genericdead2.iob similarity index 100% rename from objects/spruce-dead/spruce_dead2.iob rename to objects/trees/spruce/genericdead2.iob diff --git a/objects/spruce-dead/spruce_dead3.iob b/objects/trees/spruce/genericdead3.iob similarity index 100% rename from objects/spruce-dead/spruce_dead3.iob rename to objects/trees/spruce/genericdead3.iob diff --git a/objects/evergreen/fantasy_evergreen_large1.iob b/objects/trees/spruce/levergreen1.iob similarity index 100% rename from objects/evergreen/fantasy_evergreen_large1.iob rename to objects/trees/spruce/levergreen1.iob diff --git a/objects/evergreen/fantasy_evergreen_large2.iob b/objects/trees/spruce/levergreen2.iob similarity index 100% rename from objects/evergreen/fantasy_evergreen_large2.iob rename to objects/trees/spruce/levergreen2.iob diff --git a/objects/evergreen/fantasy_evergreen_large3.iob b/objects/trees/spruce/levergreen3.iob similarity index 100% rename from objects/evergreen/fantasy_evergreen_large3.iob rename to objects/trees/spruce/levergreen3.iob diff --git a/objects/evergreen/fantasy_evergreen_large4.iob b/objects/trees/spruce/levergreen4.iob similarity index 100% rename from objects/evergreen/fantasy_evergreen_large4.iob rename to objects/trees/spruce/levergreen4.iob diff --git a/objects/evergreen/fantasy_evergreen_large5.iob b/objects/trees/spruce/levergreen5.iob similarity index 100% rename from objects/evergreen/fantasy_evergreen_large5.iob rename to objects/trees/spruce/levergreen5.iob diff --git a/objects/evergreen/fantasy_evergreen_large6.iob b/objects/trees/spruce/levergreen6.iob similarity index 100% rename from objects/evergreen/fantasy_evergreen_large6.iob rename to objects/trees/spruce/levergreen6.iob diff --git a/objects/frosted-spruce/large-10..iob b/objects/trees/spruce/lfrostgeneric1.iob similarity index 100% rename from objects/frosted-spruce/large-10..iob rename to objects/trees/spruce/lfrostgeneric1.iob diff --git a/objects/frosted-spruce/large-18.iob b/objects/trees/spruce/lfrostgeneric10.iob similarity index 100% rename from objects/frosted-spruce/large-18.iob rename to objects/trees/spruce/lfrostgeneric10.iob diff --git a/objects/frosted-spruce/large-19.iob b/objects/trees/spruce/lfrostgeneric11.iob similarity index 100% rename from objects/frosted-spruce/large-19.iob rename to objects/trees/spruce/lfrostgeneric11.iob diff --git a/objects/frosted-spruce/large-20.iob b/objects/trees/spruce/lfrostgeneric12.iob similarity index 100% rename from objects/frosted-spruce/large-20.iob rename to objects/trees/spruce/lfrostgeneric12.iob diff --git a/objects/frosted-spruce/large-21.iob b/objects/trees/spruce/lfrostgeneric13.iob similarity index 100% rename from objects/frosted-spruce/large-21.iob rename to objects/trees/spruce/lfrostgeneric13.iob diff --git a/objects/frosted-spruce/large-22-b.iob b/objects/trees/spruce/lfrostgeneric14.iob similarity index 100% rename from objects/frosted-spruce/large-22-b.iob rename to objects/trees/spruce/lfrostgeneric14.iob diff --git a/objects/frosted-spruce/large-22.iob b/objects/trees/spruce/lfrostgeneric15.iob similarity index 100% rename from objects/frosted-spruce/large-22.iob rename to objects/trees/spruce/lfrostgeneric15.iob diff --git a/objects/frosted-spruce/large-23-b.iob b/objects/trees/spruce/lfrostgeneric16.iob similarity index 100% rename from objects/frosted-spruce/large-23-b.iob rename to objects/trees/spruce/lfrostgeneric16.iob diff --git a/objects/frosted-spruce/large-23.iob b/objects/trees/spruce/lfrostgeneric17.iob similarity index 100% rename from objects/frosted-spruce/large-23.iob rename to objects/trees/spruce/lfrostgeneric17.iob diff --git a/objects/frosted-spruce/large-24-b.iob b/objects/trees/spruce/lfrostgeneric18.iob similarity index 100% rename from objects/frosted-spruce/large-24-b.iob rename to objects/trees/spruce/lfrostgeneric18.iob diff --git a/objects/frosted-spruce/large-24.iob b/objects/trees/spruce/lfrostgeneric19.iob similarity index 100% rename from objects/frosted-spruce/large-24.iob rename to objects/trees/spruce/lfrostgeneric19.iob diff --git a/objects/frosted-spruce/large-10.iob b/objects/trees/spruce/lfrostgeneric2.iob similarity index 100% rename from objects/frosted-spruce/large-10.iob rename to objects/trees/spruce/lfrostgeneric2.iob diff --git a/objects/frosted-spruce/large-25-b.iob b/objects/trees/spruce/lfrostgeneric20.iob similarity index 100% rename from objects/frosted-spruce/large-25-b.iob rename to objects/trees/spruce/lfrostgeneric20.iob diff --git a/objects/frosted-spruce/large-25.iob b/objects/trees/spruce/lfrostgeneric21.iob similarity index 100% rename from objects/frosted-spruce/large-25.iob rename to objects/trees/spruce/lfrostgeneric21.iob diff --git a/objects/frosted-spruce/large-5.iob b/objects/trees/spruce/lfrostgeneric22.iob similarity index 100% rename from objects/frosted-spruce/large-5.iob rename to objects/trees/spruce/lfrostgeneric22.iob diff --git a/objects/frosted-spruce/large-6.iob b/objects/trees/spruce/lfrostgeneric23.iob similarity index 100% rename from objects/frosted-spruce/large-6.iob rename to objects/trees/spruce/lfrostgeneric23.iob diff --git a/objects/frosted-spruce/large-7.iob b/objects/trees/spruce/lfrostgeneric24.iob similarity index 100% rename from objects/frosted-spruce/large-7.iob rename to objects/trees/spruce/lfrostgeneric24.iob diff --git a/objects/frosted-spruce/large-8.iob b/objects/trees/spruce/lfrostgeneric25.iob similarity index 100% rename from objects/frosted-spruce/large-8.iob rename to objects/trees/spruce/lfrostgeneric25.iob diff --git a/objects/frosted-spruce/large-9.iob b/objects/trees/spruce/lfrostgeneric26.iob similarity index 100% rename from objects/frosted-spruce/large-9.iob rename to objects/trees/spruce/lfrostgeneric26.iob diff --git a/objects/frosted-spruce/large-11.iob b/objects/trees/spruce/lfrostgeneric3.iob similarity index 100% rename from objects/frosted-spruce/large-11.iob rename to objects/trees/spruce/lfrostgeneric3.iob diff --git a/objects/frosted-spruce/large-12.iob b/objects/trees/spruce/lfrostgeneric4.iob similarity index 100% rename from objects/frosted-spruce/large-12.iob rename to objects/trees/spruce/lfrostgeneric4.iob diff --git a/objects/frosted-spruce/large-13.iob b/objects/trees/spruce/lfrostgeneric5.iob similarity index 100% rename from objects/frosted-spruce/large-13.iob rename to objects/trees/spruce/lfrostgeneric5.iob diff --git a/objects/frosted-spruce/large-14.iob b/objects/trees/spruce/lfrostgeneric6.iob similarity index 100% rename from objects/frosted-spruce/large-14.iob rename to objects/trees/spruce/lfrostgeneric6.iob diff --git a/objects/frosted-spruce/large-15.iob b/objects/trees/spruce/lfrostgeneric7.iob similarity index 100% rename from objects/frosted-spruce/large-15.iob rename to objects/trees/spruce/lfrostgeneric7.iob diff --git a/objects/frosted-spruce/large-16.iob b/objects/trees/spruce/lfrostgeneric8.iob similarity index 100% rename from objects/frosted-spruce/large-16.iob rename to objects/trees/spruce/lfrostgeneric8.iob diff --git a/objects/frosted-spruce/large-17.iob b/objects/trees/spruce/lfrostgeneric9.iob similarity index 100% rename from objects/frosted-spruce/large-17.iob rename to objects/trees/spruce/lfrostgeneric9.iob diff --git a/objects/lush-pine/lush-pine1.iob b/objects/trees/spruce/lushgenericpine1.iob similarity index 100% rename from objects/lush-pine/lush-pine1.iob rename to objects/trees/spruce/lushgenericpine1.iob diff --git a/objects/lush-pine/lush-pine9.iob b/objects/trees/spruce/lushgenericpine10.iob similarity index 100% rename from objects/lush-pine/lush-pine9.iob rename to objects/trees/spruce/lushgenericpine10.iob diff --git a/objects/lush-pine/lush-pine10.iob b/objects/trees/spruce/lushgenericpine2.iob similarity index 100% rename from objects/lush-pine/lush-pine10.iob rename to objects/trees/spruce/lushgenericpine2.iob diff --git a/objects/lush-pine/lush-pine2.iob b/objects/trees/spruce/lushgenericpine3.iob similarity index 100% rename from objects/lush-pine/lush-pine2.iob rename to objects/trees/spruce/lushgenericpine3.iob diff --git a/objects/lush-pine/lush-pine3.iob b/objects/trees/spruce/lushgenericpine4.iob similarity index 100% rename from objects/lush-pine/lush-pine3.iob rename to objects/trees/spruce/lushgenericpine4.iob diff --git a/objects/lush-pine/lush-pine4.iob b/objects/trees/spruce/lushgenericpine5.iob similarity index 100% rename from objects/lush-pine/lush-pine4.iob rename to objects/trees/spruce/lushgenericpine5.iob diff --git a/objects/lush-pine/lush-pine5.iob b/objects/trees/spruce/lushgenericpine6.iob similarity index 100% rename from objects/lush-pine/lush-pine5.iob rename to objects/trees/spruce/lushgenericpine6.iob diff --git a/objects/lush-pine/lush-pine6.iob b/objects/trees/spruce/lushgenericpine7.iob similarity index 100% rename from objects/lush-pine/lush-pine6.iob rename to objects/trees/spruce/lushgenericpine7.iob diff --git a/objects/lush-pine/lush-pine7.iob b/objects/trees/spruce/lushgenericpine8.iob similarity index 100% rename from objects/lush-pine/lush-pine7.iob rename to objects/trees/spruce/lushgenericpine8.iob diff --git a/objects/lush-pine/lush-pine8.iob b/objects/trees/spruce/lushgenericpine9.iob similarity index 100% rename from objects/lush-pine/lush-pine8.iob rename to objects/trees/spruce/lushgenericpine9.iob diff --git a/objects/evergreen/fantasy_evergreen_medium1.iob b/objects/trees/spruce/mevergreen1.iob similarity index 100% rename from objects/evergreen/fantasy_evergreen_medium1.iob rename to objects/trees/spruce/mevergreen1.iob diff --git a/objects/evergreen/fantasy_evergreen_medium2.iob b/objects/trees/spruce/mevergreen2.iob similarity index 100% rename from objects/evergreen/fantasy_evergreen_medium2.iob rename to objects/trees/spruce/mevergreen2.iob diff --git a/objects/evergreen/fantasy_evergreen_medium3.iob b/objects/trees/spruce/mevergreen3.iob similarity index 100% rename from objects/evergreen/fantasy_evergreen_medium3.iob rename to objects/trees/spruce/mevergreen3.iob diff --git a/objects/pine/pine1.iob b/objects/trees/spruce/pine1.iob similarity index 100% rename from objects/pine/pine1.iob rename to objects/trees/spruce/pine1.iob diff --git a/objects/pine/pine10.iob b/objects/trees/spruce/pine10.iob similarity index 100% rename from objects/pine/pine10.iob rename to objects/trees/spruce/pine10.iob diff --git a/objects/pine/pine11.iob b/objects/trees/spruce/pine11.iob similarity index 100% rename from objects/pine/pine11.iob rename to objects/trees/spruce/pine11.iob diff --git a/objects/pine/pine12.iob b/objects/trees/spruce/pine12.iob similarity index 100% rename from objects/pine/pine12.iob rename to objects/trees/spruce/pine12.iob diff --git a/objects/pine/pine2.iob b/objects/trees/spruce/pine2.iob similarity index 100% rename from objects/pine/pine2.iob rename to objects/trees/spruce/pine2.iob diff --git a/objects/pine/pine3.iob b/objects/trees/spruce/pine3.iob similarity index 100% rename from objects/pine/pine3.iob rename to objects/trees/spruce/pine3.iob diff --git a/objects/pine/pine4.iob b/objects/trees/spruce/pine4.iob similarity index 100% rename from objects/pine/pine4.iob rename to objects/trees/spruce/pine4.iob diff --git a/objects/pine/pine5.iob b/objects/trees/spruce/pine5.iob similarity index 100% rename from objects/pine/pine5.iob rename to objects/trees/spruce/pine5.iob diff --git a/objects/pine/pine6.iob b/objects/trees/spruce/pine6.iob similarity index 100% rename from objects/pine/pine6.iob rename to objects/trees/spruce/pine6.iob diff --git a/objects/pine/pine7.iob b/objects/trees/spruce/pine7.iob similarity index 100% rename from objects/pine/pine7.iob rename to objects/trees/spruce/pine7.iob diff --git a/objects/pine/pine8.iob b/objects/trees/spruce/pine8.iob similarity index 100% rename from objects/pine/pine8.iob rename to objects/trees/spruce/pine8.iob diff --git a/objects/pine/pine9.iob b/objects/trees/spruce/pine9.iob similarity index 100% rename from objects/pine/pine9.iob rename to objects/trees/spruce/pine9.iob diff --git a/objects/evergreen/fantasy_evergreen_small1.iob b/objects/trees/spruce/severgreen1.iob similarity index 100% rename from objects/evergreen/fantasy_evergreen_small1.iob rename to objects/trees/spruce/severgreen1.iob diff --git a/objects/evergreen/fantasy_evergreen_small2.iob b/objects/trees/spruce/severgreen2.iob similarity index 100% rename from objects/evergreen/fantasy_evergreen_small2.iob rename to objects/trees/spruce/severgreen2.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-1.iob b/objects/trees/spruce/sfrostgeneric1.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-1.iob rename to objects/trees/spruce/sfrostgeneric1.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-18.iob b/objects/trees/spruce/sfrostgeneric10.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-18.iob rename to objects/trees/spruce/sfrostgeneric10.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-19.iob b/objects/trees/spruce/sfrostgeneric11.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-19.iob rename to objects/trees/spruce/sfrostgeneric11.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-2.iob b/objects/trees/spruce/sfrostgeneric12.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-2.iob rename to objects/trees/spruce/sfrostgeneric12.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-20.iob b/objects/trees/spruce/sfrostgeneric13.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-20.iob rename to objects/trees/spruce/sfrostgeneric13.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-3.iob b/objects/trees/spruce/sfrostgeneric14.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-3.iob rename to objects/trees/spruce/sfrostgeneric14.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-4.iob b/objects/trees/spruce/sfrostgeneric15.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-4.iob rename to objects/trees/spruce/sfrostgeneric15.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-5.iob b/objects/trees/spruce/sfrostgeneric16.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-5.iob rename to objects/trees/spruce/sfrostgeneric16.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-6.iob b/objects/trees/spruce/sfrostgeneric17.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-6.iob rename to objects/trees/spruce/sfrostgeneric17.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-7.iob b/objects/trees/spruce/sfrostgeneric18.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-7.iob rename to objects/trees/spruce/sfrostgeneric18.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-8.iob b/objects/trees/spruce/sfrostgeneric19.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-8.iob rename to objects/trees/spruce/sfrostgeneric19.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-10.iob b/objects/trees/spruce/sfrostgeneric2.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-10.iob rename to objects/trees/spruce/sfrostgeneric2.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-9.iob b/objects/trees/spruce/sfrostgeneric20.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-9.iob rename to objects/trees/spruce/sfrostgeneric20.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-11.iob b/objects/trees/spruce/sfrostgeneric3.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-11.iob rename to objects/trees/spruce/sfrostgeneric3.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-12.iob b/objects/trees/spruce/sfrostgeneric4.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-12.iob rename to objects/trees/spruce/sfrostgeneric4.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-13.iob b/objects/trees/spruce/sfrostgeneric5.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-13.iob rename to objects/trees/spruce/sfrostgeneric5.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-14.iob b/objects/trees/spruce/sfrostgeneric6.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-14.iob rename to objects/trees/spruce/sfrostgeneric6.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-15.iob b/objects/trees/spruce/sfrostgeneric7.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-15.iob rename to objects/trees/spruce/sfrostgeneric7.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-16.iob b/objects/trees/spruce/sfrostgeneric8.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-16.iob rename to objects/trees/spruce/sfrostgeneric8.iob diff --git a/objects/frosted-spruce/[Iced Variants]/smol-17.iob b/objects/trees/spruce/sfrostgeneric9.iob similarity index 100% rename from objects/frosted-spruce/[Iced Variants]/smol-17.iob rename to objects/trees/spruce/sfrostgeneric9.iob diff --git a/objects/spruce-small/spruce1.iob b/objects/trees/spruce/smol1.iob similarity index 100% rename from objects/spruce-small/spruce1.iob rename to objects/trees/spruce/smol1.iob diff --git a/objects/spruce-small/spruce6.iob b/objects/trees/spruce/smol10.iob similarity index 100% rename from objects/spruce-small/spruce6.iob rename to objects/trees/spruce/smol10.iob diff --git a/objects/spruce-small/spruce7.iob b/objects/trees/spruce/smol11.iob similarity index 100% rename from objects/spruce-small/spruce7.iob rename to objects/trees/spruce/smol11.iob diff --git a/objects/spruce-small/spruce8.iob b/objects/trees/spruce/smol12.iob similarity index 100% rename from objects/spruce-small/spruce8.iob rename to objects/trees/spruce/smol12.iob diff --git a/objects/spruce-small/spruce9.iob b/objects/trees/spruce/smol13.iob similarity index 100% rename from objects/spruce-small/spruce9.iob rename to objects/trees/spruce/smol13.iob diff --git a/objects/spruce-small/spruce10.iob b/objects/trees/spruce/smol2.iob similarity index 100% rename from objects/spruce-small/spruce10.iob rename to objects/trees/spruce/smol2.iob diff --git a/objects/spruce-small/spruce11.iob b/objects/trees/spruce/smol3.iob similarity index 100% rename from objects/spruce-small/spruce11.iob rename to objects/trees/spruce/smol3.iob diff --git a/objects/spruce-small/spruce12.iob b/objects/trees/spruce/smol4.iob similarity index 100% rename from objects/spruce-small/spruce12.iob rename to objects/trees/spruce/smol4.iob diff --git a/objects/spruce-small/spruce13.iob b/objects/trees/spruce/smol5.iob similarity index 100% rename from objects/spruce-small/spruce13.iob rename to objects/trees/spruce/smol5.iob diff --git a/objects/spruce-small/spruce2.iob b/objects/trees/spruce/smol6.iob similarity index 100% rename from objects/spruce-small/spruce2.iob rename to objects/trees/spruce/smol6.iob diff --git a/objects/spruce-small/spruce3.iob b/objects/trees/spruce/smol7.iob similarity index 100% rename from objects/spruce-small/spruce3.iob rename to objects/trees/spruce/smol7.iob diff --git a/objects/spruce-small/spruce4.iob b/objects/trees/spruce/smol8.iob similarity index 100% rename from objects/spruce-small/spruce4.iob rename to objects/trees/spruce/smol8.iob diff --git a/objects/spruce-small/spruce5.iob b/objects/trees/spruce/smol9.iob similarity index 100% rename from objects/spruce-small/spruce5.iob rename to objects/trees/spruce/smol9.iob diff --git a/objects/wastelands/sprucetree-1.iob b/objects/trees/spruce/sprucetree-1.iob similarity index 100% rename from objects/wastelands/sprucetree-1.iob rename to objects/trees/spruce/sprucetree-1.iob diff --git a/objects/wastelands/sprucetree-10.iob b/objects/trees/spruce/sprucetree-10.iob similarity index 100% rename from objects/wastelands/sprucetree-10.iob rename to objects/trees/spruce/sprucetree-10.iob diff --git a/objects/wastelands/sprucetree-11.iob b/objects/trees/spruce/sprucetree-11.iob similarity index 100% rename from objects/wastelands/sprucetree-11.iob rename to objects/trees/spruce/sprucetree-11.iob diff --git a/objects/wastelands/sprucetree-12.iob b/objects/trees/spruce/sprucetree-12.iob similarity index 100% rename from objects/wastelands/sprucetree-12.iob rename to objects/trees/spruce/sprucetree-12.iob diff --git a/objects/wastelands/sprucetree-13.iob b/objects/trees/spruce/sprucetree-13.iob similarity index 100% rename from objects/wastelands/sprucetree-13.iob rename to objects/trees/spruce/sprucetree-13.iob diff --git a/objects/wastelands/sprucetree-14.iob b/objects/trees/spruce/sprucetree-14.iob similarity index 100% rename from objects/wastelands/sprucetree-14.iob rename to objects/trees/spruce/sprucetree-14.iob diff --git a/objects/wastelands/sprucetree-15.iob b/objects/trees/spruce/sprucetree-15.iob similarity index 100% rename from objects/wastelands/sprucetree-15.iob rename to objects/trees/spruce/sprucetree-15.iob diff --git a/objects/wastelands/sprucetree-2.iob b/objects/trees/spruce/sprucetree-2.iob similarity index 100% rename from objects/wastelands/sprucetree-2.iob rename to objects/trees/spruce/sprucetree-2.iob diff --git a/objects/wastelands/sprucetree-3.iob b/objects/trees/spruce/sprucetree-3.iob similarity index 100% rename from objects/wastelands/sprucetree-3.iob rename to objects/trees/spruce/sprucetree-3.iob diff --git a/objects/wastelands/sprucetree-4.iob b/objects/trees/spruce/sprucetree-4.iob similarity index 100% rename from objects/wastelands/sprucetree-4.iob rename to objects/trees/spruce/sprucetree-4.iob diff --git a/objects/wastelands/sprucetree-5.iob b/objects/trees/spruce/sprucetree-5.iob similarity index 100% rename from objects/wastelands/sprucetree-5.iob rename to objects/trees/spruce/sprucetree-5.iob diff --git a/objects/wastelands/sprucetree-6.iob b/objects/trees/spruce/sprucetree-6.iob similarity index 100% rename from objects/wastelands/sprucetree-6.iob rename to objects/trees/spruce/sprucetree-6.iob diff --git a/objects/wastelands/sprucetree-7.iob b/objects/trees/spruce/sprucetree-7.iob similarity index 100% rename from objects/wastelands/sprucetree-7.iob rename to objects/trees/spruce/sprucetree-7.iob diff --git a/objects/wastelands/sprucetree-8.iob b/objects/trees/spruce/sprucetree-8.iob similarity index 100% rename from objects/wastelands/sprucetree-8.iob rename to objects/trees/spruce/sprucetree-8.iob diff --git a/objects/wastelands/sprucetree-9.iob b/objects/trees/spruce/sprucetree-9.iob similarity index 100% rename from objects/wastelands/sprucetree-9.iob rename to objects/trees/spruce/sprucetree-9.iob diff --git a/objects/pine/sup-pine-1.iob b/objects/trees/spruce/sup-pine-1.iob similarity index 100% rename from objects/pine/sup-pine-1.iob rename to objects/trees/spruce/sup-pine-1.iob diff --git a/objects/pine/sup-pine-10.iob b/objects/trees/spruce/sup-pine-10.iob similarity index 100% rename from objects/pine/sup-pine-10.iob rename to objects/trees/spruce/sup-pine-10.iob diff --git a/objects/pine/sup-pine-11.iob b/objects/trees/spruce/sup-pine-11.iob similarity index 100% rename from objects/pine/sup-pine-11.iob rename to objects/trees/spruce/sup-pine-11.iob diff --git a/objects/pine/sup-pine-12.iob b/objects/trees/spruce/sup-pine-12.iob similarity index 100% rename from objects/pine/sup-pine-12.iob rename to objects/trees/spruce/sup-pine-12.iob diff --git a/objects/pine/sup-pine-13.iob b/objects/trees/spruce/sup-pine-13.iob similarity index 100% rename from objects/pine/sup-pine-13.iob rename to objects/trees/spruce/sup-pine-13.iob diff --git a/objects/pine/sup-pine-2.iob b/objects/trees/spruce/sup-pine-2.iob similarity index 100% rename from objects/pine/sup-pine-2.iob rename to objects/trees/spruce/sup-pine-2.iob diff --git a/objects/pine/sup-pine-3.iob b/objects/trees/spruce/sup-pine-3.iob similarity index 100% rename from objects/pine/sup-pine-3.iob rename to objects/trees/spruce/sup-pine-3.iob diff --git a/objects/pine/sup-pine-4.iob b/objects/trees/spruce/sup-pine-4.iob similarity index 100% rename from objects/pine/sup-pine-4.iob rename to objects/trees/spruce/sup-pine-4.iob diff --git a/objects/pine/sup-pine-5.iob b/objects/trees/spruce/sup-pine-5.iob similarity index 100% rename from objects/pine/sup-pine-5.iob rename to objects/trees/spruce/sup-pine-5.iob diff --git a/objects/pine/sup-pine-6.iob b/objects/trees/spruce/sup-pine-6.iob similarity index 100% rename from objects/pine/sup-pine-6.iob rename to objects/trees/spruce/sup-pine-6.iob diff --git a/objects/pine/sup-pine-7.iob b/objects/trees/spruce/sup-pine-7.iob similarity index 100% rename from objects/pine/sup-pine-7.iob rename to objects/trees/spruce/sup-pine-7.iob diff --git a/objects/pine/sup-pine-8.iob b/objects/trees/spruce/sup-pine-8.iob similarity index 100% rename from objects/pine/sup-pine-8.iob rename to objects/trees/spruce/sup-pine-8.iob diff --git a/objects/pine/sup-pine-9.iob b/objects/trees/spruce/sup-pine-9.iob similarity index 100% rename from objects/pine/sup-pine-9.iob rename to objects/trees/spruce/sup-pine-9.iob diff --git a/objects/wonderland/twirlSpruce-1.iob b/objects/trees/spruce/twirl1.iob similarity index 100% rename from objects/wonderland/twirlSpruce-1.iob rename to objects/trees/spruce/twirl1.iob diff --git a/objects/wonderland/twirlSpruce-9.iob b/objects/trees/spruce/twirl10.iob similarity index 100% rename from objects/wonderland/twirlSpruce-9.iob rename to objects/trees/spruce/twirl10.iob diff --git a/objects/wonderland/twirlSpruce-10.iob b/objects/trees/spruce/twirl2.iob similarity index 100% rename from objects/wonderland/twirlSpruce-10.iob rename to objects/trees/spruce/twirl2.iob diff --git a/objects/wonderland/twirlSpruce-2.iob b/objects/trees/spruce/twirl3.iob similarity index 100% rename from objects/wonderland/twirlSpruce-2.iob rename to objects/trees/spruce/twirl3.iob diff --git a/objects/wonderland/twirlSpruce-3.iob b/objects/trees/spruce/twirl4.iob similarity index 100% rename from objects/wonderland/twirlSpruce-3.iob rename to objects/trees/spruce/twirl4.iob diff --git a/objects/wonderland/twirlSpruce-4.iob b/objects/trees/spruce/twirl5.iob similarity index 100% rename from objects/wonderland/twirlSpruce-4.iob rename to objects/trees/spruce/twirl5.iob diff --git a/objects/wonderland/twirlSpruce-5.iob b/objects/trees/spruce/twirl6.iob similarity index 100% rename from objects/wonderland/twirlSpruce-5.iob rename to objects/trees/spruce/twirl6.iob diff --git a/objects/wonderland/twirlSpruce-6.iob b/objects/trees/spruce/twirl7.iob similarity index 100% rename from objects/wonderland/twirlSpruce-6.iob rename to objects/trees/spruce/twirl7.iob diff --git a/objects/wonderland/twirlSpruce-7.iob b/objects/trees/spruce/twirl8.iob similarity index 100% rename from objects/wonderland/twirlSpruce-7.iob rename to objects/trees/spruce/twirl8.iob diff --git a/objects/wonderland/twirlSpruce-8.iob b/objects/trees/spruce/twirl9.iob similarity index 100% rename from objects/wonderland/twirlSpruce-8.iob rename to objects/trees/spruce/twirl9.iob diff --git a/objects/unfrosted-spruce/large-1.iob b/objects/trees/spruce/unfrostedlarge1.iob similarity index 100% rename from objects/unfrosted-spruce/large-1.iob rename to objects/trees/spruce/unfrostedlarge1.iob diff --git a/objects/unfrosted-spruce/large-18.iob b/objects/trees/spruce/unfrostedlarge10.iob similarity index 100% rename from objects/unfrosted-spruce/large-18.iob rename to objects/trees/spruce/unfrostedlarge10.iob diff --git a/objects/unfrosted-spruce/large-19.iob b/objects/trees/spruce/unfrostedlarge11.iob similarity index 100% rename from objects/unfrosted-spruce/large-19.iob rename to objects/trees/spruce/unfrostedlarge11.iob diff --git a/objects/unfrosted-spruce/large-2.iob b/objects/trees/spruce/unfrostedlarge12.iob similarity index 100% rename from objects/unfrosted-spruce/large-2.iob rename to objects/trees/spruce/unfrostedlarge12.iob diff --git a/objects/unfrosted-spruce/large-20.iob b/objects/trees/spruce/unfrostedlarge13.iob similarity index 100% rename from objects/unfrosted-spruce/large-20.iob rename to objects/trees/spruce/unfrostedlarge13.iob diff --git a/objects/unfrosted-spruce/large-21.iob b/objects/trees/spruce/unfrostedlarge14.iob similarity index 100% rename from objects/unfrosted-spruce/large-21.iob rename to objects/trees/spruce/unfrostedlarge14.iob diff --git a/objects/unfrosted-spruce/large-22.iob b/objects/trees/spruce/unfrostedlarge15.iob similarity index 100% rename from objects/unfrosted-spruce/large-22.iob rename to objects/trees/spruce/unfrostedlarge15.iob diff --git a/objects/unfrosted-spruce/large-23.iob b/objects/trees/spruce/unfrostedlarge16.iob similarity index 100% rename from objects/unfrosted-spruce/large-23.iob rename to objects/trees/spruce/unfrostedlarge16.iob diff --git a/objects/unfrosted-spruce/large-24.iob b/objects/trees/spruce/unfrostedlarge17.iob similarity index 100% rename from objects/unfrosted-spruce/large-24.iob rename to objects/trees/spruce/unfrostedlarge17.iob diff --git a/objects/unfrosted-spruce/large-3.iob b/objects/trees/spruce/unfrostedlarge18.iob similarity index 100% rename from objects/unfrosted-spruce/large-3.iob rename to objects/trees/spruce/unfrostedlarge18.iob diff --git a/objects/unfrosted-spruce/large-4.iob b/objects/trees/spruce/unfrostedlarge19.iob similarity index 100% rename from objects/unfrosted-spruce/large-4.iob rename to objects/trees/spruce/unfrostedlarge19.iob diff --git a/objects/unfrosted-spruce/large-10.iob b/objects/trees/spruce/unfrostedlarge2.iob similarity index 100% rename from objects/unfrosted-spruce/large-10.iob rename to objects/trees/spruce/unfrostedlarge2.iob diff --git a/objects/unfrosted-spruce/large-5.iob b/objects/trees/spruce/unfrostedlarge20.iob similarity index 100% rename from objects/unfrosted-spruce/large-5.iob rename to objects/trees/spruce/unfrostedlarge20.iob diff --git a/objects/unfrosted-spruce/large-6.iob b/objects/trees/spruce/unfrostedlarge21.iob similarity index 100% rename from objects/unfrosted-spruce/large-6.iob rename to objects/trees/spruce/unfrostedlarge21.iob diff --git a/objects/unfrosted-spruce/large-7.iob b/objects/trees/spruce/unfrostedlarge22.iob similarity index 100% rename from objects/unfrosted-spruce/large-7.iob rename to objects/trees/spruce/unfrostedlarge22.iob diff --git a/objects/unfrosted-spruce/large-8.iob b/objects/trees/spruce/unfrostedlarge23.iob similarity index 100% rename from objects/unfrosted-spruce/large-8.iob rename to objects/trees/spruce/unfrostedlarge23.iob diff --git a/objects/unfrosted-spruce/large-9.iob b/objects/trees/spruce/unfrostedlarge24.iob similarity index 100% rename from objects/unfrosted-spruce/large-9.iob rename to objects/trees/spruce/unfrostedlarge24.iob diff --git a/objects/unfrosted-spruce/large-11.iob b/objects/trees/spruce/unfrostedlarge3.iob similarity index 100% rename from objects/unfrosted-spruce/large-11.iob rename to objects/trees/spruce/unfrostedlarge3.iob diff --git a/objects/unfrosted-spruce/large-12.iob b/objects/trees/spruce/unfrostedlarge4.iob similarity index 100% rename from objects/unfrosted-spruce/large-12.iob rename to objects/trees/spruce/unfrostedlarge4.iob diff --git a/objects/unfrosted-spruce/large-13.iob b/objects/trees/spruce/unfrostedlarge5.iob similarity index 100% rename from objects/unfrosted-spruce/large-13.iob rename to objects/trees/spruce/unfrostedlarge5.iob diff --git a/objects/unfrosted-spruce/large-14.iob b/objects/trees/spruce/unfrostedlarge6.iob similarity index 100% rename from objects/unfrosted-spruce/large-14.iob rename to objects/trees/spruce/unfrostedlarge6.iob diff --git a/objects/unfrosted-spruce/large-15.iob b/objects/trees/spruce/unfrostedlarge7.iob similarity index 100% rename from objects/unfrosted-spruce/large-15.iob rename to objects/trees/spruce/unfrostedlarge7.iob diff --git a/objects/unfrosted-spruce/large-16.iob b/objects/trees/spruce/unfrostedlarge8.iob similarity index 100% rename from objects/unfrosted-spruce/large-16.iob rename to objects/trees/spruce/unfrostedlarge8.iob diff --git a/objects/unfrosted-spruce/large-17.iob b/objects/trees/spruce/unfrostedlarge9.iob similarity index 100% rename from objects/unfrosted-spruce/large-17.iob rename to objects/trees/spruce/unfrostedlarge9.iob diff --git a/objects/unfrosted-spruce/big-1.iob b/objects/trees/spruce/unfrostedmed1.iob similarity index 100% rename from objects/unfrosted-spruce/big-1.iob rename to objects/trees/spruce/unfrostedmed1.iob diff --git a/objects/unfrosted-spruce/big-2.iob b/objects/trees/spruce/unfrostedmed2.iob similarity index 100% rename from objects/unfrosted-spruce/big-2.iob rename to objects/trees/spruce/unfrostedmed2.iob diff --git a/objects/unfrosted-spruce/big-3.iob b/objects/trees/spruce/unfrostedmed3.iob similarity index 100% rename from objects/unfrosted-spruce/big-3.iob rename to objects/trees/spruce/unfrostedmed3.iob diff --git a/objects/unfrosted-spruce/med-1.iob b/objects/trees/spruce/unfrostedmed4.iob similarity index 100% rename from objects/unfrosted-spruce/med-1.iob rename to objects/trees/spruce/unfrostedmed4.iob diff --git a/objects/unfrosted-spruce/med-2.iob b/objects/trees/spruce/unfrostedmed5.iob similarity index 100% rename from objects/unfrosted-spruce/med-2.iob rename to objects/trees/spruce/unfrostedmed5.iob diff --git a/objects/unfrosted-spruce/med-3.iob b/objects/trees/spruce/unfrostedmed6.iob similarity index 100% rename from objects/unfrosted-spruce/med-3.iob rename to objects/trees/spruce/unfrostedmed6.iob diff --git a/objects/unfrosted-spruce/med-4.iob b/objects/trees/spruce/unfrostedmed7.iob similarity index 100% rename from objects/unfrosted-spruce/med-4.iob rename to objects/trees/spruce/unfrostedmed7.iob diff --git a/objects/unfrosted-spruce/med-5.iob b/objects/trees/spruce/unfrostedmed8.iob similarity index 100% rename from objects/unfrosted-spruce/med-5.iob rename to objects/trees/spruce/unfrostedmed8.iob diff --git a/objects/unfrosted-spruce/smol-1.iob b/objects/trees/spruce/unfrostedsmol1.iob similarity index 100% rename from objects/unfrosted-spruce/smol-1.iob rename to objects/trees/spruce/unfrostedsmol1.iob diff --git a/objects/unfrosted-spruce/smol-2.iob b/objects/trees/spruce/unfrostedsmol2.iob similarity index 100% rename from objects/unfrosted-spruce/smol-2.iob rename to objects/trees/spruce/unfrostedsmol2.iob diff --git a/objects/unfrosted-spruce/smol-3.iob b/objects/trees/spruce/unfrostedsmol3.iob similarity index 100% rename from objects/unfrosted-spruce/smol-3.iob rename to objects/trees/spruce/unfrostedsmol3.iob diff --git a/objects/unfrosted-spruce/smol-4.iob b/objects/trees/spruce/unfrostedsmol4.iob similarity index 100% rename from objects/unfrosted-spruce/smol-4.iob rename to objects/trees/spruce/unfrostedsmol4.iob diff --git a/objects/unfrosted-spruce/smol-5.iob b/objects/trees/spruce/unfrostedsmol5.iob similarity index 100% rename from objects/unfrosted-spruce/smol-5.iob rename to objects/trees/spruce/unfrostedsmol5.iob diff --git a/objects/unfrosted-spruce/smol-6.iob b/objects/trees/spruce/unfrostedsmol6.iob similarity index 100% rename from objects/unfrosted-spruce/smol-6.iob rename to objects/trees/spruce/unfrostedsmol6.iob diff --git a/objects/unfrosted-spruce/smol-7.iob b/objects/trees/spruce/unfrostedsmol7.iob similarity index 100% rename from objects/unfrosted-spruce/smol-7.iob rename to objects/trees/spruce/unfrostedsmol7.iob diff --git a/objects/unfrosted-spruce/smol-8.iob b/objects/trees/spruce/unfrostedsmol8.iob similarity index 100% rename from objects/unfrosted-spruce/smol-8.iob rename to objects/trees/spruce/unfrostedsmol8.iob diff --git a/objects/unfrosted-spruce/smol-9.iob b/objects/trees/spruce/unfrostedsmol9.iob similarity index 100% rename from objects/unfrosted-spruce/smol-9.iob rename to objects/trees/spruce/unfrostedsmol9.iob diff --git a/objects/spruce-medium/spruce1.iob b/objects/trees/spruce/vgeneric1.iob similarity index 100% rename from objects/spruce-medium/spruce1.iob rename to objects/trees/spruce/vgeneric1.iob diff --git a/objects/spruce-medium/spruce19.iob b/objects/trees/spruce/vgeneric10.iob similarity index 100% rename from objects/spruce-medium/spruce19.iob rename to objects/trees/spruce/vgeneric10.iob diff --git a/objects/spruce-medium/spruce2.iob b/objects/trees/spruce/vgeneric11.iob similarity index 100% rename from objects/spruce-medium/spruce2.iob rename to objects/trees/spruce/vgeneric11.iob diff --git a/objects/spruce-medium/spruce20.iob b/objects/trees/spruce/vgeneric12.iob similarity index 100% rename from objects/spruce-medium/spruce20.iob rename to objects/trees/spruce/vgeneric12.iob diff --git a/objects/spruce-medium/spruce27.iob b/objects/trees/spruce/vgeneric13.iob similarity index 100% rename from objects/spruce-medium/spruce27.iob rename to objects/trees/spruce/vgeneric13.iob diff --git a/objects/spruce-medium/spruce28.iob b/objects/trees/spruce/vgeneric14.iob similarity index 100% rename from objects/spruce-medium/spruce28.iob rename to objects/trees/spruce/vgeneric14.iob diff --git a/objects/spruce-medium/spruce29.iob b/objects/trees/spruce/vgeneric15.iob similarity index 100% rename from objects/spruce-medium/spruce29.iob rename to objects/trees/spruce/vgeneric15.iob diff --git a/objects/spruce-medium/spruce3.iob b/objects/trees/spruce/vgeneric16.iob similarity index 100% rename from objects/spruce-medium/spruce3.iob rename to objects/trees/spruce/vgeneric16.iob diff --git a/objects/spruce-medium/spruce30.iob b/objects/trees/spruce/vgeneric17.iob similarity index 100% rename from objects/spruce-medium/spruce30.iob rename to objects/trees/spruce/vgeneric17.iob diff --git a/objects/spruce-medium/spruce31.iob b/objects/trees/spruce/vgeneric18.iob similarity index 100% rename from objects/spruce-medium/spruce31.iob rename to objects/trees/spruce/vgeneric18.iob diff --git a/objects/spruce-medium/spruce32.iob b/objects/trees/spruce/vgeneric19.iob similarity index 100% rename from objects/spruce-medium/spruce32.iob rename to objects/trees/spruce/vgeneric19.iob diff --git a/objects/spruce-medium/spruce10.iob b/objects/trees/spruce/vgeneric2.iob similarity index 100% rename from objects/spruce-medium/spruce10.iob rename to objects/trees/spruce/vgeneric2.iob diff --git a/objects/spruce-medium/spruce33.iob b/objects/trees/spruce/vgeneric20.iob similarity index 100% rename from objects/spruce-medium/spruce33.iob rename to objects/trees/spruce/vgeneric20.iob diff --git a/objects/spruce-medium/spruce34.iob b/objects/trees/spruce/vgeneric21.iob similarity index 100% rename from objects/spruce-medium/spruce34.iob rename to objects/trees/spruce/vgeneric21.iob diff --git a/objects/spruce-medium/spruce37.iob b/objects/trees/spruce/vgeneric22.iob similarity index 100% rename from objects/spruce-medium/spruce37.iob rename to objects/trees/spruce/vgeneric22.iob diff --git a/objects/spruce-medium/spruce39.iob b/objects/trees/spruce/vgeneric23.iob similarity index 100% rename from objects/spruce-medium/spruce39.iob rename to objects/trees/spruce/vgeneric23.iob diff --git a/objects/spruce-medium/spruce4.iob b/objects/trees/spruce/vgeneric24.iob similarity index 100% rename from objects/spruce-medium/spruce4.iob rename to objects/trees/spruce/vgeneric24.iob diff --git a/objects/spruce-medium/spruce41.iob b/objects/trees/spruce/vgeneric25.iob similarity index 100% rename from objects/spruce-medium/spruce41.iob rename to objects/trees/spruce/vgeneric25.iob diff --git a/objects/spruce-medium/spruce42.iob b/objects/trees/spruce/vgeneric26.iob similarity index 100% rename from objects/spruce-medium/spruce42.iob rename to objects/trees/spruce/vgeneric26.iob diff --git a/objects/spruce-medium/spruce43.iob b/objects/trees/spruce/vgeneric27.iob similarity index 100% rename from objects/spruce-medium/spruce43.iob rename to objects/trees/spruce/vgeneric27.iob diff --git a/objects/spruce-medium/spruce5.iob b/objects/trees/spruce/vgeneric28.iob similarity index 100% rename from objects/spruce-medium/spruce5.iob rename to objects/trees/spruce/vgeneric28.iob diff --git a/objects/spruce-medium/spruce6.iob b/objects/trees/spruce/vgeneric29.iob similarity index 100% rename from objects/spruce-medium/spruce6.iob rename to objects/trees/spruce/vgeneric29.iob diff --git a/objects/spruce-medium/spruce11.iob b/objects/trees/spruce/vgeneric3.iob similarity index 100% rename from objects/spruce-medium/spruce11.iob rename to objects/trees/spruce/vgeneric3.iob diff --git a/objects/spruce-medium/spruce7.iob b/objects/trees/spruce/vgeneric30.iob similarity index 100% rename from objects/spruce-medium/spruce7.iob rename to objects/trees/spruce/vgeneric30.iob diff --git a/objects/spruce-medium/spruce8.iob b/objects/trees/spruce/vgeneric31.iob similarity index 100% rename from objects/spruce-medium/spruce8.iob rename to objects/trees/spruce/vgeneric31.iob diff --git a/objects/spruce-medium/spruce9.iob b/objects/trees/spruce/vgeneric32.iob similarity index 100% rename from objects/spruce-medium/spruce9.iob rename to objects/trees/spruce/vgeneric32.iob diff --git a/objects/spruce-medium/spruce12.iob b/objects/trees/spruce/vgeneric4.iob similarity index 100% rename from objects/spruce-medium/spruce12.iob rename to objects/trees/spruce/vgeneric4.iob diff --git a/objects/spruce-medium/spruce13.iob b/objects/trees/spruce/vgeneric5.iob similarity index 100% rename from objects/spruce-medium/spruce13.iob rename to objects/trees/spruce/vgeneric5.iob diff --git a/objects/spruce-medium/spruce14.iob b/objects/trees/spruce/vgeneric6.iob similarity index 100% rename from objects/spruce-medium/spruce14.iob rename to objects/trees/spruce/vgeneric6.iob diff --git a/objects/spruce-medium/spruce16.iob b/objects/trees/spruce/vgeneric7.iob similarity index 100% rename from objects/spruce-medium/spruce16.iob rename to objects/trees/spruce/vgeneric7.iob diff --git a/objects/spruce-medium/spruce17.iob b/objects/trees/spruce/vgeneric8.iob similarity index 100% rename from objects/spruce-medium/spruce17.iob rename to objects/trees/spruce/vgeneric8.iob diff --git a/objects/spruce-medium/spruce18.iob b/objects/trees/spruce/vgeneric9.iob similarity index 100% rename from objects/spruce-medium/spruce18.iob rename to objects/trees/spruce/vgeneric9.iob diff --git a/objects/unfrosted-spruce/bab-1.iob b/objects/trees/spruce/xmasbaby1.iob similarity index 100% rename from objects/unfrosted-spruce/bab-1.iob rename to objects/trees/spruce/xmasbaby1.iob diff --git a/objects/unfrosted-spruce/bab-2.iob b/objects/trees/spruce/xmasbaby2.iob similarity index 100% rename from objects/unfrosted-spruce/bab-2.iob rename to objects/trees/spruce/xmasbaby2.iob diff --git a/objects/unfrosted-spruce/bab-3.iob b/objects/trees/spruce/xmasbaby3.iob similarity index 100% rename from objects/unfrosted-spruce/bab-3.iob rename to objects/trees/spruce/xmasbaby3.iob diff --git a/objects/unfrosted-spruce/bab-4.iob b/objects/trees/spruce/xmasbaby4.iob similarity index 100% rename from objects/unfrosted-spruce/bab-4.iob rename to objects/trees/spruce/xmasbaby4.iob diff --git a/objects/unfrosted-spruce/bab-5.iob b/objects/trees/spruce/xmasbaby5.iob similarity index 100% rename from objects/unfrosted-spruce/bab-5.iob rename to objects/trees/spruce/xmasbaby5.iob diff --git a/objects/true-redwood/true-redwood-1.iob b/objects/true-redwood/true-redwood-1.iob deleted file mode 100644 index dcbb9d4c..00000000 Binary files a/objects/true-redwood/true-redwood-1.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-10-b.iob b/objects/true-redwood/true-redwood-10-b.iob deleted file mode 100644 index 73bea9c0..00000000 Binary files a/objects/true-redwood/true-redwood-10-b.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-10.iob b/objects/true-redwood/true-redwood-10.iob deleted file mode 100644 index e71be8c7..00000000 Binary files a/objects/true-redwood/true-redwood-10.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-2.iob b/objects/true-redwood/true-redwood-2.iob deleted file mode 100644 index d3e39b8f..00000000 Binary files a/objects/true-redwood/true-redwood-2.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-3.iob b/objects/true-redwood/true-redwood-3.iob deleted file mode 100644 index f7cc38ec..00000000 Binary files a/objects/true-redwood/true-redwood-3.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-4.iob b/objects/true-redwood/true-redwood-4.iob deleted file mode 100644 index 204df8fd..00000000 Binary files a/objects/true-redwood/true-redwood-4.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-5.iob b/objects/true-redwood/true-redwood-5.iob deleted file mode 100644 index b14e5ebc..00000000 Binary files a/objects/true-redwood/true-redwood-5.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-6.iob b/objects/true-redwood/true-redwood-6.iob deleted file mode 100644 index 17183aad..00000000 Binary files a/objects/true-redwood/true-redwood-6.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-7-b.iob b/objects/true-redwood/true-redwood-7-b.iob deleted file mode 100644 index 1424f8c0..00000000 Binary files a/objects/true-redwood/true-redwood-7-b.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-7.iob b/objects/true-redwood/true-redwood-7.iob deleted file mode 100644 index 5ce45812..00000000 Binary files a/objects/true-redwood/true-redwood-7.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-8-b.iob b/objects/true-redwood/true-redwood-8-b.iob deleted file mode 100644 index 3ef63e34..00000000 Binary files a/objects/true-redwood/true-redwood-8-b.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-8.iob b/objects/true-redwood/true-redwood-8.iob deleted file mode 100644 index bbd49036..00000000 Binary files a/objects/true-redwood/true-redwood-8.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-9-b.iob b/objects/true-redwood/true-redwood-9-b.iob deleted file mode 100644 index d90979fa..00000000 Binary files a/objects/true-redwood/true-redwood-9-b.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-9.iob b/objects/true-redwood/true-redwood-9.iob deleted file mode 100644 index 9d200615..00000000 Binary files a/objects/true-redwood/true-redwood-9.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-small-1.iob b/objects/true-redwood/true-redwood-small-1.iob deleted file mode 100644 index 823626b6..00000000 Binary files a/objects/true-redwood/true-redwood-small-1.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-small-2.iob b/objects/true-redwood/true-redwood-small-2.iob deleted file mode 100644 index 230b8941..00000000 Binary files a/objects/true-redwood/true-redwood-small-2.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-small-3.iob b/objects/true-redwood/true-redwood-small-3.iob deleted file mode 100644 index 29eee7cd..00000000 Binary files a/objects/true-redwood/true-redwood-small-3.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-small-4.iob b/objects/true-redwood/true-redwood-small-4.iob deleted file mode 100644 index 9b7aee7e..00000000 Binary files a/objects/true-redwood/true-redwood-small-4.iob and /dev/null differ diff --git a/objects/true-redwood/true-redwood-small-5.iob b/objects/true-redwood/true-redwood-small-5.iob deleted file mode 100644 index 1450c14c..00000000 Binary files a/objects/true-redwood/true-redwood-small-5.iob and /dev/null differ diff --git a/objects/wonderland/wonder-1.iob b/objects/wonderland/wonder-1.iob deleted file mode 100644 index e7aee1d9..00000000 Binary files a/objects/wonderland/wonder-1.iob and /dev/null differ diff --git a/objects/wonderland/wonder-10.iob b/objects/wonderland/wonder-10.iob deleted file mode 100644 index d92d58a1..00000000 Binary files a/objects/wonderland/wonder-10.iob and /dev/null differ diff --git a/objects/wonderland/wonder-2.iob b/objects/wonderland/wonder-2.iob deleted file mode 100644 index 3317c878..00000000 Binary files a/objects/wonderland/wonder-2.iob and /dev/null differ diff --git a/objects/wonderland/wonder-3.iob b/objects/wonderland/wonder-3.iob deleted file mode 100644 index 6b21ccc5..00000000 Binary files a/objects/wonderland/wonder-3.iob and /dev/null differ diff --git a/objects/wonderland/wonder-4.iob b/objects/wonderland/wonder-4.iob deleted file mode 100644 index 5d31f0b5..00000000 Binary files a/objects/wonderland/wonder-4.iob and /dev/null differ diff --git a/objects/wonderland/wonder-5.iob b/objects/wonderland/wonder-5.iob deleted file mode 100644 index 31d62b35..00000000 Binary files a/objects/wonderland/wonder-5.iob and /dev/null differ diff --git a/objects/wonderland/wonder-6.iob b/objects/wonderland/wonder-6.iob deleted file mode 100644 index ceb1b31f..00000000 Binary files a/objects/wonderland/wonder-6.iob and /dev/null differ diff --git a/objects/wonderland/wonder-7.iob b/objects/wonderland/wonder-7.iob deleted file mode 100644 index 8a23290a..00000000 Binary files a/objects/wonderland/wonder-7.iob and /dev/null differ diff --git a/objects/wonderland/wonder-8.iob b/objects/wonderland/wonder-8.iob deleted file mode 100644 index e2131382..00000000 Binary files a/objects/wonderland/wonder-8.iob and /dev/null differ diff --git a/objects/wonderland/wonder-9.iob b/objects/wonderland/wonder-9.iob deleted file mode 100644 index 7306d767..00000000 Binary files a/objects/wonderland/wonder-9.iob and /dev/null differ diff --git a/objects/zzz/cave1.iob b/objects/zzz/cave1.iob deleted file mode 100644 index 4c4763ce..00000000 Binary files a/objects/zzz/cave1.iob and /dev/null differ diff --git a/objects/zzz/cave2.iob b/objects/zzz/cave2.iob deleted file mode 100644 index f9ee54f3..00000000 Binary files a/objects/zzz/cave2.iob and /dev/null differ diff --git a/objects/zzz/grass.iob b/objects/zzz/grass.iob deleted file mode 100644 index 7c3a0c0f..00000000 Binary files a/objects/zzz/grass.iob and /dev/null differ diff --git a/regions/frozen.json b/regions/frozen.json index ece8e33f..edc3990d 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -38,6 +38,38 @@ "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 e84c35ba..60cc5082 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -8,7 +8,13 @@ "hot/sav-savanna", "hot/sav-forest", "hot/sav-plateau", - "hot/sav-acacia-denmyre" + "hot/sav-acacia-denmyre", + "hot/msa-plateau", + "hot/msa-valleys", + "hot/msa-plateau-high", + "hot/msa-valleys", + "hot/msa-mesa", + "hot/msa-cliffs" ], "shoreBiomes": ["hot/hot-beach"], "seaBiomes": ["ocean/oce-hot-ocean"], @@ -25,6 +31,37 @@ "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 deleted file mode 100644 index 49fbdde6..00000000 --- a/regions/mesa.json +++ /dev/null @@ -1,130 +0,0 @@ -{ - "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 323d9147..ab9740ef 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -123,6 +123,19 @@ "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 d5874c5c..a2b1672d 100644 --- a/regions/ocean.json +++ b/regions/ocean.json @@ -25,6 +25,18 @@ "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 1d26392c..fbdb2640 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -30,6 +30,38 @@ "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 ebd6d4e0..eefd4ed0 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -31,6 +31,68 @@ "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 d05a2310..f237fd69 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -5,26 +5,24 @@ "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-extreme", "tropical/tro-mountain", - "tropical/tro-plains", - "tropical/tro-mountain", - "tropical/tro-plains", "tropical/tro-mountain-extreme", + "tropical/tro-mountain-plains", "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": [ @@ -42,6 +40,74 @@ "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 b6936214..8ce4c837 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -29,6 +29,44 @@ "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,