diff --git a/elements/03relayage/01bobines/bobine1.elmt b/elements/03relayage/01bobines/bobine1.elmt
index 58ac63878..6db9e998c 100644
--- a/elements/03relayage/01bobines/bobine1.elmt
+++ b/elements/03relayage/01bobines/bobine1.elmt
@@ -18,7 +18,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <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="-20" x1="0" y2="-10" 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="25" y2="-10" x2="25"/>
         <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="-5" y2="10" x2="25"/>
-        <input x="30" y="3" size="9" text="_"/>
+        <input x="30" y="3" size="9" text="_" tagg="label"/>
         <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="25" y2="-10" x2="-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="-10" x1="-5" y2="10" x2="-5"/>
         <terminal x="0" y="-21" orientation="n"/>
diff --git a/elements/03relayage/01bobines/bobine3.elmt b/elements/03relayage/01bobines/bobine3.elmt
index 5e34ad3e5..07aeed1aa 100644
--- a/elements/03relayage/01bobines/bobine3.elmt
+++ b/elements/03relayage/01bobines/bobine3.elmt
@@ -19,7 +19,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <input x="2" y="19.3333" size="4" rotate="true" text="A2"/>
         <input x="2" y="-16.6667" size="4" rotate="true" text="A1"/>
         <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="8" x1="0" y2="20" x2="0"/>
-        <input x="25" y="3.3333" size="9" text="KA1"/>
+        <input x="25" y="3.3333" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-21" orientation="n"/>
         <terminal x="0" y="21" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/bobine_ka_a_remanence.elmt b/elements/03relayage/01bobines/bobine_ka_a_remanence.elmt
index 4131fad5d..f018f8cbb 100644
--- a/elements/03relayage/01bobines/bobine_ka_a_remanence.elmt
+++ b/elements/03relayage/01bobines/bobine_ka_a_remanence.elmt
@@ -22,7 +22,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <input x="2" y="19.3333" size="4" rotate="true" text="A2"/>
         <input x="2" y="-16.6667" size="4" rotate="true" text="A1"/>
         <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="8" x1="0" y2="20" x2="0"/>
-        <input x="30" y="3.3333" size="9" text="KA1"/>
+        <input x="30" y="3.3333" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-21" orientation="n"/>
         <terminal x="0" y="21" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/bobine_ka_a_verrouillage_mecanique.elmt b/elements/03relayage/01bobines/bobine_ka_a_verrouillage_mecanique.elmt
index 5b3d27f5c..66b3aa336 100644
--- a/elements/03relayage/01bobines/bobine_ka_a_verrouillage_mecanique.elmt
+++ b/elements/03relayage/01bobines/bobine_ka_a_verrouillage_mecanique.elmt
@@ -20,7 +20,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <input x="2" y="19.3333" size="4" rotate="true" text="A2"/>
         <input x="2" y="-16.6667" size="4" rotate="true" text="A1"/>
         <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="8" x1="0" y2="20" x2="0"/>
-        <input x="30" y="3.3333" size="9" text="KA1"/>
+        <input x="30" y="3.3333" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-21" orientation="n"/>
         <terminal x="0" y="21" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/bobine_tempo_repos-travail.elmt b/elements/03relayage/01bobines/bobine_tempo_repos-travail.elmt
index e33050a0c..01b7c0368 100644
--- a/elements/03relayage/01bobines/bobine_tempo_repos-travail.elmt
+++ b/elements/03relayage/01bobines/bobine_tempo_repos-travail.elmt
@@ -21,7 +21,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <input x="2" y="19.3333" size="4" rotate="true" text="A2"/>
         <input x="2" y="-16.6667" size="4" rotate="true" text="A1"/>
         <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="8" x1="0" y2="20" x2="0"/>
-        <input x="25" y="2.3333" size="9" text="KA1"/>
+        <input x="25" y="2.3333" size="9" text="_" tagg="label"/>
         <rect width="4" x="6" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
         <terminal x="0" y="-21" orientation="n"/>
         <terminal x="0" y="21" orientation="s"/>
diff --git a/elements/03relayage/01bobines/bobine_tempo_repos.elmt b/elements/03relayage/01bobines/bobine_tempo_repos.elmt
index 9fb7578d5..8d12e6c15 100644
--- a/elements/03relayage/01bobines/bobine_tempo_repos.elmt
+++ b/elements/03relayage/01bobines/bobine_tempo_repos.elmt
@@ -20,7 +20,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <input x="2" y="19.3333" size="4" rotate="true" text="A2"/>
         <input x="2" y="-16.6667" size="4" rotate="true" text="A1"/>
         <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="8" x1="0" y2="20" x2="0"/>
-        <input x="25" y="3.3333" size="9" text="KA1"/>
+        <input x="25" y="3.3333" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-21" orientation="n"/>
         <terminal x="0" y="21" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/bobine_tempo_travail.elmt b/elements/03relayage/01bobines/bobine_tempo_travail.elmt
index 017222505..6ef38aeda 100644
--- a/elements/03relayage/01bobines/bobine_tempo_travail.elmt
+++ b/elements/03relayage/01bobines/bobine_tempo_travail.elmt
@@ -22,7 +22,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <input x="2" y="19.3333" size="4" rotate="true" text="A2"/>
         <input x="2" y="-16.6667" size="4" rotate="true" text="A1"/>
         <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="8" x1="0" y2="20" x2="0"/>
-        <input x="25" y="3.3333" size="9" text="KA1"/>
+        <input x="25" y="3.3333" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-21" orientation="n"/>
         <terminal x="0" y="21" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/comm_courant_alter.elmt b/elements/03relayage/01bobines/comm_courant_alter.elmt
index 3acd8420c..0c3ea3230 100644
--- a/elements/03relayage/01bobines/comm_courant_alter.elmt
+++ b/elements/03relayage/01bobines/comm_courant_alter.elmt
@@ -17,7 +17,7 @@
         <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="-20" x1="0" y2="-10" x2="0"/>
         <input x="-14" y="18" size="4" text="A2"/>
         <input x="-14" y="-17" size="4" text="A1"/>
