diff --git a/wwong30.xml b/wwong30.xml
index 5ca6cc2..b2360fa 100644
--- a/wwong30.xml
+++ b/wwong30.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="M4" default="all" basedir=".">
+<project name="M4" default="all" basedir="M4/M4">
     
     <target name="init">
         
@@ -29,14 +29,15 @@
     
     <target name="javadoc" depends="prepare">
         
-        <javac sourcepath="${src.dir}" access="public" destdir="${apidoc.dir}" packagenames="edu.gatech.oad.antlab">
+        <javadoc sourcepath="${src.dir}" access="public" destdir="${apidoc.dir}" packagenames="edu.gatech.oad.antlab">
             <fileset dir="${src.dir}">
                 <include name="**/*.java"/>
             </fileset>
-        </javac>
+      
         <classpath>
             <fileset dir="${lib.dir}" includes="resources.jar"/>
         </classpath>
+        </javadoc>
     </target>
     
     <target name="jar" depends="compile">
@@ -44,7 +45,7 @@
         <jar destfile="AntLabRun.jar" basedir="${build.dir}">
             <manifest>
                 <attribute name="Main-Class" value="edu.gatech.oad.antlab.pkg1.AntLabMain"/>
-                <attribute name="Class-Path" value="${lib.dir}/resources.jar/}"/>
+                <attribute name="Class-Path" value="../${lib.dir}/resources.jar/}"/>
             </manifest>
         </jar>
         
@@ -52,16 +53,16 @@
     
     <target name="run" depends="jar">
         
-        <java jar="AntLabRun.jar" fork="true">
+        <java jar="${build.dir}/AntLabRun.jar" fork="true">
             <classpath>
-                <pathelement localtion="."/>
-                <pathelement location=".lib/resources.jar"/>
+                <pathelement path="${java.class.path}"/>
+                <pathelement location="../lib/resources.jar"/>
             </classpath>
         </java>
         
     </target>
     
-    <target name="all" depends="run">
+    <target name="all" depends="run, javadoc">
     
     </target>