diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
new file mode 100644
index 00000000000..4e074299875
--- /dev/null
+++ b/hbase-assembly/pom.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <!--
+    /**
+     * Licensed to the Apache Software Foundation (ASF) under one
+     * or more contributor license agreements.  See the NOTICE file
+     * distributed with this work for additional information
+     * regarding copyright ownership.  The ASF licenses this file
+     * to you 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.
+     */
+    -->
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>hbase</artifactId>
+        <groupId>org.apache.hbase</groupId>
+        <version>0.97.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <artifactId>hbase-assembly</artifactId>
+    <name>HBase - Assembly</name>
+    <description>
+        Module that does project assembly and site.
+    </description>
+    <packaging>pom</packaging>
+    <build>
+        <plugins>
+        <plugin>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>${maven.assembly.version}</version>
+          <configuration>
+          <skipAssembly>false</skipAssembly>
+          <appendAssemblyId>true</appendAssemblyId>
+          <!--We do not want assembly attached; run on command-line explicitly
+               if you want to do an assembly-->
+          <attach>false</attach>
+          <tarLongFileMode>gnu</tarLongFileMode>
+          <descriptors>
+            <descriptor>${assembly.file}</descriptor>
+          </descriptors>
+          </configuration>
+        </plugin>
+       <!--The below plugins are about site generation.
+            They are all marked as not to be in herited by child
+            modules.  The plugins are meant to run here in this
+            module only
+        -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>xml-maven-plugin</artifactId>
+        <version>1.0</version>
+        <inherited>false</inherited>
+        <executions>
+          <execution>
+            <!-- Run the hbase-default.xml through a stylesheet so can show it in doc-->
+            <goals>
+              <goal>transform</goal>
+            </goals>
+            <phase>pre-site</phase>
+          </execution>
+        </executions>
+        <configuration>
+          <transformationSets>
+            <transformationSet>
+              <!--Reaching up and over into common sub-module for hbase-default.xml-->
+              <dir>${basedir}/../hbase-common/src/main/resources/</dir>
+              <includes>
+                <include>hbase-default.xml</include>
+              </includes>
+              <stylesheet>${basedir}/src/xslt/configuration_to_docbook_section.xsl</stylesheet>
+              <outputDir>${basedir}/target/docbkx</outputDir>
+            </transformationSet>
+          </transformationSets>
+        </configuration>
+      </plugin>
+      <!--Build the documentation.  We build it twice.  Once as a single page and then
+           again as multipage.-->
+      <plugin>
+        <groupId>com.agilejava.docbkx</groupId>
+        <artifactId>docbkx-maven-plugin</artifactId>
+        <version>2.0.14</version>
+        <inherited>false</inherited>
+        <dependencies>
+          <dependency>
+            <groupId>org.docbook</groupId>
+            <artifactId>docbook-xml</artifactId>
+            <version>4.4</version>
+            <scope>runtime</scope>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <xincludeSupported>true</xincludeSupported>
+          <useIdAsFilename>true</useIdAsFilename>
+          <sectionAutolabelMaxDepth>100</sectionAutolabelMaxDepth>
+          <sectionAutolabel>true</sectionAutolabel>
+          <sectionLabelIncludesComponentLabel>true</sectionLabelIncludesComponentLabel>
+          <htmlCustomization>${basedir}/src/docbkx/customization.xsl</htmlCustomization>
+          <tocMaxDepth>2</tocMaxDepth>
+          <insertXrefPageNumber>yes</insertXrefPageNumber>
+          <targetDirectory>${basedir}/target/docbkx</targetDirectory>
+          <chunkerOutputEncoding>UTF-8</chunkerOutputEncoding>
+        </configuration>
+        <executions>
+          <execution>
+            <id>multipage</id>
+            <goals>
+              <goal>generate-html</goal>
+            </goals>
+            <phase>pre-site</phase>
+            <configuration>
+              <navigShowtitles>true</navigShowtitles>
+              <chunkedOutput>true</chunkedOutput>
+              <imgSrcPath>../images/</imgSrcPath>
+              <htmlStylesheet>../css/freebsd_docbook.css</htmlStylesheet>
+            </configuration>
+          </execution>
+          <execution>
+            <id>onepage</id>
+            <goals>
+              <goal>generate-html</goal>
+            </goals>
+            <phase>pre-site</phase>
+            <configuration>
+              <imgSrcPath>images/</imgSrcPath>
+              <htmlStylesheet>css/freebsd_docbook.css</htmlStylesheet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>${maven.resources.plugin.version}</version>
+        <!--$NO-MVN-MAN-VER$ -->
+        <inherited>false</inherited>
+        <executions>
+          <execution>
+            <id>copy-javadocs</id>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <phase>site</phase>
+            <configuration>
+              <outputDirectory>target/site/apidocs</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${basedir}/target/apidocs</directory>
+                  <includes>
+                    <include>**/**</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-docbkx</id>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <phase>site</phase>
+            <configuration>
+              <outputDirectory>target/site</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${basedir}/target/docbkx</directory>
+                  <includes>
+                    <include>**/**</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <escapeString>\</escapeString>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>${maven.site.version}</version>
+        <inherited>false</inherited>
+        <dependencies>
+          <dependency>
+            <!-- add support for ssh/scp -->
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-ssh</artifactId>
+            <version>2.2</version>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <inputEncoding>UTF-8</inputEncoding>
+          <outputEncoding>UTF-8</outputEncoding>
+          <templateFile>${basedir}/src/site/site.vm</templateFile>
+        </configuration>
+      </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+    </dependencies>
+</project>
diff --git a/src/assembly/components.xml b/hbase-assembly/src/assembly/components.xml
similarity index 68%
rename from src/assembly/components.xml
rename to hbase-assembly/src/assembly/components.xml
index 5fa87ff8a9b..fa3281cba9b 100644
--- a/src/assembly/components.xml
+++ b/hbase-assembly/src/assembly/components.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -17,6 +18,9 @@
  * limitations under the License.
  */
 -->