-        <input x="16" y="0.5" size="9" text="_"/>
+        <input x="16" y="0.5" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-20" orientation="n"/>
         <terminal x="0" y="20" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/comm_electronique.elmt b/elements/03relayage/01bobines/comm_electronique.elmt
index f3a947e07..7cd985804 100644
--- a/elements/03relayage/01bobines/comm_electronique.elmt
+++ b/elements/03relayage/01bobines/comm_electronique.elmt
@@ -19,7 +19,7 @@
         <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="-20" x1="0" y2="-10" x2="0"/>
         <input x="-14" y="18" size="4" text="A2"/>
         <input x="-14" y="-17" size="4" text="A1"/>
-        <input x="16" y="0.5" size="9" text="_"/>
+        <input x="16" y="0.5" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-20" orientation="n"/>
         <terminal x="0" y="20" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/comm_insens_au_courant_alter.elmt b/elements/03relayage/01bobines/comm_insens_au_courant_alter.elmt
index 31306c3f2..69ee34c69 100644
--- a/elements/03relayage/01bobines/comm_insens_au_courant_alter.elmt
+++ b/elements/03relayage/01bobines/comm_insens_au_courant_alter.elmt
@@ -16,7 +16,7 @@
         <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="-20" x1="0" y2="-10" x2="0"/>
         <input x="-14" y="18" size="4" text="A2"/>
         <input x="-14" y="-17" size="4" text="A1"/>
-        <input x="16" y="0.5" size="9" text="_"/>
+        <input x="16" y="0.5" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-20" orientation="n"/>
         <terminal x="0" y="20" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/comm_polarise.elmt b/elements/03relayage/01bobines/comm_polarise.elmt
index c878b98b5..b90f6a1a4 100644
--- a/elements/03relayage/01bobines/comm_polarise.elmt
+++ b/elements/03relayage/01bobines/comm_polarise.elmt
@@ -18,7 +18,7 @@
         <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="-20" x1="0" y2="-10" x2="0"/>
         <input x="-14" y="18" size="4" text="A2"/>
         <input x="-14" y="-17" size="4" text="A1"/>
-        <input x="16" y="0.5" size="9" text="_"/>
+        <input x="16" y="0.5" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-20" orientation="n"/>
         <terminal x="0" y="20" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/comm_rapides.elmt b/elements/03relayage/01bobines/comm_rapides.elmt
index a3fc5fb6c..7fe5a5acd 100644
--- a/elements/03relayage/01bobines/comm_rapides.elmt
+++ b/elements/03relayage/01bobines/comm_rapides.elmt
@@ -17,7 +17,7 @@
         <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="-20" x1="0" y2="-10" x2="0"/>
         <input x="-14" y="18" size="4" text="A2"/>
         <input x="-14" y="-17" size="4" text="A1"/>
-        <input x="16" y="0.5" size="9" text="_"/>
+        <input x="16" y="0.5" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-20" orientation="n"/>
         <terminal x="0" y="20" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/comm_remanence.elmt b/elements/03relayage/01bobines/comm_remanence.elmt
index 64974508e..e38cbe557 100644
--- a/elements/03relayage/01bobines/comm_remanence.elmt
+++ b/elements/03relayage/01bobines/comm_remanence.elmt
@@ -16,7 +16,7 @@
         <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="-20" x1="0" y2="-10" x2="0"/>
         <input x="-14" y="18" size="4" text="A2"/>
         <input x="-14" y="-17" size="4" text="A1"/>
-        <input x="16" y="0.5" size="9" text="_"/>
+        <input x="16" y="0.5" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-20" orientation="n"/>
         <terminal x="0" y="20" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/comm_repos_retardee.elmt b/elements/03relayage/01bobines/comm_repos_retardee.elmt
index 54391e939..84b5879e3 100644
--- a/elements/03relayage/01bobines/comm_repos_retardee.elmt
+++ b/elements/03relayage/01bobines/comm_repos_retardee.elmt
@@ -16,7 +16,7 @@
         <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="-20" x1="0" y2="-10" x2="0"/>
         <input x="-14" y="18" size="4" text="A2"/>
         <input x="-14" y="-17" size="4" text="A1"/>
-        <input x="16" y="0.5" size="9" text="_"/>
+        <input x="16" y="0.5" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-20" orientation="n"/>
         <terminal x="0" y="20" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/comm_repos_travail_retardee.elmt b/elements/03relayage/01bobines/comm_repos_travail_retardee.elmt
index 26e2e7620..6fbb2aece 100644
--- a/elements/03relayage/01bobines/comm_repos_travail_retardee.elmt
+++ b/elements/03relayage/01bobines/comm_repos_travail_retardee.elmt
@@ -19,7 +19,7 @@
         <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="-20" x1="0" y2="-10" x2="0"/>
         <input x="-14" y="18" size="4" text="A2"/>
         <input x="-14" y="-17" size="4" text="A1"/>
-        <input x="16" y="0.5" size="9" text="_"/>
+        <input x="16" y="0.5" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-20" orientation="n"/>
         <terminal x="0" y="20" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/comm_thermique.elmt b/elements/03relayage/01bobines/comm_thermique.elmt
index 91c23af40..eeb18f6a7 100644
--- a/elements/03relayage/01bobines/comm_thermique.elmt
+++ b/elements/03relayage/01bobines/comm_thermique.elmt
@@ -14,7 +14,7 @@
         <polygon x4="-8" y5="4" x5="0" y6="20" x6="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="0" y2="-5" x2="0" y3="-5" x3="-8" y4="4"/>
         <input x="-14" y="18" size="4" text="A2"/>
         <input x="-14" y="-17" size="4" text="A1"/>
