diff --git a/pom.xml b/pom.xml
index b54716580..3ab29aaef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-build-tools</artifactId>
+				<artifactId>spring-cloud-stream-tools</artifactId>
 				<version>1.1.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
@@ -103,7 +103,7 @@
 		<module>spring-cloud-stream-test-support</module>
 		<module>spring-cloud-stream-test-support-internal</module>
 		<module>spring-cloud-stream-integration-tests</module>
-		<module>spring-cloud-stream-docs</module>
+		<module>spring-cloud-stream-core-docs</module>
 		<module>spring-cloud-stream-reactive</module>
 		<module>spring-cloud-stream-schema</module>
 		<module>spring-cloud-stream-schema-server</module>
@@ -153,7 +153,7 @@
 					<dependency>
 						<groupId>org.springframework.cloud</groupId>
 						<artifactId>spring-cloud-stream-tools</artifactId>
-						<version>${project.version}</version>
+						<version>1.1.0.BUILD-SNAPSHOT</version>
 					</dependency>
 				</dependencies>
 				<executions>
diff --git a/spring-cloud-stream-docs/pom.xml b/spring-cloud-stream-core-docs/pom.xml
similarity index 98%
rename from spring-cloud-stream-docs/pom.xml
rename to spring-cloud-stream-core-docs/pom.xml
index bfbeb6563..0a14d77a9 100644
--- a/spring-cloud-stream-docs/pom.xml
+++ b/spring-cloud-stream-core-docs/pom.xml
@@ -6,9 +6,9 @@
 		<artifactId>spring-cloud-stream-parent</artifactId>
 		<version>1.1.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-cloud-stream-docs</artifactId>
