diff --git a/src/main/resources/data/overdrive_that_matters/structure/abandoned_cargo_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/abandoned_cargo_a.nbt
new file mode 100644
index 000000000..7bdb0dbe1
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/abandoned_cargo_a.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structure/abandoned_cargo_b.nbt b/src/main/resources/data/overdrive_that_matters/structure/abandoned_cargo_b.nbt
new file mode 100644
index 000000000..76d7a703e
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/abandoned_cargo_b.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structure/abandoned_cargo_ocean.nbt b/src/main/resources/data/overdrive_that_matters/structure/abandoned_cargo_ocean.nbt
new file mode 100644
index 000000000..6f8b53871
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/abandoned_cargo_ocean.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structure/field_research_pod.nbt b/src/main/resources/data/overdrive_that_matters/structure/field_research_pod.nbt
new file mode 100644
index 000000000..02c59e497
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/field_research_pod.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structure/field_research_pod_ruin.nbt b/src/main/resources/data/overdrive_that_matters/structure/field_research_pod_ruin.nbt
new file mode 100644
index 000000000..c3c297d99
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/field_research_pod_ruin.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/back/frigate_back_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/back/frigate_back_a.nbt
new file mode 100644
index 000000000..4918b595e
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/back/frigate_back_a.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/front/frigate_front_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/front/frigate_front_a.nbt
new file mode 100644
index 000000000..06b900861
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/front/frigate_front_a.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/front/frigate_front_b.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/front/frigate_front_b.nbt
new file mode 100644
index 000000000..16268c11c
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/front/frigate_front_b.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_arena_0.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/center/lab_arena_0.nbt
similarity index 100%
rename from src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_arena_0.nbt
rename to src/main/resources/data/overdrive_that_matters/structure/laboratory/center/lab_arena_0.nbt
diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_arena_1.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/center/lab_arena_1.nbt
similarity index 100%
rename from src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_arena_1.nbt
rename to src/main/resources/data/overdrive_that_matters/structure/laboratory/center/lab_arena_1.nbt
diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/dead_end.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/dead_end.nbt
similarity index 100%
rename from src/main/resources/data/overdrive_that_matters/structures/laboratory/dead_end.nbt
rename to src/main/resources/data/overdrive_that_matters/structure/laboratory/dead_end.nbt
diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_0.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/main/corridor_0.nbt
similarity index 100%
rename from src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_0.nbt
rename to src/main/resources/data/overdrive_that_matters/structure/laboratory/main/corridor_0.nbt
diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_1.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/main/corridor_1.nbt
similarity index 100%
rename from src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_1.nbt
rename to src/main/resources/data/overdrive_that_matters/structure/laboratory/main/corridor_1.nbt
diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_room_0.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/main/corridor_room_0.nbt
similarity index 100%
rename from src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_room_0.nbt
rename to src/main/resources/data/overdrive_that_matters/structure/laboratory/main/corridor_room_0.nbt
diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_stairs_0.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/main/corridor_stairs_0.nbt
similarity index 100%
rename from src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_stairs_0.nbt
rename to src/main/resources/data/overdrive_that_matters/structure/laboratory/main/corridor_stairs_0.nbt
diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_turn_0.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/main/corridor_turn_0.nbt
similarity index 100%
rename from src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_turn_0.nbt
rename to src/main/resources/data/overdrive_that_matters/structure/laboratory/main/corridor_turn_0.nbt
diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corrior_t_0.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/main/corrior_t_0.nbt
similarity index 100%
rename from src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corrior_t_0.nbt
rename to src/main/resources/data/overdrive_that_matters/structure/laboratory/main/corrior_t_0.nbt
diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/generator_room_0.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/main/generator_room_0.nbt
similarity index 100%
rename from src/main/resources/data/overdrive_that_matters/structures/laboratory/main/generator_room_0.nbt
rename to src/main/resources/data/overdrive_that_matters/structure/laboratory/main/generator_room_0.nbt
diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/portal_room_0.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/main/portal_room_0.nbt
similarity index 100%
rename from src/main/resources/data/overdrive_that_matters/structures/laboratory/main/portal_room_0.nbt
rename to src/main/resources/data/overdrive_that_matters/structure/laboratory/main/portal_room_0.nbt
diff --git a/src/main/resources/data/overdrive_that_matters/structure/wreckage/wreckage_body.nbt b/src/main/resources/data/overdrive_that_matters/structure/wreckage/wreckage_body.nbt
new file mode 100644
index 000000000..2ed737304
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/wreckage/wreckage_body.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structure/wreckage/wreckage_front.nbt b/src/main/resources/data/overdrive_that_matters/structure/wreckage/wreckage_front.nbt
new file mode 100644
index 000000000..315da9f22
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/wreckage/wreckage_front.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structure/wreckage/wreckage_tail.nbt b/src/main/resources/data/overdrive_that_matters/structure/wreckage/wreckage_tail.nbt
new file mode 100644
index 000000000..08d82dba8
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/wreckage/wreckage_tail.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/abandoned_cargo_a.nbt b/src/main/resources/data/overdrive_that_matters/structures/abandoned_cargo_a.nbt
deleted file mode 100644
index 810161e31..000000000
Binary files a/src/main/resources/data/overdrive_that_matters/structures/abandoned_cargo_a.nbt and /dev/null differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/abandoned_cargo_b.nbt b/src/main/resources/data/overdrive_that_matters/structures/abandoned_cargo_b.nbt
deleted file mode 100644
index 24501dfc1..000000000
Binary files a/src/main/resources/data/overdrive_that_matters/structures/abandoned_cargo_b.nbt and /dev/null differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/abandoned_cargo_ocean.nbt b/src/main/resources/data/overdrive_that_matters/structures/abandoned_cargo_ocean.nbt
deleted file mode 100644
index 76038141a..000000000
Binary files a/src/main/resources/data/overdrive_that_matters/structures/abandoned_cargo_ocean.nbt and /dev/null differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/field_research_pod.nbt b/src/main/resources/data/overdrive_that_matters/structures/field_research_pod.nbt
deleted file mode 100644
index 074df983c..000000000
Binary files a/src/main/resources/data/overdrive_that_matters/structures/field_research_pod.nbt and /dev/null differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/field_research_pod_ruin.nbt b/src/main/resources/data/overdrive_that_matters/structures/field_research_pod_ruin.nbt
deleted file mode 100644
index 6dec2862d..000000000
Binary files a/src/main/resources/data/overdrive_that_matters/structures/field_research_pod_ruin.nbt and /dev/null differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/frigate/back/frigate_back_a.nbt b/src/main/resources/data/overdrive_that_matters/structures/frigate/back/frigate_back_a.nbt
deleted file mode 100644
index 42ce92091..000000000
Binary files a/src/main/resources/data/overdrive_that_matters/structures/frigate/back/frigate_back_a.nbt and /dev/null differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/frigate/front/frigate_front_a.nbt b/src/main/resources/data/overdrive_that_matters/structures/frigate/front/frigate_front_a.nbt
deleted file mode 100644
index df58fe6bf..000000000
Binary files a/src/main/resources/data/overdrive_that_matters/structures/frigate/front/frigate_front_a.nbt and /dev/null differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/frigate/front/frigate_front_b.nbt b/src/main/resources/data/overdrive_that_matters/structures/frigate/front/frigate_front_b.nbt
deleted file mode 100644
index c6f2179fb..000000000
Binary files a/src/main/resources/data/overdrive_that_matters/structures/frigate/front/frigate_front_b.nbt and /dev/null differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/wreckage/wreckage_body.nbt b/src/main/resources/data/overdrive_that_matters/structures/wreckage/wreckage_body.nbt
deleted file mode 100644
index 691ce2bf7..000000000
Binary files a/src/main/resources/data/overdrive_that_matters/structures/wreckage/wreckage_body.nbt and /dev/null differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/wreckage/wreckage_front.nbt b/src/main/resources/data/overdrive_that_matters/structures/wreckage/wreckage_front.nbt
deleted file mode 100644
index e56d01ec0..000000000
Binary files a/src/main/resources/data/overdrive_that_matters/structures/wreckage/wreckage_front.nbt and /dev/null differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/wreckage/wreckage_tail.nbt b/src/main/resources/data/overdrive_that_matters/structures/wreckage/wreckage_tail.nbt
deleted file mode 100644
index d11685ff2..000000000
Binary files a/src/main/resources/data/overdrive_that_matters/structures/wreckage/wreckage_tail.nbt and /dev/null differ
diff --git a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/cargo_container.json b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/cargo_container.json
index 2cbd03f77..155d70ad4 100644
--- a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/cargo_container.json
+++ b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/cargo_container.json
@@ -1,7 +1,7 @@
 {
   "replace": false,
   "values": [
-	"#forge:is_desert",
+	"#c:is_desert",
 	"minecraft:beach"
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/field_research_pod.json b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/field_research_pod.json
index 9c9168463..10210e40b 100644
--- a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/field_research_pod.json
+++ b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/field_research_pod.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
+  "#c:is_nether",
 	"minecraft:basalt_deltas",
 	"minecraft:soul_sand_valley",
 	"minecraft:warped_forest"
diff --git a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/frigate.json b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/frigate.json
index 131104ad9..ef6cc1d5b 100644
--- a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/frigate.json
+++ b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/frigate.json
@@ -1,7 +1,7 @@
 {
   "replace": false,
   "values": [
-	"#forge:is_desert",
+	"#c:is_desert",
 	"minecraft:plains"
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/laboratory.json b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/laboratory.json
index 131104ad9..ef6cc1d5b 100644
--- a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/laboratory.json
+++ b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/laboratory.json
@@ -1,7 +1,7 @@
 {
   "replace": false,
   "values": [
-	"#forge:is_desert",
+	"#c:is_desert",
 	"minecraft:plains"
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/ocean_container.json b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/ocean_container.json
index e4b715704..6a0f162a4 100644
--- a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/ocean_container.json
+++ b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/ocean_container.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
+  "#c:is_ocean",
 	"minecraft:ocean",
 	"minecraft:deep_ocean",
 	"minecraft:cold_ocean",
diff --git a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/wreckage.json b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/wreckage.json
index b342d23e7..c065d72ff 100644
--- a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/wreckage.json
+++ b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/wreckage.json
@@ -1,7 +1,7 @@
 {
   "replace": false,
   "values": [
-	"#forge:is_desert",
+	"#c:is_desert",
 	"minecraft:desert"
   ]
 }
\ No newline at end of file