-        <input x="16" y="0.5" size="9" text="_"/>
+        <input x="16" y="0.5" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-20" orientation="n"/>
         <terminal x="0" y="20" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/comm_travail_retardee.elmt b/elements/03relayage/01bobines/comm_travail_retardee.elmt
index c75a6462b..326b998ba 100644
--- a/elements/03relayage/01bobines/comm_travail_retardee.elmt
+++ b/elements/03relayage/01bobines/comm_travail_retardee.elmt
@@ -18,7 +18,7 @@
         <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="-20" x1="0" y2="-10" x2="0"/>
         <input x="-14" y="18" size="4" text="A2"/>
         <input x="-14" y="-17" size="4" text="A1"/>
-        <input x="16" y="0.5" size="9" text="_"/>
+        <input x="16" y="0.5" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-20" orientation="n"/>
         <terminal x="0" y="20" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/comm_verr_mecanique.elmt b/elements/03relayage/01bobines/comm_verr_mecanique.elmt
index ded78eae9..387d2ca83 100644
--- a/elements/03relayage/01bobines/comm_verr_mecanique.elmt
+++ b/elements/03relayage/01bobines/comm_verr_mecanique.elmt
@@ -17,7 +17,7 @@
         <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="-20" x1="0" y2="-10" x2="0"/>
         <input x="-14" y="18" size="4" text="A2"/>
         <input x="-14" y="-17" size="4" text="A1"/>
-        <input x="16" y="0.5" size="9" text="_"/>
+        <input x="16" y="0.5" size="9" text="_" tagg="label"/>
         <terminal x="0" y="-20" orientation="n"/>
         <terminal x="0" y="20" orientation="s"/>
     </description>
diff --git a/elements/03relayage/01bobines/relbistable.elmt b/elements/03relayage/01bobines/relbistable.elmt
index 8f4a54929..308374169 100644
--- a/elements/03relayage/01bobines/relbistable.elmt
+++ b/elements/03relayage/01bobines/relbistable.elmt
@@ -21,7 +21,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <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="9" x1="0" y2="21" 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="8" x1="14" y2="-8" x2="14"/>
         <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="8" x1="-14" y2="8" x2="14"/>
-        <input x="20" y="2.6666" size="9" text="_"/>
+        <input x="20" y="2.6666" size="9" text="_" tagg="label"/>
         <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="-8" x1="14" y2="-8" x2="-14"/>
         <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="-8" x1="-14" y2="8" x2="-14"/>
         <terminal x="0" y="-20" orientation="n"/>
diff --git a/elements/03relayage/02esclaves/puissance/qet_directory b/elements/03relayage/02esclaves/puissance/qet_directory
deleted file mode 100644
index 4bdc10784..000000000
--- a/elements/03relayage/02esclaves/puissance/qet_directory
+++ /dev/null
@@ -1,15 +0,0 @@
-<qet-directory>
-    <names>
-        <name lang="ar">قدرة</name>
-        <name lang="de">Leistung</name>
-        <name lang="ru">контактора</name>
-        <name lang="pt">Potência</name>
-        <name lang="en">Power</name>
-        <name lang="it">Potenza</name>
-        <name lang="fr">Puissance</name>
-        <name lang="pl">Styczniki</name>
-        <name lang="es">Potencia</name>
-        <name lang="cs">Síla</name>
-        <name lang="el">Ισχύος</name>
-    </names>
-</qet-directory>
diff --git a/elements/03relayage/contacts/auxiliary_contacts/aux_contact_2no-2nc.elmt b/elements/03relayage/contacts/auxiliary_contacts/aux_contact_2no-2nc.elmt
index 4721ba279..286f80590 100755
--- a/elements/03relayage/contacts/auxiliary_contacts/aux_contact_2no-2nc.elmt
+++ b/elements/03relayage/contacts/auxiliary_contacts/aux_contact_2no-2nc.elmt
@@ -1,4 +1,4 @@
-<definition width="100" version="0.3" hotspot_x="48" hotspot_y="31" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
+<definition width="100" version="0.3" hotspot_x="48" hotspot_y="31" height="60" type="element" ic="true" orientation="dyyy" >
     <names>
         <name lang="el">Βοηθητικές επαφές, 2 ανοικτές + 2 κλειστές</name>
         <name lang="en">Auxiliary contact 2 x NO + 2 x NC</name>
diff --git a/elements/03relayage/02esclaves/auxiliary_contacts/aux_contact_2no.elmt b/elements/03relayage/contacts/auxiliary_contacts/aux_contact_2no.elmt
similarity index 83%
rename from elements/03relayage/02esclaves/auxiliary_contacts/aux_contact_2no.elmt
rename to elements/03relayage/contacts/auxiliary_contacts/aux_contact_2no.elmt
index 248abeba3..0aa48f8a4 100755
--- a/elements/03relayage/02esclaves/auxiliary_contacts/aux_contact_2no.elmt
+++ b/elements/03relayage/contacts/auxiliary_contacts/aux_contact_2no.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="28" hotspot_y="41" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
+<definition width="60" version="0.3" hotspot_x="28" hotspot_y="41" height="60" type="element" ic="true" orientation="dyyy" >
     <names>
         <name lang="el">Βοηθητικές επαφές, 2 ανοικτές</name>
         <name lang="en">Auxiliary contact 2 x NO</name>
@@ -10,12 +10,6 @@
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <kindInformations>
-        <kindInformation name="state" show="1">NO</kindInformation>
-        <kindInformation name="number" show="1">2</kindInformation>
-        <kindInformation name="type" show="1">simple</kindInformation>
-        <kindInformation name="tempoType" show="0"></kindInformation>
-    </kindInformations>
     <description>
         <input x="-23" y="6" size="4" text="54"/>
         <input x="-3" y="6" size="4" text="64"/>
