diff --git a/build.xml b/build.xml
index ee4821e..057bbb7 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project default="all" name="Create Runnable Jar for Limelight">
-  <property name="one-jar.dist.dir" value="${basedir}"/>
-
   <property name="src.dir" location="${basedir}/src"/>
   <property name="libs.dir" location="${basedir}/libs"/>
 
@@ -10,6 +8,8 @@
   
   <property name="lib.dir" location="${basedir}/lib"/>
   <property name="build.dir" location="${basedir}/build"/>
+  
+  <property name="one-jar.dist.dir" value="${libs.dir}/build"/>
 
   <property name="classes.dir" location="${basedir}/classes"/>
 
@@ -20,7 +20,7 @@
     <mkdir dir="${build.dir}"/>
   </target>
 
-  <import file="one-jar-ant-task.xml"/>
+  <import file="${one-jar.dist.dir}/one-jar-ant-task.xml"/>
 
   <target name="clean">
     <delete dir="${build.dir}"/>
diff --git a/one-jar-ant-task-0.97.jar b/libs/build/one-jar-ant-task-0.97.jar
similarity index 100%
rename from one-jar-ant-task-0.97.jar
rename to libs/build/one-jar-ant-task-0.97.jar
diff --git a/one-jar-ant-task.xml b/libs/build/one-jar-ant-task.xml
similarity index 98%
rename from one-jar-ant-task.xml
rename to libs/build/one-jar-ant-task.xml
index 7d65656..98b4c92 100644
--- a/one-jar-ant-task.xml
+++ b/libs/build/one-jar-ant-task.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
-<project>
-    <!-- The following property is expected to be overridden by caller -->   
-    <property name="one-jar.dist.dir" value="./dist"/>   
-    <property name="one-jar.version" value="0.97"/>
-    <property name="one-jar.ant.jar" value="${one-jar.dist.dir}/one-jar-ant-task-${one-jar.version}.jar"/>
-    <taskdef name="one-jar" classname="com.simontuffs.onejar.ant.OneJarTask" 
-        classpath="${one-jar.ant.jar}" onerror="report"/>
-
+<?xml version="1.0"?>
+<project>
+    <!-- The following property is expected to be overridden by caller -->   
+    <property name="one-jar.dist.dir" value="./dist"/>   
+    <property name="one-jar.version" value="0.97"/>
+    <property name="one-jar.ant.jar" value="${one-jar.dist.dir}/one-jar-ant-task-${one-jar.version}.jar"/>
+    <taskdef name="one-jar" classname="com.simontuffs.onejar.ant.OneJarTask" 
+        classpath="${one-jar.ant.jar}" onerror="report"/>
+
 </project>
\ No newline at end of file