diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
index cb865c75f..07514fbd8 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
@@ -2,9 +2,6 @@ package ru.dbotthepony.mc.otm.datagen
 
 import net.minecraft.core.Direction
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.tags.Tag
-import net.minecraft.world.item.Item
-import net.minecraft.world.item.crafting.Ingredient
 import net.minecraft.world.level.block.Block
 import net.minecraftforge.eventbus.api.SubscribeEvent
 import net.minecraftforge.fml.common.Mod
@@ -18,13 +15,11 @@ import ru.dbotthepony.mc.otm.block.BlockMatteryRotatable
 import ru.dbotthepony.mc.otm.block.BlockPatternStorage
 import ru.dbotthepony.mc.otm.block.entity.worker.WorkerState
 import ru.dbotthepony.mc.otm.datagen.blocks.*
-import ru.dbotthepony.mc.otm.datagen.items.DummyItemTag
 import ru.dbotthepony.mc.otm.datagen.items.MatteryItemModelProvider
 import ru.dbotthepony.mc.otm.datagen.loot.MatteryLootTableProvider
 import ru.dbotthepony.mc.otm.datagen.loot.TileNbtCopy
 import ru.dbotthepony.mc.otm.datagen.models.BlockMatteryModelProvider
 import ru.dbotthepony.mc.otm.datagen.recipes.MatteryRecipeProvider
-import ru.dbotthepony.mc.otm.recipes.PlatePressRecipe
 
 @Mod.EventBusSubscriber(modid = DataGen.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
 object DataGen {
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt
index 8344cc6f4..a76ca2326 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt
@@ -4,10 +4,9 @@ import net.minecraft.data.DataGenerator
 import net.minecraft.data.recipes.FinishedRecipe
 import net.minecraft.data.recipes.RecipeProvider
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.crafting.Ingredient
 import ru.dbotthepony.mc.otm.datagen.DataGen
-import ru.dbotthepony.mc.otm.recipes.PlatePressRecipe
+import ru.dbotthepony.mc.otm.recipe.PlatePressRecipe
 import java.util.function.Consumer
 
 private typealias RecipeLambda = (MatteryRecipeProvider, Consumer<FinishedRecipe>) -> Unit
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressFinishedRecipe.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressFinishedRecipe.kt
index 44f505f7b..d6b85c78f 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressFinishedRecipe.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressFinishedRecipe.kt
@@ -5,8 +5,8 @@ import com.google.gson.JsonPrimitive
 import net.minecraft.data.recipes.FinishedRecipe
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.item.crafting.RecipeSerializer
-import ru.dbotthepony.mc.otm.recipes.PlatePressRecipe
-import ru.dbotthepony.mc.otm.recipes.PlatePressRecipeFactory
+import ru.dbotthepony.mc.otm.recipe.PlatePressRecipe
+import ru.dbotthepony.mc.otm.recipe.PlatePressRecipeFactory
 import ru.dbotthepony.mc.otm.set
 
 class PlatePressFinishedRecipe(private val recipe: PlatePressRecipe) : FinishedRecipe {
diff --git a/src/main/java/ru/dbotthepony/mc/otm/Registry.java b/src/main/java/ru/dbotthepony/mc/otm/Registry.java
index d859081d7..19bd3fe4e 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/Registry.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/Registry.java
@@ -8,7 +8,6 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.stats.StatFormatter;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.util.valueproviders.UniformInt;
-import net.minecraft.world.Container;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.inventory.MenuType;
@@ -50,8 +49,8 @@ import ru.dbotthepony.mc.otm.core.Fraction;
 import ru.dbotthepony.mc.otm.item.*;
 import ru.dbotthepony.mc.otm.menu.*;
 import ru.dbotthepony.mc.otm.client.screen.*;
-import ru.dbotthepony.mc.otm.recipes.PlatePressRecipe;
-import ru.dbotthepony.mc.otm.recipes.PlatePressRecipeFactory;
+import ru.dbotthepony.mc.otm.recipe.PlatePressRecipe;
+import ru.dbotthepony.mc.otm.recipe.PlatePressRecipeFactory;
 
 public class Registry {
 	public static final DamageSource DAMAGE_BECOME_ANDROID = new DamageSource("otm_become_android");
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipes/Helpers.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Helpers.kt
similarity index 95%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/recipes/Helpers.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Helpers.kt
index 0bba35061..906d9d832 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipes/Helpers.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Helpers.kt
@@ -1,9 +1,8 @@
-package ru.dbotthepony.mc.otm.recipes
+package ru.dbotthepony.mc.otm.recipe
 
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import com.google.gson.JsonPrimitive
-import net.minecraft.data.structures.SnbtToNbt
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipes/PlatePressRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PlatePressRecipe.kt
similarity index 99%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/recipes/PlatePressRecipe.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PlatePressRecipe.kt
index c1255e9d8..b9bf1c77a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipes/PlatePressRecipe.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PlatePressRecipe.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.recipes
+package ru.dbotthepony.mc.otm.recipe
 
 import com.google.gson.JsonObject
 import com.google.gson.JsonPrimitive