diff --git a/api/pom.xml b/api/pom.xml
index 603f9babd..57c0d26b1 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -11,12 +11,6 @@
     <artifactId>struts2-api</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 API</name>
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.x/api</url>
-        </site>
-    </distributionManagement>
    <dependencies>
         <dependency>
            <groupId>javax.servlet</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 5c1c2eb9f..8ec679d3d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -10,14 +10,8 @@
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-core</artifactId>
     <packaging>jar</packaging>
-    <name>Struts 2 - Core</name>
+    <name>Struts 2 Core</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.x/core</url>
-        </site>
-    </distributionManagement>
     <build>
         <plugins>
             <plugin>
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 248110a75..cd134894d 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 Configuration Browser Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/config-browser</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
         <dependency>
             <groupId>org.apache.struts</groupId>
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index c45996b82..00150d1db 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 Jasper Reports Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/jasperreports</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
         <dependency>
             <groupId>jasperreports</groupId>
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 015dde473..3e4b460ef 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 JFreeChart Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/jfreechart</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
     	<dependency>
 			<groupId>jfree</groupId>
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index bfa79c1ac..789a6ab10 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 JSF Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/jsf</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
         <dependency>
             <groupId>org.apache.struts</groupId>
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 99539616c..cdbd53de9 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 Pell Multipart Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/pell-multipart</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
         <dependency>
             <groupId>opensymphony</groupId>
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index d23b6bd85..e344549db 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 Plexus Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/plexus</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 2529b88ae..44ca267a7 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -22,12 +22,6 @@
         <module>sitemesh</module>
         <module>tiles</module>
     </modules>
-     <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.x/plugins</url>
-        </site>
-    </distributionManagement>
     
     <dependencies>
 
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index b0d9a8b4a..963dcc442 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 Sitemesh Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/sitemesh</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
         <dependency>
             <groupId>opensymphony</groupId>
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 753d35866..b0badd9ce 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 Tiles Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/tiles</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
         <dependency>
             <groupId>org.apache.struts.tiles</groupId>
diff --git a/pom.xml b/pom.xml
index 03e2fdf86..85d091e23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,7 +166,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>2.0-beta-4</version>
+                    <version>2.0-beta-5</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/site/site.xml b/src/site/site.xml
index 916768132..8e8153887 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -56,18 +56,16 @@
         <menu name="Reference">
             <item
                     name="Struts Core API"
-                    href="core/apidocs/index.html"
+                    href="struts2-core/apidocs/index.html"
+                    />        
+            <item
+                    name="New API (experimental)"
+                    href="struts2-api/apidocs/index.html"
                     />        
-
             <item
                     name="Tag Reference"
                     href="http://cwiki.apache.org/WW/tag-reference.html"
                     />        
-
-            <item
-                    name="New API (experimental)"
-                    href="api/apidocs/index.html"
-                    />        
             <item
                     name="Source Repository"
                     href="http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/?root=Apache-SVN"
@@ -76,48 +74,48 @@
         <menu name="Plugins">
             <item
                     name="JavaServer Faces"
-                    href="plugins/jsf"
+                    href="struts2-plugins/struts2-jsf-plugin/index.html"
                     />
            <item
                     name="Struts 1"
-                    href="plugins/struts1"
+                    href="struts2-plugins/struts2-struts1-plugin/index.html"
                     />
 
            <item
                     name="JasperReports"
-                    href="plugins/jasperreports"
+                    href="struts2-plugins/struts2-jasperreports-plugin/index.html"
                     />
 
            <item
                     name="Pell Multipart"
-                    href="plugins/pellmultipart"
+                    href="struts2-plugins/struts2-pell-multipart-plugin/index.html"
                     />
 
            <item
                     name="JFreeChart"
-                    href="plugins/jfreechart"
+                    href="struts2-plugins/struts2-freechart-plugin/index.html"
                     />
 
            <item
                     name="Tiles"
-                    href="plugins/tiles"
+                    href="struts2-plugins/struts2-tiles-plugin/index.html"
                     />
 
            <item
                     name="Sitemesh"
-                    href="plugins/sitemesh"
+                    href="struts2-plugins/struts2-sitemesh-plugin/index.html"
                     />
 
 
            <item
                     name="Config Browser"
-                    href="plugins/config-browser"
+                    href="struts2-plugins/struts2-config-browser-plugin/index.html"
                     />
 
 
            <item
                     name="Plexus"
-                    href="plugins/plexus"
+                    href="struts2-plugins/struts2-plexus-plugin/index.html"
                     />
 
         </menu>