diff --git a/src/assembly/src.xml b/src/assembly/src.xml
index 3f9c66422..a8bee272b 100644
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -45,8 +45,5 @@
         <fileSet>
             <directory>src</directory>
         </fileSet>
-        <fileSet>
-            <directory>xdocs</directory>
-        </fileSet>
     </fileSets>
 </assembly>
diff --git a/xdocs/building.xml b/src/site/xdoc/building.xml
similarity index 100%
rename from xdocs/building.xml
rename to src/site/xdoc/building.xml
diff --git a/xdocs/compatibility.xml b/src/site/xdoc/compatibility.xml
similarity index 100%
rename from xdocs/compatibility.xml
rename to src/site/xdoc/compatibility.xml
diff --git a/xdocs/download_collections.xml b/src/site/xdoc/download_collections.xml
similarity index 100%
rename from xdocs/download_collections.xml
rename to src/site/xdoc/download_collections.xml
diff --git a/xdocs/history.xml b/src/site/xdoc/history.xml
similarity index 100%
rename from xdocs/history.xml
rename to src/site/xdoc/history.xml
diff --git a/xdocs/index.xml b/src/site/xdoc/index.xml
similarity index 100%
rename from xdocs/index.xml
rename to src/site/xdoc/index.xml
diff --git a/xdocs/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml
similarity index 100%
rename from xdocs/issue-tracking.xml
rename to src/site/xdoc/issue-tracking.xml
diff --git a/xdocs/pick.xml b/src/site/xdoc/pick.xml
similarity index 100%
rename from xdocs/pick.xml
rename to src/site/xdoc/pick.xml
diff --git a/xdocs/proposal.xml b/src/site/xdoc/proposal.xml
similarity index 100%
rename from xdocs/proposal.xml
rename to src/site/xdoc/proposal.xml
diff --git a/xdocs/release_3_2.xml b/src/site/xdoc/release_3_2.xml
similarity index 100%
rename from xdocs/release_3_2.xml
rename to src/site/xdoc/release_3_2.xml
diff --git a/xdocs/release_3_2_1.xml b/src/site/xdoc/release_3_2_1.xml
similarity index 100%
rename from xdocs/release_3_2_1.xml
rename to src/site/xdoc/release_3_2_1.xml
diff --git a/xdocs/release_3_3.xml b/src/site/xdoc/release_3_3.xml
similarity index 100%
rename from xdocs/release_3_3.xml
rename to src/site/xdoc/release_3_3.xml
diff --git a/xdocs/tasks.xml b/src/site/xdoc/tasks.xml
similarity index 100%
rename from xdocs/tasks.xml
rename to src/site/xdoc/tasks.xml
diff --git a/xdocs/userguide.xml b/src/site/xdoc/userguide.xml
similarity index 100%
rename from xdocs/userguide.xml
rename to src/site/xdoc/userguide.xml
diff --git a/xdocs/images/logo.png b/xdocs/images/logo.png
deleted file mode 100644
index 44654dc40..000000000
Binary files a/xdocs/images/logo.png and /dev/null differ
diff --git a/xdocs/style/project.css b/xdocs/style/project.css
deleted file mode 100644
index c1d541c82..000000000
--- a/xdocs/style/project.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("http://commons.apache.org/style/commons-maven.css");