diff --git a/common/com/pahimar/ee3/EquivalentExchange3.java b/common/com/pahimar/ee3/EquivalentExchange3.java
index 328d5e8b..e5d79587 100644
--- a/common/com/pahimar/ee3/EquivalentExchange3.java
+++ b/common/com/pahimar/ee3/EquivalentExchange3.java
@@ -23,9 +23,9 @@ import com.pahimar.ee3.core.handlers.ItemTooltipEventHandler;
 import com.pahimar.ee3.core.handlers.PlayerDestroyItemHandler;
 import com.pahimar.ee3.core.handlers.VersionCheckTickHandler;
 import com.pahimar.ee3.core.handlers.WorldTransmutationHandler;
+import com.pahimar.ee3.core.helper.LogHelper;
+import com.pahimar.ee3.core.helper.VersionHelper;
 import com.pahimar.ee3.core.proxy.CommonProxy;
-import com.pahimar.ee3.core.util.LogHelper;
-import com.pahimar.ee3.core.util.VersionHelper;
 import com.pahimar.ee3.creativetab.CreativeTabEE3;
 import com.pahimar.ee3.item.ModItems;
 import com.pahimar.ee3.item.crafting.RecipesAlchemicalBagDyes;
diff --git a/common/com/pahimar/ee3/client/audio/SoundHandler.java b/common/com/pahimar/ee3/client/audio/SoundHandler.java
index df51d2f0..30d2abf6 100644
--- a/common/com/pahimar/ee3/client/audio/SoundHandler.java
+++ b/common/com/pahimar/ee3/client/audio/SoundHandler.java
@@ -3,7 +3,7 @@ package com.pahimar.ee3.client.audio;
 import net.minecraftforge.client.event.sound.SoundLoadEvent;
 import net.minecraftforge.event.ForgeSubscribe;
 
