diff --git a/.classpath b/.classpath
index 728ca1d9..9a89710e 100644
--- a/.classpath
+++ b/.classpath
@@ -3,14 +3,11 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src_eclipseagent"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/asm-3.1.jar" sourcepath="contrib/asm-3.1-src.zip">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/lombok/contrib/asm-3.1-javadoc.zip!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="deps/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar"/>
-	<classpathentry kind="lib" path="deps/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar"/>
-	<classpathentry kind="lib" path="deps/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar"/>
-	<classpathentry kind="lib" path="deps/org.eclipse.jdt.core_3.5.0.v_963.jar" sourcepath="/Users/rzwitserloot/newworkspace/org.eclipse.jdt.core/compiler"/>
+	<classpathentry kind="lib" path="lib/eclipse.agent/asm-3.1.jar"/>
+	<classpathentry kind="lib" path="lib/lombok/spi-0.2.1.jar"/>
+	<classpathentry kind="lib" path="deps/lombok/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar"/>
+	<classpathentry kind="lib" path="deps/lombok/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar"/>
+	<classpathentry kind="lib" path="deps/lombok/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar"/>
+	<classpathentry kind="lib" path="deps/lombok/org.eclipse.jdt.core_3.5.0.v_963.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build.xml b/build.xml
index 2812017d..997cdfd9 100644
--- a/build.xml
+++ b/build.xml
@@ -4,14 +4,23 @@
 	</loadresource>
 	<property name="build.compiler" value="javac1.6" />
 	<path id="lombok.deps.path">
-		<fileset dir="deps">
+		<fileset dir="deps/lombok">
+			<include name="**/*.jar" />
+		</fileset>
+	</path>
+	<path id="lombok.libs.path">
+		<fileset dir="lib/lombok">
+			<include name="**/*.jar" />
+		</fileset>
+	</path>
+
+	<path id="eclipse.agent.deps.path">
+		<fileset dir="deps/eclipse.agent">
 			<include name="**/*.jar" />
 		</fileset>
 	</path>
-	<path id="lombok.libs.path" />
-	<path id="eclipse.agent.deps.path" />
 	<path id="eclipse.agent.libs.path">
-		<fileset dir="lib">
+		<fileset dir="lib/eclipse.agent">
 			<include name="**/*.jar" />
 		</fileset>
 	</path>
diff --git a/deps/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar b/deps/lombok/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar
similarity index 100%
rename from deps/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar
rename to deps/lombok/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar
diff --git a/deps/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar b/deps/lombok/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar
similarity index 100%
rename from deps/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar
rename to deps/lombok/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar
diff --git a/deps/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar b/deps/lombok/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar
similarity index 100%
rename from deps/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar
rename to deps/lombok/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar
diff --git a/deps/org.eclipse.jdt.core_3.5.0.v_963.jar b/deps/lombok/org.eclipse.jdt.core_3.5.0.v_963.jar
similarity index 100%
rename from deps/org.eclipse.jdt.core_3.5.0.v_963.jar
rename to deps/lombok/org.eclipse.jdt.core_3.5.0.v_963.jar
diff --git a/lib/asm-3.1.jar b/lib/eclipse.agent/asm-3.1.jar
similarity index 100%
rename from lib/asm-3.1.jar
rename to lib/eclipse.agent/asm-3.1.jar
diff --git a/lib/lombok/spi-0.2.1.jar b/lib/lombok/spi-0.2.1.jar
new file mode 100644
index 00000000..4d234f24
Binary files /dev/null and b/lib/lombok/spi-0.2.1.jar differ