diff --git a/biomes/savanna.json b/biomes/savanna.json
index c315505f..3af4d3e5 100644
--- a/biomes/savanna.json
+++ b/biomes/savanna.json
@@ -1,5 +1,89 @@
 {
+    "name": "Savanna",
+    "derivative": "SAVANNA",
     "vanillaDerivative": "SAVANNA",
+    "children": [
+        "savanna-cliff"
+    ],
+    "generators": [
+        {
+            "min": 7,
+            "max": 15,
+             "generator": "mountain"
+        },
+        {
+            "min": 3,
+            "max": 5,
+            "generator": "plain"
+        }
+    ],
+    "layers": [
+        {
+            "minHeight": 3,
+            "maxHeight": 5,
+            "slopeCondition": {
+                "minimumSlope": 6.9
+            },
+            "palette": [
+                {
+                    "block": "granite"
+                }
+            ]
+        },
+        {
+            "minHeight": 3,
+            "maxHeight": 5,
+            "slopeCondition": {
+                "minimumSlope": 4.6
+            },
+            "palette": [
+                {
+                    "block": "coarse_dirt"
+                },
+                {
+                    "block": "gravel"
+                }
+            ]
+        },
+        {
+            "style": {
+                "style": "STATIC"
+            },
+            "zoom": 0.75,
+            "palette": [
+                {
+                    "block": "grass_block"
+                }
+            ]
+        },
+        {
+            "minHeight": 2,
+            "maxHeight": 4,
+            "palette": [
+                {
+                    "block": "dirt"
+                }
+            ]
+        },
+        {
+            "minHeight": 6,
+            "maxHeight": 18,
+            "style": {
+                "style": "STATIC"
+            },
+            "palette": [
+                {
+                    "block": "stone"
+                },
+                {
+                    "block": "andesite"
+                },
+                {
+                    "block": "stone"
+                }
+            ]
+        }
+    ],
     "biomeSkyScatter": [
         "DESERT",
         "SAVANNA"
@@ -81,9 +165,6 @@
             }
         }
     ],
-    "children": [
-        "savanna-cliff"
-    ],
     "objects": [
         {
             "chance": 0.00175,
@@ -239,88 +320,7 @@
             }
         }
     ],
-    "name": "Savanna",
-    "layers": [
-        {
-            "minHeight": 3,
-            "maxHeight": 5,
-            "slopeCondition": {
-                "minimumSlope": 6.9
-            },
-            "palette": [
-                {
-                    "block": "granite"
-                }
-            ]
-        },
-        {
-            "minHeight": 3,
-            "maxHeight": 5,
-            "slopeCondition": {
-                "minimumSlope": 4.6
-            },
-            "palette": [
-                {
-                    "block": "coarse_dirt"
-                },
-                {
-                    "block": "gravel"
-                }
-            ]
-        },
-        {
-            "style": {
-                "style": "STATIC"
-            },
-            "zoom": 0.75,
-            "palette": [
-                {
-                    "block": "grass_block"
-                }
-            ]
-        },
-        {
-            "minHeight": 2,
-            "maxHeight": 4,
-            "palette": [
-                {
-                    "block": "dirt"
-                }
-            ]
-        },
-        {
-            "minHeight": 6,
-            "maxHeight": 18,
-            "style": {
-                "style": "STATIC"
-            },
-            "palette": [
-                {
-                    "block": "stone"
-                },
-                {
-                    "block": "andesite"
-                },
-                {
-                    "block": "stone"
-                }
-            ]
-        }
-    ],
-    "generators": [
-        {
-            "min": 7,
-            "max": 15,
-             "generator": "mountain"
-        },
-        {
-            "min": 3,
-            "max": 5,
-            "generator": "plain"
-        }
-    ],
     "biomeZoom": 20,
-    "derivative": "SAVANNA",
     "biomeStyle": {
         "style": "IRIS"
     },
