diff --git a/docs/workbook/basics/WSF_SERVICE_LAUNCHER_NINO.png b/docs/workbook/basics/WSF_SERVICE_LAUNCHER_NINO.png
deleted file mode 100644
index ecca100e..00000000
Binary files a/docs/workbook/basics/WSF_SERVICE_LAUNCHER_NINO.png and /dev/null differ
diff --git a/docs/workbook/basics/basics.md b/docs/workbook/basics/basics.md
index a335d17c..79c97ffb 100644
--- a/docs/workbook/basics/basics.md
+++ b/docs/workbook/basics/basics.md
@@ -94,13 +94,11 @@ The **WSF_RESPONSE** provides features to define the response with information s
**APPLICATION** is the root class of our example, it launches the application, using the corresponding connector, Which connector? this depends how do you want to run it `cgi`, `fcgi`, `standalone`. For development is recommended to use a standalone web server written in Eiffel, and run the execution within the EiffelStudio debugger. For production fcgi (or cgi) using Apache or another popular web server.
-
-
+
**WS_LAUNCHABLE_SERVICE** inherit from **WS_SERVICE** class, which is a marker interface in EWF. And also provides a way to launch our application using different kind of connectors. The class **WSF_DEFAULT_SERVICE_I**, inherit from **WS_LAUNCHABLE_SERVICE** and has a formal generic that should conform to **WSF_SERVICE_LAUNCHER [WSF_EXECUTION]**. Below a [BON diagram](http://www.bon-method.com/index_normal.htm) showing one of the possible options.
-
-
+
Other connectors:
@@ -114,8 +112,7 @@ The **APPLICATION_EXECUTION** class inherits from **WSF_EXECUTION** interface,
In the **APPLICATION_EXECUTION** class class you will need to implement the **execute** feature, get data from the request *req* and write the response in *res*.
-
-
+
The WSF_EXECUTION instance, in this case ```APPLICATION_EXECUTION``` is created per request, with two main attributes request: ```WSF_REQUEST``` and response: ```WSF_RESPONSE```.
diff --git a/docs/workbook/basics/APPLICATION_EXECUTION.png b/docs/workbook/basics/basics/images/APPLICATION_EXECUTION.png
similarity index 100%
rename from docs/workbook/basics/APPLICATION_EXECUTION.png
rename to docs/workbook/basics/basics/images/APPLICATION_EXECUTION.png
diff --git a/docs/workbook/basics/Launcher Hierarchy.png b/docs/workbook/basics/basics/images/Launcher Hierarchy.png
similarity index 100%
rename from docs/workbook/basics/Launcher Hierarchy.png
rename to docs/workbook/basics/basics/images/Launcher Hierarchy.png
diff --git a/docs/workbook/basics/WSF_SERVICE_LAUNCHER_CGI.png b/docs/workbook/basics/basics/images/WSF_SERVICE_LAUNCHER_CGI.png
similarity index 100%
rename from docs/workbook/basics/WSF_SERVICE_LAUNCHER_CGI.png
rename to docs/workbook/basics/basics/images/WSF_SERVICE_LAUNCHER_CGI.png
diff --git a/docs/workbook/basics/WSF_SERVICE_LAUNCHER_FCGI.png b/docs/workbook/basics/basics/images/WSF_SERVICE_LAUNCHER_FCGI.png
similarity index 100%
rename from docs/workbook/basics/WSF_SERVICE_LAUNCHER_FCGI.png
rename to docs/workbook/basics/basics/images/WSF_SERVICE_LAUNCHER_FCGI.png
diff --git a/docs/workbook/basics/WSF_SERVICE_LAUNCHER_STANDALONE.png b/docs/workbook/basics/basics/images/WSF_SERVICE_LAUNCHER_STANDALONE.png
similarity index 100%
rename from docs/workbook/basics/WSF_SERVICE_LAUNCHER_STANDALONE.png
rename to docs/workbook/basics/basics/images/WSF_SERVICE_LAUNCHER_STANDALONE.png
diff --git a/docs/workbook/basics/images/APPLICATION_EXECUTION.png b/docs/workbook/basics/images/APPLICATION_EXECUTION.png
new file mode 100644
index 00000000..270c78aa
Binary files /dev/null and b/docs/workbook/basics/images/APPLICATION_EXECUTION.png differ
diff --git a/docs/workbook/basics/images/Launcher Hierarchy.png b/docs/workbook/basics/images/Launcher Hierarchy.png
new file mode 100644
index 00000000..d7c04723
Binary files /dev/null and b/docs/workbook/basics/images/Launcher Hierarchy.png differ
diff --git a/docs/workbook/basics/images/WSF_SERVICE_LAUNCHER_CGI.png b/docs/workbook/basics/images/WSF_SERVICE_LAUNCHER_CGI.png
new file mode 100644
index 00000000..ba484064
Binary files /dev/null and b/docs/workbook/basics/images/WSF_SERVICE_LAUNCHER_CGI.png differ
diff --git a/docs/workbook/basics/images/WSF_SERVICE_LAUNCHER_FCGI.png b/docs/workbook/basics/images/WSF_SERVICE_LAUNCHER_FCGI.png
new file mode 100644
index 00000000..b42d4b96
Binary files /dev/null and b/docs/workbook/basics/images/WSF_SERVICE_LAUNCHER_FCGI.png differ
diff --git a/docs/workbook/basics/images/WSF_SERVICE_LAUNCHER_STANDALONE.png b/docs/workbook/basics/images/WSF_SERVICE_LAUNCHER_STANDALONE.png
new file mode 100644
index 00000000..c3eea2fb
Binary files /dev/null and b/docs/workbook/basics/images/WSF_SERVICE_LAUNCHER_STANDALONE.png differ