diff --git a/src/main/java/resonantinduction/archaic/Archaic.java b/src/main/java/resonantinduction/archaic/Archaic.java
index e985749be..5dbd2fc18 100644
--- a/src/main/java/resonantinduction/archaic/Archaic.java
+++ b/src/main/java/resonantinduction/archaic/Archaic.java
@@ -1,12 +1,11 @@
 package resonantinduction.archaic;
 
-import java.util.Arrays;
 import java.util.logging.Logger;
 
 import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.Settings;
 import resonantinduction.old.Reference;
-import calclavia.lib.utility.LanguageUtility;
+import calclavia.lib.network.PacketHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;
@@ -14,6 +13,7 @@ import cpw.mods.fml.common.ModMetadata;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkRegistry;
 
 /**
@@ -23,6 +23,7 @@ import cpw.mods.fml.common.network.NetworkRegistry;
  * 
  */
 @Mod(modid = Archaic.ID, name = Archaic.NAME, version = Reference.VERSION, dependencies = "required-after:" + ResonantInduction.ID)
+@NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
 public class Archaic
 {
 	/** Mod Information */
@@ -38,8 +39,6 @@ public class Archaic
 	@Mod.Metadata(ID)
 	public static ModMetadata metadata;
 
-	public static final Logger LOGGER = Logger.getLogger(Reference.NAME);
-
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent evt)
 	{
diff --git a/src/main/java/resonantinduction/core/ClientProxy.java b/src/main/java/resonantinduction/core/ClientProxy.java
index 28daadcc8..b18d28d2e 100644
--- a/src/main/java/resonantinduction/core/ClientProxy.java
+++ b/src/main/java/resonantinduction/core/ClientProxy.java
@@ -44,7 +44,7 @@ public class ClientProxy extends CommonProxy
 	}
 
 	@Override
-	public boolean isFancy()
+	public boolean isGraphicsFancy()
 	{
 		return FMLClientHandler.instance().getClient().gameSettings.fancyGraphics;
 	}
diff --git a/src/main/java/resonantinduction/core/CommonProxy.java b/src/main/java/resonantinduction/core/CommonProxy.java
index 02819d50c..fa0be5460 100644
--- a/src/main/java/resonantinduction/core/CommonProxy.java
+++ b/src/main/java/resonantinduction/core/CommonProxy.java
@@ -3,44 +3,20 @@
  */
 package resonantinduction.core;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
-import cpw.mods.fml.common.network.IGuiHandler;
+import resonantinduction.core.prefab.ProxyBase;
 
 /**
  * @author Calclavia
  * 
  */
-public class CommonProxy implements IGuiHandler
+public class CommonProxy extends ProxyBase
 {
-	public void preInit()
-	{
-
-	}
-
-	public void postInit()
-	{
-
-	}
-
-	@Override
-	public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z)
-	{
-		return null;
-	}
-
-	@Override
-	public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
-	{
-		return null;
-	}
-
 	public boolean isPaused()
 	{
 		return false;
 	}
 
-	public boolean isFancy()
+	public boolean isGraphicsFancy()
 	{
 		return false;
 	}
diff --git a/src/main/java/resonantinduction/core/ResonantInduction.java b/src/main/java/resonantinduction/core/ResonantInduction.java
index edfa43b25..a4b5cf319 100644
--- a/src/main/java/resonantinduction/core/ResonantInduction.java
+++ b/src/main/java/resonantinduction/core/ResonantInduction.java
@@ -7,10 +7,11 @@ import net.minecraftforge.common.MinecraftForge;
 import org.modstats.ModstatInfo;
 import org.modstats.Modstats;
 
+import resonantinduction.core.link.LinkEventHandler;
+import resonantinduction.core.prefab.part.PacketMultiPart;
 import resonantinduction.core.resource.ItemDust;
 import resonantinduction.core.resource.ResourceGenerator;
 import resonantinduction.old.Reference;
-import resonantinduction.old.core.multipart.PacketMultiPart;
 import calclavia.lib.network.PacketHandler;
 import calclavia.lib.network.PacketTile;
 import calclavia.lib.utility.LanguageUtility;
@@ -71,6 +72,7 @@ public class ResonantInduction
 
 		// Register Forge Events
 		MinecraftForge.EVENT_BUS.register(ResourceGenerator.INSTANCE);
+		MinecraftForge.EVENT_BUS.register(new LinkEventHandler());
 
 		Settings.CONFIGURATION.load();
 
diff --git a/src/main/java/resonantinduction/old/energy/ILinkable.java b/src/main/java/resonantinduction/core/link/ILinkable.java
similarity index 89%
rename from src/main/java/resonantinduction/old/energy/ILinkable.java
rename to src/main/java/resonantinduction/core/link/ILinkable.java
index 5a031f5ac..af0cb8890 100644
--- a/src/main/java/resonantinduction/old/energy/ILinkable.java
+++ b/src/main/java/resonantinduction/core/link/ILinkable.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy;
+package resonantinduction.core.link;
 
 import net.minecraft.entity.player.EntityPlayer;
 import universalelectricity.api.vector.VectorWorld;
diff --git a/src/main/java/resonantinduction/old/energy/LinkEvent.java b/src/main/java/resonantinduction/core/link/LinkEventHandler.java
similarity index 96%
rename from src/main/java/resonantinduction/old/energy/LinkEvent.java
rename to src/main/java/resonantinduction/core/link/LinkEventHandler.java
index 332dda96b..d1f801785 100644
--- a/src/main/java/resonantinduction/old/energy/LinkEvent.java
+++ b/src/main/java/resonantinduction/core/link/LinkEventHandler.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.old.energy;
+package resonantinduction.core.link;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -15,7 +15,7 @@ import codechicken.multipart.ControlKeyModifer;
 /**
  * @author Calclavia
  */
-public class LinkEvent
+public class LinkEventHandler
 {
 	@ForgeSubscribe
 	public void linkEvent(MultitoolEvent evt)
diff --git a/src/main/java/resonantinduction/core/prefab/ProxyBase.java b/src/main/java/resonantinduction/core/prefab/ProxyBase.java
new file mode 100644
index 000000000..1b121d340
--- /dev/null
+++ b/src/main/java/resonantinduction/core/prefab/ProxyBase.java
@@ -0,0 +1,33 @@
+package resonantinduction.core.prefab;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+import cpw.mods.fml.common.network.IGuiHandler;
+
+public abstract class ProxyBase implements IGuiHandler
+{
+	public void preInit()
+	{
+	}
+
+	public void init()
+	{
+	}
+
+	public void postInit()
+	{
+	}
+
+	@Override
+	public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
+	{
+		return null;
+	}
+
+	@Override
+	public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
+	{
+		return null;
+	}
+
+}
diff --git a/src/main/java/resonantinduction/old/core/multipart/PacketMultiPart.java b/src/main/java/resonantinduction/core/prefab/part/PacketMultiPart.java
similarity index 96%
rename from src/main/java/resonantinduction/old/core/multipart/PacketMultiPart.java
rename to src/main/java/resonantinduction/core/prefab/part/PacketMultiPart.java
index 3cfb9387a..3f4d8ecc1 100644
--- a/src/main/java/resonantinduction/old/core/multipart/PacketMultiPart.java
+++ b/src/main/java/resonantinduction/core/prefab/part/PacketMultiPart.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.core.multipart;
+package resonantinduction.core.prefab.part;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/resonantinduction/old/energy/ClientProxy.java b/src/main/java/resonantinduction/electrical/ClientProxy.java
similarity index 75%
rename from src/main/java/resonantinduction/old/energy/ClientProxy.java
rename to src/main/java/resonantinduction/electrical/ClientProxy.java
index b1420a449..43a44d4d1 100644
--- a/src/main/java/resonantinduction/old/energy/ClientProxy.java
+++ b/src/main/java/resonantinduction/electrical/ClientProxy.java
@@ -1,18 +1,18 @@
-package resonantinduction.old.energy;
+package resonantinduction.electrical;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
+import resonantinduction.electrical.battery.RenderBattery;
+import resonantinduction.electrical.battery.TileBattery;
+import resonantinduction.electrical.fx.FXElectricBolt;
+import resonantinduction.electrical.multimeter.GuiMultimeter;
+import resonantinduction.electrical.multimeter.PartMultimeter;
+import resonantinduction.electrical.tesla.RenderTesla;
+import resonantinduction.electrical.tesla.TileTesla;
 import resonantinduction.old.core.render.BlockRenderingHandler;
 import resonantinduction.old.core.render.RenderRIItem;
-import resonantinduction.old.energy.battery.RenderBattery;
-import resonantinduction.old.energy.battery.TileBattery;
-import resonantinduction.old.energy.fx.FXElectricBolt;
-import resonantinduction.old.energy.multimeter.GuiMultimeter;
-import resonantinduction.old.energy.multimeter.PartMultimeter;
-import resonantinduction.old.energy.tesla.RenderTesla;
-import resonantinduction.old.energy.tesla.TileTesla;
 import resonantinduction.old.transport.levitator.RenderLevitator;
 import resonantinduction.old.transport.levitator.TileEMLevitator;
 import universalelectricity.api.vector.Vector3;
@@ -35,8 +35,8 @@ public class ClientProxy extends CommonProxy
 	public void preInit()
 	{
 		RenderingRegistry.registerBlockHandler(BlockRenderingHandler.INSTANCE);
-		MinecraftForgeClient.registerItemRenderer(ResonantInductionEnergy.itemMultimeter.itemID, RenderRIItem.INSTANCE);
-		MinecraftForgeClient.registerItemRenderer(ResonantInductionEnergy.itemTransformer.itemID, RenderRIItem.INSTANCE);
+		MinecraftForgeClient.registerItemRenderer(Electrical.itemMultimeter.itemID, RenderRIItem.INSTANCE);
+		MinecraftForgeClient.registerItemRenderer(Electrical.itemTransformer.itemID, RenderRIItem.INSTANCE);
 		ClientRegistry.bindTileEntitySpecialRenderer(TileTesla.class, new RenderTesla());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEMLevitator.class, new RenderLevitator());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileBattery.class, new RenderBattery());
