From 5b0326c50132654dfb3c40ce540457213cfae5bc Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Fri, 24 Apr 2020 21:24:49 +0200
Subject: [PATCH] Fixed a ton of broken resources

---
 .../assets/unicopia/blockstates/alfalfa.json  |  19 ---
 .../unicopia/blockstates/alfalfa_crops.json   |  19 +++
 .../assets/unicopia/blockstates/anvil.json    |  16 ---
 .../unicopia/blockstates/apple_leaves.json    |  11 +-
 .../unicopia/blockstates/apple_sapling.json   |   4 +-
 .../unicopia/blockstates/bakery_door.json     |  99 +++++---------
 .../chiseled_chitin_shell_block.json          |  10 ++
 .../unicopia/blockstates/chissled_chitin.json |  10 --
 .../unicopia/blockstates/chitin_block.json    |   7 -
 .../blockstates/chitin_shell_block.json       |   7 +
 .../unicopia/blockstates/cloud_anvil.json     |   8 ++
 .../unicopia/blockstates/cloud_banister.json  |  18 ---
 .../unicopia/blockstates/cloud_block.json     |   2 +-
 .../unicopia/blockstates/cloud_farmland.json  |  16 +--
 .../unicopia/blockstates/cloud_fence.json     |  10 +-
 .../unicopia/blockstates/cloud_slab.json      |   5 +-
 .../unicopia/blockstates/cloud_stairs.json    |  80 +++++------
 .../assets/unicopia/blockstates/cuccoon.json  |  20 ---
 .../blockstates/dense_cloud_block.json        |   5 +
 .../blockstates/dense_cloud_slab.json         |   7 +
 .../unicopia/blockstates/diamond_door.json    | 128 +++++++++---------
 .../blockstates/double_cloud_slab.json        |   5 -
 .../double_enchanted_cloud_slab.json          |   5 -
 .../blockstates/double_packed_cloud_slab.json |   5 -
 .../blockstates/enchanted_cloud_block.json    |   2 +-
 .../blockstates/enchanted_cloud_slab.json     |   5 +-
 .../unicopia/blockstates/enchanted_torch.json |  22 +--
 .../unicopia/blockstates/flower_pot.json      |   6 +-
 .../assets/unicopia/blockstates/hive.json     |  13 --
 .../unicopia/blockstates/hive_wall_block.json |  13 ++
 .../unicopia/blockstates/library_door.json    | 128 +++++++++---------
 ...{mist_door.json => misted_glass_door.json} | 128 +++++++++---------
 .../blockstates/packed_cloud_block.json       |   5 -
 .../blockstates/packed_cloud_slab.json        |   6 -
 .../unicopia/blockstates/slime_drop.json      |  20 +++
 .../unicopia/blockstates/slime_layer.json     |  16 +--
 .../assets/unicopia/blockstates/stick.json    |   2 +-
 .../unicopia/blockstates/sugar_block.json     |   2 +-
 .../unicopia/blockstates/tomato_plant.json    |  32 ++---
 .../resources/assets/unicopia/lang/en_us.json |   2 +-
 .../{alfalfa => alfalfa_crops}/shaft.json     |   0
 .../{alfalfa => alfalfa_crops}/stage0.json    |   0
 .../{alfalfa => alfalfa_crops}/stage1.json    |   0
 .../{alfalfa => alfalfa_crops}/stage2.json    |   0
 .../{alfalfa => alfalfa_crops}/stage3.json    |   0
 .../{alfalfa => alfalfa_crops}/stage4.json    |   0
 ....json => chiseled_chitin_shell_block.json} |   0
 ...uncovered.json => chitin_shell_block.json} |   0
 ...d.json => chitin_shell_block_covered.json} |   0
 ...ered.json => chitin_shell_block_snow.json} |   0
 ...{anvil_undamaged.json => cloud_anvil.json} |   0
 .../block/cloud_banister_inventory.json       |  33 -----
 .../models/block/cloud_banister_post.json     |  20 ---
 .../models/block/cloud_banister_side.json     |  20 ---
 ...rmal_cloud_block.json => cloud_block.json} |   0
 ...slab_normal_cloud.json => cloud_slab.json} |   2 +-
 ..._normal_cloud.json => cloud_slab_top.json} |   2 +-
 ...loud_block.json => dense_cloud_block.json} |   0
 ...acked_cloud.json => dense_cloud_slab.json} |   2 +-
 ...d_cloud.json => dense_cloud_slab_top.json} |   2 +-
 ...d_cloud.json => enchanted_cloud_slab.json} |   2 +-
 ...oud.json => enchanted_cloud_slab_top.json} |   2 +-
 .../{cuccoon => slime_drop}/bulb_stage0.json  |   0
 .../{cuccoon => slime_drop}/bulb_stage1.json  |   0
 .../{cuccoon => slime_drop}/bulb_stage2.json  |   0
 .../{cuccoon => slime_drop}/bulb_stage3.json  |   0
 .../string_stage0.json                        |   0
 .../string_stage1.json                        |   0
 .../string_stage2.json                        |   0
 .../string_stage3.json                        |   0
 .../{slime => slime_layer}/layer_10.json      |   4 +-
 .../{slime => slime_layer}/layer_12.json      |   4 +-
 .../{slime => slime_layer}/layer_14.json      |   4 +-
 .../block/{slime => slime_layer}/layer_2.json |   4 +-
 .../block/{slime => slime_layer}/layer_4.json |   4 +-
 .../block/{slime => slime_layer}/layer_6.json |   4 +-
 .../block/{slime => slime_layer}/layer_8.json |   4 +-
 .../assets/unicopia/models/item/anvil.json    |   3 -
 .../models/item/butterfly_spawn_egg.json      |   3 +
 .../item/chiseled_chitin_shell_block.json     |   3 +
 .../unicopia/models/item/chissled_chitin.json |   3 -
 .../unicopia/models/item/chitin_block.json    |   3 -
 .../models/item/chitin_shell_block.json       |   3 +
 .../unicopia/models/item/cloud_anvil.json     |   3 +
 .../unicopia/models/item/cloud_banister.json  |   3 -
 .../unicopia/models/item/cloud_block.json     |   2 +-
 .../unicopia/models/item/cloud_slab.json      |   2 +-
 .../unicopia/models/item/cloud_spawn_egg.json |   3 +
 ...loud_block.json => dense_cloud_block.json} |   2 +-
 ..._cloud_slab.json => dense_cloud_slab.json} |   2 +-
 .../models/item/enchanted_cloud_slab.json     |   2 +-
 .../item/{hive.json => hive_wall_block.json}  |   0
 .../{cuccoon.json => misted_glass_door.json}  |   2 +-
 ...d_crusade.json => music_disc_crusade.json} |   0
 ...{record_funk.json => music_disc_funk.json} |   0
 .../{record_pet.json => music_disc_pet.json}  |   0
 ...d_popular.json => music_disc_popular.json} |   0
 .../item/{mist_door.json => slime_drop.json}  |   2 +-
 .../unicopia/models/item/slime_layer.json     |   2 +-
 .../loot_tables/blocks/enchanted_torch.json   |   4 +-
 100 files changed, 468 insertions(+), 610 deletions(-)
 delete mode 100644 src/main/resources/assets/unicopia/blockstates/alfalfa.json
 create mode 100644 src/main/resources/assets/unicopia/blockstates/alfalfa_crops.json
 delete mode 100644 src/main/resources/assets/unicopia/blockstates/anvil.json
 create mode 100644 src/main/resources/assets/unicopia/blockstates/chiseled_chitin_shell_block.json
 delete mode 100644 src/main/resources/assets/unicopia/blockstates/chissled_chitin.json
 delete mode 100644 src/main/resources/assets/unicopia/blockstates/chitin_block.json
 create mode 100644 src/main/resources/assets/unicopia/blockstates/chitin_shell_block.json
 create mode 100644 src/main/resources/assets/unicopia/blockstates/cloud_anvil.json
 delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloud_banister.json
 delete mode 100644 src/main/resources/assets/unicopia/blockstates/cuccoon.json
 create mode 100644 src/main/resources/assets/unicopia/blockstates/dense_cloud_block.json
 create mode 100644 src/main/resources/assets/unicopia/blockstates/dense_cloud_slab.json
 delete mode 100644 src/main/resources/assets/unicopia/blockstates/double_cloud_slab.json
 delete mode 100644 src/main/resources/assets/unicopia/blockstates/double_enchanted_cloud_slab.json
 delete mode 100644 src/main/resources/assets/unicopia/blockstates/double_packed_cloud_slab.json
 delete mode 100644 src/main/resources/assets/unicopia/blockstates/hive.json
 create mode 100644 src/main/resources/assets/unicopia/blockstates/hive_wall_block.json
 rename src/main/resources/assets/unicopia/blockstates/{mist_door.json => misted_glass_door.json} (51%)
 delete mode 100644 src/main/resources/assets/unicopia/blockstates/packed_cloud_block.json
 delete mode 100644 src/main/resources/assets/unicopia/blockstates/packed_cloud_slab.json
 create mode 100644 src/main/resources/assets/unicopia/blockstates/slime_drop.json
 rename src/main/resources/assets/unicopia/models/block/{alfalfa => alfalfa_crops}/shaft.json (100%)
 rename src/main/resources/assets/unicopia/models/block/{alfalfa => alfalfa_crops}/stage0.json (100%)
 rename src/main/resources/assets/unicopia/models/block/{alfalfa => alfalfa_crops}/stage1.json (100%)
 rename src/main/resources/assets/unicopia/models/block/{alfalfa => alfalfa_crops}/stage2.json (100%)
 rename src/main/resources/assets/unicopia/models/block/{alfalfa => alfalfa_crops}/stage3.json (100%)
 rename src/main/resources/assets/unicopia/models/block/{alfalfa => alfalfa_crops}/stage4.json (100%)
 rename src/main/resources/assets/unicopia/models/block/{chissled_chitin.json => chiseled_chitin_shell_block.json} (100%)
 rename src/main/resources/assets/unicopia/models/block/{chitin_block_uncovered.json => chitin_shell_block.json} (100%)
 rename src/main/resources/assets/unicopia/models/block/{chitin_block_covered.json => chitin_shell_block_covered.json} (100%)
 rename src/main/resources/assets/unicopia/models/block/{chitin_block_snow_covered.json => chitin_shell_block_snow.json} (100%)
 rename src/main/resources/assets/unicopia/models/block/{anvil_undamaged.json => cloud_anvil.json} (100%)
 delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_banister_inventory.json
 delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_banister_post.json
 delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_banister_side.json
 rename src/main/resources/assets/unicopia/models/block/{normal_cloud_block.json => cloud_block.json} (100%)
 rename src/main/resources/assets/unicopia/models/block/{half_slab_normal_cloud.json => cloud_slab.json} (83%)
 rename src/main/resources/assets/unicopia/models/block/{upper_slab_normal_cloud.json => cloud_slab_top.json} (83%)
 rename src/main/resources/assets/unicopia/models/block/{packed_cloud_block.json => dense_cloud_block.json} (100%)
 rename src/main/resources/assets/unicopia/models/block/{half_slab_packed_cloud.json => dense_cloud_slab.json} (84%)
 rename src/main/resources/assets/unicopia/models/block/{upper_slab_packed_cloud.json => dense_cloud_slab_top.json} (83%)
 rename src/main/resources/assets/unicopia/models/block/{half_slab_enchanted_cloud.json => enchanted_cloud_slab.json} (84%)
 rename src/main/resources/assets/unicopia/models/block/{upper_slab_enchanted_cloud.json => enchanted_cloud_slab_top.json} (84%)
 rename src/main/resources/assets/unicopia/models/block/{cuccoon => slime_drop}/bulb_stage0.json (100%)
 rename src/main/resources/assets/unicopia/models/block/{cuccoon => slime_drop}/bulb_stage1.json (100%)
 rename src/main/resources/assets/unicopia/models/block/{cuccoon => slime_drop}/bulb_stage2.json (100%)
 rename src/main/resources/assets/unicopia/models/block/{cuccoon => slime_drop}/bulb_stage3.json (100%)
 rename src/main/resources/assets/unicopia/models/block/{cuccoon => slime_drop}/string_stage0.json (100%)
 rename src/main/resources/assets/unicopia/models/block/{cuccoon => slime_drop}/string_stage1.json (100%)
 rename src/main/resources/assets/unicopia/models/block/{cuccoon => slime_drop}/string_stage2.json (100%)
 rename src/main/resources/assets/unicopia/models/block/{cuccoon => slime_drop}/string_stage3.json (100%)
 rename src/main/resources/assets/unicopia/models/block/{slime => slime_layer}/layer_10.json (92%)
 rename src/main/resources/assets/unicopia/models/block/{slime => slime_layer}/layer_12.json (92%)
 rename src/main/resources/assets/unicopia/models/block/{slime => slime_layer}/layer_14.json (92%)
 rename src/main/resources/assets/unicopia/models/block/{slime => slime_layer}/layer_2.json (88%)
 rename src/main/resources/assets/unicopia/models/block/{slime => slime_layer}/layer_4.json (87%)
 rename src/main/resources/assets/unicopia/models/block/{slime => slime_layer}/layer_6.json (92%)
 rename src/main/resources/assets/unicopia/models/block/{slime => slime_layer}/layer_8.json (92%)
 delete mode 100644 src/main/resources/assets/unicopia/models/item/anvil.json
 create mode 100644 src/main/resources/assets/unicopia/models/item/butterfly_spawn_egg.json
 create mode 100644 src/main/resources/assets/unicopia/models/item/chiseled_chitin_shell_block.json
 delete mode 100644 src/main/resources/assets/unicopia/models/item/chissled_chitin.json
 delete mode 100644 src/main/resources/assets/unicopia/models/item/chitin_block.json
 create mode 100644 src/main/resources/assets/unicopia/models/item/chitin_shell_block.json
 create mode 100644 src/main/resources/assets/unicopia/models/item/cloud_anvil.json
 delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud_banister.json
 create mode 100644 src/main/resources/assets/unicopia/models/item/cloud_spawn_egg.json
 rename src/main/resources/assets/unicopia/models/item/{packed_cloud_block.json => dense_cloud_block.json} (79%)
 rename src/main/resources/assets/unicopia/models/item/{packed_cloud_slab.json => dense_cloud_slab.json} (78%)
 rename src/main/resources/assets/unicopia/models/item/{hive.json => hive_wall_block.json} (100%)
 rename src/main/resources/assets/unicopia/models/item/{cuccoon.json => misted_glass_door.json} (53%)
 rename src/main/resources/assets/unicopia/models/item/{record_crusade.json => music_disc_crusade.json} (100%)
 rename src/main/resources/assets/unicopia/models/item/{record_funk.json => music_disc_funk.json} (100%)
 rename src/main/resources/assets/unicopia/models/item/{record_pet.json => music_disc_pet.json} (100%)
 rename src/main/resources/assets/unicopia/models/item/{record_popular.json => music_disc_popular.json} (100%)
 rename src/main/resources/assets/unicopia/models/item/{mist_door.json => slime_drop.json} (56%)