diff --git a/elements/03relayage/02esclaves/auxiliary_contacts/aux_contact_4nc.elmt b/elements/03relayage/contacts/auxiliary_contacts/aux_contact_4nc.elmt
similarity index 90%
rename from elements/03relayage/02esclaves/auxiliary_contacts/aux_contact_4nc.elmt
rename to elements/03relayage/contacts/auxiliary_contacts/aux_contact_4nc.elmt
index 44a251023..b3c7ee028 100755
--- a/elements/03relayage/02esclaves/auxiliary_contacts/aux_contact_4nc.elmt
+++ b/elements/03relayage/contacts/auxiliary_contacts/aux_contact_4nc.elmt
@@ -1,4 +1,4 @@
-<definition width="100" version="0.3" hotspot_x="45" hotspot_y="31" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
+<definition width="100" version="0.3" hotspot_x="45" hotspot_y="31" height="60" type="element" ic="true" orientation="dyyy" >
     <names>
         <name lang="el">Βοηθητικές επαφές, 4 κλειστές</name>
         <name lang="en">Auxiliary contact 4 x NC</name>
@@ -10,12 +10,6 @@
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <kindInformations>
-        <kindInformation name="state" show="1">NC</kindInformation>
-        <kindInformation name="number" show="1">4</kindInformation>
-        <kindInformation name="type" show="1">simple</kindInformation>
-        <kindInformation name="tempoType" show="0"></kindInformation>
-    </kindInformations>
     <description>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-27" y2="0" x2="32"/>
         <input x="17" y="16" size="4" text="82"/>
diff --git a/elements/03relayage/02esclaves/auxiliary_contacts/aux_contact_4no.elmt b/elements/03relayage/contacts/auxiliary_contacts/aux_contact_4no.elmt
similarity index 88%
rename from elements/03relayage/02esclaves/auxiliary_contacts/aux_contact_4no.elmt
rename to elements/03relayage/contacts/auxiliary_contacts/aux_contact_4no.elmt
index d43ca6f0e..ba3959dc5 100755
--- a/elements/03relayage/02esclaves/auxiliary_contacts/aux_contact_4no.elmt
+++ b/elements/03relayage/contacts/auxiliary_contacts/aux_contact_4no.elmt
@@ -1,4 +1,4 @@
-<definition width="100" version="0.3" hotspot_x="48" hotspot_y="31" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
+<definition width="100" version="0.3" hotspot_x="48" hotspot_y="31" height="60" type="element" ic="true" orientation="dyyy" >
     <names>
         <name lang="el">Βοηθητικές επαφές, 4 ανοικτές</name>
         <name lang="en">Auxiliary contact 4 x NO</name>
@@ -10,12 +10,6 @@
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-  <kindInformations>
-        <kindInformation name="state" show="1">NO</kindInformation>
-        <kindInformation name="number" show="1">4</kindInformation>
-        <kindInformation name="type" show="1">simple</kindInformation>
-        <kindInformation name="tempoType" show="0"></kindInformation>
-  </kindInformations>
     <description>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-32" y2="0" x2="27"/>
         <input x="17" y="16" size="4" text="84"/>
diff --git a/elements/03relayage/contacts/auxiliary_contacts/aux_contact_no-nc.elmt b/elements/03relayage/contacts/auxiliary_contacts/aux_contact_no-nc.elmt
index 06ac8184c..bae184391 100755
--- a/elements/03relayage/contacts/auxiliary_contacts/aux_contact_no-nc.elmt
+++ b/elements/03relayage/contacts/auxiliary_contacts/aux_contact_no-nc.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="25" hotspot_y="31" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
+<definition width="60" version="0.3" hotspot_x="25" hotspot_y="31" height="60" type="element" ic="true" orientation="dyyy" >
     <names>
         <name lang="el">Βοηθητικές επαφές, 1 ανοικτή + 1 κλειστή</name>
         <name lang="en">Auxiliary contact NO + NC</name>
diff --git a/elements/03relayage/contacts/auxiliary_contacts/mech_linked.elmt b/elements/03relayage/contacts/auxiliary_contacts/mech_linked.elmt
index 59dbc76ec..269d48a51 100644
--- a/elements/03relayage/contacts/auxiliary_contacts/mech_linked.elmt
+++ b/elements/03relayage/contacts/auxiliary_contacts/mech_linked.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="28" hotspot_y="41" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
+<definition width="60" version="0.3" hotspot_x="28" hotspot_y="41" height="60" type="element" ic="true" orientation="dyyy" >
     <names>
         <name lang="en">Positively driven contacts</name>
         <name lang="it">Contatti meccanicamente connessi</name>
diff --git a/elements/03relayage/contacts/puissance/com_puiss5.elmt b/elements/03relayage/contacts/puissance/com_puiss5.elmt
index 21fe874c3..0805b5201 100644
--- a/elements/03relayage/contacts/puissance/com_puiss5.elmt
+++ b/elements/03relayage/contacts/puissance/com_puiss5.elmt
@@ -1,4 +1,4 @@
-<definition width="110" version="0.3" hotspot_x="39" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
+<definition width="110" version="0.3" hotspot_x="39" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" >
     <names>
         <name lang="ar">مُلامس قدرة - كونتكتور (NO)</name>
         <name lang="de">Leistungs Kontakt</name>
diff --git a/elements/03relayage/contacts/puissance/com_puiss_nf5.elmt b/elements/03relayage/contacts/puissance/com_puiss_nf5.elmt
index c3a95aceb..db8c12f24 100644
--- a/elements/03relayage/contacts/puissance/com_puiss_nf5.elmt
+++ b/elements/03relayage/contacts/puissance/com_puiss_nf5.elmt
@@ -1,4 +1,4 @@
-<definition width="110" version="0.3" hotspot_x="37" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
+<definition width="110" version="0.3" hotspot_x="37" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" >
     <names>
         <name lang="ar">مُلامس قدرة - كونتكتور- (NC)</name>
         <name lang="de">Leistungs Kontakt (NC)</name>
