diff --git a/packages/code-du-travail-frontend/__tests__/__snapshots__/modeles-de-courriers.test.tsx.snap b/packages/code-du-travail-frontend/__tests__/__snapshots__/modeles-de-courriers.test.tsx.snap
index 033681f0af..02dad7d0b6 100644
--- a/packages/code-du-travail-frontend/__tests__/__snapshots__/modeles-de-courriers.test.tsx.snap
+++ b/packages/code-du-travail-frontend/__tests__/__snapshots__/modeles-de-courriers.test.tsx.snap
@@ -215,7 +215,7 @@ exports[`<ModelesDeCourriers /> should render 1`] = `
             </p>
           </header>
           <div
-            class="sc-5a2c6b8f-0 yOEut sc-496f89b6-2 RBhuQ"
+            class="sc-5a2c6b8f-0 yOEut sc-f36c6fc-2 cQpmLT"
           >
             <select
               class="sc-5a2c6b8f-2 leEqvE"
@@ -268,15 +268,15 @@ exports[`<ModelesDeCourriers /> should render 1`] = `
             </div>
           </div>
           <ul
-            class="sc-ab356c14-0 sc-496f89b6-0 bpNHPl eaxYjO"
+            class="sc-ab356c14-0 sc-f36c6fc-0 bpNHPl dRUUmx"
           >
             <h2
-              class="sc-496f89b6-3 ognPt sc-b879fc2d-0 hyiHle"
+              class="sc-f36c6fc-3 gWQLPi sc-b879fc2d-0 hyiHle"
             >
               Embauche et contrat de travail
             </h2>
             <li
-              class="sc-496f89b6-1 iHMoBq"
+              class="sc-f36c6fc-1 kJkExl"
             >
               <div
                 class="sc-d47d8018-0 cDsGtD"
