diff --git a/.classpath b/.classpath
deleted file mode 100644
index 82336e52..00000000
--- a/.classpath
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/core"/>
-	<classpathentry kind="src" path="src/eclipseAgent"/>
-	<classpathentry kind="src" path="src/netbeansAgent"/>
-	<classpathentry kind="src" path="src/installer"/>
-	<classpathentry kind="src" path="src/delombok"/>
-	<classpathentry kind="src" path="experimental/src"/>
-	<classpathentry kind="src" path="test/delombok/src"/>
-	<classpathentry kind="src" path="test/core/src"/>
-	<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="deps/lombok/ecj-3.5.1.jar" sourcepath="contrib/ecjsrc-3.5.1.zip"/>
-	<classpathentry kind="lib" path="deps/lombok/eclipse/org.eclipse.jdt.core_3.5.0.v_963.jar"/>
-	<classpathentry kind="lib" path="deps/lombok/eclipse/org.eclipse.jdt.ui_3.5.1.r351_v20090821-0800.jar"/>
-	<classpathentry kind="lib" path="deps/lombok/eclipse/org.eclipse.core.runtime_3.5.0.v20090525.jar"/>
-	<classpathentry kind="lib" path="deps/lombok/eclipse/org.eclipse.osgi_3.5.0.v20090520.jar"/>
-	<classpathentry kind="lib" path="deps/lombok/eclipse/org.eclipse.equinox.common_3.5.0.v20090520-1800.jar"/>
-	<classpathentry kind="lib" path="deps/lombok/netbeans/boot_6.8beta.jar"/>
-	<classpathentry kind="lib" path="deps/lombok/netbeans/org-openide-util_6.8beta.jar"/>
-	<classpathentry kind="lib" path="deps/lombok/netbeans/org-openide-modules_6.8beta.jar"/>
-	<classpathentry kind="lib" path="deps/lombok/netbeans/org-netbeans-modules-java-source_6.8beta.jar"/>
-	<classpathentry kind="lib" path="deps/junit-4.7.jar"/>
-	<classpathentry kind="lib" path="deps/lombok/ant.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/lombok.patcher"/>
-	<classpathentry kind="lib" path="deps/lombok/tools.jar" sourcepath="C:/javasource/javasources.zip"/>
-	<classpathentry kind="lib" path="deps/lombok/spi-0.2.4.jar"/>
-	<classpathentry kind="lib" path="lib/lombok/com.zwitserloot.cmdreader.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.factorypath b/.factorypath
deleted file mode 100644
index d4e5b82c..00000000
--- a/.factorypath
+++ /dev/null
@@ -1,3 +0,0 @@
-<factorypath>
-    <factorypathentry kind="WKSPJAR" id="/lombok/deps/lombok/spi-0.2.4.jar" enabled="true" runInBatchMode="false"/>
-</factorypath>
diff --git a/.gitignore b/.gitignore
index 82db0a61..4244e37d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,9 @@ debug
 LombokizedEclipse.launch
 libertad-upload.key
 findbugsReport.html
+lib
+.settings
+.project
+.classpath
+.factorypath
+
diff --git a/.project b/.project
deleted file mode 100644
index 628b6001..00000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>lombok</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>
-</projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index d7884166..00000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sat Jul 18 00:51:09 CEST 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.core.runtime.prefs b/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index e16e19be..00000000
--- a/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sat Jul 18 00:51:27 CEST 2009
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs
deleted file mode 100644
index c978bb18..00000000
--- a/.settings/org.eclipse.jdt.apt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Jun 12 03:57:29 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.apt.aptEnabled=true
-org.eclipse.jdt.apt.genSrcDir=.apt_generated
-org.eclipse.jdt.apt.reconcileEnabled=true
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index aab1b6fa..00000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,102 +0,0 @@
-#Sat Dec 12 14:05:24 CET 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-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.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.processAnnotations=enabled
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=warning
diff --git a/.settings/org.eclipse.jdt.launching.prefs b/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 9d56586e..00000000
--- a/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sat Dec 12 13:38:59 CET 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning
diff --git a/LICENCE b/LICENSE
similarity index 100%
rename from LICENCE
rename to LICENSE
diff --git a/build.xml b/build.xml
index f7171052..8de57ac0 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
+  Copyright © 2010 Reinier Zwitserloot and Roel Spilker.
   
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -19,17 +19,83 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 -->
-<project name="lombok" default="dist">
+<project name="lombok" default="dist" xmlns:ivy="antlib:com.zwitserloot.ivyplusplus">
 	<description>
 This buildfile is part of projectlombok.org. It is the main entry point that contains
 the common tasks and can be called on to run the main aspects of all the sub-scripts.
 	</description>
+	
+	<property name="build.compiler" value="javac1.6" />
+	<property name="ivy.retrieve.pattern" value="lib/[conf]/[artifact].[ext]" />
+	<available file="lib/ivyplusplus.jar" property="ivyplusplus.available" />
+	
 	<target name="clean" description="Removes all generated files">
 		<delete dir="build" quiet="true" />
-		<delete dir="dist" quiet="true" />
 	</target>
 	
-	<target name="version" description="Shows the version number" unless="lombok.version">
+	<target name="distclean" depends="clean" description="Deletes everything that this build script has ever generated.">
+		<delete dir="lib" quiet="true" />
+		<delete dir="dist" quiet="true" />
+		<delete file=".project" quiet="true" />
+		<delete file=".classpath" quiet="true" />
+		<delete dir=".settings" quiet="true" />
+	</target>
+	
+	<target name="download-ipp" unless="ivyplusplus.available">
+		<mkdir dir="lib" />
+		<get src="http://projectlombok.org/downloads/ivyplusplus.jar" dest="lib/ivyplusplus.jar" usetimestamp="true" />
+	</target>
+	
+	<target name="ensure-ipp" depends="download-ipp">
+		<taskdef classpath="lib/ivyplusplus.jar" resource="com/zwitserloot/ivyplusplus/antlib.xml" uri="antlib:com.zwitserloot.ivyplusplus" />
+	</target>
+	
+	<target name="config-ivy" depends="ensure-ipp" unless="ivy.config">
+		<ivy:configure file="buildScripts/ivysettings.xml" />
+		<property name="ivy.config" value="true" />
+	</target>
+	
+	<target name="deps" depends="ensureBuildDeps, ensureRuntimeDeps, ensureTestDeps, contrib" description="Downloads all dependencies." />
+	
+	<target name="contrib" depends="config-ivy" description="Downloads various non-crucial documentation, sources, etc that are useful when developing lombok.ast.">
+		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="contrib" />
+		<ivy:retrieve />
+	</target>
+	
+	<target name="ensureBuildDeps" depends="config-ivy">
+		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="build" />
+		<ivy:retrieve />
+	</target>
+	
+	<target name="ensureRuntimeDeps" depends="config-ivy">
+		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="runtime" />
+		<ivy:retrieve />
+	</target>
+	
+	<target name="ensureTestDeps" depends="config-ivy">
+		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="test" />
+		<ivy:retrieve />
+	</target>
+	
+	<path id="build.path">
+		<fileset dir="lib/build">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+	
+	<path id="runtime.path">
+		<fileset dir="lib/runtime">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+	
+	<path id="test.path">
+		<fileset dir="lib/test">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+	
+	<target name="version" depends="ensure-ipp" description="Shows the version number" unless="lombok.version">
 		<mkdir dir="build/lombok" />
 		<javac includeDestClasses="false" srcdir="src/core" debug="on" destdir="build/lombok" source="1.5" target="1.5" includes="lombok/core/Version.java" />
 		<java
@@ -37,68 +103,205 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			classpath="build/lombok"
 			failonerror="true"
 			output="build/version.txt" />
-		<loadresource property="lombok.version">
-			<file file="build/version.txt" />
-			<filterchain>
-				<striplinebreaks />
-			</filterchain>
-		</loadresource>
+		<ivy:loadversion property="lombok.version" file="build/version.txt" />
 		<echo level="info">Lombok version: ${lombok.version}</echo>
 	</target>
 	
-	<target name="buildDeps" description="Builds buildable dependencies">
-		<ant antfile="buildScripts/deps.ant.xml" target="build" inheritAll="false" />
+	<target name="-unpackLibs" depends="ensureRuntimeDeps">
+		<unjar dest="build/lombok">
+			<path refid="runtime.path" />
+		</unjar>
 	</target>
 	
-	<target name="updateDeps" description="Updates existing dependencies">
-		<ant antfile="buildScripts/deps.ant.xml" target="update" inheritAll="false" />
+	<target name="compile" depends="version, ensureBuildDeps" description="Compiles the code.">
+		<!-- ant includes the destination dir on the classpath (and there are good reason to do this), but that also means
+		 the bleeding edge lombok from the previous build is run, which means if there are bugs in it, you can't compile
+		anymore until you 'ant clean'. That's very much not desired, so we kill the processor, which stops lombok from running.
+		We re-create the file at the end of this target. -->
+		<delete file="build/lombok/META-INF/services/javax.annotation.processing.Processor" quiet="true" />
+		<ivy:compile destdir="build/lombok" source="1.5" target="1.5">
+			<src path="src/core" />
+			<src path="src/installer" />
+			<src path="src/eclipseAgent" />
+			<exclude name="lombok/javac/**" />
+			<classpath refid="build.path" />
+		</ivy:compile>
+		<ivy:compile destdir="build/lombok" source="1.6" target="1.6">
+			<src path="src/core" />
+			<src path="src/delombok" />
+			<src path="src/netbeansAgent" />
+			<include name="lombok/javac/**" />
+			<include name="lombok/delombok/**" />
+			<include name="lombok/netbeans/**" />
+			<classpath location="build/lombok" />
+			<classpath refid="build.path" />
+		</ivy:compile>
+		<mkdir dir="build/lombok/META-INF" />
+		<mkdir dir="build/lombok/META-INF/services" />
+		<echo file="build/lombok/META-INF/services/javax.annotation.processing.Processor">lombok.core.AnnotationProcessor</echo>
 	</target>
 	
-	<target name="installDeps" description="Interactively asks you which dependencies you want, and installs them.">
-		<ant antfile="buildScripts/deps.ant.xml" target="install" inheritAll="false" />
-	</target>
-	
-	<target name="installDeps-silent" description="Installs ALL dependencies, optional or not.">
-		<ant antfile="buildScripts/deps.ant.xml" target="install-silent" inheritAll="false" />
-	</target>
-	
-	<target name="dist" depends="version, buildDeps" description="Builds THE lombok.jar file which contains everything">
-		<ant antfile="buildScripts/compile.ant.xml" target="dist" inheritAll="false">
-			<property name="lombok.version" value="${lombok.version}" />
-		</ant>
+	<target name="dist" description="Builds THE lombok.jar file which contains everything." depends="version, compile, -unpackLibs">
+		<mkdir dir="dist" />
+		<copy file="doc/changelog.markdown" tofile="build/changelog.txt" />
+		<jar destfile="dist/lombok-${lombok.version}.jar">
+			<fileset dir="build/lombok" />
+			<fileset dir="build" includes="changelog.txt" />
+			<fileset dir="." includes="LICENSE" />
+			<manifest>
+				<attribute name="Premain-Class" value="lombok.core.Agent" />
+				<attribute name="Agent-Class" value="lombok.core.Agent" />
+				<attribute name="Can-Redefine-Classes" value="true" />
+				<attribute name="Main-Class" value="lombok.core.Main" />
+				<attribute name="Lombok-Version" value="${lombok.version}" />
+			</manifest>
+		</jar>
+		<copy file="dist/lombok-${lombok.version}.jar" tofile="dist/lombok.jar" />
 		<property name="lombok.dist.built" value="true" />
 	</target>
 	
-	<target name="compile" depends="version" description="Compiles the code">
-		<ant antfile="buildScripts/compile.ant.xml" target="compile" inheritAll="false">
-			<property name="lombok.version" value="${lombok.version}" />
-		</ant>
+	<target name="eclipse" depends="deps, contrib" description="Creates eclipse project files and downloads all dependencies. Open this directory as project in eclipse after running this target.">
+		<ivy:eclipsegen>
+			<srcdir dir="src/core" />
+			<srcdir dir="src/eclipseAgent" />
+			<srcdir dir="src/netbeansAgent" />
+			<srcdir dir="src/installer" />
+			<srcdir dir="src/delombok" />
+			<srcdir dir="experimental/src" />
+			<srcdir dir="test/delombok/src" />
+			<srcdir dir="test/core/src" />
+			<conf name="build" sources="contrib" />
+			<conf name="test" sources="contrib" />
+			<settings>
+				<url url="http://projectlombok.org/downloads/lombok.eclipse.settings" />
+			</settings>
+			<apt location="lib/build/spi.jar" />
+		</ivy:eclipsegen>
+		
+		<condition property="startOnFirstThread" value="-XstartOnFirstThread">
+			<os family="mac" />
+		</condition>
+		<condition property="d32" value="-d32">
+			<os family="mac" />
+		</condition>
+		<condition property="d32" value="">
+			<not><os family="mac" /></not>
+		</condition>
+		
+		<copy
+				file="buildScripts/eclipse-debug-target.template"
+				tofile="LombokizedEclipse.launch"
+				preservelastmodified="true"
+				overwrite="true">
+			<filterset>
+				<filter token="START_ON_FIRST_THREAD" value="${startOnFirstThread}" />
+				<filter token="D32" value="${d32}" />
+			</filterset>
+		</copy>
 	</target>
 	
