diff --git a/elements/capteurs/appareils_de_mesure/amperemetre-h.elmt b/elements/appareils_de_mesure/amperemetre-h.elmt
similarity index 100%
rename from elements/capteurs/appareils_de_mesure/amperemetre-h.elmt
rename to elements/appareils_de_mesure/amperemetre-h.elmt
diff --git a/elements/capteurs/appareils_de_mesure/amperemetre-v.elmt b/elements/appareils_de_mesure/amperemetre-v.elmt
similarity index 100%
rename from elements/capteurs/appareils_de_mesure/amperemetre-v.elmt
rename to elements/appareils_de_mesure/amperemetre-v.elmt
diff --git a/elements/capteurs/appareils_de_mesure/ohmmetre-h.elmt b/elements/appareils_de_mesure/ohmmetre-h.elmt
similarity index 100%
rename from elements/capteurs/appareils_de_mesure/ohmmetre-h.elmt
rename to elements/appareils_de_mesure/ohmmetre-h.elmt
diff --git a/elements/capteurs/appareils_de_mesure/ohmmetre-v.elmt b/elements/appareils_de_mesure/ohmmetre-v.elmt
similarity index 100%
rename from elements/capteurs/appareils_de_mesure/ohmmetre-v.elmt
rename to elements/appareils_de_mesure/ohmmetre-v.elmt
diff --git a/elements/capteurs/appareils_de_mesure/qet_directory b/elements/appareils_de_mesure/qet_directory
similarity index 100%
rename from elements/capteurs/appareils_de_mesure/qet_directory
rename to elements/appareils_de_mesure/qet_directory
diff --git a/elements/capteurs/sondes/qet_directory b/elements/appareils_de_mesure/sondes/qet_directory
similarity index 100%
rename from elements/capteurs/sondes/qet_directory
rename to elements/appareils_de_mesure/sondes/qet_directory
diff --git a/elements/capteurs/sondes/tores_de_courant/qet_directory b/elements/appareils_de_mesure/sondes/tores_de_courant/qet_directory
similarity index 100%
rename from elements/capteurs/sondes/tores_de_courant/qet_directory
rename to elements/appareils_de_mesure/sondes/tores_de_courant/qet_directory
diff --git a/elements/capteurs/sondes/tores_de_courant/tore1.elmt b/elements/appareils_de_mesure/sondes/tores_de_courant/tore1.elmt
similarity index 100%
rename from elements/capteurs/sondes/tores_de_courant/tore1.elmt
rename to elements/appareils_de_mesure/sondes/tores_de_courant/tore1.elmt
diff --git a/elements/capteurs/sondes/tores_de_courant/tore2.elmt b/elements/appareils_de_mesure/sondes/tores_de_courant/tore2.elmt
similarity index 100%
rename from elements/capteurs/sondes/tores_de_courant/tore2.elmt
rename to elements/appareils_de_mesure/sondes/tores_de_courant/tore2.elmt
diff --git a/elements/capteurs/sondes/tores_de_courant/tore3.elmt b/elements/appareils_de_mesure/sondes/tores_de_courant/tore3.elmt
similarity index 100%
rename from elements/capteurs/sondes/tores_de_courant/tore3.elmt
rename to elements/appareils_de_mesure/sondes/tores_de_courant/tore3.elmt
diff --git a/elements/capteurs/sondes/tores_de_courant/tore4.elmt b/elements/appareils_de_mesure/sondes/tores_de_courant/tore4.elmt
similarity index 100%
rename from elements/capteurs/sondes/tores_de_courant/tore4.elmt
rename to elements/appareils_de_mesure/sondes/tores_de_courant/tore4.elmt
diff --git a/elements/capteurs/appareils_de_mesure/voltmetre-h.elmt b/elements/appareils_de_mesure/voltmetre-h.elmt
similarity index 100%
rename from elements/capteurs/appareils_de_mesure/voltmetre-h.elmt
rename to elements/appareils_de_mesure/voltmetre-h.elmt
diff --git a/elements/capteurs/appareils_de_mesure/voltmetre-v.elmt b/elements/appareils_de_mesure/voltmetre-v.elmt
similarity index 100%
rename from elements/capteurs/appareils_de_mesure/voltmetre-v.elmt
rename to elements/appareils_de_mesure/voltmetre-v.elmt
diff --git a/elements/capteurs/appareils_de_mesure/wattmetre-h.elmt b/elements/appareils_de_mesure/wattmetre-h.elmt
similarity index 100%
rename from elements/capteurs/appareils_de_mesure/wattmetre-h.elmt
rename to elements/appareils_de_mesure/wattmetre-h.elmt
diff --git a/elements/capteurs/appareils_de_mesure/wattmetre-v.elmt b/elements/appareils_de_mesure/wattmetre-v.elmt
similarity index 100%
rename from elements/capteurs/appareils_de_mesure/wattmetre-v.elmt
rename to elements/appareils_de_mesure/wattmetre-v.elmt
diff --git a/elements/contacts/bornes/Bornes_e.elmt b/elements/bornes/Bornes_e.elmt
similarity index 100%
rename from elements/contacts/bornes/Bornes_e.elmt
rename to elements/bornes/Bornes_e.elmt
diff --git a/elements/contacts/bornes/Bornes_es.elmt b/elements/bornes/Bornes_es.elmt
similarity index 100%
rename from elements/contacts/bornes/Bornes_es.elmt
rename to elements/bornes/Bornes_es.elmt
diff --git a/elements/contacts/bornes/Bornes_s.elmt b/elements/bornes/Bornes_s.elmt
similarity index 100%
rename from elements/contacts/bornes/Bornes_s.elmt
rename to elements/bornes/Bornes_s.elmt
diff --git a/elements/contacts/bornes/borne_continuite.elmt b/elements/bornes/borne_continuite.elmt
similarity index 100%
rename from elements/contacts/bornes/borne_continuite.elmt
rename to elements/bornes/borne_continuite.elmt
diff --git a/elements/contacts/bornes/borne_finale.elmt b/elements/bornes/borne_finale.elmt
similarity index 100%
rename from elements/contacts/bornes/borne_finale.elmt
rename to elements/bornes/borne_finale.elmt
diff --git a/elements/contacts/bornes/connecteur_f.elmt b/elements/bornes/connecteur_f.elmt
similarity index 100%
rename from elements/contacts/bornes/connecteur_f.elmt
rename to elements/bornes/connecteur_f.elmt
diff --git a/elements/contacts/bornes/connecteur_m.elmt b/elements/bornes/connecteur_m.elmt
similarity index 100%
rename from elements/contacts/bornes/connecteur_m.elmt
rename to elements/bornes/connecteur_m.elmt
diff --git a/elements/contacts/bornes/connecteur_mf.elmt b/elements/bornes/connecteur_mf.elmt
similarity index 100%
rename from elements/contacts/bornes/connecteur_mf.elmt
rename to elements/bornes/connecteur_mf.elmt
diff --git a/elements/contacts/bornes/qet_directory b/elements/bornes/qet_directory
similarity index 100%
rename from elements/contacts/bornes/qet_directory
rename to elements/bornes/qet_directory
diff --git a/elements/contacts/poussoirs/arret-urgence_no.elmt b/elements/contacts/poussoirs/arret-urgence_no.elmt
index a3a327cf0..611a3d02a 100644
--- a/elements/contacts/poussoirs/arret-urgence_no.elmt
+++ b/elements/contacts/poussoirs/arret-urgence_no.elmt
@@ -1,22 +1,23 @@
-<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="50" version="0.22" hotspot_x="25" hotspot_y="25" height="50" type="element" orientation="dnny">
     <names>