@@ -333,12 +333,12 @@ exports[`<ModelesDeCourriers /> should render 1`] = `
               </div>
             </li>
             <h2
-              class="sc-496f89b6-3 ognPt sc-b879fc2d-0 hyiHle"
+              class="sc-f36c6fc-3 gWQLPi sc-b879fc2d-0 hyiHle"
             >
               Départ de l'entreprise
             </h2>
             <li
-              class="sc-496f89b6-1 iHMoBq"
+              class="sc-f36c6fc-1 kJkExl"
             >
               <div
                 class="sc-d47d8018-0 cDsGtD"
diff --git a/packages/code-du-travail-frontend/app/code-du-travail/[slug]/page.tsx b/packages/code-du-travail-frontend/app/code-du-travail/[slug]/page.tsx
index 89a2d2c8ce..da5ffd964e 100644
--- a/packages/code-du-travail-frontend/app/code-du-travail/[slug]/page.tsx
+++ b/packages/code-du-travail-frontend/app/code-du-travail/[slug]/page.tsx
@@ -5,10 +5,12 @@ import React from "react";
 import { replaceArticlesRefs } from "../../../src/lib/replaceArticlesRefs";
 import { DsfrLayout } from "../../../src/modules/layout";
 import { notFound } from "next/navigation";
-import ArticleCodeDuTravail from "../../../src/modules/code-du-travail/articleCodeDuTravail";
+import {
+  ArticleCodeDuTravail,
+  fetchLegalArticle,
+} from "../../../src/modules/code-du-travail";
 import { generateDefaultMetadata } from "../../../src/modules/common/metas";
-import { getLegalArticleBySlug } from "../../../src/api/modules/legal-articles";
-import { getRelatedItems } from "../../../src/api/modules/related-items/service";
+import { fetchRelatedItems } from "../../../src/modules/documents";
 
 export async function generateMetadata({ params }) {
   const { title, description } = await getArticle(params.slug);
@@ -23,7 +25,7 @@ export async function generateMetadata({ params }) {
 async function Fiche({ params }) {
   const { _id, title, description, dateDebut, html, url, notaHtml } =
     await getArticle(params.slug);
-  const relatedItems = await getRelatedItems({ _id }, params.slug);
+  const relatedItems = await fetchRelatedItems({ _id }, params.slug);
 
   const fixedHtml = replaceArticlesRefs("https://legifrance.gouv.fr", html);
   return (
@@ -45,7 +47,7 @@ async function Fiche({ params }) {
 }
 
 const getArticle = async (slug: string) => {
-  const article = await getLegalArticleBySlug(slug);
+  const article = await fetchLegalArticle(slug);
 
   if (!article) {
     return notFound();
diff --git a/packages/code-du-travail-frontend/app/plan-du-site/page.tsx b/packages/code-du-travail-frontend/app/plan-du-site/page.tsx
index db72080e47..d96f34bfb2 100644
--- a/packages/code-du-travail-frontend/app/plan-du-site/page.tsx
+++ b/packages/code-du-travail-frontend/app/plan-du-site/page.tsx
@@ -1,7 +1,6 @@
 import { Metadata } from "next";
 import { DsfrLayout } from "../../src/modules/layout";
-import { getSitemapData } from "../../src/api";
-import { SiteMap } from "../../src/modules/plan-du-site";
+import { fetchSitemapData, SiteMap } from "../../src/modules/plan-du-site";
 
 export const metadata: Metadata = {
   title: "Plan du site",
@@ -9,7 +8,7 @@ export const metadata: Metadata = {
 };
 
 const getSiteMap = async () => {
-  return getSitemapData();
+  return fetchSitemapData();
 };
 
 async function Index() {
diff --git a/packages/code-du-travail-frontend/package.json b/packages/code-du-travail-frontend/package.json
index 819083199a..ba93f173c1 100644
--- a/packages/code-du-travail-frontend/package.json
+++ b/packages/code-du-travail-frontend/package.json
@@ -20,9 +20,9 @@
     "pretest:api": "NEXT_PUBLIC_ES_INDEX_PREFIX=cdtn_test NEXT_PUBLIC_APP_ENV=test NODE_ENV=test node -r @swc-node/register scripts/generate-data.ts",
     "test": "yarn pretest:api && NEXT_PUBLIC_ES_INDEX_PREFIX=cdtn_test NEXT_PUBLIC_APP_ENV=test NODE_ENV=test jest --silent",
     "test:watch": "npm run test -- --watch",
-    "test:frontend": "NEXT_PUBLIC_APP_ENV=test NODE_ENV=test jest --silent --testPathIgnorePatterns=src/api",
+    "test:frontend": "NEXT_PUBLIC_APP_ENV=test NODE_ENV=test jest --silent --testPathIgnorePatterns='.*\\.es\\.test\\.ts$'",
     "test:frontend:update": "npm run test:frontend -- --updateSnapshot",
-    "test:api": "npm run test -- --testPathPattern=src/api",
+    "test:api": "npm run test -- --testPathPattern='.*\\.es\\.test\\.ts$'",
     "test:api:update": "npm run test:api -- --updateSnapshot",
     "test:update": "npm run test:frontend:update",
     "test:e2e": "cypress run",
diff --git a/packages/code-du-travail-frontend/pages/convention-collective/index.tsx b/packages/code-du-travail-frontend/pages/convention-collective/index.tsx
index 243d520d41..be1b6cd1cb 100644
--- a/packages/code-du-travail-frontend/pages/convention-collective/index.tsx
+++ b/packages/code-du-travail-frontend/pages/convention-collective/index.tsx
@@ -81,15 +81,7 @@ export default Page;
 
 export async function getStaticProps() {
   try {
-    let data = await getAllAgreements([
-      "title",
-      "shortTitle",
-      "description",
-      "url",
-      "slug",
-      "source",
-      "num",
-    ]);
+    let data = await getAllAgreements();
     return { props: { ccs: data }, revalidate: REVALIDATE_TIME };
   } catch (error) {
     console.error(error);
diff --git a/packages/code-du-travail-frontend/pages/integration/[slug].tsx b/packages/code-du-travail-frontend/pages/integration/[slug].tsx
index f8a8638461..721037ad51 100644
--- a/packages/code-du-travail-frontend/pages/integration/[slug].tsx
+++ b/packages/code-du-travail-frontend/pages/integration/[slug].tsx
@@ -48,12 +48,12 @@ const IntegrationPage = (props): JSX.Element => {
 const keys = Object.keys(integrationData);
 
 const getModelesList = async () => {
-  const modeles = await getAllModeles(["title", "cdtnId"]);
+  const modeles = await getAllModeles();
   return modeles
     .map((item) => {
       return {
-        label: item.title,
-        value: item.cdtnId,
+        label: item?.title ?? "",
+        value: item?.cdtnId ?? "",
       };
     })
     ?.sort((a, b) => a.label.localeCompare(b.label));
diff --git a/packages/code-du-travail-frontend/pages/modeles-de-courriers/index.tsx b/packages/code-du-travail-frontend/pages/modeles-de-courriers/index.tsx
index e91bffe609..bab9c0963a 100644
--- a/packages/code-du-travail-frontend/pages/modeles-de-courriers/index.tsx
+++ b/packages/code-du-travail-frontend/pages/modeles-de-courriers/index.tsx
@@ -105,14 +105,7 @@ function Modeles(props) {
 
 export async function getStaticProps() {
   try {
-    const data = await getAllModeles([
-      "title",
-      "slug",
-      "description",
-      "source",
-      "breadcrumbs",
-      "cdtnId",
-    ]);
+    const data = await getAllModeles();
     return { props: { data }, revalidate: REVALIDATE_TIME };
   } catch (error) {
     console.error(error);
diff --git a/packages/code-du-travail-frontend/pages/themes/index.tsx b/packages/code-du-travail-frontend/pages/themes/index.tsx
index 6840d64929..5b5e52f5f4 100644
--- a/packages/code-du-travail-frontend/pages/themes/index.tsx
+++ b/packages/code-du-travail-frontend/pages/themes/index.tsx
@@ -15,7 +15,7 @@ import Metas from "../../src/common/Metas";
 import { REVALIDATE_TIME } from "../../src/config";
 import { Layout } from "../../src/layout/Layout";
 import { LinkedTile } from "../../src/common/tiles/LinkedTile";
-import { getRootThemes } from "../../src/api";
+import { getAllThemes } from "../../src/api";
 
 const SubThemes = ({ children = [] }) => {
   return (
@@ -73,14 +73,8 @@ const ThemesPage = ({ children = [] }) => (
 
 export async function getStaticProps() {
   try {
-    const data = await getRootThemes([
-      "icon",
-      "children",
-      "title",
-      "slug",
-      "position",
-    ]);
-    return { props: { children: data }, revalidate: REVALIDATE_TIME };
+    const data = await getAllThemes();
+    return { props: { children: data.children }, revalidate: REVALIDATE_TIME };
   } catch (error) {
     console.error(error);
     return {
diff --git a/packages/code-du-travail-frontend/scripts/data/documents_data.json b/packages/code-du-travail-frontend/scripts/data/documents_data.json
index c84fef619f..dc28ddda3e 100644
--- a/packages/code-du-travail-frontend/scripts/data/documents_data.json
+++ b/packages/code-du-travail-frontend/scripts/data/documents_data.json
@@ -6166,6 +6166,235 @@
     "ccnShortTitle": "Industries chimiques et connexes",
     "messageBlock": "<p>Ces informations sont issues de l’analyse des règles prévues par votre convention collective de branche étendue et par le Code du travail. Elles s’appliqueront sauf si une convention ou un accord d’entreprise (ou de groupe, ou d’établissement) existant dans votre entreprise prévoit également des règles sur le même sujet. En effet, dans ce cas, cette convention ou accord s’appliquera, qu’il soit plus ou moins favorable que la convention de branche, sous réserve d’être au moins aussi favorable que le Code du travail. Dans tous les cas, reportez-vous à votre contrat de travail car s’il contient des règles plus favorables, ce sont ces dernières qui s’appliqueront. </p><p>Attention, d’autres règles non étendues peuvent potentiellement vous être applicables.</p>"
   },
+  {
+    "date": "29/05/2024",
+    "contents": [
+      {
+        "name": "contrat-de-travail-a-duree-indeterminee-cdi",
+        "title": "Contrat de travail à durée indéterminée (CDI)",
+        "blocks": [
+          {
+            "type": "markdown",
+            "html": "<p>Selon le Code du travail, la forme du contrat à durée indéterminée est libre : un écrit n’est pas nécessairement exigé s'il s'agit d'un CDI <em>à temps plein</em> sauf si votre <webcomponent-tooltip-cc>convention collective</webcomponent-tooltip-cc> le prévoit. Vous pouvez vérifier cette obligation <a href=\"https://code.travail.gouv.fr/contribution/est-il-obligatoire-davoir-un-contrat-de-travail-ecrit-et-signe\">ici</a>.\nEn pratique, un contrat écrit est toujours préférable.</p>\n<p>Par exemple, pour qu’il y ait une période d’essai, celle-ci doit être expressément indiquée dans le contrat de travail. <a href=\"https://code.travail.gouv.fr/contribution/quelle-est-la-duree-maximale-de-la-periode-dessai-sans-et-avec-renouvellement\">Vérifiez ici la durée maximale prévue par votre convention collective</a>.</p>\n<p>Par ailleurs, elle ne peut être renouvelée que si la <webcomponent-tooltip-cc>convention collective</webcomponent-tooltip-cc> le prévoit. <a href=\"https://code.travail.gouv.fr/contribution/la-periode-dessai-peut-elle-etre-renouvelee\">Consultez la disposition de votre convention collective sur le renouvellement de la période d'essai</a>.</p>\n<p>Ce modèle de contrat de travail à durée indéterminée vous est donc proposé à titre d’exemple. <a href=\"https://code.travail.gouv.fr/modeles-de-courriers/contrat-de-travail-a-duree-indeterminee\">Consultez le modèle de CDI</a></p>\n<p>Il convient de l’adapter à votre situation et d’y faire figurer les clauses imposées par votre <webcomponent-tooltip-cc>convention collective</webcomponent-tooltip-cc> et les éventuelles clauses particulières librement négociées (clause de non-concurrence, clause de mobilité…).\nRetrouvez les <strong>mentions obligatoires</strong> prévues par votre <webcomponent-tooltip-cc>convention collective</webcomponent-tooltip-cc> <a href=\"https://code.travail.gouv.fr/contribution/quelles-informations-doivent-figurer-dans-le-contrat-de-travail-ou-la-lettre-dengagement\">en cliquant ici</a>.</p>"
+          }
+        ],
+        "references": [
+          {
+            "label": "Liens utiles",
+            "links": [
+              {
+                "id": "140551c9-a782-4f0f-8652-778c7607eb17",
+                "url": "https://code.travail.gouv.fr/fiche-service-public/temps-partiel-dun-salarie-dans-le-secteur-prive?q=temps%20partiel",
+                "type": "external",
+                "order": 1,
+                "title": "Temps partiel d'un salarié dans le secteur privé "
+              },
+              {
+                "id": "d452ab8b-7dc1-4a7e-ae42-f1bd0828702f",
+                "url": "https://code.travail.gouv.fr/fiche-ministere-travail/les-conventions-de-forfait?q=forfait#Conventions-de-forfait-objet",
+                "type": "external",
+                "order": 2,
+                "title": "Les conventions de forfait "
+              },
+              {
+                "id": "80357d5d-42a0-4366-99be-bc27f2dbbda9",
+                "url": "https://code.travail.gouv.fr/outils/convention-collective",
+                "type": "external",
+                "order": 3,
+                "title": "Trouver sa convention collective"
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "contrat-de-travail-a-duree-determinee-cdd",
+        "title": "Contrat de travail à durée déterminée (CDD)",
+        "blocks": [
+          {
+            "type": "markdown",
+            "html": "<p>Le contrat de travail à durée déterminée est nécessairement établi par écrit et comporte la définition précise du motif du recours au CDD.</p>\n<p>Il doit être transmis au salarié, au plus tard, dans les deux <webcomponent-tooltip content=\"Correspond%20%C3%A0%20tous%20les%20jours%20de%20la%20semaine%2C%20%C3%A0%20l%E2%80%99exception%20du%20jour%20de%20repos%20hebdomadaire%20(g%C3%A9n%C3%A9ralement%20le%20dimanche)%20et%20des%20jours%20f%C3%A9ri%C3%A9s%20habituellement%20non%20travaill%C3%A9s%20dans%20l%E2%80%99entreprise.\">jours ouvrables</webcomponent-tooltip> suivant l'embauche.</p>\n<p>Ce modèle, proposé à titre d’exemple, reprend <a href=\"https://code.travail.gouv.fr/contribution/quelles-informations-doivent-figurer-dans-le-contrat-de-travail-ou-la-lettre-dengagement\">les mentions obligatoires qui doivent figurer dans le contrat</a>, précise les mentions spécifiques liées au motif du recours au CDD, et comporte des clauses particulières qui peuvent être retenues ou non selon les modalités d'exécution du travail prévues par les parties.</p>\n<p>En toutes hypothèses, il convient de vous assurer que vous êtes dans l’un des cas de recours autorisés par la loi et d’adapter ce contrat à votre situation. Vérifiez notamment la <a href=\"https://code.travail.gouv.fr/contribution/quelle-peut-etre-la-duree-maximale-dun-cdd\">durée maximale prévue par la convention collective</a> ainsi que <a href=\"https://code.travail.gouv.fr/contribution/combien-de-fois-le-contrat-de-travail-peut-il-etre-renouvele\">les conditions de renouvellement du CDD</a>.</p>\n<p><a href=\"https://code.travail.gouv.fr/modeles-de-courriers/contrat-de-travail-a-duree-determinee-cdd\">Consultez le modèle de CDD</a></p>\n<p>Attention au cas particulier du CDD d'usage qui comporte de nombreuses spécificités.\n<a href=\"https://code.travail.gouv.fr/contribution/embauche-en-contrat-dextra-cdd-dusage\">Consultez votre convention collective sur le CDD d'usage</a></p>\n<p>Le CDD à objet défini fait également l’objet de règles particulières, présentées sur <a href=\"https://code.travail.gouv.fr/fiche-ministere-travail/le-contrat-a-duree-determinee-a-objet-defini\">cette fiche</a>.</p>\n<p>Pour finir, à la fin d'un CDD, le salarié touche dans certains cas une prime de précarité. Pour connaître le montant de cette prime, un <a href=\"https://code.travail.gouv.fr/outils/indemnite-precarite\">simulateur de l'indemnité est disponible ici</a>.</p>"
+          }
+        ],
+        "references": [
+          {
+            "label": "Liens utiles",
+            "links": [
+              {
+                "id": "641025df-8eb9-4f14-823f-c75a6c4cca14",
+                "url": "https://code.travail.gouv.fr/contribution/dans-le-cadre-dun-cdd-quel-est-le-montant-de-lindemnite-de-fin-de-contrat",
+                "type": "external",
+                "order": 1,
+                "title": "Dans le cadre d’un CDD, quel est le montant de l’indemnité de fin de contrat ?"
+              },
+              {
+                "id": "c3bf9ca6-d1bc-4c60-ac3a-9f77d39cba1a",
+                "url": "https://code.travail.gouv.fr/fiche-ministere-travail/le-contrat-a-duree-determinee-cdd?q=CDD",
+                "type": "external",
+                "order": 2,
+                "title": "Le contrat à durée déterminée (CDD)"
+              },
+              {
+                "id": "2d82e85c-cd89-4150-9844-b07905c3c1bc",
+                "url": "https://code.travail.gouv.fr/outils/convention-collective",
+                "type": "external",
+                "order": 3,
+                "title": "Trouver sa convention collective"
+              }
+            ]
+          }
+        ]
+      }
+    ],
+    "description": "Afin de faciliter la rédaction des contrats de travail, le ministère du Travail propose aux salariés et aux employeurs des exemples de contrats : CDI et CDD.",
+    "dismissalProcess": false,
+    "sectionDisplayMode": "accordion",
+    "breadcrumbs": [
+    ],
+    "cdtnId": "16fc2b793b",
+    "excludeFromSearch": false,
+    "id": "0dfda666-dd70-4b19-be87-2366975f8a5c",
+    "isPublished": true,
+    "metaDescription": "Afin de faciliter la rédaction des contrats de travail, le ministère du Travail propose aux salariés et aux employeurs des exemples de contrats : CDI et CDD à télécharger en format Word.",
+    "refs": [
+    ],
+    "slug": "exemples-de-contrats-de-travail-cdi-et-cdd",
+    "source": "information",
+    "text": "Exemples de contrats de travail CDI et CDD",
+    "title": "Exemples de contrats de travail CDI et CDD",
+    "intro": "<p>Afin de faciliter la rédaction des contrats de travail, cette page propose deux exemples : un contrat de travail à durée indéterminée (CDI) et un contrat de travail à durée déterminée (CDD).</p>\n<p>Ils sont mis à <webcomponent-tooltip content=\"Phrase%20ou%20ensemble%20de%20phrases%20d%E2%80%99un%20accord%2C%20d%E2%80%99une%20convention%20collective%2C%20d%E2%80%99une%20loi.\">disposition</webcomponent-tooltip> pour téléchargement et doivent être complétés avant signature.</p>\n<p>La <webcomponent-tooltip-cc>convention collective</webcomponent-tooltip-cc> applicable au sein de l'entreprise peut définir des clauses de contrat spécifiques.</p>"
+  },
+  {
+    "date": "14/08/2024",
+    "contents": [
+      {
+        "name": "quelle-est-la-procedure-a-suivre",
+        "title": "Quelle est la procédure à suivre ?",
+        "blocks": [
+          {
+            "type": "markdown",
+            "html": "<h3>Un ou plusieurs entretien(s)</h3>\n<p>L'employeur et le salarié doivent se réunir à l'occasion d'au moins un entretien dont les conditions sont précisées à l’avance (date, heure, lieu). <a href=\"https://code.travail.gouv.fr/modeles-de-courriers/demande-de-rendez-vous-en-vue-dune-rupture-conventionnelle\"> Voir le modèle de lettre « demande d’entretien pour une rupture conventionnelle »</a>.</p>\n<p>Au cours de cet entretien le salarié peut se faire assister (par un représentant du personnel ou par tout autre salarié ou, s’il n’y a pas de représentant du personnel dans l’entreprise, par un <webcomponent-tooltip content=\"Personne%20qui%20assiste%20le%20salari%C3%A9%20lors%20de%20l%E2%80%99entretien%20pr%C3%A9alable%20%C3%A0%20un%20licenciement%20ou%20%C3%A0%20une%20rupture%20conventionnelle%20lorsqu%E2%80%99il%20n%E2%80%99y%20a%20pas%20de%20repr%C3%A9sentants%20du%20personnels%20%C3%A9lus%20dans%20l%E2%80%99entreprise.\">conseiller du salarié</webcomponent-tooltip>). S’il décide de l’être, il doit en informer l'employeur avant l'entretien, l’employeur pouvant alors lui-même se faire assister.</p>\n<p>Une fois les conditions de la rupture définies dans le cadre de cet ou de ces entretiens, la convention de rupture peut être rédigée.</p>\n<h3>Rédaction et signature de la convention de rupture</h3>\n<p>La convention de rupture conventionnelle individuelle contient les informations relatives aux parties et fixe les conditions, librement définies par l'employeur et le salarié, de la rupture du contrat de travail (notamment la date de rupture du contrat et le montant de l’indemnité versée au salarié).\nLe salarié et l'employeur doivent signer la convention.</p>\n<p>L'employeur doit en remettre un exemplaire au salarié.</p>\n<h3>Délai de rétractation</h3>\n<p>À partir du lendemain de la signature de la convention de rupture, l'employeur et le salarié disposent d'un délai de 15 <webcomponent-tooltip content=\"Correspond%20%C3%A0%20la%20totalit%C3%A9%20des%20jours%20du%20calendrier%20de%20l%E2%80%99ann%C3%A9e%20civile%2C%20du%201er%20janvier%20au%2031%20d%C3%A9cembre%2C%20y%20compris%20les%20jours%20f%C3%A9ri%C3%A9s%20ou%20ch%C3%B4m%C3%A9s.\">jours calendaires</webcomponent-tooltip> pour exercer leur droit de rétractation (droit de revenir sur leur décision).</p>\n<p>Si ce délai expire un samedi, un dimanche ou un <webcomponent-tooltip content=\"Jours%20de%20f%C3%AAtes%20religieuses%2C%20la%C3%AFques%2C%20de%20comm%C3%A9moration%20ou%20f%C3%AAte%20nationale%20pr%C3%A9vus%20par%20la%20loi%20%3A%201er%20janvier%2C%20lundi%20de%20P%C3%A2ques%2C%201er%20mai%2C%208%20mai%2C%20Ascension%2C%20lundi%20de%20Pentec%C3%B4te%2C%2014%20juillet%2C%20Assomption%20(15%20ao%C3%BBt)%2C%20Toussaint%2C%2011%20novembre%2C%2025%20d%C3%A9cembre.%20Il%20existe%20%C3%A9galement%20des%20jours%20f%C3%A9ri%C3%A9s%20locaux.%20Les%20jours%20f%C3%A9ri%C3%A9s%20peuvent%20%C3%AAtre%20travaill%C3%A9s%20ou%20non.%20Seul%20le%201er%20mai%20est%20obligatoirement%20non%20travaill%C3%A9%20sauf%20exception.\">jour férié</webcomponent-tooltip> ou chômé, il est prorogé jusqu'au premier <webcomponent-tooltip content=\"Correspond%20%C3%A0%20tous%20les%20jours%20de%20la%20semaine%2C%20%C3%A0%20l%E2%80%99exception%20du%20jour%20de%20repos%20hebdomadaire%20(g%C3%A9n%C3%A9ralement%20le%20dimanche)%20et%20des%20jours%20f%C3%A9ri%C3%A9s%20habituellement%20non%20travaill%C3%A9s%20dans%20l%E2%80%99entreprise.\">jour ouvrable</webcomponent-tooltip> suivant.\nLa loi n'impose pas à la partie qui déciderait de se rétracter de motiver sa décision.</p>\n<h3>Demande d'homologation à l’administration</h3>\n<p>En l'absence de rétractation dans le délai de 15 jours prévu, un exemplaire de la convention de rupture doit être adressé à la DREETS afin d’obtenir sa validation.</p>\n<p>Cette demande de validation de la convention doit être effectuée via <a href=\"https://www.telerc.travail.gouv.fr/accueil\">le téléservice TéléRC.</a></p>\n<p><strong>À noter :</strong> la convention de rupture qui concerne un salarié protégé est soumise non pas à <webcomponent-tooltip content=\"Validation%20de%20la%20conformit%C3%A9%20d%E2%80%99un%20acte.\">homologation</webcomponent-tooltip>, mais à autorisation de l'inspecteur du travail. L'employeur doit remplir un formulaire spécifique, dans cette hypothèse.</p>\n<p>L’administration dispose alors d’un délai de 15 <webcomponent-tooltip content=\"Correspond%20%C3%A0%20tous%20les%20jours%20de%20la%20semaine%2C%20%C3%A0%20l%E2%80%99exception%20du%20jour%20de%20repos%20hebdomadaire%20(g%C3%A9n%C3%A9ralement%20le%20dimanche)%20et%20des%20jours%20f%C3%A9ri%C3%A9s%20habituellement%20non%20travaill%C3%A9s%20dans%20l%E2%80%99entreprise.\">jours ouvrables</webcomponent-tooltip>, à partir du lendemain du jour de la réception de la demande, pour vérifier la validité de la convention.</p>\n<p>Si le dernier jour de ce délai tombe un samedi, un dimanche ou un <webcomponent-tooltip content=\"Jours%20de%20f%C3%AAtes%20religieuses%2C%20la%C3%AFques%2C%20de%20comm%C3%A9moration%20ou%20f%C3%AAte%20nationale%20pr%C3%A9vus%20par%20la%20loi%20%3A%201er%20janvier%2C%20lundi%20de%20P%C3%A2ques%2C%201er%20mai%2C%208%20mai%2C%20Ascension%2C%20lundi%20de%20Pentec%C3%B4te%2C%2014%20juillet%2C%20Assomption%20(15%20ao%C3%BBt)%2C%20Toussaint%2C%2011%20novembre%2C%2025%20d%C3%A9cembre.%20Il%20existe%20%C3%A9galement%20des%20jours%20f%C3%A9ri%C3%A9s%20locaux.%20Les%20jours%20f%C3%A9ri%C3%A9s%20peuvent%20%C3%AAtre%20travaill%C3%A9s%20ou%20non.%20Seul%20le%201er%20mai%20est%20obligatoirement%20non%20travaill%C3%A9%20sauf%20exception.\">jour férié</webcomponent-tooltip> ou chômé, il est prolongé jusqu'au 1er <webcomponent-tooltip content=\"Correspond%20%C3%A0%20tous%20les%20jours%20de%20la%20semaine%2C%20%C3%A0%20l%E2%80%99exception%20du%20jour%20de%20repos%20hebdomadaire%20(g%C3%A9n%C3%A9ralement%20le%20dimanche)%20et%20des%20jours%20f%C3%A9ri%C3%A9s%20habituellement%20non%20travaill%C3%A9s%20dans%20l%E2%80%99entreprise.\">jour ouvrable</webcomponent-tooltip> suivant.</p>\n<h3>Réponse de l’administration et effet sur le contrat de travail</h3>\n<p>En cas d'acceptation de la demande, ou si la DREETS n'a pas répondu dans le délai de 15 jours, la convention est homologuée.</p>\n<p>Le contrat est rompu à la date prévue dans la convention de rupture.</p>\n<p>En cas de refus d'<webcomponent-tooltip content=\"Validation%20de%20la%20conformit%C3%A9%20d%E2%80%99un%20acte.\">homologation</webcomponent-tooltip>, la DREETS doit motiver sa décision (non-respect d'une étape de la procédure ou du montant minimum de l'<webcomponent-tooltip content=\"Sommes%20vers%C3%A9es%20en%20compensation%20ou%20en%20r%C3%A9paration%20de%20quelque%20chose.\">indemnité</webcomponent-tooltip> spécifique du rupture conventionnelle par exemple).</p>\n<p>Le contrat de travail n’est pas rompu et se poursuit donc dans les conditions habituelles.</p>"
+          }
+        ],
+        "references": [
+          {
+            "label": "Références juridiques",
+            "links": [
+              {
+                "id": "b253bc47-f25f-47fa-994e-1778a2f7a6ca",
+                "url": "https://www.legifrance.gouv.fr/codes/article_lc/LEGIARTI000019071185",
+                "type": "external",
+                "order": 1,
+                "title": "Article L. 1237-12 du Code du travail"
+              },
+              {
+                "id": "f993bfe8-8007-4150-834c-b65add92e3e9",
+                "url": "https://www.legifrance.gouv.fr/codes/article_lc/LEGIARTI000019071182",
+                "type": "external",
+                "order": 2,
+                "title": "Article L. 1237-13 du Code du travail"
+              },
+              {
+                "id": "ef289550-f492-4129-87cc-8c81a0fef215",
+                "url": "https://www.legifrance.gouv.fr/codes/article_lc/LEGIARTI000019071180",
+                "type": "external",
+                "order": 3,
+                "title": "Article L. 1237-14 du Code du travail"
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "quelle-est-la-procedure-a-suivre-infographie",
+        "title": "Quelle est la procédure à suivre ? [infographie]",
+        "blocks": [
+          {
+            "size": "4.72 MB",
+            "type": "graphic",
+            "imgUrl": "ruptureconventionnelle.svg",
+            "altText": "Cette infographie décrit les différentes étapes possibles en cas de rupture conventionnelle. Sa version textuelle est disponible en cliquant sur \"Voir en détail\" (plus bas, à gauche).",
+            "fileUrl": "ruptureconventionnelle.pdf",
+            "html": "<p><strong>Étape 1: Proposition de rupture conventionnelle :</strong></p>\n<p><strong>Qui ?</strong></p>\n<ul>\n<li>la proposition peut être à l’initiative du salarié ou de l’employeur</li>\n</ul>\n<p><strong>Comment ?</strong></p>\n<ul>\n<li>la proposition peut être faite à l’oral comme à l’écrit</li>\n</ul>\n<p><strong>Étape 2 : Entretien(s) :</strong></p>\n<p><strong>Pourquoi  ?</strong></p>\n<ul>\n<li>\n<p>pour se mettre d’accord sur l’utilisation d’une rupture conventionnelle dans le but de mettre fin au contrat de travail</p>\n</li>\n<li>\n<p>pour définir les conditions de cette rupture (date de départ, montant de l’indemnité versée au salarié)</p>\n</li>\n</ul>\n<p><strong>Quelles sont les modalités ?</strong></p>\n<p>L’employeur doit informer le salarié qu’il peut être assisté par un représentant du personnel ou par tout autre salarié ou, s’il n’y a pas de représentant du personnel dans l’entreprise, par un <webcomponent-tooltip content=\"Personne%20qui%20assiste%20le%20salari%C3%A9%20lors%20de%20l%E2%80%99entretien%20pr%C3%A9alable%20%C3%A0%20un%20licenciement%20ou%20%C3%A0%20une%20rupture%20conventionnelle%20lorsqu%E2%80%99il%20n%E2%80%99y%20a%20pas%20de%20repr%C3%A9sentants%20du%20personnels%20%C3%A9lus%20dans%20l%E2%80%99entreprise.\">conseiller du salarié</webcomponent-tooltip></p>\n<p><strong>Étape 3 : Signature de la convention :</strong></p>\n<p><strong>Quand ?</strong></p>\n<ul>\n<li>possible dès le jour même de l’entretien</li>\n</ul>\n<p><strong>Comment ?</strong></p>\n<ul>\n<li>\n<p>aller sur le site <a href=\"https://www.telerc.travail.gouv.fr/accueil\">TeleRC</a> et “Créer une nouvelle demande”</p>\n</li>\n<li>\n<p>remplir le formulaire en 3 exemplaires : 1 pour l’employeur, 1 pour le salarié, 1 pour l’administration (Dreets) pour l'<webcomponent-tooltip content=\"Validation%20de%20la%20conformit%C3%A9%20d%E2%80%99un%20acte.\">homologation</webcomponent-tooltip></p>\n</li>\n<li>\n<p>chaque exemplaire doit être daté et signé par l’employeur et le salarié</p>\n</li>\n<li>\n<p>même si ce formulaire suffit, une convention de rupture « annexe » peut également être signée pour fixer par exemple le maintien ou non d’une clause de non concurrence</p>\n</li>\n</ul>\n<p><strong>Délai de rétractation : 15 <webcomponent-tooltip content=\"Correspond%20%C3%A0%20la%20totalit%C3%A9%20des%20jours%20du%20calendrier%20de%20l%E2%80%99ann%C3%A9e%20civile%2C%20du%201er%20janvier%20au%2031%20d%C3%A9cembre%2C%20y%20compris%20les%20jours%20f%C3%A9ri%C3%A9s%20ou%20ch%C3%B4m%C3%A9s.\">jours calendaires</webcomponent-tooltip></strong> (1)(3)</p>\n<p>Le délai de rétractation :</p>\n<ul>\n<li>\n<p>il débute le lendemain de la signature de la convention et se termine 15 <webcomponent-tooltip content=\"Correspond%20%C3%A0%20la%20totalit%C3%A9%20des%20jours%20du%20calendrier%20de%20l%E2%80%99ann%C3%A9e%20civile%2C%20du%201er%20janvier%20au%2031%20d%C3%A9cembre%2C%20y%20compris%20les%20jours%20f%C3%A9ri%C3%A9s%20ou%20ch%C3%B4m%C3%A9s.\">jours calendaires</webcomponent-tooltip> (1) plus tard (le 15ème jour à minuit)</p>\n</li>\n<li>\n<p>pendant ce délai, le salarié ou l’employeur peut revenir sur sa décision et se rétracter par lettre recommandée avec demande d’avis de réception ou par lettre remise à l’autre partie en main propre contre décharge mentionnant la date de remise</p>\n</li>\n<li>\n<p>en cas de rétractation, aucune justification n’est nécessaire</p>\n</li>\n</ul>\n<p><strong>Étape 4 : Demande d’homologation :</strong></p>\n<p><strong>Quand ?</strong></p>\n<ul>\n<li>possible dès le lendemain de la fin du délai de rétractation</li>\n</ul>\n<p><strong>Comment ?</strong></p>\n<p>envoi dématérialisé du formulaire sur le site <a href=\"https://www.telerc.travail.gouv.fr/accueil\">TeleRC</a></p>\n<p><strong>Pourquoi ?</strong></p>\n<p>L’administration (la Dreets) va s’assurer du respect de la liberté de consentement des parties et des conditions prévues par le Code du travail : respect des règles relatives à l’assistance des parties, au droit de rétractation, au montant minimal de l’indemnité spécifique de rupture conventionnelle, etc.</p>\n<p><strong>Délai d’instruction : 15 <webcomponent-tooltip content=\"Correspond%20%C3%A0%20tous%20les%20jours%20de%20la%20semaine%2C%20%C3%A0%20l%E2%80%99exception%20du%20jour%20de%20repos%20hebdomadaire%20(g%C3%A9n%C3%A9ralement%20le%20dimanche)%20et%20des%20jours%20f%C3%A9ri%C3%A9s%20habituellement%20non%20travaill%C3%A9s%20dans%20l%E2%80%99entreprise.\">jours ouvrables</webcomponent-tooltip></strong> (2)(3)</p>\n<p>Le délai d’instruction :</p>\n<ul>\n<li>il débute le lendemain de la réception de la demande par la Dreets</li>\n<li>il se termine 15 <webcomponent-tooltip content=\"Correspond%20%C3%A0%20tous%20les%20jours%20de%20la%20semaine%2C%20%C3%A0%20l%E2%80%99exception%20du%20jour%20de%20repos%20hebdomadaire%20(g%C3%A9n%C3%A9ralement%20le%20dimanche)%20et%20des%20jours%20f%C3%A9ri%C3%A9s%20habituellement%20non%20travaill%C3%A9s%20dans%20l%E2%80%99entreprise.\">jours ouvrables</webcomponent-tooltip> (2) plus tard à minuit</li>\n</ul>\n<p><strong>Étape 5 : Décision d’homologation</strong></p>\n<p><strong>Quelles conséquences ?</strong></p>\n<ul>\n<li>Si la Dreets valide la rupture conventionnelle ou si elle ne répond pas dans le délai de 15 <webcomponent-tooltip content=\"Correspond%20%C3%A0%20tous%20les%20jours%20de%20la%20semaine%2C%20%C3%A0%20l%E2%80%99exception%20du%20jour%20de%20repos%20hebdomadaire%20(g%C3%A9n%C3%A9ralement%20le%20dimanche)%20et%20des%20jours%20f%C3%A9ri%C3%A9s%20habituellement%20non%20travaill%C3%A9s%20dans%20l%E2%80%99entreprise.\">jours ouvrables</webcomponent-tooltip> (2) le contrat peut être rompu à la date fixée dans la convention, au plus tôt le lendemain du jour de l'<webcomponent-tooltip content=\"Validation%20de%20la%20conformit%C3%A9%20d%E2%80%99un%20acte.\">homologation</webcomponent-tooltip></li>\n</ul>\n<p>Il n’y a pas de <webcomponent-tooltip content=\"D%C3%A9lai%20qui%20s%E2%80%99%C3%A9coule%20entre%20la%20notification%20de%20la%20rupture%20du%20contrat%20de%20travail%20(licenciement%2C%20d%C3%A9mission%2C%20etc.)%20et%20la%20date%20de%20fin%20du%20contrat%20de%20travail.%20Exemple%20%3A%20un%20salari%C3%A9%20qui%20donne%20sa%20d%C3%A9mission%20le%201er%20juillet%20et%20qui%20a%20un%20pr%C3%A9avis%20de%203%20mois%20%C3%A0%20effectuer%2C%20cela%20signifie%20que%20le%20salari%C3%A9%20ne%20quittera%20l%E2%80%99entreprise%20que%20le%2030%20septembre%20au%20soir.%20\">préavis</webcomponent-tooltip> lors d’une rupture conventionnelle</p>\n<ul>\n<li>Si la Dreets refuse la rupture conventionnelle (le refus doit être expliqué) le contrat de travail n’est pas rompu et continue de s’exécuter dans les conditions habituelles (une nouvelle demande de rupture conventionnelle peut être soumise en respectant toutes les étapes)</li>\n</ul>\n<p><strong>À noter :</strong> le contrat de travail continue de s’exécuter normalement pendant toute la durée de la procédure d’élaboration et d’homologation de la convention, et jusqu’à la date de rupture fixée. Le salarié peut prendre des congés payés entre la date de signature du formulaire et la date de rupture de son contrat. Il est rémunéré normalement pendant cette période.</p>\n<p>Cette procédure ne concerne pas la rupture conventionnelle des salariés protégés (délégués syndicaux, membres élus du <webcomponent-tooltip content=\"Instance%20unique%20charg%C3%A9e%20de%20repr%C3%A9senter%20le%20personnel%20dans%20une%20entreprise.%20Elle%20remplace%20les%20anciennes%20instances%20repr%C3%A9sentatives%20du%20personnel%20dans%20l%E2%80%99entreprise%20qui%20%C3%A9taient%20les%20d%C3%A9l%C3%A9gu%C3%A9s%20du%20personnel%2C%20le%20comit%C3%A9%20d%E2%80%99entreprise%20et%20le%20CHSCT.%20Sa%20mise%20en%20place%20est%20obligatoire%20dans%20les%20entreprises%20dont%20l%E2%80%99effectif%20atteint%2011%20salari%C3%A9s%20pendant%2012%20mois%20cons%C3%A9cutifs.%20Ses%20attributions%20%C3%A9voluent%20en%20fonction%20des%20effectifs%20de%20l%E2%80%99entreprise.%20\">comité social et économique</webcomponent-tooltip>, etc.) pour lesquels une procédure spécifique s' applique.</p>\n<p>L'employeur et l'assistante maternelle ne peuvent pas conclure de rupture conventionnelle.</p>\n<p>(1) Correspond à la totalité des jours de la <webcomponent-tooltip content=\"D%C3%A9bute%20le%20lundi%20%C3%A0%200%20heure%20et%20se%20termine%20le%20dimanche%20%C3%A0%2024%20heures%2C%20sauf%20si%20une%20convention%20ou%20un%20accord%20collectif%20fixe%20une%20autre%20p%C3%A9riode%20de%207%20jours%20cons%C3%A9cutifs.\">semaine</webcomponent-tooltip> du lundi au dimanche, y compris les <webcomponent-tooltip content=\"Jours%20de%20f%C3%AAtes%20religieuses%2C%20la%C3%AFques%2C%20de%20comm%C3%A9moration%20ou%20f%C3%AAte%20nationale%20pr%C3%A9vus%20par%20la%20loi%20%3A%201er%20janvier%2C%20lundi%20de%20P%C3%A2ques%2C%201er%20mai%2C%208%20mai%2C%20Ascension%2C%20lundi%20de%20Pentec%C3%B4te%2C%2014%20juillet%2C%20Assomption%20(15%20ao%C3%BBt)%2C%20Toussaint%2C%2011%20novembre%2C%2025%20d%C3%A9cembre.%20Il%20existe%20%C3%A9galement%20des%20jours%20f%C3%A9ri%C3%A9s%20locaux.%20Les%20jours%20f%C3%A9ri%C3%A9s%20peuvent%20%C3%AAtre%20travaill%C3%A9s%20ou%20non.%20Seul%20le%201er%20mai%20est%20obligatoirement%20non%20travaill%C3%A9%20sauf%20exception.\">jours fériés</webcomponent-tooltip> ou chômés.</p>\n<p>(2) Correspond à tous les jours de la <webcomponent-tooltip content=\"D%C3%A9bute%20le%20lundi%20%C3%A0%200%20heure%20et%20se%20termine%20le%20dimanche%20%C3%A0%2024%20heures%2C%20sauf%20si%20une%20convention%20ou%20un%20accord%20collectif%20fixe%20une%20autre%20p%C3%A9riode%20de%207%20jours%20cons%C3%A9cutifs.\">semaine</webcomponent-tooltip> à l'exception du jour de repos hebdomadaire (généralement le dimanche) et des <webcomponent-tooltip content=\"Jours%20de%20f%C3%AAtes%20religieuses%2C%20la%C3%AFques%2C%20de%20comm%C3%A9moration%20ou%20f%C3%AAte%20nationale%20pr%C3%A9vus%20par%20la%20loi%20%3A%201er%20janvier%2C%20lundi%20de%20P%C3%A2ques%2C%201er%20mai%2C%208%20mai%2C%20Ascension%2C%20lundi%20de%20Pentec%C3%B4te%2C%2014%20juillet%2C%20Assomption%20(15%20ao%C3%BBt)%2C%20Toussaint%2C%2011%20novembre%2C%2025%20d%C3%A9cembre.%20Il%20existe%20%C3%A9galement%20des%20jours%20f%C3%A9ri%C3%A9s%20locaux.%20Les%20jours%20f%C3%A9ri%C3%A9s%20peuvent%20%C3%AAtre%20travaill%C3%A9s%20ou%20non.%20Seul%20le%201er%20mai%20est%20obligatoirement%20non%20travaill%C3%A9%20sauf%20exception.\">jours fériés</webcomponent-tooltip> habituellement non travaillés dans l’entreprise.</p>\n<p>(3) Si le dernier jour du délai tombe un samedi, un dimanche, un <webcomponent-tooltip content=\"Jours%20de%20f%C3%AAtes%20religieuses%2C%20la%C3%AFques%2C%20de%20comm%C3%A9moration%20ou%20f%C3%AAte%20nationale%20pr%C3%A9vus%20par%20la%20loi%20%3A%201er%20janvier%2C%20lundi%20de%20P%C3%A2ques%2C%201er%20mai%2C%208%20mai%2C%20Ascension%2C%20lundi%20de%20Pentec%C3%B4te%2C%2014%20juillet%2C%20Assomption%20(15%20ao%C3%BBt)%2C%20Toussaint%2C%2011%20novembre%2C%2025%20d%C3%A9cembre.%20Il%20existe%20%C3%A9galement%20des%20jours%20f%C3%A9ri%C3%A9s%20locaux.%20Les%20jours%20f%C3%A9ri%C3%A9s%20peuvent%20%C3%AAtre%20travaill%C3%A9s%20ou%20non.%20Seul%20le%201er%20mai%20est%20obligatoirement%20non%20travaill%C3%A9%20sauf%20exception.\">jour férié</webcomponent-tooltip> ou chômé : le délai est prolongé jusqu’au premier <webcomponent-tooltip content=\"Correspond%20%C3%A0%20tous%20les%20jours%20de%20la%20semaine%2C%20%C3%A0%20l%E2%80%99exception%20du%20jour%20de%20repos%20hebdomadaire%20(g%C3%A9n%C3%A9ralement%20le%20dimanche)%20et%20des%20jours%20f%C3%A9ri%C3%A9s%20habituellement%20non%20travaill%C3%A9s%20dans%20l%E2%80%99entreprise.\">jour ouvrable</webcomponent-tooltip> (2) suivant.</p>"
+          }
+        ],
+        "references": [
+          {
+            "label": "Références juridiques",
+            "links": [
+              {
+                "id": "1272b22e-1d6e-4b9f-9678-75a77e5b84bb",
+                "url": "https://www.legifrance.gouv.fr/codes/article_lc/LEGIARTI000019071185",
+                "type": "external",
+                "order": 1,
+                "title": "Article L. 1237-12 du Code du travail"
+              },
+              {
+                "id": "d9e93ce2-9628-40a0-9521-e9b2b2f44ed3",
+                "url": "https://www.legifrance.gouv.fr/codes/article_lc/LEGIARTI000019071182",
+                "type": "external",
+                "order": 2,
+                "title": "Article L. 1237-13 du Code du travail"
+              },
+              {
+                "id": "5292164b-fcbb-49b4-8118-59a533848516",
+                "url": "https://www.legifrance.gouv.fr/codes/article_lc/LEGIARTI000019071180",
+                "type": "external",
+                "order": 3,
+                "title": "Article L. 1237-14 du Code du travail"
+              }
+            ]
+          }
+        ]
+      }
+    ],
+    "references": [
+      {
+        "label": "Liens utiles",
+        "links": [
+          {
+            "id": "3593ab18-2956-458b-a80e-852c068d0bdb",
+            "url": "https://code.travail.gouv.fr/outils/indemnite-rupture-conventionnelle",
+            "type": "external",
+            "order": 1,
+            "title": "Simulateur d’indemnité de rupture conventionnelle "
+          }
+        ]
+      }
+    ],
+    "description": "CDI : Rupture conventionnelle. Retrouvez le détail de chaque étape de la procédure et les délais.",
+    "dismissalProcess": false,
+    "sectionDisplayMode": "accordion",
+    "breadcrumbs": [
+      {
+        "label": "Départ de l’entreprise",
+        "position": 7,
+        "slug": "/themes/depart-de-lentreprise"
+      },
+      {
+        "label": "Rupture conventionnelle",
+        "position": 3,
+        "slug": "/themes/rupture-conventionnelle"
+      },
+      {
+        "label": "Rupture conventionnelle individuelle",
+        "position": 1,
+        "slug": "/themes/rupture-conventionnelle-individuelle"
+      }
+    ],
+    "cdtnId": "188a439a07",
+    "excludeFromSearch": false,
+    "id": "cffefc03-8590-4f00-b86e-f97b25c2c546",
+    "isPublished": true,
+    "metaDescription": "CDI : Rupture conventionnelle. Retrouvez le détail de chaque étape de la procédure et les délais.",
+    "refs": [
+    ],
+    "slug": "rupture-conventionnelle-individuelle-la-procedure-en-details",
+    "source": "information",
+    "text": "Rupture conventionnelle : les étapes de la procédure et les délais",
+    "title": "Rupture conventionnelle : les étapes de la procédure et les délais",
+    "intro": "<p>Lorsque l’employeur et le salarié conviennent de rompre le contrat de travail à durée indéterminée (CDI) qui les lie dans le cadre d’une rupture conventionnelle, la procédure spécifique suivante doit être respectée.</p>\n<p><strong>À noter :</strong>  Le code du travail numérique propose un <a href=\"https://code.travail.gouv.fr/outils/indemnite-rupture-conventionnelle\">simulateur d’indemnité de rupture conventionnelle</a></p>"
+  },
   {
     "source": "versions",
     "data": {
diff --git a/packages/code-du-travail-frontend/src/api/__tests__/__snapshots__/idcc.test.ts.snap b/packages/code-du-travail-frontend/src/api/__tests__/__snapshots__/idcc.es.test.ts.snap
similarity index 95%
rename from packages/code-du-travail-frontend/src/api/__tests__/__snapshots__/idcc.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/__tests__/__snapshots__/idcc.es.test.ts.snap
index 7d939e946d..6ba47eaff0 100644
--- a/packages/code-du-travail-frontend/src/api/__tests__/__snapshots__/idcc.test.ts.snap
+++ b/packages/code-du-travail-frontend/src/api/__tests__/__snapshots__/idcc.es.test.ts.snap
@@ -37,7 +37,7 @@ exports[`IDCC return idcc results for boulangerie 1`] = `
         "answers.answer.keyword",
       ],
       "_index": "cdtn_test-v2_documents",
