diff --git a/build.xml b/build.xml
index 3023e762..d3cbef28 100644
--- a/build.xml
+++ b/build.xml
@@ -1,46 +1,58 @@
 <?xml version="1.0"?>
-
-<project name="FileBot" default="fatjar">
+<project name="FileBot" default="jar">
 
 	<property name="title" value="${ant.project.name}" />
-	<property name="version" value="1.9.0" />
+	<property name="version" value="1.9" />
 
+	<tstamp>
+		<format property="today" pattern="yyyy-MM-dd" />
+	</tstamp>
 
-	<property name="dir.source" 		location="${basedir}/source" />
-	<property name="dir.test" 			location="${basedir}/test" />
-	<property name="dir.build"			location="${basedir}/build" />
-	<property name="dir.dist"			location="${basedir}/dist" />
-	<property name="dir.lib" 			location="${basedir}/lib" />
-
-	<property name="executable" 		location="${dir.dist}/${title}.jar" />
-
-	<property name="lib.xerces" 		location="${dir.lib}/xercesImpl.jar" />
-	<property name="lib.nekohtml" 		location="${dir.lib}/nekohtml-1.9.7.jar" />
-	<property name="lib.simmetrics" 	location="${dir.lib}/simmetrics_jar_v1_6_2_d07_02_07.jar" />
-	<property name="lib.xmlrpc" 		location="${dir.lib}/xmlrpc-client-1.1.jar" />
-	<property name="lib.glazedlists"	location="${dir.lib}/glazedlists-1.7.0_java15.jar" />
-	<property name="lib.miglayout" 		location="${dir.lib}/miglayout-3.6.2-swing.jar" />
-	<property name="lib.args4j" 		location="${dir.lib}/args4j-2.0.9.jar" />
-	<property name="lib.junit" 			location="${dir.lib}/junit-4.4.jar" />
-	
+	<property name="dir.source" location="${basedir}/source" />
+	<property name="dir.test" location="${basedir}/test" />
+	<property name="dir.build" location="${basedir}/build" />
+	<property name="dir.dist" location="${basedir}/dist" />
+	<property name="dir.lib" location="${basedir}/lib" />
 
 
 
-	<target name="fatjar" depends="clean, build">
+	<target name="jar" depends="build">
 		<!-- create dist dir -->
 		<mkdir dir="${dir.dist}" />
-	
-		<jar destfile="${executable}" duplicate="fail">
-			<fileset dir="${dir.build}" />
+
+		<!-- main jar -->
+		<jar destfile="${dir.dist}/filebot.jar">
+			<fileset dir="${dir.build}" excludes="**/*Test*" />
 
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Main-Class" value="Main" />
-				<attribute name="Version" value="${version}" />
+				<attribute name="Built-Date" value="${today}" />
+				<attribute name="Implementation-Title" value="${title}" />
+				<attribute name="Implementation-Version" value="${version}" />
+				<attribute name="Class-Path" value="args4j.jar miglayout.jar glazedlists.jar nekohtml.jar xercesImpl.jar simmetrics.jar xmlrpc-client.jar" />
+				<attribute name="Main-Class" value="net.sourceforge.filebot.Main" />
 			</manifest>
+		</jar>
+
+		<!-- extra jar containing all the unit tests -->
+		<jar destfile="${dir.dist}/filebot-test.jar">
+			<fileset dir="${dir.build}" includes="**/*Test*" />
+		</jar>
+	</target>
+
+
+	<target name="fatjar" depends="jar">
+		<!-- create dist/fatjar dir -->
+		<mkdir dir="${dir.dist}/fatjar" />
+
+		<jar destfile="${dir.dist}/fatjar/FileBot.jar" filesetmanifest="merge" duplicate="fail">
+
+			<zipfileset src="${dir.dist}/filebot.jar">
+				<include name="**/*" />
+			</zipfileset>
 
 			<!-- include libs -->
-			<zipfileset src="${lib.xerces}">
+			<zipfileset src="${dir.lib}/xercesImpl.jar">
 				<include name="org/apache/html/dom/**" />
 				<include name="org/apache/xerces/dom/**" />
 				<include name="org/apache/xerces/impl/**" />
