diff --git a/docs/src/main/asciidoc/verifier/messaging.adoc b/docs/src/main/asciidoc/verifier/messaging.adoc
index 539e9943f2..863680b319 100644
--- a/docs/src/main/asciidoc/verifier/messaging.adoc
+++ b/docs/src/main/asciidoc/verifier/messaging.adoc
@@ -142,4 +142,4 @@ include::{plugins_path}/spring-cloud-contract-gradle-plugin/src/test/resources/f
 
 ===== Maven Setup
 
-Example of Maven can be found in the https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/standalone/stream-sink/pom.xml[Stream Sink sample]
+Example of Maven can be found in the https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/standalone/02-stream-sink/pom.xml[Stream Sink sample]
diff --git a/samples/standalone/stream-sink/.mvn/wrapper/maven-wrapper.jar b/samples/standalone/01-stream-source/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from samples/standalone/stream-sink/.mvn/wrapper/maven-wrapper.jar
rename to samples/standalone/01-stream-source/.mvn/wrapper/maven-wrapper.jar
diff --git a/samples/standalone/stream-sink/.mvn/wrapper/maven-wrapper.properties b/samples/standalone/01-stream-source/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from samples/standalone/stream-sink/.mvn/wrapper/maven-wrapper.properties
rename to samples/standalone/01-stream-source/.mvn/wrapper/maven-wrapper.properties
diff --git a/samples/standalone/stream-source/README.adoc b/samples/standalone/01-stream-source/README.adoc
similarity index 100%
rename from samples/standalone/stream-source/README.adoc
rename to samples/standalone/01-stream-source/README.adoc
diff --git a/samples/standalone/stream-source/build.gradle b/samples/standalone/01-stream-source/build.gradle
similarity index 100%
rename from samples/standalone/stream-source/build.gradle
rename to samples/standalone/01-stream-source/build.gradle
diff --git a/samples/standalone/stream-sink/gradle.properties b/samples/standalone/01-stream-source/gradle.properties
similarity index 100%
rename from samples/standalone/stream-sink/gradle.properties
rename to samples/standalone/01-stream-source/gradle.properties
diff --git a/samples/standalone/stream-sink/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/01-stream-source/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from samples/standalone/stream-sink/gradle/wrapper/gradle-wrapper.jar
rename to samples/standalone/01-stream-source/gradle/wrapper/gradle-wrapper.jar
diff --git a/samples/standalone/stream-sink/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/01-stream-source/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from samples/standalone/stream-sink/gradle/wrapper/gradle-wrapper.properties
rename to samples/standalone/01-stream-source/gradle/wrapper/gradle-wrapper.properties
diff --git a/samples/standalone/stream-sink/gradlew b/samples/standalone/01-stream-source/gradlew
similarity index 100%
rename from samples/standalone/stream-sink/gradlew
rename to samples/standalone/01-stream-source/gradlew
diff --git a/samples/standalone/stream-sink/gradlew.bat b/samples/standalone/01-stream-source/gradlew.bat
similarity index 100%
rename from samples/standalone/stream-sink/gradlew.bat
rename to samples/standalone/01-stream-source/gradlew.bat
diff --git a/samples/standalone/stream-sink/mvnw b/samples/standalone/01-stream-source/mvnw
similarity index 100%
rename from samples/standalone/stream-sink/mvnw
rename to samples/standalone/01-stream-source/mvnw
diff --git a/samples/standalone/stream-sink/mvnw.cmd b/samples/standalone/01-stream-source/mvnw.cmd
similarity index 100%
rename from samples/standalone/stream-sink/mvnw.cmd
rename to samples/standalone/01-stream-source/mvnw.cmd
diff --git a/samples/standalone/stream-source/pom.xml b/samples/standalone/01-stream-source/pom.xml
similarity index 100%
rename from samples/standalone/stream-source/pom.xml
rename to samples/standalone/01-stream-source/pom.xml
diff --git a/samples/standalone/stream-source/settings.gradle b/samples/standalone/01-stream-source/settings.gradle
similarity index 100%
rename from samples/standalone/stream-source/settings.gradle
rename to samples/standalone/01-stream-source/settings.gradle
diff --git a/samples/standalone/stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java b/samples/standalone/01-stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java
similarity index 100%
rename from samples/standalone/stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java
rename to samples/standalone/01-stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java
diff --git a/samples/standalone/stream-source/src/main/resources/application.properties b/samples/standalone/01-stream-source/src/main/resources/application.properties
similarity index 100%
rename from samples/standalone/stream-source/src/main/resources/application.properties
rename to samples/standalone/01-stream-source/src/main/resources/application.properties
diff --git a/samples/standalone/stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java b/samples/standalone/01-stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java
similarity index 100%
rename from samples/standalone/stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java
rename to samples/standalone/01-stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java
diff --git a/samples/standalone/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java b/samples/standalone/01-stream-source/src/test/java/com/example/source/SensorSourceTestBase.java
similarity index 100%
rename from samples/standalone/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java
rename to samples/standalone/01-stream-source/src/test/java/com/example/source/SensorSourceTestBase.java
diff --git a/samples/standalone/stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy b/samples/standalone/01-stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy
similarity index 100%
rename from samples/standalone/stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy
rename to samples/standalone/01-stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy
diff --git a/samples/standalone/stream-source/.mvn/wrapper/maven-wrapper.jar b/samples/standalone/02-stream-sink/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from samples/standalone/stream-source/.mvn/wrapper/maven-wrapper.jar
rename to samples/standalone/02-stream-sink/.mvn/wrapper/maven-wrapper.jar
diff --git a/samples/standalone/stream-source/.mvn/wrapper/maven-wrapper.properties b/samples/standalone/02-stream-sink/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from samples/standalone/stream-source/.mvn/wrapper/maven-wrapper.properties
rename to samples/standalone/02-stream-sink/.mvn/wrapper/maven-wrapper.properties
diff --git a/samples/standalone/stream-sink/README.adoc b/samples/standalone/02-stream-sink/README.adoc
similarity index 100%
rename from samples/standalone/stream-sink/README.adoc
rename to samples/standalone/02-stream-sink/README.adoc
diff --git a/samples/standalone/stream-sink/build.gradle b/samples/standalone/02-stream-sink/build.gradle
similarity index 100%
rename from samples/standalone/stream-sink/build.gradle
rename to samples/standalone/02-stream-sink/build.gradle
diff --git a/samples/standalone/stream-source/gradle.properties b/samples/standalone/02-stream-sink/gradle.properties
similarity index 100%
rename from samples/standalone/stream-source/gradle.properties
rename to samples/standalone/02-stream-sink/gradle.properties
diff --git a/samples/standalone/stream-source/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/02-stream-sink/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from samples/standalone/stream-source/gradle/wrapper/gradle-wrapper.jar
rename to samples/standalone/02-stream-sink/gradle/wrapper/gradle-wrapper.jar
diff --git a/samples/standalone/stream-source/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/02-stream-sink/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from samples/standalone/stream-source/gradle/wrapper/gradle-wrapper.properties
rename to samples/standalone/02-stream-sink/gradle/wrapper/gradle-wrapper.properties
diff --git a/samples/standalone/stream-source/gradlew b/samples/standalone/02-stream-sink/gradlew
similarity index 100%
rename from samples/standalone/stream-source/gradlew
rename to samples/standalone/02-stream-sink/gradlew
diff --git a/samples/standalone/stream-source/gradlew.bat b/samples/standalone/02-stream-sink/gradlew.bat
similarity index 100%
rename from samples/standalone/stream-source/gradlew.bat
rename to samples/standalone/02-stream-sink/gradlew.bat
diff --git a/samples/standalone/stream-source/mvnw b/samples/standalone/02-stream-sink/mvnw
similarity index 100%
rename from samples/standalone/stream-source/mvnw
rename to samples/standalone/02-stream-sink/mvnw
diff --git a/samples/standalone/stream-source/mvnw.cmd b/samples/standalone/02-stream-sink/mvnw.cmd
similarity index 100%
rename from samples/standalone/stream-source/mvnw.cmd
rename to samples/standalone/02-stream-sink/mvnw.cmd
diff --git a/samples/standalone/stream-sink/pom.xml b/samples/standalone/02-stream-sink/pom.xml
similarity index 96%
rename from samples/standalone/stream-sink/pom.xml
rename to samples/standalone/02-stream-sink/pom.xml
index b0003b8aff..cf498ac50c 100644
--- a/samples/standalone/stream-sink/pom.xml
+++ b/samples/standalone/02-stream-sink/pom.xml
@@ -45,13 +45,6 @@
 			<artifactId>spring-cloud-stream-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<!-- ENFORCING BUILD ORDER -->
