diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/index.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/index.xhtml
index e626a39..31ee7cb 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/index.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/index.xhtml
@@ -53,7 +53,7 @@
                 </ul>
             </div>
             <div class="landing-topbar-right">
-                <ui:include src="/templates/components/button-primary.xhtml">
+                <ui:include src="/templates/components/buttons/button-primary.xhtml">
                     <ui:param name="value" value="Accéder" />
                     <ui:param name="icon" value="pi pi-arrow-right" />
                     <ui:param name="outcome" value="/pages/secure/dashboard" />
@@ -71,7 +71,7 @@
                 <span class="title">UnionFlow</span>
                 <h3>Plateforme de Gestion Intégrée pour Mutuelles, Associations et Clubs<br/>
                     Simplifiez la gestion de votre organisation avec une solution complète et moderne</h3>
-                <ui:include src="/templates/components/button-primary.xhtml">
+                <ui:include src="/templates/components/buttons/button-primary.xhtml">
                     <ui:param name="value" value="Accéder à la plateforme" />
                     <ui:param name="icon" value="pi pi-sign-in" />
                     <ui:param name="outcome" value="/pages/secure/dashboard" />
@@ -220,7 +220,7 @@
                 </div>
             </div>
             <div class="text-center mt-5">
-                <ui:include src="/templates/components/button-primary.xhtml">
+                <ui:include src="/templates/components/buttons/button-primary.xhtml">
                     <ui:param name="value" value="Découvrir toutes les fonctionnalités" />
                     <ui:param name="icon" value="pi pi-arrow-right" />
                     <ui:param name="outcome" value="/pages/secure/dashboard" />
@@ -268,7 +268,7 @@
                     <h:form>
                         <div class="newsletter-input">
                             <p:inputText placeholder="adresse email" />
-                            <ui:include src="/templates/components/button-secondary.xhtml">
+                            <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                 <ui:param name="value" value="S'abonner" />
                                 <ui:param name="outlined" value="false" />
                             </ui:include>
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/admin/audit/journal.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/admin/audit/journal.xhtml
index 698d585..1b0315a 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/admin/audit/journal.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/admin/audit/journal.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActions">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Exporter" />
                             <ui:param name="icon" value="pi pi-download" />
                             <ui:param name="onclick" value="PF('exportDialog').show(); return false;" />
@@ -74,7 +74,7 @@
                 <h5>Filtres de Recherche</h5>
                 <div class="grid">
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-calendar.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                             <ui:param name="id" value="dateDebut" />
                             <ui:param name="label" value="Date Début" />
                             <ui:param name="value" value="#{auditBean.dateDebut}" />
@@ -83,7 +83,7 @@
                     </div>
                     
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-calendar.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                             <ui:param name="id" value="dateFin" />
                             <ui:param name="label" value="Date Fin" />
                             <ui:param name="value" value="#{auditBean.dateFin}" />
@@ -92,7 +92,7 @@
                     </div>
                     
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-select.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-select.xhtml">
                             <ui:param name="id" value="typeAction" />
                             <ui:param name="label" value="Type d'Action" />
                             <ui:param name="value" value="#{auditBean.typeAction}" />
@@ -112,7 +112,7 @@
                     </div>
                     
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-select.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-select.xhtml">
                             <ui:param name="id" value="severite" />
                             <ui:param name="label" value="Sévérité" />
                             <ui:param name="value" value="#{auditBean.severite}" />
@@ -129,7 +129,7 @@
                     </div>
                     
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-search-text.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-search-text.xhtml">
                             <ui:param name="id" value="utilisateur" />
                             <ui:param name="label" value="Utilisateur" />
                             <ui:param name="value" value="#{auditBean.utilisateur}" />
@@ -139,7 +139,7 @@
                     </div>
                     
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-select.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-select.xhtml">
                             <ui:param name="id" value="module" />
                             <ui:param name="label" value="Module" />
                             <ui:param name="value" value="#{auditBean.module}" />
@@ -158,7 +158,7 @@
                     </div>
                     
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-search-text.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-search-text.xhtml">
                             <ui:param name="id" value="ipAddress" />
                             <ui:param name="label" value="Adresse IP" />
                             <ui:param name="value" value="#{auditBean.ipAddress}" />
@@ -171,13 +171,13 @@
                         <div class="field">
                             <p:outputLabel />
                             <div class="flex gap-2">
-                                <ui:include src="/templates/components/button-primary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-primary.xhtml">
                                     <ui:param name="value" value="Rechercher" />
                                     <ui:param name="icon" value="pi pi-search" />
                                     <ui:param name="action" value="#{auditBean.rechercher}" />
                                     <ui:param name="update" value=":formTableau:tableauAudit" />
                                 </ui:include>
-                                <ui:include src="/templates/components/button-secondary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                     <ui:param name="value" value="Réinitialiser" />
                                     <ui:param name="icon" value="pi pi-refresh" />
                                     <ui:param name="action" value="#{auditBean.reinitialiserFiltres}" />
@@ -280,7 +280,7 @@
                      style="width: 90vw; max-width: 800px;">
                 <div class="grid" rendered="#{auditBean.evenementSelectionne != null}">
                     <div class="col-12">
-                        <ui:include src="/templates/components/form-section.xhtml">
+                        <ui:include src="/templates/components/forms/form-section.xhtml">
                             <ui:define name="title">Informations Générales</ui:define>
                             <ui:define name="content">
                                 <div class="grid">
@@ -317,7 +317,7 @@
                     </div>
                     
                     <div class="col-12">
-                        <ui:include src="/templates/components/form-section.xhtml">
+                        <ui:include src="/templates/components/forms/form-section.xhtml">
                             <ui:define name="title">Détails de l'Action</ui:define>
                             <ui:define name="content">
                                 <div class="grid">
@@ -351,7 +351,7 @@
                     </div>
                     
                     <div class="col-12">
-                        <ui:include src="/templates/components/form-section.xhtml">
+                        <ui:include src="/templates/components/forms/form-section.xhtml">
                             <ui:define name="title">Informations Techniques</ui:define>
                             <ui:define name="content">
                                 <div class="grid">
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/access-denied.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/access-denied.xhtml
index 8b21c76..ed1cd71 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/access-denied.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/access-denied.xhtml
@@ -31,14 +31,14 @@
                 <!-- Actions -->
                 <h:form>
                     <div class="flex gap-3 justify-content-center">
-                        <ui:include src="/templates/components/button-primary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-primary.xhtml">
                             <ui:param name="value" value="Retour au tableau de bord" />
                             <ui:param name="icon" value="pi pi-home" />
                             <ui:param name="action" value="#{navigationBean.goToDashboard}" />
                             <ui:param name="outlined" value="true" />
                         </ui:include>
                         
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Se déconnecter" />
                             <ui:param name="icon" value="pi pi-sign-out" />
                             <ui:param name="action" value="#{loginBean.logout}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/demande.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/demande.xhtml
index b2e47af..31aaef8 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/demande.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/demande.xhtml
@@ -21,7 +21,7 @@
             <h:form id="formDemande">
                 <h5>Nouvelle Demande d'Adhésion</h5>
                 
-                <ui:include src="/templates/components/form-section.xhtml">
+                <ui:include src="/templates/components/forms/form-section.xhtml">
                     <ui:param name="title" value="Informations du Membre" />
                     <ui:define name="content">
                         <div class="grid">
@@ -59,7 +59,7 @@
                     </ui:define>
                 </ui:include>
                 
-                <ui:include src="/templates/components/form-section.xhtml">
+                <ui:include src="/templates/components/forms/form-section.xhtml">
                     <ui:param name="title" value="Frais d'Adhésion" />
                     <ui:define name="content">
                         <div class="grid">
@@ -77,12 +77,12 @@
                     </ui:define>
                 </ui:include>
                 
-                <ui:include src="/templates/components/form-section.xhtml">
+                <ui:include src="/templates/components/forms/form-section.xhtml">
                     <ui:param name="title" value="Observations" />
                     <ui:define name="content">
                         <div class="grid">
                             <div class="col-12">
-                                <ui:include src="/templates/components/form-field-textarea.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                                     <ui:param name="id" value="observations" />
                                     <ui:param name="label" value="Observations (optionnel)" />
                                     <ui:param name="value" value="#{adhesionsBean.nouvelleAdhesion.observations}" />
@@ -94,13 +94,13 @@
                 </ui:include>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="action" value="#{navigationBean.goToDashboard}" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-primary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-primary.xhtml">
                         <ui:param name="value" value="Soumettre la demande" />
                         <ui:param name="icon" value="pi pi-send" />
                         <ui:param name="action" value="#{adhesionsBean.enregistrerAdhesion}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/history.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/history.xhtml
index 478abac..679942d 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/history.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/history.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActionsHistory">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Exporter" />
                             <ui:param name="icon" value="pi pi-download" />
                             <ui:param name="outlined" value="true" />
@@ -42,21 +42,21 @@
                 <h5>Filtres de Recherche</h5>
                 <div class="grid">
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-calendar.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                             <ui:param name="id" value="dateDebut" />
                             <ui:param name="label" value="Date début" />
                             <ui:param name="value" value="#{adhesionsBean.filtres.dateDebut}" />
                         </ui:include>
                     </div>
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-calendar.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                             <ui:param name="id" value="dateFin" />
                             <ui:param name="label" value="Date fin" />
                             <ui:param name="value" value="#{adhesionsBean.filtres.dateFin}" />
                         </ui:include>
                     </div>
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-select.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-select.xhtml">
                             <ui:param name="id" value="statutHistory" />
                             <ui:param name="label" value="Statut" />
                             <ui:param name="value" value="#{adhesionsBean.filtres.statut}" />
@@ -75,13 +75,13 @@
                         <div class="field">
                             <p:outputLabel />
                             <div class="flex gap-2">
-                                <ui:include src="/templates/components/button-primary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-primary.xhtml">
                                     <ui:param name="value" value="Rechercher" />
                                     <ui:param name="icon" value="pi pi-search" />
                                     <ui:param name="action" value="#{adhesionsBean.rechercher}" />
                                     <ui:param name="update" value=":formHistory" />
                                 </ui:include>
-                                <ui:include src="/templates/components/button-secondary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                     <ui:param name="value" value="Réinitialiser" />
                                     <ui:param name="icon" value="pi pi-times" />
                                     <ui:param name="action" value="#{adhesionsBean.reinitialiserFiltres}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/liste.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/liste.xhtml
index a1e477e..f3cf265 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/liste.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/liste.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActionsListe">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-primary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-primary.xhtml">
                             <ui:param name="value" value="Nouvelle adhésion" />
                             <ui:param name="icon" value="pi pi-plus" />
                             <ui:param name="onclick" value="PF('dlgNouvelleAdhesion').show();" />
@@ -73,7 +73,7 @@
                 <h5>Filtres de Recherche</h5>
                 <div class="grid">
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-select.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-select.xhtml">
                             <ui:param name="id" value="filtreStatut" />
                             <ui:param name="label" value="Statut" />
                             <ui:param name="value" value="#{adhesionsBean.filtres.statut}" />
@@ -88,7 +88,7 @@
                         </ui:include>
                     </div>
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-text.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-text.xhtml">
                             <ui:param name="id" value="filtreNomMembre" />
                             <ui:param name="label" value="Nom du membre" />
                             <ui:param name="value" value="#{adhesionsBean.filtres.nomMembre}" />
@@ -96,7 +96,7 @@
                         </ui:include>
                     </div>
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-calendar.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                             <ui:param name="id" value="filtreDateDebut" />
                             <ui:param name="label" value="Date début" />
                             <ui:param name="value" value="#{adhesionsBean.filtres.dateDebut}" />
@@ -106,13 +106,13 @@
                         <div class="field">
                             <p:outputLabel />
                             <div class="flex gap-2">
-                                <ui:include src="/templates/components/button-primary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-primary.xhtml">
                                     <ui:param name="value" value="Rechercher" />
                                     <ui:param name="icon" value="pi pi-search" />
                                     <ui:param name="action" value="#{adhesionsBean.rechercher}" />
                                     <ui:param name="update" value=":formListe" />
                                 </ui:include>
-                                <ui:include src="/templates/components/button-secondary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                     <ui:param name="value" value="Réinitialiser" />
                                     <ui:param name="icon" value="pi pi-times" />
                                     <ui:param name="action" value="#{adhesionsBean.reinitialiserFiltres}" />
@@ -248,7 +248,7 @@
                                      styleClass="w-full" />
                     </div>
                     
-                    <ui:include src="/templates/components/form-field-textarea.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                         <ui:param name="id" value="observations" />
                         <ui:param name="label" value="Observations" />
                         <ui:param name="value" value="#{adhesionsBean.nouvelleAdhesion.observations}" />
@@ -257,13 +257,13 @@
                 </div>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgNouvelleAdhesion').hide();" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-primary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-primary.xhtml">
                         <ui:param name="value" value="Créer" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{adhesionsBean.enregistrerAdhesion}" />
@@ -360,13 +360,13 @@
                 </div>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgApprobation').hide();" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-success.xhtml">
+                    <ui:include src="/templates/components/buttons/button-success.xhtml">
                         <ui:param name="value" value="Approuver" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{adhesionsBean.approuverAdhesion}" />
@@ -386,7 +386,7 @@
                         <p class="text-600">#{adhesionsBean.adhesionSelectionnee.numeroReference} - #{adhesionsBean.adhesionSelectionnee.nomMembre}</p>
                     </div>
                     