@@ -50,33 +62,33 @@
 				<include name="org/apache/xerces/xs/**" />
 			</zipfileset>
 
-			<zipfileset src="${lib.nekohtml}">
+			<zipfileset src="${dir.lib}/nekohtml.jar">
 				<include name="**/*.class" />
 				<include name="**/*.properties" />
 			</zipfileset>
 
-			<zipfileset src="${lib.simmetrics}">
+			<zipfileset src="${dir.lib}/simmetrics.jar">
 				<include name="uk/ac/shef/wit/simmetrics/math/**" />
 				<include name="uk/ac/shef/wit/simmetrics/similaritymetrics/**" />
 				<include name="uk/ac/shef/wit/simmetrics/tokenisers/**" />
 				<include name="uk/ac/shef/wit/simmetrics/wordhandlers/**" />
 			</zipfileset>
 
-			<zipfileset src="${lib.glazedlists}">
+			<zipfileset src="${dir.lib}/glazedlists.jar">
 				<include name="ca/odell/glazedlists/**" />
 			</zipfileset>
 
-			<zipfileset src="${lib.miglayout}">
+			<zipfileset src="${dir.lib}/miglayout.jar">
 				<include name="**/*.class" />
 				<include name="**/*.properties" />
 			</zipfileset>
 
-			<zipfileset src="${lib.xmlrpc}">
+			<zipfileset src="${dir.lib}/xmlrpc-client.jar">
 				<include name="**/*.class" />
 				<include name="**/*.properties" />
 			</zipfileset>
 
-			<zipfileset src="${lib.args4j}">
+			<zipfileset src="${dir.lib}/args4j.jar">
 				<include name="**/*.class" />
 				<include name="**/*.properties" />
 			</zipfileset>
@@ -89,7 +101,7 @@
 		<mkdir dir="${dir.build}" />
 
 		<!-- compile -->
-		<javac srcdir="${dir.source}" destdir="${dir.build}" encoding="utf-8">
+		<javac srcdir="${dir.source}:${dir.test}" destdir="${dir.build}" source="1.6" encoding="utf-8">
 			<classpath>
 				<fileset dir="${dir.lib}" includes="*.jar" />
 			</classpath>
@@ -99,43 +111,43 @@
 		<copy todir="${dir.build}">
 			<fileset dir="${dir.source}">
 				<include name="**/*.png" />
-				<include name="**/*.gif" />
 			</fileset>
 		</copy>
 	</target>
-	
-	
-	<target name="build-test" depends="build">
-		<javac srcdir="${dir.test}" destdir="${dir.build}" encoding="utf-8">
-			<classpath>
-				<fileset dir="${dir.lib}" includes="*.jar" />
-			</classpath>
-		</javac>
-	</target>
 
 
 	<target name="clean">
 		<delete dir="${dir.dist}" />
 		<delete dir="${dir.build}" />
 	</target>
-	
 
-	<target name="test" depends="clean, build-test, fatjar">
-		<junit printsummary="yes" showoutput="yes">
+
+	<target name="test" depends="jar">
+		<junit printsummary="yes" fork="true">
 			<classpath>
-				<pathelement location="${executable}"/>
-				<pathelement location="${lib.junit}"/>
+				<fileset dir="${dir.dist}" includes="*.jar" />
+				<fileset dir="${dir.lib}" includes="*.jar" />
+			</classpath>
+
+			<formatter type="plain" />
+
+			<test name="net.sourceforge.filebot.AllTests" outfile="test-report" />
+		</junit>
+	</target>
+
+	
+	<target name="test-fatjar" depends="fatjar">
+		<junit printsummary="yes" fork="true">
+			<classpath>
+				<pathelement location="${dir.dist}/fatjar/FileBot.jar" />
+				<pathelement location="${dir.dist}/filebot-test.jar" />
+				<pathelement location="${dir.lib}/junit.jar" />
 			</classpath>
 			
 			<formatter type="plain" />
