diff --git a/module/actor-creature-sheet.js b/module/actor-creature-sheet.js
index 15870dd1..80582eb1 100644
--- a/module/actor-creature-sheet.js
+++ b/module/actor-creature-sheet.js
@@ -36,7 +36,7 @@ export class RdDActorCreatureSheet extends RdDActorSheet {
       surEncombrementMessage: this.actor.getMessageSurEncombrement()
     }
 
-    RdDUtility.filterItemsPerTypeForSheet(formData);
+    RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
     this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
     formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
 
diff --git a/module/actor-entite-sheet.js b/module/actor-entite-sheet.js
index 4f9126f4..bdc6e636 100644
--- a/module/actor-entite-sheet.js
+++ b/module/actor-entite-sheet.js
@@ -39,14 +39,12 @@ export class RdDActorEntiteSheet extends ActorSheet {
       limited: this.actor.limited,
       options: this.options,
       owner: this.actor.isOwner,
-      itemsByType: Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i))),
       description:  await TextEditor.enrichHTML(this.object.system.description, {async: true}),
       notesmj: await TextEditor.enrichHTML(this.object.system.notesmj, {async: true}),
-
     };
     
     formData.options.isGM = game.user.isGM;
-    RdDUtility.filterItemsPerTypeForSheet(formData);
+    RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
 
 
     return formData;
diff --git a/module/actor-sheet.js b/module/actor-sheet.js
index ec0b9885..0002f7f3 100644
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@@ -55,15 +55,14 @@ export class RdDActorSheet extends ActorSheet {
       biographie:  await TextEditor.enrichHTML(this.object.system.biographie, {async: true}),
       notes:  await TextEditor.enrichHTML(this.object.system.notes, {async: true}),
       notesmj: await TextEditor.enrichHTML(this.object.system.notesmj, {async: true}),
-      itemsByType: Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i))),
     }
-    RdDUtility.filterItemsPerTypeForSheet(formData)
+    RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
   
     formData.options.isGM = game.user.isGM;
 
     if (formData.type == 'creature') return formData; // Shortcut
 
-    formData.competenceByCategory = Misc.classify(formData.competences, it => it.system.categorie)
+    formData.byCateg = Misc.classify(formData.competences, it => it.system.categorie)
 
     formData.calc = {
       comptageArchetype: RdDItemCompetence.computeResumeArchetype(formData.competences),
diff --git a/module/actor-vehicule-sheet.js b/module/actor-vehicule-sheet.js
index 41afd910..58699eb8 100644
--- a/module/actor-vehicule-sheet.js
+++ b/module/actor-vehicule-sheet.js
@@ -40,12 +40,11 @@ export class RdDActorVehiculeSheet extends ActorSheet {
       limited: this.actor.limited,
       options: this.options,
       owner: this.actor.isOwner,
-      itemsByType: Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i))),
       description:  await TextEditor.enrichHTML(this.object.system.biographie, {async: true}),
       notesmj: await TextEditor.enrichHTML(this.object.system.notesmj, {async: true}),
     };
 
-    RdDUtility.filterItemsPerTypeForSheet(formData);
+    RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
     this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
     formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
 
diff --git a/module/item-sheet.js b/module/item-sheet.js
index 1b405df6..3e1d3429 100644
--- a/module/item-sheet.js
+++ b/module/item-sheet.js
@@ -131,8 +131,7 @@ export class RdDItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   prepareConteneurData(formData) {
-    formData.itemsByType = Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i)))
-    RdDUtility.filterEquipementParType(formData)
+    RdDUtility.filterEquipementParType(formData, this.actor.itemTypes);
 
     this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
     formData.subItems = formData.conteneurs.find(it => it._id == this.item.id)?.subItems;
diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 200ccc2d..f5fd4d06 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -116,42 +116,42 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html',
       // sous-parties de feuilles de personnages
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-effects-partial.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-xp-competences.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-combat.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessures.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessure.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-maladies-poisons.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-possessions.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-actor-sheet-taches.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-taches.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvres.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-jeux.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-alchimie.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-astrologie.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-non-haut-revant.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-haut-revant.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-queues.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-souffles.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-tetes.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-signes-draconiques.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-rencontres.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-sorts.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-sorts-reserve.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-meditations.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-casestmr.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-xp-journal.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-item-queue.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html',
-      "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html",
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-animaux.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-suivants.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-vehicules.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/competence.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/effects.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/xp-competences.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/combat.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/blessures.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/blessure.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/maladies-poisons.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/possessions.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/taches.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/taches.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/oeuvres.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/oeuvre.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/jeux.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/alchimie.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/astrologie.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/non-haut-revant.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/haut-revant.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/dragon-queues.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/dragon-queue.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/dragon-souffles.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/dragon-tetes.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/hr-signes-draconiques.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/hr-rencontres.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/hr-sorts.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/hr-sorts-reserve.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/hr-meditations.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/hr-casestmr.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/xp-journal.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/inventaire.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-item.html',
+      "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-monnaie.html",
+      'systems/foundryvtt-reve-de-dragon/templates/actor/liens-animaux.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/liens-suivants.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/liens-vehicules.html',
       //Items
       'systems/foundryvtt-reve-de-dragon/templates/header-item.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-competence-sheet.html',
@@ -389,50 +389,50 @@ export class RdDUtility {
   }
 
   /* -------------------------------------------- */