diff --git a/elements/03relayage/02esclaves/puissance/contacteur_inverseur.elmt b/elements/03relayage/contacts/puissance/contacteur_inverseur.elmt
similarity index 93%
rename from elements/03relayage/02esclaves/puissance/contacteur_inverseur.elmt
rename to elements/03relayage/contacts/puissance/contacteur_inverseur.elmt
index 7bae7f9a9..e25fc4d98 100644
--- a/elements/03relayage/02esclaves/puissance/contacteur_inverseur.elmt
+++ b/elements/03relayage/contacts/puissance/contacteur_inverseur.elmt
@@ -1,4 +1,4 @@
-<definition width="200" version="0.3" hotspot_x="97" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
+<definition width="200" version="0.3" hotspot_x="97" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" >
     <names>
         <name lang="it">Contattore invertitore</name>
         <name lang="fr">Contacteur inverseur</name>
@@ -7,12 +7,6 @@
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <kindInformations>
-        <kindInformation name="state" show="1">NO</kindInformation>
-        <kindInformation name="number" show="1">8</kindInformation>
-        <kindInformation name="type" show="1">puissance</kindInformation>
-        <kindInformation name="tempoType" show="0"></kindInformation>
-    </kindInformations>
     <description>
         <text x="-6" y="19" size="4" text="6&#xa;T3"/>
         <text x="-26" y="19" size="4" text="4&#xa;T2"/>
diff --git a/elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf1.elmt b/elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf1.elmt
similarity index 82%
rename from elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf1.elmt
rename to elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf1.elmt
index e46b4426e..f323b1b5e 100644
--- a/elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf1.elmt
+++ b/elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf1.elmt
@@ -1,4 +1,4 @@
-<definition width="50" version="0.3" hotspot_x="7" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" link_type="slave">
+<definition width="50" version="0.3" hotspot_x="7" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
     <names>
         <name lang="ar">مُلامس قدرة كونتكتور (NC)</name>
         <name lang="de">Leistungs Kontakt (NC)</name>
@@ -14,12 +14,6 @@
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <kindInformations>
-        <kindInformation name="state" show="1">NC</kindInformation>
-        <kindInformation name="number" show="1">1</kindInformation>
-        <kindInformation name="type" show="1">puissance</kindInformation>
-        <kindInformation name="tempoType" show="0"></kindInformation>
-    </kindInformations>
     <description>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="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="-9" x1="0" y2="-9" x2="6"/>
diff --git a/elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf4.elmt b/elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf4.elmt
similarity index 91%
rename from elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf4.elmt
rename to elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf4.elmt
index 4d228a865..9c91ab735 100644
--- a/elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf4.elmt
+++ b/elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf4.elmt
@@ -1,4 +1,4 @@
-<definition width="90" version="0.3" hotspot_x="27" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
+<definition width="90" version="0.3" hotspot_x="27" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" >
     <names>
         <name lang="ar">مُلامسات قدرة - كونتكتور (NC)</name>
         <name lang="de">Leistungs Kontakt (NC)</name>
@@ -14,12 +14,6 @@
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <kindInformations>
-        <kindInformation name="state" show="1">NC</kindInformation>
-        <kindInformation name="number" show="1">3</kindInformation>
-        <kindInformation name="type" show="1">puissance</kindInformation>
-        <kindInformation name="tempoType" show="0"></kindInformation>
-    </kindInformations>
     <description>
         <text x="24" y="-20" size="4" text="5&#xa;L3"/>
         <text x="4" y="-20" size="4" text="3&#xa;L2"/>
diff --git a/elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf6.elmt b/elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf6.elmt
similarity index 92%
rename from elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf6.elmt
rename to elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf6.elmt
index bccaabfc6..ccfc35e8d 100644
--- a/elements/03relayage/02esclaves/puissance/normalement_fermes/com_puiss_nf6.elmt
+++ b/elements/03relayage/contacts/puissance/normalement_fermes/com_puiss_nf6.elmt
@@ -1,4 +1,4 @@
-<definition width="110" version="0.3" hotspot_x="37" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
+<definition width="110" version="0.3" hotspot_x="37" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" >
     <names>
         <name lang="ar">مُلامس قدرة - كونتكتور (NC)</name>
         <name lang="de">Leistungs Kontakt (NC)</name>
@@ -14,12 +14,6 @@
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <kindInformations>
-        <kindInformation name="state" show="1">NC</kindInformation>
-        <kindInformation name="number" show="1">4</kindInformation>
-        <kindInformation name="type" show="1">puissance</kindInformation>
-        <kindInformation name="tempoType" show="0"></kindInformation>
-    </kindInformations>
     <description>
         <text x="34" y="-17" size="4" text="3"/>
         <text x="34" y="22" size="4" text="4"/>
diff --git a/elements/03relayage/02esclaves/puissance/normalement_fermes/qet_directory b/elements/03relayage/contacts/puissance/normalement_fermes/qet_directory
similarity index 100%
rename from elements/03relayage/02esclaves/puissance/normalement_fermes/qet_directory
rename to elements/03relayage/contacts/puissance/normalement_fermes/qet_directory
diff --git a/elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss1.elmt b/elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss1.elmt
similarity index 80%
rename from elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss1.elmt
rename to elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss1.elmt
index 78eb83a4c..627edce75 100644
--- a/elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss1.elmt
+++ b/elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss1.elmt
@@ -1,4 +1,4 @@
-<definition width="50" version="0.3" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" link_type="slave">
+<definition width="50" version="0.3" hotspot_x="10" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
     <names>
         <name lang="ar">مُلامس قدرة - كونتكتور (NO)</name>
         <name lang="de">Leistungs Kontakt</name>
@@ -14,12 +14,6 @@
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <kindInformations>
-        <kindInformation name="state" show="1">NO</kindInformation>
-        <kindInformation name="number" show="1">1</kindInformation>
-        <kindInformation name="type" show="1">puissance</kindInformation>
-        <kindInformation name="tempoType" show="0"></kindInformation>
-    </kindInformations>
     <description>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="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="-20" x1="0" y2="-10" x2="0"/>