-                    <ui:include src="/templates/components/form-field-textarea.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                         <ui:param name="id" value="motifRejet" />
                         <ui:param name="label" value="Motif du rejet" />
                         <ui:param name="value" value="#{adhesionsBean.adhesionSelectionnee.motifRejet}" />
@@ -396,7 +396,7 @@
                 </div>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgRejet').hide();" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/new.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/new.xhtml
index a75ba81..ed33109 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/new.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/new.xhtml
@@ -21,7 +21,7 @@
             <h:form id="formNouvelleAdhesion">
                 <h5>Créer une Nouvelle Adhésion</h5>
                 
-                <ui:include src="/templates/components/form-section.xhtml">
+                <ui:include src="/templates/components/forms/form-section.xhtml">
                     <ui:param name="title" value="Informations du Membre" />
                     <ui:define name="content">
                         <div class="grid">
@@ -59,7 +59,7 @@
                     </ui:define>
                 </ui:include>
                 
-                <ui:include src="/templates/components/form-section.xhtml">
+                <ui:include src="/templates/components/forms/form-section.xhtml">
                     <ui:param name="title" value="Frais d'Adhésion" />
                     <ui:define name="content">
                         <div class="grid">
@@ -77,12 +77,12 @@
                     </ui:define>
                 </ui:include>
                 
-                <ui:include src="/templates/components/form-section.xhtml">
+                <ui:include src="/templates/components/forms/form-section.xhtml">
                     <ui:param name="title" value="Observations" />
                     <ui:define name="content">
                         <div class="grid">
                             <div class="col-12">
-                                <ui:include src="/templates/components/form-field-textarea.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                                     <ui:param name="id" value="observations" />
                                     <ui:param name="label" value="Observations (optionnel)" />
                                     <ui:param name="value" value="#{adhesionsBean.nouvelleAdhesion.observations}" />
@@ -94,13 +94,13 @@
                 </ui:include>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="action" value="#{navigationBean.goToDashboard}" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-primary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-primary.xhtml">
                         <ui:param name="value" value="Créer l'adhésion" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{adhesionsBean.enregistrerAdhesion}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/paiement.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/paiement.xhtml
index fec23e6..881cf4a 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/paiement.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/paiement.xhtml
@@ -147,7 +147,7 @@
                         <p class="text-500 text-sm">Frais d'adhésion: #{adhesionsBean.adhesionSelectionnee.fraisAdhesionFormatte}</p>
                     </div>
                     
-                    <ui:include src="/templates/components/form-field-select.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-select.xhtml">
                         <ui:param name="id" value="methodePaiement" />
                         <ui:param name="label" value="Méthode de paiement" />
                         <ui:param name="value" value="#{adhesionsBean.adhesionSelectionnee.methodePaiement}" />
@@ -163,14 +163,14 @@
                         </ui:define>
                     </ui:include>
                     
-                    <ui:include src="/templates/components/form-field-text.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-text.xhtml">
                         <ui:param name="id" value="referencePaiement" />
                         <ui:param name="label" value="Référence de paiement" />
                         <ui:param name="value" value="#{adhesionsBean.adhesionSelectionnee.referencePaiement}" />
                         <ui:param name="placeholder" value="Ex: WAVE-123456789" />
                     </ui:include>
                     
-                    <ui:include src="/templates/components/form-field-textarea.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                         <ui:param name="id" value="observationsPaiement" />
                         <ui:param name="label" value="Observations" />
                         <ui:param name="value" value="#{adhesionsBean.adhesionSelectionnee.observations}" />
@@ -179,13 +179,13 @@
                 </div>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgPaiement').hide();" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-success.xhtml">
+                    <ui:include src="/templates/components/buttons/button-success.xhtml">
                         <ui:param name="value" value="Enregistrer" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{adhesionsBean.enregistrerPaiement(adhesionsBean.adhesionSelectionnee.fraisAdhesion, adhesionsBean.adhesionSelectionnee.methodePaiement, adhesionsBean.adhesionSelectionnee.referencePaiement)}" />
@@ -217,7 +217,7 @@
                                      styleClass="w-full" />
                     </div>
                     
-                    <ui:include src="/templates/components/form-field-select.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-select.xhtml">
                         <ui:param name="id" value="methodePaiementPartiel" />
                         <ui:param name="label" value="Méthode de paiement" />
                         <ui:param name="value" value="#{adhesionsBean.adhesionSelectionnee.methodePaiement}" />
@@ -230,7 +230,7 @@
                         </ui:define>
                     </ui:include>
                     
-                    <ui:include src="/templates/components/form-field-text.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-text.xhtml">
                         <ui:param name="id" value="referencePaiementPartiel" />
                         <ui:param name="label" value="Référence de paiement" />
                         <ui:param name="value" value="#{adhesionsBean.adhesionSelectionnee.referencePaiement}" />
@@ -238,13 +238,13 @@
                 </div>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgPaiementPartiel').hide();" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-success.xhtml">
+                    <ui:include src="/templates/components/buttons/button-success.xhtml">
                         <ui:param name="value" value="Enregistrer" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{adhesionsBean.enregistrerPaiement(adhesionsBean.adhesionSelectionnee.montantPaye, adhesionsBean.adhesionSelectionnee.methodePaiement, adhesionsBean.adhesionSelectionnee.referencePaiement)}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/pending.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/pending.xhtml
index 48f5d05..8bee521 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/pending.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/pending.xhtml
@@ -146,13 +146,13 @@
                 </div>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgApprobation').hide();" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-success.xhtml">
+                    <ui:include src="/templates/components/buttons/button-success.xhtml">
                         <ui:param name="value" value="Approuver" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{adhesionsBean.approuverAdhesion}" />
@@ -172,7 +172,7 @@
                         <p class="text-600">#{adhesionsBean.adhesionSelectionnee.numeroReference} - #{adhesionsBean.adhesionSelectionnee.nomMembre}</p>
                     </div>
                     
-                    <ui:include src="/templates/components/form-field-textarea.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                         <ui:param name="id" value="motifRejet" />
                         <ui:param name="label" value="Motif du rejet" />
                         <ui:param name="value" value="#{adhesionsBean.adhesionSelectionnee.motifRejet}" />
@@ -182,7 +182,7 @@
                 </div>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgRejet').hide();" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/renouvellement.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/renouvellement.xhtml
index 67d881d..5099b71 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/renouvellement.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/renouvellement.xhtml
@@ -106,7 +106,7 @@
                     </p:column>
                     
                     <p:column headerText="Actions" style="width:150px">
-                        <ui:include src="/templates/components/button-primary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-primary.xhtml">
                             <ui:param name="value" value="Renouveler" />
                             <ui:param name="icon" value="pi pi-refresh" />
                             <ui:param name="onclick" value="PF('dlgRenouvellement').show(); adhesionsBean.selectionnerAdhesion(adhesion);" />
@@ -136,7 +136,7 @@
                                      styleClass="w-full" />
                     </div>
                     
-                    <ui:include src="/templates/components/form-field-textarea.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                         <ui:param name="id" value="observationsRenouvellement" />
                         <ui:param name="label" value="Observations" />
                         <ui:param name="value" value="#{adhesionsBean.nouvelleAdhesion.observations}" />
@@ -145,13 +145,13 @@
                 </div>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgRenouvellement').hide();" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-primary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-primary.xhtml">
                         <ui:param name="value" value="Créer le renouvellement" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{adhesionsBean.enregistrerAdhesion}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/validation.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/validation.xhtml
index 2fa4c92..b886149 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/validation.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/adhesion/validation.xhtml
@@ -105,7 +105,7 @@
                     
                     <p:column headerText="Actions" style="width:250px">
                         <div class="flex gap-1">
-                            <ui:include src="/templates/components/button-success.xhtml">
+                            <ui:include src="/templates/components/buttons/button-success.xhtml">
                                 <ui:param name="value" value="Approuver" />
                                 <ui:param name="icon" value="pi pi-check" />
                                 <ui:param name="action" value="#{adhesionsBean.selectionnerAdhesion(adhesion)}" />
@@ -143,13 +143,13 @@
                 </div>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgApprobation').hide();" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-success.xhtml">
+                    <ui:include src="/templates/components/buttons/button-success.xhtml">
                         <ui:param name="value" value="Approuver" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{adhesionsBean.approuverAdhesion}" />
@@ -169,7 +169,7 @@
                         <p class="text-600">#{adhesionsBean.adhesionSelectionnee.numeroReference} - #{adhesionsBean.adhesionSelectionnee.nomMembre}</p>
                     </div>
                     
-                    <ui:include src="/templates/components/form-field-textarea.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                         <ui:param name="id" value="motifRejet" />
                         <ui:param name="label" value="Motif du rejet" />
                         <ui:param name="value" value="#{adhesionsBean.adhesionSelectionnee.motifRejet}" />
@@ -179,7 +179,7 @@
                 </div>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgRejet').hide();" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/audit.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/audit.xhtml
index f403e9d..5c01b86 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/audit.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/audit.xhtml
@@ -18,7 +18,7 @@
                     Redirection vers la page principale du journal d'audit...
                 </p>
                 <div class="mt-4">
-                    <ui:include src="/templates/components/button-primary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-primary.xhtml">
                         <ui:param name="value" value="Accéder au Journal d'Audit" />
                         <ui:param name="icon" value="pi pi-arrow-right" />
                         <ui:param name="outcome" value="/pages/admin/audit/journal.xhtml" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/parametres.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/parametres.xhtml
index e5cee81..c29edc4 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/parametres.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/parametres.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActions">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-success.xhtml">
+                        <ui:include src="/templates/components/buttons/button-success.xhtml">
                             <ui:param name="value" value="Enregistrer" />
                             <ui:param name="icon" value="pi pi-check" />
                             <ui:param name="action" value="#{configurationBean.enregistrer}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/roles.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/roles.xhtml
index 111b425..b370c78 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/roles.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/roles.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActions">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-info.xhtml">
+                        <ui:include src="/templates/components/buttons/button-info.xhtml">
                             <ui:param name="value" value="Documentation Keycloak" />
                             <ui:param name="icon" value="pi pi-book" />
                             <ui:param name="outlined" value="true" />
@@ -39,7 +39,7 @@
                     Les rôles disponibles incluent : SUPER_ADMIN, ADMIN_ORG, SECRETAIRE, TRESORIER, MEMBRE, etc.
                 </p>
                 <div class="mt-4">
-                    <ui:include src="/templates/components/button-primary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-primary.xhtml">
                         <ui:param name="value" value="Accéder à Keycloak Admin" />
                         <ui:param name="icon" value="pi pi-external-link" />
                         <ui:param name="onclick" value="window.open('https://security.lions.dev/admin', '_blank');" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/sauvegarde.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/sauvegarde.xhtml
index dcaa673..6bb5a30 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/sauvegarde.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/sauvegarde.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActions">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-success.xhtml">
+                        <ui:include src="/templates/components/buttons/button-success.xhtml">
                             <ui:param name="value" value="Créer une sauvegarde" />
                             <ui:param name="icon" value="pi pi-save" />
                         </ui:include>
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/utilisateurs.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/utilisateurs.xhtml
index 3937c92..1966e10 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/utilisateurs.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/admin/utilisateurs.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActions">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-info.xhtml">
+                        <ui:include src="/templates/components/buttons/button-info.xhtml">
                             <ui:param name="value" value="Documentation Keycloak" />
                             <ui:param name="icon" value="pi pi-book" />
                             <ui:param name="outlined" value="true" />
@@ -39,7 +39,7 @@
                     Pour accéder à la console d'administration Keycloak, veuillez utiliser l'interface dédiée.
                 </p>
                 <div class="mt-4">
-                    <ui:include src="/templates/components/button-primary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-primary.xhtml">
                         <ui:param name="value" value="Accéder à Keycloak Admin" />
                         <ui:param name="icon" value="pi pi-external-link" />
                         <ui:param name="onclick" value="window.open('https://security.lions.dev/admin', '_blank');" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/aide/guide.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/aide/guide.xhtml
index 9d2922a..7881bfe 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/aide/guide.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/aide/guide.xhtml
@@ -26,12 +26,12 @@
                                 </p>
                             </div>
                             <div class="flex gap-2">
-                                <ui:include src="/templates/components/button-secondary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                     <ui:param name="value" value="Version PDF" />
                                     <ui:param name="icon" value="pi pi-file-pdf" />
                                     <ui:param name="outlined" value="true" />
                                 </ui:include>
-                                <ui:include src="/templates/components/button-primary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-primary.xhtml">
                                     <ui:param name="value" value="Rechercher" />
                                     <ui:param name="icon" value="pi pi-search" />
                                     <ui:param name="onclick" value="PF('rechercheDialog').show()" />
@@ -149,13 +149,13 @@
                             <!-- Actions rapides -->
                             <div class="surface-card border-round p-3 mt-3">
                                 <div class="text-center">
-                                    <ui:include src="/templates/components/button-secondary.xhtml">
+                                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                         <ui:param name="value" value="Tout marquer comme lu" />
                                         <ui:param name="icon" value="pi pi-check-square" />
                                         <ui:param name="outlined" value="false" />
                                         <ui:param name="styleClass" value="ui-button-text ui-button-sm w-full" />
                                     </ui:include>
