diff --git a/.gitignore b/.gitignore
index b00de09d8c..b93239b719 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ fmlbranding.properties
 /commands.py.bck
 /mcp*.zip
 /mcp
+/eclipse
diff --git a/build.xml b/build.xml
index f4923472e1..6fcb2e0f14 100644
--- a/build.xml
+++ b/build.xml
@@ -24,12 +24,8 @@
       <format pattern="yyMMddHHmmss" property="timestamp" />
     </tstamp>
     <property environment="env" />
-    <property file="fmlbuild.properties" />
     <property name="modname" value="fml" />
-    <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}">
+    <condition property="mcp.home" value="${env.WORKSPACE}/mcp" else="${basedir}/mcp">
       <isset property="env.WORKSPACE" />
     </condition>
     <property name="fml.python.dir" location="${basedir}/python" />
@@ -55,6 +51,7 @@
     <condition property="version.build" value="${env.BUILD_NUMBER}" else="1">
       <isset property="env.BUILD_NUMBER" />
     </condition>
+    <available file="eclipse" property="eclipse.exists"/>
   </target>
 
   <target name="makeversion" depends="buildenvsetup">
@@ -78,9 +75,9 @@
   
   <target name="clean" depends="buildenvsetup,makeclean" if="mcp.exists">
     <exec executable="${python.exe}" dir="${mcp.home}">
-      <arg value="${mcp.home}/runtime/decompile.py" />
-      <arg value="-d" />
-      <arg value="-n" />
+      <arg value="${basedir}/decompile.py" />
+      <arg value="${mcp.home}" />
+      <arg value="${basedir}" />
     </exec>
   </target>
 
@@ -239,6 +236,7 @@
       <fileset dir="${mcp.srcdir}"/>
     </copy>
     <antcall target="writeversion"/>
+    <antcall target="makeeclipse"/>
     <echo>Setup complete! You should now be able to open ${basedir}/eclipse as a workspace in eclipse and import/refresh the FML project</echo>
   </target>
 
@@ -314,6 +312,13 @@
     </exec>
   </target>
 
+  <target name="makeeclipse" depends="buildenvsetup" unless="eclipse.exists">
+    <echo>
+      Extracting fresh eclipse workspace to ${basedir}/eclipse
+    </echo>
+    <unzip file="${basedir}/eclipse_workspace.zip" dest="${basedir}" verbose="true"/>
+  </target>
+
   <target name="makerenamedsource" depends="buildenvsetup,repatch,merge-client,merge-common,reobfuscate">
     <copy todir="${tmp.mcp.srcdir}">
       <fileset dir="${mcp.srcdir}"/>
