diff --git a/build.xml b/build.xml
index 3ae7a4d7b6..e4e1ea9411 100644
--- a/build.xml
+++ b/build.xml
@@ -429,7 +429,7 @@ printed.
   <!-- ================================== -->
   
   <target  name="testmodule"   
-           depends="clean, compile, test, jar, docs, metrics, javadocs"
+           depends="clean, docs, compile, test, jar, metrics, javadocs"
            description="Testing that all major targets work; useful before a commit"/>
 
   <!-- ================================== -->
diff --git a/layout.xml b/layout.xml
index bc75e5bf54..08e11921d8 100644
--- a/layout.xml
+++ b/layout.xml
@@ -64,8 +64,11 @@
   <distributions dir="./dist">
    <source dir="./dist/src"/>
    <bin dir="./dist/bin">
-     <library dir="./dist/bin/lib"/>
-     <documentation dir="./dist/bin/docs"/>
+     <library dir="./dist/bin/lib">
+       <core dir="./dist/bin/lib"/>
+       <optional dir="./dist/bin/lib/optional"/>     
+     </library>
+     <documentation dir="./dist/bin/build/docs"/>
      <info dir="./dist/bin"/>
      <build dir="./dist/bin/build"/>
      <legal dir="./dist/bin/legal"/>