diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java b/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java
index 3a33d085..99ead715 100644
--- a/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java
+++ b/mechanical/src/main/scala/resonantinduction/mechanical/ClientProxy.java
@@ -1,9 +1,9 @@
 package resonantinduction.mechanical;
 
 import resonant.lib.render.item.GlobalItemRenderer;
-import resonantinduction.mechanica.gearshaft.RenderGearShaft;
 import resonantinduction.mechanical.fluid.pipe.RenderPipe;
 import resonantinduction.mechanical.gear.RenderGear;
+import resonantinduction.mechanical.gearshaft.RenderGearShaft;
 
 public class ClientProxy extends CommonProxy
 {
diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java b/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java
index d7abce81..6498598a 100644
--- a/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java
+++ b/mechanical/src/main/scala/resonantinduction/mechanical/Mechanical.java
@@ -18,7 +18,6 @@ import resonantinduction.core.Reference;
 import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.Settings;
 import resonantinduction.core.TabRI;
-import resonantinduction.mechanica.gearshaft.ItemGearShaft;
 import resonantinduction.mechanical.belt.BlockConveyorBelt;
 import resonantinduction.mechanical.belt.TileConveyorBelt;
 import resonantinduction.mechanical.energy.grid.MechanicalNode;
@@ -32,6 +31,7 @@ import resonantinduction.mechanical.fluid.pipe.EnumPipeMaterial;
 import resonantinduction.mechanical.fluid.pipe.ItemPipe;
 import resonantinduction.mechanical.fluid.transport.TilePump;
 import resonantinduction.mechanical.gear.ItemGear;
+import resonantinduction.mechanical.gearshaft.ItemGearShaft;
 import resonantinduction.mechanical.logistic.belt.BlockDetector;
 import resonantinduction.mechanical.logistic.belt.BlockManipulator;
 import resonantinduction.mechanical.logistic.belt.TileDetector;
diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/gear/PartGearShaft.java b/mechanical/src/main/scala/resonantinduction/mechanical/gear/PartGearShaft.java
index eb3c773c..42ce2aa4 100644
--- a/mechanical/src/main/scala/resonantinduction/mechanical/gear/PartGearShaft.java
+++ b/mechanical/src/main/scala/resonantinduction/mechanical/gear/PartGearShaft.java
@@ -6,10 +6,10 @@ import java.util.Set;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.mechanica.gearshaft.GearShaftNode;
-import resonantinduction.mechanica.gearshaft.RenderGearShaft;
 import resonantinduction.mechanical.Mechanical;
 import resonantinduction.mechanical.energy.grid.PartMechanical;
+import resonantinduction.mechanical.gearshaft.GearShaftNode;
+import resonantinduction.mechanical.gearshaft.RenderGearShaft;
 import codechicken.lib.raytracer.IndexedCuboid6;
 import codechicken.lib.vec.Cuboid6;
 import codechicken.lib.vec.Vector3;
diff --git a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/GearShaftNode.java b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/GearShaftNode.java
similarity index 98%
rename from mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/GearShaftNode.java
rename to mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/GearShaftNode.java
index 95ca38fc..a74bfa21 100644
--- a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/GearShaftNode.java
+++ b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/GearShaftNode.java
@@ -1,4 +1,4 @@
-package resonantinduction.mechanica.gearshaft;
+package resonantinduction.mechanical.gearshaft;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ItemGearShaft.java b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ItemGearShaft.java
similarity index 96%
rename from mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ItemGearShaft.java
rename to mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ItemGearShaft.java
index 6bff56da..32f01b24 100644
--- a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ItemGearShaft.java
+++ b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ItemGearShaft.java
@@ -1,4 +1,4 @@
-package resonantinduction.mechanica.gearshaft;
+package resonantinduction.mechanical.gearshaft;
 
 import java.util.List;
 
diff --git a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/RenderGearShaft.java b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/RenderGearShaft.java
similarity index 97%
rename from mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/RenderGearShaft.java
rename to mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/RenderGearShaft.java
index 99b43490..20cf4712 100644
--- a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/RenderGearShaft.java
+++ b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/RenderGearShaft.java
@@ -1,4 +1,4 @@
-package resonantinduction.mechanica.gearshaft;
+package resonantinduction.mechanical.gearshaft;
 
 import static org.lwjgl.opengl.GL11.glRotatef;
 import net.minecraft.item.ItemStack;
diff --git a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ShaftGrid.java b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ShaftGrid.java
similarity index 81%
rename from mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ShaftGrid.java
rename to mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ShaftGrid.java
index 6aff0639..bd2f392e 100644
--- a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ShaftGrid.java
+++ b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ShaftGrid.java
@@ -1,4 +1,4 @@
-package resonantinduction.mechanica.gearshaft;
+package resonantinduction.mechanical.gearshaft;
 
 import resonant.lib.grid.NodeGrid;
 
diff --git a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ShaftSubNode.java b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ShaftSubNode.java
similarity index 89%
rename from mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ShaftSubNode.java
rename to mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ShaftSubNode.java
index 51e3e957..5a1b7576 100644
--- a/mechanical/src/main/scala/resonantinduction/mechanica/gearshaft/ShaftSubNode.java
+++ b/mechanical/src/main/scala/resonantinduction/mechanical/gearshaft/ShaftSubNode.java
@@ -1,4 +1,4 @@
-package resonantinduction.mechanica.gearshaft;
+package resonantinduction.mechanical.gearshaft;
 
 import resonant.api.grid.INodeProvider;
 import resonant.lib.grid.Node;