-      "_score": 14.4136915,
+      "_score": 14.4407215,
       "_source": {
         "cdtnId": "647c224c9b",
         "contributions": true,
@@ -53,7 +53,7 @@ exports[`IDCC return idcc results for boulangerie 1`] = `
     {
       "_id": "18",
       "_index": "cdtn_test-v2_documents",
-      "_score": 13.31033,
+      "_score": 13.33736,
       "_source": {
         "cdtnId": "16752da066",
         "contributions": false,
@@ -67,7 +67,7 @@ exports[`IDCC return idcc results for boulangerie 1`] = `
       },
     },
   ],
-  "max_score": 14.4136915,
+  "max_score": 14.4407215,
   "total": {
     "relation": "eq",
     "value": 2,
@@ -84,7 +84,7 @@ exports[`IDCC return idcc results for pati 1`] = `
         "answers.answer.keyword",
       ],
       "_index": "cdtn_test-v2_documents",
-      "_score": 14.146065,
+      "_score": 14.173094,
       "_source": {
         "cdtnId": "647c224c9b",
         "contributions": true,
@@ -100,7 +100,7 @@ exports[`IDCC return idcc results for pati 1`] = `
     {
       "_id": "18",
       "_index": "cdtn_test-v2_documents",
-      "_score": 13.042704,
+      "_score": 13.069733,
       "_source": {
         "cdtnId": "16752da066",
         "contributions": false,
@@ -114,7 +114,7 @@ exports[`IDCC return idcc results for pati 1`] = `
       },
     },
   ],
-  "max_score": 14.146065,
+  "max_score": 14.173094,
   "total": {
     "relation": "eq",
     "value": 2,
@@ -131,7 +131,7 @@ exports[`IDCC return idcc results in correct order for banque 1`] = `
         "answers.answer.keyword",
       ],
       "_index": "cdtn_test-v2_documents",
-      "_score": 15.278859,
+      "_score": 15.306967,
       "_source": {
         "cdtnId": "a25dfc974f",
         "contributions": true,
@@ -147,7 +147,7 @@ exports[`IDCC return idcc results in correct order for banque 1`] = `
     {
       "_id": "20",
       "_index": "cdtn_test-v2_documents",
-      "_score": 9.034006,
+      "_score": 9.072985,
       "_source": {
         "cdtnId": "ceb38cca3c",
         "contributions": false,
@@ -161,7 +161,7 @@ exports[`IDCC return idcc results in correct order for banque 1`] = `
       },
     },
   ],
