diff --git a/pom.xml b/pom.xml
index 0145356f..366022cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.mojo</groupId>
-  <artifactId>webstart-parent</artifactId>
+  <artifactId>webstart</artifactId>
   <packaging>pom</packaging>
   <version>1.0-beta-3</version>
   <name>MWEBSTART :: Project</name>
@@ -87,8 +87,8 @@
 
   <modules>
     <module>webstart-pack200-api</module>
-    <module>webstart-jnlp-servlet</module>
     <module>webstart-maven-plugin</module>
+    <module>webstart-jnlp-servlet</module>
   </modules>
 
   <properties>
@@ -99,8 +99,6 @@
 
     <!-- all modules shares the same version in our projects -->
     <autoVersionSubmodules>true</autoVersionSubmodules>
-    <!-- make sure tag name is webstart-XXX -->
-    <tagNameFormat>webstart-@{project.version}</tagNameFormat>
   </properties>
 
   <profiles>
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 2d93e7d9..ff94529f 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -9,7 +9,8 @@
 
 Webstart Maven Plugin
 
-  This set of modules provide functionality related to the {{{./webstart-maven-plugin}Webstart Maven Plugin}}.
+  This set of modules provide functionality related to the
+  {{{./webstart-maven-plugin}Webstart Maven Plugin}}.
 
 * Note since version 1.0-beta-3
 
diff --git a/webstart-jnlp-servlet/pom.xml b/webstart-jnlp-servlet/pom.xml
index 4b3d2083..24d87683 100644
--- a/webstart-jnlp-servlet/pom.xml
+++ b/webstart-jnlp-servlet/pom.xml
@@ -3,7 +3,7 @@
 
   <parent>
     <groupId>org.codehaus.mojo</groupId>
-    <artifactId>webstart-parent</artifactId>
+    <artifactId>webstart</artifactId>
     <version>1.0-beta-3</version>
   </parent>
 
diff --git a/webstart-maven-plugin/pom.xml b/webstart-maven-plugin/pom.xml
index 62547e40..3afbfdc1 100644
--- a/webstart-maven-plugin/pom.xml
+++ b/webstart-maven-plugin/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.codehaus.mojo</groupId>
-    <artifactId>webstart-parent</artifactId>
+    <artifactId>webstart</artifactId>
     <version>1.0-beta-3</version>
   </parent>
 
@@ -117,12 +117,12 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
+    <!--dependency>
       <groupId>org.codehaus.mojo</groupId>
       <artifactId>webstart-jnlp-servlet</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
-    </dependency>
+    </dependency-->
 
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
@@ -292,6 +292,7 @@
               <settingsFile>src/it/settings.xml</settingsFile>
               <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
               <postBuildHookScript>validate.groovy</postBuildHookScript>
+              <addTestClassPath>true</addTestClassPath>
             </configuration>
             <executions>
               <execution>
diff --git a/webstart-maven-plugin/src/it/it002/pom.xml b/webstart-maven-plugin/src/it/it002/pom.xml
index 05e2f0ec..dbad39cb 100644
--- a/webstart-maven-plugin/src/it/it002/pom.xml
+++ b/webstart-maven-plugin/src/it/it002/pom.xml
@@ -19,10 +19,9 @@
     <dependencies>
 
       <dependency>
-        <groupId>org.codehaus.mojo</groupId>
-        <!--groupId>com.sun.java.jnlp</groupId-->
+        <groupId>org.codehaus.mojo.webstart</groupId>
         <artifactId>webstart-jnlp-servlet</artifactId>
-        <version>@project.version@</version>
+        <version>${webstartJnlpServletVersion}</version>
         <scope>runtime</scope>
       </dependency>
 
diff --git a/webstart-maven-plugin/src/it/it002/webapp/pom.xml b/webstart-maven-plugin/src/it/it002/webapp/pom.xml
index 3ad3e66b..e1929e70 100644
--- a/webstart-maven-plugin/src/it/it002/webapp/pom.xml
+++ b/webstart-maven-plugin/src/it/it002/webapp/pom.xml
@@ -25,7 +25,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.mojo</groupId>
+      <groupId>org.codehaus.mojo.webstart</groupId>
       <artifactId>webstart-jnlp-servlet</artifactId>
     </dependency>
 
diff --git a/webstart-maven-plugin/src/it/it003/pom.xml b/webstart-maven-plugin/src/it/it003/pom.xml
index 6e8fe587..f981ac04 100644
--- a/webstart-maven-plugin/src/it/it003/pom.xml
+++ b/webstart-maven-plugin/src/it/it003/pom.xml
@@ -19,9 +19,9 @@
     <dependencies>
 
       <dependency>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>org.codehaus.mojo.webstart</groupId>
         <artifactId>webstart-jnlp-servlet</artifactId>
-        <version>@project.version@</version>
+        <version>${webstartJnlpServletVersion}</version>
         <scope>runtime</scope>
       </dependency>
 
