Refactored the source folders.

85 files changed, 35 insertions, 14 deletions

diff --git a/.classpath b/.classpath
index 185f8a64..b59d0baa 100644
--- a/.classpath
+++ b/.classpath
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/core"/>
+	<classpathentry kind="src" path="src/eclipseAgent"/>
+	<classpathentry kind="src" path="src/installer"/>
 	<classpathentry kind="src" path="experimental/src"/>
-	<classpathentry kind="src" path="src_eclipseagent"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="deps/lombok/org.eclipse.jdt.core_3.5.0.v_963.jar"/>
 	<classpathentry kind="lib" path="deps/lombok/org.eclipse.jdt.ui_3.5.1.r351_v20090821-0800.jar"/>
diff --git a/build.xml b/build.xml
index 8d45154f..a2571d54 100644
--- a/build.xml
+++ b/build.xml
@@ -31,7 +31,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	
 	<target name="version" description="Shows the version number" unless="lombok.version">
 		<mkdir dir="build/lombok" />
-		<javac includeDestClasses="false" srcdir="src" debug="on" destdir="build/lombok" target="1.5" includes="lombok/core/Version.java" />
+		<javac includeDestClasses="false" srcdir="src/core" debug="on" destdir="build/lombok" target="1.5" includes="lombok/core/Version.java" />
 		<java
 			classname="lombok.core.Version"
 			classpath="build/lombok"
diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml
index 880d7e16..cafc59b9 100644
--- a/buildScripts/compile.ant.xml
+++ b/buildScripts/compile.ant.xml
@@ -80,12 +80,19 @@ lombok code including the various agents.
 		<findbugs home="deps/buildScripts/findBugs" output="html" outputFile="findbugsReport.html" jvmargs="-Xmx512m">
 			<auxClasspath path="build/lombok" />
 			<auxClasspath path="build/lombok_aux" />
-			<sourcePath path="src" />
-			<sourcePath path="src_eclipseagent" />
+			<sourcePath path="src/core" />
+			<sourcePath path="src/installer" />
+			<sourcePath path="src/eclipseAgent" />
 			<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
@@ -101,21 +108,30 @@ lombok code including the various agents.
 		     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">
-			<src path="src" />
-			<src path="src_eclipseagent" />
+			<src path="src/core" />
+			<src path="src/installer" />
+			<src path="src/eclipseAgent" />
 			<exclude name="lombok/javac/**" />
 			<classpath refid="deps.path" />
 			<classpath refid="libs.path" />
 		</javac>
-		<javac srcdir="src" debug="on" destdir="build/lombok" target="1.6" includes="lombok/javac/**">
+		<javac debug="on" destdir="build/lombok" target="1.6">
+			<src path="src/core" />
+			<src path="src/installer" />
+			<src path="src/eclipseAgent" />
+			<include name="lombok/javac/**" />
 			<classpath refid="deps.path" />
 			<classpath refid="libs.path" />
 		</javac>
 		<copy todir="build/lombok">
-			<fileset dir="src">
-				<exclude name="**/*.java" />
-				<exclude name="**/*.class" />
-				<exclude name="**/*.svg" />
+			<fileset dir="src/installer">
+				<patternset refid="copyables" />
+			</fileset>
+			<fileset dir="src/core">
+				<patternset refid="copyables" />
+			</fileset>
+			<fileset dir="src/eclipseAgent">
+				<patternset refid="copyables" />
 			</fileset>
 		</copy>
 		
diff --git a/buildScripts/maven.ant.xml b/buildScripts/maven.ant.xml
index 43fed149..f2495bcd 100644
--- a/buildScripts/maven.ant.xml
+++ b/buildScripts/maven.ant.xml
@@ -78,7 +78,11 @@ the maven repository that contains lombok's deliverables for those using maven.
 		<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" basedir="src" excludes="**/.DS_Store" />
+		<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>
diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index c8bdf2c2..30d0b29b 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -230,7 +230,7 @@ such as converting the changelog into HTML, and creating javadoc.
 			check the <a href="lombok/package-summary.html">lombok</a> package.&nbsp;If you're trying to extend lombok or
 			write your own plugins, the other packages are what you're looking for.</body></html>
 		]]></echo>
-		<javadoc sourcepath="src" defaultexcludes="yes" destdir="build/api" windowtitle="Lombok" Overview="${javadoc.overview.html}">
+		<javadoc sourcepath="src/core" defaultexcludes="yes" destdir="build/api" windowtitle="Lombok" Overview="${javadoc.overview.html}">
 			<classpath refid="deps.path" />
 			<classpath refid="libs.path" />
 			<link href="http://java.sun.com/javase/6/docs/api/" offline="true" packagelistLoc="./deps/javadoc/java6"/>
