diff --git a/docs/.pages b/docs/.pages
index 352b6a90239316e74e3019b44e4cb83f73825444..d721311b5c72d48342a1f91278dd1b6870fea7e9 100644
--- a/docs/.pages
+++ b/docs/.pages
@@ -5,5 +5,4 @@ nav:
  - web
  - desktop
  - mobile
- - advanced
- - faq
\ No newline at end of file
+ - advanced
\ No newline at end of file
diff --git a/docs/advanced/.pages b/docs/advanced/.pages
index 5238fb91ac870286a9e3978a2c72ebf8fdf7d0ca..ff9375e67ecf737490707341cfd3c247402d8847 100644
--- a/docs/advanced/.pages
+++ b/docs/advanced/.pages
@@ -1,5 +1,3 @@
 nav:
-- index.md
-- index.fr.md
 - web-pages
 - migration_from_dfs
\ No newline at end of file
diff --git a/docs/advanced/architecture_OLD/.pages b/docs/advanced/architecture_OLD/.pages
deleted file mode 100644
index 154c12456bcc695200597853b0317468d17b0f97..0000000000000000000000000000000000000000
--- a/docs/advanced/architecture_OLD/.pages
+++ /dev/null
@@ -1,11 +0,0 @@
-nav:
-- index.md
-- index.fr.md
-- web_access_to_your_cernbox.md
-- web_access_to_your_cernbox.fr.md
-- link_shre.md
-- link_share.fr.md
-- sync_client_access.md
-- sync_client_access.fr.md
-- authenticated_share.md
-- authenticated_share.fr.md
\ No newline at end of file
diff --git a/docs/advanced/architecture_OLD/authenticated_share.fr.md b/docs/advanced/architecture_OLD/authenticated_share.fr.md
deleted file mode 100644
index 38124da4c75c51403e824f14a37e99ad7ccbce97..0000000000000000000000000000000000000000
--- a/docs/advanced/architecture_OLD/authenticated_share.fr.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Partage en utilisateurs CERN
-
-Après avoir reçu un partage par un autre utilisateur du CERN, il est possible de synchroniser ces donnés partagées en local
-
-![](../../assets/images/User-cloud-webaccess-10.png)
diff --git a/docs/advanced/architecture_OLD/authenticated_share.md b/docs/advanced/architecture_OLD/authenticated_share.md
deleted file mode 100644
index b131bef255a872d18d157688c19bad57a1af9cef..0000000000000000000000000000000000000000
--- a/docs/advanced/architecture_OLD/authenticated_share.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Authenticated Share
-
-After another CERNBox user has shared his/her folder with you using the Authenticated Share, you can access and synchronise his/her folder to your laptop.
-
-![](../../../assets/images/User-cloud-webaccess-10.png)
diff --git a/docs/advanced/architecture_OLD/index.fr.MD b/docs/advanced/architecture_OLD/index.fr.MD
deleted file mode 100644
index d6ba8a582d0b618ca28e2c440db74a41aa063400..0000000000000000000000000000000000000000
--- a/docs/advanced/architecture_OLD/index.fr.MD
+++ /dev/null
@@ -1,3 +0,0 @@
-# Architecture de CERNBox
-
-![](../../assets/images/multiuser-multiplatform-folders-1.png)
diff --git a/docs/advanced/architecture_OLD/index.md b/docs/advanced/architecture_OLD/index.md
deleted file mode 100644
index 1a3b27bbf1a66a05dc6abdab9ab5eb80546a43fb..0000000000000000000000000000000000000000
--- a/docs/advanced/architecture_OLD/index.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# CERNBox architecture
-
-![](../../../assets/images/multiuser-multiplatform-folders-1.png)
diff --git a/docs/advanced/architecture_OLD/link_share.fr.md b/docs/advanced/architecture_OLD/link_share.fr.md
deleted file mode 100644
index 916fd634840ee7aab077df19fba1e803ea0fa302..0000000000000000000000000000000000000000
--- a/docs/advanced/architecture_OLD/link_share.fr.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Partage par lien
-
-Dans CERNBox, il y a la possibilité d'envoyer un lien impossible à deviner et d'envoyer ce lien à un collaborateur.
-
-![](../../assets/images/User-cloud-webaccess-12.png)
diff --git a/docs/advanced/architecture_OLD/link_share.md b/docs/advanced/architecture_OLD/link_share.md
deleted file mode 100644
index 7c70d1aca642946b1cd3fd08bade83c522df286f..0000000000000000000000000000000000000000
--- a/docs/advanced/architecture_OLD/link_share.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Link Share
-
-In the Web interface to your CERNBox, you generate an 'unguessable link'. Send this link to the external collaborator.
-
-![](../../../assets/images/User-cloud-webaccess-12.png)
diff --git a/docs/advanced/architecture_OLD/sync_client_access.fr.md b/docs/advanced/architecture_OLD/sync_client_access.fr.md
deleted file mode 100644
index 69cfd5d240a7f43d2817a1702b0c688f7902bf7f..0000000000000000000000000000000000000000
--- a/docs/advanced/architecture_OLD/sync_client_access.fr.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Accès par le client de synchronisation
-
-Installer et exécuter le client pour acceder et synchroniser répertoires et fichier sur votre machine
-
-![](../../assets/images/User-cloud-webaccess-9.png)
-
- 
-Possibilité de choisir les répertoires à synchroniser en local
-
-![](../../assets/images/User-cloud-webaccess-3.png)
diff --git a/docs/advanced/architecture_OLD/sync_client_access.md b/docs/advanced/architecture_OLD/sync_client_access.md
deleted file mode 100644
index fa250d80fcb5ea8b88554baafca5b637e3162bfe..0000000000000000000000000000000000000000
--- a/docs/advanced/architecture_OLD/sync_client_access.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Sync client access
-
-Install and run the Sync Client on your laptop to access and synchronise folders to your local host. 
-
-![](../../../assets/images/User-cloud-webaccess-9.png)
-
-You can choose what you want to synchronise to your laptop.
-
-![](../../../assets/images/User-cloud-webaccess-3.png)
diff --git a/docs/advanced/architecture_OLD/web_access_to_your_cernbox.fr.md b/docs/advanced/architecture_OLD/web_access_to_your_cernbox.fr.md
deleted file mode 100644
index 1419dc511170255371e32d2a958c19b12cd7be2c..0000000000000000000000000000000000000000
--- a/docs/advanced/architecture_OLD/web_access_to_your_cernbox.fr.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Accès web à votre CERNBox
-
-![](../../assets/images/User-cloud-webaccess-1.png)
diff --git a/docs/advanced/architecture_OLD/web_access_to_your_cernbox.md b/docs/advanced/architecture_OLD/web_access_to_your_cernbox.md
deleted file mode 100644
index 303c221d20a9f09affc644383b539888e2ffaa8d..0000000000000000000000000000000000000000
--- a/docs/advanced/architecture_OLD/web_access_to_your_cernbox.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Web access to your CERNBox 
-
-![](../../../assets/images/User-cloud-webaccess-1.png)
diff --git a/docs/advanced/index.md b/docs/advanced/index.md
deleted file mode 100644
index 055542163a3ad981e101115ffc25ed1fb01e11b4..0000000000000000000000000000000000000000
--- a/docs/advanced/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Advanced topics
-
-In this section you can learn about advanced topics:
-
-* [Architecture](./architecture/index.md)
-
-* [Access methods](./access/index.md)
-
-* [Migration from DFS](./migration_from_dfs/README.md)
\ No newline at end of file
diff --git a/docs/advanced/web-pages/project_website_content.fr.md b/docs/advanced/web-pages/project_website_content.fr.md
index d9d6d9db6bd01c7f3a3a6d88e210956bc3f264c2..196ecac392f1cdb3dd5b1a177898d5fc227f1df9 100644
--- a/docs/advanced/web-pages/project_website_content.fr.md
+++ b/docs/advanced/web-pages/project_website_content.fr.md
@@ -7,9 +7,9 @@
 * Aller à ***Your Projects***, et sélectionner le projet sur lequel vous coulez travailler.
 * Ouvrir le répertoire de projet, où est déjà présent le dossier `www`.
 