diff --git a/src/main/java/resonantinduction/old/energy/CommonProxy.java b/src/main/java/resonantinduction/electrical/CommonProxy.java
similarity index 77%
rename from src/main/java/resonantinduction/old/energy/CommonProxy.java
rename to src/main/java/resonantinduction/electrical/CommonProxy.java
index ee0ccd8c7..7e901f424 100644
--- a/src/main/java/resonantinduction/old/energy/CommonProxy.java
+++ b/src/main/java/resonantinduction/electrical/CommonProxy.java
@@ -1,35 +1,18 @@
-/**
- * 
- */
-package resonantinduction.old.energy;
+package resonantinduction.electrical;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import resonantinduction.old.electrical.multimeter.ContainerMultimeter;
-import resonantinduction.old.energy.multimeter.PartMultimeter;
-import universalelectricity.api.vector.Vector3;
 import codechicken.lib.colour.ColourRGBA;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;
-import cpw.mods.fml.common.network.IGuiHandler;
+import resonantinduction.core.prefab.ProxyBase;
+import resonantinduction.electrical.multimeter.ContainerMultimeter;
+import resonantinduction.electrical.multimeter.PartMultimeter;
+import universalelectricity.api.vector.Vector3;
 
-/**
- * @author Calclavia
- * 
- */
-public class CommonProxy implements IGuiHandler
+public class CommonProxy extends ProxyBase
 {
-	public void preInit()
-	{
-
-	}
-
-	public void postInit()
-	{
-
-	}
-
 	@Override
 	public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z)
 	{
@@ -47,12 +30,6 @@ public class CommonProxy implements IGuiHandler
 		return null;
 	}
 
-	@Override
-	public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
-	{
-		return null;
-	}
-
 	public void renderElectricShock(World world, Vector3 start, Vector3 target, float r, float g, float b, boolean split)
 	{
 
diff --git a/src/main/java/resonantinduction/old/energy/ResonantInductionEnergy.java b/src/main/java/resonantinduction/electrical/Electrical.java
similarity index 60%
rename from src/main/java/resonantinduction/old/energy/ResonantInductionEnergy.java
rename to src/main/java/resonantinduction/electrical/Electrical.java
index ee30ee2eb..b73ea6908 100644
--- a/src/main/java/resonantinduction/old/energy/ResonantInductionEnergy.java
+++ b/src/main/java/resonantinduction/electrical/Electrical.java
@@ -1,38 +1,26 @@
-package resonantinduction.old.energy;
+package resonantinduction.electrical;
 
 import ic2.api.item.Items;
-
-import java.util.Arrays;
-
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
-
-import org.modstats.Modstats;
-
 import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.ResonantInductionTabs;
 import resonantinduction.core.Settings;
+import resonantinduction.electrical.battery.BlockBattery;
+import resonantinduction.electrical.battery.ItemBlockBattery;
+import resonantinduction.electrical.battery.TileBattery;
+import resonantinduction.electrical.multimeter.ItemMultimeter;
+import resonantinduction.electrical.tesla.BlockTesla;
+import resonantinduction.electrical.tesla.TileTesla;
+import resonantinduction.electrical.transformer.ItemTransformer;
+import resonantinduction.electrical.wire.EnumWireMaterial;
+import resonantinduction.electrical.wire.ItemWire;
 import resonantinduction.old.Reference;
-import resonantinduction.old.core.multipart.MultipartRI;
-import resonantinduction.old.core.multipart.PacketMultiPart;
-import resonantinduction.old.electrical.multimeter.ItemMultimeter;
-import resonantinduction.old.energy.battery.BlockBattery;
-import resonantinduction.old.energy.battery.ItemBlockBattery;
-import resonantinduction.old.energy.battery.TileBattery;
-import resonantinduction.old.energy.tesla.BlockTesla;
-import resonantinduction.old.energy.tesla.TileTesla;
-import resonantinduction.old.energy.transformer.ItemTransformer;
-import resonantinduction.old.energy.wire.EnumWireMaterial;
-import resonantinduction.old.energy.wire.ItemWire;
 import calclavia.lib.network.PacketHandler;
-import calclavia.lib.network.PacketTile;
 import calclavia.lib.recipe.UniversalRecipe;
-import calclavia.lib.utility.LanguageUtility;
-import codechicken.lib.colour.ColourRGBA;
-import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
@@ -47,24 +35,23 @@ import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 /**
- * The core module of Resonant Induction
+ * Resonant Induction Electrical Module
  * 
  * @author Calclavia
  * 
  */
-//@Mod(modid = ResonantInductionEnergy.ID, name = Reference.NAME, version = Reference.VERSION, dependencies = "required-after:ResonantInduction|Core")
-//@NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
-public class ResonantInductionEnergy
+@Mod(modid = Electrical.ID, name = Electrical.NAME, version = Reference.VERSION, dependencies = "required-after:" + ResonantInduction.ID)
+@NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
+public class Electrical
 {
-	/**
-	 * Mod Information
-	 */
-	public static final String ID = "ResonantInduction|Energy";
+	/** Mod Information */
+	public static final String ID = "ResonantInduction|Electrical";
+	public static final String NAME = Reference.NAME + " Electrical";
 
 	@Instance(ID)
-	public static ResonantInductionEnergy INSTANCE;
+	public static Electrical INSTANCE;
 
-	//@SidedProxy(clientSide = "resonantinduction.energy.ClientProxy", serverSide = "resonantinduction.energy.CommonProxy")
+	@SidedProxy(clientSide = "resonantinduction.electrical.ClientProxy", serverSide = "resonantinduction.electrical.CommonProxy")
 	public static CommonProxy proxy;
 
 	@Mod.Metadata(ID)
@@ -76,21 +63,14 @@ public class ResonantInductionEnergy
 	public static Item itemTransformer;
 
 	// Blocks
-	public static Block blockTesla, blockBattery;
-
-	/**
-	 * Packets
-	 */
-	public static final PacketTile PACKET_TILE = new PacketTile(Reference.CHANNEL);
-	public static final PacketMultiPart PACKET_MULTIPART = new PacketMultiPart(Reference.CHANNEL);
-	public static final ColourRGBA[] DYE_COLORS = new ColourRGBA[] { new ColourRGBA(255, 255, 255, 255), new ColourRGBA(1, 0, 0, 1d), new ColourRGBA(0, 0.608, 0.232, 1d), new ColourRGBA(0.588, 0.294, 0, 1d), new ColourRGBA(0, 0, 1, 1d), new ColourRGBA(0.5, 0, 05, 1d), new ColourRGBA(0, 1, 1, 1d), new ColourRGBA(0.8, 0.8, 0.8, 1d), new ColourRGBA(0.3, 0.3, 0.3, 1d), new ColourRGBA(1, 0.412, 0.706, 1d), new ColourRGBA(0.616, 1, 0, 1d), new ColourRGBA(1, 1, 0, 1d), new ColourRGBA(0.46f, 0.932, 1, 1d), new ColourRGBA(0.5, 0.2, 0.5, 1d), new ColourRGBA(0.7, 0.5, 0.1, 1d), new ColourRGBA(1, 1, 1, 1d) };
+	public static Block blockTesla;
+	public static Block blockBattery;
 
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent evt)
 	{
-		ResonantInduction.LOGGER.setParent(FMLLog.getLogger());
-		NetworkRegistry.instance().registerGuiHandler(this, ResonantInductionEnergy.proxy);
-		Modstats.instance().getReporter().registerMod(this);
+		NetworkRegistry.instance().registerGuiHandler(this, proxy);
+
 		Settings.CONFIGURATION.load();
 
 		// Items
@@ -113,8 +93,6 @@ public class ResonantInductionEnergy
 		GameRegistry.registerTileEntity(TileTesla.class, blockTesla.getUnlocalizedName());
 		GameRegistry.registerTileEntity(TileBattery.class, blockBattery.getUnlocalizedName());
 
-		ResonantInductionEnergy.proxy.preInit();
-
 		/**
 		 * Set reference itemstacks
 		 */
@@ -124,22 +102,15 @@ public class ResonantInductionEnergy
 		{
 			material.setWire(itemPartWire);
 		}
+		proxy.preInit();
 	}
 
 	@EventHandler
 	public void init(FMLInitializationEvent evt)
 	{
-		metadata.modId = ID;
-		metadata.name = Reference.NAME;
-		metadata.description = LanguageUtility.getLocal("meta.resonantinduction.description");
-		metadata.url = "http://calclavia.com/resonant-induction";
-		metadata.logoFile = "ri_logo.png";
-		metadata.version = Reference.VERSION + "." + Reference.BUILD_VERSION;
-		metadata.authorList = Arrays.asList(new String[] { "Calclavia", "DarkCow" });
-		metadata.credits = LanguageUtility.getLocal("meta.resonantinduction.credits");
-		metadata.autogenerated = false;
-
-		MultipartRI.INSTANCE = new MultipartRI();
+		Settings.setModMetadata(metadata, ID, NAME);
+		MultipartElectrical.INSTANCE = new MultipartElectrical();
+		proxy.init();
 	}
 
 	@EventHandler
@@ -181,6 +152,7 @@ public class ResonantInductionEnergy
 		{
 			GameRegistry.addRecipe(new ShapelessOreRecipe(EnumWireMaterial.COPPER.getWire(), "universalCable"));
 		}
-		ResonantInductionEnergy.proxy.postInit();
+
+		proxy.postInit();
 	}
 }
