diff --git a/src/main/resources/assets/biomesoplenty/lang/en_us.json b/src/main/resources/assets/biomesoplenty/lang/en_us.json
index d3bbcffea..41bd35d81 100644
--- a/src/main/resources/assets/biomesoplenty/lang/en_us.json
+++ b/src/main/resources/assets/biomesoplenty/lang/en_us.json
@@ -115,7 +115,6 @@
   "block.biomesoplenty.cherry_trapdoor": "Cherry Trapdoor",
   "block.biomesoplenty.cherry_wall_sign": "Cherry Wall Sign",
   "block.biomesoplenty.cherry_wood": "Cherry Wood",
-  "block.biomesoplenty.cherry_wood_slab": "Cherry Slab",
   "block.biomesoplenty.chiseled_white_sandstone": "Chiseled White Sandstone",
   "block.biomesoplenty.cut_white_sandstone": "Cut White Sandstone",
   "block.biomesoplenty.cut_white_sandstone_slab": "Cut White Sandstone Slab",
@@ -135,7 +134,6 @@
   "block.biomesoplenty.dead_trapdoor": "Dead Trapdoor",
   "block.biomesoplenty.dead_wall_sign": "Dead Wall Sign",
   "block.biomesoplenty.dead_wood": "Dead Wood",
-  "block.biomesoplenty.dead_wood_slab": "Dead Slab",
   "block.biomesoplenty.desert_grass": "Desert Grass",
   "block.biomesoplenty.dried_sand": "Dried Sand",
   "block.biomesoplenty.dune_grass": "Dune Grass",
@@ -154,7 +152,6 @@
   "block.biomesoplenty.ethereal_trapdoor": "Ethereal Trapdoor",
   "block.biomesoplenty.ethereal_wall_sign": "Ethereal Wall Sign",
   "block.biomesoplenty.ethereal_wood": "Ethereal Wood",
-  "block.biomesoplenty.ethereal_wood_slab": "Ethereal Slab",
   "block.biomesoplenty.fir_button": "Fir Button",
   "block.biomesoplenty.fir_door": "Fir Door",
   "block.biomesoplenty.fir_fence": "Fir Fence",
@@ -170,7 +167,6 @@
   "block.biomesoplenty.fir_trapdoor": "Fir Trapdoor",
   "block.biomesoplenty.fir_wall_sign": "Fir Wall Sign",
   "block.biomesoplenty.fir_wood": "Fir Wood",
-  "block.biomesoplenty.fir_wood_slab": "Fir Slab",
   "block.biomesoplenty.flesh": "Flesh",
   "block.biomesoplenty.flowering_oak_leaves": "Flowering Oak Leaves",
   "block.biomesoplenty.flowering_oak_sapling": "Flowering Oak Sapling",
@@ -192,7 +188,6 @@
   "block.biomesoplenty.hellbark_trapdoor": "Hellbark Trapdoor",
   "block.biomesoplenty.hellbark_wall_sign": "Hellbark Wall Sign",
   "block.biomesoplenty.hellbark_wood": "Hellbark Wood",
-  "block.biomesoplenty.hellbark_wood_slab": "Hellbark Slab",
   "block.biomesoplenty.jacaranda_button": "Jacaranda Button",
   "block.biomesoplenty.jacaranda_door": "Jacaranda Door",
   "block.biomesoplenty.jacaranda_fence": "Jacaranda Fence",
@@ -208,7 +203,6 @@
   "block.biomesoplenty.jacaranda_trapdoor": "Jacaranda Trapdoor",
   "block.biomesoplenty.jacaranda_wall_sign": "Jacaranda Wall Sign",
   "block.biomesoplenty.jacaranda_wood": "Jacaranda Wood",
-  "block.biomesoplenty.jacaranda_wood_slab": "Jacaranda Slab",
   "block.biomesoplenty.lavender": "Lavender",
   "block.biomesoplenty.magic_button": "Magic Button",
   "block.biomesoplenty.magic_door": "Magic Door",
@@ -225,7 +219,6 @@
   "block.biomesoplenty.magic_trapdoor": "Magic Trapdoor",
   "block.biomesoplenty.magic_wall_sign": "Magic Wall Sign",
   "block.biomesoplenty.magic_wood": "Magic Wood",
-  "block.biomesoplenty.magic_wood_slab": "Magic Slab",
   "block.biomesoplenty.mahogany_button": "Mahogany Button",
   "block.biomesoplenty.mahogany_door": "Mahogany Door",
   "block.biomesoplenty.mahogany_fence": "Mahogany Fence",
@@ -241,7 +234,6 @@
   "block.biomesoplenty.mahogany_trapdoor": "Mahogany Trapdoor",
   "block.biomesoplenty.mahogany_wall_sign": "Mahogany Wall Sign",
   "block.biomesoplenty.mahogany_wood": "Mahogany Wood",
-  "block.biomesoplenty.mahogany_wood_slab": "Mahogany Slab",
   "block.biomesoplenty.mangrove_root": "Mangrove Root",
   "block.biomesoplenty.maple_leaves": "Maple Leaves",
   "block.biomesoplenty.maple_sapling": "Maple Sapling",
@@ -270,7 +262,6 @@
   "block.biomesoplenty.palm_trapdoor": "Palm Trapdoor",
   "block.biomesoplenty.palm_wall_sign": "Palm Wall Sign",
   "block.biomesoplenty.palm_wood": "Palm Wood",
-  "block.biomesoplenty.palm_wood_slab": "Palm Slab",
   "block.biomesoplenty.pink_cherry_leaves": "Pink Cherry Leaves",
   "block.biomesoplenty.pink_cherry_sapling": "Pink Cherry Sapling",
   "block.biomesoplenty.pink_daffodil": "Pink Daffodil",
@@ -323,7 +314,6 @@
   "block.biomesoplenty.redwood_trapdoor": "Redwood Trapdoor",
   "block.biomesoplenty.redwood_wall_sign": "Redwood Wall Sign",
   "block.biomesoplenty.redwood_wood": "Redwood Wood",
-  "block.biomesoplenty.redwood_wood_slab": "Redwood Slab",
   "block.biomesoplenty.reed": "Reed",
   "block.biomesoplenty.rose": "Rose",
   "block.biomesoplenty.smooth_white_sandstone": "Smooth White Sandstone",
@@ -371,7 +361,6 @@
   "block.biomesoplenty.umbran_trapdoor": "Umbran Trapdoor",
   "block.biomesoplenty.umbran_wall_sign": "Umbran Wall Sign",
   "block.biomesoplenty.umbran_wood": "Umbran Wood",
-  "block.biomesoplenty.umbran_wood_slab": "Umbran Slab",
   "block.biomesoplenty.violet": "Violet",
   "block.biomesoplenty.watergrass": "Watergrass",
   "block.biomesoplenty.white_cherry_leaves": "White Cherry Leaves",
@@ -398,7 +387,6 @@
   "block.biomesoplenty.willow_vine": "Willow Vine",
   "block.biomesoplenty.willow_wall_sign": "Willow Wall Sign",
   "block.biomesoplenty.willow_wood": "Willow Wood",
