diff --git a/README.adoc b/README.adoc
index 376ea42ad5..4a715c522e 100644
--- a/README.adoc
+++ b/README.adoc
@@ -122,7 +122,7 @@ that your application behaves in the same way as you define in your stub.
 __Summing it up:__ On this side, in the stub definition, you need exact values as request and can use patterns/methods
 for response verification.
 
-== Step by step guide to CDC
+=== Step by step guide to CDC
 
 Let's take an example of Fraud Detection and Loan Issuance process. Let's assume that the Loan Issuance is a client to the
 Fraud Detection server. Let's assume that we have to write a new feature (if a client wants too borrow too much money then
@@ -298,14 +298,20 @@ is under constant development.
 
 video::msRFcQM07-Y[youtube]
 
+https://www.youtube.com/watch?v=msRFcQM07-Y[click here to see the video]
+
 *Olga Maciaszek-Sharma talking about Accurest (Spring Cloud Contract Verifier predecessor)*
 
 video::daafmTYFoDU[youtube]
 
+https://www.youtube.com/watch?v=daafmTYFoDU[click here to see the video]
+
 *Marcin Grzejszczak and Jakub Kubryński talking about Accurest (Spring Cloud Contract Verifier predecessor)*
 
 video::130779882[vimeo]
 
+https://vimeo.com/130779882[click here to see the video]
+
 ==== Readings
 
 - http://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura[Slides from Marcin Grzejszczak's talk about Accurest]
@@ -403,20 +409,16 @@ Here you can find the Spring Cloud Contract folder structure
 ├── scripts
 ├── spring-cloud-contract-spec
 ├── spring-cloud-contract-stub-runner
-├── spring-cloud-contract-verifier
-├── spring-cloud-contract-gradle-plugin
-├── spring-cloud-contract-maven-plugin
-└── spring-cloud-contract-verifier-standalone-test-samples
+├── spring-cloud-contract-tools
+└── spring-cloud-contract-verifier
 ```
 
- - `samples` - folder contains integration test samples used also to build documentation
+ - `samples` - folder contains test samples together with standalone ones used also to build documentation
  - `scripts` - contains scripts to build and test `Spring Cloud Contract` with Maven, Gradle and standalone projects
  - `spring-cloud-contract-spec` - contains specification modules (contains concept of a Contract)
  - `spring-cloud-contract-stub-runner` - contains Stub Runner related modules
+ - `spring-cloud-contract-tools` - Gradle and Maven plugin for `Spring Cloud Contract Verifier`
  - `spring-cloud-contract-verifier` - core of the `Spring Cloud Contract Verifier` functionality
- - `spring-cloud-contract-gradle-plugin` - Gradle plugin for `Spring Cloud Contract Verifier`
- - `spring-cloud-contract-maven-plugin` - Maven plugin for `Spring Cloud Contract Verifier`
- - `spring-cloud-contract-verifier-standalone-test-samples` - standalone test sample that use `Spring Cloud Contract Verifier`
 
 === Commands
 
@@ -429,7 +431,7 @@ To build the core functionality together with Maven Plugin you can run
 To build the Gradle Plugin
 
 ```
-cd spring-cloud-contract-gradle-plugin
+cd spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin
 ./gradlew clean build
 ```
 
diff --git a/docs/src/main/asciidoc/building.adoc b/docs/src/main/asciidoc/building.adoc
index 0589bcdee7..72e5dc03a2 100644
--- a/docs/src/main/asciidoc/building.adoc
+++ b/docs/src/main/asciidoc/building.adoc
@@ -9,20 +9,16 @@ Here you can find the Spring Cloud Contract folder structure
 ├── scripts
 ├── spring-cloud-contract-spec
 ├── spring-cloud-contract-stub-runner
-├── spring-cloud-contract-verifier
-├── spring-cloud-contract-gradle-plugin
-├── spring-cloud-contract-maven-plugin
-└── spring-cloud-contract-verifier-standalone-test-samples
+├── spring-cloud-contract-tools
+└── spring-cloud-contract-verifier
 ```
 
- - `samples` - folder contains integration test samples used also to build documentation
+ - `samples` - folder contains test samples together with standalone ones used also to build documentation
  - `scripts` - contains scripts to build and test `Spring Cloud Contract` with Maven, Gradle and standalone projects
  - `spring-cloud-contract-spec` - contains specification modules (contains concept of a Contract)
  - `spring-cloud-contract-stub-runner` - contains Stub Runner related modules
+ - `spring-cloud-contract-tools` - Gradle and Maven plugin for `Spring Cloud Contract Verifier`
  - `spring-cloud-contract-verifier` - core of the `Spring Cloud Contract Verifier` functionality
- - `spring-cloud-contract-gradle-plugin` - Gradle plugin for `Spring Cloud Contract Verifier`
- - `spring-cloud-contract-maven-plugin` - Maven plugin for `Spring Cloud Contract Verifier`
- - `spring-cloud-contract-verifier-standalone-test-samples` - standalone test sample that use `Spring Cloud Contract Verifier`
 
 === Commands
 
@@ -35,7 +31,7 @@ To build the core functionality together with Maven Plugin you can run
 To build the Gradle Plugin
 
 ```
-cd spring-cloud-contract-gradle-plugin
+cd spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin
 ./gradlew clean build
 ```
 
diff --git a/docs/src/main/asciidoc/verifier/introduction.adoc b/docs/src/main/asciidoc/verifier/introduction.adoc
index 6033f1223a..9d58e72c34 100644
--- a/docs/src/main/asciidoc/verifier/introduction.adoc
+++ b/docs/src/main/asciidoc/verifier/introduction.adoc
@@ -100,7 +100,7 @@ that your application behaves in the same way as you define in your stub.
 __Summing it up:__ On this side, in the stub definition, you need exact values as request and can use patterns/methods
 for response verification.
 
-== Step by step guide to CDC
+=== Step by step guide to CDC
 
 Let's take an example of Fraud Detection and Loan Issuance process. Let's assume that the Loan Issuance is a client to the
 Fraud Detection server. Let's assume that we have to write a new feature (if a client wants too borrow too much money then
@@ -217,14 +217,20 @@ is under constant development.
 
 video::msRFcQM07-Y[youtube]
 
+https://www.youtube.com/watch?v=msRFcQM07-Y[click here to see the video]
+
 *Olga Maciaszek-Sharma talking about Accurest (Spring Cloud Contract Verifier predecessor)*
 
 video::daafmTYFoDU[youtube]
 
+https://www.youtube.com/watch?v=daafmTYFoDU[click here to see the video]
+
 *Marcin Grzejszczak and Jakub Kubryński talking about Accurest (Spring Cloud Contract Verifier predecessor)*
 
 video::130779882[vimeo]
 
+https://vimeo.com/130779882[click here to see the video]
+
 ==== Readings
 
 - http://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura[Slides from Marcin Grzejszczak's talk about Accurest]