-import com.pahimar.ee3.core.util.LogHelper;
+import com.pahimar.ee3.core.helper.LogHelper;
 import com.pahimar.ee3.lib.Sounds;
 
 /**
diff --git a/common/com/pahimar/ee3/command/CommandVersion.java b/common/com/pahimar/ee3/command/CommandVersion.java
index 63b6c82a..3d2738cc 100644
--- a/common/com/pahimar/ee3/command/CommandVersion.java
+++ b/common/com/pahimar/ee3/command/CommandVersion.java
@@ -4,7 +4,7 @@ import net.minecraft.command.ICommandSender;
 import net.minecraft.command.WrongUsageException;
 import net.minecraft.util.ChatMessageComponent;
 
-import com.pahimar.ee3.core.util.VersionHelper;
+import com.pahimar.ee3.core.helper.VersionHelper;
 import com.pahimar.ee3.lib.Commands;
 
 /**
diff --git a/common/com/pahimar/ee3/core/handlers/DrawBlockHighlightHandler.java b/common/com/pahimar/ee3/core/handlers/DrawBlockHighlightHandler.java
index 68e31a6f..33ca1155 100644
--- a/common/com/pahimar/ee3/core/handlers/DrawBlockHighlightHandler.java
+++ b/common/com/pahimar/ee3/core/handlers/DrawBlockHighlightHandler.java
@@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
 import com.pahimar.ee3.configuration.ConfigurationSettings;
-import com.pahimar.ee3.core.util.TransmutationHelper;
+import com.pahimar.ee3.core.helper.TransmutationHelper;
 import com.pahimar.ee3.item.IChargeable;
 import com.pahimar.ee3.item.ITransmutationStone;
 import com.pahimar.ee3.lib.Textures;
diff --git a/common/com/pahimar/ee3/core/handlers/EntityLivingHandler.java b/common/com/pahimar/ee3/core/handlers/EntityLivingHandler.java
index f76dcc17..3e6989a9 100644
--- a/common/com/pahimar/ee3/core/handlers/EntityLivingHandler.java
+++ b/common/com/pahimar/ee3/core/handlers/EntityLivingHandler.java
@@ -6,7 +6,7 @@ import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
 
-import com.pahimar.ee3.core.util.ItemUtil;
+import com.pahimar.ee3.core.helper.ItemHelper;
 
 /**
  * Equivalent-Exchange-3
@@ -28,12 +28,12 @@ public class EntityLivingHandler {
     public void onEntityLivingDeath(LivingDeathEvent event) {
 
         if (event.source.getDamageType().equals("player")) {
-            ItemUtil.dropMiniumShard((EntityPlayer) event.source.getSourceOfDamage(), event.entityLiving);
+            ItemHelper.dropMiniumShard((EntityPlayer) event.source.getSourceOfDamage(), event.entityLiving);
         }
         if (event.source.getSourceOfDamage() instanceof EntityArrow) {
             if (((EntityArrow) event.source.getSourceOfDamage()).shootingEntity != null) {
                 if (((EntityArrow) event.source.getSourceOfDamage()).shootingEntity instanceof EntityPlayer) {
-                    ItemUtil.dropMiniumShard((EntityPlayer) ((EntityArrow) event.source.getSourceOfDamage()).shootingEntity, event.entityLiving);
+                    ItemHelper.dropMiniumShard((EntityPlayer) ((EntityArrow) event.source.getSourceOfDamage()).shootingEntity, event.entityLiving);
                 }
             }
         }
diff --git a/common/com/pahimar/ee3/core/handlers/EquivalencyHandler.java b/common/com/pahimar/ee3/core/handlers/EquivalencyHandler.java
index e7effecc..9322181d 100644
--- a/common/com/pahimar/ee3/core/handlers/EquivalencyHandler.java
+++ b/common/com/pahimar/ee3/core/handlers/EquivalencyHandler.java
@@ -4,8 +4,8 @@ import java.util.ArrayList;
 
 import net.minecraft.item.ItemStack;
 
-import com.pahimar.ee3.core.util.GeneralHelper;
-import com.pahimar.ee3.core.util.LogHelper;
+import com.pahimar.ee3.core.helper.GeneralHelper;
+import com.pahimar.ee3.core.helper.LogHelper;
 
 /**
  * Equivalent-Exchange-3
diff --git a/common/com/pahimar/ee3/core/handlers/InterModCommsHandler.java b/common/com/pahimar/ee3/core/handlers/InterModCommsHandler.java
index 3cc875e2..5dbd6d58 100644
--- a/common/com/pahimar/ee3/core/handlers/InterModCommsHandler.java
+++ b/common/com/pahimar/ee3/core/handlers/InterModCommsHandler.java
@@ -5,7 +5,7 @@ import java.util.Map;
 
 import net.minecraft.nbt.NBTTagCompound;
 
-import com.pahimar.ee3.core.util.LogHelper;
+import com.pahimar.ee3.core.helper.LogHelper;
 import com.pahimar.ee3.emc.EmcBlackList;
 import com.pahimar.ee3.item.CustomWrappedStack;
 import com.pahimar.ee3.item.crafting.RecipesIMC;
diff --git a/common/com/pahimar/ee3/core/handlers/KeyBindingHandler.java b/common/com/pahimar/ee3/core/handlers/KeyBindingHandler.java
index 2395cd88..19b69a81 100644
--- a/common/com/pahimar/ee3/core/handlers/KeyBindingHandler.java
+++ b/common/com/pahimar/ee3/core/handlers/KeyBindingHandler.java
@@ -6,7 +6,7 @@ import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-import com.pahimar.ee3.core.util.KeyBindingUtil;
+import com.pahimar.ee3.core.helper.KeyBindingHelper;
 import com.pahimar.ee3.item.IKeyBound;
 import com.pahimar.ee3.lib.Reference;
 import com.pahimar.ee3.network.PacketTypeHandler;
@@ -30,7 +30,7 @@ public class KeyBindingHandler extends KeyBindingRegistry.KeyHandler {
 
     public KeyBindingHandler() {
 
-        super(KeyBindingUtil.gatherKeyBindings(), KeyBindingUtil.gatherIsRepeating());
+        super(KeyBindingHelper.gatherKeyBindings(), KeyBindingHelper.gatherIsRepeating());
     }
 
     @Override
@@ -52,7 +52,7 @@ public class KeyBindingHandler extends KeyBindingRegistry.KeyHandler {
 
                     if (currentItem != null) {
                         if (currentItem.getItem() instanceof IKeyBound) {
-                            if (!KeyBindingUtil.isClientSided(kb.keyDescription)) {
+                            if (!KeyBindingHelper.isClientSided(kb.keyDescription)) {
                                 PacketDispatcher.sendPacketToServer(PacketTypeHandler.populatePacket(new PacketKeyPressed(kb.keyDescription)));
                             }
                             else {
diff --git a/common/com/pahimar/ee3/core/handlers/TransmutationTargetOverlayHandler.java b/common/com/pahimar/ee3/core/handlers/TransmutationTargetOverlayHandler.java
index 9498f1e9..41adb42b 100644
--- a/common/com/pahimar/ee3/core/handlers/TransmutationTargetOverlayHandler.java
+++ b/common/com/pahimar/ee3/core/handlers/TransmutationTargetOverlayHandler.java
@@ -14,7 +14,7 @@ import org.lwjgl.opengl.GL12;
 
 import com.pahimar.ee3.client.renderer.RenderUtils;
 import com.pahimar.ee3.configuration.ConfigurationSettings;
-import com.pahimar.ee3.core.util.TransmutationHelper;
+import com.pahimar.ee3.core.helper.TransmutationHelper;
 import com.pahimar.ee3.item.ITransmutationStone;
 import com.pahimar.ee3.lib.Reference;
 
diff --git a/common/com/pahimar/ee3/core/handlers/VersionCheckTickHandler.java b/common/com/pahimar/ee3/core/handlers/VersionCheckTickHandler.java
index 6d7f6e7c..92906c15 100644
--- a/common/com/pahimar/ee3/core/handlers/VersionCheckTickHandler.java
+++ b/common/com/pahimar/ee3/core/handlers/VersionCheckTickHandler.java
@@ -6,7 +6,7 @@ import net.minecraftforge.common.Configuration;
 
 import com.pahimar.ee3.configuration.ConfigurationSettings;
 import com.pahimar.ee3.configuration.GeneralConfiguration;
-import com.pahimar.ee3.core.util.VersionHelper;
+import com.pahimar.ee3.core.helper.VersionHelper;
 import com.pahimar.ee3.lib.Reference;
 import com.pahimar.ee3.lib.Strings;
 
diff --git a/common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java b/common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java
index 24ae7635..dfd8fe7a 100644
--- a/common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java
+++ b/common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java
@@ -9,7 +9,7 @@ import net.minecraftforge.event.Event.Result;
 import net.minecraftforge.event.ForgeSubscribe;
 
 import com.pahimar.ee3.configuration.ConfigurationSettings;
-import com.pahimar.ee3.core.util.TransmutationHelper;
+import com.pahimar.ee3.core.helper.TransmutationHelper;
 import com.pahimar.ee3.event.ActionEvent;
 import com.pahimar.ee3.event.ActionEvent.ActionResult;
 import com.pahimar.ee3.event.ActionRequestEvent;
diff --git a/common/com/pahimar/ee3/core/util/GeneralHelper.java b/common/com/pahimar/ee3/core/helper/GeneralHelper.java
similarity index 97%
rename from common/com/pahimar/ee3/core/util/GeneralHelper.java
rename to common/com/pahimar/ee3/core/helper/GeneralHelper.java
index fc3cb7c0..1c01e344 100644
--- a/common/com/pahimar/ee3/core/util/GeneralHelper.java
+++ b/common/com/pahimar/ee3/core/helper/GeneralHelper.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.core.util;
+package com.pahimar.ee3.core.helper;
 
 import java.util.ArrayList;
 
diff --git a/common/com/pahimar/ee3/core/util/ItemUtil.java b/common/com/pahimar/ee3/core/helper/ItemHelper.java
similarity index 89%
rename from common/com/pahimar/ee3/core/util/ItemUtil.java
rename to common/com/pahimar/ee3/core/helper/ItemHelper.java
index e6edf57f..88e50916 100644
--- a/common/com/pahimar/ee3/core/util/ItemUtil.java
+++ b/common/com/pahimar/ee3/core/helper/ItemHelper.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.core.util;
+package com.pahimar.ee3.core.helper;
 
 import java.util.Comparator;
 
@@ -11,7 +11,6 @@ import net.minecraftforge.oredict.OreDictionary;
 import com.pahimar.ee3.item.ModItems;
 import com.pahimar.ee3.lib.Colours;
 import com.pahimar.ee3.lib.Strings;
-import com.pahimar.ee3.nbt.NBTHelper;
 
 /**
  * Equivalent-Exchange-3
@@ -22,33 +21,10 @@ import com.pahimar.ee3.nbt.NBTHelper;
  * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  * 
  */