-	<name>spring-cloud-stream-docs</name>
-	<description>Spring Cloud Stream Docs</description>
+	<artifactId>spring-cloud-stream-core-docs</artifactId>
+	<name>spring-cloud-stream-core-docs</name>
+	<description>Spring Cloud Stream Core Documentation</description>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/.gitignore b/spring-cloud-stream-core-docs/src/main/asciidoc/.gitignore
similarity index 100%
rename from spring-cloud-stream-docs/src/main/asciidoc/.gitignore
rename to spring-cloud-stream-core-docs/src/main/asciidoc/.gitignore
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/Guardfile b/spring-cloud-stream-core-docs/src/main/asciidoc/Guardfile
similarity index 100%
rename from spring-cloud-stream-docs/src/main/asciidoc/Guardfile
rename to spring-cloud-stream-core-docs/src/main/asciidoc/Guardfile
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/appendix.adoc b/spring-cloud-stream-core-docs/src/main/asciidoc/appendix.adoc
similarity index 100%
rename from spring-cloud-stream-docs/src/main/asciidoc/appendix.adoc
rename to spring-cloud-stream-core-docs/src/main/asciidoc/appendix.adoc
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/building.adoc b/spring-cloud-stream-core-docs/src/main/asciidoc/building.adoc
similarity index 100%
rename from spring-cloud-stream-docs/src/main/asciidoc/building.adoc
rename to spring-cloud-stream-core-docs/src/main/asciidoc/building.adoc
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/contributing.adoc b/spring-cloud-stream-core-docs/src/main/asciidoc/contributing.adoc
similarity index 100%
rename from spring-cloud-stream-docs/src/main/asciidoc/contributing.adoc
rename to spring-cloud-stream-core-docs/src/main/asciidoc/contributing.adoc
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/images/SCSt-groups.png b/spring-cloud-stream-core-docs/src/main/asciidoc/images/SCSt-groups.png
similarity index 100%
rename from spring-cloud-stream-docs/src/main/asciidoc/images/SCSt-groups.png
rename to spring-cloud-stream-core-docs/src/main/asciidoc/images/SCSt-groups.png
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/images/SCSt-partitioning.png b/spring-cloud-stream-core-docs/src/main/asciidoc/images/SCSt-partitioning.png
similarity index 100%
rename from spring-cloud-stream-docs/src/main/asciidoc/images/SCSt-partitioning.png
rename to spring-cloud-stream-core-docs/src/main/asciidoc/images/SCSt-partitioning.png
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/images/SCSt-sensors.png b/spring-cloud-stream-core-docs/src/main/asciidoc/images/SCSt-sensors.png
similarity index 100%
rename from spring-cloud-stream-docs/src/main/asciidoc/images/SCSt-sensors.png
rename to spring-cloud-stream-core-docs/src/main/asciidoc/images/SCSt-sensors.png
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/images/SCSt-with-binder.png b/spring-cloud-stream-core-docs/src/main/asciidoc/images/SCSt-with-binder.png
similarity index 100%
rename from spring-cloud-stream-docs/src/main/asciidoc/images/SCSt-with-binder.png
rename to spring-cloud-stream-core-docs/src/main/asciidoc/images/SCSt-with-binder.png
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/images/producers-consumers.png b/spring-cloud-stream-core-docs/src/main/asciidoc/images/producers-consumers.png
similarity index 100%
rename from spring-cloud-stream-docs/src/main/asciidoc/images/producers-consumers.png
rename to spring-cloud-stream-core-docs/src/main/asciidoc/images/producers-consumers.png
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/images/redis-binder.png b/spring-cloud-stream-core-docs/src/main/asciidoc/images/redis-binder.png
similarity index 100%
rename from spring-cloud-stream-docs/src/main/asciidoc/images/redis-binder.png
rename to spring-cloud-stream-core-docs/src/main/asciidoc/images/redis-binder.png
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/index-docinfo.xml b/spring-cloud-stream-core-docs/src/main/asciidoc/index-docinfo.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/asciidoc/index-docinfo.xml
rename to spring-cloud-stream-core-docs/src/main/asciidoc/index-docinfo.xml
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/index.adoc b/spring-cloud-stream-core-docs/src/main/asciidoc/index.adoc
similarity index 100%
rename from spring-cloud-stream-docs/src/main/asciidoc/index.adoc
rename to spring-cloud-stream-core-docs/src/main/asciidoc/index.adoc
diff --git a/spring-cloud-stream-docs/src/main/asciidoc/spring-cloud-stream-overview.adoc b/spring-cloud-stream-core-docs/src/main/asciidoc/spring-cloud-stream-overview.adoc
similarity index 100%
rename from spring-cloud-stream-docs/src/main/asciidoc/spring-cloud-stream-overview.adoc
rename to spring-cloud-stream-core-docs/src/main/asciidoc/spring-cloud-stream-overview.adoc
diff --git a/spring-cloud-stream-docs/src/main/docbook/css/highlight.css b/spring-cloud-stream-core-docs/src/main/docbook/css/highlight.css
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/css/highlight.css
rename to spring-cloud-stream-core-docs/src/main/docbook/css/highlight.css
diff --git a/spring-cloud-stream-docs/src/main/docbook/css/manual-multipage.css b/spring-cloud-stream-core-docs/src/main/docbook/css/manual-multipage.css
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/css/manual-multipage.css
rename to spring-cloud-stream-core-docs/src/main/docbook/css/manual-multipage.css
diff --git a/spring-cloud-stream-docs/src/main/docbook/css/manual-singlepage.css b/spring-cloud-stream-core-docs/src/main/docbook/css/manual-singlepage.css
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/css/manual-singlepage.css
rename to spring-cloud-stream-core-docs/src/main/docbook/css/manual-singlepage.css
diff --git a/spring-cloud-stream-docs/src/main/docbook/css/manual.css b/spring-cloud-stream-core-docs/src/main/docbook/css/manual.css
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/css/manual.css
rename to spring-cloud-stream-core-docs/src/main/docbook/css/manual.css
diff --git a/spring-cloud-stream-docs/src/main/docbook/images/background.png b/spring-cloud-stream-core-docs/src/main/docbook/images/background.png
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/images/background.png
rename to spring-cloud-stream-core-docs/src/main/docbook/images/background.png
diff --git a/spring-cloud-stream-docs/src/main/docbook/images/caution.png b/spring-cloud-stream-core-docs/src/main/docbook/images/caution.png
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/images/caution.png
rename to spring-cloud-stream-core-docs/src/main/docbook/images/caution.png
diff --git a/spring-cloud-stream-docs/src/main/docbook/images/important.png b/spring-cloud-stream-core-docs/src/main/docbook/images/important.png
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/images/important.png
rename to spring-cloud-stream-core-docs/src/main/docbook/images/important.png
diff --git a/spring-cloud-stream-docs/src/main/docbook/images/logo.png b/spring-cloud-stream-core-docs/src/main/docbook/images/logo.png
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/images/logo.png
rename to spring-cloud-stream-core-docs/src/main/docbook/images/logo.png
diff --git a/spring-cloud-stream-docs/src/main/docbook/images/note.png b/spring-cloud-stream-core-docs/src/main/docbook/images/note.png
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/images/note.png
rename to spring-cloud-stream-core-docs/src/main/docbook/images/note.png
diff --git a/spring-cloud-stream-docs/src/main/docbook/images/tip.png b/spring-cloud-stream-core-docs/src/main/docbook/images/tip.png
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/images/tip.png
rename to spring-cloud-stream-core-docs/src/main/docbook/images/tip.png
diff --git a/spring-cloud-stream-docs/src/main/docbook/images/warning.png b/spring-cloud-stream-core-docs/src/main/docbook/images/warning.png
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/images/warning.png
rename to spring-cloud-stream-core-docs/src/main/docbook/images/warning.png
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/common.xsl b/spring-cloud-stream-core-docs/src/main/docbook/xsl/common.xsl
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/common.xsl
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/common.xsl
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/epub.xsl b/spring-cloud-stream-core-docs/src/main/docbook/xsl/epub.xsl
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/epub.xsl
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/epub.xsl
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/html-multipage.xsl b/spring-cloud-stream-core-docs/src/main/docbook/xsl/html-multipage.xsl
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/html-multipage.xsl
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/html-multipage.xsl
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/html-singlepage.xsl b/spring-cloud-stream-core-docs/src/main/docbook/xsl/html-singlepage.xsl
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/html-singlepage.xsl
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/html-singlepage.xsl
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/html.xsl b/spring-cloud-stream-core-docs/src/main/docbook/xsl/html.xsl
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/html.xsl
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/html.xsl
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/pdf.xsl b/spring-cloud-stream-core-docs/src/main/docbook/xsl/pdf.xsl
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/pdf.xsl
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/pdf.xsl
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl-config.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl-config.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl-config.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl-config.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/bourne-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/bourne-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/bourne-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/bourne-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/c-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/c-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/c-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/c-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/cpp-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/cpp-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/cpp-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/cpp-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/csharp-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/csharp-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/csharp-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/csharp-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/css-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/css-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/css-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/css-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/html-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/html-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/html-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/html-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/ini-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/ini-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/ini-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/ini-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/java-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/java-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/java-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/java-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/javascript-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/javascript-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/javascript-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/javascript-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/json-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/json-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/json-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/json-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/perl-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/perl-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/perl-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/perl-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/php-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/php-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/php-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/php-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/properties-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/properties-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/properties-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/properties-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/python-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/python-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/python-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/python-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/ruby-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/ruby-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/ruby-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/ruby-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/yaml-hl.xml b/spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/yaml-hl.xml
similarity index 100%
rename from spring-cloud-stream-docs/src/main/docbook/xsl/xslthl/yaml-hl.xml
rename to spring-cloud-stream-core-docs/src/main/docbook/xsl/xslthl/yaml-hl.xml
diff --git a/spring-cloud-stream-docs/src/main/javadoc/spring-javadoc.css b/spring-cloud-stream-core-docs/src/main/javadoc/spring-javadoc.css
similarity index 100%
rename from spring-cloud-stream-docs/src/main/javadoc/spring-javadoc.css
rename to spring-cloud-stream-core-docs/src/main/javadoc/spring-javadoc.css
diff --git a/spring-cloud-stream-docs/src/main/xslt/dependencyVersions.xsl b/spring-cloud-stream-core-docs/src/main/xslt/dependencyVersions.xsl
similarity index 100%
rename from spring-cloud-stream-docs/src/main/xslt/dependencyVersions.xsl
rename to spring-cloud-stream-core-docs/src/main/xslt/dependencyVersions.xsl