diff --git a/docs/overview/index.md b/docs/overview/index.md
index f407fc488cea40a740da9a3162f6bf90c8c1d89a..017df225d0b52be77aaf749333994d3ce5afddbd 100644
--- a/docs/overview/index.md
+++ b/docs/overview/index.md
@@ -106,7 +106,7 @@ A6 | Postfix | [Link](http://www.postfix.org/) | SMTP Server
 
 ID | Name | Lang  | Repo | Doc | Usage | Deps
 --- | --- | --- | --- | --- | --- | ---
-M1 | Legacy AUTH | TS | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/middlewares/legacy-auth) | [Link](../components/middlewares/legacy-auth.md) | Facilitating the interaction between the Web Portal Authentication Service (S1) and the AUTHN/AUTHZ Service (C1) hosted by data.grandlyon.com's Core macro-component |  C1, S5
+M1 | Legacy AUTH | TS | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/middlewares/legacy-auth.md) | [Link](../components/middlewares/legacy-auth.md) | Facilitating the interaction between the Web Portal Authentication Service (S1) and the AUTHN/AUTHZ Service (C1) hosted by data.grandlyon.com's Core macro-component |  C1, S5
 
 ### Proxies
 
@@ -122,8 +122,8 @@ The following custom indexers are used to index documents in Elasticsearch (A1)
 
 ID | Name | Repo | Doc | Usage | Deps
 --- | --- | --- | --- | --- | ---
-I1 | Editorial Content | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/indexers/editorial-content) | ... | Indexing the posts and pages edited via Ghost | A2
-I2 | Metadata and Data | ... | ... | Indexing the metadata and data hosted, respectively, by data.grandlyon.com's catalog (C3) and database (C4) | C3, C4
+I1 | Editorial Content | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/indexers/editorial-content) | [Link](../components/indexers/editorial-content.md) | Indexing the posts and pages edited via Ghost | A2
+I2 | Metadata and Data | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/indexers/metadata-and-data) | [Link](../components/indexers/metadata-and-data.md) | Indexing the metadata and data hosted, respectively, by data.grandlyon.com's catalog (C3) and database (C4) | C3, C4
 
 ### Tools
 
@@ -139,7 +139,6 @@ In alphabetical order:
 
 ID | Name | Repo | Doc | Usage | Deps
 --- | --- | --- | --- | --- | ---
-<<<<<<< HEAD
 S1 | Authentication | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/services/authentication)  | [Link](../components/services/authentication.md) | Allowing users to create accounts and to perform logins and logouts | A3, S5
 S2 | Changelog | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/services/changelog) | [Link](../components/services/changelog.md) | Keeping track of the new features available to users throughout the developments|
 S3 | Credits | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/services/credits) | [Link](../components/services/credits.md) | Catalog of the Open Source initiatives powering the data.grandlyon.com project |  |
@@ -150,41 +149,18 @@ S7 | Organizations | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-
 S8 | Resources Helper | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/services/resources-helper) | [Link](../components/services/resources-helper.md) | Assisting users in the composition of custom queries against the Core APIs |
 S9 | Reuses | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/services/reuses) | [Link](../components/services/reuses.md) | A catalog of the known reuses of the data shared through data.grandlyon.com | S6
 S10 | Social Media Share Helper | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/services/social-media-share-helper) | [Link](../components/services/social-media-share-helper.md) | ... | ...
-||||||| merged common ancestors
-S1 | Authentication | ...  | [Link](../components/services/authentication.md) | Allowing users to create accounts and to perform logins and logouts | A3, S5
-S2 | Changelog | [Link](https://gitlab.alpha.grandlyon.com/refonte-data/service-changelog)  | [Link](../components/services/changelog.md) | Keeping track of the new features available to users throughout the developments|
-S3 | Credits | ... | [Link](../components/services/credits.md) | Catalog of the Open Source initiatives powering the data.grandlyon.com project |  |
-S4 | CSV Catalog Downloader | ... | [Link](../components/services/csv-catalog-downloader.md) |  Allowing users to download cached CSV exports of the metadata catalog | C3 |
-S5 | Mailer | ... | [Link](../components/services/mail.md) | Sending e-mails to both end- and back-office users | A6
-S6 | Media Library | ... | ... | Managing the images shown across the various pages of the Web Portal (organizations, posts, ...) |
-S7 | Organizations | ... | ... | A catalog of the partners of the data.grandlyon.com, typically Data Providers | S6
-S8 | Resources Helper | ... | ... | Assisting users in the composition of custom queries against the Core APIs |
-S9 | Reuses | ...  | ...  | A catalog of the known reuses of the data shared through data.grandlyon.com | S6
-S10 | Social Media Share Helper
-=======
-S1 | Authentication | ...  | [Link](../components/services/authentication.md) | Allowing users to create accounts and to perform logins and logouts | A3, S5
-S2 | Changelog | [Link](https://gitlab.alpha.grandlyon.com/refonte-data/service-changelog)  | [Link](../components/services/changelog.md) | Keeping track of the new features available to users throughout the developments|
-S3 | Credits | ... | [Link](../components/services/credits.md) | Catalog of the Open Source initiatives powering the data.grandlyon.com project |  |
-S4 | CSV Catalog Downloader | ... | [Link](../components/services/csv-catalog-downloader.md) |  Allowing users to download cached CSV exports of the metadata catalog | C3 |
-S5 | Mailer | ... | [Link](../components/services/mailer.md) | Sending e-mails to both end- and back-office users | A6
-S6 | Media Library | ... | ... | Managing the images shown across the various pages of the Web Portal (organizations, posts, ...) |
-S7 | Organizations | ... | ... | A catalog of the partners of the data.grandlyon.com, typically Data Providers | S6
-S8 | Resources Helper | ... | ... | Assisting users in the composition of custom queries against the Core APIs |
-S9 | Reuses | ...  | ...  | A catalog of the known reuses of the data shared through data.grandlyon.com | S6
-S10 | Social Media Share Helper
->>>>>>> doc-webapp
 
 ### Custom applications
 ID | Name | Repo | Doc | Usage | Deps
 --- | --- | --- | --- | --- | ---
-D1 | Web App | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/custom-apps/web-app) | ... | Web Application representing the actual Web Portal as seen by its end-users | S[1,9]
-D2 | Admin GUI | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/custom-apps/web-app) | ... |  Back-office oriented web application allowing users to administrate some of the editorial content as well as the configuration of some functionality | S[1,3], S[6,9]
+D1 | Web App | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/custom-apps/web-app) | [Link](../components/custom-apps/web-app/overview.md) | Web Application representing the actual Web Portal as seen by its end-users | S[1,9]
+D2 | Admin GUI | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/custom-apps/web-app) | [Link](../components/custom-apps/admin-gui.md) |  Back-office oriented web application allowing users to administrate some of the editorial content as well as the configuration of some functionality | S[1,3], S[6,9]
 
 ### Miscellaneous
 
 ID | Name | Repo | Doc | Usage | Deps
 --- | --- | --- | --- | --- | ---
-M1 | Maintenance Page | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/miscellaneous/maintenance-page) | A static HTML page to be used whenever the official site has to go offline because of some maintenance tasks |
+M1 | Maintenance Page | [Link](https://forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/miscellaneous/maintenance-page) | [Link](../components/miscellaneous/maintenance-page.md) | A static HTML page to be used whenever the official site has to go offline because of some maintenance tasks |
 
 <!-- <span id="test">mon test</span>
 <a href='#test'>link</a> -->