diff --git a/genapp/src/plugin-resources/default/template-resources/LICENSE.txt b/genapp/src/plugin-resources/default/template-resources/LICENSE.txt
new file mode 100644
index 00000000..d0696ae4
--- /dev/null
+++ b/genapp/src/plugin-resources/default/template-resources/LICENSE.txt
@@ -0,0 +1,13 @@
+Copyright 2001-2005 The Apache Software Foundation.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/genapp/src/plugin-resources/default/template-resources/project.properties b/genapp/src/plugin-resources/default/template-resources/project.properties
index dc873412..a1f3da8f 100644
--- a/genapp/src/plugin-resources/default/template-resources/project.properties
+++ b/genapp/src/plugin-resources/default/template-resources/project.properties
@@ -14,5 +14,7 @@
 # limitations under the License.
 # -------------------------------------------------------------------
 
+maven.docs.src=${basedir}/src/site/xdoc
+
 maven.xdoc.date=left
-## maven.xdoc.version=${pom.currentVersion}
\ No newline at end of file
+## maven.xdoc.version=${pom.currentVersion}
diff --git a/genapp/src/plugin-resources/default/template-resources/project.xml b/genapp/src/plugin-resources/default/template-resources/project.xml
index e445bbf1..422eb8a3 100644
--- a/genapp/src/plugin-resources/default/template-resources/project.xml
+++ b/genapp/src/plugin-resources/default/template-resources/project.xml
@@ -81,9 +81,10 @@
 
   <!-- build information for the project -->
   <build>
+    <defaultGoal>jar</defaultGoal>
     <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
-    <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
     <unitTest>
       <includes>
         <include>**/*Test.java</include>
@@ -94,11 +95,30 @@
     </unitTest>
     <resources>
       <resource>
-        <directory>src/conf</directory>
+        <directory>src/main/resources</directory>
         <includes>
           <include>*.properties</include>
         </includes>
       </resource>
     </resources>
   </build>
+
+  <reports>
+    <report>maven-license-plugin</report>
+    <!--
+    <report>maven-faq-plugin</report>
+    <report>maven-jdepend-plugin</report>
+    <report>maven-checkstyle-plugin</report>
+    <report>maven-changes-plugin</report>
+    <report>maven-changelog-plugin</report>
+    <report>maven-developer-activity-plugin</report>
+    <report>maven-file-activity-plugin</report>
+    <report>maven-javadoc-plugin</report>
+    <report>maven-jxr-plugin</report>
+    <report>maven-junit-report-plugin</report>
+    <report>maven-linkcheck-plugin</report>
+    <report>maven-tasklist-plugin</report>
+    -->
+  </reports>
+
 </project>
diff --git a/genapp/src/plugin-resources/default/template-resources/src/java/App.java b/genapp/src/plugin-resources/default/template-resources/src/main/java/App.java
similarity index 100%
rename from genapp/src/plugin-resources/default/template-resources/src/java/App.java
rename to genapp/src/plugin-resources/default/template-resources/src/main/java/App.java
diff --git a/genapp/src/plugin-resources/default/template-resources/src/conf/app.properties b/genapp/src/plugin-resources/default/template-resources/src/main/resources/app.properties
similarity index 100%
rename from genapp/src/plugin-resources/default/template-resources/src/conf/app.properties
rename to genapp/src/plugin-resources/default/template-resources/src/main/resources/app.properties
diff --git a/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/index.xml b/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/index.xml
new file mode 100644
index 00000000..64c4b67a
--- /dev/null
+++ b/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/index.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <title>@NAME@</title>
+    <!--<author email="john@doe.com">John Doe</author>-->
+  </properties>
+
+  <!-- An optional head, the description is used for the sitemap. -->
+  <!--
+  <head>
+    <meta name="keywords" content="List of keywords"/>
+    <meta name="description" content="The description"/>
+  </head>
+  -->
+
+  <body>
+
+    <section name="@NAME@">
+      <p>
+        @NAME@ is an extremely cool application.
+      </p>
+      <!--
+      <subsection name="A subsection">
+      </subsection>
+      -->
+    </section>
+
+  </body>
+
+</document>
diff --git a/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/navigation.xml b/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/navigation.xml
new file mode 100644
index 00000000..f62e31f3
--- /dev/null
+++ b/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/navigation.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="@NAME@">
+
+  <title>@NAME@</title>
+
+  <body>
+
+    <!--
+    <breadcrumbs>
+      <item name="Home" href="/index.html"/>
+    </breadcrumbs>
+    -->
+
+    <links>
+      <item name="Home" href="/index.html"/>
+    </links>
+
+    <!-- An optional sitemap -->
+    <!-- <sitemap/> -->
+
+    <!-- A navigation menu -->
+    <menu name="Documentation">
+      <item name="Home" href="/index.html"/>
+      <!--
+      <item name="A submenu"    href="/submenu/index.html"  collapse="true">
+        <item name="FAQ"        href="/faq.html"/>
+      </item>
+      -->
+    </menu>
+
+    <!-- A Google search field -->
+    <!-- <search/> -->
+
+    <!-- Additional powered-by logos -->
+    <!--
+    <powered-by>
+    </powered-by>
+    -->
+
+    <!-- footer will be placed above the (c) -->
+    <!--
+    <footer>
+    </footer>
+    -->
+
+  </body>
+</project>
diff --git a/genapp/src/plugin-resources/default/template-resources/src/test/AbstractTestCase.java b/genapp/src/plugin-resources/default/template-resources/src/test/java/AbstractTestCase.java
similarity index 100%
rename from genapp/src/plugin-resources/default/template-resources/src/test/AbstractTestCase.java
rename to genapp/src/plugin-resources/default/template-resources/src/test/java/AbstractTestCase.java
diff --git a/genapp/src/plugin-resources/default/template-resources/src/test/AppTest.java b/genapp/src/plugin-resources/default/template-resources/src/test/java/AppTest.java
similarity index 100%
rename from genapp/src/plugin-resources/default/template-resources/src/test/AppTest.java
rename to genapp/src/plugin-resources/default/template-resources/src/test/java/AppTest.java
diff --git a/genapp/src/plugin-resources/default/template-resources/src/test/NaughtyTest.java b/genapp/src/plugin-resources/default/template-resources/src/test/java/NaughtyTest.java
similarity index 100%
rename from genapp/src/plugin-resources/default/template-resources/src/test/NaughtyTest.java
rename to genapp/src/plugin-resources/default/template-resources/src/test/java/NaughtyTest.java
diff --git a/genapp/src/plugin-resources/default/template.properties b/genapp/src/plugin-resources/default/template.properties
index 9ca7b58f..94ebf7f1 100644
--- a/genapp/src/plugin-resources/default/template.properties
+++ b/genapp/src/plugin-resources/default/template.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 # -------------------------------------------------------------------
 
-maven.genapp.repackage=java,test
-maven.genapp.filter=project.xml
+maven.genapp.repackage=main/java,test/java
+maven.genapp.filter=project.xml,**/index.xml,**/navigation.xml
 
 maven.genapp.default.package=example.app