-	<target name="test" depends="compile">
-		<ant antfile="buildScripts/test.ant.xml" target="test" />
+	<target name="-test-compile" depends="ensureTestDeps, compile" unless="skipTests">
+		<mkdir dir="build/tests" />
+		<ivy:compile destdir="build/tests" source="1.5" target="1.5">
+			<classpath refid="test.path" />
+			<classpath path="build/lombok" />
+			<src path="test/core/src" />
+			<src path="test/delombok/src" />
+		</ivy:compile>
+		<copy todir="build/tests">
+			<fileset dir="test/pretty/resource" />
+			<fileset dir="test/delombok/resource" />
+		</copy>
 	</target>
 	
-	<target name="findbugs" description="Runs findbugs on the code">
-		<ant antfile="buildScripts/compile.ant.xml" target="findbugs" inheritAll="false" />
+	<target name="test" depends="-test-compile" unless="tests.skip">
+		<junit haltonfailure="yes" fork="on">
+			<formatter type="plain" usefile="false" unless="tests.quiet" />
+			<classpath refid="test.path" />
+			<classpath path="build/lombok" />
+			<classpath path="build/tests" />
+			<batchtest>
+				<fileset dir="test/core/src">
+					<include name="**/Test*.java" />
+				</fileset>
+				<fileset dir="test/delombok/src">
+					<include name="**/Test*.java" />
+				</fileset>
+			</batchtest>
+		</junit>
+		<echo level="info">All tests successful.</echo>
 	</target>
 	
-	<target name="maven" depends="version" description="Build a maven repository">
-		<ant antfile="buildScripts/maven.ant.xml" target="maven" inheritAll="false">
-			<property name="lombok.version" value="${lombok.version}" />
-		</ant>
+	<target name="maven" depends="version, dist, test" description="Build a maven repository.">
+		<ivy:make-maven-repo
+				group="org.projectlombok" artifact="lombok"
+				version="${lombok.version}"
+				url="http://projectlombok.org/mavenrepo"
+				outfile="dist/maven.tar.bz2"
+				artifactfile="dist/lombok-${lombok.version}.jar"
+				pomfile="doc/maven-pom.xml">
+				
+				<sources>
+					<fileset dir="src/core" />
+					<fileset dir="src/eclipseAgent" />
+					<fileset dir="src/netbeansAgent" />
+					<fileset dir="src/installer" />
+					<fileset dir="src/delombok" />
+					<fileset dir="experimental/src" />
+					<fileset dir="test/delombok/src" />
+					<fileset dir="test/core/src" />
+				</sources>
+		</ivy:make-maven-repo>
 	</target>
 	
-	<target name="maven-publish" depends="clean, version" description="Build a maven repository then upload it to projectlombok.org">
-		<ant antfile="buildScripts/maven.ant.xml" target="maven-publish" inheritAll="false">
-			<property name="lombok.version" value="${lombok.version}" />
-		</ant>
+	<target name="maven-publish" depends="maven" description="Build a maven repository then upload it to projectlombok.org.">
+		<available file="libertad-upload.key" property="libertad.key.available" />
+		<fail unless="libertad.key.available">You don't have the libertad-upload.key; you'll need it to get write access to the server.</fail>
+		<scp
+			localFile="dist/maven.tar.bz2"
+			todir="lombokup@projectlombok.org:/staging"
+			keyfile="libertad-upload.key" passphrase=""
+			sftp="true" verbose="true" trust="true" />
+		<sshexec
+			host="projectlombok.org"
+			username="lombokup"
+			keyfile="libertad-upload.key" passphrase=""
+			trust="true" command="./deployMavenRepo" />
 	</target>
 	
-	<target name="publish" depends="clean, version" description="Publishes the latest build to googlecode">
-		<ant antfile="buildScripts/publish.ant.xml" target="publish" inheritAll="false">
-			<property name="lombok.version" value="${lombok.version}" />
-		</ant>
+	<target name="-credentials">
+		<available property="hasCredentialsFile" file="${credentialsFile}"/>
+	</target>
+	
+	<target name="-checkCredentialsFile" depends="-credentials" unless="hasCredentialsFile">
+		<echo file="${credentialsFile}">
+#username=[your google account name without @gmail.com]
+#password=[your googlecode password, is NOT your gmail password]
+		</echo>
+		<fail message="fill in ${credentialsFile} to provide your credentials" />
+	</target>
+	
+	<target name="publish" description="Publishes the latest build to googlecode" depends="version, -checkCredentialsFile, dist, test">
+		<taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask" classpath="lib/build/ant-googlecode-0.0.2.jar" name="gcupload" />
+		<property file="${credentialsFile}" prefix="google" />
+		<gcupload 
+				username="${google.username}"
+				password="${google.password}"
+				projectname="projectlombok"
+				filename="dist/lombok.jar"
+				targetfilename="lombok-${lombok.version}.jar"
+				summary="Version ${lombok.version}"
+				labels=""
+				verbose="true" />
+		<gcupload 
+				username="${google.username}"
+				password="${google.password}" 
+				projectname="projectlombok" 
+				filename="dist/lombok.jar" 
+				targetfilename="lombok.jar"
+				summary="Version ${lombok.version} - The everything jar - doubleclick it to install, or just include it in your projects."
+				labels="Featured" 
+				verbose="true" />
 	</target>
 	
 	<target name="publish-all" depends="clean, version, website-publish, maven-publish, publish"
diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml
deleted file mode 100644
index 7f8e2ba7..00000000
--- a/buildScripts/compile.ant.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<!--
-  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
-  
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
--->
-<project name="lombok-compile" basedir=".." default="dist">
-	<description>
-This buildfile is part of projectlombok.org. It responsible for compiling the main
-lombok code including the various agents.
-	</description>
-	<property name="build.compiler" value="javac1.6" />
-	
-	<target name="version" unless="lombok.version">
-		<ant antfile="build.xml" target="version" inheritAll="false" />
-		<loadresource property="lombok.version">
-			<file file="build/version.txt" />
-			<filterchain>
-				<striplinebreaks />
-			</filterchain>
-		</loadresource>
-	</target>
-	
-	<path id="deps.path">
-		<fileset dir="deps/lombok">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-	
-	<path id="libs.path">
-		<fileset dir="lib/lombok">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-	
-	<path id="findbugs_deps.path">
-		<fileset dir="deps/buildScripts/findbugs">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-	
-	<target name="-unpackLibs">
-		<unjar dest="build/lombok">
-			<path refid="libs.path" />
-		</unjar>
-	</target>
-	
-	<target name="-check-findbugs">
-		<available property="findbugs.available" file="deps/buildScripts/findbugs/bin/findbugs" />
-		<fail unless="findbugs.available" message="You don't have findbugs available. Run 'ant installDeps' to fetch it." />
-	</target>
-	
-	<target name="findbugs" depends="-check-findbugs, dist" description="Runs findbugs on the lombok sources">
-		<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="findbugs_deps.path" />
-		<mkdir dir="build/lombok_aux" />
-		<!-- This ridiculous waste of time (unpacking ALL deps, which is a lot of data!) is done because the ant findbugs task is
-		a retarded stepchild; it does not understand either pathrefs or wildcards (*.jar), and hardcoding the names of the various
-		eclipse module jars would be even worse. -->
-		<unjar dest="build/lombok_aux">
-			<fileset dir="deps/lombok">
-				<include name="**/*.jar" />
-			</fileset>
-		</unjar>
-		
-		<findbugs home="deps/buildScripts/findBugs" output="html" outputFile="findbugsReport.html" jvmargs="-Xmx512m">
-			<auxClasspath path="build/lombok" />
-			<auxClasspath path="build/lombok_aux" />
-			<sourcePath path="src/core" />
-			<sourcePath path="src/installer" />
-			<sourcePath path="src/eclipseAgent" />
-			<sourcePath path="src/netbeansAgent" />
-			<sourcePath path="src/delombok" />
-			<class location="build/lombok/lombok" />
-		</findbugs>
-	</target>
-	
-	<patternset id="copyables">
-		<exclude name="**/*.java" />
-		<exclude name="**/*.class" />
-		<exclude name="**/*.svg" />
-	</patternset>
-	
-	<target name="compile" description="Compiles the code">
-		<mkdir dir="build/lombok" />
-		<!-- ant includes the destination dir on the classpath (and there are good reason to do this), but that also means
-		 the bleeding edge lombok from the previous build is run, which means if there are bugs in it, you can't compile
-		anymore until you 'ant clean'. That's very much not desired, so we kill the processor, which stops lombok from running.
-		We re-create the file at the end of this target. -->
-		<delete file="build/lombok/META-INF/services/javax.annotation.processing.Processor" quiet="true" />
-		
-		<!-- This version trickery is so that an eclipse running in a JVM 1.5 will run
-		     properly (It'll never touch the javac files and hence never trigger a
-		     Bad Class Version Number error, but for javac we definitely cannot support
-		     javac 1.5, partly because they completely rewrote large swaths of javac,
-		     and partly because our injection mechanism (annotations) doesn't work very
-		     well on javac 1.5, hence, when using javac, we do demand you're on 1.6. -->
-		<javac debug="on" destdir="build/lombok" target="1.5" source="1.5">
-			<src path="src/core" />
-			<src path="src/installer" />
-			<src path="src/eclipseAgent" />
-			<exclude name="lombok/javac/**" />
-			<classpath refid="deps.path" />
-			<classpath refid="libs.path" />
-			<compilerarg value="-Xlint:unchecked" />
-		</javac>
-		<javac debug="on" destdir="build/lombok" target="1.6" source="1.6">
-			<src path="src/core" />
-			<src path="src/delombok" />
-			<src path="src/netbeansAgent" />
-			<include name="lombok/javac/**" />
-			<include name="lombok/delombok/**" />
-			<include name="lombok/netbeans/**" />
-			<classpath location="build/lombok" />
-			<classpath refid="deps.path" />
-			<classpath refid="libs.path" />
-			<compilerarg value="-Xlint:unchecked" />
-		</javac>
-		<copy todir="build/lombok">
-			<fileset dir="src/installer">
-				<patternset refid="copyables" />
-			</fileset>
-			<fileset dir="src/core">
-				<patternset refid="copyables" />
-			</fileset>
-			<fileset dir="src/eclipseAgent">
-				<patternset refid="copyables" />
-			</fileset>
-			<fileset dir="src/netbeansAgent">
-				<patternset refid="copyables" />
-			</fileset>
-			<fileset dir="src/delombok">
-				<patternset refid="copyables" />
-			</fileset>
-		</copy>
-		
-		<mkdir dir="build/lombok/META-INF" />
-		<mkdir dir="build/lombok/META-INF/services" />
-		<echo file="build/lombok/META-INF/services/javax.annotation.processing.Processor">lombok.core.AnnotationProcessor</echo>
-	</target>
-	
-	<target name="dist" description="Builds THE lombok.jar file which contains everything" depends="compile, version, -unpackLibs">
-		<mkdir dir="dist" />
-		<copy file="doc/changelog.markdown" tofile="build/changelog.txt" />
-		<jar destfile="dist/lombok-${lombok.version}.jar">
-			<fileset dir="build/lombok" />
-			<fileset dir="build" includes="changelog.txt" />
-			<fileset dir="." includes="LICENCE" />
-			<manifest>
-				<attribute name="Premain-Class" value="lombok.core.Agent" />
-				<attribute name="Agent-Class" value="lombok.core.Agent" />
-				<attribute name="Can-Redefine-Classes" value="true" />
-				<attribute name="Main-Class" value="lombok.core.Main" />
-				<attribute name="Lombok-Version" value="${lombok.version}" />
-			</manifest>
-		</jar>
-		<copy file="dist/lombok-${lombok.version}.jar" tofile="dist/lombok.jar" />
-	</target>
-</project>
diff --git a/buildScripts/deps.ant.xml b/buildScripts/deps.ant.xml
deleted file mode 100644
index f3a07ec8..00000000
--- a/buildScripts/deps.ant.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
-  
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
--->
-<project name="lombok-deps" basedir=".." default="install">
-	<description>
-This buildfile is part of projectlombok.org. It responsible for finding, downloading,
-and building dependencies.
-	</description>
-	
-	<target name="install" description="Gets all dependencies, including optional ones, interactively (asks you)">
-		<subant target="install">
-			<fileset dir="buildScripts/deps" includes="*.ant.xml" />
-		</subant>
-	</target>
-	
-	<target name="install-silent" description="Gets all dependencies, including optional ones, assuming you want everything.">
-		<subant target="install-silent">
-			<fileset dir="buildScripts/deps" includes="*.ant.xml" />
-		</subant>
-	</target>
-	
-	<target name="update" description="Updates without interaction those deps you already have.">
-		<subant target="update">
-			<fileset dir="buildScripts/deps" includes="*.ant.xml" />
-		</subant>
-	</target>
-	
-	<target name="build" description="Builds all dependencies for which you've installed the source version.">
-		<subant target="build">
-			<fileset dir="buildScripts/deps" includes="*.ant.xml" />
-		</subant>
-	</target>
-</project>
diff --git a/buildScripts/deps/eclipse-debugging.ant.xml b/buildScripts/deps/eclipse-debugging.ant.xml
deleted file mode 100644
index dddd7f6a..00000000
--- a/buildScripts/deps/eclipse-debugging.ant.xml
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--
-  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
-  
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
--->
-<project name="lombok-deps-lombok-patcher" basedir="../.." default="install">
-	<description>
-This buildfile is part of projectlombok.org. It responsible for downloading, updating, and setting up the eclipse modules that are useful to have when working on lombok's eclipse integration. It's optional.
-	</description>
-	
-	<property name="repository.eclipse.org-eclipse" value=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse" />
-	<property name="repository.eclipse.org-rt" value=":pserver:anonymous@dev.eclipse.org/cvsroot/rt" />
-	<property name="eclipse.org.contrib.base" location=".." />
-	
-	<!-- Skips equinox because it's ENORMOUS and rarely needed. -->
-	<target name="install-silent" depends="-check-eclipse.org,
-		-force-eclipse.debug.target, install-eclipse.debug.target, update-eclipse.debug.target,
-		-force-org.eclipse.jdt.core, checkout-org.eclipse.jdt.core, update-org.eclipse.jdt.core,
-		-force-org.eclipse.jdt.ui, checkout-org.eclipse.jdt.ui, update-org.eclipse.jdt.ui,
-		-force-org.eclipse.core.runtime, checkout-org.eclipse.core.runtime, update-org.eclipse.core.runtime,
-		-force-org.eclipse.ltk.core.refactoring, checkout-org.eclipse.ltk.core.refactoring,  update-org.eclipse.ltk.core.refactoring" />
-	
-	<target name="install" depends="-check-eclipse.org,
-		-ask-eclipse.debug.target, install-eclipse.debug.target, update-eclipse.debug.target,
-		-ask-org.eclipse.jdt.core, checkout-org.eclipse.jdt.core, update-org.eclipse.jdt.core,
-		-ask-org.eclipse.jdt.ui, checkout-org.eclipse.jdt.ui, update-org.eclipse.jdt.ui,
-		-ask-org.eclipse.core.runtime, checkout-org.eclipse.core.runtime, update-org.eclipse.core.runtime,
-		-ask-org.eclipse.ltk.core.refactoring, checkout-org.eclipse.ltk.core.refactoring,  update-org.eclipse.ltk.core.refactoring,
-		-ask-org.eclipse.equinox, checkout-org.eclipse.equinox, update-org.eclipse.equinox" />
-	
-	<target name="-force-eclipse.debug.target" unless="eclipse.debug.target.available">
-		<property name="eclipse.debug.target.create" value="true" />
-	</target>
-	
-	<target name="-ask-eclipse.debug.target" unless="eclipse.debug.target.available">
-		<input validargs="n,N,no,No,NO,y,Y,yes,Yes,YES" defaultvalue="no" addproperty="eclipse.debug.target.response">
-Do you want me to create an eclipse debug target so you can launch a second eclipse, lombok-ized, in the eclipse debugger?
-		</input>
-		<condition property="eclipse.debug.target.create">
-			<matches string="${eclipse.debug.target.response}" casesensitive="false" pattern="^y(es)?$" />
-		</condition>
-	</target>
-	
-	<target name="-force-org.eclipse.jdt.core" unless="org.eclipse.jdt.core.available">
-		<property name="org.eclipse.jdt.core.checkout" value="true" />
-	</target>
-	
-	<target name="-ask-org.eclipse.jdt.core" unless="org.eclipse.jdt.core.available">
-		<input validargs="n,N,no,No,NO,y,Y,yes,Yes,YES" defaultvalue="no" addproperty="org.eclipse.jdt.core.response">
-Do you want me to grab from CVS the 3.5 version of org.eclipse.jdt.core?
-Lombok integrates with this eclipse module often, and you should grab it if you're going to work on lombok's eclipse integration.</input>
-		<condition property="org.eclipse.jdt.core.checkout">
-			<matches string="${org.eclipse.jdt.core.response}" casesensitive="false" pattern="^y(es)?$" />
-		</condition>
-	</target>
-	
-	<target name="-force-org.eclipse.jdt.ui" unless="org.eclipse.jdt.ui.available">
-		<property name="org.eclipse.jdt.ui.checkout" value="true" />
-	</target>
-	
-	<target name="-ask-org.eclipse.jdt.ui" unless="org.eclipse.jdt.ui.available">
-		<input validargs="n,N,no,No,NO,y,Y,yes,Yes,YES" defaultvalue="no" addproperty="org.eclipse.jdt.ui.response">
-Do you want me to grab from CVS the 3.5 version of org.eclipse.jdt.ui?
-Lombok integrates with this eclipse module often, and you should grab it if you're going to work on lombok's eclipse integration.</input>
-		<condition property="org.eclipse.jdt.ui.checkout">
-			<matches string="${org.eclipse.jdt.ui.response}" casesensitive="false" pattern="^y(es)?$" />
-		</condition>
-	</target>
-	
-	<target name="-force-org.eclipse.core.runtime" unless="org.eclipse.core.runtime.available">
-		<property name="org.eclipse.core.runtime.checkout" value="true" />
-	</target>
-	
-	<target name="-ask-org.eclipse.core.runtime" unless="org.eclipse.core.runtime.available">
-		<input validargs="n,N,no,No,NO,y,Y,yes,Yes,YES" defaultvalue="no" addproperty="org.eclipse.core.runtime.response">
-Do you want me to grab from CVS the 3.5 version of org.eclipse.core.runtime?
-Interacting with the filer and messager (for errors and warnings) requires core.runtime, as well as interacting with modules.
-You may not need it unless you're going to work on those areas.
-		</input>
-		<condition property="org.eclipse.core.runtime.checkout">
-			<matches string="${org.eclipse.core.runtime.response}" casesensitive="false" pattern="^y(es)?$" />
-		</condition>
-	</target>
-	
-	<target name="-force-org.eclipse.ltk.core.refactoring" unless="org.eclipse.ltk.core.refactoring.available">
-		<property name="org.eclipse.ltk.core.refactoring.checkout" value="true" />
-	</target>
-	
-	<target name="-ask-org.eclipse.ltk.core.refactoring" unless="org.eclipse.ltk.core.refactoring.available">
-		<input validargs="n,N,no,No,NO,y,Y,yes,Yes,YES" defaultvalue="no" addproperty="org.eclipse.ltk.core.refactoring.response">
-Do you want me to grab from CVS the 3.5 version of org.eclipse.ltk.core.refactoring?
-Unless you're going to work with lombok's patching of the refactor scripts, you won't need it.
-		</input>
-		<condition property="org.eclipse.ltk.core.refactoring.checkout">
-			<matches string="${org.eclipse.ltk.core.refactoring.response}" casesensitive="false" pattern="^y(es)?$" />
-		</condition>
-	</target>
-	
-	<target name="-force-org.eclipse.equinox" unless="org.eclipse.equinox.available">
-		<property name="org.eclipse.equinox.checkout" value="true" />
-	</target>
-	
-	<target name="-ask-org.eclipse.equinox" unless="org.eclipse.equinox.available">
-		<input validargs="n,N,no,No,NO,y,Y,yes,Yes,YES" defaultvalue="no" addproperty="org.eclipse.equinox.response">
-Do you want me to grab from CVS the 3.5 version of org.eclipse.equinox?
-Unless you're going to work on lombok.patcher's OSGi integration, you won't need this.
-
-WARNING: This project is enormous (350MB) and takes like an hour to check out. You should answer no unless you _really_ want it.
-		</input>
-		<condition property="org.eclipse.equinox.checkout">
-			<matches string="${org.eclipse.equinox.response}" casesensitive="false" pattern="^y(es)?$" />
-		</condition>
-	</target>
-
-	<target name="update" depends="-check-eclipse.org,
-		update-eclipse.debug.target,
-		update-org.eclipse.jdt.core,
-		update-org.eclipse.jdt.ui,
-		update-org.eclipse.core.runtime,
-		update-org.eclipse.ltk.core.refactoring,
-		update-org.eclipse.equinox" />
-	
-	<target name="build" />
-	
-	<target name="checkout-org.eclipse.jdt.core" if="org.eclipse.jdt.core.checkout">
-		<cvs
-				cvsRoot="${repository.eclipse.org-eclipse}"
-				dest="${eclipse.org.contrib.base}"
-				package="org.eclipse.jdt.core"
-				tag="R3_5_maintenance"
-				failonerror="true" />
-		<echo level="info">eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace.</echo>
-	</target>
-	
-	<target name="update-org.eclipse.jdt.core" if="org.eclipse.jdt.core.available">
-		<cvs command="update" dest="${eclipse.org.contrib.base}/org.eclipse.jdt.core" />
-	</target>
-	
-	<target name="checkout-org.eclipse.jdt.ui" if="org.eclipse.jdt.ui.checkout">
-		<cvs
-				cvsRoot="${repository.eclipse.org-eclipse}"
-				dest="${eclipse.org.contrib.base}"
-				package="org.eclipse.jdt.ui"
-				tag="R3_5_maintenance"
-				failonerror="true" />
-		<echo level="info">eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace.</echo>
-	</target>
-	
-	<target name="update-org.eclipse.jdt.ui" if="org.eclipse.jdt.ui.available">
-		<cvs command="update" dest="${eclipse.org.contrib.base}/org.eclipse.jdt.ui" />
-	</target>
-	
-	<target name="checkout-org.eclipse.core.runtime" if="org.eclipse.core.runtime.checkout">
-		<cvs
-				cvsRoot="${repository.eclipse.org-eclipse}"
-				dest="${eclipse.org.contrib.base}"
-				package="org.eclipse.core.runtime"
-				tag="R3_5_1"
-				failonerror="true" />
-		<echo level="info">eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace.</echo>
-	</target>
-	
-	<target name="update-org.eclipse.core.runtime" if="org.eclipse.core.runtime.available">
-		<cvs command="update" dest="${eclipse.org.contrib.base}/org.eclipse.core.runtime" />
-	</target>
-	
-	<target name="checkout-org.eclipse.ltk.core.refactoring" if="org.eclipse.ltk.core.refactoring.checkout">
-		<cvs
-				cvsRoot="${repository.eclipse.org-eclipse}"
-				dest="${eclipse.org.contrib.base}"
-				package="org.eclipse.ltk.core.refactoring"
-				tag="R3_5_1"
-				failonerror="true" />
-		<echo level="info">eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace.</echo>
-	</target>
-	
-	<target name="update-org.eclipse.ltk.core.refactoring" if="org.eclipse.ltk.core.refactoring.available">
-		<cvs command="update" dest="${eclipse.org.contrib.base}/org.eclipse.ltk.core.refactoring" />
-	</target>
-	
-	<target name="checkout-org.eclipse.equinox" if="org.eclipse.equinox.checkout">
-		<cvs
-				cvsRoot="${repository.eclipse.org-rt}"
-				dest="${eclipse.org.contrib.base}"
-				package="org.eclipse.equinox"
-				failonerror="true" />
-		<echo level="info">eclipse module checked out in a sibling directory to the lombok project directory. You may want to add the project to your eclipse workspace.</echo>
-	</target>
-	
-	<target name="update-org.eclipse.equinox" if="org.eclipse.equinox.available">
-		<cvs command="update" dest="${eclipse.org.contrib.base}/org.eclipse.equinox" />
-	</target>
-	
-	<target name="install-eclipse.debug.target" if="eclipse.debug.target.create">
-		<antcall target="-create-eclipse.debug.target" />
-		<echo level="info">
-		---------------------------
-
-		Launch target configured; it should show up in your eclipse under the debug menu as "LombokizedEclipse".
-		It does NOT hot-code-replace on lombok itself - you'll need to run 'ant dist' every time you want to use it. This is an unavoidable shortcoming of java agents. You can, however, breakpoint and step through your eclipse this way.
-
-		---------------------------
-		</echo>
-	</target>
-	
-	<target name="update-eclipse.debug.target" if="eclipse.debug.target.available">
-		<antcall target="-create-eclipse.debug.target" />
-	</target>
-	
-	<target name="detect-mac">
-		<condition property="startOnFirstThread" value="-XstartOnFirstThread">
-			<os family="mac" />
-		</condition>
-		<condition property="d32" value="-d32">
-			<os family="mac" />
-		</condition>
-		<condition property="d32" value="">
-			<not><os family="mac" /></not>
-		</condition>
-	</target>
-	
-	<target name="-create-eclipse.debug.target" depends="detect-mac">
-		<copy
-				file="buildScripts/deps/eclipse-debug-target.template"
-				tofile="LombokizedEclipse.launch"
-				preservelastmodified="true"
-				overwrite="true">
-			<filterset>
-				<filter token="START_ON_FIRST_THREAD" value="${startOnFirstThread}" />
-				<filter token="D32" value="${d32}" />
-			</filterset>
-		</copy>
-	</target>
-	
-	<target name="-check-eclipse.org">
-		<available file="${eclipse.org.contrib.base}/org.eclipse.jdt.core/.project" property="org.eclipse.jdt.core.available" />
-		<available file="${eclipse.org.contrib.base}/org.eclipse.jdt.ui/.project" property="org.eclipse.jdt.ui.available" />
-		<available file="${eclipse.org.contrib.base}/org.eclipse.core.runtime/.project" property="org.eclipse.core.runtime.available" />
-		<available file="${eclipse.org.contrib.base}/org.eclipse.ltk.core.refactoring/.project" property="org.eclipse.ltk.core.refactoring.available" />
-		<available file="${eclipse.org.contrib.base}/org.eclipse.equinox/.project" property="org.eclipse.equinox.available" />
-		<available file="LombokizedEclipse.launch" property="eclipse.debug.target.available" />
-	</target>
-</project>
diff --git a/buildScripts/deps/findbugs.ant.xml b/buildScripts/deps/findbugs.ant.xml
deleted file mode 100644
index 6aeedb79..00000000
--- a/buildScripts/deps/findbugs.ant.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<!--
-  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
-  
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
--->
-<project name="lombok-deps-findbugs" basedir="../.." default="install">
-	<description>
-This buildfile is part of projectlombok.org. It responsible for finding, downloading, and updating findbugs.
-	</description>
-	
-	<property name="findbugs.dir" location="deps/buildScripts/findbugs" />
-	
-	<target name="-grab-findbugs-if-wanted" unless="findbugs.available" if="findbugs.grab">
-		<antcall target="-grab-findbugs" />
-	</target>
-	
-	<target name="-grab-findbugs" unless="findbugs.available">
-		<mkdir dir="build/findbugs" />
-		<mkdir dir="${findbugs.dir}" />
-		<echo>Downloading findbugs v1.3.9 from sourceforge...</echo>
-		<get
-			src="http://mesh.dl.sourceforge.net/project/findbugs/findbugs/1.3.9/findbugs-1.3.9.tar.gz"
-			dest="build/findbugs/findbugs.tar.gz"
-			verbose="true" />
-		<untar src="build/findbugs/findbugs.tar.gz" compression="gzip" dest="${findbugs.dir}">
-			<mapper type="glob" from="findbugs-1.3.9/*" to="*" />
-			<patternset>
-				<exclude name="findbugs-1.3.9/doc" />
-				<exclude name="findbugs-1.3.9/doc/**" />
-			</patternset>
-		</untar>
-	</target>
-	
-	<target name="-check-findbugs" unless="findbugs.available">
-		<available property="findbugs.available" file="${findbugs.dir}/bin/findbugs" />
-	</target>
-	
-	<target name="install-silent" depends="-check-findbugs, -grab-findbugs">
-		<condition property="lombok.patcher.git.grab">
-			<not><isset property="lombok.patcher.available.git" /></not>
-		</condition>
-		<antcall target="-grab-git-lombok.patcher" />
-		<antcall target="-update-git-lombok.patcher" />
-	</target>
-	
-	<target name="install" depends="-check-findbugs, -missing-findbugs" />
-	
-	<target name="update" />
-	<target name="build" />
-	
-	<target name="-missing-findbugs" unless="findbugs.available">
-		<input validArgs="s,S,skip,Skip,SKIP,g,d,D,download,Download,DOWNLOAD" addproperty="missing1.feedback">
-You don't have the findbugs dependency. If you want to run the 'ant findbugs' task to run findbugs on the lombok sources, you'll need it. Otherwise, you can skip it. If you want me to do so, I will download findbugs now and unpack it in the appropriate place (deps/buildScripts/findbugs). The file will be downloaded from sourceforge.
-		Pick one (first letter will do):
-		Skip - Skips this download. This dependency is optional.
-		Download - Grabs findbugs, so that you can run 'ant findbugs'.
-		</input>
-		<condition property="findbugs.grab">
-			<matches string="${missing1.feedback}" casesensitive="false" pattern="^d(ownload)?$" />
-		</condition>
-		<antcall target="-grab-findbugs-if-wanted" />
-	</target>
-</project>
diff --git a/buildScripts/deps/lombok-patcher.ant.xml b/buildScripts/deps/lombok-patcher.ant.xml
deleted file mode 100644
index c0dfbf77..00000000
--- a/buildScripts/deps/lombok-patcher.ant.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
-  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
-  
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
--->
-<project name="lombok-deps-lombok-patcher" basedir="../.." default="install">
-	<description>
-This buildfile is part of projectlombok.org. It responsible for finding, downloading, and updating the lombok.patcher dependency.
-	</description>
-	<import file="../git.ant.xml" />
-	
-	<property name="lombok.patcher.giturl" value="git://github.com/rzwitserloot/lombok.patcher.git" />
-	<property name="lombok.patcher.dir" location="../lombok.patcher" />
-	<property name="lombok.patcher.fileurl" value="http://projectlombok.org/downloads/lombok-patcher.jar" />
-	<property name="lombok.patcher.fileloc" location="lib/lombok/lombok-patcher.jar" />
-	
-	<target name="install-silent" depends="-check-lombok.patcher, -update-git-lombok.patcher, -update-file-lombok.patcher">
-		<condition property="lombok.patcher.git.grab">
-			<not><isset property="lombok.patcher.available.git" /></not>
-		</condition>
-		<antcall target="-grab-git-lombok.patcher" />
-		<antcall target="-update-git-lombok.patcher" />
-	</target>
-	
-	<target name="install" depends="-check-lombok.patcher, -missing1-lombok.patcher, -missing2-lombok.patcher, -update-git-lombok.patcher" />
-	
-	<target name="update" depends="-check-lombok.patcher, -warn-lombok.patcher, -update-git-lombok.patcher, -check-replace-lombok.patcher, -replace-lombok.patcher">
-		<condition property="lombok.patcher.file.update">
-			<and>
-				<isset property="lombok.patcher.available.file" />
-				<not><isset property="lombok.patcher.available.git" /></not>
-			</and>
-		</condition>
-		<antcall target="-update-file-lombok.patcher" />
-	</target>
-	
-	<target name="build" depends="-check-lombok.patcher, -warn-lombok.patcher, -check-replace-lombok.patcher, -replace-lombok.patcher" />
-	
-	<target name="-warn-lombok.patcher" unless="lombok.patcher.available">
-		<fail>You don't have any version of lombok-patcher.jar installed. Run 'ant installDeps' to fix this.</fail>
-	</target>
-	
-	<target name="-check-replace-lombok.patcher" if="lombok.patcher.checkreplace.git">
-		<ant dir="${lombok.patcher.dir}" target="dist" inheritAll="false" />
-		
-		<condition property="lombok.patcher.replace">
-			<or>
-				<not><available file="${lombok.patcher.fileloc}" /></not>
-				<not><uptodate
-						srcfile="${lombok.patcher.dir}/dist/lombok-patcher.jar"
-						targetfile="${lombok.patcher.fileloc}" /></not>
-			</or>
-		</condition>
-	</target>
-	
-	<target name="-replace-lombok.patcher" if="lombok.patcher.replace">
-		<copy file="${lombok.patcher.dir}/dist/lombok-patcher.jar" tofile="${lombok.patcher.fileloc}" />
-		<echo level="info">** UPDATED: ${lombok.patcher.fileloc}</echo>
-	</target>
-	
-	<target name="-check-lombok.patcher">
-		<available file="${lombok.patcher.dir}/.project" property="lombok.patcher.available.git" />
-		<available file="${lombok.patcher.fileloc}" property="lombok.patcher.available.file" />
-		<condition property="lombok.patcher.available">
-			<or>
-				<isset property="lombok.patcher.available.git" />
-				<isset property="lombok.patcher.available.file" />
-			</or>
-		</condition>
-		<condition property="lombok.patcher.skip.missing2">
-			<isset property="lombok.patcher.available.git" />
-		</condition>
-		<condition property="lombok.patcher.checkreplace.git">
-			<isset property="lombok.patcher.available.git" />
-		</condition>
-	</target>
-	
-	<target name="-missing1-lombok.patcher" unless="lombok.patcher.available">
-		<property name="lombok.patcher.skip.missing2" value="true" />
-		<input validArgs="s,S,skip,Skip,SKIP,g,G,get,Get,GET,d,D,download,Download,DOWNLOAD" addproperty="missing1.feedback">
-You don't have the lombok.patcher dependency. I can grab the lombok.patcher project form version control. If you want me to do so, I will put the project in a sibling directory next to your 'lombok' project directory. Otherwise, I can grab a copy from the internet, though it won't be as up-to-date, and may thus be insufficient to run the very latest lombok.
-		Pick one (first letter will do):
-		Skip     - Skips this download. This dependency is not optional, so your lombok won't compile.
-		Get      - Grabs the latest version of lombok.patcher from source control.
-		Download - Downloads the latest version from the internet, and will not be as up to date as 'get'.
-		</input>
-		<condition property="lombok.patcher.git.grab">
-			<matches string="${missing1.feedback}" casesensitive="false" pattern="^g(et)?$" />
-		</condition>
-		<condition property="lombok.patcher.file.grab">
-			<matches string="${missing1.feedback}" casesensitive="false" pattern="^d(ownload)?$" />
-		</condition>
-		<antcall target="-grab-git-lombok.patcher" />
-		<antcall target="-grab-file-lombok.patcher" />
-	</target>
-	
-	<target name="-missing2-lombok.patcher" unless="lombok.patcher.skip.missing2">
-		<input validArgs="s,S,skip,Skip,SKIP,g,G,get,Get,GET" defaultvalue="s" addproperty="missing2.feedback">
-You only have the lombok.patcher dependency as a downloaded file, which won't be as cutting edge as grabbing it from version control. Do you want to grab lombok.patcher from source control? I will put the project in a sibling directory next to your 'lombok' directory.
-		Pick one (first letter will do):
-		Skip  - Skips this download, and continues to rely on the occasionally updated web version.
-		Get   - Grabs the latest version of lombok.patcher from source control. Lombok will start using this instead.
-		</input>
-		<condition property="lombok.patcher.git.grab">
-			<matches string="${missing2.feedback}" casesensitive="false" pattern="^g(et)?$" />
-		</condition>
-		<condition property="lombok.patcher.file.update">
-			<matches string="${missing2.feedback}" casesensitive="false" pattern="^s(kip)?$" />
-		</condition>
-		<antcall target="-grab-git-lombok.patcher" />
-		<antcall target="-update-file-lombok.patcher" />
-	</target>
-	
-	<target name="-grab-git-lombok.patcher" if="lombok.patcher.git.grab">
-		<echo level="info">Cloning ${lombok.patcher.giturl} into ${lombok.patcher.dir}</echo>
-		<git-clone repository="${lombok.patcher.giturl}" dest="${lombok.patcher.dir}" />
-		<echo level="info">
-Done! lombok-patcher.jar will now be resolved from this cloned repository.
-You may want to import this project into your eclipse workspace as well.
-		</echo>
-		<property name="lombok.patcher.checkreplace.git" value="true" />
-	</target>
-	
-	<target name="-update-git-lombok.patcher" if="lombok.patcher.available.git">
-		<echo level="info">Updating existing git repository of lombok.patcher...</echo>
-		<git-pull gitdir="${lombok.patcher.dir}" />
-	</target>
-	
-	<target name="-grab-file-lombok.patcher" if="lombok.patcher.file.grab">
-		<echo level="info">Downloading lombok-patcher.jar from the internet...</echo>
-		<antcall target="-download-file-lombok.patcher" />
-	</target>
-	
-	<target name="-update-file-lombok.patcher" if="lombok.patcher.file.update">
-		<echo level="info">Updating existing lombok-patcher.jar from the internet...</echo>
-		<antcall target="-download-file-lombok.patcher" />
-	</target>
-	
-	<target name="-download-file-lombok.patcher">
-		<get src="${lombok.patcher.fileurl}" dest="${lombok.patcher.fileloc}" verbose="true" usetimestamp="true" />
-	</target>
-</project>
diff --git a/buildScripts/deps/eclipse-debug-target.template b/buildScripts/eclipse-debug-target.template
similarity index 100%
rename from buildScripts/deps/eclipse-debug-target.template
rename to buildScripts/eclipse-debug-target.template
diff --git a/buildScripts/git.ant.xml b/buildScripts/git.ant.xml
deleted file mode 100644
index 14d3e963..00000000
--- a/buildScripts/git.ant.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--
-  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
-  
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-  
-  Thanks, Thomas Robinson, for the basis and inspiration of this ant script.
-  See: http://tlrobinson.net/blog/2008/11/13/ant-tasks-for-git/
--->
-<project name="git4ant" default="help">
-	<description>Useful macrodefs for using git from ant.</description>
-	<target name="help">
-		<fail message="This script just contains macrodefs for other scripts. It doesn't by itself do anything." />
-	</target>
-	
-	<macrodef name="git">
-		<attribute name="command" />
-		<attribute name="dir" default="" />
-		<element name="args" optional="true" />
-		<sequential>
-			<echo message="git @{command}" />
-			<exec executable="git" dir="@{dir}" resultproperty="git.oserror" failifexecutionfails="false" failonerror="true" searchpath="true">
-				<arg value="@{command}" />
-				<args />
-			</exec>
-			<condition property="git.notfound">
-				<not><equals arg1="0" arg2="${git.oserror}" /></not>
-			</condition>
-			<fail if="git.notfound">
-[GIT NOT FOUND]
-
-You don't appear to have git installed. If you're on windows, try running this in your git shell.
-Otherwise, install git. git is a free and open source version control system.
-You can download it from: http://git-scm.com/
-			</fail>
-		</sequential>
-	</macrodef>
-	
-	<macrodef name="git-clone">
-		<attribute name="repository" />
-		<attribute name="dest" />
-		<sequential>
-			<git command="clone">
-				<args>
-					<arg value="@{repository}" />
-					<arg value="@{dest}" />
-				</args>
-			</git>
-		</sequential>
-	</macrodef>
-	
-	<macrodef name="git-pull">
-		<attribute name="gitdir" default="." />
-		<sequential>
-			<git command="pull" dir="@{gitdir}" />
-		</sequential>
-	</macrodef>
-</project>
diff --git a/buildScripts/ivy-repo/eclipse.org-core.runtime-3.5.0.xml b/buildScripts/ivy-repo/eclipse.org-core.runtime-3.5.0.xml
new file mode 100644
index 00000000..d57eb367
--- /dev/null
+++ b/buildScripts/ivy-repo/eclipse.org-core.runtime-3.5.0.xml
@@ -0,0 +1,12 @@
+<ivy-module version="2.0">
+	<info organisation="eclipse.org" module="core.runtime" revision="3.5.0" publication="20100419062500">
+		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
+		<description homepage="http://www.eclipse.org/eclipse/" />
+	</info>
+	<configurations>
+		<conf name="build" />
+	</configurations>
+	<publications>
+		<artifact conf="build" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.core.runtime_3.5.0.v20090525.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-ecj-3.5.2.xml b/buildScripts/ivy-repo/eclipse.org-ecj-3.5.2.xml
new file mode 100644
index 00000000..b5d37c26
--- /dev/null
+++ b/buildScripts/ivy-repo/eclipse.org-ecj-3.5.2.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="eclipse.org" module="ecj" revision="3.5.2" publication="20100309090400">
+		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
+		<description homepage="http://www.eclipse.org/eclipse/" />
+	</info>
+	<configurations>
+		<conf name="runtime" />
+		<conf name="sources" />
+	</configurations>
+	<publications>
+		<artifact conf="runtime" url="http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/ecj-3.5.2.jar" />
+		<artifact type="zip" conf="sources" url="http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/ecjsrc-3.5.2.zip" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-equinox.common-3.5.0.xml b/buildScripts/ivy-repo/eclipse.org-equinox.common-3.5.0.xml
new file mode 100644
index 00000000..865f3455
--- /dev/null
+++ b/buildScripts/ivy-repo/eclipse.org-equinox.common-3.5.0.xml
@@ -0,0 +1,12 @@
+<ivy-module version="2.0">
+	<info organisation="eclipse.org" module="equinox.common" revision="3.5.0" publication="20100419062500">
+		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
+		<description homepage="http://www.eclipse.org/eclipse/" />
+	</info>
+	<configurations>
+		<conf name="build" />
+	</configurations>
+	<publications>
+		<artifact conf="build" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.equinox.common_3.5.0.v20090520-1800.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-jdt.core-3.5.0.xml b/buildScripts/ivy-repo/eclipse.org-jdt.core-3.5.0.xml
new file mode 100644
index 00000000..22b0623f
--- /dev/null
+++ b/buildScripts/ivy-repo/eclipse.org-jdt.core-3.5.0.xml
@@ -0,0 +1,12 @@
+<ivy-module version="2.0">
+	<info organisation="eclipse.org" module="jdt.core" revision="3.5.0" publication="20100419062500">
+		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
+		<description homepage="http://www.eclipse.org/eclipse/" />
+	</info>
+	<configurations>
+		<conf name="build" />
+	</configurations>
+	<publications>
+		<artifact conf="build" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.core_3.5.0.v_963.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.5.1.xml b/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.5.1.xml
new file mode 100644
index 00000000..75867b4f
--- /dev/null
+++ b/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.5.1.xml
@@ -0,0 +1,12 @@
+<ivy-module version="2.0">
+	<info organisation="eclipse.org" module="jdt.ui" revision="3.5.1" publication="20100419062500">
+		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
+		<description homepage="http://www.eclipse.org/eclipse/" />
+	</info>
+	<configurations>
+		<conf name="build" />
+	</configurations>
+	<publications>
+		<artifact conf="build" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.ui_3.5.1.r351_v20090821-0800.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/eclipse.org-osgi-3.5.0.xml b/buildScripts/ivy-repo/eclipse.org-osgi-3.5.0.xml
new file mode 100644
index 00000000..62a6d3d4
--- /dev/null
+++ b/buildScripts/ivy-repo/eclipse.org-osgi-3.5.0.xml
@@ -0,0 +1,12 @@
+<ivy-module version="2.0">
+	<info organisation="eclipse.org" module="osgi" revision="3.5.0" publication="20100419062500">
+		<license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" />
+		<description homepage="http://www.eclipse.org/eclipse/" />
+	</info>
+	<configurations>
+		<conf name="build" />
+	</configurations>
+	<publications>
+		<artifact conf="build" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.osgi_3.5.0.v20090520.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/lombok.patcher-ivy-0.3.xml b/buildScripts/ivy-repo/lombok.patcher-ivy-0.3.xml
new file mode 100644
index 00000000..ea9e369e
--- /dev/null
+++ b/buildScripts/ivy-repo/lombok.patcher-ivy-0.3.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="projectlombok.org" module="lombok.patcher" revision="0.3" publication="20100225011200">
+		<license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" />
+		<ivyauthor name="rzwitserloot" url="http://zwitserloot.com/" />
+		<ivyauthor name="rspilker" url="http://github.com/rspilker" />
+		<description homepage="http://projectlombok.org/" />
+	</info>
+	<configurations>
+		<conf name="build" />
+	</configurations>
+	<publications>
+		<artifact conf="build" url="http://projectlombok.org/downloads/lombok.patcher-0.3.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/netbeans.org-boot-6.8beta.xml b/buildScripts/ivy-repo/netbeans.org-boot-6.8beta.xml
new file mode 100644
index 00000000..4f6b6a86
--- /dev/null
+++ b/buildScripts/ivy-repo/netbeans.org-boot-6.8beta.xml
@@ -0,0 +1,12 @@
+<ivy-module version="2.0">
+	<info organisation="netbeans.org" module="boot" revision="6.8beta" publication="20100419062500">
+		<license name="CDDL 1.0 / GPL 2.0" url="http://netbeans.org/cddl-gplv2.html" />
+		<description homepage="http://www.netbeans.org/" />
+	</info>
+	<configurations>
+		<conf name="build" />
+	</configurations>
+	<publications>
+		<artifact conf="build" url="http://projectlombok.org/ivyrepo/netbeans/boot_6.8beta.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/netbeans.org-modules.java.source-6.8beta.xml b/buildScripts/ivy-repo/netbeans.org-modules.java.source-6.8beta.xml
new file mode 100644
index 00000000..352b390a
--- /dev/null
+++ b/buildScripts/ivy-repo/netbeans.org-modules.java.source-6.8beta.xml
@@ -0,0 +1,12 @@
+<ivy-module version="2.0">
+	<info organisation="netbeans.org" module="modules.java.source" revision="6.8beta" publication="20100419062500">
+		<license name="CDDL 1.0 / GPL 2.0" url="http://netbeans.org/cddl-gplv2.html" />
+		<description homepage="http://www.netbeans.org/" />
+	</info>
+	<configurations>
+		<conf name="build" />
+	</configurations>
+	<publications>
+		<artifact conf="build" url="http://projectlombok.org/ivyrepo/netbeans/org-netbeans-modules-java-source_6.8beta.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/netbeans.org-openide.modules-6.8beta.xml b/buildScripts/ivy-repo/netbeans.org-openide.modules-6.8beta.xml
new file mode 100644
index 00000000..6549869e
--- /dev/null
+++ b/buildScripts/ivy-repo/netbeans.org-openide.modules-6.8beta.xml
@@ -0,0 +1,12 @@
+<ivy-module version="2.0">
+	<info organisation="netbeans.org" module="openide.modules" revision="6.8beta" publication="20100419062500">
+		<license name="CDDL 1.0 / GPL 2.0" url="http://netbeans.org/cddl-gplv2.html" />
+		<description homepage="http://www.netbeans.org/" />
+	</info>
+	<configurations>
+		<conf name="build" />
+	</configurations>
+	<publications>
+		<artifact conf="build" url="http://projectlombok.org/ivyrepo/netbeans/org-openide-modules_6.8beta.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/netbeans.org-openide.util-6.8beta.xml b/buildScripts/ivy-repo/netbeans.org-openide.util-6.8beta.xml
new file mode 100644
index 00000000..3ef68928
--- /dev/null
+++ b/buildScripts/ivy-repo/netbeans.org-openide.util-6.8beta.xml
@@ -0,0 +1,12 @@
+<ivy-module version="2.0">
+	<info organisation="netbeans.org" module="openide.util" revision="6.8beta" publication="20100419062500">
+		<license name="CDDL 1.0 / GPL 2.0" url="http://netbeans.org/cddl-gplv2.html" />
+		<description homepage="http://www.netbeans.org/" />
+	</info>
+	<configurations>
+		<conf name="build" />
+	</configurations>
+	<publications>
+		<artifact conf="build" url="http://projectlombok.org/ivyrepo/netbeans/org-openide-util_6.8beta.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/projectlombok.org-ant-googlecode-0.0.2.xml b/buildScripts/ivy-repo/projectlombok.org-ant-googlecode-0.0.2.xml
new file mode 100644
index 00000000..9f5d13ba
--- /dev/null
+++ b/buildScripts/ivy-repo/projectlombok.org-ant-googlecode-0.0.2.xml
@@ -0,0 +1,11 @@
+<ivy-module version="2.0">
+	<info organisation="projectlombok.org" module="ant-googlecode" revision="0.0.2" publication="20100419062500">
+		<description homepage="http://code.google.com/p/ant-googlecode/" />
+	</info>
+	<configurations>
+		<conf name="build" />
+	</configurations>
+	<publications>
+		<artifact conf="build" url="http://projectlombok.org/ivyrepo/tools/ant-googlecode-0.0.2.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/projectlombok.org-javac-1.6.0.18.xml b/buildScripts/ivy-repo/projectlombok.org-javac-1.6.0.18.xml
new file mode 100644
index 00000000..f2335aa1
--- /dev/null
+++ b/buildScripts/ivy-repo/projectlombok.org-javac-1.6.0.18.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="projectlombok.org" module="javac" revision="1.6.0.18" publication="20100225011200">
+		<license name="GNU General Public License v2 with Classpath Exception" url="http://openjdk.java.net/legal/gplv2+ce.html" />
+		<description homepage="http://openjdk.java.net/" />
+	</info>
+	<configurations>
+		<conf name="runtime" />
+		<conf name="sources" />
+	</configurations>
+	<publications>
+		<artifact conf="runtime" url="http://projectlombok.org/ivyrepo/langtools/javac.jar" />
+		<artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/langtools/javac-sources.zip" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/projectlombok.org-juunit-4.8.1.xml b/buildScripts/ivy-repo/projectlombok.org-juunit-4.8.1.xml
new file mode 100644
index 00000000..aa31e5b0
--- /dev/null
+++ b/buildScripts/ivy-repo/projectlombok.org-juunit-4.8.1.xml
@@ -0,0 +1,13 @@
+<ivy-module version="2.0">
+	<info organisation="projectlombok.org" module="junit" revision="4.8.1" publication="20100225011200">
+		<license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" />
+		<ivyauthor name="KentBeck" url="http://www.threeriversinstitute.org/Kent%20Beck.htm" />
+		<description homepage="http://junit.org/" />
+	</info>
+	<configurations>
+		<conf name="test" />
+	</configurations>
+	<publications>
+		<artifact conf="test" url="http://cloud.github.com/downloads/KentBeck/junit/junit-4.8.1.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/projectlombok.org-markdownj-1.02b4.xml b/buildScripts/ivy-repo/projectlombok.org-markdownj-1.02b4.xml
new file mode 100644
index 00000000..06c581ec
--- /dev/null
+++ b/buildScripts/ivy-repo/projectlombok.org-markdownj-1.02b4.xml
@@ -0,0 +1,11 @@
+<ivy-module version="2.0">
+	<info organisation="projectlombok.org" module="markdownj" revision="1.02b4" publication="20100419062500">
+		<description homepage="http://code.google.com/p/markdownj/" />
+	</info>
+	<configurations>
+		<conf name="build" />
+	</configurations>
+	<publications>
+		<artifact conf="build" url="http://projectlombok.org/ivyrepo/tools/markdownj-1.02b4-0.3.0.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/projectlombok.org-spi-0.2.4.xml b/buildScripts/ivy-repo/projectlombok.org-spi-0.2.4.xml
new file mode 100644
index 00000000..da949c50
--- /dev/null
+++ b/buildScripts/ivy-repo/projectlombok.org-spi-0.2.4.xml
@@ -0,0 +1,12 @@
+<ivy-module version="2.0">
+	<info organisation="projectlombok.org" module="spi" revision="0.2.4" publication="20100419062500">
+		<license name="Apache License v2.0" url="http://www.apache.org/licenses/LICENSE-2.0" />
+		<description homepage="http://code.google.com/p/spi/" />
+	</info>
+	<configurations>
+		<conf name="build" />
+	</configurations>
+	<publications>
+		<artifact conf="build" url="http://projectlombok.org/ivyrepo/tools/spi-0.2.4.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/zwitserloot.com-cmdreader-1.2.xml b/buildScripts/ivy-repo/zwitserloot.com-cmdreader-1.2.xml
new file mode 100644
index 00000000..5f7b501b
--- /dev/null
+++ b/buildScripts/ivy-repo/zwitserloot.com-cmdreader-1.2.xml
@@ -0,0 +1,15 @@
+<ivy-module version="2.0">
+	<info organisation="zwitserloot.com" module="cmdreader" revision="1.2" publication="20100210120000">
+		<license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" />
+		<ivyauthor name="rzwitserloot" url="http://zwitserloot.com/" />
+		<description homepage="http://github.com/rzwitserloot/com.zwitserloot.cmdreader" />
+	</info>
+	<configurations>
+		<conf name="runtime" />
+		<conf name="sources" />
+	</configurations>
+	<publications>
+		<artifact conf="runtime" url="http://github.com/downloads/rzwitserloot/com.zwitserloot.cmdreader/com.zwitserloot.cmdreader-1.2.jar" />
+		<artifact type="zip" conf="sources" url="http://github.com/downloads/rzwitserloot/com.zwitserloot.cmdreader/com.zwitserloot.cmdreader-src-1.2.zip" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
new file mode 100644
index 00000000..4bcce7c8
--- /dev/null
+++ b/buildScripts/ivy.xml
@@ -0,0 +1,39 @@
+<ivy-module version="2.0">
+	<info organisation="projectlombok.org" module="lombok" />
+	<configurations>
+		<conf name="eclipseBuild" />
+		<conf name="netbeansBuild" />
+		<conf name="build" extends="eclipseBuild, netbeansBuild" />
+		<conf name="runtime" />
+		<conf name="test" extends="build, runtime" />
+		<conf name="contrib" />
+	</configurations>
+	<dependencies>
+		<dependency org="projectlombok.org" name="lombok.patcher" rev="0.3" conf="build; runtime->build" />
+		<dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="build->runtime; runtime" />
+		
+		<dependency org="projectlombok.org" name="junit" rev="4.8.1" conf="test" />
+		
+		<dependency org="org.apache.ant" name="ant" rev="1.8.0" conf="build->master" />
+		<dependency org="projectlombok.org" name="spi" rev="0.2.4" conf="build" />
+		<dependency org="projectlombok.org" name="ant-googlecode" rev="0.0.2" conf="build" />
+		<dependency org="jcraft.com" name="jsch" rev="0.1.42" conf="build" />
+		<dependency org="projectlombok.org" name="jsch-ant-fixed" rev="0.1.42" conf="build" />
+		<dependency org="projectlombok.org" name="markdownj" rev="1.02b4" conf="build" />
+		<dependency org="de.java2html" name="java2html" rev="5.0" conf="build->master" />
+		
+		<dependency org="projectlombok.org" name="javac" rev="1.6.0.18" conf="build->runtime; contrib->sources" />
+		<dependency org="eclipse.org" name="ecj" rev="3.5.2" conf="build->runtime; contrib->sources" />
+		
+		<dependency org="netbeans.org" name="boot" rev="6.8beta" conf="netbeansBuild->build" />
+		<dependency org="netbeans.org" name="openide.modules" rev="6.8beta" conf="netbeansBuild->build" />
+		<dependency org="netbeans.org" name="openide.util" rev="6.8beta" conf="netbeansBuild->build" />
+		<dependency org="netbeans.org" name="modules.java.source" rev="6.8beta" conf="netbeansBuild->build" />
+		
+		<dependency org="eclipse.org" name="core.runtime" rev="3.5.0" conf="eclipseBuild->build" />
+		<dependency org="eclipse.org" name="equinox.common" rev="3.5.0" conf="eclipseBuild->build" />
+		<dependency org="eclipse.org" name="jdt.core" rev="3.5.0" conf="eclipseBuild->build" />
+		<dependency org="eclipse.org" name="jdt.ui" rev="3.5.1" conf="eclipseBuild->build" />
+		<dependency org="eclipse.org" name="osgi" rev="3.5.0" conf="eclipseBuild->build" />
+	</dependencies>
+</ivy-module>
diff --git a/buildScripts/ivysettings.xml b/buildScripts/ivysettings.xml
new file mode 100644
index 00000000..18cb32d4
--- /dev/null
+++ b/buildScripts/ivysettings.xml
@@ -0,0 +1,11 @@
+<ivysettings>
+	<resolvers>
+		<chain name="projectRepos">
+			<filesystem name="projectLocalRepo">
+				<ivy pattern="${ivy.settings.dir}/ivy-repo/[organization]-[module]-[revision].xml" />
+			</filesystem>
+			<ibiblio name="maven-repo2" m2compatible="true" root="http://repo2.maven.org/maven2" />
+		</chain>
+	</resolvers>
+	<settings defaultResolver="projectRepos" />
+</ivysettings>
diff --git a/buildScripts/maven.ant.xml b/buildScripts/maven.ant.xml
deleted file mode 100644
index f2495bcd..00000000
--- a/buildScripts/maven.ant.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<!--
-  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
-  
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
--->
-<project name="lombok-maven" basedir=".." default="maven">
-	<description>
-This buildfile is part of projectlombok.org. It is responsible for creating and maintaining
-the maven repository that contains lombok's deliverables for those using maven.
-	</description>
-	
-	<path id="buildScripts.deps.path">
-		<fileset dir="deps/buildScripts">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-	
-	<target name="version" unless="lombok.version">
-		<ant antfile="build.xml" target="version" inheritAll="false" />
-		<loadresource property="lombok.version">
-			<file file="build/version.txt" />
-			<filterchain>
-				<striplinebreaks />
-			</filterchain>
-		</loadresource>
-	</target>
-	
-	<target name="dist" unless="lombok.dist.built" depends="version">
-		<ant antfile="buildScripts/compile.ant.xml" target="dist" inheritAll="false">
-			<property name="lombok.version" value="${lombok.version}" />
-		</ant>
-	</target>
-	
-	<target name="maven" depends="version, dist" description="Build a maven repository.">
-		<loadresource property="mvn.oldversions">
-			<url url="http://projectlombok.org/mavenrepo/org/projectlombok/lombok/maven-metadata.xml" />
-			<filterchain>
-				<linecontains><contains value="/version>" /></linecontains>
-				<headfilter lines="-1" skip="1" />
-			</filterchain>
-		</loadresource>
-		<mkdir dir="build" />
-		<echo file="build/version.tagged.tmp">&lt;version&gt;${lombok.version}&lt;/version&gt;</echo>
-		<loadfile srcFile="build/version.tagged.tmp" property="lombok.version.tagged" />
-		<delete file="build/version.tagged.tmp" />
-		<fail message="You already created a maven target for this version.  You'll have to update the version to something new!">
-			<condition>
-				<contains string="${mvn.oldversions}" substring="${lombok.version.tagged}" />
-			</condition>
-		</fail>
-
-		<delete dir="build/maven" quiet="true" />
-		<property name="mvn.dir" value="build/maven/org/projectlombok/lombok" />
-		<property name="mvn.bin" value="${mvn.dir}/${lombok.version}" />
-		<property name="mvn.pom" value="${mvn.bin}/lombok-${lombok.version}.pom" />
-		<mkdir dir="${mvn.bin}" />
-		<tstamp>
-			<format property="now.millis" pattern="yyyyMMddHHmmss" timezone="UTC" />
-		</tstamp>
-		<copy todir="${mvn.bin}" file="dist/lombok-${lombok.version}.jar" />
-		<checksum property="mvn.bin.md5" file="${mvn.bin}/lombok-${lombok.version}.jar" algorithm="MD5" />
-		<checksum property="mvn.bin.sha1" file="${mvn.bin}/lombok-${lombok.version}.jar" algorithm="SHA1" />
-		<echo file="${mvn.bin}/lombok-${lombok.version}.jar.md5">${mvn.bin.md5}</echo>
-		<echo file="${mvn.bin}/lombok-${lombok.version}.jar.sha1">${mvn.bin.sha1}</echo>
-		<jar destfile="${mvn.bin}/lombok-${lombok.version}-sources.jar" excludes="**/.DS_Store">
-			<fileset dir="src/core" />
-			<fileset dir="src/installer" />
-			<fileset dir="src/eclipseAgent" />
-		</jar>
-		<checksum property="mvn.src.md5" file="${mvn.bin}/lombok-${lombok.version}-sources.jar" algorithm="MD5" />
-		<checksum property="mvn.src.sha1" file="${mvn.bin}/lombok-${lombok.version}-sources.jar" algorithm="SHA1" />
-		<echo file="${mvn.bin}/lombok-${lombok.version}-sources.jar.md5">${mvn.src.md5}</echo>
-		<echo file="${mvn.bin}/lombok-${lombok.version}-sources.jar.sha1">${mvn.src.sha1}</echo>
-		<copy tofile="${mvn.pom}" file="doc/maven-pom.xml">
-			<filterchain>
-				<replacetokens>
-					<token key="VERSION" value="${lombok.version}" />
-				</replacetokens>
-			</filterchain>
-		</copy>
-		<checksum property="mvn.pom.md5" file="${mvn.pom}" algorithm="MD5" />
-		<checksum property="mvn.pom.sha1" file="${mvn.pom}" algorithm="SHA1" />
-		<echo file="${mvn.pom}.md5">${mvn.pom.md5}</echo>
-		<echo file="${mvn.pom}.sha1">${mvn.pom.sha1}</echo>
-		<echo file="${mvn.dir}/maven-metadata.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-	<groupId>org.projectlombok</groupId>
-	<artifactId>lombok</artifactId>
-	<version>${lombok.version}</version>
-	<versioning>
-		<versions>
-			<version>${lombok.version}</version>
-			${mvn.oldversions}
-		</versions>
-		<lastUpdated>${now.millis}</lastUpdated>
-	</versioning>
-</metadata>
-]]></echo>
-		<checksum property="mvn.manifest.md5" file="${mvn.dir}/maven-metadata.xml" algorithm="MD5" />
-		<checksum property="mvn.manifest.sha1" file="${mvn.dir}/maven-metadata.xml" algorithm="SHA1" />
-		<echo file="${mvn.dir}/maven-metadata.xml.md5">${mvn.manifest.md5}</echo>
-		<echo file="${mvn.dir}/maven-metadata.xml.sha1">${mvn.manifest.sha1}</echo>
-		<tar destfile="dist/maven.tar.bz2" compression="bzip2">
-			<tarfileset dir="build/maven" />
-		</tar>
-	</target>
-	
-	<taskdef name="scp" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.Scp" classpathref="buildScripts.deps.path" />
-	<taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="buildScripts.deps.path" />
-	<target name="maven-publish" depends="maven">
-		<available file="libertad-upload.key" property="libertad.key.available" />
-		<fail unless="libertad.key.available">You don't have the libertad-upload.key; you'll need it to get write access to the server.</fail>
-		<scp
-			localFile="dist/maven.tar.bz2"
-			todir="lombokup@projectlombok.org:/staging"
-			keyfile="libertad-upload.key" passphrase=""
-			sftp="true" verbose="true" trust="true" />
-		<sshexec
-			host="projectlombok.org"
-			username="lombokup"
-			keyfile="libertad-upload.key" passphrase=""
-			trust="true" command="./deployMavenRepo" />
-	</target>
-	
-	<target name="FOO">
-		<sshexec
-			host="projectlombok.org"
-			username="lombokup"
-			keyfile="libertad-upload.key" passphrase=""
-			trust="true" command="./deployMavenRepo" />
-	</target>
-</project>
diff --git a/buildScripts/publish.ant.xml b/buildScripts/publish.ant.xml
deleted file mode 100644
index da24c21f..00000000
--- a/buildScripts/publish.ant.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<!--
-  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
-  
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
--->
-<project name="lombok-publish" basedir=".." default="publish">
-	<description>
-This buildfile is part of projectlombok.org. It is responsible for turning the build results
-into the actual deliverable form, and uploading it to the distribution websites.
-	</description>
-	<property name="credentialsFile" value="google.properties" />
-	
-	<target name="version" unless="lombok.version">
-		<ant antfile="build.xml" target="version" inheritAll="false" />
-		<loadresource property="lombok.version">
-			<file file="build/version.txt" />
-			<filterchain>
-				<striplinebreaks />
-			</filterchain>
-		</loadresource>
-	</target>
-	
-	<target name="dist" unless="lombok.dist.built" depends="version">
-		<ant antfile="buildScripts/compile.ant.xml" target="dist" inheritAll="false">
-			<property name="lombok.version" value="${lombok.version}" />
-		</ant>
-	</target>
-	
-	<target name="-credentials">
-		<available property="hasCredentialsFile" file="${credentialsFile}"/>
-	</target>
-	
-	<target name="-checkCredentialsFile" depends="-credentials" unless="hasCredentialsFile">
-		<echo file="${credentialsFile}">
-#username=[your google account name without @gmail.com]
-#password=[your googlecode password, is NOT your gmail password]
-		</echo>
-		<fail message="fill in ${credentialsFile} to provide your credentials" />
-	</target>
-	
-	<target name="publish" description="Publishes the latest build to googlecode" depends="version, -checkCredentialsFile, dist">
-		<taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask" classpath="deps/buildScripts/ant-googlecode-0.0.2.jar" name="gcupload" />
-		<property file="${credentialsFile}" prefix="google" />
-		<gcupload 
-				username="${google.username}"
-				password="${google.password}"
-				projectname="projectlombok"
-				filename="dist/lombok.jar"
-				targetfilename="lombok-${lombok.version}.jar"
-				summary="Version ${lombok.version}"
-				labels=""
-				verbose="true" />
-		<gcupload 
-				username="${google.username}"
-				password="${google.password}" 
-				projectname="projectlombok" 
-				filename="dist/lombok.jar" 
-				targetfilename="lombok.jar"
-				summary="Version ${lombok.version} - The everything jar - doubleclick it to install, or just include it in your projects."
-				labels="Featured" 
-				verbose="true" />
-	</target>
-</project>
diff --git a/buildScripts/test.ant.xml b/buildScripts/test.ant.xml
deleted file mode 100644
index 5e10bbb0..00000000
--- a/buildScripts/test.ant.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<!--
-  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
-  
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
--->
-<project name="lombok-test" basedir=".." default="test">
-	<description>
-This buildfile is part of projectlombok.org. It responsible for running unit tests.
-	</description>
-	
-	<path id="deps.path">
-		<fileset dir="deps/lombok">
-			<include name="**/*.jar" />
-			<exclude name="**/ant.jar" />
-		</fileset>
-		<fileset dir="deps">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-	
-	<path id="libs.path">
-		<fileset dir="lib/lombok">
-			<include name="**/*.jar" />
-		</fileset>
-		<fileset dir="lib">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-	
-	<target name="-test-compile" unless="skipTests">
-		<mkdir dir="build/tests" />
-		<javac debug="on" destdir="build/tests" target="1.5">
-			<classpath refid="deps.path" />
-			<classpath refid="libs.path" />
-			<classpath path="build/lombok" />
-			<src path="test/core/src" />
-			<src path="test/delombok/src" />
-		</javac>
-		<copy todir="build/tests">
-			<fileset dir="test/pretty/resource" />
-			<fileset dir="test/delombok/resource" />
-		</copy>
-	</target>
-	
-	<target name="test" depends="-test-compile" unless="tests.skip">
-		<junit haltonfailure="yes" fork="on">
-			<formatter type="plain" usefile="false" unless="tests.quiet" />
-			<classpath refid="deps.path" />
-			<classpath refid="libs.path" />
-			<classpath path="build/lombok" />
-			<classpath path="build/tests" />
-			<batchtest>
-				<fileset dir="test/core/src">
-					<include name="**/Test*.java" />
-				</fileset>
-				<fileset dir="test/delombok/src">
-					<include name="**/Test*.java" />
-				</fileset>
-			</batchtest>
-		</junit>
-		<echo level="info">All tests successful.</echo>
-	</target>
-</project>
diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index e0861e83..b33eebf2 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
+  Copyright © 2010 Reinier Zwitserloot and Roel Spilker.
   
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -25,20 +25,8 @@ This buildfile is part of projectlombok.org. It is responsible for building the
 such as converting the changelog into HTML, and creating javadoc.
 	</description>
 	