-                                    <ui:include src="/templates/components/button-secondary.xhtml">
+                                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                         <ui:param name="value" value="Réinitialiser progression" />
                                         <ui:param name="icon" value="pi pi-refresh" />
                                         <ui:param name="outlined" value="false" />
@@ -347,7 +347,7 @@
 
                         <!-- Navigation entre sections -->
                         <div class="flex justify-content-between align-items-center mt-6 pt-4 border-top-1 border-200">
-                            <ui:include src="/templates/components/button-secondary.xhtml">
+                            <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                 <ui:param name="value" value="Section précédente" />
                                 <ui:param name="icon" value="pi pi-angle-left" />
                                 <ui:param name="action" value="#{guideBean.sectionPrecedente}" />
@@ -356,13 +356,13 @@
                             </ui:include>
                             
                             <div class="flex gap-2" rendered="#{guideBean.sectionCourante.id != 'default'}">
-                                <ui:include src="/templates/components/button-success.xhtml">
+                                <ui:include src="/templates/components/buttons/button-success.xhtml">
                                     <ui:param name="value" value="Marquer comme lu" />
                                     <ui:param name="icon" value="pi pi-check" />
                                     <ui:param name="action" value="#{guideBean.marquerCommeLu}" />
                                     <ui:param name="rendered" value="#{not guideBean.sectionCourante.lu}" />
                                 </ui:include>
-                                <ui:include src="/templates/components/button-secondary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                     <ui:param name="value" value="Lu" />
                                     <ui:param name="icon" value="pi pi-check" />
                                     <ui:param name="outlined" value="true" />
@@ -371,7 +371,7 @@
                                 </ui:include>
                             </div>
                             
-                            <ui:include src="/templates/components/button-secondary.xhtml">
+                            <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                 <ui:param name="value" value="Section suivante" />
                                 <ui:param name="icon" value="pi pi-angle-right" />
                                 <ui:param name="action" value="#{guideBean.sectionSuivante}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/collect.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/collect.xhtml
index 695504c..9191658 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/collect.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/collect.xhtml
@@ -17,12 +17,12 @@
             <ui:define name="actions">
                 <h:form id="formActionsCotisations">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-success.xhtml">
+                        <ui:include src="/templates/components/buttons/button-success.xhtml">
                             <ui:param name="value" value="Nouvelle cotisation" />
                             <ui:param name="icon" value="pi pi-plus" />
                             <ui:param name="onclick" value="PF('dlgNouvelleCotisation').show();" />
                         </ui:include>
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Exporter" />
                             <ui:param name="icon" value="pi pi-download" />
                             <ui:param name="action" value="#{cotisationsBean.exporterCotisations}" />
@@ -115,14 +115,14 @@
                     </p:toolbarGroup>
                     
                     <p:toolbarGroup align="right">
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Filtres avancés" />
                             <ui:param name="icon" value="pi pi-filter" />
                             <ui:param name="onclick" value="PF('dlgFiltresAvances').show();" />
                             <ui:param name="outlined" value="true" />
                             <ui:param name="styleClass" value="mr-2" />
                         </ui:include>
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Réinitialiser" />
                             <ui:param name="icon" value="pi pi-times" />
                             <ui:param name="action" value="#{cotisationsBean.reinitialiserFiltres}" />
@@ -149,7 +149,7 @@
                         <div class="flex align-items-center justify-content-between">
                             <span>Cotisations (#{cotisationsBean.cotisationsFiltrees.size()})</span>
                             <div class="flex gap-2">
-                                <ui:include src="/templates/components/button-warning.xhtml">
+                                <ui:include src="/templates/components/buttons/button-warning.xhtml">
                                     <ui:param name="value" value="Rappels groupés" />
                                     <ui:param name="icon" value="pi pi-send" />
                                     <ui:param name="action" value="#{cotisationsBean.envoyerRappelsGroupes}" />
@@ -228,12 +228,12 @@
         <!-- Dialog Nouvelle Cotisation -->
         <p:dialog header="Nouvelle Cotisation" widgetVar="dlgNouvelleCotisation" modal="true" width="600" resizable="false">
             <h:form id="formNouvelleCotisation">
-                <ui:include src="/templates/components/form-section.xhtml">
+                <ui:include src="/templates/components/forms/form-section.xhtml">
                     <ui:define name="title">Informations de la cotisation</ui:define>
                     <ui:define name="content">
                         <div class="grid">
                             <div class="col-12">
-                                <ui:include src="/templates/components/form-field-text.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                     <ui:param name="id" value="libelle" />
                                     <ui:param name="label" value="Libellé" />
                                     <ui:param name="value" value="#{cotisationsBean.nouvelleCotisation.libelle}" />
@@ -243,7 +243,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-select.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-select.xhtml">
                                     <ui:param name="id" value="typeCotisation" />
                                     <ui:param name="label" value="Type de cotisation" />
                                     <ui:param name="value" value="#{cotisationsBean.nouvelleCotisation.typeCotisation}" />
@@ -260,7 +260,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-calendar.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                                     <ui:param name="id" value="dateEcheance" />
                                     <ui:param name="label" value="Date d'échéance" />
                                     <ui:param name="value" value="#{cotisationsBean.nouvelleCotisation.dateEcheance}" />
@@ -280,7 +280,7 @@
                             </div>
                             
                             <div class="col-12">
-                                <ui:include src="/templates/components/form-field-textarea.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                                     <ui:param name="id" value="observations" />
                                     <ui:param name="label" value="Observations" />
                                     <ui:param name="value" value="#{cotisationsBean.nouvelleCotisation.observations}" />
@@ -292,13 +292,13 @@
                 </ui:include>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgNouvelleCotisation').hide();" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-success.xhtml">
+                    <ui:include src="/templates/components/buttons/button-success.xhtml">
                         <ui:param name="value" value="Enregistrer" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{cotisationsBean.enregistrerCotisation}" />
@@ -313,14 +313,14 @@
         <p:dialog header="Filtres Avancés" widgetVar="dlgFiltresAvances" modal="true" width="500" resizable="false">
             <h:form id="formFiltresAvances">
                 <div class="ui-fluid">
-                    <ui:include src="/templates/components/form-field-text.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-text.xhtml">
                         <ui:param name="id" value="club" />
                         <ui:param name="label" value="Club/Association" />
                         <ui:param name="value" value="#{cotisationsBean.filtres.club}" />
                         <ui:param name="placeholder" value="Rechercher par club..." />
                     </ui:include>
                     
-                    <ui:include src="/templates/components/form-field-select.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-select.xhtml">
                         <ui:param name="id" value="methodePaiement" />
                         <ui:param name="label" value="Méthode de paiement" />
                         <ui:param name="value" value="#{cotisationsBean.filtres.methodePaiement}" />
@@ -335,14 +335,14 @@
                     
                     <div class="grid">
                         <div class="col-12 md:col-6">
-                            <ui:include src="/templates/components/form-field-calendar.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                                 <ui:param name="id" value="dateDebut" />
                                 <ui:param name="label" value="Date début" />
                                 <ui:param name="value" value="#{cotisationsBean.filtres.dateDebut}" />
                             </ui:include>
                         </div>
                         <div class="col-12 md:col-6">
-                            <ui:include src="/templates/components/form-field-calendar.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                                 <ui:param name="id" value="dateFin" />
                                 <ui:param name="label" value="Date fin" />
                                 <ui:param name="value" value="#{cotisationsBean.filtres.dateFin}" />
@@ -352,13 +352,13 @@
                 </div>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgFiltresAvances').hide();" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-primary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-primary.xhtml">
                         <ui:param name="value" value="Appliquer" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{cotisationsBean.rechercher}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/historique.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/historique.xhtml
index aad26c3..fdf218b 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/historique.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/historique.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActionsHistorique">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Exporter" />
                             <ui:param name="icon" value="pi pi-download" />
                             <ui:param name="action" value="#{cotisationsBean.exporterCotisations}" />
@@ -43,21 +43,21 @@
                 <h5>Filtres de Recherche</h5>
                 <div class="grid">
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-calendar.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                             <ui:param name="id" value="dateDebut" />
                             <ui:param name="label" value="Date début" />
                             <ui:param name="value" value="#{cotisationsBean.filtres.dateDebut}" />
                         </ui:include>
                     </div>
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-calendar.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                             <ui:param name="id" value="dateFin" />
                             <ui:param name="label" value="Date fin" />
                             <ui:param name="value" value="#{cotisationsBean.filtres.dateFin}" />
                         </ui:include>
                     </div>
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-select.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-select.xhtml">
                             <ui:param name="id" value="statutHistorique" />
                             <ui:param name="label" value="Statut" />
                             <ui:param name="value" value="#{cotisationsBean.filtres.statut}" />
@@ -75,13 +75,13 @@
                         <div class="field">
                             <p:outputLabel />
                             <div class="flex gap-2">
-                                <ui:include src="/templates/components/button-primary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-primary.xhtml">
                                     <ui:param name="value" value="Rechercher" />
                                     <ui:param name="icon" value="pi pi-search" />
                                     <ui:param name="action" value="#{cotisationsBean.rechercher}" />
                                     <ui:param name="update" value=":formHistorique" />
                                 </ui:include>
-                                <ui:include src="/templates/components/button-secondary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                     <ui:param name="value" value="Réinitialiser" />
                                     <ui:param name="icon" value="pi pi-times" />
                                     <ui:param name="action" value="#{cotisationsBean.reinitialiserFiltres}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/paiement.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/paiement.xhtml
index 85ca516..cec8511 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/paiement.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/paiement.xhtml
@@ -194,7 +194,7 @@
                         <p class="text-500 text-sm">Montant dû: #{cotisationsBean.cotisationSelectionnee.montantDuFormatte}</p>
                     </div>
                     
-                    <ui:include src="/templates/components/form-field-select.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-select.xhtml">
                         <ui:param name="id" value="methodePaiement" />
                         <ui:param name="label" value="Méthode de paiement" />
                         <ui:param name="value" value="#{cotisationsBean.cotisationSelectionnee.methodePaiement}" />
@@ -210,14 +210,14 @@
                         </ui:define>
                     </ui:include>
                     
-                    <ui:include src="/templates/components/form-field-text.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-text.xhtml">
                         <ui:param name="id" value="referencePaiement" />
                         <ui:param name="label" value="Référence de paiement" />
                         <ui:param name="value" value="#{cotisationsBean.cotisationSelectionnee.referencePaiement}" />
                         <ui:param name="placeholder" value="Ex: WAVE-123456789" />
                     </ui:include>
                     
-                    <ui:include src="/templates/components/form-field-textarea.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                         <ui:param name="id" value="observationsPaiement" />
                         <ui:param name="label" value="Observations" />
                         <ui:param name="value" value="#{cotisationsBean.cotisationSelectionnee.observations}" />
@@ -226,13 +226,13 @@
                 </div>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgPaiement').hide();" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-success.xhtml">
+                    <ui:include src="/templates/components/buttons/button-success.xhtml">
                         <ui:param name="value" value="Enregistrer" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{cotisationsBean.marquerCommePaye}" />
@@ -264,7 +264,7 @@
                                      styleClass="w-full" />
                     </div>
                     
-                    <ui:include src="/templates/components/form-field-select.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-select.xhtml">
                         <ui:param name="id" value="methodePaiementPartiel" />
                         <ui:param name="label" value="Méthode de paiement" />
                         <ui:param name="value" value="#{cotisationsBean.cotisationSelectionnee.methodePaiement}" />
@@ -277,7 +277,7 @@
                         </ui:define>
                     </ui:include>
                     
-                    <ui:include src="/templates/components/form-field-text.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-text.xhtml">
                         <ui:param name="id" value="referencePaiementPartiel" />
                         <ui:param name="label" value="Référence de paiement" />
                         <ui:param name="value" value="#{cotisationsBean.cotisationSelectionnee.referencePaiement}" />
@@ -285,13 +285,13 @@
                 </div>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgPaiementPartiel').hide();" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-success.xhtml">
+                    <ui:include src="/templates/components/buttons/button-success.xhtml">
                         <ui:param name="value" value="Enregistrer" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{cotisationsBean.enregistrerPaiementPartiel(cotisationsBean.cotisationSelectionnee.montantPaye, cotisationsBean.cotisationSelectionnee.methodePaiement, cotisationsBean.cotisationSelectionnee.referencePaiement)}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/rapports.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/rapports.xhtml
index d81ff37..8a02683 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/rapports.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/rapports.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActionsRapports">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-primary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-primary.xhtml">
                             <ui:param name="value" value="Générer rapport" />
                             <ui:param name="icon" value="pi pi-file-pdf" />
                             <ui:param name="action" value="#{cotisationsBean.genererRapportFinancier}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/relances.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/relances.xhtml
index 301b728..7ba0666 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/relances.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/cotisation/relances.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActionsRelances">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-warning.xhtml">
+                        <ui:include src="/templates/components/buttons/button-warning.xhtml">
                             <ui:param name="value" value="Relances groupées" />
                             <ui:param name="icon" value="pi pi-send" />
                             <ui:param name="onclick" value="PF('dlgRelancesGroupes').show();" />
@@ -102,7 +102,7 @@
                 </p:column>
                 
                 <p:column headerText="Actions" style="width:150px">
-                    <ui:include src="/templates/components/button-warning.xhtml">
+                    <ui:include src="/templates/components/buttons/button-warning.xhtml">
                         <ui:param name="value" value="Envoyer" />
                         <ui:param name="icon" value="pi pi-send" />
                         <ui:param name="action" value="#{cotisationsBean.envoyerRappel}" />
@@ -132,7 +132,7 @@
                         <div class="flex align-items-center justify-content-between">
                             <span>Cotisations nécessitant une relance</span>
                             <div class="flex gap-2">
-                                <ui:include src="/templates/components/button-warning.xhtml">
+                                <ui:include src="/templates/components/buttons/button-warning.xhtml">
                                     <ui:param name="value" value="Relancer sélectionnées" />
                                     <ui:param name="icon" value="pi pi-send" />
                                     <ui:param name="action" value="#{cotisationsBean.envoyerRappelsGroupes}" />
@@ -207,13 +207,13 @@
                 </div>
                 
                 <div class="flex justify-content-end gap-2 mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgRelancesGroupes').hide();" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-warning.xhtml">
+                    <ui:include src="/templates/components/buttons/button-warning.xhtml">
                         <ui:param name="value" value="Envoyer les relances" />
                         <ui:param name="icon" value="pi pi-send" />
                         <ui:param name="action" value="#{cotisationsBean.envoyerRappelsGroupes}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/dashboard.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/dashboard.xhtml
index ac8a871..21253b4 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/dashboard.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/dashboard.xhtml
@@ -26,14 +26,14 @@
                             </div>
                         </div>
                         <div class="mt-3 lg:mt-0">
-                            <ui:include src="/templates/components/button-success.xhtml">
+                            <ui:include src="/templates/components/buttons/button-success.xhtml">
                                 <ui:param name="value" value="Rapport mensuel" />
                                 <ui:param name="icon" value="pi pi-download" />
                                 <ui:param name="action" value="#{dashboardBean.generateRapport}" />
                                 <ui:param name="outlined" value="true" />
                                 <ui:param name="styleClass" value="mr-2" />
                             </ui:include>
-                            <ui:include src="/templates/components/button-secondary.xhtml">
+                            <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                 <ui:param name="value" value="Aide" />
                                 <ui:param name="icon" value="pi pi-question-circle" />
                                 <ui:param name="outlined" value="true" />
@@ -430,7 +430,7 @@
                         <h5>Actions rapides</h5>
                         <div class="grid">
                             <div class="col-6">
-                                <ui:include src="/templates/components/button-secondary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                     <ui:param name="value" value="Nouveau membre" />
                                     <ui:param name="icon" value="pi pi-user-plus" />
                                     <ui:param name="action" value="#{dashboardBean.redirectToNewMember}" />
@@ -439,7 +439,7 @@
                                 </ui:include>
                             </div>
                             <div class="col-6">
-                                <ui:include src="/templates/components/button-success.xhtml">
+                                <ui:include src="/templates/components/buttons/button-success.xhtml">
                                     <ui:param name="value" value="Collecter" />
                                     <ui:param name="icon" value="pi pi-wallet" />
                                     <ui:param name="action" value="#{dashboardBean.redirectToCotisation}" />
@@ -448,7 +448,7 @@
                                 </ui:include>
                             </div>
                             <div class="col-6">
-                                <ui:include src="/templates/components/button-info.xhtml">
+                                <ui:include src="/templates/components/buttons/button-info.xhtml">
                                     <ui:param name="value" value="Événement" />
                                     <ui:param name="icon" value="pi pi-calendar-plus" />
                                     <ui:param name="action" value="#{dashboardBean.redirectToEvenement}" />
@@ -457,7 +457,7 @@
                                 </ui:include>
                             </div>
                             <div class="col-6">
-                                <ui:include src="/templates/components/button-warning.xhtml">
+                                <ui:include src="/templates/components/buttons/button-warning.xhtml">
                                     <ui:param name="value" value="Rapport" />
                                     <ui:param name="icon" value="pi pi-chart-bar" />
                                     <ui:param name="action" value="#{dashboardBean.generateRapport}" />
@@ -538,7 +538,7 @@
                                            yearNavigator="true" yearRange="2020:2030">
                                     <p:ajax update="financialSummary" listener="#{dashboardBean.onMoisChange}"/>
                                 </p:calendar>
-                                <ui:include src="/templates/components/button-secondary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                     <ui:param name="value" value="Exporter" />
                                     <ui:param name="icon" value="pi pi-download" />
                                     <ui:param name="action" value="#{dashboardBean.exportFinancialReport}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/calendrier.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/calendrier.xhtml
index 721bb64..e704dbe 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/calendrier.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/calendrier.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActionsCalendrier">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-success.xhtml">
+                        <ui:include src="/templates/components/buttons/button-success.xhtml">
                             <ui:param name="value" value="Nouvel événement" />
                             <ui:param name="icon" value="pi pi-plus" />
                             <ui:param name="outcome" value="/pages/secure/evenement/creation.xhtml" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/creation.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/creation.xhtml
index bc8ada3..b4f8377 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/creation.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/creation.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActionsCreation">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Retour" />
                             <ui:param name="icon" value="pi pi-arrow-left" />
                             <ui:param name="outcome" value="/pages/secure/evenement/gestion.xhtml" />
@@ -31,12 +31,12 @@
         <!-- Formulaire de création -->
         <div class="card">
             <h:form id="formCreation">
-                <ui:include src="/templates/components/form-section.xhtml">
+                <ui:include src="/templates/components/forms/form-section.xhtml">
                     <ui:define name="title">Informations Générales</ui:define>
                     <ui:define name="content">
                         <div class="grid">
                             <div class="col-12">
-                                <ui:include src="/templates/components/form-field-text.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                     <ui:param name="id" value="titre" />
                                     <ui:param name="label" value="Titre de l'événement *" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.titre}" />