-public class ItemUtil {
+public class ItemHelper {
 
     private static double rand;
 
-    public static String toString(ItemStack itemStack) {
-
-        StringBuilder stringBuilder = new StringBuilder();
-
-        stringBuilder.append("ItemStack(");
-
-        if (itemStack != null) {
-
-            stringBuilder.append(String.format("%s", encodeItemStackAsString(itemStack)));
-
-            if (itemStack.hasTagCompound()) {
-                stringBuilder.append(String.format("%s%s", Strings.TOKEN_DELIMITER, NBTHelper.encodeNBTAsString((itemStack.getTagCompound()))));
-            }
-        }
-        else {
-            stringBuilder.append("null");
-        }
-
-        stringBuilder.append(")");
-
-        return stringBuilder.toString();
-    }
-
     public static String encodeItemStackAsString(ItemStack itemStack) {
 
         StringBuilder stringBuilder = new StringBuilder();
diff --git a/common/com/pahimar/ee3/core/util/KeyBindingUtil.java b/common/com/pahimar/ee3/core/helper/KeyBindingHelper.java
similarity index 95%
rename from common/com/pahimar/ee3/core/util/KeyBindingUtil.java
rename to common/com/pahimar/ee3/core/helper/KeyBindingHelper.java
index b4bbf975..a1aad84f 100644
--- a/common/com/pahimar/ee3/core/util/KeyBindingUtil.java
+++ b/common/com/pahimar/ee3/core/helper/KeyBindingHelper.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.core.util;
+package com.pahimar.ee3.core.helper;
 
 import java.util.ArrayList;
 
@@ -15,7 +15,7 @@ import com.pahimar.ee3.configuration.ConfigurationSettings;
  * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  * 
  */
-public class KeyBindingUtil {
+public class KeyBindingHelper {
 
     public static ArrayList<KeyBinding> keyBindingsList;
     public static ArrayList<Boolean> isRepeatingList;
diff --git a/common/com/pahimar/ee3/core/util/LogHelper.java b/common/com/pahimar/ee3/core/helper/LogHelper.java
similarity index 97%
rename from common/com/pahimar/ee3/core/util/LogHelper.java
rename to common/com/pahimar/ee3/core/helper/LogHelper.java
index 9a265dcf..817ef5e7 100644
--- a/common/com/pahimar/ee3/core/util/LogHelper.java
+++ b/common/com/pahimar/ee3/core/helper/LogHelper.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.core.util;
+package com.pahimar.ee3.core.helper;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/common/com/pahimar/ee3/core/util/QualityHelper.java b/common/com/pahimar/ee3/core/helper/QualityHelper.java
similarity index 96%
rename from common/com/pahimar/ee3/core/util/QualityHelper.java
rename to common/com/pahimar/ee3/core/helper/QualityHelper.java
index 72aab085..b8c9b859 100644
--- a/common/com/pahimar/ee3/core/util/QualityHelper.java
+++ b/common/com/pahimar/ee3/core/helper/QualityHelper.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.core.util;
+package com.pahimar.ee3.core.helper;
 
 import net.minecraft.item.ItemStack;
 
diff --git a/common/com/pahimar/ee3/core/util/RecipeHelper.java b/common/com/pahimar/ee3/core/helper/RecipeHelper.java
similarity index 96%
rename from common/com/pahimar/ee3/core/util/RecipeHelper.java
rename to common/com/pahimar/ee3/core/helper/RecipeHelper.java
index 712ff06c..ba8df07d 100644
--- a/common/com/pahimar/ee3/core/util/RecipeHelper.java
+++ b/common/com/pahimar/ee3/core/helper/RecipeHelper.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.core.util;
+package com.pahimar.ee3.core.helper;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -12,6 +12,8 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
 import com.pahimar.ee3.item.CustomWrappedStack;
+import com.pahimar.ee3.item.EnergyStack;
+import com.pahimar.ee3.item.OreStack;
 
 /**
  * Equivalent-Exchange-3
@@ -156,7 +158,7 @@ public class RecipeHelper {
                     for (int i = 0; i < collatedStacks.size(); i++) {
                         if (collatedStacks.get(i).getWrappedStack() != null) {
                             if (stack.getWrappedStack() instanceof ItemStack && collatedStacks.get(i).getWrappedStack() instanceof ItemStack) {
-                                if (ItemUtil.compare((ItemStack) stack.getWrappedStack(), (ItemStack) collatedStacks.get(i).getWrappedStack())) {
+                                if (ItemHelper.compare((ItemStack) stack.getWrappedStack(), (ItemStack) collatedStacks.get(i).getWrappedStack())) {
                                     collatedStacks.get(i).setStackSize(collatedStacks.get(i).getStackSize() + stack.getStackSize());
                                     found = true;
                                 }
diff --git a/common/com/pahimar/ee3/core/util/ResourceLocationHelper.java b/common/com/pahimar/ee3/core/helper/ResourceLocationHelper.java
similarity index 91%
rename from common/com/pahimar/ee3/core/util/ResourceLocationHelper.java
rename to common/com/pahimar/ee3/core/helper/ResourceLocationHelper.java
index 2a2ff4d2..4a9a6453 100644
--- a/common/com/pahimar/ee3/core/util/ResourceLocationHelper.java
+++ b/common/com/pahimar/ee3/core/helper/ResourceLocationHelper.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.core.util;
+package com.pahimar.ee3.core.helper;
 
 import net.minecraft.util.ResourceLocation;
 
diff --git a/common/com/pahimar/ee3/core/util/TransmutationHelper.java b/common/com/pahimar/ee3/core/helper/TransmutationHelper.java
similarity index 99%
rename from common/com/pahimar/ee3/core/util/TransmutationHelper.java
rename to common/com/pahimar/ee3/core/helper/TransmutationHelper.java
index a62d2584..970899a9 100644
--- a/common/com/pahimar/ee3/core/util/TransmutationHelper.java
+++ b/common/com/pahimar/ee3/core/helper/TransmutationHelper.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.core.util;
+package com.pahimar.ee3.core.helper;
 
 import java.util.ArrayList;
 
diff --git a/common/com/pahimar/ee3/core/util/VersionHelper.java b/common/com/pahimar/ee3/core/helper/VersionHelper.java
similarity index 99%
rename from common/com/pahimar/ee3/core/util/VersionHelper.java
rename to common/com/pahimar/ee3/core/helper/VersionHelper.java
index 63ccc7c6..aafc643e 100644
--- a/common/com/pahimar/ee3/core/util/VersionHelper.java
+++ b/common/com/pahimar/ee3/core/helper/VersionHelper.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.core.util;
+package com.pahimar.ee3.core.helper;
 
 import java.io.InputStream;
 import java.net.URL;
diff --git a/common/com/pahimar/ee3/core/proxy/ClientProxy.java b/common/com/pahimar/ee3/core/proxy/ClientProxy.java
index c37534ff..8f749948 100644
--- a/common/com/pahimar/ee3/core/proxy/ClientProxy.java
+++ b/common/com/pahimar/ee3/core/proxy/ClientProxy.java
@@ -25,9 +25,9 @@ import com.pahimar.ee3.client.renderer.tileentity.TileEntityRenderingTankRendere
 import com.pahimar.ee3.core.handlers.DrawBlockHighlightHandler;
 import com.pahimar.ee3.core.handlers.KeyBindingHandler;
 import com.pahimar.ee3.core.handlers.TransmutationTargetOverlayHandler;
-import com.pahimar.ee3.core.util.ItemUtil;
-import com.pahimar.ee3.core.util.KeyBindingUtil;
-import com.pahimar.ee3.core.util.TransmutationHelper;
+import com.pahimar.ee3.core.helper.ItemHelper;
+import com.pahimar.ee3.core.helper.KeyBindingHelper;
+import com.pahimar.ee3.core.helper.TransmutationHelper;
 import com.pahimar.ee3.item.IChargeable;
 import com.pahimar.ee3.lib.ActionTypes;
 import com.pahimar.ee3.lib.BlockIds;
@@ -83,8 +83,8 @@ public class ClientProxy extends CommonProxy {
     @Override
     public void setKeyBinding(String name, int value) {
 
-        KeyBindingUtil.addKeyBinding(name, value);
-        KeyBindingUtil.addIsRepeating(false);
+        KeyBindingHelper.addKeyBinding(name, value);
+        KeyBindingHelper.addIsRepeating(false);
     }
 
     @Override
@@ -157,7 +157,7 @@ public class ClientProxy extends CommonProxy {
 
                 ItemStack itemStack = new ItemStack(itemID, stackSize, metaData);
                 if (color != Integer.parseInt(Colours.PURE_WHITE, 16)) {
-                    ItemUtil.setColor(itemStack, color);
+                    ItemHelper.setColor(itemStack, color);
                 }
 
                 ((TileGlassBell) tileEntity).setInventorySlotContents(TileGlassBell.DISPLAY_SLOT_INVENTORY_INDEX, itemStack);
@@ -167,7 +167,7 @@ public class ClientProxy extends CommonProxy {
 
                 ItemStack itemStack = new ItemStack(itemID, stackSize, metaData);
                 if (color != Integer.parseInt(Colours.PURE_WHITE, 16)) {
-                    ItemUtil.setColor(itemStack, color);
+                    ItemHelper.setColor(itemStack, color);
                 }
 
                 ((TileAludel) tileEntity).setInventorySlotContents(TileAludel.INPUT_INVENTORY_INDEX, itemStack);
diff --git a/common/com/pahimar/ee3/emc/EmcDefaultValues.java b/common/com/pahimar/ee3/emc/EmcDefaultValues.java
index e5dd577f..56a7f530 100644
--- a/common/com/pahimar/ee3/emc/EmcDefaultValues.java
+++ b/common/com/pahimar/ee3/emc/EmcDefaultValues.java
@@ -6,8 +6,8 @@ import java.util.Map;
 
 import net.minecraft.block.Block;
 
-import com.pahimar.ee3.core.util.EnergyStack;
 import com.pahimar.ee3.item.CustomWrappedStack;
+import com.pahimar.ee3.item.EnergyStack;
 
 public class EmcDefaultValues {
 
diff --git a/common/com/pahimar/ee3/item/CustomWrappedStack.java b/common/com/pahimar/ee3/item/CustomWrappedStack.java
index dcc58a33..ccd96cf6 100644
--- a/common/com/pahimar/ee3/item/CustomWrappedStack.java
+++ b/common/com/pahimar/ee3/item/CustomWrappedStack.java
@@ -7,9 +7,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-import com.pahimar.ee3.core.util.EnergyStack;
-import com.pahimar.ee3.core.util.ItemUtil;
-import com.pahimar.ee3.core.util.OreStack;
+import com.pahimar.ee3.core.helper.ItemHelper;
 import com.pahimar.ee3.lib.Reference;
 
 public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
@@ -182,7 +180,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
         CustomWrappedStack customWrappedStack = (CustomWrappedStack) object;
 
         if ((this.getWrappedStack() instanceof ItemStack) && (customWrappedStack.getWrappedStack() instanceof ItemStack)) {
-            return (ItemUtil.compare(itemStack, customWrappedStack.itemStack) && (stackSize == customWrappedStack.itemStack.stackSize));
+            return (ItemHelper.compare(itemStack, customWrappedStack.itemStack) && (stackSize == customWrappedStack.itemStack.stackSize));
         }
         else if ((this.getWrappedStack() instanceof OreStack) && (customWrappedStack.getWrappedStack() instanceof OreStack)) {
             return (oreStack.equals(customWrappedStack.getWrappedStack()) && (stackSize == customWrappedStack.stackSize));
@@ -310,10 +308,10 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
             else if (customWrappedStack.getWrappedStack() instanceof OreStack)
                 return 1;
             else if (customWrappedStack.getWrappedStack() instanceof ItemStack) {
-                if (ItemUtil.compare(itemStack, customWrappedStack.itemStack))
+                if (ItemHelper.compare(itemStack, customWrappedStack.itemStack))
                     return stackSize - customWrappedStack.stackSize;
                 else
-                    return ItemUtil.ItemStackComparator.compare(itemStack, customWrappedStack.itemStack);
+                    return ItemHelper.ItemStackComparator.compare(itemStack, customWrappedStack.itemStack);
             }
             else
                 return 1;
diff --git a/common/com/pahimar/ee3/core/util/EnergyStack.java b/common/com/pahimar/ee3/item/EnergyStack.java
similarity index 98%
rename from common/com/pahimar/ee3/core/util/EnergyStack.java
rename to common/com/pahimar/ee3/item/EnergyStack.java
index 9680514f..7642d9aa 100644
--- a/common/com/pahimar/ee3/core/util/EnergyStack.java
+++ b/common/com/pahimar/ee3/item/EnergyStack.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.core.util;
+package com.pahimar.ee3.item;
 
 public class EnergyStack implements Comparable<EnergyStack> {
 
diff --git a/common/com/pahimar/ee3/item/ItemAlchemicalBag.java b/common/com/pahimar/ee3/item/ItemAlchemicalBag.java
index 5525b937..07026f56 100644
--- a/common/com/pahimar/ee3/item/ItemAlchemicalBag.java
+++ b/common/com/pahimar/ee3/item/ItemAlchemicalBag.java
@@ -8,7 +8,7 @@ import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 
 import com.pahimar.ee3.EquivalentExchange3;
-import com.pahimar.ee3.core.util.ItemUtil;
+import com.pahimar.ee3.core.helper.ItemHelper;
 import com.pahimar.ee3.lib.Colours;
 import com.pahimar.ee3.lib.GuiIds;
 import com.pahimar.ee3.lib.Strings;
@@ -113,12 +113,12 @@ public class ItemAlchemicalBag extends ItemEE {
 
     public boolean hasColor(ItemStack itemStack) {
 
-        return ItemUtil.hasColor(itemStack);
+        return ItemHelper.hasColor(itemStack);
     }
 
     public int getColor(ItemStack itemStack) {
 
-        return ItemUtil.getColor(itemStack);
+        return ItemHelper.getColor(itemStack);
     }
 
     public void setColor(ItemStack itemStack, int color) {
@@ -128,7 +128,7 @@ public class ItemAlchemicalBag extends ItemEE {
                 // TODO Localize
                 throw new UnsupportedOperationException("Cannot dye non-bags!");
             else {
-                ItemUtil.setColor(itemStack, color);
+                ItemHelper.setColor(itemStack, color);
             }
         }
     }
diff --git a/common/com/pahimar/ee3/item/ItemMiniumStone.java b/common/com/pahimar/ee3/item/ItemMiniumStone.java
index c59a693f..6e376b3c 100644
--- a/common/com/pahimar/ee3/item/ItemMiniumStone.java
+++ b/common/com/pahimar/ee3/item/ItemMiniumStone.java
@@ -7,7 +7,7 @@ import net.minecraft.world.World;
 
 import com.pahimar.ee3.EquivalentExchange3;
 import com.pahimar.ee3.configuration.ConfigurationSettings;
-import com.pahimar.ee3.core.util.TransmutationHelper;
+import com.pahimar.ee3.core.helper.TransmutationHelper;
 import com.pahimar.ee3.lib.GuiIds;
 import com.pahimar.ee3.lib.Strings;
 import com.pahimar.ee3.nbt.NBTHelper;
diff --git a/common/com/pahimar/ee3/item/ItemPhilosophersStone.java b/common/com/pahimar/ee3/item/ItemPhilosophersStone.java
index 50c8c69a..58f0d3d3 100644
--- a/common/com/pahimar/ee3/item/ItemPhilosophersStone.java
+++ b/common/com/pahimar/ee3/item/ItemPhilosophersStone.java
@@ -7,7 +7,7 @@ import net.minecraft.world.World;
 
 import com.pahimar.ee3.EquivalentExchange3;
 import com.pahimar.ee3.configuration.ConfigurationSettings;
-import com.pahimar.ee3.core.util.TransmutationHelper;
+import com.pahimar.ee3.core.helper.TransmutationHelper;
 import com.pahimar.ee3.lib.GuiIds;
 import com.pahimar.ee3.lib.Sounds;
 import com.pahimar.ee3.lib.Strings;
diff --git a/common/com/pahimar/ee3/core/util/OreStack.java b/common/com/pahimar/ee3/item/OreStack.java
similarity index 98%
rename from common/com/pahimar/ee3/core/util/OreStack.java
rename to common/com/pahimar/ee3/item/OreStack.java
index e1d9ae07..fa862cd5 100644
--- a/common/com/pahimar/ee3/core/util/OreStack.java
+++ b/common/com/pahimar/ee3/item/OreStack.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.core.util;
+package com.pahimar.ee3.item;
 
 import java.util.ArrayList;
 
diff --git a/common/com/pahimar/ee3/item/crafting/RecipesIMC.java b/common/com/pahimar/ee3/item/crafting/RecipesIMC.java
index 2effc5df..0ec61bae 100644
--- a/common/com/pahimar/ee3/item/crafting/RecipesIMC.java
+++ b/common/com/pahimar/ee3/item/crafting/RecipesIMC.java
@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.pahimar.ee3.core.util.RecipeHelper;
+import com.pahimar.ee3.core.helper.RecipeHelper;
 import com.pahimar.ee3.item.CustomWrappedStack;
 
 /**
diff --git a/common/com/pahimar/ee3/item/crafting/RecipesSmelting.java b/common/com/pahimar/ee3/item/crafting/RecipesSmelting.java
index 21f3e7c0..f47bbca5 100644
--- a/common/com/pahimar/ee3/item/crafting/RecipesSmelting.java
+++ b/common/com/pahimar/ee3/item/crafting/RecipesSmelting.java
@@ -9,8 +9,8 @@ import net.minecraft.item.crafting.FurnaceRecipes;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.pahimar.ee3.core.util.EnergyStack;
 import com.pahimar.ee3.item.CustomWrappedStack;
+import com.pahimar.ee3.item.EnergyStack;
 
 public class RecipesSmelting {
 
diff --git a/common/com/pahimar/ee3/item/crafting/RecipesVanilla.java b/common/com/pahimar/ee3/item/crafting/RecipesVanilla.java
index ee3d5da8..99cc96e2 100644
--- a/common/com/pahimar/ee3/item/crafting/RecipesVanilla.java
+++ b/common/com/pahimar/ee3/item/crafting/RecipesVanilla.java
@@ -9,7 +9,7 @@ import net.minecraft.item.crafting.IRecipe;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.pahimar.ee3.core.util.RecipeHelper;
+import com.pahimar.ee3.core.helper.RecipeHelper;
 import com.pahimar.ee3.item.CustomWrappedStack;
 
 public class RecipesVanilla {
diff --git a/common/com/pahimar/ee3/lib/Textures.java b/common/com/pahimar/ee3/lib/Textures.java
index 22370d9a..15d14e41 100644
--- a/common/com/pahimar/ee3/lib/Textures.java
+++ b/common/com/pahimar/ee3/lib/Textures.java
@@ -3,7 +3,7 @@ package com.pahimar.ee3.lib;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.ResourceLocation;
 
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
+import com.pahimar.ee3.core.helper.ResourceLocationHelper;
 
 /**
  * Equivalent-Exchange-3
diff --git a/common/com/pahimar/ee3/nbt/NBTHelper.java b/common/com/pahimar/ee3/nbt/NBTHelper.java
index e04fefaa..a16a1ede 100644
--- a/common/com/pahimar/ee3/nbt/NBTHelper.java
+++ b/common/com/pahimar/ee3/nbt/NBTHelper.java
@@ -21,9 +21,9 @@ import net.minecraft.nbt.NBTTagLong;
 import net.minecraft.nbt.NBTTagShort;
 import net.minecraft.nbt.NBTTagString;
 
-import com.pahimar.ee3.core.util.EnergyStack;
-import com.pahimar.ee3.core.util.OreStack;
 import com.pahimar.ee3.item.CustomWrappedStack;
+import com.pahimar.ee3.item.EnergyStack;
+import com.pahimar.ee3.item.OreStack;
 import com.pahimar.ee3.lib.Strings;
 
 /**
diff --git a/common/com/pahimar/ee3/tileentity/TileAludel.java b/common/com/pahimar/ee3/tileentity/TileAludel.java
index 49eba1b9..6748af6a 100644
--- a/common/com/pahimar/ee3/tileentity/TileAludel.java
+++ b/common/com/pahimar/ee3/tileentity/TileAludel.java
@@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.packet.Packet;
 
-import com.pahimar.ee3.core.util.ItemUtil;
+import com.pahimar.ee3.core.helper.ItemHelper;
 import com.pahimar.ee3.lib.Strings;
 import com.pahimar.ee3.network.PacketTypeHandler;
 import com.pahimar.ee3.network.packet.PacketTileWithItemUpdate;
@@ -164,7 +164,7 @@ public class TileAludel extends TileEE implements IInventory {
         ItemStack itemStack = getStackInSlot(INPUT_INVENTORY_INDEX);
 
         if (itemStack != null && itemStack.stackSize > 0)
-            return PacketTypeHandler.populatePacket(new PacketTileWithItemUpdate(xCoord, yCoord, zCoord, orientation, state, customName, itemStack.itemID, itemStack.getItemDamage(), itemStack.stackSize, ItemUtil.getColor(itemStack)));
+            return PacketTypeHandler.populatePacket(new PacketTileWithItemUpdate(xCoord, yCoord, zCoord, orientation, state, customName, itemStack.itemID, itemStack.getItemDamage(), itemStack.stackSize, ItemHelper.getColor(itemStack)));
         else
             return super.getDescriptionPacket();
     }
diff --git a/common/com/pahimar/ee3/tileentity/TileGlassBell.java b/common/com/pahimar/ee3/tileentity/TileGlassBell.java
index 2619e2d3..002459c1 100644
--- a/common/com/pahimar/ee3/tileentity/TileGlassBell.java
+++ b/common/com/pahimar/ee3/tileentity/TileGlassBell.java
@@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.packet.Packet;
 
-import com.pahimar.ee3.core.util.ItemUtil;
+import com.pahimar.ee3.core.helper.ItemHelper;
 import com.pahimar.ee3.lib.Strings;
 import com.pahimar.ee3.network.PacketTypeHandler;
 import com.pahimar.ee3.network.packet.PacketTileWithItemUpdate;
@@ -152,7 +152,7 @@ public class TileGlassBell extends TileEE implements IInventory {
         ItemStack itemStack = getStackInSlot(DISPLAY_SLOT_INVENTORY_INDEX);
 
         if (itemStack != null && itemStack.stackSize > 0)
-            return PacketTypeHandler.populatePacket(new PacketTileWithItemUpdate(xCoord, yCoord, zCoord, orientation, state, customName, itemStack.itemID, itemStack.getItemDamage(), itemStack.stackSize, ItemUtil.getColor(itemStack)));
+            return PacketTypeHandler.populatePacket(new PacketTileWithItemUpdate(xCoord, yCoord, zCoord, orientation, state, customName, itemStack.itemID, itemStack.getItemDamage(), itemStack.stackSize, ItemHelper.getColor(itemStack)));
         else
             return super.getDescriptionPacket();
     }