-  "block.biomesoplenty.willow_wood_slab": "Willow Slab",
   "block.biomesoplenty.wilted_lily": "Wilted Lily",
   "block.biomesoplenty.yellow_autumn_leaves": "Yellow Autumn Leaves",
   "block.biomesoplenty.yellow_autumn_sapling": "Yellow Autumn Sapling",
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ash_block.json b/src/main/resources/assets/biomesoplenty/models/block/ash_block.json
index c6f5ffc9b..e3304b3f7 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ash_block.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ash_block.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/ash_block"
+        "all": "biomesoplenty:block/ash_block"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/barley.json b/src/main/resources/assets/biomesoplenty/models/block/barley.json
index 3a1bafb9b..29c3d1b5b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/barley.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/barley.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/barley"
+        "cross": "biomesoplenty:block/barley"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/blue_hydrangea.json b/src/main/resources/assets/biomesoplenty/models/block/blue_hydrangea.json
index 9a78d5bd7..67a1f3c6e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/blue_hydrangea.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/blue_hydrangea.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/blue_hydrangea"
+        "cross": "biomesoplenty:block/blue_hydrangea"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/bramble.json b/src/main/resources/assets/biomesoplenty/models/block/bramble.json
index bbb5c4a47..6ddcbf727 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/bramble.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/bramble.json
@@ -1,9 +1,9 @@
 {   "parent": "block/block",
     "ambientocclusion": false,
     "textures": {
-        "plant": "biomesoplenty:blocks/bramble",
-		"thorns": "biomesoplenty:blocks/bramble_thorns",
-        "particle": "biomesoplenty:blocks/bramble"
+        "plant": "biomesoplenty:block/bramble",
+		"thorns": "biomesoplenty:block/bramble_thorns",
+        "particle": "biomesoplenty:block/bramble"
     },
     "elements": [
 	    {   "from": [ 0.8, 0, 8 ],
diff --git a/src/main/resources/assets/biomesoplenty/models/block/bramble_side.json b/src/main/resources/assets/biomesoplenty/models/block/bramble_side.json
index f692ff9a2..338d8ea97 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/bramble_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/bramble_side.json
@@ -1,8 +1,8 @@
 {
     "ambientocclusion": false,
     "textures": {
-        "texture": "biomesoplenty:blocks/bramble",
-        "particle": "biomesoplenty:blocks/bramble"
+        "texture": "biomesoplenty:block/bramble",
+        "particle": "biomesoplenty:block/bramble"
     },
     "elements": [
         {   "from": [ 4, 4, 0 ],
diff --git a/src/main/resources/assets/biomesoplenty/models/block/burning_blossom.json b/src/main/resources/assets/biomesoplenty/models/block/burning_blossom.json
index cafb17dca..cbededa01 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/burning_blossom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/burning_blossom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/burning_blossom"
+        "cross": "biomesoplenty:block/burning_blossom"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/bush.json b/src/main/resources/assets/biomesoplenty/models/block/bush.json
index c30c1560d..77dc4b079 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/bush.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/bush.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/tinted_cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/bush"
+        "cross": "biomesoplenty:block/bush"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cattail.json b/src/main/resources/assets/biomesoplenty/models/block/cattail.json
index 69039669f..4b6d1f90e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cattail.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cattail.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/cattail"
+        "cross": "biomesoplenty:block/cattail"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_button.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_button.json
index 3534d7b89..89ae8d078 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_button.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_button.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_planks"
+        "texture": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_button_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_button_inventory.json
index c5bd4940b..82aadd789 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_button_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_button_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_planks"
+        "texture": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_button_pressed.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_button_pressed.json
index ef6a00f11..3c93ae88b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_button_pressed.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_button_pressed.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_pressed",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_planks"
+        "texture": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_door_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_door_bottom.json
index 92bd115aa..998fb8af0 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_door_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_door_bottom.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom",
     "textures": {
-        "bottom": "biomesoplenty:blocks/cherry_door_bottom",
-        "top": "biomesoplenty:blocks/cherry_door_top"
+        "bottom": "biomesoplenty:block/cherry_door_bottom",
+        "top": "biomesoplenty:block/cherry_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_door_bottom_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_door_bottom_hinge.json
index adab27e68..49c5eefac 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_door_bottom_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_door_bottom_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/cherry_door_bottom",
-        "top": "biomesoplenty:blocks/cherry_door_top"
+        "bottom": "biomesoplenty:block/cherry_door_bottom",
+        "top": "biomesoplenty:block/cherry_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_door_top.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_door_top.json
index bc24772e2..ab78ca028 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_door_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_door_top.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/cherry_door_bottom",
-        "top": "biomesoplenty:blocks/cherry_door_top"
+        "bottom": "biomesoplenty:block/cherry_door_bottom",
+        "top": "biomesoplenty:block/cherry_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_door_top_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_door_top_hinge.json
index 9f5c6c90c..e3a35867a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_door_top_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_door_top_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/cherry_door_bottom",
-        "top": "biomesoplenty:blocks/cherry_door_top"
+        "bottom": "biomesoplenty:block/cherry_door_bottom",
+        "top": "biomesoplenty:block/cherry_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate.json
index a3e198b1c..d057dcc12 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_planks"
+        "texture": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate_open.json
index f29af792b..f1aa4e88d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_planks"
+        "texture": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate_wall.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate_wall.json
index 1a56d2d47..05d4a08db 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate_wall.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate_wall.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_planks"
+        "texture": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate_wall_open.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate_wall_open.json
index 6a11e2b5f..5eb187462 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate_wall_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_gate_wall_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_planks"
+        "texture": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_inventory.json
index 724f7bfc7..ab5e0e53a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_planks"
+        "texture": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_post.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_post.json
index bc23267e1..da67e945b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_post.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_post.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_post",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_planks"
+        "texture": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_side.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_side.json
index 0f20a1255..8ccd9920b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_fence_side.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_side",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_planks"
+        "texture": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_log.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_log.json
index c588bf914..fd5f2078d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/cherry_log_top",
-        "side": "biomesoplenty:blocks/cherry_log"
+        "end": "biomesoplenty:block/cherry_log_top",
+        "side": "biomesoplenty:block/cherry_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_planks.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_planks.json
index 05270ddcd..9a8b84479 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_planks.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_planks.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/cherry_planks"
+        "all": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_pressure_plate.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_pressure_plate.json
index 533dfecfd..660da402a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_pressure_plate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_pressure_plate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_up",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_planks"
+        "texture": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_pressure_plate_down.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_pressure_plate_down.json
index 6188f963b..8727cca0f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_pressure_plate_down.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_pressure_plate_down.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_down",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_planks"
+        "texture": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_slab.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_slab.json
index 8af95d65f..20277ad91 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/cherry_planks",
-        "top": "biomesoplenty:blocks/cherry_planks",
-        "side": "biomesoplenty:blocks/cherry_planks"
+        "bottom": "biomesoplenty:block/cherry_planks",
+        "top": "biomesoplenty:block/cherry_planks",
+        "side": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_slab_top.json
index b3d723461..4a03ba2a5 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/cherry_planks",
-        "top": "biomesoplenty:blocks/cherry_planks",
-        "side": "biomesoplenty:blocks/cherry_planks"
+        "bottom": "biomesoplenty:block/cherry_planks",
+        "top": "biomesoplenty:block/cherry_planks",
+        "side": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_stairs.json
index b942307cd..5ed60e00b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/cherry_planks",
-        "top": "biomesoplenty:blocks/cherry_planks",
-        "side": "biomesoplenty:blocks/cherry_planks"
+        "bottom": "biomesoplenty:block/cherry_planks",
+        "top": "biomesoplenty:block/cherry_planks",
+        "side": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_stairs_inner.json
index aba428cfa..3ae07e2fe 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/cherry_planks",
-        "top": "biomesoplenty:blocks/cherry_planks",
-        "side": "biomesoplenty:blocks/cherry_planks"
+        "bottom": "biomesoplenty:block/cherry_planks",
+        "top": "biomesoplenty:block/cherry_planks",
+        "side": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_stairs_outer.json
index c0d6bfaef..3c7674476 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/cherry_planks",
-        "top": "biomesoplenty:blocks/cherry_planks",
-        "side": "biomesoplenty:blocks/cherry_planks"
+        "bottom": "biomesoplenty:block/cherry_planks",
+        "top": "biomesoplenty:block/cherry_planks",
+        "side": "biomesoplenty:block/cherry_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_trapdoor_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_trapdoor_bottom.json
index 1a73d3552..6fdb5ca80 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_trapdoor_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_trapdoor_bottom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_bottom",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_trapdoor"
+        "texture": "biomesoplenty:block/cherry_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_trapdoor_open.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_trapdoor_open.json
index dc38fc019..f8d9f9695 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_trapdoor_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_trapdoor_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_trapdoor"
+        "texture": "biomesoplenty:block/cherry_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_trapdoor_top.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_trapdoor_top.json
index 11da467f5..f5cc83a5f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_trapdoor_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_trapdoor_top.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_top",
     "textures": {
-        "texture": "biomesoplenty:blocks/cherry_trapdoor"
+        "texture": "biomesoplenty:block/cherry_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cherry_wood.json b/src/main/resources/assets/biomesoplenty/models/block/cherry_wood.json
index 3250f9150..c8d5d8660 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cherry_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cherry_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/cherry_log",
-        "side": "biomesoplenty:blocks/cherry_log"
+        "end": "biomesoplenty:block/cherry_log",
+        "side": "biomesoplenty:block/cherry_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/chiseled_white_sandstone.json b/src/main/resources/assets/biomesoplenty/models/block/chiseled_white_sandstone.json
index 2130d29b0..e0fdcefa5 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/chiseled_white_sandstone.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/chiseled_white_sandstone.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/chiseled_white_sandstone"
+        "end": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/chiseled_white_sandstone"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone.json b/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone.json
index aa983c0d4..c89ddb1bf 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/cut_white_sandstone"
+        "end": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/cut_white_sandstone"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab.json
index 545f97dc8..62d345667 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/white_sandstone_top",
-        "top": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/cut_white_sandstone"
+        "bottom": "biomesoplenty:block/white_sandstone_top",
+        "top": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/cut_white_sandstone"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab_top.json
index d73dde50b..04b11639a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/white_sandstone_top",
-        "top": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/cut_white_sandstone"
+        "bottom": "biomesoplenty:block/white_sandstone_top",
+        "top": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/cut_white_sandstone"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_button.json b/src/main/resources/assets/biomesoplenty/models/block/dead_button.json
index 1cc1f9109..3f35e902f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_button.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_button.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_planks"
+        "texture": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_button_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/dead_button_inventory.json
index 0d5f3a1dc..3696aa269 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_button_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_button_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_planks"
+        "texture": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_button_pressed.json b/src/main/resources/assets/biomesoplenty/models/block/dead_button_pressed.json
index 46a1d502a..9b60ef192 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_button_pressed.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_button_pressed.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_pressed",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_planks"
+        "texture": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_door_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/dead_door_bottom.json
index d24762ad6..bfa908cd7 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_door_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_door_bottom.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom",
     "textures": {
-        "bottom": "biomesoplenty:blocks/dead_door_bottom",
-        "top": "biomesoplenty:blocks/dead_door_top"
+        "bottom": "biomesoplenty:block/dead_door_bottom",
+        "top": "biomesoplenty:block/dead_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_door_bottom_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/dead_door_bottom_hinge.json
index daab8bad7..116741eea 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_door_bottom_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_door_bottom_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/dead_door_bottom",
-        "top": "biomesoplenty:blocks/dead_door_top"
+        "bottom": "biomesoplenty:block/dead_door_bottom",
+        "top": "biomesoplenty:block/dead_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_door_top.json b/src/main/resources/assets/biomesoplenty/models/block/dead_door_top.json
index 0959dfe7d..d57fd7ce1 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_door_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_door_top.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/dead_door_bottom",
-        "top": "biomesoplenty:blocks/dead_door_top"
+        "bottom": "biomesoplenty:block/dead_door_bottom",
+        "top": "biomesoplenty:block/dead_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_door_top_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/dead_door_top_hinge.json
index dbb8b06aa..f370baf6c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_door_top_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_door_top_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/dead_door_bottom",
-        "top": "biomesoplenty:blocks/dead_door_top"
+        "bottom": "biomesoplenty:block/dead_door_bottom",
+        "top": "biomesoplenty:block/dead_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate.json
index cf0da31f6..6505eb779 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_planks"
+        "texture": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate_open.json
index da004fa50..b772beaa9 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_planks"
+        "texture": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate_wall.json b/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate_wall.json
index a937e0bc3..b986f19a2 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate_wall.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate_wall.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_planks"
+        "texture": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate_wall_open.json b/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate_wall_open.json
index a8f330d8a..1de64f272 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate_wall_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_fence_gate_wall_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_planks"
+        "texture": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_fence_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/dead_fence_inventory.json
index b5eb12dea..92488e0bf 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_fence_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_fence_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_planks"
+        "texture": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_fence_post.json b/src/main/resources/assets/biomesoplenty/models/block/dead_fence_post.json
index 6389c6163..08a21ad9c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_fence_post.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_fence_post.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_post",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_planks"
+        "texture": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_fence_side.json b/src/main/resources/assets/biomesoplenty/models/block/dead_fence_side.json
index 4631378b5..6a4f58c5a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_fence_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_fence_side.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_side",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_planks"
+        "texture": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_grass.json b/src/main/resources/assets/biomesoplenty/models/block/dead_grass.json
index ada1648cf..d8afa3f63 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_grass.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_grass.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/dead_grass"
+        "cross": "biomesoplenty:block/dead_grass"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/dead_leaves.json
index 9b4832464..14960ae95 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/dead_leaves"
+        "all": "biomesoplenty:block/dead_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_log.json b/src/main/resources/assets/biomesoplenty/models/block/dead_log.json
index 6a85a3a6d..88e3603c1 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/dead_log_top",
-        "side": "biomesoplenty:blocks/dead_log"
+        "end": "biomesoplenty:block/dead_log_top",
+        "side": "biomesoplenty:block/dead_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_planks.json b/src/main/resources/assets/biomesoplenty/models/block/dead_planks.json
index 4a62f21f4..62bcc15a6 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_planks.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_planks.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/dead_planks"
+        "all": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_pressure_plate.json b/src/main/resources/assets/biomesoplenty/models/block/dead_pressure_plate.json
index 9b65b0bf3..611c0fc7e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_pressure_plate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_pressure_plate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_up",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_planks"
+        "texture": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_pressure_plate_down.json b/src/main/resources/assets/biomesoplenty/models/block/dead_pressure_plate_down.json
index f8d4a09e3..4ff655f54 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_pressure_plate_down.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_pressure_plate_down.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_down",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_planks"
+        "texture": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/dead_sapling.json
index 5c57ea1ab..219ab333e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/dead_sapling"
+        "cross": "biomesoplenty:block/dead_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_slab.json b/src/main/resources/assets/biomesoplenty/models/block/dead_slab.json
index a5581badf..30c1a4c20 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/dead_planks",
-        "top": "biomesoplenty:blocks/dead_planks",
-        "side": "biomesoplenty:blocks/dead_planks"
+        "bottom": "biomesoplenty:block/dead_planks",
+        "top": "biomesoplenty:block/dead_planks",
+        "side": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/dead_slab_top.json
index 35b594efe..0e61dac48 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/dead_planks",
-        "top": "biomesoplenty:blocks/dead_planks",
-        "side": "biomesoplenty:blocks/dead_planks"
+        "bottom": "biomesoplenty:block/dead_planks",
+        "top": "biomesoplenty:block/dead_planks",
+        "side": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/dead_stairs.json
index c936ec060..866f3eccb 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/dead_planks",
-        "top": "biomesoplenty:blocks/dead_planks",
-        "side": "biomesoplenty:blocks/dead_planks"
+        "bottom": "biomesoplenty:block/dead_planks",
+        "top": "biomesoplenty:block/dead_planks",
+        "side": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/dead_stairs_inner.json
index 6a016eff3..a788d61c8 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/dead_planks",
-        "top": "biomesoplenty:blocks/dead_planks",
-        "side": "biomesoplenty:blocks/dead_planks"
+        "bottom": "biomesoplenty:block/dead_planks",
+        "top": "biomesoplenty:block/dead_planks",
+        "side": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/dead_stairs_outer.json
index 070cff9fc..a3bc84e87 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/dead_planks",
-        "top": "biomesoplenty:blocks/dead_planks",
-        "side": "biomesoplenty:blocks/dead_planks"
+        "bottom": "biomesoplenty:block/dead_planks",
+        "top": "biomesoplenty:block/dead_planks",
+        "side": "biomesoplenty:block/dead_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_trapdoor_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/dead_trapdoor_bottom.json
index 32eeaf98e..69917b98c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_trapdoor_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_trapdoor_bottom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_bottom",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_trapdoor"
+        "texture": "biomesoplenty:block/dead_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_trapdoor_open.json b/src/main/resources/assets/biomesoplenty/models/block/dead_trapdoor_open.json
index b73a2b501..357eec188 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_trapdoor_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_trapdoor_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_trapdoor"
+        "texture": "biomesoplenty:block/dead_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_trapdoor_top.json b/src/main/resources/assets/biomesoplenty/models/block/dead_trapdoor_top.json
index 295c0978d..906a8a357 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_trapdoor_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_trapdoor_top.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_top",
     "textures": {
-        "texture": "biomesoplenty:blocks/dead_trapdoor"
+        "texture": "biomesoplenty:block/dead_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_wood.json b/src/main/resources/assets/biomesoplenty/models/block/dead_wood.json
index ab08cd9ec..26d992e47 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dead_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dead_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/dead_log",
-        "side": "biomesoplenty:blocks/dead_log"
+        "end": "biomesoplenty:block/dead_log",
+        "side": "biomesoplenty:block/dead_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/desert_grass.json b/src/main/resources/assets/biomesoplenty/models/block/desert_grass.json
index d9b673eb3..15943aea8 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/desert_grass.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/desert_grass.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/desert_grass"
+        "cross": "biomesoplenty:block/desert_grass"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dried_sand.json b/src/main/resources/assets/biomesoplenty/models/block/dried_sand.json
index a332c51d0..060ec61b8 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dried_sand.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dried_sand.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/dried_sand"
+        "all": "biomesoplenty:block/dried_sand"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/dune_grass.json b/src/main/resources/assets/biomesoplenty/models/block/dune_grass.json
index 34d7bb369..bdfb80dd3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/dune_grass.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/dune_grass.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/dune_grass"
+        "cross": "biomesoplenty:block/dune_grass"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_button.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_button.json
index c81bdfca3..72505051e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_button.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_button.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_planks"
+        "texture": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_button_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_button_inventory.json
index 2a52cc4f4..f7d2b3c43 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_button_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_button_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_planks"
+        "texture": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_button_pressed.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_button_pressed.json
index 534548f75..05b1f7b2f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_button_pressed.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_button_pressed.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_pressed",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_planks"
+        "texture": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_bottom.json
index 07f7cdb49..f0b0f6dca 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_bottom.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom",
     "textures": {
-        "bottom": "biomesoplenty:blocks/ethereal_door_bottom",
-        "top": "biomesoplenty:blocks/ethereal_door_top"
+        "bottom": "biomesoplenty:block/ethereal_door_bottom",
+        "top": "biomesoplenty:block/ethereal_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_bottom_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_bottom_hinge.json
index 1c93cadad..ad222e0fb 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_bottom_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_bottom_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/ethereal_door_bottom",
-        "top": "biomesoplenty:blocks/ethereal_door_top"
+        "bottom": "biomesoplenty:block/ethereal_door_bottom",
+        "top": "biomesoplenty:block/ethereal_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_top.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_top.json
index 56df8f048..9517add9e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_top.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/ethereal_door_bottom",
-        "top": "biomesoplenty:blocks/ethereal_door_top"
+        "bottom": "biomesoplenty:block/ethereal_door_bottom",
+        "top": "biomesoplenty:block/ethereal_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_top_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_top_hinge.json
index 2dde9c7d5..46cafa8ef 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_top_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_door_top_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/ethereal_door_bottom",
-        "top": "biomesoplenty:blocks/ethereal_door_top"
+        "bottom": "biomesoplenty:block/ethereal_door_bottom",
+        "top": "biomesoplenty:block/ethereal_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate.json
index 60425e72a..3108f21ec 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_planks"
+        "texture": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate_open.json
index fa4c99089..9966c5cbc 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_planks"
+        "texture": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate_wall.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate_wall.json
index 85d23ff42..de0dda25f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate_wall.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate_wall.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_planks"
+        "texture": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate_wall_open.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate_wall_open.json
index 884119fb5..a125eb697 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate_wall_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_gate_wall_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_planks"
+        "texture": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_inventory.json
index b69ab0401..bf6304b93 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_planks"
+        "texture": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_post.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_post.json
index 01cac228f..bb630f1ea 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_post.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_post.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_post",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_planks"
+        "texture": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_side.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_side.json
index 1648ce9f0..b13d0c217 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_fence_side.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_side",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_planks"
+        "texture": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_leaves.json
index b139ab071..320ebbcea 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/ethereal_leaves"
+        "all": "biomesoplenty:block/ethereal_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_log.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_log.json
index 989e2a31b..d383e18ef 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/ethereal_log_top",
-        "side": "biomesoplenty:blocks/ethereal_log"
+        "end": "biomesoplenty:block/ethereal_log_top",
+        "side": "biomesoplenty:block/ethereal_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_planks.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_planks.json
index 94cfed400..3f94f00b1 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_planks.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_planks.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/ethereal_planks"
+        "all": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_pressure_plate.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_pressure_plate.json
index 7d7d46699..74d4f4f39 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_pressure_plate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_pressure_plate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_up",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_planks"
+        "texture": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_pressure_plate_down.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_pressure_plate_down.json
index 60bb0724e..57cba0626 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_pressure_plate_down.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_pressure_plate_down.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_down",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_planks"
+        "texture": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_sapling.json
index 4f47c11d9..51bd9c5e3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/ethereal_sapling"
+        "cross": "biomesoplenty:block/ethereal_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_slab.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_slab.json
index 632631607..662ba090b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/ethereal_planks",
-        "top": "biomesoplenty:blocks/ethereal_planks",
-        "side": "biomesoplenty:blocks/ethereal_planks"
+        "bottom": "biomesoplenty:block/ethereal_planks",
+        "top": "biomesoplenty:block/ethereal_planks",
+        "side": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_slab_top.json
index 3bde08d07..d22673e15 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/ethereal_planks",
-        "top": "biomesoplenty:blocks/ethereal_planks",
-        "side": "biomesoplenty:blocks/ethereal_planks"
+        "bottom": "biomesoplenty:block/ethereal_planks",
+        "top": "biomesoplenty:block/ethereal_planks",
+        "side": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_stairs.json
index 707310f25..9bc7cf87a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/ethereal_planks",
-        "top": "biomesoplenty:blocks/ethereal_planks",
-        "side": "biomesoplenty:blocks/ethereal_planks"
+        "bottom": "biomesoplenty:block/ethereal_planks",
+        "top": "biomesoplenty:block/ethereal_planks",
+        "side": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_stairs_inner.json
index 465f89e6f..384075f33 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/ethereal_planks",
-        "top": "biomesoplenty:blocks/ethereal_planks",
-        "side": "biomesoplenty:blocks/ethereal_planks"
+        "bottom": "biomesoplenty:block/ethereal_planks",
+        "top": "biomesoplenty:block/ethereal_planks",
+        "side": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_stairs_outer.json
index 88d9bd50c..7f00b6ffd 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/ethereal_planks",
-        "top": "biomesoplenty:blocks/ethereal_planks",
-        "side": "biomesoplenty:blocks/ethereal_planks"
+        "bottom": "biomesoplenty:block/ethereal_planks",
+        "top": "biomesoplenty:block/ethereal_planks",
+        "side": "biomesoplenty:block/ethereal_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_trapdoor_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_trapdoor_bottom.json
index 2015781c2..282775a0c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_trapdoor_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_trapdoor_bottom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_bottom",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_trapdoor"
+        "texture": "biomesoplenty:block/ethereal_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_trapdoor_open.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_trapdoor_open.json
index d4b1dbb1f..3bb122d5c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_trapdoor_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_trapdoor_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_trapdoor"
+        "texture": "biomesoplenty:block/ethereal_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_trapdoor_top.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_trapdoor_top.json
index 4b0602e15..985d88904 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_trapdoor_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_trapdoor_top.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_top",
     "textures": {
-        "texture": "biomesoplenty:blocks/ethereal_trapdoor"
+        "texture": "biomesoplenty:block/ethereal_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ethereal_wood.json b/src/main/resources/assets/biomesoplenty/models/block/ethereal_wood.json
index 2273bf70f..bd870c801 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ethereal_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ethereal_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/ethereal_log",
-        "side": "biomesoplenty:blocks/ethereal_log"
+        "end": "biomesoplenty:block/ethereal_log",
+        "side": "biomesoplenty:block/ethereal_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_button.json b/src/main/resources/assets/biomesoplenty/models/block/fir_button.json
index da1b78b09..da0d67748 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_button.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_button.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_planks"
+        "texture": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_button_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/fir_button_inventory.json
index 279d25fa4..67e8329fe 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_button_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_button_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_planks"
+        "texture": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_button_pressed.json b/src/main/resources/assets/biomesoplenty/models/block/fir_button_pressed.json
index 0dcf0cba8..c4f2e84b1 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_button_pressed.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_button_pressed.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_pressed",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_planks"
+        "texture": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_door_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/fir_door_bottom.json
index 9c94b3254..4e65a731a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_door_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_door_bottom.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom",
     "textures": {
-        "bottom": "biomesoplenty:blocks/fir_door_bottom",
-        "top": "biomesoplenty:blocks/fir_door_top"
+        "bottom": "biomesoplenty:block/fir_door_bottom",
+        "top": "biomesoplenty:block/fir_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_door_bottom_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/fir_door_bottom_hinge.json
index 22ffe0c05..2439cd0b1 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_door_bottom_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_door_bottom_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/fir_door_bottom",
-        "top": "biomesoplenty:blocks/fir_door_top"
+        "bottom": "biomesoplenty:block/fir_door_bottom",
+        "top": "biomesoplenty:block/fir_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_door_top.json b/src/main/resources/assets/biomesoplenty/models/block/fir_door_top.json
index 61f72dc98..0c84c0fad 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_door_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_door_top.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/fir_door_bottom",
-        "top": "biomesoplenty:blocks/fir_door_top"
+        "bottom": "biomesoplenty:block/fir_door_bottom",
+        "top": "biomesoplenty:block/fir_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_door_top_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/fir_door_top_hinge.json
index a9e4a6f3f..83f7a1f05 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_door_top_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_door_top_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/fir_door_bottom",
-        "top": "biomesoplenty:blocks/fir_door_top"
+        "bottom": "biomesoplenty:block/fir_door_bottom",
+        "top": "biomesoplenty:block/fir_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate.json
index 33bea3229..2b7ff16f6 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_planks"
+        "texture": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate_open.json
index c38b550bd..af66fa415 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_planks"
+        "texture": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate_wall.json b/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate_wall.json
index a6c712c98..80119d6ae 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate_wall.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate_wall.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_planks"
+        "texture": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate_wall_open.json b/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate_wall_open.json
index 6495ee1f0..782ab4bdb 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate_wall_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_fence_gate_wall_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_planks"
+        "texture": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_fence_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/fir_fence_inventory.json
index 486de2134..a851de99b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_fence_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_fence_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_planks"
+        "texture": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_fence_post.json b/src/main/resources/assets/biomesoplenty/models/block/fir_fence_post.json
index cfdc52a29..6d23a93e2 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_fence_post.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_fence_post.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_post",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_planks"
+        "texture": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_fence_side.json b/src/main/resources/assets/biomesoplenty/models/block/fir_fence_side.json
index 13f131a85..ca72c66ab 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_fence_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_fence_side.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_side",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_planks"
+        "texture": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/fir_leaves.json
index d4cbd3d39..b74682357 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/fir_leaves"
+        "all": "biomesoplenty:block/fir_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_log.json b/src/main/resources/assets/biomesoplenty/models/block/fir_log.json
index ac0f334f7..ed5d5f526 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/fir_log_top",
-        "side": "biomesoplenty:blocks/fir_log"
+        "end": "biomesoplenty:block/fir_log_top",
+        "side": "biomesoplenty:block/fir_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_planks.json b/src/main/resources/assets/biomesoplenty/models/block/fir_planks.json
index b26530292..fbc4d638e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_planks.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_planks.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/fir_planks"
+        "all": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_pressure_plate.json b/src/main/resources/assets/biomesoplenty/models/block/fir_pressure_plate.json
index 0638e1efb..538cd7698 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_pressure_plate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_pressure_plate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_up",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_planks"
+        "texture": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_pressure_plate_down.json b/src/main/resources/assets/biomesoplenty/models/block/fir_pressure_plate_down.json
index 59b8743fc..cf1b24725 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_pressure_plate_down.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_pressure_plate_down.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_down",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_planks"
+        "texture": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/fir_sapling.json
index 8699d916c..74c5b14b8 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/fir_sapling"
+        "cross": "biomesoplenty:block/fir_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_slab.json b/src/main/resources/assets/biomesoplenty/models/block/fir_slab.json
index 6e325c942..daae5064f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/fir_planks",
-        "top": "biomesoplenty:blocks/fir_planks",
-        "side": "biomesoplenty:blocks/fir_planks"
+        "bottom": "biomesoplenty:block/fir_planks",
+        "top": "biomesoplenty:block/fir_planks",
+        "side": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/fir_slab_top.json
index 336f125a9..8c52d5536 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/fir_planks",
-        "top": "biomesoplenty:blocks/fir_planks",
-        "side": "biomesoplenty:blocks/fir_planks"
+        "bottom": "biomesoplenty:block/fir_planks",
+        "top": "biomesoplenty:block/fir_planks",
+        "side": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/fir_stairs.json
index 05fd1a020..a5cfb7ecb 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/fir_planks",
-        "top": "biomesoplenty:blocks/fir_planks",
-        "side": "biomesoplenty:blocks/fir_planks"
+        "bottom": "biomesoplenty:block/fir_planks",
+        "top": "biomesoplenty:block/fir_planks",
+        "side": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/fir_stairs_inner.json
index 1ff3b69eb..de05b3d49 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/fir_planks",
-        "top": "biomesoplenty:blocks/fir_planks",
-        "side": "biomesoplenty:blocks/fir_planks"
+        "bottom": "biomesoplenty:block/fir_planks",
+        "top": "biomesoplenty:block/fir_planks",
+        "side": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/fir_stairs_outer.json
index 5e345a135..7cfd6976c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/fir_planks",
-        "top": "biomesoplenty:blocks/fir_planks",
-        "side": "biomesoplenty:blocks/fir_planks"
+        "bottom": "biomesoplenty:block/fir_planks",
+        "top": "biomesoplenty:block/fir_planks",
+        "side": "biomesoplenty:block/fir_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_trapdoor_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/fir_trapdoor_bottom.json
index 8e6c2eee6..c26cfae1a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_trapdoor_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_trapdoor_bottom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_bottom",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_trapdoor"
+        "texture": "biomesoplenty:block/fir_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_trapdoor_open.json b/src/main/resources/assets/biomesoplenty/models/block/fir_trapdoor_open.json
index 4add83c13..68b1b123d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_trapdoor_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_trapdoor_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_trapdoor"
+        "texture": "biomesoplenty:block/fir_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_trapdoor_top.json b/src/main/resources/assets/biomesoplenty/models/block/fir_trapdoor_top.json
index 27339818d..60a8132ab 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_trapdoor_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_trapdoor_top.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_top",
     "textures": {
-        "texture": "biomesoplenty:blocks/fir_trapdoor"
+        "texture": "biomesoplenty:block/fir_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/fir_wood.json b/src/main/resources/assets/biomesoplenty/models/block/fir_wood.json
index 7d08e2c42..6bacffa7b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/fir_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/fir_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/fir_log",
-        "side": "biomesoplenty:blocks/fir_log"
+        "end": "biomesoplenty:block/fir_log",
+        "side": "biomesoplenty:block/fir_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/flax_lower.json b/src/main/resources/assets/biomesoplenty/models/block/flax_lower.json
deleted file mode 100644
index 135a7d58a..000000000
--- a/src/main/resources/assets/biomesoplenty/models/block/flax_lower.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/tinted_cross",
-    "textures": {
-        "cross": "biomesoplenty:blocks/flax_lower"
-    }
-}
diff --git a/src/main/resources/assets/biomesoplenty/models/block/flax_upper.json b/src/main/resources/assets/biomesoplenty/models/block/flax_upper.json
deleted file mode 100644
index dfab1d144..000000000
--- a/src/main/resources/assets/biomesoplenty/models/block/flax_upper.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "parent": "biomesoplenty:block/cross_with_overlay",
-    "textures": {
-        "colored": "biomesoplenty:blocks/flax_flowers",
-        "greyscale": "biomesoplenty:blocks/flax_upper",
-        "particle": "biomesoplenty:blocks/flax_upper"
-    }
-}
diff --git a/src/main/resources/assets/biomesoplenty/models/block/flesh.json b/src/main/resources/assets/biomesoplenty/models/block/flesh.json
index 8408ae4f1..e5d1fb2c3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/flesh.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/flesh.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/flesh"
+        "all": "biomesoplenty:block/flesh"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves.json
index b181a2447..fb558523a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves.json
@@ -1,7 +1,7 @@
 {
     "parent": "biomesoplenty:block/leaves_overlay",
     "textures": {
-        "leaves": "biomesoplenty:blocks/flowering_oak_leaves",
-        "overlay": "biomesoplenty:blocks/flowering_oak_leaves_overlay"
+        "leaves": "biomesoplenty:block/flowering_oak_leaves",
+        "overlay": "biomesoplenty:block/flowering_oak_leaves_overlay"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_sapling.json
index 89d00d600..b1b728998 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/flowering_oak_sapling"
+        "cross": "biomesoplenty:block/flowering_oak_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/glowflower.json b/src/main/resources/assets/biomesoplenty/models/block/glowflower.json
index a1232a96c..0b00e77dc 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/glowflower.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/glowflower.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/glowflower"
+        "cross": "biomesoplenty:block/glowflower"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/glowshroom.json b/src/main/resources/assets/biomesoplenty/models/block/glowshroom.json
index de37c5d06..dd345767d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/glowshroom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/glowshroom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/glowshroom"
+        "cross": "biomesoplenty:block/glowshroom"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/goldenrod.json b/src/main/resources/assets/biomesoplenty/models/block/goldenrod.json
index 8da5a47ef..ead530e95 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/goldenrod.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/goldenrod.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/goldenrod"
+        "cross": "biomesoplenty:block/goldenrod"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_button.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_button.json
index 1d3ac9e57..9b3273801 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_button.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_button.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_planks"
+        "texture": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_button_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_button_inventory.json
index f8bbf2ff7..a18bef715 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_button_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_button_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_planks"
+        "texture": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_button_pressed.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_button_pressed.json
index a112ede49..59e48909b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_button_pressed.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_button_pressed.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_pressed",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_planks"
+        "texture": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_bottom.json
index 2b600d054..ae6a90404 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_bottom.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom",
     "textures": {
-        "bottom": "biomesoplenty:blocks/hellbark_door_bottom",
-        "top": "biomesoplenty:blocks/hellbark_door_top"
+        "bottom": "biomesoplenty:block/hellbark_door_bottom",
+        "top": "biomesoplenty:block/hellbark_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_bottom_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_bottom_hinge.json
index f1997a728..3da07e6d8 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_bottom_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_bottom_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/hellbark_door_bottom",
-        "top": "biomesoplenty:blocks/hellbark_door_top"
+        "bottom": "biomesoplenty:block/hellbark_door_bottom",
+        "top": "biomesoplenty:block/hellbark_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_top.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_top.json
index 29dcde063..fbf710b9a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_top.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/hellbark_door_bottom",
-        "top": "biomesoplenty:blocks/hellbark_door_top"
+        "bottom": "biomesoplenty:block/hellbark_door_bottom",
+        "top": "biomesoplenty:block/hellbark_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_top_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_top_hinge.json
index d99de00b8..fa846f97e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_top_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_door_top_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/hellbark_door_bottom",
-        "top": "biomesoplenty:blocks/hellbark_door_top"
+        "bottom": "biomesoplenty:block/hellbark_door_bottom",
+        "top": "biomesoplenty:block/hellbark_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate.json
index 346ac259c..b04f3d64d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_planks"
+        "texture": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate_open.json
index f279a0748..3e7fb937f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_planks"
+        "texture": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate_wall.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate_wall.json
index 706132f2d..561688b7d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate_wall.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate_wall.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_planks"
+        "texture": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate_wall_open.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate_wall_open.json
index 38f406843..55e63a0c8 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate_wall_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_gate_wall_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_planks"
+        "texture": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_inventory.json
index dabe8b657..583271e0f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_planks"
+        "texture": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_post.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_post.json
index b120106cc..30fbd6bc3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_post.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_post.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_post",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_planks"
+        "texture": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_side.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_side.json
index a960e11bb..c49f5ce96 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_fence_side.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_side",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_planks"
+        "texture": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_leaves.json
index 65f49bcfc..d6bc5772f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/hellbark_leaves"
+        "all": "biomesoplenty:block/hellbark_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_log.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_log.json
index 4bc19a0f3..0a604cb4a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/hellbark_log_top",
-        "side": "biomesoplenty:blocks/hellbark_log"
+        "end": "biomesoplenty:block/hellbark_log_top",
+        "side": "biomesoplenty:block/hellbark_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_planks.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_planks.json
index f2074997b..6a1e0c71a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_planks.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_planks.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/hellbark_planks"
+        "all": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_pressure_plate.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_pressure_plate.json
index 0065648c0..446f295a0 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_pressure_plate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_pressure_plate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_up",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_planks"
+        "texture": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_pressure_plate_down.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_pressure_plate_down.json
index a0a2b6795..d45ce9fc4 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_pressure_plate_down.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_pressure_plate_down.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_down",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_planks"
+        "texture": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_sapling.json
index 7a13a90c9..3241d1fb5 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/hellbark_sapling"
+        "cross": "biomesoplenty:block/hellbark_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_slab.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_slab.json
index fb39c5ab4..dca2372da 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/hellbark_planks",
-        "top": "biomesoplenty:blocks/hellbark_planks",
-        "side": "biomesoplenty:blocks/hellbark_planks"
+        "bottom": "biomesoplenty:block/hellbark_planks",
+        "top": "biomesoplenty:block/hellbark_planks",
+        "side": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_slab_top.json
index 9cc4560e4..ae41bd5c3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/hellbark_planks",
-        "top": "biomesoplenty:blocks/hellbark_planks",
-        "side": "biomesoplenty:blocks/hellbark_planks"
+        "bottom": "biomesoplenty:block/hellbark_planks",
+        "top": "biomesoplenty:block/hellbark_planks",
+        "side": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_stairs.json
index 230d10e16..b40ce7c31 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/hellbark_planks",
-        "top": "biomesoplenty:blocks/hellbark_planks",
-        "side": "biomesoplenty:blocks/hellbark_planks"
+        "bottom": "biomesoplenty:block/hellbark_planks",
+        "top": "biomesoplenty:block/hellbark_planks",
+        "side": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_stairs_inner.json
index 3710d6a73..b788e65c5 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/hellbark_planks",
-        "top": "biomesoplenty:blocks/hellbark_planks",
-        "side": "biomesoplenty:blocks/hellbark_planks"
+        "bottom": "biomesoplenty:block/hellbark_planks",
+        "top": "biomesoplenty:block/hellbark_planks",
+        "side": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_stairs_outer.json
index 08a78cee9..e203da525 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/hellbark_planks",
-        "top": "biomesoplenty:blocks/hellbark_planks",
-        "side": "biomesoplenty:blocks/hellbark_planks"
+        "bottom": "biomesoplenty:block/hellbark_planks",
+        "top": "biomesoplenty:block/hellbark_planks",
+        "side": "biomesoplenty:block/hellbark_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_trapdoor_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_trapdoor_bottom.json
index e9fd51da3..b4e81be8a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_trapdoor_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_trapdoor_bottom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_bottom",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_trapdoor"
+        "texture": "biomesoplenty:block/hellbark_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_trapdoor_open.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_trapdoor_open.json
index cb9b73a58..d7b2c0941 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_trapdoor_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_trapdoor_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_trapdoor"
+        "texture": "biomesoplenty:block/hellbark_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_trapdoor_top.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_trapdoor_top.json
index 655c4e6d2..8c7a2ac87 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_trapdoor_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_trapdoor_top.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_top",
     "textures": {
-        "texture": "biomesoplenty:blocks/hellbark_trapdoor"
+        "texture": "biomesoplenty:block/hellbark_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/hellbark_wood.json b/src/main/resources/assets/biomesoplenty/models/block/hellbark_wood.json
index 6b3ce2108..92ab79aed 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/hellbark_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/hellbark_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/hellbark_log",
-        "side": "biomesoplenty:blocks/hellbark_log"
+        "end": "biomesoplenty:block/hellbark_log",
+        "side": "biomesoplenty:block/hellbark_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_button.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_button.json
index a007d96f5..f92e851d8 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_button.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_button.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_planks"
+        "texture": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_button_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_button_inventory.json
index 1b68a8a3e..ad9ccef2e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_button_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_button_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_planks"
+        "texture": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_button_pressed.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_button_pressed.json
index a421d7063..9088b2bf1 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_button_pressed.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_button_pressed.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_pressed",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_planks"
+        "texture": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_bottom.json
index 0405f23e9..68e4977f9 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_bottom.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom",
     "textures": {
-        "bottom": "biomesoplenty:blocks/jacaranda_door_bottom",
-        "top": "biomesoplenty:blocks/jacaranda_door_top"
+        "bottom": "biomesoplenty:block/jacaranda_door_bottom",
+        "top": "biomesoplenty:block/jacaranda_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_bottom_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_bottom_hinge.json
index 17f5b8a96..a08c68e3f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_bottom_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_bottom_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/jacaranda_door_bottom",
-        "top": "biomesoplenty:blocks/jacaranda_door_top"
+        "bottom": "biomesoplenty:block/jacaranda_door_bottom",
+        "top": "biomesoplenty:block/jacaranda_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_top.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_top.json
index aaee9059b..52025a4ee 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_top.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/jacaranda_door_bottom",
-        "top": "biomesoplenty:blocks/jacaranda_door_top"
+        "bottom": "biomesoplenty:block/jacaranda_door_bottom",
+        "top": "biomesoplenty:block/jacaranda_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_top_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_top_hinge.json
index 01ae72d45..0e439513d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_top_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_door_top_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/jacaranda_door_bottom",
-        "top": "biomesoplenty:blocks/jacaranda_door_top"
+        "bottom": "biomesoplenty:block/jacaranda_door_bottom",
+        "top": "biomesoplenty:block/jacaranda_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate.json
index fa32f43e9..e1f6bbd4f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_planks"
+        "texture": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate_open.json
index 6c3129e9d..b6c7faab9 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_planks"
+        "texture": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate_wall.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate_wall.json
index f2d797702..45102351a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate_wall.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate_wall.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_planks"
+        "texture": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate_wall_open.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate_wall_open.json
index 4db751ea6..5a3aa6b0f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate_wall_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_gate_wall_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_planks"
+        "texture": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_inventory.json
index 93631617b..8739f5e12 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_planks"
+        "texture": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_post.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_post.json
index 9504a65c4..667fe3430 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_post.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_post.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_post",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_planks"
+        "texture": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_side.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_side.json
index 9812b5ae9..daf6b6494 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_fence_side.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_side",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_planks"
+        "texture": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_leaves.json
index 364eba04b..4074ef8f7 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/jacaranda_leaves"
+        "all": "biomesoplenty:block/jacaranda_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_log.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_log.json
index 8495ff85b..fb50de22e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/jacaranda_log_top",
-        "side": "biomesoplenty:blocks/jacaranda_log"
+        "end": "biomesoplenty:block/jacaranda_log_top",
+        "side": "biomesoplenty:block/jacaranda_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_planks.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_planks.json
index 94d8d1c9e..0c4c73d56 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_planks.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_planks.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/jacaranda_planks"
+        "all": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_pressure_plate.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_pressure_plate.json
index 647b3c960..281d5f052 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_pressure_plate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_pressure_plate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_up",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_planks"
+        "texture": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_pressure_plate_down.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_pressure_plate_down.json
index f9d976afd..aa7a624d8 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_pressure_plate_down.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_pressure_plate_down.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_down",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_planks"
+        "texture": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_sapling.json
index 656e8dbdd..62dca0cda 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/jacaranda_sapling"
+        "cross": "biomesoplenty:block/jacaranda_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_slab.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_slab.json
index c2251339e..f1daec7bf 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/jacaranda_planks",
-        "top": "biomesoplenty:blocks/jacaranda_planks",
-        "side": "biomesoplenty:blocks/jacaranda_planks"
+        "bottom": "biomesoplenty:block/jacaranda_planks",
+        "top": "biomesoplenty:block/jacaranda_planks",
+        "side": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_slab_top.json
index b5fb3f3a4..2fa26c6b9 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/jacaranda_planks",
-        "top": "biomesoplenty:blocks/jacaranda_planks",
-        "side": "biomesoplenty:blocks/jacaranda_planks"
+        "bottom": "biomesoplenty:block/jacaranda_planks",
+        "top": "biomesoplenty:block/jacaranda_planks",
+        "side": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_stairs.json
index 837b973ce..7a8c98d7f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/jacaranda_planks",
-        "top": "biomesoplenty:blocks/jacaranda_planks",
-        "side": "biomesoplenty:blocks/jacaranda_planks"
+        "bottom": "biomesoplenty:block/jacaranda_planks",
+        "top": "biomesoplenty:block/jacaranda_planks",
+        "side": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_stairs_inner.json
index 2aabb8f93..0ad65f986 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/jacaranda_planks",
-        "top": "biomesoplenty:blocks/jacaranda_planks",
-        "side": "biomesoplenty:blocks/jacaranda_planks"
+        "bottom": "biomesoplenty:block/jacaranda_planks",
+        "top": "biomesoplenty:block/jacaranda_planks",
+        "side": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_stairs_outer.json
index f98e4708d..16ea041d1 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/jacaranda_planks",
-        "top": "biomesoplenty:blocks/jacaranda_planks",
-        "side": "biomesoplenty:blocks/jacaranda_planks"
+        "bottom": "biomesoplenty:block/jacaranda_planks",
+        "top": "biomesoplenty:block/jacaranda_planks",
+        "side": "biomesoplenty:block/jacaranda_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_trapdoor_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_trapdoor_bottom.json
index 0b0ef6526..2f3aac325 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_trapdoor_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_trapdoor_bottom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_bottom",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_trapdoor"
+        "texture": "biomesoplenty:block/jacaranda_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_trapdoor_open.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_trapdoor_open.json
index 706b274ea..d460618bc 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_trapdoor_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_trapdoor_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_trapdoor"
+        "texture": "biomesoplenty:block/jacaranda_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_trapdoor_top.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_trapdoor_top.json
index d8be4b999..9e950384c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_trapdoor_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_trapdoor_top.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_top",
     "textures": {
-        "texture": "biomesoplenty:blocks/jacaranda_trapdoor"
+        "texture": "biomesoplenty:block/jacaranda_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_wood.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_wood.json
index ccf421b94..38db2ce65 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/jacaranda_log",
-        "side": "biomesoplenty:blocks/jacaranda_log"
+        "end": "biomesoplenty:block/jacaranda_log",
+        "side": "biomesoplenty:block/jacaranda_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/lavender.json b/src/main/resources/assets/biomesoplenty/models/block/lavender.json
index 0b9a7083a..dd924f680 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/lavender.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/lavender.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/lavender"
+        "cross": "biomesoplenty:block/lavender"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_button.json b/src/main/resources/assets/biomesoplenty/models/block/magic_button.json
index a53d7c6dd..a94ebcc88 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_button.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_button.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_planks"
+        "texture": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_button_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/magic_button_inventory.json
index 815c4e3f9..9bdbe95f2 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_button_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_button_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_planks"
+        "texture": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_button_pressed.json b/src/main/resources/assets/biomesoplenty/models/block/magic_button_pressed.json
index a8d082ecb..13a72882b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_button_pressed.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_button_pressed.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_pressed",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_planks"
+        "texture": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_door_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/magic_door_bottom.json
index 28232f1ca..d02fa705f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_door_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_door_bottom.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom",
     "textures": {
-        "bottom": "biomesoplenty:blocks/magic_door_bottom",
-        "top": "biomesoplenty:blocks/magic_door_top"
+        "bottom": "biomesoplenty:block/magic_door_bottom",
+        "top": "biomesoplenty:block/magic_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_door_bottom_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/magic_door_bottom_hinge.json
index 8c7fc6e61..1f18cea14 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_door_bottom_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_door_bottom_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/magic_door_bottom",
-        "top": "biomesoplenty:blocks/magic_door_top"
+        "bottom": "biomesoplenty:block/magic_door_bottom",
+        "top": "biomesoplenty:block/magic_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_door_top.json b/src/main/resources/assets/biomesoplenty/models/block/magic_door_top.json
index 6c0614000..c765a00f3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_door_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_door_top.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/magic_door_bottom",
-        "top": "biomesoplenty:blocks/magic_door_top"
+        "bottom": "biomesoplenty:block/magic_door_bottom",
+        "top": "biomesoplenty:block/magic_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_door_top_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/magic_door_top_hinge.json
index 09d222a4a..fb14465df 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_door_top_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_door_top_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/magic_door_bottom",
-        "top": "biomesoplenty:blocks/magic_door_top"
+        "bottom": "biomesoplenty:block/magic_door_bottom",
+        "top": "biomesoplenty:block/magic_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate.json
index f092291f0..3bd966048 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_planks"
+        "texture": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate_open.json
index 0680291a4..b5d271485 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_planks"
+        "texture": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate_wall.json b/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate_wall.json
index fd972141b..282759c7d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate_wall.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate_wall.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_planks"
+        "texture": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate_wall_open.json b/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate_wall_open.json
index bffe56bbf..397399c8c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate_wall_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_fence_gate_wall_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_planks"
+        "texture": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_fence_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/magic_fence_inventory.json
index 97e745372..0e7f9764c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_fence_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_fence_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_planks"
+        "texture": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_fence_post.json b/src/main/resources/assets/biomesoplenty/models/block/magic_fence_post.json
index c2b532e2b..f977f14cf 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_fence_post.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_fence_post.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_post",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_planks"
+        "texture": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_fence_side.json b/src/main/resources/assets/biomesoplenty/models/block/magic_fence_side.json
index 59205f095..433cc2dc1 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_fence_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_fence_side.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_side",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_planks"
+        "texture": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/magic_leaves.json
index 6ad8a6cb6..81396300a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/magic_leaves"
+        "all": "biomesoplenty:block/magic_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_log.json b/src/main/resources/assets/biomesoplenty/models/block/magic_log.json
index 332b78e09..9d52a07f3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/magic_log_top",
-        "side": "biomesoplenty:blocks/magic_log"
+        "end": "biomesoplenty:block/magic_log_top",
+        "side": "biomesoplenty:block/magic_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_planks.json b/src/main/resources/assets/biomesoplenty/models/block/magic_planks.json
index b5226b86f..fce32594b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_planks.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_planks.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/magic_planks"
+        "all": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_pressure_plate.json b/src/main/resources/assets/biomesoplenty/models/block/magic_pressure_plate.json
index e8fcdd08d..eaf8b82cb 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_pressure_plate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_pressure_plate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_up",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_planks"
+        "texture": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_pressure_plate_down.json b/src/main/resources/assets/biomesoplenty/models/block/magic_pressure_plate_down.json
index 5a53d93b1..e445310f9 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_pressure_plate_down.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_pressure_plate_down.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_down",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_planks"
+        "texture": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/magic_sapling.json
index 5db6daabc..c723e6da3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/magic_sapling"
+        "cross": "biomesoplenty:block/magic_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_slab.json b/src/main/resources/assets/biomesoplenty/models/block/magic_slab.json
index e3d617be5..0efc1af45 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/magic_planks",
-        "top": "biomesoplenty:blocks/magic_planks",
-        "side": "biomesoplenty:blocks/magic_planks"
+        "bottom": "biomesoplenty:block/magic_planks",
+        "top": "biomesoplenty:block/magic_planks",
+        "side": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/magic_slab_top.json
index e18ab3be5..9875efd24 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/magic_planks",
-        "top": "biomesoplenty:blocks/magic_planks",
-        "side": "biomesoplenty:blocks/magic_planks"
+        "bottom": "biomesoplenty:block/magic_planks",
+        "top": "biomesoplenty:block/magic_planks",
+        "side": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/magic_stairs.json
index 43b01763a..d691d5f10 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/magic_planks",
-        "top": "biomesoplenty:blocks/magic_planks",
-        "side": "biomesoplenty:blocks/magic_planks"
+        "bottom": "biomesoplenty:block/magic_planks",
+        "top": "biomesoplenty:block/magic_planks",
+        "side": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/magic_stairs_inner.json
index 19c781e15..5e1bcf87f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/magic_planks",
-        "top": "biomesoplenty:blocks/magic_planks",
-        "side": "biomesoplenty:blocks/magic_planks"
+        "bottom": "biomesoplenty:block/magic_planks",
+        "top": "biomesoplenty:block/magic_planks",
+        "side": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/magic_stairs_outer.json
index adfdc49fc..f8b6887c3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/magic_planks",
-        "top": "biomesoplenty:blocks/magic_planks",
-        "side": "biomesoplenty:blocks/magic_planks"
+        "bottom": "biomesoplenty:block/magic_planks",
+        "top": "biomesoplenty:block/magic_planks",
+        "side": "biomesoplenty:block/magic_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_trapdoor_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/magic_trapdoor_bottom.json
index b099cb780..6b3a12927 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_trapdoor_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_trapdoor_bottom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_bottom",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_trapdoor"
+        "texture": "biomesoplenty:block/magic_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_trapdoor_open.json b/src/main/resources/assets/biomesoplenty/models/block/magic_trapdoor_open.json
index 894fd3528..3fb61513b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_trapdoor_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_trapdoor_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_trapdoor"
+        "texture": "biomesoplenty:block/magic_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_trapdoor_top.json b/src/main/resources/assets/biomesoplenty/models/block/magic_trapdoor_top.json
index 9bd08ca0d..2cc9f3797 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_trapdoor_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_trapdoor_top.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_top",
     "textures": {
-        "texture": "biomesoplenty:blocks/magic_trapdoor"
+        "texture": "biomesoplenty:block/magic_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/magic_wood.json b/src/main/resources/assets/biomesoplenty/models/block/magic_wood.json
index 0f7447f7d..4ab5f7036 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/magic_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/magic_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/magic_log",
-        "side": "biomesoplenty:blocks/magic_log"
+        "end": "biomesoplenty:block/magic_log",
+        "side": "biomesoplenty:block/magic_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_button.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_button.json
index 21b0472de..b16997947 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_button.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_button.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_planks"
+        "texture": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_button_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_button_inventory.json
index adc305381..ea72ed4ce 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_button_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_button_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_planks"
+        "texture": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_button_pressed.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_button_pressed.json
index 46e3f76d0..fe19f5108 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_button_pressed.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_button_pressed.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_pressed",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_planks"
+        "texture": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_bottom.json
index a2c396931..f76e917fe 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_bottom.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom",
     "textures": {
-        "bottom": "biomesoplenty:blocks/mahogany_door_bottom",
-        "top": "biomesoplenty:blocks/mahogany_door_top"
+        "bottom": "biomesoplenty:block/mahogany_door_bottom",
+        "top": "biomesoplenty:block/mahogany_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_bottom_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_bottom_hinge.json
index 8d5c575b0..db67fce26 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_bottom_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_bottom_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/mahogany_door_bottom",
-        "top": "biomesoplenty:blocks/mahogany_door_top"
+        "bottom": "biomesoplenty:block/mahogany_door_bottom",
+        "top": "biomesoplenty:block/mahogany_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_top.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_top.json
index 71eea519f..909f6a69e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_top.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/mahogany_door_bottom",
-        "top": "biomesoplenty:blocks/mahogany_door_top"
+        "bottom": "biomesoplenty:block/mahogany_door_bottom",
+        "top": "biomesoplenty:block/mahogany_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_top_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_top_hinge.json
index 26738faef..796529cf9 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_top_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_door_top_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/mahogany_door_bottom",
-        "top": "biomesoplenty:blocks/mahogany_door_top"
+        "bottom": "biomesoplenty:block/mahogany_door_bottom",
+        "top": "biomesoplenty:block/mahogany_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate.json
index eb92d2b76..9e5c7092f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_planks"
+        "texture": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate_open.json
index 4248e1062..cb03380f5 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_planks"
+        "texture": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate_wall.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate_wall.json
index afa02bb24..4ad1d98c0 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate_wall.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate_wall.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_planks"
+        "texture": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate_wall_open.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate_wall_open.json
index 6400c9d6d..1e7513ebc 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate_wall_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_gate_wall_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_planks"
+        "texture": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_inventory.json
index 00cd3b53c..e60c589dc 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_planks"
+        "texture": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_post.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_post.json
index ccc9c701a..06cf55d1c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_post.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_post.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_post",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_planks"
+        "texture": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_side.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_side.json
index 8a2705b34..4a3c3d2da 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_fence_side.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_side",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_planks"
+        "texture": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_leaves.json
index 75706365b..730fd2c8d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/mahogany_leaves"
+        "all": "biomesoplenty:block/mahogany_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_log.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_log.json
index 029d9ba64..c17f299f7 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/mahogany_log_top",
-        "side": "biomesoplenty:blocks/mahogany_log"
+        "end": "biomesoplenty:block/mahogany_log_top",
+        "side": "biomesoplenty:block/mahogany_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_planks.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_planks.json
index e7be1051b..68c875490 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_planks.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_planks.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/mahogany_planks"
+        "all": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_pressure_plate.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_pressure_plate.json
index d5bccaa2a..3bfedef2d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_pressure_plate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_pressure_plate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_up",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_planks"
+        "texture": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_pressure_plate_down.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_pressure_plate_down.json
index d66d49ce8..3a12ce990 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_pressure_plate_down.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_pressure_plate_down.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_down",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_planks"
+        "texture": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_sapling.json
index 99cefe180..02bd95961 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/mahogany_sapling"
+        "cross": "biomesoplenty:block/mahogany_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_slab.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_slab.json
index fc99d54d9..eb6d72c25 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/mahogany_planks",
-        "top": "biomesoplenty:blocks/mahogany_planks",
-        "side": "biomesoplenty:blocks/mahogany_planks"
+        "bottom": "biomesoplenty:block/mahogany_planks",
+        "top": "biomesoplenty:block/mahogany_planks",
+        "side": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_slab_top.json
index 4c4951936..a6cdef448 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/mahogany_planks",
-        "top": "biomesoplenty:blocks/mahogany_planks",
-        "side": "biomesoplenty:blocks/mahogany_planks"
+        "bottom": "biomesoplenty:block/mahogany_planks",
+        "top": "biomesoplenty:block/mahogany_planks",
+        "side": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_stairs.json
index 3262c732a..0641162ab 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/mahogany_planks",
-        "top": "biomesoplenty:blocks/mahogany_planks",
-        "side": "biomesoplenty:blocks/mahogany_planks"
+        "bottom": "biomesoplenty:block/mahogany_planks",
+        "top": "biomesoplenty:block/mahogany_planks",
+        "side": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_stairs_inner.json
index cdc065886..d2543e7bd 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/mahogany_planks",
-        "top": "biomesoplenty:blocks/mahogany_planks",
-        "side": "biomesoplenty:blocks/mahogany_planks"
+        "bottom": "biomesoplenty:block/mahogany_planks",
+        "top": "biomesoplenty:block/mahogany_planks",
+        "side": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_stairs_outer.json
index 6eca08bd3..984d5d205 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/mahogany_planks",
-        "top": "biomesoplenty:blocks/mahogany_planks",
-        "side": "biomesoplenty:blocks/mahogany_planks"
+        "bottom": "biomesoplenty:block/mahogany_planks",
+        "top": "biomesoplenty:block/mahogany_planks",
+        "side": "biomesoplenty:block/mahogany_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_trapdoor_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_trapdoor_bottom.json
index b4343986f..ba3430f06 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_trapdoor_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_trapdoor_bottom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_bottom",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_trapdoor"
+        "texture": "biomesoplenty:block/mahogany_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_trapdoor_open.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_trapdoor_open.json
index 6f292f060..20f29d522 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_trapdoor_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_trapdoor_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_trapdoor"
+        "texture": "biomesoplenty:block/mahogany_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_trapdoor_top.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_trapdoor_top.json
index 8265f948b..1677bdef0 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_trapdoor_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_trapdoor_top.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_top",
     "textures": {
-        "texture": "biomesoplenty:blocks/mahogany_trapdoor"
+        "texture": "biomesoplenty:block/mahogany_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_wood.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_wood.json
index 3ad62231e..b7be0c710 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mahogany_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/mahogany_log",
-        "side": "biomesoplenty:blocks/mahogany_log"
+        "end": "biomesoplenty:block/mahogany_log",
+        "side": "biomesoplenty:block/mahogany_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mangrove_root.json b/src/main/resources/assets/biomesoplenty/models/block/mangrove_root.json
index 04759e463..4a97e3ede 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mangrove_root.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mangrove_root.json
@@ -1,7 +1,7 @@
 {
     "parent": "biomesoplenty:block/water_plant",
     "textures": {
-    	"cross_top": "biomesoplenty:blocks/mangrove_root_top",
-		"cross_bottom": "biomesoplenty:blocks/mangrove_root_bottom"
+    	"cross_top": "biomesoplenty:block/mangrove_root_top",
+		"cross_bottom": "biomesoplenty:block/mangrove_root_bottom"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/maple_leaves.json
index 86a104149..a22820bac 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/maple_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/maple_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/maple_leaves"
+        "all": "biomesoplenty:block/maple_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/maple_sapling.json
index 534e4a8b7..9a1d67a30 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/maple_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/maple_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/maple_sapling"
+        "cross": "biomesoplenty:block/maple_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud.json b/src/main/resources/assets/biomesoplenty/models/block/mud.json
index 71ffba582..0c121cc3f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mud.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mud.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/mud"
+        "all": "biomesoplenty:block/mud"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab.json
index dee9408d1..6087af8e9 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/mud_bricks",
-        "top": "biomesoplenty:blocks/mud_bricks",
-        "side": "biomesoplenty:blocks/mud_bricks"
+        "bottom": "biomesoplenty:block/mud_bricks",
+        "top": "biomesoplenty:block/mud_bricks",
+        "side": "biomesoplenty:block/mud_bricks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab_top.json
index 5ddf0a401..20d4b4ac1 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/mud_bricks",
-        "top": "biomesoplenty:blocks/mud_bricks",
-        "side": "biomesoplenty:blocks/mud_bricks"
+        "bottom": "biomesoplenty:block/mud_bricks",
+        "top": "biomesoplenty:block/mud_bricks",
+        "side": "biomesoplenty:block/mud_bricks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs.json
index 937b0371d..9646fa359 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/mud_bricks",
-        "top": "biomesoplenty:blocks/mud_bricks",
-        "side": "biomesoplenty:blocks/mud_bricks"
+        "bottom": "biomesoplenty:block/mud_bricks",
+        "top": "biomesoplenty:block/mud_bricks",
+        "side": "biomesoplenty:block/mud_bricks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_inner.json
index 23582320c..5c88b9c64 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/mud_bricks",
-        "top": "biomesoplenty:blocks/mud_bricks",
-        "side": "biomesoplenty:blocks/mud_bricks"
+        "bottom": "biomesoplenty:block/mud_bricks",
+        "top": "biomesoplenty:block/mud_bricks",
+        "side": "biomesoplenty:block/mud_bricks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_outer.json
index cdc5deb5a..951a8db95 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/mud_bricks",
-        "top": "biomesoplenty:blocks/mud_bricks",
-        "side": "biomesoplenty:blocks/mud_bricks"
+        "bottom": "biomesoplenty:block/mud_bricks",
+        "top": "biomesoplenty:block/mud_bricks",
+        "side": "biomesoplenty:block/mud_bricks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_inventory.json
index 706661acc..cae6906e1 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/wall_inventory",
     "textures": {
-        "wall": "biomesoplenty:blocks/mud_bricks"
+        "wall": "biomesoplenty:block/mud_bricks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_post.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_post.json
index 7ba887611..dffb905ea 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_post.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_post.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_wall_post",
     "textures": {
-        "wall": "biomesoplenty:blocks/mud_bricks"
+        "wall": "biomesoplenty:block/mud_bricks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_side.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_side.json
index 1b14cb42c..8a05aa667 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_wall_side.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_wall_side",
     "textures": {
-        "wall": "biomesoplenty:blocks/mud_bricks"
+        "wall": "biomesoplenty:block/mud_bricks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_bricks.json b/src/main/resources/assets/biomesoplenty/models/block/mud_bricks.json
index c151c9bd5..eecc93274 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/mud_bricks.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/mud_bricks.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/mud_bricks"
+        "all": "biomesoplenty:block/mud_bricks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_autumn_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/orange_autumn_leaves.json
index a7b301fef..3ab8b1079 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/orange_autumn_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/orange_autumn_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/orange_autumn_leaves"
+        "all": "biomesoplenty:block/orange_autumn_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/orange_autumn_sapling.json
index efccf6873..9008e99d6 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/orange_autumn_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/orange_autumn_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/orange_autumn_sapling"
+        "cross": "biomesoplenty:block/orange_autumn_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_cosmos.json b/src/main/resources/assets/biomesoplenty/models/block/orange_cosmos.json
index 3969d2944..d679075a3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/orange_cosmos.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/orange_cosmos.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/orange_cosmos"
+        "cross": "biomesoplenty:block/orange_cosmos"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/origin_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/origin_leaves.json
index 69c8e360c..5e847b15b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/origin_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/origin_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/origin_leaves"
+        "all": "biomesoplenty:block/origin_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/origin_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/origin_sapling.json
index 0f315a634..4d8125868 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/origin_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/origin_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/origin_sapling"
+        "cross": "biomesoplenty:block/origin_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_button.json b/src/main/resources/assets/biomesoplenty/models/block/palm_button.json
index 1449adc9c..78fc80d00 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_button.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_button.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_planks"
+        "texture": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_button_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/palm_button_inventory.json
index 9c80fa580..9a1dc2a66 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_button_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_button_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_planks"
+        "texture": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_button_pressed.json b/src/main/resources/assets/biomesoplenty/models/block/palm_button_pressed.json
index 9f80084e8..8fa73e2e3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_button_pressed.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_button_pressed.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_pressed",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_planks"
+        "texture": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_door_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/palm_door_bottom.json
index 39cd55f71..8820b483f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_door_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_door_bottom.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom",
     "textures": {
-        "bottom": "biomesoplenty:blocks/palm_door_bottom",
-        "top": "biomesoplenty:blocks/palm_door_top"
+        "bottom": "biomesoplenty:block/palm_door_bottom",
+        "top": "biomesoplenty:block/palm_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_door_bottom_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/palm_door_bottom_hinge.json
index 737ae3636..3197daddf 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_door_bottom_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_door_bottom_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/palm_door_bottom",
-        "top": "biomesoplenty:blocks/palm_door_top"
+        "bottom": "biomesoplenty:block/palm_door_bottom",
+        "top": "biomesoplenty:block/palm_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_door_top.json b/src/main/resources/assets/biomesoplenty/models/block/palm_door_top.json
index 5a1062674..56bc36e32 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_door_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_door_top.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/palm_door_bottom",
-        "top": "biomesoplenty:blocks/palm_door_top"
+        "bottom": "biomesoplenty:block/palm_door_bottom",
+        "top": "biomesoplenty:block/palm_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_door_top_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/palm_door_top_hinge.json
index aaabb130c..c573d7b4f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_door_top_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_door_top_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/palm_door_bottom",
-        "top": "biomesoplenty:blocks/palm_door_top"
+        "bottom": "biomesoplenty:block/palm_door_bottom",
+        "top": "biomesoplenty:block/palm_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate.json
index 90f807a7b..6509d121b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_planks"
+        "texture": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate_open.json
index 90e7c0919..714911e03 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_planks"
+        "texture": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate_wall.json b/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate_wall.json
index 9384d3805..f28f532ac 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate_wall.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate_wall.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_planks"
+        "texture": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate_wall_open.json b/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate_wall_open.json
index 3b1508b4b..6d0e4982c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate_wall_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_fence_gate_wall_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_planks"
+        "texture": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_fence_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/palm_fence_inventory.json
index 177332efe..d54995fe3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_fence_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_fence_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_planks"
+        "texture": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_fence_post.json b/src/main/resources/assets/biomesoplenty/models/block/palm_fence_post.json
index 14af6928a..13234a3c8 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_fence_post.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_fence_post.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_post",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_planks"
+        "texture": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_fence_side.json b/src/main/resources/assets/biomesoplenty/models/block/palm_fence_side.json
index d93de40f4..5c18da82b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_fence_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_fence_side.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_side",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_planks"
+        "texture": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/palm_leaves.json
index 766fdd63d..2ef414147 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/palm_leaves"
+        "all": "biomesoplenty:block/palm_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_log.json b/src/main/resources/assets/biomesoplenty/models/block/palm_log.json
index 6dabce514..0dd816c0a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/palm_log_top",
-        "side": "biomesoplenty:blocks/palm_log"
+        "end": "biomesoplenty:block/palm_log_top",
+        "side": "biomesoplenty:block/palm_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_planks.json b/src/main/resources/assets/biomesoplenty/models/block/palm_planks.json
index ac2776e1e..5a4041137 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_planks.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_planks.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/palm_planks"
+        "all": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_pressure_plate.json b/src/main/resources/assets/biomesoplenty/models/block/palm_pressure_plate.json
index 13d1ad872..c08f77571 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_pressure_plate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_pressure_plate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_up",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_planks"
+        "texture": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_pressure_plate_down.json b/src/main/resources/assets/biomesoplenty/models/block/palm_pressure_plate_down.json
index 99d9f515b..ff3f98620 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_pressure_plate_down.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_pressure_plate_down.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_down",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_planks"
+        "texture": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/palm_sapling.json
index e5073b06a..6a8d88add 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/palm_sapling"
+        "cross": "biomesoplenty:block/palm_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_slab.json b/src/main/resources/assets/biomesoplenty/models/block/palm_slab.json
index c602bb394..3da0bebaa 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/palm_planks",
-        "top": "biomesoplenty:blocks/palm_planks",
-        "side": "biomesoplenty:blocks/palm_planks"
+        "bottom": "biomesoplenty:block/palm_planks",
+        "top": "biomesoplenty:block/palm_planks",
+        "side": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/palm_slab_top.json
index 102e829aa..bd2d02579 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/palm_planks",
-        "top": "biomesoplenty:blocks/palm_planks",
-        "side": "biomesoplenty:blocks/palm_planks"
+        "bottom": "biomesoplenty:block/palm_planks",
+        "top": "biomesoplenty:block/palm_planks",
+        "side": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/palm_stairs.json
index 57420e056..4ddcc1baa 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/palm_planks",
-        "top": "biomesoplenty:blocks/palm_planks",
-        "side": "biomesoplenty:blocks/palm_planks"
+        "bottom": "biomesoplenty:block/palm_planks",
+        "top": "biomesoplenty:block/palm_planks",
+        "side": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/palm_stairs_inner.json
index 3a44daadf..9ab710479 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/palm_planks",
-        "top": "biomesoplenty:blocks/palm_planks",
-        "side": "biomesoplenty:blocks/palm_planks"
+        "bottom": "biomesoplenty:block/palm_planks",
+        "top": "biomesoplenty:block/palm_planks",
+        "side": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/palm_stairs_outer.json
index 7095bd756..b4ef5e911 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/palm_planks",
-        "top": "biomesoplenty:blocks/palm_planks",
-        "side": "biomesoplenty:blocks/palm_planks"
+        "bottom": "biomesoplenty:block/palm_planks",
+        "top": "biomesoplenty:block/palm_planks",
+        "side": "biomesoplenty:block/palm_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_trapdoor_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/palm_trapdoor_bottom.json
index 4ce72cc8b..00119e541 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_trapdoor_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_trapdoor_bottom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_bottom",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_trapdoor"
+        "texture": "biomesoplenty:block/palm_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_trapdoor_open.json b/src/main/resources/assets/biomesoplenty/models/block/palm_trapdoor_open.json
index bdf670946..ef8b78214 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_trapdoor_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_trapdoor_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_trapdoor"
+        "texture": "biomesoplenty:block/palm_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_trapdoor_top.json b/src/main/resources/assets/biomesoplenty/models/block/palm_trapdoor_top.json
index 93d02b389..4971b06d9 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_trapdoor_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_trapdoor_top.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_top",
     "textures": {
-        "texture": "biomesoplenty:blocks/palm_trapdoor"
+        "texture": "biomesoplenty:block/palm_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/palm_wood.json b/src/main/resources/assets/biomesoplenty/models/block/palm_wood.json
index cab77846d..ac2bc4cab 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/palm_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/palm_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/palm_log",
-        "side": "biomesoplenty:blocks/palm_log"
+        "end": "biomesoplenty:block/palm_log",
+        "side": "biomesoplenty:block/palm_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/pink_cherry_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/pink_cherry_leaves.json
index acc8ed5b6..9b331dc07 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/pink_cherry_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/pink_cherry_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/pink_cherry_leaves"
+        "all": "biomesoplenty:block/pink_cherry_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/pink_cherry_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/pink_cherry_sapling.json
index 32a77c72c..158c8b72b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/pink_cherry_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/pink_cherry_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/pink_cherry_sapling"
+        "cross": "biomesoplenty:block/pink_cherry_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/pink_daffodil.json b/src/main/resources/assets/biomesoplenty/models/block/pink_daffodil.json
index 6bcca00d4..dbd4c85c3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/pink_daffodil.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/pink_daffodil.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/pink_daffodil"
+        "cross": "biomesoplenty:block/pink_daffodil"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/pink_hibiscus.json b/src/main/resources/assets/biomesoplenty/models/block/pink_hibiscus.json
index c945f021d..1505342b5 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/pink_hibiscus.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/pink_hibiscus.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/pink_hibiscus"
+        "cross": "biomesoplenty:block/pink_hibiscus"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_blue_hydrangea.json b/src/main/resources/assets/biomesoplenty/models/block/potted_blue_hydrangea.json
index 329ffb3e1..5b5ffc48a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_blue_hydrangea.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_blue_hydrangea.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/blue_hydrangea"
+        "plant": "biomesoplenty:block/blue_hydrangea"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_burning_blossom.json b/src/main/resources/assets/biomesoplenty/models/block/potted_burning_blossom.json
index aa8d6f04a..a8a139052 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_burning_blossom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_burning_blossom.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/burning_blossom"
+        "plant": "biomesoplenty:block/burning_blossom"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_dead_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_dead_sapling.json
index 360b509b5..67ed3ff35 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_dead_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_dead_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/dead_sapling"
+        "plant": "biomesoplenty:block/dead_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_ethereal_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_ethereal_sapling.json
index 5bc23e1ba..9d6ea620d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_ethereal_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_ethereal_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/ethereal_sapling"
+        "plant": "biomesoplenty:block/ethereal_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_fir_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_fir_sapling.json
index 2283fe6f4..7027c2f01 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_fir_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_fir_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/fir_sapling"
+        "plant": "biomesoplenty:block/fir_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_flowering_oak_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_flowering_oak_sapling.json
index e6387a77e..3e0bbd8da 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_flowering_oak_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_flowering_oak_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/flowering_oak_sapling"
+        "plant": "biomesoplenty:block/flowering_oak_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_glowflower.json b/src/main/resources/assets/biomesoplenty/models/block/potted_glowflower.json
index bf1ddd045..f8cced96c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_glowflower.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_glowflower.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/glowflower"
+        "plant": "biomesoplenty:block/glowflower"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_glowshroom.json b/src/main/resources/assets/biomesoplenty/models/block/potted_glowshroom.json
index be2dd8e50..8c9e68bcc 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_glowshroom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_glowshroom.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/potted_glowshroom"
+        "plant": "biomesoplenty:block/potted_glowshroom"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_goldenrod.json b/src/main/resources/assets/biomesoplenty/models/block/potted_goldenrod.json
index d92d22422..f5dd9211e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_goldenrod.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_goldenrod.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/goldenrod"
+        "plant": "biomesoplenty:block/goldenrod"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_hellbark_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_hellbark_sapling.json
index 238735e7d..8815d8fd2 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_hellbark_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_hellbark_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/hellbark_sapling"
+        "plant": "biomesoplenty:block/hellbark_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_jacaranda_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_jacaranda_sapling.json
index 66023e4c6..d9d55c264 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_jacaranda_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_jacaranda_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/jacaranda_sapling"
+        "plant": "biomesoplenty:block/jacaranda_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_lavender.json b/src/main/resources/assets/biomesoplenty/models/block/potted_lavender.json
index fa4bcf796..a798f2455 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_lavender.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_lavender.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/potted_lavender"
+        "plant": "biomesoplenty:block/potted_lavender"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_magic_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_magic_sapling.json
index eacbfa250..9b82590df 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_magic_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_magic_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/magic_sapling"
+        "plant": "biomesoplenty:block/magic_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_mahogany_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_mahogany_sapling.json
index 49b8e0909..8e051d940 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_mahogany_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_mahogany_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/mahogany_sapling"
+        "plant": "biomesoplenty:block/mahogany_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_maple_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_maple_sapling.json
index 5a727f32a..8955dfce5 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_maple_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_maple_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/maple_sapling"
+        "plant": "biomesoplenty:block/maple_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_orange_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_orange_autumn_sapling.json
index 4e62a9a27..1da1e8a01 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_orange_autumn_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_orange_autumn_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/orange_autumn_sapling"
+        "plant": "biomesoplenty:block/orange_autumn_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_orange_cosmos.json b/src/main/resources/assets/biomesoplenty/models/block/potted_orange_cosmos.json
index 68c1e29c6..2d488db9e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_orange_cosmos.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_orange_cosmos.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/orange_cosmos"
+        "plant": "biomesoplenty:block/orange_cosmos"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_origin_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_origin_sapling.json
index bc7cb5f26..dbbc8eccf 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_origin_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_origin_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/origin_sapling"
+        "plant": "biomesoplenty:block/origin_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_palm_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_palm_sapling.json
index b0610d121..f1e8344c0 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_palm_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_palm_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/palm_sapling"
+        "plant": "biomesoplenty:block/palm_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_pink_cherry_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_pink_cherry_sapling.json
index 05867476b..63d809492 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_pink_cherry_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_pink_cherry_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/pink_cherry_sapling"
+        "plant": "biomesoplenty:block/pink_cherry_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_pink_daffodil.json b/src/main/resources/assets/biomesoplenty/models/block/potted_pink_daffodil.json
index 76f25b286..68710f51c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_pink_daffodil.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_pink_daffodil.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/pink_daffodil"
+        "plant": "biomesoplenty:block/pink_daffodil"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_pink_hibiscus.json b/src/main/resources/assets/biomesoplenty/models/block/potted_pink_hibiscus.json
index b49dd0c2c..34fe5bc7c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_pink_hibiscus.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_pink_hibiscus.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/pink_hibiscus"
+        "plant": "biomesoplenty:block/pink_hibiscus"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_redwood_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_redwood_sapling.json
index 4506ff08b..5b0ec1604 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_redwood_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_redwood_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/redwood_sapling"
+        "plant": "biomesoplenty:block/redwood_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_rose.json b/src/main/resources/assets/biomesoplenty/models/block/potted_rose.json
index 6c2ccdf16..7c91f955f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_rose.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_rose.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/rose"
+        "plant": "biomesoplenty:block/rose"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_sprout.json b/src/main/resources/assets/biomesoplenty/models/block/potted_sprout.json
index 73109a80d..02979defc 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_sprout.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_sprout.json
@@ -4,7 +4,7 @@
         "particle": "minecraft:block/flower_pot",
         "flowerpot": "minecraft:block/flower_pot",
         "dirt": "minecraft:block/dirt",
-        "plant": "biomesoplenty:blocks/potted_sprout"
+        "plant": "biomesoplenty:block/potted_sprout"
     },
     "elements": [
         {   "from": [ 5, 0, 5 ],
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_toadstool.json b/src/main/resources/assets/biomesoplenty/models/block/potted_toadstool.json
index 2c8393b72..6cfcebb51 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_toadstool.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_toadstool.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/toadstool"
+        "plant": "biomesoplenty:block/toadstool"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_umbran_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_umbran_sapling.json
index 04ba75b64..3d85ed1f0 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_umbran_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_umbran_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/umbran_sapling"
+        "plant": "biomesoplenty:block/umbran_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_violet.json b/src/main/resources/assets/biomesoplenty/models/block/potted_violet.json
index 7f52dcdb0..6eaccc0c2 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_violet.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_violet.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/potted_violet"
+        "plant": "biomesoplenty:block/potted_violet"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_white_cherry_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_white_cherry_sapling.json
index 4ab6556d8..001dce02a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_white_cherry_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_white_cherry_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/white_cherry_sapling"
+        "plant": "biomesoplenty:block/white_cherry_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_wildflower.json b/src/main/resources/assets/biomesoplenty/models/block/potted_wildflower.json
index 418240560..bf9c00782 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_wildflower.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_wildflower.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/wildflower"
+        "plant": "biomesoplenty:block/wildflower"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_willow_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_willow_sapling.json
index 44d42a955..6941312d5 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_willow_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_willow_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/willow_sapling"
+        "plant": "biomesoplenty:block/willow_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_wilted_lily.json b/src/main/resources/assets/biomesoplenty/models/block/potted_wilted_lily.json
index 846985249..9aabcbcf4 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_wilted_lily.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_wilted_lily.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/wilted_lily"
+        "plant": "biomesoplenty:block/wilted_lily"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_yellow_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_yellow_autumn_sapling.json
index 773d7f729..2abf81ba6 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/potted_yellow_autumn_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/potted_yellow_autumn_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/flower_pot_cross",
     "textures": {
-        "plant": "biomesoplenty:blocks/yellow_autumn_sapling"
+        "plant": "biomesoplenty:block/yellow_autumn_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_button.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_button.json
index aaf35eb44..d8e66f0ca 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_button.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_button.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_planks"
+        "texture": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_button_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_button_inventory.json
index f8fc8d283..d0e020304 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_button_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_button_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_planks"
+        "texture": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_button_pressed.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_button_pressed.json
index 461a473e9..95dc36c54 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_button_pressed.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_button_pressed.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_pressed",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_planks"
+        "texture": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_door_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_door_bottom.json
index 8fab98558..c576b9fd8 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_door_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_door_bottom.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom",
     "textures": {
-        "bottom": "biomesoplenty:blocks/redwood_door_bottom",
-        "top": "biomesoplenty:blocks/redwood_door_top"
+        "bottom": "biomesoplenty:block/redwood_door_bottom",
+        "top": "biomesoplenty:block/redwood_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_door_bottom_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_door_bottom_hinge.json
index f97d5482b..38c5eb172 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_door_bottom_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_door_bottom_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/redwood_door_bottom",
-        "top": "biomesoplenty:blocks/redwood_door_top"
+        "bottom": "biomesoplenty:block/redwood_door_bottom",
+        "top": "biomesoplenty:block/redwood_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_door_top.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_door_top.json
index 400b90c7c..88b45bd01 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_door_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_door_top.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/redwood_door_bottom",
-        "top": "biomesoplenty:blocks/redwood_door_top"
+        "bottom": "biomesoplenty:block/redwood_door_bottom",
+        "top": "biomesoplenty:block/redwood_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_door_top_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_door_top_hinge.json
index 044b92a10..853cbb9ae 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_door_top_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_door_top_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/redwood_door_bottom",
-        "top": "biomesoplenty:blocks/redwood_door_top"
+        "bottom": "biomesoplenty:block/redwood_door_bottom",
+        "top": "biomesoplenty:block/redwood_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate.json
index d2b189148..c7804031a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_planks"
+        "texture": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate_open.json
index 7b403ebd7..d35695574 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_planks"
+        "texture": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate_wall.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate_wall.json
index 598bc90b2..6c461f03f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate_wall.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate_wall.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_planks"
+        "texture": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate_wall_open.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate_wall_open.json
index cabde35c6..3066c3381 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate_wall_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_gate_wall_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_planks"
+        "texture": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_inventory.json
index d92e3acde..899993105 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_planks"
+        "texture": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_post.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_post.json
index 62c9a1c15..cd3dd2f92 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_post.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_post.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_post",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_planks"
+        "texture": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_side.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_side.json
index 17bb8490a..8c597d3ef 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_fence_side.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_side",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_planks"
+        "texture": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_leaves.json
index 7cb55cb9c..6778689d0 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/redwood_leaves"
+        "all": "biomesoplenty:block/redwood_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_log.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_log.json
index 7d7585c83..795cb0317 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/redwood_log_top",
-        "side": "biomesoplenty:blocks/redwood_log"
+        "end": "biomesoplenty:block/redwood_log_top",
+        "side": "biomesoplenty:block/redwood_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_planks.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_planks.json
index 5d67c8ebb..267ac7208 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_planks.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_planks.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/redwood_planks"
+        "all": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_pressure_plate.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_pressure_plate.json
index 6d6274b44..37249f9e5 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_pressure_plate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_pressure_plate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_up",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_planks"
+        "texture": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_pressure_plate_down.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_pressure_plate_down.json
index 3db1e0604..f03d2fd78 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_pressure_plate_down.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_pressure_plate_down.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_down",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_planks"
+        "texture": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_sapling.json
index 3854e9c2f..9cd1ea1fd 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/redwood_sapling"
+        "cross": "biomesoplenty:block/redwood_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_slab.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_slab.json
index bd7b29f4b..8db8a6bb4 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/redwood_planks",
-        "top": "biomesoplenty:blocks/redwood_planks",
-        "side": "biomesoplenty:blocks/redwood_planks"
+        "bottom": "biomesoplenty:block/redwood_planks",
+        "top": "biomesoplenty:block/redwood_planks",
+        "side": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_slab_top.json
index 2ada933e1..976bb9d93 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/redwood_planks",
-        "top": "biomesoplenty:blocks/redwood_planks",
-        "side": "biomesoplenty:blocks/redwood_planks"
+        "bottom": "biomesoplenty:block/redwood_planks",
+        "top": "biomesoplenty:block/redwood_planks",
+        "side": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_stairs.json
index 2bb1bdf84..8d417593d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/redwood_planks",
-        "top": "biomesoplenty:blocks/redwood_planks",
-        "side": "biomesoplenty:blocks/redwood_planks"
+        "bottom": "biomesoplenty:block/redwood_planks",
+        "top": "biomesoplenty:block/redwood_planks",
+        "side": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_stairs_inner.json
index 57a839a06..7966a1a46 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/redwood_planks",
-        "top": "biomesoplenty:blocks/redwood_planks",
-        "side": "biomesoplenty:blocks/redwood_planks"
+        "bottom": "biomesoplenty:block/redwood_planks",
+        "top": "biomesoplenty:block/redwood_planks",
+        "side": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_stairs_outer.json
index 5a169b922..6d3045d61 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/redwood_planks",
-        "top": "biomesoplenty:blocks/redwood_planks",
-        "side": "biomesoplenty:blocks/redwood_planks"
+        "bottom": "biomesoplenty:block/redwood_planks",
+        "top": "biomesoplenty:block/redwood_planks",
+        "side": "biomesoplenty:block/redwood_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_trapdoor_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_trapdoor_bottom.json
index 819b0b8b5..57998097e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_trapdoor_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_trapdoor_bottom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_bottom",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_trapdoor"
+        "texture": "biomesoplenty:block/redwood_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_trapdoor_open.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_trapdoor_open.json
index 52baab8cf..9d570bfc1 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_trapdoor_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_trapdoor_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_trapdoor"
+        "texture": "biomesoplenty:block/redwood_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_trapdoor_top.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_trapdoor_top.json
index 165eafa5f..70bf80d9b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_trapdoor_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_trapdoor_top.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_top",
     "textures": {
-        "texture": "biomesoplenty:blocks/redwood_trapdoor"
+        "texture": "biomesoplenty:block/redwood_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/redwood_wood.json b/src/main/resources/assets/biomesoplenty/models/block/redwood_wood.json
index f3c988e0e..5230ad85e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/redwood_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/redwood_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/redwood_log",
-        "side": "biomesoplenty:blocks/redwood_log"
+        "end": "biomesoplenty:block/redwood_log",
+        "side": "biomesoplenty:block/redwood_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/reed.json b/src/main/resources/assets/biomesoplenty/models/block/reed.json
index 06fb672c1..b48d36fd7 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/reed.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/reed.json
@@ -1,7 +1,7 @@
 {
     "parent": "biomesoplenty:block/water_plant",
     "textures": {
-    	"cross_top": "biomesoplenty:blocks/reed_top",
-		"cross_bottom": "biomesoplenty:blocks/reed_bottom"
+    	"cross_top": "biomesoplenty:block/reed_top",
+		"cross_bottom": "biomesoplenty:block/reed_bottom"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/block/rose.json b/src/main/resources/assets/biomesoplenty/models/block/rose.json
index f0e63e9a5..11bb2a1ba 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/rose.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/rose.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/rose"
+        "cross": "biomesoplenty:block/rose"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone.json
index f6fa4f4c7..cccdc4019 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/white_sandstone_top"
+        "all": "biomesoplenty:block/white_sandstone_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab.json
index 4d86a1188..d2f414168 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/white_sandstone_top",
-        "top": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/white_sandstone_top"
+        "bottom": "biomesoplenty:block/white_sandstone_top",
+        "top": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/white_sandstone_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab_top.json
index 75a883621..e6845efd7 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/white_sandstone_top",
-        "top": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/white_sandstone_top"
+        "bottom": "biomesoplenty:block/white_sandstone_top",
+        "top": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/white_sandstone_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs.json
index 36a3d78b1..bcd88f0f3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/white_sandstone_top",
-        "top": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/white_sandstone_top"
+        "bottom": "biomesoplenty:block/white_sandstone_top",
+        "top": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/white_sandstone_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_inner.json
index c1482e76f..8a57baabf 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/white_sandstone_top",
-        "top": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/white_sandstone_top"
+        "bottom": "biomesoplenty:block/white_sandstone_top",
+        "top": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/white_sandstone_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_outer.json
index dc682abc1..f7fc574c4 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/white_sandstone_top",
-        "top": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/white_sandstone_top"
+        "bottom": "biomesoplenty:block/white_sandstone_top",
+        "top": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/white_sandstone_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/sprout.json b/src/main/resources/assets/biomesoplenty/models/block/sprout.json
index 25195220d..273e9b897 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/sprout.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/sprout.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/tinted_cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/sprout"
+        "cross": "biomesoplenty:block/sprout"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_cherry_log.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_cherry_log.json
index b23f24869..74d014470 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_cherry_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_cherry_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_cherry_log_top",
-        "side": "biomesoplenty:blocks/stripped_cherry_log"
+        "end": "biomesoplenty:block/stripped_cherry_log_top",
+        "side": "biomesoplenty:block/stripped_cherry_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_cherry_wood.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_cherry_wood.json
index 9c25021fc..17830615c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_cherry_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_cherry_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_cherry_log",
-        "side": "biomesoplenty:blocks/stripped_cherry_log"
+        "end": "biomesoplenty:block/stripped_cherry_log",
+        "side": "biomesoplenty:block/stripped_cherry_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_dead_log.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_dead_log.json
index 9f5c9c954..686937e72 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_dead_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_dead_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_dead_log_top",
-        "side": "biomesoplenty:blocks/stripped_dead_log"
+        "end": "biomesoplenty:block/stripped_dead_log_top",
+        "side": "biomesoplenty:block/stripped_dead_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_dead_wood.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_dead_wood.json
index 65858c837..1b25b8263 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_dead_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_dead_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_dead_log",
-        "side": "biomesoplenty:blocks/stripped_dead_log"
+        "end": "biomesoplenty:block/stripped_dead_log",
+        "side": "biomesoplenty:block/stripped_dead_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_ethereal_log.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_ethereal_log.json
index 22e40d48a..66632a6fa 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_ethereal_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_ethereal_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_ethereal_log_top",
-        "side": "biomesoplenty:blocks/stripped_ethereal_log"
+        "end": "biomesoplenty:block/stripped_ethereal_log_top",
+        "side": "biomesoplenty:block/stripped_ethereal_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_ethereal_wood.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_ethereal_wood.json
index 7389ce2d7..9329c0c10 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_ethereal_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_ethereal_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_ethereal_log",
-        "side": "biomesoplenty:blocks/stripped_ethereal_log"
+        "end": "biomesoplenty:block/stripped_ethereal_log",
+        "side": "biomesoplenty:block/stripped_ethereal_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_fir_log.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_fir_log.json
index 8b5333a89..68da36ca1 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_fir_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_fir_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_fir_log_top",
-        "side": "biomesoplenty:blocks/stripped_fir_log"
+        "end": "biomesoplenty:block/stripped_fir_log_top",
+        "side": "biomesoplenty:block/stripped_fir_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_fir_wood.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_fir_wood.json
index 6858041d9..8b9df7eb3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_fir_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_fir_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_fir_log",
-        "side": "biomesoplenty:blocks/stripped_fir_log"
+        "end": "biomesoplenty:block/stripped_fir_log",
+        "side": "biomesoplenty:block/stripped_fir_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_hellbark_log.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_hellbark_log.json
index edcd63967..4cc7ef970 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_hellbark_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_hellbark_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_hellbark_log_top",
-        "side": "biomesoplenty:blocks/stripped_hellbark_log"
+        "end": "biomesoplenty:block/stripped_hellbark_log_top",
+        "side": "biomesoplenty:block/stripped_hellbark_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_hellbark_wood.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_hellbark_wood.json
index 5cf519e41..0511b9740 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_hellbark_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_hellbark_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_hellbark_log",
-        "side": "biomesoplenty:blocks/stripped_hellbark_log"
+        "end": "biomesoplenty:block/stripped_hellbark_log",
+        "side": "biomesoplenty:block/stripped_hellbark_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_jacaranda_log.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_jacaranda_log.json
index ffb30aede..6f516ea98 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_jacaranda_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_jacaranda_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_jacaranda_log_top",
-        "side": "biomesoplenty:blocks/stripped_jacaranda_log"
+        "end": "biomesoplenty:block/stripped_jacaranda_log_top",
+        "side": "biomesoplenty:block/stripped_jacaranda_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_jacaranda_wood.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_jacaranda_wood.json
index b0608358a..98a019780 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_jacaranda_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_jacaranda_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_jacaranda_log",
-        "side": "biomesoplenty:blocks/stripped_jacaranda_log"
+        "end": "biomesoplenty:block/stripped_jacaranda_log",
+        "side": "biomesoplenty:block/stripped_jacaranda_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_magic_log.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_magic_log.json
index 2b8e00bbb..dbca1595f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_magic_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_magic_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_magic_log_top",
-        "side": "biomesoplenty:blocks/stripped_magic_log"
+        "end": "biomesoplenty:block/stripped_magic_log_top",
+        "side": "biomesoplenty:block/stripped_magic_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_magic_wood.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_magic_wood.json
index 4bba96199..8ca31a9a2 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_magic_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_magic_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_magic_log",
-        "side": "biomesoplenty:blocks/stripped_magic_log"
+        "end": "biomesoplenty:block/stripped_magic_log",
+        "side": "biomesoplenty:block/stripped_magic_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_mahogany_log.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_mahogany_log.json
index ed8ad95e4..940bb5415 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_mahogany_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_mahogany_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_mahogany_log_top",
-        "side": "biomesoplenty:blocks/stripped_mahogany_log"
+        "end": "biomesoplenty:block/stripped_mahogany_log_top",
+        "side": "biomesoplenty:block/stripped_mahogany_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_mahogany_wood.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_mahogany_wood.json
index 0c5e88371..c1884c65e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_mahogany_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_mahogany_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_mahogany_log",
-        "side": "biomesoplenty:blocks/stripped_mahogany_log"
+        "end": "biomesoplenty:block/stripped_mahogany_log",
+        "side": "biomesoplenty:block/stripped_mahogany_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_palm_log.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_palm_log.json
index b246f7156..d552c2619 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_palm_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_palm_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_palm_log_top",
-        "side": "biomesoplenty:blocks/stripped_palm_log"
+        "end": "biomesoplenty:block/stripped_palm_log_top",
+        "side": "biomesoplenty:block/stripped_palm_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_palm_wood.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_palm_wood.json
index 80c22a6b3..6f6c1ec66 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_palm_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_palm_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_palm_log",
-        "side": "biomesoplenty:blocks/stripped_palm_log"
+        "end": "biomesoplenty:block/stripped_palm_log",
+        "side": "biomesoplenty:block/stripped_palm_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_redwood_log.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_redwood_log.json
index 3155bc80b..0646b57a6 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_redwood_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_redwood_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_redwood_log_top",
-        "side": "biomesoplenty:blocks/stripped_redwood_log"
+        "end": "biomesoplenty:block/stripped_redwood_log_top",
+        "side": "biomesoplenty:block/stripped_redwood_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_redwood_wood.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_redwood_wood.json
index d0e869b0f..6c4662702 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_redwood_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_redwood_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_redwood_log",
-        "side": "biomesoplenty:blocks/stripped_redwood_log"
+        "end": "biomesoplenty:block/stripped_redwood_log",
+        "side": "biomesoplenty:block/stripped_redwood_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_umbran_log.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_umbran_log.json
index 1a43a9766..dbe937879 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_umbran_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_umbran_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_umbran_log_top",
-        "side": "biomesoplenty:blocks/stripped_umbran_log"
+        "end": "biomesoplenty:block/stripped_umbran_log_top",
+        "side": "biomesoplenty:block/stripped_umbran_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_umbran_wood.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_umbran_wood.json
index a0f920502..34fe6f81f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_umbran_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_umbran_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_umbran_log",
-        "side": "biomesoplenty:blocks/stripped_umbran_log"
+        "end": "biomesoplenty:block/stripped_umbran_log",
+        "side": "biomesoplenty:block/stripped_umbran_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_willow_log.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_willow_log.json
index 776bd859f..49f3f5662 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_willow_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_willow_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_willow_log_top",
-        "side": "biomesoplenty:blocks/stripped_willow_log"
+        "end": "biomesoplenty:block/stripped_willow_log_top",
+        "side": "biomesoplenty:block/stripped_willow_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_willow_wood.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_willow_wood.json
index f8d3d1edc..b78acd661 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/stripped_willow_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_willow_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/stripped_willow_log",
-        "side": "biomesoplenty:blocks/stripped_willow_log"
+        "end": "biomesoplenty:block/stripped_willow_log",
+        "side": "biomesoplenty:block/stripped_willow_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_bottom.json
index 703dd2b3e..55adb1b10 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_bottom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/tall_cattail_bottom"
+        "cross": "biomesoplenty:block/tall_cattail_bottom"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_lower.json b/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_lower.json
index b5d1762c9..1c253164f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_lower.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_lower.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/tall_cattail_lower"
+        "cross": "biomesoplenty:block/tall_cattail_lower"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_top.json b/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_top.json
index 94e002327..363f9ba8b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_top.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/tall_cattail_top"
+        "cross": "biomesoplenty:block/tall_cattail_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_upper.json b/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_upper.json
index d918c10f3..d889a6af8 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_upper.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_upper.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/tall_cattail_upper"
+        "cross": "biomesoplenty:block/tall_cattail_upper"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/block/toadstool.json b/src/main/resources/assets/biomesoplenty/models/block/toadstool.json
index 175da4ed4..0eaab390f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/toadstool.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/toadstool.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/toadstool"
+        "cross": "biomesoplenty:block/toadstool"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_button.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_button.json
index dab0ea5ac..c4571a397 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_button.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_button.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_planks"
+        "texture": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_button_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_button_inventory.json
index 864ff1bf2..e0bf5199e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_button_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_button_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_planks"
+        "texture": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_button_pressed.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_button_pressed.json
index c9e5eaa9c..66f898c65 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_button_pressed.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_button_pressed.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_pressed",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_planks"
+        "texture": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom.json
index 1804e5064..a6bb68c91 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom",
     "textures": {
-        "bottom": "biomesoplenty:blocks/umbran_door_bottom",
-        "top": "biomesoplenty:blocks/umbran_door_top"
+        "bottom": "biomesoplenty:block/umbran_door_bottom",
+        "top": "biomesoplenty:block/umbran_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom_hinge.json
index 9923c1747..87d100a61 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_bottom_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/umbran_door_bottom",
-        "top": "biomesoplenty:blocks/umbran_door_top"
+        "bottom": "biomesoplenty:block/umbran_door_bottom",
+        "top": "biomesoplenty:block/umbran_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_door_top.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_top.json
index 6acc41f40..274dc4717 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_door_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_top.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/umbran_door_bottom",
-        "top": "biomesoplenty:blocks/umbran_door_top"
+        "bottom": "biomesoplenty:block/umbran_door_bottom",
+        "top": "biomesoplenty:block/umbran_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_door_top_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_top_hinge.json
index 982876690..f147a4244 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_door_top_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_door_top_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/umbran_door_bottom",
-        "top": "biomesoplenty:blocks/umbran_door_top"
+        "bottom": "biomesoplenty:block/umbran_door_bottom",
+        "top": "biomesoplenty:block/umbran_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate.json
index 69227724f..f56305f49 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_planks"
+        "texture": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_open.json
index 7fa862ac9..a52e9fa64 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_planks"
+        "texture": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_wall.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_wall.json
index 386cb4b86..eae961eb7 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_wall.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_wall.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_planks"
+        "texture": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_wall_open.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_wall_open.json
index 96d4c8521..78d5c269f 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_wall_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_gate_wall_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_planks"
+        "texture": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_inventory.json
index a80aa254d..dfeb3e449 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_planks"
+        "texture": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_post.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_post.json
index 82519a1e3..c686283ca 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_post.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_post.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_post",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_planks"
+        "texture": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_side.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_side.json
index 08705f03b..14b2b0068 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_fence_side.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_side",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_planks"
+        "texture": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_leaves.json
index 1142e8b5d..c4cff4243 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/umbran_leaves"
+        "all": "biomesoplenty:block/umbran_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_log.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_log.json
index aab5fef25..244baed4b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/umbran_log_top",
-        "side": "biomesoplenty:blocks/umbran_log"
+        "end": "biomesoplenty:block/umbran_log_top",
+        "side": "biomesoplenty:block/umbran_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_planks.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_planks.json
index abf3c7c89..98c757cf3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_planks.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_planks.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/umbran_planks"
+        "all": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_pressure_plate.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_pressure_plate.json
index 0fdffef97..293478896 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_pressure_plate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_pressure_plate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_up",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_planks"
+        "texture": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_pressure_plate_down.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_pressure_plate_down.json
index 447517143..34b2276a8 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_pressure_plate_down.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_pressure_plate_down.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_down",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_planks"
+        "texture": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_sapling.json
index 859b34660..730d7781b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/umbran_sapling"
+        "cross": "biomesoplenty:block/umbran_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_slab.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_slab.json
index 9cfe4b68b..f04670686 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/umbran_planks",
-        "top": "biomesoplenty:blocks/umbran_planks",
-        "side": "biomesoplenty:blocks/umbran_planks"
+        "bottom": "biomesoplenty:block/umbran_planks",
+        "top": "biomesoplenty:block/umbran_planks",
+        "side": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_slab_top.json
index 703db5392..d450d47ff 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/umbran_planks",
-        "top": "biomesoplenty:blocks/umbran_planks",
-        "side": "biomesoplenty:blocks/umbran_planks"
+        "bottom": "biomesoplenty:block/umbran_planks",
+        "top": "biomesoplenty:block/umbran_planks",
+        "side": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs.json
index c38fd5801..262f69e8e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/umbran_planks",
-        "top": "biomesoplenty:blocks/umbran_planks",
-        "side": "biomesoplenty:blocks/umbran_planks"
+        "bottom": "biomesoplenty:block/umbran_planks",
+        "top": "biomesoplenty:block/umbran_planks",
+        "side": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs_inner.json
index 5fbec17d3..814da9220 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/umbran_planks",
-        "top": "biomesoplenty:blocks/umbran_planks",
-        "side": "biomesoplenty:blocks/umbran_planks"
+        "bottom": "biomesoplenty:block/umbran_planks",
+        "top": "biomesoplenty:block/umbran_planks",
+        "side": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs_outer.json
index b62e448c1..e94fc8203 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/umbran_planks",
-        "top": "biomesoplenty:blocks/umbran_planks",
-        "side": "biomesoplenty:blocks/umbran_planks"
+        "bottom": "biomesoplenty:block/umbran_planks",
+        "top": "biomesoplenty:block/umbran_planks",
+        "side": "biomesoplenty:block/umbran_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_trapdoor_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_trapdoor_bottom.json
index ae6f8d8fe..5db368061 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_trapdoor_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_trapdoor_bottom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_bottom",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_trapdoor"
+        "texture": "biomesoplenty:block/umbran_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_trapdoor_open.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_trapdoor_open.json
index dc90db2d0..e05b9c089 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_trapdoor_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_trapdoor_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_trapdoor"
+        "texture": "biomesoplenty:block/umbran_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_trapdoor_top.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_trapdoor_top.json
index 8aa625985..4cd157478 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_trapdoor_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_trapdoor_top.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_top",
     "textures": {
-        "texture": "biomesoplenty:blocks/umbran_trapdoor"
+        "texture": "biomesoplenty:block/umbran_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/umbran_wood.json b/src/main/resources/assets/biomesoplenty/models/block/umbran_wood.json
index e56eb2498..8d6167b3a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/umbran_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/umbran_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/umbran_log",
-        "side": "biomesoplenty:blocks/umbran_log"
+        "end": "biomesoplenty:block/umbran_log",
+        "side": "biomesoplenty:block/umbran_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/violet.json b/src/main/resources/assets/biomesoplenty/models/block/violet.json
index 5cb361ef9..871d41532 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/violet.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/violet.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/violet"
+        "cross": "biomesoplenty:block/violet"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_cherry_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/white_cherry_leaves.json
index 90c7dbe59..bd14709e3 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/white_cherry_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/white_cherry_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/white_cherry_leaves"
+        "all": "biomesoplenty:block/white_cherry_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_cherry_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/white_cherry_sapling.json
index e02d1cdd9..ef1d790da 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/white_cherry_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/white_cherry_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/white_cherry_sapling"
+        "cross": "biomesoplenty:block/white_cherry_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sand.json b/src/main/resources/assets/biomesoplenty/models/block/white_sand.json
index bb04f4108..b0ebedcc1 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/white_sand.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/white_sand.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/white_sand"
+        "all": "biomesoplenty:block/white_sand"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone.json
index 18fff9d1c..82d9dc53c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/cube_bottom_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/white_sandstone_bottom",
-        "top": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/white_sandstone"
+        "bottom": "biomesoplenty:block/white_sandstone_bottom",
+        "top": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/white_sandstone"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab.json
index 0694ecdcf..0dc002d62 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/white_sandstone_bottom",
-        "top": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/white_sandstone"
+        "bottom": "biomesoplenty:block/white_sandstone_bottom",
+        "top": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/white_sandstone"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab_top.json
index d9e7d3728..aacf693da 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/white_sandstone_bottom",
-        "top": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/white_sandstone"
+        "bottom": "biomesoplenty:block/white_sandstone_bottom",
+        "top": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/white_sandstone"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs.json
index 21ab0a531..8c1ddc91b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/white_sandstone_bottom",
-        "top": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/white_sandstone"
+        "bottom": "biomesoplenty:block/white_sandstone_bottom",
+        "top": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/white_sandstone"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_inner.json
index 563ea132c..371a42e01 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/white_sandstone_bottom",
-        "top": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/white_sandstone"
+        "bottom": "biomesoplenty:block/white_sandstone_bottom",
+        "top": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/white_sandstone"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_outer.json
index cee8e17c4..60811a098 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/white_sandstone_bottom",
-        "top": "biomesoplenty:blocks/white_sandstone_top",
-        "side": "biomesoplenty:blocks/white_sandstone"
+        "bottom": "biomesoplenty:block/white_sandstone_bottom",
+        "top": "biomesoplenty:block/white_sandstone_top",
+        "side": "biomesoplenty:block/white_sandstone"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_inventory.json
index 7abc97bdf..3affd5d8e 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/wall_inventory",
     "textures": {
-        "wall": "biomesoplenty:blocks/white_sandstone"
+        "wall": "biomesoplenty:block/white_sandstone"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_post.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_post.json
index bceec43b6..d33c97b79 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_post.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_post.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_wall_post",
     "textures": {
-        "wall": "biomesoplenty:blocks/white_sandstone"
+        "wall": "biomesoplenty:block/white_sandstone"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_side.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_side.json
index 25a3b154d..1ac490c34 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_wall_side.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_wall_side",
     "textures": {
-        "wall": "biomesoplenty:blocks/white_sandstone"
+        "wall": "biomesoplenty:block/white_sandstone"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/wildflower.json b/src/main/resources/assets/biomesoplenty/models/block/wildflower.json
index 4b2e1365a..8cf012ac5 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/wildflower.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/wildflower.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/wildflower"
+        "cross": "biomesoplenty:block/wildflower"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_button.json b/src/main/resources/assets/biomesoplenty/models/block/willow_button.json
index c7d37f10b..9024e7ba0 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_button.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_button.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_planks"
+        "texture": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_button_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/willow_button_inventory.json
index fd3f7ea7b..fee79b32d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_button_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_button_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_planks"
+        "texture": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_button_pressed.json b/src/main/resources/assets/biomesoplenty/models/block/willow_button_pressed.json
index 2f2e5c6fe..597d5f611 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_button_pressed.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_button_pressed.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/button_pressed",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_planks"
+        "texture": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_door_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/willow_door_bottom.json
index 24eb2d937..faa902a14 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_door_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_door_bottom.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom",
     "textures": {
-        "bottom": "biomesoplenty:blocks/willow_door_bottom",
-        "top": "biomesoplenty:blocks/willow_door_top"
+        "bottom": "biomesoplenty:block/willow_door_bottom",
+        "top": "biomesoplenty:block/willow_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_door_bottom_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/willow_door_bottom_hinge.json
index 539d30793..7475c97d4 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_door_bottom_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_door_bottom_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_bottom_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/willow_door_bottom",
-        "top": "biomesoplenty:blocks/willow_door_top"
+        "bottom": "biomesoplenty:block/willow_door_bottom",
+        "top": "biomesoplenty:block/willow_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_door_top.json b/src/main/resources/assets/biomesoplenty/models/block/willow_door_top.json
index 928a85312..cc216c02d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_door_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_door_top.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/willow_door_bottom",
-        "top": "biomesoplenty:blocks/willow_door_top"
+        "bottom": "biomesoplenty:block/willow_door_bottom",
+        "top": "biomesoplenty:block/willow_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_door_top_hinge.json b/src/main/resources/assets/biomesoplenty/models/block/willow_door_top_hinge.json
index 91321799d..6e218d602 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_door_top_hinge.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_door_top_hinge.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/door_top_rh",
     "textures": {
-        "bottom": "biomesoplenty:blocks/willow_door_bottom",
-        "top": "biomesoplenty:blocks/willow_door_top"
+        "bottom": "biomesoplenty:block/willow_door_bottom",
+        "top": "biomesoplenty:block/willow_door_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate.json
index 57deb61de..072fa36fc 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_planks"
+        "texture": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate_open.json
index 67b54ea8b..506df3523 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_planks"
+        "texture": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate_wall.json b/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate_wall.json
index 18aa0cb60..3d267e9b8 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate_wall.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate_wall.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_planks"
+        "texture": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate_wall_open.json b/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate_wall_open.json
index 817f2f715..cd57eac54 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate_wall_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_fence_gate_wall_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_fence_gate_wall_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_planks"
+        "texture": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_fence_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/willow_fence_inventory.json
index a96340978..b7b6d4e84 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_fence_inventory.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_fence_inventory.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_inventory",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_planks"
+        "texture": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_fence_post.json b/src/main/resources/assets/biomesoplenty/models/block/willow_fence_post.json
index 167f074ca..eac75a8f1 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_fence_post.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_fence_post.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_post",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_planks"
+        "texture": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_fence_side.json b/src/main/resources/assets/biomesoplenty/models/block/willow_fence_side.json
index 323b67d43..055175ebb 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_fence_side.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_fence_side.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/fence_side",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_planks"
+        "texture": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/willow_leaves.json
index 4544ea27d..a57991ba4 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/willow_leaves"
+        "all": "biomesoplenty:block/willow_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_log.json b/src/main/resources/assets/biomesoplenty/models/block/willow_log.json
index 31870e4dc..626848a40 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_log.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_log.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/willow_log_top",
-        "side": "biomesoplenty:blocks/willow_log"
+        "end": "biomesoplenty:block/willow_log_top",
+        "side": "biomesoplenty:block/willow_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_planks.json b/src/main/resources/assets/biomesoplenty/models/block/willow_planks.json
index 9a514f510..83fc983d2 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_planks.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_planks.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:blocks/willow_planks"
+        "all": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_pressure_plate.json b/src/main/resources/assets/biomesoplenty/models/block/willow_pressure_plate.json
index 0b559d615..984d343ef 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_pressure_plate.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_pressure_plate.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_up",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_planks"
+        "texture": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_pressure_plate_down.json b/src/main/resources/assets/biomesoplenty/models/block/willow_pressure_plate_down.json
index 2a9248d20..580353f6c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_pressure_plate_down.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_pressure_plate_down.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/pressure_plate_down",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_planks"
+        "texture": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/willow_sapling.json
index be58e9c80..4e95b5997 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/willow_sapling"
+        "cross": "biomesoplenty:block/willow_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_slab.json b/src/main/resources/assets/biomesoplenty/models/block/willow_slab.json
index 83dbb171e..b45b4d601 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_slab.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_slab.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab",
     "textures": {
-        "bottom": "biomesoplenty:blocks/willow_planks",
-        "top": "biomesoplenty:blocks/willow_planks",
-        "side": "biomesoplenty:blocks/willow_planks"
+        "bottom": "biomesoplenty:block/willow_planks",
+        "top": "biomesoplenty:block/willow_planks",
+        "side": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/willow_slab_top.json
index cc6a5ec0b..3e301e3f5 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_slab_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_slab_top.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/slab_top",
     "textures": {
-        "bottom": "biomesoplenty:blocks/willow_planks",
-        "top": "biomesoplenty:blocks/willow_planks",
-        "side": "biomesoplenty:blocks/willow_planks"
+        "bottom": "biomesoplenty:block/willow_planks",
+        "top": "biomesoplenty:block/willow_planks",
+        "side": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/willow_stairs.json
index 65d04d1f9..0c8ef93bf 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_stairs.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_stairs.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/willow_planks",
-        "top": "biomesoplenty:blocks/willow_planks",
-        "side": "biomesoplenty:blocks/willow_planks"
+        "bottom": "biomesoplenty:block/willow_planks",
+        "top": "biomesoplenty:block/willow_planks",
+        "side": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/willow_stairs_inner.json
index abe491e29..156db4bc0 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_stairs_inner.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_stairs_inner.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/inner_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/willow_planks",
-        "top": "biomesoplenty:blocks/willow_planks",
-        "side": "biomesoplenty:blocks/willow_planks"
+        "bottom": "biomesoplenty:block/willow_planks",
+        "top": "biomesoplenty:block/willow_planks",
+        "side": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/willow_stairs_outer.json
index 602ff520b..c3d9c0401 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_stairs_outer.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_stairs_outer.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/outer_stairs",
     "textures": {
-        "bottom": "biomesoplenty:blocks/willow_planks",
-        "top": "biomesoplenty:blocks/willow_planks",
-        "side": "biomesoplenty:blocks/willow_planks"
+        "bottom": "biomesoplenty:block/willow_planks",
+        "top": "biomesoplenty:block/willow_planks",
+        "side": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_trapdoor_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/willow_trapdoor_bottom.json
index 7b8f2af84..988c692c4 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_trapdoor_bottom.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_trapdoor_bottom.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_bottom",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_trapdoor"
+        "texture": "biomesoplenty:block/willow_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_trapdoor_open.json b/src/main/resources/assets/biomesoplenty/models/block/willow_trapdoor_open.json
index 5afc96ae8..5d358e7a6 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_trapdoor_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_trapdoor_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_trapdoor"
+        "texture": "biomesoplenty:block/willow_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_trapdoor_top.json b/src/main/resources/assets/biomesoplenty/models/block/willow_trapdoor_top.json
index d0d2f2582..f96d1262d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_trapdoor_top.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_trapdoor_top.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/template_orientable_trapdoor_top",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_trapdoor"
+        "texture": "biomesoplenty:block/willow_trapdoor"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_1.json b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_1.json
index 58be4abe4..f2ffd4063 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_1.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_1.json
@@ -1,8 +1,8 @@
 {
     "ambientocclusion": false,
     "textures": {
-        "particle": "biomesoplenty:blocks/willow_vine",
-        "vine": "biomesoplenty:blocks/willow_vine"
+        "particle": "biomesoplenty:block/willow_vine",
+        "vine": "biomesoplenty:block/willow_vine"
     },
     "elements": [
         {   "from": [ 0, 0, 15.2 ],
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_1u.json b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_1u.json
index ee1e653dd..56c0a8399 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_1u.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_1u.json
@@ -1,8 +1,8 @@
 {
     "ambientocclusion": false,
     "textures": {
-        "particle": "biomesoplenty:blocks/willow_vine",
-        "vine": "biomesoplenty:blocks/willow_vine"
+        "particle": "biomesoplenty:block/willow_vine",
+        "vine": "biomesoplenty:block/willow_vine"
     },
     "elements": [
         {   "from": [ 0, 15.2, 0 ],
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2.json b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2.json
index 6c982f5f5..23d00ffe8 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2.json
@@ -1,8 +1,8 @@
 {
     "ambientocclusion": false,
     "textures": {
-        "particle": "biomesoplenty:blocks/willow_vine",
-        "vine": "biomesoplenty:blocks/willow_vine"
+        "particle": "biomesoplenty:block/willow_vine",
+        "vine": "biomesoplenty:block/willow_vine"
     },
     "elements": [
         {   "from": [ 0, 0, 0.8 ],
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2_opposite.json b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2_opposite.json
index 6ec2f9738..a27af2194 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2_opposite.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2_opposite.json
@@ -1,8 +1,8 @@
 {
     "ambientocclusion": false,
     "textures": {
-        "particle": "biomesoplenty:blocks/willow_vine",
-        "vine": "biomesoplenty:blocks/willow_vine"
+        "particle": "biomesoplenty:block/willow_vine",
+        "vine": "biomesoplenty:block/willow_vine"
     },
     "elements": [
         {   "from": [ 15.2, 0, 0 ],
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2u.json b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2u.json
index 0c3e82220..da7e45dbb 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2u.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2u.json
@@ -1,8 +1,8 @@
 {
     "ambientocclusion": false,
     "textures": {
-        "particle": "biomesoplenty:blocks/willow_vine",
-        "vine": "biomesoplenty:blocks/willow_vine"
+        "particle": "biomesoplenty:block/willow_vine",
+        "vine": "biomesoplenty:block/willow_vine"
     },
     "elements": [
         {   "from": [ 0, 15.2, 0 ],
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2u_opposite.json b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2u_opposite.json
index d2c311781..610d551e4 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2u_opposite.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_2u_opposite.json
@@ -1,8 +1,8 @@
 {
     "ambientocclusion": false,
     "textures": {
-        "particle": "biomesoplenty:blocks/willow_vine",
-        "vine": "biomesoplenty:blocks/willow_vine"
+        "particle": "biomesoplenty:block/willow_vine",
+        "vine": "biomesoplenty:block/willow_vine"
     },
     "elements": [
         {   "from": [ 0, 15.2, 0 ],
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_3.json b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_3.json
index d3acd9f6b..20296bad6 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_3.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_3.json
@@ -1,8 +1,8 @@
 {
     "ambientocclusion": false,
     "textures": {
-        "particle": "biomesoplenty:blocks/willow_vine",
-        "vine": "biomesoplenty:blocks/willow_vine"
+        "particle": "biomesoplenty:block/willow_vine",
+        "vine": "biomesoplenty:block/willow_vine"
     },
     "elements": [
         {   "from": [ 15.2, 0, 0 ],
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_3u.json b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_3u.json
index 2f5e7e3a0..9837aa36a 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_3u.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_3u.json
@@ -1,8 +1,8 @@
 {
     "ambientocclusion": false,
     "textures": {
-        "particle": "biomesoplenty:blocks/willow_vine",
-        "vine": "biomesoplenty:blocks/willow_vine"
+        "particle": "biomesoplenty:block/willow_vine",
+        "vine": "biomesoplenty:block/willow_vine"
     },
     "elements": [
         {   "from": [ 0, 15.2, 0 ],
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_4.json b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_4.json
index fd4275f34..f64e13adb 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_4.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_4.json
@@ -1,8 +1,8 @@
 {
     "ambientocclusion": false,
     "textures": {
-        "particle": "biomesoplenty:blocks/willow_vine",
-        "vine": "biomesoplenty:blocks/willow_vine"
+        "particle": "biomesoplenty:block/willow_vine",
+        "vine": "biomesoplenty:block/willow_vine"
     },
     "elements": [
         {   "from": [ 0.8, 0, 0 ],
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_4u.json b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_4u.json
index cc87c30cd..846519d50 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_4u.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_4u.json
@@ -1,8 +1,8 @@
 {
     "ambientocclusion": false,
     "textures": {
-        "particle": "biomesoplenty:blocks/willow_vine",
-        "vine": "biomesoplenty:blocks/willow_vine"
+        "particle": "biomesoplenty:block/willow_vine",
+        "vine": "biomesoplenty:block/willow_vine"
     },
     "elements": [
         {   "from": [ 0, 15.2, 0 ],
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_u.json b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_u.json
index dc770c096..a93c31357 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_vine_u.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_vine_u.json
@@ -1,8 +1,8 @@
 {
     "ambientocclusion": false,
     "textures": {
-        "particle": "biomesoplenty:blocks/willow_vine",
-        "vine": "biomesoplenty:blocks/willow_vine"
+        "particle": "biomesoplenty:block/willow_vine",
+        "vine": "biomesoplenty:block/willow_vine"
     },
     "elements": [
         {   "from": [ 0, 15.2, 0 ],
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_wall_gate_closed.json b/src/main/resources/assets/biomesoplenty/models/block/willow_wall_gate_closed.json
index 6d68a0151..639883e1c 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_wall_gate_closed.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_wall_gate_closed.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/wall_gate_closed",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_planks"
+        "texture": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_wall_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/willow_wall_gate_open.json
index 04b871f12..95838298d 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_wall_gate_open.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_wall_gate_open.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/wall_gate_open",
     "textures": {
-        "texture": "biomesoplenty:blocks/willow_planks"
+        "texture": "biomesoplenty:block/willow_planks"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/willow_wood.json b/src/main/resources/assets/biomesoplenty/models/block/willow_wood.json
index 49550fa73..88cbbd391 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/willow_wood.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/willow_wood.json
@@ -1,7 +1,7 @@
 {
     "parent": "block/cube_column",
     "textures": {
-        "end": "biomesoplenty:blocks/willow_log",
-        "side": "biomesoplenty:blocks/willow_log"
+        "end": "biomesoplenty:block/willow_log",
+        "side": "biomesoplenty:block/willow_log"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/wilted_lily.json b/src/main/resources/assets/biomesoplenty/models/block/wilted_lily.json
index c24703463..9662c7f28 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/wilted_lily.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/wilted_lily.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/wilted_lily"
+        "cross": "biomesoplenty:block/wilted_lily"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/yellow_autumn_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/yellow_autumn_leaves.json
index 43136a77c..26ffc41d7 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/yellow_autumn_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/yellow_autumn_leaves.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/leaves",
     "textures": {
-        "all": "biomesoplenty:blocks/yellow_autumn_leaves"
+        "all": "biomesoplenty:block/yellow_autumn_leaves"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/yellow_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/yellow_autumn_sapling.json
index 71a2c7d03..73365a1cf 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/yellow_autumn_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/yellow_autumn_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cross",
     "textures": {
-        "cross": "biomesoplenty:blocks/yellow_autumn_sapling"
+        "cross": "biomesoplenty:block/yellow_autumn_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/barley.json b/src/main/resources/assets/biomesoplenty/models/item/barley.json
index d0d75e1aa..4b185e67e 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/barley.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/barley.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/barley"
+        "layer0": "biomesoplenty:block/barley"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/blood_bucket.json b/src/main/resources/assets/biomesoplenty/models/item/blood_bucket.json
deleted file mode 100644
index 249dba167..000000000
--- a/src/main/resources/assets/biomesoplenty/models/item/blood_bucket.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:items/blood_bucket"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/blue_hydrangea.json b/src/main/resources/assets/biomesoplenty/models/item/blue_hydrangea.json
index f1889af01..7a2409a3d 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/blue_hydrangea.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/blue_hydrangea.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/blue_hydrangea"
+        "layer0": "biomesoplenty:block/blue_hydrangea"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/bop_icon.json b/src/main/resources/assets/biomesoplenty/models/item/bop_icon.json
index 945cfe11b..ab11fa5e4 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/bop_icon.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/bop_icon.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/bop_icon"
+        "layer0": "biomesoplenty:item/bop_icon"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/bramble.json b/src/main/resources/assets/biomesoplenty/models/item/bramble.json
index 288806ed5..3ef087029 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/bramble.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/bramble.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/bramble"
+        "layer0": "biomesoplenty:item/bramble"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/burning_blossom.json b/src/main/resources/assets/biomesoplenty/models/item/burning_blossom.json
index 355ea6f85..7a18b0596 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/burning_blossom.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/burning_blossom.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/burning_blossom"
+        "layer0": "biomesoplenty:block/burning_blossom"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/bush.json b/src/main/resources/assets/biomesoplenty/models/item/bush.json
index 21a850e52..5a09ecbfa 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/bush.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/bush.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/bush"
+        "layer0": "biomesoplenty:block/bush"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/cattail.json b/src/main/resources/assets/biomesoplenty/models/item/cattail.json
index c54192c6b..d32a14624 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/cattail.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/cattail.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/cattail"
+        "layer0": "biomesoplenty:item/cattail"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/cherry_boat.json b/src/main/resources/assets/biomesoplenty/models/item/cherry_boat.json
index 01e349732..7faa3d5ff 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/cherry_boat.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/cherry_boat.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/cherry_boat"
+        "layer0": "biomesoplenty:item/cherry_boat"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/cherry_door.json b/src/main/resources/assets/biomesoplenty/models/item/cherry_door.json
index ff9ca7aba..b86e33a37 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/cherry_door.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/cherry_door.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/cherry_door"
+        "layer0": "biomesoplenty:item/cherry_door"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/dead_boat.json b/src/main/resources/assets/biomesoplenty/models/item/dead_boat.json
index e17e0af5f..dee43e7ea 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/dead_boat.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/dead_boat.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/dead_boat"
+        "layer0": "biomesoplenty:item/dead_boat"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/dead_door.json b/src/main/resources/assets/biomesoplenty/models/item/dead_door.json
index 72216d523..cabb002dd 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/dead_door.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/dead_door.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/dead_door"
+        "layer0": "biomesoplenty:item/dead_door"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/dead_grass.json b/src/main/resources/assets/biomesoplenty/models/item/dead_grass.json
index 61b334e33..057a5c3d5 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/dead_grass.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/dead_grass.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/dead_grass"
+        "layer0": "biomesoplenty:block/dead_grass"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/dead_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/dead_sapling.json
index ad7592d78..fd207b0e7 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/dead_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/dead_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/dead_sapling"
+        "layer0": "biomesoplenty:block/dead_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/desert_grass.json b/src/main/resources/assets/biomesoplenty/models/item/desert_grass.json
index 6a2016773..84d32c523 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/desert_grass.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/desert_grass.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/desert_grass"
+        "layer0": "biomesoplenty:block/desert_grass"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/dune_grass.json b/src/main/resources/assets/biomesoplenty/models/item/dune_grass.json
index d5526ee6e..b93b6a1f8 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/dune_grass.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/dune_grass.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/dune_grass"
+        "layer0": "biomesoplenty:block/dune_grass"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/ethereal_boat.json b/src/main/resources/assets/biomesoplenty/models/item/ethereal_boat.json
index 0bb645693..1beb04855 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/ethereal_boat.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/ethereal_boat.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/ethereal_boat"
+        "layer0": "biomesoplenty:item/ethereal_boat"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/ethereal_door.json b/src/main/resources/assets/biomesoplenty/models/item/ethereal_door.json
index fc1f3aee8..0a04c0efb 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/ethereal_door.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/ethereal_door.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/ethereal_door"
+        "layer0": "biomesoplenty:item/ethereal_door"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/ethereal_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/ethereal_sapling.json
index 14ead6a34..47f88efb0 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/ethereal_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/ethereal_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/ethereal_sapling"
+        "layer0": "biomesoplenty:block/ethereal_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/fir_boat.json b/src/main/resources/assets/biomesoplenty/models/item/fir_boat.json
index 59b6a6a78..fa57cbd27 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/fir_boat.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/fir_boat.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/fir_boat"
+        "layer0": "biomesoplenty:item/fir_boat"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/fir_door.json b/src/main/resources/assets/biomesoplenty/models/item/fir_door.json
index bab73ef65..d13f1ca95 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/fir_door.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/fir_door.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/fir_door"
+        "layer0": "biomesoplenty:item/fir_door"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/fir_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/fir_sapling.json
index 67d98e7a1..4d4cf05d3 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/fir_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/fir_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/fir_sapling"
+        "layer0": "biomesoplenty:block/fir_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/flax.json b/src/main/resources/assets/biomesoplenty/models/item/flax.json
deleted file mode 100644
index 6a207618c..000000000
--- a/src/main/resources/assets/biomesoplenty/models/item/flax.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:items/flax"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/flowering_oak_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/flowering_oak_sapling.json
index 0ce84a227..13086c0d7 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/flowering_oak_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/flowering_oak_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/flowering_oak_sapling"
+        "layer0": "biomesoplenty:block/flowering_oak_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/glowflower.json b/src/main/resources/assets/biomesoplenty/models/item/glowflower.json
index 3f44acf42..1c43f5a0a 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/glowflower.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/glowflower.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/glowflower"
+        "layer0": "biomesoplenty:block/glowflower"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/glowshroom.json b/src/main/resources/assets/biomesoplenty/models/item/glowshroom.json
index 1f97b6757..c0b73f379 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/glowshroom.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/glowshroom.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/glowshroom"
+        "layer0": "biomesoplenty:block/glowshroom"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/goldenrod.json b/src/main/resources/assets/biomesoplenty/models/item/goldenrod.json
index 5dec40155..0e3c72127 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/goldenrod.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/goldenrod.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/goldenrod"
+        "layer0": "biomesoplenty:block/goldenrod"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/hellbark_boat.json b/src/main/resources/assets/biomesoplenty/models/item/hellbark_boat.json
index 6bf8e18d5..61547688d 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/hellbark_boat.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/hellbark_boat.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/hellbark_boat"
+        "layer0": "biomesoplenty:item/hellbark_boat"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/hellbark_door.json b/src/main/resources/assets/biomesoplenty/models/item/hellbark_door.json
index ec900292d..094f17a68 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/hellbark_door.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/hellbark_door.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/hellbark_door"
+        "layer0": "biomesoplenty:item/hellbark_door"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/hellbark_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/hellbark_sapling.json
index c8973cc47..6037cc1bd 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/hellbark_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/hellbark_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/hellbark_sapling"
+        "layer0": "biomesoplenty:block/hellbark_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/hot_spring_water_bucket.json b/src/main/resources/assets/biomesoplenty/models/item/hot_spring_water_bucket.json
deleted file mode 100644
index e3fc6bd2f..000000000
--- a/src/main/resources/assets/biomesoplenty/models/item/hot_spring_water_bucket.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "biomesoplenty:items/hot_spring_water_bucket"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/jacaranda_boat.json b/src/main/resources/assets/biomesoplenty/models/item/jacaranda_boat.json
index bb833f70b..2ce867baf 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/jacaranda_boat.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/jacaranda_boat.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/jacaranda_boat"
+        "layer0": "biomesoplenty:item/jacaranda_boat"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/jacaranda_door.json b/src/main/resources/assets/biomesoplenty/models/item/jacaranda_door.json
index da59ce817..98dfddb2e 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/jacaranda_door.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/jacaranda_door.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/jacaranda_door"
+        "layer0": "biomesoplenty:item/jacaranda_door"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/jacaranda_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/jacaranda_sapling.json
index 65c117a55..636110a94 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/jacaranda_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/jacaranda_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/jacaranda_sapling"
+        "layer0": "biomesoplenty:block/jacaranda_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/lavender.json b/src/main/resources/assets/biomesoplenty/models/item/lavender.json
index a6585ae37..c1c4419a0 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/lavender.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/lavender.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/lavender"
+        "layer0": "biomesoplenty:block/lavender"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/magic_boat.json b/src/main/resources/assets/biomesoplenty/models/item/magic_boat.json
index aa514de64..669d5cbb7 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/magic_boat.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/magic_boat.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/magic_boat"
+        "layer0": "biomesoplenty:item/magic_boat"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/magic_door.json b/src/main/resources/assets/biomesoplenty/models/item/magic_door.json
index 4343a62f3..b1ebb39ee 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/magic_door.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/magic_door.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/magic_door"
+        "layer0": "biomesoplenty:item/magic_door"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/magic_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/magic_sapling.json
index 56ccaa96c..7405e1c45 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/magic_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/magic_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/magic_sapling"
+        "layer0": "biomesoplenty:block/magic_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/mahogany_boat.json b/src/main/resources/assets/biomesoplenty/models/item/mahogany_boat.json
index d769abe95..118e4f07c 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/mahogany_boat.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/mahogany_boat.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/mahogany_boat"
+        "layer0": "biomesoplenty:item/mahogany_boat"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/mahogany_door.json b/src/main/resources/assets/biomesoplenty/models/item/mahogany_door.json
index efea9955a..75eadc274 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/mahogany_door.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/mahogany_door.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/mahogany_door"
+        "layer0": "biomesoplenty:item/mahogany_door"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/mahogany_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/mahogany_sapling.json
index d1138c203..d2ae14425 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/mahogany_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/mahogany_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/mahogany_sapling"
+        "layer0": "biomesoplenty:block/mahogany_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/mangrove_root.json b/src/main/resources/assets/biomesoplenty/models/item/mangrove_root.json
index a51964404..a9c1c2ad9 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/mangrove_root.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/mangrove_root.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/mangrove_root"
+        "layer0": "biomesoplenty:item/mangrove_root"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/maple_sapling.json
index 27b410a20..a191fa800 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/maple_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/maple_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/maple_sapling"
+        "layer0": "biomesoplenty:block/maple_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/mud_ball.json b/src/main/resources/assets/biomesoplenty/models/item/mud_ball.json
index 470cac15e..55d6e2936 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/mud_ball.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/mud_ball.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/mud_ball"
+        "layer0": "biomesoplenty:item/mud_ball"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/mud_brick.json b/src/main/resources/assets/biomesoplenty/models/item/mud_brick.json
index 37ef06c82..e79a3c0a6 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/mud_brick.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/mud_brick.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/mud_brick"
+        "layer0": "biomesoplenty:item/mud_brick"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/music_disc_wanderer.json b/src/main/resources/assets/biomesoplenty/models/item/music_disc_wanderer.json
index f64be0e31..43a9d087e 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/music_disc_wanderer.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/music_disc_wanderer.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/music_disc_wanderer"
+        "layer0": "biomesoplenty:item/music_disc_wanderer"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/orange_autumn_sapling.json
index e6145ce15..e2c6a8269 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/orange_autumn_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/orange_autumn_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/orange_autumn_sapling"
+        "layer0": "biomesoplenty:block/orange_autumn_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_cosmos.json b/src/main/resources/assets/biomesoplenty/models/item/orange_cosmos.json
index 6046012c9..69ea223c7 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/orange_cosmos.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/orange_cosmos.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/orange_cosmos"
+        "layer0": "biomesoplenty:block/orange_cosmos"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/origin_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/origin_sapling.json
index 9e9864773..5a16d875b 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/origin_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/origin_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/origin_sapling"
+        "layer0": "biomesoplenty:block/origin_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/palm_boat.json b/src/main/resources/assets/biomesoplenty/models/item/palm_boat.json
index f5c1e00f7..42b4fd033 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/palm_boat.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/palm_boat.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/palm_boat"
+        "layer0": "biomesoplenty:item/palm_boat"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/palm_door.json b/src/main/resources/assets/biomesoplenty/models/item/palm_door.json
index 9159b5d69..6d929fedb 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/palm_door.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/palm_door.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/palm_door"
+        "layer0": "biomesoplenty:item/palm_door"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/palm_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/palm_sapling.json
index af7c05419..7a7cf672b 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/palm_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/palm_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/palm_sapling"
+        "layer0": "biomesoplenty:block/palm_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/pink_cherry_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/pink_cherry_sapling.json
index c14f6d4b0..dba768cc2 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/pink_cherry_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/pink_cherry_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/pink_cherry_sapling"
+        "layer0": "biomesoplenty:block/pink_cherry_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/pink_daffodil.json b/src/main/resources/assets/biomesoplenty/models/item/pink_daffodil.json
index b8f20182b..11395d0b0 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/pink_daffodil.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/pink_daffodil.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/pink_daffodil"
+        "layer0": "biomesoplenty:block/pink_daffodil"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/pink_hibiscus.json b/src/main/resources/assets/biomesoplenty/models/item/pink_hibiscus.json
index a6833456a..37b779b9c 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/pink_hibiscus.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/pink_hibiscus.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/pink_hibiscus"
+        "layer0": "biomesoplenty:block/pink_hibiscus"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/redwood_boat.json b/src/main/resources/assets/biomesoplenty/models/item/redwood_boat.json
index 2bf00814e..40fc7d612 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/redwood_boat.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/redwood_boat.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/redwood_boat"
+        "layer0": "biomesoplenty:item/redwood_boat"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/redwood_door.json b/src/main/resources/assets/biomesoplenty/models/item/redwood_door.json
index 6b063b443..b479c7e4d 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/redwood_door.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/redwood_door.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/redwood_door"
+        "layer0": "biomesoplenty:item/redwood_door"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/redwood_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/redwood_sapling.json
index 3c0385e7f..3f564e5e2 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/redwood_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/redwood_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/redwood_sapling"
+        "layer0": "biomesoplenty:block/redwood_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/reed.json b/src/main/resources/assets/biomesoplenty/models/item/reed.json
index da9c10c25..7b23defdf 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/reed.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/reed.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/reed"
+        "layer0": "biomesoplenty:item/reed"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/rose.json b/src/main/resources/assets/biomesoplenty/models/item/rose.json
index 223cbc3ea..e33354f21 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/rose.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/rose.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/rose"
+        "layer0": "biomesoplenty:block/rose"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/sprout.json b/src/main/resources/assets/biomesoplenty/models/item/sprout.json
index 72cb750ad..9126845c9 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/sprout.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/sprout.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/sprout"
+        "layer0": "biomesoplenty:block/sprout"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/tall_cattail.json b/src/main/resources/assets/biomesoplenty/models/item/tall_cattail.json
index 9c10e0cab..ffcf5085e 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/tall_cattail.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/tall_cattail.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/tall_cattail_top"
+        "layer0": "biomesoplenty:block/tall_cattail_top"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/toadstool.json b/src/main/resources/assets/biomesoplenty/models/item/toadstool.json
index 2c268e4fa..4213732f3 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/toadstool.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/toadstool.json
@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/toadstool"
+        "layer0": "biomesoplenty:block/toadstool"
     },
     "display": {
         "thirdperson": {
diff --git a/src/main/resources/assets/biomesoplenty/models/item/umbran_boat.json b/src/main/resources/assets/biomesoplenty/models/item/umbran_boat.json
index 410851eb9..2a61e969a 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/umbran_boat.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/umbran_boat.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/umbran_boat"
+        "layer0": "biomesoplenty:item/umbran_boat"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/umbran_door.json b/src/main/resources/assets/biomesoplenty/models/item/umbran_door.json
index 739f84603..8745d780e 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/umbran_door.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/umbran_door.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/umbran_door"
+        "layer0": "biomesoplenty:item/umbran_door"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/umbran_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/umbran_sapling.json
index 98e146636..52fd3e6a3 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/umbran_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/umbran_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/umbran_sapling"
+        "layer0": "biomesoplenty:block/umbran_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/violet.json b/src/main/resources/assets/biomesoplenty/models/item/violet.json
index 3cd3572da..178d7d7bb 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/violet.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/violet.json
@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/violet"
+        "layer0": "biomesoplenty:block/violet"
     },
     "display": {
         "thirdperson": {
diff --git a/src/main/resources/assets/biomesoplenty/models/item/watergrass.json b/src/main/resources/assets/biomesoplenty/models/item/watergrass.json
index fe3f2cb33..6b42ee1b5 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/watergrass.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/watergrass.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/watergrass"
+        "layer0": "biomesoplenty:item/watergrass"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/white_cherry_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/white_cherry_sapling.json
index f76a25433..a45f1b60e 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/white_cherry_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/white_cherry_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/white_cherry_sapling"
+        "layer0": "biomesoplenty:block/white_cherry_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/wildflower.json b/src/main/resources/assets/biomesoplenty/models/item/wildflower.json
index 410a97997..bcdec51fa 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/wildflower.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/wildflower.json
@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/wildflower"
+        "layer0": "biomesoplenty:block/wildflower"
     },
     "display": {
         "thirdperson": {
diff --git a/src/main/resources/assets/biomesoplenty/models/item/willow_boat.json b/src/main/resources/assets/biomesoplenty/models/item/willow_boat.json
index 7a331353d..a15c4725d 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/willow_boat.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/willow_boat.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/willow_boat"
+        "layer0": "biomesoplenty:item/willow_boat"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/willow_door.json b/src/main/resources/assets/biomesoplenty/models/item/willow_door.json
index dc8105a6f..ea894985b 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/willow_door.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/willow_door.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:items/willow_door"
+        "layer0": "biomesoplenty:item/willow_door"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/willow_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/willow_sapling.json
index 18b3460a3..a76e53dab 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/willow_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/willow_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/willow_sapling"
+        "layer0": "biomesoplenty:block/willow_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/item/willow_vine.json b/src/main/resources/assets/biomesoplenty/models/item/willow_vine.json
index 949df63c5..5fb22a013 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/willow_vine.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/willow_vine.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/willow_vine"
+        "layer0": "biomesoplenty:block/willow_vine"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/item/wilted_lily.json b/src/main/resources/assets/biomesoplenty/models/item/wilted_lily.json
index fdea08d75..add68cf15 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/wilted_lily.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/wilted_lily.json
@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/wilted_lily"
+        "layer0": "biomesoplenty:block/wilted_lily"
     },
     "display": {
         "thirdperson": {
diff --git a/src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_sapling.json
index cb93799c9..8e63c69bb 100644
--- a/src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_sapling.json
+++ b/src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_sapling.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "biomesoplenty:blocks/yellow_autumn_sapling"
+        "layer0": "biomesoplenty:block/yellow_autumn_sapling"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ash_block.png b/src/main/resources/assets/biomesoplenty/textures/block/ash_block.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/ash_block.png
rename to src/main/resources/assets/biomesoplenty/textures/block/ash_block.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/barley.png b/src/main/resources/assets/biomesoplenty/textures/block/barley.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/barley.png
rename to src/main/resources/assets/biomesoplenty/textures/block/barley.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/blue_hydrangea.png b/src/main/resources/assets/biomesoplenty/textures/block/blue_hydrangea.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/blue_hydrangea.png
rename to src/main/resources/assets/biomesoplenty/textures/block/blue_hydrangea.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/bramble.png b/src/main/resources/assets/biomesoplenty/textures/block/bramble.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/bramble.png
rename to src/main/resources/assets/biomesoplenty/textures/block/bramble.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/bramble_thorns.png b/src/main/resources/assets/biomesoplenty/textures/block/bramble_thorns.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/bramble_thorns.png
rename to src/main/resources/assets/biomesoplenty/textures/block/bramble_thorns.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/burning_blossom.png b/src/main/resources/assets/biomesoplenty/textures/block/burning_blossom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/burning_blossom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/burning_blossom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/bush.png b/src/main/resources/assets/biomesoplenty/textures/block/bush.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/bush.png
rename to src/main/resources/assets/biomesoplenty/textures/block/bush.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/cattail.png b/src/main/resources/assets/biomesoplenty/textures/block/cattail.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/cattail.png
rename to src/main/resources/assets/biomesoplenty/textures/block/cattail.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/cherry_door_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/cherry_door_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/cherry_door_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/cherry_door_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/cherry_door_top.png b/src/main/resources/assets/biomesoplenty/textures/block/cherry_door_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/cherry_door_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/cherry_door_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/cherry_log.png b/src/main/resources/assets/biomesoplenty/textures/block/cherry_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/cherry_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/cherry_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/cherry_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/cherry_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/cherry_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/cherry_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/cherry_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/cherry_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/cherry_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/block/cherry_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/cherry_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/cherry_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/cherry_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/block/cherry_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/chiseled_white_sandstone.png b/src/main/resources/assets/biomesoplenty/textures/block/chiseled_white_sandstone.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/chiseled_white_sandstone.png
rename to src/main/resources/assets/biomesoplenty/textures/block/chiseled_white_sandstone.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/cut_white_sandstone.png b/src/main/resources/assets/biomesoplenty/textures/block/cut_white_sandstone.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/cut_white_sandstone.png
rename to src/main/resources/assets/biomesoplenty/textures/block/cut_white_sandstone.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_door_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/dead_door_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/dead_door_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/dead_door_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_door_top.png b/src/main/resources/assets/biomesoplenty/textures/block/dead_door_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/dead_door_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/dead_door_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_grass.png b/src/main/resources/assets/biomesoplenty/textures/block/dead_grass.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/dead_grass.png
rename to src/main/resources/assets/biomesoplenty/textures/block/dead_grass.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/dead_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/dead_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/dead_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log.png b/src/main/resources/assets/biomesoplenty/textures/block/dead_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/dead_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/dead_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/dead_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/dead_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/dead_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/dead_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/dead_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/block/dead_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/dead_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/dead_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/dead_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/dead_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/dead_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/block/dead_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/desert_grass.png b/src/main/resources/assets/biomesoplenty/textures/block/desert_grass.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/desert_grass.png
rename to src/main/resources/assets/biomesoplenty/textures/block/desert_grass.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dried_sand.png b/src/main/resources/assets/biomesoplenty/textures/block/dried_sand.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/dried_sand.png
rename to src/main/resources/assets/biomesoplenty/textures/block/dried_sand.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dune_grass.png b/src/main/resources/assets/biomesoplenty/textures/block/dune_grass.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/dune_grass.png
rename to src/main/resources/assets/biomesoplenty/textures/block/dune_grass.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_door_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/ethereal_door_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_door_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/ethereal_door_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_door_top.png b/src/main/resources/assets/biomesoplenty/textures/block/ethereal_door_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_door_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/ethereal_door_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/ethereal_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/ethereal_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_log.png b/src/main/resources/assets/biomesoplenty/textures/block/ethereal_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/ethereal_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/ethereal_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/ethereal_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/ethereal_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/block/ethereal_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/ethereal_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/ethereal_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/ethereal_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/block/ethereal_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/fir_door_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/fir_door_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/fir_door_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/fir_door_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/fir_door_top.png b/src/main/resources/assets/biomesoplenty/textures/block/fir_door_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/fir_door_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/fir_door_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/fir_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/fir_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/fir_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/fir_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/fir_log.png b/src/main/resources/assets/biomesoplenty/textures/block/fir_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/fir_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/fir_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/fir_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/fir_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/fir_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/fir_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/fir_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/fir_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/fir_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/block/fir_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/fir_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/fir_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/fir_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/fir_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/fir_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/fir_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/fir_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/block/fir_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flesh.png b/src/main/resources/assets/biomesoplenty/textures/block/flesh.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/flesh.png
rename to src/main/resources/assets/biomesoplenty/textures/block/flesh.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/flowering_oak_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/flowering_oak_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves_overlay.png b/src/main/resources/assets/biomesoplenty/textures/block/flowering_oak_leaves_overlay.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves_overlay.png
rename to src/main/resources/assets/biomesoplenty/textures/block/flowering_oak_leaves_overlay.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/flowering_oak_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/flowering_oak_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/glowflower.png b/src/main/resources/assets/biomesoplenty/textures/block/glowflower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/glowflower.png
rename to src/main/resources/assets/biomesoplenty/textures/block/glowflower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/glowshroom.png b/src/main/resources/assets/biomesoplenty/textures/block/glowshroom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/glowshroom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/glowshroom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/goldenrod.png b/src/main/resources/assets/biomesoplenty/textures/block/goldenrod.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/goldenrod.png
rename to src/main/resources/assets/biomesoplenty/textures/block/goldenrod.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_door_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/hellbark_door_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_door_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/hellbark_door_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_door_top.png b/src/main/resources/assets/biomesoplenty/textures/block/hellbark_door_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_door_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/hellbark_door_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/hellbark_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/hellbark_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_log.png b/src/main/resources/assets/biomesoplenty/textures/block/hellbark_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/hellbark_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/hellbark_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/hellbark_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/hellbark_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/block/hellbark_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/hellbark_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/hellbark_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/hellbark_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/block/hellbark_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_door_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_door_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_door_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/jacaranda_door_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_door_top.png b/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_door_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_door_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/jacaranda_door_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/jacaranda_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_log.png b/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/jacaranda_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/jacaranda_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/block/jacaranda_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/jacaranda_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/block/jacaranda_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/lavender.png b/src/main/resources/assets/biomesoplenty/textures/block/lavender.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/lavender.png
rename to src/main/resources/assets/biomesoplenty/textures/block/lavender.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/magic_door_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/magic_door_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/magic_door_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/magic_door_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/magic_door_top.png b/src/main/resources/assets/biomesoplenty/textures/block/magic_door_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/magic_door_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/magic_door_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/magic_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/magic_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/magic_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/magic_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/magic_log.png b/src/main/resources/assets/biomesoplenty/textures/block/magic_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/magic_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/magic_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/magic_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/magic_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/magic_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/magic_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/magic_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/magic_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/magic_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/block/magic_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/magic_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/magic_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/magic_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/magic_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/magic_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/magic_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/magic_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/block/magic_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_door_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/mahogany_door_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_door_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/mahogany_door_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_door_top.png b/src/main/resources/assets/biomesoplenty/textures/block/mahogany_door_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_door_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/mahogany_door_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/mahogany_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/mahogany_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log.png b/src/main/resources/assets/biomesoplenty/textures/block/mahogany_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/mahogany_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/mahogany_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/mahogany_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/mahogany_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/block/mahogany_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/mahogany_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/mahogany_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/mahogany_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/block/mahogany_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mangrove_root_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/mangrove_root_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/mangrove_root_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/mangrove_root_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mangrove_root_top.png b/src/main/resources/assets/biomesoplenty/textures/block/mangrove_root_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/mangrove_root_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/mangrove_root_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/maple_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/maple_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/maple_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/maple_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/maple_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/maple_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/maple_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/maple_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/mud.png b/src/main/resources/assets/biomesoplenty/textures/block/mud.png
new file mode 100644
index 000000000..d45b631c8
Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/mud.png differ
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mud_bricks.png b/src/main/resources/assets/biomesoplenty/textures/block/mud_bricks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/mud_bricks.png
rename to src/main/resources/assets/biomesoplenty/textures/block/mud_bricks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/orange_autumn_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/orange_autumn_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/orange_autumn_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/orange_autumn_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/orange_autumn_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/orange_autumn_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/orange_autumn_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/orange_autumn_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/orange_cosmos.png b/src/main/resources/assets/biomesoplenty/textures/block/orange_cosmos.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/orange_cosmos.png
rename to src/main/resources/assets/biomesoplenty/textures/block/orange_cosmos.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/origin_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/origin_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/origin_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/origin_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/origin_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/origin_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/origin_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/origin_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/palm_door_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/palm_door_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/palm_door_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/palm_door_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/palm_door_top.png b/src/main/resources/assets/biomesoplenty/textures/block/palm_door_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/palm_door_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/palm_door_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/palm_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/palm_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/palm_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/palm_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/palm_log.png b/src/main/resources/assets/biomesoplenty/textures/block/palm_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/palm_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/palm_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/palm_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/palm_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/palm_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/palm_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/palm_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/palm_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/palm_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/block/palm_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/palm_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/palm_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/palm_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/palm_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/palm_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/palm_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/palm_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/block/palm_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/pink_cherry_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/pink_cherry_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/pink_cherry_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/pink_cherry_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/pink_cherry_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/pink_cherry_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/pink_cherry_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/pink_cherry_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/pink_daffodil.png b/src/main/resources/assets/biomesoplenty/textures/block/pink_daffodil.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/pink_daffodil.png
rename to src/main/resources/assets/biomesoplenty/textures/block/pink_daffodil.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/pink_hibiscus.png b/src/main/resources/assets/biomesoplenty/textures/block/pink_hibiscus.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/pink_hibiscus.png
rename to src/main/resources/assets/biomesoplenty/textures/block/pink_hibiscus.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/potted_glowshroom.png b/src/main/resources/assets/biomesoplenty/textures/block/potted_glowshroom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/potted_glowshroom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/potted_glowshroom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/potted_lavender.png b/src/main/resources/assets/biomesoplenty/textures/block/potted_lavender.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/potted_lavender.png
rename to src/main/resources/assets/biomesoplenty/textures/block/potted_lavender.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/potted_sprout.png b/src/main/resources/assets/biomesoplenty/textures/block/potted_sprout.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/potted_sprout.png
rename to src/main/resources/assets/biomesoplenty/textures/block/potted_sprout.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/potted_violet.png b/src/main/resources/assets/biomesoplenty/textures/block/potted_violet.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/potted_violet.png
rename to src/main/resources/assets/biomesoplenty/textures/block/potted_violet.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_door_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_door_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/redwood_door_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/redwood_door_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_door_top.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_door_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/redwood_door_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/redwood_door_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/redwood_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/redwood_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_log.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/redwood_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/redwood_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/redwood_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/redwood_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/redwood_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/block/redwood_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/redwood_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/redwood_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/redwood_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/block/redwood_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/reed_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/reed_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/reed_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/reed_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/reed_top.png b/src/main/resources/assets/biomesoplenty/textures/block/reed_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/reed_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/reed_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/rose.png b/src/main/resources/assets/biomesoplenty/textures/block/rose.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/rose.png
rename to src/main/resources/assets/biomesoplenty/textures/block/rose.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sprout.png b/src/main/resources/assets/biomesoplenty/textures/block/sprout.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/sprout.png
rename to src/main/resources/assets/biomesoplenty/textures/block/sprout.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_cherry_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_cherry_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_cherry_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_cherry_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_cherry_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_cherry_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_cherry_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_cherry_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_dead_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_dead_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_dead_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_dead_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_dead_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_dead_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_dead_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_dead_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_ethereal_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_ethereal_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_ethereal_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_ethereal_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_ethereal_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_ethereal_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_ethereal_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_ethereal_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_fir_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_fir_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_fir_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_fir_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_fir_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_fir_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_fir_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_fir_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_hellbark_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_hellbark_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_hellbark_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_hellbark_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_hellbark_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_hellbark_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_hellbark_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_hellbark_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_jacaranda_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_jacaranda_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_jacaranda_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_jacaranda_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_jacaranda_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_jacaranda_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_jacaranda_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_jacaranda_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_magic_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_magic_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_magic_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_magic_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_magic_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_magic_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_magic_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_magic_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_mahogany_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_mahogany_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_mahogany_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_mahogany_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_mahogany_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_mahogany_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_mahogany_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_mahogany_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_palm_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_palm_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_palm_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_palm_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_palm_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_palm_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_palm_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_palm_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_redwood_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_redwood_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_redwood_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_redwood_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_redwood_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_redwood_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_redwood_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_redwood_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_umbran_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_umbran_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_umbran_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_umbran_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_umbran_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_umbran_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_umbran_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_umbran_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_willow_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_willow_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_willow_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_willow_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_willow_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_willow_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/stripped_willow_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/stripped_willow_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/tall_cattail_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/tall_cattail_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_top.png b/src/main/resources/assets/biomesoplenty/textures/block/tall_cattail_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/tall_cattail_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/toadstool.png b/src/main/resources/assets/biomesoplenty/textures/block/toadstool.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/toadstool.png
rename to src/main/resources/assets/biomesoplenty/textures/block/toadstool.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_door_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/umbran_door_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/umbran_door_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/umbran_door_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_door_top.png b/src/main/resources/assets/biomesoplenty/textures/block/umbran_door_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/umbran_door_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/umbran_door_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/umbran_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/umbran_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/umbran_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log.png b/src/main/resources/assets/biomesoplenty/textures/block/umbran_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/umbran_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/umbran_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/umbran_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/umbran_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/umbran_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/block/umbran_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/umbran_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/umbran_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/umbran_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/umbran_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/umbran_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/block/umbran_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/violet.png b/src/main/resources/assets/biomesoplenty/textures/block/violet.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/violet.png
rename to src/main/resources/assets/biomesoplenty/textures/block/violet.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/white_cherry_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/white_cherry_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/white_cherry_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/white_cherry_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/white_cherry_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/white_cherry_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/white_cherry_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/white_cherry_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/white_sand.png b/src/main/resources/assets/biomesoplenty/textures/block/white_sand.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/white_sand.png
rename to src/main/resources/assets/biomesoplenty/textures/block/white_sand.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone.png b/src/main/resources/assets/biomesoplenty/textures/block/white_sandstone.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone.png
rename to src/main/resources/assets/biomesoplenty/textures/block/white_sandstone.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_top.png b/src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/wildflower.png b/src/main/resources/assets/biomesoplenty/textures/block/wildflower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/wildflower.png
rename to src/main/resources/assets/biomesoplenty/textures/block/wildflower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/willow_door_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/willow_door_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/willow_door_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/block/willow_door_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/willow_door_top.png b/src/main/resources/assets/biomesoplenty/textures/block/willow_door_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/willow_door_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/willow_door_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/willow_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/willow_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/willow_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/willow_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/willow_log.png b/src/main/resources/assets/biomesoplenty/textures/block/willow_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/willow_log.png
rename to src/main/resources/assets/biomesoplenty/textures/block/willow_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/willow_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/willow_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/willow_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/block/willow_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/willow_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/willow_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/willow_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/block/willow_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/willow_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/willow_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/willow_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/willow_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/willow_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/willow_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/willow_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/block/willow_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/willow_vine.png b/src/main/resources/assets/biomesoplenty/textures/block/willow_vine.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/willow_vine.png
rename to src/main/resources/assets/biomesoplenty/textures/block/willow_vine.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/wilted_lily.png b/src/main/resources/assets/biomesoplenty/textures/block/wilted_lily.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/wilted_lily.png
rename to src/main/resources/assets/biomesoplenty/textures/block/wilted_lily.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/yellow_autumn_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/yellow_autumn_leaves.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/yellow_autumn_leaves.png
rename to src/main/resources/assets/biomesoplenty/textures/block/yellow_autumn_leaves.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/yellow_autumn_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/yellow_autumn_sapling.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/blocks/yellow_autumn_sapling.png
rename to src/main/resources/assets/biomesoplenty/textures/block/yellow_autumn_sapling.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mud.png b/src/main/resources/assets/biomesoplenty/textures/blocks/mud.png
deleted file mode 100644
index fd2011fc6..000000000
Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/mud.png and /dev/null differ
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/bop_icon.png b/src/main/resources/assets/biomesoplenty/textures/item/bop_icon.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/bop_icon.png
rename to src/main/resources/assets/biomesoplenty/textures/item/bop_icon.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/bramble.png b/src/main/resources/assets/biomesoplenty/textures/item/bramble.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/bramble.png
rename to src/main/resources/assets/biomesoplenty/textures/item/bramble.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/cattail.png b/src/main/resources/assets/biomesoplenty/textures/item/cattail.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/cattail.png
rename to src/main/resources/assets/biomesoplenty/textures/item/cattail.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/cherry_boat.png b/src/main/resources/assets/biomesoplenty/textures/item/cherry_boat.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/cherry_boat.png
rename to src/main/resources/assets/biomesoplenty/textures/item/cherry_boat.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/cherry_door.png b/src/main/resources/assets/biomesoplenty/textures/item/cherry_door.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/cherry_door.png
rename to src/main/resources/assets/biomesoplenty/textures/item/cherry_door.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/dead_boat.png b/src/main/resources/assets/biomesoplenty/textures/item/dead_boat.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/dead_boat.png
rename to src/main/resources/assets/biomesoplenty/textures/item/dead_boat.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/dead_door.png b/src/main/resources/assets/biomesoplenty/textures/item/dead_door.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/dead_door.png
rename to src/main/resources/assets/biomesoplenty/textures/item/dead_door.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/ethereal_boat.png b/src/main/resources/assets/biomesoplenty/textures/item/ethereal_boat.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/ethereal_boat.png
rename to src/main/resources/assets/biomesoplenty/textures/item/ethereal_boat.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/ethereal_door.png b/src/main/resources/assets/biomesoplenty/textures/item/ethereal_door.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/ethereal_door.png
rename to src/main/resources/assets/biomesoplenty/textures/item/ethereal_door.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/fir_boat.png b/src/main/resources/assets/biomesoplenty/textures/item/fir_boat.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/fir_boat.png
rename to src/main/resources/assets/biomesoplenty/textures/item/fir_boat.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/fir_door.png b/src/main/resources/assets/biomesoplenty/textures/item/fir_door.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/fir_door.png
rename to src/main/resources/assets/biomesoplenty/textures/item/fir_door.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/hellbark_boat.png b/src/main/resources/assets/biomesoplenty/textures/item/hellbark_boat.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/hellbark_boat.png
rename to src/main/resources/assets/biomesoplenty/textures/item/hellbark_boat.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/hellbark_door.png b/src/main/resources/assets/biomesoplenty/textures/item/hellbark_door.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/hellbark_door.png
rename to src/main/resources/assets/biomesoplenty/textures/item/hellbark_door.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/jacaranda_boat.png b/src/main/resources/assets/biomesoplenty/textures/item/jacaranda_boat.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/jacaranda_boat.png
rename to src/main/resources/assets/biomesoplenty/textures/item/jacaranda_boat.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/jacaranda_door.png b/src/main/resources/assets/biomesoplenty/textures/item/jacaranda_door.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/jacaranda_door.png
rename to src/main/resources/assets/biomesoplenty/textures/item/jacaranda_door.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/magic_boat.png b/src/main/resources/assets/biomesoplenty/textures/item/magic_boat.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/magic_boat.png
rename to src/main/resources/assets/biomesoplenty/textures/item/magic_boat.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/magic_door.png b/src/main/resources/assets/biomesoplenty/textures/item/magic_door.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/magic_door.png
rename to src/main/resources/assets/biomesoplenty/textures/item/magic_door.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/mahogany_boat.png b/src/main/resources/assets/biomesoplenty/textures/item/mahogany_boat.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/mahogany_boat.png
rename to src/main/resources/assets/biomesoplenty/textures/item/mahogany_boat.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/mahogany_door.png b/src/main/resources/assets/biomesoplenty/textures/item/mahogany_door.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/mahogany_door.png
rename to src/main/resources/assets/biomesoplenty/textures/item/mahogany_door.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/mangrove_root.png b/src/main/resources/assets/biomesoplenty/textures/item/mangrove_root.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/mangrove_root.png
rename to src/main/resources/assets/biomesoplenty/textures/item/mangrove_root.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/mud_ball.png b/src/main/resources/assets/biomesoplenty/textures/item/mud_ball.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/mud_ball.png
rename to src/main/resources/assets/biomesoplenty/textures/item/mud_ball.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/mud_brick.png b/src/main/resources/assets/biomesoplenty/textures/item/mud_brick.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/mud_brick.png
rename to src/main/resources/assets/biomesoplenty/textures/item/mud_brick.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/music_disc_wanderer.png b/src/main/resources/assets/biomesoplenty/textures/item/music_disc_wanderer.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/music_disc_wanderer.png
rename to src/main/resources/assets/biomesoplenty/textures/item/music_disc_wanderer.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/palm_boat.png b/src/main/resources/assets/biomesoplenty/textures/item/palm_boat.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/palm_boat.png
rename to src/main/resources/assets/biomesoplenty/textures/item/palm_boat.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/palm_door.png b/src/main/resources/assets/biomesoplenty/textures/item/palm_door.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/palm_door.png
rename to src/main/resources/assets/biomesoplenty/textures/item/palm_door.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/redwood_boat.png b/src/main/resources/assets/biomesoplenty/textures/item/redwood_boat.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/redwood_boat.png
rename to src/main/resources/assets/biomesoplenty/textures/item/redwood_boat.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/redwood_door.png b/src/main/resources/assets/biomesoplenty/textures/item/redwood_door.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/redwood_door.png
rename to src/main/resources/assets/biomesoplenty/textures/item/redwood_door.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/reed.png b/src/main/resources/assets/biomesoplenty/textures/item/reed.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/reed.png
rename to src/main/resources/assets/biomesoplenty/textures/item/reed.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/umbran_boat.png b/src/main/resources/assets/biomesoplenty/textures/item/umbran_boat.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/umbran_boat.png
rename to src/main/resources/assets/biomesoplenty/textures/item/umbran_boat.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/umbran_door.png b/src/main/resources/assets/biomesoplenty/textures/item/umbran_door.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/umbran_door.png
rename to src/main/resources/assets/biomesoplenty/textures/item/umbran_door.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/watergrass.png b/src/main/resources/assets/biomesoplenty/textures/item/watergrass.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/watergrass.png
rename to src/main/resources/assets/biomesoplenty/textures/item/watergrass.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/willow_boat.png b/src/main/resources/assets/biomesoplenty/textures/item/willow_boat.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/willow_boat.png
rename to src/main/resources/assets/biomesoplenty/textures/item/willow_boat.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/items/willow_door.png b/src/main/resources/assets/biomesoplenty/textures/item/willow_door.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/items/willow_door.png
rename to src/main/resources/assets/biomesoplenty/textures/item/willow_door.png