-  static filterItemsPerTypeForSheet(formData) {
+  static filterItemsPerTypeForSheet(formData, itemTypes) {
 
-    RdDUtility.filterEquipementParType(formData);
+    RdDUtility.filterEquipementParType(formData, itemTypes);
 
-    formData.sorts = this.arrayOrEmpty(formData.itemsByType['sort']);
-    formData.casestmr = this.arrayOrEmpty(formData.itemsByType['casetmr']);
-    formData.signesdraconiques = this.arrayOrEmpty(formData.itemsByType['signedraconique']);
-    formData.queues = this.arrayOrEmpty(formData.itemsByType['queue']);
-    formData.souffles = this.arrayOrEmpty(formData.itemsByType['souffle']);
-    formData.ombres = this.arrayOrEmpty(formData.itemsByType['ombre']);
-    formData.tetes = this.arrayOrEmpty(formData.itemsByType['tete']);
-    formData.taches = this.arrayOrEmpty(formData.itemsByType['tache']);
-    formData.meditations = this.arrayOrEmpty(formData.itemsByType['meditation']);
-    formData.chants = this.arrayOrEmpty(formData.itemsByType['chant']);
-    formData.danses = this.arrayOrEmpty(formData.itemsByType['danse']);
-    formData.musiques = this.arrayOrEmpty(formData.itemsByType['musique']);
-    formData.oeuvres = this.arrayOrEmpty(formData.itemsByType['oeuvre']);
-    formData.jeux = this.arrayOrEmpty(formData.itemsByType['jeu']);
+    formData.sorts = this.arrayOrEmpty(itemTypes['sort']);
+    formData.casestmr = this.arrayOrEmpty(itemTypes['casetmr']);
+    formData.signesdraconiques = this.arrayOrEmpty(itemTypes['signedraconique']);
+    formData.queues = this.arrayOrEmpty(itemTypes['queue']);
+    formData.souffles = this.arrayOrEmpty(itemTypes['souffle']);
+    formData.ombres = this.arrayOrEmpty(itemTypes['ombre']);
+    formData.tetes = this.arrayOrEmpty(itemTypes['tete']);
+    formData.taches = this.arrayOrEmpty(itemTypes['tache']);
+    formData.meditations = this.arrayOrEmpty(itemTypes['meditation']);
+    formData.chants = this.arrayOrEmpty(itemTypes['chant']);
+    formData.danses = this.arrayOrEmpty(itemTypes['danse']);
+    formData.musiques = this.arrayOrEmpty(itemTypes['musique']);
+    formData.oeuvres = this.arrayOrEmpty(itemTypes['oeuvre']);
+    formData.jeux = this.arrayOrEmpty(itemTypes['jeu']);
 
-    formData.recettescuisine = this.arrayOrEmpty(formData.itemsByType['recettecuisine']);
-    formData.recettesAlchimiques = this.arrayOrEmpty(formData.itemsByType['recettealchimique']);
-    formData.maladies = this.arrayOrEmpty(formData.itemsByType['maladie']);
-    formData.poisons = this.arrayOrEmpty(formData.itemsByType['poison']);
-    formData.possessions = this.arrayOrEmpty(formData.itemsByType['possession']);
+    formData.recettescuisine = this.arrayOrEmpty(itemTypes['recettecuisine']);
+    formData.recettesAlchimiques = this.arrayOrEmpty(itemTypes['recettealchimique']);
+    formData.maladies = this.arrayOrEmpty(itemTypes['maladie']);
+    formData.poisons = this.arrayOrEmpty(itemTypes['poison']);
+    formData.possessions = this.arrayOrEmpty(itemTypes['possession']);
     formData.maladiesPoisons = formData.maladies.concat(formData.poisons);
-    formData.competences = (formData.itemsByType.competence ?? []).concat(formData.itemsByType.competencecreature ?? []);
-    formData.sortsReserve = this.arrayOrEmpty(formData.itemsByType['sortreserve']);
+    formData.competences = (itemTypes['competence'] ?? []).concat(itemTypes['competencecreature'] ?? []);
+    formData.sortsReserve = this.arrayOrEmpty(itemTypes['sortreserve']);
   }
 
-  static filterEquipementParType(formData) {
-    formData.conteneurs = this.arrayOrEmpty(formData.itemsByType['conteneur']);
+  static filterEquipementParType(formData, itemTypes) {
+    formData.conteneurs = this.arrayOrEmpty(itemTypes['conteneur']);
 
-    formData.materiel = this.arrayOrEmpty(formData.itemsByType['objet']);
-    formData.armes = this.arrayOrEmpty(formData.itemsByType['arme']);
-    formData.armures = this.arrayOrEmpty(formData.itemsByType['armure']);
-    formData.munitions = this.arrayOrEmpty(formData.itemsByType['munition']);
-    formData.livres = this.arrayOrEmpty(formData.itemsByType['livre']);
-    formData.potions = this.arrayOrEmpty(formData.itemsByType['potion']);
-    formData.ingredients = this.arrayOrEmpty(formData.itemsByType['ingredient']);
-    formData.herbes = this.arrayOrEmpty(formData.itemsByType['herbe']);
-    formData.monnaie = this.arrayOrEmpty(formData.itemsByType['monnaie']);
+    formData.materiel = this.arrayOrEmpty(itemTypes['objet']);
+    formData.armes = this.arrayOrEmpty(itemTypes['arme']);
+    formData.armures = this.arrayOrEmpty(itemTypes['armure']);
+    formData.munitions = this.arrayOrEmpty(itemTypes['munition']);
+    formData.livres = this.arrayOrEmpty(itemTypes['livre']);
+    formData.potions = this.arrayOrEmpty(itemTypes['potion']);
+    formData.ingredients = this.arrayOrEmpty(itemTypes['ingredient']);
+    formData.herbes = this.arrayOrEmpty(itemTypes['herbe']);
+    formData.monnaie = this.arrayOrEmpty(itemTypes['monnaie']);
     formData.monnaie.sort(Monnaie.triValeurDenier());
-    formData.nourritureboissons = this.arrayOrEmpty(formData.itemsByType['nourritureboisson']);
-    formData.gemmes = this.arrayOrEmpty(formData.itemsByType['gemme']);
+    formData.nourritureboissons = this.arrayOrEmpty(itemTypes['nourritureboisson']);
+    formData.gemmes = this.arrayOrEmpty(itemTypes['gemme']);
 
     formData.objets = formData.conteneurs
       .concat(formData.materiel)
@@ -502,7 +502,7 @@ export class RdDUtility {
     const isConteneur = objet.type == 'conteneur';
     const isOuvert = isConteneur && this.getAfficheContenu(objet._id);
     const isVide = isConteneur && objet.system.contenu.length == 0;
-    const conteneur = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html']({
+    const conteneur = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-item.html']({
       item: objet,
       vide: isVide,
       ouvert: isOuvert
diff --git a/templates/actor-creature-sheet.html b/templates/actor-creature-sheet.html
index 1dcdab80..5c431c70 100644
--- a/templates/actor-creature-sheet.html
+++ b/templates/actor-creature-sheet.html
@@ -18,7 +18,7 @@
           <span>{{calc.resumeBlessures}}</span>
         </div>
         <div class="flexrow">
-          {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-effects-partial.html"}}
+          {{>"systems/foundryvtt-reve-de-dragon/templates/actor/effects.html"}}
         </div>
     </div>
     </div>
@@ -121,12 +121,12 @@
     {{!-- blessures Tab --}}
     <div class="tab blessures" data-group="primary" data-tab="blessures" style="height:200px">
       {{!-- Liste de blessures --}}
-      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessures.html" this}}
+      {{> "systems/foundryvtt-reve-de-dragon/templates/actor/blessures.html"}}
     </div>
 
     {{!-- Equipment Tab --}}
     <div class="tab items" data-group="primary" data-tab="items">
-      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}}
+      {{> "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire.html"}}
     </div>
 
     {{!-- Biography Tab --}}
@@ -142,7 +142,7 @@
         {{editor description target="system.description" button=true owner=owner editable=true}}
       </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}
 
     </div>
 
diff --git a/templates/actor-entite-sheet.html b/templates/actor-entite-sheet.html
index 8026abff..98175932 100644
--- a/templates/actor-entite-sheet.html
+++ b/templates/actor-entite-sheet.html
@@ -133,7 +133,7 @@
       <div class="form-group editor">
         {{editor description target="system.description" button=true owner=owner editable=true}}
       </div>
-      {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}
     </div>
 
   </section>
diff --git a/templates/actor-sheet-oeuvres.html b/templates/actor-sheet-oeuvres.html
deleted file mode 100644
index f6819673..00000000
--- a/templates/actor-sheet-oeuvres.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<h3>Oeuvres diverses</h3><a class="creer-une-oeuvre">Créer une oeuvre</a>
-<ul class="item-list alterne-list">
-  {{#each chants as |chant id|}}
-  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=chant typeOeuvre="Chant" classOeuvre="chant-label"}}
-  {{/each}}
-  {{#each musiques as |musique id|}}
-  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=musique typeOeuvre="Musique" classOeuvre="musique-label"}}
-  {{/each}}
-  {{#each danses as |danse id|}}
-  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=danse typeOeuvre="Danse" classOeuvre="danse-label"}}
-  {{/each}}
-  {{#each oeuvres as |oeuvre id|}}
-  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=oeuvre typeOeuvre=oeuvre.system.competence classOeuvre="oeuvre-label"}}
-  {{/each}}
-  {{#each recettescuisine as |recette id|}}
-  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=recette typeOeuvre="Recette de cuisine" classOeuvre="recettecuisine-label"}}
-  {{/each}}
-</ul>
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 81c2a3c2..896e1abf 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -69,7 +69,7 @@
               <span>{{system.compteurs.surenc.label}}: {{system.compteurs.surenc.value}}</span>
             </div>
             <div class="flexrow">
-              {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-effects-partial.html"}}
+              {{>"systems/foundryvtt-reve-de-dragon/templates/actor/effects.html"}}
             </div>
           </div>
         </div>
@@ -230,39 +230,39 @@
           </div>
           <div class="grid grid-2col">
             <div class="flex-group-left flexcol competence-column">
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.generale) categorie="Compétences générales"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.particuliere) categorie="Compétences Particulières"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.specialisee) categorie="Compétences Spécialisées"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.generale) categorie="Compétences générales"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.particuliere) categorie="Compétences Particulières"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.specialisee) categorie="Compétences Spécialisées"}}
             </div>
 
             <div class="flex-group-left flexcol competence-column">
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.melee) categorie="Compétences de Mêlée"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.tir) categorie="Compétences de Tir"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.lancer) categorie="Compétences de Lancer"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.connaissance) categorie="Connaissances"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.melee) categorie="Compétences de Mêlée"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.tir) categorie="Compétences de Tir"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.lancer) categorie="Compétences de Lancer"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.connaissance) categorie="Connaissances"}}
               {{#if (or system.attributs.hautrevant.value options.vueDetaillee)}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.draconic) categorie="Draconic"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.draconic) categorie="Draconic"}}
               {{/if}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-xp-competences.html"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/xp-competences.html"}}
             </div>
           </div>
         </div>
 
         {{!-- Combat Tab --}}
         <div class="tab combat" data-group="primary" data-tab="combat">
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-combat.html"}}<hr>
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessures.html"}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-maladies-poisons.html"}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-possessions.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/combat.html"}}<hr>
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/blessures.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/maladies-poisons.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/possessions.html"}}
         
       </div>
       
       {{!-- Connaissances Tab --}}
       <div class="tab connaissances" data-group="primary" data-tab="connaissances">
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-taches.html"}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvres.html"}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-jeux.html"}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-alchimie.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/taches.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/oeuvres.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/jeux.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/alchimie.html"}}
       </div>
       
       {{!-- hautreve Tab --}}