diff --git a/elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss4.elmt b/elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss4.elmt
similarity index 89%
rename from elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss4.elmt
rename to elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss4.elmt
index 06cc0739a..2110ee805 100644
--- a/elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss4.elmt
+++ b/elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss4.elmt
@@ -1,4 +1,4 @@
-<definition width="90" version="0.3" hotspot_x="29" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
+<definition width="90" version="0.3" hotspot_x="29" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" >
     <names>
         <name lang="ar">مُلامس قدرة- كونتكتور (NO)</name>
         <name lang="de">Leistungs Kontakt</name>
@@ -14,12 +14,6 @@
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <kindInformations>
-        <kindInformation name="state" show="1">NO</kindInformation>
-        <kindInformation name="number" show="1">3</kindInformation>
-        <kindInformation name="type" show="1">puissance</kindInformation>
-        <kindInformation name="tempoType" show="0"></kindInformation>
-    </kindInformations>
     <description>
         <text x="5" y="-20" size="4" text="3&#xa;L2"/>
         <text x="25" y="-20" size="4" text="5&#xa;L3"/>
diff --git a/elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss6.elmt b/elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss6.elmt
similarity index 91%
rename from elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss6.elmt
rename to elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss6.elmt
index c8c93fd99..25af7db1f 100644
--- a/elements/03relayage/02esclaves/puissance/normalement_ouverts/com_puiss6.elmt
+++ b/elements/03relayage/contacts/puissance/normalement_ouverts/com_puiss6.elmt
@@ -1,4 +1,4 @@
-<definition width="110" version="0.3" hotspot_x="39" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" link_type="slave">
+<definition width="110" version="0.3" hotspot_x="39" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy" >
     <names>
         <name lang="ar">مُلامس قدرة - كونتكتور (NO)</name>
         <name lang="de">Leistungs Kontakt</name>
@@ -14,12 +14,6 @@
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <kindInformations>
-        <kindInformation name="state" show="1">NO</kindInformation>
-        <kindInformation name="number" show="1">4</kindInformation>
-        <kindInformation name="type" show="1">puissance</kindInformation>
-        <kindInformation name="tempoType" show="0"></kindInformation>
-    </kindInformations>
     <description>
         <text x="14" y="-17" size="4" text="R3"/>
         <text x="-6" y="-17" size="4" text="R1"/>
diff --git a/elements/03relayage/02esclaves/puissance/normalement_ouverts/qet_directory b/elements/03relayage/contacts/puissance/normalement_ouverts/qet_directory
similarity index 100%
rename from elements/03relayage/02esclaves/puissance/normalement_ouverts/qet_directory
rename to elements/03relayage/contacts/puissance/normalement_ouverts/qet_directory
diff --git a/elements/03relayage/contacts/simples/con_simple.elmt b/elements/03relayage/contacts/simples/con_simple.elmt
new file mode 100644
index 000000000..3f1bd2b8d
--- /dev/null
+++ b/elements/03relayage/contacts/simples/con_simple.elmt
@@ -0,0 +1,24 @@
+<definition width="30" version="0.3" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
+    <names>
+        <name lang="ar">مُلامس بسيط (NO)</name>
+        <name lang="de">Kontakt Einfach</name>
+        <name lang="ru">Проктой контакт (НР)</name>
+        <name lang="pt">Contacto simples (NO)</name>
+        <name lang="el">Απλή επαφή, ανοικτή</name>
+        <name lang="en">Simple contact</name>
+        <name lang="it">Contatto semplice (NO)</name>
+        <name lang="fr">Contact simple</name>
+        <name lang="pl">Zestyk zwierny</name>
+        <name lang="es">Contactor simple</name>
+        <name lang="cs">Jednoduché spojení</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0"/>
+        <input x="2.75" y="3" size="9" text="_" tagg="label"/>
+        <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="-20" x1="0" y2="-10" x2="0"/>
+        <terminal x="0" y="-20" orientation="n"/>
+        <terminal x="0" y="20" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/03relayage/contacts/simples/con_simple_nf.elmt b/elements/03relayage/contacts/simples/con_simple_nf.elmt
new file mode 100644
index 000000000..4c68958ed
--- /dev/null
+++ b/elements/03relayage/contacts/simples/con_simple_nf.elmt
@@ -0,0 +1,25 @@
+<definition width="30" version="0.3" hotspot_x="5" hotspot_y="25" height="50" type="element" orientation="dnny" >
+    <names>
+        <name lang="ar">مُلامس بسيط (NC)</name>
+        <name lang="de">Kontakt Einfach (NC)</name>
+        <name lang="ru">Проктой контакт (НЗ)</name>
+        <name lang="pt">Contacto simples (NC)</name>
+        <name lang="el">Απλή επαφή, κλειστή</name>
+        <name lang="en">Simple contact (NC)</name>
+        <name lang="it">Contatto semplice (NC)</name>
+        <name lang="fr">Contact simple (NF)</name>
+        <name lang="pl">Zestyk rozwierny</name>
+        <name lang="es">Contactor simple (NC)</name>
+        <name lang="cs">Jednoduché spojení (NC)</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="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="-9" x1="0" y2="-9" x2="6"/>
+        <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="-20" x1="0" y2="-9" x2="0"/>
+        <input x="5.75" y="3" size="9" text="_" tagg="label"/>
+        <terminal x="0" y="-20" orientation="n"/>
+        <terminal x="0" y="20" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/03relayage/contacts/simples/contnonc.elmt b/elements/03relayage/contacts/simples/contnonc.elmt
index b28ca3270..6278f8f20 100644
--- a/elements/03relayage/contacts/simples/contnonc.elmt
+++ b/elements/03relayage/contacts/simples/contnonc.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="35" height="70" type="element" ic="true" orientation="dnyn" link_type="slave">
+<definition width="60" version="0.3" hotspot_x="35" hotspot_y="35" height="70" type="element" ic="true" orientation="dnyn" >
     <names>
         <name lang="ar">مُلامس NO-NC</name>
         <name lang="de">Wechselkontakt (NO/NC)</name>
