diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 71d65cd8..236b614f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,10 +12,10 @@ jobs:
           fetch-depth: 0
           fetch-tags: true
 
-      - name: Setup JDK 21
+      - name: Setup JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
+          java-version: '17'
           distribution: 'temurin'
 
       - name: Build with Gradle
diff --git a/build.gradle b/build.gradle
index 590417d9..fd81b415 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,16 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.133'
+    id 'net.neoforged.gradle.userdev' version '7.0.145'
+}
+
+tasks.named('wrapper', Wrapper).configure {
+    // Define wrapper values here so as to not have to always do so when updating gradlew.properties.
+    // Switching this to Wrapper.DistributionType.ALL will download the full gradle sources that comes with
+    // documentation attached on cursor hover of gradle classes and methods. However, this comes with increased
+    // file size for Gradle. If you do switch this to ALL, run the Gradle wrapper task twice afterwards.
+    // (Verify by checking gradle/wrapper/gradle-wrapper.properties to see if distributionUrl now points to `-all`)
+    distributionType = Wrapper.DistributionType.BIN
 }
 
 version = mod_version
@@ -11,15 +20,6 @@ group = mod_group_id
 
 repositories {
     mavenLocal()
-
-    maven {
-        name = "Jared's maven"
-        url = "https://maven.blamejared.com/"
-    }
-    maven {
-        name = "ModMaven"
-        url = "https://modmaven.dev"
-    }
 }
 
 base {
diff --git a/gradle.properties b/gradle.properties
index 39279657..f7e54392 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,16 +6,16 @@ org.gradle.debug=false
 # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
 neogradle.subsystems.parchment.minecraftVersion=1.20.6
 neogradle.subsystems.parchment.mappingsVersion=2024.05.01
-minecraft_version=1.20.6
-minecraft_version_range=[1.20.6]
-neo_version=20.6.80-beta
-neo_version_range=[20.6,)
-loader_version_range=[2,)
-jei_version=17.3.0.51
+minecraft_version=1.21
+minecraft_version_range=[1.21,1.21.1)
+neo_version=21.0.42-beta
+neo_version_range=[21.0.42-beta,)
+loader_version_range=[4,)
+jei_version=19.0.0.11
 mod_id=jafohana
 mod_name=Just a Few Ohana
 mod_license=LGPL-3.0
-mod_version=9.0.3
+mod_version=10.0.0
 mod_group_id=com.github.mechalopa.jafohana
 mod_authors=Mechalopa
 mod_description=More new flowers.
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd491..e6441136 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/src/main/java/com/github/mechalopa/jafohana/util/ModTags.java b/src/main/java/com/github/mechalopa/jafohana/util/ModTags.java
index f164ca85..38021e5d 100644
--- a/src/main/java/com/github/mechalopa/jafohana/util/ModTags.java
+++ b/src/main/java/com/github/mechalopa/jafohana/util/ModTags.java
@@ -28,11 +28,11 @@ public static final class EntityTypeTags
 
 	private static TagKey<Block> createBlockTag(String name)
 	{
-		return TagKey.create(Registries.BLOCK, new ResourceLocation(JAFOhana.MODID, name));
+		return TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(JAFOhana.MODID, name));
 	}
 
 	private static TagKey<EntityType<?>> createEntityTypeTag(String name)
 	{
-		return TagKey.create(Registries.ENTITY_TYPE, new ResourceLocation(JAFOhana.MODID, name));
+		return TagKey.create(Registries.ENTITY_TYPE, ResourceLocation.fromNamespaceAndPath(JAFOhana.MODID, name));
 	}
 }
\ No newline at end of file
diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml
index 9b18f5e7..33a312a7 100644
--- a/src/main/resources/META-INF/neoforge.mods.toml
+++ b/src/main/resources/META-INF/neoforge.mods.toml
@@ -6,7 +6,7 @@ issueTrackerURL="https://github.com/Mechalopa/Just-a-Few-Ohana/issues"
 modId="${mod_id}"
 version="${mod_version}"
 displayName="${mod_name}"
-updateJSONURL="https://github.com/Mechalopa/Just-a-Few-Ohana/raw/neoforge-1.20.4/update.json"
+updateJSONURL="https://github.com/Mechalopa/Just-a-Few-Ohana/raw/neoforge-1.21/update.json"
 displayURL="https://www.curseforge.com/minecraft/mc-mods/just-a-few-ohana"
 #logoFile="logo.png"
 credits="${mod_authors}"
