diff --git a/elements/bornes/barette_de_terre.elmt b/elements/bornes/bornes/barette_de_terre.elmt
similarity index 100%
rename from elements/bornes/barette_de_terre.elmt
rename to elements/bornes/bornes/barette_de_terre.elmt
diff --git a/elements/bornes/barre_interconnexion_tn.elmt b/elements/bornes/bornes/barre_interconnexion_tn.elmt
similarity index 100%
rename from elements/bornes/barre_interconnexion_tn.elmt
rename to elements/bornes/bornes/barre_interconnexion_tn.elmt
diff --git a/elements/bornes/barrette_connexion_f.elmt b/elements/bornes/bornes/barrette_connexion_f.elmt
similarity index 100%
rename from elements/bornes/barrette_connexion_f.elmt
rename to elements/bornes/bornes/barrette_connexion_f.elmt
diff --git a/elements/bornes/borne_continuite.elmt b/elements/bornes/bornes/borne_continuite.elmt
similarity index 100%
rename from elements/bornes/borne_continuite.elmt
rename to elements/bornes/bornes/borne_continuite.elmt
diff --git a/elements/bornes/borne_f.elmt b/elements/bornes/bornes/borne_f.elmt
similarity index 100%
rename from elements/bornes/borne_f.elmt
rename to elements/bornes/bornes/borne_f.elmt
diff --git a/elements/bornes/borne_finale.elmt b/elements/bornes/bornes/borne_finale.elmt
similarity index 100%
rename from elements/bornes/borne_finale.elmt
rename to elements/bornes/bornes/borne_finale.elmt
diff --git a/elements/bornes/borne_fusible_cablage.elmt b/elements/bornes/bornes/borne_fusible_cablage.elmt
similarity index 100%
rename from elements/bornes/borne_fusible_cablage.elmt
rename to elements/bornes/bornes/borne_fusible_cablage.elmt
diff --git a/elements/bornes/bornes_e.elmt b/elements/bornes/bornes/bornes_e.elmt
similarity index 100%
rename from elements/bornes/bornes_e.elmt
rename to elements/bornes/bornes/bornes_e.elmt
diff --git a/elements/bornes/bornes_es.elmt b/elements/bornes/bornes/bornes_es.elmt
similarity index 100%
rename from elements/bornes/bornes_es.elmt
rename to elements/bornes/bornes/bornes_es.elmt
diff --git a/elements/bornes/bornes_s.elmt b/elements/bornes/bornes/bornes_s.elmt
similarity index 100%
rename from elements/bornes/bornes_s.elmt
rename to elements/bornes/bornes/bornes_s.elmt
diff --git a/elements/bornes/connecteur_f.elmt b/elements/bornes/bornes/connecteur_f.elmt
similarity index 100%
rename from elements/bornes/connecteur_f.elmt
rename to elements/bornes/bornes/connecteur_f.elmt
diff --git a/elements/bornes/connecteur_m.elmt b/elements/bornes/bornes/connecteur_m.elmt
similarity index 100%
rename from elements/bornes/connecteur_m.elmt
rename to elements/bornes/bornes/connecteur_m.elmt
diff --git a/elements/bornes/connecteur_mf.elmt b/elements/bornes/bornes/connecteur_mf.elmt
similarity index 100%
rename from elements/bornes/connecteur_mf.elmt
rename to elements/bornes/bornes/connecteur_mf.elmt
diff --git a/elements/bornes/contact_prise_fiche.elmt b/elements/bornes/bornes/contact_prise_fiche.elmt
similarity index 100%
rename from elements/bornes/contact_prise_fiche.elmt
rename to elements/bornes/bornes/contact_prise_fiche.elmt
diff --git a/elements/bornes/prise_fiche.elmt b/elements/bornes/bornes/prise_fiche.elmt
similarity index 100%
rename from elements/bornes/prise_fiche.elmt
rename to elements/bornes/bornes/prise_fiche.elmt
diff --git a/elements/bornes/prise_multipolaire.elmt b/elements/bornes/bornes/prise_multipolaire.elmt
similarity index 100%
rename from elements/bornes/prise_multipolaire.elmt
rename to elements/bornes/bornes/prise_multipolaire.elmt
diff --git a/elements/bornes/prise_multipolaire_2.elmt b/elements/bornes/bornes/prise_multipolaire_2.elmt
similarity index 100%
rename from elements/bornes/prise_multipolaire_2.elmt
rename to elements/bornes/bornes/prise_multipolaire_2.elmt
diff --git a/elements/bornes/bornes/qet_directory b/elements/bornes/bornes/qet_directory
new file mode 100644
index 000000000..c9b9eb834
--- /dev/null
+++ b/elements/bornes/bornes/qet_directory
@@ -0,0 +1,15 @@
+<qet-directory>
+    <names>
+        <name lang="de">Klemmen</name>
+        <name lang="ru">соеденителей</name>
+        <name lang="en">Terminals</name>
+        <name lang="fr">Bornes</name>
+        <name lang="ar">طرفيات توصيل</name>
+        <name lang="pt">Terminais</name>
+        <name lang="cs">Svorky</name>
+        <name lang="pl">Złącza i zaciski</name>
+        <name lang="it">Terminali</name>
+        <name lang="es">Terminales</name>
+        <name lang="el">Ακροδέκτες</name>
+    </names>
+</qet-directory>
diff --git a/elements/bornes/sec_fus_ferme1.elmt b/elements/bornes/bornes/sec_fus_ferme1.elmt
similarity index 100%
rename from elements/bornes/sec_fus_ferme1.elmt
rename to elements/bornes/bornes/sec_fus_ferme1.elmt
diff --git a/elements/domestique/coffret_de_repartition1.elmt b/elements/domestique/architectural/coffret_de_repartition1.elmt
similarity index 100%
rename from elements/domestique/coffret_de_repartition1.elmt
rename to elements/domestique/architectural/coffret_de_repartition1.elmt
diff --git a/elements/domestique/coffret_de_repartition2.elmt b/elements/domestique/architectural/coffret_de_repartition2.elmt
similarity index 100%
rename from elements/domestique/coffret_de_repartition2.elmt
rename to elements/domestique/architectural/coffret_de_repartition2.elmt
diff --git a/elements/domestique/connecteur.elmt b/elements/domestique/architectural/connecteur.elmt
similarity index 100%
rename from elements/domestique/connecteur.elmt
rename to elements/domestique/architectural/connecteur.elmt
diff --git a/elements/domestique/gache_electrique.elmt b/elements/domestique/architectural/gache_electrique.elmt
similarity index 100%
rename from elements/domestique/gache_electrique.elmt
rename to elements/domestique/architectural/gache_electrique.elmt
diff --git a/elements/domestique/horloge_pointage.elmt b/elements/domestique/architectural/horloge_pointage.elmt
similarity index 100%
rename from elements/domestique/horloge_pointage.elmt
rename to elements/domestique/architectural/horloge_pointage.elmt
diff --git a/elements/domestique/interphone.elmt b/elements/domestique/architectural/interphone.elmt
similarity index 100%
rename from elements/domestique/interphone.elmt
rename to elements/domestique/architectural/interphone.elmt
diff --git a/elements/domestique/moteur.elmt b/elements/domestique/architectural/moteur.elmt
similarity index 100%
rename from elements/domestique/moteur.elmt
rename to elements/domestique/architectural/moteur.elmt
diff --git a/elements/domestique/moteur_pas_a_pas.elmt b/elements/domestique/architectural/moteur_pas_a_pas.elmt
similarity index 100%
rename from elements/domestique/moteur_pas_a_pas.elmt
rename to elements/domestique/architectural/moteur_pas_a_pas.elmt
diff --git a/elements/domestique/protege_par_cle.elmt b/elements/domestique/architectural/protege_par_cle.elmt
similarity index 100%
rename from elements/domestique/protege_par_cle.elmt
rename to elements/domestique/architectural/protege_par_cle.elmt
diff --git a/elements/domestique/ventilateur.elmt b/elements/domestique/architectural/ventilateur.elmt
similarity index 100%
rename from elements/domestique/ventilateur.elmt
rename to elements/domestique/architectural/ventilateur.elmt
diff --git a/elements/domestique/moteur_lineaire.elmt b/elements/domestique/moteur_lineaire.elmt
deleted file mode 100644
index fa80d507e..000000000
--- a/elements/domestique/moteur_lineaire.elmt
+++ /dev/null
@@ -1,19 +0,0 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="35" height="50" type="element" orientation="dyyy">
-    <names>
-        <name lang="ar">مُحرّك خطّي</name>
-        <name lang="de">Linearmotor</name>
-        <name lang="el">Γραμμικός ηλεκτροκινητήρας</name>
-        <name lang="en">Linear motor</name>
-        <name lang="it">Motore lineare</name>
-        <name lang="fr">Moteur linéaire</name>
-        <name lang="pl">Silnik liniowy</name>
-        <name lang="cs">Lineární motor</name>
-    </names>
-    <informations>EN 60617: 06-04-02</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-14" y2="0" x2="14"/>
-        <circle x="-12" y="-20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="24"/>
-        <text x="-4.5" y="-6" size="8" text="M"/>
-        <terminal x="0" y="-20" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/energie/froid/debitmetre.elmt b/elements/energie/froid/capteurs/debitmetre.elmt
similarity index 100%
rename from elements/energie/froid/debitmetre.elmt
rename to elements/energie/froid/capteurs/debitmetre.elmt
diff --git a/elements/nomenclatures/bases/etiquette_triphase.elmt b/elements/nomenclatures/bases/nomenclature/etiquette_triphase.elmt
similarity index 100%
rename from elements/nomenclatures/bases/etiquette_triphase.elmt
rename to elements/nomenclatures/bases/nomenclature/etiquette_triphase.elmt
diff --git a/elements/nomenclatures/bases/nomenclature_section.elmt b/elements/nomenclatures/bases/nomenclature/nomenclature_section.elmt
similarity index 100%
rename from elements/nomenclatures/bases/nomenclature_section.elmt
rename to elements/nomenclatures/bases/nomenclature/nomenclature_section.elmt
diff --git a/elements/nomenclatures/bases/textes/qet_directory b/elements/nomenclatures/bases/textes/qet_directory
deleted file mode 100644
index 4bc51928f..000000000
--- a/elements/nomenclatures/bases/textes/qet_directory
+++ /dev/null
@@ -1,13 +0,0 @@
-<qet-directory>
-    <names>
-        <name lang="ru">Тексты</name>
-        <name lang="en">Texts</name>
-        <name lang="el">Κείμενα</name>
-        <name lang="fr">Textes</name>
-        <name lang="ar">نُصوص</name>
-        <name lang="pl">Teksty</name>
-        <name lang="cs">Texty</name>
-        <name lang="de">Texte</name>
-        <name lang="it">Testi</name>
-    </names>
-</qet-directory>
diff --git a/elements/nomenclatures/bases/textes/text_10.elmt b/elements/nomenclatures/bases/textes/text_10.elmt
deleted file mode 100644
index c8a98fa4b..000000000
--- a/elements/nomenclatures/bases/textes/text_10.elmt
+++ /dev/null
@@ -1,16 +0,0 @@
-<definition width="20" version="0.3" hotspot_x="5" hotspot_y="12" height="30" type="element" orientation="dyyy">
-    <names>
-        <name lang="ar">حقل نصي T10</name>
-        <name lang="de">T10 Textfeld</name>
-        <name lang="el">Πεδίο κειμένου, μέγεθος 10</name>
-        <name lang="en">T10 text area</name>
-        <name lang="it">Testo (altezza 10)</name>
-        <name lang="fr">Zone texte T10</name>
-        <name lang="pl">Pole tekstowe T10</name>
-        <name lang="cs">Textové pole T10</name>
-    </names>
-    <informations></informations>
-    <description>
-        <input x="-3" y="3.6666" size="10" rotate="true" text="_"/>
-    </description>
-</definition>
diff --git a/elements/nomenclatures/bases/textes/text_12.elmt b/elements/nomenclatures/bases/textes/text_12.elmt
deleted file mode 100644
index c2be4b495..000000000
--- a/elements/nomenclatures/bases/textes/text_12.elmt
+++ /dev/null
@@ -1,16 +0,0 @@
-<definition width="20" version="0.3" hotspot_x="5" hotspot_y="10" height="30" type="element" orientation="dyyy">
-    <names>
-        <name lang="ar">حقل نصي T12</name>
-        <name lang="de">T12 Textfeld</name>
-        <name lang="el">Πεδίο κειμένου, μέγεθος 12</name>
-        <name lang="en">T12 text area</name>
-        <name lang="it">Testo (altezza 12)</name>
-        <name lang="fr">Zone texte T12</name>
-        <name lang="pl">Pole tekstowe T12</name>
-        <name lang="cs">Textové pole T12</name>
-    </names>
-    <informations></informations>
-    <description>
-        <input x="-3" y="5.6666" size="12" rotate="true" text="_"/>
-    </description>
-</definition>
diff --git a/elements/nomenclatures/bases/textes/text_14.elmt b/elements/nomenclatures/bases/textes/text_14.elmt
deleted file mode 100644
index b379989a7..000000000
--- a/elements/nomenclatures/bases/textes/text_14.elmt
+++ /dev/null
@@ -1,16 +0,0 @@
-<definition width="20" version="0.3" hotspot_x="7" hotspot_y="12" height="40" type="element" orientation="dyyy">
-    <names>
-        <name lang="ar">حقل نصي T14</name>
-        <name lang="de">T14 Textfeld</name>
-        <name lang="el">Πεδίο κειμένου, μέγεθος 14</name>
-        <name lang="en">T14 text area</name>
-        <name lang="it">Testo (altezza 14)</name>
-        <name lang="fr">Zone texte T14</name>
-        <name lang="pl">Pole tekstowe T14</name>
-        <name lang="cs">Textové pole T14</name>
-    </names>
-    <informations></informations>
-    <description>
-        <input x="-6" y="7.3333" size="14" rotate="true" text="_"/>
-    </description>
-</definition>
diff --git a/elements/nomenclatures/bases/textes/text_16.elmt b/elements/nomenclatures/bases/textes/text_16.elmt
deleted file mode 100644
index 75bc2e2b5..000000000
--- a/elements/nomenclatures/bases/textes/text_16.elmt
+++ /dev/null
@@ -1,16 +0,0 @@
-<definition width="20" version="0.3" hotspot_x="7" hotspot_y="13" height="40" type="element" orientation="dyyy">
-    <names>
-        <name lang="ar">حقل نصي T16</name>
-        <name lang="de">T16 Textfeld</name>
-        <name lang="el">Πεδίο κειμένου, μέγεθος 16</name>
-        <name lang="en">T16 text area</name>
-        <name lang="it">Testo (altezza 16)</name>
-        <name lang="fr">Zone texte T16</name>
-        <name lang="pl">Pole tekstowe T16</name>
-        <name lang="cs">Textové pole T16</name>
-    </names>
-    <informations></informations>
-    <description>
-        <input x="-6" y="7.3333" size="16" rotate="true" text="_"/>
-    </description>
-</definition>
diff --git a/elements/nomenclatures/bases/textes/text_18.elmt b/elements/nomenclatures/bases/textes/text_18.elmt
deleted file mode 100644
index 008fc8d9e..000000000
--- a/elements/nomenclatures/bases/textes/text_18.elmt
+++ /dev/null
@@ -1,16 +0,0 @@
-<definition width="30" version="0.3" hotspot_x="10" hotspot_y="12" height="40" type="element" orientation="dyyy">
-    <names>
-        <name lang="ar">حقل نصيT18</name>
-        <name lang="de">T10 Textfeld</name>
-        <name lang="el">Πεδίο κειμένου, μέγεθος 18</name>
-        <name lang="en">T10 text area</name>
-        <name lang="it">Testo (altezza 18)</name>
-        <name lang="fr">Zone texte T10</name>
-        <name lang="pl">Pole tekstowe T18</name>
-        <name lang="cs">Textové pole T18</name>
-    </names>
-    <informations></informations>
-    <description>
-        <input x="-7" y="8" size="18" rotate="true" text="_"/>
-    </description>
-</definition>
diff --git a/elements/nomenclatures/bases/textes/text_20.elmt b/elements/nomenclatures/bases/textes/text_20.elmt
deleted file mode 100644
index 0a621593f..000000000
--- a/elements/nomenclatures/bases/textes/text_20.elmt
+++ /dev/null
@@ -1,16 +0,0 @@
-<definition width="30" version="0.3" hotspot_x="11" hotspot_y="15" height="50" type="element" orientation="dyyy">
-    <names>
-        <name lang="ar">حقل نصي T20</name>
-        <name lang="de">T20 Textfeld</name>
-        <name lang="el">Πεδίο κειμένου, μέγεθος 20</name>
-        <name lang="en">T20 text area</name>
-        <name lang="it">Testo (altezza 20)</name>
-        <name lang="fr">Zone texte T20</name>
-        <name lang="pl">Pole tekstowe T20</name>
-        <name lang="cs">Textové pole T20</name>
-    </names>
-    <informations></informations>
-    <description>
-        <input x="-7" y="9.6666" size="20" rotate="true" text="_"/>
-    </description>
-</definition>
diff --git a/elements/nomenclatures/bases/textes/text_8.elmt b/elements/nomenclatures/bases/textes/text_8.elmt
deleted file mode 100644
index fe9e5cabc..000000000
--- a/elements/nomenclatures/bases/textes/text_8.elmt
+++ /dev/null
@@ -1,16 +0,0 @@
-<definition width="30" version="0.3" hotspot_x="10" hotspot_y="14" height="30" type="element" orientation="dyyy">
-    <names>
-        <name lang="ar">حقل نصي T8</name>
-        <name lang="de">T08 Textfeld</name>
-        <name lang="el">Πεδίο κειμένου, μέγεθος 08</name>
-        <name lang="en">T08 text area</name>
-        <name lang="it">Testo (altezza 08)</name>
-        <name lang="fr">Zone texte T08</name>
-        <name lang="pl">Pole tekstowe T08</name>
-        <name lang="cs">Textové pole T08</name>
-    </names>
-    <informations></informations>
-    <description>
-        <input x="-3" y="1.6666" size="8" rotate="true" text="_"/>
-    </description>
-</definition>