diff --git a/src/main/java/resonantinduction/old/core/multipart/MultipartRI.java b/src/main/java/resonantinduction/electrical/MultipartElectrical.java
similarity index 64%
rename from src/main/java/resonantinduction/old/core/multipart/MultipartRI.java
rename to src/main/java/resonantinduction/electrical/MultipartElectrical.java
index 9cff47e79..986548009 100644
--- a/src/main/java/resonantinduction/old/core/multipart/MultipartRI.java
+++ b/src/main/java/resonantinduction/electrical/MultipartElectrical.java
@@ -1,28 +1,28 @@
-package resonantinduction.old.core.multipart;
+package resonantinduction.electrical;
 
-import resonantinduction.old.energy.multimeter.PartMultimeter;
-import resonantinduction.old.energy.transformer.PartTransformer;
-import resonantinduction.old.energy.wire.flat.PartFlatSwitchWire;
-import resonantinduction.old.energy.wire.flat.PartFlatWire;
-import resonantinduction.old.energy.wire.framed.PartFramedSwitchWire;
-import resonantinduction.old.energy.wire.framed.PartFramedWire;
+import resonantinduction.electrical.multimeter.PartMultimeter;
+import resonantinduction.electrical.transformer.PartTransformer;
+import resonantinduction.electrical.wire.flat.PartFlatSwitchWire;
+import resonantinduction.electrical.wire.flat.PartFlatWire;
+import resonantinduction.electrical.wire.framed.PartFramedSwitchWire;
+import resonantinduction.electrical.wire.framed.PartFramedWire;
 import codechicken.multipart.MultiPartRegistry;
 import codechicken.multipart.MultiPartRegistry.IPartFactory;
 import codechicken.multipart.MultipartGenerator;
 import codechicken.multipart.TMultiPart;
 
