diff --git a/kfc/gradle.properties b/kfc/gradle.properties
index 88618be1..f83335c5 100644
--- a/kfc/gradle.properties
+++ b/kfc/gradle.properties
@@ -1,12 +1,12 @@
 # ~/.gradle/gradle.properties
 #
 #org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx3G -Dhttps.protocols=TLSv1.2,TLSv1.1,TLSv1 
+org.gradle.jvmargs=-Xmx3G 
 
 mod_group=nmd.primal.forgecraft
 mod_name=ForgeCraft
 
-mod_version=1.6.45
+mod_version=1.6.51
 forge_version=14.23.5.2806
 mcp_mappings=snapshot_20171003
 mc_version=1.12.2
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/CommonEvents.java b/kfc/src/main/java/nmd/primal/forgecraft/CommonEvents.java
index 8224332f..83a43d74 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/CommonEvents.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/CommonEvents.java
@@ -6,8 +6,8 @@ import net.minecraft.util.NonNullList;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import nmd.primal.core.api.events.CauldronRecipeEvent;
+import nmd.primal.core.common.crafting.handlers.tile.CauldronRecipe;
 import nmd.primal.core.common.helper.RecipeHelper;
-import nmd.primal.core.common.recipes.tile.CauldronRecipe;
 import nmd.primal.core.common.tiles.machines.TileCauldron;
 import nmd.primal.forgecraft.items.parts.WeaponPart;
 import nmd.primal.forgecraft.util.WeaponNBT;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java