-	<path id="deps.path">
-		<fileset dir="deps/lombok">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-	
-	<path id="libs.path">
-		<fileset dir="lib/lombok">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-	
-	<path id="buildScripts.deps.path">
-		<fileset dir="deps/buildScripts">
+	<path id="build.path">
+		<fileset dir="lib/build">
 			<include name="**/*.jar" />
 		</fileset>
 	</path>
@@ -52,24 +40,18 @@ such as converting the changelog into HTML, and creating javadoc.
 	<target name="website" description="Prepares the website for distribution" depends="-website-main, -website-videos, -website-dist" />
 	
 	<target name="version" unless="lombok.version">
-		<ant antfile="build.xml" target="version" inheritAll="false" />
-		<loadresource property="lombok.version">
-			<file file="build/version.txt" />
-			<filterchain>
-				<striplinebreaks />
-			</filterchain>
-		</loadresource>
+		<fail>Supply lombok.version</fail>
 	</target>
 	
 	<target name="-compile-webclasses">
 		<mkdir dir="build/webclasses" />
 		<javac includeDestClasses="false" destdir="build/webclasses" debug="on" source="1.4" target="1.4">
-			<classpath refid="buildScripts.deps.path" />
+			<classpath refid="build.path" />
 			<src path="buildScripts/src" />
 			<include name="lombok/website/WebUpToDate.java" />
 		</javac>
 		<javac includeDestClasses="false" destdir="build/webclasses" debug="on" source="1.5" target="1.5">
