diff --git a/src/main/java/resonantinduction/ClientProxy.java b/src/main/java/resonantinduction/ClientProxy.java
index aebbf439f..cb34716fe 100644
--- a/src/main/java/resonantinduction/ClientProxy.java
+++ b/src/main/java/resonantinduction/ClientProxy.java
@@ -8,7 +8,7 @@ import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.MinecraftForge;
 import resonantinduction.core.render.BlockRenderingHandler;
 import resonantinduction.core.render.RenderRIItem;
-import resonantinduction.machine.grinder.ItemDust;
+import resonantinduction.machine.item.ItemDust;
 import resonantinduction.transport.battery.RenderBattery;
 import resonantinduction.transport.battery.TileBattery;
 import resonantinduction.transport.fx.FXElectricBolt;
diff --git a/src/main/java/resonantinduction/MultipartRI.java b/src/main/java/resonantinduction/MultipartRI.java
index 32127be38..73def640f 100644
--- a/src/main/java/resonantinduction/MultipartRI.java
+++ b/src/main/java/resonantinduction/MultipartRI.java
@@ -1,15 +1,21 @@
 package resonantinduction;
 
+import ic2.api.energy.tile.IEnergySink;
 import resonantinduction.transport.transformer.PartTransformer;
 import resonantinduction.transport.wire.flat.PartFlatSwitchWire;
 import resonantinduction.transport.wire.flat.PartFlatWire;
 import resonantinduction.transport.wire.framed.PartFramedSwitchWire;
 import resonantinduction.transport.wire.framed.PartFramedWire;
+import resonantinduction.transport.wire.trait.TraitConductor;
+import resonantinduction.transport.wire.trait.TraitEnergyHandler;
+import resonantinduction.transport.wire.trait.TraitEnergySink;
 import resonantinduction.utility.multimeter.PartMultimeter;
+import universalelectricity.api.energy.IConductor;
 import codechicken.multipart.MultiPartRegistry;
 import codechicken.multipart.MultiPartRegistry.IPartFactory;
 import codechicken.multipart.MultipartGenerator;
 import codechicken.multipart.TMultiPart;
+import cofh.api.energy.IEnergyHandler;
 
 public class MultipartRI implements IPartFactory
 {
@@ -20,9 +26,9 @@ public class MultipartRI implements IPartFactory
 	public MultipartRI()
 	{
 		MultiPartRegistry.registerParts(this, PART_TYPES);
-		MultipartGenerator.registerTrait("universalelectricity.api.energy.IConductor", "resonantinduction.transport.wire.trait.TraitConductor");
-		MultipartGenerator.registerTrait("cofh.api.energy.IEnergyHandler", "resonantinduction.transport.wire.trait.TraitEnergyHandler");
-		MultipartGenerator.registerTrait("ic2.api.energy.tile.IEnergySink", "resonantinduction.transport.wire.trait.TraitEnergySink");
+		MultipartGenerator.registerTrait(IConductor.class.getCanonicalName(), TraitConductor.class.getCanonicalName());
+		MultipartGenerator.registerTrait(IEnergyHandler.class.getCanonicalName(), TraitEnergyHandler.class.getCanonicalName());
+		MultipartGenerator.registerTrait(IEnergySink.class.getCanonicalName(), TraitEnergySink.class.getCanonicalName());
 	}
 
 	@Override
diff --git a/src/main/java/resonantinduction/ResonantInduction.java b/src/main/java/resonantinduction/ResonantInduction.java
index e5ad73a4e..858fcf9ae 100644
--- a/src/main/java/resonantinduction/ResonantInduction.java
+++ b/src/main/java/resonantinduction/ResonantInduction.java
@@ -30,8 +30,8 @@ import resonantinduction.machine.BlockMachinePart;
 import resonantinduction.machine.furnace.BlockAdvancedFurnace;
 import resonantinduction.machine.furnace.TileAdvancedFurnace;
 import resonantinduction.machine.grinder.BlockGrinderWheel;
-import resonantinduction.machine.grinder.ItemDust;
 import resonantinduction.machine.grinder.TileGrinderWheel;
+import resonantinduction.machine.item.ItemDust;
 import resonantinduction.machine.liquid.BlockFluidMixture;
 import resonantinduction.machine.liquid.TileFluidMixture;
 import resonantinduction.transport.battery.BlockBattery;
diff --git a/src/main/java/resonantinduction/machine/grinder/ItemDust.java b/src/main/java/resonantinduction/machine/item/ItemDust.java
similarity index 99%
rename from src/main/java/resonantinduction/machine/grinder/ItemDust.java
rename to src/main/java/resonantinduction/machine/item/ItemDust.java
index b17069398..4a0a0b9e2 100644
--- a/src/main/java/resonantinduction/machine/grinder/ItemDust.java
+++ b/src/main/java/resonantinduction/machine/item/ItemDust.java
@@ -1,4 +1,4 @@
-package resonantinduction.machine.grinder;
+package resonantinduction.machine.item;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;