+
+<!--Shared by hadoop-one-compat.xml and hadoop-two-compat.xml.
+     Does common copying-->
 <component>
   <fileSets>
     <!--Copy over the site if built as docs dir -->
@@ -24,80 +28,70 @@
       <directory>target/site</directory>
       <outputDirectory>docs</outputDirectory>
     </fileSet>
-    <!-- Include top level text files -->
+    <!--Copy over the javadoc if built-->
     <fileSet>
-      <outputDirectory>/</outputDirectory>
+        <directory>${project.basedir}/../target/apidocs</directory>
+        <outputDirectory>docs/apidocs</outputDirectory>
+    </fileSet>
+    <!-- Include top level text files-->
+    <fileSet>
+      <directory>${project.basedir}/..</directory>
+      <outputDirectory>.</outputDirectory>
       <includes>
-        <include>*.txt</include>
-        <include>pom.xml</include>
+        <include>LICENSE.txt</include>
+        <include>NOTICE.txt</include>
+        <include>CHANGES.txt</include>
+        <include>README.txt</include>
       </includes>
+      <fileMode>0644</fileMode>
     </fileSet>
     <!-- Include the top level conf directory -->
     <fileSet>
-      <directory>conf</directory>
+      <directory>${project.basedir}/../conf</directory>
       <outputDirectory>conf</outputDirectory>
       <fileMode>0644</fileMode>
       <directoryMode>0755</directoryMode>
     </fileSet>
     <!-- Include top level bin directory -->
     <fileSet>
-      <directory>bin</directory>
+        <directory>${project.basedir}/../bin</directory>
       <outputDirectory>bin</outputDirectory>
       <fileMode>0755</fileMode>
       <directoryMode>0755</directoryMode>
     </fileSet>
-    <fileSet>
-      <directory>conf</directory>
-      <outputDirectory>conf</outputDirectory>
-      <fileMode>0644</fileMode>
-      <directoryMode>0755</directoryMode>
-    </fileSet>
-    <!--Include top-level src. Module src done down below -->
-    <fileSet>
-      <directory>src</directory>
-      <outputDirectory>src</outputDirectory>
-      <fileMode>0644</fileMode>
-      <directoryMode>0755</directoryMode>
-    </fileSet>
-    <!-- Include dev-support directory -->
-    <fileSet>
-      <directory>dev-support</directory>
-      <outputDirectory>dev-support</outputDirectory>
-      <fileMode>0755</fileMode>
-      <directoryMode>0755</directoryMode>
-    </fileSet>
     <!-- Move the ruby code over -->
     <fileSet>
-      <directory>hbase-server/src/main/ruby</directory>
+        <directory>${project.basedir}/../hbase-server/src/main/ruby</directory>
       <outputDirectory>lib/ruby</outputDirectory>
       <fileMode>0644</fileMode>
       <directoryMode>0755</directoryMode>
     </fileSet>
     <!-- Move the webapps to the webapp dir -->
     <fileSet>
-      <directory>hbase-server/target/hbase-webapps</directory>
+        <directory>${project.basedir}/../hbase-server/target/hbase-webapps</directory>
       <outputDirectory>hbase-webapps</outputDirectory>
       <fileMode>0644</fileMode>
       <directoryMode>0755</directoryMode>
     </fileSet>
     <!-- Include native libraries -->
     <fileSet>
-      <directory>hbase-server/target/native</directory>
-      <outputDirectory>native</outputDirectory>
+        <directory>${project.basedir}/../hbase-server/target/native</directory>
+        <outputDirectory>lib/native</outputDirectory>
       <fileMode>0755</fileMode>
       <directoryMode>0755</directoryMode>
       <includes>
         <include>*.so</include>
+        <include>*.dylib</include>
       </includes>
     </fileSet>
-    <!-- This is only necessary until maven fixes the intra-project dependency bug 
-      in maven 3.0. Until then, we have to include the test jars for sub-projects. When 
-      fixed, the below dependencySet stuff is sufficient for pulling in the test jars as 
-      well, as long as they are added as dependencies in this project. Right now, we only 
-      have 1 submodule to accumulate, but we can copy/paste as necessary until maven is 
+    <!-- This is only necessary until maven fixes the intra-project dependency bug
+      in maven 3.0. Until then, we have to include the test jars for sub-projects. When
+      fixed, the below dependencySet stuff is sufficient for pulling in the test jars as
+      well, as long as they are added as dependencies in this project. Right now, we only
+      have 1 submodule to accumulate, but we can copy/paste as necessary until maven is
       fixed. -->
     <fileSet>
-      <directory>hbase-server/target/</directory>
+        <directory>${project.basedir}/../hbase-server/target/</directory>
       <outputDirectory>lib</outputDirectory>
       <includes>
         <include>${server.test.jar}</include>
@@ -105,7 +99,7 @@
       <fileMode>0644</fileMode>
     </fileSet>
     <fileSet>
-      <directory>hbase-it/target/</directory>
+        <directory>${project.basedir}/../hbase-it/target/</directory>
       <outputDirectory>lib</outputDirectory>
       <includes>
         <include>${it.test.jar}</include>
@@ -113,7 +107,7 @@
       <fileMode>0644</fileMode>
     </fileSet>
     <fileSet>
-      <directory>hbase-common/target/</directory>
+        <directory>${project.basedir}/../hbase-common/target/</directory>
       <outputDirectory>lib</outputDirectory>
       <includes>
         <include>${common.test.jar}</include>
@@ -121,4 +115,4 @@
       <fileMode>0644</fileMode>
     </fileSet>
   </fileSets>