-			<classpath refid="buildScripts.deps.path" />
+			<classpath refid="build.path" />
 			<src path="buildScripts/src" />
 			<include name="lombok/website/CompileChangelog.java" />
 		</javac>
@@ -94,7 +76,7 @@ such as converting the changelog into HTML, and creating javadoc.
 	</target>
 	
 	<target name="-website-main" depends="-website-clean, version, javadoc, changelogToHtml">
-		<taskdef classpath="deps/buildScripts/java2html.jar" name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" />
+		<taskdef classpath="lib/build/java2html.jar" name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" />
 		<mkdir dir="build/website" />
 		<copy todir="build/website">
 			<fileset dir="website">
@@ -157,8 +139,8 @@ such as converting the changelog into HTML, and creating javadoc.
 		</tar>
 	</target>
 	
-	<taskdef name="scp" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.Scp" classpathref="buildScripts.deps.path" />
-	<taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="buildScripts.deps.path" />
+	<taskdef name="scp" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.Scp" classpathref="build.path" />
+	<taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" />
 	<target name="website-publish" depends="website">
 		<available file="libertad-upload.key" property="libertad.key.available" />
 		<fail unless="libertad.key.available">You don't have the libertad-upload.key; you'll need it to get write access to the server.</fail>
@@ -217,7 +199,7 @@ such as converting the changelog into HTML, and creating javadoc.
 		<property name="CHANGELOG_HTML" location="build/website-edge/changelog-edge.html" />
 		<java fork="true" classname="lombok.website.CompileChangelog" failonerror="true">
 			<classpath>