diff --git a/webstart-maven-plugin/src/it/it003/webapp/pom.xml b/webstart-maven-plugin/src/it/it003/webapp/pom.xml
index 61caeba1..a0ee3b85 100644
--- a/webstart-maven-plugin/src/it/it003/webapp/pom.xml
+++ b/webstart-maven-plugin/src/it/it003/webapp/pom.xml
@@ -25,7 +25,7 @@
   <dependencies>
     
     <dependency>
-      <groupId>org.codehaus.mojo</groupId>
+      <groupId>org.codehaus.mojo.webstart</groupId>
       <artifactId>webstart-jnlp-servlet</artifactId>
     </dependency>
 
diff --git a/webstart-maven-plugin/src/it/settings.xml b/webstart-maven-plugin/src/it/settings.xml
index 4e20f55a..236ea45e 100644
--- a/webstart-maven-plugin/src/it/settings.xml
+++ b/webstart-maven-plugin/src/it/settings.xml
@@ -22,6 +22,11 @@
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
+      <properties>
+        <webstartJnlpServletVersion>
+          1.0-6.0.02_ea_b02.2
+        </webstartJnlpServletVersion>
+      </properties>
       <repositories>
         <repository>
           <id>local.central</id>
diff --git a/webstart-maven-plugin/src/site/apt/contributors.apt b/webstart-maven-plugin/src/site/apt/contributors.apt
index a587ff75..1c0ca38d 100644
--- a/webstart-maven-plugin/src/site/apt/contributors.apt
+++ b/webstart-maven-plugin/src/site/apt/contributors.apt
@@ -16,7 +16,6 @@ Notes to users and contributors
 
   * More generally some work is going to be done to make the JNLP goals configuration more compatible.
 
