From 59250bc957c51a689d37d2cfa1bb1c2c3b1a82a2 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Fri, 23 Jul 2021 08:14:15 -0400
Subject: [PATCH] Reduce ID Pollution

---
 biomes/frozen/{fzn-hills.json => hills.json}  |   0
 ...ntain-cliffs.json => mountain-cliffs.json} |   0
 ...ntain-middle.json => mountain-middle.json} |   0
 .../{fzn-mountain.json => mountain.json}      |   6 +-
 .../{fzn-mountains.json => mountains.json}    |   4 +-
 biomes/frozen/{fzn-peak.json => peak.json}    |   0
 .../{fzn-pine-hills.json => pine-hills.json}  |   0
 ...{fzn-pine-plains.json => pine-plains.json} |   2 +-
 biomes/frozen/{fzn-pines.json => pines.json}  |   0
 .../frozen/{fzn-plains.json => plains.json}   |   2 +-
 ...edwood-forest.json => redwood-forest.json} |   0
 .../sea/ocean.json}                           |   0
 .../sea/river.json}                           |   0
 .../{fzn-beach.json => shore/beach.json}      |   0
 ...zn-spruce-hills.json => spruce-hills.json} |   0
 ...-spruce-plains.json => spruce-plains.json} |   2 +-
 .../frozen/{fzn-vander.json => vander.json}   |   0
 ...t-dunes-red.json => desert-dunes-red.json} |   0
 ...ot-desert-dunes.json => desert-dunes.json} |   0
 ...ntain-cliffs.json => mountain-cliffs.json} |   0
 ...ntain-middle.json => mountain-middle.json} |   0
 ...ntain-plains.json => mountain-plains.json} |   0
 .../hot/{hot-mountain.json => mountain.json}  |   0
 biomes/hot/{hot-oasis.json => oasis.json}     |   0
 .../sea/ocean-cliffs.json}                    |   0
 .../oce-hot-ocean.json => hot/sea/ocean.json} |   2 +-
 .../oce-hot-river.json => hot/sea/river.json} |   0
 .../beach-grass.json}                         |   0
 .../hot/{hot-beach.json => shore/beach.json}  |   0
 biomes/{hot/msa-blue.json => mesa/blue.json}  |   0
 .../{hot/msa-cliffs.json => mesa/cliffs.json} |   0
 biomes/{hot/msa-dark.json => mesa/dark.json}  |   8 +-
 .../{hot/msa-green.json => mesa/green.json}   |   0
 biomes/{hot/msa-mesa.json => mesa/mesa.json}  |  16 +-
 .../plateau-dirt-high.json}                   |   0
 .../plateau-dirt.json}                        |   0
 .../plateau-high.json}                        |   2 +-
 .../msa-plateau.json => mesa/plateau.json}    |   2 +-
 biomes/{hot/msa-red.json => mesa/red.json}    |   0
 .../msa-river.json => mesa/sea/river.json}    |   0
 .../msa-beach.json => mesa/shore/beach.json}  |   0
 .../msa-valleys.json => mesa/valleys.json}    |   0
 .../{hot/msa-yellow.json => mesa/yellow.json} |   2 +-
 .../mountain/{mtn-cliffs.json => cliffs.json} |   0
 ...tn-forest-hills.json => forest-hills.json} |   0
 .../mountain/{mtn-forest.json => forest.json} |   0
 .../mountain/{mtn-hills.json => hills.json}   |   2 +-
 biomes/mountain/{mtn-main.json => main.json}  |   2 +-
 .../mountain/{mtn-middle.json => middle.json} |   2 +-
 .../{mtn-mountain.json => mountain.json}      |   2 +-
 ...{mtn-plain-hills.json => plain-hills.json} |   0
 .../mountain/{mtn-plains.json => plains.json} |   0
 .../sea/lake.json}                            |   0
 .../sea/river-soft.json}                      |   0
 .../sea/river.json}                           |   0
 .../{mtn-beach.json => shore/beach.json}      |   0
 ...rimson-forest.json => crimson-forest.json} |   0
 ...us-forest-hills.json => forest-hills.json} |   0
 .../mushroom/{mus-forest.json => forest.json} |   2 +-
 .../mushroom/{mus-plains.json => plains.json} |   0
 .../sea/lake.json}                            |   0
 .../sea/ocean.json}                           |   0
 .../{mus-beach.json => shore/beach.json}      |   0
 ...-warped-forest.json => warped-forest.json} |   0
 .../acacia-denmyre.json}                      |   0
 .../sav-cliff.json => savanna/cliff.json}     |   2 +-
 .../sav-forest.json => savanna/forest.json}   |   0
 .../sav-plateau.json => savanna/plateau.json} |   0
 .../sav-savanna.json => savanna/savanna.json} |   2 +-
 .../shore/beach.json}                         |   0
 .../swamp/{swa-denmyre.json => denmyre.json}  |   0
 ...wa-marsh-rotten.json => marsh-rotten.json} |   0
 biomes/swamp/{swa-marsh.json => marsh.json}   |   2 +-
 ...-roofed-forest.json => roofed-forest.json} |   2 +-
 ...oofed-wayward.json => roofed-wayward.json} |   2 +-
 biomes/swamp/{swa-lake.json => sea/lake.json} |   2 +-
 .../sea/ocean-tree.json}                      |   0
 .../sea/ocean.json}                           |   0
 .../{swa-beach.json => shore/beach.json}      |   0
 ...-willow-forest.json => willow-forest.json} |   4 +-
 ...-birch-denmyre.json => birch-denmyre.json} |   0
 ...em-birch-forest.json => birch-forest.json} |   2 +-
 ...-flower-forest.json => flower-forest.json} |   0
 .../{tem-highlands.json => highlands.json}    |   0
 .../{tem-island.json => island.json}          |   2 +-
 ...gtree-forest.json => longtree-forest.json} |   0
 ...{tem-oak-denmyre.json => oak-denmyre.json} |   0
 .../{tem-oak-forest.json => oak-forest.json}  |   2 +-
 .../{tem-oak-hills.json => oak-hills.json}    |   0
 biomes/temperate/{tem-oak.json => oak.json}   |   2 +-
 ...{tem-plain-hills.json => plain-hills.json} |   0
 .../{tem-plains.json => plains.json}          |   4 +-
 .../{tem-plateau.json => plateau.json}        |   0
 ...pink-child.json => sakura-pink-child.json} |   0
 ...nk-forest.json => sakura-pink-forest.json} |   2 +-
 .../sea/ocean-deep.json}                      |   0
 .../sea/ocean.json}                           |   0
 .../sea/river.json}                           |   0
 .../{tem-beach.json => shore/beach.json}      |   0
 .../oak-beach.json}                           |   0
 ...anged-plains.json => stranged-plains.json} |   0
 .../temperate/{tem-wilds.json => wilds.json}  |   2 +-
 ...-bamboo-forest.json => bamboo-forest.json} |   2 +-
 ...ro-beach-bamboo.json => beach-bamboo.json} |   0
 ...-beach-charred.json => beach-charred.json} |   0
 .../tropical/{tro-beach.json => beach.json}   |   0
 .../{tro-highlands.json => highlands.json}    |   0
 ...ro-island-beach.json => island-beach.json} |   0
 ...ungle-denmyre.json => jungle-denmyre.json} |   0
 ...ain-extreme.json => mountain-extreme.json} |   2 +-
 ...ntain-middle.json => mountain-middle.json} |   2 +-
 ...ntain-plains.json => mountain-plains.json} |   0
 ...ountain-water.json => mountain-water.json} |   0
 .../{tro-mountain.json => mountain.json}      |   2 +-
 ...ro-plains-hills.json => plains-hills.json} |   0
 .../tropical/{tro-plains.json => plains.json} |   2 +-
 ...orest-hills.json => rainforest-hills.json} |   0
 ...est-island.json => rainforest-island.json} |   0
 ...hild.json => rainforest-wicked-child.json} |   0
 ...ge.json => rainforest-wicked-village.json} |   0
 ...est-wicked.json => rainforest-wicked.json} |   6 +-
 .../{tro-rainforest.json => rainforest.json}  |   4 +-
 .../sea/coral-ocean-cliffs.json}              |   2 +-
 .../sea/coral-ocean.json}                     |   0
 .../sea/ocean.json}                           |   4 +-
 .../sea/river-soft.json}                      |   0
 .../sea/river-steep.json}                     |   0
 ...-volcanic.json => submerged-volcanic.json} |   0
 ...canic-plains.json => volcanic-plains.json} |   2 +-
 ...olcanoes-lava.json => volcanoes-lava.json} |   0
 .../{tro-volcanoes.json => volcanoes.json}    |   2 +-
 .../tropical/{tro-wilds.json => wilds.json}   |   2 +-
 biomes/tundra/autumn.json                     |   2 +-
 ...-bonsai-forest.json => bonsai-forest.json} |   4 +-
 ...-forest-cliffs.json => forest-cliffs.json} |   0
 .../tundra/{tun-forest.json => forest.json}   |   2 +-
 ...un-magic-forest.json => magic-forest.json} |   0
 ...ains-cliffs.json => mountains-cliffs.json} |   0
 .../{tun-mountains.json => mountains.json}    |   2 +-
 ...edwood-cliffs.json => redwood-cliffs.json} |   0
 ...edwood-forest.json => redwood-forest.json} |   2 +-
 .../tundra/{tun-lake.json => sea/lake.json}   |   0
 .../sea/river-rocky.json}                     |   0
 .../sea/river.json}                           |   2 +-
 ...uia-redwoods.json => sequia-redwoods.json} |   0
 .../beach-stone.json}                         |   0
 .../{tun-beach.json => shore/beach.json}      |   0
 ...pruce-denmyre.json => spruce-denmyre.json} |   0
 biomes/tundra/{tun-taiga.json => taiga.json}  |   0
 dimensions/overworld.json                     |   9 +-
 regions/frozen.json                           |  24 +--
 regions/hot.json                              |  32 ++--
 regions/mushroom.json                         |  14 +-
 regions/ocean.json                            |  69 -------
 regions/swamp.json                            |  16 +-
 regions/temperate.json                        |  40 ++--
 regions/tropical.json                         |  38 ++--
 regions/tundra.json                           | 178 ++++++++++--------
 158 files changed, 258 insertions(+), 298 deletions(-)
 rename biomes/frozen/{fzn-hills.json => hills.json} (100%)
 rename biomes/frozen/{fzn-mountain-cliffs.json => mountain-cliffs.json} (100%)
 rename biomes/frozen/{fzn-mountain-middle.json => mountain-middle.json} (100%)
 rename biomes/frozen/{fzn-mountain.json => mountain.json} (96%)
 rename biomes/frozen/{fzn-mountains.json => mountains.json} (99%)
 rename biomes/frozen/{fzn-peak.json => peak.json} (100%)
 rename biomes/frozen/{fzn-pine-hills.json => pine-hills.json} (100%)
 rename biomes/frozen/{fzn-pine-plains.json => pine-plains.json} (98%)
 rename biomes/frozen/{fzn-pines.json => pines.json} (100%)
 rename biomes/frozen/{fzn-plains.json => plains.json} (99%)
 rename biomes/frozen/{fzn-redwood-forest.json => redwood-forest.json} (100%)
 rename biomes/{ocean/oce-fzn-ocean.json => frozen/sea/ocean.json} (100%)
 rename biomes/{ocean/oce-fzn-river.json => frozen/sea/river.json} (100%)
 rename biomes/frozen/{fzn-beach.json => shore/beach.json} (100%)
 rename biomes/frozen/{fzn-spruce-hills.json => spruce-hills.json} (100%)
 rename biomes/frozen/{fzn-spruce-plains.json => spruce-plains.json} (98%)
 rename biomes/frozen/{fzn-vander.json => vander.json} (100%)
 rename biomes/hot/{hot-desert-dunes-red.json => desert-dunes-red.json} (100%)
 rename biomes/hot/{hot-desert-dunes.json => desert-dunes.json} (100%)
 rename biomes/hot/{hot-mountain-cliffs.json => mountain-cliffs.json} (100%)
 rename biomes/hot/{hot-mountain-middle.json => mountain-middle.json} (100%)
 rename biomes/hot/{hot-mountain-plains.json => mountain-plains.json} (100%)
 rename biomes/hot/{hot-mountain.json => mountain.json} (100%)
 rename biomes/hot/{hot-oasis.json => oasis.json} (100%)
 rename biomes/{ocean/oce-hot-ocean-cliffs.json => hot/sea/ocean-cliffs.json} (100%)
 rename biomes/{ocean/oce-hot-ocean.json => hot/sea/ocean.json} (99%)
 rename biomes/{ocean/oce-hot-river.json => hot/sea/river.json} (100%)
 rename biomes/hot/{hot-beach-grass.json => shore/beach-grass.json} (100%)
 rename biomes/hot/{hot-beach.json => shore/beach.json} (100%)
 rename biomes/{hot/msa-blue.json => mesa/blue.json} (100%)
 rename biomes/{hot/msa-cliffs.json => mesa/cliffs.json} (100%)
 rename biomes/{hot/msa-dark.json => mesa/dark.json} (97%)
 rename biomes/{hot/msa-green.json => mesa/green.json} (100%)
 rename biomes/{hot/msa-mesa.json => mesa/mesa.json} (95%)
 rename biomes/{hot/msa-plateau-dirt-high.json => mesa/plateau-dirt-high.json} (100%)
 rename biomes/{hot/msa-plateau-dirt.json => mesa/plateau-dirt.json} (100%)
 rename biomes/{hot/msa-plateau-high.json => mesa/plateau-high.json} (98%)
 rename biomes/{hot/msa-plateau.json => mesa/plateau.json} (99%)
 rename biomes/{hot/msa-red.json => mesa/red.json} (100%)
 rename biomes/{ocean/msa-river.json => mesa/sea/river.json} (100%)
 rename biomes/{hot/msa-beach.json => mesa/shore/beach.json} (100%)
 rename biomes/{hot/msa-valleys.json => mesa/valleys.json} (100%)
 rename biomes/{hot/msa-yellow.json => mesa/yellow.json} (98%)
 rename biomes/mountain/{mtn-cliffs.json => cliffs.json} (100%)
 rename biomes/mountain/{mtn-forest-hills.json => forest-hills.json} (100%)
 rename biomes/mountain/{mtn-forest.json => forest.json} (100%)
 rename biomes/mountain/{mtn-hills.json => hills.json} (99%)
 rename biomes/mountain/{mtn-main.json => main.json} (98%)
 rename biomes/mountain/{mtn-middle.json => middle.json} (98%)
 rename biomes/mountain/{mtn-mountain.json => mountain.json} (98%)
 rename biomes/mountain/{mtn-plain-hills.json => plain-hills.json} (100%)
 rename biomes/mountain/{mtn-plains.json => plains.json} (100%)
 rename biomes/{ocean/oce-mtn-lake.json => mountain/sea/lake.json} (100%)
 rename biomes/{ocean/oce-mtn-river-soft.json => mountain/sea/river-soft.json} (100%)
 rename biomes/{ocean/oce-mtn-river.json => mountain/sea/river.json} (100%)
 rename biomes/mountain/{mtn-beach.json => shore/beach.json} (100%)
 rename biomes/mushroom/{mus-crimson-forest.json => crimson-forest.json} (100%)
 rename biomes/mushroom/{mus-forest-hills.json => forest-hills.json} (100%)
 rename biomes/mushroom/{mus-forest.json => forest.json} (99%)
 rename biomes/mushroom/{mus-plains.json => plains.json} (100%)
 rename biomes/{ocean/oce-mus-lake.json => mushroom/sea/lake.json} (100%)
 rename biomes/{ocean/oce-mus-ocean.json => mushroom/sea/ocean.json} (100%)
 rename biomes/mushroom/{mus-beach.json => shore/beach.json} (100%)
 rename biomes/mushroom/{mus-warped-forest.json => warped-forest.json} (100%)
 rename biomes/{hot/sav-acacia-denmyre.json => savanna/acacia-denmyre.json} (100%)
 rename biomes/{hot/sav-cliff.json => savanna/cliff.json} (99%)
 rename biomes/{hot/sav-forest.json => savanna/forest.json} (100%)
 rename biomes/{hot/sav-plateau.json => savanna/plateau.json} (100%)
 rename biomes/{hot/sav-savanna.json => savanna/savanna.json} (99%)
 rename biomes/{hot/sav-beach.json => savanna/shore/beach.json} (100%)
 rename biomes/swamp/{swa-denmyre.json => denmyre.json} (100%)
 rename biomes/swamp/{swa-marsh-rotten.json => marsh-rotten.json} (100%)
 rename biomes/swamp/{swa-marsh.json => marsh.json} (98%)
 rename biomes/swamp/{swa-roofed-forest.json => roofed-forest.json} (99%)
 rename biomes/swamp/{swa-roofed-wayward.json => roofed-wayward.json} (99%)
 rename biomes/swamp/{swa-lake.json => sea/lake.json} (98%)
 rename biomes/{ocean/oce-swa-ocean-tree.json => swamp/sea/ocean-tree.json} (100%)
 rename biomes/{ocean/oce-swa-ocean.json => swamp/sea/ocean.json} (100%)
 rename biomes/swamp/{swa-beach.json => shore/beach.json} (100%)
 rename biomes/swamp/{swa-willow-forest.json => willow-forest.json} (99%)
 rename biomes/temperate/{tem-birch-denmyre.json => birch-denmyre.json} (100%)
 rename biomes/temperate/{tem-birch-forest.json => birch-forest.json} (99%)
 rename biomes/temperate/{tem-flower-forest.json => flower-forest.json} (100%)
 rename biomes/temperate/{tem-highlands.json => highlands.json} (100%)
 rename biomes/temperate/{tem-island.json => island.json} (98%)
 rename biomes/temperate/{tem-longtree-forest.json => longtree-forest.json} (100%)
 rename biomes/temperate/{tem-oak-denmyre.json => oak-denmyre.json} (100%)
 rename biomes/temperate/{tem-oak-forest.json => oak-forest.json} (99%)
 rename biomes/temperate/{tem-oak-hills.json => oak-hills.json} (100%)
 rename biomes/temperate/{tem-oak.json => oak.json} (99%)
 rename biomes/temperate/{tem-plain-hills.json => plain-hills.json} (100%)
 rename biomes/temperate/{tem-plains.json => plains.json} (99%)
 rename biomes/temperate/{tem-plateau.json => plateau.json} (100%)
 rename biomes/temperate/{tem-sakura-pink-child.json => sakura-pink-child.json} (100%)
 rename biomes/temperate/{tem-sakura-pink-forest.json => sakura-pink-forest.json} (99%)
 rename biomes/{ocean/oce-tem-ocean-deep.json => temperate/sea/ocean-deep.json} (100%)
 rename biomes/{ocean/oce-tem-ocean.json => temperate/sea/ocean.json} (100%)
 rename biomes/{ocean/oce-tem-river.json => temperate/sea/river.json} (100%)
 rename biomes/temperate/{tem-beach.json => shore/beach.json} (100%)
 rename biomes/temperate/{tem-oak-beach.json => shore/oak-beach.json} (100%)
 rename biomes/temperate/{tem-stranged-plains.json => stranged-plains.json} (100%)
 rename biomes/temperate/{tem-wilds.json => wilds.json} (99%)
 rename biomes/tropical/{tro-bamboo-forest.json => bamboo-forest.json} (99%)
 rename biomes/tropical/{tro-beach-bamboo.json => beach-bamboo.json} (100%)
 rename biomes/tropical/{tro-beach-charred.json => beach-charred.json} (100%)
 rename biomes/tropical/{tro-beach.json => beach.json} (100%)
 rename biomes/tropical/{tro-highlands.json => highlands.json} (100%)
 rename biomes/tropical/{tro-island-beach.json => island-beach.json} (100%)
 rename biomes/tropical/{tro-jungle-denmyre.json => jungle-denmyre.json} (100%)
 rename biomes/tropical/{tro-mountain-extreme.json => mountain-extreme.json} (98%)
 rename biomes/tropical/{tro-mountain-middle.json => mountain-middle.json} (98%)
 rename biomes/tropical/{tro-mountain-plains.json => mountain-plains.json} (100%)
 rename biomes/tropical/{tro-mountain-water.json => mountain-water.json} (100%)
 rename biomes/tropical/{tro-mountain.json => mountain.json} (98%)
 rename biomes/tropical/{tro-plains-hills.json => plains-hills.json} (100%)
 rename biomes/tropical/{tro-plains.json => plains.json} (98%)
 rename biomes/tropical/{tro-rainforest-hills.json => rainforest-hills.json} (100%)
 rename biomes/tropical/{tro-rainforest-island.json => rainforest-island.json} (100%)
 rename biomes/tropical/{tro-rainforest-wicked-child.json => rainforest-wicked-child.json} (100%)
 rename biomes/tropical/{tro-rainforest-wicked-village.json => rainforest-wicked-village.json} (100%)
 rename biomes/tropical/{tro-rainforest-wicked.json => rainforest-wicked.json} (98%)
 rename biomes/tropical/{tro-rainforest.json => rainforest.json} (99%)
 rename biomes/{ocean/oce-tro-coral-ocean-cliffs.json => tropical/sea/coral-ocean-cliffs.json} (99%)
 rename biomes/{ocean/oce-tro-coral-ocean.json => tropical/sea/coral-ocean.json} (100%)
 rename biomes/{ocean/oce-tro-ocean.json => tropical/sea/ocean.json} (98%)
 rename biomes/{ocean/oce-tro-river-soft.json => tropical/sea/river-soft.json} (100%)
 rename biomes/{ocean/oce-tro-river-steep.json => tropical/sea/river-steep.json} (100%)
 rename biomes/tropical/{tro-submerged-volcanic.json => submerged-volcanic.json} (100%)
 rename biomes/tropical/{tro-volcanic-plains.json => volcanic-plains.json} (98%)
 rename biomes/tropical/{tro-volcanoes-lava.json => volcanoes-lava.json} (100%)
 rename biomes/tropical/{tro-volcanoes.json => volcanoes.json} (96%)
 rename biomes/tropical/{tro-wilds.json => wilds.json} (99%)
 rename biomes/tundra/{tun-bonsai-forest.json => bonsai-forest.json} (99%)
 rename biomes/tundra/{tun-forest-cliffs.json => forest-cliffs.json} (100%)
 rename biomes/tundra/{tun-forest.json => forest.json} (99%)
 rename biomes/tundra/{tun-magic-forest.json => magic-forest.json} (100%)
 rename biomes/tundra/{tun-mountains-cliffs.json => mountains-cliffs.json} (100%)
 rename biomes/tundra/{tun-mountains.json => mountains.json} (99%)
 rename biomes/tundra/{tun-redwood-cliffs.json => redwood-cliffs.json} (100%)
 rename biomes/tundra/{tun-redwood-forest.json => redwood-forest.json} (99%)
 rename biomes/tundra/{tun-lake.json => sea/lake.json} (100%)
 rename biomes/{ocean/oce-tun-river-rocky.json => tundra/sea/river-rocky.json} (100%)
 rename biomes/{ocean/oce-tun-river.json => tundra/sea/river.json} (98%)
 rename biomes/tundra/{tun-sequia-redwoods.json => sequia-redwoods.json} (100%)
 rename biomes/tundra/{tun-tundra-beach-stone.json => shore/beach-stone.json} (100%)
 rename biomes/tundra/{tun-beach.json => shore/beach.json} (100%)
 rename biomes/tundra/{tun-spruce-denmyre.json => spruce-denmyre.json} (100%)
 rename biomes/tundra/{tun-taiga.json => taiga.json} (100%)
 delete mode 100644 regions/ocean.json