-				<path refid="buildScripts.deps.path" />
+				<path refid="build.path" />
 				<pathelement location="build/webclasses" />
 			</classpath>
 			<arg value="${CHANGELOG_FILE}" />
@@ -269,7 +251,7 @@ such as converting the changelog into HTML, and creating javadoc.
 		<property name="CHANGELOG_HTML" location="build/website/changelog-raw.html" />
 		<java fork="true" classname="lombok.website.CompileChangelog" failonerror="true">
 			<classpath>
-				<path refid="buildScripts.deps.path" />
+				<path refid="build.path" />
 				<pathelement location="build/webclasses" />
 			</classpath>
 			<arg value="${CHANGELOG_FILE}" />
diff --git a/contrib/README b/contrib/README
deleted file mode 100644
index b94d973f..00000000
--- a/contrib/README
+++ /dev/null
@@ -1,4 +0,0 @@
-The files in this directory are not required to either run or build lombok.
-They are in the repository solely because they are useful when developing lombok.
-For example, the sources to used libraries are here so you can click through to it
-in your IDE when you configure your library requirements correctly.
diff --git a/contrib/asm-3.1-javadoc.zip b/contrib/asm-3.1-javadoc.zip
deleted file mode 100644
index 91ce1569..00000000
Binary files a/contrib/asm-3.1-javadoc.zip and /dev/null differ
diff --git a/contrib/asm-3.1-src.zip b/contrib/asm-3.1-src.zip
deleted file mode 100644
index 4ad32d54..00000000
Binary files a/contrib/asm-3.1-src.zip and /dev/null differ
diff --git a/contrib/ecjsrc-3.5.1.zip b/contrib/ecjsrc-3.5.1.zip
deleted file mode 100644
index 25041d24..00000000
Binary files a/contrib/ecjsrc-3.5.1.zip and /dev/null differ
diff --git a/contrib/javac-source.zip b/contrib/javac-source.zip
deleted file mode 100644
index 7d989ac6..00000000
Binary files a/contrib/javac-source.zip and /dev/null differ
diff --git a/deps/README b/deps/README
deleted file mode 100644
index 3a260349..00000000
--- a/deps/README
+++ /dev/null
@@ -1,4 +0,0 @@
-'deps' are defined as those things which are required to compile or develop lombok, but which aren't required when
-actually running lombok.
-
-For dependencies which need to be available at runtime, see the 'lib' directory.
diff --git a/deps/buildScripts/.gitignore b/deps/buildScripts/.gitignore
deleted file mode 100644
index 643bebd3..00000000
--- a/deps/buildScripts/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-findbugs
-
diff --git a/deps/buildScripts/ant-googlecode-0.0.2.jar b/deps/buildScripts/ant-googlecode-0.0.2.jar
deleted file mode 100644
index fa51d57c..00000000
Binary files a/deps/buildScripts/ant-googlecode-0.0.2.jar and /dev/null differ
diff --git a/deps/buildScripts/ant-jsch-fixed.jar b/deps/buildScripts/ant-jsch-fixed.jar
deleted file mode 100644
index c8649226..00000000
Binary files a/deps/buildScripts/ant-jsch-fixed.jar and /dev/null differ
diff --git a/deps/buildScripts/java2html.jar b/deps/buildScripts/java2html.jar
deleted file mode 100644
index 3d05dc55..00000000
Binary files a/deps/buildScripts/java2html.jar and /dev/null differ
diff --git a/deps/buildScripts/jsch-0.1.42.jar b/deps/buildScripts/jsch-0.1.42.jar
deleted file mode 100644
index c65eff09..00000000
Binary files a/deps/buildScripts/jsch-0.1.42.jar and /dev/null differ
diff --git a/deps/buildScripts/markdownj.jar b/deps/buildScripts/markdownj.jar
deleted file mode 100644
index 5e8f22b9..00000000
Binary files a/deps/buildScripts/markdownj.jar and /dev/null differ
diff --git a/deps/javadoc/java6/package-list b/deps/javadoc/java6/package-list
deleted file mode 100644
index 3e918cda..00000000
--- a/deps/javadoc/java6/package-list
+++ /dev/null
@@ -1,203 +0,0 @@
-java.applet
-java.awt
-java.awt.color
-java.awt.datatransfer
-java.awt.dnd
-java.awt.event
-java.awt.font
-java.awt.geom
-java.awt.im
-java.awt.im.spi
-java.awt.image
-java.awt.image.renderable
-java.awt.print
-java.beans
-java.beans.beancontext
-java.io
-java.lang
-java.lang.annotation
-java.lang.instrument
-java.lang.management
-java.lang.ref
-java.lang.reflect
-java.math
-java.net
-java.nio
-java.nio.channels
-java.nio.channels.spi
-java.nio.charset
-java.nio.charset.spi
-java.rmi
-java.rmi.activation
-java.rmi.dgc
-java.rmi.registry
-java.rmi.server
-java.security
-java.security.acl
-java.security.cert
-java.security.interfaces
-java.security.spec
-java.sql
-java.text
-java.text.spi
-java.util
-java.util.concurrent
-java.util.concurrent.atomic
-java.util.concurrent.locks
-java.util.jar
-java.util.logging
-java.util.prefs
-java.util.regex
-java.util.spi
-java.util.zip
-javax.accessibility
-javax.activation
-javax.activity
-javax.annotation
-javax.annotation.processing
-javax.crypto
-javax.crypto.interfaces
-javax.crypto.spec
-javax.imageio
-javax.imageio.event
-javax.imageio.metadata
-javax.imageio.plugins.bmp
-javax.imageio.plugins.jpeg
-javax.imageio.spi
-javax.imageio.stream
-javax.jws
-javax.jws.soap
-javax.lang.model
-javax.lang.model.element
-javax.lang.model.type
-javax.lang.model.util
-javax.management
-javax.management.loading
-javax.management.modelmbean
-javax.management.monitor
-javax.management.openmbean
-javax.management.relation
-javax.management.remote
-javax.management.remote.rmi
-javax.management.timer
-javax.naming
-javax.naming.directory
-javax.naming.event
-javax.naming.ldap
-javax.naming.spi
-javax.net
-javax.net.ssl
-javax.print
-javax.print.attribute
-javax.print.attribute.standard
-javax.print.event
-javax.rmi
-javax.rmi.CORBA
-javax.rmi.ssl
-javax.script
-javax.security.auth
-javax.security.auth.callback
-javax.security.auth.kerberos
-javax.security.auth.login
-javax.security.auth.spi
-javax.security.auth.x500
-javax.security.cert
-javax.security.sasl
-javax.sound.midi
-javax.sound.midi.spi
-javax.sound.sampled
-javax.sound.sampled.spi
-javax.sql
-javax.sql.rowset
-javax.sql.rowset.serial
-javax.sql.rowset.spi
-javax.swing
-javax.swing.border
-javax.swing.colorchooser
-javax.swing.event
-javax.swing.filechooser
-javax.swing.plaf
-javax.swing.plaf.basic
-javax.swing.plaf.metal
-javax.swing.plaf.multi
-javax.swing.plaf.synth
-javax.swing.table
-javax.swing.text
-javax.swing.text.html
-javax.swing.text.html.parser
-javax.swing.text.rtf
-javax.swing.tree
-javax.swing.undo
-javax.tools
-javax.transaction
-javax.transaction.xa
-javax.xml
-javax.xml.bind
-javax.xml.bind.annotation
-javax.xml.bind.annotation.adapters
-javax.xml.bind.attachment
-javax.xml.bind.helpers
-javax.xml.bind.util
-javax.xml.crypto
-javax.xml.crypto.dom
-javax.xml.crypto.dsig
-javax.xml.crypto.dsig.dom
-javax.xml.crypto.dsig.keyinfo
-javax.xml.crypto.dsig.spec
-javax.xml.datatype
-javax.xml.namespace
-javax.xml.parsers
-javax.xml.soap
-javax.xml.stream
-javax.xml.stream.events
-javax.xml.stream.util
-javax.xml.transform
-javax.xml.transform.dom
-javax.xml.transform.sax
-javax.xml.transform.stax
-javax.xml.transform.stream
-javax.xml.validation
-javax.xml.ws
-javax.xml.ws.handler
-javax.xml.ws.handler.soap
-javax.xml.ws.http
-javax.xml.ws.soap
-javax.xml.ws.spi
-javax.xml.ws.wsaddressing
-javax.xml.xpath
-org.ietf.jgss
-org.omg.CORBA
-org.omg.CORBA.DynAnyPackage
-org.omg.CORBA.ORBPackage
-org.omg.CORBA.TypeCodePackage
-org.omg.CORBA.portable
-org.omg.CORBA_2_3
-org.omg.CORBA_2_3.portable
-org.omg.CosNaming
-org.omg.CosNaming.NamingContextExtPackage
-org.omg.CosNaming.NamingContextPackage
-org.omg.Dynamic
-org.omg.DynamicAny
-org.omg.DynamicAny.DynAnyFactoryPackage
-org.omg.DynamicAny.DynAnyPackage
-org.omg.IOP
-org.omg.IOP.CodecFactoryPackage
-org.omg.IOP.CodecPackage
-org.omg.Messaging
-org.omg.PortableInterceptor
-org.omg.PortableInterceptor.ORBInitInfoPackage
-org.omg.PortableServer
-org.omg.PortableServer.CurrentPackage
-org.omg.PortableServer.POAManagerPackage
-org.omg.PortableServer.POAPackage
-org.omg.PortableServer.ServantLocatorPackage
-org.omg.PortableServer.portable
-org.omg.SendingContext
-org.omg.stub.java.rmi
-org.w3c.dom
-org.w3c.dom.bootstrap
-org.w3c.dom.events
-org.w3c.dom.ls
-org.xml.sax
-org.xml.sax.ext
-org.xml.sax.helpers
diff --git a/deps/junit-4.7.jar b/deps/junit-4.7.jar
deleted file mode 100644
index 700ad695..00000000
Binary files a/deps/junit-4.7.jar and /dev/null differ
diff --git a/deps/lombok/ant.jar b/deps/lombok/ant.jar
deleted file mode 100644
index 19900e9f..00000000
Binary files a/deps/lombok/ant.jar and /dev/null differ
diff --git a/deps/lombok/ecj-3.5.1.jar b/deps/lombok/ecj-3.5.1.jar
deleted file mode 100644
index c32db12c..00000000
Binary files a/deps/lombok/ecj-3.5.1.jar and /dev/null differ
diff --git a/deps/lombok/eclipse/org.eclipse.core.runtime_3.5.0.v20090525.jar b/deps/lombok/eclipse/org.eclipse.core.runtime_3.5.0.v20090525.jar
deleted file mode 100644
index a1cf295a..00000000
Binary files a/deps/lombok/eclipse/org.eclipse.core.runtime_3.5.0.v20090525.jar and /dev/null differ
diff --git a/deps/lombok/eclipse/org.eclipse.equinox.common_3.5.0.v20090520-1800.jar b/deps/lombok/eclipse/org.eclipse.equinox.common_3.5.0.v20090520-1800.jar
deleted file mode 100644
index 8687a112..00000000
Binary files a/deps/lombok/eclipse/org.eclipse.equinox.common_3.5.0.v20090520-1800.jar and /dev/null differ
diff --git a/deps/lombok/eclipse/org.eclipse.jdt.core_3.5.0.v_963.jar b/deps/lombok/eclipse/org.eclipse.jdt.core_3.5.0.v_963.jar
deleted file mode 100644
index 0db68569..00000000
Binary files a/deps/lombok/eclipse/org.eclipse.jdt.core_3.5.0.v_963.jar and /dev/null differ
diff --git a/deps/lombok/eclipse/org.eclipse.jdt.ui_3.5.1.r351_v20090821-0800.jar b/deps/lombok/eclipse/org.eclipse.jdt.ui_3.5.1.r351_v20090821-0800.jar
deleted file mode 100644
index fe3d9bee..00000000
Binary files a/deps/lombok/eclipse/org.eclipse.jdt.ui_3.5.1.r351_v20090821-0800.jar and /dev/null differ
diff --git a/deps/lombok/eclipse/org.eclipse.osgi_3.5.0.v20090520.jar b/deps/lombok/eclipse/org.eclipse.osgi_3.5.0.v20090520.jar
deleted file mode 100644
index b80140e0..00000000
Binary files a/deps/lombok/eclipse/org.eclipse.osgi_3.5.0.v20090520.jar and /dev/null differ
diff --git a/deps/lombok/netbeans/boot_6.8beta.jar b/deps/lombok/netbeans/boot_6.8beta.jar
deleted file mode 100644
index f82709d2..00000000
Binary files a/deps/lombok/netbeans/boot_6.8beta.jar and /dev/null differ
diff --git a/deps/lombok/netbeans/org-netbeans-modules-java-source_6.8beta.jar b/deps/lombok/netbeans/org-netbeans-modules-java-source_6.8beta.jar
deleted file mode 100644
index 04b51656..00000000
Binary files a/deps/lombok/netbeans/org-netbeans-modules-java-source_6.8beta.jar and /dev/null differ
diff --git a/deps/lombok/netbeans/org-openide-modules_6.8beta.jar b/deps/lombok/netbeans/org-openide-modules_6.8beta.jar
deleted file mode 100644
index 9f345729..00000000
Binary files a/deps/lombok/netbeans/org-openide-modules_6.8beta.jar and /dev/null differ
diff --git a/deps/lombok/netbeans/org-openide-util_6.8beta.jar b/deps/lombok/netbeans/org-openide-util_6.8beta.jar
deleted file mode 100644
index b3dbeac6..00000000
Binary files a/deps/lombok/netbeans/org-openide-util_6.8beta.jar and /dev/null differ
diff --git a/deps/lombok/org.eclipse.core.runtime_3.5.0.v20090525.jar b/deps/lombok/org.eclipse.core.runtime_3.5.0.v20090525.jar
deleted file mode 100644
index a1cf295a..00000000
Binary files a/deps/lombok/org.eclipse.core.runtime_3.5.0.v20090525.jar and /dev/null differ
diff --git a/deps/lombok/org.eclipse.equinox.common_3.5.0.v20090520-1800.jar b/deps/lombok/org.eclipse.equinox.common_3.5.0.v20090520-1800.jar
deleted file mode 100644
index 8687a112..00000000
Binary files a/deps/lombok/org.eclipse.equinox.common_3.5.0.v20090520-1800.jar and /dev/null differ
diff --git a/deps/lombok/org.eclipse.jdt.core_3.5.0.v_963.jar b/deps/lombok/org.eclipse.jdt.core_3.5.0.v_963.jar
deleted file mode 100644
index 0db68569..00000000
Binary files a/deps/lombok/org.eclipse.jdt.core_3.5.0.v_963.jar and /dev/null differ
diff --git a/deps/lombok/org.eclipse.jdt.ui_3.5.1.r351_v20090821-0800.jar b/deps/lombok/org.eclipse.jdt.ui_3.5.1.r351_v20090821-0800.jar
deleted file mode 100644
index fe3d9bee..00000000
Binary files a/deps/lombok/org.eclipse.jdt.ui_3.5.1.r351_v20090821-0800.jar and /dev/null differ
diff --git a/deps/lombok/org.eclipse.osgi_3.5.0.v20090520.jar b/deps/lombok/org.eclipse.osgi_3.5.0.v20090520.jar
deleted file mode 100644
index b80140e0..00000000
Binary files a/deps/lombok/org.eclipse.osgi_3.5.0.v20090520.jar and /dev/null differ
diff --git a/deps/lombok/spi-0.2.4.jar b/deps/lombok/spi-0.2.4.jar
deleted file mode 100644
index 39999092..00000000
Binary files a/deps/lombok/spi-0.2.4.jar and /dev/null differ
diff --git a/deps/lombok/tools.jar b/deps/lombok/tools.jar
deleted file mode 100644
index bc3e0bef..00000000
Binary files a/deps/lombok/tools.jar and /dev/null differ
diff --git a/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java b/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java
index c3e02431..2ec5614d 100644
--- a/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java
+++ b/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java
@@ -74,11 +74,11 @@ public class DisableCheckedExceptionsAgent extends AbstractProcessor {
 		return false;
 	}
 	
