diff --git a/build.xml b/build.xml
index 5fa8fea..1241a2a 100644
--- a/build.xml
+++ b/build.xml
@@ -1,49 +1,45 @@
-<project name="scriptcraft" default="bukkit-dist" basedir=".">
+<project name="scriptcraft" default="package" basedir=".">
   <property file="build.properties"/>
   <description>Builds the scriptcraft.jar file - a plugin for bukkit</description>
-  <property name="bukkit" location="bukkit-plugin"/>
-  <property name="src" location="${bukkit}/src"/>
-  <property name="build" location="${bukkit}/build"/>
-  <property name="dist" location="./" />
+  <property name="src" location="src/main/java"/>
+  <property name="build" location="target/classes"/>
+  <property name="dist" location="target/" />
 
   <target name="init">
-	 <tstamp/>
-	 <mkdir dir="${build}"/>
+    <tstamp/>
+    <mkdir dir="${build}"/>
   </target>
   
-  <target name="bukkit-compile" depends="init" description="compile bukkit plugin source">
-	 <javac srcdir="${src}" destdir="${build}" classpath="${bukkit-lib}">
-	 </javac>
+  <target name="compile" depends="init" description="compile bukkit plugin source">
+    <javac srcdir="${src}" destdir="${build}" classpath="${bukkit-lib}">
+    </javac>
   </target>
-	 
-	 
+    
+    
 
   <target name="zip_js">
-	 <zip zipfile="${build}/js-plugins.zip" basedir="./js-plugins"/>
+    <zip zipfile="${build}/js-plugins.zip" basedir="./src/main/javascript"/>
   </target>
 
-  <target name="bukkit-dist" depends="zip_js,bukkit-compile" 
-			 description="generate the distribution" >
-    <!-- Create the distribution directory -->
-    <mkdir dir="${dist}/lib"/>
-	 <copy file="bukkit-plugin/plugin.yml" todir="${build}"/>
-	 <replace file="${build}/plugin.yml" value="${bukkit-version}-${DSTAMP}">
-		<replacetoken>[[version]]</replacetoken>
-	 </replace>
+  <target name="package" depends="zip_js,compile" 
+          description="generate the distribution" >
+    <copy file="src/main/resources/plugin.yml" todir="${build}"/>
+    <replace file="${build}/plugin.yml" value="${bukkit-version}-${DSTAMP}">
+      <replacetoken>[[version]]</replacetoken>
+    </replace>
 
     <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
     <jar jarfile="${dist}/scriptcraft-${bukkit-version}-${DSTAMP}.jar" basedir="${build}"/>
   </target>
 
   <target name="clean" description="clean up" >
-    <delete dir="${build}"/>
+    <delete dir="${dist}"/>
   </target>
 
-  <target name="update-live-cb" depends="bukkit-dist" description="Copy the built plugin to the live craftbukkit folder for testing.">
-	 <!--delete dir="${craftbukkit}/js-plugins" /-->
-	 <delete>
-		<fileset dir="${craftbukkit}/plugins/" includes="scriptcraft*.*"/>
-	 </delete>
-	 <copy file="${dist}/scriptcraft-${bukkit-version}-${DSTAMP}.jar" todir="${craftbukkit}/plugins"/>
+  <target name="update-live-cb" depends="package" description="Copy the built plugin to the live craftbukkit folder for testing.">
+    <delete>
+      <fileset dir="${craftbukkit}/plugins/" includes="scriptcraft*.*"/>
+    </delete>
+    <copy file="${dist}/scriptcraft-${bukkit-version}-${DSTAMP}.jar" todir="${craftbukkit}/plugins"/>
   </target>
 </project>