-public class MultipartRI implements IPartFactory
+public class MultipartElectrical implements IPartFactory
 {
-	public static MultipartRI INSTANCE;
+	public static MultipartElectrical INSTANCE;
 
 	public static final String[] PART_TYPES = { "resonant_induction_wire", "resonant_induction_switch_wire", "resonant_induction_flat_wire", "resonant_induction_flat_switch_wire", "resonant_induction_multimeter", "resonant_induction_transformer" };
 
-	public MultipartRI()
+	public MultipartElectrical()
 	{
 		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("universalelectricity.api.energy.IConductor", "resonantinduction.electrical.wire.trait.TraitConductor");
+		MultipartGenerator.registerTrait("cofh.api.energy.IEnergyHandler", "resonantinduction.electrical.wire.trait.TraitEnergyHandler");
+		MultipartGenerator.registerTrait("ic2.api.energy.tile.IEnergySink", "resonantinduction.electrical.wire.trait.TraitEnergySink");
 	}
 
 	@Override
diff --git a/src/main/java/resonantinduction/old/energy/battery/BatteryStructure.java b/src/main/java/resonantinduction/electrical/battery/BatteryStructure.java
similarity index 95%
rename from src/main/java/resonantinduction/old/energy/battery/BatteryStructure.java
rename to src/main/java/resonantinduction/electrical/battery/BatteryStructure.java
index b844a178e..ca410c6ab 100644
--- a/src/main/java/resonantinduction/old/energy/battery/BatteryStructure.java
+++ b/src/main/java/resonantinduction/electrical/battery/BatteryStructure.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.battery;
+package resonantinduction.electrical.battery;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/resonantinduction/old/energy/battery/BlockBattery.java b/src/main/java/resonantinduction/electrical/battery/BlockBattery.java
similarity index 97%
rename from src/main/java/resonantinduction/old/energy/battery/BlockBattery.java
rename to src/main/java/resonantinduction/electrical/battery/BlockBattery.java
index 320a801c9..002c67883 100644
--- a/src/main/java/resonantinduction/old/energy/battery/BlockBattery.java
+++ b/src/main/java/resonantinduction/electrical/battery/BlockBattery.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.old.energy.battery;
+package resonantinduction.electrical.battery;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/main/java/resonantinduction/old/energy/battery/ItemBlockBattery.java b/src/main/java/resonantinduction/electrical/battery/ItemBlockBattery.java
similarity index 99%
rename from src/main/java/resonantinduction/old/energy/battery/ItemBlockBattery.java
rename to src/main/java/resonantinduction/electrical/battery/ItemBlockBattery.java
index 64a4df4f7..a8db99022 100644
--- a/src/main/java/resonantinduction/old/energy/battery/ItemBlockBattery.java
+++ b/src/main/java/resonantinduction/electrical/battery/ItemBlockBattery.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.battery;
+package resonantinduction.electrical.battery;
 
 import java.util.List;
 
diff --git a/src/main/java/resonantinduction/old/energy/battery/RenderBattery.java b/src/main/java/resonantinduction/electrical/battery/RenderBattery.java
similarity index 96%
rename from src/main/java/resonantinduction/old/energy/battery/RenderBattery.java
rename to src/main/java/resonantinduction/electrical/battery/RenderBattery.java
index 87de891d2..441a1b28c 100644
--- a/src/main/java/resonantinduction/old/energy/battery/RenderBattery.java
+++ b/src/main/java/resonantinduction/electrical/battery/RenderBattery.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.old.energy.battery;
+package resonantinduction.electrical.battery;
 
 import static org.lwjgl.opengl.GL11.glPopMatrix;
 import static org.lwjgl.opengl.GL11.glPushMatrix;
diff --git a/src/main/java/resonantinduction/old/energy/battery/TileBattery.java b/src/main/java/resonantinduction/electrical/battery/TileBattery.java
similarity index 98%
rename from src/main/java/resonantinduction/old/energy/battery/TileBattery.java
rename to src/main/java/resonantinduction/electrical/battery/TileBattery.java
index c2fa5ba10..898433c32 100644
--- a/src/main/java/resonantinduction/old/energy/battery/TileBattery.java
+++ b/src/main/java/resonantinduction/electrical/battery/TileBattery.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.battery;
+package resonantinduction.electrical.battery;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/main/java/resonantinduction/old/energy/fx/FXElectricBolt.java b/src/main/java/resonantinduction/electrical/fx/FXElectricBolt.java
similarity index 99%
rename from src/main/java/resonantinduction/old/energy/fx/FXElectricBolt.java
rename to src/main/java/resonantinduction/electrical/fx/FXElectricBolt.java
index e37baa4d0..73299abe1 100644
--- a/src/main/java/resonantinduction/old/energy/fx/FXElectricBolt.java
+++ b/src/main/java/resonantinduction/electrical/fx/FXElectricBolt.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.fx;
+package resonantinduction.electrical.fx;
 
 import static org.lwjgl.opengl.GL11.GL_BLEND;
 import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA;
diff --git a/src/main/java/resonantinduction/old/electrical/multimeter/ContainerMultimeter.java b/src/main/java/resonantinduction/electrical/multimeter/ContainerMultimeter.java
similarity index 90%
rename from src/main/java/resonantinduction/old/electrical/multimeter/ContainerMultimeter.java
rename to src/main/java/resonantinduction/electrical/multimeter/ContainerMultimeter.java
index 4e3fb0d58..0dca13f42 100644
--- a/src/main/java/resonantinduction/old/electrical/multimeter/ContainerMultimeter.java
+++ b/src/main/java/resonantinduction/electrical/multimeter/ContainerMultimeter.java
@@ -1,13 +1,12 @@
 /**
  * 
  */
-package resonantinduction.old.electrical.multimeter;
+package resonantinduction.electrical.multimeter;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
-import resonantinduction.old.energy.multimeter.PartMultimeter;
 
 /**
  * @author Calclavia
diff --git a/src/main/java/resonantinduction/old/energy/multimeter/GuiMultimeter.java b/src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java
similarity index 96%
rename from src/main/java/resonantinduction/old/energy/multimeter/GuiMultimeter.java
rename to src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java
index 8e0b4ad78..7633474d7 100644
--- a/src/main/java/resonantinduction/old/energy/multimeter/GuiMultimeter.java
+++ b/src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java
@@ -1,14 +1,13 @@
 /**
  * 
  */
-package resonantinduction.old.energy.multimeter;
+package resonantinduction.electrical.multimeter;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
 import resonantinduction.old.Reference;
-import resonantinduction.old.electrical.multimeter.ContainerMultimeter;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import calclavia.lib.gui.GuiContainerBase;
 import calclavia.lib.render.EnumColor;
diff --git a/src/main/java/resonantinduction/old/electrical/multimeter/ItemMultimeter.java b/src/main/java/resonantinduction/electrical/multimeter/ItemMultimeter.java
similarity index 94%
rename from src/main/java/resonantinduction/old/electrical/multimeter/ItemMultimeter.java
rename to src/main/java/resonantinduction/electrical/multimeter/ItemMultimeter.java
index 39a45114b..4423bb510 100644
--- a/src/main/java/resonantinduction/old/electrical/multimeter/ItemMultimeter.java
+++ b/src/main/java/resonantinduction/electrical/multimeter/ItemMultimeter.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.electrical.multimeter;
+package resonantinduction.electrical.multimeter;
 
 import java.util.List;
 
@@ -9,8 +9,7 @@ import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.prefab.part.ItemMultipartBase;
-import resonantinduction.old.energy.multimeter.PartMultimeter;
-import resonantinduction.old.energy.wire.EnumWireMaterial;
+import resonantinduction.electrical.wire.EnumWireMaterial;
 import calclavia.lib.utility.LanguageUtility;
 import codechicken.lib.vec.BlockCoord;
 import codechicken.lib.vec.Vector3;
diff --git a/src/main/java/resonantinduction/old/electrical/multimeter/ItemReadoutTools.java b/src/main/java/resonantinduction/electrical/multimeter/ItemReadoutTools.java
similarity index 99%
rename from src/main/java/resonantinduction/old/electrical/multimeter/ItemReadoutTools.java
rename to src/main/java/resonantinduction/electrical/multimeter/ItemReadoutTools.java
index 08797796a..a820e1c31 100644
--- a/src/main/java/resonantinduction/old/electrical/multimeter/ItemReadoutTools.java
+++ b/src/main/java/resonantinduction/electrical/multimeter/ItemReadoutTools.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.electrical.multimeter;
+package resonantinduction.electrical.multimeter;
 
 import java.util.List;
 
diff --git a/src/main/java/resonantinduction/old/energy/multimeter/ModelMultimeter.java b/src/main/java/resonantinduction/electrical/multimeter/ModelMultimeter.java
similarity index 97%
rename from src/main/java/resonantinduction/old/energy/multimeter/ModelMultimeter.java
rename to src/main/java/resonantinduction/electrical/multimeter/ModelMultimeter.java
index eb67d0952..7073097d1 100644
--- a/src/main/java/resonantinduction/old/energy/multimeter/ModelMultimeter.java
+++ b/src/main/java/resonantinduction/electrical/multimeter/ModelMultimeter.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.multimeter;
+package resonantinduction.electrical.multimeter;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
diff --git a/src/main/java/resonantinduction/old/energy/multimeter/PartMultimeter.java b/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
similarity index 97%
rename from src/main/java/resonantinduction/old/energy/multimeter/PartMultimeter.java
rename to src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
index e89af79db..3dd135ccc 100644
--- a/src/main/java/resonantinduction/old/energy/multimeter/PartMultimeter.java
+++ b/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.old.energy.multimeter;
+package resonantinduction.electrical.multimeter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -16,8 +16,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.ResonantInduction;
-import resonantinduction.old.electrical.multimeter.RenderMultimeter;
-import resonantinduction.old.energy.ResonantInductionEnergy;
+import resonantinduction.electrical.Electrical;
 import universalelectricity.api.CompatibilityModule;
 import universalelectricity.api.energy.IConductor;
 import universalelectricity.api.energy.IEnergyNetwork;
@@ -351,7 +350,7 @@ public class PartMultimeter extends JCuboidPart implements IPacketReceiver, TFac
 
 	protected ItemStack getItem()
 	{
-		return new ItemStack(ResonantInductionEnergy.itemMultimeter);
+		return new ItemStack(Electrical.itemMultimeter);
 	}
 
 	@Override
diff --git a/src/main/java/resonantinduction/old/electrical/multimeter/RenderMultimeter.java b/src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java
similarity index 96%
rename from src/main/java/resonantinduction/old/electrical/multimeter/RenderMultimeter.java
rename to src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java
index c97b3c210..e41e513d5 100644
--- a/src/main/java/resonantinduction/old/electrical/multimeter/RenderMultimeter.java
+++ b/src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.electrical.multimeter;
+package resonantinduction.electrical.multimeter;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
@@ -8,8 +8,6 @@ import net.minecraftforge.common.ForgeDirection;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.old.Reference;
-import resonantinduction.old.energy.multimeter.ModelMultimeter;
-import resonantinduction.old.energy.multimeter.PartMultimeter;
 import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import cpw.mods.fml.client.FMLClientHandler;
diff --git a/src/main/java/resonantinduction/old/energy/tesla/BlockTesla.java b/src/main/java/resonantinduction/electrical/tesla/BlockTesla.java
similarity index 98%
rename from src/main/java/resonantinduction/old/energy/tesla/BlockTesla.java
rename to src/main/java/resonantinduction/electrical/tesla/BlockTesla.java
index 8e19cfd1e..4b1d1b6a5 100644
--- a/src/main/java/resonantinduction/old/energy/tesla/BlockTesla.java
+++ b/src/main/java/resonantinduction/electrical/tesla/BlockTesla.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.old.energy.tesla;
+package resonantinduction.electrical.tesla;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/resonantinduction/old/energy/tesla/ITesla.java b/src/main/java/resonantinduction/electrical/tesla/ITesla.java
similarity index 90%
rename from src/main/java/resonantinduction/old/energy/tesla/ITesla.java
rename to src/main/java/resonantinduction/electrical/tesla/ITesla.java
index 5ceb0cf2f..99da86026 100644
--- a/src/main/java/resonantinduction/old/energy/tesla/ITesla.java
+++ b/src/main/java/resonantinduction/electrical/tesla/ITesla.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.old.energy.tesla;
+package resonantinduction.electrical.tesla;
 
 import net.minecraft.tileentity.TileEntity;
 
diff --git a/src/main/java/resonantinduction/old/energy/tesla/ModelTeslaBottom.java b/src/main/java/resonantinduction/electrical/tesla/ModelTeslaBottom.java
similarity index 99%
rename from src/main/java/resonantinduction/old/energy/tesla/ModelTeslaBottom.java
rename to src/main/java/resonantinduction/electrical/tesla/ModelTeslaBottom.java
index 1171431bb..21acabcc2 100644
--- a/src/main/java/resonantinduction/old/energy/tesla/ModelTeslaBottom.java
+++ b/src/main/java/resonantinduction/electrical/tesla/ModelTeslaBottom.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.tesla;
+package resonantinduction.electrical.tesla;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
diff --git a/src/main/java/resonantinduction/old/energy/tesla/ModelTeslaMiddle.java b/src/main/java/resonantinduction/electrical/tesla/ModelTeslaMiddle.java
similarity index 99%
rename from src/main/java/resonantinduction/old/energy/tesla/ModelTeslaMiddle.java
rename to src/main/java/resonantinduction/electrical/tesla/ModelTeslaMiddle.java
index bfc66e42b..490915c63 100644
--- a/src/main/java/resonantinduction/old/energy/tesla/ModelTeslaMiddle.java
+++ b/src/main/java/resonantinduction/electrical/tesla/ModelTeslaMiddle.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.tesla;
+package resonantinduction.electrical.tesla;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
diff --git a/src/main/java/resonantinduction/old/energy/tesla/ModelTeslaTop.java b/src/main/java/resonantinduction/electrical/tesla/ModelTeslaTop.java
similarity index 99%
rename from src/main/java/resonantinduction/old/energy/tesla/ModelTeslaTop.java
rename to src/main/java/resonantinduction/electrical/tesla/ModelTeslaTop.java
index 56af1217b..20bb1bcf8 100644
--- a/src/main/java/resonantinduction/old/energy/tesla/ModelTeslaTop.java
+++ b/src/main/java/resonantinduction/electrical/tesla/ModelTeslaTop.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.tesla;
+package resonantinduction.electrical.tesla;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
diff --git a/src/main/java/resonantinduction/old/energy/tesla/RenderTesla.java b/src/main/java/resonantinduction/electrical/tesla/RenderTesla.java
similarity index 97%
rename from src/main/java/resonantinduction/old/energy/tesla/RenderTesla.java
rename to src/main/java/resonantinduction/electrical/tesla/RenderTesla.java
index f6e9156ff..cb98e9583 100644
--- a/src/main/java/resonantinduction/old/energy/tesla/RenderTesla.java
+++ b/src/main/java/resonantinduction/electrical/tesla/RenderTesla.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.old.energy.tesla;
+package resonantinduction.electrical.tesla;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/resonantinduction/old/energy/tesla/TeslaGrid.java b/src/main/java/resonantinduction/electrical/tesla/TeslaGrid.java
similarity index 96%
rename from src/main/java/resonantinduction/old/energy/tesla/TeslaGrid.java
rename to src/main/java/resonantinduction/electrical/tesla/TeslaGrid.java
index 7d7852305..87de2a91e 100644
--- a/src/main/java/resonantinduction/old/energy/tesla/TeslaGrid.java
+++ b/src/main/java/resonantinduction/electrical/tesla/TeslaGrid.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.old.energy.tesla;
+package resonantinduction.electrical.tesla;
 
 import java.util.HashSet;
 import java.util.Iterator;
diff --git a/src/main/java/resonantinduction/old/energy/tesla/TileTesla.java b/src/main/java/resonantinduction/electrical/tesla/TileTesla.java
similarity index 95%
rename from src/main/java/resonantinduction/old/energy/tesla/TileTesla.java
rename to src/main/java/resonantinduction/electrical/tesla/TileTesla.java
index c39c84fa6..48ab9e5be 100644
--- a/src/main/java/resonantinduction/old/energy/tesla/TileTesla.java
+++ b/src/main/java/resonantinduction/electrical/tesla/TileTesla.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.old.energy.tesla;
+package resonantinduction.electrical.tesla;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -21,8 +21,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.Settings;
+import resonantinduction.core.link.ILinkable;
+import resonantinduction.electrical.Electrical;
 import resonantinduction.old.Reference;
-import resonantinduction.old.energy.ILinkable;
 import universalelectricity.api.energy.EnergyStorageHandler;
 import universalelectricity.api.vector.Vector3;
 import universalelectricity.api.vector.VectorWorld;
@@ -30,7 +31,9 @@ import calclavia.lib.CustomDamageSource;
 import calclavia.lib.network.IPacketReceiver;
 import calclavia.lib.network.IPacketSender;
 import calclavia.lib.prefab.tile.TileElectrical;
+import calclavia.lib.render.EnumColor;
 import calclavia.lib.utility.LanguageUtility;
+import codechicken.lib.colour.ColourRGBA;
 
 import com.google.common.io.ByteArrayDataInput;
 
@@ -137,7 +140,7 @@ public class TileTesla extends TileElectrical implements ITesla, IPacketSender,
 					}
 					else
 					{
-						ResonantInduction.proxy.renderElectricShock(this.worldObj, topTeslaVector.clone().translate(0.5), topTeslaVector.clone().translate(new Vector3(0.5, Double.POSITIVE_INFINITY, 0.5)), false);
+						Electrical.proxy.renderElectricShock(this.worldObj, topTeslaVector.clone().translate(0.5), topTeslaVector.clone().translate(new Vector3(0.5, Double.POSITIVE_INFINITY, 0.5)), false);
 					}
 				}
 				else
