diff --git a/install_iso_de.md b/pages/01.administrate/02.install/01.iso/install_iso_de.md
similarity index 93%
rename from install_iso_de.md
rename to pages/01.administrate/02.install/01.iso/install_iso_de.md
index f25dc7d6..f2053600 100644
--- a/install_iso_de.md
+++ b/pages/01.administrate/02.install/01.iso/install_iso_de.md
@@ -1,4 +1,9 @@
-# Instalation auf einem normalen Computer
+---
+title: Instalation auf einem normalen Computer
+template: docs
+taxonomy:
+ category: docs
+---
*Um andere Wege zu finden, YunoHost zu instalieren, klicke **[hier](/install)**.*
diff --git a/finding_the_local_ip.md b/pages/01.administrate/03.postinstall/00.findinglocalip/finding_the_local_ip.md
similarity index 94%
rename from finding_the_local_ip.md
rename to pages/01.administrate/03.postinstall/00.findinglocalip/finding_the_local_ip.md
index 0d0050e9..5e1ebd15 100644
--- a/finding_the_local_ip.md
+++ b/pages/01.administrate/03.postinstall/00.findinglocalip/finding_the_local_ip.md
@@ -1,4 +1,9 @@
-# Finding your server's local IP
+---
+title: Finding your server's local IP
+template: docs
+taxonomy:
+ category: docs
+---
On an installation at home, your server should typically be accessible using the `yunohost.local` domain. If for any reason this does not work, you may need to find the *local* IP of your server.
diff --git a/finding_the_local_ip_fr.md b/pages/01.administrate/03.postinstall/00.findinglocalip/finding_the_local_ip_fr.md
similarity index 94%
rename from finding_the_local_ip_fr.md
rename to pages/01.administrate/03.postinstall/00.findinglocalip/finding_the_local_ip_fr.md
index 5ccf0269..c04a7034 100644
--- a/finding_the_local_ip_fr.md
+++ b/pages/01.administrate/03.postinstall/00.findinglocalip/finding_the_local_ip_fr.md
@@ -1,4 +1,9 @@
-# Trouver l'IP locale de son serveur
+---
+title: Trouver l'IP locale de son serveur
+template: docs
+taxonomy:
+ category: docs
+---
Dans le cas d'une installation à la maison, votre serveur devrait typiquement être accessible (depuis son réseau local) avec le domaine `yunohost.local`. Si pour une raison cela ne fonctionne pas, il vous faut peut-être trouver l'IP locale de votre serveur.
diff --git a/app_bookstack.md b/pages/01.administrate/04.learn/06.apps/02.apps/bookstack/app_bookstack.md
similarity index 84%
rename from app_bookstack.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/bookstack/app_bookstack.md
index c46091ed..2977575d 100644
--- a/app_bookstack.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/bookstack/app_bookstack.md
@@ -1,4 +1,11 @@
-# BookStack
+---
+title: Bookstack
+template: docs
+taxonomy:
+ category: docs, apps
+---
+
+ BookStack
[![Install BookStack with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=bookstack) [![Integration level](https://dash.yunohost.org/integration/bookstack.svg)](https://dash.yunohost.org/appci/app/bookstack)
diff --git a/app_bookstack_fr.md b/pages/01.administrate/04.learn/06.apps/02.apps/bookstack/app_bookstack_fr.md
similarity index 81%
rename from app_bookstack_fr.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/bookstack/app_bookstack_fr.md
index 489d7001..33a3d198 100644
--- a/app_bookstack_fr.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/bookstack/app_bookstack_fr.md
@@ -1,4 +1,11 @@
-# BookStack
+---
+title: Bookstack
+template: docs
+taxonomy:
+ category: docs, apps
+---
+
+ BookStack
[![Installer BookStack avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=bookstack) [![Integration level](https://dash.yunohost.org/integration/bookstack.svg)](https://dash.yunohost.org/appci/app/bookstack)
diff --git a/app_galene.md b/pages/01.administrate/04.learn/06.apps/02.apps/galene/app_galene.md
similarity index 94%
rename from app_galene.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/galene/app_galene.md
index ade5e1f1..8893f12e 100644
--- a/app_galene.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/galene/app_galene.md
@@ -1,4 +1,9 @@
-# Galène
+---
+title: Galène
+template: docs
+taxonomy:
+ category: docs, apps
+---
[![Install Galène with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=galene) [![Integration level](https://dash.yunohost.org/integration/galene.svg)](https://dash.yunohost.org/appci/app/galene)
diff --git a/app_galene_fr.md b/pages/01.administrate/04.learn/06.apps/02.apps/galene/app_galene_fr.md
similarity index 94%
rename from app_galene_fr.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/galene/app_galene_fr.md
index 0fe4ed54..a60c5871 100644
--- a/app_galene_fr.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/galene/app_galene_fr.md
@@ -1,4 +1,9 @@
-# Galène
+---
+title: Galène
+template: docs
+taxonomy:
+ category: docs, apps
+---
[![Installer Galène avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=galene) [![Integration level](https://dash.yunohost.org/integration/galene.svg)](https://dash.yunohost.org/appci/app/galene)
diff --git a/app_hedgedoc.md b/pages/01.administrate/04.learn/06.apps/02.apps/hedgedoc/app_hedgedoc.md
similarity index 88%
rename from app_hedgedoc.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/hedgedoc/app_hedgedoc.md
index a01394ab..36b821d8 100644
--- a/app_hedgedoc.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/hedgedoc/app_hedgedoc.md
@@ -1,4 +1,11 @@
-# HedgeDoc
+---
+title: HedgeDoc
+template: docs
+taxonomy:
+ category: docs, apps
+---
+
+ HedgeDoc
[![Install HedgeDoc with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=hedgedoc) [![Integration level](https://dash.yunohost.org/integration/hedgedoc.svg)](https://dash.yunohost.org/appci/app/hedgedoc)
diff --git a/app_hedgedoc_fr.md b/pages/01.administrate/04.learn/06.apps/02.apps/hedgedoc/app_hedgedoc_fr.md
similarity index 89%
rename from app_hedgedoc_fr.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/hedgedoc/app_hedgedoc_fr.md
index b41a3f62..b9d9470c 100644
--- a/app_hedgedoc_fr.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/hedgedoc/app_hedgedoc_fr.md
@@ -1,4 +1,11 @@
-# HedgeDoc
+---
+title: HedgeDoc
+template: docs
+taxonomy:
+ category: docs, apps
+---
+
+ HedgeDoc
[![Installer HedgeDoc avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=hedgedoc) [![Integration level](https://dash.yunohost.org/integration/hedgedoc.svg)](https://dash.yunohost.org/appci/app/hedgedoc)
diff --git a/app_lychee.md b/pages/01.administrate/04.learn/06.apps/02.apps/lychee/app_lychee.md
similarity index 87%
rename from app_lychee.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/lychee/app_lychee.md
index c2559647..b2e5e9e8 100644
--- a/app_lychee.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/lychee/app_lychee.md
@@ -1,4 +1,11 @@
-# Lychee
+---
+title: Lychee
+template: docs
+taxonomy:
+ category: docs, apps
+---
+
+ Lychee
[![Install Lychee with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=lychee) [![Integration level](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee)
diff --git a/app_lychee_fr.md b/pages/01.administrate/04.learn/06.apps/02.apps/lychee/app_lychee_fr.md
similarity index 88%
rename from app_lychee_fr.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/lychee/app_lychee_fr.md
index c98a7c4c..e7b38f4f 100644
--- a/app_lychee_fr.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/lychee/app_lychee_fr.md
@@ -1,4 +1,11 @@
-# Lychee
+---
+title: Lychee
+template: docs
+taxonomy:
+ category: docs, apps
+---
+
+ Lychee
[![Installer Lychee avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=lychee) [![Integration level](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee)
diff --git a/app_mantis.md b/pages/01.administrate/04.learn/06.apps/02.apps/mantis/app_mantis.md
similarity index 86%
rename from app_mantis.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/mantis/app_mantis.md
index 1eb2291e..8f5038c9 100644
--- a/app_mantis.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/mantis/app_mantis.md
@@ -1,4 +1,11 @@
-# Mantis
+---
+title: Mantis
+template: docs
+taxonomy:
+ category: docs, apps
+---
+
+ Mantis
[![Install Mantis with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=mantis) [![Integration level](https://dash.yunohost.org/integration/mantis.svg)](https://dash.yunohost.org/appci/app/mantis)
diff --git a/app_mantis_fr.md b/pages/01.administrate/04.learn/06.apps/02.apps/mantis/app_mantis_fr.md
similarity index 87%
rename from app_mantis_fr.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/mantis/app_mantis_fr.md
index e9e11931..4d2faa92 100644
--- a/app_mantis_fr.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/mantis/app_mantis_fr.md
@@ -1,4 +1,11 @@
-# Mantis
+---
+title: Mantis
+template: docs
+taxonomy:
+ category: docs, apps
+---
+
+ Mantis
[![Installer Mantis avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=mantis) [![Integration level](https://dash.yunohost.org/integration/mantis.svg)](https://dash.yunohost.org/appci/app/mantis)
diff --git a/app_matomo.md b/pages/01.administrate/04.learn/06.apps/02.apps/matomo/app_matomo.md
similarity index 87%
rename from app_matomo.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/matomo/app_matomo.md
index 0347c64c..b5ee8587 100644
--- a/app_matomo.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/matomo/app_matomo.md
@@ -1,4 +1,11 @@
-# Matomo
+---
+title: Matomo
+template: docs
+taxonomy:
+ category: docs, apps
+---
+
+ Matomo
[![Install Matomo with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=matomo) [![Integration level](https://dash.yunohost.org/integration/matomo.svg)](https://dash.yunohost.org/appci/app/matomo)
diff --git a/app_matomo_fr.md b/pages/01.administrate/04.learn/06.apps/02.apps/matomo/app_matomo_fr.md
similarity index 88%
rename from app_matomo_fr.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/matomo/app_matomo_fr.md
index a7bfb1ce..4f4e4479 100644
--- a/app_matomo_fr.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/matomo/app_matomo_fr.md
@@ -1,4 +1,11 @@
-# Matomo
+---
+title: Matomo
+template: docs
+taxonomy:
+ category: docs, apps
+---
+
+ Matomo
[![Install Matomo with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=matomo) [![Integration level](https://dash.yunohost.org/integration/matomo.svg)](https://dash.yunohost.org/appci/app/matomo)
diff --git a/app_netdata_fr.md b/pages/01.administrate/04.learn/06.apps/02.apps/netdata/app_netdata_fr.md
similarity index 99%
rename from app_netdata_fr.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/netdata/app_netdata_fr.md
index a73c587e..fcb26902 100644
--- a/app_netdata_fr.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/netdata/app_netdata_fr.md
@@ -1,4 +1,9 @@
-## NetData
+---
+title: NetData
+template: docs
+taxonomy:
+ category: docs, apps
+---
[NetData](http://my-netdata.io/) est un système distribué de **surveillance des performances et de la santé en temps réel**.
Il fournit un **aperçu inégalé, en temps réel**, de tout ce qui se passe sur lesystème qu'il exécute (y compris les applications telles que les serveurs web et de base de données), en utilisantdes **tableaux de bord modernes et interactifs sur le web**.
diff --git a/app_privatebin.md b/pages/01.administrate/04.learn/06.apps/02.apps/privatebin/app_privatebin.md
similarity index 89%
rename from app_privatebin.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/privatebin/app_privatebin.md
index b77764e4..fe58a869 100644
--- a/app_privatebin.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/privatebin/app_privatebin.md
@@ -1,4 +1,11 @@
-# Privatebin
+---
+title: PrivateBin
+template: docs
+taxonomy:
+ category: docs, apps
+---
+
+ Privatebin
[![Install PrivateBin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=privatebin) [![Integration level](https://dash.yunohost.org/integration/privatebin.svg)](https://dash.yunohost.org/appci/app/privatebin)
diff --git a/app_privatebin_fr.md b/pages/01.administrate/04.learn/06.apps/02.apps/privatebin/app_privatebin_fr.md
similarity index 89%
rename from app_privatebin_fr.md
rename to pages/01.administrate/04.learn/06.apps/02.apps/privatebin/app_privatebin_fr.md
index 6711103d..186e7b5d 100644
--- a/app_privatebin_fr.md
+++ b/pages/01.administrate/04.learn/06.apps/02.apps/privatebin/app_privatebin_fr.md
@@ -1,4 +1,11 @@
-# PrivateBin
+---
+title: PrivateBin
+template: docs
+taxonomy:
+ category: docs, apps
+---
+
+ PrivateBin
[![Install PrivateBin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=privatebin) [![Integration level](https://dash.yunohost.org/integration/privatebin.svg)](https://dash.yunohost.org/appci/app/privatebin)
diff --git a/pages/02.contribute/04.packaging_apps/08.groups_permissions/groups_and_permissions.fr.md b/pages/01.administrate/04.learn/13.permissions/groups_and_permissions.fr.md
similarity index 100%
rename from pages/02.contribute/04.packaging_apps/08.groups_permissions/groups_and_permissions.fr.md
rename to pages/01.administrate/04.learn/13.permissions/groups_and_permissions.fr.md
diff --git a/pages/02.contribute/04.packaging_apps/08.groups_permissions/groups_and_permissions.md b/pages/01.administrate/04.learn/13.permissions/groups_and_permissions.md
similarity index 100%
rename from pages/02.contribute/04.packaging_apps/08.groups_permissions/groups_and_permissions.md
rename to pages/01.administrate/04.learn/13.permissions/groups_and_permissions.md
diff --git a/email_configure_relay.md b/pages/01.administrate/05.advance/07.email_relay/email_configure_relay.md
similarity index 98%
rename from email_configure_relay.md
rename to pages/01.administrate/05.advance/07.email_relay/email_configure_relay.md
index 504167d8..d4e360fc 100644
--- a/email_configure_relay.md
+++ b/pages/01.administrate/05.advance/07.email_relay/email_configure_relay.md
@@ -1,4 +1,9 @@
-# Configure SMTP relay
+---
+title: Configure SMTP relay
+template: docs
+taxonomy:
+ category: docs
+---
If your ISP blocks port 25, if you can't set a reverseDNS on your server, or if you have any other troubles using the built-in SMTP server on YunoHost, you may want to setup your YunoHost server to use a SMTP relay.
diff --git a/email_configure_relay_fr.md b/pages/01.administrate/05.advance/07.email_relay/email_configure_relay_fr.md
similarity index 97%
rename from email_configure_relay_fr.md
rename to pages/01.administrate/05.advance/07.email_relay/email_configure_relay_fr.md
index 068a1514..c7c07cad 100644
--- a/email_configure_relay_fr.md
+++ b/pages/01.administrate/05.advance/07.email_relay/email_configure_relay_fr.md
@@ -1,4 +1,9 @@
-# Configurer un relais SMTP
+---
+title: Configurer un relais SMTP
+template: docs
+taxonomy:
+ category: docs
+---
Si votre fournisseur internet bloque le port 25, ou si vous rencontrez un problème d’utilisation du serveur SMTP natif de YunoHost, vous pouvez configurer votre serveur YunoHost pour utiliser un relais SMTP.
diff --git a/pages/01.administrate/05.advance/07.tor/torhiddenservice.fr.md b/pages/01.administrate/05.advance/08.tor/torhiddenservice.fr.md
similarity index 100%
rename from pages/01.administrate/05.advance/07.tor/torhiddenservice.fr.md
rename to pages/01.administrate/05.advance/08.tor/torhiddenservice.fr.md
diff --git a/pages/01.administrate/05.advance/07.tor/torhiddenservice.it.md b/pages/01.administrate/05.advance/08.tor/torhiddenservice.it.md
similarity index 100%
rename from pages/01.administrate/05.advance/07.tor/torhiddenservice.it.md
rename to pages/01.administrate/05.advance/08.tor/torhiddenservice.it.md
diff --git a/pages/01.administrate/05.advance/07.tor/torhiddenservice.md b/pages/01.administrate/05.advance/08.tor/torhiddenservice.md
similarity index 100%
rename from pages/01.administrate/05.advance/07.tor/torhiddenservice.md
rename to pages/01.administrate/05.advance/08.tor/torhiddenservice.md
diff --git a/pages/01.administrate/05.advance/08.certificate_custom/certificate_custom.fr.md b/pages/01.administrate/05.advance/09.certificate_custom/certificate_custom.fr.md
similarity index 100%
rename from pages/01.administrate/05.advance/08.certificate_custom/certificate_custom.fr.md
rename to pages/01.administrate/05.advance/09.certificate_custom/certificate_custom.fr.md
diff --git a/pages/01.administrate/05.advance/08.certificate_custom/certificate_custom.md b/pages/01.administrate/05.advance/09.certificate_custom/certificate_custom.md
similarity index 100%
rename from pages/01.administrate/05.advance/08.certificate_custom/certificate_custom.md
rename to pages/01.administrate/05.advance/09.certificate_custom/certificate_custom.md
diff --git a/pages/01.administrate/05.advance/09.vpn/vpn_advantage.fr.md b/pages/01.administrate/05.advance/10.vpn/vpn_advantage.fr.md
similarity index 100%
rename from pages/01.administrate/05.advance/09.vpn/vpn_advantage.fr.md
rename to pages/01.administrate/05.advance/10.vpn/vpn_advantage.fr.md
diff --git a/pages/01.administrate/05.advance/10.moving_app_folder/moving_app_folder.fr.md b/pages/01.administrate/05.advance/11.moving_app_folder/moving_app_folder.fr.md
similarity index 100%
rename from pages/01.administrate/05.advance/10.moving_app_folder/moving_app_folder.fr.md
rename to pages/01.administrate/05.advance/11.moving_app_folder/moving_app_folder.fr.md
diff --git a/pages/01.administrate/05.advance/10.moving_app_folder/moving_app_folder.md b/pages/01.administrate/05.advance/11.moving_app_folder/moving_app_folder.md
similarity index 100%
rename from pages/01.administrate/05.advance/10.moving_app_folder/moving_app_folder.md
rename to pages/01.administrate/05.advance/11.moving_app_folder/moving_app_folder.md
diff --git a/packaging_apps_permissions.md b/pages/02.contribute/04.packaging_apps/08.groups_permissions/packaging_apps_permissions.md
similarity index 98%
rename from packaging_apps_permissions.md
rename to pages/02.contribute/04.packaging_apps/08.groups_permissions/packaging_apps_permissions.md
index 0a36b39e..e4ae2fe5 100644
--- a/packaging_apps_permissions.md
+++ b/pages/02.contribute/04.packaging_apps/08.groups_permissions/packaging_apps_permissions.md
@@ -1,4 +1,9 @@
-# User groups and permissions
+---
+title: User groups and permissions
+template: docs
+taxonomy:
+ category: docs
+---
Installing an app creates the permission `app.main` with `all_users` allowed by default.