-> **[info] Chemin du dossier web sur EOSUSER (accessible depuis LXPLUS**
->
-> `eos/project/<initial>/<nom de projet>/www`
+!!! info "Chemin du dossier web sur EOSUSER (accessible depuis LXPLUS"
+
+    `eos/project/<initial>/<nom de projet>/www`
 
 ![](../../assets/images/project_web_01.png)
 
diff --git a/docs/advanced/web-pages/project_website_content.md b/docs/advanced/web-pages/project_website_content.md
index 499ad6cf5a0aacee76120ad48f9ae854727f0c93..e43b6d6d3c605d13fee5aa99786591a9f35de500 100644
--- a/docs/advanced/web-pages/project_website_content.md
+++ b/docs/advanced/web-pages/project_website_content.md
@@ -7,9 +7,9 @@ Using the pre-created www folder, put your website contents there.
 * Go to ‘Your projects’, and select the project that you want to work on
 * Open the project folder, you will see that folder ‘www’ is already created for you
 
-> **[info] Full path of the web folder on EOSUSER (accessible from LXPLUS)**
->
-> `/eos/project/<initial>/<project name>/www` 
+!!! info "Full path of the web folder on EOSUSER (accessible from LXPLUS)"
+
+    `/eos/project/<initial>/<project name>/www` 
 
 Screenshots to walk through the above procedure:
 
diff --git a/docs/desktop/.pages b/docs/desktop/.pages
index 7ed1cd55ffb20103db1f5ba913405acb926f1392..e364b9052dd7e2fcc50515ab9a09786ac5d5c6fb 100644
--- a/docs/desktop/.pages
+++ b/docs/desktop/.pages
@@ -1,3 +1,3 @@
 nav:
-- access-methods
-- sync-client
\ No newline at end of file
+- sync-client
+- other-access-methods
\ No newline at end of file
diff --git a/docs/desktop/access-methods/eos_xrootd.fr.md b/docs/desktop/access-methods/eos_xrootd.fr.md
deleted file mode 100644
index 6f6e53f507eb5c56b984fc9753d923c1425a9529..0000000000000000000000000000000000000000
--- a/docs/desktop/access-methods/eos_xrootd.fr.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Accés par EOS et XRootD
-
-Le point d'entrée XRootD/EOS  (instance serveur) pour vos fichiers CERNbox est `root://eosuser.cern.ch`
-et votre répertoire est  `/eos/user/<initial>/<userid>`,  (e.g. `/eos/user/l/laman`)
-
-- Pour créer un répertoire dans votre espace CERNBox:
-
-`% eos mkdir /eos/user/<initial>/<userid>/<my_directory>`, (e.g. `eos mkdir /eos/user/l/laman/office_plans`)
-
-> **[warning] NOTE** 
->
-> Si vous utilisez EOS pour CERNBox et pour votre expérience de physique, vérifier toujours quelle est l'instance EOS à laquelle vous accèdez avant d'exécuter des commandes EOS. 
-> Pour être certain d'accèder à la bonne instance EOS, il est recommandé d'utiliser la commande   `% eos <instance server> <command>` avant toute autre commande EOS
-> Exemples : 
->   - pour avoir la liste des fichiers de l'utilisateur laman dans CERNBox, `>eos root://eosuser.cern.ch ls /eos/user/l/laman`
->   - pour interroger l'instance EOSCMS, `>eos root://eoscms.cern.ch <command>`
diff --git a/docs/desktop/access-methods/eos_xrootd.md b/docs/desktop/access-methods/eos_xrootd.md
deleted file mode 100644
index 5416d672caa51cdf4a99619dc338cf8843d427f6..0000000000000000000000000000000000000000
--- a/docs/desktop/access-methods/eos_xrootd.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# EOS and XRootD client access 
-
-The XRootD/EOS entry point (instance server) for your files in CERNbox is `root://eosuser.cern.ch`
-and your user directories are under `/eos/user/<initial>/<userid>`,  (e.g. `/eos/user/l/laman`)
-
-- To create a directory:
-
-`% eos mkdir /eos/user/<initial>/<userid>/<my_directory>`, (e.g. `% eos mkdir /eos/user/l/laman/office_plans`)
-
-> **[warning] NOTE**: if you are using EOS for both CERNBox and your experiment be sure to verify which instance of EOS you are querying when running EOS commands. 
->
-> One way to force an EOS command to query a specific instance is to specify the server for that instance in the command line: `% eos <instance server> <command>`
-> Exemples
->   - to list laman's files in CERNBox, `% eos root://eosuser.cern.ch ls /eos/user/l/laman`
->   - to query EOSCMS, `% eos root://eoscms.cern.ch <command>`
diff --git a/docs/desktop/access-methods/index.md b/docs/desktop/access-methods/index.md
deleted file mode 100644
index 25ca04ba14babca78018fdedad195f5a9a064017..0000000000000000000000000000000000000000
--- a/docs/desktop/access-methods/index.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Different access methods to your CERNBox
-
-## Windows: SAMBA access
-
-_This functionality is currently under evaluation._
-
-From a Windows machine, you might want to access your CERNBox directly from the file explorer. The storage space EOSUSER is defined as a backend for the Samba server. 
-
-- Connect to it with
-`Start --> Run --> \\cernbox-smb\eos\user`
-
-![SAMBA connexion](../../assets/images/samba_1.png)
-
-You can also type the full path to your CERNBox, for example
-    `\\cernbox-smb\eos\user\d\duret`
-
-- OR, you can change your Windows configuration by mapping your CERNBox to a Network drive, for example Y:
-
-![SAMBA mount as network drive](../../assets/images/samba_2.png)
-
-<a id="KB0003190"></a>
-## WebDav
-An alternative to viewing your CERNBox files/folders is to mount CERNBox using WebDav. Use the following syntax:
-
-`https://cernbox.cern.ch/cernbox/webdav/home`
-
-Full access the to underlying storage is available using the full path, for example, something like:
-    
-`https://cernbox.cern.ch/cernbox/webdav/eos/project/c/cernbox`  
-
-Note: please do not rely on these URLs in the web browser.
-
-**Suggestions/Limitations**:
-
-- Cyberduck (see below) and other decent 3rd party tools work best
-- MacOSX Finder WebDAV Client is not very efficient, you can expect slowdowns depending on your network connectivity
-- Windows Network Drive and File Explorer: some Windows installations might experience connection problems (issue is being investigated), suggest using SAMBA
-
-<a id="KB0003184"></a>
-## Cyberduck
-You can mount CERNBox via Cyberduck, which is an open source client for FTP and SFTP, WebDAV. It is available for Mac OS X and Windows, licensed under the GPL.
-
-- Download and install Cyberduck from the following link: [https://cyberduck.io/?l=en](https://cyberduck.io/?l=en)
-- Launch Cyberduck and type your Username and Password:
-
-![Cyberduck step 1](../../assets/images/cyberduck_1.png)
-
-- Then click on **Open Connection** button:
-
-![Cyberduck Step 2](../../assets/images/cyberduck_2.png)
-
-- The **Open Connection** window will pop up, select **WebDav (Https/SSL)** from the drop down menu:
-
-![Cyberduck Step 3](../../assets/images/cyberduck_3.png)
-
-- Then type *cernbox.cern.ch* in the Server box
-- Type your Username and Password
-- Click on **More Options** and 
-- Insert the path as follows */cernbox/webdav/home*
-- Then click **Connect**
-
-![Cyberduck Step 4](../../assets/images/cyberduck_4.png)
-
-- Your CERNbox will then be mounted via Cyberduck
-
-![CERNBox mounted via Cyberduck](../../assets/images/cyberduck_5.png)
-
-<a id="KB0003232"></a>
-## Lxplus
-
-CERNBox files are stored in EOS (the disk-based storage service), in the instance EOSUSER, to be precise . 
-
-If you want to access your CERNBox files in EOS from **lxplus**, do the following: 
-
-   `% cd /eos/user/<initial>/<account>`
-
-to access your eosuser directory
-
-## EOS and XRootD client access 
-
-The XRootD/EOS entry point (instance server) for your files in CERNbox is `root://eosuser.cern.ch`
-and your user directories are under `/eos/user/<initial>/<userid>`,  (e.g. `/eos/user/l/laman`)
-
-- To create a directory:
-
-`% eos mkdir /eos/user/<initial>/<userid>/<my_directory>`, (e.g. `% eos mkdir /eos/user/l/laman/office_plans`)
-
-**NOTE**: if you are using EOS for both CERNBox and your experiment be sure to verify which instance of EOS you are querying when running EOS commands. 
-
-One way to force an EOS command to query a specific instance is to specify the server for that instance in the command line:  
-
-`% eos <instance server> <command>`
-
-(e.g. to list laman's files in CERNBox, `% eos root://eosuser.cern.ch ls /eos/user/l/laman`)
-(e.g. to query EOSCMS, `% eos root://eoscms.cern.ch <command>`)
-
- 
-
----
-
-
diff --git a/docs/desktop/index.md b/docs/desktop/index.md
index 3690dfd369ef841d810020b0a7ca319b6d22aefd..de1822582a965429c8b2f7656fc0457178927b4f 100644
--- a/docs/desktop/index.md
+++ b/docs/desktop/index.md
@@ -1 +1,5 @@
-# Desktop
\ No newline at end of file
+# Desktop Access
+
+TODO intro to desktop access?
+
+Besides being accessible via a web UI, you can also access the files locally in your computer. blabla
diff --git a/docs/desktop/access-methods/.pages b/docs/desktop/other-access-methods/.pages
similarity index 73%
rename from docs/desktop/access-methods/.pages
rename to docs/desktop/other-access-methods/.pages
index d83736750556af98536812f7e41fcedb8aac2e3c..3732ba5360e5b31d4e55bb2ca2a086bf8a4bbff1 100644
--- a/docs/desktop/access-methods/.pages
+++ b/docs/desktop/other-access-methods/.pages
@@ -1,6 +1,4 @@
 nav:
-- index.md
-- index.fr.md
 - desktop-mobile-access.md
 - desktop-mobile-access.fr.md 
 - ...
\ No newline at end of file
diff --git a/docs/desktop/access-methods/cyberduck.fr.md b/docs/desktop/other-access-methods/cyberduck.fr.md
similarity index 100%
rename from docs/desktop/access-methods/cyberduck.fr.md
rename to docs/desktop/other-access-methods/cyberduck.fr.md
diff --git a/docs/desktop/access-methods/cyberduck.md b/docs/desktop/other-access-methods/cyberduck.md
similarity index 100%
rename from docs/desktop/access-methods/cyberduck.md
rename to docs/desktop/other-access-methods/cyberduck.md
diff --git a/docs/desktop/access-methods/desktop-mobile-access.md b/docs/desktop/other-access-methods/desktop-mobile-access.md
similarity index 100%
rename from docs/desktop/access-methods/desktop-mobile-access.md
rename to docs/desktop/other-access-methods/desktop-mobile-access.md
diff --git a/docs/desktop/other-access-methods/eos_xrootd.fr.md b/docs/desktop/other-access-methods/eos_xrootd.fr.md
new file mode 100644
index 0000000000000000000000000000000000000000..b6ec3e49b4f78fa3419b0330d62c97f9d41abc53
--- /dev/null
+++ b/docs/desktop/other-access-methods/eos_xrootd.fr.md
@@ -0,0 +1,17 @@
+# Accés par EOS et XRootD
+
+Le point d'entrée XRootD/EOS  (instance serveur) pour vos fichiers CERNbox est `root://eosuser.cern.ch`
+et votre répertoire est  `/eos/user/<initial>/<userid>`,  (e.g. `/eos/user/l/laman`)
+
+- Pour créer un répertoire dans votre espace CERNBox:
+
+`% eos mkdir /eos/user/<initial>/<userid>/<my_directory>`, (e.g. `eos mkdir /eos/user/l/laman/office_plans`)
+
+!!! warning "Note"
+
+     Si vous utilisez EOS pour CERNBox et pour votre expérience de physique, vérifier toujours quelle est l'instance EOS à laquelle vous accèdez avant d'exécuter des commandes EOS. 
+
+     Pour être certain d'accèder à la bonne instance EOS, il est recommandé d'utiliser la commande   `% eos <instance server> <command>` avant toute autre commande EOS
+     Exemples : 
+       - pour avoir la liste des fichiers de l'utilisateur laman dans CERNBox, `>eos root://eosuser.cern.ch ls /eos/user/l/laman`
+       - pour interroger l'instance EOSCMS, `>eos root://eoscms.cern.ch <command>`
diff --git a/docs/desktop/other-access-methods/eos_xrootd.md b/docs/desktop/other-access-methods/eos_xrootd.md
new file mode 100644
index 0000000000000000000000000000000000000000..47491ca4057ac92d040c6e2d13dcccca7c97a580
--- /dev/null
+++ b/docs/desktop/other-access-methods/eos_xrootd.md
@@ -0,0 +1,17 @@
+# EOS and XRootD client access 
+
+The XRootD/EOS entry point (instance server) for your files in CERNbox is `root://eosuser.cern.ch`
+and your user directories are under `/eos/user/<initial>/<userid>`,  (e.g. `/eos/user/l/laman`)
+
+- To create a directory:
+
+`% eos mkdir /eos/user/<initial>/<userid>/<my_directory>`, (e.g. `% eos mkdir /eos/user/l/laman/office_plans`)
+
+!!! warning "Note"
+
+    If you are using EOS for both CERNBox and your experiment be sure to verify which instance of EOS you are querying when running EOS commands. 
+
+    One way to force an EOS command to query a specific instance is to specify the server for that instance in the command line: `% eos <instance server> <command>`
+    Exemples
+      - to list laman's files in CERNBox, `% eos root://eosuser.cern.ch ls /eos/user/l/laman`
+      - to query EOSCMS, `% eos root://eoscms.cern.ch <command>`
diff --git a/docs/desktop/access-methods/lxplus.fr.md b/docs/desktop/other-access-methods/lxplus.fr.md
similarity index 100%
rename from docs/desktop/access-methods/lxplus.fr.md
rename to docs/desktop/other-access-methods/lxplus.fr.md
diff --git a/docs/desktop/access-methods/lxplus.md b/docs/desktop/other-access-methods/lxplus.md
similarity index 100%
rename from docs/desktop/access-methods/lxplus.md
rename to docs/desktop/other-access-methods/lxplus.md
diff --git a/docs/desktop/access-methods/samba.fr.md b/docs/desktop/other-access-methods/samba.fr.md
similarity index 85%
rename from docs/desktop/access-methods/samba.fr.md
rename to docs/desktop/other-access-methods/samba.fr.md
index b4237c733b29cba7cf518c3f24edddb9c673830d..2fd28dcef97623fe8ce5c22024b1c3f4cfc66c11 100644
--- a/docs/desktop/access-methods/samba.fr.md
+++ b/docs/desktop/other-access-methods/samba.fr.md
@@ -4,7 +4,9 @@
 
 Depuis une machine sous Windows, vous pouvez accèder directement à votre espace CERNBox à travers votre gestionnaire de fichiers. SAMBA est configuré pour accèder à EOSUSER, espace de stockage pour CERNBox.
 
-> [warning] Cette fonctionalité est seulement disponible depuis le réseau local du CERN (LAN), si vous avez besoin d'accèder a ce service depuis un réseau étendu (WAN), veuillez vous servir d'outils tel que le Sync Client, WebDav ou le via le navigateur internet.
+!!! warning
+    
+    Cette fonctionalité est seulement disponible depuis le réseau local du CERN (LAN), si vous avez besoin d'accèder a ce service depuis un réseau étendu (WAN), veuillez vous servir d'outils tel que le Sync Client, WebDav ou le via le navigateur internet.
 
 - Se connecter à SAMBA via `Start` --> `Run` --> `\\cernbox-smb.cern.ch\eos\user`
 
diff --git a/docs/desktop/access-methods/samba.md b/docs/desktop/other-access-methods/samba.md
similarity index 90%
rename from docs/desktop/access-methods/samba.md
rename to docs/desktop/other-access-methods/samba.md
index 5dfc38568ecbf6cefdf567e0572b4c348534a51d..6a6a6b9828e1487d4bd2ad2e493f3174d587a17a 100644
--- a/docs/desktop/access-methods/samba.md
+++ b/docs/desktop/other-access-methods/samba.md
@@ -2,7 +2,9 @@
 
 From a Windows machine, you may want to access your CERNBox directly from the File Explorer, using the standard CIFS/SMB protocol. A cluster of Samba gateways is provided for this purpose.
 
-> [warning] This method only works within the CERN Local Area Network. If you need external online access, you may use the web browser or the [WebDAV](webdav.md) method.
+!!! warning
+
+    This method only works within the CERN Local Area Network. If you need external online access, you may use the web browser or the [WebDAV](webdav.md) method.
 
 - Connect to the Samba gateways with `Start` --> `Run` --> `\\cernbox-smb\eos\user`
 
diff --git a/docs/desktop/access-methods/webdav.fr.md b/docs/desktop/other-access-methods/webdav.fr.md
similarity index 100%
rename from docs/desktop/access-methods/webdav.fr.md
rename to docs/desktop/other-access-methods/webdav.fr.md
diff --git a/docs/desktop/access-methods/webdav.md b/docs/desktop/other-access-methods/webdav.md
similarity index 58%
rename from docs/desktop/access-methods/webdav.md
rename to docs/desktop/other-access-methods/webdav.md
index ed4da773669202e95d51d6b65d1ea4907248712d..06e51f6f5574ea99f58c5975cea88cf54e4e9944 100644
--- a/docs/desktop/access-methods/webdav.md
+++ b/docs/desktop/other-access-methods/webdav.md
@@ -11,8 +11,8 @@ For project space: `https://cernbox.cern.ch/cernbox/webdav/eos/project/c/cernbox
 
 Note: please do not use these URLs in the web browser.
 
-> **[warning] Suggestions/Limitations**:
->
-> - The MacOSX Finder WebDAV Client is not very efficient, you can expect slowdowns depending on your network connectivity
-> - The Windows File Explorer provides a limited support of the WebDAV standard and is effectively not working with CERNBox
-> - In both cases, we recommend to use Cyberduck (see below) or other 3rd party tools
+!!! warning "Suggestions/Limitations"
+
+     - The MacOSX Finder WebDAV Client is not very efficient, you can expect slowdowns depending on your network connectivity
+     - The Windows File Explorer provides a limited support of the WebDAV standard and is effectively not working with CERNBox
+     - In both cases, we recommend to use Cyberduck (see below) or other 3rd party tools
diff --git a/docs/desktop/sync-client/.pages b/docs/desktop/sync-client/.pages
index 29b88df5f3a403c0341aa72d2f7e6d941e6e165d..1046e7706a80a78a8678a786cf96672256f188f2 100644
--- a/docs/desktop/sync-client/.pages
+++ b/docs/desktop/sync-client/.pages
@@ -9,6 +9,7 @@ nav:
 - manage_your_synchronisation.fr.md
 - add_a_folder_sync_connection.md
 - add_a_folder_sync_connection.fr.md
+- sync_project.md
 - vfs_mode.md
 - vfs_mode.fr.md
 - uninstall_sync_client.md
diff --git a/docs/desktop/sync-client/sync_project.md b/docs/desktop/sync-client/sync_project.md
new file mode 100644
index 0000000000000000000000000000000000000000..658649da8c2cf18c0f0bd498419414158bcabfca
--- /dev/null
+++ b/docs/desktop/sync-client/sync_project.md
@@ -0,0 +1,38 @@
+# Sync a project
+
+Follow steps 2->10 to synchronise a remote project to one of your local folders. You might already have been given the **path** of the project's location, but otherwise you can **copy** it from the Web browser view to your CERNBox:
+
+![](../../../assets/images/proj-space-sync-6.png)
+
+Open your CERNBox Sync Client to set up the project->local folder synchronisation. Click on the CERNBox Sync Client icon ![](../../../assets/images/cloud_green.png) to open it - if this was not running previously, you will have to start it.
+
+![](../../../assets/images/proj-space-sync-8.png)
+
+![](../../../assets/images/proj-space-sync-11.png)
+
+**Paste** the path that you copied:
+
+![](../../../assets/images/proj-space-sync-12.png)
+
+![](../../../assets/images/proj-space-sync-16.png)
+
+![](../../../assets/images/proj-space-sync-18.png)
+
+![](../../../assets/images/proj-space-sync-19.png)
+
+![](../../../assets/images/proj-space-sync-24.png)
+
+## Sync one specific project folder locally
+
+Instead of synchronising the complete folder to your local folder, you may decide to synchronise a **SPECIFIC** folder only. 
+
+Open your CERNBox Sync Client, click on 'Add Folder Sync Connection', and follow steps 1->7. In our example, the folder 'microtests' in the remote project 'noafs' is being synced to the local folder 'no-afs-microtests'
+
+![](../../../assets/images/proj-space-sync-41.png)
+
+![](../../../assets/images/proj-space-sync-42.png)
+
+![](../../../assets/images/proj-space-sync-43.png)
+
+![](../../../assets/images/proj-space-sync-44.png)
+
diff --git a/docs/faq/index.fr.md b/docs/faq/index.fr.md
deleted file mode 100644
index c838f05911db1df5299c8386c46196d8799b7710..0000000000000000000000000000000000000000
--- a/docs/faq/index.fr.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# FAQ
-
-Les FAQ de CERNBox se trouvent dans [la cantalogue](https://cern.service-now.com/service-portal?id=kb_article&n=KB0004587).
\ No newline at end of file
diff --git a/docs/faq/index.md b/docs/faq/index.md
deleted file mode 100644
index 4f60c6547bf7809ad221f671deb5ef2f87acdbda..0000000000000000000000000000000000000000
--- a/docs/faq/index.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# FAQ
-
-CERNBox FAQs can be found in [CERNBox Ordered FAQs List](https://cern.service-now.com/service-portal?id=kb_article&n=KB0004587).
-
diff --git a/docs/index.fr.md b/docs/index.fr.md
index 46d5c4fbb5fd233c6a2b13fe7017945d303af64f..e287db7aba089a3f3ca51e5a02178f90321831bf 100644
--- a/docs/index.fr.md
+++ b/docs/index.fr.md
@@ -7,4 +7,4 @@ En savoir plus sur l'utilisation de CERNBox via
 
  * [Interface utilisateur Web] (./web/new-web/index.md)
  * [Clients mobiles](./mobile/)
- * [Clients de bureau](./desktop/)
\ No newline at end of file
+ * [Access desktop](./desktop/)
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
index 71117149d12be51c6c98293254605333193bd60e..f808dae33a0f5fea521ffc480257bd8abf5ac5a7 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -7,4 +7,4 @@ Learn more how to use CERNBox via
 
  * [Web UI](./web/new-web/index.md)
  * [Mobile Clients](./mobile/)
- * [Desktop Clients](./desktop/)
\ No newline at end of file
+ * [Desktop Access](./desktop/)
\ No newline at end of file
diff --git a/docs/web/.pages b/docs/web/.pages
index 551a1185abef1d45d8f74e5e88538f730c57554d..225c60334259091ce36391a8ce6f656d946cbfe4 100644
--- a/docs/web/.pages
+++ b/docs/web/.pages
@@ -8,12 +8,9 @@ nav:
 - access.fr.md
 - managing-files.md
 - managing-files.fr.md
-- apps.md
-- apps.fr.md
-- projects.md
-- projects.fr.md
-- data-security.md
-- data-security.fr.md
+- quota.md
+- quota.fr.md
+- data-security
 - sharing
-- project-space
-- space_quota
+- apps
+- projects
diff --git a/docs/web/access.fr.md b/docs/web/access.fr.md
index 7c39f72243e9769122b12367ed52ea89f182478d..b58d17d24ca429629a6664568305c2879992fca1 100644
--- a/docs/web/access.fr.md
+++ b/docs/web/access.fr.md
@@ -35,6 +35,7 @@ https://new.cernbox.cern.ch/files/spaces**/eos/user/<letter\>/<username\>**
 CERNBox, qui utilise le [système de stockage EOS](https://eos.web.cern.ch){target=_blank} sous le capot, expose désormais son espace de noms complet. Cela signifie que la plupart de nos méthodes d'accès (à l'exception du client mobile, pour l'instant) ont une vue cohérente et plus intuitive.
 
 !!! tip
+
     Cela signifie également qu'il est désormais possible de simplement copier votre URL et de la partager directement avec quelqu'un d'autre. Si cette personne a des autorisations, elle pourra l'ouvrir.
 
-    Cela fonctionne également avec des liens directs vers [applications] (apps.md).
\ No newline at end of file
+    Cela fonctionne également avec des liens directs vers [applications] (./apps).
\ No newline at end of file
diff --git a/docs/web/access.md b/docs/web/access.md
index 206a36014edba116fdc446198cddaa20f467492a..f64ebbfcb61850d92330ba4e29c7238436e64e51 100644
--- a/docs/web/access.md
+++ b/docs/web/access.md
@@ -1,13 +1,15 @@
 # Access instructions
 
+## How to get an account?
+
+The initial and **mandatory step** to using your CERNBox is to create it. Use any Web browser to go to [https://cernbox.cern.ch](https://cernbox.cern.ch) and login via the CERN Single Sign-On page with your username and password. 
+
 ## How to access?
 
-The new service is temporarily available under the address [new.cernbox.cern.ch](https://new.cernbox.cern.ch){target=_blank}.
+The new service is available under the same address as before [cernbox.cern.ch](https://cernbox.cern.ch){target=_blank}.
 
 ![The new CERNBox UI](../assets/screenshots/main-window.png)
 
-Users will be migrated to this new UI in stages but anyone wanting to try it is welcomed. Once all users are migrated, **the new service will replace the old UI and become available under the usual cernbox.cern.ch address**.
-
 All the other access methods are still possible:
 
 * Windows: the `H:` drive for home spaces and the `\\eosproject-smb` network share for all other spaces
@@ -35,6 +37,7 @@ https://new.cernbox.cern.ch/files/spaces**/eos/user/<letter\>/<username\>**
 CERNBox, which uses the [EOS storage system](https://eos.web.cern.ch){target=_blank} under the hood, now exposes its full namespace. This means most of our access methods (excluding the mobile client, for now) have a consistent and more intuitive view.
 
 !!! tip
+
     It also means that now it's possible to just copy your URL and share it directly with someone else. If that person has permissions, he/she will be able to open it.
 
-    This also works with direct links to [applications](apps.md).
+    This also works with direct links to [applications](./apps).
diff --git a/docs/web/integrated-editors/codimd.md b/docs/web/apps/codimd.md
similarity index 100%
rename from docs/web/integrated-editors/codimd.md
rename to docs/web/apps/codimd.md
diff --git a/docs/web/apps.fr.md b/docs/web/apps/index.fr.md
similarity index 100%
rename from docs/web/apps.fr.md
rename to docs/web/apps/index.fr.md
diff --git a/docs/web/apps.md b/docs/web/apps/index.md
similarity index 70%
rename from docs/web/apps.md
rename to docs/web/apps/index.md
index c36eeb261548e91d371711d420ebb2008cd050f2..313e17baa31e4dd4fc911f5beb69db3b1bd08e0d 100644
--- a/docs/web/apps.md
+++ b/docs/web/apps/index.md
@@ -1,4 +1,4 @@
-# Applications
+# Overview
 
 ## Online viewing/editing capabilities
 
@@ -25,19 +25,19 @@ The first 2 apps (MS Office 365 and CodiMD), also have concurrent editing capabi
 
 Clicking on a file will open it with the default application. To open with a different one, right click the file to see the options.
 
-![Open a file with different apps](../assets/screenshots/apps-context.png)
+![Open a file with different apps](../../assets/screenshots/apps-context.png)
 
 ## Application URLs
 
-Just like all other URLs (see [Universal URLs](access.md#universal-urls)), the application URLs are also shareable with someone who has access to the file. They are also bookmarkeable so that you always land on the same application and on the same file.
+Just like all other URLs (see [Universal URLs](../access.md#universal-urls)), the application URLs are also shareable with someone who has access to the file. They are also bookmarkeable so that you always land on the same application and on the same file.
 
-![Example document opened in MS Office 365](../assets/screenshots/word.png)
+![Example document opened in MS Office 365](../../assets/screenshots/word.png)
 
 To share the URL to a file without choosing which application to use (leaving that to the receiver), it's possible to copy a `Direct link` from the right sidebar.
 
 
 ## Learn more about file apps
-- [CodiMD](../integrated-editors/codimd.md)
-- [MS Office 365](../integrated-editors/office_online.md)
-- [Notebook viewer and editor](../integrated-editors/notebook_viewer_and_editor.md)
-- [Root](../integrated-editors/root_analyse.md)
+- [CodiMD](codimd.md)
+- [MS Office 365](office_online.md)
+- [Notebook viewer and editor](notebook_viewer_and_editor.md)
+- [ROOT](root_analyse.md)
diff --git a/docs/web/integrated-editors/notebook_viewer_and_editor.fr.md b/docs/web/apps/notebook_viewer_and_editor.fr.md
similarity index 100%
rename from docs/web/integrated-editors/notebook_viewer_and_editor.fr.md
rename to docs/web/apps/notebook_viewer_and_editor.fr.md
diff --git a/docs/web/integrated-editors/notebook_viewer_and_editor.md b/docs/web/apps/notebook_viewer_and_editor.md
similarity index 100%
rename from docs/web/integrated-editors/notebook_viewer_and_editor.md
rename to docs/web/apps/notebook_viewer_and_editor.md
diff --git a/docs/web/integrated-editors/office_online.fr.md b/docs/web/apps/office_online.fr.md
similarity index 100%
rename from docs/web/integrated-editors/office_online.fr.md
rename to docs/web/apps/office_online.fr.md
diff --git a/docs/web/integrated-editors/office_online.md b/docs/web/apps/office_online.md
similarity index 100%
rename from docs/web/integrated-editors/office_online.md
rename to docs/web/apps/office_online.md
diff --git a/docs/web/integrated-editors/root_analyse.fr.md b/docs/web/apps/root_analyse.fr.md
similarity index 100%
rename from docs/web/integrated-editors/root_analyse.fr.md
rename to docs/web/apps/root_analyse.fr.md
diff --git a/docs/web/space_quota/features-deleted-files.md b/docs/web/data-security/features-deleted-files.md
similarity index 100%
rename from docs/web/space_quota/features-deleted-files.md
rename to docs/web/data-security/features-deleted-files.md
diff --git a/docs/web/space_quota/features-file-versioning.md b/docs/web/data-security/features-file-versioning.md
similarity index 100%
rename from docs/web/space_quota/features-file-versioning.md
rename to docs/web/data-security/features-file-versioning.md
diff --git a/docs/web/data-security.fr.md b/docs/web/data-security/index.fr.md
similarity index 100%
rename from docs/web/data-security.fr.md
rename to docs/web/data-security/index.fr.md
diff --git a/docs/web/data-security.md b/docs/web/data-security/index.md
similarity index 100%
rename from docs/web/data-security.md
rename to docs/web/data-security/index.md
diff --git a/docs/web/space_quota/recover_files_folders.fr.md b/docs/web/data-security/recover_files_folders.fr.md
similarity index 100%
rename from docs/web/space_quota/recover_files_folders.fr.md
rename to docs/web/data-security/recover_files_folders.fr.md
diff --git a/docs/web/space_quota/recover_files_folders.md b/docs/web/data-security/recover_files_folders.md
similarity index 100%
rename from docs/web/space_quota/recover_files_folders.md
rename to docs/web/data-security/recover_files_folders.md
diff --git a/docs/web/getting-started/create_files_folders.md b/docs/web/getting-started/create_files_folders.md
index d408a6d30cdc39c4a8053f32df6c01daa55edb3b..449f893a75707e2435eb820da6a95ba3f57372d6 100644
--- a/docs/web/getting-started/create_files_folders.md
+++ b/docs/web/getting-started/create_files_folders.md
@@ -1,8 +1,8 @@
 # Create files/folders
 
-> **[info] To see the visual guide for managing your file structure**
->
-> Click [here](https://cds.cern.ch/record/2791207/files/ManageStructure_CERNBox.pdf).
+!!! info "To see the visual guide for managing your file structure"
+
+    Click [here](https://cds.cern.ch/record/2791207/files/ManageStructure_CERNBox.pdf).
 &nbsp;
 
 
diff --git a/docs/web/index.fr.md b/docs/web/index.fr.md
index d22c60b8ee80e21f28f13852f58f19730c289f16..8883e03ebbc9a2334c1a6dd93c16a846b0de2141 100644
--- a/docs/web/index.fr.md
+++ b/docs/web/index.fr.md
@@ -18,7 +18,7 @@ Celles-ci incluent des explications sur les nouvelles fonctionnalités majeures
 * Interface utilisateur plus moderne et intuitive
 * [URL universelles](access.md#universal-urls)
 * [Partage de fichier unique](sharing.md#internal-shares)
-* [Écosystème d'applications amélioré](apps.md)
+* [Écosystème d'applications amélioré](./apps)
 * [Intégration améliorée des projets](projects.md)
 * [Prise en charge des comptes légers](access.md#accounts-supported)
 * [Refus d'accès](sharing.md#deny-access)
@@ -36,8 +36,7 @@ Celles-ci incluent des explications sur les nouvelles fonctionnalités majeures
 * [Comment utiliser Office](../integrated-editors/office_online.md)
 
 
-!!! Info
-    D'autres fonctionnalités arriveront dans les mois à venir :
+!!! Info "D'autres fonctionnalités arriveront dans les mois à venir" 
 
     * Intégrations avec d'autres services (Indico déjà disponible)
     * Recherche améliorée
diff --git a/docs/web/index.md b/docs/web/index.md
index bb035065cd374c561ff85dc3d0d1b5a83c563970..a42d0c0c84ef89918e704d597bf0845c9568f268 100644
--- a/docs/web/index.md
+++ b/docs/web/index.md
@@ -1,44 +1,33 @@
 # Welcome to the new CERNBox!
 
-This documents aims to explain the basic functionalities of the new and redesigned [CERNBox](https://new.cernbox.cern.ch){target=_blank}, as well as introduce the brand new features exclusive to it.
+This documents aims to explain the basic functionalities of the new and redesigned [CERNBox](https://cernbox.cern.ch){target=_blank}, as well as introduce the brand new features exclusive to it.
 
 ## What's changed ?
 
-Everything available in the previous system is also available with a new modern look in the new, including the 1TB of storage space and the security and condifentiality assurances provided by the CERN Data Center. 
+Everything available in the previous system is also available with a new modern look in the new, including the 1TB of storage space and the security and confidentiality assurances provided by the CERN Data Center. 
 
-The new interface aims to improve the usability. Here are some interface changes we made:
-
- * [Interface changes](interface-changes.md)
+The new interface aims to improve the usability. Check the changes in the section [Interface changes](interface-changes.md).
 
 ## New features
 
 We invite you to read the topics presented on the left menu.
 These include explanations to the new major functionalities introduced:
 
-* More modern and intuitive UI
+* [More modern and intuitive UI](interface-changes.md)
 * [Universal URLs](access.md#universal-urls)
 * [Single file sharing](sharing.md#internal-shares)
-* [Improved app ecosystem](apps.md)
+* [Improved app ecosystem](./apps)
 * [Improved Projects integration](projects.md)
 * [Lightweight accounts support](access.md#accounts-supported)
 * [Access denials](sharing.md#deny-access)
 * [Improved Sync Client integration](sync-clients.md)
 
-
-
-
-
 ## Did you know you can work with Markdown and Office files?
-
-
  
-* [How to use Markdown](../integrated-editors/codimd.md)
-* [How to use Office](../integrated-editors/office_online.md)
-
-
+* [How to use Markdown](apps/codimd.md)
+* [How to use Office](apps/office_online.md)
 
-!!! info
-    Other features will be coming in the coming months:
+!!! info "Other features will be coming in the coming months"
 
     * Integrations with other services (Indico already available)
     * Improved search
diff --git a/docs/web/integrated-editors/README.fr.md b/docs/web/integrated-editors/README.fr.md
deleted file mode 100644
index 11b4a415179f2bcec517c5be88048c9fb06f9b16..0000000000000000000000000000000000000000
--- a/docs/web/integrated-editors/README.fr.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Utiliser CERNBox pour travailler en collaboration 
-
-CERNBox comprends un certain nombre de lecteurs et d'éditeurs directement intégrés dans l'interface web, afin de faciliter le collaboration.. Aujourd'hui les outils disponibles sont :
-- Un lecteur basé sur [l'outil d'analyse](root_analyse.md) [ROOT](https://root.cern.ch/about)(en anglais) développé au CERN.
-- un lecteur et editeur du [bloc-note interactif](lecteur_editeur_blocnote.md), basé sur [SWAN](http://swan.web.cern.ch)(en anglais)
-- un lecteur et editeur pour [documents Microsoft Office](office_online.md), basé sur Microsoft Office Online et fourni par IT/CDA 
diff --git a/docs/web/integrated-editors/README.md b/docs/web/integrated-editors/README.md
deleted file mode 100644
index 5c2aa2291fe3964fc765d21a265bf116288d7545..0000000000000000000000000000000000000000
--- a/docs/web/integrated-editors/README.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# Using CERNBox for collaborative work
-
-CERNBox integrates a number of viewers and editors directly from the web interface, to ease collaboration with other colleagues. Currently, the following tools are available:
-
-- [Root file viewer](../integrated_editors#root-file-viewer) - a viewer based on the [ROOT](https://root.cern.ch/about-root) analysis framework developed at CERN.
-- [Interactive notebook](notebook_viewer_and_editor.md) - a viewer and editor based on [SWAN](http://swan.web.cern.ch) (Service for Web ANalysis).
-- [OnlyOffice](only-office.md) - a viewer and editor for MS Office (OOXML) documents.
-- Collabora Online - a viewer and editor for ODF files.
-- [MS Office Online](office_online.md) - a viewer and editor for MS Office (OOXML) documents.
-
-The Office document editors are provided and supported by IT/CDA.
-
-## ROOT file viewer
-
-ROOT files are marked with the ![](../../../assets/images/cernbox_icons_root.png) icon.
-
-The viewing page is divided in two main parts:
-
-- On the left-hand side, information on the file and on the way it is displayed
-- On the right-hand side, a display area which can be customized according to a list of different pre-defined layouts. 
-![View ROOT files in CERNBox: Example](../../../assets/images/root_1.png)
-
-### Layout function
-For example, you can decide to see each graph one by one, or to see the 3 graphs in one view:
-
-- Choose your layout from the pop-up menu 
-![](../../../assets/images/root_layout.png)(the default option is  '*simple*')
-![Before changing layout](../../../assets/images/root_2.png)
-- and click on the ***Reload with selected layout*** button
-![After changing layout](../../../assets/images/root_3.png)
-
-
-<table style="width:100%">
-<tr><th>Layout</th>
-	<th>Description</th></tr>
-<tr><td>simple</td>
-	<td>default value; result displayed in the full view area</td></tr>
-<tr><td>collapsible</td>
-	<td>
-<!-- TO BE CHECKED -->
-</td></tr>
-<tr><td>flex</td>
-	<td>
-<!-- TO BE CHECKED -->
-</td></tr>
-<tr><td>tabs</td>
-	<td>open each result in a different tab 
-<!-- TO BE CHECKED <mark> was not able to do it in Windows+ie on hsimple.root</mark> 
--->
-</td></tr>
-<tr><td>grid axb</td>
-	<td>a:1..4, b:2..4<br>divide the output screen horizontally in <i>a</i>, vertically in <i>b</i><br>available configurations:1x2, 2x2, 1x3, 2x3, 3x3, 4x4</td></tr>
-</table>
-
-### Zooming function
-On a chart, select the part you want to zoom in; 
-
-in the following example, zoom in the tails of the histogram
-
-![Zoom on part of ROOT file](../../../assets/images/root_5.png)
-
diff --git a/docs/web/managing-files.fr.md b/docs/web/managing-files.fr.md
index eee6ba083ede9c182687645c56fec1e3f7ce5527..04bf05372322c263204bceb9498be6d44b860013 100644
--- a/docs/web/managing-files.fr.md
+++ b/docs/web/managing-files.fr.md
@@ -2,7 +2,7 @@
 
 ## Ajout de fichiers
 
-Pour ajouter des fichiers, vous pouvez utiliser les boutons `Télécharger` ou `Nouveau`. Pour voir quelles extensions de fichiers sont visibles/modifiables par les applications intégrées, veuillez consulter la page [applications](apps.md#online-viewingediting-capabilities).
+Pour ajouter des fichiers, vous pouvez utiliser les boutons `Télécharger` ou `Nouveau`. Pour voir quelles extensions de fichiers sont visibles/modifiables par les applications intégrées, veuillez consulter la page [applications](./apps/#online-viewingediting-capabilities).
 
 ![Créer un nouveau fichier](../assets/screenshots/new-file-menu.png)
 
diff --git a/docs/web/managing-files.md b/docs/web/managing-files.md
index ebca90e614e062f5c3d3a29be564d302eddc7875..6bb7569cd8c6533aa07d9f9b50f77ca8897dea95 100644
--- a/docs/web/managing-files.md
+++ b/docs/web/managing-files.md
@@ -2,7 +2,7 @@
 
 ## Adding files
 
-To add files, you can use the `Upload` or `New` buttons. To see what file extensions are viewable/editable by the integrated applications, please check the [applications](apps.md#online-viewingediting-capabilities) page.
+To add files, you can use the `Upload` or `New` buttons. To see what file extensions are viewable/editable by the integrated applications, please check the [applications](./apps/#online-viewingediting-capabilities) page.
 
 ![Create a new file](../assets/screenshots/new-file-menu.png)
 
diff --git a/docs/web/project-space/.pages b/docs/web/project-space/.pages
deleted file mode 100644
index 84f027ae4e9273206ed89688111ad77d221fa4f6..0000000000000000000000000000000000000000
--- a/docs/web/project-space/.pages
+++ /dev/null
@@ -1,17 +0,0 @@
-nav:
-- index.md
-- index.fr.md
-- requesting_for_project_space.md
-- requesting_for_project_space.fr.md
-- manage_project_space.md
-- manage_project_space.fr.md
-- access-to-project-space.md
-- access-to-project-space.fr.md
-- quota-for-project-space.md
-- quota-for-project-space.fr.md
-- delete-version-files-in-project.md
-- delete-version-files-in-project.fr.md
-- restore-file-in-project-space.md
-- restore-file-in-project-space.fr.md
-- unsubscribe-from-project.md
-- unsubscribe-from-project.fr.md
\ No newline at end of file
diff --git a/docs/web/project-space/index.fr.md b/docs/web/project-space/index.fr.md
deleted file mode 100644
index 6fe7c034a0fb7c82684878fd761d7c3fe318c7e6..0000000000000000000000000000000000000000
--- a/docs/web/project-space/index.fr.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Espace Projet dans CERNBox 
-
-Si vous voulez partager des données relatives à un projet/une activité, vous pouvez en faire la demande. Un espace sous EOS pourra alors vous être alloué. Les expériences LHC et d'autres disposent déjà d'un espace qui leur est dédié (se reporter à [la description du service (SLA)](https://cern.service-now.com/service-portal/service-element.do?name=storage-projects-experiments) pour plus d'informations).
- 
-## Obtenir la liste des projets enregistrés sous EOS
-
-CERNBox permet d'avoir un accès facile à la liste des projets qui sont enregistrés dans EOS. Pour cela, connectez vous à votre CERNBox via un navigateur Web et cliquez sur le filtre ***All projects*** dans la barre latérale gauche de l'écran.
-
-![Liste des projets dans EOS](../../assets/images/project_all_view.png)
-
-Par défaut, les projets sont triés par ordre alphabétique.
-
-Vous pouvez alors, comme pour n'importe quel dossier, cliquer sur son nom pour voir son contenu, si bien entendu vous avez les droits d'accès suffisants.
-Et, si c'est le cas (par exemple, vous êtes membre du e-groupe CERN attaché à ce projet), vous pouvez alors synchroniser tout ou partie du dossier sur votre ordinateur de bureau. Vous trouverez la procédure à suivre dans le chapitre  [Synchronisation](../synchronisation/).
diff --git a/docs/web/project-space/index.md b/docs/web/project-space/index.md
deleted file mode 100644
index 6dc9dfecd28647eeceb9e11f2bd7d8dab322dba3..0000000000000000000000000000000000000000
--- a/docs/web/project-space/index.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Project Space in CERNBox 
-
-'Project space' is used for storing data for an activity across different users. To request for project space, see section [Request for project space](requesting_for_project_space.md). Please note that large experiments/activities have dedicated EOS areas, and users can consult their experiment storage managers about this (see 'EOS for Physics' [Service Level Description](https://cern.service-now.com/service-portal?id=kb_article&n=KB0002879) for more details).
-
-In this section, see how to:
-
-* [List your projects](#list-your-projects)
-* [Sync a remote project locally](#sync-a-remote-project-locally)
-* [Sync one specific project folder locally](#sync-one-specific-project-folder-locally)
- 
-## List your projects
-
-CERNBox provides a list of all the CERNBox projects in which you are member. You become a member of a project if you are added by the project administrator to the one of the access e-groups.
-Connect to your CERNBox via a Web browser and click on ***Your projects*** (on left-hand side) to see the list.
-
-![](../../../assets/images/proj-space-sync-2.png)
-
-By default the list in 'Your projects' is displayed in alphabetical order, clicking ***Size*** or ***Modify*** will re-order the list accordingly.
-Your level of access to a project is granted by the project administrator. You will have **admin** or **write** or **reader** access to the project. To know your level of access to a project, open it and check as follows:
-
-**Admin** access is shown as:
-![](../../../assets/images/proj-space-sync-3.png)
-
-**Write** access is shown as:
-![](../../../assets/images/proj-space-sync-4.png)
-
-**Read** only access is shown as:
-![](../../../assets/images/proj-space-sync-5.png)
-
-Depending on how you wish to work, you may decide to synchronise a project with a folder on your desktop (i.e. locally). 
-
-## Sync a remote project locally
-
-Follow steps 2->10 to synchronise a remote project to one of your local folders. You might already have been given the **path** of the project's location, but otherwise you can **copy** it from the Web browser view to your CERNBox:
-
-![](../../../assets/images/proj-space-sync-6.png)
-
-Open your CERNBox Sync Client to set up the project->local folder synchronisation. Click on the CERNBox Sync Client icon ![](../../../assets/images/cloud_green.png) to open it - if this was not running previously, you will have to start it.
-
-![](../../../assets/images/proj-space-sync-8.png)
-
-![](../../../assets/images/proj-space-sync-11.png)
-
-**Paste** the path that you copied:
-
-![](../../../assets/images/proj-space-sync-12.png)
-
-![](../../../assets/images/proj-space-sync-16.png)
-
-![](../../../assets/images/proj-space-sync-18.png)
-
-![](../../../assets/images/proj-space-sync-19.png)
-
-![](../../../assets/images/proj-space-sync-24.png)
-
-## Sync one specific project folder locally
-
-Instead of synchronising the complete folder to your local folder, you may decide to synchronise a **SPECIFIC** folder only. 
-
-Open your CERNBox Sync Client, click on 'Add Folder Sync Connection', and follow steps 1->7. In our example, the folder 'microtests' in the remote project 'noafs' is being synced to the local folder 'no-afs-microtests'
-
-![](../../../assets/images/proj-space-sync-41.png)
-
-![](../../../assets/images/proj-space-sync-42.png)
-
-![](../../../assets/images/proj-space-sync-43.png)
-
-![](../../../assets/images/proj-space-sync-44.png)
-
diff --git a/docs/web/projects/.pages b/docs/web/projects/.pages
new file mode 100644
index 0000000000000000000000000000000000000000..6b0674d514f87dd1c1e3c032cc5d1605f5a0e88f
--- /dev/null
+++ b/docs/web/projects/.pages
@@ -0,0 +1,6 @@
+nav:
+- index.md
+- index.fr.md
+- requesting_for_project_space.md
+- requesting_for_project_space.fr.md
+- ...
\ No newline at end of file
diff --git a/docs/web/project-space/access-to-project-space.md b/docs/web/projects/access-to-project-space.md
similarity index 98%
rename from docs/web/project-space/access-to-project-space.md
rename to docs/web/projects/access-to-project-space.md
index 8a465ac388770279f39e9e953dc3498053aec976..f54c36beb9414bd0d378a25449f982cc743881be 100644
--- a/docs/web/project-space/access-to-project-space.md
+++ b/docs/web/projects/access-to-project-space.md
@@ -1,4 +1,4 @@
-# Manage access to your project space 
+# Manage access
 
 Access is controlled (via the **Web interface**):
    - to the ENTIRE project via the `-writers` and `readers` egroups 
diff --git a/docs/web/project-space/delete-version-files-in-project.md b/docs/web/projects/delete-version-files-in-project.md
similarity index 97%
rename from docs/web/project-space/delete-version-files-in-project.md
rename to docs/web/projects/delete-version-files-in-project.md
index 4851b14b97fb92b14c6740453323df638fee7631..9c52756a9fe0755dbbdbf996e1abcebdd29e0627 100644
--- a/docs/web/project-space/delete-version-files-in-project.md
+++ b/docs/web/projects/delete-version-files-in-project.md
@@ -1,4 +1,4 @@
-# Delete version files in your project space
+# Delete version files
 
 In some use cases, projects create many version files such that they consume the project's allowance of space. The commands below show you how to delete version files, but **WARNING** please be aware that you will lose one of the three ways to recover your files (the other two being the recycle bin and our backups).
 
diff --git a/docs/web/projects.fr.md b/docs/web/projects/index.fr.md
similarity index 82%
rename from docs/web/projects.fr.md
rename to docs/web/projects/index.fr.md
index 85b7a7336e97ad54be92d4dd4b104a584029d4c5..e2a2a5da1e0ec33706bfdfc9df56cfbd376f78cf 100644
--- a/docs/web/projects.fr.md
+++ b/docs/web/projects/index.fr.md
@@ -6,12 +6,10 @@ Pour avoir un aperçu des projets auxquels le compte connecté a accès, il est
 
 Maintenant, il est également possible de voir et de récupérer des fichiers de projets en faisant un clic droit sur un projet puis sur "Ouvrir la corbeille".
 
-![Corbeille du projet](../assets/screenshots/projects-trashbin.png)
+![Corbeille du projet](../../assets/screenshots/projects-trashbin.png)
 
 Les administrateurs de projet peuvent désormais voir les partages associés à un fichier/dossier et pourront les modifier. Tout partage créé par un administrateur sera associé au compte de service propriétaire du projet.
 
 ## Autres sources de données
 
-D'autres sources de données seront également ajoutées à CERNBox. Accès aux autres instances EOS ou aux répertoires d'accueil HPC, par exemple.
-
-[En savoir plus](../project-space/index.md) sur la gestion de projets
\ No newline at end of file
+D'autres sources de données seront également ajoutées à CERNBox. Accès aux autres instances EOS ou aux répertoires d'accueil HPC, par exemple.
\ No newline at end of file
diff --git a/docs/web/projects.md b/docs/web/projects/index.md
similarity index 56%
rename from docs/web/projects.md
rename to docs/web/projects/index.md
index d80c7ce1791483bd4141e9ae5dba8e96463254e9..288a4d892892fd619c496084546ea09bc08879c0 100644
--- a/docs/web/projects.md
+++ b/docs/web/projects/index.md
@@ -2,16 +2,16 @@
 
 ## Projects
 
+Projects are used for storing data for an activity across different users. To request for project space, see section [Request for project space](requesting_for_project_space.md). Please note that large experiments/activities have dedicated EOS areas, and users can consult their experiment storage managers about this (see 'EOS for Physics' [Service Level Description](https://cern.service-now.com/service-portal?id=kb_article&n=KB0002879) for more details).
+
 To have an overview of the projects to which the logged in account has access to, it's possible to list them by clicking in `Projects` on the left menu.
 
 Now it's also possible to see and recover files of projects by right clicking on a project and then on "Open trashbin".
 
-![Project trashbin](../assets/screenshots/projects-trashbin.png)
+![Project trashbin](../../assets/screenshots/projects-trashbin.png)
 
 Project administrators can now see the shares associated with a file/folder and will be able to edit them. Any shared created by an admin, will be associated with the service account that owns the project.
 
 ## Other data sources
 
 Other data sources will be added to CERNBox as well. Access to the other EOS instances or the HPC home directories, for example.
-
-[Learn more](../project-space/index.md) about managing projects
diff --git a/docs/web/project-space/manage_project_space.fr.md b/docs/web/projects/manage_project_space.fr.md
similarity index 100%
rename from docs/web/project-space/manage_project_space.fr.md
rename to docs/web/projects/manage_project_space.fr.md
diff --git a/docs/web/project-space/manage_project_space.md b/docs/web/projects/manage_project_space.md
similarity index 85%
rename from docs/web/project-space/manage_project_space.md
rename to docs/web/projects/manage_project_space.md
index 772b75709f6b372448505ff794ca0fab6eff652d..ea271cd1cbea2e08ff80c2b0e6533d4574c647e9 100644
--- a/docs/web/project-space/manage_project_space.md
+++ b/docs/web/projects/manage_project_space.md
@@ -13,8 +13,9 @@ Three (3) CERN e-groups to be **used to control access to the ENTIRE project spa
 To add other project space administrators to `cernbox-project-<projectname>-admins`, the Service Account holder has to login (using his/her own primary account) to https://e-groups.cern.ch and add other project space administrators to this egroup.
 Any member of `cernbox-project-<projectname>-admins` can give read/write access to a user (or an e-group) to the project. He/she needs to login (using his/her own primary account) into https://e-groups.cern.ch, and add the user (or e-group) to either the `-readers` or `-writers` e-groups.
 
-> **[Info] Waiting time (for propagation) after adding members to the project access e-groups**
-> We recommend waiting 40 mins, but it has been known to take longer, unfortunately.
+!!! info "Waiting time (for propagation) after adding members to the project access e-groups"
+
+    We recommend waiting 40 mins, but it has been known to take longer, unfortunately.
 
 The project space can be accessed both via CERNBox (Web browser or client) and on lxplus. 
 
@@ -24,7 +25,7 @@ For example on Lxplus, for a project called 'lattice' the project directory will
    - `/eos/project/l/lattice/public/` (public folder for all CERN authenticated users)
 
 ## Going to the project in CERNBox
-All members of the CERNBox project see the contents of the project by logging into https://cernbox.cern.ch and going to the ***Your project*** list (on left-hand side), and then clicking on the project name.
+All members of the CERNBox project see the contents of the project by logging into https://cernbox.cern.ch and going to the ***Projects*** list (on left-hand side), and then clicking on the project name.
 
 
 
diff --git a/docs/web/project-space/quota-for-project-space.md b/docs/web/projects/quota-for-project-space.md
similarity index 98%
rename from docs/web/project-space/quota-for-project-space.md
rename to docs/web/projects/quota-for-project-space.md
index 9e24621e153e38a53df68c5bdf7f3e967938d82f..1fca4f557f7c08ef9895316935b01e3f027a0294 100644
--- a/docs/web/project-space/quota-for-project-space.md
+++ b/docs/web/projects/quota-for-project-space.md
@@ -1,4 +1,4 @@
-# Check the quota for your project space
+# Check the quota
 
 To check the quota for your project you need to be: 
  *  the **Service Account** holder of the project
diff --git a/docs/web/project-space/requesting_for_project_space.fr.md b/docs/web/projects/requesting_for_project_space.fr.md
similarity index 100%
rename from docs/web/project-space/requesting_for_project_space.fr.md
rename to docs/web/projects/requesting_for_project_space.fr.md
diff --git a/docs/web/project-space/requesting_for_project_space.md b/docs/web/projects/requesting_for_project_space.md
similarity index 100%
rename from docs/web/project-space/requesting_for_project_space.md
rename to docs/web/projects/requesting_for_project_space.md
diff --git a/docs/web/project-space/restore-file-in-project-space.md b/docs/web/projects/restore-file-in-project-space.md
similarity index 97%
rename from docs/web/project-space/restore-file-in-project-space.md
rename to docs/web/projects/restore-file-in-project-space.md
index a7eff189bd9a14cd6d963c260e2c8c8e983238ae..7f1683bdb0869b2532865d0990c5a2ec2348e521 100644
--- a/docs/web/project-space/restore-file-in-project-space.md
+++ b/docs/web/projects/restore-file-in-project-space.md
@@ -1,4 +1,4 @@
-# Restore a file in your project space
+# Restore a file
 
 The restoring of a file that is in the recycle bin can only be done by the Service Account of the project.
 
diff --git a/docs/web/project-space/unsubscribe-from-project.md b/docs/web/projects/unsubscribe-from-project.md
similarity index 100%
rename from docs/web/project-space/unsubscribe-from-project.md
rename to docs/web/projects/unsubscribe-from-project.md
diff --git a/docs/web/space_quota/index.fr.md b/docs/web/quota.fr.md
similarity index 97%
rename from docs/web/space_quota/index.fr.md
rename to docs/web/quota.fr.md
index 77197ac094d8b5183d00a4a68f9527f00b91b1a5..bf2a0efd717bca100428e0a3bac9444f986bbdbb 100644
--- a/docs/web/space_quota/index.fr.md
+++ b/docs/web/quota.fr.md
@@ -7,7 +7,7 @@ Chaque utilisateur CERNBox dispose d'un espace personnel de stockage de **1 TB**
 
 Pour voir combien d'espace vous utilisez sur l'ensemble du quota alloué, cliquer sur votre nom d'utilisateur (dans le coin supérieur droit de votre page d'accueil CERNBox) et choisissez l'option  ***Personnel*** option.
 
-![Espace utilisé](../../assets/images/storage_used.png)   
+![Espace utilisé](../assets/images/storage_used.png)   
     
 Une autre façon de vérifier votre espace personnel ou commun est la suivante :
 
diff --git a/docs/web/space_quota/index.md b/docs/web/quota.md
similarity index 100%
rename from docs/web/space_quota/index.md
rename to docs/web/quota.md
diff --git a/docs/web/sharing_OLD/manage_your_shares.fr.md b/docs/web/sharing_OLD/manage_your_shares.fr.md
deleted file mode 100644
index e09c12346b38718fb405f53f97311850174c66f7..0000000000000000000000000000000000000000
--- a/docs/web/sharing_OLD/manage_your_shares.fr.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Gérer vos partages
-
-La barre latérale gauche de l'écran d'accueil de CERNBox contient des filtres vous permettant d'afficher rapidement des listes des objets partagés. Cliquez sur : 
-
-* **Partagés avec vous** : Liste des dossiers partagés avec vous par un autre utilisateur CERNBox, dont le nom et le nom d'utilisateur s'affiche à droite du nom du dossier. Il est impossible de partager ce qu'il y a ici. Pour partager, vous devez faire une copie et le partager la copie. 
-
-* **Partagés avec d'autres** : Liste des objets que vous avez partagés avec d'autres personnes. Les objets que vous avez partagés par lien hypertexte (option **Share link**) sont identifiés par l'icône ![](../../assets/images/share_link_icon.png). Les autres sont identifiés par l'icône ![](../../assets/images/share_icon.png) suivie de la liste des personnes ayant accès au dossier concerné.
-
-* **Partagés par lien** : Liste des objets que vous avez partagé via un lien hypertexte. Il est possible de partager le lien, mais l’accès est contrôlé par la personne a l'origine du lien.
-
-## Accès aux dossiers partagés 
-
-Quand un utilisateur CERNBox partage un fichier avec vous, vous recevez un message électronique comportant le nom de ce dossier (dans notre example, Jakub Moscicki a partagé le dossier "RootDemo").<br>
-
-- Connectez vous à votre CERNBox et regardez la liste des dossiers partagés avec vous, en utilisant le filtre **Partagés avec vous** dans la barre latérale gauche de l'écran.
-- Pour voir le contenu du dossier, et éventuellement le télécharger, cliquer sur la ligne grisée.
-
-![Accès aux dossiers partagés](../../assets/images/share_view_01_f.png)
-
-- Cliquez sur le bouton ![](../../assets/images/3_dot.png) et choisissez l'option **Télécharger** pour télécharger tout le contenu du dossier.
-
-![Télécharger un dossier](../../assets/images/share_view_02_f.png)
-
-- Vous pouvez ouvrir ou sauvegarder le résultat du téléchargement.
-
-![Sauvegarder le téléchargement](../../assets/images/share_view_03_f.png)
-
-Rappelez-vous que le téléchargement d'un dossier se fait toujours dans un fichier compressé.<br>
-Vous pouvez alors extraire un fichier ou décompresser la totalité du dossier (reportez-vous à votre gestionnaire de fichiers pour connaître la procédure). Avant toute opération de décompression, assurez-vous que vous connaissez la taille des fichiers, car la totalité du dossier sera copié sur votre disque local.
-
-Vous pouvez suivre la même procédure pour accèder à un fichier qui a été partagé avec vous (cette fois, par lien hypertexte).
-
-
-## Modification des options de partage
-
-Vous pouvez, à tout moment, modifier  les options de partage d'un dossier en cliquant sur les icônes ![](../../assets/images/share_icon.png) ou ![](../../assets/images/share_link_icon.png) :
-
-- pour ajouter un accès
-- pour changer les droits d'accès d'un utilisateur
-- pour supprimer l'accès pour un utilisateur
-- pour ajouter un lien hypertexte sur l'objet.
-
-![Modifier des options de partage](../../assets/images/share_modify_f.png)
-
-
-## Supprimer un droit d'accès {#supprimer_acces}
-
-Vous pouvez modifier à tout moment supprimer un droit d'accès à un dossier en cliquant sur les icônes ![](../../assets/images/share_icon.png) ou ![](../../../assets/images/share_link_icon.png).
-
-Supprimez le droit d'accès d'un utilisateur CERNBox en cliquant sur l'icône représentant une poubelle,
-ou cliquez à nouveau sur la case **Partager par lien public** pour supprimer le lien hypertexte vers l'objet (*dans l'exemple, c'est pour un dossier, mais cette méthode s'applique également aux fichiers*), empêchant ainsi tout accès au fichier depuis un autre compte que le votre. Quiconque essaye de cliquer sur un lien désactivé reçoit un message d'erreur.
-
-![Supprimer un partage](../../assets/images/share_revoke_f.png)
-
-
-# Supprimer un fichier/répertoire partagé
-
-Si quelqu'un a partagé un répertoire (avec l'option 'write+delete') avec vous (via le partage en utilisateurs CERNBox), quand vous supprimez un fichier/répertoire de celui-ci, le fichier/repertoire suprimé n'apparaitra pas dans vos fichiers supprimés (Deleted File) mais dans ceux de la personne qui a partagé avec vous. 
diff --git a/docs/web/sharing_OLD/manage_your_shares.md b/docs/web/sharing_OLD/manage_your_shares.md
deleted file mode 100644
index effceafbabf4c8d2643c8ea3f208a8e16e6bb3b3..0000000000000000000000000000000000000000
--- a/docs/web/sharing_OLD/manage_your_shares.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Manage your shares
-
-To display your shared files/folders go to your CERNBox **Files** page. The left sidebar  contains several filters for quickly sorting and managing your files. The share-related options are:
-
-* **Shared with you**: displays all folders shared with you by another user or CERN e-group. The full name of the owner of the folder and his/her username is displayed to the right of the folder name. 'Resharing is not allowed' from here because the folder was actually shared with you, NOT with another (unknown) 3rd party. If you decide to download and re-share the folder to someone else, you are deemed responsible for what is now your share.
-
-* **Shared with others**: displays all files and folders that you have shared with other users or CERN e-groups.
-The names of your recipients are listed on the right of the folder name, next to the ![](../../../assets/images/share_icon.png) icon. File and folders for which you have chosen the **Share link** option are marked with ![](../../../assets/images/share_link_icon.png)
-
-* **Shared by link**: displays all files and folders that are shared by you via an hyperlink. It is possible to reshare the 'unguessable link' to the file/folder, but access is controlled by the original sharer.
-
-
-## Access shared folders
-<a id="top"></a>
-
-When another CERNBox user shares a folder with you, you get an e-mail with the name of that folder (in the following example, Jakub Moscicki shared the folder "RootDemo" with me).
-
-- Connect to your CERNBox and have a look to all folders shared with you: just click on the ***Shared with you*** filter on the left hand side of the screen.
-
-- If you want to see what is in the folder "RootDemo", maybe to download it, click the highlighted line of "RootDemo".<br>
-
-![Download a folder Step 1](../../../assets/images/share_view_01.png)
-
-- Click on the 
-![](../../../assets/images/3_dot.png) 
-button and choose the option ***Download***  to download the all folder contents.<br>
-![Download a folder Step 2](../../../assets/images/share_view_02.png)
-
-- Open or save the zip file of the download:<br>
-![Download a folder Step 3](../../../assets/images/share_view_03.png)
-
-Please note that when downloading a folder, your download will always be done using a zip file.<br>
-
-Extract or unzip the zip file containing the folder that you downloaded (procedures may differ depending on your file explorer). Make sure that you know what you are about to download because the whole folder directory will be downloaded.
-
-The same procedure applies when trying to look and download a file. Just choose the ***Shared by link*** filter to retrieve the file.
-
-
-## Modify sharing options
-At any time you can modify the sharing options attached to a folder by clicking on the ![](../../../assets/images/share_icon.png) or ![](../../../assets/images/share_link_icon.png) icon right to the folder name:
-
-- Give access to an other user
-- Change from read-only to write option, and vice-versa, for a given user
-- Suppress all access for a given user
-- Create an hyperlink to the object, to be send to new recipients
-
-![Modify a share](../../../assets/images/share_modify.png)
-
-
-## Revoke a share
-
-At any time you can revoke the shares to a folder by clicking on the ![](../../../assets/images/share_icon.png) or ![](../../../assets/images/share_link_icon.png) icon right to the folder name.
-
-Either revoke the access right to a user or a CERN e-group by cliking on the Trashbin next to the username, <br>or tick off the **Share link** box to delete the hyperlink, preventing the object to be accessed from outside (*in our example, we revoke the access to a folder, but you can use the same procedure to revoke an access to a file*). 
-
-Anyone trying to further access the object using the hyperlink will get an error message.
-![Revoke a share](../../../assets/images/share_revoke.png)
-
-## Delete a shared file/folder
-
- If someone has shared a folder (with the options 'write + delete') with you (using the Authenticated Share method), whenever you delete a file/folder from that folder the deleted file/folder will NOT appear in your 'Deleted files' folder, but will appear in the 'Deleted files' folder of the original sharer. So, a deleted file/folder will not always appear in your CERNBox 'Deleted files' folder simply because you deleted it - it depends on where it was shared from. 
-
diff --git a/docs/web/sharing_OLD/share_a_file.fr.md b/docs/web/sharing_OLD/share_a_file.fr.md
deleted file mode 100644
index 1c8c7a76e3dbcdf018ab5896c408c2cc2c45f691..0000000000000000000000000000000000000000
--- a/docs/web/sharing_OLD/share_a_file.fr.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Partager un fichier
-
-Pour partager seulement un de vos fichiers CERNBox à quelqu'un, il faut utiliser la méthode de **partage par lien**.
-
-Depuis votre page **Fichiers**, cliquez sur l'icône **Partager** ![](../../assets/images/share_icon.png) pour le fichier que vous voulez partager. Une barre latérale à droite de l'écran s'ouvre, dans laquelle vous devez :
-
-- Cocher la case ***Partager par lien public*** pour créer et établir un lien hypertexte impossible à deviner[^1].
-- Décider si vous souhaitez ou non sécuriser plus l'accès à ce fichier : 
-     - en ajoutant un mot de passe
-     - et/ou en définissant une limite de validité du lien dans le temps.     
-
-![Partager par lien hypertexte](../../../assets/images/link-share-pemberley-file-0.png)
-
-- Copier le lien hypertexte généré par le système et coller ce lien dans un message électronique à la personne que vous souhaitez. Remarquez que l'icône ***Partager*** a changé pour ![](../../assets/images/share_link_icon_f.png).
-- Vous  pouvez à tout moment désactiver le lien vers en cliquant  sur l'icône ![](../../assets/images/share_link_icon_f.png) puis de nouveau sur la case  ***Partager par lien public***.
-- Tant que le fichier est partagé, vous pouvez retrouver le lien vers ce fichier en cliquant sur l'icône ![](../../assets/images/share_link_icon_f.png) ;  vous pouvez alors l'envoyer à d'autres personnes si besoin.
-
-> **[warning] Afin de partager seulement un fichier**
->
-> la seule façon est de le faire par lien. C'est à dire que pour partager un seul fichier avec un utilisateur du CERN ou une personne extérieur, cela se fait avec un lien
-
-&nbsp;
-
-> **[warning]Précautions d'utilisation d'un lien hypertexte**
->
-> si le lien hypertexte est publié sur un site public (par exemple via les réseaux sociaux), toute personne ayant accès à ce site pourra cliquer sur le lien et ainsi accèder à votre fichier.
-
-En cliquant sur l'option ***Partagés par lien*** dans la barre latérale gauche de l'écran, vous pouvez retrouver la liste de tous les fichiers et dossiers que vous avez partagés par cette méthode.
-
-[^1]: un lien ressemble à ça : "https://cernbox.cern.ch/index.php/s/vuKHIQCkKTHsa5S".
diff --git a/docs/web/sharing_OLD/share_a_file.md b/docs/web/sharing_OLD/share_a_file.md
deleted file mode 100644
index e93748060e77bc020fc0c98a0273b1add06127c4..0000000000000000000000000000000000000000
--- a/docs/web/sharing_OLD/share_a_file.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Share a file
-
-> [Please note] **Sharing ONE file** with either a CERN user or an external person is **ALWAYS** done via the **Link Share** method of sharing, whereby you send the person(s) a Public Link[^1] (aka unguessable/anonymous hyperlink). The recipient will be able to view and download the file, but he/she will **not be able to edit** the version that is in CERNBox. See [Share a folder](https://cernbox-manual.web.cern.ch/cernbox-manual/en/sharing/share_a_folder.html) if you want to allow the recipient to edit your file (via a shared folder). 
-
-
-> **[Warning]** If your Public Link happens to get published on a public site (for example on social networks media), everyone having access to this site will be able to click on the link and see your file. It is possible to restrict access to your file.
-
-Go to your CERNBox **Files** page and click the **_Share_** icon ![](../../../assets/images/share_icon.png) on the file you want to share
-![CERNBox Share link](../../../assets/images/link-share-pemberley-file-0.png)
-
-In the right-side window that appears, click on 'Create public link'
-![CERNBox Share link](../../../assets/images/link-share-pemberley-file-0.5.png)
-
-OPTIONAL: you can set a password on the access to your file, but make sure to give the password to the person who needs to see your file
-![CERNBox Share link](../../../assets/images/link-share-pemberley-file-3.png)
-
-OPTIONAL: you can set an expiration date for the link. By default the Public Link expires a year from the day you created the Public Link
-![CERNBox Share link](../../../assets/images/link-share-pemberley-file-4.png)
-
-After you have clicked the 'Share' button, the displayed icon shows that a Public Link exists. To share the link, you can either copy it and send it in an email (or similar), or you can use one of the Social Share options
-![CERNBox Share link](../../../assets/images/link-share-pemberley-file-5.png)
-
-The Social Share options are
-![CERNBox Share link](../../../assets/images/link-share-pemberley-file-7.png)
-
-If necessary, the link settings can be modified at any time
-![CERNBox Share link](../../../assets/images/link-share-pemberley-file-6.png)
-
-Your Public Link can be removed if you no longer want it
-![CERNBox Share link](../../../assets/images/link-share-pemberley-file-8.png)
-
-It is possible to have different passwords and expiration dates for more than one Public Link on the same file. Simply create another Public Link with different settings.
-
-You can retrieve the list of all files you have shared by link on your CERNBox **_Files_** page: choose the ***Shared by link*** option on the left-hand side menu.
-
-[^1]: A Public Link will look something like: "https://cernbox.cern.ch/index.php/s/vuKHIQCkKTHsa5S".  
-
diff --git a/docs/web/sharing_OLD/share_a_folder.fr.md b/docs/web/sharing_OLD/share_a_folder.fr.md
deleted file mode 100644
index 81a08851ab31d13b4432021e8d76240c835a45c5..0000000000000000000000000000000000000000
--- a/docs/web/sharing_OLD/share_a_folder.fr.md
+++ /dev/null
@@ -1,111 +0,0 @@
-# Partager un dossier
-
-> **[warning] Responsabilité du contenu d'un dossier**
->
-> Vous êtes responsable du contenu de tout votre CERNBox ce qui inclut aussi ce qui mis par d'autre dans vos dossiers partagés
-
-Il y a deux façons de partager un dossier :
-* [par lien](#partage-par-lien)
-* [avec des utilisateurs CERNBox](#partage avec des utilisateurs CERNBox)
-
-# Partage par lien
-Le partage par lien est utilisé pour :
-- un partage ponctuel.
-- pour partager un dossier avec une personne exterieur.
-
-Depuis votre page **Fichiers**, cliquez sur l'icône **Partager**  ![](../../../assets/images/share_icon.png) pour le dossier que vous voulez partager.
-![](../../assets/images/link-share-01-a.png)
-
-Choisissez l'option 'Lien Public' dans la partie en haut a droite zone pop up.
-![](../../assets/images/link-share-02-a.png)
-
-Cliquez sur 'Créer un lien Public' :
-
-![](../../assets/images/link-share-03-a.png)
-
-Optionel - Vous pouvez choisir quel(s) permission(s) a accorder :
-![](../../assets/images/link-share-04-a.png)
-
-Optionel - Vous pouvez choisir les permissions du dossier, mettre un mot de passe et un date d'expiration si desiré.
-![](../../assets/images/link-share-05-a.png)
-
-Vous pouvez choisir une date en vous servant du calendrier (par défaut, le lien est actif pour une année). Cliquez sur 'Partager' pour générer le lien.
-![](../../assets/images/link-share-07-a.png)
-
-Un lien public de votre dossier a bien été crée
-![](../../assets/images/link-share-08-a.png)
-
-Cliquez sur l'icone 'Partager' et choisissez comment vous voulez partager votre lien
-![](../../assets/images/link-share-10-a.png)
-
-Vous pouvez vérifier et modifier les paramètres de votre lien
-![](../../assets/images/link-share-09-a.png)
-
-Si vous voulez supprimer le lien de votre dossier
-![](../../assets/images/link-share-12-a.png)
-
-Vous pouvez avoir plusieurs liens ayant différentes propriétés de partage
-![](../../assets/images/link-share-14-a.png)
-
-#Lien Public (Upload seulement)
-Les liens Public (Upload seulement) permettent aux utilisateurs de seulement charger des fichiers dans votre dossier  
-
-![](../../assets/images/public-link-upload-lydia-1.png)
-
-![](../../assets/images/public-link-upload-lydia-2.png)
-
-![](../../assets/images/public-link-upload-lydia-4.png)
-
-![](../../assets/images/public-link-upload-lydia-6.png)
-
-![](../../assets/images/public-link-upload-lydia-8.png)
-
-![](../../assets/images/public-link-upload-lydia-9.png)
-
-![](../../assets/images/public-link-upload-lydia-10.png)
-
-![](../../assets/images/public-link-upload-lydia-11.png)
-
-![](../../assets/images/public-link-upload-lydia-7.png)
-
-
-## Partage avec des utilisateurs CERNBox
-Cette méthode de partage est utilisé :
-* Pour partager avec des utilisateurs CERNBox[^2]
-* Quand vous voulez travailler en collaboration avec d'autres utilisateurs CERNBox.
-
-Notez que :
- - Si vous souhaitez partager un espace project entier avec des utilisateurs CERNBox, il est préferable de rajouter ces utilisateurs dans l'egroup souhaité ( reader / writer / admin ) qui vous seront fournis a la création de celui-ci.
- - Si vous souhaitez partager un sous-dossier ou autre, vous pouvez utiliser la fonction de partage authentifié décrite ci-dessous.
-
-Allez sur votre page de fichiers CERNBox et cliquer sur l'icône **_Partager_** sur le dossier souhaité
-![](../../en/images/auth-share-01.png)
-
-Sur la droite, vous verrez l'option 'Partage' > 'Utilisateurs et groupes'
-![](../../assets/images/auth-share-02.png)
-
-Comment d'écrire le nom d'utilisateur souhaité, CERNBox completera automatiquement pour vous ou vous listera les noms comportant les caractères que vous aurez tapé
-![](../../assets/images/auth-share-02.5.png)
-
-Vérifier les permissions sur le Partage Authentifié
-![](../../assets/images/auth-share-04.png)
-
-Pour partager avec un egroup, commencer de taper le nom de celui-ci, CERNBox completera automatiquement pour vous ou vous listera les egroup comportant les caractères que vous aurez tapé
-![](../../assets/images/auth-share-05.png)
-
-Pour partager avec un compte secondaire, mettez le préfixe '**a:**' par exemple : "**a:**_Service-Account_"
-![](../../assets/images/auth-share-07.png)
-
-Vous pouvez supprimer un partage pour un/une personne/e-group/compte en cliquant sur l'icône de la poubelle.
-![](../../assets/images/auth-share-06.png)
-
-Vérifiez vos partages
-![](../../assets/images/auth-share-08.png)
-
-La facon dont vous souhaitez que les personnes avec qui vous avez partagé vos fichiers/dossiers soit averti vous incombe. Vous pouvez par exemple le faire via email ou partage par médias sociaux.  
-
-Pour que la personne puisse voir le partage, Il devra se connecter avec son propre compte CERNBox, si il ne l'a pas encore fait, il sera invité a le faire.
-![](../../assets/images/auth-share-20.png)
-
-[^1]: un lien ressemble à ça : "https://cernbox.cern.ch/index.php/s/vuKHIQCkKTHsa5S".
-[^2]: N'importe qui ayant un compte CERN Standard est un utilisateur CERNBox. Il suffit de [créer un CERNBox](../premiers_pas/1_READNE.md)
diff --git a/docs/web/sharing_OLD/share_a_folder.md b/docs/web/sharing_OLD/share_a_folder.md
deleted file mode 100644
index f4d81897faf38c613ba29b9a957b6e93e93e0f1f..0000000000000000000000000000000000000000
--- a/docs/web/sharing_OLD/share_a_folder.md
+++ /dev/null
@@ -1,120 +0,0 @@
-# Share a folder
-
-> **[warning] Responsability for folder contents**
->
-> You are responsible for the contents that are uploaded by others into your folders as it will be stored in your CERNBox space, with you as the owner!
-
-There are two ways of sharing your folder:
-
-* [Link Share](#link-share), the option "Link Share (upload only)" is also covered below
-* [Authenticated Share](#authenticated-share)
-
-If you wish a **recipient to be able to edit a file**, you must always share the folder (containing the file), and allow modifications/editing within the folder.
-
-## Link Share
-Link Share is used: 
-- for ad-hoc sharing
-- when you want to share your folder with an external person
- 
-Go to your CERNBox **Files** page and click the **_Share_** icon ![](../../../assets/images/share_icon.png) on the folder you want to share
-![](../../../assets/images/link-share-01-a.png)
-
-Select tab 'Public Links' in the right-side pop-up area
-![](../../../assets/images/link-share-02-a.png)
-
-Click 'Create public link'
-
-![](../../../assets/images/link-share-03-a.png)
-
-Optional - you can choose which folder permissions to allow
-![](../../../assets/images/link-share-04-a.png)
-
-Optional - you can choose your folder permissions, if you want to set a password and expiration date for the link
-![](../../../assets/images/link-share-05-a.png)
-
-You can select the date using the calendar (by default the link remains active for a year). Click 'Share' to produce the link
-![](../../../assets/images/link-share-07-a.png)
-
-A Public Link[^1] to your folder has been created 
-![](../../../assets/images/link-share-08-a.png)
-
-Click the 'share' icon and select how to share your link
-![](../../../assets/images/link-share-10-a.png)
-
-You can check and modify the settings for your link
-![](../../../assets/images/link-share-09-a.png)
-
-If you want to remove the link to your folder
-![](../../../assets/images/link-share-12-a.png)
-
-You can have several links that have different sharing properties
-![](../../../assets/images/link-share-14-a.png)
-
-
-## Link Share - upload only
-Link Share (upload only) allows your Users to ONLY upload files into your folder.
-
-![](../../../assets/images/public-link-upload-lydia-1.png)
-
-![](../../../assets/images/public-link-upload-lydia-2.png)
-
-![](../../../assets/images/public-link-upload-lydia-4.png)
-
-![](../../../assets/images/public-link-upload-lydia-6.png)
-
-![](../../../assets/images/public-link-upload-lydia-8.png)
-
-![](../../../assets/images/public-link-upload-lydia-9.png)
-
-![](../../../assets/images/public-link-upload-lydia-10.png)
-
-![](../../../assets/images/public-link-upload-lydia-11.png)
-
-![](../../../assets/images/public-link-upload-lydia-7.png)
-
-
-## Authenticated Share
-Authenticated Share is used 
-- for sharing folders with CERNBox registered users[^2]
-- when you want to work collaboratively with CERNBox users
-
-Note :
-- If you wish to share a whole project with authenticated users, you can add those into the desired egroups ( readers / writers / admin ) that will be provided when the space will be created.
-- If you wish to share certain subfolders of the project, you can use the authenticated share.
-
-Go to your CERNBox Files page and click the **_Share_** icon on the folder you want to share
-![](../../../assets/images/auth-share-01.png)
-
-On the right-hand side, you will see the 'Sharing'>'User and Groups' tab
-![](../../../assets/images/auth-share-02.png)
-
-Start to type the user's name, CERNBox will automatically complete it for you or prompt you with a list of names so that you can pick who you are looking for
-![](../../../assets/images/auth-share-02.5.png)
-
-Check the permissions for the Authenticated Sharing
-![](../../../assets/images/auth-share-04-send-mail-button.png)
-
-
-To share with e-groups, start to type the e-group name, CERNBox will automatically complete it for you or prompt you with a list of names so that you can pick the egroup you are looking for
-
-![](../../../assets/images/auth-share-05.png)
-
-To share with a Secondary Account or a Service Account, precede the name with '**a:**', e.g. "**a:**_Service-Account_"
-![](../../../assets/images/auth-share-07-send-mail-button.png)
-
-You can remove an Authenticated Share to the person/e-group/account by clicking on the 'trash' icon
-![](../../../assets/images/auth-share-06-send-mail-button.png)
-
-
-## Check your shares
-
-![](../../../assets/images/auth-share-08.png)
-
-The way you tell the person(s) with whom you have shared the folder is up to you. You can tell them in an email or via social share methods.
-
-For the person to see the share, he/she will have to connect to his/her CERNBox to access the folder. If the person has not yet created his/her CERNBox, he/she will be invited to do so
-
-![](../../../assets/images/auth-share-20.png)
-
-[^1]: A Public Link will look something like: "https://cernbox.cern.ch/index.php/s/vuKHIQCkKTHsa5S".
-[^2]: Anyone who has a standard CERN computing account can be a CERNBox registered user. The person only needs to do the [create CERNBox](../getting_started/index.html) step.
diff --git a/docs/web/sharing_OLD/sharing_steps_summarised.fr.md b/docs/web/sharing_OLD/sharing_steps_summarised.fr.md
deleted file mode 100644
index e485aca5626986e773e3ed545722cc874a93d5ec..0000000000000000000000000000000000000000
--- a/docs/web/sharing_OLD/sharing_steps_summarised.fr.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Résume des étapes de partage
-
-[Limites actuelles de CERNBox](https://cern.service-now.com/service-portal/article.do?n=KB0004537)
-
-## Partager un fichier
-Quelque soit la position du destinataire par rapport au CERN (interne ou externe), la seule option pour un fichier est le **partage par lien**.
-
-### Partage par lien
-* Aller à la page Fichiers de CERNBox.
-* Trouver le fichier, cliquer sur l'icône ***Partager***.
-* Cliquer sur ***Partager par lien public***
-* Si désiré, configurer la protection par mot de passe
-* Si désiré, configurer la date d'expiration
-* Envoyer le lien au destinataire
-
-### Partage par lien du point de vue du destinataire
-* Celui-ci reçoit le lien.
-* Il l'ouvre dans un navigateur
-* Il télecharge le fichier pour le voir
-
-## Partager un dossier
-* Si le destinataire est exterieur au CERN ou s'il est un utilisateur CERN mais que vous voulez partager le répertoire juste une fois, utiliser le **partage par lien**
-* Si le destinataire est un utilisateur du CERN et que vous voulez travailler en collaboration, utiliser le partage authentifié.
-
-### Partage par lien
-* Aller à la page Fichiers de CERNBox.
-* Trouver le répertoire, cliquer sur l'icône ***Partager***.
-* Cliquer sur ***Partager par lien public***
-* Si désiré, configurer la protection par mot de passe
-* Si désiré, donner les droits d'écriture
-* Si désiré, configurer la date d'expiration
-* Envoyer le lien au destinataire
-
-### Partage par lien du point de vue du destinataire
-* Celui-ci reçoit le lien.
-* Il l'ouvre dans un navigateur
-* Il télecharge le répertoire (zip), et le décompresse pour voir les fichiers
-
-### Partage authentifié
-* Aller à la page Fichiers de CERNBox.
-* Trouver le répertoire
-* Créer la liste des destinataires : username (ajouter 'a:' devant si c'est un compte de service ou un compte secondaire.
-* si désiré, configurer la notification par mail
-* Cliquer sur ***Confirmer***
-* Si désiré, selectionner ***write+delete*** afin de donner les droits d'ecriture au dossier.
-
-### Partage authentifié du point de vue du destinataire
-* Il recoit un email (si l'envoi de celui ci a été configurer)
-* Il se connecte à son CERNBox
-* Le dossier apparait dans ***Partagés avec vous***. Il peut donc l'acceder normalement. 
diff --git a/docs/web/sharing_OLD/sharing_steps_summarised.md b/docs/web/sharing_OLD/sharing_steps_summarised.md
deleted file mode 100644
index 40bf71b0947768345f9af4d34da1a0957aa91eee..0000000000000000000000000000000000000000
--- a/docs/web/sharing_OLD/sharing_steps_summarised.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Sharing steps summarised
-
-
-> **[info] To see the visual guide for sharing files and folders internally**
->
-> Click [here](https://cds.cern.ch/record/2791206/files/ShareFoldersFilesInternally_CERNBox.pdf).
-&nbsp;
-
-
-> **[info] To see the visual guide for sharing files and folders with external people**
->
-> Click [here](https://cds.cern.ch/record/2791205/files/ShareFoldersFilesOutside_CERNBox.pdf).
-
-&nbsp;
-
-
-## Share a file
-It does not matter whether the user is external or a CERNBox user, use the **Link Share** way of sharing (this is the only option).
-
-### Link Share (for file)
-- Go to your CERNBox Web Files page
-- Find your file, click on _**Share**_ icon
-- Click on _**Share link**_
-- If wanted, configure _**Password protect**_
-- If wanted, configure _**Set expiration date**_
-- Send the unguessable link to the recipient in an email
-
-### Link Share (for file) - recipient's view
- - Recipient receives link in an email
- - Recipient opens link in a Web browser
- - Recipient downloads file to view it
-
-## Share a folder
-- If person is external, use the **Link Share** way
-- If person is CERN user, but you want to share the folder just once, also use the **Link Share** way
-- If person is CERN user, and you will collaborate, use the **Authenticated Share** way of sharing
-
-### Link Share (for folder)
-- Go to your CERNBox Web Files page
-- Find your folder, click on _**Share**_ icon
-- Click on _**Share link**_
-- If wanted, configure _**Password protect**_
-- If wanted, configure _**Allow editing**_
-- If wanted, configure _**Set expiration date**_
-- Send the unguessable link to the recipient in an email
-
-### Link Share (for folder) - recipient's view
- - Recipient receives link in an email
- - Recipient opens link in a Web browser
- - Recipient downloads folder(zip), and unzips it to access the files
-
-### Authenticated Share (for folder)
-
-- Go to your CERNBox Web Files page
-- Find your folder, start to fill in field
-- Create list of recipients: usernames, e-groups, **a:**_service-account_, **a:**_secondary-account_
-- If wanted, select _**Send notification email**_
-- Click _**Confirm**_
-- If wanted, select _**write + delete**_ to give access rights to your folder
-
-### Authenticated Share (for folder) - recipient's view
-
-- Recipient receives email (if _**Send notification email**_ was set)
-- Recipient logs into his/her CERNBox account
-- Recipient looks into _**Shared with you**_ for the shared folder, and accesses it normally