@@ -46,7 +46,7 @@
                             </div>
                             
                             <div class="col-12">
-                                <ui:include src="/templates/components/form-field-textarea.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                                     <ui:param name="id" value="description" />
                                     <ui:param name="label" value="Description" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.description}" />
@@ -56,7 +56,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-select.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-select.xhtml">
                                     <ui:param name="id" value="typeEvenement" />
                                     <ui:param name="label" value="Type d'événement *" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.typeEvenement}" />
@@ -77,7 +77,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-select.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-select.xhtml">
                                     <ui:param name="id" value="priorite" />
                                     <ui:param name="label" value="Priorité" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.priorite}" />
@@ -93,12 +93,12 @@
                     </ui:define>
                 </ui:include>
 
-                <ui:include src="/templates/components/form-section.xhtml">
+                <ui:include src="/templates/components/forms/form-section.xhtml">
                     <ui:define name="title">Dates et Horaires</ui:define>
                     <ui:define name="content">
                         <div class="grid">
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-calendar.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                                     <ui:param name="id" value="dateDebut" />
                                     <ui:param name="label" value="Date de début *" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.dateDebut}" />
@@ -107,7 +107,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-calendar.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                                     <ui:param name="id" value="dateFin" />
                                     <ui:param name="label" value="Date de fin" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.dateFin}" />
@@ -137,12 +137,12 @@
                     </ui:define>
                 </ui:include>
 
-                <ui:include src="/templates/components/form-section.xhtml">
+                <ui:include src="/templates/components/forms/form-section.xhtml">
                     <ui:define name="title">Localisation</ui:define>
                     <ui:define name="content">
                         <div class="grid">
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-text.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                     <ui:param name="id" value="lieu" />
                                     <ui:param name="label" value="Lieu *" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.lieu}" />
@@ -152,7 +152,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-text.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                     <ui:param name="id" value="adresse" />
                                     <ui:param name="label" value="Adresse" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.adresse}" />
@@ -161,7 +161,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-text.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                     <ui:param name="id" value="ville" />
                                     <ui:param name="label" value="Ville" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.ville}" />
@@ -169,7 +169,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-text.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                     <ui:param name="id" value="region" />
                                     <ui:param name="label" value="Région" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.region}" />
@@ -179,12 +179,12 @@
                     </ui:define>
                 </ui:include>
 
-                <ui:include src="/templates/components/form-section.xhtml">
+                <ui:include src="/templates/components/forms/form-section.xhtml">
                     <ui:define name="title">Organisation et Participants</ui:define>
                     <ui:define name="content">
                         <div class="grid">
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-text.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                     <ui:param name="id" value="organisateur" />
                                     <ui:param name="label" value="Organisateur" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.organisateur}" />
@@ -192,7 +192,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-number.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-number.xhtml">
                                     <ui:param name="id" value="capaciteMax" />
                                     <ui:param name="label" value="Capacité maximale" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.capaciteMax}" />
@@ -201,7 +201,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-calendar.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                                     <ui:param name="id" value="dateLimiteInscription" />
                                     <ui:param name="label" value="Date limite d'inscription" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.dateLimiteInscription}" />
@@ -209,7 +209,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-boolean.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-boolean.xhtml">
                                     <ui:param name="id" value="inscriptionObligatoire" />
                                     <ui:param name="label" value="Inscription obligatoire" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.inscriptionObligatoire}" />
@@ -219,12 +219,12 @@
                     </ui:define>
                 </ui:include>
 
-                <ui:include src="/templates/components/form-section.xhtml">
+                <ui:include src="/templates/components/forms/form-section.xhtml">
                     <ui:define name="title">Budget</ui:define>
                     <ui:define name="content">
                         <div class="grid">
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-number.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-number.xhtml">
                                     <ui:param name="id" value="budget" />
                                     <ui:param name="label" value="Budget prévu" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.budget}" />
@@ -234,7 +234,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-text.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                     <ui:param name="id" value="codeDevise" />
                                     <ui:param name="label" value="Devise" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.codeDevise}" />
@@ -247,13 +247,13 @@
 
                 <!-- Actions -->
                 <div class="flex justify-content-end gap-2 mt-4">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="outcome" value="/pages/secure/evenement/gestion.xhtml" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-success.xhtml">
+                    <ui:include src="/templates/components/buttons/button-success.xhtml">
                         <ui:param name="value" value="Créer l'événement" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{evenementsBean.creerEvenement}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/gestion.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/gestion.xhtml
index d92967c..522975b 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/gestion.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/gestion.xhtml
@@ -17,12 +17,12 @@
             <ui:define name="actions">
                 <h:form id="formActionsEvenements">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-success.xhtml">
+                        <ui:include src="/templates/components/buttons/button-success.xhtml">
                             <ui:param name="value" value="Nouvel événement" />
                             <ui:param name="icon" value="pi pi-plus" />
                             <ui:param name="onclick" value="PF('dlgNouvelEvenement').show();" />
                         </ui:include>
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Exporter" />
                             <ui:param name="icon" value="pi pi-download" />
                             <ui:param name="outlined" value="true" />
@@ -81,7 +81,7 @@
                 <p:toolbar>
                     <p:toolbarGroup>
                         <div class="flex align-items-center gap-2 flex-wrap">
-                            <ui:include src="/templates/components/form-field-search-text.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-search-text.xhtml">
                                 <ui:param name="id" value="searchTitre" />
                                 <ui:param name="value" value="#{evenementsBean.filtres.titre}" />
                                 <ui:param name="placeholder" value="Rechercher par titre..." />
@@ -223,11 +223,11 @@
                      modal="true" 
                      resizable="false"
                      style="width: 90vw; max-width: 800px;">
-                <ui:include src="/templates/components/form-section.xhtml">
+                <ui:include src="/templates/components/forms/form-section.xhtml">
                     <ui:define name="content">
                         <div class="grid">
                             <div class="col-12">
-                                <ui:include src="/templates/components/form-field-text.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                     <ui:param name="id" value="titre" />
                                     <ui:param name="label" value="Titre *" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.titre}" />
@@ -236,7 +236,7 @@
                             </div>
                             
                             <div class="col-12">
-                                <ui:include src="/templates/components/form-field-textarea.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                                     <ui:param name="id" value="description" />
                                     <ui:param name="label" value="Description" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.description}" />
@@ -245,7 +245,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-select.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-select.xhtml">
                                     <ui:param name="id" value="typeEvenement" />
                                     <ui:param name="label" value="Type d'événement *" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.typeEvenement}" />
@@ -265,7 +265,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-select.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-select.xhtml">
                                     <ui:param name="id" value="priorite" />
                                     <ui:param name="label" value="Priorité" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.priorite}" />
@@ -279,7 +279,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-calendar.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                                     <ui:param name="id" value="dateDebut" />
                                     <ui:param name="label" value="Date de début *" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.dateDebut}" />
@@ -288,7 +288,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-calendar.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                                     <ui:param name="id" value="dateFin" />
                                     <ui:param name="label" value="Date de fin" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.dateFin}" />
@@ -296,7 +296,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-text.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                     <ui:param name="id" value="lieu" />
                                     <ui:param name="label" value="Lieu *" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.lieu}" />
@@ -305,7 +305,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-number.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-number.xhtml">
                                     <ui:param name="id" value="capaciteMax" />
                                     <ui:param name="label" value="Capacité maximale" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.capaciteMax}" />
@@ -314,7 +314,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-number.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-number.xhtml">
                                     <ui:param name="id" value="budget" />
                                     <ui:param name="label" value="Budget prévu" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.budget}" />
@@ -324,7 +324,7 @@
                             </div>
                             
                             <div class="col-12 md:col-6">