-	public static void agentmain(@SuppressWarnings("unused") String agentArgs, Instrumentation instrumentation) throws Exception {
+	public static void agentmain(String agentArgs, Instrumentation instrumentation) throws Exception {
 		registerPatchScripts(instrumentation, true);
 	}
 	
-	public static void premain(@SuppressWarnings("unused") String agentArgs, Instrumentation instrumentation) throws Exception {
+	public static void premain(String agentArgs, Instrumentation instrumentation) throws Exception {
 		registerPatchScripts(instrumentation, false);
 	}
 	
diff --git a/lib/README b/lib/README
deleted file mode 100644
index e776bb9c..00000000
--- a/lib/README
+++ /dev/null
@@ -1,4 +0,0 @@
-'lib' is defined as those things which are required when actually running lombok.
-The main lombok code requires all libraries in the 'lombok' directory.
-
-For dependencies which are required only at compile time, see the 'deps' directory.
diff --git a/lib/lombok/.gitignore b/lib/lombok/.gitignore
deleted file mode 100644
index 468666ec..00000000
--- a/lib/lombok/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-lombok-patcher.jar
diff --git a/lib/lombok/.gitkeep b/lib/lombok/.gitkeep
deleted file mode 100644
index 2ded1cf3..00000000
--- a/lib/lombok/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-Empty dir placeholder
diff --git a/lib/lombok/com.zwitserloot.cmdreader.jar b/lib/lombok/com.zwitserloot.cmdreader.jar
deleted file mode 100644
index 7eb37b5a..00000000
Binary files a/lib/lombok/com.zwitserloot.cmdreader.jar and /dev/null differ
diff --git a/src/core/lombok/eclipse/Eclipse.java b/src/core/lombok/eclipse/Eclipse.java
index 019b37fd..c70660f4 100644
--- a/src/core/lombok/eclipse/Eclipse.java
+++ b/src/core/lombok/eclipse/Eclipse.java
@@ -113,7 +113,6 @@ public class Eclipse {
 	}
 	
 	private static class TerminalLogger {
-		@SuppressWarnings("unused")	//to match signature of EclipseWorkspaceLogger.
 		void error(String message, String bundleName, Throwable error) {
 			System.err.println(message);
 			error.printStackTrace();
diff --git a/src/netbeansAgent/lombok/netbeans/agent/PatchFixes.java b/src/netbeansAgent/lombok/netbeans/agent/PatchFixes.java
index 7b85be29..f45a4736 100644
--- a/src/netbeansAgent/lombok/netbeans/agent/PatchFixes.java
+++ b/src/netbeansAgent/lombok/netbeans/agent/PatchFixes.java
@@ -52,7 +52,7 @@ import com.sun.tools.javac.util.Context;
 // This footwork was converted into a patch script form by me (rzwitserloot). See:
 // http://code.google.com/p/projectlombok/issues/detail?id=20#c3
 public class PatchFixes {
-	public static boolean loadClass_decision(@SuppressWarnings("unused") ClassLoader loader, String name) throws Exception {
+	public static boolean loadClass_decision(ClassLoader loader, String name) throws Exception {
 		return name.startsWith("lombok.");
 	}
 	
@@ -64,7 +64,7 @@ public class PatchFixes {
 		return (Class<?>)m.invoke(loader, pkg, name);
 	}
 	
-	public static boolean getResource_decision(@SuppressWarnings("unused") ClassLoader loader, String name) throws Exception {
+	public static boolean getResource_decision(ClassLoader loader, String name) throws Exception {
 		return name.startsWith("META-INF/services/lombok.");
 	}
 	
@@ -74,7 +74,7 @@ public class PatchFixes {
 		return (URL) m.invoke(loader, name);
 	}
 	
-	public static boolean getResources_decision(@SuppressWarnings("unused") ClassLoader loader, String name) throws Exception {
+	public static boolean getResources_decision(ClassLoader loader, String name) throws Exception {
 		return name.startsWith("META-INF/services/lombok.");
 	}
 	
@@ -130,7 +130,7 @@ public class PatchFixes {
 	}
 	
 	public static void addTaskListenerWhenCallingJavac(JavacTaskImpl task,
-			@SuppressWarnings("unused") /* Will come in handy later */ ClasspathInfo cpInfo) throws Exception {
+			ClasspathInfo cpInfo) throws Exception {
 		if (task == null) return;
 		Class<?> entryPoint = JavacTaskImpl.class.getClassLoader().loadClass("lombok.netbeans.agent.NetbeansEntryPoint");
 		if (entryPoint == null) {