@@ -218,7 +221,8 @@ public class TileTesla extends TileElectrical implements ITesla, IPacketSender,
 							}
 
 							double distance = topTeslaVector.distance(targetVector);
-							ResonantInduction.proxy.renderElectricShock(this.worldObj, new Vector3(topTesla).translate(new Vector3(0.5)), targetVector.translate(new Vector3(0.5)), ResonantInduction.DYE_COLORS[this.dyeID]);
+							//TODO: Fix color.
+							Electrical.proxy.renderElectricShock(this.worldObj, new Vector3(topTesla).translate(new Vector3(0.5)), targetVector.translate(new Vector3(0.5)), new ColourRGBA(EnumColor.DYES[this.dyeID].toColor().getRGB()));
 
 							this.transfer(tesla, Math.min(transferEnergy, TRANSFER_CAP));
 
@@ -236,7 +240,7 @@ public class TileTesla extends TileElectrical implements ITesla, IPacketSender,
 									if (mop.entityHit instanceof EntityLivingBase)
 									{
 										mop.entityHit.attackEntityFrom(CustomDamageSource.electrocution, 4);
-										ResonantInduction.proxy.renderElectricShock(this.worldObj, new Vector3(topTesla).clone().translate(0.5), new Vector3(mop.entityHit));
+										Electrical.proxy.renderElectricShock(this.worldObj, new Vector3(topTesla).clone().translate(0.5), new Vector3(mop.entityHit));
 									}
 								}
 							}