-                                <ui:include src="/templates/components/form-field-text.xhtml">
+                                <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                     <ui:param name="id" value="organisateur" />
                                     <ui:param name="label" value="Organisateur" />
                                     <ui:param name="value" value="#{evenementsBean.nouvelEvenement.organisateur}" />
@@ -430,7 +430,7 @@
                      style="width: 90vw; max-width: 800px;">
                 <div class="grid" rendered="#{evenementsBean.evenementSelectionne != null}">
                     <div class="col-12">
-                        <ui:include src="/templates/components/form-field-text.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-text.xhtml">
                             <ui:param name="id" value="titreModif" />
                             <ui:param name="label" value="Titre *" />
                             <ui:param name="value" value="#{evenementsBean.evenementSelectionne.titre}" />
@@ -439,7 +439,7 @@
                     </div>
                     
                     <div class="col-12">
-                        <ui:include src="/templates/components/form-field-textarea.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                             <ui:param name="id" value="descriptionModif" />
                             <ui:param name="label" value="Description" />
                             <ui:param name="value" value="#{evenementsBean.evenementSelectionne.description}" />
@@ -448,7 +448,7 @@
                     </div>
                     
                     <div class="col-12 md:col-6">
-                        <ui:include src="/templates/components/form-field-select.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-select.xhtml">
                             <ui:param name="id" value="statutModif" />
                             <ui:param name="label" value="Statut" />
                             <ui:param name="value" value="#{evenementsBean.evenementSelectionne.statut}" />
@@ -464,7 +464,7 @@
                     </div>
                     
                     <div class="col-12 md:col-6">
-                        <ui:include src="/templates/components/form-field-calendar.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                             <ui:param name="id" value="dateDebutModif" />
                             <ui:param name="label" value="Date de début *" />
                             <ui:param name="value" value="#{evenementsBean.evenementSelectionne.dateDebut}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/participants.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/participants.xhtml
index b557a03..31d549f 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/participants.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/evenement/participants.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActionsParticipants">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Retour" />
                             <ui:param name="icon" value="pi pi-arrow-left" />
                             <ui:param name="outcome" value="/pages/secure/evenement/gestion.xhtml" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/inscription.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/inscription.xhtml
index a5eb830..3fa2267 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/inscription.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/inscription.xhtml
@@ -27,7 +27,7 @@
             
             <div class="grid">
                 <div class="col-12 md:col-6">
-                    <ui:decorate template="/templates/components/form-section.xhtml">
+                    <ui:decorate template="/templates/components/forms/form-section.xhtml">
                         <ui:param name="title" value="Informations personnelles" />
                         <ui:param name="fluid" value="true" />
                         <ui:define name="content">
@@ -135,7 +135,7 @@
                         </ui:define>
                     </ui:decorate>
 
-                    <ui:decorate template="/templates/components/form-section.xhtml">
+                    <ui:decorate template="/templates/components/forms/form-section.xhtml">
                         <ui:param name="title" value="Contact d'urgence" />
                         <ui:param name="fluid" value="true" />
                         <ui:define name="content">
@@ -164,7 +164,7 @@
                         </ui:define>
                     </ui:decorate>
 
-                    <ui:decorate template="/templates/components/form-section.xhtml">
+                    <ui:decorate template="/templates/components/forms/form-section.xhtml">
                         <ui:param name="title" value="Documents justificatifs" />
                         <ui:define name="content">
                             <p:fileUpload listener="#{membreInscriptionBean.handleFileUpload}" 
@@ -210,7 +210,7 @@
                 </div>
                 
                 <div class="col-12 md:col-6">
-                    <ui:decorate template="/templates/components/form-section.xhtml">
+                    <ui:decorate template="/templates/components/forms/form-section.xhtml">
                         <ui:param name="title" value="Coordonnées" />
                         <ui:param name="fluid" value="true" />
                         <ui:define name="content">
@@ -261,7 +261,7 @@
                         </ui:define>
                     </ui:decorate>
 
-                    <ui:decorate template="/templates/components/form-section.xhtml">
+                    <ui:decorate template="/templates/components/forms/form-section.xhtml">
                         <ui:param name="title" value="Adhésion" />
                         <ui:param name="fluid" value="true" />
                         <ui:define name="content">
@@ -310,7 +310,7 @@
                 </div>
                 
                 <div class="col-12">
-                    <ui:decorate template="/templates/components/form-section.xhtml">
+                    <ui:decorate template="/templates/components/forms/form-section.xhtml">
                         <ui:param name="title" value="Informations complémentaires" />
                         <ui:define name="content">
                             <div class="ui-fluid formgrid grid">
@@ -388,7 +388,7 @@
                         styleClass="ui-button-success"
                         title="Soumettre l'inscription" />
                     
-                    <ui:include src="/templates/components/button-info.xhtml">
+                    <ui:include src="/templates/components/buttons/button-info.xhtml">
                         <ui:param name="value" value="💾 Enregistrer brouillon" />
                         <ui:param name="icon" value="pi pi-save" />
                         <ui:param name="action" value="#{membreInscriptionBean.enregistrerBrouillon}" />
@@ -396,14 +396,14 @@
                         <ui:param name="outlined" value="true" />
                     </ui:include>
                     
-                    <ui:include src="/templates/components/button-warning.xhtml">
+                    <ui:include src="/templates/components/buttons/button-warning.xhtml">
                         <ui:param name="value" value="🔄 Réinitialiser" />
                         <ui:param name="icon" value="pi pi-refresh" />
                         <ui:param name="onclick" value="removePhoto(); return confirm('Êtes-vous sûr de vouloir réinitialiser le formulaire ?');" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
                     
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="❌ Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="action" value="#{membreInscriptionBean.annuler}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/liste.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/liste.xhtml
index 5e79b1f..1e1f429 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/liste.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/liste.xhtml
@@ -17,12 +17,12 @@
             <ui:define name="actions">
                 <h:form id="formActionsMembres">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-success.xhtml">
+                        <ui:include src="/templates/components/buttons/button-success.xhtml">
                             <ui:param name="value" value="Nouveau membre" />
                             <ui:param name="icon" value="pi pi-user-plus" />
                             <ui:param name="outcome" value="/pages/secure/membre/inscription" />
                         </ui:include>
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Import/Export" />
                             <ui:param name="icon" value="pi pi-upload" />
                             <ui:param name="onclick" value="PF('dlgImportExport').show();" />
@@ -89,7 +89,7 @@
                     </p:toolbarGroup>
                     
                     <p:toolbarGroup align="right">
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Filtres avancés" />
                             <ui:param name="icon" value="pi pi-filter" />
                             <ui:param name="onclick" value="PF('dlgFiltresAvances').show();" />
@@ -242,14 +242,14 @@
                         </span>
                     </div>
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-info.xhtml">
+                        <ui:include src="/templates/components/buttons/button-info.xhtml">
                             <ui:param name="value" value="Envoyer message" />
                             <ui:param name="icon" value="pi pi-envelope" />
                             <ui:param name="onclick" value="PF('dlgMessageGroupe').show();" />
                             <ui:param name="outlined" value="true" />
                             <ui:param name="disabled" value="#{empty membreListeBean.selectedMembres}" />
                         </ui:include>
-                        <ui:include src="/templates/components/button-warning.xhtml">
+                        <ui:include src="/templates/components/buttons/button-warning.xhtml">
                             <ui:param name="value" value="Rappel cotisations" />
                             <ui:param name="icon" value="pi pi-bell" />
                             <ui:param name="action" value="#{membreListeBean.rappelCotisationsGroupe}" />
@@ -257,14 +257,14 @@
                             <ui:param name="outlined" value="true" />
                             <ui:param name="disabled" value="#{empty membreListeBean.selectedMembres}" />
                         </ui:include>
-                        <ui:include src="/templates/components/button-success.xhtml">
+                        <ui:include src="/templates/components/buttons/button-success.xhtml">
                             <ui:param name="value" value="Exporter sélection" />
                             <ui:param name="icon" value="pi pi-file-excel" />
                             <ui:param name="action" value="#{membreListeBean.exporterSelection}" />
                             <ui:param name="outlined" value="true" />
                             <ui:param name="disabled" value="#{empty membreListeBean.selectedMembres}" />
                         </ui:include>
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Modifier en lot" />
                             <ui:param name="icon" value="pi pi-pencil" />
                             <ui:param name="onclick" value="PF('dlgModificationLot').show();" />
@@ -312,13 +312,13 @@
                         </div>
                         
                         <div class="col-12 md:col-6">
-                            <ui:include src="/templates/components/form-field-calendar.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                                 <ui:param name="id" value="dateAdhesionDebut" />
                                 <ui:param name="label" value="Adhésion après le" />
                                 <ui:param name="value" value="#{membreListeBean.dateAdhesionDebut}" />
                             </ui:include>
                             
-                            <ui:include src="/templates/components/form-field-calendar.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                                 <ui:param name="id" value="dateAdhesionFin" />
                                 <ui:param name="label" value="Adhésion avant le" />
                                 <ui:param name="value" value="#{membreListeBean.dateAdhesionFin}" />
@@ -342,21 +342,21 @@
                 </div>
                 
                 <div class="flex gap-2 mt-3">
-                    <ui:include src="/templates/components/button-info.xhtml">
+                    <ui:include src="/templates/components/buttons/button-info.xhtml">
                         <ui:param name="value" value="Appliquer" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{membreListeBean.appliquerFiltresAvances}" />
                         <ui:param name="update" value=":formMembres:dtMembres" />
                         <ui:param name="onclick" value="PF('dlgFiltresAvances').hide();" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Réinitialiser" />
                         <ui:param name="icon" value="pi pi-refresh" />
                         <ui:param name="action" value="#{membreListeBean.reinitialiserFiltres}" />
                         <ui:param name="update" value="@form :formMembres:dtMembres" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgFiltresAvances').hide();" />
@@ -371,7 +371,7 @@
         <p:dialog header="Envoyer un Message Groupé" widgetVar="dlgMessageGroupe" modal="true" width="600">
             <h:form id="formMessageGroupe">
                 <div class="ui-fluid">
-                    <ui:include src="/templates/components/form-field-text.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-text.xhtml">
                         <ui:param name="id" value="sujetMessage" />
                         <ui:param name="label" value="Sujet" />
                         <ui:param name="value" value="#{membreListeBean.sujetMessage}" />
@@ -379,7 +379,7 @@
                         <ui:param name="placeholder" value="Objet du message" />
                     </ui:include>
                     
-                    <ui:include src="/templates/components/form-field-textarea.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                         <ui:param name="id" value="contenuMessage" />
                         <ui:param name="label" value="Message" />
                         <ui:param name="value" value="#{membreListeBean.contenuMessage}" />
@@ -405,14 +405,14 @@
                 </div>
                 
                 <div class="flex gap-2 mt-3">
-                    <ui:include src="/templates/components/button-info.xhtml">
+                    <ui:include src="/templates/components/buttons/button-info.xhtml">
                         <ui:param name="value" value="Envoyer" />
                         <ui:param name="icon" value="pi pi-send" />
                         <ui:param name="action" value="#{membreListeBean.envoyerMessageGroupe}" />
                         <ui:param name="update" value="@form" />
                         <ui:param name="onclick" value="if(!args.validationFailed) PF('dlgMessageGroupe').hide();" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgMessageGroupe').hide();" />
@@ -448,13 +448,13 @@
                         </div>
                         
                         <div class="flex gap-2 mt-3">
-                            <ui:include src="/templates/components/button-success.xhtml">
+                            <ui:include src="/templates/components/buttons/button-success.xhtml">
                                 <ui:param name="value" value="Importer" />
                                 <ui:param name="icon" value="pi pi-upload" />
                                 <ui:param name="action" value="#{membreListeBean.importerMembres}" />
                                 <ui:param name="update" value="@form :formMembres" />
                             </ui:include>
-                            <ui:include src="/templates/components/button-info.xhtml">
+                            <ui:include src="/templates/components/buttons/button-info.xhtml">
                                 <ui:param name="value" value="Télécharger modèle" />
                                 <ui:param name="icon" value="pi pi-download" />
                                 <ui:param name="action" value="#{membreListeBean.telechargerModele}" />
@@ -493,7 +493,7 @@
                         </div>
                         
                         <div class="flex gap-2 mt-3">
-                            <ui:include src="/templates/components/button-success.xhtml">
+                            <ui:include src="/templates/components/buttons/button-success.xhtml">
                                 <ui:param name="value" value="Exporter" />
                                 <ui:param name="icon" value="pi pi-download" />
                                 <ui:param name="action" value="#{membreListeBean.exporterMembres}" />
@@ -503,7 +503,7 @@
                 </p:tabView>
                 
                 <div class="flex justify-content-end mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Fermer" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgImportExport').hide();" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/profil.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/profil.xhtml
index fef1a93..a4fb5ca 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/profil.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/profil.xhtml
@@ -85,25 +85,25 @@
                         <!-- Actions principales -->
                         <h:form id="formActionsPrincipales">
                             <div class="flex flex-column gap-2">
-                                <ui:include src="/templates/components/button-warning.xhtml">
+                                <ui:include src="/templates/components/buttons/button-warning.xhtml">
                                     <ui:param name="value" value="Modifier" />
                                     <ui:param name="icon" value="pi pi-pencil" />
                                     <ui:param name="onclick" value="PF('dlgModifierProfil').show();" />
                                     <ui:param name="outlined" value="true" />
                                 </ui:include>
