diff --git a/.classpath b/.classpath
index dbfefb4ec..217c4460e 100644
--- a/.classpath
+++ b/.classpath
@@ -1,23 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**/.svn/" kind="src" output="dist/classes" path="src/main/java"/>
-	<classpathentry excluding="**/.svn/" kind="src" output="tests/dist/classes" path="src/test/java"/>
-	<classpathentry kind="var" path="EXT_LIBS_DIR/javassist.jar"/>
-	<classpathentry exported="true" kind="var" path="EXT_LIBS_DIR/guice.jar">
-		<accessrules>
-			<accessrule kind="nonaccessible" pattern="com/google/inject/internal/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/depot"/>
-	<classpathentry exported="true" kind="var" path="EXT_LIBS_DIR/gwt-user.jar"/>
-	<classpathentry exported="true" kind="var" path="EXT_LIBS_DIR/atunit.jar">
-		<accessrules>
-			<accessrule kind="nonaccessible" pattern="atunit/lib/com/google/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="EXT_LIBS_DIR/jsr250-api.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/gwt-utils"/>
-	<classpathentry kind="var" path="M2_REPO/com/samskivert/jmustache/1.0/jmustache-1.0.jar"/>
-	<classpathentry kind="output" path="bin"/>
+  <classpathentry kind="src" path="src/test/java" output="dist/test-classes" including="**/*.java"/>
+  <classpathentry kind="src" path="src/test/resources" output="dist/test-classes" excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+  <classpathentry kind="output" path="dist/classes"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.1/ant-1.7.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/samskivert/depot/1.0/depot-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.6.0/ehcache-1.6.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/r05/guava-r05.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/google/inject/guice/2.0/guice-2.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.0.4/gwt-user-2.0.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/threerings/gwt-utils/1.0/gwt-utils-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.8.0.GA/javassist-3.8.0.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/samskivert/jmustache/1.0/jmustache-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/samskivert/samskivert/1.1/samskivert-1.1.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>