diff --git a/doc/readme.md b/doc/readme.md
index 26e5c0bd..b26411fd 100644
--- a/doc/readme.md
+++ b/doc/readme.md
@@ -2,9 +2,9 @@ Welcome to the EiffelWeb framework documentation.
 
 The EiffelWeb framework is also known as *EWF*.
 
-The [Workbook](/doc/workbook/workbook.md) lets you discover the EiffelWeb framework.
+The [Workbook](/docs/workbook/workbook.md) lets you discover the EiffelWeb framework.
 
-And you may found in the *old* [Wiki](/doc/wiki/readme.md) notes that were not migrated to the [Workbook](/doc/workbook/workbook.md), but consider them as obsolete.
+And you may found in the *old* [Wiki](/docs/wiki/readme.md) notes that were not migrated to the [Workbook](/docs/workbook/workbook.md), but consider them as obsolete.
 
-[Enter the documentation](/doc/workbook/workbook.md)
+[Enter the documentation](/docs/workbook/workbook.md)
 		
diff --git a/doc/workbook/readme.md b/doc/workbook/readme.md
index 7b3183be..7bb2360c 100644
--- a/doc/workbook/readme.md
+++ b/doc/workbook/readme.md
@@ -1,56 +1 @@
-# EWF Workbook
-
-##### Table of Contents  
-* [EWF Core](#core)  
-* [EWF Introduction](#introduction)
-* [Handling Requests: Form/Query Parameter](#form_query_parameters)
-* [Handling Requests: Header Fields](#header_fields)
-* [Generating Responses](#generating_responses)
-* [Handling Cookies](#handling_cookies) 
-* [Web User Interface](#wui) 
-* [EWF Deployment](#deployment)
-
-<a name="core"></a>
-
-# EWF Core
-Before reading (or walking throught) the workbook, to get a quick overview of EWF, it is recommended to read the following articles:
-
-* [Getting Started with EWF](http://eiffelwebframework.github.io/EWF/getting-started/)
-* [EWF Documentation](http://eiffelwebframework.github.io/EWF/workbook/workbook)
-* [EWF Application Lifecyle](https://github.com/EiffelWebFramework/ewf_examples/wiki/Application-Lifecycle)
-
-
-<a name="introduction"></a>
-
-## Introduction
-[Basic Concepts](./basics/basics.md).
-
-<a name="form_query_parameters"></a>
-
-## Handling Requests: Form/Query Parameter
-[Handling Requests: Form/Query Parameter](./handling_request/form.md).
-
-<a name="header_fields"></a>
-
-## Handling Requests: Header Fields
-[Handling Requests: Header Fields](./handling_request/headers.md).
-
-<a name="generating_responses"></a>
-
-## Generating Response
-[Generating Responses](./generating_response/generating_response.md)
-
-<a name="wui"></a>
-
-## Web User Interface
-[Web User Interface](./wui/readme.md) 
-
-<a name="handling_cookies"></a>
-
-## Handling Cookies
-[Handling Cookies](./handling_cookies/handling_cookies.md) 
-
-<a name="deployment"></a>
-
-## EWF Deployment
-[EWF Deployment](./deployment/readme.md) 
+Workbook moved to [new location](../../docs/workbook/readme.md)
diff --git a/doc/workbook/workbook.md b/doc/workbook/workbook.md
new file mode 100644
index 00000000..7bb2360c
--- /dev/null
+++ b/doc/workbook/workbook.md
@@ -0,0 +1 @@
+Workbook moved to [new location](../../docs/workbook/readme.md)