diff --git a/src/main/resources/assets/unicopia/blockstates/alfalfa.json b/src/main/resources/assets/unicopia/blockstates/alfalfa.json
deleted file mode 100644
index 0be74c49..00000000
--- a/src/main/resources/assets/unicopia/blockstates/alfalfa.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "variants": {
-        "age=0,half=top": { "model": "unicopia:alfalfa/stage0" },
-        "age=1,half=top": { "model": "unicopia:alfalfa/stage1" },
-        "age=2,half=top": { "model": "unicopia:alfalfa/stage2" },
-        "age=3,half=top": { "model": "unicopia:alfalfa/stage3" },
-        "age=4,half=top": { "model": "unicopia:alfalfa/stage4" },
-        "age=0,half=middle": { "model": "unicopia:alfalfa/shaft" },
-        "age=1,half=middle": { "model": "unicopia:alfalfa/shaft" },
-        "age=2,half=middle": { "model": "unicopia:alfalfa/shaft" },
-        "age=3,half=middle": { "model": "unicopia:alfalfa/shaft" },
-        "age=4,half=middle": { "model": "unicopia:alfalfa/shaft" },
-        "age=0,half=bottom": { "model": "unicopia:alfalfa/stage0" },
-        "age=1,half=bottom": { "model": "unicopia:alfalfa/stage1" },
-        "age=2,half=bottom": { "model": "unicopia:alfalfa/stage2" },
-        "age=3,half=bottom": { "model": "unicopia:alfalfa/stage3" },
-        "age=4,half=bottom": { "model": "unicopia:alfalfa/shaft" }
-    }
-}
diff --git a/src/main/resources/assets/unicopia/blockstates/alfalfa_crops.json b/src/main/resources/assets/unicopia/blockstates/alfalfa_crops.json
new file mode 100644
index 00000000..96a99cdb
--- /dev/null
+++ b/src/main/resources/assets/unicopia/blockstates/alfalfa_crops.json
@@ -0,0 +1,19 @@
+{
+    "variants": {
+        "age=0,half=top": { "model": "unicopia:block/alfalfa_crops/stage0" },
+        "age=1,half=top": { "model": "unicopia:block/alfalfa_crops/stage1" },
+        "age=2,half=top": { "model": "unicopia:block/alfalfa_crops/stage2" },
+        "age=3,half=top": { "model": "unicopia:block/alfalfa_crops/stage3" },
+        "age=4,half=top": { "model": "unicopia:block/alfalfa_crops/stage4" },
+        "age=0,half=middle": { "model": "unicopia:block/alfalfa_crops/shaft" },
+        "age=1,half=middle": { "model": "unicopia:block/alfalfa_crops/shaft" },
+        "age=2,half=middle": { "model": "unicopia:block/alfalfa_crops/shaft" },
+        "age=3,half=middle": { "model": "unicopia:block/alfalfa_crops/shaft" },
+        "age=4,half=middle": { "model": "unicopia:block/alfalfa_crops/shaft" },
+        "age=0,half=bottom": { "model": "unicopia:block/alfalfa_crops/stage0" },
+        "age=1,half=bottom": { "model": "unicopia:block/alfalfa_crops/stage1" },
+        "age=2,half=bottom": { "model": "unicopia:block/alfalfa_crops/stage2" },
+        "age=3,half=bottom": { "model": "unicopia:block/alfalfa_crops/stage3" },
+        "age=4,half=bottom": { "model": "unicopia:block/alfalfa_crops/shaft" }
+    }
+}
diff --git a/src/main/resources/assets/unicopia/blockstates/anvil.json b/src/main/resources/assets/unicopia/blockstates/anvil.json
deleted file mode 100644
index 2a089abf..00000000
--- a/src/main/resources/assets/unicopia/blockstates/anvil.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "variants": {
-        "damage=0,facing=south": { "model": "unicopia:anvil_undamaged" },
-        "damage=0,facing=west": { "model": "unicopia:anvil_undamaged", "y": 90 },
-        "damage=0,facing=north": { "model": "unicopia:anvil_undamaged", "y": 180 },
-        "damage=0,facing=east": { "model": "unicopia:anvil_undamaged", "y": 270 },
-        "damage=1,facing=south": { "model": "unicopia:anvil_undamaged" },
-        "damage=1,facing=west": { "model": "unicopia:anvil_undamaged", "y": 90 },
-        "damage=1,facing=north": { "model": "unicopia:anvil_undamaged", "y": 180 },
-        "damage=1,facing=east": { "model": "unicopia:anvil_undamaged", "y": 270 },
-        "damage=2,facing=south": { "model": "unicopia:anvil_undamaged" },
-        "damage=2,facing=west": { "model": "unicopia:anvil_undamaged", "y": 90 },
-        "damage=2,facing=north": { "model": "unicopia:anvil_undamaged", "y": 180 },
-        "damage=2,facing=east": { "model": "unicopia:anvil_undamaged", "y": 270 }
-    }
-}
diff --git a/src/main/resources/assets/unicopia/blockstates/apple_leaves.json b/src/main/resources/assets/unicopia/blockstates/apple_leaves.json
index 78d26656..59ab42ec 100644
--- a/src/main/resources/assets/unicopia/blockstates/apple_leaves.json
+++ b/src/main/resources/assets/unicopia/blockstates/apple_leaves.json
@@ -1,13 +1,6 @@
 {
     "variants": {
-        "normal": { "model": "unicopia:apple_leaves" },
-        "check_decay=false,decayable=false,heavy=false": { "model": "unicopia:apple_leaves" },
-        "check_decay=true,decayable=false,heavy=false": { "model": "unicopia:apple_leaves" },
-        "check_decay=false,decayable=true,heavy=false": { "model": "unicopia:apple_leaves" },
-        "check_decay=true,decayable=true,heavy=false": { "model": "unicopia:apple_leaves" },
-        "check_decay=false,decayable=false,heavy=true": { "model": "unicopia:apple_leaves_heavy" },
-        "check_decay=true,decayable=false,heavy=true": { "model": "unicopia:apple_leaves_heavy" },
-        "check_decay=false,decayable=true,heavy=true": { "model": "unicopia:apple_leaves_heavy" },
-        "check_decay=true,decayable=true,heavy=true": { "model": "unicopia:apple_leaves_heavy" }
+        "heavy=false": { "model": "unicopia:block/apple_leaves" },
+        "heavy=true": { "model": "unicopia:block/apple_leaves_heavy" }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/apple_sapling.json b/src/main/resources/assets/unicopia/blockstates/apple_sapling.json
index 69f7e19a..e44e4db1 100644
--- a/src/main/resources/assets/unicopia/blockstates/apple_sapling.json
+++ b/src/main/resources/assets/unicopia/blockstates/apple_sapling.json
@@ -1,6 +1,6 @@
 {
     "variants": {
-        "stage=0": { "model": "unicopia:apple_sapling" },
-        "stage=1": { "model": "unicopia:apple_sapling" }
+        "stage=0": { "model": "unicopia:block/apple_sapling" },
+        "stage=1": { "model": "unicopia:block/apple_sapling" }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/bakery_door.json b/src/main/resources/assets/unicopia/blockstates/bakery_door.json
index 72faabed..2a94f01e 100644
--- a/src/main/resources/assets/unicopia/blockstates/bakery_door.json
+++ b/src/main/resources/assets/unicopia/blockstates/bakery_door.json
@@ -1,68 +1,39 @@
 {
     "variants": {
-        "facing=east,half=lower,hinge=left,open=false,powered=false":  { "model": "unicopia:door/bakery_bottom" },
-        "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:door/bakery_bottom", "y": 90 },
-        "facing=west,half=lower,hinge=left,open=false,powered=false":  { "model": "unicopia:door/bakery_bottom", "y": 180 },
-        "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:door/bakery_bottom", "y": 270 },
-        "facing=east,half=lower,hinge=right,open=false,powered=false":  { "model": "unicopia:door/bakery_bottom_rh" },
-        "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:door/bakery_bottom_rh", "y": 90 },
-        "facing=west,half=lower,hinge=right,open=false,powered=false":  { "model": "unicopia:door/bakery_bottom_rh", "y": 180 },
-        "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:door/bakery_bottom_rh", "y": 270 },
-        "facing=east,half=lower,hinge=left,open=true,powered=false":  { "model": "unicopia:door/bakery_bottom_rh", "y": 90 },
-        "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:door/bakery_bottom_rh", "y": 180 },
-        "facing=west,half=lower,hinge=left,open=true,powered=false":  { "model": "unicopia:door/bakery_bottom_rh", "y": 270 },
-        "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:door/bakery_bottom_rh" },
-        "facing=east,half=lower,hinge=right,open=true,powered=false":  { "model": "unicopia:door/bakery_bottom", "y": 270 },
-        "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:door/bakery_bottom" },
-        "facing=west,half=lower,hinge=right,open=true,powered=false":  { "model": "unicopia:door/bakery_bottom", "y": 90 },
-        "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:door/bakery_bottom", "y": 180 },
-        "facing=east,half=upper,hinge=left,open=false,powered=false":  { "model": "unicopia:door/bakery_top" },
-        "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:door/bakery_top", "y": 90 },
-        "facing=west,half=upper,hinge=left,open=false,powered=false":  { "model": "unicopia:door/bakery_top", "y": 180 },
-        "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:door/bakery_top", "y": 270 },
-        "facing=east,half=upper,hinge=right,open=false,powered=false":  { "model": "unicopia:door/bakery_top_rh" },
-        "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:door/bakery_top_rh", "y": 90 },
-        "facing=west,half=upper,hinge=right,open=false,powered=false":  { "model": "unicopia:door/bakery_top_rh", "y": 180 },
-        "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:door/bakery_top_rh", "y": 270 },
-        "facing=east,half=upper,hinge=left,open=true,powered=false":  { "model": "unicopia:door/bakery_top_rh", "y": 90 },
-        "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:door/bakery_top_rh", "y": 180 },
-        "facing=west,half=upper,hinge=left,open=true,powered=false":  { "model": "unicopia:door/bakery_top_rh", "y": 270 },
-        "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:door/bakery_top_rh" },
-        "facing=east,half=upper,hinge=right,open=true,powered=false":  { "model": "unicopia:door/bakery_top", "y": 270 },
-        "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:door/bakery_top" },
-        "facing=west,half=upper,hinge=right,open=true,powered=false":  { "model": "unicopia:door/bakery_top", "y": 90 },
-        "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:door/bakery_top", "y": 180 },
-        "facing=east,half=lower,hinge=left,open=false,powered=true":  { "model": "unicopia:door/bakery_bottom" },
-        "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:door/bakery_bottom", "y": 90 },
-        "facing=west,half=lower,hinge=left,open=false,powered=true":  { "model": "unicopia:door/bakery_bottom", "y": 180 },
-        "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:door/bakery_bottom", "y": 270 },
-        "facing=east,half=lower,hinge=right,open=false,powered=true":  { "model": "unicopia:door/bakery_bottom_rh" },
-        "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:door/bakery_bottom_rh", "y": 90 },
-        "facing=west,half=lower,hinge=right,open=false,powered=true":  { "model": "unicopia:door/bakery_bottom_rh", "y": 180 },
-        "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:door/bakery_bottom_rh", "y": 270 },
-        "facing=east,half=lower,hinge=left,open=true,powered=true":  { "model": "unicopia:door/bakery_bottom_rh", "y": 90 },
-        "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:door/bakery_bottom_rh", "y": 180 },
-        "facing=west,half=lower,hinge=left,open=true,powered=true":  { "model": "unicopia:door/bakery_bottom_rh", "y": 270 },
-        "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:door/bakery_bottom_rh" },
-        "facing=east,half=lower,hinge=right,open=true,powered=true":  { "model": "unicopia:door/bakery_bottom", "y": 270 },
-        "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:door/bakery_bottom" },
-        "facing=west,half=lower,hinge=right,open=true,powered=true":  { "model": "unicopia:door/bakery_bottom", "y": 90 },
-        "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:door/bakery_bottom", "y": 180 },
-        "facing=east,half=upper,hinge=left,open=false,powered=true":  { "model": "unicopia:door/bakery_top" },
-        "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:door/bakery_top", "y": 90 },
-        "facing=west,half=upper,hinge=left,open=false,powered=true":  { "model": "unicopia:door/bakery_top", "y": 180 },
-        "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:door/bakery_top", "y": 270 },
-        "facing=east,half=upper,hinge=right,open=false,powered=true":  { "model": "unicopia:door/bakery_top_rh" },
-        "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:door/bakery_top_rh", "y": 90 },
-        "facing=west,half=upper,hinge=right,open=false,powered=true":  { "model": "unicopia:door/bakery_top_rh", "y": 180 },
-        "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:door/bakery_top_rh", "y": 270 },
-        "facing=east,half=upper,hinge=left,open=true,powered=true":  { "model": "unicopia:door/bakery_top_rh", "y": 90 },
-        "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:door/bakery_top_rh", "y": 180 },
-        "facing=west,half=upper,hinge=left,open=true,powered=true":  { "model": "unicopia:door/bakery_top_rh", "y": 270 },
-        "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:door/bakery_top_rh" },
-        "facing=east,half=upper,hinge=right,open=true,powered=true":  { "model": "unicopia:door/bakery_top", "y": 270 },
-        "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:door/bakery_top" },
-        "facing=west,half=upper,hinge=right,open=true,powered=true":  { "model": "unicopia:door/bakery_top", "y": 90 },
-        "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:door/bakery_top", "y": 180 }
+        "facing=east,half=lower,hinge=left,open=false":  { "model": "unicopia:block/door/bakery_bottom" },
+        "facing=south,half=lower,hinge=left,open=false": { "model": "unicopia:block/door/bakery_bottom", "y": 90 },
+        "facing=west,half=lower,hinge=left,open=false":  { "model": "unicopia:block/door/bakery_bottom", "y": 180 },
+        "facing=north,half=lower,hinge=left,open=false": { "model": "unicopia:block/door/bakery_bottom", "y": 270 },
+        "facing=east,half=lower,hinge=right,open=false":  { "model": "unicopia:block/door/bakery_bottom_rh" },
+        "facing=south,half=lower,hinge=right,open=false": { "model": "unicopia:block/door/bakery_bottom_rh", "y": 90 },
+        "facing=west,half=lower,hinge=right,open=false":  { "model": "unicopia:block/door/bakery_bottom_rh", "y": 180 },
+        "facing=north,half=lower,hinge=right,open=false": { "model": "unicopia:block/door/bakery_bottom_rh", "y": 270 },
+        
+        "facing=east,half=lower,hinge=left,open=true":  { "model": "unicopia:block/door/bakery_bottom_rh", "y": 90 },
+        "facing=south,half=lower,hinge=left,open=true": { "model": "unicopia:block/door/bakery_bottom_rh", "y": 180 },
+        "facing=west,half=lower,hinge=left,open=true":  { "model": "unicopia:block/door/bakery_bottom_rh", "y": 270 },
+        "facing=north,half=lower,hinge=left,open=true": { "model": "unicopia:block/door/bakery_bottom_rh" },
+        "facing=east,half=lower,hinge=right,open=true":  { "model": "unicopia:block/door/bakery_bottom", "y": 270 },
+        "facing=south,half=lower,hinge=right,open=true": { "model": "unicopia:block/door/bakery_bottom" },
+        "facing=west,half=lower,hinge=right,open=true":  { "model": "unicopia:block/door/bakery_bottom", "y": 90 },
+        "facing=north,half=lower,hinge=right,open=true": { "model": "unicopia:block/door/bakery_bottom", "y": 180 },
+        
+        "facing=east,half=upper,hinge=left,open=false":  { "model": "unicopia:block/door/bakery_top" },
+        "facing=south,half=upper,hinge=left,open=false": { "model": "unicopia:block/door/bakery_top", "y": 90 },
+        "facing=west,half=upper,hinge=left,open=false":  { "model": "unicopia:block/door/bakery_top", "y": 180 },
+        "facing=north,half=upper,hinge=left,open=false": { "model": "unicopia:block/door/bakery_top", "y": 270 },
+        "facing=east,half=upper,hinge=right,open=false":  { "model": "unicopia:block/door/bakery_top_rh" },
+        "facing=south,half=upper,hinge=right,open=false": { "model": "unicopia:block/door/bakery_top_rh", "y": 90 },
+        "facing=west,half=upper,hinge=right,open=false":  { "model": "unicopia:block/door/bakery_top_rh", "y": 180 },
+        "facing=north,half=upper,hinge=right,open=false": { "model": "unicopia:block/door/bakery_top_rh", "y": 270 },
+        
+        "facing=east,half=upper,hinge=left,open=true":  { "model": "unicopia:block/door/bakery_top_rh", "y": 90 },
+        "facing=south,half=upper,hinge=left,open=true": { "model": "unicopia:block/door/bakery_top_rh", "y": 180 },
+        "facing=west,half=upper,hinge=left,open=true":  { "model": "unicopia:block/door/bakery_top_rh", "y": 270 },
+        "facing=north,half=upper,hinge=left,open=true": { "model": "unicopia:block/door/bakery_top_rh" },
+        "facing=east,half=upper,hinge=right,open=true":  { "model": "unicopia:block/door/bakery_top", "y": 270 },
+        "facing=south,half=upper,hinge=right,open=true": { "model": "unicopia:block/door/bakery_top" },
+        "facing=west,half=upper,hinge=right,open=true":  { "model": "unicopia:block/door/bakery_top", "y": 90 },
+        "facing=north,half=upper,hinge=right,open=true": { "model": "unicopia:block/door/bakery_top", "y": 180 }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/chiseled_chitin_shell_block.json b/src/main/resources/assets/unicopia/blockstates/chiseled_chitin_shell_block.json
new file mode 100644
index 00000000..753a0be4
--- /dev/null
+++ b/src/main/resources/assets/unicopia/blockstates/chiseled_chitin_shell_block.json
@@ -0,0 +1,10 @@
+{
+    "variants": {
+        "facing=up": { "model": "unicopia:block/chiseled_chitin_shell_block" },
+        "facing=down": { "model": "unicopia:block/chiseled_chitin_shell_block", "x": 180 },
+        "facing=north": { "model": "unicopia:block/chiseled_chitin_shell_block", "x": 90 },
+        "facing=south": { "model": "unicopia:block/chiseled_chitin_shell_block", "x": -90 },
+        "facing=east": { "model": "unicopia:block/chiseled_chitin_shell_block", "x": 90, "y": 90 },
+		"facing=west": { "model": "unicopia:block/chiseled_chitin_shell_block", "x": 90, "y": -90 }
+    }
+}
diff --git a/src/main/resources/assets/unicopia/blockstates/chissled_chitin.json b/src/main/resources/assets/unicopia/blockstates/chissled_chitin.json
deleted file mode 100644
index 81a3c03a..00000000
--- a/src/main/resources/assets/unicopia/blockstates/chissled_chitin.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "variants": {
-        "facing=up": { "model": "unicopia:chissled_chitin" },
-        "facing=down": { "model": "unicopia:chissled_chitin", "x": 180 },
-        "facing=north": { "model": "unicopia:chissled_chitin", "x": 90 },
-        "facing=south": { "model": "unicopia:chissled_chitin", "x": -90 },
-        "facing=east": { "model": "unicopia:chissled_chitin", "x": 90, "y": 90 },
-		"facing=west": { "model": "unicopia:chissled_chitin", "x": 90, "y": -90 }
-    }
-}
diff --git a/src/main/resources/assets/unicopia/blockstates/chitin_block.json b/src/main/resources/assets/unicopia/blockstates/chitin_block.json
deleted file mode 100644
index a2663eda..00000000
--- a/src/main/resources/assets/unicopia/blockstates/chitin_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "covering=uncovered": { "model": "unicopia:chitin_block_uncovered" },
-        "covering=covered": { "model": "unicopia:chitin_block_covered" },
-        "covering=snow_covered": { "model": "unicopia:chitin_block_snow_covered" }
-    }
-}
diff --git a/src/main/resources/assets/unicopia/blockstates/chitin_shell_block.json b/src/main/resources/assets/unicopia/blockstates/chitin_shell_block.json
new file mode 100644
index 00000000..900a6d84
--- /dev/null
+++ b/src/main/resources/assets/unicopia/blockstates/chitin_shell_block.json
@@ -0,0 +1,7 @@
+{
+    "variants": {
+        "covering=uncovered": { "model": "unicopia:block/chitin_shell_block" },
+        "covering=covered": { "model": "unicopia:block/chitin_shell_block_covered" },
+        "covering=snow_covered": { "model": "unicopia:block/chitin_shell_block_snow" }
+    }
+}
diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_anvil.json b/src/main/resources/assets/unicopia/blockstates/cloud_anvil.json
new file mode 100644
index 00000000..667c820b
--- /dev/null
+++ b/src/main/resources/assets/unicopia/blockstates/cloud_anvil.json
@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "unicopia:block/cloud_anvil" },
+        "facing=west": { "model": "unicopia:block/cloud_anvil", "y": 90 },
+        "facing=north": { "model": "unicopia:block/cloud_anvil", "y": 180 },
+        "facing=east": { "model": "unicopia:block/cloud_anvil", "y": 270 }
+    }
+}
diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_banister.json b/src/main/resources/assets/unicopia/blockstates/cloud_banister.json
deleted file mode 100644
index 0b389a64..00000000
--- a/src/main/resources/assets/unicopia/blockstates/cloud_banister.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "multipart": [
-        {   "when": { "north": "false", "south": "false", "east": "false", "west": "false" },
-        	"apply": { "model": "unicopia:cloud_banister_post" }},
-        {   "when": { "north": "true" },
-            "apply": { "model": "unicopia:cloud_banister_side", "uvlock": true }
-        },
-        {   "when": { "east": "true" },
-            "apply": { "model": "unicopia:cloud_banister_side", "y": 90, "uvlock": true }
-        },
-        {   "when": { "south": "true" },
-            "apply": { "model": "unicopia:cloud_banister_side", "y": 180, "uvlock": true }
-        },
-        {   "when": { "west": "true" },
-            "apply": { "model": "unicopia:cloud_banister_side", "y": 270, "uvlock": true }
-        }
-    ]
-}
diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_block.json b/src/main/resources/assets/unicopia/blockstates/cloud_block.json
index 0dd87d3a..c974c23e 100644
--- a/src/main/resources/assets/unicopia/blockstates/cloud_block.json
+++ b/src/main/resources/assets/unicopia/blockstates/cloud_block.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "normal": { "model": "unicopia:normal_cloud_block" }
+        "": { "model": "unicopia:block/cloud_block" }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_farmland.json b/src/main/resources/assets/unicopia/blockstates/cloud_farmland.json
index 00a1aa0e..c1bdf151 100644
--- a/src/main/resources/assets/unicopia/blockstates/cloud_farmland.json
+++ b/src/main/resources/assets/unicopia/blockstates/cloud_farmland.json
@@ -1,12 +1,12 @@
 {
     "variants": {
-        "moisture=0": { "model": "unicopia:farmland/dry" },
-        "moisture=1": { "model": "unicopia:farmland/dry" },
-        "moisture=2": { "model": "unicopia:farmland/dry" },
-        "moisture=3": { "model": "unicopia:farmland/dry" },
-        "moisture=4": { "model": "unicopia:farmland/dry" },
-        "moisture=5": { "model": "unicopia:farmland/dry" },
-        "moisture=6": { "model": "unicopia:farmland/dry" },
-        "moisture=7": { "model": "unicopia:farmland/wet" }
+        "moisture=0": { "model": "unicopia:block/farmland/dry" },
+        "moisture=1": { "model": "unicopia:block/farmland/dry" },
+        "moisture=2": { "model": "unicopia:block/farmland/dry" },
+        "moisture=3": { "model": "unicopia:block/farmland/dry" },
+        "moisture=4": { "model": "unicopia:block/farmland/dry" },
+        "moisture=5": { "model": "unicopia:block/farmland/dry" },
+        "moisture=6": { "model": "unicopia:block/farmland/dry" },
+        "moisture=7": { "model": "unicopia:block/farmland/wet" }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_fence.json b/src/main/resources/assets/unicopia/blockstates/cloud_fence.json
index 1818235d..a55bc4df 100644
--- a/src/main/resources/assets/unicopia/blockstates/cloud_fence.json
+++ b/src/main/resources/assets/unicopia/blockstates/cloud_fence.json
@@ -1,17 +1,17 @@
 {
     "multipart": [
-        {   "apply": { "model": "unicopia:cloud_fence_post" }},
+        {   "apply": { "model": "unicopia:block/cloud_fence_post" }},
         {   "when": { "north": "true" },
-            "apply": { "model": "unicopia:cloud_fence_side", "uvlock": true }
+            "apply": { "model": "unicopia:block/cloud_fence_side", "uvlock": true }
         },
         {   "when": { "east": "true" },
-            "apply": { "model": "unicopia:cloud_fence_side", "y": 90, "uvlock": true }
+            "apply": { "model": "unicopia:block/cloud_fence_side", "y": 90, "uvlock": true }
         },
         {   "when": { "south": "true" },
-            "apply": { "model": "unicopia:cloud_fence_side", "y": 180, "uvlock": true }
+            "apply": { "model": "unicopia:block/cloud_fence_side", "y": 180, "uvlock": true }
         },
         {   "when": { "west": "true" },
-            "apply": { "model": "unicopia:cloud_fence_side", "y": 270, "uvlock": true }
+            "apply": { "model": "unicopia:block/cloud_fence_side", "y": 270, "uvlock": true }
         }
     ]
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_slab.json b/src/main/resources/assets/unicopia/blockstates/cloud_slab.json
index 1a11fa07..927c65b9 100644
--- a/src/main/resources/assets/unicopia/blockstates/cloud_slab.json
+++ b/src/main/resources/assets/unicopia/blockstates/cloud_slab.json
@@ -1,6 +1,7 @@
 {
     "variants": {
-        "half=bottom,variant=normal": { "model": "unicopia:half_slab_normal_cloud" },
-        "half=top,variant=normal": { "model": "unicopia:upper_slab_normal_cloud" }
+        "type=bottom": { "model": "unicopia:block/cloud_slab_top" },
+        "type=top": { "model": "unicopia:block/cloud_slab" },
+        "type=double": { "model": "unicopia:block/cloud_block" }
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_stairs.json b/src/main/resources/assets/unicopia/blockstates/cloud_stairs.json
index c87b856b..572a1b2d 100644
--- a/src/main/resources/assets/unicopia/blockstates/cloud_stairs.json
+++ b/src/main/resources/assets/unicopia/blockstates/cloud_stairs.json
@@ -1,44 +1,44 @@
 {
     "variants": {
-        "facing=east,half=bottom,shape=straight":  { "model": "unicopia:cloud_stairs" },
-        "facing=west,half=bottom,shape=straight":  { "model": "unicopia:cloud_stairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=straight": { "model": "unicopia:cloud_stairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=straight": { "model": "unicopia:cloud_stairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_right":  { "model": "unicopia:cloud_outer_stairs" },
-        "facing=west,half=bottom,shape=outer_right":  { "model": "unicopia:cloud_outer_stairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_right": { "model": "unicopia:cloud_outer_stairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=outer_right": { "model": "unicopia:cloud_outer_stairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_left":  { "model": "unicopia:cloud_outer_stairs", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=outer_left":  { "model": "unicopia:cloud_outer_stairs", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_left": { "model": "unicopia:cloud_outer_stairs" },
-        "facing=north,half=bottom,shape=outer_left": { "model": "unicopia:cloud_outer_stairs", "y": 180, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_right":  { "model": "unicopia:cloud_inner_stairs" },
-        "facing=west,half=bottom,shape=inner_right":  { "model": "unicopia:cloud_inner_stairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_right": { "model": "unicopia:cloud_inner_stairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=inner_right": { "model": "unicopia:cloud_inner_stairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_left":  { "model": "unicopia:cloud_inner_stairs", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=inner_left":  { "model": "unicopia:cloud_inner_stairs", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_left": { "model": "unicopia:cloud_inner_stairs" },
-        "facing=north,half=bottom,shape=inner_left": { "model": "unicopia:cloud_inner_stairs", "y": 180, "uvlock": true },
-        "facing=east,half=top,shape=straight":  { "model": "unicopia:cloud_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=straight":  { "model": "unicopia:cloud_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=straight": { "model": "unicopia:cloud_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=straight": { "model": "unicopia:cloud_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "unicopia:cloud_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "unicopia:cloud_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "unicopia:cloud_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "unicopia:cloud_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "unicopia:cloud_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "unicopia:cloud_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "unicopia:cloud_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "unicopia:cloud_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "unicopia:cloud_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "unicopia:cloud_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "unicopia:cloud_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "unicopia:cloud_inner_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "unicopia:cloud_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "unicopia:cloud_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "unicopia:cloud_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "unicopia:cloud_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=east,half=bottom,shape=straight":  { "model": "unicopia:block/cloud_stairs" },
+        "facing=west,half=bottom,shape=straight":  { "model": "unicopia:block/cloud_stairs", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=straight": { "model": "unicopia:block/cloud_stairs", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=straight": { "model": "unicopia:block/cloud_stairs", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_right":  { "model": "unicopia:block/cloud_outer_stairs" },
+        "facing=west,half=bottom,shape=outer_right":  { "model": "unicopia:block/cloud_outer_stairs", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_right": { "model": "unicopia:block/cloud_outer_stairs", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=outer_right": { "model": "unicopia:block/cloud_outer_stairs", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_left":  { "model": "unicopia:block/cloud_outer_stairs", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=outer_left":  { "model": "unicopia:block/cloud_outer_stairs", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_left": { "model": "unicopia:block/cloud_outer_stairs" },
+        "facing=north,half=bottom,shape=outer_left": { "model": "unicopia:block/cloud_outer_stairs", "y": 180, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_right":  { "model": "unicopia:block/cloud_inner_stairs" },
+        "facing=west,half=bottom,shape=inner_right":  { "model": "unicopia:block/cloud_inner_stairs", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_right": { "model": "unicopia:block/cloud_inner_stairs", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=inner_right": { "model": "unicopia:block/cloud_inner_stairs", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_left":  { "model": "unicopia:block/cloud_inner_stairs", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=inner_left":  { "model": "unicopia:block/cloud_inner_stairs", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_left": { "model": "unicopia:block/cloud_inner_stairs" },
+        "facing=north,half=bottom,shape=inner_left": { "model": "unicopia:block/cloud_inner_stairs", "y": 180, "uvlock": true },
+        "facing=east,half=top,shape=straight":  { "model": "unicopia:block/cloud_stairs", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=straight":  { "model": "unicopia:block/cloud_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=straight": { "model": "unicopia:block/cloud_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=straight": { "model": "unicopia:block/cloud_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "unicopia:block/cloud_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "unicopia:block/cloud_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "unicopia:block/cloud_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "unicopia:block/cloud_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "unicopia:block/cloud_outer_stairs", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "unicopia:block/cloud_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "unicopia:block/cloud_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "unicopia:block/cloud_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "unicopia:block/cloud_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "unicopia:block/cloud_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "unicopia:block/cloud_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "unicopia:block/cloud_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "unicopia:block/cloud_inner_stairs", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "unicopia:block/cloud_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "unicopia:block/cloud_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=inner_left": { "model": "unicopia:block/cloud_inner_stairs", "x": 180, "y": 270, "uvlock": true }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/cuccoon.json b/src/main/resources/assets/unicopia/blockstates/cuccoon.json
deleted file mode 100644
index 36c5f0cd..00000000
--- a/src/main/resources/assets/unicopia/blockstates/cuccoon.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "variants": {
-        "age=0,shape=bulb": { "model": "unicopia:cuccoon/bulb_stage0" },
-        "age=1,shape=bulb": { "model": "unicopia:cuccoon/bulb_stage0" },
-        "age=2,shape=bulb": { "model": "unicopia:cuccoon/bulb_stage1" },
-        "age=3,shape=bulb": { "model": "unicopia:cuccoon/bulb_stage1" },
-        "age=4,shape=bulb": { "model": "unicopia:cuccoon/bulb_stage2" },
-        "age=5,shape=bulb": { "model": "unicopia:cuccoon/bulb_stage2" },
-        "age=6,shape=bulb": { "model": "unicopia:cuccoon/bulb_stage3" },
-        "age=7,shape=bulb": { "model": "unicopia:cuccoon/bulb_stage3" },
-        "age=0,shape=string": { "model": "unicopia:cuccoon/string_stage0" },
-        "age=1,shape=string": { "model": "unicopia:cuccoon/string_stage0" },
-        "age=2,shape=string": { "model": "unicopia:cuccoon/string_stage1" },
-        "age=3,shape=string": { "model": "unicopia:cuccoon/string_stage1" },
-        "age=4,shape=string": { "model": "unicopia:cuccoon/string_stage2" },
-        "age=5,shape=string": { "model": "unicopia:cuccoon/string_stage2" },
-        "age=6,shape=string": { "model": "unicopia:cuccoon/string_stage3" },
-        "age=7,shape=string": { "model": "unicopia:cuccoon/string_stage3" }
-    }
-}
diff --git a/src/main/resources/assets/unicopia/blockstates/dense_cloud_block.json b/src/main/resources/assets/unicopia/blockstates/dense_cloud_block.json
new file mode 100644
index 00000000..1d77f3cf
--- /dev/null
+++ b/src/main/resources/assets/unicopia/blockstates/dense_cloud_block.json
@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "": { "model": "unicopia:block/dense_cloud_block" }
+    }
+}
diff --git a/src/main/resources/assets/unicopia/blockstates/dense_cloud_slab.json b/src/main/resources/assets/unicopia/blockstates/dense_cloud_slab.json
new file mode 100644
index 00000000..1d623878
--- /dev/null
+++ b/src/main/resources/assets/unicopia/blockstates/dense_cloud_slab.json
@@ -0,0 +1,7 @@
+{
+    "variants": {
+        "type=bottom": { "model": "unicopia:block/dense_cloud_slab_top" },
+        "type=top": { "model": "unicopia:block/dense_cloud_slab" },
+        "type=double": { "model": "unicopia:block/dense_cloud_block" }
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/unicopia/blockstates/diamond_door.json b/src/main/resources/assets/unicopia/blockstates/diamond_door.json
index 2a69bf7f..41f1c53f 100644
--- a/src/main/resources/assets/unicopia/blockstates/diamond_door.json
+++ b/src/main/resources/assets/unicopia/blockstates/diamond_door.json
@@ -1,68 +1,68 @@
 {
     "variants": {
-        "facing=east,half=lower,hinge=left,open=false,powered=false":  { "model": "unicopia:door/diamond_bottom" },
-        "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:door/diamond_bottom", "y": 90 },
-        "facing=west,half=lower,hinge=left,open=false,powered=false":  { "model": "unicopia:door/diamond_bottom", "y": 180 },
-        "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:door/diamond_bottom", "y": 270 },
-        "facing=east,half=lower,hinge=right,open=false,powered=false":  { "model": "unicopia:door/diamond_bottom_rh" },
-        "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:door/diamond_bottom_rh", "y": 90 },
-        "facing=west,half=lower,hinge=right,open=false,powered=false":  { "model": "unicopia:door/diamond_bottom_rh", "y": 180 },
-        "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:door/diamond_bottom_rh", "y": 270 },
-        "facing=east,half=lower,hinge=left,open=true,powered=false":  { "model": "unicopia:door/diamond_bottom_rh", "y": 90 },
-        "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:door/diamond_bottom_rh", "y": 180 },
-        "facing=west,half=lower,hinge=left,open=true,powered=false":  { "model": "unicopia:door/diamond_bottom_rh", "y": 270 },
-        "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:door/diamond_bottom_rh" },
-        "facing=east,half=lower,hinge=right,open=true,powered=false":  { "model": "unicopia:door/diamond_bottom", "y": 270 },
-        "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:door/diamond_bottom" },
-        "facing=west,half=lower,hinge=right,open=true,powered=false":  { "model": "unicopia:door/diamond_bottom", "y": 90 },
-        "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:door/diamond_bottom", "y": 180 },
-        "facing=east,half=upper,hinge=left,open=false,powered=false":  { "model": "unicopia:door/diamond_top" },
-        "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:door/diamond_top", "y": 90 },
-        "facing=west,half=upper,hinge=left,open=false,powered=false":  { "model": "unicopia:door/diamond_top", "y": 180 },
-        "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:door/diamond_top", "y": 270 },
-        "facing=east,half=upper,hinge=right,open=false,powered=false":  { "model": "unicopia:door/diamond_top_rh" },
-        "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:door/diamond_top_rh", "y": 90 },
-        "facing=west,half=upper,hinge=right,open=false,powered=false":  { "model": "unicopia:door/diamond_top_rh", "y": 180 },
-        "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:door/diamond_top_rh", "y": 270 },
-        "facing=east,half=upper,hinge=left,open=true,powered=false":  { "model": "unicopia:door/diamond_top_rh", "y": 90 },
-        "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:door/diamond_top_rh", "y": 180 },
-        "facing=west,half=upper,hinge=left,open=true,powered=false":  { "model": "unicopia:door/diamond_top_rh", "y": 270 },
-        "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:door/diamond_top_rh" },
-        "facing=east,half=upper,hinge=right,open=true,powered=false":  { "model": "unicopia:door/diamond_top", "y": 270 },
-        "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:door/diamond_top" },
-        "facing=west,half=upper,hinge=right,open=true,powered=false":  { "model": "unicopia:door/diamond_top", "y": 90 },
-        "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:door/diamond_top", "y": 180 },
-        "facing=east,half=lower,hinge=left,open=false,powered=true":  { "model": "unicopia:door/diamond_bottom" },
-        "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:door/diamond_bottom", "y": 90 },
-        "facing=west,half=lower,hinge=left,open=false,powered=true":  { "model": "unicopia:door/diamond_bottom", "y": 180 },
-        "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:door/diamond_bottom", "y": 270 },
-        "facing=east,half=lower,hinge=right,open=false,powered=true":  { "model": "unicopia:door/diamond_bottom_rh" },
-        "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:door/diamond_bottom_rh", "y": 90 },
-        "facing=west,half=lower,hinge=right,open=false,powered=true":  { "model": "unicopia:door/diamond_bottom_rh", "y": 180 },
-        "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:door/diamond_bottom_rh", "y": 270 },
-        "facing=east,half=lower,hinge=left,open=true,powered=true":  { "model": "unicopia:door/diamond_bottom_rh", "y": 90 },
-        "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:door/diamond_bottom_rh", "y": 180 },
-        "facing=west,half=lower,hinge=left,open=true,powered=true":  { "model": "unicopia:door/diamond_bottom_rh", "y": 270 },
-        "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:door/diamond_bottom_rh" },
-        "facing=east,half=lower,hinge=right,open=true,powered=true":  { "model": "unicopia:door/diamond_bottom", "y": 270 },
-        "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:door/diamond_bottom" },
-        "facing=west,half=lower,hinge=right,open=true,powered=true":  { "model": "unicopia:door/diamond_bottom", "y": 90 },
-        "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:door/diamond_bottom", "y": 180 },
-        "facing=east,half=upper,hinge=left,open=false,powered=true":  { "model": "unicopia:door/diamond_top" },
-        "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:door/diamond_top", "y": 90 },
-        "facing=west,half=upper,hinge=left,open=false,powered=true":  { "model": "unicopia:door/diamond_top", "y": 180 },
-        "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:door/diamond_top", "y": 270 },
-        "facing=east,half=upper,hinge=right,open=false,powered=true":  { "model": "unicopia:door/diamond_top_rh" },
-        "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:door/diamond_top_rh", "y": 90 },
-        "facing=west,half=upper,hinge=right,open=false,powered=true":  { "model": "unicopia:door/diamond_top_rh", "y": 180 },
-        "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:door/diamond_top_rh", "y": 270 },
-        "facing=east,half=upper,hinge=left,open=true,powered=true":  { "model": "unicopia:door/diamond_top_rh", "y": 90 },
-        "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:door/diamond_top_rh", "y": 180 },
-        "facing=west,half=upper,hinge=left,open=true,powered=true":  { "model": "unicopia:door/diamond_top_rh", "y": 270 },
-        "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:door/diamond_top_rh" },
-        "facing=east,half=upper,hinge=right,open=true,powered=true":  { "model": "unicopia:door/diamond_top", "y": 270 },
-        "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:door/diamond_top" },
-        "facing=west,half=upper,hinge=right,open=true,powered=true":  { "model": "unicopia:door/diamond_top", "y": 90 },
-        "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:door/diamond_top", "y": 180 }
+        "facing=east,half=lower,hinge=left,open=false,powered=false":  { "model": "unicopia:block/door/diamond_bottom" },
+        "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/diamond_bottom", "y": 90 },
+        "facing=west,half=lower,hinge=left,open=false,powered=false":  { "model": "unicopia:block/door/diamond_bottom", "y": 180 },
+        "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/diamond_bottom", "y": 270 },
+        "facing=east,half=lower,hinge=right,open=false,powered=false":  { "model": "unicopia:block/door/diamond_bottom_rh" },
+        "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/diamond_bottom_rh", "y": 90 },
+        "facing=west,half=lower,hinge=right,open=false,powered=false":  { "model": "unicopia:block/door/diamond_bottom_rh", "y": 180 },
+        "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/diamond_bottom_rh", "y": 270 },
+        "facing=east,half=lower,hinge=left,open=true,powered=false":  { "model": "unicopia:block/door/diamond_bottom_rh", "y": 90 },
+        "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/diamond_bottom_rh", "y": 180 },
+        "facing=west,half=lower,hinge=left,open=true,powered=false":  { "model": "unicopia:block/door/diamond_bottom_rh", "y": 270 },
+        "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/diamond_bottom_rh" },
+        "facing=east,half=lower,hinge=right,open=true,powered=false":  { "model": "unicopia:block/door/diamond_bottom", "y": 270 },
+        "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/diamond_bottom" },
+        "facing=west,half=lower,hinge=right,open=true,powered=false":  { "model": "unicopia:block/door/diamond_bottom", "y": 90 },
+        "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/diamond_bottom", "y": 180 },
+        "facing=east,half=upper,hinge=left,open=false,powered=false":  { "model": "unicopia:block/door/diamond_top" },
+        "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/diamond_top", "y": 90 },
+        "facing=west,half=upper,hinge=left,open=false,powered=false":  { "model": "unicopia:block/door/diamond_top", "y": 180 },
+        "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/diamond_top", "y": 270 },
+        "facing=east,half=upper,hinge=right,open=false,powered=false":  { "model": "unicopia:block/door/diamond_top_rh" },
+        "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/diamond_top_rh", "y": 90 },
+        "facing=west,half=upper,hinge=right,open=false,powered=false":  { "model": "unicopia:block/door/diamond_top_rh", "y": 180 },
+        "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/diamond_top_rh", "y": 270 },
+        "facing=east,half=upper,hinge=left,open=true,powered=false":  { "model": "unicopia:block/door/diamond_top_rh", "y": 90 },
+        "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/diamond_top_rh", "y": 180 },
+        "facing=west,half=upper,hinge=left,open=true,powered=false":  { "model": "unicopia:block/door/diamond_top_rh", "y": 270 },
+        "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/diamond_top_rh" },
+        "facing=east,half=upper,hinge=right,open=true,powered=false":  { "model": "unicopia:block/door/diamond_top", "y": 270 },
+        "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/diamond_top" },
+        "facing=west,half=upper,hinge=right,open=true,powered=false":  { "model": "unicopia:block/door/diamond_top", "y": 90 },
+        "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/diamond_top", "y": 180 },
+        "facing=east,half=lower,hinge=left,open=false,powered=true":  { "model": "unicopia:block/door/diamond_bottom" },
+        "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/diamond_bottom", "y": 90 },
+        "facing=west,half=lower,hinge=left,open=false,powered=true":  { "model": "unicopia:block/door/diamond_bottom", "y": 180 },
+        "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/diamond_bottom", "y": 270 },
+        "facing=east,half=lower,hinge=right,open=false,powered=true":  { "model": "unicopia:block/door/diamond_bottom_rh" },
+        "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/diamond_bottom_rh", "y": 90 },
+        "facing=west,half=lower,hinge=right,open=false,powered=true":  { "model": "unicopia:block/door/diamond_bottom_rh", "y": 180 },
+        "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/diamond_bottom_rh", "y": 270 },
+        "facing=east,half=lower,hinge=left,open=true,powered=true":  { "model": "unicopia:block/door/diamond_bottom_rh", "y": 90 },
+        "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/diamond_bottom_rh", "y": 180 },
+        "facing=west,half=lower,hinge=left,open=true,powered=true":  { "model": "unicopia:block/door/diamond_bottom_rh", "y": 270 },
+        "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/diamond_bottom_rh" },
+        "facing=east,half=lower,hinge=right,open=true,powered=true":  { "model": "unicopia:block/door/diamond_bottom", "y": 270 },
+        "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/diamond_bottom" },
+        "facing=west,half=lower,hinge=right,open=true,powered=true":  { "model": "unicopia:block/door/diamond_bottom", "y": 90 },
+        "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/diamond_bottom", "y": 180 },
+        "facing=east,half=upper,hinge=left,open=false,powered=true":  { "model": "unicopia:block/door/diamond_top" },
+        "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/diamond_top", "y": 90 },
+        "facing=west,half=upper,hinge=left,open=false,powered=true":  { "model": "unicopia:block/door/diamond_top", "y": 180 },
+        "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/diamond_top", "y": 270 },
+        "facing=east,half=upper,hinge=right,open=false,powered=true":  { "model": "unicopia:block/door/diamond_top_rh" },
+        "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/diamond_top_rh", "y": 90 },
+        "facing=west,half=upper,hinge=right,open=false,powered=true":  { "model": "unicopia:block/door/diamond_top_rh", "y": 180 },
+        "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/diamond_top_rh", "y": 270 },
+        "facing=east,half=upper,hinge=left,open=true,powered=true":  { "model": "unicopia:block/door/diamond_top_rh", "y": 90 },
+        "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/diamond_top_rh", "y": 180 },
+        "facing=west,half=upper,hinge=left,open=true,powered=true":  { "model": "unicopia:block/door/diamond_top_rh", "y": 270 },
+        "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/diamond_top_rh" },
+        "facing=east,half=upper,hinge=right,open=true,powered=true":  { "model": "unicopia:block/door/diamond_top", "y": 270 },
+        "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/diamond_top" },
+        "facing=west,half=upper,hinge=right,open=true,powered=true":  { "model": "unicopia:block/door/diamond_top", "y": 90 },
+        "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/diamond_top", "y": 180 }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/double_cloud_slab.json b/src/main/resources/assets/unicopia/blockstates/double_cloud_slab.json
deleted file mode 100644
index 4aaee84b..00000000
--- a/src/main/resources/assets/unicopia/blockstates/double_cloud_slab.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "variant=normal": { "model": "unicopia:normal_cloud_block" }
-    }
-}
diff --git a/src/main/resources/assets/unicopia/blockstates/double_enchanted_cloud_slab.json b/src/main/resources/assets/unicopia/blockstates/double_enchanted_cloud_slab.json
deleted file mode 100644
index e7f9dad8..00000000
--- a/src/main/resources/assets/unicopia/blockstates/double_enchanted_cloud_slab.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "variant=normal": { "model": "unicopia:enchanted_cloud_block" }
-    }
-}
diff --git a/src/main/resources/assets/unicopia/blockstates/double_packed_cloud_slab.json b/src/main/resources/assets/unicopia/blockstates/double_packed_cloud_slab.json
deleted file mode 100644
index 465e9512..00000000
--- a/src/main/resources/assets/unicopia/blockstates/double_packed_cloud_slab.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "variant=normal": { "model": "unicopia:packed_cloud_block" }
-    }
-}
diff --git a/src/main/resources/assets/unicopia/blockstates/enchanted_cloud_block.json b/src/main/resources/assets/unicopia/blockstates/enchanted_cloud_block.json
index 0abf2904..913d057d 100644
--- a/src/main/resources/assets/unicopia/blockstates/enchanted_cloud_block.json
+++ b/src/main/resources/assets/unicopia/blockstates/enchanted_cloud_block.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "normal": { "model": "unicopia:enchanted_cloud_block" }
+        "": { "model": "unicopia:block/enchanted_cloud_block" }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/enchanted_cloud_slab.json b/src/main/resources/assets/unicopia/blockstates/enchanted_cloud_slab.json
index 7258ab6e..9fbacaaf 100644
--- a/src/main/resources/assets/unicopia/blockstates/enchanted_cloud_slab.json
+++ b/src/main/resources/assets/unicopia/blockstates/enchanted_cloud_slab.json
@@ -1,6 +1,7 @@
 {
     "variants": {
-        "half=bottom,variant=normal": { "model": "unicopia:half_slab_enchanted_cloud" },
-        "half=top,variant=normal": { "model": "unicopia:upper_slab_enchanted_cloud" }
+        "type=bottom": { "model": "unicopia:block/enchanted_cloud_slab_top" },
+        "type=top": { "model": "unicopia:block/enchanted_cloud_slab" },
+        "type=double": { "model": "unicopia:block/enchanted_cloud_block" }
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/unicopia/blockstates/enchanted_torch.json b/src/main/resources/assets/unicopia/blockstates/enchanted_torch.json
index b7f31c6f..ddeabe6a 100644
--- a/src/main/resources/assets/unicopia/blockstates/enchanted_torch.json
+++ b/src/main/resources/assets/unicopia/blockstates/enchanted_torch.json
@@ -1,14 +1,16 @@
 {
     "variants": {
-		"facing=up,on=true": { "model": "unicopia:enchanted_torch_on" },
-        "facing=east,on=true": { "model": "unicopia:enchanted_torch_wall_on" },
-        "facing=south,on=true": { "model": "unicopia:enchanted_torch_wall_on", "y": 90 },
-        "facing=west,on=true": { "model": "unicopia:enchanted_torch_wall_on", "y": 180 },
-        "facing=north,on=true": { "model": "unicopia:enchanted_torch_wall_on", "y": 270 },
-		"facing=up,on=false": { "model": "unicopia:enchanted_torch_off" },
-        "facing=east,on=false": { "model": "unicopia:enchanted_torch_wall_off" },
-        "facing=south,on=false": { "model": "unicopia:enchanted_torch_wall_off", "y": 90 },
-        "facing=west,on=false": { "model": "unicopia:enchanted_torch_wall_off", "y": 180 },
-        "facing=north,on=false": { "model": "unicopia:enchanted_torch_wall_off", "y": 270 }
+		"facing=up,on=true": { "model": "unicopia:block/enchanted_torch_on" },
+		"facing=down,on=true": { "model": "unicopia:block/enchanted_torch_on" },
+        "facing=east,on=true": { "model": "unicopia:block/enchanted_torch_wall_on" },
+        "facing=south,on=true": { "model": "unicopia:block/enchanted_torch_wall_on", "y": 90 },
+        "facing=west,on=true": { "model": "unicopia:block/enchanted_torch_wall_on", "y": 180 },
+        "facing=north,on=true": { "model": "unicopia:block/enchanted_torch_wall_on", "y": 270 },
+		"facing=up,on=false": { "model": "unicopia:block/enchanted_torch_off" },
+		"facing=down,on=false": { "model": "unicopia:block/enchanted_torch_off" },
+        "facing=east,on=false": { "model": "unicopia:block/enchanted_torch_wall_off" },
+        "facing=south,on=false": { "model": "unicopia:block/enchanted_torch_wall_off", "y": 90 },
+        "facing=west,on=false": { "model": "unicopia:block/enchanted_torch_wall_off", "y": 180 },
+        "facing=north,on=false": { "model": "unicopia:block/enchanted_torch_wall_off", "y": 270 }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/flower_pot.json b/src/main/resources/assets/unicopia/blockstates/flower_pot.json
index 9b81edac..0e6dc8ca 100644
--- a/src/main/resources/assets/unicopia/blockstates/flower_pot.json
+++ b/src/main/resources/assets/unicopia/blockstates/flower_pot.json
@@ -1,7 +1,7 @@
 {
     "variants": {
-    	"plant=empty":    { "model": "minecraft:flower_pot" },
-        "plant=quill": { "model": "unicopia:flower_pot/feather" },
-        "plant=meadowbrook": { "model": "unicopia:flower_pot/meadowbrook" }
+    	"plant=empty":    { "model": "minecraft:block/flower_pot" },
+        "plant=quill": { "model": "unicopia:block/flower_pot/feather" },
+        "plant=meadowbrook": { "model": "unicopia:block/flower_pot/meadowbrook" }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/hive.json b/src/main/resources/assets/unicopia/blockstates/hive.json
deleted file mode 100644
index c62dcd1b..00000000
--- a/src/main/resources/assets/unicopia/blockstates/hive.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "variants": {
-        "axis=x,state=growing": { "model": "unicopia:hive_growing" },
-        "axis=y,state=growing": { "model": "unicopia:hive_growing" },
-        "axis=z,state=growing": { "model": "unicopia:hive_growing" },
-        "axis=x,state=stable": { "model": "unicopia:hive_stable" },
-        "axis=y,state=stable": { "model": "unicopia:hive_stable" },
-        "axis=z,state=stable": { "model": "unicopia:hive_stable" },
-        "axis=x,state=dying": { "model": "unicopia:hive_dying" },
-        "axis=y,state=dying": { "model": "unicopia:hive_dying" },
-        "axis=z,state=dying": { "model": "unicopia:hive_dying" }
-    }
-}
diff --git a/src/main/resources/assets/unicopia/blockstates/hive_wall_block.json b/src/main/resources/assets/unicopia/blockstates/hive_wall_block.json
new file mode 100644
index 00000000..3f96f46d
--- /dev/null
+++ b/src/main/resources/assets/unicopia/blockstates/hive_wall_block.json
@@ -0,0 +1,13 @@
+{
+    "variants": {
+        "axis=x,state=growing": { "model": "unicopia:block/hive_growing" },
+        "axis=y,state=growing": { "model": "unicopia:block/hive_growing" },
+        "axis=z,state=growing": { "model": "unicopia:block/hive_growing" },
+        "axis=x,state=stable": { "model": "unicopia:block/hive_stable" },
+        "axis=y,state=stable": { "model": "unicopia:block/hive_stable" },
+        "axis=z,state=stable": { "model": "unicopia:block/hive_stable" },
+        "axis=x,state=dying": { "model": "unicopia:block/hive_dying" },
+        "axis=y,state=dying": { "model": "unicopia:block/hive_dying" },
+        "axis=z,state=dying": { "model": "unicopia:block/hive_dying" }
+    }
+}
diff --git a/src/main/resources/assets/unicopia/blockstates/library_door.json b/src/main/resources/assets/unicopia/blockstates/library_door.json
index aec9f468..68053603 100644
--- a/src/main/resources/assets/unicopia/blockstates/library_door.json
+++ b/src/main/resources/assets/unicopia/blockstates/library_door.json
@@ -1,68 +1,68 @@
 {
     "variants": {
-        "facing=east,half=lower,hinge=left,open=false,powered=false":  { "model": "unicopia:door/library_bottom" },
-        "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:door/library_bottom", "y": 90 },
-        "facing=west,half=lower,hinge=left,open=false,powered=false":  { "model": "unicopia:door/library_bottom", "y": 180 },
-        "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:door/library_bottom", "y": 270 },
-        "facing=east,half=lower,hinge=right,open=false,powered=false":  { "model": "unicopia:door/library_bottom_rh" },
-        "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:door/library_bottom_rh", "y": 90 },
-        "facing=west,half=lower,hinge=right,open=false,powered=false":  { "model": "unicopia:door/library_bottom_rh", "y": 180 },
-        "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:door/library_bottom_rh", "y": 270 },
-        "facing=east,half=lower,hinge=left,open=true,powered=false":  { "model": "unicopia:door/library_bottom_rh", "y": 90 },
-        "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:door/library_bottom_rh", "y": 180 },
-        "facing=west,half=lower,hinge=left,open=true,powered=false":  { "model": "unicopia:door/library_bottom_rh", "y": 270 },
-        "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:door/library_bottom_rh" },
-        "facing=east,half=lower,hinge=right,open=true,powered=false":  { "model": "unicopia:door/library_bottom", "y": 270 },
-        "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:door/library_bottom" },
-        "facing=west,half=lower,hinge=right,open=true,powered=false":  { "model": "unicopia:door/library_bottom", "y": 90 },
-        "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:door/library_bottom", "y": 180 },
-        "facing=east,half=upper,hinge=left,open=false,powered=false":  { "model": "unicopia:door/library_top" },
-        "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:door/library_top", "y": 90 },
-        "facing=west,half=upper,hinge=left,open=false,powered=false":  { "model": "unicopia:door/library_top", "y": 180 },
-        "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:door/library_top", "y": 270 },
-        "facing=east,half=upper,hinge=right,open=false,powered=false":  { "model": "unicopia:door/library_top_rh" },
-        "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:door/library_top_rh", "y": 90 },
-        "facing=west,half=upper,hinge=right,open=false,powered=false":  { "model": "unicopia:door/library_top_rh", "y": 180 },
-        "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:door/library_top_rh", "y": 270 },
-        "facing=east,half=upper,hinge=left,open=true,powered=false":  { "model": "unicopia:door/library_top_rh", "y": 90 },
-        "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:door/library_top_rh", "y": 180 },
-        "facing=west,half=upper,hinge=left,open=true,powered=false":  { "model": "unicopia:door/library_top_rh", "y": 270 },
-        "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:door/library_top_rh" },
-        "facing=east,half=upper,hinge=right,open=true,powered=false":  { "model": "unicopia:door/library_top", "y": 270 },
-        "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:door/library_top" },
-        "facing=west,half=upper,hinge=right,open=true,powered=false":  { "model": "unicopia:door/library_top", "y": 90 },
-        "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:door/library_top", "y": 180 },
-        "facing=east,half=lower,hinge=left,open=false,powered=true":  { "model": "unicopia:door/library_bottom" },
-        "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:door/library_bottom", "y": 90 },
-        "facing=west,half=lower,hinge=left,open=false,powered=true":  { "model": "unicopia:door/library_bottom", "y": 180 },
-        "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:door/library_bottom", "y": 270 },
-        "facing=east,half=lower,hinge=right,open=false,powered=true":  { "model": "unicopia:door/library_bottom_rh" },
-        "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:door/library_bottom_rh", "y": 90 },
-        "facing=west,half=lower,hinge=right,open=false,powered=true":  { "model": "unicopia:door/library_bottom_rh", "y": 180 },
-        "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:door/library_bottom_rh", "y": 270 },
-        "facing=east,half=lower,hinge=left,open=true,powered=true":  { "model": "unicopia:door/library_bottom_rh", "y": 90 },
-        "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:door/library_bottom_rh", "y": 180 },
-        "facing=west,half=lower,hinge=left,open=true,powered=true":  { "model": "unicopia:door/library_bottom_rh", "y": 270 },
-        "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:door/library_bottom_rh" },
-        "facing=east,half=lower,hinge=right,open=true,powered=true":  { "model": "unicopia:door/library_bottom", "y": 270 },
-        "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:door/library_bottom" },
-        "facing=west,half=lower,hinge=right,open=true,powered=true":  { "model": "unicopia:door/library_bottom", "y": 90 },
-        "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:door/library_bottom", "y": 180 },
-        "facing=east,half=upper,hinge=left,open=false,powered=true":  { "model": "unicopia:door/library_top" },
-        "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:door/library_top", "y": 90 },
-        "facing=west,half=upper,hinge=left,open=false,powered=true":  { "model": "unicopia:door/library_top", "y": 180 },
-        "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:door/library_top", "y": 270 },
-        "facing=east,half=upper,hinge=right,open=false,powered=true":  { "model": "unicopia:door/library_top_rh" },
-        "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:door/library_top_rh", "y": 90 },
-        "facing=west,half=upper,hinge=right,open=false,powered=true":  { "model": "unicopia:door/library_top_rh", "y": 180 },
-        "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:door/library_top_rh", "y": 270 },
-        "facing=east,half=upper,hinge=left,open=true,powered=true":  { "model": "unicopia:door/library_top_rh", "y": 90 },
-        "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:door/library_top_rh", "y": 180 },
-        "facing=west,half=upper,hinge=left,open=true,powered=true":  { "model": "unicopia:door/library_top_rh", "y": 270 },
-        "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:door/library_top_rh" },
-        "facing=east,half=upper,hinge=right,open=true,powered=true":  { "model": "unicopia:door/library_top", "y": 270 },
-        "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:door/library_top" },
-        "facing=west,half=upper,hinge=right,open=true,powered=true":  { "model": "unicopia:door/library_top", "y": 90 },
-        "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:door/library_top", "y": 180 }
+        "facing=east,half=lower,hinge=left,open=false,powered=false":  { "model": "unicopia:block/door/library_bottom" },
+        "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/library_bottom", "y": 90 },
+        "facing=west,half=lower,hinge=left,open=false,powered=false":  { "model": "unicopia:block/door/library_bottom", "y": 180 },
+        "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/library_bottom", "y": 270 },
+        "facing=east,half=lower,hinge=right,open=false,powered=false":  { "model": "unicopia:block/door/library_bottom_rh" },
+        "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/library_bottom_rh", "y": 90 },
+        "facing=west,half=lower,hinge=right,open=false,powered=false":  { "model": "unicopia:block/door/library_bottom_rh", "y": 180 },
+        "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/library_bottom_rh", "y": 270 },
+        "facing=east,half=lower,hinge=left,open=true,powered=false":  { "model": "unicopia:block/door/library_bottom_rh", "y": 90 },
+        "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/library_bottom_rh", "y": 180 },
+        "facing=west,half=lower,hinge=left,open=true,powered=false":  { "model": "unicopia:block/door/library_bottom_rh", "y": 270 },
+        "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/library_bottom_rh" },
+        "facing=east,half=lower,hinge=right,open=true,powered=false":  { "model": "unicopia:block/door/library_bottom", "y": 270 },
+        "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/library_bottom" },
+        "facing=west,half=lower,hinge=right,open=true,powered=false":  { "model": "unicopia:block/door/library_bottom", "y": 90 },
+        "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/library_bottom", "y": 180 },
+        "facing=east,half=upper,hinge=left,open=false,powered=false":  { "model": "unicopia:block/door/library_top" },
+        "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/library_top", "y": 90 },
+        "facing=west,half=upper,hinge=left,open=false,powered=false":  { "model": "unicopia:block/door/library_top", "y": 180 },
+        "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/library_top", "y": 270 },
+        "facing=east,half=upper,hinge=right,open=false,powered=false":  { "model": "unicopia:block/door/library_top_rh" },
+        "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/library_top_rh", "y": 90 },
+        "facing=west,half=upper,hinge=right,open=false,powered=false":  { "model": "unicopia:block/door/library_top_rh", "y": 180 },
+        "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/library_top_rh", "y": 270 },
+        "facing=east,half=upper,hinge=left,open=true,powered=false":  { "model": "unicopia:block/door/library_top_rh", "y": 90 },
+        "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/library_top_rh", "y": 180 },
+        "facing=west,half=upper,hinge=left,open=true,powered=false":  { "model": "unicopia:block/door/library_top_rh", "y": 270 },
+        "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/library_top_rh" },
+        "facing=east,half=upper,hinge=right,open=true,powered=false":  { "model": "unicopia:block/door/library_top", "y": 270 },
+        "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/library_top" },
+        "facing=west,half=upper,hinge=right,open=true,powered=false":  { "model": "unicopia:block/door/library_top", "y": 90 },
+        "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/library_top", "y": 180 },
+        "facing=east,half=lower,hinge=left,open=false,powered=true":  { "model": "unicopia:block/door/library_bottom" },
+        "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/library_bottom", "y": 90 },
+        "facing=west,half=lower,hinge=left,open=false,powered=true":  { "model": "unicopia:block/door/library_bottom", "y": 180 },
+        "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/library_bottom", "y": 270 },
+        "facing=east,half=lower,hinge=right,open=false,powered=true":  { "model": "unicopia:block/door/library_bottom_rh" },
+        "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/library_bottom_rh", "y": 90 },
+        "facing=west,half=lower,hinge=right,open=false,powered=true":  { "model": "unicopia:block/door/library_bottom_rh", "y": 180 },
+        "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/library_bottom_rh", "y": 270 },
+        "facing=east,half=lower,hinge=left,open=true,powered=true":  { "model": "unicopia:block/door/library_bottom_rh", "y": 90 },
+        "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/library_bottom_rh", "y": 180 },
+        "facing=west,half=lower,hinge=left,open=true,powered=true":  { "model": "unicopia:block/door/library_bottom_rh", "y": 270 },
+        "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/library_bottom_rh" },
+        "facing=east,half=lower,hinge=right,open=true,powered=true":  { "model": "unicopia:block/door/library_bottom", "y": 270 },
+        "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/library_bottom" },
+        "facing=west,half=lower,hinge=right,open=true,powered=true":  { "model": "unicopia:block/door/library_bottom", "y": 90 },
+        "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/library_bottom", "y": 180 },
+        "facing=east,half=upper,hinge=left,open=false,powered=true":  { "model": "unicopia:block/door/library_top" },
+        "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/library_top", "y": 90 },
+        "facing=west,half=upper,hinge=left,open=false,powered=true":  { "model": "unicopia:block/door/library_top", "y": 180 },
+        "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/library_top", "y": 270 },
+        "facing=east,half=upper,hinge=right,open=false,powered=true":  { "model": "unicopia:block/door/library_top_rh" },
+        "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/library_top_rh", "y": 90 },
+        "facing=west,half=upper,hinge=right,open=false,powered=true":  { "model": "unicopia:block/door/library_top_rh", "y": 180 },
+        "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/library_top_rh", "y": 270 },
+        "facing=east,half=upper,hinge=left,open=true,powered=true":  { "model": "unicopia:block/door/library_top_rh", "y": 90 },
+        "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/library_top_rh", "y": 180 },
+        "facing=west,half=upper,hinge=left,open=true,powered=true":  { "model": "unicopia:block/door/library_top_rh", "y": 270 },
+        "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/library_top_rh" },
+        "facing=east,half=upper,hinge=right,open=true,powered=true":  { "model": "unicopia:block/door/library_top", "y": 270 },
+        "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/library_top" },
+        "facing=west,half=upper,hinge=right,open=true,powered=true":  { "model": "unicopia:block/door/library_top", "y": 90 },
+        "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/library_top", "y": 180 }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/mist_door.json b/src/main/resources/assets/unicopia/blockstates/misted_glass_door.json
similarity index 51%
rename from src/main/resources/assets/unicopia/blockstates/mist_door.json
rename to src/main/resources/assets/unicopia/blockstates/misted_glass_door.json
index e7212f17..1c0bbdfe 100644
--- a/src/main/resources/assets/unicopia/blockstates/mist_door.json
+++ b/src/main/resources/assets/unicopia/blockstates/misted_glass_door.json
@@ -1,68 +1,68 @@
 {
     "variants": {
-        "facing=east,half=lower,hinge=left,open=false,powered=false":  { "model": "unicopia:door/mist_bottom" },
-        "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:door/mist_bottom", "y": 90 },
-        "facing=west,half=lower,hinge=left,open=false,powered=false":  { "model": "unicopia:door/mist_bottom", "y": 180 },
-        "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:door/mist_bottom", "y": 270 },
-        "facing=east,half=lower,hinge=right,open=false,powered=false":  { "model": "unicopia:door/mist_bottom_rh" },
-        "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:door/mist_bottom_rh", "y": 90 },
-        "facing=west,half=lower,hinge=right,open=false,powered=false":  { "model": "unicopia:door/mist_bottom_rh", "y": 180 },
-        "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:door/mist_bottom_rh", "y": 270 },
-        "facing=east,half=lower,hinge=left,open=true,powered=false":  { "model": "unicopia:door/mist_bottom_rh", "y": 90 },
-        "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:door/mist_bottom_rh", "y": 180 },
-        "facing=west,half=lower,hinge=left,open=true,powered=false":  { "model": "unicopia:door/mist_bottom_rh", "y": 270 },
-        "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:door/mist_bottom_rh" },
-        "facing=east,half=lower,hinge=right,open=true,powered=false":  { "model": "unicopia:door/mist_bottom", "y": 270 },
-        "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:door/mist_bottom" },
-        "facing=west,half=lower,hinge=right,open=true,powered=false":  { "model": "unicopia:door/mist_bottom", "y": 90 },
-        "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:door/mist_bottom", "y": 180 },
-        "facing=east,half=upper,hinge=left,open=false,powered=false":  { "model": "unicopia:door/mist_top" },
-        "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:door/mist_top", "y": 90 },
-        "facing=west,half=upper,hinge=left,open=false,powered=false":  { "model": "unicopia:door/mist_top", "y": 180 },
-        "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:door/mist_top", "y": 270 },
-        "facing=east,half=upper,hinge=right,open=false,powered=false":  { "model": "unicopia:door/mist_top_rh" },
-        "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:door/mist_top_rh", "y": 90 },
-        "facing=west,half=upper,hinge=right,open=false,powered=false":  { "model": "unicopia:door/mist_top_rh", "y": 180 },
-        "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:door/mist_top_rh", "y": 270 },
-        "facing=east,half=upper,hinge=left,open=true,powered=false":  { "model": "unicopia:door/mist_top_rh", "y": 90 },
-        "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:door/mist_top_rh", "y": 180 },
-        "facing=west,half=upper,hinge=left,open=true,powered=false":  { "model": "unicopia:door/mist_top_rh", "y": 270 },
-        "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:door/mist_top_rh" },
-        "facing=east,half=upper,hinge=right,open=true,powered=false":  { "model": "unicopia:door/mist_top", "y": 270 },
-        "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:door/mist_top" },
-        "facing=west,half=upper,hinge=right,open=true,powered=false":  { "model": "unicopia:door/mist_top", "y": 90 },
-        "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:door/mist_top", "y": 180 },
-        "facing=east,half=lower,hinge=left,open=false,powered=true":  { "model": "unicopia:door/mist_bottom" },
-        "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:door/mist_bottom", "y": 90 },
-        "facing=west,half=lower,hinge=left,open=false,powered=true":  { "model": "unicopia:door/mist_bottom", "y": 180 },
-        "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:door/mist_bottom", "y": 270 },
-        "facing=east,half=lower,hinge=right,open=false,powered=true":  { "model": "unicopia:door/mist_bottom_rh" },
-        "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:door/mist_bottom_rh", "y": 90 },
-        "facing=west,half=lower,hinge=right,open=false,powered=true":  { "model": "unicopia:door/mist_bottom_rh", "y": 180 },
-        "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:door/mist_bottom_rh", "y": 270 },
-        "facing=east,half=lower,hinge=left,open=true,powered=true":  { "model": "unicopia:door/mist_bottom_rh", "y": 90 },
-        "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:door/mist_bottom_rh", "y": 180 },
-        "facing=west,half=lower,hinge=left,open=true,powered=true":  { "model": "unicopia:door/mist_bottom_rh", "y": 270 },
-        "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:door/mist_bottom_rh" },
-        "facing=east,half=lower,hinge=right,open=true,powered=true":  { "model": "unicopia:door/mist_bottom", "y": 270 },
-        "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:door/mist_bottom" },
-        "facing=west,half=lower,hinge=right,open=true,powered=true":  { "model": "unicopia:door/mist_bottom", "y": 90 },
-        "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:door/mist_bottom", "y": 180 },
-        "facing=east,half=upper,hinge=left,open=false,powered=true":  { "model": "unicopia:door/mist_top" },
-        "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:door/mist_top", "y": 90 },
-        "facing=west,half=upper,hinge=left,open=false,powered=true":  { "model": "unicopia:door/mist_top", "y": 180 },
-        "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:door/mist_top", "y": 270 },
-        "facing=east,half=upper,hinge=right,open=false,powered=true":  { "model": "unicopia:door/mist_top_rh" },
-        "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:door/mist_top_rh", "y": 90 },
-        "facing=west,half=upper,hinge=right,open=false,powered=true":  { "model": "unicopia:door/mist_top_rh", "y": 180 },
-        "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:door/mist_top_rh", "y": 270 },
-        "facing=east,half=upper,hinge=left,open=true,powered=true":  { "model": "unicopia:door/mist_top_rh", "y": 90 },
-        "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:door/mist_top_rh", "y": 180 },
-        "facing=west,half=upper,hinge=left,open=true,powered=true":  { "model": "unicopia:door/mist_top_rh", "y": 270 },
-        "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:door/mist_top_rh" },
-        "facing=east,half=upper,hinge=right,open=true,powered=true":  { "model": "unicopia:door/mist_top", "y": 270 },
-        "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:door/mist_top" },
-        "facing=west,half=upper,hinge=right,open=true,powered=true":  { "model": "unicopia:door/mist_top", "y": 90 },
-        "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:door/mist_top", "y": 180 }
+        "facing=east,half=lower,hinge=left,open=false,powered=false":  { "model": "unicopia:block/door/mist_bottom" },
+        "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/mist_bottom", "y": 90 },
+        "facing=west,half=lower,hinge=left,open=false,powered=false":  { "model": "unicopia:block/door/mist_bottom", "y": 180 },
+        "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/mist_bottom", "y": 270 },
+        "facing=east,half=lower,hinge=right,open=false,powered=false":  { "model": "unicopia:block/door/mist_bottom_rh" },
+        "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/mist_bottom_rh", "y": 90 },
+        "facing=west,half=lower,hinge=right,open=false,powered=false":  { "model": "unicopia:block/door/mist_bottom_rh", "y": 180 },
+        "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/mist_bottom_rh", "y": 270 },
+        "facing=east,half=lower,hinge=left,open=true,powered=false":  { "model": "unicopia:block/door/mist_bottom_rh", "y": 90 },
+        "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/mist_bottom_rh", "y": 180 },
+        "facing=west,half=lower,hinge=left,open=true,powered=false":  { "model": "unicopia:block/door/mist_bottom_rh", "y": 270 },
+        "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/mist_bottom_rh" },
+        "facing=east,half=lower,hinge=right,open=true,powered=false":  { "model": "unicopia:block/door/mist_bottom", "y": 270 },
+        "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/mist_bottom" },
+        "facing=west,half=lower,hinge=right,open=true,powered=false":  { "model": "unicopia:block/door/mist_bottom", "y": 90 },
+        "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/mist_bottom", "y": 180 },
+        "facing=east,half=upper,hinge=left,open=false,powered=false":  { "model": "unicopia:block/door/mist_top" },
+        "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/mist_top", "y": 90 },
+        "facing=west,half=upper,hinge=left,open=false,powered=false":  { "model": "unicopia:block/door/mist_top", "y": 180 },
+        "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/mist_top", "y": 270 },
+        "facing=east,half=upper,hinge=right,open=false,powered=false":  { "model": "unicopia:block/door/mist_top_rh" },
+        "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/mist_top_rh", "y": 90 },
+        "facing=west,half=upper,hinge=right,open=false,powered=false":  { "model": "unicopia:block/door/mist_top_rh", "y": 180 },
+        "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/mist_top_rh", "y": 270 },
+        "facing=east,half=upper,hinge=left,open=true,powered=false":  { "model": "unicopia:block/door/mist_top_rh", "y": 90 },
+        "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/mist_top_rh", "y": 180 },
+        "facing=west,half=upper,hinge=left,open=true,powered=false":  { "model": "unicopia:block/door/mist_top_rh", "y": 270 },
+        "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/mist_top_rh" },
+        "facing=east,half=upper,hinge=right,open=true,powered=false":  { "model": "unicopia:block/door/mist_top", "y": 270 },
+        "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/mist_top" },
+        "facing=west,half=upper,hinge=right,open=true,powered=false":  { "model": "unicopia:block/door/mist_top", "y": 90 },
+        "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/mist_top", "y": 180 },
+        "facing=east,half=lower,hinge=left,open=false,powered=true":  { "model": "unicopia:block/door/mist_bottom" },
+        "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/mist_bottom", "y": 90 },
+        "facing=west,half=lower,hinge=left,open=false,powered=true":  { "model": "unicopia:block/door/mist_bottom", "y": 180 },
+        "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/mist_bottom", "y": 270 },
+        "facing=east,half=lower,hinge=right,open=false,powered=true":  { "model": "unicopia:block/door/mist_bottom_rh" },
+        "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/mist_bottom_rh", "y": 90 },
+        "facing=west,half=lower,hinge=right,open=false,powered=true":  { "model": "unicopia:block/door/mist_bottom_rh", "y": 180 },
+        "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/mist_bottom_rh", "y": 270 },
+        "facing=east,half=lower,hinge=left,open=true,powered=true":  { "model": "unicopia:block/door/mist_bottom_rh", "y": 90 },
+        "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/mist_bottom_rh", "y": 180 },
+        "facing=west,half=lower,hinge=left,open=true,powered=true":  { "model": "unicopia:block/door/mist_bottom_rh", "y": 270 },
+        "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/mist_bottom_rh" },
+        "facing=east,half=lower,hinge=right,open=true,powered=true":  { "model": "unicopia:block/door/mist_bottom", "y": 270 },
+        "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/mist_bottom" },
+        "facing=west,half=lower,hinge=right,open=true,powered=true":  { "model": "unicopia:block/door/mist_bottom", "y": 90 },
+        "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/mist_bottom", "y": 180 },
+        "facing=east,half=upper,hinge=left,open=false,powered=true":  { "model": "unicopia:block/door/mist_top" },
+        "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/mist_top", "y": 90 },
+        "facing=west,half=upper,hinge=left,open=false,powered=true":  { "model": "unicopia:block/door/mist_top", "y": 180 },
+        "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/mist_top", "y": 270 },
+        "facing=east,half=upper,hinge=right,open=false,powered=true":  { "model": "unicopia:block/door/mist_top_rh" },
+        "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/mist_top_rh", "y": 90 },
+        "facing=west,half=upper,hinge=right,open=false,powered=true":  { "model": "unicopia:block/door/mist_top_rh", "y": 180 },
+        "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/mist_top_rh", "y": 270 },
+        "facing=east,half=upper,hinge=left,open=true,powered=true":  { "model": "unicopia:block/door/mist_top_rh", "y": 90 },
+        "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/mist_top_rh", "y": 180 },
+        "facing=west,half=upper,hinge=left,open=true,powered=true":  { "model": "unicopia:block/door/mist_top_rh", "y": 270 },
+        "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/mist_top_rh" },
+        "facing=east,half=upper,hinge=right,open=true,powered=true":  { "model": "unicopia:block/door/mist_top", "y": 270 },
+        "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/mist_top" },
+        "facing=west,half=upper,hinge=right,open=true,powered=true":  { "model": "unicopia:block/door/mist_top", "y": 90 },
+        "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/mist_top", "y": 180 }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/packed_cloud_block.json b/src/main/resources/assets/unicopia/blockstates/packed_cloud_block.json
deleted file mode 100644
index 0abf2904..00000000
--- a/src/main/resources/assets/unicopia/blockstates/packed_cloud_block.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "normal": { "model": "unicopia:enchanted_cloud_block" }
-    }
-}
diff --git a/src/main/resources/assets/unicopia/blockstates/packed_cloud_slab.json b/src/main/resources/assets/unicopia/blockstates/packed_cloud_slab.json
deleted file mode 100644
index 978908ec..00000000
--- a/src/main/resources/assets/unicopia/blockstates/packed_cloud_slab.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "variants": {
-        "half=bottom,variant=normal": { "model": "unicopia:half_slab_packed_cloud" },
-        "half=top,variant=normal": { "model": "unicopia:upper_slab_packed_cloud" }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/unicopia/blockstates/slime_drop.json b/src/main/resources/assets/unicopia/blockstates/slime_drop.json
new file mode 100644
index 00000000..5d4c80c0
--- /dev/null
+++ b/src/main/resources/assets/unicopia/blockstates/slime_drop.json
@@ -0,0 +1,20 @@
+{
+    "variants": {
+        "age=0,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage0" },
+        "age=1,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage0" },
+        "age=2,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage1" },
+        "age=3,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage1" },
+        "age=4,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage2" },
+        "age=5,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage2" },
+        "age=6,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage3" },
+        "age=7,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage3" },
+        "age=0,shape=string": { "model": "unicopia:block/slime_drop/string_stage0" },
+        "age=1,shape=string": { "model": "unicopia:block/slime_drop/string_stage0" },
+        "age=2,shape=string": { "model": "unicopia:block/slime_drop/string_stage1" },
+        "age=3,shape=string": { "model": "unicopia:block/slime_drop/string_stage1" },
+        "age=4,shape=string": { "model": "unicopia:block/slime_drop/string_stage2" },
+        "age=5,shape=string": { "model": "unicopia:block/slime_drop/string_stage2" },
+        "age=6,shape=string": { "model": "unicopia:block/slime_drop/string_stage3" },
+        "age=7,shape=string": { "model": "unicopia:block/slime_drop/string_stage3" }
+    }
+}
diff --git a/src/main/resources/assets/unicopia/blockstates/slime_layer.json b/src/main/resources/assets/unicopia/blockstates/slime_layer.json
index a73d9f9b..59818564 100644
--- a/src/main/resources/assets/unicopia/blockstates/slime_layer.json
+++ b/src/main/resources/assets/unicopia/blockstates/slime_layer.json
@@ -1,12 +1,12 @@
 {
     "variants": {
-        "layers=1":  { "model": "unicopia:slime/layer_2" },
-        "layers=2":  { "model": "unicopia:slime/layer_4" },
-        "layers=3":  { "model": "unicopia:slime/layer_6" },
-        "layers=4":  { "model": "unicopia:slime/layer_8" },
-        "layers=5":  { "model": "unicopia:slime/layer_10" },
-        "layers=6":  { "model": "unicopia:slime/layer_12" },
-        "layers=7":  { "model": "unicopia:slime/layer_14" },
-        "layers=8":  { "model": "minecraft:slime" }
+        "layers=1":  { "model": "unicopia:block/slime_layer/layer_2" },
+        "layers=2":  { "model": "unicopia:block/slime_layer/layer_4" },
+        "layers=3":  { "model": "unicopia:block/slime_layer/layer_6" },
+        "layers=4":  { "model": "unicopia:block/slime_layer/layer_8" },
+        "layers=5":  { "model": "unicopia:block/slime_layer/layer_10" },
+        "layers=6":  { "model": "unicopia:block/slime_layer/layer_12" },
+        "layers=7":  { "model": "unicopia:block/slime_layer/layer_14" },
+        "layers=8":  { "model": "minecraft:block/slime_block" }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/stick.json b/src/main/resources/assets/unicopia/blockstates/stick.json
index 912628ac..b90bed6c 100644
--- a/src/main/resources/assets/unicopia/blockstates/stick.json
+++ b/src/main/resources/assets/unicopia/blockstates/stick.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "normal": { "model": "unicopia:tomato_plant/stage0" }
+        "": { "model": "unicopia:block/tomato_plant/stage0" }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/sugar_block.json b/src/main/resources/assets/unicopia/blockstates/sugar_block.json
index 123e8309..290628ff 100644
--- a/src/main/resources/assets/unicopia/blockstates/sugar_block.json
+++ b/src/main/resources/assets/unicopia/blockstates/sugar_block.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "variant=normal": { "model": "unicopia:sugar_block" }
+        "": { "model": "unicopia:block/sugar_block" }
     }
 }