-                                <ui:include src="/templates/components/button-success.xhtml">
+                                <ui:include src="/templates/components/buttons/button-success.xhtml">
                                     <ui:param name="value" value="Cotisations" />
                                     <ui:param name="icon" value="pi pi-dollar" />
                                     <ui:param name="action" value="#{membreProfilBean.gererCotisations}" />
                                     <ui:param name="outlined" value="true" />
                                 </ui:include>
-                                <ui:include src="/templates/components/button-info.xhtml">
+                                <ui:include src="/templates/components/buttons/button-info.xhtml">
                                     <ui:param name="value" value="Contacter" />
                                     <ui:param name="icon" value="pi pi-envelope" />
                                     <ui:param name="onclick" value="PF('dlgContacter').show();" />
                                     <ui:param name="outlined" value="true" />
                                 </ui:include>
-                                <ui:include src="/templates/components/button-secondary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                                     <ui:param name="value" value="Actions" />
                                     <ui:param name="icon" value="pi pi-cog" />
                                     <ui:param name="onclick" value="PF('dlgActions').show();" />
@@ -290,12 +290,12 @@
 
                             <h:form id="formCotisationsActions">
                                 <div class="flex gap-2">
-                                    <ui:include src="/templates/components/button-success.xhtml">
+                                    <ui:include src="/templates/components/buttons/button-success.xhtml">
                                         <ui:param name="value" value="Nouveau paiement" />
                                         <ui:param name="icon" value="pi pi-plus" />
                                         <ui:param name="onclick" value="PF('dlgNouveauPaiement').show();" />
                                     </ui:include>
-                                    <ui:include src="/templates/components/button-warning.xhtml">
+                                    <ui:include src="/templates/components/buttons/button-warning.xhtml">
                                         <ui:param name="value" value="Envoyer rappel" />
                                         <ui:param name="icon" value="pi pi-bell" />
                                         <ui:param name="action" value="#{membreProfilBean.envoyerRappelCotisation}" />
@@ -441,7 +441,7 @@
                             </p:dataTable>
 
                             <h:form id="formNouvelleDemande">
-                                <ui:include src="/templates/components/button-success.xhtml">
+                                <ui:include src="/templates/components/buttons/button-success.xhtml">
                                     <ui:param name="value" value="Nouvelle demande" />
                                     <ui:param name="icon" value="pi pi-plus" />
                                     <ui:param name="onclick" value="PF('dlgNouvelleDemande').show();" />
@@ -497,28 +497,28 @@
                 <div class="ui-fluid">
                     <div class="grid">
                         <div class="col-12 md:col-6">
-                            <ui:include src="/templates/components/form-field-text.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                 <ui:param name="id" value="editPrenom" />
                                 <ui:param name="label" value="Prénom" />
                                 <ui:param name="value" value="#{membreProfilBean.membreEdit.prenom}" />
                                 <ui:param name="required" value="true" />
                             </ui:include>
                             
-                            <ui:include src="/templates/components/form-field-text.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                 <ui:param name="id" value="editNom" />
                                 <ui:param name="label" value="Nom" />
                                 <ui:param name="value" value="#{membreProfilBean.membreEdit.nom}" />
                                 <ui:param name="required" value="true" />
                             </ui:include>
                             
-                            <ui:include src="/templates/components/form-field-text.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                 <ui:param name="id" value="editEmail" />
                                 <ui:param name="label" value="Email" />
                                 <ui:param name="value" value="#{membreProfilBean.membreEdit.email}" />
                                 <ui:param name="required" value="true" />
                             </ui:include>
                             
-                            <ui:include src="/templates/components/form-field-text.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                 <ui:param name="id" value="editTelephone" />
                                 <ui:param name="label" value="Téléphone" />
                                 <ui:param name="value" value="#{membreProfilBean.membreEdit.telephone}" />
@@ -527,19 +527,19 @@
                         </div>
                         
                         <div class="col-12 md:col-6">
-                            <ui:include src="/templates/components/form-field-calendar.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                                 <ui:param name="id" value="editDateNaissance" />
                                 <ui:param name="label" value="Date de naissance" />
                                 <ui:param name="value" value="#{membreProfilBean.membreEdit.dateNaissance}" />
                             </ui:include>
                             
-                            <ui:include src="/templates/components/form-field-text.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                 <ui:param name="id" value="editProfession" />
                                 <ui:param name="label" value="Profession" />
                                 <ui:param name="value" value="#{membreProfilBean.membreEdit.profession}" />
                             </ui:include>
                             
-                            <ui:include src="/templates/components/form-field-textarea.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                                 <ui:param name="id" value="editAdresse" />
                                 <ui:param name="label" value="Adresse" />
                                 <ui:param name="value" value="#{membreProfilBean.membreEdit.adresse}" />
@@ -550,14 +550,14 @@
                 </div>
                 
                 <div class="flex gap-2 mt-3">
-                    <ui:include src="/templates/components/button-success.xhtml">
+                    <ui:include src="/templates/components/buttons/button-success.xhtml">
                         <ui:param name="value" value="Enregistrer" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{membreProfilBean.sauvegarderModifications}" />
                         <ui:param name="update" value="@form" />
                         <ui:param name="onclick" value="if(!args.validationFailed) PF('dlgModifierProfil').hide();" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgModifierProfil').hide();" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/recherche.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/recherche.xhtml
index 467bc2c..6f647ed 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/recherche.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/membre/recherche.xhtml
@@ -17,13 +17,13 @@
             <ui:define name="actions">
                 <h:form id="formActionsEntete">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-info.xhtml">
+                        <ui:include src="/templates/components/buttons/button-info.xhtml">
                             <ui:param name="value" value="Recherches sauvegardées" />
                             <ui:param name="icon" value="pi pi-bookmark" />
                             <ui:param name="onclick" value="PF('dlgRecherchesSauvegardees').show();" />
                             <ui:param name="outlined" value="true" />
                         </ui:include>
-                        <ui:include src="/templates/components/button-success.xhtml">
+                        <ui:include src="/templates/components/buttons/button-success.xhtml">
                             <ui:param name="value" value="Nouvelle recherche" />
                             <ui:param name="icon" value="pi pi-plus" />
                             <ui:param name="action" value="#{membreRechercheBean.nouvelleRecherche}" />
@@ -79,7 +79,7 @@
                         <div class="ui-fluid">
                             <div class="grid">
                                 <div class="col-12 md:col-4">
-                                    <ui:include src="/templates/components/form-field-search-text.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-search-text.xhtml">
                                         <ui:param name="id" value="searchNom" />
                                         <ui:param name="label" value="Nom" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.nom}" />
@@ -88,7 +88,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-4">
-                                    <ui:include src="/templates/components/form-field-search-text.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-search-text.xhtml">
                                         <ui:param name="id" value="searchPrenom" />
                                         <ui:param name="label" value="Prénom" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.prenom}" />
@@ -97,7 +97,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-4">
-                                    <ui:include src="/templates/components/form-field-search-text.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-search-text.xhtml">
                                         <ui:param name="id" value="searchEmail" />
                                         <ui:param name="label" value="Email" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.email}" />
@@ -106,7 +106,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-4">
-                                    <ui:include src="/templates/components/form-field-search-text.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-search-text.xhtml">
                                         <ui:param name="id" value="searchTelephone" />
                                         <ui:param name="label" value="Téléphone" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.telephone}" />
@@ -115,7 +115,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-4">
-                                    <ui:include src="/templates/components/form-field-search-text.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-search-text.xhtml">
                                         <ui:param name="id" value="searchNumeroMembre" />
                                         <ui:param name="label" value="Numéro membre" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.numeroMembre}" />
@@ -124,7 +124,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-4">
-                                    <ui:include src="/templates/components/form-field-autocomplete.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-autocomplete.xhtml">
                                         <ui:param name="id" value="searchProfession" />
                                         <ui:param name="label" value="Profession" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.profession}" />
@@ -141,7 +141,7 @@
                         <div class="ui-fluid">
                             <div class="grid">
                                 <div class="col-12 md:col-3">
-                                    <ui:include src="/templates/components/form-field-checkbox-menu.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-checkbox-menu.xhtml">
                                         <ui:param name="id" value="searchStatut" />
                                         <ui:param name="label" value="Statut" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.statuts}" />
@@ -155,7 +155,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-3">
-                                    <ui:include src="/templates/components/form-field-checkbox-menu.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-checkbox-menu.xhtml">
                                         <ui:param name="id" value="searchTypeMembre" />
                                         <ui:param name="label" value="Type de membre" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.typesMembre}" />
@@ -183,7 +183,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-3">
-                                    <ui:include src="/templates/components/form-field-checkbox-menu.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-checkbox-menu.xhtml">
                                         <ui:param name="id" value="searchCotisationStatut" />
                                         <ui:param name="label" value="Statut cotisations" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.statutsCotisation}" />
@@ -198,7 +198,7 @@
                             
                             <div class="grid">
                                 <div class="col-12 md:col-6">
-                                    <ui:include src="/templates/components/form-field-calendar.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                                         <ui:param name="id" value="adhesionDateDebut" />
                                         <ui:param name="label" value="Adhésion après le" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.dateAdhesionDebut}" />
@@ -206,7 +206,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-6">
-                                    <ui:include src="/templates/components/form-field-calendar.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                                         <ui:param name="id" value="adhesionDateFin" />
                                         <ui:param name="label" value="Adhésion avant le" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.dateAdhesionFin}" />
@@ -221,7 +221,7 @@
                         <div class="ui-fluid">
                             <div class="grid">
                                 <div class="col-12 md:col-3">
-                                    <ui:include src="/templates/components/form-field-checkbox-menu.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-checkbox-menu.xhtml">
                                         <ui:param name="id" value="searchGenre" />
                                         <ui:param name="label" value="Genre" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.genres}" />
@@ -233,7 +233,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-3">
-                                    <ui:include src="/templates/components/form-field-number.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-number.xhtml">
                                         <ui:param name="id" value="ageMin" />
                                         <ui:param name="label" value="Âge minimum" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.ageMin}" />
@@ -242,7 +242,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-3">
-                                    <ui:include src="/templates/components/form-field-number.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-number.xhtml">
                                         <ui:param name="id" value="ageMax" />
                                         <ui:param name="label" value="Âge maximum" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.ageMax}" />
@@ -251,7 +251,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-3">
-                                    <ui:include src="/templates/components/form-field-autocomplete.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-autocomplete.xhtml">
                                         <ui:param name="id" value="searchVille" />
                                         <ui:param name="label" value="Ville" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.ville}" />
@@ -268,7 +268,7 @@
                         <div class="ui-fluid">
                             <div class="grid">
                                 <div class="col-12 md:col-4">
-                                    <ui:include src="/templates/components/form-field-number.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-number.xhtml">
                                         <ui:param name="id" value="tauxParticipationMin" />
                                         <ui:param name="label" value="Taux participation min (%)" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.tauxParticipationMin}" />
@@ -278,7 +278,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-4">
-                                    <ui:include src="/templates/components/form-field-number.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-number.xhtml">
                                         <ui:param name="id" value="evenementsMin" />
                                         <ui:param name="label" value="Événements min (cette année)" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.evenementsMin}" />
@@ -286,7 +286,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-4">
-                                    <ui:include src="/templates/components/form-field-number.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-number.xhtml">
                                         <ui:param name="id" value="cotisationsMin" />
                                         <ui:param name="label" value="Cotisations payées min" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.cotisationsMin}" />
@@ -294,7 +294,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-6">
-                                    <ui:include src="/templates/components/form-field-boolean.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-boolean.xhtml">
                                         <ui:param name="id" value="aDesEnfants" />
                                         <ui:param name="label" value=" A des enfants déclarés" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.aDesEnfants}" />
@@ -302,7 +302,7 @@
                                 </div>
                                 
                                 <div class="col-12 md:col-6">
-                                    <ui:include src="/templates/components/form-field-boolean.xhtml">
+                                    <ui:include src="/templates/components/forms/form-field-boolean.xhtml">
                                         <ui:param name="id" value="aRecuAides" />
                                         <ui:param name="label" value=" A reçu des aides" />
                                         <ui:param name="value" value="#{membreRechercheBean.filtres.aRecuAides}" />
@@ -315,26 +315,26 @@
 
                 <!-- Actions de recherche -->
                 <div class="flex gap-2 mt-4">
-                    <ui:include src="/templates/components/button-success.xhtml">
+                    <ui:include src="/templates/components/buttons/button-success.xhtml">
                         <ui:param name="value" value="Rechercher" />
                         <ui:param name="icon" value="pi pi-search" />
                         <ui:param name="action" value="#{membreRechercheBean.effectuerRecherche}" />
                         <ui:param name="update" value=":formResultats:dtResultats @(.search-summary)" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Réinitialiser" />
                         <ui:param name="icon" value="pi pi-refresh" />
                         <ui:param name="action" value="#{membreRechercheBean.reinitialiserFiltres}" />
                         <ui:param name="update" value="@form :formResultats:dtResultats @(.search-summary)" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-info.xhtml">
+                    <ui:include src="/templates/components/buttons/button-info.xhtml">
                         <ui:param name="value" value="Sauvegarder recherche" />
                         <ui:param name="icon" value="pi pi-bookmark" />
                         <ui:param name="onclick" value="PF('dlgSauvegarderRecherche').show();" />
                         <ui:param name="outlined" value="true" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-warning.xhtml">
