diff --git a/src/main/scala/resonantinduction/electrical/multimeter/MultimeterNetwork.java b/src/main/scala/resonantinduction/electrical/multimeter/MultimeterGrid.java
similarity index 97%
rename from src/main/scala/resonantinduction/electrical/multimeter/MultimeterNetwork.java
rename to src/main/scala/resonantinduction/electrical/multimeter/MultimeterGrid.java
index 6b2db6bc9..2327e36b9 100644
--- a/src/main/scala/resonantinduction/electrical/multimeter/MultimeterNetwork.java
+++ b/src/main/scala/resonantinduction/electrical/multimeter/MultimeterGrid.java
@@ -7,13 +7,14 @@ import java.util.List;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import resonant.lib.utility.LanguageUtility;
+import resonantinduction.electrical.multimeter.graph.*;
 import universalelectricity.api.UnitDisplay;
 import universalelectricity.api.core.grid.IUpdate;
 import universalelectricity.core.grid.Grid;
 import universalelectricity.core.grid.UpdateTicker;
 import universalelectricity.core.transform.vector.Vector3;
 
-public class MultimeterNetwork extends Grid<PartMultimeter> implements IUpdate
+public class MultimeterGrid extends Grid<PartMultimeter> implements IUpdate
 {
 	public final List<String> displayInformation = new ArrayList<String>();
 
@@ -62,7 +63,7 @@ public class MultimeterNetwork extends Grid<PartMultimeter> implements IUpdate
 	public boolean isEnabled = true;
 	public PartMultimeter primaryMultimeter = null;
 
-	public MultimeterNetwork()
+	public MultimeterGrid()
 	{
 		super(PartMultimeter.class);
 		graphs.add(energyGraph);
diff --git a/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.java b/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.java
index cb71fa5a5..3f123564b 100644
--- a/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.java
+++ b/src/main/scala/resonantinduction/electrical/multimeter/PartMultimeter.java
@@ -16,11 +16,9 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import resonant.api.IRemovable;
-import resonant.engine.ResonantEngine;
 import resonant.lib.network.discriminator.PacketType;
 import resonant.lib.network.handle.IPacketReceiver;
 import resonant.lib.utility.WrenchUtility;
-import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.interfaces.IMechanicalNode;
 import resonantinduction.core.prefab.part.PartFace;
 import resonantinduction.electrical.Electrical;
@@ -32,8 +30,6 @@ import codechicken.multipart.IRedstonePart;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;
 
-import com.google.common.io.ByteArrayDataInput;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import resonantinduction.electrical.ElectricalContent;
@@ -74,7 +70,7 @@ public class PartMultimeter extends PartFace implements IRedstonePart, IPacketRe
     private boolean doDetect = true;
 
     public boolean isPrimary;
-    private MultimeterNetwork network;
+    private MultimeterGrid network;
 
     public boolean hasMultimeter(int x, int y, int z)
     {
@@ -451,11 +447,11 @@ public class PartMultimeter extends PartFace implements IRedstonePart, IPacketRe
     }
 
 
-    public MultimeterNetwork getNetwork()
+    public MultimeterGrid getNetwork()
     {
         if (network == null)
         {
-            network = new MultimeterNetwork();
+            network = new MultimeterGrid();
             network.add(this);
         }
 
@@ -463,7 +459,7 @@ public class PartMultimeter extends PartFace implements IRedstonePart, IPacketRe
     }
 
 
-    public void setNetwork(MultimeterNetwork network)
+    public void setNetwork(MultimeterGrid network)
     {
         this.network = network;
     }
diff --git a/src/main/scala/resonantinduction/electrical/multimeter/Graph.java b/src/main/scala/resonantinduction/electrical/multimeter/graph/Graph.java
similarity index 95%
rename from src/main/scala/resonantinduction/electrical/multimeter/Graph.java
rename to src/main/scala/resonantinduction/electrical/multimeter/graph/Graph.java
index 40cbf8a5a..8422a96f2 100644
--- a/src/main/scala/resonantinduction/electrical/multimeter/Graph.java
+++ b/src/main/scala/resonantinduction/electrical/multimeter/graph/Graph.java
@@ -1,4 +1,4 @@
-package resonantinduction.electrical.multimeter;
+package resonantinduction.electrical.multimeter.graph;
 
 import net.minecraft.nbt.NBTTagCompound;
 import resonant.lib.type.EvictingList;
diff --git a/src/main/scala/resonantinduction/electrical/multimeter/GraphD.java b/src/main/scala/resonantinduction/electrical/multimeter/graph/GraphD.java
similarity index 96%
rename from src/main/scala/resonantinduction/electrical/multimeter/GraphD.java
rename to src/main/scala/resonantinduction/electrical/multimeter/graph/GraphD.java
index 97591c7d2..87cdfa8e6 100644
--- a/src/main/scala/resonantinduction/electrical/multimeter/GraphD.java
+++ b/src/main/scala/resonantinduction/electrical/multimeter/graph/GraphD.java
@@ -1,4 +1,4 @@
-package resonantinduction.electrical.multimeter;
+package resonantinduction.electrical.multimeter.graph;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
diff --git a/src/main/scala/resonantinduction/electrical/multimeter/GraphF.java b/src/main/scala/resonantinduction/electrical/multimeter/graph/GraphF.java
similarity index 96%
rename from src/main/scala/resonantinduction/electrical/multimeter/GraphF.java
rename to src/main/scala/resonantinduction/electrical/multimeter/graph/GraphF.java
index 7a6ef3e3a..6db4b3112 100644
--- a/src/main/scala/resonantinduction/electrical/multimeter/GraphF.java
+++ b/src/main/scala/resonantinduction/electrical/multimeter/graph/GraphF.java
@@ -1,4 +1,4 @@
-package resonantinduction.electrical.multimeter;
+package resonantinduction.electrical.multimeter.graph;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
diff --git a/src/main/scala/resonantinduction/electrical/multimeter/GraphI.java b/src/main/scala/resonantinduction/electrical/multimeter/graph/GraphI.java
similarity index 96%
rename from src/main/scala/resonantinduction/electrical/multimeter/GraphI.java
rename to src/main/scala/resonantinduction/electrical/multimeter/graph/GraphI.java
index 6ba28adab..f7e655b23 100644
--- a/src/main/scala/resonantinduction/electrical/multimeter/GraphI.java
+++ b/src/main/scala/resonantinduction/electrical/multimeter/graph/GraphI.java
@@ -1,4 +1,4 @@
-package resonantinduction.electrical.multimeter;
+package resonantinduction.electrical.multimeter.graph;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
diff --git a/src/main/scala/resonantinduction/electrical/multimeter/GraphL.java b/src/main/scala/resonantinduction/electrical/multimeter/graph/GraphL.java
similarity index 96%
rename from src/main/scala/resonantinduction/electrical/multimeter/GraphL.java
rename to src/main/scala/resonantinduction/electrical/multimeter/graph/GraphL.java
index 875bce51b..5bae342de 100644
--- a/src/main/scala/resonantinduction/electrical/multimeter/GraphL.java
+++ b/src/main/scala/resonantinduction/electrical/multimeter/graph/GraphL.java
@@ -1,4 +1,4 @@
-package resonantinduction.electrical.multimeter;
+package resonantinduction.electrical.multimeter.graph;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;