diff --git a/api/pom.xml b/api/pom.xml
index 96dad3966..603f9babd 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -11,7 +11,13 @@
     <artifactId>struts2-api</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 API</name>
-    <dependencies>
+    <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>
            <artifactId>servlet-api</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 04441b72e..5c1c2eb9f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -15,7 +15,7 @@
     <distributionManagement>
         <site>
             <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.x/struts-core</url>
+            <url>scp://people.apache.org/www/struts.apache.org/2.x/core</url>
         </site>
     </distributionManagement>
     <build>
diff --git a/core/src/site/site.xml b/src/site/site.xml
similarity index 66%
rename from core/src/site/site.xml
rename to src/site/site.xml
index 1c7589d17..916768132 100644
--- a/core/src/site/site.xml
+++ b/src/site/site.xml
@@ -56,17 +56,7 @@
         <menu name="Reference">
             <item
                     name="Struts Core API"
-                    href="core-apidocs/index.html"
-                    />        
-
-            <item
-                    name="XWork API"
-                    href="xwork-apidocs/index.html"
-                    />        
-
-            <item
-                    name="Struts Plugins API"
-                    href="plugins-apidocs/index.html"
+                    href="core/apidocs/index.html"
                     />        
 
             <item
@@ -76,13 +66,61 @@
 
             <item
                     name="New API (experimental)"
-                    href="api-apidocs/index.html"
+                    href="api/apidocs/index.html"
                     />        
             <item
                     name="Source Repository"
                     href="http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/?root=Apache-SVN"
                     />
         </menu>
+        <menu name="Plugins">
+            <item
+                    name="JavaServer Faces"
+                    href="plugins/jsf"
+                    />
+           <item
+                    name="Struts 1"
+                    href="plugins/struts1"
+                    />
+
+           <item
+                    name="JasperReports"
+                    href="plugins/jasperreports"
+                    />
+
+           <item
+                    name="Pell Multipart"
+                    href="plugins/pellmultipart"
+                    />
+
+           <item
+                    name="JFreeChart"
+                    href="plugins/jfreechart"
+                    />
+
+           <item
+                    name="Tiles"
+                    href="plugins/tiles"
+                    />
+
+           <item
+                    name="Sitemesh"
+                    href="plugins/sitemesh"
+                    />
+
+
+           <item
+                    name="Config Browser"
+                    href="plugins/config-browser"
+                    />
+
+
+           <item
+                    name="Plexus"
+                    href="plugins/plexus"
+                    />
+
+        </menu>
         ${reports}
     </body>
 </project>
diff --git a/core/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
similarity index 100%
rename from core/src/site/xdoc/index.xml
rename to src/site/xdoc/index.xml
diff --git a/core/src/site/xdoc/jxr.xml b/src/site/xdoc/jxr.xml
similarity index 100%
rename from core/src/site/xdoc/jxr.xml
rename to src/site/xdoc/jxr.xml