-  "max_score": 15.278859,
+  "max_score": 15.306967,
   "total": {
     "relation": "eq",
     "value": 2,
diff --git a/packages/code-du-travail-frontend/src/api/__tests__/__snapshots__/suggest.test.ts.snap b/packages/code-du-travail-frontend/src/api/__tests__/__snapshots__/suggest.es.test.ts.snap
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/__tests__/__snapshots__/suggest.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/__tests__/__snapshots__/suggest.es.test.ts.snap
diff --git a/packages/code-du-travail-frontend/src/api/__tests__/idcc.test.ts b/packages/code-du-travail-frontend/src/api/__tests__/idcc.es.test.ts
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/__tests__/idcc.test.ts
rename to packages/code-du-travail-frontend/src/api/__tests__/idcc.es.test.ts
diff --git a/packages/code-du-travail-frontend/src/api/__tests__/suggest.test.ts b/packages/code-du-travail-frontend/src/api/__tests__/suggest.es.test.ts
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/__tests__/suggest.test.ts
rename to packages/code-du-travail-frontend/src/api/__tests__/suggest.es.test.ts
diff --git a/packages/code-du-travail-frontend/src/api/__tests__/utils.test.ts b/packages/code-du-travail-frontend/src/api/__tests__/utils.es.test.ts
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/__tests__/utils.test.ts
rename to packages/code-du-travail-frontend/src/api/__tests__/utils.es.test.ts
diff --git a/packages/code-du-travail-frontend/src/api/modules/agreements/__tests__/__snapshots__/service.test.ts.snap b/packages/code-du-travail-frontend/src/api/modules/agreements/__tests__/__snapshots__/service.es.test.ts.snap
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/agreements/__tests__/__snapshots__/service.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/modules/agreements/__tests__/__snapshots__/service.es.test.ts.snap
diff --git a/packages/code-du-travail-frontend/src/api/modules/agreements/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/api/modules/agreements/__tests__/service.es.test.ts
similarity index 84%
rename from packages/code-du-travail-frontend/src/api/modules/agreements/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/agreements/__tests__/service.es.test.ts
index 803da95428..739f85a11a 100644
--- a/packages/code-du-travail-frontend/src/api/modules/agreements/__tests__/service.test.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/agreements/__tests__/service.es.test.ts
@@ -9,10 +9,7 @@ import {
 
 describe("Agreements", () => {
   it("getAllAgreements", async () => {
-    const result = await getAllAgreements(
-      ["title", "shortTitle", "description", "url", "slug", "source", "num"],
-      "shortTitle"
-    );
+    const result = await getAllAgreements();
     expect(result).toMatchSnapshot();
   });
   it("getBySlugsAgreements", async () => {
diff --git a/packages/code-du-travail-frontend/src/api/modules/agreements/queries.ts b/packages/code-du-travail-frontend/src/api/modules/agreements/queries.ts
index aebaceccc4..126dac7822 100644
--- a/packages/code-du-travail-frontend/src/api/modules/agreements/queries.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/agreements/queries.ts
@@ -1,7 +1,16 @@
 import { SOURCES } from "@socialgouv/cdtn-utils";
 
-export const getAllAgreementsQuery = () => {
+export const getAllAgreementsWithContributions = () => {
   return {
+    _source: [
+      "title",
+      "shortTitle",
+      "description",
+      "url",
+      "slug",
+      "source",
+      "num",
+    ],
     query: {
       bool: {
         filter: [
diff --git a/packages/code-du-travail-frontend/src/api/modules/agreements/service.ts b/packages/code-du-travail-frontend/src/api/modules/agreements/service.ts
index ac623df46f..1f2241bb0b 100644
--- a/packages/code-du-travail-frontend/src/api/modules/agreements/service.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/agreements/service.ts
@@ -3,31 +3,24 @@ import {
   getAgreementBySlug,
   getAgreementsByIds,
   getAgreementsBySlugs,
-  getAllAgreementsQuery,
+  getAllAgreementsWithContributions,
 } from "./queries";
 import { ElasticSearchItem } from "../../types";
 import { AgreementDoc, ElasticAgreement } from "@socialgouv/cdtn-types";
-import {orderByAlpha} from "../../utils/sort";
+import { nonNullable } from "@socialgouv/modeles-social";
 
-export const getAllAgreements = async <K extends keyof ElasticAgreement>(
-  fields: K[],
-  sortBy?: K
-): Promise<Pick<ElasticAgreement, K>[]> => {
-  const body = getAllAgreementsQuery();
+export const getAllAgreements = async (): Promise<ElasticAgreement[]> => {
+  const body = getAllAgreementsWithContributions();
 
-  const response = await elasticsearchClient.search<Pick<ElasticAgreement, K>>({
-    ...body,
-    _source: fields,
+  const response = await elasticsearchClient.search<ElasticAgreement>({
+    body,
     index: elasticDocumentsIndex,
   });
 
-  const data = response.hits.hits
+  return response.hits.hits
     .map(({ _source }) => _source)
-    .filter((item) => item !== undefined);
-  if (sortBy) {
-    data.sort((a, b) => orderByAlpha(a, b, sortBy));
-  }
-  return data;
+    .filter(nonNullable)
+    .sort(orderByAlpha);
 };
 
 export const getBySlugsAgreements = async (
@@ -69,3 +62,9 @@ export const getBySlugAgreements = async (slug: string) => {
 
   return { ...response.hits.hits[0]._source };
 };
+
+const orderByAlpha = (a, b) => {
+  return a.shortTitle.localeCompare(b.shortTitle, "fr", {
+    ignorePunctuation: true,
+  });
+};
diff --git a/packages/code-du-travail-frontend/src/api/modules/contributions/__tests__/__snapshots__/service.test.ts.snap b/packages/code-du-travail-frontend/src/api/modules/contributions/__tests__/__snapshots__/service.es.test.ts.snap
similarity index 77%
rename from packages/code-du-travail-frontend/src/api/modules/contributions/__tests__/__snapshots__/service.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/modules/contributions/__tests__/__snapshots__/service.es.test.ts.snap
index c9334bac05..c99ba54fa1 100644
--- a/packages/code-du-travail-frontend/src/api/modules/contributions/__tests__/__snapshots__/service.test.ts.snap
+++ b/packages/code-du-travail-frontend/src/api/modules/contributions/__tests__/__snapshots__/service.es.test.ts.snap
@@ -1,5 +1,32 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Contributions getAllContributions 1`] = `
+[
+  {
+    "agreements": [],
+    "generic": {
+      "idcc": "0000",
+      "slug": "les-conges-pour-evenements-familiaux",
+      "title": "Les congés pour événements familiaux",
+    },
+  },
+  {
+    "agreements": [
+      {
+        "idcc": "0044",
+        "slug": "44-quand-le-salarie-a-t-il-droit-a-une-prime-danciennete-quel-est-son-montant",
+        "title": "Quand le salarié a-t-il droit à une prime d’ancienneté ? Quel est son montant ?",
+      },
+    ],
+    "generic": {
+      "idcc": "0000",
+      "slug": "quand-le-salarie-a-t-il-droit-a-une-prime-danciennete-quel-est-son-montant",
+      "title": "Quand le salarié a-t-il droit à une prime d’ancienneté ? Quel est son montant ?",
+    },
+  },
+]
+`;
+
 exports[`Contributions getByIdsContributions 1`] = `
 [
   {
diff --git a/packages/code-du-travail-frontend/src/api/modules/contributions/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/api/modules/contributions/__tests__/service.es.test.ts
similarity index 61%
rename from packages/code-du-travail-frontend/src/api/modules/contributions/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/contributions/__tests__/service.es.test.ts
index 08e2dd4741..977a17c73c 100644
--- a/packages/code-du-travail-frontend/src/api/modules/contributions/__tests__/service.test.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/contributions/__tests__/service.es.test.ts
@@ -1,9 +1,11 @@
 /** @jest-environment node */
 
 import {
+  getAllContributionsGroupByQuestion,
   getByIdsContributions,
   getGenericContributionsGroupByThemes,
 } from "../service";
+import { getAllAgreements } from "../../agreements";
 
 describe("Contributions", () => {
   it("getGenericContributions", async () => {
@@ -15,4 +17,10 @@ describe("Contributions", () => {
     const result = await getByIdsContributions(["eba7a4592f"]);
     expect(result).toMatchSnapshot();
   });
+
+  it("getAllContributions", async () => {
+    const agreements = await getAllAgreements();
+    const result = await getAllContributionsGroupByQuestion(agreements);
+    expect(result).toMatchSnapshot();
+  });
 });
diff --git a/packages/code-du-travail-frontend/src/api/modules/contributions/fetch.ts b/packages/code-du-travail-frontend/src/api/modules/contributions/fetch.ts
index b08e90c6d7..0a06df0c78 100644
--- a/packages/code-du-travail-frontend/src/api/modules/contributions/fetch.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/contributions/fetch.ts
@@ -1,23 +1,11 @@
-import { ContributionElasticDocument } from "@socialgouv/cdtn-types";
 import { elasticDocumentsIndex, elasticsearchClient } from "../../utils";
 import { getAllContributions } from "./queries";
 
-export const fetchAllContributions = async <
-  K extends keyof ContributionElasticDocument
->(
-  fields: K[]
-): Promise<Pick<ContributionElasticDocument, K>[]> => {
+export const fetchAllContributions = async () => {
   const body = getAllContributions();
 
-  const result = await elasticsearchClient.search<
-    Pick<ContributionElasticDocument, K>
-  >({
-    ...body,
-    _source: fields,
+  return await elasticsearchClient.search<any>({
+    body,
     index: elasticDocumentsIndex,
   });
-
-  return result.hits.hits
-    .map(({ _source }) => _source)
-    .filter((source) => source !== undefined);
 };
diff --git a/packages/code-du-travail-frontend/src/api/modules/contributions/queries.ts b/packages/code-du-travail-frontend/src/api/modules/contributions/queries.ts
index 88e2935fe0..73899674ab 100644
--- a/packages/code-du-travail-frontend/src/api/modules/contributions/queries.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/contributions/queries.ts
@@ -2,6 +2,7 @@ import { SOURCES } from "@socialgouv/cdtn-utils";
 
 export const getAllContributions = () => {
   return {
+    _source: ["title", "shortTitle", "slug", "idcc"],
     query: {
       bool: {
         filter: [
diff --git a/packages/code-du-travail-frontend/src/api/modules/contributions/service.ts b/packages/code-du-travail-frontend/src/api/modules/contributions/service.ts
index 045d7aadde..1793cff09f 100644
--- a/packages/code-du-travail-frontend/src/api/modules/contributions/service.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/contributions/service.ts
@@ -4,7 +4,6 @@ import { fetchAllContributions } from "./fetch";
 import { ElasticSearchItem } from "../../types";
 import { ElasticAgreement } from "@socialgouv/cdtn-types";
 
-
 export const getGenericContributionsGroupByThemes = async () => {
   const body = getAllGenericsContributions();
 
@@ -21,6 +20,41 @@ export const getGenericContributionsGroupByThemes = async () => {
     .reduce(groupByThemes, {});
 };
 
+const isGeneric = (contrib) => contrib.idcc === "0000";
+
+function getTitle(agreements: ElasticAgreement[], contrib) {
+  const idcc = contrib.idcc ?? contrib.slug.split("-")[0];
+  const agreement = agreements.find((a) => a.num === parseInt(idcc));
+  return agreement
+    ? `${contrib.title} - ${agreement.shortTitle}`
+    : contrib.title;
+}
+
+export const getAllContributionsGroupByQuestion = async (
+  agreements: ElasticAgreement[]
+) => {
+  const response = await fetchAllContributions();
+  const all = response.hits.hits.map(({ _source }) => _source);
+  const allGenerics = all
+    .filter(isGeneric)
+    .sort((a, b) => a.title.localeCompare(b.title));
+
+  return allGenerics.map((generic) => {
+    return {
+      generic: generic,
+      agreements: all
+        .filter((contrib) => {
+          return !isGeneric(contrib) && contrib.slug.includes(generic.slug);
+        })
+        .map((contrib) => {
+          contrib.title = getTitle(agreements, contrib);
+          return contrib;
+        })
+        .sort((a, b) => a.title.localeCompare(b.title)),
+    };
+  });
+};
+
 export const getByIdsContributions = async (
   ids: string[]
 ): Promise<ElasticSearchItem[]> => {
diff --git a/packages/code-du-travail-frontend/src/api/modules/dossiers/__tests__/__snapshots__/service.test.ts.snap b/packages/code-du-travail-frontend/src/api/modules/dossiers/__tests__/__snapshots__/service.es.test.ts.snap
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/dossiers/__tests__/__snapshots__/service.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/modules/dossiers/__tests__/__snapshots__/service.es.test.ts.snap
diff --git a/packages/code-du-travail-frontend/src/api/modules/dossiers/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/api/modules/dossiers/__tests__/service.es.test.ts
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/dossiers/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/dossiers/__tests__/service.es.test.ts
diff --git a/packages/code-du-travail-frontend/src/api/modules/enterprises/service/__tests__/fetchEnterprises.test.ts b/packages/code-du-travail-frontend/src/api/modules/enterprises/service/__tests__/fetchEnterprises.es.test.ts
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/enterprises/service/__tests__/fetchEnterprises.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/enterprises/service/__tests__/fetchEnterprises.es.test.ts
diff --git a/packages/code-du-travail-frontend/src/api/modules/enterprises/service/__tests__/populateAgreements.test.ts b/packages/code-du-travail-frontend/src/api/modules/enterprises/service/__tests__/populateAgreements.es.test.ts
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/enterprises/service/__tests__/populateAgreements.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/enterprises/service/__tests__/populateAgreements.es.test.ts
diff --git a/packages/code-du-travail-frontend/src/api/modules/glossary/__tests__/__snapshots__/service.test.ts.snap b/packages/code-du-travail-frontend/src/api/modules/glossary/__tests__/__snapshots__/service.es.test.ts.snap
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/glossary/__tests__/__snapshots__/service.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/modules/glossary/__tests__/__snapshots__/service.es.test.ts.snap
diff --git a/packages/code-du-travail-frontend/src/api/modules/glossary/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/api/modules/glossary/__tests__/service.es.test.ts
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/glossary/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/glossary/__tests__/service.es.test.ts
diff --git a/packages/code-du-travail-frontend/src/api/modules/highlights/__tests__/__snapshots__/service.test.ts.snap b/packages/code-du-travail-frontend/src/api/modules/highlights/__tests__/__snapshots__/service.es.test.ts.snap
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/highlights/__tests__/__snapshots__/service.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/modules/highlights/__tests__/__snapshots__/service.es.test.ts.snap
diff --git a/packages/code-du-travail-frontend/src/api/modules/highlights/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/api/modules/highlights/__tests__/service.es.test.ts
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/highlights/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/highlights/__tests__/service.es.test.ts
diff --git a/packages/code-du-travail-frontend/src/api/modules/home/service.ts b/packages/code-du-travail-frontend/src/api/modules/home/service.ts
index 82682f1a8f..bf0e4495fb 100644
--- a/packages/code-du-travail-frontend/src/api/modules/home/service.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/home/service.ts
@@ -3,7 +3,7 @@ import { getByIdsAgreements } from "../agreements";
 import { getByIdsContributions } from "../contributions";
 import { getBySlugHighlights } from "../highlights";
 import { getByIdsModeles } from "../modeles";
-import { getRootThemes } from "../themes";
+import { getAllThemes } from "../themes";
 import { getToolsByIds } from "../tools";
 
 export type GetHomePage = {
@@ -16,13 +16,7 @@ export type GetHomePage = {
 };
 
 export const getHomeData = async (): Promise<GetHomePage> => {
-  const themes = await getRootThemes([
-    "icon",
-    "children",
-    "title",
-    "slug",
-    "position",
-  ]);
+  const themes = await getAllThemes();
   const highlights = await getBySlugHighlights("homepage");
   const tools = await getToolsByIds([
     "d7ad36850a", // simulateur-embauche
diff --git a/packages/code-du-travail-frontend/src/api/modules/idcc/__tests__/__snapshots__/service.test.ts.snap b/packages/code-du-travail-frontend/src/api/modules/idcc/__tests__/__snapshots__/service.es.test.ts.snap
similarity index 94%
rename from packages/code-du-travail-frontend/src/api/modules/idcc/__tests__/__snapshots__/service.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/modules/idcc/__tests__/__snapshots__/service.es.test.ts.snap
index f8295d58de..93e2a8d0ad 100644
--- a/packages/code-du-travail-frontend/src/api/modules/idcc/__tests__/__snapshots__/service.test.ts.snap
+++ b/packages/code-du-travail-frontend/src/api/modules/idcc/__tests__/__snapshots__/service.es.test.ts.snap
@@ -16,7 +16,7 @@ exports[`IDCC getIdccByQuery 1`] = `
           "answers.answer.keyword",
         ],
         "_index": "cdtn_test-v2_documents",
-        "_score": 15.278859,
+        "_score": 15.306967,
         "_source": {
           "cdtnId": "a25dfc974f",
           "contributions": true,
@@ -32,7 +32,7 @@ exports[`IDCC getIdccByQuery 1`] = `
       {
         "_id": "20",
         "_index": "cdtn_test-v2_documents",
-        "_score": 9.034006,
+        "_score": 9.072985,
         "_source": {
           "cdtnId": "ceb38cca3c",
           "contributions": false,
@@ -46,7 +46,7 @@ exports[`IDCC getIdccByQuery 1`] = `
         },
       },
     ],
-    "max_score": 15.278859,
+    "max_score": 15.306967,
     "total": {
       "relation": "eq",
       "value": 2,
diff --git a/packages/code-du-travail-frontend/src/api/modules/idcc/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/api/modules/idcc/__tests__/service.es.test.ts
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/idcc/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/idcc/__tests__/service.es.test.ts
diff --git a/packages/code-du-travail-frontend/src/api/modules/index.ts b/packages/code-du-travail-frontend/src/api/modules/index.ts
index 6220bceb86..5a6ec15e21 100644
--- a/packages/code-du-travail-frontend/src/api/modules/index.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/index.ts
@@ -14,4 +14,3 @@ export * from "./idcc";
 export * from "./glossary";
 export * from "./enterprises";
 export * from "./dossiers";
-export * from "./sitemap";
diff --git a/packages/code-du-travail-frontend/src/api/modules/informations/queries.ts b/packages/code-du-travail-frontend/src/api/modules/informations/queries.ts
index 96cc87b94d..5de097f745 100644
--- a/packages/code-du-travail-frontend/src/api/modules/informations/queries.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/informations/queries.ts
@@ -2,6 +2,7 @@ import { SOURCES } from "@socialgouv/cdtn-utils";
 
 export const fetchInformations = () => {
   return {
+    _source: ["title", "slug"],
     query: {
       bool: {
         filter: [
diff --git a/packages/code-du-travail-frontend/src/api/modules/informations/service.ts b/packages/code-du-travail-frontend/src/api/modules/informations/service.ts
index 13a991db6c..ef5ec5b96a 100644
--- a/packages/code-du-travail-frontend/src/api/modules/informations/service.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/informations/service.ts
@@ -1,29 +1,18 @@
-import { EditorialContentElasticDocument } from "@socialgouv/cdtn-types";
 import { elasticDocumentsIndex, elasticsearchClient } from "../../utils";
 import { fetchInformations } from "./queries";
-import { orderByAlpha } from "../../utils/sort";
 
-export const getAllInformations = async <
-  K extends keyof EditorialContentElasticDocument
->(
-  fields: K[],
-  sortBy?: K
-): Promise<Pick<EditorialContentElasticDocument, K>[]> => {
+export const getAllInformations = async () => {
   const body = fetchInformations();
 
-  const response = await elasticsearchClient.search<
-    Pick<EditorialContentElasticDocument, K>
-  >({
-    ...body,
-    _source: fields,
+  const response = await elasticsearchClient.search<any>({
+    body,
     index: elasticDocumentsIndex,
   });
-
-  const data = response.hits.hits
+  return response.hits.hits
     .map(({ _source }) => _source)
-    .filter((source) => source !== undefined);
-  if (sortBy) {
-    return data.sort((a, b) => orderByAlpha(a, b, sortBy));
-  }
-  return data;
+    .sort((infoA, infoB) => {
+      return infoA.title.localeCompare(infoB.title, "fr", {
+        ignorePunctuation: true,
+      });
+    });
 };
diff --git a/packages/code-du-travail-frontend/src/api/modules/items/__tests__/__snapshots__/service.test.ts.snap b/packages/code-du-travail-frontend/src/api/modules/items/__tests__/__snapshots__/service.es.test.ts.snap
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/items/__tests__/__snapshots__/service.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/modules/items/__tests__/__snapshots__/service.es.test.ts.snap
diff --git a/packages/code-du-travail-frontend/src/api/modules/items/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/api/modules/items/__tests__/service.es.test.ts
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/items/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/items/__tests__/service.es.test.ts
diff --git a/packages/code-du-travail-frontend/src/api/modules/items/service.ts b/packages/code-du-travail-frontend/src/api/modules/items/service.ts
index 0d420f70ac..5d8256a597 100644
--- a/packages/code-du-travail-frontend/src/api/modules/items/service.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/items/service.ts
@@ -1,8 +1,6 @@
 import { elasticDocumentsIndex, elasticsearchClient } from "../../utils";
 import { getSearchBySourceSlugBody } from "./queries";
 import { getRelatedItems } from "./utils";
-import { DocumentElasticResult } from "../legal-articles/type";
-import { SearchRequest } from "@elastic/elasticsearch/lib/api/types";
 
 export const getBySourceAndSlugItems = async <Type>(
   source: string,
@@ -31,22 +29,3 @@ export const getBySourceAndSlugItems = async <Type>(
     relatedItems,
   };
 };
-
-export const getItemBySlug = async <
-  V,
-  K extends keyof DocumentElasticResult<V>
->(
-  fields: K[],
-  body: SearchRequest
-): Promise<DocumentElasticResult<V> | undefined> => {
-  const response = await elasticsearchClient.search<V>({
-    _source: fields,
-    index: elasticDocumentsIndex,
-    ...body,
-  });
-  if (response.hits.hits.length === 0) {
-    return;
-  }
-  const item = response.hits.hits[0];
-  return { ...item._source, _id: item._id } as DocumentElasticResult<V>;
-};
diff --git a/packages/code-du-travail-frontend/src/api/modules/legal-articles/index.ts b/packages/code-du-travail-frontend/src/api/modules/legal-articles/index.ts
deleted file mode 100644
index 6261f89636..0000000000
--- a/packages/code-du-travail-frontend/src/api/modules/legal-articles/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./service";
diff --git a/packages/code-du-travail-frontend/src/api/modules/legal-articles/queries.ts b/packages/code-du-travail-frontend/src/api/modules/legal-articles/queries.ts
deleted file mode 100644
index c87f453c7a..0000000000
--- a/packages/code-du-travail-frontend/src/api/modules/legal-articles/queries.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { SOURCES } from "@socialgouv/cdtn-utils";
-
-export const getLegalArticle = (slug: string) => {
-  return {
-    query: {
-      bool: {
-        filter: [
-          { term: { source: SOURCES.CDT } },
-          { term: { slug } },
-          { term: { isPublished: true } },
-        ],
-      },
-    },
-    size: 1,
-  };
-};
diff --git a/packages/code-du-travail-frontend/src/api/modules/legal-articles/service.ts b/packages/code-du-travail-frontend/src/api/modules/legal-articles/service.ts
deleted file mode 100644
index 82bbe760fa..0000000000
--- a/packages/code-du-travail-frontend/src/api/modules/legal-articles/service.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { getLegalArticle } from "./queries";
-import { DocumentElasticResult, ElasticLaborCodeArticle } from "./type";
-import { getItemBySlug } from "../items";
-
-export const getLegalArticleBySlug = async (
-  slug: string
-): Promise<DocumentElasticResult<ElasticLaborCodeArticle> | undefined> => {
-  const body = getLegalArticle(slug);
-  return await getItemBySlug<
-    ElasticLaborCodeArticle,
-    keyof DocumentElasticResult<ElasticLaborCodeArticle>
-  >(["description", "title", "dateDebut", "html", "url", "notaHtml"], body);
-};
diff --git a/packages/code-du-travail-frontend/src/api/modules/modeles/__tests__/__snapshots__/service.test.ts.snap b/packages/code-du-travail-frontend/src/api/modules/modeles/__tests__/__snapshots__/service.es.test.ts.snap
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/modeles/__tests__/__snapshots__/service.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/modules/modeles/__tests__/__snapshots__/service.es.test.ts.snap
diff --git a/packages/code-du-travail-frontend/src/api/modules/modeles/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/api/modules/modeles/__tests__/service.es.test.ts
similarity index 84%
rename from packages/code-du-travail-frontend/src/api/modules/modeles/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/modeles/__tests__/service.es.test.ts
index efe6867864..8d671117fd 100644
--- a/packages/code-du-travail-frontend/src/api/modules/modeles/__tests__/service.test.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/modeles/__tests__/service.es.test.ts
@@ -9,14 +9,7 @@ import {
 
 describe("Modeles", () => {
   it("getAllModeles", async () => {
-    const result = await getAllModeles([
-      "title",
-      "slug",
-      "description",
-      "source",
-      "breadcrumbs",
-      "cdtnId",
-    ]);
+    const result = await getAllModeles();
     expect(result).toMatchSnapshot();
   });
   it("getBySlugsModeles", async () => {
diff --git a/packages/code-du-travail-frontend/src/api/modules/modeles/queries.ts b/packages/code-du-travail-frontend/src/api/modules/modeles/queries.ts
index 27f9ff64f3..4604b46a2b 100644
--- a/packages/code-du-travail-frontend/src/api/modules/modeles/queries.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/modeles/queries.ts
@@ -2,6 +2,14 @@ import { SOURCES } from "@socialgouv/cdtn-utils";
 
 export function getModeles() {
   return {
+    _source: [
+      "title",
+      "slug",
+      "description",
+      "source",
+      "breadcrumbs",
+      "cdtnId",
+    ],
     query: {
       bool: {
         filter: [
diff --git a/packages/code-du-travail-frontend/src/api/modules/modeles/service.ts b/packages/code-du-travail-frontend/src/api/modules/modeles/service.ts
index 35ecab239d..a52c6e7086 100644
--- a/packages/code-du-travail-frontend/src/api/modules/modeles/service.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/modeles/service.ts
@@ -1,6 +1,6 @@
 import {
   DocumentElasticWithSource,
-  MailTemplateDoc,
+  MailTemplate,
 } from "@socialgouv/cdtn-types";
 import { ElasticSearchItem } from "../../types";
 import {
@@ -15,24 +15,17 @@ import {
   getModelesBySlugs,
 } from "./queries";
 
-export const getAllModeles = async <
-  K extends keyof DocumentElasticWithSource<MailTemplateDoc>
->(
-  fields: K[]
-): Promise<Pick<DocumentElasticWithSource<MailTemplateDoc>, K>[]> => {
+export const getAllModeles = async () => {
   const body = getModeles();
   const response = await elasticsearchClient.search<
-    DocumentElasticWithSource<
-      Pick<DocumentElasticWithSource<MailTemplateDoc>, K>
-    >
+    DocumentElasticWithSource<MailTemplate>
   >({
-    ...body,
-    _source: fields,
+    body,
     index: elasticDocumentsIndex,
   });
-  return response.hits.hits
-    .map(({ _source }) => _source)
-    .filter((source) => source !== undefined);
+  return response.hits.hits.length > 0
+    ? response.hits.hits.map(({ _source }) => _source)
+    : [];
 };
 
 export const getBySlugsModeles = async (
diff --git a/packages/code-du-travail-frontend/src/api/modules/related-items/queries.ts b/packages/code-du-travail-frontend/src/api/modules/related-items/queries.ts
deleted file mode 100644
index 8fbdc502c7..0000000000
--- a/packages/code-du-travail-frontend/src/api/modules/related-items/queries.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { RelatedItemSettings } from "./service";
-import { sources } from "./type";
-
-export const getRelatedItemsBody = (
-  settings: RelatedItemSettings[],
-  size: number | undefined = 10
-): any => {
-  return {
-    query: {
-      bool: {
-        filter: [
-          { term: { excludeFromSearch: false } },
-          { term: { isPublished: true } },
-          {
-            bool: {
-              should: sources.map((source) => ({ term: { source } })),
-            },
-          },
-        ],
-        must: {
-          more_like_this: {
-            fields: ["title", "text"],
-            like: settings,
-            max_query_terms: 12,
-            min_term_freq: 1,
-          },
-        },
-      },
-    },
-    size,
-  };
-};
diff --git a/packages/code-du-travail-frontend/src/api/modules/search/__tests__/__snapshots__/service.test.ts.snap b/packages/code-du-travail-frontend/src/api/modules/search/__tests__/__snapshots__/service.es.test.ts.snap
similarity index 98%
rename from packages/code-du-travail-frontend/src/api/modules/search/__tests__/__snapshots__/service.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/modules/search/__tests__/__snapshots__/service.es.test.ts.snap
index ac6eaa5c31..d9b5b475a4 100644
--- a/packages/code-du-travail-frontend/src/api/modules/search/__tests__/__snapshots__/service.test.ts.snap
+++ b/packages/code-du-travail-frontend/src/api/modules/search/__tests__/__snapshots__/service.es.test.ts.snap
@@ -34,7 +34,7 @@ exports[`Search searchWithQuery 1`] = `
       "title": "L1237-2",
     },
     {
-      "_score": 3.9074206,
+      "_score": 4.1066437,
       "cdtnId": "f13147ec33",
       "description": "Le salarié informe son employeur de sa démission, en application de l'article L. 1225-66 , par lettre recommandée avec avis de réception ou remise contre récépissé. Il adresse à l'employeur sa demande de réembauche, en application de l'article L. 1225-67 , par lettre recommandée avec avis de réception ou remise contre récépissé",
       "slug": "r1225-18",
@@ -239,7 +239,7 @@ exports[`Search searchWithQuery 1`] = `
       "title": "Démission d'une assistante maternelle",
     },
     {
-      "_score": 39.911243,
+      "_score": 40.360065,
       "action": "Calculer",
       "algo": "fulltext",
       "breadcrumbs": [
@@ -261,7 +261,7 @@ exports[`Search searchWithQuery 1`] = `
       "title": "Préavis de démission",
     },
     {
-      "_score": 37.12557,
+      "_score": 37.407562,
       "action": "Calculer",
       "algo": "fulltext",
       "breadcrumbs": [
@@ -278,7 +278,7 @@ exports[`Search searchWithQuery 1`] = `
       "title": "Heures d'absence pour rechercher un emploi",
     },
     {
-      "_score": 32.103558,
+      "_score": 32.15685,
       "algo": "fulltext",
       "breadcrumbs": [
         {
@@ -302,7 +302,7 @@ exports[`Search searchWithQuery 1`] = `
   ],
   "themes": [
     {
-      "_score": 2.5448813,
+      "_score": 2.6255991,
       "algo": "fulltext",
       "cdtnId": "a9ccf1d613",
       "slug": "demission",
diff --git a/packages/code-du-travail-frontend/src/api/modules/search/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/api/modules/search/__tests__/service.es.test.ts
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/search/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/search/__tests__/service.es.test.ts
diff --git a/packages/code-du-travail-frontend/src/api/modules/sheets-mt/__tests__/__snapshots__/service.test.ts.snap b/packages/code-du-travail-frontend/src/api/modules/sheets-mt/__tests__/__snapshots__/service.es.test.ts.snap
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/sheets-mt/__tests__/__snapshots__/service.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/modules/sheets-mt/__tests__/__snapshots__/service.es.test.ts.snap
diff --git a/packages/code-du-travail-frontend/src/api/modules/sheets-mt/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/api/modules/sheets-mt/__tests__/service.es.test.ts
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/sheets-mt/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/sheets-mt/__tests__/service.es.test.ts
diff --git a/packages/code-du-travail-frontend/src/api/modules/sitemap/index.ts b/packages/code-du-travail-frontend/src/api/modules/sitemap/index.ts
deleted file mode 100644
index 6261f89636..0000000000
--- a/packages/code-du-travail-frontend/src/api/modules/sitemap/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./service";
diff --git a/packages/code-du-travail-frontend/src/api/modules/suggest/__tests__/__snapshots__/service.test.ts.snap b/packages/code-du-travail-frontend/src/api/modules/suggest/__tests__/__snapshots__/service.es.test.ts.snap
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/suggest/__tests__/__snapshots__/service.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/modules/suggest/__tests__/__snapshots__/service.es.test.ts.snap
diff --git a/packages/code-du-travail-frontend/src/api/modules/suggest/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/api/modules/suggest/__tests__/service.es.test.ts
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/modules/suggest/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/suggest/__tests__/service.es.test.ts
diff --git a/packages/code-du-travail-frontend/src/api/modules/themes/__tests__/__snapshots__/service.test.ts.snap b/packages/code-du-travail-frontend/src/api/modules/themes/__tests__/__snapshots__/service.es.test.ts.snap
similarity index 68%
rename from packages/code-du-travail-frontend/src/api/modules/themes/__tests__/__snapshots__/service.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/modules/themes/__tests__/__snapshots__/service.es.test.ts.snap
index 0d73fbb55d..71cecd7219 100644
--- a/packages/code-du-travail-frontend/src/api/modules/themes/__tests__/__snapshots__/service.test.ts.snap
+++ b/packages/code-du-travail-frontend/src/api/modules/themes/__tests__/__snapshots__/service.es.test.ts.snap
@@ -1,6 +1,65 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Themes getAllThemes 1`] = `
+{
+  "children": [
+    {
+      "children": [
+        {
+          "label": "Embauche",
+          "slug": "embauche",
+        },
+        {
+          "label": "Contrat de travail",
+          "slug": "contrat-de-travail",
+        },
+      ],
+      "icon": "Contract",
+      "position": 1,
+      "slug": "embauche-et-contrat-de-travail",
+      "title": "Embauche et contrat de travail",
+    },
+    {
+      "children": [
+        {
+          "label": "Documents à remettre au salarié",
+          "slug": "documents-a-remettre-au-salarie",
+        },
+        {
+          "label": "Démission",
+          "slug": "demission",
+        },
+        {
+          "label": "Fin d’un CDD - CTT",
+          "slug": "fin-dun-cdd-ctt",
+        },
+        {
+          "label": "Rupture conventionnelle",
+          "slug": "rupture-conventionnelle",
+        },
+        {
+          "label": "Licenciement : droits des salariés et procédures",
+          "slug": "licenciement-droits-des-salaries-et-procedures",
+        },
+        {
+          "label": "Retraite",
+          "slug": "retraite",
+        },
+        {
+          "label": "Autres départs",
+          "slug": "autres-departs",
+        },
+      ],
+      "icon": "Depart",
+      "position": 8,
+      "slug": "depart-de-lentreprise",
+      "title": "Départ de l’entreprise",
+    },
+  ],
+}
+`;
+
+exports[`Themes getAllThemesAndSubThemes 1`] = `
 [
   {
     "children": [
@@ -13,6 +72,8 @@ exports[`Themes getAllThemes 1`] = `
         "slug": "contrat-de-travail",
       },
     ],
+    "icon": "Contract",
+    "position": 1,
     "slug": "embauche-et-contrat-de-travail",
     "title": "Embauche et contrat de travail",
   },
@@ -25,6 +86,7 @@ exports[`Themes getAllThemes 1`] = `
       {
         "label": "Démission",
         "slug": "demission",
+        "title": "Démission",
       },
       {
         "label": "Fin d’un CDD - CTT",
@@ -47,6 +109,8 @@ exports[`Themes getAllThemes 1`] = `
         "slug": "autres-departs",
       },
     ],
+    "icon": "Depart",
+    "position": 8,
     "slug": "depart-de-lentreprise",
     "title": "Départ de l’entreprise",
   },
diff --git a/packages/code-du-travail-frontend/src/api/modules/themes/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/api/modules/themes/__tests__/service.es.test.ts
similarity index 60%
rename from packages/code-du-travail-frontend/src/api/modules/themes/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/themes/__tests__/service.es.test.ts
index 94a8711e13..678a1fd4f6 100644
--- a/packages/code-du-travail-frontend/src/api/modules/themes/__tests__/service.test.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/themes/__tests__/service.es.test.ts
@@ -1,13 +1,19 @@
 /** @jest-environment node */
 
 import {
-  getRootThemes,
+  getAllThemes,
+  getAllThemesAndSubThemes,
   getBySlugThemes,
 } from "../service";
 
 describe("Themes", () => {
   it("getAllThemes", async () => {
-    const result = await getRootThemes(["title", "slug", "children"]);
+    const result = await getAllThemes();
+    expect(result).toMatchSnapshot();
+  });
+
+  it("getAllThemesAndSubThemes", async () => {
+    const result = await getAllThemesAndSubThemes();
     expect(result).toMatchSnapshot();
   });
 
diff --git a/packages/code-du-travail-frontend/src/api/modules/themes/queries.ts b/packages/code-du-travail-frontend/src/api/modules/themes/queries.ts
index ffafbcb786..f941a24731 100644
--- a/packages/code-du-travail-frontend/src/api/modules/themes/queries.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/themes/queries.ts
@@ -1,7 +1,8 @@
 import { SOURCES } from "@socialgouv/cdtn-utils";
 
-export function getRootThemesQuery() {
+export function getAllThemesQuery() {
   return {
+    _source: ["icon", "children", "title", "slug", "position"],
     query: {
       bool: {
         filter: [
@@ -41,6 +42,7 @@ export function getThemeBySlugQuery(slug: string) {
 
 export function getThemeBySlugsQuery(slugs: string[]) {
   return {
+    _source: ["title", "slug"],
     query: {
       bool: {
         filter: [
diff --git a/packages/code-du-travail-frontend/src/api/modules/themes/service.ts b/packages/code-du-travail-frontend/src/api/modules/themes/service.ts
index e418cf4f0f..97cd155dc5 100644
--- a/packages/code-du-travail-frontend/src/api/modules/themes/service.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/themes/service.ts
@@ -1,25 +1,53 @@
-import { elasticDocumentsIndex, elasticsearchClient } from "../../utils";
 import {
-  getRootThemesQuery,
+  elasticsearchClient,
+  elasticDocumentsIndex,
+  NotFoundError,
+} from "../../utils";
+import {
+  getAllThemesQuery,
   getThemeBySlugQuery,
   getThemeBySlugsQuery,
 } from "./queries";
-import { ThemeElasticDocument } from "@socialgouv/cdtn-types/build/elastic/theme";
-
-export const getRootThemes = async <K extends keyof ThemeElasticDocument>(
-  fields: K[]
-): Promise<Pick<ThemeElasticDocument, K>[]> => {
-  const body = getRootThemesQuery();
-  const response = await elasticsearchClient.search<
-    Pick<ThemeElasticDocument, K>
-  >({
-    ...body,
-    _source: fields,
+
+export const getAllThemes = async () => {
+  const body: any = getAllThemesQuery();
+  const response = await elasticsearchClient.search<any>({
+    body,
+    index: elasticDocumentsIndex,
+  });
+  return {
+    children: response.hits.hits.map((t) => t._source),
+  };
+};
+
+export const getAllThemesAndSubThemes = async () => {
+  const body: any = getAllThemesQuery();
+  const response = await elasticsearchClient.search<any>({
+    body,
     index: elasticDocumentsIndex,
   });
-  return response.hits.hits
-    .map((t) => t._source)
-    .filter((item) => item !== undefined);
+  const themes = response.hits.hits.map((t) => t._source);
+  // for each theme of themes, we need to get slug of children
+  const childrenSlugs = themes.flatMap((theme) =>
+    theme.children.map((child) => child.slug)
+  );
+  const data = await getBySlugsThemes(childrenSlugs).catch(() => {
+    return [];
+  });
+  const themesWithChildren = themes.map((theme) => {
+    const children = theme.children.map((child) => {
+      const childWithContent = data.find((d: any) => d.slug === child.slug);
+      return {
+        ...child,
+        ...childWithContent,
+      };
+    });
+    return {
+      ...theme,
+      children,
+    };
+  });
+  return themesWithChildren;
 };
 
 export const getBySlugThemes = async (slug: string) => {
@@ -41,21 +69,23 @@ export const getBySlugThemes = async (slug: string) => {
   };
 };
 
-export const getBySlugsThemes = async <K extends keyof ThemeElasticDocument>(
-  slugs: string[],
-  fields: K[]
-): Promise<Pick<ThemeElasticDocument, K>[]> => {
+export const getBySlugsThemes = async (slugs: string[]) => {
   const body: any = getThemeBySlugsQuery(slugs);
 
-  const response = await elasticsearchClient.search<
-    Pick<ThemeElasticDocument, K>
-  >({
-    ...body,
-    _source: fields,
+  const response = await elasticsearchClient.search<any>({
+    body,
     index: elasticDocumentsIndex,
   });
 
-  return response.hits.hits
-    .map(({ _source }) => _source)
-    .filter((item) => item !== undefined);
+  if (response.hits.hits.length === 0) {
+    throw new NotFoundError({
+      message: `There is no theme that match ${slugs.join(",")}`,
+      name: "THEME_NOT_FOUND",
+      cause: null,
+    });
+  }
+
+  const themes = response.hits.hits.map(({ _source }) => _source);
+
+  return themes;
 };
diff --git a/packages/code-du-travail-frontend/src/api/modules/tools/__tests__/__snapshots__/service.test.ts.snap b/packages/code-du-travail-frontend/src/api/modules/tools/__tests__/__snapshots__/service.es.test.ts.snap
similarity index 99%
rename from packages/code-du-travail-frontend/src/api/modules/tools/__tests__/__snapshots__/service.test.ts.snap
rename to packages/code-du-travail-frontend/src/api/modules/tools/__tests__/__snapshots__/service.es.test.ts.snap
index b7fa3a40ce..8cdb3ec6df 100644
--- a/packages/code-du-travail-frontend/src/api/modules/tools/__tests__/__snapshots__/service.test.ts.snap
+++ b/packages/code-du-travail-frontend/src/api/modules/tools/__tests__/__snapshots__/service.es.test.ts.snap
@@ -3,16 +3,19 @@
 exports[`Tools getAllTools 1`] = `
 [
   {
+    "_id": "14",
     "displayTool": true,
     "slug": "indemnite-licenciement",
     "title": "Indemnité de licenciement",
   },
   {
+    "_id": "13",
     "displayTool": true,
     "slug": "preavis-demission",
     "title": "Préavis de démission",
   },
   {
+    "_id": "27",
     "displayTool": true,
     "slug": "heures-recherche-emploi",
     "title": "Heures d'absence pour rechercher un emploi",
diff --git a/packages/code-du-travail-frontend/src/api/modules/tools/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/api/modules/tools/__tests__/service.es.test.ts
similarity index 92%
rename from packages/code-du-travail-frontend/src/api/modules/tools/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/api/modules/tools/__tests__/service.es.test.ts
index e66508c327..b194e95a40 100644
--- a/packages/code-du-travail-frontend/src/api/modules/tools/__tests__/service.test.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/tools/__tests__/service.es.test.ts
@@ -10,7 +10,7 @@ import {
 
 describe("Tools", () => {
   it("getAllTools", async () => {
-    const result = await getAllTools(["slug", "title", "displayTool"]);
+    const result = await getAllTools();
     expect(result).toMatchSnapshot();
   });
   it("getToolsBySlugs", async () => {
diff --git a/packages/code-du-travail-frontend/src/api/modules/tools/queries.ts b/packages/code-du-travail-frontend/src/api/modules/tools/queries.ts
index bd7ba6a377..7de885a42f 100644
--- a/packages/code-du-travail-frontend/src/api/modules/tools/queries.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/tools/queries.ts
@@ -1,34 +1,18 @@
-import { Tool } from "@socialgouv/cdtn-types";
-
 export const getAllToolsQuery = () => {
   return {
+    _source: ["slug", "title", "displayTool"],
     query: {
       bool: {
         must: [
-          {
-            term: {
-              isPublished: true,
-            },
-          },
-          {
-            term: {
-              source: "outils",
-            },
-          },
-          {
-            term: {
-              displayTool: true,
-            },
-          },
+          { term: { isPublished: true } },
+          { term: { source: "outils" } },
         ],
       },
     },
     size: 50,
     sort: [
       {
-        order: {
-          order: "asc",
-        },
+        order: "asc",
       },
     ],
   };
diff --git a/packages/code-du-travail-frontend/src/api/modules/tools/service.ts b/packages/code-du-travail-frontend/src/api/modules/tools/service.ts
index 70976da8a8..7e425ffa6c 100644
--- a/packages/code-du-travail-frontend/src/api/modules/tools/service.ts
+++ b/packages/code-du-travail-frontend/src/api/modules/tools/service.ts
@@ -1,19 +1,16 @@
 import { Tool } from "@socialgouv/cdtn-types";
 import {
-  elasticDocumentsIndex,
   elasticsearchClient,
+  elasticDocumentsIndex,
   NotFoundError,
 } from "../../utils";
-import { getAllToolsQuery, getTools } from "./queries";
+import { getTools, getAllToolsQuery } from "./queries";
 import { SearchHit } from "@elastic/elasticsearch/lib/api/types";
 
-export const getAllTools = async <K extends keyof Tool>(
-  fields: K[]
-): Promise<Pick<Tool, K>[]> => {
+export const getAllTools = async (): Promise<Tool[]> => {
   const body: any = getAllToolsQuery();
-  const response = await elasticsearchClient.search<Pick<Tool, K>>({
-    ...body,
-    _source: fields,
+  const response = await elasticsearchClient.search<any>({
+    body,
     index: elasticDocumentsIndex,
   });
   if (response.hits.hits.length === 0) {
@@ -24,8 +21,8 @@ export const getAllTools = async <K extends keyof Tool>(
     });
   }
   return response.hits.hits
-    .map(({ _source }) => _source)
-    .filter((source) => source !== undefined);
+    .map(({ _id, _source }) => ({ ..._source, _id }))
+    .filter((tool) => tool.displayTool);
 };
 
 export const getToolsByIdsAndSlugs = async (
diff --git a/packages/code-du-travail-frontend/src/api/modules/legal-articles/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/modules/code-du-travail/__tests__/service.es.test.ts
similarity index 92%
rename from packages/code-du-travail-frontend/src/api/modules/legal-articles/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/modules/code-du-travail/__tests__/service.es.test.ts
index 3aeeb87682..76ccef21e1 100644
--- a/packages/code-du-travail-frontend/src/api/modules/legal-articles/__tests__/service.test.ts
+++ b/packages/code-du-travail-frontend/src/modules/code-du-travail/__tests__/service.es.test.ts
@@ -1,10 +1,10 @@
 /** @jest-environment node */
 
-import { getLegalArticleBySlug } from "../service";
+import { fetchLegalArticle } from "../queries";
 
 describe("Legal-articles", () => {
   it("getLegalArticleBySlug", async () => {
-    const result = await getLegalArticleBySlug("r1225-18");
+    const result = await fetchLegalArticle("r1225-18");
     expect(result).toEqual({
       _id: "11",
       dateDebut: 1209600000000,
diff --git a/packages/code-du-travail-frontend/src/modules/code-du-travail/articleCodeDuTravail.tsx b/packages/code-du-travail-frontend/src/modules/code-du-travail/articleCodeDuTravail.tsx
index 77af8c7bde..9299eaefc0 100644
--- a/packages/code-du-travail-frontend/src/modules/code-du-travail/articleCodeDuTravail.tsx
+++ b/packages/code-du-travail-frontend/src/modules/code-du-travail/articleCodeDuTravail.tsx
@@ -3,8 +3,8 @@ import { fr } from "@codegouvfr/react-dsfr";
 import { Tag } from "@codegouvfr/react-dsfr/Tag";
 import Html from "../common/Html";
 import { ContainerRich } from "../layout/ContainerRich";
-import { RelatedItem } from "../../api/modules/related-items/type";
 import { Feedback } from "../layout/feedback";
+import { RelatedItem } from "../documents";
 
 type Props = {
   metaDescription: string;
@@ -17,7 +17,7 @@ type Props = {
   title: string;
 };
 
-function ArticleCodeDuTravail({
+export function ArticleCodeDuTravail({
   metaDescription,
   date,
   html,
@@ -57,5 +57,3 @@ function ArticleCodeDuTravail({
     </ContainerRich>
   );
 }
-
-export default ArticleCodeDuTravail;
diff --git a/packages/code-du-travail-frontend/src/modules/code-du-travail/index.ts b/packages/code-du-travail-frontend/src/modules/code-du-travail/index.ts
new file mode 100644
index 0000000000..a7cb868578
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/code-du-travail/index.ts
@@ -0,0 +1,3 @@
+export * from "./articleCodeDuTravail";
+export * from "./queries";
+export * from "./type";
diff --git a/packages/code-du-travail-frontend/src/modules/code-du-travail/queries.ts b/packages/code-du-travail-frontend/src/modules/code-du-travail/queries.ts
new file mode 100644
index 0000000000..860746c63f
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/code-du-travail/queries.ts
@@ -0,0 +1,23 @@
+import { SOURCES } from "@socialgouv/cdtn-utils";
+import { ElasticLaborCodeArticle } from "./type";
+import { DocumentElasticResult, fetchDocument } from "../documents";
+
+export const fetchLegalArticle = async (
+  slug: string
+): Promise<DocumentElasticResult<ElasticLaborCodeArticle> | undefined> => {
+  return await fetchDocument<
+    ElasticLaborCodeArticle,
+    keyof DocumentElasticResult<ElasticLaborCodeArticle>
+  >(["description", "title", "dateDebut", "html", "url", "notaHtml"], {
+    query: {
+      bool: {
+        filter: [
+          { term: { source: SOURCES.CDT } },
+          { term: { slug } },
+          { term: { isPublished: true } },
+        ],
+      },
+    },
+    size: 1,
+  });
+};
diff --git a/packages/code-du-travail-frontend/src/api/modules/legal-articles/type.ts b/packages/code-du-travail-frontend/src/modules/code-du-travail/type.ts
similarity index 73%
rename from packages/code-du-travail-frontend/src/api/modules/legal-articles/type.ts
rename to packages/code-du-travail-frontend/src/modules/code-du-travail/type.ts
index 576d27b579..1d0db5629a 100644
--- a/packages/code-du-travail-frontend/src/api/modules/legal-articles/type.ts
+++ b/packages/code-du-travail-frontend/src/modules/code-du-travail/type.ts
@@ -3,11 +3,6 @@ import {
   LaborCodeDoc,
 } from "@socialgouv/cdtn-types";
 
-export type DocumentElasticResult<T> = T & {
-  _id: string;
-};
-
-
 export type ElasticLaborCodeArticle = DocumentElasticWithSource<
   Omit<LaborCodeDoc, "cid">
 >;
diff --git a/packages/code-du-travail-frontend/src/modules/common/RelatedItems.tsx b/packages/code-du-travail-frontend/src/modules/common/RelatedItems.tsx
index 2bf93c4932..4cc0577fd2 100644
--- a/packages/code-du-travail-frontend/src/modules/common/RelatedItems.tsx
+++ b/packages/code-du-travail-frontend/src/modules/common/RelatedItems.tsx
@@ -5,7 +5,7 @@ import { SOURCES } from "@socialgouv/cdtn-utils";
 import React from "react";
 import { ListWithArrow } from "./ListWithArrow";
 import { useCommonTracking } from "./tracking";
-import { RelatedItem } from "../../api/modules/related-items/type";
+import { RelatedItem } from "../documents";
 
 export const RelatedItems = ({
   relatedItems = [],
diff --git a/packages/code-du-travail-frontend/src/modules/common/__tests__/RelatedItems.test.tsx b/packages/code-du-travail-frontend/src/modules/common/__tests__/RelatedItems.test.tsx
index 9cd37f8859..913dba112c 100644
--- a/packages/code-du-travail-frontend/src/modules/common/__tests__/RelatedItems.test.tsx
+++ b/packages/code-du-travail-frontend/src/modules/common/__tests__/RelatedItems.test.tsx
@@ -1,7 +1,7 @@
 import { push as matopush } from "@socialgouv/matomo-next";
 import { render } from "@testing-library/react";
 import { RelatedItems } from "../RelatedItems";
-import { RelatedItem } from "../../../api/modules/related-items/type";
+import { RelatedItem } from "../../documents";
 
 jest.mock("@socialgouv/matomo-next", () => {
   return {
diff --git a/packages/code-du-travail-frontend/src/modules/contributions/__tests__/queries.es.test.ts b/packages/code-du-travail-frontend/src/modules/contributions/__tests__/queries.es.test.ts
new file mode 100644
index 0000000000..7f491c5c2f
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/contributions/__tests__/queries.es.test.ts
@@ -0,0 +1,45 @@
+/** @jest-environment node */
+
+import { fetchAllContributions } from "../queries";
+
+describe("Contributions", () => {
+  it("Récupération de toutes les contributions", async () => {
+    const result = await fetchAllContributions([
+      "slug",
+      "title",
+      "contentType",
+    ]);
+    expect(result).toEqual([
+      {
+        slug: "les-conges-pour-evenements-familiaux",
+        title: "Les congés pour événements familiaux",
+      },
+      {
+        slug: "quelles-sont-les-consequences-du-deces-de-lemployeur-sur-le-contrat-de-travail",
+        title:
+          "Quelles sont les conséquences du décès de l’employeur sur le contrat de travail ?",
+      },
+      {
+        slug: "44-quelles-sont-les-consequences-du-deces-de-lemployeur-sur-le-contrat-de-travail",
+        title:
+          "Quelles sont les conséquences du décès de l’employeur sur le contrat de travail ?",
+      },
+      {
+        slug: "1090-quelles-sont-les-consequences-du-deces-de-lemployeur-sur-le-contrat-de-travail",
+        title:
+          "Quelles sont les conséquences du décès de l’employeur sur le contrat de travail ?",
+      },
+      {
+        slug: "quand-le-salarie-a-t-il-droit-a-une-prime-danciennete-quel-est-son-montant",
+        title:
+          "Quand le salarié a-t-il droit à une prime d’ancienneté ? Quel est son montant ?",
+      },
+      {
+        contentType: "ANSWER",
+        slug: "44-quand-le-salarie-a-t-il-droit-a-une-prime-danciennete-quel-est-son-montant",
+        title:
+          "Quand le salarié a-t-il droit à une prime d’ancienneté ? Quel est son montant ?",
+      },
+    ]);
+  });
+});
diff --git a/packages/code-du-travail-frontend/src/modules/contributions/index.ts b/packages/code-du-travail-frontend/src/modules/contributions/index.ts
new file mode 100644
index 0000000000..b69c251208
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/contributions/index.ts
@@ -0,0 +1 @@
+export * from "./queries";
diff --git a/packages/code-du-travail-frontend/src/modules/contributions/queries.ts b/packages/code-du-travail-frontend/src/modules/contributions/queries.ts
new file mode 100644
index 0000000000..08426eb4c5
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/contributions/queries.ts
@@ -0,0 +1,29 @@
+import { elasticDocumentsIndex, elasticsearchClient } from "../../api/utils";
+import { ContributionElasticDocument } from "@socialgouv/cdtn-types";
+import { SOURCES } from "@socialgouv/cdtn-utils";
+
+export const fetchAllContributions = async <
+  K extends keyof ContributionElasticDocument
+>(
+  fields: K[]
+): Promise<Pick<ContributionElasticDocument, K>[]> => {
+  const result = await elasticsearchClient.search<
+    Pick<ContributionElasticDocument, K>
+  >({
+    query: {
+      bool: {
+        filter: [
+          { term: { source: SOURCES.CONTRIBUTIONS } },
+          { term: { isPublished: true } },
+        ],
+      },
+    },
+    size: 3000,
+    _source: fields,
+    index: elasticDocumentsIndex,
+  });
+
+  return result.hits.hits
+    .map(({ _source }) => _source)
+    .filter((source) => source !== undefined);
+};
diff --git a/packages/code-du-travail-frontend/src/modules/convention-collective/__tests__/queries.es.test.ts b/packages/code-du-travail-frontend/src/modules/convention-collective/__tests__/queries.es.test.ts
new file mode 100644
index 0000000000..667acefb58
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/convention-collective/__tests__/queries.es.test.ts
@@ -0,0 +1,35 @@
+/** @jest-environment node */
+
+import { fetchAllAgreements } from "../queries";
+
+describe("Conventions collectives", () => {
+  it("Récupération de toutes les conventions collectives", async () => {
+    const result = await fetchAllAgreements(["slug", "title", "num"]);
+    expect(result).toEqual([
+      {
+        num: 843,
+        slug: "843-boulangerie-patisserie-entreprises-artisanales",
+        title:
+          "Convention collective nationale de la boulangerie-pâtisserie du 19 mars 1976.  Etendue par arrêté du 21 juin 1978 JONC 28 juillet 1978.",
+      },
+      {
+        num: 2120,
+        slug: "2120-banque",
+        title:
+          "Convention collective nationale de la banque du 10 janvier 2000.  Etendue par arrêté du 17 novembre 2004 JORF 11 décembre 2004.",
+      },
+      {
+        num: 1090,
+        slug: "1090-services-de-lautomobile-commerce-et-reparation-de-lautomobile-du-cycle",
+        title:
+          "Services de l'automobile Convention collective nationale du commerce et de la réparation de l'automobile, du cycle et du motocycle et des activités connexes, ainsi que du contrôle technique automobile du 15 janvier 1981. Etendue par arrêté du 30 octobre 1981 JONC 3 décembre 1981.",
+      },
+      {
+        num: 1234,
+        slug: "1518-education-culture-loisirs-et-animation-au-service-des-territoires-eclat",
+        title:
+          "Éducation, culture, loisirs et animation au service des territoires (ÉCLAT)",
+      },
+    ]);
+  });
+});
diff --git a/packages/code-du-travail-frontend/src/modules/convention-collective/index.ts b/packages/code-du-travail-frontend/src/modules/convention-collective/index.ts
new file mode 100644
index 0000000000..b69c251208
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/convention-collective/index.ts
@@ -0,0 +1 @@
+export * from "./queries";
diff --git a/packages/code-du-travail-frontend/src/modules/convention-collective/queries.ts b/packages/code-du-travail-frontend/src/modules/convention-collective/queries.ts
new file mode 100644
index 0000000000..0aa021ae5f
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/convention-collective/queries.ts
@@ -0,0 +1,32 @@
+import { ElasticAgreement } from "@socialgouv/cdtn-types";
+import { orderByAlpha } from "../utils";
+import { SOURCES } from "@socialgouv/cdtn-utils";
+import { elasticDocumentsIndex, elasticsearchClient } from "../../api/utils";
+
+export const fetchAllAgreements = async <K extends keyof ElasticAgreement>(
+  fields: K[],
+  sortBy?: K
+): Promise<Pick<ElasticAgreement, K>[]> => {
+  const response = await elasticsearchClient.search<Pick<ElasticAgreement, K>>({
+    query: {
+      bool: {
+        filter: [
+          { term: { source: SOURCES.CCN } },
+          { term: { isPublished: true } },
+          { term: { contributions: true } },
+        ],
+      },
+    },
+    size: 100,
+    _source: fields,
+    index: elasticDocumentsIndex,
+  });
+
+  const data = response.hits.hits
+    .map(({ _source }) => _source)
+    .filter((item) => item !== undefined);
+  if (sortBy) {
+    data.sort((a, b) => orderByAlpha(a, b, sortBy));
+  }
+  return data;
+};
diff --git a/packages/code-du-travail-frontend/src/api/modules/related-items/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/modules/documents/__tests__/service.es.test.ts
similarity index 92%
rename from packages/code-du-travail-frontend/src/api/modules/related-items/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/modules/documents/__tests__/service.es.test.ts
index ba8eec2019..b86a2e9cef 100644
--- a/packages/code-du-travail-frontend/src/api/modules/related-items/__tests__/service.test.ts
+++ b/packages/code-du-travail-frontend/src/modules/documents/__tests__/service.es.test.ts
@@ -1,10 +1,10 @@
 /** @jest-environment node */
 
-import { getRelatedItems } from "../service";
+import { fetchRelatedItems } from "../fetch-related-items";
 
 describe("RelatedItems", () => {
   it("getRelatedItems", async () => {
-    const result = await getRelatedItems(
+    const result = await fetchRelatedItems(
       { _id: "5" },
       "quelles-sont-les-consequences-du-deces-de-lemployeur-sur-le-contrat-de-travail"
     );
diff --git a/packages/code-du-travail-frontend/src/modules/documents/fetch-document.ts b/packages/code-du-travail-frontend/src/modules/documents/fetch-document.ts
new file mode 100644
index 0000000000..81e0028105
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/documents/fetch-document.ts
@@ -0,0 +1,22 @@
+import { DocumentElasticResult } from "./type";
+import { SearchRequest } from "@elastic/elasticsearch/lib/api/types";
+import {elasticDocumentsIndex, elasticsearchClient} from "../../api/utils";
+
+export const fetchDocument = async <
+  V,
+  K extends keyof DocumentElasticResult<V>
+>(
+  fields: K[],
+  body: SearchRequest
+): Promise<DocumentElasticResult<V> | undefined> => {
+  const response = await elasticsearchClient.search<V>({
+    _source: fields,
+    index: elasticDocumentsIndex,
+    ...body,
+  });
+  if (response.hits.hits.length === 0) {
+    return;
+  }
+  const item = response.hits.hits[0];
+  return { ...item._source, _id: item._id } as DocumentElasticResult<V>;
+};
diff --git a/packages/code-du-travail-frontend/src/api/modules/related-items/service.ts b/packages/code-du-travail-frontend/src/modules/documents/fetch-related-items.ts
similarity index 68%
rename from packages/code-du-travail-frontend/src/api/modules/related-items/service.ts
rename to packages/code-du-travail-frontend/src/modules/documents/fetch-related-items.ts
index aaa1abb71a..b44aa6d84e 100644
--- a/packages/code-du-travail-frontend/src/api/modules/related-items/service.ts
+++ b/packages/code-du-travail-frontend/src/modules/documents/fetch-related-items.ts
@@ -1,14 +1,14 @@
-import { elasticDocumentsIndex, elasticsearchClient } from "../../utils";
-import { getRelatedItemsBody } from "./queries";
-import { RelatedItem } from "./type";
-import { nonNullable } from "@socialgouv/modeles-social";
 import { getRouteBySource, SOURCES } from "@socialgouv/cdtn-utils";
+import { elasticDocumentsIndex, elasticsearchClient } from "../../api/utils";
+
+import { nonNullable } from "@socialgouv/modeles-social";
+import { RelatedItem, sources } from "./type";
 
-export type RelatedItemSettings = {
+type RelatedItemSettings = {
   _id: string;
 };
 
-export const getSearchBasedItems = async (settings: RelatedItemSettings) => {
+const getSearchBasedItems = async (settings: RelatedItemSettings) => {
   const relatedItemBody = getRelatedItemsBody([settings]);
   const { hits } = await elasticsearchClient.search<
     RelatedItem & { slug: string }
@@ -24,7 +24,37 @@ export const getSearchBasedItems = async (settings: RelatedItemSettings) => {
 const isArticleSource = (source) =>
   ![SOURCES.EXTERNALS, SOURCES.LETTERS, SOURCES.TOOLS].includes(source);
 
-export const getRelatedItems = async (
+const getRelatedItemsBody = (
+  settings: RelatedItemSettings[],
+  size: number | undefined = 10
+): any => {
+  return {
+    query: {
+      bool: {
+        filter: [
+          { term: { excludeFromSearch: false } },
+          { term: { isPublished: true } },
+          {
+            bool: {
+              should: sources.map((source) => ({ term: { source } })),
+            },
+          },
+        ],
+        must: {
+          more_like_this: {
+            fields: ["title", "text"],
+            like: settings,
+            max_query_terms: 12,
+            min_term_freq: 1,
+          },
+        },
+      },
+    },
+    size,
+  };
+};
+
+export const fetchRelatedItems = async (
   settings: RelatedItemSettings,
   excludedSlug: string
 ): Promise<{ items: RelatedItem[]; title: string }[]> => {
diff --git a/packages/code-du-travail-frontend/src/modules/documents/index.ts b/packages/code-du-travail-frontend/src/modules/documents/index.ts
new file mode 100644
index 0000000000..bf1b470476
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/documents/index.ts
@@ -0,0 +1,3 @@
+export * from "./fetch-document";
+export * from "./fetch-related-items";
+export * from "./type";
diff --git a/packages/code-du-travail-frontend/src/api/modules/related-items/type.ts b/packages/code-du-travail-frontend/src/modules/documents/type.ts
similarity index 86%
rename from packages/code-du-travail-frontend/src/api/modules/related-items/type.ts
rename to packages/code-du-travail-frontend/src/modules/documents/type.ts
index 183cce40b8..d3825b5f63 100644
--- a/packages/code-du-travail-frontend/src/api/modules/related-items/type.ts
+++ b/packages/code-du-travail-frontend/src/modules/documents/type.ts
@@ -1,6 +1,10 @@
 import { SOURCES } from "@socialgouv/cdtn-utils";
 import { DocumentElastic } from "@socialgouv/cdtn-types/build/elastic/common";
 
+export type DocumentElasticResult<T> = T & {
+  _id: string;
+};
+
 export const sources = [
   SOURCES.TOOLS,
   SOURCES.SHEET_SP,
diff --git a/packages/code-du-travail-frontend/src/modules/informations/__tests__/queries.es.test.ts b/packages/code-du-travail-frontend/src/modules/informations/__tests__/queries.es.test.ts
new file mode 100644
index 0000000000..ba0f41a051
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/informations/__tests__/queries.es.test.ts
@@ -0,0 +1,22 @@
+/** @jest-environment node */
+
+import { fetchAllInformations } from "../queries";
+
+describe("Informations", () => {
+  it("Récupération de tous les informations", async () => {
+    const result = await fetchAllInformations(["slug", "title", "date"]);
+    expect(result).toEqual([
+      {
+        date: "29/05/2024",
+        slug: "exemples-de-contrats-de-travail-cdi-et-cdd",
+        title: "Exemples de contrats de travail CDI et CDD",
+      },
+      {
+        date: "14/08/2024",
+        slug: "rupture-conventionnelle-individuelle-la-procedure-en-details",
+        title:
+          "Rupture conventionnelle : les étapes de la procédure et les délais",
+      },
+    ]);
+  });
+});
diff --git a/packages/code-du-travail-frontend/src/modules/informations/index.ts b/packages/code-du-travail-frontend/src/modules/informations/index.ts
new file mode 100644
index 0000000000..b69c251208
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/informations/index.ts
@@ -0,0 +1 @@
+export * from "./queries";
diff --git a/packages/code-du-travail-frontend/src/modules/informations/queries.ts b/packages/code-du-travail-frontend/src/modules/informations/queries.ts
new file mode 100644
index 0000000000..481efd4926
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/informations/queries.ts
@@ -0,0 +1,35 @@
+import { orderByAlpha } from "../utils/sort";
+import { elasticDocumentsIndex, elasticsearchClient } from "../../api/utils";
+import { EditorialContentElasticDocument } from "@socialgouv/cdtn-types";
+import { SOURCES } from "@socialgouv/cdtn-utils";
+
+export const fetchAllInformations = async <
+  K extends keyof EditorialContentElasticDocument
+>(
+  fields: K[],
+  sortBy?: K
+): Promise<Pick<EditorialContentElasticDocument, K>[]> => {
+  const response = await elasticsearchClient.search<
+    Pick<EditorialContentElasticDocument, K>
+  >({
+    query: {
+      bool: {
+        filter: [
+          { term: { source: SOURCES.EDITORIAL_CONTENT } },
+          { term: { isPublished: true } },
+        ],
+      },
+    },
+    size: 3000,
+    _source: fields,
+    index: elasticDocumentsIndex,
+  });
+
+  const data = response.hits.hits
+    .map(({ _source }) => _source)
+    .filter((source) => source !== undefined);
+  if (sortBy) {
+    return data.sort((a, b) => orderByAlpha(a, b, sortBy));
+  }
+  return data;
+};
diff --git a/packages/code-du-travail-frontend/src/modules/layout/ContainerRich.tsx b/packages/code-du-travail-frontend/src/modules/layout/ContainerRich.tsx
index 318e90dc9f..b0bd5c1a9a 100644
--- a/packages/code-du-travail-frontend/src/modules/layout/ContainerRich.tsx
+++ b/packages/code-du-travail-frontend/src/modules/layout/ContainerRich.tsx
@@ -1,7 +1,7 @@
 import { fr } from "@codegouvfr/react-dsfr";
 import { RelatedItems } from "../common/RelatedItems";
 import { Share } from "../common/Share";
-import { RelatedItem } from "../../api/modules/related-items/type";
+import {RelatedItem} from "../documents";
 
 type Props = {
   relatedItems: { items: RelatedItem[]; title: string }[];
diff --git a/packages/code-du-travail-frontend/src/modules/modeles-de-courriers/__tests__/queries.es.test.ts b/packages/code-du-travail-frontend/src/modules/modeles-de-courriers/__tests__/queries.es.test.ts
new file mode 100644
index 0000000000..b7a563c40f
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/modeles-de-courriers/__tests__/queries.es.test.ts
@@ -0,0 +1,23 @@
+/** @jest-environment node */
+
+import { fetchAllModels } from "../queries";
+
+describe("Modèles de courrier", () => {
+  it("Récupération de tous les modèles de courrier", async () => {
+    const result = await fetchAllModels(["slug", "title", "type"]);
+    expect(result).toEqual([
+      {
+        slug: "demande-de-rendez-vous-en-vue-dune-rupture-conventionnelle",
+        title: "Demande de rendez-vous en vue d’une rupture conventionnelle",
+      },
+      {
+        slug: "rupture-de-periode-dessai-a-linitiative-de-lemployeur",
+        title: "Rupture de période d’essai à l’initiative de l’employeur",
+      },
+      {
+        slug: "certificat-de-travail",
+        title: "Certificat de travail",
+      },
+    ]);
+  });
+});
diff --git a/packages/code-du-travail-frontend/src/modules/modeles-de-courriers/index.ts b/packages/code-du-travail-frontend/src/modules/modeles-de-courriers/index.ts
new file mode 100644
index 0000000000..b69c251208
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/modeles-de-courriers/index.ts
@@ -0,0 +1 @@
+export * from "./queries";
diff --git a/packages/code-du-travail-frontend/src/modules/modeles-de-courriers/queries.ts b/packages/code-du-travail-frontend/src/modules/modeles-de-courriers/queries.ts
new file mode 100644
index 0000000000..0ba873c242
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/modeles-de-courriers/queries.ts
@@ -0,0 +1,33 @@
+import {
+  DocumentElasticWithSource,
+  MailTemplateDoc,
+} from "@socialgouv/cdtn-types";
+import { elasticDocumentsIndex, elasticsearchClient } from "../../api/utils";
+import { SOURCES } from "@socialgouv/cdtn-utils";
+
+export const fetchAllModels = async <
+  K extends keyof DocumentElasticWithSource<MailTemplateDoc>
+>(
+  fields: K[]
+): Promise<Pick<DocumentElasticWithSource<MailTemplateDoc>, K>[]> => {
+  const response = await elasticsearchClient.search<
+    DocumentElasticWithSource<
+      Pick<DocumentElasticWithSource<MailTemplateDoc>, K>
+    >
+  >({
+    query: {
+      bool: {
+        filter: [
+          { term: { source: SOURCES.LETTERS } },
+          { term: { isPublished: true } },
+        ],
+      },
+    },
+    size: 1000,
+    _source: fields,
+    index: elasticDocumentsIndex,
+  });
+  return response.hits.hits
+    .map(({ _source }) => _source)
+    .filter((source) => source !== undefined);
+};
diff --git a/packages/code-du-travail-frontend/src/modules/outils/__tests__/queries.es.test.ts b/packages/code-du-travail-frontend/src/modules/outils/__tests__/queries.es.test.ts
new file mode 100644
index 0000000000..1915cba543
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/outils/__tests__/queries.es.test.ts
@@ -0,0 +1,26 @@
+/** @jest-environment node */
+
+import { fetchAllTools } from "../queries";
+
+describe("Outils", () => {
+  it("Récupération de tous les outils", async () => {
+    const result = await fetchAllTools(["slug", "title", "icon"]);
+    expect(result).toEqual([
+      {
+        icon: "Indemnity",
+        slug: "indemnite-licenciement",
+        title: "Indemnité de licenciement",
+      },
+      {
+        icon: "Rules",
+        slug: "preavis-demission",
+        title: "Préavis de démission",
+      },
+      {
+        icon: "Time",
+        slug: "heures-recherche-emploi",
+        title: "Heures d'absence pour rechercher un emploi",
+      },
+    ]);
+  });
+});
diff --git a/packages/code-du-travail-frontend/src/modules/outils/index.ts b/packages/code-du-travail-frontend/src/modules/outils/index.ts
new file mode 100644
index 0000000000..b69c251208
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/outils/index.ts
@@ -0,0 +1 @@
+export * from "./queries";
diff --git a/packages/code-du-travail-frontend/src/modules/outils/queries.ts b/packages/code-du-travail-frontend/src/modules/outils/queries.ts
new file mode 100644
index 0000000000..c090a0f64e
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/outils/queries.ts
@@ -0,0 +1,55 @@
+import {
+  elasticDocumentsIndex,
+  elasticsearchClient,
+  NotFoundError,
+} from "../../api/utils";
+import { Tool } from "@socialgouv/cdtn-types";
+import { SOURCES } from "@socialgouv/cdtn-utils";
+
+export const fetchAllTools = async <K extends keyof Tool>(
+  fields: K[]
+): Promise<Pick<Tool, K>[]> => {
+  const response = await elasticsearchClient.search<Pick<Tool, K>>({
+    query: {
+      bool: {
+        must: [
+          {
+            term: {
+              isPublished: true,
+            },
+          },
+          {
+            term: {
+              source: SOURCES.TOOLS,
+            },
+          },
+          {
+            term: {
+              displayTool: true,
+            },
+          },
+        ],
+      },
+    },
+    size: 50,
+    sort: [
+      {
+        order: {
+          order: "asc",
+        },
+      },
+    ],
+    _source: fields,
+    index: elasticDocumentsIndex,
+  });
+  if (response.hits.hits.length === 0) {
+    throw new NotFoundError({
+      message: `There is no tools that match query`,
+      name: "TOOLS_NOT_FOUND",
+      cause: null,
+    });
+  }
+  return response.hits.hits
+    .map(({ _source }) => _source)
+    .filter((source) => source !== undefined);
+};
diff --git a/packages/code-du-travail-frontend/src/modules/plan-du-site/SiteMap.tsx b/packages/code-du-travail-frontend/src/modules/plan-du-site/SiteMap.tsx
new file mode 100644
index 0000000000..1789d7b68b
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/plan-du-site/SiteMap.tsx
@@ -0,0 +1,126 @@
+import { fr } from "@codegouvfr/react-dsfr";
+import { Document } from "./queries";
+import React from "react";
+import Link from "next/link";
+import { getRouteBySource, SourceKeys, SOURCES } from "@socialgouv/cdtn-utils";
+import { Container } from "../layout/Container";
+
+type Props = {
+  themes: Document[];
+  tools: Document[];
+  modeles: Document[];
+  contributions: Document[];
+  agreements: Document[];
+  informations: Document[];
+};
+
+type SectionProps = {
+  title: string;
+  url?: string;
+  detail?: {
+    source: SourceKeys;
+    docs: Document[];
+  };
+};
+
+const SiteMapSection = ({ title, url, detail }: SectionProps) => (
+  <div className={fr.cx("fr-mb-4w")}>
+    {url ? (
+      <Link href={url}>
+        <span className={fr.cx("fr-text--lead", "fr-text--bold")}>{title}</span>
+      </Link>
+    ) : (
+      <span className={fr.cx("fr-text--lead", "fr-text--bold", "fr-mb-3w")}>
+        {title}
+      </span>
+    )}
+
+    {detail && (
+      <ul className={fr.cx("fr-mt-3w")}>
+        {detail.docs.map(({ root, children }) => (
+          <li key={root.slug}>
+            <Link href={`/${getRouteBySource(detail.source)}/${root.slug}`}>
+              {root.title}
+            </Link>
+            {children && (
+              <ul>
+                {children.map((doc) => (
+                  <li key={doc.slug}>
+                    <Link
+                      href={`/${getRouteBySource(detail.source)}/${doc.slug}`}
+                    >
+                      {doc.title}
+                    </Link>
+                  </li>
+                ))}
+              </ul>
+            )}
+          </li>
+        ))}
+      </ul>
+    )}
+  </div>
+);
+
+export const SiteMap = ({
+  tools,
+  modeles,
+  contributions,
+  agreements,
+  informations,
+  themes,
+}: Props) => (
+  <Container>
+    <h1 id="plan-du-site" className={fr.cx("fr-mt-0", "fr-mb-3w")}>
+      Plan du site
+    </h1>
+    <SiteMapSection title={"Page d'accueil"} url={"/"} />
+    <SiteMapSection
+      title={"Boîte à outils"}
+      url={"/outils"}
+      detail={{
+        source: SOURCES.TOOLS,
+        docs: tools,
+      }}
+    />
+    <SiteMapSection
+      title={"Modèles de documents"}
+      url={"/modeles-de-courriers"}
+      detail={{
+        source: SOURCES.LETTERS,
+        docs: modeles,
+      }}
+    />
+    <SiteMapSection
+      title={"Contenus éditoriaux"}
+      detail={{
+        source: SOURCES.EDITORIAL_CONTENT,
+        docs: informations,
+      }}
+    />
+    <SiteMapSection
+      title={"Vos fiches pratiques"}
+      url={"/contribution"}
+      detail={{
+        source: SOURCES.CONTRIBUTIONS,
+        docs: contributions,
+      }}
+    />
+    <SiteMapSection
+      title={"Votre convention collective"}
+      url={"/convention-collective"}
+      detail={{
+        source: SOURCES.CCN,
+        docs: agreements,
+      }}
+    />
+    <SiteMapSection
+      title={"Thèmes"}
+      url={"/themes"}
+      detail={{
+        source: SOURCES.THEMES,
+        docs: themes,
+      }}
+    />
+  </Container>
+);
diff --git a/packages/code-du-travail-frontend/src/modules/plan-du-site/__tests__/PlanDuSite.test.tsx b/packages/code-du-travail-frontend/src/modules/plan-du-site/__tests__/PlanDuSite.test.tsx
index b3079d05ae..575d280b37 100644
--- a/packages/code-du-travail-frontend/src/modules/plan-du-site/__tests__/PlanDuSite.test.tsx
+++ b/packages/code-du-travail-frontend/src/modules/plan-du-site/__tests__/PlanDuSite.test.tsx
@@ -1,7 +1,7 @@
 import { render } from "@testing-library/react";
 import React from "react";
 import { SiteMap } from "..";
-import type { Document } from "../../../api";
+import type { Document } from "../";
 
 describe("<SiteMap />", () => {
   it("should match snapshot", () => {
diff --git a/packages/code-du-travail-frontend/src/api/modules/sitemap/__tests__/service.test.ts b/packages/code-du-travail-frontend/src/modules/plan-du-site/__tests__/queries.es.test.ts
similarity index 92%
rename from packages/code-du-travail-frontend/src/api/modules/sitemap/__tests__/service.test.ts
rename to packages/code-du-travail-frontend/src/modules/plan-du-site/__tests__/queries.es.test.ts
index dd00d2b817..a9838ffa87 100644
--- a/packages/code-du-travail-frontend/src/api/modules/sitemap/__tests__/service.test.ts
+++ b/packages/code-du-travail-frontend/src/modules/plan-du-site/__tests__/queries.es.test.ts
@@ -1,8 +1,8 @@
 /** @jest-environment node */
 
-import { getSitemapData } from "../service";
+import { fetchSitemapData } from "../queries";
 
-jest.mock("../../contributions/fetch", () => ({
+jest.mock("../../contributions/queries", () => ({
   fetchAllContributions: async () => {
     return Promise.resolve([
       {
@@ -42,7 +42,7 @@ jest.mock("../../contributions/fetch", () => ({
 
 describe("Sitemap", () => {
   it("getSitemapData returns empty array if contrib does not exists", async () => {
-    const result = await getSitemapData();
+    const result = await fetchSitemapData();
     expect(Object.keys(result)).toEqual([
       "themes",
       "tools",
diff --git a/packages/code-du-travail-frontend/src/modules/plan-du-site/index.tsx b/packages/code-du-travail-frontend/src/modules/plan-du-site/index.tsx
index 370dedd867..30a833872d 100644
--- a/packages/code-du-travail-frontend/src/modules/plan-du-site/index.tsx
+++ b/packages/code-du-travail-frontend/src/modules/plan-du-site/index.tsx
@@ -1,126 +1,2 @@
-import { fr } from "@codegouvfr/react-dsfr";
-import { Document } from "../../api";
-import React from "react";
-import Link from "next/link";
-import { getRouteBySource, SourceKeys, SOURCES } from "@socialgouv/cdtn-utils";
-import { Container } from "../layout/Container";
-
-type Props = {
-  themes: Document[];
-  tools: Document[];
-  modeles: Document[];
-  contributions: Document[];
-  agreements: Document[];
-  informations: Document[];
-};
-
-type SectionProps = {
-  title: string;
-  url?: string;
-  detail?: {
-    source: SourceKeys;
-    docs: Document[];
-  };
-};
-
-const SiteMapSection = ({ title, url, detail }: SectionProps) => (
-  <div className={fr.cx("fr-mb-4w")}>
-    {url ? (
-      <Link href={url}>
-        <span className={fr.cx("fr-text--lead", "fr-text--bold")}>{title}</span>
-      </Link>
-    ) : (
-      <span className={fr.cx("fr-text--lead", "fr-text--bold", "fr-mb-3w")}>
-        {title}
-      </span>
-    )}
-
-    {detail && (
-      <ul className={fr.cx("fr-mt-3w")}>
-        {detail.docs.map(({ root, children }) => (
-          <li key={root.slug}>
-            <Link href={`/${getRouteBySource(detail.source)}/${root.slug}`}>
-              {root.title}
-            </Link>
-            {children && (
-              <ul>
-                {children.map((doc) => (
-                  <li key={doc.slug}>
-                    <Link
-                      href={`/${getRouteBySource(detail.source)}/${doc.slug}`}
-                    >
-                      {doc.title}
-                    </Link>
-                  </li>
-                ))}
-              </ul>
-            )}
-          </li>
-        ))}
-      </ul>
-    )}
-  </div>
-);
-
-export const SiteMap = ({
-  tools,
-  modeles,
-  contributions,
-  agreements,
-  informations,
-  themes,
-}: Props) => (
-  <Container>
-    <h1 id="plan-du-site" className={fr.cx("fr-mt-0", "fr-mb-3w")}>
-      Plan du site
-    </h1>
-    <SiteMapSection title={"Page d'accueil"} url={"/"} />
-    <SiteMapSection
-      title={"Boîte à outils"}
-      url={"/outils"}
-      detail={{
-        source: SOURCES.TOOLS,
-        docs: tools,
-      }}
-    />
-    <SiteMapSection
-      title={"Modèles de documents"}
-      url={"/modeles-de-courriers"}
-      detail={{
-        source: SOURCES.LETTERS,
-        docs: modeles,
-      }}
-    />
-    <SiteMapSection
-      title={"Contenus éditoriaux"}
-      detail={{
-        source: SOURCES.EDITORIAL_CONTENT,
-        docs: informations,
-      }}
-    />
-    <SiteMapSection
-      title={"Vos fiches pratiques"}
-      url={"/contribution"}
-      detail={{
-        source: SOURCES.CONTRIBUTIONS,
-        docs: contributions,
-      }}
-    />
-    <SiteMapSection
-      title={"Votre convention collective"}
-      url={"/convention-collective"}
-      detail={{
-        source: SOURCES.CCN,
-        docs: agreements,
-      }}
-    />
-    <SiteMapSection
-      title={"Thèmes"}
-      url={"/themes"}
-      detail={{
-        source: SOURCES.THEMES,
-        docs: themes,
-      }}
-    />
-  </Container>
-);
+export * from "./SiteMap";
+export * from "./queries";
diff --git a/packages/code-du-travail-frontend/src/api/modules/sitemap/service.ts b/packages/code-du-travail-frontend/src/modules/plan-du-site/queries.ts
similarity index 77%
rename from packages/code-du-travail-frontend/src/api/modules/sitemap/service.ts
rename to packages/code-du-travail-frontend/src/modules/plan-du-site/queries.ts
index 30a85738a9..fa92ff62d7 100644
--- a/packages/code-du-travail-frontend/src/api/modules/sitemap/service.ts
+++ b/packages/code-du-travail-frontend/src/modules/plan-du-site/queries.ts
@@ -2,13 +2,13 @@ import {
   ContributionElasticDocument,
   ElasticAgreement,
 } from "@socialgouv/cdtn-types";
-import { getAllAgreements } from "../agreements";
-import { getAllModeles } from "../modeles";
-import { getRootThemes } from "../themes";
-import { getAllTools } from "../tools";
-import { getAllInformations } from "../informations";
-import { fetchAllContributions } from "../contributions/fetch";
-import { orderByAlpha } from "../../utils/sort";
+import { fetchAllAgreements } from "../convention-collective/queries";
+import { orderByAlpha } from "../utils";
+import { fetchRootThemes } from "../themes";
+import { fetchAllTools } from "../outils";
+import { fetchAllModels } from "../modeles-de-courriers";
+import { fetchAllInformations } from "../informations";
+import { fetchAllContributions } from "../contributions";
 
 export type Document = {
   root: DocumentInfo;
@@ -28,15 +28,15 @@ export type GetSitemapPage = {
   informations: Document[];
 };
 
-export const getSitemapData = async () => {
+export const fetchSitemapData = async () => {
   const themes = await getAllThemesAndSubThemes();
-  const tools = await getAllTools(["slug", "title"]);
-  const modeles = await getAllModeles(["slug", "title"]);
-  const agreements = await getAllAgreements(
+  const tools = await fetchAllTools(["slug", "title"]);
+  const modeles = await fetchAllModels(["slug", "title"]);
+  const agreements = await fetchAllAgreements(
     ["slug", "shortTitle", "num"],
     "shortTitle"
   );
-  const informations = await getAllInformations(["slug", "title"], "title");
+  const informations = await fetchAllInformations(["slug", "title"], "title");
   const contributions = await getAllContributionsGroupByQuestion(agreements);
   const response: GetSitemapPage = {
     themes,
@@ -99,7 +99,7 @@ const getTitle = (
 };
 
 export const getAllThemesAndSubThemes = async (): Promise<Document[]> => {
-  const themes = await getRootThemes(["title", "children", "slug"]);
+  const themes = await fetchRootThemes(["title", "children", "slug"]);
 
   return themes.map(({ slug, title, children }) => {
     return {
diff --git a/packages/code-du-travail-frontend/src/modules/themes/__tests__/queries.es.test.ts b/packages/code-du-travail-frontend/src/modules/themes/__tests__/queries.es.test.ts
new file mode 100644
index 0000000000..ff39e1768d
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/themes/__tests__/queries.es.test.ts
@@ -0,0 +1,59 @@
+/** @jest-environment node */
+
+import { fetchRootThemes } from "../queries";
+
+describe("Thèmes", () => {
+  it("Récupération de tous les thèmes", async () => {
+    const result = await fetchRootThemes(["slug", "title", "children"]);
+    expect(result).toEqual([
+      {
+        children: [
+          {
+            label: "Embauche",
+            slug: "embauche",
+          },
+          {
+            label: "Contrat de travail",
+            slug: "contrat-de-travail",
+          },
+        ],
+        slug: "embauche-et-contrat-de-travail",
+        title: "Embauche et contrat de travail",
+      },
+      {
+        children: [
+          {
+            label: "Documents à remettre au salarié",
+            slug: "documents-a-remettre-au-salarie",
+          },
+          {
+            label: "Démission",
+            slug: "demission",
+          },
+          {
+            label: "Fin d’un CDD - CTT",
+            slug: "fin-dun-cdd-ctt",
+          },
+          {
+            label: "Rupture conventionnelle",
+            slug: "rupture-conventionnelle",
+          },
+          {
+            label: "Licenciement : droits des salariés et procédures",
+            slug: "licenciement-droits-des-salaries-et-procedures",
+          },
+          {
+            label: "Retraite",
+            slug: "retraite",
+          },
+          {
+            label: "Autres départs",
+            slug: "autres-departs",
+          },
+        ],
+        slug: "depart-de-lentreprise",
+        title: "Départ de l’entreprise",
+      },
+    ]);
+  });
+});
diff --git a/packages/code-du-travail-frontend/src/modules/themes/index.ts b/packages/code-du-travail-frontend/src/modules/themes/index.ts
new file mode 100644
index 0000000000..b69c251208
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/themes/index.ts
@@ -0,0 +1 @@
+export * from "./queries";
diff --git a/packages/code-du-travail-frontend/src/modules/themes/queries.ts b/packages/code-du-travail-frontend/src/modules/themes/queries.ts
new file mode 100644
index 0000000000..3298047248
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/themes/queries.ts
@@ -0,0 +1,27 @@
+import { ThemeElasticDocument } from "@socialgouv/cdtn-types/build/elastic/theme";
+import { elasticDocumentsIndex, elasticsearchClient } from "../../api/utils";
+import { SOURCES } from "@socialgouv/cdtn-utils";
+
+export const fetchRootThemes = async <K extends keyof ThemeElasticDocument>(
+  fields: K[]
+): Promise<Pick<ThemeElasticDocument, K>[]> => {
+  const response = await elasticsearchClient.search<
+    Pick<ThemeElasticDocument, K>
+  >({
+    query: {
+      bool: {
+        filter: [
+          { term: { source: SOURCES.THEMES } },
+          { term: { isPublished: true } },
+        ],
+        must_not: { exists: { field: "breadcrumbs" } },
+      },
+    },
+    sort: [{ position: { order: "asc" } }],
+    _source: fields,
+    index: elasticDocumentsIndex,
+  });
+  return response.hits.hits
+    .map((t) => t._source)
+    .filter((item) => item !== undefined);
+};
diff --git a/packages/code-du-travail-frontend/src/modules/utils/index.ts b/packages/code-du-travail-frontend/src/modules/utils/index.ts
new file mode 100644
index 0000000000..03fccca99b
--- /dev/null
+++ b/packages/code-du-travail-frontend/src/modules/utils/index.ts
@@ -0,0 +1,2 @@
+export * from "./sort";
+export * from "./events";
diff --git a/packages/code-du-travail-frontend/src/api/utils/sort.ts b/packages/code-du-travail-frontend/src/modules/utils/sort.ts
similarity index 100%
rename from packages/code-du-travail-frontend/src/api/utils/sort.ts
rename to packages/code-du-travail-frontend/src/modules/utils/sort.ts