diff --git a/elements/01sources/convertisseurs/blocs/alim.elmt b/elements/01sources/convertisseurs/blocs/alim.elmt
new file mode 100644
index 000000000..85815e60c
--- /dev/null
+++ b/elements/01sources/convertisseurs/blocs/alim.elmt
@@ -0,0 +1,35 @@
+<definition width="70" version="0.4" hotspot_x="35" hotspot_y="50" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="ar">موحد محكوم</name>
+        <name lang="de">Gleichrichter</name>
+        <name lang="be">Gelijkrichter AC1/DC</name>
+        <name lang="el">Ανορθωτής</name>
+        <name lang="en">Rectifier</name>
+        <name lang="it">Raddrizzatore AC/DC</name>
+        <name lang="fr">Redresseur</name>
+        <name lang="pl">Zasilacz</name>
+        <name lang="nl">Gelijkrichter AC1/DC</name>
+        <name lang="cs">Usměrňovač proudu</name>
+    </names>
+    <informations>EN 60617: 06-14-03</informations>
+    <description>
+        <rect width="60" x="-30" y="-40" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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="-4" x1="-12" y2="-4" x2="-8"/>
+        <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="-4" x1="8" y2="-4" x2="12"/>
+        <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="-10" x1="12" y2="-10" x2="23"/>
+        <line length1="0" length2="0" antialias="true" end1="simple" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="-40" x2="30"/>
+        <arc width="5" x="-19.5" y="-35.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175"/>
+        <arc width="5" x="-24.5" y="-35.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175"/>
+        <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="-28" x1="-25" y2="-28" x2="-14"/>
+        <rect width="9" x="13" y="-12" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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="-6" x1="10" y2="-2" x2="10"/>
+        <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="-45" x1="-10" y2="-40" x2="-10"/>
+        <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="-45" x1="10" y2="-40" x2="10"/>
+        <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="-10" y2="5" x2="-10"/>
+        <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="10" y2="5" x2="10"/>
+        <terminal x="10" y="-45" orientation="n"/>
+        <terminal x="-10" y="-45" orientation="n"/>
+        <terminal x="-10" y="5" orientation="s"/>
+        <terminal x="10" y="5" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/03relayage/bornes/bornes/borne_f.elmt b/elements/03relayage/bornes/bornes/borne_f.elmt
deleted file mode 100644
index e3053ee72..000000000
--- a/elements/03relayage/bornes/bornes/borne_f.elmt
+++ /dev/null
@@ -1,23 +0,0 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" ic="true" orientation="dyyy">
-    <names>
-        <name lang="ar">طرف نهائي</name>
-        <name lang="de">Endklemme</name>
-        <name lang="ru">Клеммник</name>
-        <name lang="pt">Terminal de fim</name>
-        <name lang="en">Terminal block</name>
-        <name lang="it">Terminale</name>
-        <name lang="fr">Borne finale</name>
-        <name lang="pl">Zacisk</name>
-        <name lang="es">Punto de unión</name>
-        <name lang="cs">Koncová svorka</name>
-        <name lang="nl">Klem eind</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input x="8" y="0.6666" size="9" text="_"/>
-        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <terminal x="0" y="3" orientation="s"/>
-        <terminal x="0" y="-3" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/03relayage/recepteurs/lampes/fluo.elmt b/elements/03relayage/recepteurs/lampes/fluo.elmt
new file mode 100644
index 000000000..0a92f2ccc
--- /dev/null
+++ b/elements/03relayage/recepteurs/lampes/fluo.elmt
@@ -0,0 +1,17 @@
+<definition width="20" version="0.4" hotspot_x="9" hotspot_y="75" height="170" link_type="simple" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="en">Fluorescent tube</name>
+        <name lang="fr">Tube fluorescent</name>
+    </names>
+    <informations></informations>
+    <description>
+        <arc width="9" x="-4" y="70" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="180"/>
+        <rect width="11" x="-5" y="-61" antialias="false" height="140" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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="-58" x1="0" y2="-67" x2="0"/>
+        <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="76" x1="0" y2="86" x2="0"/>
+        <arc width="9" x="-4" y="-57" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-180"/>
+        <input x="-60" y="10" size="9" rotate="true" text="_" tagg="label"/>
+        <terminal x="0" y="-67" orientation="n"/>
+        <terminal x="0" y="86" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/061bornes/borne_2.elmt b/elements/061bornes/borne_2.elmt
new file mode 100644
index 000000000..e26029a7c
--- /dev/null
+++ b/elements/061bornes/borne_2.elmt
@@ -0,0 +1,26 @@
+<definition width="20" version="0.4" hotspot_x="5" hotspot_y="15" height="30" link_type="terminal" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="ar">طرف توصيل</name>
+        <name lang="de">Klemmblock</name>
+        <name lang="ru">Клеммное соединение</name>
+        <name lang="pt">Terminal de combinação</name>
+        <name lang="en">Terminal block</name>
+        <name lang="it">Terminale di unione</name>
+        <name lang="fr">Borne continuité</name>
+        <name lang="pl">Zacisk</name>
+        <name lang="es">Terminal de unión</name>
+        <name lang="nl">klem doorgang</name>
+        <name lang="cs">Spojovací svorka</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</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="10" x1="0" y2="3" x2="0"/>
+        <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="-10" x1="0" y2="-3" x2="0"/>
+        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <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="10" y2="0" x2="3"/>
+        <terminal x="0" y="-10" orientation="n"/>
+        <terminal x="0" y="10" orientation="s"/>
+        <terminal x="10" y="0" orientation="e"/>
+    </description>
+</definition>
diff --git a/elements/061bornes/borne_3.elmt b/elements/061bornes/borne_3.elmt
new file mode 100644
index 000000000..81c59acbb
--- /dev/null
+++ b/elements/061bornes/borne_3.elmt
@@ -0,0 +1,24 @@
+<definition width="20" version="0.4" hotspot_x="15" hotspot_y="15" height="20" link_type="terminal" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="ar">طرف توصيل</name>
+        <name lang="de">Klemmblock</name>
+        <name lang="ru">Клеммное соединение</name>
+        <name lang="pt">Terminal de combinação</name>
+        <name lang="en">Terminal block</name>
+        <name lang="it">Terminale di unione</name>
+        <name lang="fr">Borne continuité</name>
+        <name lang="pl">Zacisk</name>
+        <name lang="es">Terminal de unión</name>
+        <name lang="nl">klem doorgang</name>
+        <name lang="cs">Spojovací svorka</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</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="-10" x1="0" y2="-3" x2="0"/>
+        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <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="-3" y2="0" x2="-10"/>
+        <terminal x="0" y="-10" orientation="n"/>
+        <terminal x="-10" y="0" orientation="w"/>
+    </description>
+</definition>
diff --git a/elements/061bornes/borne_5.elmt b/elements/061bornes/borne_5.elmt
new file mode 100644
index 000000000..577950088
--- /dev/null
+++ b/elements/061bornes/borne_5.elmt
@@ -0,0 +1,28 @@
+<definition width="30" version="0.4" hotspot_x="15" hotspot_y="15" height="30" link_type="terminal" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="ar">طرف توصيل</name>
+        <name lang="de">Klemmblock</name>
+        <name lang="ru">Клеммное соединение</name>
+        <name lang="pt">Terminal de combinação</name>
+        <name lang="en">Terminal block</name>
+        <name lang="it">Terminale di unione</name>
+        <name lang="fr">Borne continuité</name>
+        <name lang="pl">Zacisk</name>
+        <name lang="es">Terminal de unión</name>
+        <name lang="nl">klem doorgang</name>
+        <name lang="cs">Spojovací svorka</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</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="-3" y2="0" x2="-10"/>
+        <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="10" x1="0" y2="3" x2="0"/>
+        <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="-10" x1="0" y2="-3" x2="0"/>
+        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <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="10" y2="0" x2="3"/>
+        <terminal x="0" y="-10" orientation="n"/>
+        <terminal x="0" y="10" orientation="s"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="-10" y="0" orientation="w"/>
+    </description>
+</definition>
diff --git a/elements/03relayage/bornes/bornes/borne_finale.elmt b/elements/061bornes/borne_finale.elmt
similarity index 100%
rename from elements/03relayage/bornes/bornes/borne_finale.elmt
rename to elements/061bornes/borne_finale.elmt
diff --git a/elements/061bornes/bornedouble.elmt b/elements/061bornes/bornedouble.elmt
new file mode 100644
index 000000000..15694fff8
--- /dev/null
+++ b/elements/061bornes/bornedouble.elmt
@@ -0,0 +1,28 @@
+<definition width="10" version="0.4" hotspot_x="4" hotspot_y="15" height="40" link_type="terminal" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="ar">طرف توصيل</name>
+        <name lang="de">Klemmblock</name>
+        <name lang="ru">Клеммное соединение</name>
+        <name lang="pt">Terminal de combinação</name>
+        <name lang="en">Terminal block</name>
+        <name lang="it">Terminale di unione</name>
+        <name lang="fr">Borne double</name>
+        <name lang="pl">Zacisk</name>
+        <name lang="es">Terminal de unión</name>
+        <name lang="nl">klem doorgang</name>
+        <name lang="cs">Spojovací svorka</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <input x="3" y="6.5" size="7" text="_" tagg="none"/>
+        <circle x="-2.5" y="6.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <input x="3" y="-2.5" size="7" text="_" tagg="none"/>
+        <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="19" x1="0" y2="12" x2="0"/>
+        <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="-10" x1="0" y2="-3" x2="0"/>
+        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <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="3" x1="0" y2="6" x2="0"/>
+        <terminal x="0" y="-10" orientation="n"/>
+        <terminal x="0" y="19" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/07securite_des_machines/blocs_de_securite/preventa/xps_gske.elmt b/elements/07securite_des_machines/blocs_de_securite/preventa/xps_gske.elmt
new file mode 100644
index 000000000..d6bdc7a52
--- /dev/null
+++ b/elements/07securite_des_machines/blocs_de_securite/preventa/xps_gske.elmt
@@ -0,0 +1,56 @@
+<definition width="470" version="0.4" hotspot_x="206" hotspot_y="65" height="140" link_type="simple" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="ar">XPS-GSKE</name>
+        <name lang="en">XPS-GSKE</name>
+        <name lang="fr">XPS-GSKE</name>
+        <name lang="pl">XPS-GSKE</name>
+        <name lang="cs">XPS-GSKE</name>
+        <name lang="es">XPS-GSKE</name>
+        <name lang="it">XPS-GSKE</name>
+        <name lang="nl">XPS-GSKE</name>
+    </names>
+    <informations></informations>
+    <description>
+        <rect width="466" x="-204" y="-50" antialias="false" height="110" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-193" y="53.05" size="6" text="A2"/>
+        <text x="92" y="-38" size="6" text="T22"/>
+        <text x="-192" y="-35.95" size="6" text="A1"/>
+        <text x="233" y="-39" size="6" text="T12"/>
+        <text x="163" y="-39" size="6" text="T21"/>
+        <text x="-156" y="-34.95" size="6" text="13"/>
+        <text x="26" y="-37.95" size="6" text="B1"/>
+        <text x="-124" y="-36" size="6" text="23"/>
+        <text x="-56" y="-37" size="6" text="T11"/>
+        <text x="-124" y="52" size="6" text="24"/>
+        <text x="-155" y="52" size="6" text="14"/>
+        <text x="-95" y="-37" size="6" text="T34"/>
+        <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="-29.75" x1="-160" y2="-9.5" x2="-160"/>
+        <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="-50.0537" x1="100" y2="-59.4241" x2="100"/>
+        <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="-50.0537" x1="-90" y2="-59.4241" x2="-90"/>
+        <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="-30.595" x1="-160" y2="-60.0783" x2="-160"/>
+        <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="-29.7011" x1="-130" y2="-59.9803" x2="-130"/>
+        <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="-50.0537" x1="30" y2="-59.4241" x2="30"/>
+        <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="-50.0537" x1="-50" y2="-59.4241" x2="-50"/>
+        <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="69.1926" x1="-190" y2="59.8222" x2="-190"/>
+        <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="-50.0537" x1="170" y2="-59.4241" x2="170"/>
+        <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="-50.0537" x1="240" y2="-59.4241" x2="240"/>
+        <polygon x4="-160" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-8" x1="-170" y2="18" x2="-160" y3="70" x3="-160" y4="70"/>
+        <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="-50.8074" x1="-190" y2="-60.1778" x2="-190"/>
+        <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="-29.75" x1="-130" y2="-9.5" x2="-130"/>
+        <polygon x4="-130" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-8" x1="-140" y2="18" x2="-130" y3="70" x3="-130" y4="70"/>
+        <input x="-35" y="17" size="9" rotate="true" text="_" tagg="label"/>
+        <text x="112" y="54" size="6" text="PREVENTA GSKE"/>
+        <terminal x="-190" y="-60" orientation="n"/>
+        <terminal x="-160" y="-60" orientation="n"/>
+        <terminal x="-130" y="-60" orientation="n"/>
+        <terminal x="-90" y="-59.2463" orientation="n"/>
+        <terminal x="-50" y="-59.2463" orientation="n"/>
+        <terminal x="30" y="-59.2463" orientation="n"/>
+        <terminal x="100" y="-59.2463" orientation="n"/>
+        <terminal x="170" y="-59.2463" orientation="n"/>
+        <terminal x="240" y="-59.2463" orientation="n"/>
+        <terminal x="-190" y="70" orientation="s"/>
+        <terminal x="-160" y="70" orientation="s"/>
+        <terminal x="-130" y="70" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/20nomenclatures/bases/nomenclature/cable.elmt b/elements/20nomenclatures/bases/cables/cable.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/cable.elmt
rename to elements/20nomenclatures/bases/cables/cable.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/cable1.elmt b/elements/20nomenclatures/bases/cables/cable1.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/cable1.elmt
rename to elements/20nomenclatures/bases/cables/cable1.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/cable2.elmt b/elements/20nomenclatures/bases/cables/cable2.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/cable2.elmt
rename to elements/20nomenclatures/bases/cables/cable2.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/etiquette_triphase.elmt b/elements/20nomenclatures/bases/cables/etiquette_triphase.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/etiquette_triphase.elmt
rename to elements/20nomenclatures/bases/cables/etiquette_triphase.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/nomenclature_section.elmt b/elements/20nomenclatures/bases/cables/nomenclature_section.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/nomenclature_section.elmt
rename to elements/20nomenclatures/bases/cables/nomenclature_section.elmt
diff --git a/elements/20nomenclatures/bases/cables/qet_directory b/elements/20nomenclatures/bases/cables/qet_directory
new file mode 100644
index 000000000..19275393a
--- /dev/null
+++ b/elements/20nomenclatures/bases/cables/qet_directory
@@ -0,0 +1,6 @@
+<qet-directory>
+    <names>
+        <name lang="en">Cables</name>
+        <name lang="fr">Cables</name>
+    </names>
+</qet-directory>
diff --git a/elements/20nomenclatures/bases/nomenclature/section1conducteur.elmt b/elements/20nomenclatures/bases/cables/section1conducteur.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/section1conducteur.elmt
rename to elements/20nomenclatures/bases/cables/section1conducteur.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/section2-1conducteurs.elmt b/elements/20nomenclatures/bases/cables/section2-1conducteurs.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/section2-1conducteurs.elmt
rename to elements/20nomenclatures/bases/cables/section2-1conducteurs.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/section2conducteurs.elmt b/elements/20nomenclatures/bases/cables/section2conducteurs.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/section2conducteurs.elmt
rename to elements/20nomenclatures/bases/cables/section2conducteurs.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/section3.elmt b/elements/20nomenclatures/bases/cables/section3.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/section3.elmt
rename to elements/20nomenclatures/bases/cables/section3.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/0volt.elmt b/elements/20nomenclatures/bases/nomenclature/0volt.elmt
deleted file mode 100644
index 6106690c3..000000000
--- a/elements/20nomenclatures/bases/nomenclature/0volt.elmt
+++ /dev/null
@@ -1,11 +0,0 @@
-<definition width="40" version="0.2" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="ydyy" >
-    <names>
-        <name lang="fr" >0 VDC</name>
-        <name lang="it">0 Vdc</name>
-    </names>
-    <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="0" y2="0" x2="15" />
-        <input x="-16" y="-2.66667" size="5" rotate="true" text="0VDC" />
-        <terminal x="15" y="0" orientation="e" />
-    </description>
-</definition>
diff --git a/elements/20nomenclatures/bases/nomenclature/24volt.elmt b/elements/20nomenclatures/bases/nomenclature/24volt.elmt
deleted file mode 100644
index 3437cacd0..000000000
--- a/elements/20nomenclatures/bases/nomenclature/24volt.elmt
+++ /dev/null
@@ -1,11 +0,0 @@
-<definition width="40" version="0.2" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="ydyy" >
-    <names>
-        <name lang="fr" >24 VDC</name>
-        <name lang="it">24 Vdc</name>
-    </names>
-    <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="0" y2="0" x2="14" />
-        <input x="-14" y="-3.66667" size="5" rotate="true" text="24VDC" />
-        <terminal x="14" y="0" orientation="e" />
-    </description>
-</definition>
diff --git a/elements/20nomenclatures/bases/nomenclature/commentaire.elmt b/elements/20nomenclatures/bases/nomenclature/commentaire.elmt
deleted file mode 100644
index c859e0d5e..000000000
--- a/elements/20nomenclatures/bases/nomenclature/commentaire.elmt
+++ /dev/null
@@ -1,9 +0,0 @@
-<definition width="100" version="0.2" hotspot_x="15" hotspot_y="17" height="30" type="element" orientation="dyyy" >
-    <names>
-        <name lang="fr">commentaire</name>
-        <name lang="it">commento</name>
-    </names>
-    <description>
-        <input x="-3" y="1.66667" size="10" rotate="true" text="Commentaire" />
-    </description>
-</definition>
diff --git a/elements/20nomenclatures/bases/qet_directory b/elements/20nomenclatures/bases/qet_directory
index e3f8381b2..47b10bc99 100644
--- a/elements/20nomenclatures/bases/qet_directory
+++ b/elements/20nomenclatures/bases/qet_directory
@@ -1,9 +1,9 @@
 <qet-directory>
     <names>
         <name lang="de">Formulare</name>