-</component>
\ No newline at end of file
+</component>
diff --git a/src/assembly/hadoop-one-compat.xml b/hbase-assembly/src/assembly/hadoop-one-compat.xml
similarity index 55%
rename from src/assembly/hadoop-one-compat.xml
rename to hbase-assembly/src/assembly/hadoop-one-compat.xml
index f3a36b06f77..398812bc4e8 100644
--- a/src/assembly/hadoop-one-compat.xml
+++ b/hbase-assembly/src/assembly/hadoop-one-compat.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
 <!--
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +21,7 @@
 -->
 
   <!--This 'all' id is not appended to the produced bundle because we do this: http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers -->
-  <id>all</id>
+  <id>bin</id>
   <formats>
     <format>tar.gz</format>
   </formats>
@@ -32,42 +30,15 @@
   </componentDescriptors>
   <moduleSets>
     <moduleSet>
-      <!-- Enable access to all projects in the current multimodule build. Eclipse 
+      <!-- Enable access to all projects in the current multimodule build. Eclipse
         says this is an error, but builds from the command line just fine. -->
       <useAllReactorProjects>true</useAllReactorProjects>
-      <!-- This should work with more than 1 source module -->
-      <!-- For now, select which projects to include in this module-set. -->
-      <includes>
-        <include>org.apache.hbase:hbase-prefix-tree</include>
-        <include>org.apache.hbase:hbase-it</include>
-        <include>org.apache.hbase:hbase-protocol</include>
-        <include>org.apache.hbase:hbase-common</include>
-        <include>org.apache.hbase:hbase-client</include>
-        <include>org.apache.hbase:hbase-hadoop-compat</include>
-        <include>org.apache.hbase:hbase-server</include>
-        <include>org.apache.hbase:hbase-hadoop1-compat</include>
-        <include>org.apache.hbase:hbase-examples</include>
-      </includes>
-      <!-- Include all the sources in the top directory -->
-      <sources>
-        <fileSets>
-          <fileSet>
-            <excludes>
-              <exclude>target/</exclude>
-              <exclude>test/</exclude>
-              <exclude>.classpath</exclude>
-              <exclude>.project</exclude>
-              <exclude>.settings/</exclude>
-            </excludes>
-          </fileSet>
-        </fileSets>
-      </sources>
       <!-- Binaries for the dependencies also go in the lib directory -->
       <binaries>
         <outputDirectory>lib</outputDirectory>
         <unpack>false</unpack>
         <dependencySets>
-          <dependencySet />
+          <dependencySet/>
         </dependencySets>
       </binaries>
     </moduleSet>
diff --git a/src/assembly/hadoop-two-compat.xml b/hbase-assembly/src/assembly/hadoop-two-compat.xml
similarity index 54%
rename from src/assembly/hadoop-two-compat.xml
rename to hbase-assembly/src/assembly/hadoop-two-compat.xml
index 7701d433efd..4c436a534cd 100644
--- a/src/assembly/hadoop-two-compat.xml
+++ b/hbase-assembly/src/assembly/hadoop-two-compat.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
 <!--
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +21,7 @@
 -->
 
   <!--This 'all' id is not appended to the produced bundle because we do this: http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers -->
-  <id>all</id>
+  <id>bin</id>
   <formats>
     <format>tar.gz</format>
   </formats>
@@ -32,43 +30,15 @@
   </componentDescriptors>
   <moduleSets>
     <moduleSet>
-      <!-- Enable access to all projects in the current multimodule build. Eclipse 
+      <!-- Enable access to all projects in the current multimodule build. Eclipse
         says this is an error, but builds from the command line just fine. -->
       <useAllReactorProjects>true</useAllReactorProjects>
-      <!-- This should work with more than 1 source module -->
-      <!-- Now, select which projects to include in this module-set. -->
-      <!-- Just add future modules here assuming the wildcare doesn't match -->
-      <includes>
-        <include>org.apache.hbase:hbase-prefix-tree</include>
-        <include>org.apache.hbase:hbase-it</include>
-        <include>org.apache.hbase:hbase-protocol</include>
-        <include>org.apache.hbase:hbase-common</include>
-        <include>org.apache.hbase:hbase-client</include>
-        <include>org.apache.hbase:hbase-hadoop-compat</include>
-        <include>org.apache.hbase:hbase-server</include>
-        <include>org.apache.hbase:hbase-hadoop2-compat</include>
-        <include>org.apache.hbase:hbase-examples</include>
-      </includes>
-      <!-- Include all the sources in the top directory -->
-      <sources>
-        <fileSets>
-          <fileSet>
-            <excludes>
-              <exclude>target/</exclude>
-              <exclude>test/</exclude>
-              <exclude>.classpath</exclude>
-              <exclude>.project</exclude>
-              <exclude>.settings/</exclude>
-            </excludes>
-          </fileSet>
-        </fileSets>
-      </sources>
       <!-- Binaries for the dependencies also go in the hbase-jars directory -->
       <binaries>
         <outputDirectory>lib</outputDirectory>
         <unpack>false</unpack>
         <dependencySets>
-          <dependencySet />
+          <dependencySet/>
         </dependencySets>
       </binaries>
     </moduleSet>
