diff --git a/build.xml b/build.xml
index 844017e..8678b8f 100644
--- a/build.xml
+++ b/build.xml
@@ -318,11 +318,11 @@
 
         <!-- Reobf. Can't use SRG names due to smart moving support -->
         <exec dir="${mcp.dir}" executable="cmd" osfamily="windows">
-            <arg line="/c reobfuscate.bat"/>
+            <arg line="/c reobfuscate_srg.bat"/>
         </exec>
 
         <exec dir="${mcp.dir}" executable="sh" osfamily="unix">
-            <arg value="reobfuscate.sh"/>
+            <arg value="reobfuscate_srg.sh"/>
         </exec>
 
         <copy todir="${classes.dir}">
diff --git a/src/minecraft/net/machinemuse/powersuits/client/render/item/ArmorModel.scala b/src/minecraft/net/machinemuse/powersuits/client/render/item/ArmorModel.scala
index 5c0e45c..a4f8510 100644
--- a/src/minecraft/net/machinemuse/powersuits/client/render/item/ArmorModel.scala
+++ b/src/minecraft/net/machinemuse/powersuits/client/render/item/ArmorModel.scala
@@ -9,20 +9,15 @@ import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraftforge.client.model.obj.WavefrontObject
 import net.minecraft.nbt.NBTTagCompound
-import net.minecraft.src.ModelPlayer
 
 object ArmorModel {
-  val instance:ArmorModel = try {
+  val instance: ArmorModel = try {
     new SMovingArmorModel
   } catch {
-    case _:Throwable => new VanillaArmorModel
+    case _: Throwable => new VanillaArmorModel
   }
 }
 
-class SMovingArmorModel extends ModelPlayer(0) with ArmorModel
-
-class VanillaArmorModel extends ModelBiped(0) with ArmorModel
-
 trait ArmorModel extends ModelBiped {
   var renderSpec: NBTTagCompound = null
   var visible: Int = 0
diff --git a/src/minecraft/net/machinemuse/powersuits/client/render/item/SMovingArmorModel.scala b/src/minecraft/net/machinemuse/powersuits/client/render/item/SMovingArmorModel.scala
new file mode 100644
index 0000000..6197039
--- /dev/null
+++ b/src/minecraft/net/machinemuse/powersuits/client/render/item/SMovingArmorModel.scala
@@ -0,0 +1,9 @@
+package net.machinemuse.powersuits.client.render.item
+
+import net.minecraft.src.ModelPlayer
+
+/**
+ * Author: MachineMuse (Claire Semple)
+ * Created: 9:23 PM, 11/07/13
+ */
+class SMovingArmorModel extends ModelPlayer(0) with ArmorModel
\ No newline at end of file
diff --git a/src/minecraft/net/machinemuse/powersuits/client/render/item/VanillaArmorModel.scala b/src/minecraft/net/machinemuse/powersuits/client/render/item/VanillaArmorModel.scala
new file mode 100644
index 0000000..2b2e807
--- /dev/null
+++ b/src/minecraft/net/machinemuse/powersuits/client/render/item/VanillaArmorModel.scala
@@ -0,0 +1,9 @@
+package net.machinemuse.powersuits.client.render.item
+
+import net.minecraft.client.model.ModelBiped
+
+/**
+ * Author: MachineMuse (Claire Semple)
+ * Created: 9:24 PM, 11/07/13
+ */
+class VanillaArmorModel extends ModelBiped(0) with ArmorModel
diff --git a/src/minecraft/net/minecraft/src/ModelPlayer.java b/src/minecraft/net/minecraft/src/ModelPlayer.java
index 1bb98bc..fb7fa4e 100644
--- a/src/minecraft/net/minecraft/src/ModelPlayer.java
+++ b/src/minecraft/net/minecraft/src/ModelPlayer.java
@@ -2,12 +2,11 @@ package net.minecraft.src;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.model.ModelBiped;
 
 @SideOnly(Side.CLIENT)
-public class ModelPlayer extends net.minecraft.client.model.ModelBiped
-{
-    public ModelPlayer(float var1)
-    {
+public class ModelPlayer extends ModelBiped {
+    public ModelPlayer(float var1) {
         super(var1);
     }
 }
\ No newline at end of file