+                    <ui:include src="/templates/components/buttons/button-warning.xhtml">
                         <ui:param name="value" value="Exporter résultats" />
                         <ui:param name="icon" value="pi pi-download" />
                         <ui:param name="onclick" value="PF('dlgExporterResultats').show();" />
@@ -511,21 +511,21 @@
                         <span class="text-600">#{membreRechercheBean.selectedMembres.size()} membre(s) sélectionné(s)</span>
                     </div>
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-info.xhtml">
+                        <ui:include src="/templates/components/buttons/button-info.xhtml">
                             <ui:param name="value" value="Envoyer message groupé" />
                             <ui:param name="icon" value="pi pi-envelope" />
                             <ui:param name="onclick" value="PF('dlgMessageGroupe').show();" />
                             <ui:param name="outlined" value="true" />
                             <ui:param name="disabled" value="#{empty membreRechercheBean.selectedMembres}" />
                         </ui:include>
-                        <ui:include src="/templates/components/button-success.xhtml">
+                        <ui:include src="/templates/components/buttons/button-success.xhtml">
                             <ui:param name="value" value="Créer groupe de travail" />
                             <ui:param name="icon" value="pi pi-users" />
                             <ui:param name="onclick" value="PF('dlgCreerGroupe').show();" />
                             <ui:param name="outlined" value="true" />
                             <ui:param name="disabled" value="#{empty membreRechercheBean.selectedMembres}" />
                         </ui:include>
-                        <ui:include src="/templates/components/button-warning.xhtml">
+                        <ui:include src="/templates/components/buttons/button-warning.xhtml">
                             <ui:param name="value" value="Exporter sélection" />
                             <ui:param name="icon" value="pi pi-file-excel" />
                             <ui:param name="action" value="#{membreRechercheBean.exporterSelection}" />
@@ -541,7 +541,7 @@
         <p:dialog header="Sauvegarder la Recherche" widgetVar="dlgSauvegarderRecherche" modal="true" width="500">
             <h:form id="formSauvegarderRecherche">
                 <div class="ui-fluid">
-                    <ui:include src="/templates/components/form-field-text.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-text.xhtml">
                         <ui:param name="id" value="nomRecherche" />
                         <ui:param name="label" value="Nom de la recherche" />
                         <ui:param name="value" value="#{membreRechercheBean.nouvelleRechercheSauvegardee.nom}" />
@@ -549,7 +549,7 @@
                         <ui:param name="placeholder" value="Ex: Membres actifs 2024" />
                     </ui:include>
                     
-                    <ui:include src="/templates/components/form-field-textarea.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                         <ui:param name="id" value="descriptionRecherche" />
                         <ui:param name="label" value="Description" />
                         <ui:param name="value" value="#{membreRechercheBean.nouvelleRechercheSauvegardee.description}" />
@@ -568,14 +568,14 @@
                 </div>
                 
                 <div class="flex gap-2 mt-3">
-                    <ui:include src="/templates/components/button-success.xhtml">
+                    <ui:include src="/templates/components/buttons/button-success.xhtml">
                         <ui:param name="value" value="Sauvegarder" />
                         <ui:param name="icon" value="pi pi-check" />
                         <ui:param name="action" value="#{membreRechercheBean.sauvegarderRecherche}" />
                         <ui:param name="update" value="@form" />
                         <ui:param name="onclick" value="if(!args.validationFailed) PF('dlgSauvegarderRecherche').hide();" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgSauvegarderRecherche').hide();" />
@@ -634,7 +634,7 @@
                 </p:dataTable>
                 
                 <div class="flex justify-content-end mt-3">
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Fermer" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgRecherchesSauvegardees').hide();" />
@@ -647,7 +647,7 @@
         <p:dialog header="Envoyer un Message Groupé" widgetVar="dlgMessageGroupe" modal="true" width="600">
             <h:form id="formMessageGroupe">
                 <div class="ui-fluid">
-                    <ui:include src="/templates/components/form-field-text.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-text.xhtml">
                         <ui:param name="id" value="sujetMessageGroupe" />
                         <ui:param name="label" value="Sujet" />
                         <ui:param name="value" value="#{membreRechercheBean.messageGroupe.sujet}" />
@@ -655,7 +655,7 @@
                         <ui:param name="placeholder" value="Objet du message" />
                     </ui:include>
                     
-                    <ui:include src="/templates/components/form-field-textarea.xhtml">
+                    <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                         <ui:param name="id" value="contenuMessageGroupe" />
                         <ui:param name="label" value="Message" />
                         <ui:param name="value" value="#{membreRechercheBean.messageGroupe.contenu}" />
@@ -681,14 +681,14 @@
                 </div>
                 
                 <div class="flex gap-2 mt-3">
-                    <ui:include src="/templates/components/button-success.xhtml">
+                    <ui:include src="/templates/components/buttons/button-success.xhtml">
                         <ui:param name="value" value="Envoyer" />
                         <ui:param name="icon" value="pi pi-send" />
                         <ui:param name="action" value="#{membreRechercheBean.envoyerMessageGroupe}" />
                         <ui:param name="update" value="@form" />
                         <ui:param name="onclick" value="if(!args.validationFailed) PF('dlgMessageGroupe').hide();" />
                     </ui:include>
-                    <ui:include src="/templates/components/button-secondary.xhtml">
+                    <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                         <ui:param name="value" value="Annuler" />
                         <ui:param name="icon" value="pi pi-times" />
                         <ui:param name="onclick" value="PF('dlgMessageGroupe').hide();" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/activites.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/activites.xhtml
index 58dc131..dbe9d93 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/activites.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/activites.xhtml
@@ -17,12 +17,12 @@
             <ui:define name="actions">
                 <h:form id="formActions">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Exporter" />
                             <ui:param name="icon" value="pi pi-download" />
                             <ui:param name="outlined" value="true" />
                         </ui:include>
-                        <ui:include src="/templates/components/button-primary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-primary.xhtml">
                             <ui:param name="value" value="Filtrer" />
                             <ui:param name="icon" value="pi pi-filter" />
                             <ui:param name="onclick" value="PF('dlgFiltres').show();" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/agenda.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/agenda.xhtml
index 8bbdbb3..e8e0823 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/agenda.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/agenda.xhtml
@@ -17,12 +17,12 @@
             <ui:define name="actions">
                 <h:form id="formActions">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Synchroniser" />
                             <ui:param name="icon" value="pi pi-sync" />
                             <ui:param name="outlined" value="true" />
                         </ui:include>
-                        <ui:include src="/templates/components/button-primary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-primary.xhtml">
                             <ui:param name="value" value="Nouvel Événement" />
                             <ui:param name="icon" value="pi pi-plus" />
                             <ui:param name="onclick" value="PF('nouvelEvenementDialog').show();" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/documents.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/documents.xhtml
index 1bea100..97dc726 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/documents.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/documents.xhtml
@@ -17,12 +17,12 @@
             <ui:define name="actions">
                 <h:form id="formActions">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Nouveau Dossier" />
                             <ui:param name="icon" value="pi pi-folder-plus" />
                             <ui:param name="outlined" value="true" />
                         </ui:include>
-                        <ui:include src="/templates/components/button-primary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-primary.xhtml">
                             <ui:param name="value" value="Télécharger" />
                             <ui:param name="icon" value="pi pi-upload" />
                             <ui:param name="onclick" value="PF('uploadDialog').show();" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/notifications.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/notifications.xhtml
index 8bc2fa6..1962f2e 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/notifications.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/notifications.xhtml
@@ -17,12 +17,12 @@
             <ui:define name="actions">
                 <h:form id="formActions">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Marquer toutes comme lues" />
                             <ui:param name="icon" value="pi pi-check" />
                             <ui:param name="outlined" value="true" />
                         </ui:include>
-                        <ui:include src="/templates/components/button-primary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-primary.xhtml">
                             <ui:param name="value" value="Paramètres" />
                             <ui:param name="icon" value="pi pi-cog" />
                             <ui:param name="outcome" value="/pages/secure/personnel/parametres" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/profil.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/profil.xhtml
index 2306b33..af5d410 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/profil.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/personnel/profil.xhtml
@@ -41,7 +41,7 @@
                                 </div>
                             </div>
                             <div class="flex gap-2">
-                                <ui:include src="/templates/components/button-primary.xhtml">
+                                <ui:include src="/templates/components/buttons/button-primary.xhtml">
                                     <ui:param name="value" value="Modifier" />
                                     <ui:param name="icon" value="pi pi-pencil" />
                                     <ui:param name="onclick" value="PF('modifierProfilDialog').show();" />
@@ -226,7 +226,7 @@
                 <div class="ui-fluid">
                     <div class="formgrid grid" rendered="#{personnelBean.membre != null}">
                         <div class="field col-12 lg:col-6">
-                            <ui:include src="/templates/components/form-field-text.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                 <ui:param name="id" value="nom" />
                                 <ui:param name="label" value="Nom *" />
                                 <ui:param name="value" value="#{personnelBean.membre.nom}" />
@@ -234,7 +234,7 @@
                             </ui:include>
                         </div>
                         <div class="field col-12 lg:col-6">
-                            <ui:include src="/templates/components/form-field-text.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                 <ui:param name="id" value="prenom" />
                                 <ui:param name="label" value="Prénom *" />
                                 <ui:param name="value" value="#{personnelBean.membre.prenom}" />
@@ -242,7 +242,7 @@
                             </ui:include>
                         </div>
                         <div class="field col-12">
-                            <ui:include src="/templates/components/form-field-text.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                 <ui:param name="id" value="email" />
                                 <ui:param name="label" value="Email *" />
                                 <ui:param name="value" value="#{personnelBean.membre.email}" />
@@ -250,21 +250,21 @@
                             </ui:include>
                         </div>
                         <div class="field col-12 lg:col-6">
-                            <ui:include src="/templates/components/form-field-text.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                 <ui:param name="id" value="telephone" />
                                 <ui:param name="label" value="Téléphone" />
                                 <ui:param name="value" value="#{personnelBean.membre.telephone}" />
                             </ui:include>
                         </div>
                         <div class="field col-12 lg:col-6">
-                            <ui:include src="/templates/components/form-field-calendar.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                                 <ui:param name="id" value="dateNaissance" />
                                 <ui:param name="label" value="Date de naissance" />
                                 <ui:param name="value" value="#{personnelBean.membre.dateNaissance}" />
                             </ui:include>
                         </div>
                         <div class="field col-12">
-                            <ui:include src="/templates/components/form-field-textarea.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                                 <ui:param name="id" value="adresse" />
                                 <ui:param name="label" value="Adresse" />
                                 <ui:param name="value" value="#{personnelBean.membre.adresse}" />
@@ -272,7 +272,7 @@
                             </ui:include>
                         </div>
                         <div class="field col-12 lg:col-6">
-                            <ui:include src="/templates/components/form-field-text.xhtml">
+                            <ui:include src="/templates/components/forms/form-field-text.xhtml">
                                 <ui:param name="id" value="profession" />
                                 <ui:param name="label" value="Profession" />
                                 <ui:param name="value" value="#{personnelBean.membre.profession}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/activites.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/activites.xhtml
index 64da6bb..d85176d 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/activites.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/activites.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActions">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-success.xhtml">
+                        <ui:include src="/templates/components/buttons/button-success.xhtml">
                             <ui:param name="value" value="Exporter" />
                             <ui:param name="icon" value="pi pi-download" />
                             <ui:param name="onclick" value="PF('dlgExport').show();" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/export.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/export.xhtml
index 06fe94d..617eb76 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/export.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/export.xhtml
@@ -101,7 +101,7 @@
                                            styleClass="p-button-outlined p-button-secondary"
                                            action="#{rapportsBean.nouveauRapport = null}"
                                            update="@form" />
-                            <ui:include src="/templates/components/button-primary.xhtml">
+                            <ui:include src="/templates/components/buttons/button-primary.xhtml">
                                 <ui:param name="value" value="Générer le Rapport" />
                                 <ui:param name="icon" value="pi pi-file" />
                                 <ui:param name="action" value="#{rapportsBean.genererRapport}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/finances.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/finances.xhtml
index 0945945..d387013 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/finances.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/finances.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActions">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-success.xhtml">
+                        <ui:include src="/templates/components/buttons/button-success.xhtml">
                             <ui:param name="value" value="Exporter" />
                             <ui:param name="icon" value="pi pi-download" />
                             <ui:param name="onclick" value="PF('dlgExport').show();" />
@@ -42,7 +42,7 @@
                 <h5>Période d'Analyse</h5>
                 <div class="grid">
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-select.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-select.xhtml">
                             <ui:param name="id" value="periodeRapide" />
                             <ui:param name="label" value="Période Rapide" />
                             <ui:param name="value" value="#{rapportsBean.periodeRapide}" />
@@ -58,7 +58,7 @@
                     </div>
                     
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-calendar.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                             <ui:param name="id" value="dateDebut" />
                             <ui:param name="label" value="Date Début" />
                             <ui:param name="value" value="#{rapportsBean.dateDebut}" />
@@ -67,7 +67,7 @@
                     </div>
                     
                     <div class="col-12 md:col-3">
-                        <ui:include src="/templates/components/form-field-calendar.xhtml">
+                        <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                             <ui:param name="id" value="dateFin" />
                             <ui:param name="label" value="Date Fin" />
                             <ui:param name="value" value="#{rapportsBean.dateFin}" />