-        <name lang="ru" >Кнопка (НР)</name>
-        <name lang="en" >Push-button</name>
-        <name lang="fr" >Arret d'urgence (NF)</name>
-        <name lang="es" >Pulsador</name>
-        <name lang="pl" >Przycisk zatrzaskowy (NO)</name>
-        <name lang="cs" >Nouzové zastavení</name>
+        <name lang="ru">Кнопка (НР)</name>
+        <name lang="en">Push-button</name>
+        <name lang="fr">Arret d'urgence (NF)</name>
+        <name lang="pl">Przycisk zatrzaskowy (NO)</name>
+        <name lang="es">Pulsador</name>
+        <name lang="cs">Nouzové zastavení</name>
     </names>
+    <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-2" x1="-7.25" y2="0" x2="-4.25" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-2" y2="10" x2="3" y3="20" x3="3" />
-        <arc width="8" x="-14.25" y="-5" antialias="true" height="10" style="line-style:dashed;line-weight:thin;filling:none;color:black" start="-90" angle="-180" />
-        <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="3" y2="-10" x2="3" />
-        <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="-2" x1="-7.25" y2="0" x2="-7.25" />
-        <input x="5.75" y="3" size="9" text="_" />
-        <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="-5" x1="-10.25" y2="5" x2="-10.25" />
-        <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="-10.25" y2="0" x2="-0.25" />
-        <terminal x="3" y="-21" orientation="n" />
-        <terminal x="3" y="21" orientation="s" />
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-2" x1="-10.25" y2="0" x2="-7.25"/>
+        <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"/>
+        <arc width="8" x="-17.25" y="-5" antialias="true" height="10" style="line-style:dashed;line-weight:thin;filling:none;color:black" start="-90" angle="-180"/>
+        <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:dashed;line-weight:thin;filling:none;color:black" y1="-2" x1="-10.25" y2="0" x2="-10.25"/>
+        <input x="2.75" y="3" size="9" text="_"/>
+        <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="-5" x1="-13.25" y2="5" x2="-13.25"/>
+        <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="-13.25" y2="0" x2="-3.25"/>
+        <terminal x="0" y="-20" orientation="n"/>
+        <terminal x="0" y="20" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/contacts/poussoirs/au.elmt b/elements/contacts/poussoirs/au.elmt
index 0189492d8..80a5f41d2 100644
--- a/elements/contacts/poussoirs/au.elmt
+++ b/elements/contacts/poussoirs/au.elmt
@@ -1,26 +1,26 @@
-<definition width="30" version="0.2" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny" >
+<definition width="40" version="0.22" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny">
     <names>