diff --git a/src/main/java/resonantinduction/old/energy/transformer/ItemTransformer.java b/src/main/java/resonantinduction/electrical/transformer/ItemTransformer.java
similarity index 89%
rename from src/main/java/resonantinduction/old/energy/transformer/ItemTransformer.java
rename to src/main/java/resonantinduction/electrical/transformer/ItemTransformer.java
index 1f2deb3fa..a1cffce0e 100644
--- a/src/main/java/resonantinduction/old/energy/transformer/ItemTransformer.java
+++ b/src/main/java/resonantinduction/electrical/transformer/ItemTransformer.java
@@ -1,11 +1,11 @@
-package resonantinduction.old.energy.transformer;
+package resonantinduction.electrical.transformer;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import resonantinduction.core.prefab.part.ItemMultipartBase;
-import resonantinduction.old.energy.wire.EnumWireMaterial;
+import resonantinduction.electrical.wire.EnumWireMaterial;
 import codechicken.lib.vec.BlockCoord;
 import codechicken.lib.vec.Vector3;
 import codechicken.multipart.MultiPartRegistry;
diff --git a/src/main/java/resonantinduction/old/energy/transformer/ModelTransformer.java b/src/main/java/resonantinduction/electrical/transformer/ModelTransformer.java
similarity index 98%
rename from src/main/java/resonantinduction/old/energy/transformer/ModelTransformer.java
rename to src/main/java/resonantinduction/electrical/transformer/ModelTransformer.java
index 7bfd68f13..4c227cfe1 100644
--- a/src/main/java/resonantinduction/old/energy/transformer/ModelTransformer.java
+++ b/src/main/java/resonantinduction/electrical/transformer/ModelTransformer.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.transformer;
+package resonantinduction.electrical.transformer;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
diff --git a/src/main/java/resonantinduction/old/energy/transformer/PartTransformer.java b/src/main/java/resonantinduction/electrical/transformer/PartTransformer.java
similarity index 98%
rename from src/main/java/resonantinduction/old/energy/transformer/PartTransformer.java
rename to src/main/java/resonantinduction/electrical/transformer/PartTransformer.java
index 253b93fc7..9b887bcd2 100644
--- a/src/main/java/resonantinduction/old/energy/transformer/PartTransformer.java
+++ b/src/main/java/resonantinduction/electrical/transformer/PartTransformer.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.transformer;
+package resonantinduction.electrical.transformer;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -11,7 +11,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.core.ResonantInduction;
+import resonantinduction.electrical.Electrical;
 import universalelectricity.api.electricity.IElectricalNetwork;
 import universalelectricity.api.electricity.IVoltageInput;
 import universalelectricity.api.electricity.IVoltageOutput;
@@ -111,7 +111,7 @@ public class PartTransformer extends JCuboidPart implements JNormalOcclusion, TF
 
 	protected ItemStack getItem()
 	{
-		return new ItemStack(ResonantInduction.itemTransformer);
+		return new ItemStack(Electrical.itemTransformer);
 	}
 
 	@Override
diff --git a/src/main/java/resonantinduction/old/energy/transformer/RenderTransformer.java b/src/main/java/resonantinduction/electrical/transformer/RenderTransformer.java
similarity index 98%
rename from src/main/java/resonantinduction/old/energy/transformer/RenderTransformer.java
rename to src/main/java/resonantinduction/electrical/transformer/RenderTransformer.java
index 92cddfe3d..528b1b5b1 100644
--- a/src/main/java/resonantinduction/old/energy/transformer/RenderTransformer.java
+++ b/src/main/java/resonantinduction/electrical/transformer/RenderTransformer.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.transformer;
+package resonantinduction.electrical.transformer;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/resonantinduction/old/energy/wire/EnumWireMaterial.java b/src/main/java/resonantinduction/electrical/wire/EnumWireMaterial.java
similarity index 97%
rename from src/main/java/resonantinduction/old/energy/wire/EnumWireMaterial.java
rename to src/main/java/resonantinduction/electrical/wire/EnumWireMaterial.java
index 9cf6a6c32..6bfc57f4b 100644
--- a/src/main/java/resonantinduction/old/energy/wire/EnumWireMaterial.java
+++ b/src/main/java/resonantinduction/electrical/wire/EnumWireMaterial.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.wire;
+package resonantinduction.electrical.wire;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
diff --git a/src/main/java/resonantinduction/old/energy/wire/ItemWire.java b/src/main/java/resonantinduction/electrical/wire/ItemWire.java
similarity index 93%
rename from src/main/java/resonantinduction/old/energy/wire/ItemWire.java
rename to src/main/java/resonantinduction/electrical/wire/ItemWire.java
index b9a122413..3b6da92ac 100644
--- a/src/main/java/resonantinduction/old/energy/wire/ItemWire.java
+++ b/src/main/java/resonantinduction/electrical/wire/ItemWire.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.wire;
+package resonantinduction.electrical.wire;
 
 import java.util.List;
 
@@ -16,11 +16,11 @@ import org.lwjgl.input.Keyboard;
 import resonantinduction.core.ResonantInductionTabs;
 import resonantinduction.core.Settings;
 import resonantinduction.core.Utility;
+import resonantinduction.electrical.wire.flat.PartFlatWire;
+import resonantinduction.electrical.wire.flat.RenderFlatWire;
+import resonantinduction.electrical.wire.framed.PartFramedWire;
+import resonantinduction.electrical.wire.framed.RenderPartWire;
 import resonantinduction.old.Reference;
-import resonantinduction.old.energy.wire.flat.PartFlatWire;
-import resonantinduction.old.energy.wire.flat.RenderFlatWire;
-import resonantinduction.old.energy.wire.framed.PartFramedWire;
-import resonantinduction.old.energy.wire.framed.RenderPartWire;
 import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import calclavia.lib.render.EnumColor;
@@ -33,7 +33,7 @@ import codechicken.multipart.MultiPartRegistry;
 import codechicken.multipart.TMultiPart;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
