diff --git a/source/behavior/biomes/biomes.json b/source/behavior/biomes/biomes.json
index 39ddcf41..1fe260a6 100644
--- a/source/behavior/biomes/biomes.json
+++ b/source/behavior/biomes/biomes.json
@@ -16,22 +16,25 @@
     "properties": {
       "format_version": { "$ref": "../../general/format_version.json" },
 
-      "minecraft:climate": { "$ref": "./components/minecraft.climate.json" },
-      "minecraft:forced_features": { "$ref": "./components/minecraft.forced_features.json" },
-      "minecraft:overworld_height": { "$ref": "./components/minecraft.overworld_height.json" },
-      "minecraft:ignore_automatic_features": { "$ref": "./components/minecraft.ignore_automatic_features.json" },
-      "minecraft:surface_parameters": { "$ref": "./components/minecraft.surface_parameters.json" },
-      "minecraft:surface_material_adjustments": { "$ref": "./components/minecraft.surface_material_adjustments.json" },
-      "minecraft:swamp_surface": { "$ref": "./components/minecraft.swamp_surface.json" },
-      "minecraft:frozen_ocean_surface": { "$ref": "./components/minecraft.frozen_ocean_surface.json" },
-      "minecraft:mesa_surface": { "$ref": "./components/minecraft.mesa_surface.json" },
-      "minecraft:mountain_parameters": { "$ref": "./components/minecraft.mountain_parameters.json" },
-      "minecraft:nether_surface": { "$ref": "./components/minecraft.nether_surface.json" },
-      "minecraft:the_end_surface": { "$ref": "./components/minecraft.the_end_surface.json" },
-      "minecraft:capped_surface": { "$ref": "./components/minecraft.capped_surface.json" },
-      "minecraft:overworld_generation_rules": { "$ref": "./components/minecraft.overworld_generation_rules.json" },
-      "minecraft:nether_generation_rules": { "$ref": "./components/minecraft.nether_generation_rules.json" },
-      "minecraft:legacy_world_generation_rules": { "$ref": "./components/minecraft.legacy_world_generation_rules.json" }
+      "minecraft:capped_surface": { "$ref": "./components/capped_surface.json" },
+      "minecraft:climate": { "$ref": "./components/climate.json" },
+      "minecraft:consolidated_features": { "$ref": "./components/consolidated_features.json" },
+      "minecraft:forced_features": { "$ref": "./components/forced_features.json" },
+      "minecraft:frozen_ocean_surface": { "$ref": "./components/frozen_ocean_surface.json" },
+      "minecraft:ignore_automatic_features": { "$ref": "./components/ignore_automatic_features.json" },
+      "minecraft:legacy_world_generation_rules": {
+        "$ref": "./components/legacy_world_generation_rules.json"
+      },
+      "minecraft:mesa_surface": { "$ref": "./components/mesa_surface.json" },
+      "minecraft:mountain_parameters": { "$ref": "./components/mountain_parameters.json" },
+      "minecraft:nether_generation_rules": { "$ref": "./components/nether_generation_rules.json" },
+      "minecraft:nether_surface": { "$ref": "./components/nether_surface.json" },
+      "minecraft:overworld_generation_rules": { "$ref": "./components/overworld_generation_rules.json" },
+      "minecraft:overworld_height": { "$ref": "./components/overworld_height.json" },
+      "minecraft:surface_material_adjustments": { "$ref": "./components/surface_material_adjustments.json" },
+      "minecraft:surface_parameters": { "$ref": "./components/surface_parameters.json" },
+      "minecraft:swamp_surface": { "$ref": "./components/swamp_surface.json" },
+      "minecraft:the_end_surface": { "$ref": "./components/the_end_surface.json" }
     }
   }
 }
