diff --git a/src/main/javadoc/doc-files/th-background.png b/docs/src/api/doc-files/th-background.png
similarity index 100%
rename from src/main/javadoc/doc-files/th-background.png
rename to docs/src/api/doc-files/th-background.png
diff --git a/src/main/javadoc/overview.html b/docs/src/api/overview.html
similarity index 100%
rename from src/main/javadoc/overview.html
rename to docs/src/api/overview.html
diff --git a/src/main/javadoc/javadoc.css b/docs/src/api/spring-javadoc.css
similarity index 100%
rename from src/main/javadoc/javadoc.css
rename to docs/src/api/spring-javadoc.css
diff --git a/src/main/resources/apache-license.txt b/docs/src/info/apache-license.txt
similarity index 100%
rename from src/main/resources/apache-license.txt
rename to docs/src/info/apache-license.txt
diff --git a/src/main/resources/changelog.txt b/docs/src/info/changelog.txt
similarity index 100%
rename from src/main/resources/changelog.txt
rename to docs/src/info/changelog.txt
diff --git a/src/main/resources/notice.txt b/docs/src/info/notice.txt
similarity index 100%
rename from src/main/resources/notice.txt
rename to docs/src/info/notice.txt
diff --git a/src/main/resources/readme.txt b/docs/src/info/readme.txt
similarity index 100%
rename from src/main/resources/readme.txt
rename to docs/src/info/readme.txt
diff --git a/src/docbkx/appendix/appendix-schema.xml b/docs/src/reference/docbook/appendix/appendix-schema.xml
similarity index 100%
rename from src/docbkx/appendix/appendix-schema.xml
rename to docs/src/reference/docbook/appendix/appendix-schema.xml
diff --git a/src/docbkx/appendix/introduction.xml b/docs/src/reference/docbook/appendix/introduction.xml
similarity index 100%
rename from src/docbkx/appendix/introduction.xml
rename to docs/src/reference/docbook/appendix/introduction.xml
diff --git a/src/docbkx/index.xml b/docs/src/reference/docbook/index.xml
similarity index 100%
rename from src/docbkx/index.xml
rename to docs/src/reference/docbook/index.xml
diff --git a/src/docbkx/introduction/getting-started.xml b/docs/src/reference/docbook/introduction/getting-started.xml
similarity index 100%
rename from src/docbkx/introduction/getting-started.xml
rename to docs/src/reference/docbook/introduction/getting-started.xml
diff --git a/src/docbkx/introduction/introduction.xml b/docs/src/reference/docbook/introduction/introduction.xml
similarity index 100%
rename from src/docbkx/introduction/introduction.xml
rename to docs/src/reference/docbook/introduction/introduction.xml
diff --git a/src/docbkx/introduction/requirements.xml b/docs/src/reference/docbook/introduction/requirements.xml
similarity index 100%
rename from src/docbkx/introduction/requirements.xml
rename to docs/src/reference/docbook/introduction/requirements.xml
diff --git a/src/docbkx/introduction/why-sd-kv.xml b/docs/src/reference/docbook/introduction/why-sd-kv.xml
similarity index 100%
rename from src/docbkx/introduction/why-sd-kv.xml
rename to docs/src/reference/docbook/introduction/why-sd-kv.xml
diff --git a/src/docbkx/preface.xml b/docs/src/reference/docbook/preface.xml
similarity index 100%
rename from src/docbkx/preface.xml
rename to docs/src/reference/docbook/preface.xml
diff --git a/src/docbkx/reference/introduction.xml b/docs/src/reference/docbook/reference/introduction.xml
similarity index 100%
rename from src/docbkx/reference/introduction.xml
rename to docs/src/reference/docbook/reference/introduction.xml
diff --git a/src/docbkx/reference/redis-messaging.xml b/docs/src/reference/docbook/reference/redis-messaging.xml
similarity index 100%
rename from src/docbkx/reference/redis-messaging.xml
rename to docs/src/reference/docbook/reference/redis-messaging.xml
diff --git a/src/docbkx/reference/redis.xml b/docs/src/reference/docbook/reference/redis.xml
similarity index 100%
rename from src/docbkx/reference/redis.xml
rename to docs/src/reference/docbook/reference/redis.xml
diff --git a/src/docbkx/reference/riak.xml b/docs/src/reference/docbook/reference/riak.xml
similarity index 100%
rename from src/docbkx/reference/riak.xml
rename to docs/src/reference/docbook/reference/riak.xml
diff --git a/src/docbkx/resources/css/highlight.css b/docs/src/reference/resources/css/highlight.css
similarity index 100%
rename from src/docbkx/resources/css/highlight.css
rename to docs/src/reference/resources/css/highlight.css
diff --git a/src/docbkx/resources/css/html.css b/docs/src/reference/resources/css/html.css
similarity index 100%
rename from src/docbkx/resources/css/html.css
rename to docs/src/reference/resources/css/html.css
diff --git a/src/docbkx/resources/images/admons/blank.png b/docs/src/reference/resources/images/admons/blank.png
similarity index 100%
rename from src/docbkx/resources/images/admons/blank.png
rename to docs/src/reference/resources/images/admons/blank.png
diff --git a/src/docbkx/resources/images/admons/caution.gif b/docs/src/reference/resources/images/admons/caution.gif
similarity index 100%
rename from src/docbkx/resources/images/admons/caution.gif
rename to docs/src/reference/resources/images/admons/caution.gif
diff --git a/src/docbkx/resources/images/admons/caution.png b/docs/src/reference/resources/images/admons/caution.png
similarity index 100%
rename from src/docbkx/resources/images/admons/caution.png
rename to docs/src/reference/resources/images/admons/caution.png
diff --git a/src/docbkx/resources/images/admons/caution.tif b/docs/src/reference/resources/images/admons/caution.tif
similarity index 100%
rename from src/docbkx/resources/images/admons/caution.tif
rename to docs/src/reference/resources/images/admons/caution.tif
diff --git a/src/docbkx/resources/images/admons/draft.png b/docs/src/reference/resources/images/admons/draft.png
similarity index 100%
rename from src/docbkx/resources/images/admons/draft.png
rename to docs/src/reference/resources/images/admons/draft.png
diff --git a/src/docbkx/resources/images/admons/home.gif b/docs/src/reference/resources/images/admons/home.gif
similarity index 100%
rename from src/docbkx/resources/images/admons/home.gif
rename to docs/src/reference/resources/images/admons/home.gif
diff --git a/src/docbkx/resources/images/admons/home.png b/docs/src/reference/resources/images/admons/home.png
similarity index 100%
rename from src/docbkx/resources/images/admons/home.png
rename to docs/src/reference/resources/images/admons/home.png
diff --git a/src/docbkx/resources/images/admons/important.gif b/docs/src/reference/resources/images/admons/important.gif
similarity index 100%
rename from src/docbkx/resources/images/admons/important.gif
rename to docs/src/reference/resources/images/admons/important.gif
diff --git a/src/docbkx/resources/images/admons/important.png b/docs/src/reference/resources/images/admons/important.png
similarity index 100%
rename from src/docbkx/resources/images/admons/important.png
rename to docs/src/reference/resources/images/admons/important.png
diff --git a/src/docbkx/resources/images/admons/important.tif b/docs/src/reference/resources/images/admons/important.tif
similarity index 100%
rename from src/docbkx/resources/images/admons/important.tif
rename to docs/src/reference/resources/images/admons/important.tif
diff --git a/src/docbkx/resources/images/admons/next.gif b/docs/src/reference/resources/images/admons/next.gif
similarity index 100%
rename from src/docbkx/resources/images/admons/next.gif
rename to docs/src/reference/resources/images/admons/next.gif
diff --git a/src/docbkx/resources/images/admons/next.png b/docs/src/reference/resources/images/admons/next.png
similarity index 100%
rename from src/docbkx/resources/images/admons/next.png
rename to docs/src/reference/resources/images/admons/next.png
diff --git a/src/docbkx/resources/images/admons/note.gif b/docs/src/reference/resources/images/admons/note.gif
similarity index 100%
rename from src/docbkx/resources/images/admons/note.gif
rename to docs/src/reference/resources/images/admons/note.gif
diff --git a/src/docbkx/resources/images/admons/note.png b/docs/src/reference/resources/images/admons/note.png
similarity index 100%
rename from src/docbkx/resources/images/admons/note.png
rename to docs/src/reference/resources/images/admons/note.png
diff --git a/src/docbkx/resources/images/admons/note.tif b/docs/src/reference/resources/images/admons/note.tif
similarity index 100%
rename from src/docbkx/resources/images/admons/note.tif
rename to docs/src/reference/resources/images/admons/note.tif
diff --git a/src/docbkx/resources/images/admons/prev.gif b/docs/src/reference/resources/images/admons/prev.gif
similarity index 100%
rename from src/docbkx/resources/images/admons/prev.gif
rename to docs/src/reference/resources/images/admons/prev.gif
diff --git a/src/docbkx/resources/images/admons/prev.png b/docs/src/reference/resources/images/admons/prev.png
similarity index 100%
rename from src/docbkx/resources/images/admons/prev.png
rename to docs/src/reference/resources/images/admons/prev.png
diff --git a/src/docbkx/resources/images/admons/tip.gif b/docs/src/reference/resources/images/admons/tip.gif
similarity index 100%
rename from src/docbkx/resources/images/admons/tip.gif
rename to docs/src/reference/resources/images/admons/tip.gif
diff --git a/src/docbkx/resources/images/admons/tip.png b/docs/src/reference/resources/images/admons/tip.png
similarity index 100%
rename from src/docbkx/resources/images/admons/tip.png
rename to docs/src/reference/resources/images/admons/tip.png
diff --git a/src/docbkx/resources/images/admons/tip.tif b/docs/src/reference/resources/images/admons/tip.tif
similarity index 100%
rename from src/docbkx/resources/images/admons/tip.tif
rename to docs/src/reference/resources/images/admons/tip.tif
diff --git a/src/docbkx/resources/images/admons/toc-blank.png b/docs/src/reference/resources/images/admons/toc-blank.png
similarity index 100%
rename from src/docbkx/resources/images/admons/toc-blank.png
rename to docs/src/reference/resources/images/admons/toc-blank.png
diff --git a/src/docbkx/resources/images/admons/toc-minus.png b/docs/src/reference/resources/images/admons/toc-minus.png
similarity index 100%
rename from src/docbkx/resources/images/admons/toc-minus.png
rename to docs/src/reference/resources/images/admons/toc-minus.png
diff --git a/src/docbkx/resources/images/admons/toc-plus.png b/docs/src/reference/resources/images/admons/toc-plus.png
similarity index 100%
rename from src/docbkx/resources/images/admons/toc-plus.png
rename to docs/src/reference/resources/images/admons/toc-plus.png
diff --git a/src/docbkx/resources/images/admons/up.gif b/docs/src/reference/resources/images/admons/up.gif
similarity index 100%
rename from src/docbkx/resources/images/admons/up.gif
rename to docs/src/reference/resources/images/admons/up.gif
diff --git a/src/docbkx/resources/images/admons/up.png b/docs/src/reference/resources/images/admons/up.png
similarity index 100%
rename from src/docbkx/resources/images/admons/up.png
rename to docs/src/reference/resources/images/admons/up.png
diff --git a/src/docbkx/resources/images/admons/warning.gif b/docs/src/reference/resources/images/admons/warning.gif
similarity index 100%
rename from src/docbkx/resources/images/admons/warning.gif
rename to docs/src/reference/resources/images/admons/warning.gif
diff --git a/src/docbkx/resources/images/admons/warning.png b/docs/src/reference/resources/images/admons/warning.png
similarity index 100%
rename from src/docbkx/resources/images/admons/warning.png
rename to docs/src/reference/resources/images/admons/warning.png
diff --git a/src/docbkx/resources/images/admons/warning.tif b/docs/src/reference/resources/images/admons/warning.tif
similarity index 100%
rename from src/docbkx/resources/images/admons/warning.tif
rename to docs/src/reference/resources/images/admons/warning.tif
diff --git a/src/docbkx/resources/images/callouts/1.png b/docs/src/reference/resources/images/callouts/1.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/1.png
rename to docs/src/reference/resources/images/callouts/1.png
diff --git a/src/docbkx/resources/images/callouts/10.png b/docs/src/reference/resources/images/callouts/10.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/10.png
rename to docs/src/reference/resources/images/callouts/10.png
diff --git a/src/docbkx/resources/images/callouts/11.png b/docs/src/reference/resources/images/callouts/11.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/11.png
rename to docs/src/reference/resources/images/callouts/11.png
diff --git a/src/docbkx/resources/images/callouts/12.png b/docs/src/reference/resources/images/callouts/12.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/12.png
rename to docs/src/reference/resources/images/callouts/12.png
diff --git a/src/docbkx/resources/images/callouts/13.png b/docs/src/reference/resources/images/callouts/13.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/13.png
rename to docs/src/reference/resources/images/callouts/13.png
diff --git a/src/docbkx/resources/images/callouts/14.png b/docs/src/reference/resources/images/callouts/14.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/14.png
rename to docs/src/reference/resources/images/callouts/14.png
diff --git a/src/docbkx/resources/images/callouts/15.png b/docs/src/reference/resources/images/callouts/15.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/15.png
rename to docs/src/reference/resources/images/callouts/15.png
diff --git a/src/docbkx/resources/images/callouts/2.png b/docs/src/reference/resources/images/callouts/2.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/2.png
rename to docs/src/reference/resources/images/callouts/2.png
diff --git a/src/docbkx/resources/images/callouts/3.png b/docs/src/reference/resources/images/callouts/3.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/3.png
rename to docs/src/reference/resources/images/callouts/3.png
diff --git a/src/docbkx/resources/images/callouts/4.png b/docs/src/reference/resources/images/callouts/4.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/4.png
rename to docs/src/reference/resources/images/callouts/4.png
diff --git a/src/docbkx/resources/images/callouts/5.png b/docs/src/reference/resources/images/callouts/5.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/5.png
rename to docs/src/reference/resources/images/callouts/5.png
diff --git a/src/docbkx/resources/images/callouts/6.png b/docs/src/reference/resources/images/callouts/6.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/6.png
rename to docs/src/reference/resources/images/callouts/6.png
diff --git a/src/docbkx/resources/images/callouts/7.png b/docs/src/reference/resources/images/callouts/7.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/7.png
rename to docs/src/reference/resources/images/callouts/7.png
diff --git a/src/docbkx/resources/images/callouts/8.png b/docs/src/reference/resources/images/callouts/8.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/8.png
rename to docs/src/reference/resources/images/callouts/8.png
diff --git a/src/docbkx/resources/images/callouts/9.png b/docs/src/reference/resources/images/callouts/9.png
similarity index 100%
rename from src/docbkx/resources/images/callouts/9.png
rename to docs/src/reference/resources/images/callouts/9.png
diff --git a/src/docbkx/resources/images/logo.png b/docs/src/reference/resources/images/logo.png
similarity index 100%
rename from src/docbkx/resources/images/logo.png
rename to docs/src/reference/resources/images/logo.png
diff --git a/src/docbkx/resources/images/xdev-spring_logo.jpg b/docs/src/reference/resources/images/xdev-spring_logo.jpg
similarity index 100%
rename from src/docbkx/resources/images/xdev-spring_logo.jpg
rename to docs/src/reference/resources/images/xdev-spring_logo.jpg
diff --git a/src/docbkx/resources/xsl/fopdf.xsl b/docs/src/reference/resources/xsl/fopdf.xsl
similarity index 100%
rename from src/docbkx/resources/xsl/fopdf.xsl
rename to docs/src/reference/resources/xsl/fopdf.xsl
diff --git a/src/docbkx/resources/xsl/highlight-fo.xsl b/docs/src/reference/resources/xsl/highlight-fo.xsl
similarity index 100%
rename from src/docbkx/resources/xsl/highlight-fo.xsl
rename to docs/src/reference/resources/xsl/highlight-fo.xsl
diff --git a/src/docbkx/resources/xsl/highlight.xsl b/docs/src/reference/resources/xsl/highlight.xsl
similarity index 100%
rename from src/docbkx/resources/xsl/highlight.xsl
rename to docs/src/reference/resources/xsl/highlight.xsl
diff --git a/src/docbkx/resources/xsl/html.xsl b/docs/src/reference/resources/xsl/html.xsl
similarity index 100%
rename from src/docbkx/resources/xsl/html.xsl
rename to docs/src/reference/resources/xsl/html.xsl
diff --git a/src/docbkx/resources/xsl/html_chunk.xsl b/docs/src/reference/resources/xsl/html_chunk.xsl
similarity index 100%
rename from src/docbkx/resources/xsl/html_chunk.xsl
rename to docs/src/reference/resources/xsl/html_chunk.xsl
diff --git a/src/ant/upload-dist.xml b/src/ant/upload-dist.xml
deleted file mode 100644
index 5395f4d02..000000000
--- a/src/ant/upload-dist.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<project name="upload-dist-tasks">
-
-<!-- can be run independent of maven as follows
-   - classpath must be uncommented below. when run from maven,
-   - the classpath is set up for you
-
-ant -f src/ant/upload-dist.xml \
-    -Ddist.id=spring-data-keyvalue \
-    -Ddist.name='Spring Datastore Key-Value' \
-    -Ddist.key=DATADOC \
-    -Ddist.releaseType=milestone \
-    -Ddist.accessKey=<access key> \
-    -Ddist.secretKey=<secret key> \
-    -Ddist.bucketName=dist.springframework.org \
-    -Ddist.fileName=spring-data-keyvalue-1.0.0.M1.zip \
-    -Ddist.filePath=../../spring-data-keyvalue-1.0.0.M1.zip \
-    -Ddist.version=1.0.0.M1 \
-    upload-dist
--->
-
-    <taskdef resource="org/springframework/build/aws/ant/antlib.xml">
-        <!-- see comment above
-        <classpath>
-            <pathelement location="/Users/cbeams/Desktop/org.springframework.build.aws.ant-3.0.5.RELEASE.jar"/>
-            <pathelement location="/Users/cbeams/.m2/repository/net/java/dev/jets3t/jets3t/0.7.2/jets3t-0.7.2.jar"/>
-            <pathelement location="/Users/cbeams/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
-            <pathelement location="/Users/cbeams/.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
-            <pathelement location="/Users/cbeams/.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/>
-        </classpath>
-        -->
-    </taskdef>
-    <target name="upload-dist">
-        <checksum file="${dist.filePath}" algorithm="sha1"/>
-        <s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
-            <upload bucketName="${dist.bucketName}" file="${dist.filePath}"
-                    toFile="${dist.releaseType}/${dist.key}/${dist.fileName}" publicRead="true">
-                <metadata name="project.name" value="${dist.name}"/>
-                <metadata name="release.type" value="${dist.releaseType}"/>
-                <metadata name="bundle.version" value="${dist.version}"/>
-                <metadata name="package.file.name" value="${dist.fileName}"/>
-            </upload>
-            <upload bucketName="${dist.bucketName}" file="${dist.filePath}.sha1"
-                    toFile="${dist.releaseType}/${dist.key}/${dist.fileName}.sha1" publicRead="true">
-            </upload>
-        </s3>
-    </target>
-</project>
diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml
deleted file mode 100644
index f7908aa55..000000000
--- a/src/assembly/distribution.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-	<!-- distribution assembly descriptor. packages up jars, source jars, documentation,
-		 dependencies and other resources into a single archive suitable for download and
-		 standalone use.
-		 see pom.xml 'maven-assembly-plugin' declaration
-		 see src/main/scripts/build-distribution.sh
-		 see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html -->
-	<id>distribution</id>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<includeBaseDirectory>true</includeBaseDirectory>
-	<fileSets>
-		<fileSet>
-			<!-- adds readme and other textfiles to the root of the distribution archive -->
-			<directory>src/main/resources</directory>
-			<includes>
-				<include>readme.txt</include>
-				<include>apache-license.txt</include>
-				<include>notice.txt</include>
-				<include>changelog.txt</include>
-			</includes>
-			<outputDirectory/>
-			<lineEnding>dos</lineEnding>
-		</fileSet>
-		<fileSet>
-			<!-- adds reference manual (html and pdf) to the distribution archive under the
-				 'docs/reference' directory
-				 see pom.xml 'maven-javadoc-plugin' declaration -->
-			<directory>target/site/reference</directory>
-			<outputDirectory>docs/reference</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<!-- adds javadoc html to the distribution archive under the 'docs/javadoc' directory
-				 see pom.xml 'maven-javadoc-plugin' declaration -->
-			<directory>target/site/apidocs</directory>
-			<outputDirectory>docs/javadoc</outputDirectory>
-		</fileSet>
-	</fileSets>
-	<moduleSets>
-		<moduleSet>
-			<!-- adds module jars to the distribution archive under the 'dist' directory -->
-			<includes>
-				<include>org.springframework.data:spring-data-keyvalue-core</include>
-				<include>org.springframework.data:spring-data-redis</include>
-			</includes>
-			<binaries>
-				<outputDirectory>dist</outputDirectory>
-				<includeDependencies>false</includeDependencies>
-				<unpack>false</unpack>
-			</binaries>
-		</moduleSet>
-		<moduleSet>
-			<!-- adds module source jars to the distribution archive under the 'src' directory
-				 see pom.xml 'maven-source-plugin' declaration -->
-			<includes>
-				<include>org.springframework.data:spring-data-keyvalue-core</include>
-				<include>org.springframework.data:spring-data-redis</include>
-			</includes>
-			<binaries>
-				<attachmentClassifier>sources</attachmentClassifier>
-				<outputDirectory>src</outputDirectory>
-				<includeDependencies>false</includeDependencies>
-				<unpack>false</unpack>
-			</binaries>
-		</moduleSet>
-	</moduleSets>
-</assembly>