-        <name lang="en">Bases</name>
+        <name lang="en">Table</name>
         <name lang="el">Βάσεις</name>
-        <name lang="fr">Bases</name>
+        <name lang="fr">Tableaux</name>
         <name lang="ar">أساسيات</name>
         <name lang="pl">Podstawowe</name>
         <name lang="cs">Základy</name>
diff --git a/elements/20nomenclatures/bases/nomenclature/cartouche_de_garde.elmt b/elements/20nomenclatures/bases/tableaux/cartouche_de_garde.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/cartouche_de_garde.elmt
rename to elements/20nomenclatures/bases/tableaux/cartouche_de_garde.elmt
diff --git a/elements/20nomenclatures/bases/grille_composition.elmt b/elements/20nomenclatures/bases/tableaux/grille_composition.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/grille_composition.elmt
rename to elements/20nomenclatures/bases/tableaux/grille_composition.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/ligne_tab_nomenclature.elmt b/elements/20nomenclatures/bases/tableaux/ligne_tab_nomenclature.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/ligne_tab_nomenclature.elmt
rename to elements/20nomenclatures/bases/tableaux/ligne_tab_nomenclature.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/nomenclature1.elmt b/elements/20nomenclatures/bases/tableaux/nomenclature1.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/nomenclature1.elmt
rename to elements/20nomenclatures/bases/tableaux/nomenclature1.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/nomenclature2.elmt b/elements/20nomenclatures/bases/tableaux/nomenclature2.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/nomenclature2.elmt
rename to elements/20nomenclatures/bases/tableaux/nomenclature2.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/pagegarde.elmt b/elements/20nomenclatures/bases/tableaux/pagegarde.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/pagegarde.elmt
rename to elements/20nomenclatures/bases/tableaux/pagegarde.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/qet_directory b/elements/20nomenclatures/bases/tableaux/qet_directory
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/qet_directory
rename to elements/20nomenclatures/bases/tableaux/qet_directory
diff --git a/elements/20nomenclatures/bases/nomenclature/repere_contacts_par_4.elmt b/elements/20nomenclatures/bases/tableaux/repere_contacts_par_4.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/repere_contacts_par_4.elmt
rename to elements/20nomenclatures/bases/tableaux/repere_contacts_par_4.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/repere_relai_contacteur.elmt b/elements/20nomenclatures/bases/tableaux/repere_relai_contacteur.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/repere_relai_contacteur.elmt
rename to elements/20nomenclatures/bases/tableaux/repere_relai_contacteur.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/repertoire_de_folio.elmt b/elements/20nomenclatures/bases/tableaux/repertoire_de_folio.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/repertoire_de_folio.elmt
rename to elements/20nomenclatures/bases/tableaux/repertoire_de_folio.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/titre_tab_nomenclature-el.elmt b/elements/20nomenclatures/bases/tableaux/titre_tab_nomenclature-el.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/titre_tab_nomenclature-el.elmt
rename to elements/20nomenclatures/bases/tableaux/titre_tab_nomenclature-el.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/titre_tab_nomenclature.elmt b/elements/20nomenclatures/bases/tableaux/titre_tab_nomenclature.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/titre_tab_nomenclature.elmt
rename to elements/20nomenclatures/bases/tableaux/titre_tab_nomenclature.elmt
diff --git a/elements/20nomenclatures/bases/nomenclature/version.elmt b/elements/20nomenclatures/bases/tableaux/version.elmt
similarity index 100%
rename from elements/20nomenclatures/bases/nomenclature/version.elmt
rename to elements/20nomenclatures/bases/tableaux/version.elmt