diff --git a/biomes/swamp-beach.json b/biomes/swamp-beach.json
index 89ec8744..3c27b5db 100644
--- a/biomes/swamp-beach.json
+++ b/biomes/swamp-beach.json
@@ -1,4 +1,51 @@
 {
+    "name": "Swamp Beach",
+    "derivative": "SWAMP",
+    "vanillaDerivative": "BEACH",
+    "generators": [
+        {
+            "min": -5,
+            "max": 1,
+            "generator": "plain"
+        }
+    ],
+    "layers": [
+        {
+            "minHeight": 3,
+            "maxHeight": 6,
+            "style": {
+                "style": "STATIC"
+            },
+            "zoom": 0.25,
+            "palette": [
+                {
+                    "block": "dirt"
+                },
+                {
+                    "block": "podzol"
+                },
+                {
+                    "block": "coarse_dirt"
+                },
+                {
+                    "block": "podzol"
+                }
+            ]
+        },
+        {
+            "minHeight": 1,
+            "maxHeight": 3,
+            "palette": [
+                {
+                    "block": "dirt"
+                },
+                {
+                    "weight": 2,
+                    "block": "coarse_dirt"
+                }
+            ]
+        }
+    ],
     "decorators": [
         {
             "chance": 0.004,
@@ -84,7 +131,6 @@
             "rarity": 6
         }
     ],
-    "name": "Swamp Beach",
     "objects": [
 		{
             "place": [
@@ -159,55 +205,9 @@
             }
         }
     ],
-    "layers": [
-        {
-            "minHeight": 3,
-            "maxHeight": 6,
-            "style": {
-                "style": "STATIC"
-            },
-            "zoom": 0.25,
-            "palette": [
-                {
-                    "block": "dirt"
-                },
-                {
-                    "block": "podzol"
-                },
-                {
-                    "block": "coarse_dirt"
-                },
-                {
-                    "block": "podzol"
-                }
-            ]
-        },
-        {
-            "minHeight": 1,
-            "maxHeight": 3,
-            "palette": [
-                {
-                    "block": "dirt"
-                },
-                {
-                    "weight": 2,
-                    "block": "coarse_dirt"
-                }
-            ]
-        }
-    ],
-    "generators": [
-        {
-            "min": -5,
-            "max": 1,
-            "generator": "plain"
-        }
-    ],
     "loot": {
         "tables": [
             "beach-clutter"
         ]
-    },
-    "vanillaDerivative": "BEACH",
-    "derivative": "SWAMP"
+    }
 }
\ No newline at end of file
diff --git a/biomes/swamp-dark-oak-denmyre.json b/biomes/swamp-denmyre.json
similarity index 99%
rename from biomes/swamp-dark-oak-denmyre.json
rename to biomes/swamp-denmyre.json
index 79b05d56..a87e1bf8 100644
--- a/biomes/swamp-dark-oak-denmyre.json
+++ b/biomes/swamp-denmyre.json
@@ -1,5 +1,60 @@
 {
+    "name": "Swamp Denmyre",
+    "derivative": "SWAMP",
     "vanillaDerivative": "DARK_FOREST",
+    "generators": [
+        {
+            "min": 4,
+            "max": 7,
+            "generator": "plain"
+        }
+    ],
+    "layers": [
+        {
+            "style": {
+                "style": "FLAT"
+            },
+            "palette": [
+                {
+                    "block": "grass_block"
+                }
+            ]
+        },
+        {
+            "palette": [
+                {
+                    "block": "dirt"
+                }
+            ]
+        },
+        {
+            "minHeight": 1,
+            "maxHeight": 3,
+            "palette": [
+                {
+                    "block": "coarse_dirt"
+                }
+            ]
+        },
+        {
+            "minHeight": 6,
+            "maxHeight": 18,
+            "style": {
+                "style": "STATIC"
+            },
+            "palette": [
+                {
+                    "block": "stone"
+                },
+                {
+                    "block": "andesite"
+                },
+                {
+                    "block": "stone"
+                }
+            ]
+        }
+    ],
     "decorators": [
         {
             "chance": 0.01,
@@ -79,7 +134,6 @@
         }
     ],
     "objects": [
-
         {
             "mode": "PAINT",
             "chance": 0.0025,
@@ -313,61 +367,6 @@
             "rarity": 6
         }
     ],
-    "name": "Swamp Denmyre",
-    "layers": [
-        {
-            "style": {
-                "style": "FLAT"
-            },
-            "palette": [
-                {
-                    "block": "grass_block"
-                }
-            ]
-        },
-        {
-            "palette": [
-                {
-                    "block": "dirt"
-                }
-            ]
-        },
-        {
-            "minHeight": 1,
-            "maxHeight": 3,
-            "palette": [
-                {
-                    "block": "coarse_dirt"
-                }
-            ]
-        },
-        {
-            "minHeight": 6,
-            "maxHeight": 18,
-            "style": {
-                "style": "STATIC"
-            },
-            "palette": [
-                {
-                    "block": "stone"
-                },
-                {
-                    "block": "andesite"
-                },
-                {
-                    "block": "stone"
-                }
-            ]
-        }
-    ],
-    "generators": [
-        {
-            "min": 4,
-            "max": 7,
-            "generator": "plain"
-        }
-    ],
-    "derivative": "SWAMP",
     "wall": {
         "style": {
             "style": "STATIC"
diff --git a/biomes/swamp-willow-forest.json b/biomes/swamp-willow-forest.json
index ebd93bc9..6d195eda 100644
--- a/biomes/swamp-willow-forest.json
+++ b/biomes/swamp-willow-forest.json
@@ -31,7 +31,7 @@
         }
     ],
     "children": [
-        "swamp-dark-oak-denmyre",
+        "swamp-denmyre",
         "swamp-marsh"
     ],
     "decorators": [