@@ -270,11 +270,11 @@
         <div>
           {{#if system.attributs.hautrevant.value}}
           <h3>Haut rêvant</h3>
-          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-haut-revant.html"}}
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor/haut-revant.html"}}
           {{else}}
           <h3>Vous n'avez pas le don de haut-rêve</h3>
           <p>Attribuer la Tête de Dragon 'Don de Haut Rêve' pour rendre le personnage Haut-Rêvant.</p>
-          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-non-haut-revant.html"}}
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor/non-haut-revant.html"}}
           {{/if}}
           <br><br>
         </div>
@@ -283,10 +283,10 @@
       {{!-- Equipment Tab --}}
       <div class="tab items" data-group="primary" data-tab="items">
         
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-animaux.html"}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-suivants.html"}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-vehicules.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/liens-animaux.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/liens-suivants.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor/liens-vehicules.html"}}
 
       </div>
 
@@ -352,8 +352,8 @@
           <div class="form-group editor">
             {{editor notes target="system.notes" button=true owner=owner editable=editable}}
           </div>
-          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-xp-journal.html"}}
-          {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor/xp-journal.html"}}
+          {{> "systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}
         </article>
       </div>
 
diff --git a/templates/actor-vehicule-sheet.html b/templates/actor-vehicule-sheet.html
index e0a21592..3a85a905 100644
--- a/templates/actor-vehicule-sheet.html
+++ b/templates/actor-vehicule-sheet.html
@@ -69,7 +69,7 @@
     {{!-- Equipment Tab --}}
     <div class="tab items" data-group="primary" data-tab="items">
 
-      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}}
+      {{> "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire.html"}}
       
 
     {{!-- Biography Tab --}}
@@ -77,7 +77,7 @@
       <div class="form-group editor">
         {{editor description target="system.description" button=true owner=owner editable=editable}}
       </div>
-      {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}
     </div>
     
     </div>
diff --git a/templates/actor-sheet-alchimie.html b/templates/actor/alchimie.html
similarity index 100%
rename from templates/actor-sheet-alchimie.html
rename to templates/actor/alchimie.html
diff --git a/templates/actor-sheet-astrologie.html b/templates/actor/astrologie.html
similarity index 100%
rename from templates/actor-sheet-astrologie.html
rename to templates/actor/astrologie.html
diff --git a/templates/actor-sheet-blessure.html b/templates/actor/blessure.html
similarity index 100%
rename from templates/actor-sheet-blessure.html
rename to templates/actor/blessure.html
diff --git a/templates/actor-sheet-blessures.html b/templates/actor/blessures.html
similarity index 52%
rename from templates/actor-sheet-blessures.html
rename to templates/actor/blessures.html
index b6853800..fa7705c6 100644
--- a/templates/actor-sheet-blessures.html
+++ b/templates/actor/blessures.html
@@ -7,12 +7,12 @@
     <span>Localisation</span>
   </li>
   {{#each system.blessures.legeres.liste as |blessure key|}}
-  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessure.html" blessure=blessure key=key gravite="legere" title="Légère"}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/blessure.html" blessure=blessure key=key gravite="legere" title="Légère"}}
   {{/each}}
   {{#each system.blessures.graves.liste as |blessure key|}}
-  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessure.html" blessure=blessure key=key gravite="grave" title="Grave"}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/blessure.html" blessure=blessure key=key gravite="grave" title="Grave"}}
   {{/each}}
   {{#each system.blessures.critiques.liste as |blessure key|}}
-  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessure.html" blessure=blessure key=key gravite="critique" title="Critique"}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/blessure.html" blessure=blessure key=key gravite="critique" title="Critique"}}
   {{/each}}
 </ul>
diff --git a/templates/actor-sheet-categorie-competences-partial.html b/templates/actor/categorie-competences.html
similarity index 90%
rename from templates/actor-sheet-categorie-competences-partial.html
rename to templates/actor/categorie-competences.html
index 26d7a1db..f3420ecb 100644
--- a/templates/actor-sheet-categorie-competences-partial.html
+++ b/templates/actor/categorie-competences.html
@@ -24,7 +24,7 @@
     </li>
     {{/if}}
     {{#each competences as |comp key|}}
-    {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
+    {{> "systems/foundryvtt-reve-de-dragon/templates/actor/competence.html" comp}}
     {{/each}}
   </ul>
 </div>
diff --git a/templates/actor-sheet-combat.html b/templates/actor/combat.html
similarity index 100%
rename from templates/actor-sheet-combat.html
rename to templates/actor/combat.html
diff --git a/templates/actor-sheet-competence-partial.html b/templates/actor/competence.html
similarity index 100%
rename from templates/actor-sheet-competence-partial.html
rename to templates/actor/competence.html
diff --git a/templates/actor-sheet-item-queue.html b/templates/actor/dragon-queue.html
similarity index 100%
rename from templates/actor-sheet-item-queue.html
rename to templates/actor/dragon-queue.html
diff --git a/templates/actor-sheet-queues.html b/templates/actor/dragon-queues.html
similarity index 62%
rename from templates/actor-sheet-queues.html
rename to templates/actor/dragon-queues.html
index 9bbb716a..3e246c66 100644
--- a/templates/actor-sheet-queues.html
+++ b/templates/actor/dragon-queues.html
@@ -6,10 +6,10 @@
 </h3>
 <ul class="flex-group-left">
   {{#each queues as |queue key|}}
-  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-item-queue.html" queue=queue key=key}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/dragon-queue.html" queue=queue key=key}}
   {{/each}}
   {{#each ombres as |ombre key|}}
-  {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-item-queue.html" queue=ombre key=key}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/dragon-queue.html" queue=ombre key=key}}
   {{/each}}
 </ul>
 {{/if}}
diff --git a/templates/actor-sheet-souffles.html b/templates/actor/dragon-souffles.html
similarity index 100%
rename from templates/actor-sheet-souffles.html
rename to templates/actor/dragon-souffles.html
diff --git a/templates/actor-sheet-tetes.html b/templates/actor/dragon-tetes.html
similarity index 100%
rename from templates/actor-sheet-tetes.html
rename to templates/actor/dragon-tetes.html
diff --git a/templates/actor-sheet-editor-notes-mj.html b/templates/actor/editor-notes-mj.html
similarity index 100%
rename from templates/actor-sheet-editor-notes-mj.html
rename to templates/actor/editor-notes-mj.html
diff --git a/templates/actor-sheet-effects-partial.html b/templates/actor/effects.html
similarity index 100%
rename from templates/actor-sheet-effects-partial.html
rename to templates/actor/effects.html
diff --git a/templates/actor-sheet-haut-revant.html b/templates/actor/haut-revant.html
similarity index 58%
rename from templates/actor-sheet-haut-revant.html
rename to templates/actor/haut-revant.html
index 2d06671d..bee5f0ed 100644
--- a/templates/actor-sheet-haut-revant.html
+++ b/templates/actor/haut-revant.html
@@ -25,11 +25,11 @@
   {{/if}}
   </span> 
 </li>
-{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-non-haut-revant.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/non-haut-revant.html"}}
 <hr>
-{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-signes-draconiques.html"}}
-{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-rencontres.html"}}
-{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-sorts.html"}}
-{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-sorts-reserve.html"}}
-{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-meditations.html"}}
-{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-casestmr.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/hr-signes-draconiques.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/hr-rencontres.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/hr-sorts.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/hr-sorts-reserve.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/hr-meditations.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/hr-casestmr.html"}}
diff --git a/templates/actor-sheet-hr-casestmr.html b/templates/actor/hr-casestmr.html
similarity index 100%
rename from templates/actor-sheet-hr-casestmr.html
rename to templates/actor/hr-casestmr.html
diff --git a/templates/actor-sheet-hr-meditations.html b/templates/actor/hr-meditations.html
similarity index 100%
rename from templates/actor-sheet-hr-meditations.html
rename to templates/actor/hr-meditations.html
diff --git a/templates/actor-sheet-hr-rencontres.html b/templates/actor/hr-rencontres.html
similarity index 100%
rename from templates/actor-sheet-hr-rencontres.html
rename to templates/actor/hr-rencontres.html
diff --git a/templates/actor-sheet-hr-signes-draconiques.html b/templates/actor/hr-signes-draconiques.html
similarity index 100%
rename from templates/actor-sheet-hr-signes-draconiques.html
rename to templates/actor/hr-signes-draconiques.html
diff --git a/templates/actor-sheet-hr-sorts-reserve.html b/templates/actor/hr-sorts-reserve.html
similarity index 100%
rename from templates/actor-sheet-hr-sorts-reserve.html
rename to templates/actor/hr-sorts-reserve.html
diff --git a/templates/actor-sheet-hr-sorts.html b/templates/actor/hr-sorts.html
similarity index 100%
rename from templates/actor-sheet-hr-sorts.html
rename to templates/actor/hr-sorts.html
diff --git a/templates/actor-sheet-inventaire-item.html b/templates/actor/inventaire-item.html
similarity index 100%
rename from templates/actor-sheet-inventaire-item.html
rename to templates/actor/inventaire-item.html
diff --git a/templates/actor-sheet-inventaire-monnaie.html b/templates/actor/inventaire-monnaie.html
similarity index 100%
rename from templates/actor-sheet-inventaire-monnaie.html
rename to templates/actor/inventaire-monnaie.html
diff --git a/templates/actor-sheet-inventaire.html b/templates/actor/inventaire.html
similarity index 80%
rename from templates/actor-sheet-inventaire.html
rename to templates/actor/inventaire.html
index 89bf2d18..eefa1609 100644
--- a/templates/actor-sheet-inventaire.html
+++ b/templates/actor/inventaire.html
@@ -1,4 +1,4 @@
-{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html" monnaie=monnaie}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-monnaie.html" monnaie=monnaie}}
 
 <span class="item-name"><h4>Equipement</h4></span>
 <span class="item-name">Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{system.attributs.encombrement.value}} <b>{{calc.surEncombrementMessage}}</b></span> - 
@@ -16,7 +16,7 @@
   {{#each objets as |item id|}}
     {{#unless item.estContenu}}
     {{#if (ne item.type 'conteneur')}}
-      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html" item=item vide=true ouvert=true }}
+      {{> "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-item.html" item=item vide=true ouvert=true }}
     {{/if}}
     {{/unless}}
   {{/each}}
diff --git a/templates/actor-sheet-jeux.html b/templates/actor/jeux.html
similarity index 100%
rename from templates/actor-sheet-jeux.html
rename to templates/actor/jeux.html
diff --git a/templates/actor-sheet-liens-animaux.html b/templates/actor/liens-animaux.html
similarity index 100%
rename from templates/actor-sheet-liens-animaux.html
rename to templates/actor/liens-animaux.html
diff --git a/templates/actor-sheet-liens-suivants.html b/templates/actor/liens-suivants.html
similarity index 100%
rename from templates/actor-sheet-liens-suivants.html
rename to templates/actor/liens-suivants.html
diff --git a/templates/actor-sheet-liens-vehicules.html b/templates/actor/liens-vehicules.html
similarity index 100%
rename from templates/actor-sheet-liens-vehicules.html
rename to templates/actor/liens-vehicules.html
diff --git a/templates/actor-sheet-maladies-poisons.html b/templates/actor/maladies-poisons.html
similarity index 100%
rename from templates/actor-sheet-maladies-poisons.html
rename to templates/actor/maladies-poisons.html
diff --git a/templates/actor-sheet-non-haut-revant.html b/templates/actor/non-haut-revant.html
similarity index 75%
rename from templates/actor-sheet-non-haut-revant.html
rename to templates/actor/non-haut-revant.html
index 8349a8f5..3051d47c 100644
--- a/templates/actor-sheet-non-haut-revant.html
+++ b/templates/actor/non-haut-revant.html
@@ -21,6 +21,6 @@
   </li>
 </ul>
 <hr>
-{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-queues.html"}}
-{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-souffles.html"}}
-{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-tetes.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/dragon-queues.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/dragon-souffles.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor/dragon-tetes.html"}}
diff --git a/templates/actor-sheet-oeuvre-partial.html b/templates/actor/oeuvre.html
similarity index 100%
rename from templates/actor-sheet-oeuvre-partial.html
rename to templates/actor/oeuvre.html
diff --git a/templates/actor/oeuvres.html b/templates/actor/oeuvres.html
new file mode 100644
index 00000000..82ebad8c
--- /dev/null
+++ b/templates/actor/oeuvres.html
@@ -0,0 +1,18 @@
+<h3>Oeuvres diverses</h3><a class="creer-une-oeuvre">Créer une oeuvre</a>
+<ul class="item-list alterne-list">
+  {{#each chants as |chant id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/oeuvre.html" oeuvre=chant typeOeuvre="Chant" classOeuvre="chant-label"}}
+  {{/each}}
+  {{#each musiques as |musique id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/oeuvre.html" oeuvre=musique typeOeuvre="Musique" classOeuvre="musique-label"}}
+  {{/each}}
+  {{#each danses as |danse id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/oeuvre.html" oeuvre=danse typeOeuvre="Danse" classOeuvre="danse-label"}}
+  {{/each}}
+  {{#each oeuvres as |oeuvre id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/oeuvre.html" oeuvre=oeuvre typeOeuvre=oeuvre.system.competence classOeuvre="oeuvre-label"}}
+  {{/each}}
+  {{#each recettescuisine as |recette id|}}
+  {{> "systems/foundryvtt-reve-de-dragon/templates/actor/oeuvre.html" oeuvre=recette typeOeuvre="Recette de cuisine" classOeuvre="recettecuisine-label"}}
+  {{/each}}
+</ul>
diff --git a/templates/actor-sheet-possessions.html b/templates/actor/possessions.html
similarity index 100%
rename from templates/actor-sheet-possessions.html
rename to templates/actor/possessions.html
diff --git a/templates/actor-sheet-taches.html b/templates/actor/taches.html
similarity index 100%
rename from templates/actor-sheet-taches.html
rename to templates/actor/taches.html
diff --git a/templates/actor-sheet-xp-competences.html b/templates/actor/xp-competences.html
similarity index 100%
rename from templates/actor-sheet-xp-competences.html
rename to templates/actor/xp-competences.html
diff --git a/templates/actor-sheet-xp-journal.html b/templates/actor/xp-journal.html
similarity index 100%
rename from templates/actor-sheet-xp-journal.html
rename to templates/actor/xp-journal.html