diff --git a/pom.xml b/pom.xml
index ec727e48..103c4b85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,27 +20,30 @@
 	<description>Spring Data for Apache Geode and Pivotal GemFire Parent</description>
 	<url>https://projects.spring.io/spring-data-geode/</url>
 
+	<organization>
+		<name>Pivotal Software, Inc.</name>
+		<url>https://www.spring.io</url>
+	</organization>
+
 	<developers>
 		<developer>
 			<id>jblum</id>
 			<name>John Blum</name>
-			<email>jblum at pivotal.io</email>
 			<organization>Pivotal</organization>
 			<organizationUrl>https://www.pivotal.io</organizationUrl>
 			<roles>
 				<role>Lead Developer</role>
 			</roles>
-			<timezone>-8</timezone>
 		</developer>
 	</developers>
 
 	<modules>
 		<module>spring-data-geode</module>
 		<module>spring-data-gemfire</module>
+		<module>spring-data-geode-distribution</module>
 	</modules>
 
 	<properties>
-		<dist.key>SGF</dist.key>
 		<java-module-name>spring.data.geode</java-module-name>
 		<source.level>1.8</source.level>
 		<antlr.version>2.7.7</antlr.version>
@@ -257,7 +260,6 @@
 
 	<build>
 		<plugins>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -268,81 +270,15 @@
 					</includes>
 					<reuseForks>false</reuseForks>
 					<systemProperties>
-						<gemfire.disableShutdownHook>true</gemfire.disableShutdownHook>
 						<java.util.logging.config.file>${basedir}/src/test/resources/java-util-logging.properties</java.util.logging.config.file>
 						<javax.net.ssl.keyStore>${basedir}/src/test/resources/trusted.keystore</javax.net.ssl.keyStore>
+						<gemfire.disableShutdownHook>true</gemfire.disableShutdownHook>
 						<logback.log.level>error</logback.log.level>
 						<spring.profiles.active>apache-geode</spring.profiles.active>
 					</systemProperties>
 				</configuration>
 			</plugin>
-
-			<plugin>
-				<groupId>org.asciidoctor</groupId>
-				<artifactId>asciidoctor-maven-plugin</artifactId>
-				<configuration>
-					<attributes>
-						<basedocdir>${project.basedir}/src/main/asciidoc</basedocdir>
-						<doctype>book</doctype>
-						<version>${project.version}</version>
-					</attributes>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-			</plugin>
-
 		</plugins>
 	</build>
 
-	<profiles>
-
-		<profile>
-			<id>html-asciidoc</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.asciidoctor</groupId>
-						<artifactId>asciidoctor-maven-plugin</artifactId>
-						<configuration>
-							<attributes>
-								<basedocdir>${project.basedir}/src/main/asciidoc</basedocdir>
-								<doctype>book</doctype>
-								<numbered>true</numbered>
-								<sectnums>true</sectnums>
-								<toclevels>2</toclevels>
-								<version>${project.version}</version>
-								<!-- TODO include other attributes from build.gradle! -->
-							</attributes>
-						</configuration>
-						<executions>
-							<execution>
-								<id>html</id>
-								<phase>generate-resources</phase>
-								<goals>
-									<goal>process-asciidoc</goal>
-								</goals>
-								<configuration>
-									<backend>html5</backend>
-									<outputDirectory>${project.root}/target/site/reference/html</outputDirectory>
-									<sectids>false</sectids>
-									<sourceHighlighter>prettify</sourceHighlighter>
-									<attributes>
-										<linkcss>true</linkcss>
-										<icons>font</icons>
-										<sectanchors>true</sectanchors>
-										<stylesheet>spring.css</stylesheet>
-									</attributes>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-	</profiles>
-
 </project>
