diff --git a/bootstrap.bat b/bootstrap.bat
index f34678b83..770076cce 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -47,7 +47,7 @@ if not exist build\classes\nul mkdir build\classes
 echo.
 echo ... Compiling Ant Classes
 
-"%JAVAC%" -d %CLASSDIR% %TOOLS%\bzip\*.java %TOOLS%\tar\*.java %TOOLS%\zip\*.java %TOOLS%\ant\*.java %TOOLS%\ant\types\*.java %TOOLS%\ant\taskdefs\*.java %TOOLS%\ant\util\*.java %TOOLS%\ant\util\regexp\RegexpMatcher.java %TOOLS%\ant\util\regexp\RegexpMatcherFactory.java %TOOLS%\ant\taskdefs\condition\*.java %TOOLS%\ant\taskdefs\compilers\*.java 
+"%JAVAC%" -d %CLASSDIR% %TOOLS%\bzip2\*.java %TOOLS%\tar\*.java %TOOLS%\zip\*.java %TOOLS%\ant\*.java %TOOLS%\ant\types\*.java %TOOLS%\ant\taskdefs\*.java %TOOLS%\ant\util\*.java %TOOLS%\ant\util\regexp\RegexpMatcher.java %TOOLS%\ant\util\regexp\RegexpMatcherFactory.java %TOOLS%\ant\taskdefs\condition\*.java %TOOLS%\ant\taskdefs\compilers\*.java 
 
 echo.
 echo ... Copying Required Files
diff --git a/bootstrap.sh b/bootstrap.sh
index c36c7adc5..92519bc9f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -98,7 +98,7 @@ mkdir -p bin
 
 echo ... Compiling Ant Classes
 
-"${JAVAC}" -d ${CLASSDIR} ${TOOLS}/bzip/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
+"${JAVAC}" -d ${CLASSDIR} ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
     ${TOOLS}/ant/util/regexp/RegexpMatcher.java \
     ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \
     ${TOOLS}/ant/util/*.java ${TOOLS}/ant/types/*.java \
diff --git a/src/main/org/apache/tools/bzip/BZip2Constants.java b/src/main/org/apache/tools/bzip2/BZip2Constants.java
similarity index 100%
rename from src/main/org/apache/tools/bzip/BZip2Constants.java
rename to src/main/org/apache/tools/bzip2/BZip2Constants.java
diff --git a/src/main/org/apache/tools/bzip/CBZip2InputStream.java b/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
similarity index 100%
rename from src/main/org/apache/tools/bzip/CBZip2InputStream.java
rename to src/main/org/apache/tools/bzip2/CBZip2InputStream.java
diff --git a/src/main/org/apache/tools/bzip/CBZip2OutputStream.java b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
similarity index 100%
rename from src/main/org/apache/tools/bzip/CBZip2OutputStream.java
rename to src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
diff --git a/src/main/org/apache/tools/bzip/CRC.java b/src/main/org/apache/tools/bzip2/CRC.java
similarity index 100%
rename from src/main/org/apache/tools/bzip/CRC.java
rename to src/main/org/apache/tools/bzip2/CRC.java