diff --git a/docs/src/main/asciidoc/verifier/spring-cloud-contract-verifier.adoc b/docs/src/main/asciidoc/verifier/spring-cloud-contract-verifier.adoc
index 9e107e1c02..4c55b1a188 100644
--- a/docs/src/main/asciidoc/verifier/spring-cloud-contract-verifier.adoc
+++ b/docs/src/main/asciidoc/verifier/spring-cloud-contract-verifier.adoc
@@ -2,7 +2,7 @@
 :plugins_path: ../../../../../spring-cloud-contract-tools
 :verifier_root_path: {core_path}/spring-cloud-contract-verifier
 :samples_path: {core_path}/samples
-:verifier_core_path: {verifier_root_path}/spring-cloud-contract-verifier-core
+:verifier_core_path: {verifier_root_path}
 :stubrunner_core_path: {core_path}/spring-cloud-contract-stub-runner
 :standalone_samples_path: {samples_path}/samples-standalone
 
diff --git a/samples/standalone/stream-source/build.gradle b/samples/standalone/stream-source/build.gradle
index a9d16aa783..98decfe675 100644
--- a/samples/standalone/stream-source/build.gradle
+++ b/samples/standalone/stream-source/build.gradle
@@ -51,7 +51,8 @@ dependencies {
 	compile("org.springframework.boot:spring-boot-starter-actuator")
 	compile("org.springframework.cloud:spring-cloud-starter-stream-rabbit")
 
-	testCompile("org.springframework.cloud:spring-cloud-contract-verifier-stream")
+	testCompile("org.springframework.cloud:spring-cloud-stream-test-support")
+	testCompile("org.springframework.cloud:spring-cloud-contract-verifier")
 	testCompile "org.spockframework:spock-core"
 	testCompile "org.spockframework:spock-spring"
 	testCompile "org.springframework:spring-test"
diff --git a/samples/standalone/stream-source/pom.xml b/samples/standalone/stream-source/pom.xml
index 3624b6cc12..f01ce2efec 100644
--- a/samples/standalone/stream-source/pom.xml
+++ b/samples/standalone/stream-source/pom.xml
@@ -29,6 +29,11 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-stream-test-support</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -36,7 +41,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-contract-verifier-stream</artifactId>
+			<artifactId>spring-cloud-contract-verifier</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml
index 13c8e14def..fcdd2a2b07 100644
--- a/spring-cloud-contract-dependencies/pom.xml
+++ b/spring-cloud-contract-dependencies/pom.xml
@@ -39,11 +39,6 @@
 				<artifactId>spring-cloud-contract-verifier</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-contract-verifier-testing-utils</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-stub-runner</artifactId>
@@ -74,26 +69,6 @@
 				<artifactId>spring-cloud-contract-stub-runner-integration</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-contract-verifier-messaging-core</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-contract-verifier-camel</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-contract-verifier-integration</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-contract-verifier-stream</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>com.github.tomakehurst</groupId>
 				<artifactId>wiremock</artifactId>
diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-camel/pom.xml b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-camel/pom.xml
index d8767665c1..6dfca395ba 100644
--- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-camel/pom.xml
+++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-camel/pom.xml
@@ -24,7 +24,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-contract-verifier-camel</artifactId>
+			<artifactId>spring-cloud-contract-verifier</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.camel</groupId>
diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-integration/pom.xml b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-integration/pom.xml
index 025a1dfe9b..e0c5a76850 100644
--- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-integration/pom.xml
+++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-integration/pom.xml
@@ -27,7 +27,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-contract-verifier-integration</artifactId>
+			<artifactId>spring-cloud-contract-verifier</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-stream/pom.xml b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-stream/pom.xml
index 942ce1e90c..3e3395356f 100644
--- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-stream/pom.xml
+++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-stream/pom.xml
@@ -27,7 +27,15 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-contract-verifier-stream</artifactId>
+			<artifactId>spring-cloud-contract-verifier</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-stream</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-stream-test-support</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/pom.xml b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/pom.xml
index 723c6949fb..70fa93df7f 100644
--- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/pom.xml
+++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/pom.xml
@@ -34,7 +34,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-contract-verifier-messaging-core</artifactId>
+			<artifactId>spring-cloud-contract-verifier</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml
index 9b24768e4e..ae39b29519 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-contract-verifier</artifactId>
+		<artifactId>spring-cloud-contract-tools</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle
index 3805c64ecf..57198c78a0 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle
@@ -72,9 +72,6 @@ dependencies {
 	testCompile 'info.solidsoft.spock:spock-global-unroll:0.5.0'
 	testCompile gradleTestKit()
 
-	messagingLibs("org.springframework.cloud:spring-cloud-contract-verifier-integration:${project.version}") {
-		exclude(group: 'org.codehaus.groovy')
-	}
 }
 
 test {
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
index c46da6d825..6f483b9824 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
@@ -12,10 +12,9 @@
 
 	<artifactId>spring-cloud-contract-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
 
-	<name>Spring Cloud Contract Verifier Maven Plugin</name>
-	<description>Spring Cloud Contract Verifier Maven Plugin</description>
+	<name>Spring Cloud Contract Maven Plugin</name>
+	<description>Spring Cloud Contract Maven Plugin</description>
 	<url>https://github.com/spring-cloud/spring-cloud-contract</url>
 
 	<properties>
@@ -259,7 +258,6 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier</artifactId>
-			<version>${spring.cloud.contract.verifier.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -269,13 +267,11 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-stub-runner</artifactId>
-			<version>${spring.cloud.contract.verifier.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.aether</groupId>
 			<artifactId>aether-api</artifactId>
-			<version>${aether.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -288,19 +284,16 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
-			<version>1.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.12</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>javax.inject</groupId>
 			<artifactId>javax.inject</artifactId>
-			<version>1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -370,13 +363,11 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>2.4.0</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/groovy/org/springframework/cloud/contract/maven/verifier/ManifestCreator.groovy b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/groovy/org/springframework/cloud/contract/maven/verifier/ManifestCreator.groovy
index 73b3b7ccf8..014cba93d6 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/groovy/org/springframework/cloud/contract/maven/verifier/ManifestCreator.groovy
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/groovy/org/springframework/cloud/contract/maven/verifier/ManifestCreator.groovy
@@ -27,7 +27,7 @@ class ManifestCreator {
         manifest.addConfiguredAttribute(new Manifest.Attribute("Spring-Cloud-Contract-Verifier-Maven-Plugin-Version", verifierMavenPlugin.version));
         if (verifierMavenPlugin.getDependencies()) {
             String verifierVersion = verifierMavenPlugin.getDependencies().find {
-                it.artifactId == 'spring-cloud-contract-verifier-core'
+                it.artifactId == 'spring-cloud-contract-verifier'
             }.version
             manifest.addConfiguredAttribute(new Manifest.Attribute("Spring-Cloud-Contract-Verifier-Version", verifierVersion));
         }
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java
index 65f1cd41a9..09315b7dda 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java
@@ -36,7 +36,7 @@ import org.springframework.cloud.contract.verifier.wiremock.RecursiveFilesConver
 /**
  * Convert Spring Cloud Contract Verifier contracts into WireMock stubs mappings.
  * <p>
- * This goal allow to generate `stubs-jar` or execute `spring-cloud-contract-verifier:run` with generated WireMock mappings.
+ * This goal allows you to generate `stubs-jar` or execute `spring-cloud-contract:run` with generated WireMock mappings.
  */
 @Mojo(name = "convert", requiresProject = false, defaultPhase = LifecyclePhase.PROCESS_TEST_RESOURCES)
 public class ConvertMojo extends AbstractMojo {
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.java
index 74d38eaa48..50a2e8009b 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.java
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.java
@@ -75,7 +75,7 @@ public class GenerateStubsMojo extends AbstractMojo {
 
     private File createStubJar(File stubsOutputDir) throws MojoFailureException, MojoExecutionException {
         if (!stubsOutputDir.exists()) {
-            throw new MojoExecutionException("Stubs could not be found: [" + stubsOutputDir.getAbsolutePath() + "] .\nPlease make sure that spring-cloud-contract-verifier:convert was invoked");
+            throw new MojoExecutionException("Stubs could not be found: [" + stubsOutputDir.getAbsolutePath() + "] .\nPlease make sure that spring-cloud-contract:convert was invoked");
         }
         String stubArchiveName = project.getBuild().getFinalName() + "-" + classifier + ".jar";
         File stubsJarFile = new File(projectBuildDirectory, stubArchiveName);
diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml
index 7ff81d59fa..4630f7752f 100644
--- a/spring-cloud-contract-verifier/pom.xml
+++ b/spring-cloud-contract-verifier/pom.xml
@@ -10,8 +10,8 @@
 	</parent>
 	<artifactId>spring-cloud-contract-verifier</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring Cloud Contract Verifier Core</name>
-	<description>Spring Cloud Contract Verifier Core</description>
+	<name>Spring Cloud Contract Verifier</name>
+	<description>Spring Cloud Contract Verifier</description>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -56,6 +56,10 @@
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-nio</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-json</artifactId>
@@ -99,6 +103,15 @@
 			<plugin>
 				<groupId>org.codehaus.gmavenplus</groupId>
 				<artifactId>gmavenplus-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>addSources</goal>
+							<goal>compile</goal>
+							<goal>testCompile</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubStrategy.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubStrategy.groovy
index 41c1ed1615..99120119a3 100644
--- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubStrategy.groovy
+++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubStrategy.groovy
@@ -16,12 +16,14 @@
 
 package org.springframework.cloud.contract.verifier.dsl.wiremock
 
+import groovy.transform.CompileDynamic
+import groovy.transform.CompileStatic
+
+import org.springframework.cloud.contract.verifier.file.ContractMetadata
+
 import com.github.tomakehurst.wiremock.http.ResponseDefinition
 import com.github.tomakehurst.wiremock.matching.RequestPattern
 import com.github.tomakehurst.wiremock.stubbing.StubMapping
-import groovy.transform.CompileDynamic
-import groovy.transform.CompileStatic
-import org.springframework.cloud.contract.verifier.file.ContractMetadata
 
 /**
  * Converts a {@link ContractMetadata} into a WireMock stub