diff --git a/spring-data-geode-distribution/pom.xml b/spring-data-geode-distribution/pom.xml
new file mode 100644
index 00000000..3ba6fa3c
--- /dev/null
+++ b/spring-data-geode-distribution/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.springframework.data</groupId>
+		<artifactId>spring-data-geode-parent</artifactId>
+		<version>2.3.0.BUILD-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>spring-data-geode-distribution</artifactId>
+	<packaging>pom</packaging>
+
+	<properties>
+		<project.root>${project.basedir}/..</project.root>
+		<dist.key>SGF</dist.key>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.asciidoctor</groupId>
+				<artifactId>asciidoctor-maven-plugin</artifactId>
+				<configuration>
+					<attributes>
+						<basedocdir>${project.root}/src/main/asciidoc</basedocdir>
+						<doctype>book</doctype>
+						<version>${project.version}</version>
+					</attributes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<profiles>
+		<profile>
+			<id>html-asciidoc</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.asciidoctor</groupId>
+						<artifactId>asciidoctor-maven-plugin</artifactId>
+						<configuration>
+							<attributes>
+								<basedocdir>${project.root}/src/main/asciidoc</basedocdir>
+								<doctype>book</doctype>
+								<numbered>true</numbered>
+								<sectnums>true</sectnums>
+								<toclevels>2</toclevels>
+								<version>${project.version}</version>
+								<!-- TODO include other attributes from build.gradle! -->
+							</attributes>
+						</configuration>
+						<executions>
+							<execution>
+								<id>html</id>
+								<phase>generate-resources</phase>
+								<goals>
+									<goal>process-asciidoc</goal>
+								</goals>
+								<configuration>
+									<backend>html5</backend>
+									<outputDirectory>${project.root}/target/site/reference/html</outputDirectory>
+									<sectids>false</sectids>
+									<sourceHighlighter>prettify</sourceHighlighter>
+									<attributes>
+										<linkcss>true</linkcss>
+										<icons>font</icons>
+										<sectanchors>true</sectanchors>
+										<stylesheet>spring.css</stylesheet>
+									</attributes>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+</project>
diff --git a/spring-data-geode/src/main/asciidoc/appendix/appendix-schema.adoc b/src/main/asciidoc/appendix/appendix-schema.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/appendix/appendix-schema.adoc
rename to src/main/asciidoc/appendix/appendix-schema.adoc
diff --git a/spring-data-geode/src/main/asciidoc/images/epub-cover.png b/src/main/asciidoc/images/epub-cover.png
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/images/epub-cover.png
rename to src/main/asciidoc/images/epub-cover.png
diff --git a/spring-data-geode/src/main/asciidoc/images/epub-cover.svg b/src/main/asciidoc/images/epub-cover.svg
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/images/epub-cover.svg
rename to src/main/asciidoc/images/epub-cover.svg
diff --git a/spring-data-geode/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/index.adoc
rename to src/main/asciidoc/index.adoc
diff --git a/spring-data-geode/src/main/asciidoc/introduction/introduction.adoc b/src/main/asciidoc/introduction/introduction.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/introduction/introduction.adoc
rename to src/main/asciidoc/introduction/introduction.adoc
diff --git a/spring-data-geode/src/main/asciidoc/introduction/new-features.adoc b/src/main/asciidoc/introduction/new-features.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/introduction/new-features.adoc
rename to src/main/asciidoc/introduction/new-features.adoc
diff --git a/spring-data-geode/src/main/asciidoc/introduction/requirements.adoc b/src/main/asciidoc/introduction/requirements.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/introduction/requirements.adoc
rename to src/main/asciidoc/introduction/requirements.adoc
diff --git a/spring-data-geode/src/main/asciidoc/links.adoc b/src/main/asciidoc/links.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/links.adoc
rename to src/main/asciidoc/links.adoc
diff --git a/spring-data-geode/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/preface.adoc
rename to src/main/asciidoc/preface.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/bootstrap-annotations-quickstart.adoc b/src/main/asciidoc/reference/bootstrap-annotations-quickstart.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/bootstrap-annotations-quickstart.adoc
rename to src/main/asciidoc/reference/bootstrap-annotations-quickstart.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/bootstrap-annotations.adoc b/src/main/asciidoc/reference/bootstrap-annotations.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/bootstrap-annotations.adoc
rename to src/main/asciidoc/reference/bootstrap-annotations.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/bootstrap.adoc b/src/main/asciidoc/reference/bootstrap.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/bootstrap.adoc
rename to src/main/asciidoc/reference/bootstrap.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/cache.adoc b/src/main/asciidoc/reference/cache.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/cache.adoc
rename to src/main/asciidoc/reference/cache.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/cq-container.adoc b/src/main/asciidoc/reference/cq-container.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/cq-container.adoc
rename to src/main/asciidoc/reference/cq-container.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/data-access.adoc b/src/main/asciidoc/reference/data-access.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/data-access.adoc
rename to src/main/asciidoc/reference/data-access.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/data.adoc b/src/main/asciidoc/reference/data.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/data.adoc
rename to src/main/asciidoc/reference/data.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/diskstore.adoc b/src/main/asciidoc/reference/diskstore.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/diskstore.adoc
rename to src/main/asciidoc/reference/diskstore.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/function-annotations.adoc b/src/main/asciidoc/reference/function-annotations.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/function-annotations.adoc
rename to src/main/asciidoc/reference/function-annotations.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/function.adoc b/src/main/asciidoc/reference/function.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/function.adoc
rename to src/main/asciidoc/reference/function.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/gateway.adoc b/src/main/asciidoc/reference/gateway.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/gateway.adoc
rename to src/main/asciidoc/reference/gateway.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/gemfire-bootstrap.adoc b/src/main/asciidoc/reference/gemfire-bootstrap.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/gemfire-bootstrap.adoc
rename to src/main/asciidoc/reference/gemfire-bootstrap.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/indexing.adoc b/src/main/asciidoc/reference/indexing.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/indexing.adoc
rename to src/main/asciidoc/reference/indexing.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/introduction.adoc b/src/main/asciidoc/reference/introduction.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/introduction.adoc
rename to src/main/asciidoc/reference/introduction.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/lucene.adoc b/src/main/asciidoc/reference/lucene.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/lucene.adoc
rename to src/main/asciidoc/reference/lucene.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/mapping.adoc b/src/main/asciidoc/reference/mapping.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/mapping.adoc
rename to src/main/asciidoc/reference/mapping.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/region.adoc b/src/main/asciidoc/reference/region.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/region.adoc
rename to src/main/asciidoc/reference/region.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/repositories.adoc b/src/main/asciidoc/reference/repositories.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/repositories.adoc
rename to src/main/asciidoc/reference/repositories.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/samples.adoc b/src/main/asciidoc/reference/samples.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/samples.adoc
rename to src/main/asciidoc/reference/samples.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/serialization.adoc b/src/main/asciidoc/reference/serialization.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/serialization.adoc
rename to src/main/asciidoc/reference/serialization.adoc
diff --git a/spring-data-geode/src/main/asciidoc/reference/snapshot.adoc b/src/main/asciidoc/reference/snapshot.adoc
similarity index 100%
rename from spring-data-geode/src/main/asciidoc/reference/snapshot.adoc
rename to src/main/asciidoc/reference/snapshot.adoc
diff --git a/spring-data-geode/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
similarity index 100%
rename from spring-data-geode/src/main/resources/changelog.txt
rename to src/main/resources/changelog.txt
diff --git a/spring-data-geode/src/main/resources/license.txt b/src/main/resources/license.txt
similarity index 100%
rename from spring-data-geode/src/main/resources/license.txt
rename to src/main/resources/license.txt
diff --git a/spring-data-geode/src/main/resources/notice.txt b/src/main/resources/notice.txt
similarity index 100%
rename from spring-data-geode/src/main/resources/notice.txt
rename to src/main/resources/notice.txt
diff --git a/spring-data-geode/src/main/resources/readme.txt b/src/main/resources/readme.txt
similarity index 100%
rename from spring-data-geode/src/main/resources/readme.txt
rename to src/main/resources/readme.txt