-        <name lang="ru" >Аварийный стоп</name>
-        <name lang="en" >Emergency stop (NC)</name>
-        <name lang="fr" >Arrêt d'urgence (NF)</name>
-        <name lang="es" >Parada de emergencia (NC)</name>
-        <name lang="cs" >Nouzové zastavení</name>
-        <name lang="pt" >Paragem de emergência (NC)</name>
-        <name lang="pl" >Zatrzymanie awaryjne (NC)</name>
+        <name lang="ru">Аварийный стоп</name>
+        <name lang="pt">Paragem de emergência (NC)</name>
+        <name lang="en">Emergency stop (NC)</name>
+        <name lang="fr">Arrêt d'urgence (NF)</name>
+        <name lang="pl">Zatrzymanie awaryjne (NC)</name>
+        <name lang="es">Parada de emergencia (NC)</name>
+        <name lang="cs">Nouzové zastavení</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="true" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-2" x1="-4" y2="0" x2="-1" />
-        <arc width="8" x="-11" y="-5" antialias="true" height="10" style="line-style:dashed;line-weight:thin;filling:none;color:black" start="-90" angle="-180" />
-        <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="-2" x1="-4" y2="0" x2="-4" />
-        <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="_" />
-        <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="-5" x1="-7" y2="5" x2="-7" />
-        <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="-7" y2="0" x2="3" />
-        <terminal x="0" y="-21" orientation="n" />
-        <terminal x="0" y="21" orientation="s" />
+        <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="true" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-2" x1="-4" y2="0" x2="-1"/>
+        <arc width="8" x="-11" y="-5" antialias="true" height="10" style="line-style:dashed;line-weight:thin;filling:none;color:black" start="-90" angle="-180"/>
+        <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="-2" x1="-4" y2="0" x2="-4"/>
+        <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="_"/>
+        <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="-5" x1="-7" y2="5" x2="-7"/>
+        <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="-7" y2="0" x2="3"/>
+        <terminal x="0" y="-20" orientation="n"/>
+        <terminal x="0" y="20" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/recepteurs/rlc/monofilaires/capacite.elmt b/elements/semiconducteurs/rlc/monofilaires/capacite.elmt
similarity index 100%
rename from elements/recepteurs/rlc/monofilaires/capacite.elmt
rename to elements/semiconducteurs/rlc/monofilaires/capacite.elmt
diff --git a/elements/recepteurs/rlc/monofilaires/inductance.elmt b/elements/semiconducteurs/rlc/monofilaires/inductance.elmt
similarity index 100%
rename from elements/recepteurs/rlc/monofilaires/inductance.elmt
rename to elements/semiconducteurs/rlc/monofilaires/inductance.elmt
diff --git a/elements/recepteurs/rlc/monofilaires/qet_directory b/elements/semiconducteurs/rlc/monofilaires/qet_directory
similarity index 100%
rename from elements/recepteurs/rlc/monofilaires/qet_directory
rename to elements/semiconducteurs/rlc/monofilaires/qet_directory
diff --git a/elements/recepteurs/rlc/monofilaires/resistance.elmt b/elements/semiconducteurs/rlc/monofilaires/resistance.elmt
similarity index 100%
rename from elements/recepteurs/rlc/monofilaires/resistance.elmt
rename to elements/semiconducteurs/rlc/monofilaires/resistance.elmt
diff --git a/elements/recepteurs/rlc/normaux/capacite.elmt b/elements/semiconducteurs/rlc/normaux/capacite.elmt
similarity index 100%
rename from elements/recepteurs/rlc/normaux/capacite.elmt
rename to elements/semiconducteurs/rlc/normaux/capacite.elmt
diff --git a/elements/recepteurs/rlc/normaux/inductance.elmt b/elements/semiconducteurs/rlc/normaux/inductance.elmt
similarity index 100%
rename from elements/recepteurs/rlc/normaux/inductance.elmt
rename to elements/semiconducteurs/rlc/normaux/inductance.elmt
diff --git a/elements/recepteurs/rlc/normaux/qet_directory b/elements/semiconducteurs/rlc/normaux/qet_directory
similarity index 100%
rename from elements/recepteurs/rlc/normaux/qet_directory
rename to elements/semiconducteurs/rlc/normaux/qet_directory
diff --git a/elements/recepteurs/rlc/normaux/resistance.elmt b/elements/semiconducteurs/rlc/normaux/resistance.elmt
similarity index 100%
rename from elements/recepteurs/rlc/normaux/resistance.elmt
rename to elements/semiconducteurs/rlc/normaux/resistance.elmt
diff --git a/elements/recepteurs/rlc/parasites/capacite.elmt b/elements/semiconducteurs/rlc/parasites/capacite.elmt
similarity index 100%
rename from elements/recepteurs/rlc/parasites/capacite.elmt
rename to elements/semiconducteurs/rlc/parasites/capacite.elmt
diff --git a/elements/recepteurs/rlc/parasites/inductance.elmt b/elements/semiconducteurs/rlc/parasites/inductance.elmt
similarity index 100%
rename from elements/recepteurs/rlc/parasites/inductance.elmt
rename to elements/semiconducteurs/rlc/parasites/inductance.elmt
diff --git a/elements/recepteurs/rlc/parasites/qet_directory b/elements/semiconducteurs/rlc/parasites/qet_directory
similarity index 100%
rename from elements/recepteurs/rlc/parasites/qet_directory
rename to elements/semiconducteurs/rlc/parasites/qet_directory
diff --git a/elements/recepteurs/rlc/parasites/resistance.elmt b/elements/semiconducteurs/rlc/parasites/resistance.elmt
similarity index 100%
rename from elements/recepteurs/rlc/parasites/resistance.elmt
rename to elements/semiconducteurs/rlc/parasites/resistance.elmt
diff --git a/elements/recepteurs/rlc/qet_directory b/elements/semiconducteurs/rlc/qet_directory
similarity index 100%
rename from elements/recepteurs/rlc/qet_directory
rename to elements/semiconducteurs/rlc/qet_directory