-
 * Reported missing features
 
    * {{{http://jira.codehaus.org/browse/MWEBSTART-25} A mojo for deploying the bundles to a remote server}}
diff --git a/webstart-maven-plugin/src/site/apt/examples/keystore_gen.apt b/webstart-maven-plugin/src/site/apt/examples/keystore_gen.apt
index c8adf07f..491494a2 100644
--- a/webstart-maven-plugin/src/site/apt/examples/keystore_gen.apt
+++ b/webstart-maven-plugin/src/site/apt/examples/keystore_gen.apt
@@ -10,12 +10,16 @@ Keystore generation and usage
 
   To deliver signed applications, one usually needs to generate a keystore.
 
-  One can use the keytool command line program delivered as part of the SDK. Another way to create the keystore is to use the {{{http://mojo.codehaus.org/keytool-maven-plugin/}Keytool Maven Plugin}}.
+  One can use the keytool command line program delivered as part of the SDK.
+  Another way to create the keystore is to use the
+  {{{http://mojo.codehaus.org/keytool/}Keytool Project}} via his nice java api.
  
-* Keytool as part of the Keystore Maven Plugin
+* Keytool as part of the Keytool Maven Plugin
 
-  See the  {{{http://mojo.codehaus.org/keytool-maven-plugin/}Keytool Maven Plugin}} documentation.
+  See the  {{{http://mojo.codehaus.org/keytool/keytool-maven-plugin/}Keytool Maven Plugin}} documentation.
 
 * Keytool as part of the Webstart Maven Plugin
 
-  One can make the Webstart Plugin generate a new keystore at each build. This can be convenient for demos and other less production critical projects (where signing needs to be done appropriately).
+  One can make the Webstart Plugin generate a new keystore at each build.
+  This can be convenient for demos and other less production critical projects
+  (where signing needs to be done appropriately).
diff --git a/webstart-maven-plugin/src/site/apt/examples/more_examples.apt b/webstart-maven-plugin/src/site/apt/examples/more_examples.apt
deleted file mode 100644
index cd92aa73..00000000
--- a/webstart-maven-plugin/src/site/apt/examples/more_examples.apt
+++ /dev/null
@@ -1,12 +0,0 @@
- ------
- More examples
- ------
- Jerome Lacoste
- ------
- 2008-09-23
- ------
-
-More examples
-
-  The plugin comes with several {{{http://svn.mojo.codehaus.org/browse/mojo/trunk/mojo/webstart/webstart-maven-plugin/src/test/projects/}test projects}} and {{{http://svn.mojo.codehaus.org/browse/mojo/trunk/mojo/webstart/webstart-maven-plugin/src/it}integration tests}}.
-
diff --git a/webstart-maven-plugin/src/site/apt/examples/more_examples.apt.vm b/webstart-maven-plugin/src/site/apt/examples/more_examples.apt.vm
new file mode 100644
index 00000000..77418bd2
--- /dev/null
+++ b/webstart-maven-plugin/src/site/apt/examples/more_examples.apt.vm
@@ -0,0 +1,12 @@
+ ------
+ More examples
+ ------
+ Jerome Lacoste
+ ------
+ 2008-09-23
+ ------
+
+More examples
+
+  The plugin comes with several {{{http://svn.codehaus.org/mojo/tags/webstart-${project.version}/webstart-maven-plugin/src/test/projects/}test projects}} and {{{http://svn.codehaus.org/mojo/tags/webstart-${project.version}/webstart-maven-plugin/src/it}integration tests}}.
+
diff --git a/webstart-maven-plugin/src/site/apt/examples/pluggable_jar_signing.apt b/webstart-maven-plugin/src/site/apt/examples/pluggable_jar_signing.apt
index 450e0447..84268e16 100644
--- a/webstart-maven-plugin/src/site/apt/examples/pluggable_jar_signing.apt
+++ b/webstart-maven-plugin/src/site/apt/examples/pluggable_jar_signing.apt
@@ -12,4 +12,5 @@ Using an external JAR signer
 
   See {{{http://svn.mojo.codehaus.org/browse/mojo/trunk/mojo/webstart/webstart-maven-plugin/src/test/projects/project5}src/test/projects/project5}} as an example on how to use an external JAR signer.
 
+  This was deprecated, since 1.0-beta-2, perharps I did not see the point ?
 ~~ FIXME further describe here and move to an integration test
diff --git a/webstart-maven-plugin/src/site/apt/examples/simple_jnlp_download_servlet.apt b/webstart-maven-plugin/src/site/apt/examples/simple_jnlp_download_servlet.apt
index d14c308f..301a64ab 100644
--- a/webstart-maven-plugin/src/site/apt/examples/simple_jnlp_download_servlet.apt
+++ b/webstart-maven-plugin/src/site/apt/examples/simple_jnlp_download_servlet.apt
@@ -10,7 +10,7 @@ Simple JnlpDownloadServlet Example
 
     In this example, we show how to use the plugin to deploy a single JNLP application within a WAR that uses
     the JnlpDownloadServlet. Only the most basic features are described. For a more complex example that includes 
-    multiple JNLP applications in the same WAR, and other more advanced features, see the {{{advanced_jnlp_download_servlet.html}Advanced JnlpDownloadServlet Example}}. 
+    multiple JNLP applications in the same WAR, and other more advanced features, see the {{{./advanced_jnlp_download_servlet.html}Advanced JnlpDownloadServlet Example}}.
 
 *The web.xml
 
diff --git a/webstart-maven-plugin/src/site/apt/examples/war_bundle_1.apt b/webstart-maven-plugin/src/site/apt/examples/war_bundle_1.apt
index cdf2bf1e..6481219f 100644
--- a/webstart-maven-plugin/src/site/apt/examples/war_bundle_1.apt
+++ b/webstart-maven-plugin/src/site/apt/examples/war_bundle_1.apt
@@ -38,7 +38,7 @@ Example WAR Bundle #1
 
     Because the JNLP projects have no knowledge of the webapp project, they don't need
     to be treated any differently from a normal standalone JNLP project as described
-    in the {{{single_webstart_app.html}Single webstart application example}}. Follow the instructions in that example
+    in the {{{./single_webstart_app.html}Single webstart application example}}. Follow the instructions in that example
     to create the <sample-jnlp1> and <sample-jnlp2> projects. They can be deployed
     to any repository that the webapp project will have access to.
         
diff --git a/webstart-maven-plugin/src/site/site.xml b/webstart-maven-plugin/src/site/site.xml
index ce2bde9f..fa838abc 100644
--- a/webstart-maven-plugin/src/site/site.xml
+++ b/webstart-maven-plugin/src/site/site.xml
@@ -30,7 +30,7 @@
       <item name="Advanced" href="examples/advanced_jnlp_download_servlet.html" />
     </item>
     <!--item name="Advanced" collapse="false"-->
-      <item name="Advanced: Pluggable JAR signing" href="examples/pluggable_jar_signing.html" />
+      <!--item name="Advanced: Pluggable JAR signing" href="examples/pluggable_jar_signing.html" /-->
     <!--/item-->
     <item name="More examples" href="examples/more_examples.html" />
   </menu>
diff --git a/webstart-pack200-api/pom.xml b/webstart-pack200-api/pom.xml
index aefce6e6..d2410302 100644
--- a/webstart-pack200-api/pom.xml
+++ b/webstart-pack200-api/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.codehaus.mojo</groupId>
-    <artifactId>webstart-parent</artifactId>
+    <artifactId>webstart</artifactId>
     <version>1.0-beta-3</version>
   </parent>
 
diff --git a/webstart-pack200-impl/pom.xml b/webstart-pack200-impl/pom.xml
index f6d26b30..f8b22b7c 100644
--- a/webstart-pack200-impl/pom.xml
+++ b/webstart-pack200-impl/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.codehaus.mojo</groupId>
-    <artifactId>webstart-parent</artifactId>
+    <artifactId>webstart</artifactId>
     <version>1.0-beta-3</version>
   </parent>