+//TODO: AUTO COLOR WIRES!
 public class ItemWire extends JItemMultiPart
 {
 	private Icon[] icons = new Icon[EnumWireMaterial.values().length];
diff --git a/src/main/java/resonantinduction/old/energy/wire/PartAdvancedWire.java b/src/main/java/resonantinduction/electrical/wire/PartAdvancedWire.java
similarity index 99%
rename from src/main/java/resonantinduction/old/energy/wire/PartAdvancedWire.java
rename to src/main/java/resonantinduction/electrical/wire/PartAdvancedWire.java
index dc66ad4a8..00f0a35e0 100644
--- a/src/main/java/resonantinduction/old/energy/wire/PartAdvancedWire.java
+++ b/src/main/java/resonantinduction/electrical/wire/PartAdvancedWire.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.wire;
+package resonantinduction.electrical.wire;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/resonantinduction/old/energy/wire/PartConductor.java b/src/main/java/resonantinduction/electrical/wire/PartConductor.java
similarity index 98%
rename from src/main/java/resonantinduction/old/energy/wire/PartConductor.java
rename to src/main/java/resonantinduction/electrical/wire/PartConductor.java
index 5a12184bb..678ca311d 100644
--- a/src/main/java/resonantinduction/old/energy/wire/PartConductor.java
+++ b/src/main/java/resonantinduction/electrical/wire/PartConductor.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.wire;
+package resonantinduction.electrical.wire;
 
 import ic2.api.energy.event.EnergyTileLoadEvent;
 import ic2.api.energy.event.EnergyTileUnloadEvent;
diff --git a/src/main/java/resonantinduction/old/energy/wire/flat/PartFlatSwitchWire.java b/src/main/java/resonantinduction/electrical/wire/flat/PartFlatSwitchWire.java
similarity index 97%
rename from src/main/java/resonantinduction/old/energy/wire/flat/PartFlatSwitchWire.java
rename to src/main/java/resonantinduction/electrical/wire/flat/PartFlatSwitchWire.java
index 0cbcd80f8..9f4fda4b4 100644
--- a/src/main/java/resonantinduction/old/energy/wire/flat/PartFlatSwitchWire.java
+++ b/src/main/java/resonantinduction/electrical/wire/flat/PartFlatSwitchWire.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.wire.flat;
+package resonantinduction.electrical.wire.flat;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/resonantinduction/old/energy/wire/flat/PartFlatWire.java b/src/main/java/resonantinduction/electrical/wire/flat/PartFlatWire.java
similarity index 98%
rename from src/main/java/resonantinduction/old/energy/wire/flat/PartFlatWire.java
rename to src/main/java/resonantinduction/electrical/wire/flat/PartFlatWire.java
index 4a114e075..dcfb0df85 100644
--- a/src/main/java/resonantinduction/old/energy/wire/flat/PartFlatWire.java
+++ b/src/main/java/resonantinduction/electrical/wire/flat/PartFlatWire.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.wire.flat;
+package resonantinduction.electrical.wire.flat;
 
 import java.util.Arrays;
 
@@ -15,11 +15,12 @@ import net.minecraftforge.common.ForgeDirection;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.Utility;
-import resonantinduction.old.energy.wire.EnumWireMaterial;
-import resonantinduction.old.energy.wire.PartAdvancedWire;
+import resonantinduction.electrical.wire.EnumWireMaterial;
+import resonantinduction.electrical.wire.PartAdvancedWire;
+import calclavia.lib.render.EnumColor;
 import codechicken.lib.colour.Colour;
+import codechicken.lib.colour.ColourRGBA;
 import codechicken.lib.data.MCDataInput;
 import codechicken.lib.data.MCDataOutput;
 import codechicken.lib.lighting.LazyLightMatrix;
@@ -894,7 +895,7 @@ public class PartFlatWire extends PartAdvancedWire implements TFacePart, JNormal
 
 	public Colour getColour()
 	{
-		return this.isInsulated ? ResonantInduction.DYE_COLORS[this.color] : this.getMaterial().color;
+		return this.isInsulated ? new ColourRGBA(EnumColor.DYES[this.color].toColor().getRGB()) : this.getMaterial().color;
 	}
 
 	public boolean useStaticRenderer()
diff --git a/src/main/java/resonantinduction/old/energy/wire/flat/RenderFlatWire.java b/src/main/java/resonantinduction/electrical/wire/flat/RenderFlatWire.java
similarity index 99%
rename from src/main/java/resonantinduction/old/energy/wire/flat/RenderFlatWire.java
rename to src/main/java/resonantinduction/electrical/wire/flat/RenderFlatWire.java
index 57f21c9bf..83f86a66c 100644
--- a/src/main/java/resonantinduction/old/energy/wire/flat/RenderFlatWire.java
+++ b/src/main/java/resonantinduction/electrical/wire/flat/RenderFlatWire.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.wire.flat;
+package resonantinduction.electrical.wire.flat;
 
 import java.util.Arrays;
 import java.util.LinkedList;
diff --git a/src/main/java/resonantinduction/old/energy/wire/framed/PartFramedSwitchWire.java b/src/main/java/resonantinduction/electrical/wire/framed/PartFramedSwitchWire.java
similarity index 97%
rename from src/main/java/resonantinduction/old/energy/wire/framed/PartFramedSwitchWire.java
rename to src/main/java/resonantinduction/electrical/wire/framed/PartFramedSwitchWire.java
index c61a6b23c..73cee9648 100644
--- a/src/main/java/resonantinduction/old/energy/wire/framed/PartFramedSwitchWire.java
+++ b/src/main/java/resonantinduction/electrical/wire/framed/PartFramedSwitchWire.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.wire.framed;
+package resonantinduction.electrical.wire.framed;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/resonantinduction/old/energy/wire/framed/PartFramedWire.java b/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java
similarity index 98%
rename from src/main/java/resonantinduction/old/energy/wire/framed/PartFramedWire.java
rename to src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java
index b7fae9b07..0817c23b1 100644
--- a/src/main/java/resonantinduction/old/energy/wire/framed/PartFramedWire.java
+++ b/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.wire.framed;
+package resonantinduction.electrical.wire.framed;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -14,8 +14,8 @@ import net.minecraft.util.Icon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.old.energy.wire.EnumWireMaterial;
-import resonantinduction.old.energy.wire.PartAdvancedWire;
+import resonantinduction.electrical.wire.EnumWireMaterial;
+import resonantinduction.electrical.wire.PartAdvancedWire;
 import universalelectricity.api.CompatibilityModule;
 import universalelectricity.api.energy.IConductor;
 import universalelectricity.api.vector.Vector3;
diff --git a/src/main/java/resonantinduction/old/energy/wire/framed/RenderPartWire.java b/src/main/java/resonantinduction/electrical/wire/framed/RenderPartWire.java
similarity index 95%
rename from src/main/java/resonantinduction/old/energy/wire/framed/RenderPartWire.java
rename to src/main/java/resonantinduction/electrical/wire/framed/RenderPartWire.java
index af5745881..555bbf338 100644
--- a/src/main/java/resonantinduction/old/energy/wire/framed/RenderPartWire.java
+++ b/src/main/java/resonantinduction/electrical/wire/framed/RenderPartWire.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.wire.framed;
+package resonantinduction.electrical.wire.framed;
 
 import java.nio.FloatBuffer;
 import java.util.Map;
@@ -11,10 +11,12 @@ import net.minecraftforge.common.ForgeDirection;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 
+import calclavia.lib.render.EnumColor;
 import resonantinduction.core.ResonantInduction;
+import resonantinduction.core.render.InvertX;
 import resonantinduction.old.Reference;
-import resonantinduction.old.core.render.InvertX;
 import codechicken.lib.colour.Colour;
+import codechicken.lib.colour.ColourRGBA;
 import codechicken.lib.lighting.LightModel;
 import codechicken.lib.render.CCModel;
 import codechicken.lib.render.CCRenderState;
@@ -165,7 +167,7 @@ public class RenderPartWire
 
 		if (wire.isInsulated())
 		{
-			Colour insulationColour = ResonantInduction.DYE_COLORS[wire.getColor()];
+			Colour insulationColour = new ColourRGBA(EnumColor.DYES[wire.getColor()].toColor().getRGB());
 			renderPart(insulationIcon, models.get(name + "Insulation"), wire.x(), wire.y(), wire.z(), insulationColour);
 		}
 	}
diff --git a/src/main/java/resonantinduction/old/energy/wire/trait/TraitConductor.java b/src/main/java/resonantinduction/electrical/wire/trait/TraitConductor.java
similarity index 98%
rename from src/main/java/resonantinduction/old/energy/wire/trait/TraitConductor.java
rename to src/main/java/resonantinduction/electrical/wire/trait/TraitConductor.java
index 515dfa721..b3a703c88 100644
--- a/src/main/java/resonantinduction/old/energy/wire/trait/TraitConductor.java
+++ b/src/main/java/resonantinduction/electrical/wire/trait/TraitConductor.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.wire.trait;
+package resonantinduction.electrical.wire.trait;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/main/java/resonantinduction/old/energy/wire/trait/TraitEnergyHandler.java b/src/main/java/resonantinduction/electrical/wire/trait/TraitEnergyHandler.java
similarity index 97%
rename from src/main/java/resonantinduction/old/energy/wire/trait/TraitEnergyHandler.java
rename to src/main/java/resonantinduction/electrical/wire/trait/TraitEnergyHandler.java
index 757dd2140..65a29fb34 100644
--- a/src/main/java/resonantinduction/old/energy/wire/trait/TraitEnergyHandler.java
+++ b/src/main/java/resonantinduction/electrical/wire/trait/TraitEnergyHandler.java
@@ -1,10 +1,10 @@
-package resonantinduction.old.energy.wire.trait;
+package resonantinduction.electrical.wire.trait;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.old.energy.wire.PartConductor;
+import resonantinduction.electrical.wire.PartConductor;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;
 import cofh.api.energy.IEnergyHandler;
diff --git a/src/main/java/resonantinduction/old/energy/wire/trait/TraitEnergySink.java b/src/main/java/resonantinduction/electrical/wire/trait/TraitEnergySink.java
similarity index 97%
rename from src/main/java/resonantinduction/old/energy/wire/trait/TraitEnergySink.java
rename to src/main/java/resonantinduction/electrical/wire/trait/TraitEnergySink.java
index db9899a08..8c28ff294 100644
--- a/src/main/java/resonantinduction/old/energy/wire/trait/TraitEnergySink.java
+++ b/src/main/java/resonantinduction/electrical/wire/trait/TraitEnergySink.java
@@ -1,4 +1,4 @@
-package resonantinduction.old.energy.wire.trait;
+package resonantinduction.electrical.wire.trait;
 
 import ic2.api.energy.tile.IEnergySink;
 
