diff --git a/bootstrap.bat b/bootstrap.bat
index 0bcc1e59a..7ade10082 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -1,7 +1,7 @@
 @ECHO OFF
 echo BOOTSTRAPPING ANT DISTRIBUTION
 
-set C=%CLASSPATH%;..\jakarta-tools\projectx-tr2.jar
+set C=%CLASSPATH%;lib/projectx-tr2.jar
 set SRCDIR=src\main\org\apache\tools\ant
 set TMPDIR=tmp
 
diff --git a/bootstrap.sh b/bootstrap.sh
index c887d3c1c..22f8a5b4c 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -5,7 +5,7 @@ fi
 SRCDIR=src/main/org/apache/tools/ant
 CLASSDIR=classes
 CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/classes.zip:${JAVA_HOME}/lib/tools.jar
-CLASSPATH=${CLASSPATH}:../jakarta-tomcat/projectx-tr2.jar:src:${CLASSDIR}
+CLASSPATH=${CLASSPATH}:lib/projectx-tr2.jar:src:${CLASSDIR}
 
 mkdir -p ${CLASSDIR}
 
diff --git a/build.bat b/build.bat
index ec5299aeb..e9341f7e4 100755
--- a/build.bat
+++ b/build.bat
@@ -1,3 +1,3 @@
 @echo off
 REM convience bat file to build with
-java -classpath "%CLASSPATH%;..\jakarta-tools\ant.jar;..\jakarta-tools\projectx-tr2.jar" org.apache.tools.ant.Main %1 %2 %3 %4 %5
+java -classpath "%CLASSPATH%;lib\ant.jar;lib\projectx-tr2.jar" org.apache.tools.ant.Main %1 %2 %3 %4 %5
diff --git a/build.sh b/build.sh
index 2087d6908..17c70c4d2 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-ADDL_CLASSPATH=./../jakarta-tools/ant.jar:./../jakarta-tools/projectx-tr2.jar
+ADDL_CLASSPATH=./lib/ant.jar:./lib/projectx-tr2.jar
 
 if [ "$CLASSPATH" != "" ] ; then
   CLASSPATH=$CLASSPATH:$ADDL_CLASSPATH
diff --git a/build.xml b/build.xml
index b905aa248..d4124f80f 100644
--- a/build.xml
+++ b/build.xml
@@ -18,7 +18,7 @@
   </target>
 
   <target name="jar" depends="main">
-     <jar jarfile="../ant.jar" basedir="${build.dir}" items="org" manifest="${manifest}"/>
+     <jar jarfile="lib/ant.jar" basedir="${build.dir}" items="org" manifest="${manifest}"/>
   </target>
 
   <target name="dist" depends="main">
@@ -27,8 +27,7 @@
      <mkdir dir="${dist.dir}/ant/bin"/>
      <mkdir dir="${dist.dir}/ant/docs"/>
      <jar jarfile="${dist.dir}/ant/lib/ant.jar" basedir="${build.dir}" items="org" manifest="${manifest}"/>
-     <copyfile src="../projectx-tr2.jar" dest="${dist.dir}/ant/lib/xml.jar"/>
-     <copyfile src="../moo.jar" dest="${dist.dir}/ant/lib/moo.jar"/>
+     <copyfile src="lib/projectx-tr2.jar" dest="${dist.dir}/ant/lib/xml.jar"/>
      <copyfile src="build.xml" dest="${dist.dir}/ant/lib/build.xml"/>
      <copydir src="src/bin" dest="${dist.dir}/ant/bin"/>
      <copydir src="docs" dest="${dist.dir}/ant/docs"/>