diff --git a/.gitignore b/.gitignore
index e77be365d7ca3ca776cc2ad2ab07e63233fe4b66..9f1ce12c726165db48c9eee87d0e41877673fc87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,16 +4,14 @@
 /dist
 /tmp
 /out-tsc
-/src/assets/docs-*
+/src/assets/docs
 /compodoc-fr
-/docs-fr_pdf
-/docs-en_pdf
+/docs/fr/pdf
+/docs/en/pdf
 /release
 
 # dependencies
 /node_modules
-/docs-fr/javascripts/mathjax
-/docs-en/javascripts/mathjax
 /src/date_revision.ts
 
 # IDEs and editors
diff --git a/DEVELOPERS.md b/DEVELOPERS.md
index 9f3bfea1b7db2ee4a7b78953d0186a6c4e5f778c..7871bd5926682ecdf22005c995450c8294b8d48d 100644
--- a/DEVELOPERS.md
+++ b/DEVELOPERS.md
@@ -114,7 +114,7 @@ Le déploiement de ngHyd sous forme d'application mobile se fait à l'aide de Co
 
 La documentation est générée à l'aide de MkDocs.
 
-Les fichiers source pour une langue donnée se trouvent dans le dossier `docs-lang` (ex: `docs-fr`). Pour traduire la documentation dans une autre langue, il faut recopier l'intégralité des fichiers source puis les traduire. Afin de faciliter les liens de l'application vers la documentation, les noms des fichiers ne sont pas traduits et restent en français pour toutes les langues.
+Les fichiers source pour une langue donnée se trouvent dans le dossier `docs/lang` (ex: `docs/fr`). Pour traduire la documentation dans une autre langue, il faut recopier l'intégralité des fichiers source puis les traduire. Afin de faciliter les liens de l'application vers la documentation, les noms des fichiers ne sont pas traduits et restent en français pour toutes les langues.
 
 L'organisation hiérarchique de la documentation est définie dans les fichiers `mkdocs-lang.yml` (ex: `mkdocs-fr.yml`).
 
