diff --git a/sink/.mvn b/jdbc-sink/.mvn
similarity index 100%
rename from sink/.mvn
rename to jdbc-sink/.mvn
diff --git a/sink/README.md b/jdbc-sink/README.adoc
similarity index 100%
rename from sink/README.md
rename to jdbc-sink/README.adoc
diff --git a/sink/docker-compose.yml b/jdbc-sink/docker-compose.yml
similarity index 100%
rename from sink/docker-compose.yml
rename to jdbc-sink/docker-compose.yml
diff --git a/sink/mvnw b/jdbc-sink/mvnw
similarity index 100%
rename from sink/mvnw
rename to jdbc-sink/mvnw
diff --git a/sink/mvnw.cmd b/jdbc-sink/mvnw.cmd
similarity index 100%
rename from sink/mvnw.cmd
rename to jdbc-sink/mvnw.cmd
diff --git a/sink/pom.xml b/jdbc-sink/pom.xml
similarity index 98%
rename from sink/pom.xml
rename to jdbc-sink/pom.xml
index b45b2a0..369779a 100644
--- a/sink/pom.xml
+++ b/jdbc-sink/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>spring.cloud.stream.samples</groupId>
-	<artifactId>sample-jdbc-sink</artifactId>
+	<artifactId>jdbc-sink</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
diff --git a/sink/src/main/java/demo/SampleJdbcSink.java b/jdbc-sink/src/main/java/demo/SampleJdbcSink.java
similarity index 100%
rename from sink/src/main/java/demo/SampleJdbcSink.java
rename to jdbc-sink/src/main/java/demo/SampleJdbcSink.java
diff --git a/sink/src/main/resources/application.yml b/jdbc-sink/src/main/resources/application.yml
similarity index 100%
rename from sink/src/main/resources/application.yml
rename to jdbc-sink/src/main/resources/application.yml
diff --git a/sink/src/main/resources/sample-schema.sql b/jdbc-sink/src/main/resources/sample-schema.sql
similarity index 100%
rename from sink/src/main/resources/sample-schema.sql
rename to jdbc-sink/src/main/resources/sample-schema.sql
diff --git a/sink/src/test/java/demo/ModuleApplicationTests.java b/jdbc-sink/src/test/java/demo/ModuleApplicationTests.java
similarity index 100%
rename from sink/src/test/java/demo/ModuleApplicationTests.java
rename to jdbc-sink/src/test/java/demo/ModuleApplicationTests.java
diff --git a/sink/src/test/resources/application.properties b/jdbc-sink/src/test/resources/application.properties
similarity index 100%
rename from sink/src/test/resources/application.properties
rename to jdbc-sink/src/test/resources/application.properties
diff --git a/sink/start-kafka-shell.sh b/jdbc-sink/start-kafka-shell.sh
similarity index 100%
rename from sink/start-kafka-shell.sh
rename to jdbc-sink/start-kafka-shell.sh
diff --git a/source/.mvn b/jdbc-source/.mvn
similarity index 100%
rename from source/.mvn
rename to jdbc-source/.mvn
diff --git a/source/README.adoc b/jdbc-source/README.adoc
similarity index 100%
rename from source/README.adoc
rename to jdbc-source/README.adoc
diff --git a/source/docker-compose.yml b/jdbc-source/docker-compose.yml
similarity index 100%
rename from source/docker-compose.yml
rename to jdbc-source/docker-compose.yml
diff --git a/source/mvnw b/jdbc-source/mvnw
similarity index 100%
rename from source/mvnw
rename to jdbc-source/mvnw
diff --git a/source/mvnw.cmd b/jdbc-source/mvnw.cmd
similarity index 100%
rename from source/mvnw.cmd
rename to jdbc-source/mvnw.cmd
diff --git a/source/pom.xml b/jdbc-source/pom.xml
similarity index 95%
rename from source/pom.xml
rename to jdbc-source/pom.xml
index c09a47e..f9440df 100644
--- a/source/pom.xml
+++ b/jdbc-source/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>spring.cloud.stream.samples</groupId>
-	<artifactId>sample-jdbc-source</artifactId>
+	<artifactId>jdbc-source</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
diff --git a/source/src/main/java/demo/JdbcSourceProperties.java b/jdbc-source/src/main/java/demo/JdbcSourceProperties.java
similarity index 100%
rename from source/src/main/java/demo/JdbcSourceProperties.java
rename to jdbc-source/src/main/java/demo/JdbcSourceProperties.java
diff --git a/source/src/main/java/demo/SampleJdbcSource.java b/jdbc-source/src/main/java/demo/SampleJdbcSource.java
similarity index 100%
rename from source/src/main/java/demo/SampleJdbcSource.java
rename to jdbc-source/src/main/java/demo/SampleJdbcSource.java
diff --git a/source/src/main/resources/application.yml b/jdbc-source/src/main/resources/application.yml
similarity index 100%
rename from source/src/main/resources/application.yml
rename to jdbc-source/src/main/resources/application.yml
diff --git a/source/src/main/resources/sample-schema.sql b/jdbc-source/src/main/resources/sample-schema.sql
similarity index 100%
rename from source/src/main/resources/sample-schema.sql
rename to jdbc-source/src/main/resources/sample-schema.sql
diff --git a/source/src/test/java/demo/ModuleApplicationTests.java b/jdbc-source/src/test/java/demo/ModuleApplicationTests.java
similarity index 100%
rename from source/src/test/java/demo/ModuleApplicationTests.java
rename to jdbc-source/src/test/java/demo/ModuleApplicationTests.java
diff --git a/source/src/test/resources/application.properties b/jdbc-source/src/test/resources/application.properties
similarity index 100%
rename from source/src/test/resources/application.properties
rename to jdbc-source/src/test/resources/application.properties
diff --git a/source/start-kafka-shell.sh b/jdbc-source/start-kafka-shell.sh
similarity index 100%
rename from source/start-kafka-shell.sh
rename to jdbc-source/start-kafka-shell.sh
diff --git a/multibinder-differentsystems/pom.xml b/multibinder-differentsystems/pom.xml
index 5562ff1..16f668d 100644
--- a/multibinder-differentsystems/pom.xml
+++ b/multibinder-differentsystems/pom.xml
@@ -2,62 +2,42 @@
 <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>
 
