diff --git a/eclipse/dev/.classpath b/eclipse/dev/.classpath
index b133bac..481429a 100644
--- a/eclipse/dev/.classpath
+++ b/eclipse/dev/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="core/src"/>
-	<classpathentry kind="src" path="core/oophm-test"/>
-	<classpathentry kind="src" path="core/oophm"/>
-	<classpathentry kind="src" path="core/overlay"/>
 	<classpathentry kind="src" path="core/test"/>
+	<classpathentry kind="src" path="oophm/overlay"/>
+	<classpathentry kind="src" path="oophm/src"/>
+	<classpathentry kind="src" path="oophm/test"/>
 	<classpathentry excluding="com/google/gwt/dev/jjs/intrinsic/" kind="src" path="core/super"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="GWT_TOOLS/lib/apache/ant-1.6.5.jar" sourcepath="/GWT_TOOLS/lib/apache/ant-1.6.5-src.zip"/>
diff --git a/eclipse/dev/.project b/eclipse/dev/.project
index ab97556..b1ad44e 100644
--- a/eclipse/dev/.project
+++ b/eclipse/dev/.project
@@ -21,19 +21,9 @@
 			<locationURI>GWT_ROOT/dev/core</locationURI>
 		</link>
 		<link>
-			<name>core/oophm</name>
+			<name>oophm</name>
 			<type>2</type>
-			<locationURI>GWT_ROOT/dev/oophm/src</locationURI>
-		</link>
-		<link>
-			<name>core/oophm-test</name>
-			<type>2</type>
-			<locationURI>GWT_ROOT/dev/oophm/test</locationURI>
-		</link>
-		<link>
-			<name>core/overlay</name>
-			<type>2</type>
-			<locationURI>GWT_ROOT/dev/oophm/overlay</locationURI>
+			<locationURI>GWT_ROOT/dev/oophm</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>