diff --git a/recipe-rest-service/src/docs/asciidoc/recipe-rest-service.adoc b/recipe-rest-service/src/docs/asciidoc/recipe-rest-service.adoc
index a2af8ac..a748fbd 100644
--- a/recipe-rest-service/src/docs/asciidoc/recipe-rest-service.adoc
+++ b/recipe-rest-service/src/docs/asciidoc/recipe-rest-service.adoc
@@ -34,7 +34,7 @@
 .template.mf
 [source,txt]
 ----
-include::../../org.eclipse.virgo.samples.recipe.restservice/template.mf[]
+include::../../../org.eclipse.virgo.samples.recipe.restservice/template.mf[]
 ----
 
 You can mix and match the Virgo specific header `Import-Bundle` and OSGi standard header `Import-Package` within the `MANIFEST.MF`. In the sample the fine-tuning of the `MANIFEST.MF` is done within the Maven `pom.xml`.
@@ -46,7 +46,7 @@
 [source,xml]
 .web.xml
 ----
-include::../../org.eclipse.virgo.samples.recipe.restservice/src/main/resources/WEB-INF/web.xml[]
+include::../../../org.eclipse.virgo.samples.recipe.restservice/src/main/resources/WEB-INF/web.xml[]
 ----
 
 NOTE: The most important parameter is the `contextClass` which is *not* the default from the Spring Framework, but `org.eclipse.virgo.web.dm.ServerOsgiBundleXmlWebApplicationContext`.
@@ -63,7 +63,7 @@
 
 [source,xml]
 ----
-include::../../org.eclipse.virgo.samples.recipe.restservice/src/main/resources/WEB-INF/spring/appServlet/servlet-context.xml[]
+include::../../../org.eclipse.virgo.samples.recipe.restservice/src/main/resources/WEB-INF/spring/appServlet/servlet-context.xml[]
 ----
 
 Within the `servlet-context.xml` we define a single message converter `jacksonMessageConverter` using Jackson 2:
diff --git a/recipe-uploading-files/build.gradle b/recipe-uploading-files/build.gradle
index 215906a..a716902 100644
--- a/recipe-uploading-files/build.gradle
+++ b/recipe-uploading-files/build.gradle
@@ -8,8 +8,8 @@
 	}
 	dependencies {
 		classpath "gradle.plugin.org.eclipse.virgo.bundlor:bundlor-plugin:0.2"
-		classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.5"
-        classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.0'
+		classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.6"
+        classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.1'
 	}
 }
 
diff --git a/recipe-uploading-files/src/asciidoc/recipe-uploading-filest.adoc b/recipe-uploading-files/src/docs/asciidoc/recipe-uploading-files.adoc
similarity index 65%
rename from recipe-uploading-files/src/asciidoc/recipe-uploading-filest.adoc
rename to recipe-uploading-files/src/docs/asciidoc/recipe-uploading-files.adoc
index edc9986..9d1b81b 100644
--- a/recipe-uploading-files/src/asciidoc/recipe-uploading-filest.adoc
+++ b/recipe-uploading-files/src/docs/asciidoc/recipe-uploading-files.adoc
@@ -3,29 +3,29 @@
 :recipe-name: Getting Started - Uploading Files
 :recipe-short-name: recipe-{guide-short-name}
 
-include::../../../recipe-template/src/asciidoc/00_title.adoc[]
-include::../../../recipe-template/src/asciidoc/01_acknowledgements.adoc[]
+include::../../../../recipe-template/src/docs/asciidoc/00_title.adoc[]
+include::../../../../recipe-template/src/docs/asciidoc/01_acknowledgements.adoc[]
 
 == {recipe-name}
 
 The original guide uses https://projects.spring.io/spring-boot/[Spring Boot] to bootstrap the demo application. This guide walks through the necessary
 additional steps/configuration to get "{recipe-name}" up and running on Virgo.
 
-include::../../../recipe-template/src/asciidoc/03_shopping-list.adoc[]
+include::../../../../recipe-template/src/docs/asciidoc/03_shopping-list.adoc[]
 
-include::../../../recipe-template/src/asciidoc/04_ingredients.adoc[]
+include::../../../../recipe-template/src/docs/asciidoc/04_ingredients.adoc[]
 * Spring configuration
 * Web application configuration
 * OSGi manifest
 
 == Preparations
 
-include::../../../recipe-template/src/asciidoc/051_get-the-code.adoc[]
-include::../../../recipe-template/src/asciidoc/052_create-recipe-runtime.adoc[]
-include::../../../recipe-template/src/asciidoc/053_create-eclipse-project-metadata.adoc[]
-include::../../../recipe-template/src/asciidoc/054_prepare-virgo-tooling.adoc[]
-include::../../../recipe-template/src/asciidoc/055_import-the-code.adoc[]
-include::../../../recipe-template/src/asciidoc/056_create-new-virgo-server.adoc[]
+include::../../../../recipe-template/src/docs/asciidoc/051_get-the-code.adoc[]
+include::../../../../recipe-template/src/docs/asciidoc/052_create-recipe-runtime.adoc[]
+include::../../../../recipe-template/src/docs/asciidoc/053_create-eclipse-project-metadata.adoc[]
+include::../../../../recipe-template/src/docs/asciidoc/054_prepare-virgo-tooling.adoc[]
+include::../../../../recipe-template/src/docs/asciidoc/055_import-the-code.adoc[]
+include::../../../../recipe-template/src/docs/asciidoc/056_create-new-virgo-server.adoc[]
 
 == Directions
 
@@ -37,7 +37,7 @@
 .template.mf
 [source,txt]
 ----
-include::../../org.eclipse.virgo.samples.recipe.uploading/template.mf[]
+include::../../../org.eclipse.virgo.samples.recipe.uploading/template.mf[]
 ----
 
 You can mix and match the Virgo specific header `Import-Bundle` and OSGi standard header `Import-Package` within the `MANIFEST.MF`.
@@ -50,7 +50,7 @@
 [source,xml]
 .web.xml
 ----
-include::../../org.eclipse.virgo.samples.recipe.uploading/src/main/resources/WEB-INF/web.xml[]
+include::../../../org.eclipse.virgo.samples.recipe.uploading/src/main/resources/WEB-INF/web.xml[]
 ----
 <1> Virgo specific `contextClass`
 
@@ -60,7 +60,7 @@
 
 [source,xml]
 ----
-include::../../org.eclipse.virgo.samples.recipe.uploading/src/main/resources/WEB-INF/spring/appServlet/servlet-context.xml[]
+include::../../../org.eclipse.virgo.samples.recipe.uploading/src/main/resources/WEB-INF/spring/appServlet/servlet-context.xml[]
 ----
 
 == Let's taste
@@ -69,7 +69,7 @@
 
 [source,java]
 ----
-include::../../org.eclipse.virgo.samples.recipe.uploading/src/main/java/org/eclipse/virgo/samples/recipe/uploading/internal/FileUploader.java[tags=type]
+include::../../../org.eclipse.virgo.samples.recipe.uploading/src/main/java/org/eclipse/virgo/samples/recipe/uploading/internal/FileUploader.java[tags=type]
 ----
 
 NOTE: Please see the original guide https://spring.io/guides/gs/{guide-short-name}/["{recipe-name}"] for more background information about this client.
@@ -94,4 +94,4 @@
 You successfully uploaded sample.txt into sample.txt-uploaded !
 ....
 
-include::../../../recipe-template/src/asciidoc/08_dockerize_recipe.adoc[]
+include::../../../../recipe-template/src/docs/asciidoc/08_dockerize_recipe.adoc[]