-	<artifactId>spring-cloud-stream-sample-multibinder-differentsystems</artifactId>
+	<groupId>spring.cloud.stream.samples</groupId>
+	<artifactId>multibinder-differentsystems</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
-	<name>spring-cloud-stream-sample-multibinder-differentsystems</name>
-	<description>
-		Demo project for multiple binders of the same type (Kafka), connecting to different systems (broker groups)
-	</description>
+
+	<name>multibinder-differentsystems</name>
+	<description>Demo project for Spring Boot</description>
 
 	<parent>
-		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-stream-samples</artifactId>
-		<version>1.2.0.BUILD-SNAPSHOT</version>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.0.0.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
-		<start-class>multibinder.MultibinderApplication</start-class>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+		<spring-cloud.version>Finchley.BUILD-SNAPSHOT</spring-cloud.version>
 	</properties>
 
+
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-sample-source</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-sample-transform</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-sample-sink</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-kafka</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.curator</groupId>
-			<artifactId>curator-test</artifactId>
-			<version>2.6.0</version>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</artifactId>
-			<optional>true</optional>
-		</dependency>
-		
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -66,19 +46,51 @@
 		<dependency>
 			<groupId>org.springframework.kafka</groupId>
 			<artifactId>spring-kafka-test</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<classifier>exec</classifier>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>
 
+	<repositories>
+		<repository>
+			<id>spring-snapshots</id>
+			<name>Spring Snapshots</name>
+			<url>http://repo.spring.io/libs-snapshot-local</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>http://repo.spring.io/libs-milestone-local</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
 </project>
diff --git a/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java b/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java
index 64c97d2..a8e0e4d 100644
--- a/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java
+++ b/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java
@@ -38,17 +38,16 @@ import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.UUID;
 
 import static org.hamcrest.Matchers.arrayWithSize;
 import static org.hamcrest.Matchers.equalTo;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = MultibinderApplication.class)
-@WebAppConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest(
+		webEnvironment = SpringBootTest.WebEnvironment.NONE)
 @DirtiesContext
 @Ignore
 public class TwoKafkaBindersApplicationTest {
diff --git a/pom.xml b/pom.xml
index 3e215a4..31e272d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,14 +21,14 @@
         <java.version>1.8</java.version>
 	</properties>
 	<modules>
-		<module>source</module>
-		<module>sink</module>
+		<module>jdbc-sink</module>
+		<module>jdbc-source</module>
 		<module>dynamic-source</module>
 		<module>transform</module>
 		<module>double</module>
 		<module>non-self-contained-aggregate-app</module>
 		<!--<module>multibinder</module>-->
-		<!--<module>multibinder-differentsystems</module>-->
+		<module>multibinder-differentsystems</module>
 		<module>multi-io</module>
 		<module>stream-listener</module>
 		<module>reactive-processor-kafka</module>