diff --git a/genapp/src/plugin-test/nonStandardDirsTest/maven.xml b/genapp/src/plugin-test/nonStandardDirsTest/maven.xml
index 0dfc1d0b..54c08a6f 100644
--- a/genapp/src/plugin-test/nonStandardDirsTest/maven.xml
+++ b/genapp/src/plugin-test/nonStandardDirsTest/maven.xml
@@ -29,8 +29,8 @@
     <ant:move todir="${maven.genapp.template.dir}/template-resources/my_src">
       <ant:fileset dir="${maven.genapp.template.dir}/template-resources/src"/>
     </ant:move>
-    <ant:move todir="${maven.genapp.template.dir}/template-resources/my_src/my_java">
-      <ant:fileset dir="${maven.genapp.template.dir}/template-resources/my_src/java"/>
+    <ant:move todir="${maven.genapp.template.dir}/template-resources/my_src/main/my_java">
+      <ant:fileset dir="${maven.genapp.template.dir}/template-resources/my_src/main/java"/>
     </ant:move>
     <ant:move todir="${maven.genapp.template.dir}/template-resources/my_src/my_test">
       <ant:fileset dir="${maven.genapp.template.dir}/template-resources/my_src/test"/>
@@ -46,7 +46,7 @@
     <assert:assertFileExists file="${maven.genapp.basedir}/project.xml"/>
     <assert:assertFileExists file="${maven.genapp.basedir}/project.properties"/>
     <assert:assertFileExists file="${maven.genapp.basedir}/${mySrc}"/>
-    <assert:assertFileExists file="${maven.genapp.basedir}/${mySrc}/${myJava}"/>
+    <assert:assertFileExists file="${maven.genapp.basedir}/${mySrc}/main/${myJava}"/>
     <assert:assertFileExists file="${maven.genapp.basedir}/${mySrc}/${myTest}"/>
   </goal>
 </project>
diff --git a/genapp/src/plugin-test/nonStandardDirsTest/template.properties b/genapp/src/plugin-test/nonStandardDirsTest/template.properties
index 19586e61..ec6fd551 100644
--- a/genapp/src/plugin-test/nonStandardDirsTest/template.properties
+++ b/genapp/src/plugin-test/nonStandardDirsTest/template.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 # -------------------------------------------------------------------
 
-maven.genapp.repackage=my_java,my_test
+maven.genapp.repackage=main/my_java,my_test/java
 maven.genapp.filter=project.xml
 
 maven.genapp.default.package=example.app
diff --git a/genapp/xdocs/properties.xml b/genapp/xdocs/properties.xml
index 97e791dd..68ebe101 100644
--- a/genapp/xdocs/properties.xml
+++ b/genapp/xdocs/properties.xml
@@ -43,7 +43,7 @@
             into the new project after they have been filtered.  The filtering
             replaces placeholders with properties (see below).
           </td>
-          <td>java,test</td>
+          <td>project.xml,**/index.xml,**/navigation.xml</td>
         </tr>
         <tr>
           <td>maven.genapp.param</td>
@@ -62,7 +62,7 @@
             defined with the property maven.genapp.template.package. The
 			files are not only copied, but also filtered.
           </td>
-          <td>project.xml</td>
+          <td>main/java,test/java</td>
         </tr>
         <tr>
           <td>maven.genapp.template</td>
@@ -111,7 +111,7 @@
             Base directory for the <code>maven.genapp.repackage</code> property.
           </td>
           <td>
-            ${src}
+            <code>src</code>
           </td>
         </tr>
       </table>