diff --git a/.gitignore b/.gitignore
index 9a798c672..a8ac70c4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ _site/
.idea
.factorypath
spring-xd-samples/*/xd
+dump.rdb
diff --git a/pom.xml b/pom.xml
index c15bda4c9..603a8e373 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,7 @@
spring-cloud-streams-common
spring-xd-runner
spring-xd-samples
+ spring-cloud-streams-samples
diff --git a/vanilla-samples/double/pom.xml b/spring-cloud-streams-samples/double/pom.xml
similarity index 100%
rename from vanilla-samples/double/pom.xml
rename to spring-cloud-streams-samples/double/pom.xml
diff --git a/vanilla-samples/double/src/main/java/config/SinkModuleDefinition.java b/spring-cloud-streams-samples/double/src/main/java/config/SinkModuleDefinition.java
similarity index 100%
rename from vanilla-samples/double/src/main/java/config/SinkModuleDefinition.java
rename to spring-cloud-streams-samples/double/src/main/java/config/SinkModuleDefinition.java
diff --git a/vanilla-samples/double/src/main/java/config/SourceModuleDefinition.java b/spring-cloud-streams-samples/double/src/main/java/config/SourceModuleDefinition.java
similarity index 100%
rename from vanilla-samples/double/src/main/java/config/SourceModuleDefinition.java
rename to spring-cloud-streams-samples/double/src/main/java/config/SourceModuleDefinition.java
diff --git a/vanilla-samples/double/src/main/java/demo/DoubleApplication.java b/spring-cloud-streams-samples/double/src/main/java/demo/DoubleApplication.java
similarity index 100%
rename from vanilla-samples/double/src/main/java/demo/DoubleApplication.java
rename to spring-cloud-streams-samples/double/src/main/java/demo/DoubleApplication.java
diff --git a/vanilla-samples/double/src/main/resources/application.yml b/spring-cloud-streams-samples/double/src/main/resources/application.yml
similarity index 100%
rename from vanilla-samples/double/src/main/resources/application.yml
rename to spring-cloud-streams-samples/double/src/main/resources/application.yml
diff --git a/vanilla-samples/double/src/main/resources/sink.yml b/spring-cloud-streams-samples/double/src/main/resources/sink.yml
similarity index 100%
rename from vanilla-samples/double/src/main/resources/sink.yml
rename to spring-cloud-streams-samples/double/src/main/resources/sink.yml
diff --git a/vanilla-samples/double/src/main/resources/source.yml b/spring-cloud-streams-samples/double/src/main/resources/source.yml
similarity index 100%
rename from vanilla-samples/double/src/main/resources/source.yml
rename to spring-cloud-streams-samples/double/src/main/resources/source.yml
diff --git a/vanilla-samples/double/src/test/java/demo/ModuleApplicationTests.java b/spring-cloud-streams-samples/double/src/test/java/demo/ModuleApplicationTests.java
similarity index 100%
rename from vanilla-samples/double/src/test/java/demo/ModuleApplicationTests.java
rename to spring-cloud-streams-samples/double/src/test/java/demo/ModuleApplicationTests.java
diff --git a/vanilla-samples/extended/pom.xml b/spring-cloud-streams-samples/extended/pom.xml
similarity index 100%
rename from vanilla-samples/extended/pom.xml
rename to spring-cloud-streams-samples/extended/pom.xml
diff --git a/vanilla-samples/extended/src/main/java/extended/ExtendedApplication.java b/spring-cloud-streams-samples/extended/src/main/java/extended/ExtendedApplication.java
similarity index 100%
rename from vanilla-samples/extended/src/main/java/extended/ExtendedApplication.java
rename to spring-cloud-streams-samples/extended/src/main/java/extended/ExtendedApplication.java
diff --git a/vanilla-samples/extended/src/main/resources/application.yml b/spring-cloud-streams-samples/extended/src/main/resources/application.yml
similarity index 100%
rename from vanilla-samples/extended/src/main/resources/application.yml
rename to spring-cloud-streams-samples/extended/src/main/resources/application.yml
diff --git a/vanilla-samples/extended/src/main/resources/source.yml b/spring-cloud-streams-samples/extended/src/main/resources/source.yml
similarity index 100%
rename from vanilla-samples/extended/src/main/resources/source.yml
rename to spring-cloud-streams-samples/extended/src/main/resources/source.yml
diff --git a/vanilla-samples/extended/src/test/java/demo/ModuleApplicationTests.java b/spring-cloud-streams-samples/extended/src/test/java/demo/ModuleApplicationTests.java
similarity index 100%
rename from vanilla-samples/extended/src/test/java/demo/ModuleApplicationTests.java
rename to spring-cloud-streams-samples/extended/src/test/java/demo/ModuleApplicationTests.java
diff --git a/vanilla-samples/pom.xml b/spring-cloud-streams-samples/pom.xml
similarity index 100%
rename from vanilla-samples/pom.xml
rename to spring-cloud-streams-samples/pom.xml
diff --git a/vanilla-samples/sink/pom.xml b/spring-cloud-streams-samples/sink/pom.xml
similarity index 100%
rename from vanilla-samples/sink/pom.xml
rename to spring-cloud-streams-samples/sink/pom.xml
diff --git a/vanilla-samples/sink/src/main/java/demo/SinkApplication.java b/spring-cloud-streams-samples/sink/src/main/java/demo/SinkApplication.java
similarity index 100%
rename from vanilla-samples/sink/src/main/java/demo/SinkApplication.java
rename to spring-cloud-streams-samples/sink/src/main/java/demo/SinkApplication.java
diff --git a/vanilla-samples/sink/src/main/java/sink/LogSink.java b/spring-cloud-streams-samples/sink/src/main/java/sink/LogSink.java
similarity index 100%
rename from vanilla-samples/sink/src/main/java/sink/LogSink.java
rename to spring-cloud-streams-samples/sink/src/main/java/sink/LogSink.java
diff --git a/vanilla-samples/sink/src/main/resources/application.yml b/spring-cloud-streams-samples/sink/src/main/resources/application.yml
similarity index 100%
rename from vanilla-samples/sink/src/main/resources/application.yml
rename to spring-cloud-streams-samples/sink/src/main/resources/application.yml
diff --git a/vanilla-samples/sink/src/test/java/demo/ModuleApplicationTests.java b/spring-cloud-streams-samples/sink/src/test/java/demo/ModuleApplicationTests.java
similarity index 100%
rename from vanilla-samples/sink/src/test/java/demo/ModuleApplicationTests.java
rename to spring-cloud-streams-samples/sink/src/test/java/demo/ModuleApplicationTests.java
diff --git a/vanilla-samples/source/pom.xml b/spring-cloud-streams-samples/source/pom.xml
similarity index 100%
rename from vanilla-samples/source/pom.xml
rename to spring-cloud-streams-samples/source/pom.xml
diff --git a/vanilla-samples/source/src/main/java/demo/SourceApplication.java b/spring-cloud-streams-samples/source/src/main/java/demo/SourceApplication.java
similarity index 100%
rename from vanilla-samples/source/src/main/java/demo/SourceApplication.java
rename to spring-cloud-streams-samples/source/src/main/java/demo/SourceApplication.java
diff --git a/vanilla-samples/source/src/main/java/source/TimeSource.java b/spring-cloud-streams-samples/source/src/main/java/source/TimeSource.java
similarity index 100%
rename from vanilla-samples/source/src/main/java/source/TimeSource.java
rename to spring-cloud-streams-samples/source/src/main/java/source/TimeSource.java
diff --git a/vanilla-samples/source/src/main/java/source/TimeSourceOptionsMetadata.java b/spring-cloud-streams-samples/source/src/main/java/source/TimeSourceOptionsMetadata.java
similarity index 100%
rename from vanilla-samples/source/src/main/java/source/TimeSourceOptionsMetadata.java
rename to spring-cloud-streams-samples/source/src/main/java/source/TimeSourceOptionsMetadata.java
diff --git a/vanilla-samples/source/src/main/resources/application.yml b/spring-cloud-streams-samples/source/src/main/resources/application.yml
similarity index 98%
rename from vanilla-samples/source/src/main/resources/application.yml
rename to spring-cloud-streams-samples/source/src/main/resources/application.yml
index b66dbae9a..2debefb34 100644
--- a/vanilla-samples/source/src/main/resources/application.yml
+++ b/spring-cloud-streams-samples/source/src/main/resources/application.yml
@@ -18,4 +18,3 @@ spring:
cloud:
channels:
inputChannelName: xformed
-
\ No newline at end of file
diff --git a/vanilla-samples/source/src/test/java/demo/ModuleApplicationTests.java b/spring-cloud-streams-samples/source/src/test/java/demo/ModuleApplicationTests.java
similarity index 100%
rename from vanilla-samples/source/src/test/java/demo/ModuleApplicationTests.java
rename to spring-cloud-streams-samples/source/src/test/java/demo/ModuleApplicationTests.java
diff --git a/vanilla-samples/transform/pom.xml b/spring-cloud-streams-samples/transform/pom.xml
similarity index 100%
rename from vanilla-samples/transform/pom.xml
rename to spring-cloud-streams-samples/transform/pom.xml
diff --git a/vanilla-samples/transform/src/main/java/demo/TransformApplication.java b/spring-cloud-streams-samples/transform/src/main/java/demo/TransformApplication.java
similarity index 100%
rename from vanilla-samples/transform/src/main/java/demo/TransformApplication.java
rename to spring-cloud-streams-samples/transform/src/main/java/demo/TransformApplication.java
diff --git a/vanilla-samples/transform/src/main/java/transform/LoggingTransformer.java b/spring-cloud-streams-samples/transform/src/main/java/transform/LoggingTransformer.java
similarity index 100%
rename from vanilla-samples/transform/src/main/java/transform/LoggingTransformer.java
rename to spring-cloud-streams-samples/transform/src/main/java/transform/LoggingTransformer.java
diff --git a/vanilla-samples/transform/src/main/resources/application.yml b/spring-cloud-streams-samples/transform/src/main/resources/application.yml
similarity index 100%
rename from vanilla-samples/transform/src/main/resources/application.yml
rename to spring-cloud-streams-samples/transform/src/main/resources/application.yml
diff --git a/vanilla-samples/transform/src/test/java/demo/ModuleApplicationTests.java b/spring-cloud-streams-samples/transform/src/test/java/demo/ModuleApplicationTests.java
similarity index 100%
rename from vanilla-samples/transform/src/test/java/demo/ModuleApplicationTests.java
rename to spring-cloud-streams-samples/transform/src/test/java/demo/ModuleApplicationTests.java