diff --git a/src/main/java/resonantinduction/old/core/render/BlockRenderingHandler.java b/src/main/java/resonantinduction/old/core/render/BlockRenderingHandler.java
index a4cd739fc..639b744ef 100644
--- a/src/main/java/resonantinduction/old/core/render/BlockRenderingHandler.java
+++ b/src/main/java/resonantinduction/old/core/render/BlockRenderingHandler.java
@@ -12,10 +12,10 @@ import static org.lwjgl.opengl.GL11.glTranslatef;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
-import resonantinduction.old.energy.battery.BlockBattery;
-import resonantinduction.old.energy.battery.RenderBattery;
-import resonantinduction.old.energy.tesla.BlockTesla;
-import resonantinduction.old.energy.tesla.RenderTesla;
+import resonantinduction.electrical.battery.BlockBattery;
+import resonantinduction.electrical.battery.RenderBattery;
+import resonantinduction.electrical.tesla.BlockTesla;
+import resonantinduction.electrical.tesla.RenderTesla;
 import resonantinduction.old.transport.levitator.BlockLevitator;
 import resonantinduction.old.transport.levitator.RenderLevitator;
 import cpw.mods.fml.client.FMLClientHandler;
diff --git a/src/main/java/resonantinduction/old/core/render/RenderRIItem.java b/src/main/java/resonantinduction/old/core/render/RenderRIItem.java
index 205e21b26..a86a96f1a 100644
--- a/src/main/java/resonantinduction/old/core/render/RenderRIItem.java
+++ b/src/main/java/resonantinduction/old/core/render/RenderRIItem.java
@@ -5,10 +5,10 @@ import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.old.electrical.multimeter.ItemMultimeter;
-import resonantinduction.old.electrical.multimeter.RenderMultimeter;
-import resonantinduction.old.energy.transformer.ItemTransformer;
-import resonantinduction.old.energy.transformer.RenderTransformer;
+import resonantinduction.electrical.multimeter.ItemMultimeter;
+import resonantinduction.electrical.multimeter.RenderMultimeter;
+import resonantinduction.electrical.transformer.ItemTransformer;
+import resonantinduction.electrical.transformer.RenderTransformer;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
diff --git a/src/main/java/resonantinduction/old/mechanics/ClientProxy.java b/src/main/java/resonantinduction/old/mechanics/ClientProxy.java
index 309c2e9b7..d7fd5120f 100644
--- a/src/main/java/resonantinduction/old/mechanics/ClientProxy.java
+++ b/src/main/java/resonantinduction/old/mechanics/ClientProxy.java
@@ -4,10 +4,10 @@ import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+import resonantinduction.electrical.fx.FXElectricBolt;
+import resonantinduction.electrical.multimeter.GuiMultimeter;
+import resonantinduction.electrical.multimeter.PartMultimeter;
 import resonantinduction.old.core.render.BlockRenderingHandler;
-import resonantinduction.old.energy.fx.FXElectricBolt;
-import resonantinduction.old.energy.multimeter.GuiMultimeter;
-import resonantinduction.old.energy.multimeter.PartMultimeter;
 import universalelectricity.api.vector.Vector3;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;
diff --git a/src/main/java/resonantinduction/old/mechanics/CommonProxy.java b/src/main/java/resonantinduction/old/mechanics/CommonProxy.java
index 58dab0d2c..84249d7d4 100644
--- a/src/main/java/resonantinduction/old/mechanics/CommonProxy.java
+++ b/src/main/java/resonantinduction/old/mechanics/CommonProxy.java
@@ -6,8 +6,8 @@ package resonantinduction.old.mechanics;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import resonantinduction.old.electrical.multimeter.ContainerMultimeter;
-import resonantinduction.old.energy.multimeter.PartMultimeter;
+import resonantinduction.electrical.multimeter.ContainerMultimeter;
+import resonantinduction.electrical.multimeter.PartMultimeter;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;
 import cpw.mods.fml.common.network.IGuiHandler;
diff --git a/src/main/java/resonantinduction/old/mechanics/ResonantInductionMechanics.java b/src/main/java/resonantinduction/old/mechanics/ResonantInductionMechanics.java
index 53897fbb5..e880ea87d 100644
--- a/src/main/java/resonantinduction/old/mechanics/ResonantInductionMechanics.java
+++ b/src/main/java/resonantinduction/old/mechanics/ResonantInductionMechanics.java
@@ -19,10 +19,10 @@ import org.modstats.Modstats;
 
 import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.Settings;
+import resonantinduction.core.prefab.part.PacketMultiPart;
 import resonantinduction.core.resource.ResourceGenerator;
+import resonantinduction.electrical.MultipartElectrical;
 import resonantinduction.old.Reference;
-import resonantinduction.old.core.multipart.MultipartRI;
-import resonantinduction.old.core.multipart.PacketMultiPart;
 import resonantinduction.old.mechanics.furnace.BlockAdvancedFurnace;
 import resonantinduction.old.mechanics.furnace.TileAdvancedFurnace;
 import resonantinduction.old.mechanics.item.ItemDust;
@@ -147,7 +147,7 @@ public class ResonantInductionMechanics
 		metadata.credits = LanguageUtility.getLocal("meta.resonantinduction.credits");
 		metadata.autogenerated = false;
 
-		MultipartRI.INSTANCE = new MultipartRI();
+		MultipartElectrical.INSTANCE = new MultipartElectrical();
 	}
 
 	@EventHandler
diff --git a/src/main/java/resonantinduction/old/transport/ResonantInductionTransport.java b/src/main/java/resonantinduction/old/transport/ResonantInductionTransport.java
index ce3f69404..040510c9b 100644
--- a/src/main/java/resonantinduction/old/transport/ResonantInductionTransport.java
+++ b/src/main/java/resonantinduction/old/transport/ResonantInductionTransport.java
@@ -21,6 +21,7 @@ import resonantinduction.core.network.PacketIDTile;
 import resonantinduction.core.resource.ItemBlockOre;
 import resonantinduction.core.resource.ItemParts;
 import resonantinduction.core.resource.ItemParts.Parts;
+import resonantinduction.electrical.multimeter.ItemReadoutTools;
 import resonantinduction.old.api.coding.TaskRegistry;
 import resonantinduction.old.blocks.BlockColorGlass;
 import resonantinduction.old.blocks.BlockColorGlowGlass;
@@ -39,7 +40,6 @@ import resonantinduction.old.core.misc.ItemColoredDust;
 import resonantinduction.old.core.misc.ItemCommonTool;
 import resonantinduction.old.core.misc.ItemFarmEgg;
 import resonantinduction.old.core.recipe.RecipeLoader;
-import resonantinduction.old.electrical.multimeter.ItemReadoutTools;
 import resonantinduction.old.lib.CoreRegistry;
 import resonantinduction.old.lib.EnumMaterial;
 import resonantinduction.old.lib.EnumOrePart;
diff --git a/src/main/java/resonantinduction/old/transport/levitator/TileEMLevitator.java b/src/main/java/resonantinduction/old/transport/levitator/TileEMLevitator.java
index 0307e0812..f1615cd2b 100644
--- a/src/main/java/resonantinduction/old/transport/levitator/TileEMLevitator.java
+++ b/src/main/java/resonantinduction/old/transport/levitator/TileEMLevitator.java
@@ -23,8 +23,8 @@ import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.IFluidBlock;
 import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.Settings;
-import resonantinduction.old.energy.ILinkable;
-import resonantinduction.old.energy.tesla.TileTesla;
+import resonantinduction.core.link.ILinkable;
+import resonantinduction.electrical.tesla.TileTesla;
 import universalelectricity.api.vector.Vector3;
 import universalelectricity.api.vector.VectorWorld;
 import calclavia.lib.network.IPacketReceiver;
@@ -143,7 +143,7 @@ public class TileEMLevitator extends TileAdvanced implements IPacketReceiver, IP
 				}
 			}
 
-			final int renderFrequency = ResonantInduction.proxy.isFancy() ? 1 + worldObj.rand.nextInt(2) : 10 + worldObj.rand.nextInt(2);
+			final int renderFrequency = ResonantInduction.proxy.isGraphicsFancy() ? 1 + worldObj.rand.nextInt(2) : 10 + worldObj.rand.nextInt(2);
 			final boolean renderBeam = ticks % renderFrequency == 0 && hasLink() && linked.suck != suck;
 
 			if (hasLink())