diff --git a/src/main/resources/data/buzzier_bees/tags/blocks/flower_blacklist.json b/src/main/resources/data/buzzier_bees/tags/block/flower_blacklist.json
similarity index 100%
rename from src/main/resources/data/buzzier_bees/tags/blocks/flower_blacklist.json
rename to src/main/resources/data/buzzier_bees/tags/block/flower_blacklist.json
diff --git a/src/main/resources/data/enchanted/tags/blocks/mutandis_blacklist_plants.json b/src/main/resources/data/enchanted/tags/block/mutandis_blacklist_plants.json
similarity index 100%
rename from src/main/resources/data/enchanted/tags/blocks/mutandis_blacklist_plants.json
rename to src/main/resources/data/enchanted/tags/block/mutandis_blacklist_plants.json
diff --git a/src/main/resources/data/evilcraft/tags/items/poisonous.json b/src/main/resources/data/evilcraft/tags/item/poisonous.json
similarity index 100%
rename from src/main/resources/data/evilcraft/tags/items/poisonous.json
rename to src/main/resources/data/evilcraft/tags/item/poisonous.json
diff --git a/src/main/resources/data/jafohana/loot_tables/additions/chests/ancient_city.json b/src/main/resources/data/jafohana/loot_table/additions/chests/ancient_city.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/additions/chests/ancient_city.json
rename to src/main/resources/data/jafohana/loot_table/additions/chests/ancient_city.json
diff --git a/src/main/resources/data/jafohana/loot_tables/additions/chests/ancient_city_ice_box.json b/src/main/resources/data/jafohana/loot_table/additions/chests/ancient_city_ice_box.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/additions/chests/ancient_city_ice_box.json
rename to src/main/resources/data/jafohana/loot_table/additions/chests/ancient_city_ice_box.json
diff --git a/src/main/resources/data/jafohana/loot_tables/additions/chests/buried_treasure.json b/src/main/resources/data/jafohana/loot_table/additions/chests/buried_treasure.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/additions/chests/buried_treasure.json
rename to src/main/resources/data/jafohana/loot_table/additions/chests/buried_treasure.json
diff --git a/src/main/resources/data/jafohana/loot_tables/additions/chests/igloo_chest.json b/src/main/resources/data/jafohana/loot_table/additions/chests/igloo_chest.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/additions/chests/igloo_chest.json
rename to src/main/resources/data/jafohana/loot_table/additions/chests/igloo_chest.json
diff --git a/src/main/resources/data/jafohana/loot_tables/additions/chests/jungle_temple.json b/src/main/resources/data/jafohana/loot_table/additions/chests/jungle_temple.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/additions/chests/jungle_temple.json
rename to src/main/resources/data/jafohana/loot_table/additions/chests/jungle_temple.json
diff --git a/src/main/resources/data/jafohana/loot_tables/additions/chests/pillager_outpost.json b/src/main/resources/data/jafohana/loot_table/additions/chests/pillager_outpost.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/additions/chests/pillager_outpost.json
rename to src/main/resources/data/jafohana/loot_table/additions/chests/pillager_outpost.json
diff --git a/src/main/resources/data/jafohana/loot_tables/additions/chests/stronghold_corridor.json b/src/main/resources/data/jafohana/loot_table/additions/chests/stronghold_corridor.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/additions/chests/stronghold_corridor.json
rename to src/main/resources/data/jafohana/loot_table/additions/chests/stronghold_corridor.json
diff --git a/src/main/resources/data/jafohana/loot_tables/additions/chests/stronghold_crossing.json b/src/main/resources/data/jafohana/loot_table/additions/chests/stronghold_crossing.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/additions/chests/stronghold_crossing.json
rename to src/main/resources/data/jafohana/loot_table/additions/chests/stronghold_crossing.json
diff --git a/src/main/resources/data/jafohana/loot_tables/additions/chests/village/village_plains_house.json b/src/main/resources/data/jafohana/loot_table/additions/chests/village/village_plains_house.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/additions/chests/village/village_plains_house.json
rename to src/main/resources/data/jafohana/loot_table/additions/chests/village/village_plains_house.json
diff --git a/src/main/resources/data/jafohana/loot_tables/additions/chests/village/village_savanna_house.json b/src/main/resources/data/jafohana/loot_table/additions/chests/village/village_savanna_house.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/additions/chests/village/village_savanna_house.json
rename to src/main/resources/data/jafohana/loot_table/additions/chests/village/village_savanna_house.json
diff --git a/src/main/resources/data/jafohana/loot_tables/additions/chests/village/village_snowy_house.json b/src/main/resources/data/jafohana/loot_table/additions/chests/village/village_snowy_house.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/additions/chests/village/village_snowy_house.json
rename to src/main/resources/data/jafohana/loot_table/additions/chests/village/village_snowy_house.json
diff --git a/src/main/resources/data/jafohana/loot_tables/additions/chests/village/village_taiga_house.json b/src/main/resources/data/jafohana/loot_table/additions/chests/village/village_taiga_house.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/additions/chests/village/village_taiga_house.json
rename to src/main/resources/data/jafohana/loot_table/additions/chests/village/village_taiga_house.json
diff --git a/src/main/resources/data/jafohana/loot_tables/additions/chests/woodland_mansion.json b/src/main/resources/data/jafohana/loot_table/additions/chests/woodland_mansion.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/additions/chests/woodland_mansion.json
rename to src/main/resources/data/jafohana/loot_table/additions/chests/woodland_mansion.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/alpine_ragwort.json b/src/main/resources/data/jafohana/loot_table/blocks/alpine_ragwort.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/alpine_ragwort.json
rename to src/main/resources/data/jafohana/loot_table/blocks/alpine_ragwort.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/bells_of_ireland.json b/src/main/resources/data/jafohana/loot_table/blocks/bells_of_ireland.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/bells_of_ireland.json
rename to src/main/resources/data/jafohana/loot_table/blocks/bells_of_ireland.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/bird_of_paradise.json b/src/main/resources/data/jafohana/loot_table/blocks/bird_of_paradise.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/bird_of_paradise.json
rename to src/main/resources/data/jafohana/loot_table/blocks/bird_of_paradise.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/black_bat_flower.json b/src/main/resources/data/jafohana/loot_table/blocks/black_bat_flower.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/black_bat_flower.json
rename to src/main/resources/data/jafohana/loot_table/blocks/black_bat_flower.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/black_tulip.json b/src/main/resources/data/jafohana/loot_table/blocks/black_tulip.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/black_tulip.json
rename to src/main/resources/data/jafohana/loot_table/blocks/black_tulip.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/blood_red_iris.json b/src/main/resources/data/jafohana/loot_table/blocks/blood_red_iris.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/blood_red_iris.json
rename to src/main/resources/data/jafohana/loot_table/blocks/blood_red_iris.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/blue_daisy.json b/src/main/resources/data/jafohana/loot_table/blocks/blue_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/blue_daisy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/blue_daisy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/bluebell.json b/src/main/resources/data/jafohana/loot_table/blocks/bluebell.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/bluebell.json
rename to src/main/resources/data/jafohana/loot_table/blocks/bluebell.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/brazilian_plume.json b/src/main/resources/data/jafohana/loot_table/blocks/brazilian_plume.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/brazilian_plume.json
rename to src/main/resources/data/jafohana/loot_table/blocks/brazilian_plume.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/creepansy.json b/src/main/resources/data/jafohana/loot_table/blocks/creepansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/creepansy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/creepansy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/crimson_clover.json b/src/main/resources/data/jafohana/loot_table/blocks/crimson_clover.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/crimson_clover.json
rename to src/main/resources/data/jafohana/loot_table/blocks/crimson_clover.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/dancing_ladies_ginger.json b/src/main/resources/data/jafohana/loot_table/blocks/dancing_ladies_ginger.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/dancing_ladies_ginger.json
rename to src/main/resources/data/jafohana/loot_table/blocks/dancing_ladies_ginger.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/dayflower.json b/src/main/resources/data/jafohana/loot_table/blocks/dayflower.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/dayflower.json
rename to src/main/resources/data/jafohana/loot_table/blocks/dayflower.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/evening_primrose.json b/src/main/resources/data/jafohana/loot_table/blocks/evening_primrose.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/evening_primrose.json
rename to src/main/resources/data/jafohana/loot_table/blocks/evening_primrose.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/fasciated_dandelion.json b/src/main/resources/data/jafohana/loot_table/blocks/fasciated_dandelion.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/fasciated_dandelion.json
rename to src/main/resources/data/jafohana/loot_table/blocks/fasciated_dandelion.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/fasciated_oxeye_daisy.json b/src/main/resources/data/jafohana/loot_table/blocks/fasciated_oxeye_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/fasciated_oxeye_daisy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/fasciated_oxeye_daisy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/fireball_lily.json b/src/main/resources/data/jafohana/loot_table/blocks/fireball_lily.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/fireball_lily.json
rename to src/main/resources/data/jafohana/loot_table/blocks/fireball_lily.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/fireweed.json b/src/main/resources/data/jafohana/loot_table/blocks/fireweed.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/fireweed.json
rename to src/main/resources/data/jafohana/loot_table/blocks/fireweed.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/forget_me_not.json b/src/main/resources/data/jafohana/loot_table/blocks/forget_me_not.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/forget_me_not.json
rename to src/main/resources/data/jafohana/loot_table/blocks/forget_me_not.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/gloriosa.json b/src/main/resources/data/jafohana/loot_table/blocks/gloriosa.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/gloriosa.json
rename to src/main/resources/data/jafohana/loot_table/blocks/gloriosa.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/green_tulip.json b/src/main/resources/data/jafohana/loot_table/blocks/green_tulip.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/green_tulip.json
rename to src/main/resources/data/jafohana/loot_table/blocks/green_tulip.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/jade_vine.json b/src/main/resources/data/jafohana/loot_table/blocks/jade_vine.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/jade_vine.json
rename to src/main/resources/data/jafohana/loot_table/blocks/jade_vine.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/magenta_spotted_bellflower.json b/src/main/resources/data/jafohana/loot_table/blocks/magenta_spotted_bellflower.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/magenta_spotted_bellflower.json
rename to src/main/resources/data/jafohana/loot_table/blocks/magenta_spotted_bellflower.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/milk_vetch.json b/src/main/resources/data/jafohana/loot_table/blocks/milk_vetch.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/milk_vetch.json
rename to src/main/resources/data/jafohana/loot_table/blocks/milk_vetch.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/oakleaf_hydrangea.json b/src/main/resources/data/jafohana/loot_table/blocks/oakleaf_hydrangea.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/oakleaf_hydrangea.json
rename to src/main/resources/data/jafohana/loot_table/blocks/oakleaf_hydrangea.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/orange_marigold.json b/src/main/resources/data/jafohana/loot_table/blocks/orange_marigold.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/orange_marigold.json
rename to src/main/resources/data/jafohana/loot_table/blocks/orange_marigold.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/orange_spider_lily.json b/src/main/resources/data/jafohana/loot_table/blocks/orange_spider_lily.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/orange_spider_lily.json
rename to src/main/resources/data/jafohana/loot_table/blocks/orange_spider_lily.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/pink_african_daisy.json b/src/main/resources/data/jafohana/loot_table/blocks/pink_african_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/pink_african_daisy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/pink_african_daisy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/pink_snapdragon.json b/src/main/resources/data/jafohana/loot_table/blocks/pink_snapdragon.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/pink_snapdragon.json
rename to src/main/resources/data/jafohana/loot_table/blocks/pink_snapdragon.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_bells_of_ireland.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_bells_of_ireland.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_bells_of_ireland.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_bells_of_ireland.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_black_tulip.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_black_tulip.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_black_tulip.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_black_tulip.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_blood_red_iris.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_blood_red_iris.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_blood_red_iris.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_blood_red_iris.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_blue_daisy.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_blue_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_blue_daisy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_blue_daisy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_bluebell.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_bluebell.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_bluebell.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_bluebell.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_creepansy.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_creepansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_creepansy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_creepansy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_crimson_clover.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_crimson_clover.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_crimson_clover.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_crimson_clover.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_dancing_ladies_ginger.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_dancing_ladies_ginger.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_dancing_ladies_ginger.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_dancing_ladies_ginger.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_dayflower.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_dayflower.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_dayflower.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_dayflower.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_evening_primrose.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_evening_primrose.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_evening_primrose.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_evening_primrose.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_fireball_lily.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_fireball_lily.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_fireball_lily.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_fireball_lily.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_forget_me_not.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_forget_me_not.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_forget_me_not.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_forget_me_not.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_green_tulip.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_green_tulip.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_green_tulip.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_green_tulip.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_magenta_spotted_bellflower.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_magenta_spotted_bellflower.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_magenta_spotted_bellflower.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_magenta_spotted_bellflower.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_milk_vetch.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_milk_vetch.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_milk_vetch.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_milk_vetch.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_orange_spider_lily.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_orange_spider_lily.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_orange_spider_lily.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_orange_spider_lily.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_pink_african_daisy.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_pink_african_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_pink_african_daisy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_pink_african_daisy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_pink_snapdragon.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_pink_snapdragon.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_pink_snapdragon.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_pink_snapdragon.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_purple_pansy.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_purple_pansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_purple_pansy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_purple_pansy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_red_snapdragon.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_red_snapdragon.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_red_snapdragon.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_red_snapdragon.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_red_spider_lily.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_red_spider_lily.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_red_spider_lily.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_red_spider_lily.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_snowdrop.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_snowdrop.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_snowdrop.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_snowdrop.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_spathiphyllum.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_spathiphyllum.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_spathiphyllum.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_spathiphyllum.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_wheel_lily.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_wheel_lily.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_wheel_lily.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_wheel_lily.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_white_african_daisy.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_white_african_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_white_african_daisy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_white_african_daisy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_white_egret_orchid.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_white_egret_orchid.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_white_egret_orchid.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_white_egret_orchid.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_white_pansy.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_white_pansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_white_pansy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_white_pansy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_white_spotted_bellflower.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_white_spotted_bellflower.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_white_spotted_bellflower.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_white_spotted_bellflower.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_winter_heath.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_winter_heath.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_winter_heath.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_winter_heath.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_yellow_african_daisy.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_yellow_african_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_yellow_african_daisy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_yellow_african_daisy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_yellow_pansy.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_yellow_pansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_yellow_pansy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_yellow_pansy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/potted_yellow_snapdragon.json b/src/main/resources/data/jafohana/loot_table/blocks/potted_yellow_snapdragon.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/potted_yellow_snapdragon.json
rename to src/main/resources/data/jafohana/loot_table/blocks/potted_yellow_snapdragon.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/purple_pansy.json b/src/main/resources/data/jafohana/loot_table/blocks/purple_pansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/purple_pansy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/purple_pansy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/red_snapdragon.json b/src/main/resources/data/jafohana/loot_table/blocks/red_snapdragon.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/red_snapdragon.json
rename to src/main/resources/data/jafohana/loot_table/blocks/red_snapdragon.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/red_spider_lily.json b/src/main/resources/data/jafohana/loot_table/blocks/red_spider_lily.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/red_spider_lily.json
rename to src/main/resources/data/jafohana/loot_table/blocks/red_spider_lily.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/snowdrop.json b/src/main/resources/data/jafohana/loot_table/blocks/snowdrop.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/snowdrop.json
rename to src/main/resources/data/jafohana/loot_table/blocks/snowdrop.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/spathiphyllum.json b/src/main/resources/data/jafohana/loot_table/blocks/spathiphyllum.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/spathiphyllum.json
rename to src/main/resources/data/jafohana/loot_table/blocks/spathiphyllum.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/tatarian_aster.json b/src/main/resources/data/jafohana/loot_table/blocks/tatarian_aster.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/tatarian_aster.json
rename to src/main/resources/data/jafohana/loot_table/blocks/tatarian_aster.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/wheel_lily.json b/src/main/resources/data/jafohana/loot_table/blocks/wheel_lily.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/wheel_lily.json
rename to src/main/resources/data/jafohana/loot_table/blocks/wheel_lily.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/white_african_daisy.json b/src/main/resources/data/jafohana/loot_table/blocks/white_african_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/white_african_daisy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/white_african_daisy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/white_egret_orchid.json b/src/main/resources/data/jafohana/loot_table/blocks/white_egret_orchid.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/white_egret_orchid.json
rename to src/main/resources/data/jafohana/loot_table/blocks/white_egret_orchid.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/white_pansy.json b/src/main/resources/data/jafohana/loot_table/blocks/white_pansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/white_pansy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/white_pansy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/white_spotted_bellflower.json b/src/main/resources/data/jafohana/loot_table/blocks/white_spotted_bellflower.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/white_spotted_bellflower.json
rename to src/main/resources/data/jafohana/loot_table/blocks/white_spotted_bellflower.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/winter_heath.json b/src/main/resources/data/jafohana/loot_table/blocks/winter_heath.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/winter_heath.json
rename to src/main/resources/data/jafohana/loot_table/blocks/winter_heath.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/worsleya.json b/src/main/resources/data/jafohana/loot_table/blocks/worsleya.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/worsleya.json
rename to src/main/resources/data/jafohana/loot_table/blocks/worsleya.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/yellow_african_daisy.json b/src/main/resources/data/jafohana/loot_table/blocks/yellow_african_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/yellow_african_daisy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/yellow_african_daisy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/yellow_marigold.json b/src/main/resources/data/jafohana/loot_table/blocks/yellow_marigold.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/yellow_marigold.json
rename to src/main/resources/data/jafohana/loot_table/blocks/yellow_marigold.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/yellow_pansy.json b/src/main/resources/data/jafohana/loot_table/blocks/yellow_pansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/yellow_pansy.json
rename to src/main/resources/data/jafohana/loot_table/blocks/yellow_pansy.json
diff --git a/src/main/resources/data/jafohana/loot_tables/blocks/yellow_snapdragon.json b/src/main/resources/data/jafohana/loot_table/blocks/yellow_snapdragon.json
similarity index 100%
rename from src/main/resources/data/jafohana/loot_tables/blocks/yellow_snapdragon.json
rename to src/main/resources/data/jafohana/loot_table/blocks/yellow_snapdragon.json
diff --git a/src/main/resources/data/jafohana/recipes/black_dye_from_black_bat_flower.json b/src/main/resources/data/jafohana/recipe/black_dye_from_black_bat_flower.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/black_dye_from_black_bat_flower.json
rename to src/main/resources/data/jafohana/recipe/black_dye_from_black_bat_flower.json
diff --git a/src/main/resources/data/jafohana/recipes/black_dye_from_black_tulip.json b/src/main/resources/data/jafohana/recipe/black_dye_from_black_tulip.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/black_dye_from_black_tulip.json
rename to src/main/resources/data/jafohana/recipe/black_dye_from_black_tulip.json
diff --git a/src/main/resources/data/jafohana/recipes/blue_dye_from_bluebell.json b/src/main/resources/data/jafohana/recipe/blue_dye_from_bluebell.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/blue_dye_from_bluebell.json
rename to src/main/resources/data/jafohana/recipe/blue_dye_from_bluebell.json
diff --git a/src/main/resources/data/jafohana/recipes/blue_dye_from_dayflower.json b/src/main/resources/data/jafohana/recipe/blue_dye_from_dayflower.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/blue_dye_from_dayflower.json
rename to src/main/resources/data/jafohana/recipe/blue_dye_from_dayflower.json
diff --git a/src/main/resources/data/jafohana/recipes/cyan_dye_from_jade_vine.json b/src/main/resources/data/jafohana/recipe/cyan_dye_from_jade_vine.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/cyan_dye_from_jade_vine.json
rename to src/main/resources/data/jafohana/recipe/cyan_dye_from_jade_vine.json
diff --git a/src/main/resources/data/jafohana/recipes/green_dye_from_creepansy.json b/src/main/resources/data/jafohana/recipe/green_dye_from_creepansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/green_dye_from_creepansy.json
rename to src/main/resources/data/jafohana/recipe/green_dye_from_creepansy.json
diff --git a/src/main/resources/data/jafohana/recipes/gunpowder_from_creepansy.json b/src/main/resources/data/jafohana/recipe/gunpowder_from_creepansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/gunpowder_from_creepansy.json
rename to src/main/resources/data/jafohana/recipe/gunpowder_from_creepansy.json
diff --git a/src/main/resources/data/jafohana/recipes/light_blue_dye_from_blue_daisy.json b/src/main/resources/data/jafohana/recipe/light_blue_dye_from_blue_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/light_blue_dye_from_blue_daisy.json
rename to src/main/resources/data/jafohana/recipe/light_blue_dye_from_blue_daisy.json
diff --git a/src/main/resources/data/jafohana/recipes/light_blue_dye_from_forget_me_not.json b/src/main/resources/data/jafohana/recipe/light_blue_dye_from_forget_me_not.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/light_blue_dye_from_forget_me_not.json
rename to src/main/resources/data/jafohana/recipe/light_blue_dye_from_forget_me_not.json
diff --git a/src/main/resources/data/jafohana/recipes/light_gray_dye_from_fasciated_oxeye_daisy.json b/src/main/resources/data/jafohana/recipe/light_gray_dye_from_fasciated_oxeye_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/light_gray_dye_from_fasciated_oxeye_daisy.json
rename to src/main/resources/data/jafohana/recipe/light_gray_dye_from_fasciated_oxeye_daisy.json
diff --git a/src/main/resources/data/jafohana/recipes/light_gray_dye_from_spathiphyllum.json b/src/main/resources/data/jafohana/recipe/light_gray_dye_from_spathiphyllum.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/light_gray_dye_from_spathiphyllum.json
rename to src/main/resources/data/jafohana/recipe/light_gray_dye_from_spathiphyllum.json
diff --git a/src/main/resources/data/jafohana/recipes/light_gray_dye_from_white_pansy.json b/src/main/resources/data/jafohana/recipe/light_gray_dye_from_white_pansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/light_gray_dye_from_white_pansy.json
rename to src/main/resources/data/jafohana/recipe/light_gray_dye_from_white_pansy.json
diff --git a/src/main/resources/data/jafohana/recipes/lime_dye_from_bells_of_ireland.json b/src/main/resources/data/jafohana/recipe/lime_dye_from_bells_of_ireland.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/lime_dye_from_bells_of_ireland.json
rename to src/main/resources/data/jafohana/recipe/lime_dye_from_bells_of_ireland.json
diff --git a/src/main/resources/data/jafohana/recipes/lime_dye_from_green_tulip.json b/src/main/resources/data/jafohana/recipe/lime_dye_from_green_tulip.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/lime_dye_from_green_tulip.json
rename to src/main/resources/data/jafohana/recipe/lime_dye_from_green_tulip.json
diff --git a/src/main/resources/data/jafohana/recipes/magenta_dye_from_dancing_ladies_ginger.json b/src/main/resources/data/jafohana/recipe/magenta_dye_from_dancing_ladies_ginger.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/magenta_dye_from_dancing_ladies_ginger.json
rename to src/main/resources/data/jafohana/recipe/magenta_dye_from_dancing_ladies_ginger.json
diff --git a/src/main/resources/data/jafohana/recipes/magenta_dye_from_fireweed.json b/src/main/resources/data/jafohana/recipe/magenta_dye_from_fireweed.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/magenta_dye_from_fireweed.json
rename to src/main/resources/data/jafohana/recipe/magenta_dye_from_fireweed.json
diff --git a/src/main/resources/data/jafohana/recipes/magenta_dye_from_magenta_spotted_bellflower.json b/src/main/resources/data/jafohana/recipe/magenta_dye_from_magenta_spotted_bellflower.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/magenta_dye_from_magenta_spotted_bellflower.json
rename to src/main/resources/data/jafohana/recipe/magenta_dye_from_magenta_spotted_bellflower.json
diff --git a/src/main/resources/data/jafohana/recipes/magenta_dye_from_winter_heath.json b/src/main/resources/data/jafohana/recipe/magenta_dye_from_winter_heath.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/magenta_dye_from_winter_heath.json
rename to src/main/resources/data/jafohana/recipe/magenta_dye_from_winter_heath.json
diff --git a/src/main/resources/data/jafohana/recipes/orange_dye_from_bird_of_paradise.json b/src/main/resources/data/jafohana/recipe/orange_dye_from_bird_of_paradise.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/orange_dye_from_bird_of_paradise.json
rename to src/main/resources/data/jafohana/recipe/orange_dye_from_bird_of_paradise.json
diff --git a/src/main/resources/data/jafohana/recipes/orange_dye_from_gloriosa.json b/src/main/resources/data/jafohana/recipe/orange_dye_from_gloriosa.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/orange_dye_from_gloriosa.json
rename to src/main/resources/data/jafohana/recipe/orange_dye_from_gloriosa.json
diff --git a/src/main/resources/data/jafohana/recipes/orange_dye_from_orange_marigold.json b/src/main/resources/data/jafohana/recipe/orange_dye_from_orange_marigold.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/orange_dye_from_orange_marigold.json
rename to src/main/resources/data/jafohana/recipe/orange_dye_from_orange_marigold.json
diff --git a/src/main/resources/data/jafohana/recipes/orange_dye_from_orange_spider_lily.json b/src/main/resources/data/jafohana/recipe/orange_dye_from_orange_spider_lily.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/orange_dye_from_orange_spider_lily.json
rename to src/main/resources/data/jafohana/recipe/orange_dye_from_orange_spider_lily.json
diff --git a/src/main/resources/data/jafohana/recipes/orange_dye_from_wheel_lily.json b/src/main/resources/data/jafohana/recipe/orange_dye_from_wheel_lily.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/orange_dye_from_wheel_lily.json
rename to src/main/resources/data/jafohana/recipe/orange_dye_from_wheel_lily.json
diff --git a/src/main/resources/data/jafohana/recipes/pink_dye_from_brazilian_plume.json b/src/main/resources/data/jafohana/recipe/pink_dye_from_brazilian_plume.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/pink_dye_from_brazilian_plume.json
rename to src/main/resources/data/jafohana/recipe/pink_dye_from_brazilian_plume.json
diff --git a/src/main/resources/data/jafohana/recipes/pink_dye_from_milk_vetch.json b/src/main/resources/data/jafohana/recipe/pink_dye_from_milk_vetch.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/pink_dye_from_milk_vetch.json
rename to src/main/resources/data/jafohana/recipe/pink_dye_from_milk_vetch.json
diff --git a/src/main/resources/data/jafohana/recipes/pink_dye_from_pink_african_daisy.json b/src/main/resources/data/jafohana/recipe/pink_dye_from_pink_african_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/pink_dye_from_pink_african_daisy.json
rename to src/main/resources/data/jafohana/recipe/pink_dye_from_pink_african_daisy.json
diff --git a/src/main/resources/data/jafohana/recipes/pink_dye_from_pink_snapdragon.json b/src/main/resources/data/jafohana/recipe/pink_dye_from_pink_snapdragon.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/pink_dye_from_pink_snapdragon.json
rename to src/main/resources/data/jafohana/recipe/pink_dye_from_pink_snapdragon.json
diff --git a/src/main/resources/data/jafohana/recipes/purple_dye_from_blood_red_iris.json b/src/main/resources/data/jafohana/recipe/purple_dye_from_blood_red_iris.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/purple_dye_from_blood_red_iris.json
rename to src/main/resources/data/jafohana/recipe/purple_dye_from_blood_red_iris.json
diff --git a/src/main/resources/data/jafohana/recipes/purple_dye_from_purple_pansy.json b/src/main/resources/data/jafohana/recipe/purple_dye_from_purple_pansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/purple_dye_from_purple_pansy.json
rename to src/main/resources/data/jafohana/recipe/purple_dye_from_purple_pansy.json
diff --git a/src/main/resources/data/jafohana/recipes/purple_dye_from_tatarian_aster.json b/src/main/resources/data/jafohana/recipe/purple_dye_from_tatarian_aster.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/purple_dye_from_tatarian_aster.json
rename to src/main/resources/data/jafohana/recipe/purple_dye_from_tatarian_aster.json
diff --git a/src/main/resources/data/jafohana/recipes/purple_dye_from_worsleya.json b/src/main/resources/data/jafohana/recipe/purple_dye_from_worsleya.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/purple_dye_from_worsleya.json
rename to src/main/resources/data/jafohana/recipe/purple_dye_from_worsleya.json
diff --git a/src/main/resources/data/jafohana/recipes/red_dye_from_crimson_clover.json b/src/main/resources/data/jafohana/recipe/red_dye_from_crimson_clover.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/red_dye_from_crimson_clover.json
rename to src/main/resources/data/jafohana/recipe/red_dye_from_crimson_clover.json
diff --git a/src/main/resources/data/jafohana/recipes/red_dye_from_fireball_lily.json b/src/main/resources/data/jafohana/recipe/red_dye_from_fireball_lily.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/red_dye_from_fireball_lily.json
rename to src/main/resources/data/jafohana/recipe/red_dye_from_fireball_lily.json
diff --git a/src/main/resources/data/jafohana/recipes/red_dye_from_red_snapdragon.json b/src/main/resources/data/jafohana/recipe/red_dye_from_red_snapdragon.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/red_dye_from_red_snapdragon.json
rename to src/main/resources/data/jafohana/recipe/red_dye_from_red_snapdragon.json
diff --git a/src/main/resources/data/jafohana/recipes/red_dye_from_red_spider_lily.json b/src/main/resources/data/jafohana/recipe/red_dye_from_red_spider_lily.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/red_dye_from_red_spider_lily.json
rename to src/main/resources/data/jafohana/recipe/red_dye_from_red_spider_lily.json
diff --git a/src/main/resources/data/jafohana/recipes/white_dye_from_evening_primrose.json b/src/main/resources/data/jafohana/recipe/white_dye_from_evening_primrose.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/white_dye_from_evening_primrose.json
rename to src/main/resources/data/jafohana/recipe/white_dye_from_evening_primrose.json
diff --git a/src/main/resources/data/jafohana/recipes/white_dye_from_oakleaf_hydrangea.json b/src/main/resources/data/jafohana/recipe/white_dye_from_oakleaf_hydrangea.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/white_dye_from_oakleaf_hydrangea.json
rename to src/main/resources/data/jafohana/recipe/white_dye_from_oakleaf_hydrangea.json
diff --git a/src/main/resources/data/jafohana/recipes/white_dye_from_snowdrop.json b/src/main/resources/data/jafohana/recipe/white_dye_from_snowdrop.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/white_dye_from_snowdrop.json
rename to src/main/resources/data/jafohana/recipe/white_dye_from_snowdrop.json
diff --git a/src/main/resources/data/jafohana/recipes/white_dye_from_white_african_daisy.json b/src/main/resources/data/jafohana/recipe/white_dye_from_white_african_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/white_dye_from_white_african_daisy.json
rename to src/main/resources/data/jafohana/recipe/white_dye_from_white_african_daisy.json
diff --git a/src/main/resources/data/jafohana/recipes/white_dye_from_white_egret_orchid.json b/src/main/resources/data/jafohana/recipe/white_dye_from_white_egret_orchid.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/white_dye_from_white_egret_orchid.json
rename to src/main/resources/data/jafohana/recipe/white_dye_from_white_egret_orchid.json
diff --git a/src/main/resources/data/jafohana/recipes/white_dye_from_white_spotted_bellflower.json b/src/main/resources/data/jafohana/recipe/white_dye_from_white_spotted_bellflower.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/white_dye_from_white_spotted_bellflower.json
rename to src/main/resources/data/jafohana/recipe/white_dye_from_white_spotted_bellflower.json
diff --git a/src/main/resources/data/jafohana/recipes/yellow_dye_from_alpine_ragwort.json b/src/main/resources/data/jafohana/recipe/yellow_dye_from_alpine_ragwort.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/yellow_dye_from_alpine_ragwort.json
rename to src/main/resources/data/jafohana/recipe/yellow_dye_from_alpine_ragwort.json
diff --git a/src/main/resources/data/jafohana/recipes/yellow_dye_from_fasciated_dandelion.json b/src/main/resources/data/jafohana/recipe/yellow_dye_from_fasciated_dandelion.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/yellow_dye_from_fasciated_dandelion.json
rename to src/main/resources/data/jafohana/recipe/yellow_dye_from_fasciated_dandelion.json
diff --git a/src/main/resources/data/jafohana/recipes/yellow_dye_from_yellow_african_daisy.json b/src/main/resources/data/jafohana/recipe/yellow_dye_from_yellow_african_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/yellow_dye_from_yellow_african_daisy.json
rename to src/main/resources/data/jafohana/recipe/yellow_dye_from_yellow_african_daisy.json
diff --git a/src/main/resources/data/jafohana/recipes/yellow_dye_from_yellow_marigold.json b/src/main/resources/data/jafohana/recipe/yellow_dye_from_yellow_marigold.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/yellow_dye_from_yellow_marigold.json
rename to src/main/resources/data/jafohana/recipe/yellow_dye_from_yellow_marigold.json
diff --git a/src/main/resources/data/jafohana/recipes/yellow_dye_from_yellow_pansy.json b/src/main/resources/data/jafohana/recipe/yellow_dye_from_yellow_pansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/yellow_dye_from_yellow_pansy.json
rename to src/main/resources/data/jafohana/recipe/yellow_dye_from_yellow_pansy.json
diff --git a/src/main/resources/data/jafohana/recipes/yellow_dye_from_yellow_snapdragon.json b/src/main/resources/data/jafohana/recipe/yellow_dye_from_yellow_snapdragon.json
similarity index 100%
rename from src/main/resources/data/jafohana/recipes/yellow_dye_from_yellow_snapdragon.json
rename to src/main/resources/data/jafohana/recipe/yellow_dye_from_yellow_snapdragon.json
diff --git a/src/main/resources/data/jafohana/tags/blocks/affects_fasciations.json b/src/main/resources/data/jafohana/tags/block/affects_fasciations.json
similarity index 100%
rename from src/main/resources/data/jafohana/tags/blocks/affects_fasciations.json
rename to src/main/resources/data/jafohana/tags/block/affects_fasciations.json
diff --git a/src/main/resources/data/jafohana/tags/blocks/convertable_to_creepansy.json b/src/main/resources/data/jafohana/tags/block/convertable_to_creepansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/tags/blocks/convertable_to_creepansy.json
rename to src/main/resources/data/jafohana/tags/block/convertable_to_creepansy.json
diff --git a/src/main/resources/data/jafohana/tags/blocks/convertable_to_fasciated_dandelion.json b/src/main/resources/data/jafohana/tags/block/convertable_to_fasciated_dandelion.json
similarity index 100%
rename from src/main/resources/data/jafohana/tags/blocks/convertable_to_fasciated_dandelion.json
rename to src/main/resources/data/jafohana/tags/block/convertable_to_fasciated_dandelion.json
diff --git a/src/main/resources/data/jafohana/tags/blocks/convertable_to_fasciated_oxeye_daisy.json b/src/main/resources/data/jafohana/tags/block/convertable_to_fasciated_oxeye_daisy.json
similarity index 100%
rename from src/main/resources/data/jafohana/tags/blocks/convertable_to_fasciated_oxeye_daisy.json
rename to src/main/resources/data/jafohana/tags/block/convertable_to_fasciated_oxeye_daisy.json
diff --git a/src/main/resources/data/jafohana/tags/blocks/crimson_clover_plantable_on.json b/src/main/resources/data/jafohana/tags/block/crimson_clover_plantable_on.json
similarity index 100%
rename from src/main/resources/data/jafohana/tags/blocks/crimson_clover_plantable_on.json
rename to src/main/resources/data/jafohana/tags/block/crimson_clover_plantable_on.json
diff --git a/src/main/resources/data/jafohana/tags/blocks/flower_pots.json b/src/main/resources/data/jafohana/tags/block/flower_pots.json
similarity index 100%
rename from src/main/resources/data/jafohana/tags/blocks/flower_pots.json
rename to src/main/resources/data/jafohana/tags/block/flower_pots.json
diff --git a/src/main/resources/data/jafohana/tags/blocks/jade_vine_plantable_on.json b/src/main/resources/data/jafohana/tags/block/jade_vine_plantable_on.json
similarity index 100%
rename from src/main/resources/data/jafohana/tags/blocks/jade_vine_plantable_on.json
rename to src/main/resources/data/jafohana/tags/block/jade_vine_plantable_on.json
diff --git a/src/main/resources/data/jafohana/tags/blocks/red_spider_lily_plantable_on.json b/src/main/resources/data/jafohana/tags/block/red_spider_lily_plantable_on.json
similarity index 100%
rename from src/main/resources/data/jafohana/tags/blocks/red_spider_lily_plantable_on.json
rename to src/main/resources/data/jafohana/tags/block/red_spider_lily_plantable_on.json
diff --git a/src/main/resources/data/jafohana/tags/blocks/small_flowers.json b/src/main/resources/data/jafohana/tags/block/small_flowers.json
similarity index 100%
rename from src/main/resources/data/jafohana/tags/blocks/small_flowers.json
rename to src/main/resources/data/jafohana/tags/block/small_flowers.json
diff --git a/src/main/resources/data/jafohana/tags/blocks/tall_flowers.json b/src/main/resources/data/jafohana/tags/block/tall_flowers.json
similarity index 100%
rename from src/main/resources/data/jafohana/tags/blocks/tall_flowers.json
rename to src/main/resources/data/jafohana/tags/block/tall_flowers.json
diff --git a/src/main/resources/data/jafohana/tags/entity_types/can_convert_to_creepansy.json b/src/main/resources/data/jafohana/tags/entity_type/can_convert_to_creepansy.json
similarity index 100%
rename from src/main/resources/data/jafohana/tags/entity_types/can_convert_to_creepansy.json
rename to src/main/resources/data/jafohana/tags/entity_type/can_convert_to_creepansy.json
diff --git a/src/main/resources/data/jafohana/tags/items/small_flowers.json b/src/main/resources/data/jafohana/tags/item/small_flowers.json
similarity index 100%
rename from src/main/resources/data/jafohana/tags/items/small_flowers.json
rename to src/main/resources/data/jafohana/tags/item/small_flowers.json
diff --git a/src/main/resources/data/jafohana/tags/items/tall_flowers.json b/src/main/resources/data/jafohana/tags/item/tall_flowers.json
similarity index 100%
rename from src/main/resources/data/jafohana/tags/items/tall_flowers.json
rename to src/main/resources/data/jafohana/tags/item/tall_flowers.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/flower_pots.json b/src/main/resources/data/minecraft/tags/block/flower_pots.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/flower_pots.json
rename to src/main/resources/data/minecraft/tags/block/flower_pots.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/flowers.json b/src/main/resources/data/minecraft/tags/block/flowers.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/flowers.json
rename to src/main/resources/data/minecraft/tags/block/flowers.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/block/mineable/axe.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/mineable/axe.json
rename to src/main/resources/data/minecraft/tags/block/mineable/axe.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/replaceable_by_trees.json b/src/main/resources/data/minecraft/tags/block/replaceable_by_trees.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/replaceable_by_trees.json
rename to src/main/resources/data/minecraft/tags/block/replaceable_by_trees.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/small_flowers.json b/src/main/resources/data/minecraft/tags/block/small_flowers.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/small_flowers.json
rename to src/main/resources/data/minecraft/tags/block/small_flowers.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/sword_efficient.json b/src/main/resources/data/minecraft/tags/block/sword_efficient.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/sword_efficient.json
rename to src/main/resources/data/minecraft/tags/block/sword_efficient.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json b/src/main/resources/data/minecraft/tags/block/tall_flowers.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/tall_flowers.json
rename to src/main/resources/data/minecraft/tags/block/tall_flowers.json
diff --git a/src/main/resources/data/minecraft/tags/items/flowers.json b/src/main/resources/data/minecraft/tags/item/flowers.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/items/flowers.json
rename to src/main/resources/data/minecraft/tags/item/flowers.json
diff --git a/src/main/resources/data/minecraft/tags/items/small_flowers.json b/src/main/resources/data/minecraft/tags/item/small_flowers.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/items/small_flowers.json
rename to src/main/resources/data/minecraft/tags/item/small_flowers.json
diff --git a/src/main/resources/data/minecraft/tags/items/tall_flowers.json b/src/main/resources/data/minecraft/tags/item/tall_flowers.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/items/tall_flowers.json
rename to src/main/resources/data/minecraft/tags/item/tall_flowers.json
diff --git a/update.json b/update.json
index 3b529ec5..8614effb 100644
--- a/update.json
+++ b/update.json
@@ -1,7 +1,7 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/just-a-few-ohana",
   "promos": {
-    "1.20.6-latest": "9.0.3",
-    "1.20.6-recommended": "9.0.3"
+    "1.21-latest": "10.0.0",
+    "1.21-recommended": "10.0.0"
   }
 }
\ No newline at end of file