diff --git a/elements/03relayage/contacts/temporises/con_simple_nf_tmp_on_off.elmt b/elements/03relayage/contacts/temporises/con_simple_nf_tmp_on_off.elmt
index fbbdb5acc..b8280f29a 100644
--- a/elements/03relayage/contacts/temporises/con_simple_nf_tmp_on_off.elmt
+++ b/elements/03relayage/contacts/temporises/con_simple_nf_tmp_on_off.elmt
@@ -1,4 +1,4 @@
-<definition width="40" version="0.3" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" link_type="slave">
+<definition width="40" version="0.3" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny" >
     <names>
         <name lang="ar">مُلامس فصل (NC) يُفتح ويُغلق بتأخير</name>
         <name lang="el">Κλειστή επαφή χρονικου, καθυστέρηση ενεργ/απεν</name>
diff --git a/elements/03relayage/contacts/temporises/con_simple_no_tmp_on_off.elmt b/elements/03relayage/contacts/temporises/con_simple_no_tmp_on_off.elmt
index a834cb222..0a728a8e3 100644
--- a/elements/03relayage/contacts/temporises/con_simple_no_tmp_on_off.elmt
+++ b/elements/03relayage/contacts/temporises/con_simple_no_tmp_on_off.elmt
@@ -1,4 +1,4 @@
-<definition width="50" version="0.3" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnny" link_type="slave">
+<definition width="50" version="0.3" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnny" >
     <names>
         <name lang="ar">مُلامس وصل (NO) يُغلق و يُفتح بتأخير</name>
         <name lang="el">Ανοικτή επαφή χρονικου, καθυστέρηση ενεργ/απ</name>
diff --git a/elements/03relayage/contacts/temporises/contact_frem_anticipee.elmt b/elements/03relayage/contacts/temporises/contact_frem_anticipee.elmt
index b21c5afe0..d0e83faaf 100644
--- a/elements/03relayage/contacts/temporises/contact_frem_anticipee.elmt
+++ b/elements/03relayage/contacts/temporises/contact_frem_anticipee.elmt
@@ -1,4 +1,4 @@
-<definition width="20" version="0.3" hotspot_x="15" hotspot_y="30" height="40" type="element" orientation="dyyy" link_type="slave">
+<definition width="20" version="0.3" hotspot_x="15" hotspot_y="30" height="40" type="element" orientation="dyyy" >
     <names>
         <name lang="en">Contact early closure</name>
         <name lang="fr">Contact à fermeture anticipée</name>
diff --git a/elements/03relayage/contacts/temporises/contact_frem_tardive.elmt b/elements/03relayage/contacts/temporises/contact_frem_tardive.elmt
index ec440775b..e48cf2be2 100644
--- a/elements/03relayage/contacts/temporises/contact_frem_tardive.elmt
+++ b/elements/03relayage/contacts/temporises/contact_frem_tardive.elmt
@@ -1,4 +1,4 @@
-<definition width="20" version="0.3" hotspot_x="15" hotspot_y="30" height="40" type="element" orientation="dyyy" link_type="slave">
+<definition width="20" version="0.3" hotspot_x="15" hotspot_y="30" height="40" type="element" orientation="dyyy" >
     <names>
         <name lang="en">Contact closure late</name>
         <name lang="fr">Contact à fermeture tardive</name>
diff --git a/elements/03relayage/contacts/temporises/contact_ouverture_anticipee.elmt b/elements/03relayage/contacts/temporises/contact_ouverture_anticipee.elmt
index 7a10b9b34..5dfc0df62 100644
--- a/elements/03relayage/contacts/temporises/contact_ouverture_anticipee.elmt
+++ b/elements/03relayage/contacts/temporises/contact_ouverture_anticipee.elmt
@@ -1,4 +1,4 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="20" height="40" type="element" orientation="dyyy" link_type="slave">
+<definition width="20" version="0.3" hotspot_x="10" hotspot_y="20" height="40" type="element" orientation="dyyy" >
     <names>
         <name lang="en">NC early</name>
         <name lang="fr">Contact à ouverture anticipée</name>
diff --git a/elements/03relayage/contacts/temporises/contact_ouverture_tardive.elmt b/elements/03relayage/contacts/temporises/contact_ouverture_tardive.elmt
index 46129d323..9b551e6e2 100644
--- a/elements/03relayage/contacts/temporises/contact_ouverture_tardive.elmt
+++ b/elements/03relayage/contacts/temporises/contact_ouverture_tardive.elmt
@@ -1,4 +1,4 @@
-<definition width="20" version="0.3" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy" link_type="slave">
+<definition width="20" version="0.3" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy" >
     <names>
         <name lang="en">NC late</name>
         <name lang="fr">Contact à ouverture tardive</name>
diff --git a/elements/03relayage/01bobines/contacteur.elmt b/elements/03relayage/relais/contacteur.elmt
similarity index 97%
rename from elements/03relayage/01bobines/contacteur.elmt
rename to elements/03relayage/relais/contacteur.elmt
index d358841c4..da2513250 100644
--- a/elements/03relayage/01bobines/contacteur.elmt
+++ b/elements/03relayage/relais/contacteur.elmt
@@ -1,4 +1,4 @@
-<definition width="70" version="0.3" hotspot_x="47" hotspot_y="25" height="50" type="element" orientation="dnny" link_type="master">
+<definition width="70" version="0.3" hotspot_x="47" hotspot_y="25" height="50" type="element" orientation="dnny" >
     <names>
         <name lang="en">contactor</name>
         <name lang="it">Contattore</name>