-		<dependency>
-			<groupId>com.example</groupId>
-			<artifactId>stream-source</artifactId>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
 	</dependencies>
 
 	<dependencyManagement>
diff --git a/samples/standalone/stream-sink/settings.gradle b/samples/standalone/02-stream-sink/settings.gradle
similarity index 100%
rename from samples/standalone/stream-sink/settings.gradle
rename to samples/standalone/02-stream-sink/settings.gradle
diff --git a/samples/standalone/stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java b/samples/standalone/02-stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java
similarity index 100%
rename from samples/standalone/stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java
rename to samples/standalone/02-stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java
diff --git a/samples/standalone/stream-sink/src/main/java/com/example/sink/SensorData.java b/samples/standalone/02-stream-sink/src/main/java/com/example/sink/SensorData.java
similarity index 100%
rename from samples/standalone/stream-sink/src/main/java/com/example/sink/SensorData.java
rename to samples/standalone/02-stream-sink/src/main/java/com/example/sink/SensorData.java
diff --git a/samples/standalone/stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java b/samples/standalone/02-stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java
similarity index 100%
rename from samples/standalone/stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java
rename to samples/standalone/02-stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java
diff --git a/samples/standalone/stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java b/samples/standalone/02-stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java
similarity index 100%
rename from samples/standalone/stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java
rename to samples/standalone/02-stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java
diff --git a/samples/standalone/stream-sink/src/test/resources/application.yml b/samples/standalone/02-stream-sink/src/test/resources/application.yml
similarity index 100%
rename from samples/standalone/stream-sink/src/test/resources/application.yml
rename to samples/standalone/02-stream-sink/src/test/resources/application.yml