@@ -392,7 +392,7 @@ Dans la fonction `parseConfig()`, ajouter un appel par à `setPropertyValueFromC
  
 ### documentation
 
-Pour chaque langue, ajouter un fichier .md dans les dossiers `docs-*/calculators`, puis placer ce nouveau fichier dans la hiérarchie de la documentation, en ajoutant son chemin dans les fichiers `mkdocs-*.yml`.
+Pour chaque langue, ajouter un fichier .md dans les dossiers `docs/*/calculators`, puis placer ce nouveau fichier dans la hiérarchie de la documentation, en ajoutant son chemin dans les fichiers `mkdocs-*.yml`.
 
 Lier ce fichier au module via la clé `help` du bloc d'options de la configuration du module. Exemple pour un fichier de documentation dont le chemin est `calculators/math/addition.md` : `"help" : "math/addition.html"` (MkDocs convertit les fichiers MarkDown en HTML)
 
diff --git a/docs-en/CHANGELOG.md b/docs-en/CHANGELOG.md
deleted file mode 120000
index 04c99a55caae5d51f17666f554c2c8cea0aadfc0..0000000000000000000000000000000000000000
--- a/docs-en/CHANGELOG.md
+++ /dev/null
@@ -1 +0,0 @@
-../CHANGELOG.md
\ No newline at end of file
diff --git a/docs-fr/CHANGELOG.md b/docs-fr/CHANGELOG.md
deleted file mode 120000
index 04c99a55caae5d51f17666f554c2c8cea0aadfc0..0000000000000000000000000000000000000000
--- a/docs-fr/CHANGELOG.md
+++ /dev/null
@@ -1 +0,0 @@
-../CHANGELOG.md
\ No newline at end of file
diff --git a/docs-fr/javascripts/matomo-tracking.js b/docs-fr/javascripts/matomo-tracking.js
deleted file mode 100644
index 0610b88f4bd1ccc932f51ffd53443d7363db0593..0000000000000000000000000000000000000000
--- a/docs-fr/javascripts/matomo-tracking.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var _paq = window._paq || [];
-/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-_paq.push(['disableCookies']); // évite de mettre en place un bandeau RGPD
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
-var u="//stasi.g-eau.fr/";
-_paq.push(['setTrackerUrl', u+'matomo.php']);
-_paq.push(['setSiteId', '1']);
-var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-})();
\ No newline at end of file
diff --git a/docs/en/CHANGELOG.md b/docs/en/CHANGELOG.md
new file mode 120000
index 0000000000000000000000000000000000000000..699cc9e7b7c5bf63c3549abe36e3eecf8efab625
--- /dev/null
+++ b/docs/en/CHANGELOG.md
@@ -0,0 +1 @@
+../../CHANGELOG.md
\ No newline at end of file
diff --git a/docs-en/calculators/devalaison/grille-inclinee-b.jpg b/docs/en/calculators/devalaison/grille-inclinee-b.jpg
similarity index 100%
rename from docs-en/calculators/devalaison/grille-inclinee-b.jpg
rename to docs/en/calculators/devalaison/grille-inclinee-b.jpg
diff --git a/docs-en/calculators/devalaison/grille-inclinee.jpg b/docs/en/calculators/devalaison/grille-inclinee.jpg
similarity index 100%
rename from docs-en/calculators/devalaison/grille-inclinee.jpg
rename to docs/en/calculators/devalaison/grille-inclinee.jpg
diff --git a/docs-en/calculators/devalaison/grille-orientee.jpg b/docs/en/calculators/devalaison/grille-orientee.jpg
similarity index 100%
rename from docs-en/calculators/devalaison/grille-orientee.jpg
rename to docs/en/calculators/devalaison/grille-orientee.jpg
diff --git a/docs-en/calculators/devalaison/grille.md b/docs/en/calculators/devalaison/grille.md
similarity index 100%
rename from docs-en/calculators/devalaison/grille.md
rename to docs/en/calculators/devalaison/grille.md
diff --git a/docs-en/calculators/devalaison/jet.md b/docs/en/calculators/devalaison/jet.md
similarity index 100%
rename from docs-en/calculators/devalaison/jet.md
rename to docs/en/calculators/devalaison/jet.md
diff --git a/docs-en/calculators/devalaison/profil-barreaux.png b/docs/en/calculators/devalaison/profil-barreaux.png
similarity index 100%
rename from docs-en/calculators/devalaison/profil-barreaux.png
rename to docs/en/calculators/devalaison/profil-barreaux.png
diff --git a/docs-en/calculators/hsl/courbe_remous.md b/docs/en/calculators/hsl/courbe_remous.md
similarity index 100%
rename from docs-en/calculators/hsl/courbe_remous.md
rename to docs/en/calculators/hsl/courbe_remous.md
diff --git a/docs-en/calculators/hsl/pente.md b/docs/en/calculators/hsl/pente.md
similarity index 100%
rename from docs-en/calculators/hsl/pente.md
rename to docs/en/calculators/hsl/pente.md
diff --git a/docs-en/calculators/hsl/regime_uniforme.md b/docs/en/calculators/hsl/regime_uniforme.md
similarity index 100%
rename from docs-en/calculators/hsl/regime_uniforme.md
rename to docs/en/calculators/hsl/regime_uniforme.md
diff --git a/docs-en/calculators/hsl/section_circulaire.png b/docs/en/calculators/hsl/section_circulaire.png
similarity index 100%
rename from docs-en/calculators/hsl/section_circulaire.png
rename to docs/en/calculators/hsl/section_circulaire.png
diff --git a/docs-en/calculators/hsl/section_parametree.md b/docs/en/calculators/hsl/section_parametree.md
similarity index 100%
rename from docs-en/calculators/hsl/section_parametree.md
rename to docs/en/calculators/hsl/section_parametree.md
diff --git a/docs-en/calculators/hsl/section_rectangulaire.png b/docs/en/calculators/hsl/section_rectangulaire.png
similarity index 100%
rename from docs-en/calculators/hsl/section_rectangulaire.png
rename to docs/en/calculators/hsl/section_rectangulaire.png
diff --git a/docs-en/calculators/hsl/section_trapezoidale.png b/docs/en/calculators/hsl/section_trapezoidale.png
similarity index 100%
rename from docs-en/calculators/hsl/section_trapezoidale.png
rename to docs/en/calculators/hsl/section_trapezoidale.png
diff --git a/docs-en/calculators/hsl/strickler.md b/docs/en/calculators/hsl/strickler.md
similarity index 100%
rename from docs-en/calculators/hsl/strickler.md
rename to docs/en/calculators/hsl/strickler.md
diff --git a/docs-en/calculators/hsl/types_sections.md b/docs/en/calculators/hsl/types_sections.md
similarity index 100%
rename from docs-en/calculators/hsl/types_sections.md
rename to docs/en/calculators/hsl/types_sections.md
diff --git a/docs-en/calculators/hsl/var_hydrauliques.md b/docs/en/calculators/hsl/var_hydrauliques.md
similarity index 100%
rename from docs-en/calculators/hsl/var_hydrauliques.md
rename to docs/en/calculators/hsl/var_hydrauliques.md
diff --git a/docs-en/calculators/hyd_en_charge/cond_distri.md b/docs/en/calculators/hyd_en_charge/cond_distri.md
similarity index 100%
rename from docs-en/calculators/hyd_en_charge/cond_distri.md
rename to docs/en/calculators/hyd_en_charge/cond_distri.md
diff --git a/docs-en/calculators/hyd_en_charge/cond_distri.png b/docs/en/calculators/hyd_en_charge/cond_distri.png
similarity index 100%
rename from docs-en/calculators/hyd_en_charge/cond_distri.png
rename to docs/en/calculators/hyd_en_charge/cond_distri.png
diff --git a/docs-en/calculators/hyd_en_charge/lechapt-calmon.md b/docs/en/calculators/hyd_en_charge/lechapt-calmon.md
similarity index 100%
rename from docs-en/calculators/hyd_en_charge/lechapt-calmon.md
rename to docs/en/calculators/hyd_en_charge/lechapt-calmon.md
diff --git a/docs-en/calculators/pab/chute.md b/docs/en/calculators/pab/chute.md
similarity index 100%
rename from docs-en/calculators/pab/chute.md
rename to docs/en/calculators/pab/chute.md
diff --git a/docs-en/calculators/pab/cloisons.md b/docs/en/calculators/pab/cloisons.md
similarity index 100%
rename from docs-en/calculators/pab/cloisons.md
rename to docs/en/calculators/pab/cloisons.md
diff --git a/docs-en/calculators/pab/dimensions.md b/docs/en/calculators/pab/dimensions.md
similarity index 100%
rename from docs-en/calculators/pab/dimensions.md
rename to docs/en/calculators/pab/dimensions.md
diff --git a/docs-en/calculators/pab/nombre.md b/docs/en/calculators/pab/nombre.md
similarity index 100%
rename from docs-en/calculators/pab/nombre.md
rename to docs/en/calculators/pab/nombre.md
diff --git a/docs-en/calculators/pab/pab.md b/docs/en/calculators/pab/pab.md
similarity index 100%
rename from docs-en/calculators/pab/pab.md
rename to docs/en/calculators/pab/pab.md
diff --git a/docs-en/calculators/pab/pab_barre_outils_edition.png b/docs/en/calculators/pab/pab_barre_outils_edition.png
similarity index 100%
rename from docs-en/calculators/pab/pab_barre_outils_edition.png
rename to docs/en/calculators/pab/pab_barre_outils_edition.png
diff --git a/docs-en/calculators/pab/volume.md b/docs/en/calculators/pab/volume.md
similarity index 100%
rename from docs-en/calculators/pab/volume.md
rename to docs/en/calculators/pab/volume.md
diff --git a/docs-en/calculators/pam/concentration.md b/docs/en/calculators/pam/concentration.md
similarity index 100%
rename from docs-en/calculators/pam/concentration.md
rename to docs/en/calculators/pam/concentration.md
diff --git a/docs-en/calculators/pam/macrorugo.md b/docs/en/calculators/pam/macrorugo.md
similarity index 100%
rename from docs-en/calculators/pam/macrorugo.md
rename to docs/en/calculators/pam/macrorugo.md
diff --git a/docs-en/calculators/pam/macrorugo_complexe.md b/docs/en/calculators/pam/macrorugo_complexe.md
similarity index 100%
rename from docs-en/calculators/pam/macrorugo_complexe.md
rename to docs/en/calculators/pam/macrorugo_complexe.md
diff --git a/docs-en/calculators/pam/macrorugo_theorie.md b/docs/en/calculators/pam/macrorugo_theorie.md
similarity index 100%
rename from docs-en/calculators/pam/macrorugo_theorie.md
rename to docs/en/calculators/pam/macrorugo_theorie.md
diff --git a/docs-en/calculators/pam/pam_schema_enrochement_regulier.png b/docs/en/calculators/pam/pam_schema_enrochement_regulier.png
similarity index 100%
rename from docs-en/calculators/pam/pam_schema_enrochement_regulier.png
rename to docs/en/calculators/pam/pam_schema_enrochement_regulier.png
diff --git a/docs-en/calculators/structures/cem_88_d.md b/docs/en/calculators/structures/cem_88_d.md
similarity index 100%
rename from docs-en/calculators/structures/cem_88_d.md
rename to docs/en/calculators/structures/cem_88_d.md
diff --git a/docs-en/calculators/structures/cem_88_d_graphique.jpg b/docs/en/calculators/structures/cem_88_d_graphique.jpg
similarity index 100%
rename from docs-en/calculators/structures/cem_88_d_graphique.jpg
rename to docs/en/calculators/structures/cem_88_d_graphique.jpg
diff --git a/docs-en/calculators/structures/cem_88_d_schema.jpg b/docs/en/calculators/structures/cem_88_d_schema.jpg
similarity index 100%
rename from docs-en/calculators/structures/cem_88_d_schema.jpg
rename to docs/en/calculators/structures/cem_88_d_schema.jpg
diff --git a/docs-en/calculators/structures/cem_88_v.md b/docs/en/calculators/structures/cem_88_v.md
similarity index 100%
rename from docs-en/calculators/structures/cem_88_v.md
rename to docs/en/calculators/structures/cem_88_v.md
diff --git a/docs-en/calculators/structures/cem_88_v_graphique.jpg b/docs/en/calculators/structures/cem_88_v_graphique.jpg
similarity index 100%
rename from docs-en/calculators/structures/cem_88_v_graphique.jpg
rename to docs/en/calculators/structures/cem_88_v_graphique.jpg
diff --git a/docs-en/calculators/structures/cem_88_v_schema.jpg b/docs/en/calculators/structures/cem_88_v_schema.jpg
similarity index 100%
rename from docs-en/calculators/structures/cem_88_v_schema.jpg
rename to docs/en/calculators/structures/cem_88_v_schema.jpg
diff --git a/docs-en/calculators/structures/cunge_80.md b/docs/en/calculators/structures/cunge_80.md
similarity index 100%
rename from docs-en/calculators/structures/cunge_80.md
rename to docs/en/calculators/structures/cunge_80.md
diff --git a/docs-en/calculators/structures/dever.md b/docs/en/calculators/structures/dever.md
similarity index 100%
rename from docs-en/calculators/structures/dever.md
rename to docs/en/calculators/structures/dever.md
diff --git a/docs-en/calculators/structures/dever_triang.md b/docs/en/calculators/structures/dever_triang.md
similarity index 100%
rename from docs-en/calculators/structures/dever_triang.md
rename to docs/en/calculators/structures/dever_triang.md
diff --git a/docs-en/calculators/structures/dever_triang_tronque.md b/docs/en/calculators/structures/dever_triang_tronque.md
similarity index 100%
rename from docs-en/calculators/structures/dever_triang_tronque.md
rename to docs/en/calculators/structures/dever_triang_tronque.md
diff --git a/docs-en/calculators/structures/echancrure_schema.png b/docs/en/calculators/structures/echancrure_schema.png
similarity index 100%
rename from docs-en/calculators/structures/echancrure_schema.png
rename to docs/en/calculators/structures/echancrure_schema.png
diff --git a/docs-en/calculators/structures/fente_noyee.md b/docs/en/calculators/structures/fente_noyee.md
similarity index 100%
rename from docs-en/calculators/structures/fente_noyee.md
rename to docs/en/calculators/structures/fente_noyee.md
diff --git a/docs-en/calculators/structures/fente_noyee_schema.png b/docs/en/calculators/structures/fente_noyee_schema.png
similarity index 100%
rename from docs-en/calculators/structures/fente_noyee_schema.png
rename to docs/en/calculators/structures/fente_noyee_schema.png
diff --git a/docs-en/calculators/structures/kivi.md b/docs/en/calculators/structures/kivi.md
similarity index 100%
rename from docs-en/calculators/structures/kivi.md
rename to docs/en/calculators/structures/kivi.md
diff --git a/docs-en/calculators/structures/kivi_abaques_alpha_beta.png b/docs/en/calculators/structures/kivi_abaques_alpha_beta.png
similarity index 100%
rename from docs-en/calculators/structures/kivi_abaques_alpha_beta.png
rename to docs/en/calculators/structures/kivi_abaques_alpha_beta.png
diff --git a/docs-en/calculators/structures/kivi_schema_seuil.png b/docs/en/calculators/structures/kivi_schema_seuil.png
similarity index 100%
rename from docs-en/calculators/structures/kivi_schema_seuil.png
rename to docs/en/calculators/structures/kivi_schema_seuil.png
diff --git a/docs-en/calculators/structures/kivi_villemonte_schema_seuil_noye.png b/docs/en/calculators/structures/kivi_villemonte_schema_seuil_noye.png
similarity index 100%
rename from docs-en/calculators/structures/kivi_villemonte_schema_seuil_noye.png
rename to docs/en/calculators/structures/kivi_villemonte_schema_seuil_noye.png
diff --git a/docs-en/calculators/structures/liste.md b/docs/en/calculators/structures/liste.md
similarity index 100%
rename from docs-en/calculators/structures/liste.md
rename to docs/en/calculators/structures/liste.md
diff --git a/docs-en/calculators/structures/lois_ouvrages.md b/docs/en/calculators/structures/lois_ouvrages.md
similarity index 100%
rename from docs-en/calculators/structures/lois_ouvrages.md
rename to docs/en/calculators/structures/lois_ouvrages.md
diff --git a/docs-en/calculators/structures/orifice_denoye.md b/docs/en/calculators/structures/orifice_denoye.md
similarity index 100%
rename from docs-en/calculators/structures/orifice_denoye.md
rename to docs/en/calculators/structures/orifice_denoye.md
diff --git a/docs-en/calculators/structures/orifice_denoye_schema.png b/docs/en/calculators/structures/orifice_denoye_schema.png
similarity index 100%
rename from docs-en/calculators/structures/orifice_denoye_schema.png
rename to docs/en/calculators/structures/orifice_denoye_schema.png
diff --git a/docs-en/calculators/structures/orifice_noye.md b/docs/en/calculators/structures/orifice_noye.md
similarity index 100%
rename from docs-en/calculators/structures/orifice_noye.md
rename to docs/en/calculators/structures/orifice_noye.md
diff --git a/docs-en/calculators/structures/orifice_noye_schema.png b/docs/en/calculators/structures/orifice_noye_schema.png
similarity index 100%
rename from docs-en/calculators/structures/orifice_noye_schema.png
rename to docs/en/calculators/structures/orifice_noye_schema.png
diff --git a/docs-en/calculators/structures/seuil_denoye.md b/docs/en/calculators/structures/seuil_denoye.md
similarity index 100%
rename from docs-en/calculators/structures/seuil_denoye.md
rename to docs/en/calculators/structures/seuil_denoye.md
diff --git a/docs-en/calculators/structures/seuil_noye.md b/docs/en/calculators/structures/seuil_noye.md
similarity index 100%
rename from docs-en/calculators/structures/seuil_noye.md
rename to docs/en/calculators/structures/seuil_noye.md
diff --git a/docs-en/calculators/structures/seuil_noye_schema.png b/docs/en/calculators/structures/seuil_noye_schema.png
similarity index 100%
rename from docs-en/calculators/structures/seuil_noye_schema.png
rename to docs/en/calculators/structures/seuil_noye_schema.png
diff --git a/docs-en/calculators/structures/type_de_jet.png b/docs/en/calculators/structures/type_de_jet.png
similarity index 100%
rename from docs-en/calculators/structures/type_de_jet.png
rename to docs/en/calculators/structures/type_de_jet.png
diff --git a/docs-en/calculators/structures/vanne_denoyee.md b/docs/en/calculators/structures/vanne_denoyee.md
similarity index 100%
rename from docs-en/calculators/structures/vanne_denoyee.md
rename to docs/en/calculators/structures/vanne_denoyee.md
diff --git a/docs-en/calculators/structures/vanne_denoyee_schema.png b/docs/en/calculators/structures/vanne_denoyee_schema.png
similarity index 100%
rename from docs-en/calculators/structures/vanne_denoyee_schema.png
rename to docs/en/calculators/structures/vanne_denoyee_schema.png
diff --git a/docs-en/calculators/structures/vanne_noyee.md b/docs/en/calculators/structures/vanne_noyee.md
similarity index 100%
rename from docs-en/calculators/structures/vanne_noyee.md
rename to docs/en/calculators/structures/vanne_noyee.md
diff --git a/docs-en/calculators/structures/vanne_noyee_schema.png b/docs/en/calculators/structures/vanne_noyee_schema.png
similarity index 100%
rename from docs-en/calculators/structures/vanne_noyee_schema.png
rename to docs/en/calculators/structures/vanne_noyee_schema.png
diff --git a/docs-en/calculators/structures/villemonte_1947.md b/docs/en/calculators/structures/villemonte_1947.md
similarity index 100%
rename from docs-en/calculators/structures/villemonte_1947.md
rename to docs/en/calculators/structures/villemonte_1947.md
diff --git a/docs-en/general/parametres_application.md b/docs/en/general/parametres_application.md
similarity index 100%
rename from docs-en/general/parametres_application.md
rename to docs/en/general/parametres_application.md
diff --git a/docs-en/general/principe_fonctionnement.md b/docs/en/general/principe_fonctionnement.md
similarity index 100%
rename from docs-en/general/principe_fonctionnement.md
rename to docs/en/general/principe_fonctionnement.md
diff --git a/docs-en/general/principe_fonctionnement_bandeau_superieur.png b/docs/en/general/principe_fonctionnement_bandeau_superieur.png
similarity index 100%
rename from docs-en/general/principe_fonctionnement_bandeau_superieur.png
rename to docs/en/general/principe_fonctionnement_bandeau_superieur.png
diff --git a/docs-en/general/principe_fonctionnement_grandeurs.png b/docs/en/general/principe_fonctionnement_grandeurs.png
similarity index 100%
rename from docs-en/general/principe_fonctionnement_grandeurs.png
rename to docs/en/general/principe_fonctionnement_grandeurs.png
diff --git a/docs-en/general/principe_fonctionnement_resultat_fix.png b/docs/en/general/principe_fonctionnement_resultat_fix.png
similarity index 100%
rename from docs-en/general/principe_fonctionnement_resultat_fix.png
rename to docs/en/general/principe_fonctionnement_resultat_fix.png
diff --git a/docs-en/general/principe_fonctionnement_resultat_var.png b/docs/en/general/principe_fonctionnement_resultat_var.png
similarity index 100%
rename from docs-en/general/principe_fonctionnement_resultat_var.png
rename to docs/en/general/principe_fonctionnement_resultat_var.png
diff --git a/docs-en/general/principe_fonctionnement_varie_liste.png b/docs/en/general/principe_fonctionnement_varie_liste.png
similarity index 100%
rename from docs-en/general/principe_fonctionnement_varie_liste.png
rename to docs/en/general/principe_fonctionnement_varie_liste.png
diff --git a/docs-en/general/principe_fonctionnement_varie_pas.png b/docs/en/general/principe_fonctionnement_varie_pas.png
similarity index 100%
rename from docs-en/general/principe_fonctionnement_varie_pas.png
rename to docs/en/general/principe_fonctionnement_varie_pas.png
diff --git a/docs-en/general/raccourcis_clavier.md b/docs/en/general/raccourcis_clavier.md
similarity index 100%
rename from docs-en/general/raccourcis_clavier.md
rename to docs/en/general/raccourcis_clavier.md
diff --git a/docs-en/index.md b/docs/en/index.md
similarity index 100%
rename from docs-en/index.md
rename to docs/en/index.md
diff --git a/docs-en/logo.png b/docs/en/logo.png
similarity index 100%
rename from docs-en/logo.png
rename to docs/en/logo.png
diff --git a/docs-en/mentions_legales.md b/docs/en/mentions_legales.md
similarity index 100%
rename from docs-en/mentions_legales.md
rename to docs/en/mentions_legales.md
diff --git a/docs-en/methodes_numeriques/brent.md b/docs/en/methodes_numeriques/brent.md
similarity index 100%
rename from docs-en/methodes_numeriques/brent.md
rename to docs/en/methodes_numeriques/brent.md
diff --git a/docs-en/methodes_numeriques/euler_explicite.md b/docs/en/methodes_numeriques/euler_explicite.md
similarity index 100%
rename from docs-en/methodes_numeriques/euler_explicite.md
rename to docs/en/methodes_numeriques/euler_explicite.md
diff --git a/docs-en/methodes_numeriques/integration_trapezes.md b/docs/en/methodes_numeriques/integration_trapezes.md
similarity index 100%
rename from docs-en/methodes_numeriques/integration_trapezes.md
rename to docs/en/methodes_numeriques/integration_trapezes.md
diff --git a/docs-en/methodes_numeriques/newton.md b/docs/en/methodes_numeriques/newton.md
similarity index 100%
rename from docs-en/methodes_numeriques/newton.md
rename to docs/en/methodes_numeriques/newton.md
diff --git a/docs-en/methodes_numeriques/rk4.md b/docs/en/methodes_numeriques/rk4.md
similarity index 100%
rename from docs-en/methodes_numeriques/rk4.md
rename to docs/en/methodes_numeriques/rk4.md
diff --git a/docs/fr/CHANGELOG.md b/docs/fr/CHANGELOG.md
new file mode 120000
index 0000000000000000000000000000000000000000..699cc9e7b7c5bf63c3549abe36e3eecf8efab625
--- /dev/null
+++ b/docs/fr/CHANGELOG.md
@@ -0,0 +1 @@
+../../CHANGELOG.md
\ No newline at end of file
diff --git a/docs-fr/calculators/devalaison/grille-inclinee-b.jpg b/docs/fr/calculators/devalaison/grille-inclinee-b.jpg
similarity index 100%
rename from docs-fr/calculators/devalaison/grille-inclinee-b.jpg
rename to docs/fr/calculators/devalaison/grille-inclinee-b.jpg
diff --git a/docs-fr/calculators/devalaison/grille-inclinee.jpg b/docs/fr/calculators/devalaison/grille-inclinee.jpg
similarity index 100%
rename from docs-fr/calculators/devalaison/grille-inclinee.jpg
rename to docs/fr/calculators/devalaison/grille-inclinee.jpg
diff --git a/docs-fr/calculators/devalaison/grille-orientee.jpg b/docs/fr/calculators/devalaison/grille-orientee.jpg
similarity index 100%
rename from docs-fr/calculators/devalaison/grille-orientee.jpg
rename to docs/fr/calculators/devalaison/grille-orientee.jpg
diff --git a/docs-fr/calculators/devalaison/grille.md b/docs/fr/calculators/devalaison/grille.md
similarity index 100%
rename from docs-fr/calculators/devalaison/grille.md
rename to docs/fr/calculators/devalaison/grille.md
diff --git a/docs-fr/calculators/devalaison/jet.md b/docs/fr/calculators/devalaison/jet.md
similarity index 100%
rename from docs-fr/calculators/devalaison/jet.md
rename to docs/fr/calculators/devalaison/jet.md
diff --git a/docs-fr/calculators/devalaison/profil-barreaux.png b/docs/fr/calculators/devalaison/profil-barreaux.png
similarity index 100%
rename from docs-fr/calculators/devalaison/profil-barreaux.png
rename to docs/fr/calculators/devalaison/profil-barreaux.png
diff --git a/docs-fr/calculators/hsl/courbe_remous.md b/docs/fr/calculators/hsl/courbe_remous.md
similarity index 100%
rename from docs-fr/calculators/hsl/courbe_remous.md
rename to docs/fr/calculators/hsl/courbe_remous.md
diff --git a/docs-fr/calculators/hsl/pente.md b/docs/fr/calculators/hsl/pente.md
similarity index 100%
rename from docs-fr/calculators/hsl/pente.md
rename to docs/fr/calculators/hsl/pente.md
diff --git a/docs-fr/calculators/hsl/regime_uniforme.md b/docs/fr/calculators/hsl/regime_uniforme.md
similarity index 100%
rename from docs-fr/calculators/hsl/regime_uniforme.md
rename to docs/fr/calculators/hsl/regime_uniforme.md
diff --git a/docs-fr/calculators/hsl/section_circulaire.png b/docs/fr/calculators/hsl/section_circulaire.png
similarity index 100%
rename from docs-fr/calculators/hsl/section_circulaire.png
rename to docs/fr/calculators/hsl/section_circulaire.png
diff --git a/docs-fr/calculators/hsl/section_parametree.md b/docs/fr/calculators/hsl/section_parametree.md
similarity index 100%
rename from docs-fr/calculators/hsl/section_parametree.md
rename to docs/fr/calculators/hsl/section_parametree.md
diff --git a/docs-fr/calculators/hsl/section_rectangulaire.png b/docs/fr/calculators/hsl/section_rectangulaire.png
similarity index 100%
rename from docs-fr/calculators/hsl/section_rectangulaire.png
rename to docs/fr/calculators/hsl/section_rectangulaire.png
diff --git a/docs-fr/calculators/hsl/section_trapezoidale.png b/docs/fr/calculators/hsl/section_trapezoidale.png
similarity index 100%
rename from docs-fr/calculators/hsl/section_trapezoidale.png
rename to docs/fr/calculators/hsl/section_trapezoidale.png
diff --git a/docs-fr/calculators/hsl/strickler.md b/docs/fr/calculators/hsl/strickler.md
similarity index 100%
rename from docs-fr/calculators/hsl/strickler.md
rename to docs/fr/calculators/hsl/strickler.md
diff --git a/docs-fr/calculators/hsl/types_sections.md b/docs/fr/calculators/hsl/types_sections.md
similarity index 100%
rename from docs-fr/calculators/hsl/types_sections.md
rename to docs/fr/calculators/hsl/types_sections.md
diff --git a/docs-fr/calculators/hsl/var_hydrauliques.md b/docs/fr/calculators/hsl/var_hydrauliques.md
similarity index 100%
rename from docs-fr/calculators/hsl/var_hydrauliques.md
rename to docs/fr/calculators/hsl/var_hydrauliques.md
diff --git a/docs-fr/calculators/hyd_en_charge/cond_distri.md b/docs/fr/calculators/hyd_en_charge/cond_distri.md
similarity index 100%
rename from docs-fr/calculators/hyd_en_charge/cond_distri.md
rename to docs/fr/calculators/hyd_en_charge/cond_distri.md
diff --git a/docs-fr/calculators/hyd_en_charge/cond_distri.png b/docs/fr/calculators/hyd_en_charge/cond_distri.png
similarity index 100%
rename from docs-fr/calculators/hyd_en_charge/cond_distri.png
rename to docs/fr/calculators/hyd_en_charge/cond_distri.png
diff --git a/docs-fr/calculators/hyd_en_charge/lechapt-calmon.md b/docs/fr/calculators/hyd_en_charge/lechapt-calmon.md
similarity index 100%
rename from docs-fr/calculators/hyd_en_charge/lechapt-calmon.md
rename to docs/fr/calculators/hyd_en_charge/lechapt-calmon.md
diff --git a/docs-fr/calculators/pab/chute.md b/docs/fr/calculators/pab/chute.md
similarity index 100%
rename from docs-fr/calculators/pab/chute.md
rename to docs/fr/calculators/pab/chute.md
diff --git a/docs-fr/calculators/pab/cloisons.md b/docs/fr/calculators/pab/cloisons.md
similarity index 100%
rename from docs-fr/calculators/pab/cloisons.md
rename to docs/fr/calculators/pab/cloisons.md
diff --git a/docs-fr/calculators/pab/dimensions.md b/docs/fr/calculators/pab/dimensions.md
similarity index 100%
rename from docs-fr/calculators/pab/dimensions.md
rename to docs/fr/calculators/pab/dimensions.md
diff --git a/docs-fr/calculators/pab/nombre.md b/docs/fr/calculators/pab/nombre.md
similarity index 100%
rename from docs-fr/calculators/pab/nombre.md
rename to docs/fr/calculators/pab/nombre.md
diff --git a/docs-fr/calculators/pab/pab.md b/docs/fr/calculators/pab/pab.md
similarity index 100%
rename from docs-fr/calculators/pab/pab.md
rename to docs/fr/calculators/pab/pab.md
diff --git a/docs-fr/calculators/pab/pab_barre_outils_edition.png b/docs/fr/calculators/pab/pab_barre_outils_edition.png
similarity index 100%
rename from docs-fr/calculators/pab/pab_barre_outils_edition.png
rename to docs/fr/calculators/pab/pab_barre_outils_edition.png
diff --git a/docs-fr/calculators/pab/volume.md b/docs/fr/calculators/pab/volume.md
similarity index 100%
rename from docs-fr/calculators/pab/volume.md
rename to docs/fr/calculators/pab/volume.md
diff --git a/docs-fr/calculators/pam/concentration.md b/docs/fr/calculators/pam/concentration.md
similarity index 100%
rename from docs-fr/calculators/pam/concentration.md
rename to docs/fr/calculators/pam/concentration.md
diff --git a/docs-fr/calculators/pam/macrorugo.md b/docs/fr/calculators/pam/macrorugo.md
similarity index 100%
rename from docs-fr/calculators/pam/macrorugo.md
rename to docs/fr/calculators/pam/macrorugo.md
diff --git a/docs-fr/calculators/pam/macrorugo_complexe.md b/docs/fr/calculators/pam/macrorugo_complexe.md
similarity index 100%
rename from docs-fr/calculators/pam/macrorugo_complexe.md
rename to docs/fr/calculators/pam/macrorugo_complexe.md
diff --git a/docs-fr/calculators/pam/macrorugo_theorie.md b/docs/fr/calculators/pam/macrorugo_theorie.md
similarity index 100%
rename from docs-fr/calculators/pam/macrorugo_theorie.md
rename to docs/fr/calculators/pam/macrorugo_theorie.md
diff --git a/docs-fr/calculators/pam/pam_schema_enrochement_regulier.png b/docs/fr/calculators/pam/pam_schema_enrochement_regulier.png
similarity index 100%
rename from docs-fr/calculators/pam/pam_schema_enrochement_regulier.png
rename to docs/fr/calculators/pam/pam_schema_enrochement_regulier.png
diff --git a/docs-fr/calculators/structures/cem_88_d.md b/docs/fr/calculators/structures/cem_88_d.md
similarity index 100%
rename from docs-fr/calculators/structures/cem_88_d.md
rename to docs/fr/calculators/structures/cem_88_d.md
diff --git a/docs-fr/calculators/structures/cem_88_d_graphique.jpg b/docs/fr/calculators/structures/cem_88_d_graphique.jpg
similarity index 100%
rename from docs-fr/calculators/structures/cem_88_d_graphique.jpg
rename to docs/fr/calculators/structures/cem_88_d_graphique.jpg
diff --git a/docs-fr/calculators/structures/cem_88_d_schema.jpg b/docs/fr/calculators/structures/cem_88_d_schema.jpg
similarity index 100%
rename from docs-fr/calculators/structures/cem_88_d_schema.jpg
rename to docs/fr/calculators/structures/cem_88_d_schema.jpg
diff --git a/docs-fr/calculators/structures/cem_88_v.md b/docs/fr/calculators/structures/cem_88_v.md
similarity index 100%
rename from docs-fr/calculators/structures/cem_88_v.md
rename to docs/fr/calculators/structures/cem_88_v.md
diff --git a/docs-fr/calculators/structures/cem_88_v_graphique.jpg b/docs/fr/calculators/structures/cem_88_v_graphique.jpg
similarity index 100%
rename from docs-fr/calculators/structures/cem_88_v_graphique.jpg
rename to docs/fr/calculators/structures/cem_88_v_graphique.jpg
diff --git a/docs-fr/calculators/structures/cem_88_v_schema.jpg b/docs/fr/calculators/structures/cem_88_v_schema.jpg
similarity index 100%
rename from docs-fr/calculators/structures/cem_88_v_schema.jpg
rename to docs/fr/calculators/structures/cem_88_v_schema.jpg
diff --git a/docs-fr/calculators/structures/cunge_80.md b/docs/fr/calculators/structures/cunge_80.md
similarity index 100%
rename from docs-fr/calculators/structures/cunge_80.md
rename to docs/fr/calculators/structures/cunge_80.md
diff --git a/docs-fr/calculators/structures/dever.md b/docs/fr/calculators/structures/dever.md
similarity index 100%
rename from docs-fr/calculators/structures/dever.md
rename to docs/fr/calculators/structures/dever.md
diff --git a/docs-fr/calculators/structures/dever_triang.md b/docs/fr/calculators/structures/dever_triang.md
similarity index 100%
rename from docs-fr/calculators/structures/dever_triang.md
rename to docs/fr/calculators/structures/dever_triang.md
diff --git a/docs-fr/calculators/structures/dever_triang_tronque.md b/docs/fr/calculators/structures/dever_triang_tronque.md
similarity index 100%
rename from docs-fr/calculators/structures/dever_triang_tronque.md
rename to docs/fr/calculators/structures/dever_triang_tronque.md
diff --git a/docs-fr/calculators/structures/echancrure_schema.png b/docs/fr/calculators/structures/echancrure_schema.png
similarity index 100%
rename from docs-fr/calculators/structures/echancrure_schema.png
rename to docs/fr/calculators/structures/echancrure_schema.png
diff --git a/docs-fr/calculators/structures/fente_noyee.md b/docs/fr/calculators/structures/fente_noyee.md
similarity index 100%
rename from docs-fr/calculators/structures/fente_noyee.md
rename to docs/fr/calculators/structures/fente_noyee.md
diff --git a/docs-fr/calculators/structures/fente_noyee_schema.png b/docs/fr/calculators/structures/fente_noyee_schema.png
similarity index 100%
rename from docs-fr/calculators/structures/fente_noyee_schema.png
rename to docs/fr/calculators/structures/fente_noyee_schema.png
diff --git a/docs-fr/calculators/structures/kivi.md b/docs/fr/calculators/structures/kivi.md
similarity index 100%
rename from docs-fr/calculators/structures/kivi.md
rename to docs/fr/calculators/structures/kivi.md
diff --git a/docs-fr/calculators/structures/kivi_abaques_alpha_beta.png b/docs/fr/calculators/structures/kivi_abaques_alpha_beta.png
similarity index 100%
rename from docs-fr/calculators/structures/kivi_abaques_alpha_beta.png
rename to docs/fr/calculators/structures/kivi_abaques_alpha_beta.png
diff --git a/docs-fr/calculators/structures/kivi_schema_seuil.png b/docs/fr/calculators/structures/kivi_schema_seuil.png
similarity index 100%
rename from docs-fr/calculators/structures/kivi_schema_seuil.png
rename to docs/fr/calculators/structures/kivi_schema_seuil.png
diff --git a/docs-fr/calculators/structures/kivi_villemonte_schema_seuil_noye.png b/docs/fr/calculators/structures/kivi_villemonte_schema_seuil_noye.png
similarity index 100%
rename from docs-fr/calculators/structures/kivi_villemonte_schema_seuil_noye.png
rename to docs/fr/calculators/structures/kivi_villemonte_schema_seuil_noye.png
diff --git a/docs-fr/calculators/structures/liste.md b/docs/fr/calculators/structures/liste.md
similarity index 100%
rename from docs-fr/calculators/structures/liste.md
rename to docs/fr/calculators/structures/liste.md
diff --git a/docs-fr/calculators/structures/lois_ouvrages.md b/docs/fr/calculators/structures/lois_ouvrages.md
similarity index 100%
rename from docs-fr/calculators/structures/lois_ouvrages.md
rename to docs/fr/calculators/structures/lois_ouvrages.md
diff --git a/docs-fr/calculators/structures/orifice_denoye.md b/docs/fr/calculators/structures/orifice_denoye.md
similarity index 100%
rename from docs-fr/calculators/structures/orifice_denoye.md
rename to docs/fr/calculators/structures/orifice_denoye.md
diff --git a/docs-fr/calculators/structures/orifice_denoye_schema.png b/docs/fr/calculators/structures/orifice_denoye_schema.png
similarity index 100%
rename from docs-fr/calculators/structures/orifice_denoye_schema.png
rename to docs/fr/calculators/structures/orifice_denoye_schema.png
diff --git a/docs-fr/calculators/structures/orifice_noye.md b/docs/fr/calculators/structures/orifice_noye.md
similarity index 100%
rename from docs-fr/calculators/structures/orifice_noye.md
rename to docs/fr/calculators/structures/orifice_noye.md
diff --git a/docs-fr/calculators/structures/orifice_noye_schema.png b/docs/fr/calculators/structures/orifice_noye_schema.png
similarity index 100%
rename from docs-fr/calculators/structures/orifice_noye_schema.png
rename to docs/fr/calculators/structures/orifice_noye_schema.png
diff --git a/docs-fr/calculators/structures/seuil_denoye.md b/docs/fr/calculators/structures/seuil_denoye.md
similarity index 100%
rename from docs-fr/calculators/structures/seuil_denoye.md
rename to docs/fr/calculators/structures/seuil_denoye.md
diff --git a/docs-fr/calculators/structures/seuil_noye.md b/docs/fr/calculators/structures/seuil_noye.md
similarity index 100%
rename from docs-fr/calculators/structures/seuil_noye.md
rename to docs/fr/calculators/structures/seuil_noye.md
diff --git a/docs-fr/calculators/structures/seuil_noye_schema.png b/docs/fr/calculators/structures/seuil_noye_schema.png
similarity index 100%
rename from docs-fr/calculators/structures/seuil_noye_schema.png
rename to docs/fr/calculators/structures/seuil_noye_schema.png
diff --git a/docs-fr/calculators/structures/type_de_jet.png b/docs/fr/calculators/structures/type_de_jet.png
similarity index 100%
rename from docs-fr/calculators/structures/type_de_jet.png
rename to docs/fr/calculators/structures/type_de_jet.png
diff --git a/docs-fr/calculators/structures/vanne_denoyee.md b/docs/fr/calculators/structures/vanne_denoyee.md
similarity index 100%
rename from docs-fr/calculators/structures/vanne_denoyee.md
rename to docs/fr/calculators/structures/vanne_denoyee.md
diff --git a/docs-fr/calculators/structures/vanne_denoyee_schema.png b/docs/fr/calculators/structures/vanne_denoyee_schema.png
similarity index 100%
rename from docs-fr/calculators/structures/vanne_denoyee_schema.png
rename to docs/fr/calculators/structures/vanne_denoyee_schema.png
diff --git a/docs-fr/calculators/structures/vanne_noyee.md b/docs/fr/calculators/structures/vanne_noyee.md
similarity index 100%
rename from docs-fr/calculators/structures/vanne_noyee.md
rename to docs/fr/calculators/structures/vanne_noyee.md
diff --git a/docs-fr/calculators/structures/vanne_noyee_schema.png b/docs/fr/calculators/structures/vanne_noyee_schema.png
similarity index 100%
rename from docs-fr/calculators/structures/vanne_noyee_schema.png
rename to docs/fr/calculators/structures/vanne_noyee_schema.png
diff --git a/docs-fr/calculators/structures/villemonte_1947.md b/docs/fr/calculators/structures/villemonte_1947.md
similarity index 100%
rename from docs-fr/calculators/structures/villemonte_1947.md
rename to docs/fr/calculators/structures/villemonte_1947.md
diff --git a/docs-fr/general/parametres_application.md b/docs/fr/general/parametres_application.md
similarity index 100%
rename from docs-fr/general/parametres_application.md
rename to docs/fr/general/parametres_application.md
diff --git a/docs-fr/general/principe_fonctionnement.md b/docs/fr/general/principe_fonctionnement.md
similarity index 100%
rename from docs-fr/general/principe_fonctionnement.md
rename to docs/fr/general/principe_fonctionnement.md
diff --git a/docs-fr/general/principe_fonctionnement_bandeau_superieur.png b/docs/fr/general/principe_fonctionnement_bandeau_superieur.png
similarity index 100%
rename from docs-fr/general/principe_fonctionnement_bandeau_superieur.png
rename to docs/fr/general/principe_fonctionnement_bandeau_superieur.png
diff --git a/docs-fr/general/principe_fonctionnement_grandeurs.png b/docs/fr/general/principe_fonctionnement_grandeurs.png
similarity index 100%
rename from docs-fr/general/principe_fonctionnement_grandeurs.png
rename to docs/fr/general/principe_fonctionnement_grandeurs.png
diff --git a/docs-fr/general/principe_fonctionnement_resultat_fix.png b/docs/fr/general/principe_fonctionnement_resultat_fix.png
similarity index 100%
rename from docs-fr/general/principe_fonctionnement_resultat_fix.png
rename to docs/fr/general/principe_fonctionnement_resultat_fix.png
diff --git a/docs-fr/general/principe_fonctionnement_resultat_var.png b/docs/fr/general/principe_fonctionnement_resultat_var.png
similarity index 100%
rename from docs-fr/general/principe_fonctionnement_resultat_var.png
rename to docs/fr/general/principe_fonctionnement_resultat_var.png
diff --git a/docs-fr/general/principe_fonctionnement_varie_liste.png b/docs/fr/general/principe_fonctionnement_varie_liste.png
similarity index 100%
rename from docs-fr/general/principe_fonctionnement_varie_liste.png
rename to docs/fr/general/principe_fonctionnement_varie_liste.png
diff --git a/docs-fr/general/principe_fonctionnement_varie_pas.png b/docs/fr/general/principe_fonctionnement_varie_pas.png
similarity index 100%
rename from docs-fr/general/principe_fonctionnement_varie_pas.png
rename to docs/fr/general/principe_fonctionnement_varie_pas.png
diff --git a/docs-fr/general/raccourcis_clavier.md b/docs/fr/general/raccourcis_clavier.md
similarity index 100%
rename from docs-fr/general/raccourcis_clavier.md
rename to docs/fr/general/raccourcis_clavier.md
diff --git a/docs-fr/index.md b/docs/fr/index.md
similarity index 100%
rename from docs-fr/index.md
rename to docs/fr/index.md
diff --git a/docs-fr/logo.png b/docs/fr/logo.png
similarity index 100%
rename from docs-fr/logo.png
rename to docs/fr/logo.png
diff --git a/docs-fr/mentions_legales.md b/docs/fr/mentions_legales.md
similarity index 100%
rename from docs-fr/mentions_legales.md
rename to docs/fr/mentions_legales.md
diff --git a/docs-fr/methodes_numeriques/brent.md b/docs/fr/methodes_numeriques/brent.md
similarity index 100%
rename from docs-fr/methodes_numeriques/brent.md
rename to docs/fr/methodes_numeriques/brent.md
diff --git a/docs-fr/methodes_numeriques/euler_explicite.md b/docs/fr/methodes_numeriques/euler_explicite.md
similarity index 100%
rename from docs-fr/methodes_numeriques/euler_explicite.md
rename to docs/fr/methodes_numeriques/euler_explicite.md
diff --git a/docs-fr/methodes_numeriques/integration_trapezes.md b/docs/fr/methodes_numeriques/integration_trapezes.md
similarity index 100%
rename from docs-fr/methodes_numeriques/integration_trapezes.md
rename to docs/fr/methodes_numeriques/integration_trapezes.md
diff --git a/docs-fr/methodes_numeriques/newton.md b/docs/fr/methodes_numeriques/newton.md
similarity index 100%
rename from docs-fr/methodes_numeriques/newton.md
rename to docs/fr/methodes_numeriques/newton.md
diff --git a/docs-fr/methodes_numeriques/rk4.md b/docs/fr/methodes_numeriques/rk4.md
similarity index 100%
rename from docs-fr/methodes_numeriques/rk4.md
rename to docs/fr/methodes_numeriques/rk4.md
diff --git a/electron-builder.yml b/electron-builder.yml
index 28087463289cff9f4fa4f5f9d69e693673426fe3..b74f49dd256a8cb56b69a2806f00bd28797fa165 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -15,8 +15,7 @@ files:
   - "!src/"
   - "!e2e/"
   - "!doc/"
-  - "!docs-fr/"
-  - "!docs-en/"
+  - "!docs/"
   - "!compodoc-fr/"
   - "!hooks/"
   - "!node_modules/"
diff --git a/mkdocs-en.yml b/mkdocs-en.yml
index 877dc87d3d0ba2e7e9156c46a15af9fd7c6fbcf0..969110e36fcadc57abf7270668bf04992ce83cd2 100644
--- a/mkdocs-en.yml
+++ b/mkdocs-en.yml
@@ -1,7 +1,7 @@
 site_name: Cassiopée documentation
 site_author: UMR G-EAU
-docs_dir: docs-en
-site_dir: src/assets/docs-en/
+docs_dir: docs/en
+site_dir: src/assets/docs/en/
 copyright: CC BY-NC-ND 4.0, UMR G-EAU 2019 - <a href="https://cassiopee.g-eau.fr">https://cassiopee.g-eau.fr</a>
 repo_name: ''
 repo_url: 'https://gitlab.irstea.fr/cassiopee'
@@ -10,8 +10,8 @@ theme:
     language: 'en'
 use_directory_urls: false
 extra_javascript:
-    - javascripts/mathjax/MathJax.js?config=TeX-AMS_CHTML
-    - javascripts/matomo-tracking.js
+    - ../javascripts/mathjax/MathJax.js?config=TeX-AMS_CHTML
+    - ../javascripts/matomo-tracking.js
 markdown_extensions:
     - mdx_math
     - footnotes
@@ -64,6 +64,7 @@ nav:
         - calculators/pam/macrorugo.md
         - calculators/pam/macrorugo_theorie.md
         - calculators/pam/macrorugo_complexe.md
+        - calculators/pam/concentration.md
     - Downstream migration:
         - Loss of charge, water grid: calculators/devalaison/grille.md
         - Jet impact: calculators/devalaison/jet.md
diff --git a/mkdocs-fr.yml b/mkdocs-fr.yml
index c99784f8fca9c3411b53d644d8d32b7a850151cd..5588f6755308f3d33eb6309f837c78ca3af7a3e1 100644
--- a/mkdocs-fr.yml
+++ b/mkdocs-fr.yml
@@ -1,7 +1,7 @@
 site_name: Documentation de Cassiopée
 site_author: UMR G-EAU
-docs_dir: docs-fr
-site_dir: src/assets/docs-fr/
+docs_dir: docs/fr
+site_dir: src/assets/docs/fr/
 copyright: CC BY-NC-ND 4.0, UMR G-EAU 2019 - <a href="https://cassiopee.g-eau.fr">https://cassiopee.g-eau.fr</a>
 repo_name: ''
 repo_url: 'https://gitlab.irstea.fr/cassiopee'
@@ -10,8 +10,8 @@ theme:
     language: 'fr'
 use_directory_urls: false
 extra_javascript:
-    - javascripts/mathjax/MathJax.js?config=TeX-AMS_CHTML
-    - javascripts/matomo-tracking.js
+    - ../javascripts/mathjax/MathJax.js?config=TeX-AMS_CHTML
+    - ../javascripts/matomo-tracking.js
 markdown_extensions:
     - mdx_math
     - footnotes
@@ -64,6 +64,7 @@ nav:
         - calculators/pam/macrorugo.md
         - calculators/pam/macrorugo_theorie.md
         - calculators/pam/macrorugo_complexe.md
+        - calculators/pam/concentration.md
     - Dévalaison:
         - Perte de charge sur grille de prise d'eau: calculators/devalaison/grille.md
         - Impact de jet: calculators/devalaison/jet.md
diff --git a/mkdocs2pdf.py b/mkdocs2pdf.py
index 46bb52479e6a40934bc7816b9be0a319069f2b62..51081ce88902116dbf1deae2bd1fa687afc9f159 100644
--- a/mkdocs2pdf.py
+++ b/mkdocs2pdf.py
@@ -1,12 +1,17 @@
 #! /bin/python3
 
+#
 # Combine tous les fichiers markdown de la documentation en un seul fichier
+#
+# Requis : 
+# - pandoc
+# - texlive (lister les paquets)
+#
 # Usage :
-# python3 ./mkdocs-combine.py > cassiopee_doc-fr.md
-# Pour la conversion au format tex :
-# pandoc cassiopee_doc-fr.md -o cassiopee_doc-fr.md.tex
+# - python3 ./mkdocs2pdf.py
+#
 
-outputDir = 'docs-fr_pdf'
+outputDir = 'docs/fr/pdf'
 filename = 'cassiopee_docs-fr'
 
 def readConfig(sYAML):
diff --git a/package.json b/package.json
index 222a12349daede552547e3d7dfc0e3f07be1961d..7efd965941898de64fbc5e79312b4752891e4b48 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "lint": "npm run ng -- lint",
     "e2e": "npm run preprocess && npm run ng -- e2e",
     "e2equick": "npm run ng -- e2e --dev-server-target=",
-    "mkdocs": "node scripts/mkdocs-preprocess.js && node scripts/python3.js -m mkdocs build -f mkdocs-fr.yml && node scripts/python3.js -m mkdocs build -f mkdocs-en.yml",
+    "mkdocs": "node scripts/python3.js -m mkdocs build -f mkdocs-fr.yml && node scripts/python3.js -m mkdocs build -f mkdocs-en.yml && node scripts/mkdocs-postprocess.js",
     "preprocess": "node scripts/preprocessors.js && npm run mkdocs",
     "start": "npm run preprocess && npm run ng serve -- --host 0.0.0.0 --poll 5000",
     "prod": "npm run preprocess && npm run ng serve  -- --host 0.0.0.0 --prod",
diff --git a/scripts/mkdocs-postprocess.js b/scripts/mkdocs-postprocess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7d5a9cd33a527125ba481ba2c04e39c481b816f4
--- /dev/null
+++ b/scripts/mkdocs-postprocess.js
@@ -0,0 +1,22 @@
+'use strict';
+
+/**
+ * copies Mathjax to src/assets/docs/javascripts after doc was built by MkDocs
+ */
+
+const fs = require('fs-extra');
+
+const destPath = "src/assets/docs/javascripts/mathjax";
+
+// empty destination folder
+fs.emptyDirSync(destPath);
+
+// create destination subfolders
+fs.ensureDirSync(destPath + "/fonts/HTML-CSS/TeX/", { recursive: true });
+
+// copy required files only
+fs.copySync("node_modules/mathjax/MathJax.js", destPath + "/MathJax.js");
+fs.copySync("node_modules/mathjax/config", destPath + "/config");
+fs.copySync("node_modules/mathjax/jax", destPath + "/jax");
+fs.copySync("node_modules/mathjax/fonts/HTML-CSS/TeX/woff", destPath + "/fonts/HTML-CSS/TeX/woff");
+fs.copySync("node_modules/mathjax/fonts/HTML-CSS/TeX/otf", destPath + "/fonts/HTML-CSS/TeX/otf");
diff --git a/scripts/mkdocs-preprocess.js b/scripts/mkdocs-preprocess.js
deleted file mode 100644
index 19d0b769e5ce2d3edec103b2c0285b6f30611a12..0000000000000000000000000000000000000000
--- a/scripts/mkdocs-preprocess.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-
-const fs = require('fs-extra');
-
-const langs = [ "en", "fr" ];
-
-for (const l of langs) {
-    preprocessForLang(l);
-}
-
-function preprocessForLang(lang = "fr") {
-    const destPath = "docs-" + lang + "/javascripts/mathjax";
-
-    // empty destination folder
-    fs.emptyDirSync(destPath);
-
-    // create destination subfolders
-    fs.ensureDirSync(destPath + "/fonts/HTML-CSS/TeX/", { recursive: true });
-
-    // copy required files only
-    fs.copySync("node_modules/mathjax/MathJax.js", destPath + "/MathJax.js");
-    fs.copySync("node_modules/mathjax/config", destPath + "/config");
-    fs.copySync("node_modules/mathjax/jax", destPath + "/jax");
-    fs.copySync("node_modules/mathjax/fonts/HTML-CSS/TeX/woff", destPath + "/fonts/HTML-CSS/TeX/woff");
-    fs.copySync("node_modules/mathjax/fonts/HTML-CSS/TeX/otf", destPath + "/fonts/HTML-CSS/TeX/otf");
-}
diff --git a/scripts/remove-duplicate-sitemap.js b/scripts/remove-duplicate-sitemap.js
index eb3d4eb88942a6f2d63e64677c913b251e318a9f..f119d98367b2c37c75507613135d3eaef666de88 100644
--- a/scripts/remove-duplicate-sitemap.js
+++ b/scripts/remove-duplicate-sitemap.js
@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 
-const paths = [ "dist/assets/docs-fr/sitemap.xml.gz", "dist/assets/docs-en/sitemap.xml.gz" ];
+const paths = [ "dist/assets/docs/fr/sitemap.xml.gz", "dist/assets/docs/en/sitemap.xml.gz" ];
 
 for (const path of paths) {
     if (fs.existsSync(path)) {
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 55812e840fb7f24c1c242175a27c7e767b1955cc..de6a3963ea14422875800f14a0d9c907fbf7a075 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -791,7 +791,7 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
   }
 
   public get docIndexPath(): string {
-    return "assets/docs-" + this.appSetupService.language + "/index.html";
+    return "assets/docs/" + this.appSetupService.language + "/index.html";
   }
 
   /**
diff --git a/src/app/components/field-set/field-set.component.ts b/src/app/components/field-set/field-set.component.ts
index c8201280bb34e938b9a24d7faad1516efe3e1825..2d53d8e4d6fb6bb1903662bdff553322b70ec4ed 100644
--- a/src/app/components/field-set/field-set.component.ts
+++ b/src/app/components/field-set/field-set.component.ts
@@ -399,7 +399,7 @@ export class FieldSetComponent implements DoCheck {
     }
 
     public openHelp() {
-        window.open("assets/docs-" + this.appSetupService.language + "/calculators/" + this._fieldSet.helpLink, "_blank");
+        window.open("assets/docs/" + this.appSetupService.language + "/calculators/" + this._fieldSet.helpLink, "_blank");
     }
 
     public get enableHelpButton() {
diff --git a/src/app/components/fieldset-container/fieldset-container.component.ts b/src/app/components/fieldset-container/fieldset-container.component.ts
index dbc3a5a2270764b3a93f35d5b8fbe6a17d61c851..84e9bbdd52c20986db846fbac644daff4be9698c 100644
--- a/src/app/components/fieldset-container/fieldset-container.component.ts
+++ b/src/app/components/fieldset-container/fieldset-container.component.ts
@@ -211,7 +211,7 @@ export class FieldsetContainerComponent implements DoCheck, AfterViewInit {
     }
 
     public openHelp() {
-        window.open("assets/docs-" + this.appSetupService.language + "/calculators/" + this._container.helpLink, "_blank");
+        window.open("assets/docs/" + this.appSetupService.language + "/calculators/" + this._container.helpLink, "_blank");
     }
 
     public get enableHelpButton() {
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 44f7e7e262430cbe4b7c27c8085039bbaa9487f3..c99b6cc91d1c0d13ceeef8f1cf12a47758448580 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -507,7 +507,7 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
     }
 
     public openHelp() {
-        window.open("assets/docs-" + this.appSetupService.language + "/calculators/" + this._formulaire.helpLink, "_blank");
+        window.open("assets/docs/" + this.appSetupService.language + "/calculators/" + this._formulaire.helpLink, "_blank");
     }
 
     /**
diff --git a/src/app/components/generic-input/generic-input.component.ts b/src/app/components/generic-input/generic-input.component.ts
index 3339ae54db76964c3262e5cff87df8ca477173f5..46f6bfe2e0d161ba77ef923f9fe3f49f7300040a 100644
--- a/src/app/components/generic-input/generic-input.component.ts
+++ b/src/app/components/generic-input/generic-input.component.ts
@@ -341,7 +341,7 @@ export abstract class GenericInputComponent implements OnChanges {
     }
 
     public openHelp($event: any) {
-        window.open("assets/docs-" + this.appSetupService.language + "/calculators/" + this._model.helpLink, "_blank");
+        window.open("assets/docs/" + this.appSetupService.language + "/calculators/" + this._model.helpLink, "_blank");
         $event.preventDefault();
         $event.stopPropagation();
         return false;
diff --git a/src/app/components/select-field-line/select-field-line.component.ts b/src/app/components/select-field-line/select-field-line.component.ts
index 2cdeca62c46a426e2d6881fc135cd167f7fc55e3..97ba41d40c123c744ae556778e0a5fcf64c402e3 100644
--- a/src/app/components/select-field-line/select-field-line.component.ts
+++ b/src/app/components/select-field-line/select-field-line.component.ts
@@ -70,7 +70,7 @@ export class SelectFieldLineComponent implements OnInit {
             const entryId = cv.id.substring(this._select.entriesBaseId.length);
             link = this._select.helpLink[entryId];
         }
-        window.open("assets/docs-" + this.appSetupService.language + "/calculators/" + link, "_blank");
+        window.open("assets/docs/" + this.appSetupService.language + "/calculators/" + link, "_blank");
         $event.preventDefault();
         $event.stopPropagation();
         return false;
diff --git a/src/app/results/calculator-results.ts b/src/app/results/calculator-results.ts
index 344364bbbef331c2a61c20f92dd5c448cd4755f7..e4b420907fc2122f8b4bf458663b01e97d878a43 100644
--- a/src/app/results/calculator-results.ts
+++ b/src/app/results/calculator-results.ts
@@ -58,7 +58,7 @@ export abstract class CalculatorResults {
     public getHelpLink(symbol: string): string {
         // add help link if any
         if (this.helpLinks !== undefined && this.helpLinks[symbol] !== undefined) {
-            const helpURL = "assets/docs-" + ServiceFactory.instance.applicationSetupService.language
+            const helpURL = "assets/docs/" + ServiceFactory.instance.applicationSetupService.language
                 + "/calculators/" + this.helpLinks[symbol];
             // pseudo-<mat-icon> dirty trick because <mat-icon> renderer cannot be
             // triggered when code is set through innerHTML
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 63ea5e92501fa9d65a02326655dcb43da6388b8f..93fe4db20ca5c84a5241069b071a8adf62da4034 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -475,7 +475,7 @@
     "INFO_THEME_PASSE_NATURELLE_TITRE": "Natural pass",
     "INFO_TITREJOURNAL": "Calculation log",
     "INFO_TITREJOURNAL_GLOBAL": "Calculation log synthesis",
-    "INFO_WELCOME_CONTENT": "<p>Il regroupe des outils d'aide à la conception des dispositifs de franchissement piscicoles pour la montaison et la dévalaison ainsi que des outils de calcul hydraulique utiles pour l'ingénierie en environnement et agriculture.</p><p>The Cassiopée software was developed by the ecohydraulic R&D pole gathering <a href=\"https://www.afbiodiversite.fr\" target=\"_blank\">AFB</a> (French Agency for Biodiversity) and <a href=\"https://www.imft.fr\" target=\"_blank\">IMFT</a> (Fluids Mechanics Institute of Toulouse) and by <a href=\"http://g-eau.fr/index.php/en/\" target=\"_blank\">UMR G-EAU</a> (Joint Research Unit \"Water Management, Actors, Territories\").</p><p>It includes tools for designing fish crossing devices for upstream and downstream migrations, and hydraulic calculation tools useful for environmental and agricultural engineering.</p><p>For more information, consult <a href=\"assets/docs-en/mentions_legales.html\" target=\"_blank\">legal notice</a> and <a href=\"assets/docs-en/index.html\" target=\"_blank\">documentation</a>.</p>",
+    "INFO_WELCOME_CONTENT": "<p>Il regroupe des outils d'aide à la conception des dispositifs de franchissement piscicoles pour la montaison et la dévalaison ainsi que des outils de calcul hydraulique utiles pour l'ingénierie en environnement et agriculture.</p><p>The Cassiopée software was developed by the ecohydraulic R&D pole gathering <a href=\"https://www.afbiodiversite.fr\" target=\"_blank\">AFB</a> (French Agency for Biodiversity) and <a href=\"https://www.imft.fr\" target=\"_blank\">IMFT</a> (Fluids Mechanics Institute of Toulouse) and by <a href=\"http://g-eau.fr/index.php/en/\" target=\"_blank\">UMR G-EAU</a> (Joint Research Unit \"Water Management, Actors, Territories\").</p><p>It includes tools for designing fish crossing devices for upstream and downstream migrations, and hydraulic calculation tools useful for environmental and agricultural engineering.</p><p>For more information, consult <a href=\"assets/docs/en/mentions_legales.html\" target=\"_blank\">legal notice</a> and <a href=\"assets/docs/en/index.html\" target=\"_blank\">documentation</a>.</p>",
     "INFO_WELCOME_SUBTITLE": "Hydraulic calculators",
     "INFO_EXAMPLE_LABEL_CHANNEL_FLOW": "Channel flow with hydraulic structures",
     "INFO_EXAMPLE_LABEL_PAB_COMPLETE": "Standard fish ladder",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 6e7ba5d64a856941be452f30e1285e208ef18462..46a58344c5e3982b165b403e5b8aa91b1d0fc563 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -474,7 +474,7 @@
     "INFO_THEME_PASSE_NATURELLE_TITRE": "Passe naturelle",
     "INFO_TITREJOURNAL": "Journal de calcul",
     "INFO_TITREJOURNAL_GLOBAL": "Synthèse du journal de calcul",
-    "INFO_WELCOME_CONTENT": "<p>Le logiciel Cassiopée a été développé par le pôle R&D écohydraulique regroupant l'<a href=\"https://www.afbiodiversite.fr\" target=\"_blank\">AFB</a> (Agence Française pour la Biodiversité) et l’<a href=\"https://www.imft.fr\" target=\"_blank\">IMFT</a> (Institut de mécanique des fluides de Toulouse) et par l'<a href=\"http://g-eau.fr\" target=\"_blank\">UMR G-EAU</a> (UMR Gestion de l'Eau, Acteurs, Usages).</p><p>Il regroupe des outils d'aide à la conception des dispositifs de franchissement piscicoles pour la montaison et la dévalaison ainsi que des outils de calcul hydraulique utiles pour l'ingénierie en environnement et agriculture.</p><p>Pour plus d'informations, consulter les <a href=\"assets/docs-fr/mentions_legales.html\" target=\"_blank\">mentions légales</a> et la <a href=\"assets/docs-fr/index.html\" target=\"_blank\">documentation</a>.</p>",
+    "INFO_WELCOME_CONTENT": "<p>Le logiciel Cassiopée a été développé par le pôle R&D écohydraulique regroupant l'<a href=\"https://www.afbiodiversite.fr\" target=\"_blank\">AFB</a> (Agence Française pour la Biodiversité) et l’<a href=\"https://www.imft.fr\" target=\"_blank\">IMFT</a> (Institut de mécanique des fluides de Toulouse) et par l'<a href=\"http://g-eau.fr\" target=\"_blank\">UMR G-EAU</a> (UMR Gestion de l'Eau, Acteurs, Usages).</p><p>Il regroupe des outils d'aide à la conception des dispositifs de franchissement piscicoles pour la montaison et la dévalaison ainsi que des outils de calcul hydraulique utiles pour l'ingénierie en environnement et agriculture.</p><p>Pour plus d'informations, consulter les <a href=\"assets/docs/fr/mentions_legales.html\" target=\"_blank\">mentions légales</a> et la <a href=\"assets/docs/fr/index.html\" target=\"_blank\">documentation</a>.</p>",
     "INFO_WELCOME_SUBTITLE": "Modules de calcul d'hydraulique",
     "INFO_EXAMPLE_LABEL_CHANNEL_FLOW": "Débit d'un chenal avec ouvrages",
     "INFO_EXAMPLE_LABEL_PAB_COMPLETE": "Passe à bassins type",