diff --git a/hbase-assembly/src/assembly/src.xml b/hbase-assembly/src/assembly/src.xml
new file mode 100644
index 00000000000..df73794f4b4
--- /dev/null
+++ b/hbase-assembly/src/assembly/src.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+<!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+-->
+
+  <!--Copies over all you need to build hbase-->
+  <id>src</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <moduleSets>
+    <moduleSet>
+      <!-- Enable access to all projects in the current multimodule build. Eclipse
+        says this is an error, but builds from the command line just fine. -->
+      <useAllReactorProjects>true</useAllReactorProjects>
+      <!-- Include all the sources in the top directory -->
+      <sources>
+        <fileSets>
+          <fileSet>
+            <excludes>
+              <exclude>target/</exclude>
+              <exclude>test/</exclude>
+              <exclude>.classpath</exclude>
+              <exclude>.project</exclude>
+              <exclude>.settings/</exclude>
+            </excludes>
+          </fileSet>
+        </fileSets>
+      </sources>
+    </moduleSet>
+  </moduleSets>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/../dev-tools</directory>
+      <outputDirectory>dev-tools</outputDirectory>
+      <fileMode>0644</fileMode>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
+    <!-- Include the top level conf directory -->
+    <fileSet>
+      <directory>${project.basedir}/../conf</directory>
+      <outputDirectory>conf</outputDirectory>
+      <fileMode>0644</fileMode>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
+    <!-- Include top level bin directory -->
+    <fileSet>
+        <directory>${project.basedir}/../bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>0755</fileMode>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/..</directory>
+      <outputDirectory>.</outputDirectory>
+      <includes>
+        <include>pom.xml</include>
+        <include>LICENSE.txt</include>
+        <include>NOTICE.txt</include>
+        <include>CHANGES.txt</include>
+        <include>README.txt</include>
+      </includes>
+      <fileMode>0644</fileMode>
+    </fileSet>
+</fileSets>
+</assembly>
diff --git a/src/docbkx/book.xml b/hbase-assembly/src/docbkx/book.xml
similarity index 100%
rename from src/docbkx/book.xml
rename to hbase-assembly/src/docbkx/book.xml
diff --git a/src/docbkx/case_studies.xml b/hbase-assembly/src/docbkx/case_studies.xml
similarity index 100%
rename from src/docbkx/case_studies.xml
rename to hbase-assembly/src/docbkx/case_studies.xml
diff --git a/src/docbkx/community.xml b/hbase-assembly/src/docbkx/community.xml
similarity index 100%
rename from src/docbkx/community.xml
rename to hbase-assembly/src/docbkx/community.xml
diff --git a/src/docbkx/configuration.xml b/hbase-assembly/src/docbkx/configuration.xml
similarity index 100%
rename from src/docbkx/configuration.xml
rename to hbase-assembly/src/docbkx/configuration.xml
diff --git a/src/docbkx/customization.xsl b/hbase-assembly/src/docbkx/customization.xsl
similarity index 100%
rename from src/docbkx/customization.xsl
rename to hbase-assembly/src/docbkx/customization.xsl
diff --git a/src/docbkx/developer.xml b/hbase-assembly/src/docbkx/developer.xml
similarity index 100%
rename from src/docbkx/developer.xml
rename to hbase-assembly/src/docbkx/developer.xml
diff --git a/src/docbkx/external_apis.xml b/hbase-assembly/src/docbkx/external_apis.xml
similarity index 100%
rename from src/docbkx/external_apis.xml
rename to hbase-assembly/src/docbkx/external_apis.xml
diff --git a/src/docbkx/getting_started.xml b/hbase-assembly/src/docbkx/getting_started.xml
similarity index 100%
rename from src/docbkx/getting_started.xml
rename to hbase-assembly/src/docbkx/getting_started.xml
diff --git a/src/docbkx/ops_mgt.xml b/hbase-assembly/src/docbkx/ops_mgt.xml
similarity index 100%
rename from src/docbkx/ops_mgt.xml
rename to hbase-assembly/src/docbkx/ops_mgt.xml
diff --git a/src/docbkx/performance.xml b/hbase-assembly/src/docbkx/performance.xml
similarity index 100%
rename from src/docbkx/performance.xml
rename to hbase-assembly/src/docbkx/performance.xml
diff --git a/src/docbkx/preface.xml b/hbase-assembly/src/docbkx/preface.xml
similarity index 100%
rename from src/docbkx/preface.xml
rename to hbase-assembly/src/docbkx/preface.xml
diff --git a/src/docbkx/rpc.xml b/hbase-assembly/src/docbkx/rpc.xml
similarity index 100%
rename from src/docbkx/rpc.xml
rename to hbase-assembly/src/docbkx/rpc.xml
diff --git a/src/docbkx/security.xml b/hbase-assembly/src/docbkx/security.xml
similarity index 100%
rename from src/docbkx/security.xml
rename to hbase-assembly/src/docbkx/security.xml
diff --git a/src/docbkx/shell.xml b/hbase-assembly/src/docbkx/shell.xml
similarity index 100%
rename from src/docbkx/shell.xml
rename to hbase-assembly/src/docbkx/shell.xml
diff --git a/src/docbkx/troubleshooting.xml b/hbase-assembly/src/docbkx/troubleshooting.xml
similarity index 100%
rename from src/docbkx/troubleshooting.xml
rename to hbase-assembly/src/docbkx/troubleshooting.xml
diff --git a/src/docbkx/upgrading.xml b/hbase-assembly/src/docbkx/upgrading.xml
similarity index 100%
rename from src/docbkx/upgrading.xml
rename to hbase-assembly/src/docbkx/upgrading.xml
diff --git a/src/docbkx/zookeeper.xml b/hbase-assembly/src/docbkx/zookeeper.xml
similarity index 100%
rename from src/docbkx/zookeeper.xml
rename to hbase-assembly/src/docbkx/zookeeper.xml
diff --git a/src/site/resources/css/freebsd_docbook.css b/hbase-assembly/src/site/resources/css/freebsd_docbook.css
similarity index 100%
rename from src/site/resources/css/freebsd_docbook.css
rename to hbase-assembly/src/site/resources/css/freebsd_docbook.css
diff --git a/src/site/resources/css/site.css b/hbase-assembly/src/site/resources/css/site.css
similarity index 100%
rename from src/site/resources/css/site.css
rename to hbase-assembly/src/site/resources/css/site.css
diff --git a/src/site/resources/doap_Hbase.rdf b/hbase-assembly/src/site/resources/doap_Hbase.rdf
similarity index 100%
rename from src/site/resources/doap_Hbase.rdf
rename to hbase-assembly/src/site/resources/doap_Hbase.rdf
diff --git a/src/site/resources/images/big_h_logo.svg b/hbase-assembly/src/site/resources/images/big_h_logo.svg
similarity index 100%
rename from src/site/resources/images/big_h_logo.svg
rename to hbase-assembly/src/site/resources/images/big_h_logo.svg
diff --git a/src/site/resources/images/hbase_logo.svg b/hbase-assembly/src/site/resources/images/hbase_logo.svg
similarity index 100%
rename from src/site/resources/images/hbase_logo.svg
rename to hbase-assembly/src/site/resources/images/hbase_logo.svg
diff --git a/src/site/site.vm b/hbase-assembly/src/site/site.vm
similarity index 100%
rename from src/site/site.vm
rename to hbase-assembly/src/site/site.vm
diff --git a/src/site/site.xml b/hbase-assembly/src/site/site.xml
similarity index 100%
rename from src/site/site.xml
rename to hbase-assembly/src/site/site.xml
diff --git a/src/site/xdoc/acid-semantics.xml b/hbase-assembly/src/site/xdoc/acid-semantics.xml
similarity index 100%
rename from src/site/xdoc/acid-semantics.xml
rename to hbase-assembly/src/site/xdoc/acid-semantics.xml
diff --git a/src/site/xdoc/bulk-loads.xml b/hbase-assembly/src/site/xdoc/bulk-loads.xml
similarity index 100%
rename from src/site/xdoc/bulk-loads.xml
rename to hbase-assembly/src/site/xdoc/bulk-loads.xml
diff --git a/src/site/xdoc/cygwin.xml b/hbase-assembly/src/site/xdoc/cygwin.xml
similarity index 100%
rename from src/site/xdoc/cygwin.xml
rename to hbase-assembly/src/site/xdoc/cygwin.xml
diff --git a/src/site/xdoc/index.xml b/hbase-assembly/src/site/xdoc/index.xml
similarity index 100%
rename from src/site/xdoc/index.xml
rename to hbase-assembly/src/site/xdoc/index.xml
diff --git a/src/site/xdoc/metrics.xml b/hbase-assembly/src/site/xdoc/metrics.xml
similarity index 100%
rename from src/site/xdoc/metrics.xml
rename to hbase-assembly/src/site/xdoc/metrics.xml
diff --git a/src/site/xdoc/old_news.xml b/hbase-assembly/src/site/xdoc/old_news.xml
similarity index 100%
rename from src/site/xdoc/old_news.xml
rename to hbase-assembly/src/site/xdoc/old_news.xml
diff --git a/src/site/xdoc/pseudo-distributed.xml b/hbase-assembly/src/site/xdoc/pseudo-distributed.xml
similarity index 100%
rename from src/site/xdoc/pseudo-distributed.xml
rename to hbase-assembly/src/site/xdoc/pseudo-distributed.xml
diff --git a/src/site/xdoc/replication.xml b/hbase-assembly/src/site/xdoc/replication.xml
similarity index 100%
rename from src/site/xdoc/replication.xml
rename to hbase-assembly/src/site/xdoc/replication.xml
diff --git a/src/site/xdoc/resources.xml b/hbase-assembly/src/site/xdoc/resources.xml
similarity index 100%
rename from src/site/xdoc/resources.xml
rename to hbase-assembly/src/site/xdoc/resources.xml
diff --git a/src/site/xdoc/sponsors.xml b/hbase-assembly/src/site/xdoc/sponsors.xml
similarity index 100%
rename from src/site/xdoc/sponsors.xml
rename to hbase-assembly/src/site/xdoc/sponsors.xml
diff --git a/src/xslt/configuration_to_docbook_section.xsl b/hbase-assembly/src/xslt/configuration_to_docbook_section.xsl
similarity index 100%
rename from src/xslt/configuration_to_docbook_section.xsl
rename to hbase-assembly/src/xslt/configuration_to_docbook_section.xsl
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 26703c0c54a..9df71e3e449 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <!--
     /**
@@ -22,7 +23,7 @@
     <parent>
         <artifactId>hbase</artifactId>
         <groupId>org.apache.hbase</groupId>
-        <version>0.97-SNAPSHOT</version>
+        <version>0.97.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -32,24 +33,44 @@
 
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <!-- Always skip the second part executions, since we only run
-          simple unit tests in this module -->
-                <executions>
-                    <execution>
-                        <id>secondPartTestsExecution</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven.assembly.version}</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <!-- Always skip the second part executions, since we only run
+            simple unit tests in this module -->
+          <executions>
+            <execution>
+              <id>secondPartTestsExecution</id>
+              <phase>test</phase>
+              <goals>
+              <goal>test</goal>
+              </goals>
+              <configuration>
+              <skip>true</skip>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <!-- Make a jar and put the sources in the jar -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+        </plugin>
+      </plugins>
     </build>
 
     <dependencies>
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index 0d401e5d167..afcb3507837 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 <!--
 /**
@@ -22,7 +23,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.97-SNAPSHOT</version>
+    <version>0.97.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -41,6 +42,21 @@
       </resource>
     </resources>
     <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven.assembly.version}</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
         <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
@@ -107,10 +123,15 @@
               </execution>
             </executions>
           </plugin>
+        <!-- Make a jar and put the sources in the jar -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+        </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
-       <!--This plugin's configuration is used to store Eclipse m2e settings only. It 
+       <!--This plugin's configuration is used to store Eclipse m2e settings only. It
       has no influence on the Maven build itself. -->
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
@@ -129,7 +150,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <execute />
+                    <execute/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml
index 806fa298630..542852492bf 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -59,7 +59,7 @@
   <property>
     <name>hbase.local.dir</name>
     <value>${hbase.tmp.dir}/local/</value>
-    <description>Directory on the local filesystem to be used 
+    <description>Directory on the local filesystem to be used
     as a local storage.
     </description>
   </property>
@@ -129,7 +129,7 @@
     server, getting a cell's value, starting a row update, etc.
     Default: 10.
     </description>
-  </property> 
+  </property>
   <property>
     <name>hbase.bulkload.retries.number</name>
     <value>0</value>
@@ -453,7 +453,7 @@
     <name>hbase.storescanner.parallel.seek.threads</name>
     <value>10</value>
     <description>
-      The default thread pool size if parallel-seeking feature enabled. 
+      The default thread pool size if parallel-seeking feature enabled.
     </description>
   </property>
   <property>
@@ -612,7 +612,7 @@
   <property>
     <name>hbase.auth.key.update.interval</name>
     <value>86400000</value>
-    <description>The update interval for master key for authentication tokens 
+    <description>The update interval for master key for authentication tokens
     in servers in milliseconds.  Only used when HBase security is enabled.
     </description>
   </property>
@@ -659,7 +659,7 @@
     <value>acl</value>
     <description>Root ZNode for access control lists.</description>
   </property>
-  
+
   <property>
     <name>hbase.coprocessor.region.classes</name>
     <value></value>
@@ -719,7 +719,7 @@
     <value>false</value>
     <description>Instructs HBase to make use of ZooKeeper's multi-update functionality.
     This allows certain ZooKeeper operations to complete more quickly and prevents some issues
-    with rare Replication failure scenarios (see the release note of HBASE-2611 for an example). 
+    with rare Replication failure scenarios (see the release note of HBASE-2611 for an example).
     IMPORTANT: only set this to true if all ZooKeeper servers in the cluster are on version 3.4+
     and will not be downgraded.  ZooKeeper versions before 3.4 do not support multi-update and will
     not fail gracefully if multi-update is invoked (see ZOOKEEPER-1495).
@@ -795,9 +795,9 @@
 
   <property skipInDoc="true">
     <name>hbase.defaults.for.version</name>
-    <value>${hbase.version}</value>
+    <value>${pom.version}</value>
     <description>
-    This defaults file was compiled for version ${hbase.version}. This variable is used
+    This defaults file was compiled for version ${pom.version}. This variable is used
     to make sure that a user doesn't have an old version of hbase-default.xml on the
     classpath.
     </description>
@@ -830,7 +830,7 @@
     <name>hbase.online.schema.update.enable</name>
     <value>false</value>
     <description>
-    Set true to enable online schema changes.  This is an experimental feature.  
+    Set true to enable online schema changes.  This is an experimental feature.
     There are known issues modifying table schemas at the same time a region
     split is happening so your table needs to be quiescent or else you have to
     be running with splits disabled.
diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index f9d8aaf3864..2c5ac0ebe0b 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.97-SNAPSHOT</version>
+    <version>0.97.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-examples</artifactId>
@@ -31,6 +31,21 @@
   <description>Examples of HBase usage</description>
   <build>
     <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven.assembly.version}</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
         <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <version>${surefire.version}</version>
@@ -40,6 +55,11 @@
                 <groups>${surefire.firstPartGroups}</groups>
             </configuration>
         </plugin>
+        <!-- Make a jar and put the sources in the jar -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+        </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/hbase-hadoop-compat/pom.xml b/hbase-hadoop-compat/pom.xml
index 5bd9b7766e8..96f3f1761af 100644
--- a/hbase-hadoop-compat/pom.xml
+++ b/hbase-hadoop-compat/pom.xml
@@ -1,6 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <!--
     /**
      * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +23,7 @@
     <parent>
         <artifactId>hbase</artifactId>
         <groupId>org.apache.hbase</groupId>
-        <version>0.97-SNAPSHOT</version>
+        <version>0.97.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -37,6 +36,21 @@
 
     <build>
         <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven.assembly.version}</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <!-- Always skip the second part executions, since we only run
@@ -54,6 +68,11 @@
                     </execution>
                 </executions>
             </plugin>
+        <!-- Make a jar and put the sources in the jar -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+        </plugin>
         </plugins>
     </build>
 
diff --git a/hbase-hadoop1-compat/pom.xml b/hbase-hadoop1-compat/pom.xml
index b7e2e514393..d24a5d12a76 100644
--- a/hbase-hadoop1-compat/pom.xml
+++ b/hbase-hadoop1-compat/pom.xml
@@ -1,6 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <!--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -22,7 +21,7 @@ limitations under the License.
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.97-SNAPSHOT</version>
+    <version>0.97.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -33,6 +32,22 @@ limitations under the License.
 
   <build>
     <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven.assembly.version}</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <!-- Always skip the second part executions, since we only run simple unit
@@ -50,6 +65,11 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
+        <!-- Make a jar and put the sources in the jar -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+        </plugin>
     </plugins>
   </build>
 
diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml
index 305f76bd793..7b6e8a6758b 100644
--- a/hbase-hadoop2-compat/pom.xml
+++ b/hbase-hadoop2-compat/pom.xml
@@ -1,6 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <!--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -22,7 +21,7 @@ limitations under the License.
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.97-SNAPSHOT</version>
+    <version>0.97.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -35,6 +34,43 @@ limitations under the License.
 
   <build>
     <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+        <!-- Make a jar and put the sources in the jar -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+        </plugin>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven.assembly.version}</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven.assembly.version}</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven.assembly.version}</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <!-- Always skip the second part executions, since we only run simple unit
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 1ce301a6885..2de610717ce 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 <!--
 /**
@@ -22,7 +23,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.97-SNAPSHOT</version>
+    <version>0.97.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -46,6 +47,26 @@
     </testResources>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+        <!-- Make a jar and put the sources in the jar -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+        </plugin>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven.assembly.version}</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml
index b771cf6d1a6..b34df17af46 100644
--- a/hbase-prefix-tree/pom.xml
+++ b/hbase-prefix-tree/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 <!--
 /**
@@ -22,7 +23,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.97-SNAPSHOT</version>
+    <version>0.97.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -32,6 +33,26 @@
 
   <build>
     <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+        <!-- Make a jar and put the sources in the jar -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+        </plugin>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven.assembly.version}</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <!-- Always skip the second part executions, since we only run
diff --git a/hbase-protocol/pom.xml b/hbase-protocol/pom.xml
index fc5924b2d10..b5d74c9b7b3 100644
--- a/hbase-protocol/pom.xml
+++ b/hbase-protocol/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <!--
     /**
@@ -22,7 +23,7 @@
     <parent>
         <artifactId>hbase</artifactId>
         <groupId>org.apache.hbase</groupId>
-        <version>0.97-SNAPSHOT</version>
+        <version>0.97.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -32,6 +33,26 @@
 
     <build>
         <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+        <!-- Make a jar and put the sources in the jar -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+        </plugin>
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven.assembly.version}</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <!-- Always skip the second part executions, since we only run
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 49612ffaceb..b1ec677f22a 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.97-SNAPSHOT</version>
+    <version>0.97.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-server</artifactId>
@@ -50,9 +50,24 @@
       </testResource>
     </testResources>
     <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
       <!-- Run with -Dmaven.test.skip.exec=true to build -tests.jar without running
         tests (this is needed for upstream projects whose tests need this jar simply for
         compilation) -->
+      <plugin>
+        <!--Make it so assembly:single does nothing in here-->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven.assembly.version}</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -532,13 +547,10 @@
                 <configuration>
                   <target>
                     <mkdir dir="${project.build.directory}/native"/>
-                    <exec executable="cmake" dir="${project.build.directory}/native"
-                        failonerror="true">
-                      <arg
-                    line="${basedir}/src/main/native -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model}"/>
+                    <exec executable="cmake" dir="${project.build.directory}/native" failonerror="true">
+                      <arg line="${basedir}/src/main/native -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model}"/>
                     </exec>
-                    <exec executable="make" dir="${project.build.directory}/native"
-                        failonerror="true">
+                    <exec executable="make" dir="${project.build.directory}/native" failonerror="true">
                       <arg line="VERBOSE=1"/>
                     </exec>
                   </target>
diff --git a/pom.xml b/pom.xml
index 950b63969fd..23a9bb9f8ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,9 +39,7 @@
   <groupId>org.apache.hbase</groupId>
   <artifactId>hbase</artifactId>
   <packaging>pom</packaging>
-  <!--Version is defined below in properties section so can be shared by all sub modules.
-   -->
-  <version>0.97-SNAPSHOT</version>
+  <version>0.97.0-SNAPSHOT</version>
   <name>HBase</name>
   <description>
     Apache HBase™ is the Hadoop database. Use it when you need
@@ -59,6 +57,7 @@
     <module>hbase-it</module>
     <module>hbase-examples</module>
     <module>hbase-prefix-tree</module>
+    <module>hbase-assembly</module>
   </modules>
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/hbase/trunk</connection>
@@ -421,10 +420,7 @@
           <!--Intentionally, this is not bound to a phase because it is an
            'aggregating' plugin; it expects to be run from the top-level only; see
            http://www.sonatype.com/books/mvnref-book/reference/assemblies-sect-basics.html.
-           When it was bound to pre-site, we were descending into modules expecting
-           dependencies like hbase-*.jar to be already built.  It was messing us up,
-           particular on clean checkouts.  To get javadoc into your site, you must
-           precede site build by invocation of javadoc:aggregate expplicitly.
+           To get javadoc into your site, you must precede site build by invocation of javadoc:aggregate expplicitly.
            -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
@@ -684,166 +680,23 @@
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>${maven.assembly.version}</version>
-        <inherited>false</inherited>
         <configuration>
-          <skipAssembly>false</skipAssembly>
+          <!--Defer to the hbase-assembly sub-module.  It
+             does all assembly-->
+          <skipAssembly>true</skipAssembly>
+          <!--Do not attach assembly to project.-->
+          <!--
           <attach>false</attach>
           <tarLongFileMode>gnu</tarLongFileMode>
+          -->
+          <!--
           <appendAssemblyId>false</appendAssemblyId>
+          -->
+          <!--
           <descriptors>
             <descriptor>${assembly.file}</descriptor>
           </descriptors>
-        </configuration>
-      </plugin>
-       <!--The below plugins are about site generation.
-            They are all marked as not to be in herited by child
-            modules.  The plugins are meant to run here in the
-            parent project only.
-        -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>xml-maven-plugin</artifactId>
-        <version>1.0</version>
-        <inherited>false</inherited>
-        <executions>
-          <execution>
-            <goals>
-              <goal>transform</goal>
-            </goals>
-            <phase>pre-site</phase>
-          </execution>
-        </executions>
-        <configuration>
-          <transformationSets>
-            <transformationSet>
-              <!--Reaching down into sub-module for docs-->
-              <dir>${basedir}/hbase-common/src/main/resources/</dir>
-              <includes>
-                <include>hbase-default.xml</include>
-              </includes>
-              <stylesheet>${basedir}/src/xslt/configuration_to_docbook_section.xsl</stylesheet>
-              <outputDir>${basedir}/target/docbkx</outputDir>
-            </transformationSet>
-          </transformationSets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.agilejava.docbkx</groupId>
-        <artifactId>docbkx-maven-plugin</artifactId>
-        <version>2.0.14</version>
-        <inherited>false</inherited>
-        <dependencies>
-          <dependency>
-            <groupId>org.docbook</groupId>
-            <artifactId>docbook-xml</artifactId>
-            <version>4.4</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
-        <configuration>
-          <xincludeSupported>true</xincludeSupported>
-          <useIdAsFilename>true</useIdAsFilename>
-          <sectionAutolabelMaxDepth>100</sectionAutolabelMaxDepth>
-          <sectionAutolabel>true</sectionAutolabel>
-          <sectionLabelIncludesComponentLabel>true</sectionLabelIncludesComponentLabel>
-          <htmlCustomization>${basedir}/src/docbkx/customization.xsl</htmlCustomization>
-          <tocMaxDepth>2</tocMaxDepth>
-          <insertXrefPageNumber>yes</insertXrefPageNumber>
-          <targetDirectory>${basedir}/target/docbkx</targetDirectory>
-          <chunkerOutputEncoding>UTF-8</chunkerOutputEncoding>
-        </configuration>
-        <executions>
-          <execution>
-            <id>multipage</id>
-            <goals>
-              <goal>generate-html</goal>
-            </goals>
-            <phase>pre-site</phase>
-            <configuration>
-              <navigShowtitles>true</navigShowtitles>
-              <chunkedOutput>true</chunkedOutput>
-              <imgSrcPath>../images/</imgSrcPath>
-              <htmlStylesheet>../css/freebsd_docbook.css</htmlStylesheet>
-            </configuration>
-          </execution>
-          <execution>
-            <id>onepage</id>
-            <goals>
-              <goal>generate-html</goal>
-            </goals>
-            <phase>pre-site</phase>
-            <configuration>
-              <imgSrcPath>images/</imgSrcPath>
-              <htmlStylesheet>css/freebsd_docbook.css</htmlStylesheet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>${maven.resources.plugin.version}</version>
-        <!--$NO-MVN-MAN-VER$ -->
-        <inherited>false</inherited>
-        <executions>
-          <execution>
-            <id>copy-javadocs</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <phase>site</phase>
-            <configuration>
-              <outputDirectory>target/site/apidocs</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${basedir}/target/apidocs</directory>
-                  <includes>
-                    <include>**/**</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-docbkx</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <phase>site</phase>
-            <configuration>
-              <outputDirectory>target/site</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${basedir}/target/docbkx</directory>
-                  <includes>
-                    <include>**/**</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <escapeString>\</escapeString>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>${maven.site.version}</version>
-        <inherited>false</inherited>
-        <dependencies>
-          <dependency>
-            <!-- add support for ssh/scp -->
-            <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-ssh</artifactId>
-            <version>2.2</version>
-          </dependency>
-        </dependencies>
-        <configuration>
-          <inputEncoding>UTF-8</inputEncoding>
-          <outputEncoding>UTF-8</outputEncoding>
-          <templateFile>${basedir}/src/site/site.vm</templateFile>
+          -->
         </configuration>
       </plugin>
       <!-- Special configuration for findbugs just in the parent so
@@ -878,7 +731,6 @@
     </maven.build.timestamp.format>
     <buildDate>${maven.build.timestamp}</buildDate>
     <compileSource>1.6</compileSource>
-    <hbase.version>${project.version}</hbase.version>
     <!-- Dependencies -->
     <hadoop-two.version>2.0.2-alpha</hadoop-two.version>
     <hadoop-one.version>1.1.2</hadoop-one.version>
@@ -913,7 +765,7 @@
     <jettison.version>1.3.1</jettison.version>
     <netty.version>3.5.9.Final</netty.version>
     <!-- Plugin Dependencies -->
-    <maven.assembly.version>2.3</maven.assembly.version>
+    <maven.assembly.version>2.4</maven.assembly.version>
     <maven.antrun.version>1.6</maven.antrun.version>
     <jamon.plugin.version>2.3.4</jamon.plugin.version>
     <findbugs-maven-plugin.version>2.5.2</findbugs-maven-plugin.version>
@@ -1496,8 +1348,8 @@
         <module>hbase-hadoop2-compat</module>
       </modules>
       <properties>
-        <slf4j.version>1.6.1</slf4j.version>
         <hadoop.version>${hadoop-two.version}</hadoop.version>
+        <slf4j.version>1.6.1</slf4j.version>
         <compat.module>hbase-hadoop2-compat</compat.module>
         <assembly.file>src/assembly/hadoop-two-compat.xml</assembly.file>
       </properties>
diff --git a/src/site/resources/images/architecture.gif b/src/site/resources/images/architecture.gif
deleted file mode 100644
index 8d84a23b07a..00000000000
Binary files a/src/site/resources/images/architecture.gif and /dev/null differ
diff --git a/src/site/resources/images/big_h_logo.png b/src/site/resources/images/big_h_logo.png
deleted file mode 100644
index 5256094e46b..00000000000
Binary files a/src/site/resources/images/big_h_logo.png and /dev/null differ
diff --git a/src/site/resources/images/favicon.ico b/src/site/resources/images/favicon.ico
deleted file mode 100644
index 6e4d0f71831..00000000000
Binary files a/src/site/resources/images/favicon.ico and /dev/null differ
diff --git a/src/site/resources/images/hadoop-logo.jpg b/src/site/resources/images/hadoop-logo.jpg
deleted file mode 100644
index 809525d9f15..00000000000
Binary files a/src/site/resources/images/hadoop-logo.jpg and /dev/null differ
diff --git a/src/site/resources/images/hbase_logo.png b/src/site/resources/images/hbase_logo.png
deleted file mode 100644
index e962ce04975..00000000000
Binary files a/src/site/resources/images/hbase_logo.png and /dev/null differ
diff --git a/src/site/resources/images/hfile.png b/src/site/resources/images/hfile.png
deleted file mode 100644
index 57629701394..00000000000
Binary files a/src/site/resources/images/hfile.png and /dev/null differ
diff --git a/src/site/resources/images/hfilev2.png b/src/site/resources/images/hfilev2.png
deleted file mode 100644
index 54cc0cf529c..00000000000
Binary files a/src/site/resources/images/hfilev2.png and /dev/null differ
diff --git a/src/site/resources/images/replication_overview.png b/src/site/resources/images/replication_overview.png
deleted file mode 100644
index 47d7b4c00be..00000000000
Binary files a/src/site/resources/images/replication_overview.png and /dev/null differ