diff --git a/android/build.xml b/android/build.xml
deleted file mode 100644
index 2b05a033a..000000000
--- a/android/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- This isn't yet completely baked. You might call it half. -->
-
-<project default="build" name="Create .zip file for core">
-
-  <property environment="env" />
-
-  <target name="build" if="env.ANDROID_SDK">
-    <mkdir dir="core/bin" />
-    <javac target="1.5" 
-	   encoding="UTF-8"
-	   includeAntRuntime="false"
-	   bootclasspath="${env.ANDROID_SDK}/platforms/android-7/android.jar"
-	   srcdir="core/src" destdir="core/bin" />
-
-<!--
-    <delete file="core.zip" />
-    <zip destfile="core.zip">
-      <fileset dir="core/bin" includes="processing/core/*.class" />
-      <fileset dir="core/bin" includes="processing/xml/*.class" />
-    </zip>
--->
-
-<!--    <delete file="core.zip" />-->
-    <jar basedir="core/bin" destfile="core.zip" />
-
-<!--
-    <mkdir dir="tool/bin" />
-    <javac encoding="UTF-8"
-	   includeAntRuntime="false"
-	   srcdir="tool/src" destdir="tool/bin" />
-    -->
-  </target>
-
-  <target name="clean" if="env.ANDROID_SDK"
-	  description="Clean out the build directories">
-    <delete dir="core/bin" />
-    <delete file="core.zip" />
-  </target>
-</project>
diff --git a/android/core/build.xml b/android/core/build.xml
new file mode 100644
index 000000000..738541f89
--- /dev/null
+++ b/android/core/build.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="build" name="Create .zip file for core">
+  <property environment="env" />
+
+  <target name="build" if="env.ANDROID_SDK">
+    <mkdir dir="bin" />
+    <javac target="1.5" 
+	   encoding="UTF-8"
+	   includeAntRuntime="false"
+	   bootclasspath="${env.ANDROID_SDK}/platforms/android-7/android.jar"
+	   srcdir="src" destdir="bin" />
+
+    <jar basedir="bin" destfile="../android-core.zip" />
+  </target>
+
+  <target name="clean" if="env.ANDROID_SDK"
+	  description="Clean out the build directories">
+    <delete dir="bin" />
+    <delete file="../android-core.zip" />
+  </target>
+</project>
diff --git a/build/cmd/dist.sh b/java/cmd/dist.sh
similarity index 100%
rename from build/cmd/dist.sh
rename to java/cmd/dist.sh
diff --git a/build/cmd/dist/processing b/java/cmd/dist/processing
similarity index 100%
rename from build/cmd/dist/processing
rename to java/cmd/dist/processing