index 794a1434..36613111 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java
@@ -22,7 +22,7 @@ public class ModInfo {
     //public static final String MOD_PREFIX = MOD_ID + ":";
     public static final String MOD_CHANNEL = MOD_ID;
 
-    public static final String MOD_VERSION = "1.6.45";
+    public static final String MOD_VERSION = "1.6.51";
     public static final String MC_VERSIONS = "[1.12.0, 1.13.0)";
     public static final String DEPENDENCIES = "required-after:forge@[14.21.1.2400,);" + "required-after:primal@[0.6.69,);";
 
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/BloomeryBase.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/BloomeryBase.java
index 62479599..19dd49d5 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/BloomeryBase.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/BloomeryBase.java
@@ -26,8 +26,8 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.items.IItemHandler;
 import nmd.primal.core.api.PrimalAPI;
+import nmd.primal.core.common.crafting.handlers.inworld.FireSource;
 import nmd.primal.core.common.helper.PlayerHelper;
-import nmd.primal.core.common.recipes.inworld.FireSource;
 import nmd.primal.forgecraft.ModInfo;
 import nmd.primal.forgecraft.blocks.CustomContainerFacing;
 import nmd.primal.forgecraft.crafting.CrucibleCrafting;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/Forge.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/Forge.java
index 28df46a2..ea9077d4 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/Forge.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/Forge.java
@@ -23,8 +23,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import nmd.primal.core.api.PrimalAPI;
+import nmd.primal.core.common.crafting.handlers.inworld.FireSource;
 import nmd.primal.core.common.helper.PlayerHelper;
-import nmd.primal.core.common.recipes.inworld.FireSource;
 import nmd.primal.forgecraft.ModInfo;
 import nmd.primal.forgecraft.blocks.CustomContainerFacing;
 import nmd.primal.forgecraft.tiles.TileForge;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/crafting/CrucibleCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/crafting/CrucibleCrafting.java
index 3153ad21..631058cf 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/crafting/CrucibleCrafting.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/crafting/CrucibleCrafting.java
@@ -4,7 +4,7 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.Ingredient;
 import net.minecraftforge.registries.IForgeRegistry;
-import nmd.primal.core.common.recipes.AbstractRecipe;
+import nmd.primal.core.common.crafting.AbstractRecipe;
 import nmd.primal.forgecraft.ModInfo;
 
 import javax.annotation.Nullable;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/crafting/WorkbenchCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/crafting/WorkbenchCrafting.java
index c1e0a762..120b3040 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/crafting/WorkbenchCrafting.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/crafting/WorkbenchCrafting.java
@@ -4,8 +4,8 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.Ingredient;
 import net.minecraftforge.registries.IForgeRegistry;
+import nmd.primal.core.common.crafting.AbstractRecipe;
 import nmd.primal.core.common.helper.RecipeHelper;
-import nmd.primal.core.common.recipes.AbstractRecipe;
 import nmd.primal.forgecraft.ModInfo;
 
 import javax.annotation.Nullable;
@@ -13,6 +13,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import static nmd.primal.core.common.crafting.AbstractRecipe.getFullRecipeName;
+
 /**
  * Created by mminaie on 11/11/17.
  */
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java
index 54244321..0fc215e7 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java
@@ -7,8 +7,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.oredict.OreDictionary;
 import nmd.primal.core.api.PrimalAPI;
-import nmd.primal.core.common.helper.RecipeHelper;
-import nmd.primal.core.common.recipes.irecipe.RecipeHandler;
+import nmd.primal.core.common.crafting.handlers.irecipe.RecipeHandler;
 import nmd.primal.forgecraft.crafting.AnvilCrafting;
 import nmd.primal.forgecraft.crafting.CastingCrafting;
 import nmd.primal.forgecraft.crafting.ForgeCrafting;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/CauldronRecipes.java b/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/CauldronRecipes.java
index ac13ba65..863ccaea 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/CauldronRecipes.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/CauldronRecipes.java
@@ -9,8 +9,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.registries.IForgeRegistry;
 import nmd.primal.core.api.PrimalAPI;
+import nmd.primal.core.common.crafting.handlers.tile.CauldronRecipe;
 import nmd.primal.core.common.helper.RecipeHelper;
-import nmd.primal.core.common.recipes.tile.CauldronRecipe;
 import nmd.primal.forgecraft.ModInfo;
 import nmd.primal.forgecraft.init.ModItems;
 
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/DryingRecipes.java b/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/DryingRecipes.java
index 01382423..97c85cd5 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/DryingRecipes.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/DryingRecipes.java
@@ -6,7 +6,7 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.registries.IForgeRegistry;
-import nmd.primal.core.common.recipes.tile.DryingRecipe;
+import nmd.primal.core.common.crafting.handlers.tile.DryingRecipe;
 import nmd.primal.forgecraft.ModInfo;
 import nmd.primal.forgecraft.init.ModBlocks;
 import nmd.primal.forgecraft.init.ModItems;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/HibachiRecipes.java b/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/HibachiRecipes.java
index 416571a4..833b3605 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/HibachiRecipes.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/init/recipes/HibachiRecipes.java
@@ -6,7 +6,7 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.registries.IForgeRegistry;
-import nmd.primal.core.common.recipes.tile.HibachiRecipe;
+import nmd.primal.core.common.crafting.handlers.tile.HibachiRecipe;
 import nmd.primal.forgecraft.ModInfo;
 import nmd.primal.forgecraft.init.ModBlocks;
 import nmd.primal.forgecraft.init.ModItems;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/SledgeHammer.java b/kfc/src/main/java/nmd/primal/forgecraft/items/SledgeHammer.java
index d22ce8ec..3e0e9344 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/items/SledgeHammer.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/items/SledgeHammer.java
@@ -12,8 +12,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import nmd.primal.core.common.crafting.handlers.irecipe.ToolCraftingRecipe;
 import nmd.primal.core.common.items.tools.Gallagher;
-import nmd.primal.core.common.recipes.irecipe.ToolCraftingRecipe;
 import nmd.primal.forgecraft.ModInfo;
 import nmd.primal.forgecraft.util.ToolMaterialMap;
 
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java b/kfc/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java
index 9e365ed4..6ab438fb 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java
@@ -8,9 +8,9 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import nmd.primal.core.api.PrimalAPI;
+import nmd.primal.core.common.crafting.handlers.inworld.GallagherRecipe;
 import nmd.primal.core.common.helper.PlayerHelper;
 import nmd.primal.core.common.helper.RecipeHelper;
-import nmd.primal.core.common.recipes.inworld.GallagherRecipe;
 import nmd.primal.forgecraft.blocks.CustomContainerFacing;
 import nmd.primal.forgecraft.tiles.TileBreaker;
 
diff --git a/kfc/src/main/resources/mcmod.info b/kfc/src/main/resources/mcmod.info
index c9b18ccd..8c4a6b43 100644
--- a/kfc/src/main/resources/mcmod.info
+++ b/kfc/src/main/resources/mcmod.info
@@ -2,7 +2,7 @@
   "modid": "forgecraft",
   "name": "Kitsu's Forgecraft",
   "description": "Forged with sweat and blood",
-  "version": "1.6.45",
+  "version": "1.6.51",
   "mcversion": "1.12.2",
   "url": "",
   "updateUrl": "",