diff --git a/src/lombok/AccessLevel.java b/src/core/lombok/AccessLevel.java
index 16edd108..16edd108 100644
--- a/src/lombok/AccessLevel.java
+++ b/src/core/lombok/AccessLevel.java
diff --git a/src/lombok/Cleanup.java b/src/core/lombok/Cleanup.java
index ce9e0aa9..ce9e0aa9 100644
--- a/src/lombok/Cleanup.java
+++ b/src/core/lombok/Cleanup.java
diff --git a/src/lombok/Data.java b/src/core/lombok/Data.java
index 488de640..488de640 100644
--- a/src/lombok/Data.java
+++ b/src/core/lombok/Data.java
diff --git a/src/lombok/EqualsAndHashCode.java b/src/core/lombok/EqualsAndHashCode.java
index 88d72051..88d72051 100644
--- a/src/lombok/EqualsAndHashCode.java
+++ b/src/core/lombok/EqualsAndHashCode.java
diff --git a/src/lombok/Getter.java b/src/core/lombok/Getter.java
index fa84954c..fa84954c 100644
--- a/src/lombok/Getter.java
+++ b/src/core/lombok/Getter.java
diff --git a/src/lombok/Lombok.java b/src/core/lombok/Lombok.java
index 71684f4f..71684f4f 100644
--- a/src/lombok/Lombok.java
+++ b/src/core/lombok/Lombok.java
diff --git a/src/lombok/NonNull.java b/src/core/lombok/NonNull.java
index 08eec2a5..08eec2a5 100644
--- a/src/lombok/NonNull.java
+++ b/src/core/lombok/NonNull.java
diff --git a/src/lombok/Setter.java b/src/core/lombok/Setter.java
index 778bb00d..778bb00d 100644
--- a/src/lombok/Setter.java
+++ b/src/core/lombok/Setter.java
diff --git a/src/lombok/SneakyThrows.java b/src/core/lombok/SneakyThrows.java
index 1feeadf1..1feeadf1 100644
--- a/src/lombok/SneakyThrows.java
+++ b/src/core/lombok/SneakyThrows.java
diff --git a/src/lombok/Synchronized.java b/src/core/lombok/Synchronized.java
index 72c44c71..72c44c71 100644
--- a/src/lombok/Synchronized.java
+++ b/src/core/lombok/Synchronized.java
diff --git a/src/lombok/ToString.java b/src/core/lombok/ToString.java
index 7b89d481..7b89d481 100644
--- a/src/lombok/ToString.java
+++ b/src/core/lombok/ToString.java
diff --git a/src/lombok/core/AST.java b/src/core/lombok/core/AST.java
index 6d786d1e..6d786d1e 100644
--- a/src/lombok/core/AST.java
+++ b/src/core/lombok/core/AST.java
diff --git a/src/lombok/core/AnnotationValues.java b/src/core/lombok/core/AnnotationValues.java
index 0408de85..0408de85 100644
--- a/src/lombok/core/AnnotationValues.java
+++ b/src/core/lombok/core/AnnotationValues.java
diff --git a/src/lombok/core/LombokNode.java b/src/core/lombok/core/LombokNode.java
index c8ee4c00..c8ee4c00 100644
--- a/src/lombok/core/LombokNode.java
+++ b/src/core/lombok/core/LombokNode.java
diff --git a/src/lombok/core/PrintAST.java b/src/core/lombok/core/PrintAST.java
index df1b652c..df1b652c 100644
--- a/src/lombok/core/PrintAST.java
+++ b/src/core/lombok/core/PrintAST.java
diff --git a/src/lombok/core/SpiLoadUtil.java b/src/core/lombok/core/SpiLoadUtil.java
index 0a97af7e..0a97af7e 100644
--- a/src/lombok/core/SpiLoadUtil.java
+++ b/src/core/lombok/core/SpiLoadUtil.java
diff --git a/src/lombok/core/TransformationsUtil.java b/src/core/lombok/core/TransformationsUtil.java
index 6b457927..6b457927 100644
--- a/src/lombok/core/TransformationsUtil.java
+++ b/src/core/lombok/core/TransformationsUtil.java
diff --git a/src/lombok/core/TypeLibrary.java b/src/core/lombok/core/TypeLibrary.java
index 5de01b70..5de01b70 100644
--- a/