diff --git a/build.xml b/build.xml
index e7164250b..2a3f1710d 100644
--- a/build.xml
+++ b/build.xml
@@ -340,14 +340,8 @@
   <!-- ================================== -->
   
   <target  name="gump"   
-           depends="testmodule"
-           description="Target used by Gump">
-           
-      <antcall target="testtargets"/>
-      <antcall target="testmodule"/>
-      <antcall target="all"/>
-      
-  </target>
+           depends="-init, compile, test, jar, metrics, javadocs"
+           description="Target used by Gump"/>
 
   <!-- ================================== -->
   <!--        Generate all                -->
diff --git a/module.xml b/module.xml
index e2e068af6..56fc2c43d 100644
--- a/module.xml
+++ b/module.xml
@@ -72,22 +72,25 @@
     <!-- needed for build -->
     <depend project="jakarta-ant"/>
     <depend project="xml-xerces"/>
-    <depend project="xml-xalan2"/>
-    <depend project="xml-cocoon2"/>
-    <depend project="junit"/>
-
+    <depend project="xml-xalan2"/>    
+    
     <!-- needed for POI -->
     <depend project="commons-logging"/>
     
     <!-- Project jars POI build can use  -->    
     <option project="jakarta-log4j"/>
- 
+     
     <!-- Work dirs to be included in classpath  -->          
-    <work nested="build/jakarta-poi/classes"/>
-    <work nested="build/jakarta-poi/testcases"/>
-    <work nested="tools/tmp/anttasks"/>
-
-    <home nested="build/jakarta-poi"/>
+    <work nested="build/classes"/>
+    <work nested="build/testcases"/>
+    <work nested="tools/cents/checkstyle.cent/lib"/>
+    <work nested="tools/cents/forrest.cent/lib"/>
+    <work nested="tools/cents/javasrc.cent/lib"/>
+    <work nested="tools/cents/jdepend.cent/lib"/>        
+    <work nested="tools/cents/junit.cent/lib"/>        
+    <work nested="tools/cents/umldoclet.cent/lib"/>        
+    
+    <home nested="build"/>
 
     <!-- POI jars - the result of the build  -->        
     <jar name="jakarta-poi.jar"            id="poi"/>
@@ -96,7 +99,7 @@
     <jar name="jakarta-poi-examples.jar"   id="examples"/>
     
     <!-- POI Javadocs - location in the build dirs  -->         
-    <javadoc parent="build/jakarta-poi/docs/apidocs"/>
+    <javadoc parent="build/docs/apidocs"/>
     
     <!-- Getting ready for automatic site updates
     <deliver fromdir="build/jakarta-poi/docs"