diff --git a/elements/03relayage/01bobines/contacteur2.elmt b/elements/03relayage/relais/contacteur2.elmt
similarity index 97%
rename from elements/03relayage/01bobines/contacteur2.elmt
rename to elements/03relayage/relais/contacteur2.elmt
index 8c5869e29..87947a7e5 100644
--- a/elements/03relayage/01bobines/contacteur2.elmt
+++ b/elements/03relayage/relais/contacteur2.elmt
@@ -1,4 +1,4 @@
-<definition width="80" version="0.3" hotspot_x="47" hotspot_y="25" height="50" type="element" orientation="dnny" link_type="master">
+<definition width="80" version="0.3" hotspot_x="47" hotspot_y="25" height="50" type="element" orientation="dnny" >
     <names>
         <name lang="en">Contactor</name>
         <name lang="it">Contattore</name>
diff --git a/elements/03relayage/01bobines/ev.elmt b/elements/03relayage/relais/ev.elmt
similarity index 100%
rename from elements/03relayage/01bobines/ev.elmt
rename to elements/03relayage/relais/ev.elmt
diff --git a/elements/03relayage/relais/qet_directory b/elements/03relayage/relais/qet_directory
new file mode 100644
index 000000000..8741d97b2
--- /dev/null
+++ b/elements/03relayage/relais/qet_directory
@@ -0,0 +1,6 @@
+<qet-directory>
+    <names>
+        <name lang="en">Various Relay</name>
+        <name lang="fr">Relais divers</name>
+    </names>
+</qet-directory>
diff --git a/elements/03relayage/01bobines/re7.elmt b/elements/03relayage/relais/re7.elmt
similarity index 100%
rename from elements/03relayage/01bobines/re7.elmt
rename to elements/03relayage/relais/re7.elmt
diff --git a/elements/03relayage/01bobines/re8.elmt b/elements/03relayage/relais/re8.elmt
similarity index 100%
rename from elements/03relayage/01bobines/re8.elmt
rename to elements/03relayage/relais/re8.elmt
diff --git a/elements/03relayage/01bobines/relais.elmt b/elements/03relayage/relais/relais.elmt
similarity index 96%
rename from elements/03relayage/01bobines/relais.elmt
rename to elements/03relayage/relais/relais.elmt
index e989e6373..82adbaa46 100644
--- a/elements/03relayage/01bobines/relais.elmt
+++ b/elements/03relayage/relais/relais.elmt
@@ -1,4 +1,4 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnny" link_type="master">
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnny" >
     <names>
         <name lang="ar">مُرحّل</name>
         <name lang="de">Spule</name>
diff --git a/elements/03relayage/01bobines/relais_niveau.elmt b/elements/03relayage/relais/relais_niveau.elmt
similarity index 100%
rename from elements/03relayage/01bobines/relais_niveau.elmt
rename to elements/03relayage/relais/relais_niveau.elmt
diff --git a/elements/03relayage/01bobines/relais_polarise_retournant.elmt b/elements/03relayage/relais/relais_polarise_retournant.elmt
similarity index 100%
rename from elements/03relayage/01bobines/relais_polarise_retournant.elmt
rename to elements/03relayage/relais/relais_polarise_retournant.elmt
diff --git a/elements/03relayage/01bobines/relais_statique.elmt b/elements/03relayage/relais/relais_statique.elmt
similarity index 98%
rename from elements/03relayage/01bobines/relais_statique.elmt
rename to elements/03relayage/relais/relais_statique.elmt
index 49bb682e1..eef304af5 100644
--- a/elements/03relayage/01bobines/relais_statique.elmt
+++ b/elements/03relayage/relais/relais_statique.elmt
@@ -1,4 +1,4 @@
-<definition width="100" version="0.3" hotspot_x="31" hotspot_y="25" height="50" type="element" orientation="dnny" link_type="master">
+<definition width="100" version="0.3" hotspot_x="31" hotspot_y="25" height="50" type="element" orientation="dnny" >
     <names>
         <name lang="ar">مُرحّل استاتيكي</name>
         <name lang="en">Static relay</name>
diff --git a/elements/03relayage/01bobines/telerupteur.elmt b/elements/03relayage/relais/telerupteur.elmt
similarity index 97%
rename from elements/03relayage/01bobines/telerupteur.elmt
rename to elements/03relayage/relais/telerupteur.elmt
index d0fe0b90e..4587bc964 100644
--- a/elements/03relayage/01bobines/telerupteur.elmt
+++ b/elements/03relayage/relais/telerupteur.elmt
@@ -1,4 +1,4 @@
-<definition width="70" version="0.3" hotspot_x="47" hotspot_y="25" height="50" type="element" orientation="dnny" link_type="master">
+<definition width="70" version="0.3" hotspot_x="47" hotspot_y="25" height="50" type="element" orientation="dnny" >
     <names>
         <name lang="el">Τηλεχειριζόμενος διακόπτης</name>
         <name lang="en">Remote controlled switch</name>
diff --git a/elements/03relayage/01bobines/telerupteur2.elmt b/elements/03relayage/relais/telerupteur2.elmt
similarity index 98%
rename from elements/03relayage/01bobines/telerupteur2.elmt
rename to elements/03relayage/relais/telerupteur2.elmt
index f6c0e79ce..1b2fb3283 100644
--- a/elements/03relayage/01bobines/telerupteur2.elmt
+++ b/elements/03relayage/relais/telerupteur2.elmt
@@ -1,4 +1,4 @@
-<definition width="80" version="0.3" hotspot_x="47" hotspot_y="25" height="50" type="element" orientation="dnny" link_type="master">
+<definition width="80" version="0.3" hotspot_x="47" hotspot_y="25" height="50" type="element" orientation="dnny" >
     <names>
         <name lang="el">Τηλεχειριζόμενος διακόπτης</name>
         <name lang="en">Remote controlled switch</name>