diff --git a/source/behavior/biomes/components/minecraft.capped_surface.json b/source/behavior/biomes/components/capped_surface.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.capped_surface.json
rename to source/behavior/biomes/components/capped_surface.json
diff --git a/source/behavior/biomes/components/minecraft.climate.json b/source/behavior/biomes/components/climate.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.climate.json
rename to source/behavior/biomes/components/climate.json
diff --git a/source/behavior/biomes/components/consolidated_features.json b/source/behavior/biomes/components/consolidated_features.json
new file mode 100644
index 00000000..9d587764
--- /dev/null
+++ b/source/behavior/biomes/components/consolidated_features.json
@@ -0,0 +1,8 @@
+{
+  "$id": "minecraft.behavior.biomes.components.minecraft.consolidated_features",
+  "title": "Consolidated Features",
+  "description": "UNDOCUMENTED",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {}
+}
diff --git a/source/behavior/biomes/components/minecraft.forced_features.json b/source/behavior/biomes/components/forced_features.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.forced_features.json
rename to source/behavior/biomes/components/forced_features.json
diff --git a/source/behavior/biomes/components/minecraft.frozen_ocean_surface.json b/source/behavior/biomes/components/frozen_ocean_surface.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.frozen_ocean_surface.json
rename to source/behavior/biomes/components/frozen_ocean_surface.json
diff --git a/source/behavior/biomes/components/minecraft.ignore_automatic_features.json b/source/behavior/biomes/components/ignore_automatic_features.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.ignore_automatic_features.json
rename to source/behavior/biomes/components/ignore_automatic_features.json
diff --git a/source/behavior/biomes/components/minecraft.legacy_world_generation_rules.json b/source/behavior/biomes/components/legacy_world_generation_rules.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.legacy_world_generation_rules.json
rename to source/behavior/biomes/components/legacy_world_generation_rules.json
diff --git a/source/behavior/biomes/components/minecraft.mesa_surface.json b/source/behavior/biomes/components/mesa_surface.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.mesa_surface.json
rename to source/behavior/biomes/components/mesa_surface.json
diff --git a/source/behavior/biomes/components/minecraft.mountain_parameters.json b/source/behavior/biomes/components/mountain_parameters.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.mountain_parameters.json
rename to source/behavior/biomes/components/mountain_parameters.json
diff --git a/source/behavior/biomes/components/minecraft.nether_generation_rules.json b/source/behavior/biomes/components/nether_generation_rules.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.nether_generation_rules.json
rename to source/behavior/biomes/components/nether_generation_rules.json
diff --git a/source/behavior/biomes/components/minecraft.nether_surface.json b/source/behavior/biomes/components/nether_surface.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.nether_surface.json
rename to source/behavior/biomes/components/nether_surface.json
diff --git a/source/behavior/biomes/components/minecraft.overworld_generation_rules.json b/source/behavior/biomes/components/overworld_generation_rules.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.overworld_generation_rules.json
rename to source/behavior/biomes/components/overworld_generation_rules.json
diff --git a/source/behavior/biomes/components/minecraft.overworld_height.json b/source/behavior/biomes/components/overworld_height.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.overworld_height.json
rename to source/behavior/biomes/components/overworld_height.json
diff --git a/source/behavior/biomes/components/minecraft.surface_material_adjustments.json b/source/behavior/biomes/components/surface_material_adjustments.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.surface_material_adjustments.json
rename to source/behavior/biomes/components/surface_material_adjustments.json
diff --git a/source/behavior/biomes/components/minecraft.surface_parameters.json b/source/behavior/biomes/components/surface_parameters.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.surface_parameters.json
rename to source/behavior/biomes/components/surface_parameters.json
diff --git a/source/behavior/biomes/components/minecraft.swamp_surface.json b/source/behavior/biomes/components/swamp_surface.json
similarity index 87%
rename from source/behavior/biomes/components/minecraft.swamp_surface.json
rename to source/behavior/biomes/components/swamp_surface.json
index ef81de29..ed6cb197 100644
--- a/source/behavior/biomes/components/minecraft.swamp_surface.json
+++ b/source/behavior/biomes/components/swamp_surface.json
@@ -7,7 +7,11 @@
   "maxProperties": 6,
   "additionalProperties": false,
   "properties": {
-    "top_material": { "title": "Top Material", "description": "Controls the block type used for the surface of this biome.", "string": "string" },
+    "top_material": {
+      "title": "Top Material",
+      "description": "Controls the block type used for the surface of this biome.",
+      "string": "string"
+    },
     "mid_material": {
       "title": "Mid Material",
       "description": "Controls the block type used in a layer below the surface of this biome.",
diff --git a/source/behavior/biomes/components/minecraft.the_end_surface.json b/source/behavior/biomes/components/the_end_surface.json
similarity index 100%
rename from source/behavior/biomes/components/minecraft.the_end_surface.json
rename to source/behavior/biomes/components/the_end_surface.json