@@ -78,7 +78,7 @@
                     <div class="col-12 md:col-3">
                         <div class="field">
                             <p:outputLabel />
-                            <ui:include src="/templates/components/button-primary.xhtml">
+                            <ui:include src="/templates/components/buttons/button-primary.xhtml">
                                 <ui:param name="value" value="Appliquer" />
                                 <ui:param name="icon" value="pi pi-check" />
                                 <ui:param name="action" value="#{rapportsBean.chargerDonnees}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/membres.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/membres.xhtml
index 2f9661b..1caaa88 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/membres.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/rapport/membres.xhtml
@@ -17,7 +17,7 @@
             <ui:define name="actions">
                 <h:form id="formActions">
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-success.xhtml">
+                        <ui:include src="/templates/components/buttons/button-success.xhtml">
                             <ui:param name="value" value="Exporter" />
                             <ui:param name="icon" value="pi pi-download" />
                             <ui:param name="onclick" value="PF('dlgExport').show();" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/action-button-view.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/action-button-view.xhtml
index b121d6e..36279b6 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/action-button-view.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/action-button-view.xhtml
@@ -6,7 +6,7 @@
     <!--
         Composant bouton "Consulter" réutilisable - DRY/WOU
         Usage :
-        <ui:include src="/templates/components/action-button-view.xhtml">
+        <ui:include src="/templates/components/buttons/action-button-view.xhtml">
             <ui:param name="id" value="#{item.id}"/>
             <ui:param name="detailPage" value="/pages/secure/organisation/detail.xhtml"/>
         </ui:include>
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-primary.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-primary.xhtml
index b14994b..334c706 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-primary.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-primary.xhtml
@@ -6,7 +6,7 @@
     
     <!-- 
         Composant bouton primaire réutilisable (WOU/DRY)
-        Usage: <ui:include src="/templates/components/button-primary.xhtml">
+        Usage: <ui:include src="/templates/components/buttons/button-primary.xhtml">
                   <ui:param name="value" value="Texte du bouton" />
                   <ui:param name="icon" value="pi pi-icon-name" />
                   <ui:param name="action" value="#{bean.method}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-secondary.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-secondary.xhtml
index 5c744aa..6fe4102 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-secondary.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-secondary.xhtml
@@ -6,7 +6,7 @@
     
     <!-- 
         Composant bouton secondaire réutilisable (WOU/DRY)
-        Usage: <ui:include src="/templates/components/button-secondary.xhtml">
+        Usage: <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                   <ui:param name="value" value="Texte du bouton" />
                   <ui:param name="icon" value="pi pi-icon-name" />
                   <ui:param name="action" value="#{bean.method}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/cards/card-header.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/cards/card-header.xhtml
index c0b81fb..ca70d69 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/cards/card-header.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/cards/card-header.xhtml
@@ -6,7 +6,7 @@
     <!--
         Composant card avec en-tête et actions - DRY/WOU
         Usage :
-        <ui:decorate template="/templates/components/card-header.xhtml">
+        <ui:decorate template="/templates/components/cards/card-header.xhtml">
             <ui:param name="title" value="Titre de la card"/>
             <ui:param name="subtitle" value="Sous-titre optionnel"/>
             <ui:param name="styleClass" value="mb-3"/>
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/cards/card-simple.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/cards/card-simple.xhtml
index 3c9abcf..313a434 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/cards/card-simple.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/cards/card-simple.xhtml
@@ -6,7 +6,7 @@
     <!--
         Composant card simple avec titre optionnel - DRY/WOU
         Usage :
-        <ui:decorate template="/templates/components/card-simple.xhtml">
+        <ui:decorate template="/templates/components/cards/card-simple.xhtml">
             <ui:param name="title" value="Titre de la card"/>
             <ui:param name="styleClass" value="mb-3"/>
             <ui:define name="content">
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-actions.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-actions.xhtml
index 2e95e22..d769d43 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-actions.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-actions.xhtml
@@ -6,7 +6,7 @@
     <!--
         Composant colonne Actions réutilisable - DRY/WOU
         Usage :
-        <ui:decorate template="/templates/components/column-actions.xhtml">
+        <ui:decorate template="/templates/components/columns/column-actions.xhtml">
             <ui:param name="width" value="220px"/>
             <ui:define name="actions">
                 Boutons d'action ici (view, edit, toggle, delete, etc.)
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-logo.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-logo.xhtml
index 88d4917..ba47b1b 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-logo.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-logo.xhtml
@@ -6,7 +6,7 @@
     <!--
         Composant colonne Logo réutilisable - DRY/WOU
         Usage :
-        <ui:include src="/templates/components/column-logo.xhtml">
+        <ui:include src="/templates/components/columns/column-logo.xhtml">
             <ui:param name="logo" value="#{item.logo}"/>
             <ui:param name="size" value="40"/>
             <ui:param name="width" value="80px"/>
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-name-with-subtitle.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-name-with-subtitle.xhtml
index f263c91..77bd86c 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-name-with-subtitle.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-name-with-subtitle.xhtml
@@ -6,7 +6,7 @@
     <!--
         Composant colonne Nom avec sous-titre réutilisable - DRY/WOU
         Usage :
-        <ui:include src="/templates/components/column-name-with-subtitle.xhtml">
+        <ui:include src="/templates/components/columns/column-name-with-subtitle.xhtml">
             <ui:param name="headerText" value="Nom"/>
             <ui:param name="name" value="#{item.nom}"/>
             <ui:param name="subtitle" value="#{item.typeLibelle}"/>
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-tag.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-tag.xhtml
index b9bed7c..9ebf9b0 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-tag.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-tag.xhtml
@@ -6,7 +6,7 @@
     <!--
         Composant colonne Tag réutilisable - DRY/WOU
         Usage :
-        <ui:include src="/templates/components/column-tag.xhtml">
+        <ui:include src="/templates/components/columns/column-tag.xhtml">
             <ui:param name="headerText" value="Type"/>
             <ui:param name="value" value="#{item.typeLibelle}"/>
             <ui:param name="severity" value="info"/>
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-text-with-icon.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-text-with-icon.xhtml
index 688c950..bd3487c 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-text-with-icon.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/columns/column-text-with-icon.xhtml
@@ -6,7 +6,7 @@
     <!--
         Composant colonne Texte avec icône réutilisable - DRY/WOU
         Usage :
-        <ui:include src="/templates/components/column-text-with-icon.xhtml">
+        <ui:include src="/templates/components/columns/column-text-with-icon.xhtml">
             <ui:param name="headerText" value="Localisation"/>
             <ui:param name="icon" value="pi pi-map-marker"/>
             <ui:param name="text" value="#{item.ville}, #{item.region}"/>
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-autocomplete.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-autocomplete.xhtml
index 315d35c..30c3201 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-autocomplete.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-autocomplete.xhtml
@@ -6,7 +6,7 @@
     
     <!-- 
         Composant autoComplete réutilisable (WOU/DRY)
-        Usage: <ui:include src="/templates/components/form-field-autocomplete.xhtml">
+        Usage: <ui:include src="/templates/components/forms/form-field-autocomplete.xhtml">
                   <ui:param name="id" value="searchProfession" />
                   <ui:param name="label" value="Profession" />
                   <ui:param name="value" value="#{bean.filtres.profession}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-boolean.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-boolean.xhtml
index ce5075a..2decd31 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-boolean.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-boolean.xhtml
@@ -6,7 +6,7 @@
     
     <!-- 
         Composant checkbox booléenne réutilisable (WOU/DRY)
-        Usage: <ui:include src="/templates/components/form-field-boolean.xhtml">
+        Usage: <ui:include src="/templates/components/forms/form-field-boolean.xhtml">
                   <ui:param name="id" value="desEnfants" />
                   <ui:param name="label" value=" A des enfants déclarés" />
                   <ui:param name="value" value="#{bean.filtres.desEnfants}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-calendar.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-calendar.xhtml
index f028d88..a911b5b 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-calendar.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-calendar.xhtml
@@ -6,7 +6,7 @@
     
     <!-- 
         Composant champ date réutilisable (WOU/DRY)
-        Usage: <ui:include src="/templates/components/form-field-calendar.xhtml">
+        Usage: <ui:include src="/templates/components/forms/form-field-calendar.xhtml">
                   <ui:param name="id" value="fieldId" />
                   <ui:param name="label" value="Label du champ" />
                   <ui:param name="value" value="#{bean.property}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-checkbox-menu.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-checkbox-menu.xhtml
index c37cc21..92aff32 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-checkbox-menu.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-checkbox-menu.xhtml
@@ -6,7 +6,7 @@
     
     <!-- 
         Composant selectCheckboxMenu réutilisable (WOU/DRY)
-        Usage: <ui:include src="/templates/components/form-field-checkbox-menu.xhtml">
+        Usage: <ui:include src="/templates/components/forms/form-field-checkbox-menu.xhtml">
                   <ui:param name="id" value="searchStatut" />
                   <ui:param name="label" value="Statut" />
                   <ui:param name="value" value="#{bean.filtres.statuts}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-group.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-group.xhtml
index 2c2b6fb..9838e9e 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-group.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-group.xhtml
@@ -6,7 +6,7 @@
     
     <!-- 
         Composant groupe de champs (formgrid) réutilisable (WOU/DRY)
-        Usage: <ui:include src="/templates/components/form-field-group.xhtml">
+        Usage: <ui:include src="/templates/components/forms/form-field-group.xhtml">
                   <ui:param name="content" value="contenu des champs groupés" />
                 </ui:include>
     -->
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-number.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-number.xhtml
index 8de67fd..c689a5c 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-number.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-number.xhtml
@@ -6,7 +6,7 @@
     
     <!-- 
         Composant champ numérique réutilisable (WOU/DRY)
-        Usage: <ui:include src="/templates/components/form-field-number.xhtml">
+        Usage: <ui:include src="/templates/components/forms/form-field-number.xhtml">
                   <ui:param name="id" value="ageMin" />
                   <ui:param name="label" value="Âge minimum" />
                   <ui:param name="value" value="#{bean.filtres.ageMin}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-search-text.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-search-text.xhtml
index e00f7be..2cb5ff9 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-search-text.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-search-text.xhtml
@@ -6,7 +6,7 @@
     
     <!-- 
         Composant champ de recherche texte avec AJAX réutilisable (WOU/DRY)
-        Usage: <ui:include src="/templates/components/form-field-search-text.xhtml">
+        Usage: <ui:include src="/templates/components/forms/form-field-search-text.xhtml">
                   <ui:param name="id" value="searchNom" />
                   <ui:param name="label" value="Nom" />
                   <ui:param name="value" value="#{bean.filtres.nom}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-select.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-select.xhtml
index 93743e5..af42c67 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-select.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-select.xhtml
@@ -6,7 +6,7 @@
     
     <!-- 
         Composant champ sélection réutilisable (WOU/DRY)
-        Usage: <ui:include src="/templates/components/form-field-select.xhtml">
+        Usage: <ui:include src="/templates/components/forms/form-field-select.xhtml">
                   <ui:param name="id" value="fieldId" />
                   <ui:param name="label" value="Label du champ" />
                   <ui:param name="value" value="#{bean.property}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-text.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-text.xhtml
index 18ec0dd..3a83883 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-text.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-text.xhtml
@@ -6,7 +6,7 @@
     
     <!-- 
         Composant champ texte réutilisable (WOU/DRY)
-        Usage: <ui:include src="/templates/components/form-field-text.xhtml">
+        Usage: <ui:include src="/templates/components/forms/form-field-text.xhtml">
                   <ui:param name="id" value="fieldId" />
                   <ui:param name="label" value="Label du champ" />
                   <ui:param name="value" value="#{bean.property}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-textarea.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-textarea.xhtml
index 55ce59f..745552c 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-textarea.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-textarea.xhtml
@@ -6,7 +6,7 @@
     
     <!-- 
         Composant champ textarea réutilisable (WOU/DRY)
-        Usage: <ui:include src="/templates/components/form-field-textarea.xhtml">
+        Usage: <ui:include src="/templates/components/forms/form-field-textarea.xhtml">
                   <ui:param name="id" value="fieldId" />
                   <ui:param name="label" value="Label du champ" />
                   <ui:param name="value" value="#{bean.property}" />
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-wrapper.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-wrapper.xhtml
index ce288c3..5a39d0f 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-wrapper.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-field-wrapper.xhtml
@@ -6,7 +6,7 @@
     
     <!-- 
         Wrapper de champ de formulaire réutilisable (WOU/DRY)
-        Usage: <ui:include src="/templates/components/form-field-wrapper.xhtml">
+        Usage: <ui:include src="/templates/components/forms/form-field-wrapper.xhtml">
                   <ui:param name="id" value="fieldId" />
                   <ui:param name="label" value="Label du champ" />
                   <ui:define name="input">
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-section.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-section.xhtml
index 37a46c6..8ceb512 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-section.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/forms/form-section.xhtml
@@ -7,7 +7,7 @@
 
 <!-- 
     Composant section de formulaire réutilisable (WOU/DRY)
-    Usage: <ui:decorate template="/templates/components/form-section.xhtml">
+    Usage: <ui:decorate template="/templates/components/forms/form-section.xhtml">
               <ui:param name="title" value="Titre de la section" />
               <ui:param name="fluid" value="true" />
               <ui:define name="content">