diff --git a/.classpath b/.classpath
index b958ba93c1..d48aef6506 100644
--- a/.classpath
+++ b/.classpath
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="common"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="src" path="minecraft_server"/>
+	<classpathentry kind="src" path="server"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000000..b665331c3e
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ====================================================================== 
+     30 Mar 2012 13:35:40                                                        
+
+     FML    
+     The Forge Mod Loader
+                   
+     cpw                                                                
+     ====================================================================== -->
+<project name="FML" default="build">
+  <description>The Forge Mod Loader</description>
+  <macrodef name="side">
+    <attribute name="prop" />
+    <attribute name="src" />
+    <attribute name="side" />
+    <sequential>
+      <property name="@{prop}" value="${@{side}.@{src}}" />
+      <condition property="is.client">
+        <equals arg1="@{side}" arg2="client" />
+      </condition>
+      <condition property="is.server">
+        <equals arg1="@{side}" arg2="server" />
+      </condition>
+    </sequential>
+  </macrodef>
+
+  <target name="init">
+    <tstamp>
+      <format pattern="yyMMddHHmmss" property="timestamp" />
+    </tstamp>
+    <property environment="env" />
+    <property file="fmlbuild.properties" />
+    <property name="modname" value="fml" />
+    <property name="version.major" value="0" />
+    <property name="version.minor" value="0" />
+    <property name="version.rev" value="0" />
+    <condition property="version.build" value="${env.BUILD_NUMBER}" else="1">
+      <isset property="env.BUILD_NUMBER" />
+    </condition>
+    <property name="version" value="${version.major}.${version.minor}.${version.rev}.${version.build}" />
+    <condition property="dev.home" value="${env.WORKSPACE}" else="${default.dev.home}">
+      <isset property="env.WORKSPACE" />
+    </condition>
+    <condition property="mcp.home" value="${env.WORKSPACE}/mcpworkspace" else="${default.mcp.home}">
+      <isset property="env.WORKSPACE" />
+    </condition>
+    <condition property="python.exe" value="${mcp.home}/runtime/bin/python.exe" else="python">
+      <os family="Windows"/>
+    </condition>
+    <property name="mcp.obfoutput" location="${mcp.home}/reobf" />
+    <property name="client.mcp.obfoutput" location="${mcp.obfoutput}/minecraft" />
+    <property name="server.mcp.obfoutput" location="${mcp.obfoutput}/minecraft_server" />
+    <property name="mcp.srcdir" location="${mcp.home}/src" />
+    <property name="client.mcp.srcdir" location="${mcp.srcdir}/minecraft" />
+    <property name="server.mcp.srcdir" location="${mcp.srcdir}/minecraft_server" />
+    <property name="common.src.dir" location="${basedir}/common" />
+    <property name="client.src.dir" location="${basedir}/client" />
+    <property name="server.src.dir" location="${basedir}/server" />
+    <property name="patch.src.dir" location="${basedir}/patches" />
+  </target>
+  
+  <target name="clean">
+    <exec executable="${python.exe}" dir="${mcp.home}">
+      <arg value="${mcp.home}/runtime/cleanup.py"/>
+      <arg value="-f" />
+    </exec>
+    <exec executable="${python.exe}" dir="${mcp.home}">
+      <arg value="${mcp.home}/runtime/decompile.py"/>
+      <arg value="-l" />
+      <arg value="-g" />
+    </exec>
+  </target>
+
+  <target name="buildandreobfmcp" depends="init">
+    <exec executable="${python.exe}" dir="${mcp.home}">
+      <arg value="${mcp.home}/runtime/recompile.py"/>
+    </exec>
+    <exec executable="${python.exe}" dir="${mcp.home}">
+      <arg value="${mcp.home}/runtime/reobfuscate.py"/>
+    </exec>
+  </target>
+
+  <target name="merge-client" depends="init,clean">
+    <antcall target="merge-source">
+      <param name="side" value="client" />
+    </antcall>
+  </target>
+
+  <target name="merge-server" depends="init,clean">
+    <antcall target="merge-source">
+      <param name="side" value="server" />
+    </antcall>
+  </target>
+
+  <target name="merge-source">
+    <side prop="merge-to" src="mcp.srcdir" side="${side}" />
+    <side prop="side-from" src="src.dir" side="${side}" />
+
+    <copy todir="${merge-to}" overwrite="true" verbose="true">
+      <fileset dir="${side-from}" includes="**/*.java" />
+      <fileset dir="${common.src.dir}" includes="**/*.java" />
+      <filterchain>
+        <replacetokens>
+          <token key="MAJOR" value="${version.major}" />
+          <token key="MINOR" value="${version.minor}" />
+          <token key="REV" value="${version.rev}" />
+          <token key="BUILD" value="${version.build}" />
+        </replacetokens>
+      </filterchain>
+    </copy>
+  </target>
+
+  <target name="build-client" depends="init,merge-client,buildandreobfmcp">
+    <antcall target="extract-built-jar">
+      <param name="side" value="client" />
+    </antcall>
+  </target>
+
+  <target name="build-server" depends="init,clean,merge-server,buildandreobfmcp">
+    <antcall target="extract-built-jar">
+      <param name="side" value="server" />
+    </antcall>
+  </target>
+
+  <target name="extract-built-jar">
+    <side prop="output" src="mcp.obfoutput" side="${side}" />
+    <property name="jarname" value="${modname}-${side}-${version}" />
+    <mkdir dir="${basedir}/target" />
+    <jar destfile="${basedir}/target/${jarname}.zip">
+      <fileset dir="${output}" includes="**/*.class" />
+    </jar>
+  </target>
+
+  <target name="build-source-pack">
+    <property name="jarname" value="${modname}-src-${version}" />
+    <zip destfile="${basedir}/target/${jarname}.zip">
+      <zipfileset dir="${common.src.dir}" includes="**/*.java" prefix="src"/>
+      <zipfileset dir="${server.src.dir}" includes="**/*.java" prefix="src"/>
+      <zipfileset dir="${patch.src.dir}" includes="**/*.patch" prefix="patches"/>
+      <zipfileset dir="${basedir}/install" includes="*"/>
+      <zipfileset dir="${basedir}" includes="LICENSE"/>
+    </zip>
+  </target>
+  
+  <target name="build" depends="init,clean,merge-server,patch,build-server,build-source-pack" />
+
+  <target name="patch" depends="init">
+  </target>
+
+</project>
diff --git a/src/fml/CommonRegistry.java b/common/fml/CommonRegistry.java
similarity index 100%
rename from src/fml/CommonRegistry.java
rename to common/fml/CommonRegistry.java
diff --git a/src/fml/FMLHooks.java b/common/fml/FMLHooks.java
similarity index 100%
rename from src/fml/FMLHooks.java
rename to common/fml/FMLHooks.java
diff --git a/src/fml/FMLModContainer.java b/common/fml/FMLModContainer.java
similarity index 100%
rename from src/fml/FMLModContainer.java
rename to common/fml/FMLModContainer.java
diff --git a/src/fml/Loader.java b/common/fml/Loader.java
similarity index 100%
rename from src/fml/Loader.java
rename to common/fml/Loader.java
diff --git a/src/fml/LoaderException.java b/common/fml/LoaderException.java
similarity index 100%
rename from src/fml/LoaderException.java
rename to common/fml/LoaderException.java
diff --git a/src/fml/Mod.java b/common/fml/Mod.java
similarity index 100%
rename from src/fml/Mod.java
rename to common/fml/Mod.java
diff --git a/src/fml/ModClassLoader.java b/common/fml/ModClassLoader.java
similarity index 100%
rename from src/fml/ModClassLoader.java
rename to common/fml/ModClassLoader.java
diff --git a/src/fml/ModContainer.java b/common/fml/ModContainer.java
similarity index 100%
rename from src/fml/ModContainer.java
rename to common/fml/ModContainer.java
diff --git a/src/fml/ml/ModLoaderModContainer.java b/common/fml/ml/ModLoaderModContainer.java
similarity index 100%
rename from src/fml/ml/ModLoaderModContainer.java
rename to common/fml/ml/ModLoaderModContainer.java
diff --git a/src/fml/obf/FMLHandler.java b/common/fml/obf/FMLHandler.java
similarity index 100%
rename from src/fml/obf/FMLHandler.java
rename to common/fml/obf/FMLHandler.java
diff --git a/src/net/minecraft/src/BaseMod.java b/common/net/minecraft/src/BaseMod.java
similarity index 100%
rename from src/net/minecraft/src/BaseMod.java
rename to common/net/minecraft/src/BaseMod.java
diff --git a/src/net/minecraft/src/ModLoader.java b/common/net/minecraft/src/ModLoader.java
similarity index 100%
rename from src/net/minecraft/src/ModLoader.java
rename to common/net/minecraft/src/ModLoader.java