diff --git a/website.rst b/website.rst
index 3652da23f..233381e4f 100644
--- a/website.rst
+++ b/website.rst
@@ -7,6 +7,7 @@ Website
 .. toctree::
    :titlesonly:
 
-   website/seo
-   website/google_analytics
-   website/translate_website
+   website/publish
+   website/optimize
+
+
diff --git a/website/optimize.rst b/website/optimize.rst
new file mode 100644
index 000000000..cbce20ace
--- /dev/null
+++ b/website/optimize.rst
@@ -0,0 +1,14 @@
+:banner: banners/seo.jpg
+
+=======
+Optimize
+=======
+
+.. toctree::
+   :titlesonly:
+
+   optimize/seo
+   optimize/google_analytics
+
+
+
diff --git a/website/google_analytics.rst b/website/optimize/google_analytics.rst
similarity index 62%
rename from website/google_analytics.rst
rename to website/optimize/google_analytics.rst
index 484ad85f8..c4199a26f 100644
--- a/website/google_analytics.rst
+++ b/website/optimize/google_analytics.rst
@@ -1,8 +1,6 @@
-:banner: banners/getting_started.jpg
-
-================
-Google Analytics
-================
+==================================================
+How to track your traffic through Google Analytics
+==================================================
 
 To setup the signin process with Google, first you have to perform the following steps:
 
@@ -17,8 +15,9 @@ To setup the signin process with Google, first you have to perform the following
     .. image:: media/GC_new_project.png
         :align: center
 
--   In the menu on left side, select the sub menu APIs (from menu APIs and auth) and activate **"Analytics API"** by clicking on button "OFF".
-    When it's done, check that the button of **"Calendar API"** is well in green and with text "ON"
+-   In the menu on left side, select the sub menu APIs (from menu APIs and auth) and
+    activate **"Analytics API"** by clicking on button "OFF". When it's done, check
+    that the button of **"Calendar API"** is well in green and with text "ON"
 
     .. image:: media/GC_API.png
         :align: center
@@ -29,7 +28,8 @@ To setup the signin process with Google, first you have to perform the following
     .. image:: media/GC_on_api.png
         :align: center
 
--   In the menu on left side, select the sub menu **"Credentials"** (from menu APIs and auth) and click on button **"Create New Client ID"**
+-   In the menu on left side, select the sub menu **"Credentials"** (from menu APIs and
+    auth) and click on button **"Create New Client ID"**
 
     .. image:: media/GC_credentials.png
         :align: center
@@ -38,14 +38,15 @@ To setup the signin process with Google, first you have to perform the following
         :align: center
 
 -   Fill in the Name of application and check that the platform is well on **"Web Application"**.
-    You should now configure the allowed pages on which you will be redirected. To do it, you need to complete the field **"Redirect RI"**
-    and set as value (your own domain followed by ``/google_account/authentication``) :
-    You can now click on **"Create Client ID"**
+    You should now configure the allowed pages on which you will be redirected. To do
+    it, you need to complete the field **"Redirect RI"** and set as value (your own domain
+    followed by ``/google_account/authentication``) : You can now click on **"Create Client ID"**
 
     .. image:: media/GC_client_id.png
         :align: center
 
--   Once done, you will have the both informations (**Client ID** and **Client Secret**) that you need to insert in the 2 fields below !
+-   Once done, you will have the both informations (**Client ID** and **Client Secret**) that
+    you need to insert in the 2 fields below !
 
     .. image:: media/GC_copy.png
         :align: center
diff --git a/website/media/GC_API.png b/website/optimize/media/GC_API.png
similarity index 100%
rename from website/media/GC_API.png
rename to website/optimize/media/GC_API.png
diff --git a/website/media/GC_Project.png b/website/optimize/media/GC_Project.png
similarity index 100%
rename from website/media/GC_Project.png
rename to website/optimize/media/GC_Project.png
diff --git a/website/media/GC_client_id.png b/website/optimize/media/GC_client_id.png
similarity index 100%
rename from website/media/GC_client_id.png
rename to website/optimize/media/GC_client_id.png
diff --git a/website/media/GC_copy.png b/website/optimize/media/GC_copy.png
similarity index 100%
rename from website/media/GC_copy.png
rename to website/optimize/media/GC_copy.png
diff --git a/website/media/GC_create_new_client_id.png b/website/optimize/media/GC_create_new_client_id.png
similarity index 100%
rename from website/media/GC_create_new_client_id.png
rename to website/optimize/media/GC_create_new_client_id.png
diff --git a/website/media/GC_create_project.png b/website/optimize/media/GC_create_project.png
similarity index 100%
rename from website/media/GC_create_project.png
rename to website/optimize/media/GC_create_project.png
diff --git a/website/media/GC_credentials.png b/website/optimize/media/GC_credentials.png
similarity index 100%
rename from website/media/GC_credentials.png
rename to website/optimize/media/GC_credentials.png
diff --git a/website/media/GC_enable_api.png b/website/optimize/media/GC_enable_api.png
similarity index 100%
rename from website/media/GC_enable_api.png
rename to website/optimize/media/GC_enable_api.png
diff --git a/website/media/GC_new_project.png b/website/optimize/media/GC_new_project.png
similarity index 100%
rename from website/media/GC_new_project.png
rename to website/optimize/media/GC_new_project.png
diff --git a/website/media/GC_off_api.png b/website/optimize/media/GC_off_api.png
similarity index 100%
rename from website/media/GC_off_api.png
rename to website/optimize/media/GC_off_api.png
diff --git a/website/media/GC_on_api.png b/website/optimize/media/GC_on_api.png
similarity index 100%
rename from website/media/GC_on_api.png
rename to website/optimize/media/GC_on_api.png
diff --git a/website/publish.rst b/website/publish.rst
new file mode 100644
index 000000000..746f0f4ae
--- /dev/null
+++ b/website/publish.rst
@@ -0,0 +1,14 @@
+:banner: banners/seo.jpg
+
+=======
+Publish
+=======
+
+.. toctree::
+   :titlesonly:
+
+   publish/domain_name
+   publish/translate
+
+
+