diff --git a/layout.xml b/layout.xml
index fd773253a8..71e5f571ba 100644
--- a/layout.xml
+++ b/layout.xml
@@ -42,7 +42,7 @@
    <work dir="./build/work"/>
    <documentation dir="./build/docs">
      <javadocs dir="./build/docs/javadocs"/>
-     <test dir="./build/docs/test"/>
+     <test dir="./build/docs/tests"/>
      <metrics dir="./build/docs/metrics"/>
    </documentation>
    <scratchpad dir="./build/scratchpad">
diff --git a/properties.xml b/properties.xml
index 52490a2968..3acd3a70fc 100644
--- a/properties.xml
+++ b/properties.xml
@@ -24,9 +24,11 @@
       <tools>
          <cents repository="http://krysalis.org/jars/">
             <!-- not currently used by POI
-                 <antidote/>
-                 <xmldoclet/> -->            
-            <centipede/>
+                 <antidote/>   
+                 <xmldoclet/>    -->      
+            <centipede>
+              <javadocs group="POIFS org.apache.poi.poifs*,HSSF org.apache.poi.hssf*,HPSF org.apache.poi.hpsf*,"/>
+            </centipede>
             <junit/>
             <jdepend/>
             <checkstyle/>
diff --git a/src/documentation/xdocs/book.xml b/src/documentation/xdocs/book.xml
index 1d4b945e38..1ba77670eb 100644
--- a/src/documentation/xdocs/book.xml
+++ b/src/documentation/xdocs/book.xml
@@ -6,30 +6,38 @@
       copyright="@year@ Poi Project"
       xmlns:xlink="http://www.w3.org/1999/xlink">
 
-  <menu label="About">
+  <menu label="Community">
     <menu-item label="Index" href="index.html"/>
     <menu-item label="History and Future" href="historyandfuture.html"/>
-    <menu-item label="Download" href="http://jakarta.apache.org/builds/jakarta-poi/"/>
     <menu-item label="1.0 Vision" href="plan/POI10Vision.html"/>
     <menu-item label="2.0 Vision" href="plan/POI20Vision.html"/>
-    <menu-item label="Who we are" href="who.html"/>    
-    <menu-item label="Changes" href="changes.html"/>
-    <menu-item label="FAQ" href="faq.html"/>
+    <menu-item label="Who we are" href="who.html"/> 
+    <menu-item label="Download" href="http://jakarta.apache.org/builds/jakarta-poi/"/>       
   </menu>
-  
+
   <menu label="Sub-Projects">
     <menu-item label="Overview" href="overview.html"/>
     <menu-item label="POIFS" href="poifs/index.html"/>
     <menu-item label="HSSF" href="hssf/index.html"/>
     <menu-item label="HDF" href="hdf/index.html"/>
     <menu-item label="HPSF" href="hpsf/index.html"/>
-    <menu-item label="POI-Utils" href="utils/index.html"/>
+    <menu-item label="POI-Utils" href="utils/index.html"/>  
   </menu>
-
-  <menu label="References">
+  
+  <menu label="Docs">
     <menu-item label="Javadocs" href="http://jakarta.apache.org/poi/javadocs/"/>  
-    <menu-item label="Test Results" href="http://jakarta.apache.org/poi/test/"/>  
-    <menu-item label="Metrics" href="http://jakarta.apache.org/poi/metrics/jdepend-report.html"/>  
+    <menu-item label="Source" href="http://jakarta.apache.org/poi/javadocs/javasrc/"/>      
+    <menu-item label="Changes" href="changes.html"/>
+    <menu-item label="FAQ" href="faq.html"/>
+  </menu>
+  
+  <menu label="Code">
+    <menu-item label="Junit Test Results" href="http://jakarta.apache.org/poi/tests/junit/"/>  
+    <menu-item label="Dependency Metrics" href="http://jakarta.apache.org/poi/metrics/jdepend/"/> 
+    <menu-item label="Checkstyle" href="http://jakarta.apache.org/poi/metrics/checkstyle/"/> 
+  </menu>
+     
+  <menu label="References">
     <menu-item label="In The News" href="inthenews.html"/>  
     <menu-item label="Live Sites" href="livesites.html"/>
     <menu-item label="XLS spec [PDF]" href="http://sc.openoffice.org/excelfileformat.pdf"/>
diff --git a/tools/antipede/build.xtarget b/tools/antipede/build.xtarget
index 90957cfc85..e0c7eee36d 100644
--- a/tools/antipede/build.xtarget
+++ b/tools/antipede/build.xtarget
@@ -1,9 +1,12 @@
-  <target name="-init">
+  <target name="-init" unless="${antipede.init.already.called}">
    <tstamp>
      <format property="YEAR" pattern="yyyy" locale="en"/>
    </tstamp>
    
    <buildnumber/>
+
+   <property name="antipede.init.already.called" value="true"/>
+   
    <echo>
     --------------------------------------------------------------
 
@@ -24,7 +27,7 @@
     -->
     <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
     <available file="${tools.jar}" property="tools.jar.present"/>
-    <fail unless="tools.jar.present" message="tools.jar not found. Probably JDK not installed."/>    
+    <fail unless="tools.jar.present" message="tools.jar not found. Probably you are using the JRE and the JDK is not installed. Please download the JDK from the Java Sun website www.javasoft.com ."/>    
 
 
     <!-- fixed centipede dirs -->
@@ -190,7 +193,16 @@
          target="${cent-target}" />       
   </target>            
   
-  
+  <!-- ============================================= -->
+  <!-- Simple utility target to call a cent target   -->
+  <!-- ==============================================-->
+  <target name="cent-target" depends="-init">
+     <ant antfile="tools/cents/${cent-name}.cent/xbuild.xml"
+         inheritall="true" 
+         dir="."
+         target="${cent-target}" />       
+  </target>     
+    
   <!-- ================================== -->
   <!--   Create a cent.jar package        -->
   <!--   using an already deployed cent   -->
diff --git a/tools/cents/centipede.cent.jar b/tools/cents/centipede.cent.jar
index 5679c128e9..14cba04ff5 100644
Binary files a/tools/cents/centipede.cent.jar and b/tools/cents/centipede.cent.jar differ
diff --git a/tools/cents/checkstyle.cent.jar b/tools/cents/checkstyle.cent.jar
index 35c6a8d590..a5b3c7158d 100644
Binary files a/tools/cents/checkstyle.cent.jar and b/tools/cents/checkstyle.cent.jar differ
diff --git a/tools/cents/javasrc.cent.jar b/tools/cents/javasrc.cent.jar
index fdf724d74c..5ad30adaa8 100644
Binary files a/tools/cents/javasrc.cent.jar and b/tools/cents/javasrc.cent.jar differ
diff --git a/tools/cents/jdepend.cent.jar b/tools/cents/jdepend.cent.jar
index 6572f7b850..363f923e9f 100644
Binary files a/tools/cents/jdepend.cent.jar and b/tools/cents/jdepend.cent.jar differ
diff --git a/tools/cents/junit.cent.jar b/tools/cents/junit.cent.jar
index 086f3cedda..dda30e0b44 100644
Binary files a/tools/cents/junit.cent.jar and b/tools/cents/junit.cent.jar differ
diff --git a/tools/cents/umldoclet.cent.jar b/tools/cents/umldoclet.cent.jar
index 3e44f5dd1d..e3d717b4fb 100644
Binary files a/tools/cents/umldoclet.cent.jar and b/tools/cents/umldoclet.cent.jar differ