diff --git a/biomes/mushroom/mus-crimson-forest.json b/biomes/mushroom/mus-crimson-forest.json
index bef3a3d6..7b4c820d 100644
--- a/biomes/mushroom/mus-crimson-forest.json
+++ b/biomes/mushroom/mus-crimson-forest.json
@@ -98,16 +98,16 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/small-organell-r-1",
-                "mushroom-red/small-organell-r-2",
-                "mushroom-red/small-organell-r-3",
-                "mushroom-red/small-organell-r-4",
-                "mushroom-red/small-organell-r-5",
-                "mushroom-red/small-organell-r-6",
-                "mushroom-red/small-organell-r-7",
-                "mushroom-red/small-organell-r-8",
-                "mushroom-red/small-organell-r-9",
-                "mushroom-red/small-organell-r-10"
+                "trees/mushroom/mushclut1",
+                "trees/mushroom/mushclut2",
+                "trees/mushroom/mushclut3",
+                "trees/mushroom/mushclut4",
+                "trees/mushroom/mushclut5",
+                "trees/mushroom/mushclut6",
+                "trees/mushroom/mushclut7",
+                "trees/mushroom/mushclut8",
+                "trees/mushroom/mushclut9",
+                "trees/mushroom/mushclut10"
             ],
             "mode": "VACUUM",
             "translate": {
@@ -139,16 +139,16 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/small-organell-r-1",
-                "mushroom-red/small-organell-r-2",
-                "mushroom-red/small-organell-r-3",
-                "mushroom-red/small-organell-r-4",
-                "mushroom-red/small-organell-r-5",
-                "mushroom-red/small-organell-r-6",
-                "mushroom-red/small-organell-r-7",
-                "mushroom-red/small-organell-r-8",
-                "mushroom-red/small-organell-r-9",
-                "mushroom-red/small-organell-r-10"
+                "trees/mushroom/mushclut1",
+                "trees/mushroom/mushclut2",
+                "trees/mushroom/mushclut3",
+                "trees/mushroom/mushclut4",
+                "trees/mushroom/mushclut5",
+                "trees/mushroom/mushclut6",
+                "trees/mushroom/mushclut7",
+                "trees/mushroom/mushclut8",
+                "trees/mushroom/mushclut9",
+                "trees/mushroom/mushclut10"
             ],
             "translate": {
                 "x": 0,
@@ -179,18 +179,18 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/organell-r-1",
-                "mushroom-red/organell-r-2",
-                "mushroom-red/organell-b-1",
-                "mushroom-red/organell-b-2",
-                "mushroom-red/organell-r-3",
-                "mushroom-red/organell-r-4",
-                "mushroom-red/organell-r-5",
-                "mushroom-red/organell-r-6",
-                "mushroom-red/organell-r-7",
-                "mushroom-red/organell-r-8",
-                "mushroom-red/organell-r-9",
-                "mushroom-red/organell-r-10"
+                "trees/mushroom/redgeneric1",
+                "trees/mushroom/redgeneric2",
+                "trees/mushroom/browngeneric1",
+                "trees/mushroom/browngeneric2",
+                "trees/mushroom/redgeneric3",
+                "trees/mushroom/redgeneric4",
+                "trees/mushroom/redgeneric5",
+                "trees/mushroom/redgeneric6",
+                "trees/mushroom/redgeneric7",
+                "trees/mushroom/redgeneric8",
+                "trees/mushroom/redgeneric9",
+                "trees/mushroom/redgeneric10"
             ],
             "translate": {
                 "x": 0,
@@ -221,18 +221,18 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/organell-r-1",
-                "mushroom-red/organell-r-2",
-                "mushroom-red/organell-b-1",
-                "mushroom-red/organell-b-2",
-                "mushroom-red/organell-r-3",
-                "mushroom-red/organell-r-4",
-                "mushroom-red/organell-r-5",
-                "mushroom-red/organell-r-6",
-                "mushroom-red/organell-r-7",
-                "mushroom-red/organell-r-8",
-                "mushroom-red/organell-r-9",
-                "mushroom-red/organell-r-10"
+                "trees/mushroom/redgeneric1",
+                "trees/mushroom/redgeneric2",
+                "trees/mushroom/browngeneric1",
+                "trees/mushroom/browngeneric2",
+                "trees/mushroom/redgeneric3",
+                "trees/mushroom/redgeneric4",
+                "trees/mushroom/redgeneric5",
+                "trees/mushroom/redgeneric6",
+                "trees/mushroom/redgeneric7",
+                "trees/mushroom/redgeneric8",
+                "trees/mushroom/redgeneric9",
+                "trees/mushroom/redgeneric10"
             ],
             "translate": {
                 "x": 0,
@@ -263,11 +263,11 @@
                 "enabled": true
             },
             "place": [
-                "shroom/mushclutt1",
-                "shroom/mushclutt2",
-                "shroom/mushclutt3",
-                "shroom/mushclutt4",
-                "shroom/mushclutt5"
+                "trees/mushroom/smolshroomt1",
+                "trees/mushroom/smolshroomt2",
+                "trees/mushroom/smolshroomt3",
+                "trees/mushroom/smolshroomt4",
+                "trees/mushroom/smolshroomt5"
             ],
             "translate": {
                 "x": 0,
@@ -298,11 +298,11 @@
                 "enabled": true
             },
             "place": [
-                "shroom/mushclutt1",
-                "shroom/mushclutt2",
-                "shroom/mushclutt3",
-                "shroom/mushclutt4",
-                "shroom/mushclutt5"
+                "trees/mushroom/smolshroomt1",
+                "trees/mushroom/smolshroomt2",
+                "trees/mushroom/smolshroomt3",
+                "trees/mushroom/smolshroomt4",
+                "trees/mushroom/smolshroomt5"
             ],
             "translate": {
                 "x": 0,
diff --git a/biomes/mushroom/mus-forest-hills.json b/biomes/mushroom/mus-forest-hills.json
index dab1ac94..6c056baf 100644
--- a/biomes/mushroom/mus-forest-hills.json
+++ b/biomes/mushroom/mus-forest-hills.json
@@ -146,16 +146,16 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/small-organell-r-1",
-                "mushroom-red/small-organell-r-2",
-                "mushroom-red/small-organell-r-3",
-                "mushroom-red/small-organell-r-4",
-                "mushroom-red/small-organell-r-5",
-                "mushroom-red/small-organell-r-6",
-                "mushroom-red/small-organell-r-7",
-                "mushroom-red/small-organell-r-8",
-                "mushroom-red/small-organell-r-9",
-                "mushroom-red/small-organell-r-10"
+                "trees/mushroom/mushclut1",
+                "trees/mushroom/mushclut2",
+                "trees/mushroom/mushclut3",
+                "trees/mushroom/mushclut4",
+                "trees/mushroom/mushclut5",
+                "trees/mushroom/mushclut6",
+                "trees/mushroom/mushclut7",
+                "trees/mushroom/mushclut8",
+                "trees/mushroom/mushclut9",
+                "trees/mushroom/mushclut10"
             ],
             "mode": "MIN_HEIGHT",
             "translate": {
@@ -181,16 +181,16 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/small-organell-r-1",
-                "mushroom-red/small-organell-r-2",
-                "mushroom-red/small-organell-r-3",
-                "mushroom-red/small-organell-r-4",
-                "mushroom-red/small-organell-r-5",
-                "mushroom-red/small-organell-r-6",
-                "mushroom-red/small-organell-r-7",
-                "mushroom-red/small-organell-r-8",
-                "mushroom-red/small-organell-r-9",
-                "mushroom-red/small-organell-r-10"
+                "trees/mushroom/mushclut1",
+                "trees/mushroom/mushclut2",
+                "trees/mushroom/mushclut3",
+                "trees/mushroom/mushclut4",
+                "trees/mushroom/mushclut5",
+                "trees/mushroom/mushclut6",
+                "trees/mushroom/mushclut7",
+                "trees/mushroom/mushclut8",
+                "trees/mushroom/mushclut9",
+                "trees/mushroom/mushclut10"
             ],
             "translate": {
                 "x": 0,
@@ -211,17 +211,17 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/organell-b-1",
-                "mushroom-red/organell-b-2",
-                "mushroom-red/organell-r-3",
-                "mushroom-red/organell-r-4",
-                "mushroom-red/organell-r-5",
-                "mushroom-red/organell-r-6",
-                "mushroom-red/organell-r-7",
-                "mushroom-red/organell-r-8",
-                "mushroom-red/organell-r-9",
-                "mushroom-red/organell-r-10",
-                "mushroom-red/organell-r-11"
+                "trees/mushroom/browngeneric1",
+                "trees/mushroom/browngeneric2",
+                "trees/mushroom/redgeneric3",
+                "trees/mushroom/redgeneric4",
+                "trees/mushroom/redgeneric5",
+                "trees/mushroom/redgeneric6",
+                "trees/mushroom/redgeneric7",
+                "trees/mushroom/redgeneric8",
+                "trees/mushroom/redgeneric9",
+                "trees/mushroom/redgeneric10",
+                "trees/mushroom/redgeneric11"
             ],
             "translate": {
                 "x": 0,
@@ -246,17 +246,17 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/illuminorganell-r-1",
-                "mushroom-red/illuminorganell-r-2",
-                "mushroom-red/illuminorganell-r-3",
-                "mushroom-red/illuminorganell-r-4",
-                "mushroom-red/illuminorganell-r-5",
-                "mushroom-red/illuminorganell-r-6",
-                "mushroom-red/illuminorganell-r-7",
-                "mushroom-red/illuminorganell-r-8",
-                "mushroom-red/illuminorganell-r-9",
-                "mushroom-red/illuminorganell-r-10",
-                "mushroom-red/illuminorganell-r-11"
+                "trees/mushroom/redlumotall1",
+                "trees/mushroom/redlumotall2",
+                "trees/mushroom/redlumotall3",
+                "trees/mushroom/redlumotall4",
+                "trees/mushroom/redlumotall5",
+                "trees/mushroom/redlumotall6",
+                "trees/mushroom/redlumotall7",
+                "trees/mushroom/redlumotall8",
+                "trees/mushroom/redlumotall9",
+                "trees/mushroom/redlumotall10",
+                "trees/mushroom/redlumotall11"
             ],
             "translate": {
                 "x": 0,
@@ -281,17 +281,17 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/organell-b-1",
-                "mushroom-red/organell-b-2",
-                "mushroom-red/organell-r-3",
-                "mushroom-red/organell-r-4",
-                "mushroom-red/organell-r-5",
-                "mushroom-red/organell-r-6",
-                "mushroom-red/organell-r-7",
-                "mushroom-red/organell-r-8",
-                "mushroom-red/organell-r-9",
-                "mushroom-red/organell-r-10",
-                "mushroom-red/organell-r-11"
+                "trees/mushroom/browngeneric1",
+                "trees/mushroom/browngeneric2",
+                "trees/mushroom/redgeneric3",
+                "trees/mushroom/redgeneric4",
+                "trees/mushroom/redgeneric5",
+                "trees/mushroom/redgeneric6",
+                "trees/mushroom/redgeneric7",
+                "trees/mushroom/redgeneric8",
+                "trees/mushroom/redgeneric9",
+                "trees/mushroom/redgeneric10",
+                "trees/mushroom/redgeneric11"
             ],
             "translate": {
                 "x": 0,
@@ -316,11 +316,11 @@
                 "enabled": true
             },
             "place": [
-                "shroom/mushclutt1",
-                "shroom/mushclutt2",
-                "shroom/mushclutt3",
-                "shroom/mushclutt4",
-                "shroom/mushclutt5"
+                "trees/mushroom/smolshroomt1",
+                "trees/mushroom/smolshroomt2",
+                "trees/mushroom/smolshroomt3",
+                "trees/mushroom/smolshroomt4",
+                "trees/mushroom/smolshroomt5"
             ],
             "translate": {
                 "x": 0,
@@ -341,11 +341,11 @@
                 "enabled": true
             },
             "place": [
-                "shroom/mushclutt1",
-                "shroom/mushclutt2",
-                "shroom/mushclutt3",
-                "shroom/mushclutt4",
-                "shroom/mushclutt5"
+                "trees/mushroom/smolshroomt1",
+                "trees/mushroom/smolshroomt2",
+                "trees/mushroom/smolshroomt3",
+                "trees/mushroom/smolshroomt4",
+                "trees/mushroom/smolshroomt5"
             ],
             "translate": {
                 "x": 0,
diff --git a/biomes/mushroom/mus-forest.json b/biomes/mushroom/mus-forest.json
index bf368620..ea90e326 100644
--- a/biomes/mushroom/mus-forest.json
+++ b/biomes/mushroom/mus-forest.json
@@ -147,16 +147,16 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/small-organell-r-1",
-                "mushroom-red/small-organell-r-2",
-                "mushroom-red/small-organell-r-3",
-                "mushroom-red/small-organell-r-4",
-                "mushroom-red/small-organell-r-5",
-                "mushroom-red/small-organell-r-6",
-                "mushroom-red/small-organell-r-7",
-                "mushroom-red/small-organell-r-8",
-                "mushroom-red/small-organell-r-9",
-                "mushroom-red/small-organell-r-10"
+                "trees/mushroom/mushclut1",
+                "trees/mushroom/mushclut2",
+                "trees/mushroom/mushclut3",
+                "trees/mushroom/mushclut4",
+                "trees/mushroom/mushclut5",
+                "trees/mushroom/mushclut6",
+                "trees/mushroom/mushclut7",
+                "trees/mushroom/mushclut8",
+                "trees/mushroom/mushclut9",
+                "trees/mushroom/mushclut10"
             ],
             "mode": "MIN_HEIGHT",
             "translate": {
@@ -182,16 +182,16 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/small-organell-r-1",
-                "mushroom-red/small-organell-r-2",
-                "mushroom-red/small-organell-r-3",
-                "mushroom-red/small-organell-r-4",
-                "mushroom-red/small-organell-r-5",
-                "mushroom-red/small-organell-r-6",
-                "mushroom-red/small-organell-r-7",
-                "mushroom-red/small-organell-r-8",
-                "mushroom-red/small-organell-r-9",
-                "mushroom-red/small-organell-r-10"
+                "trees/mushroom/mushclut1",
+                "trees/mushroom/mushclut2",
+                "trees/mushroom/mushclut3",
+                "trees/mushroom/mushclut4",
+                "trees/mushroom/mushclut5",
+                "trees/mushroom/mushclut6",
+                "trees/mushroom/mushclut7",
+                "trees/mushroom/mushclut8",
+                "trees/mushroom/mushclut9",
+                "trees/mushroom/mushclut10"
             ],
             "mode": "MIN_HEIGHT",
             "translate": {
@@ -213,17 +213,17 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/organell-b-1",
-                "mushroom-red/organell-b-2",
-                "mushroom-red/organell-r-3",
-                "mushroom-red/organell-r-4",
-                "mushroom-red/organell-r-5",
-                "mushroom-red/organell-r-6",
-                "mushroom-red/organell-r-7",
-                "mushroom-red/organell-r-8",
-                "mushroom-red/organell-r-9",
-                "mushroom-red/organell-r-10",
-                "mushroom-red/organell-r-11"
+                "trees/mushroom/browngeneric1",
+                "trees/mushroom/browngeneric2",
+                "trees/mushroom/redgeneric3",
+                "trees/mushroom/redgeneric4",
+                "trees/mushroom/redgeneric5",
+                "trees/mushroom/redgeneric6",
+                "trees/mushroom/redgeneric7",
+                "trees/mushroom/redgeneric8",
+                "trees/mushroom/redgeneric9",
+                "trees/mushroom/redgeneric10",
+                "trees/mushroom/redgeneric11"
             ],
             "translate": {
                 "x": 0,
@@ -248,17 +248,17 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/illuminorganell-r-1",
-                "mushroom-red/illuminorganell-r-2",
-                "mushroom-red/illuminorganell-r-3",
-                "mushroom-red/illuminorganell-r-4",
-                "mushroom-red/illuminorganell-r-5",
-                "mushroom-red/illuminorganell-r-6",
-                "mushroom-red/illuminorganell-r-7",
-                "mushroom-red/illuminorganell-r-8",
-                "mushroom-red/illuminorganell-r-9",
-                "mushroom-red/illuminorganell-r-10",
-                "mushroom-red/illuminorganell-r-11"
+                "trees/mushroom/redlumotall1",
+                "trees/mushroom/redlumotall2",
+                "trees/mushroom/redlumotall3",
+                "trees/mushroom/redlumotall4",
+                "trees/mushroom/redlumotall5",
+                "trees/mushroom/redlumotall6",
+                "trees/mushroom/redlumotall7",
+                "trees/mushroom/redlumotall8",
+                "trees/mushroom/redlumotall9",
+                "trees/mushroom/redlumotall10",
+                "trees/mushroom/redlumotall11"
             ],
             "translate": {
                 "x": 0,
@@ -283,17 +283,17 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/organell-b-1",
-                "mushroom-red/organell-b-2",
-                "mushroom-red/organell-r-3",
-                "mushroom-red/organell-r-4",
-                "mushroom-red/organell-r-5",
-                "mushroom-red/organell-r-6",
-                "mushroom-red/organell-r-7",
-                "mushroom-red/organell-r-8",
-                "mushroom-red/organell-r-9",
-                "mushroom-red/organell-r-10",
-                "mushroom-red/organell-r-11"
+                "trees/mushroom/browngeneric1",
+                "trees/mushroom/browngeneric2",
+                "trees/mushroom/redgeneric3",
+                "trees/mushroom/redgeneric4",
+                "trees/mushroom/redgeneric5",
+                "trees/mushroom/redgeneric6",
+                "trees/mushroom/redgeneric7",
+                "trees/mushroom/redgeneric8",
+                "trees/mushroom/redgeneric9",
+                "trees/mushroom/redgeneric10",
+                "trees/mushroom/redgeneric11"
             ],
             "translate": {
                 "x": 0,
@@ -318,11 +318,11 @@
                 "enabled": true
             },
             "place": [
-                "shroom/mushclutt1",
-                "shroom/mushclutt2",
-                "shroom/mushclutt3",
-                "shroom/mushclutt4",
-                "shroom/mushclutt5"
+                "trees/mushroom/smolshroomt1",
+                "trees/mushroom/smolshroomt2",
+                "trees/mushroom/smolshroomt3",
+                "trees/mushroom/smolshroomt4",
+                "trees/mushroom/smolshroomt5"
             ],
             "translate": {
                 "x": 0,
@@ -343,11 +343,11 @@
                 "enabled": true
             },
             "place": [
-                "shroom/mushclutt1",
-                "shroom/mushclutt2",
-                "shroom/mushclutt3",
-                "shroom/mushclutt4",
-                "shroom/mushclutt5"
+                "trees/mushroom/smolshroomt1",
+                "trees/mushroom/smolshroomt2",
+                "trees/mushroom/smolshroomt3",
+                "trees/mushroom/smolshroomt4",
+                "trees/mushroom/smolshroomt5"
             ],
             "translate": {
                 "x": 0,
diff --git a/biomes/mushroom/mus-plains.json b/biomes/mushroom/mus-plains.json
index d5fd765a..ef78724c 100644
--- a/biomes/mushroom/mus-plains.json
+++ b/biomes/mushroom/mus-plains.json
@@ -111,16 +111,16 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/small-organell-r-1",
-                "mushroom-red/small-organell-r-2",
-                "mushroom-red/small-organell-r-3",
-                "mushroom-red/small-organell-r-4",
-                "mushroom-red/small-organell-r-5",
-                "mushroom-red/small-organell-r-6",
-                "mushroom-red/small-organell-r-7",
-                "mushroom-red/small-organell-r-8",
-                "mushroom-red/small-organell-r-9",
-                "mushroom-red/small-organell-r-10"
+                "trees/mushroom/mushclut1",
+                "trees/mushroom/mushclut2",
+                "trees/mushroom/mushclut3",
+                "trees/mushroom/mushclut4",
+                "trees/mushroom/mushclut5",
+                "trees/mushroom/mushclut6",
+                "trees/mushroom/mushclut7",
+                "trees/mushroom/mushclut8",
+                "trees/mushroom/mushclut9",
+                "trees/mushroom/mushclut10"
             ],
             "translate": {
                 "x": 0,
@@ -145,16 +145,16 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/small-organell-r-1",
-                "mushroom-red/small-organell-r-2",
-                "mushroom-red/small-organell-r-3",
-                "mushroom-red/small-organell-r-4",
-                "mushroom-red/small-organell-r-5",
-                "mushroom-red/small-organell-r-6",
-                "mushroom-red/small-organell-r-7",
-                "mushroom-red/small-organell-r-8",
-                "mushroom-red/small-organell-r-9",
-                "mushroom-red/small-organell-r-10"
+                "trees/mushroom/mushclut1",
+                "trees/mushroom/mushclut2",
+                "trees/mushroom/mushclut3",
+                "trees/mushroom/mushclut4",
+                "trees/mushroom/mushclut5",
+                "trees/mushroom/mushclut6",
+                "trees/mushroom/mushclut7",
+                "trees/mushroom/mushclut8",
+                "trees/mushroom/mushclut9",
+                "trees/mushroom/mushclut10"
             ],
             "translate": {
                 "x": 0,
@@ -179,11 +179,11 @@
                 "enabled": true
             },
             "place": [
-                "shroom/mushclutt1",
-                "shroom/mushclutt2",
-                "shroom/mushclutt3",
-                "shroom/mushclutt4",
-                "shroom/mushclutt5"
+                "trees/mushroom/smolshroomt1",
+                "trees/mushroom/smolshroomt2",
+                "trees/mushroom/smolshroomt3",
+                "trees/mushroom/smolshroomt4",
+                "trees/mushroom/smolshroomt5"
             ],
             "translate": {
                 "x": 0,
@@ -204,11 +204,11 @@
                 "enabled": true
             },
             "place": [
-                "shroom/mushclutt1",
-                "shroom/mushclutt2",
-                "shroom/mushclutt3",
-                "shroom/mushclutt4",
-                "shroom/mushclutt5"
+                "trees/mushroom/smolshroomt1",
+                "trees/mushroom/smolshroomt2",
+                "trees/mushroom/smolshroomt3",
+                "trees/mushroom/smolshroomt4",
+                "trees/mushroom/smolshroomt5"
             ],
             "translate": {
                 "x": 0,
diff --git a/biomes/mushroom/mus-warped-forest.json b/biomes/mushroom/mus-warped-forest.json
index 0e0e4570..9b56c990 100644
--- a/biomes/mushroom/mus-warped-forest.json
+++ b/biomes/mushroom/mus-warped-forest.json
@@ -107,16 +107,16 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/small-organell-r-1",
-                "mushroom-red/small-organell-r-2",
-                "mushroom-red/small-organell-r-3",
-                "mushroom-red/small-organell-r-4",
-                "mushroom-red/small-organell-r-5",
-                "mushroom-red/small-organell-r-6",
-                "mushroom-red/small-organell-r-7",
-                "mushroom-red/small-organell-r-8",
-                "mushroom-red/small-organell-r-9",
-                "mushroom-red/small-organell-r-10"
+                "trees/mushroom/mushclut1",
+                "trees/mushroom/mushclut2",
+                "trees/mushroom/mushclut3",
+                "trees/mushroom/mushclut4",
+                "trees/mushroom/mushclut5",
+                "trees/mushroom/mushclut6",
+                "trees/mushroom/mushclut7",
+                "trees/mushroom/mushclut8",
+                "trees/mushroom/mushclut9",
+                "trees/mushroom/mushclut10"
             ],
             "translate": {
                 "x": 0,
@@ -151,16 +151,16 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/small-organell-r-1",
-                "mushroom-red/small-organell-r-2",
-                "mushroom-red/small-organell-r-3",
-                "mushroom-red/small-organell-r-4",
-                "mushroom-red/small-organell-r-5",
-                "mushroom-red/small-organell-r-6",
-                "mushroom-red/small-organell-r-7",
-                "mushroom-red/small-organell-r-8",
-                "mushroom-red/small-organell-r-9",
-                "mushroom-red/small-organell-r-10"
+                "trees/mushroom/mushclut1",
+                "trees/mushroom/mushclut2",
+                "trees/mushroom/mushclut3",
+                "trees/mushroom/mushclut4",
+                "trees/mushroom/mushclut5",
+                "trees/mushroom/mushclut6",
+                "trees/mushroom/mushclut7",
+                "trees/mushroom/mushclut8",
+                "trees/mushroom/mushclut9",
+                "trees/mushroom/mushclut10"
             ],
             "translate": {
                 "x": 0,
@@ -195,18 +195,18 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/organell-r-1",
-                "mushroom-red/organell-r-2",
-                "mushroom-red/organell-b-1",
-                "mushroom-red/organell-b-2",
-                "mushroom-red/organell-r-3",
-                "mushroom-red/organell-r-4",
-                "mushroom-red/organell-r-5",
-                "mushroom-red/organell-r-6",
-                "mushroom-red/organell-r-7",
-                "mushroom-red/organell-r-8",
-                "mushroom-red/organell-r-9",
-                "mushroom-red/organell-r-10"
+                "trees/mushroom/redgeneric1",
+                "trees/mushroom/redgeneric2",
+                "trees/mushroom/browngeneric1",
+                "trees/mushroom/browngeneric2",
+                "trees/mushroom/redgeneric3",
+                "trees/mushroom/redgeneric4",
+                "trees/mushroom/redgeneric5",
+                "trees/mushroom/redgeneric6",
+                "trees/mushroom/redgeneric7",
+                "trees/mushroom/redgeneric8",
+                "trees/mushroom/redgeneric9",
+                "trees/mushroom/redgeneric10"
             ],
             "translate": {
                 "x": 0,
@@ -241,18 +241,18 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/organell-r-1",
-                "mushroom-red/organell-r-2",
-                "mushroom-red/organell-b-1",
-                "mushroom-red/organell-b-2",
-                "mushroom-red/organell-r-3",
-                "mushroom-red/organell-r-4",
-                "mushroom-red/organell-r-5",
-                "mushroom-red/organell-r-6",
-                "mushroom-red/organell-r-7",
-                "mushroom-red/organell-r-8",
-                "mushroom-red/organell-r-9",
-                "mushroom-red/organell-r-10"
+                "trees/mushroom/redgeneric1",
+                "trees/mushroom/redgeneric2",
+                "trees/mushroom/browngeneric1",
+                "trees/mushroom/browngeneric2",
+                "trees/mushroom/redgeneric3",
+                "trees/mushroom/redgeneric4",
+                "trees/mushroom/redgeneric5",
+                "trees/mushroom/redgeneric6",
+                "trees/mushroom/redgeneric7",
+                "trees/mushroom/redgeneric8",
+                "trees/mushroom/redgeneric9",
+                "trees/mushroom/redgeneric10"
             ],
             "translate": {
                 "x": 0,
@@ -287,11 +287,11 @@
                 "enabled": true
             },
             "place": [
-                "shroom/mushclutt1",
-                "shroom/mushclutt2",
-                "shroom/mushclutt3",
-                "shroom/mushclutt4",
-                "shroom/mushclutt5"
+                "trees/mushroom/smolshroomt1",
+                "trees/mushroom/smolshroomt2",
+                "trees/mushroom/smolshroomt3",
+                "trees/mushroom/smolshroomt4",
+                "trees/mushroom/smolshroomt5"
             ],
             "translate": {
                 "x": 0,
@@ -326,11 +326,11 @@
                 "enabled": true
             },
             "place": [
-                "shroom/mushclutt1",
-                "shroom/mushclutt2",
-                "shroom/mushclutt3",
-                "shroom/mushclutt4",
-                "shroom/mushclutt5"
+                "trees/mushroom/smolshroomt1",
+                "trees/mushroom/smolshroomt2",
+                "trees/mushroom/smolshroomt3",
+                "trees/mushroom/smolshroomt4",
+                "trees/mushroom/smolshroomt5"
             ],
             "translate": {
                 "x": 0,
diff --git a/biomes/ocean/oce-mus-lake.json b/biomes/ocean/oce-mus-lake.json
index 8708408f..6c237e3d 100644
--- a/biomes/ocean/oce-mus-lake.json
+++ b/biomes/ocean/oce-mus-lake.json
@@ -99,16 +99,16 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/small-organell-r-1",
-                "mushroom-red/small-organell-r-2",
-                "mushroom-red/small-organell-r-3",
-                "mushroom-red/small-organell-r-4",
-                "mushroom-red/small-organell-r-5",
-                "mushroom-red/small-organell-r-6",
-                "mushroom-red/small-organell-r-7",
-                "mushroom-red/small-organell-r-8",
-                "mushroom-red/small-organell-r-9",
-                "mushroom-red/small-organell-r-10"
+                "trees/mushroom/mushclut1",
+                "trees/mushroom/mushclut2",
+                "trees/mushroom/mushclut3",
+                "trees/mushroom/mushclut4",
+                "trees/mushroom/mushclut5",
+                "trees/mushroom/mushclut6",
+                "trees/mushroom/mushclut7",
+                "trees/mushroom/mushclut8",
+                "trees/mushroom/mushclut9",
+                "trees/mushroom/mushclut10"
             ],
             "translate": {
                 "x": 0,
@@ -133,16 +133,16 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/small-organell-r-1",
-                "mushroom-red/small-organell-r-2",
-                "mushroom-red/small-organell-r-3",
-                "mushroom-red/small-organell-r-4",
-                "mushroom-red/small-organell-r-5",
-                "mushroom-red/small-organell-r-6",
-                "mushroom-red/small-organell-r-7",
-                "mushroom-red/small-organell-r-8",
-                "mushroom-red/small-organell-r-9",
-                "mushroom-red/small-organell-r-10"
+                "trees/mushroom/mushclut1",
+                "trees/mushroom/mushclut2",
+                "trees/mushroom/mushclut3",
+                "trees/mushroom/mushclut4",
+                "trees/mushroom/mushclut5",
+                "trees/mushroom/mushclut6",
+                "trees/mushroom/mushclut7",
+                "trees/mushroom/mushclut8",
+                "trees/mushroom/mushclut9",
+                "trees/mushroom/mushclut10"
             ],
             "translate": {
                 "x": 0,
@@ -167,11 +167,11 @@
                 "enabled": true
             },
             "place": [
-                "shroom/mushclutt1",
-                "shroom/mushclutt2",
-                "shroom/mushclutt3",
-                "shroom/mushclutt4",
-                "shroom/mushclutt5"
+                "trees/mushroom/smolshroomt1",
+                "trees/mushroom/smolshroomt2",
+                "trees/mushroom/smolshroomt3",
+                "trees/mushroom/smolshroomt4",
+                "trees/mushroom/smolshroomt5"
             ],
             "translate": {
                 "x": 0,
@@ -192,11 +192,11 @@
                 "enabled": true
             },
             "place": [
-                "shroom/mushclutt1",
-                "shroom/mushclutt2",
-                "shroom/mushclutt3",
-                "shroom/mushclutt4",
-                "shroom/mushclutt5"
+                "trees/mushroom/smolshroomt1",
+                "trees/mushroom/smolshroomt2",
+                "trees/mushroom/smolshroomt3",
+                "trees/mushroom/smolshroomt4",
+                "trees/mushroom/smolshroomt5"
             ],
             "translate": {
                 "x": 0,
diff --git a/biomes/ocean/oce-mus-ocean.json b/biomes/ocean/oce-mus-ocean.json
index 2d860c91..304c406d 100644
--- a/biomes/ocean/oce-mus-ocean.json
+++ b/biomes/ocean/oce-mus-ocean.json
@@ -146,16 +146,16 @@
             },
             "underwater": true,
             "place": [
-                "lumoshroom/subnauti-1",
-                "lumoshroom/subnauti-2",
-                "lumoshroom/subnauti-3",
-                "lumoshroom/subnauti-4",
-                "lumoshroom/subnauti-5",
-                "lumoshroom/subnauti-6",
-                "lumoshroom/subnauti-7",
-                "lumoshroom/subnauti-8",
-                "lumoshroom/subnauti-9",
-                "lumoshroom/subnauti-10"
+                "trees/mushroom/lumo1",
+                "trees/mushroom/lumo2",
+                "trees/mushroom/lumo3",
+                "trees/mushroom/lumo4",
+                "trees/mushroom/lumo5",
+                "trees/mushroom/lumo6",
+                "trees/mushroom/lumo7",
+                "trees/mushroom/lumo8",
+                "trees/mushroom/lumo9",
+                "trees/mushroom/lumo10"
             ],
             "translate": {
                 "x": 0,
@@ -176,16 +176,16 @@
             },
             "underwater": true,
             "place": [
-                "lumoshroom/subnauti-1",
-                "lumoshroom/subnauti-2",
-                "lumoshroom/subnauti-3",
-                "lumoshroom/subnauti-4",
-                "lumoshroom/subnauti-5",
-                "lumoshroom/subnauti-6",
-                "lumoshroom/subnauti-7",
-                "lumoshroom/subnauti-8",
-                "lumoshroom/subnauti-9",
-                "lumoshroom/subnauti-10"
+                "trees/mushroom/lumo1",
+                "trees/mushroom/lumo2",
+                "trees/mushroom/lumo3",
+                "trees/mushroom/lumo4",
+                "trees/mushroom/lumo5",
+                "trees/mushroom/lumo6",
+                "trees/mushroom/lumo7",
+                "trees/mushroom/lumo8",
+                "trees/mushroom/lumo9",
+                "trees/mushroom/lumo10"
             ],
             "translate": {
                 "x": 0,
diff --git a/biomes/swamp/swa-roofed-forest.json b/biomes/swamp/swa-roofed-forest.json
index 1a2162ac..4c43ec1f 100644
--- a/biomes/swamp/swa-roofed-forest.json
+++ b/biomes/swamp/swa-roofed-forest.json
@@ -162,17 +162,17 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/organell-b-1",
-                "mushroom-red/organell-b-2",
-                "mushroom-red/organell-r-3",
-                "mushroom-red/organell-r-4",
-                "mushroom-red/organell-r-5",
-                "mushroom-red/organell-r-6",
-                "mushroom-red/organell-r-7",
-                "mushroom-red/organell-r-8",
-                "mushroom-red/organell-r-9",
-                "mushroom-red/organell-r-10",
-                "mushroom-red/organell-r-11"
+                "trees/mushroom/browngeneric1",
+                "trees/mushroom/browngeneric2",
+                "trees/mushroom/redgeneric3",
+                "trees/mushroom/redgeneric4",
+                "trees/mushroom/redgeneric5",
+                "trees/mushroom/redgeneric6",
+                "trees/mushroom/redgeneric7",
+                "trees/mushroom/redgeneric8",
+                "trees/mushroom/redgeneric9",
+                "trees/mushroom/redgeneric10",
+                "trees/mushroom/redgeneric11"
             ],
             "translate": {
                 "x": 0,
@@ -197,17 +197,17 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/organell-b-1",
-                "mushroom-red/organell-b-2",
-                "mushroom-red/organell-r-3",
-                "mushroom-red/organell-r-4",
-                "mushroom-red/organell-r-5",
-                "mushroom-red/organell-r-6",
-                "mushroom-red/organell-r-7",
-                "mushroom-red/organell-r-8",
-                "mushroom-red/organell-r-9",
-                "mushroom-red/organell-r-10",
-                "mushroom-red/organell-r-11"
+                "trees/mushroom/browngeneric1",
+                "trees/mushroom/browngeneric2",
+                "trees/mushroom/redgeneric3",
+                "trees/mushroom/redgeneric4",
+                "trees/mushroom/redgeneric5",
+                "trees/mushroom/redgeneric6",
+                "trees/mushroom/redgeneric7",
+                "trees/mushroom/redgeneric8",
+                "trees/mushroom/redgeneric9",
+                "trees/mushroom/redgeneric10",
+                "trees/mushroom/redgeneric11"
             ],
             "translate": {
                 "x": 0,
diff --git a/biomes/swamp/swa-roofed-wayward.json b/biomes/swamp/swa-roofed-wayward.json
index 4802bac8..be5538a1 100644
--- a/biomes/swamp/swa-roofed-wayward.json
+++ b/biomes/swamp/swa-roofed-wayward.json
@@ -189,17 +189,17 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/organell-b-1",
-                "mushroom-red/organell-b-2",
-                "mushroom-red/small-organell-r-3",
-                "mushroom-red/small-organell-r-4",
-                "mushroom-red/small-organell-r-5",
-                "mushroom-red/small-organell-r-6",
-                "mushroom-red/small-organell-r-7",
-                "mushroom-red/small-organell-r-8",
-                "mushroom-red/small-organell-r-9",
-                "mushroom-red/small-organell-r-10",
-                "mushroom-red/organell-r-11"
+                "trees/mushroom/browngeneric1",
+                "trees/mushroom/browngeneric2",
+                "trees/mushroom/mushclut3",
+                "trees/mushroom/mushclut4",
+                "trees/mushroom/mushclut5",
+                "trees/mushroom/mushclut6",
+                "trees/mushroom/mushclut7",
+                "trees/mushroom/mushclut8",
+                "trees/mushroom/mushclut9",
+                "trees/mushroom/mushclut10",
+                "trees/mushroom/redgeneric11"
             ],
             "translate": {
                 "x": 0,
@@ -224,17 +224,17 @@
                 "enabled": true
             },
             "place": [
-                "mushroom-red/organell-b-1",
-                "mushroom-red/organell-b-2",
-                "mushroom-red/small-organell-r-3",
-                "mushroom-red/small-organell-r-4",
-                "mushroom-red/small-organell-r-5",
-                "mushroom-red/small-organell-r-6",
-                "mushroom-red/small-organell-r-7",
-                "mushroom-red/small-organell-r-8",
-                "mushroom-red/small-organell-r-9",
-                "mushroom-red/small-organell-r-10",
-                "mushroom-red/organell-r-11"
+                "trees/mushroom/browngeneric1",
+                "trees/mushroom/browngeneric2",
+                "trees/mushroom/mushclut3",
+                "trees/mushroom/mushclut4",
+                "trees/mushroom/mushclut5",
+                "trees/mushroom/mushclut6",
+                "trees/mushroom/mushclut7",
+                "trees/mushroom/mushclut8",
+                "trees/mushroom/mushclut9",
+                "trees/mushroom/mushclut10",
+                "trees/mushroom/redgeneric11"
             ],
             "translate": {
                 "x": 0,