diff --git a/src/main/resources/assets/unicopia/blockstates/tomato_plant.json b/src/main/resources/assets/unicopia/blockstates/tomato_plant.json
index ae8099a7..e308ae98 100644
--- a/src/main/resources/assets/unicopia/blockstates/tomato_plant.json
+++ b/src/main/resources/assets/unicopia/blockstates/tomato_plant.json
@@ -1,20 +1,20 @@
 {
     "variants": {
-        "age=0,type=normal": { "model": "unicopia:tomato_plant/stage0" },
-        "age=1,type=normal": { "model": "unicopia:tomato_plant/stage1" },
-        "age=2,type=normal": { "model": "unicopia:tomato_plant/stage1" },
-        "age=3,type=normal": { "model": "unicopia:tomato_plant/stage2" },
-        "age=4,type=normal": { "model": "unicopia:tomato_plant/stage2" },
-        "age=5,type=normal": { "model": "unicopia:tomato_plant/stage3" },
-        "age=6,type=normal": { "model": "unicopia:tomato_plant/stage4" },
-        "age=7,type=normal": { "model": "unicopia:tomato_plant/stage4" },
-        "age=0,type=cloudsdale": { "model": "unicopia:tomato_plant/stage0" },
-        "age=1,type=cloudsdale": { "model": "unicopia:tomato_plant/stage1" },
-        "age=2,type=cloudsdale": { "model": "unicopia:tomato_plant/stage1" },
-        "age=3,type=cloudsdale": { "model": "unicopia:tomato_plant/stage2" },
-        "age=4,type=cloudsdale": { "model": "unicopia:tomato_plant/stage2" },
-        "age=5,type=cloudsdale": { "model": "unicopia:tomato_plant/stage3" },
-        "age=6,type=cloudsdale": { "model": "unicopia:tomato_plant/stage4" },
-        "age=7,type=cloudsdale": { "model": "unicopia:tomato_plant/stage4" }
+        "age=0,type=normal": { "model": "unicopia:block/tomato_plant/stage0" },
+        "age=1,type=normal": { "model": "unicopia:block/tomato_plant/stage1" },
+        "age=2,type=normal": { "model": "unicopia:block/tomato_plant/stage1" },
+        "age=3,type=normal": { "model": "unicopia:block/tomato_plant/stage2" },
+        "age=4,type=normal": { "model": "unicopia:block/tomato_plant/stage2" },
+        "age=5,type=normal": { "model": "unicopia:block/tomato_plant/stage3" },
+        "age=6,type=normal": { "model": "unicopia:block/tomato_plant/stage4" },
+        "age=7,type=normal": { "model": "unicopia:block/tomato_plant/stage4" },
+        "age=0,type=cloudsdale": { "model": "unicopia:block/tomato_plant/stage0" },
+        "age=1,type=cloudsdale": { "model": "unicopia:block/tomato_plant/stage1" },
+        "age=2,type=cloudsdale": { "model": "unicopia:block/tomato_plant/stage1" },
+        "age=3,type=cloudsdale": { "model": "unicopia:block/tomato_plant/stage2" },
+        "age=4,type=cloudsdale": { "model": "unicopia:block/tomato_plant/stage2" },
+        "age=5,type=cloudsdale": { "model": "unicopia:block/tomato_plant/stage3" },
+        "age=6,type=cloudsdale": { "model": "unicopia:block/tomato_plant/stage4" },
+        "age=7,type=cloudsdale": { "model": "unicopia:block/tomato_plant/stage4" }
     }
 }
diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json
index 72997172..12b21b21 100644
--- a/src/main/resources/assets/unicopia/lang/en_us.json
+++ b/src/main/resources/assets/unicopia/lang/en_us.json
@@ -191,7 +191,7 @@
   "commands.race.usage": "/race <get|set|list|describe> [player] <species>",
   "commands.race.list": "The available races are:",
   "commands.race.permission": "Selected Race is not permitted by your current server",
-  "commands.race.fail": ""%s" is not a recognised Race",
+  "commands.race.fail": "\"%s\" is not a recognised Race",
 
   "commands.race.tell.self": "You are a ",
   "commands.race.tell.self.alt": "You are an ",
diff --git a/src/main/resources/assets/unicopia/models/block/alfalfa/shaft.json b/src/main/resources/assets/unicopia/models/block/alfalfa_crops/shaft.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/alfalfa/shaft.json
rename to src/main/resources/assets/unicopia/models/block/alfalfa_crops/shaft.json
diff --git a/src/main/resources/assets/unicopia/models/block/alfalfa/stage0.json b/src/main/resources/assets/unicopia/models/block/alfalfa_crops/stage0.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/alfalfa/stage0.json
rename to src/main/resources/assets/unicopia/models/block/alfalfa_crops/stage0.json
diff --git a/src/main/resources/assets/unicopia/models/block/alfalfa/stage1.json b/src/main/resources/assets/unicopia/models/block/alfalfa_crops/stage1.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/alfalfa/stage1.json
rename to src/main/resources/assets/unicopia/models/block/alfalfa_crops/stage1.json
diff --git a/src/main/resources/assets/unicopia/models/block/alfalfa/stage2.json b/src/main/resources/assets/unicopia/models/block/alfalfa_crops/stage2.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/alfalfa/stage2.json
rename to src/main/resources/assets/unicopia/models/block/alfalfa_crops/stage2.json
diff --git a/src/main/resources/assets/unicopia/models/block/alfalfa/stage3.json b/src/main/resources/assets/unicopia/models/block/alfalfa_crops/stage3.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/alfalfa/stage3.json
rename to src/main/resources/assets/unicopia/models/block/alfalfa_crops/stage3.json
diff --git a/src/main/resources/assets/unicopia/models/block/alfalfa/stage4.json b/src/main/resources/assets/unicopia/models/block/alfalfa_crops/stage4.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/alfalfa/stage4.json
rename to src/main/resources/assets/unicopia/models/block/alfalfa_crops/stage4.json
diff --git a/src/main/resources/assets/unicopia/models/block/chissled_chitin.json b/src/main/resources/assets/unicopia/models/block/chiseled_chitin_shell_block.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/chissled_chitin.json
rename to src/main/resources/assets/unicopia/models/block/chiseled_chitin_shell_block.json
diff --git a/src/main/resources/assets/unicopia/models/block/chitin_block_uncovered.json b/src/main/resources/assets/unicopia/models/block/chitin_shell_block.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/chitin_block_uncovered.json
rename to src/main/resources/assets/unicopia/models/block/chitin_shell_block.json
diff --git a/src/main/resources/assets/unicopia/models/block/chitin_block_covered.json b/src/main/resources/assets/unicopia/models/block/chitin_shell_block_covered.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/chitin_block_covered.json
rename to src/main/resources/assets/unicopia/models/block/chitin_shell_block_covered.json
diff --git a/src/main/resources/assets/unicopia/models/block/chitin_block_snow_covered.json b/src/main/resources/assets/unicopia/models/block/chitin_shell_block_snow.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/chitin_block_snow_covered.json
rename to src/main/resources/assets/unicopia/models/block/chitin_shell_block_snow.json
diff --git a/src/main/resources/assets/unicopia/models/block/anvil_undamaged.json b/src/main/resources/assets/unicopia/models/block/cloud_anvil.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/anvil_undamaged.json
rename to src/main/resources/assets/unicopia/models/block/cloud_anvil.json
diff --git a/src/main/resources/assets/unicopia/models/block/cloud_banister_inventory.json b/src/main/resources/assets/unicopia/models/block/cloud_banister_inventory.json
deleted file mode 100644
index 03828b1d..00000000
--- a/src/main/resources/assets/unicopia/models/block/cloud_banister_inventory.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{   "parent": "block/block",
-    "display": {
-        "gui": {
-            "rotation": [ 30, 135, 0 ],
-            "translation": [ 0, 0, 0],
-            "scale":[ 0.625, 0.625, 0.625 ]
-        },
-        "fixed": {
-            "rotation": [ 0, 90, 0 ],
-            "translation": [ 0, 0, 0],
-            "scale":[ 0.5, 0.5, 0.5 ]
-        }
-    },
-    "ambientocclusion": false,
-    "textures": {
-    	"texture": "unicopia:blocks/cloud_normal",
-        "particle": "unicopia:blocks/cloud_normal"
-    },
-    "elements": [
-        {   "from": [ 6, 4, 0 ],
-            "to": [ 10, 8, 16 ],
-            "faces": {
-                "down":  { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "cullface": "down" },
-                "up":    { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" },
-                "north": { "uv": [ 6, 0, 10, 4 ], "texture": "#texture" },
-                "south": { "uv": [ 6, 0, 10, 4 ], "texture": "#texture" },
-                "west":  { "uv": [ 0, 0,  4, 4 ], "texture": "#texture" },
-                "east":  { "uv": [ 0, 0,  4, 4 ], "texture": "#texture" }
-            },
-            "__comment": "Left post"
-        }
-    ]
-}
diff --git a/src/main/resources/assets/unicopia/models/block/cloud_banister_post.json b/src/main/resources/assets/unicopia/models/block/cloud_banister_post.json
deleted file mode 100644
index 3a37eeae..00000000
--- a/src/main/resources/assets/unicopia/models/block/cloud_banister_post.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "textures": {
-		"texture": "unicopia:blocks/cloud_enchanted_top",
-        "particle": "unicopia:blocks/cloud_enchanted_top"
-    },
-    "elements": [
-        {   "from": [ 5, 0, 5 ],
-            "to": [ 11, 2, 11 ],
-            "faces": {
-                "down":  { "uv": [ 5, 0, 11, 11 ], "texture": "#texture" },
-                "up":    { "uv": [ 5, 0, 11, 11 ], "texture": "#texture" },
-                "north": { "uv": [ 5, 0, 11, 2 ], "texture": "#texture" },
-                "south": { "uv": [ 5, 0, 11, 2 ], "texture": "#texture" },
-                "west":  { "uv": [ 0, 0, 11, 2 ], "texture": "#texture" },
-                "east":  { "uv": [ 0, 0, 11, 2 ], "texture": "#texture" }
-            },
-            "__comment": "top bar"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/unicopia/models/block/cloud_banister_side.json b/src/main/resources/assets/unicopia/models/block/cloud_banister_side.json
deleted file mode 100644
index 06b1119f..00000000
--- a/src/main/resources/assets/unicopia/models/block/cloud_banister_side.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "textures": {
-		"texture": "unicopia:blocks/cloud_enchanted_top",
-        "particle": "unicopia:blocks/cloud_enchanted_top"
-    },
-    "elements": [
-        {   "from": [ 5, 0, 0 ],
-            "to": [ 11, 2, 11 ],
-            "faces": {
-                "down":  { "uv": [ 5, 0, 11, 11 ], "texture": "#texture" },
-                "up":    { "uv": [ 5, 0, 11, 11 ], "texture": "#texture" },
-                "north": { "uv": [ 5, 0, 11, 2 ], "texture": "#texture" },
-                "south": { "uv": [ 5, 0, 11, 2 ], "texture": "#texture" },
-                "west":  { "uv": [ 0, 0, 11, 2 ], "texture": "#texture" },
-                "east":  { "uv": [ 0, 0, 11, 2 ], "texture": "#texture" }
-            },
-            "__comment": "top bar"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/unicopia/models/block/normal_cloud_block.json b/src/main/resources/assets/unicopia/models/block/cloud_block.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/normal_cloud_block.json
rename to src/main/resources/assets/unicopia/models/block/cloud_block.json
diff --git a/src/main/resources/assets/unicopia/models/block/half_slab_normal_cloud.json b/src/main/resources/assets/unicopia/models/block/cloud_slab.json
similarity index 83%
rename from src/main/resources/assets/unicopia/models/block/half_slab_normal_cloud.json
rename to src/main/resources/assets/unicopia/models/block/cloud_slab.json
index d30a7d5f..4531f612 100644
--- a/src/main/resources/assets/unicopia/models/block/half_slab_normal_cloud.json
+++ b/src/main/resources/assets/unicopia/models/block/cloud_slab.json
@@ -1,5 +1,5 @@
 {
-    "parent": "block/half_slab",
+    "parent": "block/slab",
     "textures": {
         "bottom": "unicopia:blocks/cloud_normal",
         "top": "unicopia:blocks/cloud_normal",
diff --git a/src/main/resources/assets/unicopia/models/block/upper_slab_normal_cloud.json b/src/main/resources/assets/unicopia/models/block/cloud_slab_top.json
similarity index 83%
rename from src/main/resources/assets/unicopia/models/block/upper_slab_normal_cloud.json
rename to src/main/resources/assets/unicopia/models/block/cloud_slab_top.json
index 64300044..2b678629 100644
--- a/src/main/resources/assets/unicopia/models/block/upper_slab_normal_cloud.json
+++ b/src/main/resources/assets/unicopia/models/block/cloud_slab_top.json
@@ -1,5 +1,5 @@
 {
-    "parent": "block/upper_slab",
+    "parent": "block/slab_top",
     "textures": {
         "bottom": "unicopia:blocks/cloud_normal",
         "top": "unicopia:blocks/cloud_normal",
diff --git a/src/main/resources/assets/unicopia/models/block/packed_cloud_block.json b/src/main/resources/assets/unicopia/models/block/dense_cloud_block.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/packed_cloud_block.json
rename to src/main/resources/assets/unicopia/models/block/dense_cloud_block.json
diff --git a/src/main/resources/assets/unicopia/models/block/half_slab_packed_cloud.json b/src/main/resources/assets/unicopia/models/block/dense_cloud_slab.json
similarity index 84%
rename from src/main/resources/assets/unicopia/models/block/half_slab_packed_cloud.json
rename to src/main/resources/assets/unicopia/models/block/dense_cloud_slab.json
index e12eaff0..7d864a33 100644
--- a/src/main/resources/assets/unicopia/models/block/half_slab_packed_cloud.json
+++ b/src/main/resources/assets/unicopia/models/block/dense_cloud_slab.json
@@ -1,5 +1,5 @@
 {
-    "parent": "block/half_slab",
+    "parent": "block/slab",
     "textures": {
         "bottom": "unicopia:blocks/cloud_packed_top",
         "top": "unicopia:blocks/cloud_packed",
diff --git a/src/main/resources/assets/unicopia/models/block/upper_slab_packed_cloud.json b/src/main/resources/assets/unicopia/models/block/dense_cloud_slab_top.json
similarity index 83%
rename from src/main/resources/assets/unicopia/models/block/upper_slab_packed_cloud.json
rename to src/main/resources/assets/unicopia/models/block/dense_cloud_slab_top.json
index 956f43fd..3d4723ab 100644
--- a/src/main/resources/assets/unicopia/models/block/upper_slab_packed_cloud.json
+++ b/src/main/resources/assets/unicopia/models/block/dense_cloud_slab_top.json
@@ -1,5 +1,5 @@
 {
-    "parent": "block/upper_slab",
+    "parent": "block/slab_top",
     "textures": {
         "bottom": "unicopia:blocks/cloud_packed",
         "top": "unicopia:blocks/cloud_packed_top",
diff --git a/src/main/resources/assets/unicopia/models/block/half_slab_enchanted_cloud.json b/src/main/resources/assets/unicopia/models/block/enchanted_cloud_slab.json
similarity index 84%
rename from src/main/resources/assets/unicopia/models/block/half_slab_enchanted_cloud.json
rename to src/main/resources/assets/unicopia/models/block/enchanted_cloud_slab.json
index 695e7492..03375470 100644
--- a/src/main/resources/assets/unicopia/models/block/half_slab_enchanted_cloud.json
+++ b/src/main/resources/assets/unicopia/models/block/enchanted_cloud_slab.json
@@ -1,5 +1,5 @@
 {
-    "parent": "block/half_slab",
+    "parent": "block/slab",
     "textures": {
         "bottom": "unicopia:blocks/cloud_enchanted_top",
         "top": "unicopia:blocks/cloud_enchanted",
diff --git a/src/main/resources/assets/unicopia/models/block/upper_slab_enchanted_cloud.json b/src/main/resources/assets/unicopia/models/block/enchanted_cloud_slab_top.json
similarity index 84%
rename from src/main/resources/assets/unicopia/models/block/upper_slab_enchanted_cloud.json
rename to src/main/resources/assets/unicopia/models/block/enchanted_cloud_slab_top.json
index f7ffb049..c288bda8 100644
--- a/src/main/resources/assets/unicopia/models/block/upper_slab_enchanted_cloud.json
+++ b/src/main/resources/assets/unicopia/models/block/enchanted_cloud_slab_top.json
@@ -1,5 +1,5 @@
 {
-    "parent": "block/upper_slab",
+    "parent": "block/slab_top",
     "textures": {
         "bottom": "unicopia:blocks/cloud_enchanted",
         "top": "unicopia:blocks/cloud_enchanted_top",
diff --git a/src/main/resources/assets/unicopia/models/block/cuccoon/bulb_stage0.json b/src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage0.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/cuccoon/bulb_stage0.json
rename to src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage0.json
diff --git a/src/main/resources/assets/unicopia/models/block/cuccoon/bulb_stage1.json b/src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage1.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/cuccoon/bulb_stage1.json
rename to src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage1.json
diff --git a/src/main/resources/assets/unicopia/models/block/cuccoon/bulb_stage2.json b/src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage2.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/cuccoon/bulb_stage2.json
rename to src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage2.json
diff --git a/src/main/resources/assets/unicopia/models/block/cuccoon/bulb_stage3.json b/src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage3.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/cuccoon/bulb_stage3.json
rename to src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage3.json
diff --git a/src/main/resources/assets/unicopia/models/block/cuccoon/string_stage0.json b/src/main/resources/assets/unicopia/models/block/slime_drop/string_stage0.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/cuccoon/string_stage0.json
rename to src/main/resources/assets/unicopia/models/block/slime_drop/string_stage0.json
diff --git a/src/main/resources/assets/unicopia/models/block/cuccoon/string_stage1.json b/src/main/resources/assets/unicopia/models/block/slime_drop/string_stage1.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/cuccoon/string_stage1.json
rename to src/main/resources/assets/unicopia/models/block/slime_drop/string_stage1.json
diff --git a/src/main/resources/assets/unicopia/models/block/cuccoon/string_stage2.json b/src/main/resources/assets/unicopia/models/block/slime_drop/string_stage2.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/cuccoon/string_stage2.json
rename to src/main/resources/assets/unicopia/models/block/slime_drop/string_stage2.json
diff --git a/src/main/resources/assets/unicopia/models/block/cuccoon/string_stage3.json b/src/main/resources/assets/unicopia/models/block/slime_drop/string_stage3.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/block/cuccoon/string_stage3.json
rename to src/main/resources/assets/unicopia/models/block/slime_drop/string_stage3.json
diff --git a/src/main/resources/assets/unicopia/models/block/slime/layer_10.json b/src/main/resources/assets/unicopia/models/block/slime_layer/layer_10.json
similarity index 92%
rename from src/main/resources/assets/unicopia/models/block/slime/layer_10.json
rename to src/main/resources/assets/unicopia/models/block/slime_layer/layer_10.json
index 1bb5f77a..c7db3d4e 100644
--- a/src/main/resources/assets/unicopia/models/block/slime/layer_10.json
+++ b/src/main/resources/assets/unicopia/models/block/slime_layer/layer_10.json
@@ -1,7 +1,7 @@
 {
     "textures": {
-        "particle": "minecraft:blocks/slime",
-        "texture": "minecraft:blocks/slime"
+        "particle": "minecraft:block/slime_block",
+        "texture": "minecraft:block/slime_block"
     },
     "elements": [
         {   "from": [ 3, 3, 3 ],
diff --git a/src/main/resources/assets/unicopia/models/block/slime/layer_12.json b/src/main/resources/assets/unicopia/models/block/slime_layer/layer_12.json
similarity index 92%
rename from src/main/resources/assets/unicopia/models/block/slime/layer_12.json
rename to src/main/resources/assets/unicopia/models/block/slime_layer/layer_12.json
index bfee5a5e..a82b2823 100644
--- a/src/main/resources/assets/unicopia/models/block/slime/layer_12.json
+++ b/src/main/resources/assets/unicopia/models/block/slime_layer/layer_12.json
@@ -1,7 +1,7 @@
 {
     "textures": {
-        "particle": "minecraft:blocks/slime",
-        "texture": "minecraft:blocks/slime"
+        "particle": "minecraft:block/slime_block",
+        "texture": "minecraft:block/slime_block"
     },
     "elements": [
         {   "from": [ 3, 3, 3 ],
diff --git a/src/main/resources/assets/unicopia/models/block/slime/layer_14.json b/src/main/resources/assets/unicopia/models/block/slime_layer/layer_14.json
similarity index 92%
rename from src/main/resources/assets/unicopia/models/block/slime/layer_14.json
rename to src/main/resources/assets/unicopia/models/block/slime_layer/layer_14.json
index 3a58f52c..ae50cec1 100644
--- a/src/main/resources/assets/unicopia/models/block/slime/layer_14.json
+++ b/src/main/resources/assets/unicopia/models/block/slime_layer/layer_14.json
@@ -1,7 +1,7 @@
 {
     "textures": {
-        "particle": "minecraft:blocks/slime",
-        "texture": "minecraft:blocks/slime"
+        "particle": "minecraft:block/slime_block",
+        "texture": "minecraft:block/slime_block"
     },
     "elements": [
         {   "from": [ 3, 3, 3 ],
diff --git a/src/main/resources/assets/unicopia/models/block/slime/layer_2.json b/src/main/resources/assets/unicopia/models/block/slime_layer/layer_2.json
similarity index 88%
rename from src/main/resources/assets/unicopia/models/block/slime/layer_2.json
rename to src/main/resources/assets/unicopia/models/block/slime_layer/layer_2.json
index 04df4e0c..7679c043 100644
--- a/src/main/resources/assets/unicopia/models/block/slime/layer_2.json
+++ b/src/main/resources/assets/unicopia/models/block/slime_layer/layer_2.json
@@ -1,7 +1,7 @@
 {   "parent": "block/thin_block",
     "textures": {
-        "particle": "minecraft:blocks/slime",
-        "texture": "minecraft:blocks/slime"
+        "particle": "minecraft:block/slime_block",
+        "texture": "minecraft:block/slime_block"
     },
     "elements": [
         {   "from": [ 0, 0, 0 ],
diff --git a/src/main/resources/assets/unicopia/models/block/slime/layer_4.json b/src/main/resources/assets/unicopia/models/block/slime_layer/layer_4.json
similarity index 87%
rename from src/main/resources/assets/unicopia/models/block/slime/layer_4.json
rename to src/main/resources/assets/unicopia/models/block/slime_layer/layer_4.json
index 2b244c44..b309cad5 100644
--- a/src/main/resources/assets/unicopia/models/block/slime/layer_4.json
+++ b/src/main/resources/assets/unicopia/models/block/slime_layer/layer_4.json
@@ -1,7 +1,7 @@
 {
     "textures": {
-        "particle": "minecraft:blocks/slime",
-        "texture": "minecraft:blocks/slime"
+        "particle": "minecraft:block/slime_block",
+        "texture": "minecraft:block/slime_block"
     },
     "elements": [
         {   "from": [ 0, 0, 0 ],
diff --git a/src/main/resources/assets/unicopia/models/block/slime/layer_6.json b/src/main/resources/assets/unicopia/models/block/slime_layer/layer_6.json
similarity index 92%
rename from src/main/resources/assets/unicopia/models/block/slime/layer_6.json
rename to src/main/resources/assets/unicopia/models/block/slime_layer/layer_6.json
index 85ad8f3d..2d9a3a5e 100644
--- a/src/main/resources/assets/unicopia/models/block/slime/layer_6.json
+++ b/src/main/resources/assets/unicopia/models/block/slime_layer/layer_6.json
@@ -1,7 +1,7 @@
 {
     "textures": {
-        "particle": "minecraft:blocks/slime",
-        "texture": "minecraft:blocks/slime"
+        "particle": "minecraft:block/slime_block",
+        "texture": "minecraft:block/slime_block"
     },
     "elements": [
         {   "from": [ 3, 3, 3 ],
diff --git a/src/main/resources/assets/unicopia/models/block/slime/layer_8.json b/src/main/resources/assets/unicopia/models/block/slime_layer/layer_8.json
similarity index 92%
rename from src/main/resources/assets/unicopia/models/block/slime/layer_8.json
rename to src/main/resources/assets/unicopia/models/block/slime_layer/layer_8.json
index a9845c70..428e84f9 100644
--- a/src/main/resources/assets/unicopia/models/block/slime/layer_8.json
+++ b/src/main/resources/assets/unicopia/models/block/slime_layer/layer_8.json
@@ -1,7 +1,7 @@
 {
     "textures": {
-        "particle": "minecraft:blocks/slime",
-        "texture": "minecraft:blocks/slime"
+        "particle": "minecraft:block/slime_block",
+        "texture": "minecraft:block/slime_block"
     },
     "elements": [
         {   "from": [ 3, 3, 3 ],
diff --git a/src/main/resources/assets/unicopia/models/item/anvil.json b/src/main/resources/assets/unicopia/models/item/anvil.json
deleted file mode 100644
index dba9b872..00000000
--- a/src/main/resources/assets/unicopia/models/item/anvil.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "unicopia:block/anvil_undamaged"
-}
diff --git a/src/main/resources/assets/unicopia/models/item/butterfly_spawn_egg.json b/src/main/resources/assets/unicopia/models/item/butterfly_spawn_egg.json
new file mode 100644
index 00000000..765225c9
--- /dev/null
+++ b/src/main/resources/assets/unicopia/models/item/butterfly_spawn_egg.json
@@ -0,0 +1,3 @@
+{
+    "parent": "item/template_spawn_egg"
+}
diff --git a/src/main/resources/assets/unicopia/models/item/chiseled_chitin_shell_block.json b/src/main/resources/assets/unicopia/models/item/chiseled_chitin_shell_block.json
new file mode 100644
index 00000000..d5f9ef48
--- /dev/null
+++ b/src/main/resources/assets/unicopia/models/item/chiseled_chitin_shell_block.json
@@ -0,0 +1,3 @@
+{
+    "parent": "unicopia:block/chiseled_chitin_shell_block"
+}
diff --git a/src/main/resources/assets/unicopia/models/item/chissled_chitin.json b/src/main/resources/assets/unicopia/models/item/chissled_chitin.json
deleted file mode 100644
index 344120f8..00000000
--- a/src/main/resources/assets/unicopia/models/item/chissled_chitin.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "unicopia:block/chissled_chitin"
-}
diff --git a/src/main/resources/assets/unicopia/models/item/chitin_block.json b/src/main/resources/assets/unicopia/models/item/chitin_block.json
deleted file mode 100644
index 63860a70..00000000
--- a/src/main/resources/assets/unicopia/models/item/chitin_block.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "unicopia:block/chitin_block_uncovered"
-}
diff --git a/src/main/resources/assets/unicopia/models/item/chitin_shell_block.json b/src/main/resources/assets/unicopia/models/item/chitin_shell_block.json
new file mode 100644
index 00000000..46af308e
--- /dev/null
+++ b/src/main/resources/assets/unicopia/models/item/chitin_shell_block.json
@@ -0,0 +1,3 @@
+{
+    "parent": "unicopia:block/chitin_shell_block"
+}
diff --git a/src/main/resources/assets/unicopia/models/item/cloud_anvil.json b/src/main/resources/assets/unicopia/models/item/cloud_anvil.json
new file mode 100644
index 00000000..1dc50bda
--- /dev/null
+++ b/src/main/resources/assets/unicopia/models/item/cloud_anvil.json
@@ -0,0 +1,3 @@
+{
+    "parent": "unicopia:block/cloud_anvil"
+}
diff --git a/src/main/resources/assets/unicopia/models/item/cloud_banister.json b/src/main/resources/assets/unicopia/models/item/cloud_banister.json
deleted file mode 100644
index 3a80ac90..00000000
--- a/src/main/resources/assets/unicopia/models/item/cloud_banister.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "unicopia:block/cloud_banister_inventory"
-}
diff --git a/src/main/resources/assets/unicopia/models/item/cloud_block.json b/src/main/resources/assets/unicopia/models/item/cloud_block.json
index 0ec38890..5294cbc4 100644
--- a/src/main/resources/assets/unicopia/models/item/cloud_block.json
+++ b/src/main/resources/assets/unicopia/models/item/cloud_block.json
@@ -1,5 +1,5 @@
 {
-    "parent": "unicopia:block/normal_cloud_block",
+    "parent": "unicopia:block/cloud_block",
     "display": {
         "thirdperson": {
             "rotation": [ 10, -45, 170 ],
diff --git a/src/main/resources/assets/unicopia/models/item/cloud_slab.json b/src/main/resources/assets/unicopia/models/item/cloud_slab.json
index 5e9d4e1b..0eb609ab 100644
--- a/src/main/resources/assets/unicopia/models/item/cloud_slab.json
+++ b/src/main/resources/assets/unicopia/models/item/cloud_slab.json
@@ -1,5 +1,5 @@
 {
-    "parent": "unicopia:block/half_slab_normal_cloud",
+    "parent": "unicopia:block/cloud_slab",
     "display": {
         "thirdperson": {
             "rotation": [ 10, -45, 170 ],
diff --git a/src/main/resources/assets/unicopia/models/item/cloud_spawn_egg.json b/src/main/resources/assets/unicopia/models/item/cloud_spawn_egg.json
new file mode 100644
index 00000000..765225c9
--- /dev/null
+++ b/src/main/resources/assets/unicopia/models/item/cloud_spawn_egg.json
@@ -0,0 +1,3 @@
+{
+    "parent": "item/template_spawn_egg"
+}
diff --git a/src/main/resources/assets/unicopia/models/item/packed_cloud_block.json b/src/main/resources/assets/unicopia/models/item/dense_cloud_block.json
similarity index 79%
rename from src/main/resources/assets/unicopia/models/item/packed_cloud_block.json
rename to src/main/resources/assets/unicopia/models/item/dense_cloud_block.json
index b0acce3e..59677ea7 100644
--- a/src/main/resources/assets/unicopia/models/item/packed_cloud_block.json
+++ b/src/main/resources/assets/unicopia/models/item/dense_cloud_block.json
@@ -1,5 +1,5 @@
 {
-    "parent": "unicopia:block/packed_cloud_block",
+    "parent": "unicopia:block/dense_cloud_block",
     "display": {
         "thirdperson": {
             "rotation": [ 10, -45, 170 ],
diff --git a/src/main/resources/assets/unicopia/models/item/packed_cloud_slab.json b/src/main/resources/assets/unicopia/models/item/dense_cloud_slab.json
similarity index 78%
rename from src/main/resources/assets/unicopia/models/item/packed_cloud_slab.json
rename to src/main/resources/assets/unicopia/models/item/dense_cloud_slab.json
index 2d1617b5..391d435d 100644
--- a/src/main/resources/assets/unicopia/models/item/packed_cloud_slab.json
+++ b/src/main/resources/assets/unicopia/models/item/dense_cloud_slab.json
@@ -1,5 +1,5 @@
 {
-    "parent": "unicopia:block/half_slab_packed_cloud",
+    "parent": "unicopia:block/dense_cloud_slab",
     "display": {
         "thirdperson": {
             "rotation": [ 10, -45, 170 ],
diff --git a/src/main/resources/assets/unicopia/models/item/enchanted_cloud_slab.json b/src/main/resources/assets/unicopia/models/item/enchanted_cloud_slab.json
index 52913f8c..22bb2a3d 100644
--- a/src/main/resources/assets/unicopia/models/item/enchanted_cloud_slab.json
+++ b/src/main/resources/assets/unicopia/models/item/enchanted_cloud_slab.json
@@ -1,5 +1,5 @@
 {
-    "parent": "unicopia:block/half_slab_enchanted_cloud",
+    "parent": "unicopia:block/enchanted_cloud_slab",
     "display": {
         "thirdperson": {
             "rotation": [ 10, -45, 170 ],
diff --git a/src/main/resources/assets/unicopia/models/item/hive.json b/src/main/resources/assets/unicopia/models/item/hive_wall_block.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/item/hive.json
rename to src/main/resources/assets/unicopia/models/item/hive_wall_block.json
diff --git a/src/main/resources/assets/unicopia/models/item/cuccoon.json b/src/main/resources/assets/unicopia/models/item/misted_glass_door.json
similarity index 53%
rename from src/main/resources/assets/unicopia/models/item/cuccoon.json
rename to src/main/resources/assets/unicopia/models/item/misted_glass_door.json
index 9e981fea..efea724b 100644
--- a/src/main/resources/assets/unicopia/models/item/cuccoon.json
+++ b/src/main/resources/assets/unicopia/models/item/misted_glass_door.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/cuccoon"
+        "layer0": "unicopia:items/misted_glass_door"
     }
 }
diff --git a/src/main/resources/assets/unicopia/models/item/record_crusade.json b/src/main/resources/assets/unicopia/models/item/music_disc_crusade.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/item/record_crusade.json
rename to src/main/resources/assets/unicopia/models/item/music_disc_crusade.json
diff --git a/src/main/resources/assets/unicopia/models/item/record_funk.json b/src/main/resources/assets/unicopia/models/item/music_disc_funk.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/item/record_funk.json
rename to src/main/resources/assets/unicopia/models/item/music_disc_funk.json
diff --git a/src/main/resources/assets/unicopia/models/item/record_pet.json b/src/main/resources/assets/unicopia/models/item/music_disc_pet.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/item/record_pet.json
rename to src/main/resources/assets/unicopia/models/item/music_disc_pet.json
diff --git a/src/main/resources/assets/unicopia/models/item/record_popular.json b/src/main/resources/assets/unicopia/models/item/music_disc_popular.json
similarity index 100%
rename from src/main/resources/assets/unicopia/models/item/record_popular.json
rename to src/main/resources/assets/unicopia/models/item/music_disc_popular.json
diff --git a/src/main/resources/assets/unicopia/models/item/mist_door.json b/src/main/resources/assets/unicopia/models/item/slime_drop.json
similarity index 56%
rename from src/main/resources/assets/unicopia/models/item/mist_door.json
rename to src/main/resources/assets/unicopia/models/item/slime_drop.json
index e70f2461..4b2eb5cd 100644
--- a/src/main/resources/assets/unicopia/models/item/mist_door.json
+++ b/src/main/resources/assets/unicopia/models/item/slime_drop.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/door_cloud"
+        "layer0": "unicopia:items/slime_drop"
     }
 }
diff --git a/src/main/resources/assets/unicopia/models/item/slime_layer.json b/src/main/resources/assets/unicopia/models/item/slime_layer.json
index cca358b5..53d6975a 100644
--- a/src/main/resources/assets/unicopia/models/item/slime_layer.json
+++ b/src/main/resources/assets/unicopia/models/item/slime_layer.json
@@ -1,3 +1,3 @@
 {
-    "parent": "unicopia:block/slime/layer_2"
+    "parent": "unicopia:block/slime_layer/layer_2"
 }
diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/enchanted_torch.json b/src/main/resources/data/unicopia/loot_tables/blocks/enchanted_torch.json
index 160cff70..de81c36c 100644
--- a/src/main/resources/data/unicopia/loot_tables/blocks/enchanted_torch.json
+++ b/src/main/resources/data/unicopia/loot_tables/blocks/enchanted_torch.json
@@ -6,11 +6,11 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "unicopia:spell"
+          "name": "unicopia:gem"
         },
         {
           "type": "minecraft:item",
-          "name": "unicopia:curse"
+          "name": "unicopia:corrupted_gem"
         }
       ]
     }