-			
-			<test name="AllTests" outfile="test-report" />
+
+			<test name="net.sourceforge.filebot.AllTests" outfile="test-report" />
 		</junit>
 	</target>
 	
-	
-	<target name="run" depends="fatjar">
-		<java jar="${executable}" fork="yes" />
-	</target>
-
 </project>
diff --git a/lib/args4j-2.0.9.jar b/lib/args4j.jar
similarity index 100%
rename from lib/args4j-2.0.9.jar
rename to lib/args4j.jar
diff --git a/lib/glazedlists-1.7.0_java15.jar b/lib/glazedlists.jar
similarity index 100%
rename from lib/glazedlists-1.7.0_java15.jar
rename to lib/glazedlists.jar
diff --git a/lib/junit-4.4.jar b/lib/junit.jar
similarity index 100%
rename from lib/junit-4.4.jar
rename to lib/junit.jar
diff --git a/lib/miglayout-3.6.2-swing.jar b/lib/miglayout.jar
similarity index 100%
rename from lib/miglayout-3.6.2-swing.jar
rename to lib/miglayout.jar
diff --git a/lib/nekohtml-1.9.7.jar b/lib/nekohtml.jar
similarity index 100%
rename from lib/nekohtml-1.9.7.jar
rename to lib/nekohtml.jar
diff --git a/lib/simmetrics_jar_v1_6_2_d07_02_07.jar b/lib/simmetrics.jar
similarity index 100%
rename from lib/simmetrics_jar_v1_6_2_d07_02_07.jar
rename to lib/simmetrics.jar
diff --git a/lib/xmlrpc-client-1.1.jar b/lib/xmlrpc-client.jar
similarity index 100%
rename from lib/xmlrpc-client-1.1.jar
rename to lib/xmlrpc-client.jar
diff --git a/source/Main.java b/source/net/sourceforge/filebot/Main.java
similarity index 96%
rename from source/Main.java
rename to source/net/sourceforge/filebot/Main.java
index 3e75f856..46a84be7 100644
--- a/source/Main.java
+++ b/source/net/sourceforge/filebot/Main.java
@@ -1,3 +1,4 @@
+package net.sourceforge.filebot;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.prefs.BackingStoreException;
@@ -6,8 +7,6 @@ import java.util.prefs.Preferences;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
-import net.sourceforge.filebot.ArgumentBean;
-import net.sourceforge.filebot.FileBotUtil;
 import net.sourceforge.filebot.ui.FileBotWindow;
 import net.sourceforge.filebot.ui.NotificationLoggingHandler;
 
diff --git a/test/AllTests.java b/test/net/sourceforge/filebot/AllTests.java
similarity index 84%
rename from test/AllTests.java
rename to test/net/sourceforge/filebot/AllTests.java
index 8d74e2a5..152ed797 100644
--- a/test/AllTests.java
+++ b/test/net/sourceforge/filebot/AllTests.java
@@ -1,4 +1,4 @@
-import net.sourceforge.filebot.FileBotTestSuite;
+package net.sourceforge.filebot;
 import net.sourceforge.tuned.TunedTestSuite;
 
 import org.junit.runner.RunWith;
diff --git a/test/net/sourceforge/tuned/FilterIteratorTest.java b/test/net/sourceforge/tuned/FilterIteratorTest.java
index 6eb74d3d..4438e618 100644
--- a/test/net/sourceforge/tuned/FilterIteratorTest.java
+++ b/test/net/sourceforge/tuned/FilterIteratorTest.java
@@ -36,15 +36,15 @@ public class FilterIteratorTest {
 			@Override
 			protected Integer filter(String sourceValue) {
 				if (sourceValue.matches("\\d+"))
-					return Integer.parseInt(sourceValue);
+					return Integer.valueOf(sourceValue);
 				
 				return null;
 			}
 		};
 		
-		assertEquals(2, integers.next());
+		assertEquals(Integer.valueOf(2), integers.next());
 		integers.remove();
-		assertEquals(5, integers.next());
+		assertEquals(Integer.valueOf(5), integers.next());
 		integers.remove();
 		
 		assertFalse(integers.hasNext());