diff --git a/eclipse-workspace.zip b/eclipse-workspace.zip
new file mode 100644
index 0000000000..2936412569
Binary files /dev/null and b/eclipse-workspace.zip differ
diff --git a/eclipse/.gitignore b/eclipse/.gitignore
deleted file mode 100644
index 3c4a7e9620..0000000000
--- a/eclipse/.gitignore
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-!.gitignore
-!/Clean/
-/Clean/*
-!/Clean/.classpath
-!/Clean/.project
-!/Clean/.settings/
-/Clean/.settings/*
-!/Clean/.settings/org.eclipse.jdt.core.prefs
-!/FML/
-/FML/*
-!/FML/.classpath
-!/FML/.project
-!/FML/.settings/
-/FML/.settings/*
-!/FML/.settings/org.eclipse.jdt.core.prefs
-!/.metadata/
-/.metadata/*
-!/.metadata/.plugins/
-/.metadata/.plugins/*
-!/.metadata/.plugins/org.eclipse.core.runtime/
-/.metadata/.plugins/org.eclipse.core.runtime/*
-!/.metadata/.plugins/org.eclipse.core.runtime/.settings/
-/.metadata/.plugins/org.eclipse.core.runtime/.settings/*
-!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
-!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
-!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs
-!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
-!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
-!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
-!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
-!/.metadata/.plugins/org.eclipse.debug.core/
-/.metadata/.plugins/org.eclipse.debug.core/*
-!/.metadata/.plugins/org.eclipse.debug.core/.launches/
-/.metadata/.plugins/org.eclipse.debug.core/.launches/*
-!/.metadata/.plugins/org.eclipse.debug.core/.launches/CleanClient.launch
-!/.metadata/.plugins/org.eclipse.debug.core/.launches/CleanServer.launch
-!/.metadata/.plugins/org.eclipse.debug.core/.launches/FMLClient.launch
-!/.metadata/.plugins/org.eclipse.debug.core/.launches/FMLServer.launch
-!/.metadata/.plugins/org.eclipse.debug.ui/
-/.metadata/.plugins/org.eclipse.debug.ui/*
-!/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
-
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Clean/placeholder b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Clean/placeholder
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/FML/placeholder b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/FML/placeholder
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree
deleted file mode 100644
index ff3b00c035..0000000000
Binary files a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree and /dev/null differ
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 466d7f93a1..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Jun 05 18:58:07 CEST 2011
-version=1
-eclipse.preferences.version=1
-refresh.enabled=true
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
deleted file mode 100644
index e2680d2579..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-Console.highWaterMark=88000
-StringVariablePreferencePage=130,107,107,86,
-eclipse.preferences.version=1
-org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\n<launchPerspectives/>\n
-org.eclipse.debug.ui.UseContextualLaunch=false
-org.eclipse.debug.ui.user_view_bindings=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\r\n<viewBindings>\r\n<view id\="org.eclipse.ui.console.ConsoleView">\r\n<perspective id\="org.eclipse.jdt.ui.JavaPerspective" userAction\="opened"/>\r\n</view>\r\n</viewBindings>\r\n
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs
deleted file mode 100644
index 333b991531..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Jun 05 18:58:07 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.epp.usagedata.gathering.enabled=false
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 12ec368903..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,14 +0,0 @@
-#Sun Sep 18 16:44:39 NZST 2011
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
deleted file mode 100644
index 316ef6f309..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Jun 05 18:58:05 CEST 2011
-spacesForTabs=true
-eclipse.preferences.version=1
-overviewRuler_migration=migrated_3.1
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
deleted file mode 100644
index d338eab761..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-IMPORT_FILES_AND_FOLDERS_MODE=prompt
-IMPORT_FILES_AND_FOLDERS_VIRTUAL_FOLDER_MODE=prompt
-PROBLEMS_FILTERS_MIGRATE=true
-SAVE_ALL_BEFORE_BUILD=true
-TASKS_FILTERS_MIGRATE=true
-eclipse.preferences.version=1
-platformState=1349115159163
-quickStart=false
-tipsAndTricks=true
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
deleted file mode 100644
index 08076f236a..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-showIntro=false
diff --git a/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml b/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
deleted file mode 100644
index 1208f602e5..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchHistory>
-<launchGroup id="org.eclipse.ui.externaltools.launchGroup">
-<mruHistory/>
-<favorites/>
-</launchGroup>
-<launchGroup id="org.eclipse.debug.ui.launchGroup.profile">
-<mruHistory/>
-<favorites/>
-</launchGroup>
-<launchGroup id="org.eclipse.debug.ui.launchGroup.debug">
-<mruHistory>
-<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Client&quot;/&gt;&#13;&#10;"/>
-<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Server&quot;/&gt;&#13;&#10;"/>
-</mruHistory>
-<favorites/>
-</launchGroup>
-<launchGroup id="org.eclipse.debug.ui.launchGroup.run">
-<mruHistory>
-<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Client&quot;/&gt;&#13;&#10;"/>
-<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Server&quot;/&gt;&#13;&#10;"/>
-</mruHistory>
-<favorites/>
-</launchGroup>
-</launchHistory>
diff --git a/eclipse/Clean/.classpath b/eclipse/Clean/.classpath
deleted file mode 100644
index 36c2af60c0..0000000000
--- a/eclipse/Clean/.classpath
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="mc-common"/>
-	<classpathentry kind="src" path="mc-client"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="jars/bin/jinput.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="jars/bin/lwjgl_util.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="jars/bin/lwjgl.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="jars/bin/minecraft.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/eclipse/Clean/.project b/eclipse/Clean/.project
deleted file mode 100644
index f5a1d893da..0000000000
--- a/eclipse/Clean/.project
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Clean</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>jars</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/jars</locationURI>
-		</link>
-		<link>
-			<name>mc-client</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/src-base/minecraft</locationURI>
-		</link>
-		<link>
-			<name>mc-common</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/src-base/common</locationURI>
-		</link>
-	</linkedResources>
-	<filteredResources>
-		<filter>
-			<id>0</id>
-			<name>jars</name>
-			<type>13</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-bin</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>0</id>
-			<name>jars/bin</name>
-			<type>5</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*.jar</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>0</id>
-			<name>jars/bin/natives</name>
-			<type>6</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-	<variableList>
-		<variable>
-			<name>MCP_LOC</name>
-			<value>$%7BPARENT-2-WORKSPACE_LOC%7D</value>
-		</variable>
-	</variableList>
-</projectDescription>
diff --git a/eclipse/Clean/.settings/org.eclipse.jdt.core.prefs b/eclipse/Clean/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fff3b334bb..0000000000
--- a/eclipse/Clean/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Thu Jun 02 15:56:40 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/eclipse/FML/.classpath b/eclipse/FML/.classpath
deleted file mode 100644
index ca7d0029b1..0000000000
--- a/eclipse/FML/.classpath
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="mc-common"/>
-	<classpathentry kind="src" path="fml-client"/>
-	<classpathentry kind="src" path="fml-common"/>
-	<classpathentry kind="src" path="mc-client"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="jars/bin/jinput.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="FML/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="jars/bin/lwjgl_util.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="FML/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="jars/bin/lwjgl.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="FML/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="jars/bin/minecraft.jar"/>
-	<classpathentry kind="lib" path="lib/argo-2.25.jar"/>
-	<classpathentry kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-all-4.0-source.jar"/>
-	<classpathentry kind="lib" path="lib/guava-12.0.1.jar" sourcepath="lib/guava-12.0.1-sources.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/eclipse/FML/.project b/eclipse/FML/.project
deleted file mode 100644
index 51cdbc3eec..0000000000
--- a/eclipse/FML/.project
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>FML</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>fml-client</name>
-			<type>2</type>
-			<locationURI>FML_LOC/client</locationURI>
-		</link>
-		<link>
-			<name>fml-common</name>
-			<type>2</type>
-			<locationURI>FML_LOC/common</locationURI>
-		</link>
-		<link>
-			<name>jars</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/jars</locationURI>
-		</link>
-		<link>
-			<name>lib</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/lib</locationURI>
-		</link>
-		<link>
-			<name>mc-client</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/src-work/minecraft</locationURI>
-		</link>
-		<link>
-			<name>mc-common</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/src-work/common</locationURI>
-		</link>
-		<link>
-			<name>fml-common/fmlversion.properties</name>
-			<type>1</type>
-			<locationURI>FML_LOC/fmlversion.properties</locationURI>
-		</link>
-	</linkedResources>
-	<filteredResources>
-		<filter>
-			<id>0</id>
-			<name>jars</name>
-			<type>13</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-bin</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-	<variableList>
-		<variable>
-			<name>FML_LOC</name>
-			<value>$%7BPARENT-1-WORKSPACE_LOC%7D</value>
-		</variable>
-		<variable>
-			<name>MCP_LOC</name>
-			<value>$%7BPARENT-2-WORKSPACE_LOC%7D</value>
-		</variable>
-	</variableList>
-</projectDescription>
diff --git a/eclipse/FML/.settings/org.eclipse.jdt.core.prefs b/eclipse/FML/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 96db542e64..0000000000
--- a/eclipse/FML/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Thu Jun 02 15:56:50 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/install/fml.py b/install/fml.py
index f414ebcaa1..c8701db445 100644
--- a/install/fml.py
+++ b/install/fml.py
@@ -731,13 +731,13 @@ def setup_mcp(fml_dir, mcp_dir, dont_gen_conf=True):
     print 'Copying FML conf'
     shutil.copytree(fml_conf, mcp_conf)
     
-    #update workspace
-    print 'Fixing MCP Workspace'
-    if not os.path.isdir(os.path.join(fml_dir, 'eclipse', 'Clean-Client')):
-        mcp_eclipse = os.path.join(mcp_dir, 'eclipse')
-        if os.path.isdir(mcp_eclipse):
-            shutil.rmtree(mcp_eclipse)
-        shutil.copytree(os.path.join(fml_dir, 'eclipse'), mcp_eclipse)
+#    #update workspace
+#    print 'Fixing MCP Workspace'
+#    if not os.path.isdir(os.path.join(fml_dir, 'eclipse', 'Clean-Client')):
+#        mcp_eclipse = os.path.join(mcp_dir, 'eclipse')
+#        if os.path.isdir(mcp_eclipse):
+#            shutil.rmtree(mcp_eclipse)
+#        shutil.copytree(os.path.join(fml_dir, 'eclipse'), mcp_eclipse)
 
 def normaliselines(in_filename):
     in_filename = os.path.normpath(in_filename)