diff --git a/.gitignore b/.gitignore
index d52a2521..2f3dacac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-java-build/java/build
+build-files/java/build
 jsdoc.jar
diff --git a/java-build/build.properties b/build-files/build.properties
similarity index 100%
rename from java-build/build.properties
rename to build-files/build.properties
diff --git a/java-build/java/classes/js.jar b/build-files/java/classes/js.jar
similarity index 100%
rename from java-build/java/classes/js.jar
rename to build-files/java/classes/js.jar
diff --git a/java-build/java/classes/sqlitejdbc-v054.jar b/build-files/java/classes/sqlitejdbc-v054.jar
similarity index 100%
rename from java-build/java/classes/sqlitejdbc-v054.jar
rename to build-files/java/classes/sqlitejdbc-v054.jar
diff --git a/java-build/java/src/Run.java b/build-files/java/src/Run.java
similarity index 100%
rename from java-build/java/src/Run.java
rename to build-files/java/src/Run.java
diff --git a/java-build/templates/package.json b/build-files/templates/package.json
similarity index 100%
rename from java-build/templates/package.json
rename to build-files/templates/package.json
diff --git a/build.xml b/build.xml
index c9ecfffb..7e2edd03 100644
--- a/build.xml
+++ b/build.xml
@@ -2,8 +2,8 @@
  
 <project name="jsdoc" default="jar-install">
 
-    <property file="java-build/build.properties" />
-    <property name="build.templates" location="java-build/templates" />
+    <property file="build-files/build.properties" />
+    <property name="build.templates" location="build-files/templates" />
     
     <tstamp>
         <format property="NOW" pattern="yyyy-MM-dd-HHmm" locale="en,UK"/>
@@ -33,39 +33,39 @@
     
     <!-- steps to build and install the jsdoc.jar file: clean, compile, build -->
     <target name="jar-clean">
-        <delete dir="java-build/java/build" />
+        <delete dir="build-files/java/build" />
         <delete file="jsdoc.jar" />
     </target>
     
     <target name="jar-compile">
         <path id="local-classes">
-            <fileset dir="java-build/java/classes/">
+            <fileset dir="build-files/java/classes/">
                 <include name="*.jar" />
             </fileset>
         </path>
     
-        <mkdir dir="java-build/java/build/classes" />
+        <mkdir dir="build-files/java/build/classes" />
         
-        <javac srcdir="java-build/java/src"
-               destdir="java-build/java/build/classes"
+        <javac srcdir="build-files/java/src"
+               destdir="build-files/java/build/classes"
                includeAntRuntime="false">
             <classpath refid="local-classes" />
         </javac>
     </target>
 
     <target name="jar-build" depends="jar-compile">
-        <mkdir dir="java-build/java/build/jar" />
-        <jar destfile="java-build/java/build/jar/jsdoc.jar" basedir="java-build/java/build/classes">
+        <mkdir dir="build-files/java/build/jar" />
+        <jar destfile="build-files/java/build/jar/jsdoc.jar" basedir="build-files/java/build/classes">
             <manifest>
                <attribute name="Main-Class" value="Run" />
-               <attribute name="Class-Path" value="java-build/java/classes/js.jar java-build/java/classes/sqlitejdbc-v054.jar" />
+               <attribute name="Class-Path" value="build-files/java/classes/js.jar build-files/java/classes/sqlitejdbc-v054.jar" />
             </manifest>
         </jar>
     </target>
     
     <!-- do all the steps to build and install the jsdoc.jar file -->
     <target name="jar-install" depends="jar-clean, jar-build">
-        <copy file="java-build/java/build/jar/jsdoc.jar" tofile="jsdoc.jar" overwrite="true" />
+        <copy file="build-files/java/build/jar/jsdoc.jar" tofile="jsdoc.jar" overwrite="true" />
     </target>
 
 </project>
\ No newline at end of file
diff --git a/package.json b/package.json
index 926d554e..93b92d09 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "jsdoc",
 	"version": "3.0.0beta1",
-	"revision": "2011-02-25-1216",
+	"revision": "2011-03-29-2211",
 	"description": "An automatic documentation generator for javascript.",
 	"keywords": [ "documentation", "javascript" ],
 	"licenses": [