diff --git a/biomes/frozen/fzn-hills.json b/biomes/frozen/hills.json
similarity index 100%
rename from biomes/frozen/fzn-hills.json
rename to biomes/frozen/hills.json
diff --git a/biomes/frozen/fzn-mountain-cliffs.json b/biomes/frozen/mountain-cliffs.json
similarity index 100%
rename from biomes/frozen/fzn-mountain-cliffs.json
rename to biomes/frozen/mountain-cliffs.json
diff --git a/biomes/frozen/fzn-mountain-middle.json b/biomes/frozen/mountain-middle.json
similarity index 100%
rename from biomes/frozen/fzn-mountain-middle.json
rename to biomes/frozen/mountain-middle.json
diff --git a/biomes/frozen/fzn-mountain.json b/biomes/frozen/mountain.json
similarity index 96%
rename from biomes/frozen/fzn-mountain.json
rename to biomes/frozen/mountain.json
index 83f828e0..de177ab1 100644
--- a/biomes/frozen/fzn-mountain.json
+++ b/biomes/frozen/mountain.json
@@ -5,9 +5,9 @@
     "rarity": 1,
     "vanillaDerivative": "SNOWY_MOUNTAINS",
     "children": [
-        "frozen/fzn-mountain-middle",
-        "frozen/fzn-peak",
-        "frozen/fzn-mountain-cliffs"
+        "frozen/mountain-middle",
+        "frozen/peak",
+        "frozen/mountain-cliffs"
     ],
     "customDerivitives": [{
         "id": "fznmountain",
diff --git a/biomes/frozen/fzn-mountains.json b/biomes/frozen/mountains.json
similarity index 99%
rename from biomes/frozen/fzn-mountains.json
rename to biomes/frozen/mountains.json
index 1fe9cb99..34df2cbf 100644
--- a/biomes/frozen/fzn-mountains.json
+++ b/biomes/frozen/mountains.json
@@ -5,8 +5,8 @@
     "derivative": "SNOWY_MOUNTAINS",
     "vanillaDerivative": "SNOWY_MOUNTAINS",
     "children": [
-        "frozen/fzn-peak",
-        "frozen/fzn-vander"
+        "frozen/peak",
+        "frozen/vander"
     ],
     "customDerivitives": [{
         "id": "fznmountains",
diff --git a/biomes/frozen/fzn-peak.json b/biomes/frozen/peak.json
similarity index 100%
rename from biomes/frozen/fzn-peak.json
rename to biomes/frozen/peak.json
diff --git a/biomes/frozen/fzn-pine-hills.json b/biomes/frozen/pine-hills.json
similarity index 100%
rename from biomes/frozen/fzn-pine-hills.json
rename to biomes/frozen/pine-hills.json
diff --git a/biomes/frozen/fzn-pine-plains.json b/biomes/frozen/pine-plains.json
similarity index 98%
rename from biomes/frozen/fzn-pine-plains.json
rename to biomes/frozen/pine-plains.json
index cc3ae564..dcf81811 100644
--- a/biomes/frozen/fzn-pine-plains.json
+++ b/biomes/frozen/pine-plains.json
@@ -4,7 +4,7 @@
     "color": "#164898",
     "rarity": 1,
     "vanillaDerivative": "SNOWY_TAIGA",
-    "children": ["frozen/fzn-pine-hills"],
+    "children": ["frozen/pine-hills"],
     "generators": [
         {
             "generator": "plain",
diff --git a/biomes/frozen/fzn-pines.json b/biomes/frozen/pines.json
similarity index 100%
rename from biomes/frozen/fzn-pines.json
rename to biomes/frozen/pines.json
diff --git a/biomes/frozen/fzn-plains.json b/biomes/frozen/plains.json
similarity index 99%
rename from biomes/frozen/fzn-plains.json
rename to biomes/frozen/plains.json
index 99007fa6..95320d77 100644
--- a/biomes/frozen/fzn-plains.json
+++ b/biomes/frozen/plains.json
@@ -4,7 +4,7 @@
     "color": "#3E5D8F",
     "rarity": 1,
     "vanillaDerivative": "SNOWY_TAIGA",
-    "children": ["frozen/fzn-hills"],
+    "children": ["frozen/hills"],
     "generators": [
         {
             "min": 4,
diff --git a/biomes/frozen/fzn-redwood-forest.json b/biomes/frozen/redwood-forest.json
similarity index 100%
rename from biomes/frozen/fzn-redwood-forest.json
rename to biomes/frozen/redwood-forest.json
diff --git a/biomes/ocean/oce-fzn-ocean.json b/biomes/frozen/sea/ocean.json
similarity index 100%
rename from biomes/ocean/oce-fzn-ocean.json
rename to biomes/frozen/sea/ocean.json
diff --git a/biomes/ocean/oce-fzn-river.json b/biomes/frozen/sea/river.json
similarity index 100%
rename from biomes/ocean/oce-fzn-river.json
rename to biomes/frozen/sea/river.json
diff --git a/biomes/frozen/fzn-beach.json b/biomes/frozen/shore/beach.json
similarity index 100%
rename from biomes/frozen/fzn-beach.json
rename to biomes/frozen/shore/beach.json
diff --git a/biomes/frozen/fzn-spruce-hills.json b/biomes/frozen/spruce-hills.json
similarity index 100%
rename from biomes/frozen/fzn-spruce-hills.json
rename to biomes/frozen/spruce-hills.json
diff --git a/biomes/frozen/fzn-spruce-plains.json b/biomes/frozen/spruce-plains.json
similarity index 98%
rename from biomes/frozen/fzn-spruce-plains.json
rename to biomes/frozen/spruce-plains.json
index 1e434587..e8345b97 100644
--- a/biomes/frozen/fzn-spruce-plains.json
+++ b/biomes/frozen/spruce-plains.json
@@ -4,7 +4,7 @@
     "color": "#237695",
     "rarity": 1,
     "vanillaDerivative": "SNOWY_TAIGA",
-    "children": ["frozen/fzn-spruce-hills"],
+    "children": ["frozen/spruce-hills"],
     "layers": [
         {
             "minHeight": 0,
diff --git a/biomes/frozen/fzn-vander.json b/biomes/frozen/vander.json
similarity index 100%
rename from biomes/frozen/fzn-vander.json
rename to biomes/frozen/vander.json
diff --git a/biomes/hot/hot-desert-dunes-red.json b/biomes/hot/desert-dunes-red.json
similarity index 100%
rename from biomes/hot/hot-desert-dunes-red.json
rename to biomes/hot/desert-dunes-red.json
diff --git a/biomes/hot/hot-desert-dunes.json b/biomes/hot/desert-dunes.json
similarity index 100%
rename from biomes/hot/hot-desert-dunes.json
rename to biomes/hot/desert-dunes.json
diff --git a/biomes/hot/hot-mountain-cliffs.json b/biomes/hot/mountain-cliffs.json
similarity index 100%
rename from biomes/hot/hot-mountain-cliffs.json
rename to biomes/hot/mountain-cliffs.json
diff --git a/biomes/hot/hot-mountain-middle.json b/biomes/hot/mountain-middle.json
similarity index 100%
rename from biomes/hot/hot-mountain-middle.json
rename to biomes/hot/mountain-middle.json
diff --git a/biomes/hot/hot-mountain-plains.json b/biomes/hot/mountain-plains.json
similarity index 100%
rename from biomes/hot/hot-mountain-plains.json
rename to biomes/hot/mountain-plains.json
diff --git a/biomes/hot/hot-mountain.json b/biomes/hot/mountain.json
similarity index 100%
rename from biomes/hot/hot-mountain.json
rename to biomes/hot/mountain.json
diff --git a/biomes/hot/hot-oasis.json b/biomes/hot/oasis.json
similarity index 100%
rename from biomes/hot/hot-oasis.json
rename to biomes/hot/oasis.json
diff --git a/biomes/ocean/oce-hot-ocean-cliffs.json b/biomes/hot/sea/ocean-cliffs.json
similarity index 100%
rename from biomes/ocean/oce-hot-ocean-cliffs.json
rename to biomes/hot/sea/ocean-cliffs.json
diff --git a/biomes/ocean/oce-hot-ocean.json b/biomes/hot/sea/ocean.json
similarity index 99%
rename from biomes/ocean/oce-hot-ocean.json
rename to biomes/hot/sea/ocean.json
index dfbb17e2..48d90302 100644
--- a/biomes/ocean/oce-hot-ocean.json
+++ b/biomes/hot/sea/ocean.json
@@ -2,7 +2,7 @@
     "name": "Hot Ocean",
     "derivative": "WARM_OCEAN",
     "vanillaDerivative": "WARM_OCEAN",
-    "children": ["ocean/oce-hot-ocean-cliffs"],
+    "children": ["hot/sea/ocean-cliffs"],
     "color": "#103140",
     "generators": [{
         "min": -11,
diff --git a/biomes/ocean/oce-hot-river.json b/biomes/hot/sea/river.json
similarity index 100%
rename from biomes/ocean/oce-hot-river.json
rename to biomes/hot/sea/river.json
diff --git a/biomes/hot/hot-beach-grass.json b/biomes/hot/shore/beach-grass.json
similarity index 100%
rename from biomes/hot/hot-beach-grass.json
rename to biomes/hot/shore/beach-grass.json
diff --git a/biomes/hot/hot-beach.json b/biomes/hot/shore/beach.json
similarity index 100%
rename from biomes/hot/hot-beach.json
rename to biomes/hot/shore/beach.json
diff --git a/biomes/hot/msa-blue.json b/biomes/mesa/blue.json
similarity index 100%
rename from biomes/hot/msa-blue.json
rename to biomes/mesa/blue.json
diff --git a/biomes/hot/msa-cliffs.json b/biomes/mesa/cliffs.json
similarity index 100%
rename from biomes/hot/msa-cliffs.json
rename to biomes/mesa/cliffs.json
diff --git a/biomes/hot/msa-dark.json b/biomes/mesa/dark.json
similarity index 97%
rename from biomes/hot/msa-dark.json
rename to biomes/mesa/dark.json
index 0453940b..8afe5082 100644
--- a/biomes/hot/msa-dark.json
+++ b/biomes/mesa/dark.json
@@ -5,10 +5,10 @@
     "derivative": "SHATTERED_SAVANNA",
     "vanillaDerivative": "ERODED_BADLANDS",
     "children": [
-        "hot/msa-cliffs",
-        "hot/msa-red",
-        "hot/msa-green",
-        "hot/msa-blue"
+        "mesa/cliffs",
+        "mesa/red",
+        "mesa/green",
+        "mesa/blue"
     ],
     "generators": [
         {
diff --git a/biomes/hot/msa-green.json b/biomes/mesa/green.json
similarity index 100%
rename from biomes/hot/msa-green.json
rename to biomes/mesa/green.json
diff --git a/biomes/hot/msa-mesa.json b/biomes/mesa/mesa.json
similarity index 95%
rename from biomes/hot/msa-mesa.json
rename to biomes/mesa/mesa.json
index 8fd94446..91961281 100644
--- a/biomes/hot/msa-mesa.json
+++ b/biomes/mesa/mesa.json
@@ -10,14 +10,14 @@
         "ERODED_BADLANDS"
     ],
     "children": [
-        "hot/msa-valleys",
-        "hot/msa-red",
-        "hot/msa-blue",
-        "hot/msa-dark",
-        "hot/msa-green",
-        "hot/msa-red",
-        "hot/msa-yellow",
-        "hot/msa-blue"
+        "mesa/valleys",
+        "mesa/red",
+        "mesa/blue",
+        "mesa/dark",
+        "mesa/green",
+        "mesa/red",
+        "mesa/yellow",
+        "mesa/blue"
     ],
     "generators": [{
         "min": 25,
diff --git a/biomes/hot/msa-plateau-dirt-high.json b/biomes/mesa/plateau-dirt-high.json
similarity index 100%
rename from biomes/hot/msa-plateau-dirt-high.json
rename to biomes/mesa/plateau-dirt-high.json
diff --git a/biomes/hot/msa-plateau-dirt.json b/biomes/mesa/plateau-dirt.json
similarity index 100%
rename from biomes/hot/msa-plateau-dirt.json
rename to biomes/mesa/plateau-dirt.json
diff --git a/biomes/hot/msa-plateau-high.json b/biomes/mesa/plateau-high.json
similarity index 98%
rename from biomes/hot/msa-plateau-high.json
rename to biomes/mesa/plateau-high.json
index 16346638..1f43f845 100644
--- a/biomes/hot/msa-plateau-high.json
+++ b/biomes/mesa/plateau-high.json
@@ -9,7 +9,7 @@
         "BADLANDS_PLATEAU",
         "ERODED_BADLANDS"
     ],
-    "children": ["hot/msa-plateau-dirt-high"],
+    "children": ["mesa/plateau-dirt-high"],
     "generators": [
         {
             "min": 55,
diff --git a/biomes/hot/msa-plateau.json b/biomes/mesa/plateau.json
similarity index 99%
rename from biomes/hot/msa-plateau.json
rename to biomes/mesa/plateau.json
index cca3d809..36071a4e 100644
--- a/biomes/hot/msa-plateau.json
+++ b/biomes/mesa/plateau.json
@@ -9,7 +9,7 @@
         "BADLANDS_PLATEAU",
         "ERODED_BADLANDS"
     ],
-    "children": ["hot/msa-plateau-dirt"],
+    "children": ["mesa/plateau-dirt"],
     "generators": [
         {
             "min": 35,
diff --git a/biomes/hot/msa-red.json b/biomes/mesa/red.json
similarity index 100%
rename from biomes/hot/msa-red.json
rename to biomes/mesa/red.json
diff --git a/biomes/ocean/msa-river.json b/biomes/mesa/sea/river.json
similarity index 100%
rename from biomes/ocean/msa-river.json
rename to biomes/mesa/sea/river.json
diff --git a/biomes/hot/msa-beach.json b/biomes/mesa/shore/beach.json
similarity index 100%
rename from biomes/hot/msa-beach.json
rename to biomes/mesa/shore/beach.json
diff --git a/biomes/hot/msa-valleys.json b/biomes/mesa/valleys.json
similarity index 100%
rename from biomes/hot/msa-valleys.json
rename to biomes/mesa/valleys.json
diff --git a/biomes/hot/msa-yellow.json b/biomes/mesa/yellow.json
similarity index 98%
rename from biomes/hot/msa-yellow.json
rename to biomes/mesa/yellow.json
index 119db78c..318e51b1 100644
--- a/biomes/hot/msa-yellow.json
+++ b/biomes/mesa/yellow.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#BDBF05",
     "vanillaDerivative": "BADLANDS",
-    "children": ["hot/msa-dark"],
+    "children": ["mesa/dark"],
     "generators": [
         {
             "min": 9,
diff --git a/biomes/mountain/mtn-cliffs.json b/biomes/mountain/cliffs.json
similarity index 100%
rename from biomes/mountain/mtn-cliffs.json
rename to biomes/mountain/cliffs.json
diff --git a/biomes/mountain/mtn-forest-hills.json b/biomes/mountain/forest-hills.json
similarity index 100%
rename from biomes/mountain/mtn-forest-hills.json
rename to biomes/mountain/forest-hills.json
diff --git a/biomes/mountain/mtn-forest.json b/biomes/mountain/forest.json
similarity index 100%
rename from biomes/mountain/mtn-forest.json
rename to biomes/mountain/forest.json
diff --git a/biomes/mountain/mtn-hills.json b/biomes/mountain/hills.json
similarity index 99%
rename from biomes/mountain/mtn-hills.json
rename to biomes/mountain/hills.json
index 92d5e9e3..a3542131 100644
--- a/biomes/mountain/mtn-hills.json
+++ b/biomes/mountain/hills.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#48525F",
     "vanillaDerivative": "TAIGA_MOUNTAINS",
-    "children": ["mountain/mtn-forest"],
+    "children": ["mountain/forest"],
     "generators": [{
         "generator": "smooth-dunes",
         "max": 23,
diff --git a/biomes/mountain/mtn-main.json b/biomes/mountain/main.json
similarity index 98%
rename from biomes/mountain/mtn-main.json
rename to biomes/mountain/main.json
index c7ab282a..dbb8f45d 100644
--- a/biomes/mountain/mtn-main.json
+++ b/biomes/mountain/main.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#2B2E32",
     "vanillaDerivative": "PLAINS",
-    "children": ["mountain/mtn-middle"],
+    "children": ["mountain/middle"],
     "generators": [
         {
             "min": 70,
diff --git a/biomes/mountain/mtn-middle.json b/biomes/mountain/middle.json
similarity index 98%
rename from biomes/mountain/mtn-middle.json
rename to biomes/mountain/middle.json
index f5811534..ac72b96e 100644
--- a/biomes/mountain/mtn-middle.json
+++ b/biomes/mountain/middle.json
@@ -3,7 +3,7 @@
     "color": "#36383C",
     "derivative": "TAIGA_MOUNTAINS",
     "vanillaDerivative": "TAIGA_MOUNTAINS",
-    "children": ["mountain/mtn-cliffs"],
+    "children": ["mountain/cliffs"],
     "generators": [
         {
             "generator": "mountain",
diff --git a/biomes/mountain/mtn-mountain.json b/biomes/mountain/mountain.json
similarity index 98%
rename from biomes/mountain/mtn-mountain.json
rename to biomes/mountain/mountain.json
index 753139fc..c4dfb5c9 100644
--- a/biomes/mountain/mtn-mountain.json
+++ b/biomes/mountain/mountain.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#4B4D4F",
     "vanillaDerivative": "MOUNTAIN_EDGE",
-    "children": ["mountain/mtn-middle"],
+    "children": ["mountain/middle"],
     "generators": [
         {
             "min": 70,
diff --git a/biomes/mountain/mtn-plain-hills.json b/biomes/mountain/plain-hills.json
similarity index 100%
rename from biomes/mountain/mtn-plain-hills.json
rename to biomes/mountain/plain-hills.json
diff --git a/biomes/mountain/mtn-plains.json b/biomes/mountain/plains.json
similarity index 100%
rename from biomes/mountain/mtn-plains.json
rename to biomes/mountain/plains.json
diff --git a/biomes/ocean/oce-mtn-lake.json b/biomes/mountain/sea/lake.json
similarity index 100%
rename from biomes/ocean/oce-mtn-lake.json
rename to biomes/mountain/sea/lake.json
diff --git a/biomes/ocean/oce-mtn-river-soft.json b/biomes/mountain/sea/river-soft.json
similarity index 100%
rename from biomes/ocean/oce-mtn-river-soft.json
rename to biomes/mountain/sea/river-soft.json
diff --git a/biomes/ocean/oce-mtn-river.json b/biomes/mountain/sea/river.json
similarity index 100%
rename from biomes/ocean/oce-mtn-river.json
rename to biomes/mountain/sea/river.json
diff --git a/biomes/mountain/mtn-beach.json b/biomes/mountain/shore/beach.json
similarity index 100%
rename from biomes/mountain/mtn-beach.json
rename to biomes/mountain/shore/beach.json
diff --git a/biomes/mushroom/mus-crimson-forest.json b/biomes/mushroom/crimson-forest.json
similarity index 100%
rename from biomes/mushroom/mus-crimson-forest.json
rename to biomes/mushroom/crimson-forest.json
diff --git a/biomes/mushroom/mus-forest-hills.json b/biomes/mushroom/forest-hills.json
similarity index 100%
rename from biomes/mushroom/mus-forest-hills.json
rename to biomes/mushroom/forest-hills.json
diff --git a/biomes/mushroom/mus-forest.json b/biomes/mushroom/forest.json
similarity index 99%
rename from biomes/mushroom/mus-forest.json
rename to biomes/mushroom/forest.json
index f257d7ad..75a3eba4 100644
--- a/biomes/mushroom/mus-forest.json
+++ b/biomes/mushroom/forest.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#BFA6BE",
     "vanillaDerivative": "MUSHROOM_FIELDS",
-    "children": ["mushroom/mus-forest-hills"],
+    "children": ["mushroom/forest-hills"],
     "customDerivitives": [{
         "id": "musforest",
         "waterColor": "#B4B2FF",
diff --git a/biomes/mushroom/mus-plains.json b/biomes/mushroom/plains.json
similarity index 100%
rename from biomes/mushroom/mus-plains.json
rename to biomes/mushroom/plains.json
diff --git a/biomes/ocean/oce-mus-lake.json b/biomes/mushroom/sea/lake.json
similarity index 100%
rename from biomes/ocean/oce-mus-lake.json
rename to biomes/mushroom/sea/lake.json
diff --git a/biomes/ocean/oce-mus-ocean.json b/biomes/mushroom/sea/ocean.json
similarity index 100%
rename from biomes/ocean/oce-mus-ocean.json
rename to biomes/mushroom/sea/ocean.json
diff --git a/biomes/mushroom/mus-beach.json b/biomes/mushroom/shore/beach.json
similarity index 100%
rename from biomes/mushroom/mus-beach.json
rename to biomes/mushroom/shore/beach.json
diff --git a/biomes/mushroom/mus-warped-forest.json b/biomes/mushroom/warped-forest.json
similarity index 100%
rename from biomes/mushroom/mus-warped-forest.json
rename to biomes/mushroom/warped-forest.json
diff --git a/biomes/hot/sav-acacia-denmyre.json b/biomes/savanna/acacia-denmyre.json
similarity index 100%
rename from biomes/hot/sav-acacia-denmyre.json
rename to biomes/savanna/acacia-denmyre.json
diff --git a/biomes/hot/sav-cliff.json b/biomes/savanna/cliff.json
similarity index 99%
rename from biomes/hot/sav-cliff.json
rename to biomes/savanna/cliff.json
index 53cac96e..398f8713 100644
--- a/biomes/hot/sav-cliff.json
+++ b/biomes/savanna/cliff.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#BF8931",
     "vanillaDerivative": "SAVANNA",
-    "children": ["hot/sav-acacia-denmyre"],
+    "children": ["savanna/acacia-denmyre"],
     "customDerivitives": [{
         "id": "savcliff",
         "grassColor": "#DFD545",
diff --git a/biomes/hot/sav-forest.json b/biomes/savanna/forest.json
similarity index 100%
rename from biomes/hot/sav-forest.json
rename to biomes/savanna/forest.json
diff --git a/biomes/hot/sav-plateau.json b/biomes/savanna/plateau.json
similarity index 100%
rename from biomes/hot/sav-plateau.json
rename to biomes/savanna/plateau.json
diff --git a/biomes/hot/sav-savanna.json b/biomes/savanna/savanna.json
similarity index 99%
rename from biomes/hot/sav-savanna.json
rename to biomes/savanna/savanna.json
index 6d20d8ac..37c853aa 100644
--- a/biomes/hot/sav-savanna.json
+++ b/biomes/savanna/savanna.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#604418",
     "vanillaDerivative": "SAVANNA",
-    "children": ["hot/sav-cliff"],
+    "children": ["savanna/cliff"],
     "customDerivitives": [{
         "id": "savsavanna",
         "grassColor": "#DFD545",
diff --git a/biomes/hot/sav-beach.json b/biomes/savanna/shore/beach.json
similarity index 100%
rename from biomes/hot/sav-beach.json
rename to biomes/savanna/shore/beach.json
diff --git a/biomes/swamp/swa-denmyre.json b/biomes/swamp/denmyre.json
similarity index 100%
rename from biomes/swamp/swa-denmyre.json
rename to biomes/swamp/denmyre.json
diff --git a/biomes/swamp/swa-marsh-rotten.json b/biomes/swamp/marsh-rotten.json
similarity index 100%
rename from biomes/swamp/swa-marsh-rotten.json
rename to biomes/swamp/marsh-rotten.json
diff --git a/biomes/swamp/swa-marsh.json b/biomes/swamp/marsh.json
similarity index 98%
rename from biomes/swamp/swa-marsh.json
rename to biomes/swamp/marsh.json
index d70e07b5..ce824118 100644
--- a/biomes/swamp/swa-marsh.json
+++ b/biomes/swamp/marsh.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#36A300",
     "vanillaDerivative": "SWAMP",
-    "children": ["swamp/swa-marsh-rotten"],
+    "children": ["swamp/marsh-rotten"],
     "generators": [{
         "min": 3,
         "max": 6,
diff --git a/biomes/swamp/swa-roofed-forest.json b/biomes/swamp/roofed-forest.json
similarity index 99%
rename from biomes/swamp/swa-roofed-forest.json
rename to biomes/swamp/roofed-forest.json
index 07b4809a..1df159c3 100644
--- a/biomes/swamp/swa-roofed-forest.json
+++ b/biomes/swamp/roofed-forest.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#3F9F10",
     "vanillaDerivative": "DARK_FOREST",
-    "children": ["swamp/swa-lake"],
+    "children": ["swamp/sea/lake"],
     "generators": [{
         "min": 4,
         "max": 11,
diff --git a/biomes/swamp/swa-roofed-wayward.json b/biomes/swamp/roofed-wayward.json
similarity index 99%
rename from biomes/swamp/swa-roofed-wayward.json
rename to biomes/swamp/roofed-wayward.json
index 2622f736..eab21489 100644
--- a/biomes/swamp/swa-roofed-wayward.json
+++ b/biomes/swamp/roofed-wayward.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#489A20",
     "vanillaDerivative": "DARK_FOREST",
-    "children": ["swamp/swa-lake"],
+    "children": ["swamp/sea/lake"],
     "generators": [{
         "min": -7,
         "max": -3,
diff --git a/biomes/swamp/swa-lake.json b/biomes/swamp/sea/lake.json
similarity index 98%
rename from biomes/swamp/swa-lake.json
rename to biomes/swamp/sea/lake.json
index d7330370..b2e066df 100644
--- a/biomes/swamp/swa-lake.json
+++ b/biomes/swamp/sea/lake.json
@@ -4,7 +4,7 @@
     "color": "#6A9140",
     "derivative": "SWAMP",
     "vanillaDerivative": "SWAMP",
-    "children": ["swamp/swa-marsh"],
+    "children": ["swamp/marsh"],
     "generators": [{
         "min": -8,
         "max": -5,
diff --git a/biomes/ocean/oce-swa-ocean-tree.json b/biomes/swamp/sea/ocean-tree.json
similarity index 100%
rename from biomes/ocean/oce-swa-ocean-tree.json
rename to biomes/swamp/sea/ocean-tree.json
diff --git a/biomes/ocean/oce-swa-ocean.json b/biomes/swamp/sea/ocean.json
similarity index 100%
rename from biomes/ocean/oce-swa-ocean.json
rename to biomes/swamp/sea/ocean.json
diff --git a/biomes/swamp/swa-beach.json b/biomes/swamp/shore/beach.json
similarity index 100%
rename from biomes/swamp/swa-beach.json
rename to biomes/swamp/shore/beach.json
diff --git a/biomes/swamp/swa-willow-forest.json b/biomes/swamp/willow-forest.json
similarity index 99%
rename from biomes/swamp/swa-willow-forest.json
rename to biomes/swamp/willow-forest.json
index c686ebfd..c5b7bbd5 100644
--- a/biomes/swamp/swa-willow-forest.json
+++ b/biomes/swamp/willow-forest.json
@@ -5,8 +5,8 @@
     "color": "#648D50",
     "vanillaDerivative": "DARK_FOREST",
     "children": [
-        "swamp/swa-denmyre",
-        "swamp/swa-marsh"
+        "swamp/denmyre",
+        "swamp/marsh"
     ],
     "generators": [{
         "min": 4,
diff --git a/biomes/temperate/tem-birch-denmyre.json b/biomes/temperate/birch-denmyre.json
similarity index 100%
rename from biomes/temperate/tem-birch-denmyre.json
rename to biomes/temperate/birch-denmyre.json
diff --git a/biomes/temperate/tem-birch-forest.json b/biomes/temperate/birch-forest.json
similarity index 99%
rename from biomes/temperate/tem-birch-forest.json
rename to biomes/temperate/birch-forest.json
index 3cbf7851..f1713d71 100644
--- a/biomes/temperate/tem-birch-forest.json
+++ b/biomes/temperate/birch-forest.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#D2DF20",
     "vanillaDerivative": "BIRCH_FOREST",
-    "children": ["temperate/tem-birch-denmyre"],
+    "children": ["temperate/birch-denmyre"],
     "generators": [{
         "min": 4,
         "max": 7,
diff --git a/biomes/temperate/tem-flower-forest.json b/biomes/temperate/flower-forest.json
similarity index 100%
rename from biomes/temperate/tem-flower-forest.json
rename to biomes/temperate/flower-forest.json
diff --git a/biomes/temperate/tem-highlands.json b/biomes/temperate/highlands.json
similarity index 100%
rename from biomes/temperate/tem-highlands.json
rename to biomes/temperate/highlands.json
diff --git a/biomes/temperate/tem-island.json b/biomes/temperate/island.json
similarity index 98%
rename from biomes/temperate/tem-island.json
rename to biomes/temperate/island.json
index 26443de7..394546aa 100644
--- a/biomes/temperate/tem-island.json
+++ b/biomes/temperate/island.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#A9AF50",
     "vanillaDerivative": "PLAINS",
-    "children": ["temperate/tem-wilds"],
+    "children": ["temperate/wilds"],
     "generators": [{
         "min": 28,
         "max": 42,
diff --git a/biomes/temperate/tem-longtree-forest.json b/biomes/temperate/longtree-forest.json
similarity index 100%
rename from biomes/temperate/tem-longtree-forest.json
rename to biomes/temperate/longtree-forest.json
diff --git a/biomes/temperate/tem-oak-denmyre.json b/biomes/temperate/oak-denmyre.json
similarity index 100%
rename from biomes/temperate/tem-oak-denmyre.json
rename to biomes/temperate/oak-denmyre.json
diff --git a/biomes/temperate/tem-oak-forest.json b/biomes/temperate/oak-forest.json
similarity index 99%
rename from biomes/temperate/tem-oak-forest.json
rename to biomes/temperate/oak-forest.json
index 9d94f7c1..f9cb9e91 100644
--- a/biomes/temperate/tem-oak-forest.json
+++ b/biomes/temperate/oak-forest.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#BFEF10",
     "vanillaDerivative": "FOREST",
-    "children": ["temperate/tem-oak-denmyre"],
+    "children": ["temperate/oak-denmyre"],
     "customDerivitives": [{
         "id": "temoakforest",
         "foliageColor": "#80B918",
diff --git a/biomes/temperate/tem-oak-hills.json b/biomes/temperate/oak-hills.json
similarity index 100%
rename from biomes/temperate/tem-oak-hills.json
rename to biomes/temperate/oak-hills.json
diff --git a/biomes/temperate/tem-oak.json b/biomes/temperate/oak.json
similarity index 99%
rename from biomes/temperate/tem-oak.json
rename to biomes/temperate/oak.json
index 11ba5d93..55ea1c4f 100644
--- a/biomes/temperate/tem-oak.json
+++ b/biomes/temperate/oak.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#ADCF30",
     "vanillaDerivative": "FOREST",
-    "children": ["temperate/tem-oak-hills"],
+    "children": ["temperate/oak-hills"],
     "generators": [{
         "generator": "smooth-dunes",
         "max": 4,
diff --git a/biomes/temperate/tem-plain-hills.json b/biomes/temperate/plain-hills.json
similarity index 100%
rename from biomes/temperate/tem-plain-hills.json
rename to biomes/temperate/plain-hills.json
diff --git a/biomes/temperate/tem-plains.json b/biomes/temperate/plains.json
similarity index 99%
rename from biomes/temperate/tem-plains.json
rename to biomes/temperate/plains.json
index d59afeb2..3925c11e 100644
--- a/biomes/temperate/tem-plains.json
+++ b/biomes/temperate/plains.json
@@ -5,8 +5,8 @@
     "color": "#9BAF50",
     "vanillaDerivative": "PLAINS",
     "children": [
-        "temperate/tem-plain-hills",
-        "temperate/tem-wilds"
+        "temperate/plain-hills",
+        "temperate/wilds"
     ],
     "customDerivitives": [{
         "id": "templains",
diff --git a/biomes/temperate/tem-plateau.json b/biomes/temperate/plateau.json
similarity index 100%
rename from biomes/temperate/tem-plateau.json
rename to biomes/temperate/plateau.json
diff --git a/biomes/temperate/tem-sakura-pink-child.json b/biomes/temperate/sakura-pink-child.json
similarity index 100%
rename from biomes/temperate/tem-sakura-pink-child.json
rename to biomes/temperate/sakura-pink-child.json
diff --git a/biomes/temperate/tem-sakura-pink-forest.json b/biomes/temperate/sakura-pink-forest.json
similarity index 99%
rename from biomes/temperate/tem-sakura-pink-forest.json
rename to biomes/temperate/sakura-pink-forest.json
index c06a347c..0ceae983 100644
--- a/biomes/temperate/tem-sakura-pink-forest.json
+++ b/biomes/temperate/sakura-pink-forest.json
@@ -4,7 +4,7 @@
     "rarity": 2,
     "color": "#DF4FE8",
     "vanillaDerivative": "FOREST",
-    "children": ["temperate/tem-sakura-pink-child"],
+    "children": ["temperate/sakura-pink-child"],
     "childStyle": {
         "style": "IRIS",
         "zoom": 0.3,
diff --git a/biomes/ocean/oce-tem-ocean-deep.json b/biomes/temperate/sea/ocean-deep.json
similarity index 100%
rename from biomes/ocean/oce-tem-ocean-deep.json
rename to biomes/temperate/sea/ocean-deep.json
diff --git a/biomes/ocean/oce-tem-ocean.json b/biomes/temperate/sea/ocean.json
similarity index 100%
rename from biomes/ocean/oce-tem-ocean.json
rename to biomes/temperate/sea/ocean.json
diff --git a/biomes/ocean/oce-tem-river.json b/biomes/temperate/sea/river.json
similarity index 100%
rename from biomes/ocean/oce-tem-river.json
rename to biomes/temperate/sea/river.json
diff --git a/biomes/temperate/tem-beach.json b/biomes/temperate/shore/beach.json
similarity index 100%
rename from biomes/temperate/tem-beach.json
rename to biomes/temperate/shore/beach.json
diff --git a/biomes/temperate/tem-oak-beach.json b/biomes/temperate/shore/oak-beach.json
similarity index 100%
rename from biomes/temperate/tem-oak-beach.json
rename to biomes/temperate/shore/oak-beach.json
diff --git a/biomes/temperate/tem-stranged-plains.json b/biomes/temperate/stranged-plains.json
similarity index 100%
rename from biomes/temperate/tem-stranged-plains.json
rename to biomes/temperate/stranged-plains.json
diff --git a/biomes/temperate/tem-wilds.json b/biomes/temperate/wilds.json
similarity index 99%
rename from biomes/temperate/tem-wilds.json
rename to biomes/temperate/wilds.json
index 09297648..ed3482b5 100644
--- a/biomes/temperate/tem-wilds.json
+++ b/biomes/temperate/wilds.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#B6CF68",
     "vanillaDerivative": "PLAINS",
-    "children": ["temperate/tem-highlands"],
+    "children": ["temperate/highlands"],
     "customDerivitives": [{
         "id": "temwilds",
         "foliageColor": "#237031",
diff --git a/biomes/tropical/tro-bamboo-forest.json b/biomes/tropical/bamboo-forest.json
similarity index 99%
rename from biomes/tropical/tro-bamboo-forest.json
rename to biomes/tropical/bamboo-forest.json
index db9e790d..4e4d5e7f 100644
--- a/biomes/tropical/tro-bamboo-forest.json
+++ b/biomes/tropical/bamboo-forest.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#9BFF00",
     "vanillaDerivative": "BAMBOO_JUNGLE",
-    "children": ["tropical/tro-wilds"],
+    "children": ["tropical/wilds"],
     "generators": [{
         "min": 5,
         "max": 9,
diff --git a/biomes/tropical/tro-beach-bamboo.json b/biomes/tropical/beach-bamboo.json
similarity index 100%
rename from biomes/tropical/tro-beach-bamboo.json
rename to biomes/tropical/beach-bamboo.json
diff --git a/biomes/tropical/tro-beach-charred.json b/biomes/tropical/beach-charred.json
similarity index 100%
rename from biomes/tropical/tro-beach-charred.json
rename to biomes/tropical/beach-charred.json
diff --git a/biomes/tropical/tro-beach.json b/biomes/tropical/beach.json
similarity index 100%
rename from biomes/tropical/tro-beach.json
rename to biomes/tropical/beach.json
diff --git a/biomes/tropical/tro-highlands.json b/biomes/tropical/highlands.json
similarity index 100%
rename from biomes/tropical/tro-highlands.json
rename to biomes/tropical/highlands.json
diff --git a/biomes/tropical/tro-island-beach.json b/biomes/tropical/island-beach.json
similarity index 100%
rename from biomes/tropical/tro-island-beach.json
rename to biomes/tropical/island-beach.json
diff --git a/biomes/tropical/tro-jungle-denmyre.json b/biomes/tropical/jungle-denmyre.json
similarity index 100%
rename from biomes/tropical/tro-jungle-denmyre.json
rename to biomes/tropical/jungle-denmyre.json
diff --git a/biomes/tropical/tro-mountain-extreme.json b/biomes/tropical/mountain-extreme.json
similarity index 98%
rename from biomes/tropical/tro-mountain-extreme.json
rename to biomes/tropical/mountain-extreme.json
index 3b0a7fcb..354dab85 100644
--- a/biomes/tropical/tro-mountain-extreme.json
+++ b/biomes/tropical/mountain-extreme.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#838F70",
     "vanillaDerivative": "MODIFIED_JUNGLE",
-    "children": ["tropical/tro-mountain-water"],
+    "children": ["tropical/mountain-water"],
     "generators": [{
         "generator": "mountain",
         "max": 190,
diff --git a/biomes/tropical/tro-mountain-middle.json b/biomes/tropical/mountain-middle.json
similarity index 98%
rename from biomes/tropical/tro-mountain-middle.json
rename to biomes/tropical/mountain-middle.json
index 2b2c9707..a32bca53 100644
--- a/biomes/tropical/tro-mountain-middle.json
+++ b/biomes/tropical/mountain-middle.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#39FF00",
     "vanillaDerivative": "JUNGLE_HILLS",
-    "children": ["tropical/tro-plains"],
+    "children": ["tropical/plains"],
     "generators": [
         {
             "generator": "mountain",
diff --git a/biomes/tropical/tro-mountain-plains.json b/biomes/tropical/mountain-plains.json
similarity index 100%
rename from biomes/tropical/tro-mountain-plains.json
rename to biomes/tropical/mountain-plains.json
diff --git a/biomes/tropical/tro-mountain-water.json b/biomes/tropical/mountain-water.json
similarity index 100%
rename from biomes/tropical/tro-mountain-water.json
rename to biomes/tropical/mountain-water.json
diff --git a/biomes/tropical/tro-mountain.json b/biomes/tropical/mountain.json
similarity index 98%
rename from biomes/tropical/tro-mountain.json
rename to biomes/tropical/mountain.json
index 66079295..5c8b7e34 100644
--- a/biomes/tropical/tro-mountain.json
+++ b/biomes/tropical/mountain.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#2057DF",
     "vanillaDerivative": "JUNGLE_HILLS",
-    "children": ["tropical/tro-mountain-middle"],
+    "children": ["tropical/mountain-middle"],
     "generators": [{
         "min": 75,
         "max": 150,
diff --git a/biomes/tropical/tro-plains-hills.json b/biomes/tropical/plains-hills.json
similarity index 100%
rename from biomes/tropical/tro-plains-hills.json
rename to biomes/tropical/plains-hills.json
diff --git a/biomes/tropical/tro-plains.json b/biomes/tropical/plains.json
similarity index 98%
rename from biomes/tropical/tro-plains.json
rename to biomes/tropical/plains.json
index cf7098c5..2ab8c8bf 100644
--- a/biomes/tropical/tro-plains.json
+++ b/biomes/tropical/plains.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#5EBF40",
     "vanillaDerivative": "JUNGLE",
-    "children": ["tropical/tro-plains-hills"],
+    "children": ["tropical/plains-hills"],
     "generators": [{
         "generator": "smooth-dunes",
         "max": 20,
diff --git a/biomes/tropical/tro-rainforest-hills.json b/biomes/tropical/rainforest-hills.json
similarity index 100%
rename from biomes/tropical/tro-rainforest-hills.json
rename to biomes/tropical/rainforest-hills.json
diff --git a/biomes/tropical/tro-rainforest-island.json b/biomes/tropical/rainforest-island.json
similarity index 100%
rename from biomes/tropical/tro-rainforest-island.json
rename to biomes/tropical/rainforest-island.json
diff --git a/biomes/tropical/tro-rainforest-wicked-child.json b/biomes/tropical/rainforest-wicked-child.json
similarity index 100%
rename from biomes/tropical/tro-rainforest-wicked-child.json
rename to biomes/tropical/rainforest-wicked-child.json
diff --git a/biomes/tropical/tro-rainforest-wicked-village.json b/biomes/tropical/rainforest-wicked-village.json
similarity index 100%
rename from biomes/tropical/tro-rainforest-wicked-village.json
rename to biomes/tropical/rainforest-wicked-village.json
diff --git a/biomes/tropical/tro-rainforest-wicked.json b/biomes/tropical/rainforest-wicked.json
similarity index 98%
rename from biomes/tropical/tro-rainforest-wicked.json
rename to biomes/tropical/rainforest-wicked.json
index 758119b6..44eff35b 100644
--- a/biomes/tropical/tro-rainforest-wicked.json
+++ b/biomes/tropical/rainforest-wicked.json
@@ -5,9 +5,9 @@
     "color": "#10EF15",
     "vanillaDerivative": "MODIFIED_JUNGLE_EDGE",
     "children": [
-        "tropical/tro-rainforest-hills",
-        "tropical/tro-jungle-denmyre",
-        "tropical/tro-rainforest-wicked-child"
+        "tropical/rainforest-hills",
+        "tropical/jungle-denmyre",
+        "tropical/rainforest-wicked-child"
     ],
     "customDerivitives": [{
         "id": "trowkd",
diff --git a/biomes/tropical/tro-rainforest.json b/biomes/tropical/rainforest.json
similarity index 99%
rename from biomes/tropical/tro-rainforest.json
rename to biomes/tropical/rainforest.json
index 8b40a6ff..46aa69d4 100644
--- a/biomes/tropical/tro-rainforest.json
+++ b/biomes/tropical/rainforest.json
@@ -5,8 +5,8 @@
     "rarity": 1,
     "color": "#20DF24",
     "children": [
-        "tropical/tro-rainforest-hills",
-        "tropical/tro-jungle-denmyre"
+        "tropical/rainforest-hills",
+        "tropical/jungle-denmyre"
     ],
     "generators": [{
         "min": 20,
diff --git a/biomes/ocean/oce-tro-coral-ocean-cliffs.json b/biomes/tropical/sea/coral-ocean-cliffs.json
similarity index 99%
rename from biomes/ocean/oce-tro-coral-ocean-cliffs.json
rename to biomes/tropical/sea/coral-ocean-cliffs.json
index 09582ce4..84599237 100644
--- a/biomes/ocean/oce-tro-coral-ocean-cliffs.json
+++ b/biomes/tropical/sea/coral-ocean-cliffs.json
@@ -3,7 +3,7 @@
     "derivative": "LUKEWARM_OCEAN",
     "vanillaDerivative": "LUKEWARM_OCEAN",
     "color": "#29449F",
-    "children": ["ocean/oce-tro-coral-ocean"],
+    "children": ["tropical/sea/coral-ocean"],
     "generators": [{
         "min": -51,
         "max": -37,
diff --git a/biomes/ocean/oce-tro-coral-ocean.json b/biomes/tropical/sea/coral-ocean.json
similarity index 100%
rename from biomes/ocean/oce-tro-coral-ocean.json
rename to biomes/tropical/sea/coral-ocean.json
diff --git a/biomes/ocean/oce-tro-ocean.json b/biomes/tropical/sea/ocean.json
similarity index 98%
rename from biomes/ocean/oce-tro-ocean.json
rename to biomes/tropical/sea/ocean.json
index bef752c1..f1f882bb 100644
--- a/biomes/ocean/oce-tro-ocean.json
+++ b/biomes/tropical/sea/ocean.json
@@ -4,8 +4,8 @@
     "color": "#182960",
     "vanillaDerivative": "WARM_OCEAN",
     "children": [
-        "ocean/oce-tro-coral-ocean",
-        "ocean/oce-tro-coral-ocean-cliffs"
+        "tropical/sea/coral-ocean",
+        "tropical/sea/coral-ocean-cliffs"
     ],
     "generators": [{
         "min": -38,
diff --git a/biomes/ocean/oce-tro-river-soft.json b/biomes/tropical/sea/river-soft.json
similarity index 100%
rename from biomes/ocean/oce-tro-river-soft.json
rename to biomes/tropical/sea/river-soft.json
diff --git a/biomes/ocean/oce-tro-river-steep.json b/biomes/tropical/sea/river-steep.json
similarity index 100%
rename from biomes/ocean/oce-tro-river-steep.json
rename to biomes/tropical/sea/river-steep.json
diff --git a/biomes/tropical/tro-submerged-volcanic.json b/biomes/tropical/submerged-volcanic.json
similarity index 100%
rename from biomes/tropical/tro-submerged-volcanic.json
rename to biomes/tropical/submerged-volcanic.json
diff --git a/biomes/tropical/tro-volcanic-plains.json b/biomes/tropical/volcanic-plains.json
similarity index 98%
rename from biomes/tropical/tro-volcanic-plains.json
rename to biomes/tropical/volcanic-plains.json
index 9faad996..e8f16f45 100644
--- a/biomes/tropical/tro-volcanic-plains.json
+++ b/biomes/tropical/volcanic-plains.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#40BF43",
     "vanillaDerivative": "THE_VOID",
-    "children": ["tropical/tro-volcanoes"],
+    "children": ["tropical/volcanoes"],
     "generators": [{
         "min": 120,
         "max": 190,
diff --git a/biomes/tropical/tro-volcanoes-lava.json b/biomes/tropical/volcanoes-lava.json
similarity index 100%
rename from biomes/tropical/tro-volcanoes-lava.json
rename to biomes/tropical/volcanoes-lava.json
diff --git a/biomes/tropical/tro-volcanoes.json b/biomes/tropical/volcanoes.json
similarity index 96%
rename from biomes/tropical/tro-volcanoes.json
rename to biomes/tropical/volcanoes.json
index 41c00915..ac258788 100644
--- a/biomes/tropical/tro-volcanoes.json
+++ b/biomes/tropical/volcanoes.json
@@ -11,7 +11,7 @@
         "fogColor": "#DD793C",
         "downfallType": "none"
     }],
-    "children": ["tropical/tro-volcanoes-lava"],
+    "children": ["tropical/volcanoes-lava"],
     "generators": [
         {
             "generator": "mountain",
diff --git a/biomes/tropical/tro-wilds.json b/biomes/tropical/wilds.json
similarity index 99%
rename from biomes/tropical/tro-wilds.json
rename to biomes/tropical/wilds.json
index a1c55a6b..8787bb8c 100644
--- a/biomes/tropical/tro-wilds.json
+++ b/biomes/tropical/wilds.json
@@ -4,7 +4,7 @@
     "vanillaDerivative": "JUNGLE",
     "rarity": 1,
     "color": "#708F70",
-    "children": ["tropical/tro-highlands"],
+    "children": ["tropical/highlands"],
     "generators": [{
         "min": 10,
         "max": 20,
diff --git a/biomes/tundra/autumn.json b/biomes/tundra/autumn.json
index 5d6ae921..d98070d0 100644
--- a/biomes/tundra/autumn.json
+++ b/biomes/tundra/autumn.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#23EBA3",
     "vanillaDerivative": "DARK_FOREST",
-    "children": ["tundra/tun-redwood-cliffs"],
+    "children": ["tundra/redwood-cliffs"],
     "generators": [{
         "min": 4,
         "max": 10,
diff --git a/biomes/tundra/tun-bonsai-forest.json b/biomes/tundra/bonsai-forest.json
similarity index 99%
rename from biomes/tundra/tun-bonsai-forest.json
rename to biomes/tundra/bonsai-forest.json
index f2532603..6fb795ce 100644
--- a/biomes/tundra/tun-bonsai-forest.json
+++ b/biomes/tundra/bonsai-forest.json
@@ -5,8 +5,8 @@
     "rarity": 1,
     "vanillaDerivative": "FLOWER_FOREST",
     "children": [
-        "tundra/tun-sequia-redwoods",
-        "tundra/tun-redwood-cliffs"
+        "tundra/sequia-redwoods",
+        "tundra/redwood-cliffs"
     ],
     "generators": [{
         "min": 17,
diff --git a/biomes/tundra/tun-forest-cliffs.json b/biomes/tundra/forest-cliffs.json
similarity index 100%
rename from biomes/tundra/tun-forest-cliffs.json
rename to biomes/tundra/forest-cliffs.json
diff --git a/biomes/tundra/tun-forest.json b/biomes/tundra/forest.json
similarity index 99%
rename from biomes/tundra/tun-forest.json
rename to biomes/tundra/forest.json
index 83ac64a5..9b2488ec 100644
--- a/biomes/tundra/tun-forest.json
+++ b/biomes/tundra/forest.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#169864",
     "vanillaDerivative": "TAIGA_MOUNTAINS",
-    "children": ["tundra/tun-forest-cliffs"],
+    "children": ["tundra/forest-cliffs"],
     "generators": [{
         "generator": "smooth-dunes",
         "max": 14,
diff --git a/biomes/tundra/tun-magic-forest.json b/biomes/tundra/magic-forest.json
similarity index 100%
rename from biomes/tundra/tun-magic-forest.json
rename to biomes/tundra/magic-forest.json
diff --git a/biomes/tundra/tun-mountains-cliffs.json b/biomes/tundra/mountains-cliffs.json
similarity index 100%
rename from biomes/tundra/tun-mountains-cliffs.json
rename to biomes/tundra/mountains-cliffs.json
diff --git a/biomes/tundra/tun-mountains.json b/biomes/tundra/mountains.json
similarity index 99%
rename from biomes/tundra/tun-mountains.json
rename to biomes/tundra/mountains.json
index 6386d28e..eca85c4b 100644
--- a/biomes/tundra/tun-mountains.json
+++ b/biomes/tundra/mountains.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#3AD0B2",
     "vanillaDerivative": "TAIGA_MOUNTAINS",
-    "children": ["tundra/tun-mountains-cliffs"],
+    "children": ["tundra/mountains-cliffs"],
     "generators": [{
         "min": 66,
         "max": 89,
diff --git a/biomes/tundra/tun-redwood-cliffs.json b/biomes/tundra/redwood-cliffs.json
similarity index 100%
rename from biomes/tundra/tun-redwood-cliffs.json
rename to biomes/tundra/redwood-cliffs.json
diff --git a/biomes/tundra/tun-redwood-forest.json b/biomes/tundra/redwood-forest.json
similarity index 99%
rename from biomes/tundra/tun-redwood-forest.json
rename to biomes/tundra/redwood-forest.json
index 13e1cdae..c9250fd7 100644
--- a/biomes/tundra/tun-redwood-forest.json
+++ b/biomes/tundra/redwood-forest.json
@@ -4,7 +4,7 @@
     "rarity": 1,
     "color": "#23EBA3",
     "vanillaDerivative": "DARK_FOREST",
-    "children": ["tundra/tun-redwood-cliffs"],
+    "children": ["tundra/redwood-cliffs"],
     "generators": [{
         "min": 4,
         "max": 10,
diff --git a/biomes/tundra/tun-lake.json b/biomes/tundra/sea/lake.json
similarity index 100%
rename from biomes/tundra/tun-lake.json
rename to biomes/tundra/sea/lake.json
diff --git a/biomes/ocean/oce-tun-river-rocky.json b/biomes/tundra/sea/river-rocky.json
similarity index 100%
rename from biomes/ocean/oce-tun-river-rocky.json
rename to biomes/tundra/sea/river-rocky.json
diff --git a/biomes/ocean/oce-tun-river.json b/biomes/tundra/sea/river.json
similarity index 98%
rename from biomes/ocean/oce-tun-river.json
rename to biomes/tundra/sea/river.json
index e13188fe..ff2ba2a7 100644
--- a/biomes/ocean/oce-tun-river.json
+++ b/biomes/tundra/sea/river.json
@@ -3,7 +3,7 @@
     "derivative": "COLD_OCEAN",
     "vanillaDerivative": "RIVER",
     "color": "#3E31BF",
-    "children": ["ocean/oce-tun-river-rocky"],
+    "children": ["tundra/sea/river-rocky"],
     "generators": [{
         "generator": "river",
         "max": -10,
diff --git a/biomes/tundra/tun-sequia-redwoods.json b/biomes/tundra/sequia-redwoods.json
similarity index 100%
rename from biomes/tundra/tun-sequia-redwoods.json
rename to biomes/tundra/sequia-redwoods.json
diff --git a/biomes/tundra/tun-tundra-beach-stone.json b/biomes/tundra/shore/beach-stone.json
similarity index 100%
rename from biomes/tundra/tun-tundra-beach-stone.json
rename to biomes/tundra/shore/beach-stone.json
diff --git a/biomes/tundra/tun-beach.json b/biomes/tundra/shore/beach.json
similarity index 100%
rename from biomes/tundra/tun-beach.json
rename to biomes/tundra/shore/beach.json
diff --git a/biomes/tundra/tun-spruce-denmyre.json b/biomes/tundra/spruce-denmyre.json
similarity index 100%
rename from biomes/tundra/tun-spruce-denmyre.json
rename to biomes/tundra/spruce-denmyre.json
diff --git a/biomes/tundra/tun-taiga.json b/biomes/tundra/taiga.json
similarity index 100%
rename from biomes/tundra/tun-taiga.json
rename to biomes/tundra/taiga.json
diff --git a/dimensions/overworld.json b/dimensions/overworld.json
index 6c6cb96e..6a315204 100644
--- a/dimensions/overworld.json
+++ b/dimensions/overworld.json
@@ -18,12 +18,11 @@
     "regions": [
         "mushroom",
         "swamp",
-        "frozen",
-        "tundra",
-        "temperate",
-        "ocean",
+        "hot",
         "tropical",
-        "hot"
+        "temperate",
+        "frozen",
+        "tundra"
     ],
     "regionStyle": {
         "style": "NOWHERE_CELLULAR",
diff --git a/regions/frozen.json b/regions/frozen.json
index 2cd027b8..57094852 100644
--- a/regions/frozen.json
+++ b/regions/frozen.json
@@ -2,28 +2,28 @@
     "name": "Frozen",
     "color": "#51BFBD",
     "landBiomes": [
-        "frozen/fzn-plains",
-        "frozen/fzn-pines",
-        "frozen/fzn-plains",
-        "frozen/fzn-mountain",
-        "frozen/fzn-redwood-forest",
-        "frozen/fzn-hills",
-        "frozen/fzn-pine-plains",
-        "frozen/fzn-spruce-plains"
+        "frozen/plains",
+        "frozen/pines",
+        "frozen/plains",
+        "frozen/mountain",
+        "frozen/redwood-forest",
+        "frozen/hills",
+        "frozen/pine-plains",
+        "frozen/spruce-plains"
     ],
-    "shoreBiomes": ["frozen/fzn-beach"],
-    "seaBiomes": ["ocean/oce-fzn-river"],
+    "shoreBiomes": ["frozen/shore/beach"],
+    "seaBiomes": ["frozen/sea/ocean"],
     "caveBiomes": [
         "cave/ice-cavern",
         "cave/cracked-cavern"
     ],
-    "riverBiomes": ["ocean/oce-fzn-river"],
+    "riverBiomes": ["frozen/sea/river"],
     "jigsawStructures": [{
         "structure": "murky_stronghold",
         "rarity": 750
     }],
     "spotBiomes": [{
-        "biome": "frozen/fzn-vander",
+        "biome": "frozen/vander",
         "scale": 25,
         "type": "LAND",
         "shuffle": 328,
diff --git a/regions/hot.json b/regions/hot.json
index cec93565..cbec80d4 100644
--- a/regions/hot.json
+++ b/regions/hot.json
@@ -2,22 +2,22 @@
     "name": "Hot",
     "color": "#E7D900",
     "landBiomes": [
-        "hot/hot-desert-dunes",
-        "hot/hot-desert-dunes-red",
-        "hot/sav-forest",
-        "hot/sav-savanna",
-        "hot/sav-forest",
-        "hot/sav-plateau",
-        "hot/sav-acacia-denmyre",
-        "hot/msa-plateau",
-        "hot/msa-valleys",
-        "hot/msa-plateau-high",
-        "hot/msa-valleys",
-        "hot/msa-mesa",
-        "hot/msa-cliffs"
+        "hot/desert-dunes",
+        "hot/desert-dunes-red",
+        "savanna/forest",
+        "savanna/savanna",
+        "savanna/forest",
+        "savanna/plateau",
+        "savanna/acacia-denmyre",
+        "mesa/plateau",
+        "mesa/valleys",
+        "mesa/plateau-high",
+        "mesa/valleys",
+        "mesa/mesa",
+        "mesa/cliffs"
     ],
-    "shoreBiomes": ["hot/hot-beach"],
-    "seaBiomes": ["ocean/oce-hot-ocean"],
+    "shoreBiomes": ["hot/shore/beach"],
+    "seaBiomes": ["hot/sea/ocean"],
     "caveBiomes": [
         "cave/sandy-cave",
         "cave/sandy-red-cave"
@@ -64,7 +64,7 @@
         }
     ],
     "spotBiomes": [{
-        "biome": "hot/hot-oasis",
+        "biome": "hot/oasis",
         "scale": 5,
         "type": "SEA",
         "shuffle": 328,
diff --git a/regions/mushroom.json b/regions/mushroom.json
index 46935322..ce2cf201 100644
--- a/regions/mushroom.json
+++ b/regions/mushroom.json
@@ -2,18 +2,18 @@
     "name": "Mushroom",
     "color": "#DD86DC",
     "landBiomes": [
-        "mushroom/mus-forest",
-        "mushroom/mus-crimson-forest",
-        "mushroom/mus-forest-hills",
-        "mushroom/mus-plains",
-        "mushroom/mus-warped-forest"
+        "mushroom/forest",
+        "mushroom/crimson-forest",
+        "mushroom/forest-hills",
+        "mushroom/plains",
+        "mushroom/warped-forest"
     ],
-    "shoreBiomes": ["mushroom/mus-beach"],
+    "shoreBiomes": ["mushroom/shore/beach"],
     "jigsawStructures": [{
         "structure": "murky_stronghold",
         "rarity": 750
     }],
-    "seaBiomes": ["ocean/oce-mus-ocean"],
+    "seaBiomes": ["mushroom/sea/ocean"],
     "caveBiomes": [
         "cave/tundra-cavern",
         "cave/murky-cavern-gleaming",
diff --git a/regions/ocean.json b/regions/ocean.json
deleted file mode 100644
index f21b060e..00000000
--- a/regions/ocean.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "name": "Ocean",
-    "color": "#2D329C",
-    "landBiomes": ["ocean/oce-beach"],
-    "shoreBiomes": ["temperate/tem-beach"],
-    "seaBiomes": [
-        "ocean/oce-deep",
-        "ocean/oce-ocean",
-        "ocean/oce-deep"
-    ],
-    "caveBiomes": [
-        "cave/spiked-cavern",
-        "cave/tropical-cavern",
-        "cave/cavern-coral",
-        "cave/cavern-root",
-        "cave/lit-cavern",
-        "cave/old-cavern",
-        "cave/cracked-cavern"
-    ],
-    "riverBiomes": ["ocean/oce-ocean"],
-    "biomeImplosionRatio": 0.7,
-    "loot": {"tables": [
-        "beach-clutter",
-        "global-treasure",
-        "ocean-clutter",
-        "tropical-treasure"
-    ]},
-    "entityInitialSpawns": [
-        {
-            "entity": "glowsquid",
-            "maxSpawns": 2,
-            "rarity": 40
-        },
-        {
-            "entity": "drowned",
-            "maxSpawns": 2,
-            "rarity": 45
-        }
-    ],
-    "rarity": 3,
-    "effects": [
-        {
-            "particleAltX": 0.001,
-            "particleAltY": 0.2,
-            "particleAltZ": 0.001,
-            "chance": 2,
-            "particleEffect": "BUBBLE_POP",
-            "particleOffset": 0,
-            "interval": 1350,
-            "particleCount": 0
-        },
-        {
-            "particleAltX": 0.001,
-            "particleAltY": 0.2,
-            "particleAltZ": 0.001,
-            "chance": 2,
-            "particleEffect": "WATER_BUBBLE",
-            "particleOffset": 0,
-            "interval": 1350,
-            "particleCount": 0
-        }
-    ],
-    "seaBiomeZoom": 20,
-    "shoreRatio": 0.01,
-    "shoreHeightMin": 0,
-    "shoreHeightMax": 1,
-    "landBiomeZoom": 0.5,
-    "shoreBiomeZoom": 0.5
-}
diff --git a/regions/swamp.json b/regions/swamp.json
index c8c1f504..dbbe4af1 100644
--- a/regions/swamp.json
+++ b/regions/swamp.json
@@ -2,20 +2,20 @@
     "name": "Swamp",
     "color": "#68411E",
     "landBiomes": [
-        "swamp/swa-roofed-forest",
-        "swamp/swa-willow-forest",
-        "swamp/swa-lake",
-        "swamp/swa-roofed-wayward",
-        "swamp/swa-marsh"
+        "swamp/roofed-forest",
+        "swamp/willow-forest",
+        "swamp/sea/lake",
+        "swamp/roofed-wayward",
+        "swamp/marsh"
     ],
-    "shoreBiomes": ["swamp/swa-beach"],
+    "shoreBiomes": ["swamp/shore/beach"],
     "jigsawStructures": [{
         "structure": "murky_stronghold",
         "rarity": 750
     }],
     "seaBiomes": [
-        "ocean/oce-swa-ocean",
-        "ocean/oce-swa-ocean-tree"
+        "swamp/sea/ocean",
+        "swamp/sea/ocean-tree"
     ],
     "caveBiomes": [
         "cave/murky-cavern",
diff --git a/regions/temperate.json b/regions/temperate.json
index 0d52bcb3..6baeca24 100644
--- a/regions/temperate.json
+++ b/regions/temperate.json
@@ -2,23 +2,23 @@
     "name": "Temperate",
     "color": "#8BD03C",
     "landBiomes": [
-        "temperate/tem-plateau",
-        "temperate/tem-flower-forest",
-        "temperate/tem-stranged-plains",
-        "temperate/tem-longtree-forest",
-        "temperate/tem-sakura-pink-forest",
-        "temperate/tem-oak",
-        "temperate/tem-plains",
-        "temperate/tem-oak-forest",
-        "temperate/tem-wilds",
-        "temperate/tem-birch-forest"
+        "temperate/plateau",
+        "temperate/flower-forest",
+        "temperate/stranged-plains",
+        "temperate/longtree-forest",
+        "temperate/sakura-pink-forest",
+        "temperate/oak",
+        "temperate/plains",
+        "temperate/oak-forest",
+        "temperate/wilds",
+        "temperate/birch-forest"
     ],
     "shoreBiomes": [
-        "temperate/tem-beach",
-        "temperate/tem-oak-beach"
+        "temperate/shore/beach",
+        "temperate/shore/oak-beach"
     ],
     "seaBiomes": [
-        "ocean/oce-tem-river",
+        "temperate/sea/river",
         "ocean/oce-deep"
     ],
     "caveBiomes": [
@@ -26,7 +26,7 @@
         "cave/cracked-cavern",
         "cave/lit-cavern"
     ],
-    "riverBiomes": ["ocean/oce-tem-river"],
+    "riverBiomes": ["temperate/sea/river"],
     "jigsawStructures": [{
         "structure": "murky_stronghold",
         "rarity": 750
@@ -59,37 +59,37 @@
         {
             "entity": "wolf",
             "maxSpawns": 2,
-            "minSpawns": 0,
+            "minSpawns": 1,
             "rarity": 18
         },
         {
             "entity": "goat",
             "maxSpawns": 2,
-            "minSpawns": 0,
+            "minSpawns": 1,
             "rarity": 38
         },
         {
             "entity": "horse",
             "maxSpawns": 3,
-            "minSpawns": 0,
+            "minSpawns": 1,
             "rarity": 60
         },
         {
             "entity": "llama",
             "maxSpawns": 3,
-            "minSpawns": 0,
+            "minSpawns": 1,
             "rarity": 65
         },
         {
             "entity": "fox",
             "maxSpawns": 1,
-            "minSpawns": 0,
+            "minSpawns": 1,
             "rarity": 40
         },
         {
             "entity": "bee",
             "maxSpawns": 1,
-            "minSpawns": 0,
+            "minSpawns": 1,
             "rarity": 30
         }
     ],
diff --git a/regions/tropical.json b/regions/tropical.json
index af526e80..21a9657b 100644
--- a/regions/tropical.json
+++ b/regions/tropical.json
@@ -2,28 +2,28 @@
     "name": "Tropical",
     "color": "#0F3415",
     "landBiomes": [
-        "tropical/tro-rainforest",
-        "tropical/tro-plains",
-        "tropical/tro-bamboo-forest",
-        "tropical/tro-rainforest-wicked",
-        "tropical/tro-volcanic-plains",
-        "tropical/tro-mountain",
-        "tropical/tro-mountain-extreme",
-        "tropical/tro-mountain-plains",
-        "tropical/tro-wilds",
-        "tropical/tro-plains-hills"
+        "tropical/rainforest",
+        "tropical/plains",
+        "tropical/bamboo-forest",
+        "tropical/rainforest-wicked",
+        "tropical/volcanic-plains",
+        "tropical/mountain",
+        "tropical/mountain-extreme",
+        "tropical/mountain-plains",
+        "tropical/wilds",
+        "tropical/plains-hills"
     ],
     "shoreBiomes": [
-        "tropical/tro-island-beach",
-        "tropical/tro-beach",
-        "tropical/tro-submerged-volcanic",
-        "tropical/tro-beach-bamboo"
+        "tropical/island-beach",
+        "tropical/beach",
+        "tropical/submerged-volcanic",
+        "tropical/beach-bamboo"
     ],
     "seaBiomes": [
-        "tropical/tro-submerged-volcanic",
-        "ocean/oce-tro-ocean",
-        "tropical/tro-rainforest-island",
-        "ocean/oce-tro-river-soft"
+        "tropical/submerged-volcanic",
+        "tropical/sea/ocean",
+        "tropical/rainforest-island",
+        "tropical/sea/river-soft"
     ],
     "caveBiomes": [
         "cave/tropical-cavern",
@@ -74,7 +74,7 @@
         {
             "entity": "ocelot",
             "maxSpawns": 2,
-            "minSpawns": 0,
+            "minSpawns": 1,
             "rarity": 10
         },
         {
diff --git a/regions/tundra.json b/regions/tundra.json
index 307c1162..561eed64 100644
--- a/regions/tundra.json
+++ b/regions/tundra.json
@@ -2,31 +2,36 @@
     "name": "Tundra",
     "color": "#3CD0B1",
     "landBiomes": [
-        "tundra/tun-taiga",
-        "tundra/tun-redwood-forest",
-        "tundra/tun-sequia-redwoods",
-        "tundra/tun-magic-forest",
-        "tundra/tun-forest",
-        "tundra/tun-spruce-denmyre",
-        "tundra/tun-lake",
-        "tundra/tun-mountains",
-        "tundra/tun-mountains",
-        "tundra/tun-mountains-cliffs",
-        "mountain/mtn-mountain",
-        "mountain/mtn-hills",
-        "mountain/mtn-forest-hills",
-        "mountain/mtn-forest",
-        "mountain/mtn-plains",
-        "mountain/mtn-cliffs",
-        "mountain/mtn-mountain",
-        "tundra/autumn"
+        "tundra/taiga",
+        "tundra/redwood-forest",
+        "tundra/sequia-redwoods",
+        "tundra/magic-forest",
+        "tundra/autumn",
+        "tundra/forest",
+        "tundra/spruce-denmyre",
+        "tundra/mountains",
+        "tundra/mountains",
+        "tundra/mountains-cliffs",
+        "mountain/hills",
+        "mountain/forest-hills",
+        "mountain/forest",
+        "mountain/plains",
+        "mountain/cliffs",
+        "mountain/mountain"
+    ],
+    "shoreBiomes": [
+        "tundra/shore/beach",
+        "tundra/shore/beach-stone"
+    ],
+    "seaBiomes": [
+        "mountain/sea/lake"
+    ],
+    "jigsawStructures": [
+        {
+            "structure": "murky_stronghold",
+            "rarity": 750
+        }
     ],
-    "shoreBiomes": ["tundra/tun-beach"],
-    "seaBiomes": ["ocean/oce-tun-river"],
-    "jigsawStructures": [{
-        "structure": "murky_stronghold",
-        "rarity": 750
-    }],
     "caveBiomes": [
         "cave/tundra-cavern",
         "cave/spiked-cavern"
@@ -69,18 +74,29 @@
             "rarity": 20
         }
     ],
-    "riverBiomes": ["ocean/oce-tun-river"],
+    "riverBiomes": [
+        "tundra/sea/river",
+        "tundra/sea/river-rocky",
+        "mountain/sea/river",
+        "mountain/sea/river-soft"
+    ],
     "biomeImplosionRatio": 0.25,
-    "deposits": [{
-        "minHeight": 15,
-        "maxPerChunk": 3,
-        "maxHeight": 60,
-        "minPerChunk": 2,
-        "minSize": 1,
-        "maxSize": 2,
-        "palette": [{"block": "emerald_ore"}],
-        "varience": 2
-    }],
+    "deposits": [
+        {
+            "minHeight": 15,
+            "maxPerChunk": 3,
+            "maxHeight": 60,
+            "minPerChunk": 2,
+            "minSize": 1,
+            "maxSize": 2,
+            "palette": [
+                {
+                    "block": "emerald_ore"
+                }
+            ],
+            "varience": 2
+        }
+    ],
     "riverRarity": 1,
     "landBiomeZoom": 1.85,
     "riverStyle": {
@@ -104,47 +120,61 @@
             "cold-food"
         ]
     },
-    "objects": [{
-        "heightmap": {
-            "seed": 1337,
-            "style": {
-                "style": "SIMPLEX",
-                "multiplier": 10
+    "objects": [
+        {
+            "heightmap": {
+                "seed": 1337,
+                "style": {
+                    "style": "SIMPLEX",
+                    "multiplier": 10
+                },
+                "offsetY": 5
             },
-            "offsetY": 5
-        },
-        "chance": 0.05,
-        "bottom": true,
-        "density": 1,
-        "place": [
-            "structures/amethyst1",
-            "structures/amethyst2",
-            "structures/amethyst3",
-            "structures/amethyst4",
-            "structures/amethyst5",
-            "structures/amethyst6"
-        ],
-        "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
+            "chance": 0.05,
+            "bottom": true,
+            "density": 1,
+            "place": [
+                "structures/amethyst1",
+                "structures/amethyst2",
+                "structures/amethyst3",
+                "structures/amethyst4",
+                "structures/amethyst5",
+                "structures/amethyst6"
+            ],
+            "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
+            }
         }
-    }],
+    ],
     "shoreHeightZoom": 1.14,
     "riverThickness": 0.025,
     "rarity": 2
-}
+}
\ No newline at end of file