diff --git a/elements/fiches/embase_din_2_broches_avec_borne_centrale_plate.elmt b/elements/fiches/din/embase_din_2_broches_avec_borne_centrale_plate.elmt
similarity index 100%
rename from elements/fiches/embase_din_2_broches_avec_borne_centrale_plate.elmt
rename to elements/fiches/din/embase_din_2_broches_avec_borne_centrale_plate.elmt
diff --git a/elements/fiches/embase_din_3_broches_180_degres.elmt b/elements/fiches/din/embase_din_3_broches_180_degres.elmt
similarity index 100%
rename from elements/fiches/embase_din_3_broches_180_degres.elmt
rename to elements/fiches/din/embase_din_3_broches_180_degres.elmt
diff --git a/elements/fiches/embase_din_4_broches.elmt b/elements/fiches/din/embase_din_4_broches.elmt
similarity index 100%
rename from elements/fiches/embase_din_4_broches.elmt
rename to elements/fiches/din/embase_din_4_broches.elmt
diff --git a/elements/fiches/embase_din_5_broches.elmt b/elements/fiches/din/embase_din_5_broches.elmt
similarity index 100%
rename from elements/fiches/embase_din_5_broches.elmt
rename to elements/fiches/din/embase_din_5_broches.elmt
diff --git a/elements/fiches/embase_din_5_broches_180_degres.elmt b/elements/fiches/din/embase_din_5_broches_180_degres.elmt
similarity index 100%
rename from elements/fiches/embase_din_5_broches_180_degres.elmt
rename to elements/fiches/din/embase_din_5_broches_180_degres.elmt
diff --git a/elements/fiches/embase_din_5_broches_270_degres.elmt b/elements/fiches/din/embase_din_5_broches_270_degres.elmt
similarity index 100%
rename from elements/fiches/embase_din_5_broches_270_degres.elmt
rename to elements/fiches/din/embase_din_5_broches_270_degres.elmt
diff --git a/elements/fiches/embase_din_5_broches_360_degres_avec_borne_centrale.elmt b/elements/fiches/din/embase_din_5_broches_360_degres_avec_borne_centrale.elmt
similarity index 100%
rename from elements/fiches/embase_din_5_broches_360_degres_avec_borne_centrale.elmt
rename to elements/fiches/din/embase_din_5_broches_360_degres_avec_borne_centrale.elmt
diff --git a/elements/fiches/embase_din_8_broches.elmt b/elements/fiches/din/embase_din_8_broches.elmt
similarity index 100%
rename from elements/fiches/embase_din_8_broches.elmt
rename to elements/fiches/din/embase_din_8_broches.elmt
diff --git a/elements/fiches/embase_minidin_8_broches.elmt b/elements/fiches/din/embase_minidin_8_broches.elmt
similarity index 100%
rename from elements/fiches/embase_minidin_8_broches.elmt
rename to elements/fiches/din/embase_minidin_8_broches.elmt
diff --git a/elements/fiches/din/qet_directory b/elements/fiches/din/qet_directory
new file mode 100644
index 000000000..8e4ee214c
--- /dev/null
+++ b/elements/fiches/din/qet_directory
@@ -0,0 +1,13 @@
+<qet-directory>
+    <names>
+        <name lang="en">Din</name>
+        <name lang="fr">Din</name>
+        <name lang="ar">Din</name>
+        <name lang="pl">Din</name>
+        <name lang="cs">Din</name>
+        <name lang="pt">Din</name>
+        <name lang="es">Din</name>
+        <name lang="it">Din</name>
+        <name lang="el">Din</name>
+    </names>
+</qet-directory>
diff --git a/elements/fiches/sub-d/qet_directory b/elements/fiches/sub-d/qet_directory
new file mode 100644
index 000000000..25da80006
--- /dev/null
+++ b/elements/fiches/sub-d/qet_directory
@@ -0,0 +1,13 @@
+<qet-directory>
+    <names>
+        <name lang="en">Sub-d</name>
+        <name lang="fr">Sub-d</name>
+        <name lang="ar">Sub-d</name>
+        <name lang="pl">Sub-d</name>
+        <name lang="cs">Sub-d</name>
+        <name lang="pt">Sub-d</name>
+        <name lang="es">Sub-d</name>
+        <name lang="it">Sub-d</name>
+        <name lang="el">Sub-d</name>
+    </names>
+</qet-directory>
diff --git a/elements/fiches/sub-d-hd_15_broches_femelle.elmt b/elements/fiches/sub-d/sub-d-hd_15_broches_femelle.elmt
similarity index 100%
rename from elements/fiches/sub-d-hd_15_broches_femelle.elmt
rename to elements/fiches/sub-d/sub-d-hd_15_broches_femelle.elmt
diff --git a/elements/fiches/sub-d-hd_15_broches_male.elmt b/elements/fiches/sub-d/sub-d-hd_15_broches_male.elmt
similarity index 100%
rename from elements/fiches/sub-d-hd_15_broches_male.elmt
rename to elements/fiches/sub-d/sub-d-hd_15_broches_male.elmt
diff --git a/elements/fiches/sub-d_15_broches_femelle.elmt b/elements/fiches/sub-d/sub-d_15_broches_femelle.elmt
similarity index 100%
rename from elements/fiches/sub-d_15_broches_femelle.elmt
rename to elements/fiches/sub-d/sub-d_15_broches_femelle.elmt
diff --git a/elements/fiches/sub-d_15_broches_male.elmt b/elements/fiches/sub-d/sub-d_15_broches_male.elmt
similarity index 100%
rename from elements/fiches/sub-d_15_broches_male.elmt
rename to elements/fiches/sub-d/sub-d_15_broches_male.elmt
diff --git a/elements/fiches/sub-d_25_broches_femelle.elmt b/elements/fiches/sub-d/sub-d_25_broches_femelle.elmt
similarity index 100%
rename from elements/fiches/sub-d_25_broches_femelle.elmt
rename to elements/fiches/sub-d/sub-d_25_broches_femelle.elmt
diff --git a/elements/fiches/sub-d_25_broches_male.elmt b/elements/fiches/sub-d/sub-d_25_broches_male.elmt
similarity index 100%
rename from elements/fiches/sub-d_25_broches_male.elmt
rename to elements/fiches/sub-d/sub-d_25_broches_male.elmt
diff --git a/elements/fiches/sub-d_9_broches_femelle.elmt b/elements/fiches/sub-d/sub-d_9_broches_femelle.elmt
similarity index 100%
rename from elements/fiches/sub-d_9_broches_femelle.elmt
rename to elements/fiches/sub-d/sub-d_9_broches_femelle.elmt
diff --git a/elements/fiches/sub-d_9_broches_male.elmt b/elements/fiches/sub-d/sub-d_9_broches_male.elmt
similarity index 100%
rename from elements/fiches/sub-d_9_broches_male.elmt
rename to elements/fiches/sub-d/sub-d_9_broches_male.elmt
diff --git a/elements/semiconducteurs/condensateur.elmt b/elements/semiconducteurs/condensateurs/condensateur.elmt
similarity index 100%
rename from elements/semiconducteurs/condensateur.elmt
rename to elements/semiconducteurs/condensateurs/condensateur.elmt
diff --git a/elements/semiconducteurs/condensateur_electrolytique.elmt b/elements/semiconducteurs/condensateurs/condensateur_electrolytique.elmt
similarity index 100%
rename from elements/semiconducteurs/condensateur_electrolytique.elmt
rename to elements/semiconducteurs/condensateurs/condensateur_electrolytique.elmt
diff --git a/elements/semiconducteurs/condensateur_polarise.elmt b/elements/semiconducteurs/condensateurs/condensateur_polarise.elmt
similarity index 100%
rename from elements/semiconducteurs/condensateur_polarise.elmt
rename to elements/semiconducteurs/condensateurs/condensateur_polarise.elmt
diff --git a/elements/semiconducteurs/condensateur_reglable.elmt b/elements/semiconducteurs/condensateurs/condensateur_reglable.elmt
similarity index 100%
rename from elements/semiconducteurs/condensateur_reglable.elmt
rename to elements/semiconducteurs/condensateurs/condensateur_reglable.elmt
diff --git a/elements/semiconducteurs/condensateurs/qet_directory b/elements/semiconducteurs/condensateurs/qet_directory
new file mode 100644
index 000000000..20ce1ca9d
--- /dev/null
+++ b/elements/semiconducteurs/condensateurs/qet_directory
@@ -0,0 +1,15 @@
+<qet-directory>
+    <names>
+        <name lang="ar">مُكثّف</name>
+        <name lang="de">Kondensator</name>
+        <name lang="ru">Конденсатор</name>
+        <name lang="pt">Condensador</name>
+        <name lang="el">Πυκνωτής</name>
+        <name lang="en">Capacitors</name>
+        <name lang="it">Condensatore</name>
+        <name lang="fr">Condensateurs</name>
+        <name lang="pl">Kondensator</name>
+        <name lang="es">Condensador</name>
+        <name lang="cs">Kondenzátor</name>
+    </names>
+</qet-directory>
diff --git a/elements/semiconducteurs/avalanche_diode_b.elmt b/elements/semiconducteurs/diodes/avalanche_diode_b.elmt
similarity index 100%
rename from elements/semiconducteurs/avalanche_diode_b.elmt
rename to elements/semiconducteurs/diodes/avalanche_diode_b.elmt
diff --git a/elements/semiconducteurs/avalanche_diode_u.elmt b/elements/semiconducteurs/diodes/avalanche_diode_u.elmt
similarity index 100%
rename from elements/semiconducteurs/avalanche_diode_u.elmt
rename to elements/semiconducteurs/diodes/avalanche_diode_u.elmt
diff --git a/elements/semiconducteurs/diode_led.elmt b/elements/semiconducteurs/diodes/diode_led.elmt
similarity index 100%
rename from elements/semiconducteurs/diode_led.elmt
rename to elements/semiconducteurs/diodes/diode_led.elmt
diff --git a/elements/semiconducteurs/diode_thermique.elmt b/elements/semiconducteurs/diodes/diode_thermique.elmt
similarity index 87%
rename from elements/semiconducteurs/diode_thermique.elmt
rename to elements/semiconducteurs/diodes/diode_thermique.elmt
index 66d4be1f3..422995fe3 100644
--- a/elements/semiconducteurs/diode_thermique.elmt
+++ b/elements/semiconducteurs/diodes/diode_thermique.elmt
@@ -1,13 +1,10 @@
 <definition width="30" version="0.3" hotspot_x="10" hotspot_y="25" height="40" type="element" orientation="dnny">
     <names>
         <name lang="ar">دايود بارتباط حراري</name>
-        <name lang="de">Temperaturdiode
-</name>
-        <name lang="en">Temperature sensing diode
-</name>
+        <name lang="de">Temperaturdiode</name>
+        <name lang="en">Temperature sensing diode</name>
         <name lang="it">Diodo sensibile alla temperatura</name>
-        <name lang="fr">Diode à dépendance thermique
-</name>
+        <name lang="fr">Diode à dépendance thermique</name>
         <name lang="pl">Dioda o zależności temperaturowej.</name>
         <name lang="cs">Dioda zaznamenávající teplotu</name>
     </names>
diff --git a/elements/semiconducteurs/diode_tunnel.elmt b/elements/semiconducteurs/diodes/diode_tunnel.elmt
similarity index 100%
rename from elements/semiconducteurs/diode_tunnel.elmt
rename to elements/semiconducteurs/diodes/diode_tunnel.elmt
diff --git a/elements/semiconducteurs/diode_unitunnel.elmt b/elements/semiconducteurs/diodes/diode_unitunnel.elmt
similarity index 100%
rename from elements/semiconducteurs/diode_unitunnel.elmt
rename to elements/semiconducteurs/diodes/diode_unitunnel.elmt
diff --git a/elements/semiconducteurs/photo-diode.elmt b/elements/semiconducteurs/diodes/photo-diode.elmt
similarity index 100%
rename from elements/semiconducteurs/photo-diode.elmt
rename to elements/semiconducteurs/diodes/photo-diode.elmt
diff --git a/elements/semiconducteurs/pont_de_graetz.elmt b/elements/semiconducteurs/diodes/pont_de_graetz.elmt
similarity index 100%
rename from elements/semiconducteurs/pont_de_graetz.elmt
rename to elements/semiconducteurs/diodes/pont_de_graetz.elmt
diff --git a/elements/semiconducteurs/diodes/qet_directory b/elements/semiconducteurs/diodes/qet_directory
new file mode 100644
index 000000000..9de8859b2
--- /dev/null
+++ b/elements/semiconducteurs/diodes/qet_directory
@@ -0,0 +1,10 @@
+<qet-directory>
+    <names>
+        <name lang="de">Diode</name>
+        <name lang="en">Diode</name>
+        <name lang="it">Diodo</name>
+        <name lang="fr">Diode</name>
+        <name lang="pl">Dioda</name>
+        <name lang="cs">Dioda</name>
+    </names>
+</qet-directory>
diff --git a/elements/semiconducteurs/schottky_diode.elmt b/elements/semiconducteurs/diodes/schottky_diode.elmt
similarity index 100%
rename from elements/semiconducteurs/schottky_diode.elmt
rename to elements/semiconducteurs/diodes/schottky_diode.elmt
diff --git a/elements/semiconducteurs/shockley_diode.elmt b/elements/semiconducteurs/diodes/shockley_diode.elmt
similarity index 100%
rename from elements/semiconducteurs/shockley_diode.elmt
rename to elements/semiconducteurs/diodes/shockley_diode.elmt
diff --git a/elements/semiconducteurs/varactor.elmt b/elements/semiconducteurs/diodes/varactor.elmt
similarity index 100%
rename from elements/semiconducteurs/varactor.elmt
rename to elements/semiconducteurs/diodes/varactor.elmt
diff --git a/elements/semiconducteurs/zener_diode.elmt b/elements/semiconducteurs/diodes/zener_diode.elmt
similarity index 100%
rename from elements/semiconducteurs/zener_diode.elmt
rename to elements/semiconducteurs/diodes/zener_diode.elmt
diff --git a/elements/semiconducteurs/element_chauffant.elmt b/elements/semiconducteurs/resistances/element_chauffant.elmt
similarity index 100%
rename from elements/semiconducteurs/element_chauffant.elmt
rename to elements/semiconducteurs/resistances/element_chauffant.elmt
diff --git a/elements/semiconducteurs/photo-resistance.elmt b/elements/semiconducteurs/resistances/photo-resistance.elmt
similarity index 100%
rename from elements/semiconducteurs/photo-resistance.elmt
rename to elements/semiconducteurs/resistances/photo-resistance.elmt
diff --git a/elements/semiconducteurs/resistances/qet_directory b/elements/semiconducteurs/resistances/qet_directory
new file mode 100644
index 000000000..15a24ed21
--- /dev/null
+++ b/elements/semiconducteurs/resistances/qet_directory
@@ -0,0 +1,15 @@
+<qet-directory>
+    <names>
+        <name lang="ar">مُقاومة</name>
+        <name lang="de">Widerstand</name>
+        <name lang="ru">Резистор</name>
+        <name lang="pt">Resistência</name>
+        <name lang="el">Αντίσταση</name>
+        <name lang="en">Resistors</name>
+        <name lang="it">Resistore</name>
+        <name lang="fr">Résistances</name>
+        <name lang="pl">Rezystor</name>
+        <name lang="es">Resistencia</name>
+        <name lang="cs">Odporník</name>
+    </names>
+</qet-directory>
diff --git a/elements/semiconducteurs/resistance.elmt b/elements/semiconducteurs/resistances/resistance.elmt
similarity index 100%
rename from elements/semiconducteurs/resistance.elmt
rename to elements/semiconducteurs/resistances/resistance.elmt
diff --git a/elements/semiconducteurs/resistance_reglable.elmt b/elements/semiconducteurs/resistances/resistance_reglable.elmt
similarity index 100%
rename from elements/semiconducteurs/resistance_reglable.elmt
rename to elements/semiconducteurs/resistances/resistance_reglable.elmt
diff --git a/elements/semiconducteurs/varistance.elmt b/elements/semiconducteurs/resistances/varistance.elmt
similarity index 100%
rename from elements/semiconducteurs/varistance.elmt
rename to elements/semiconducteurs/resistances/varistance.elmt
diff --git a/elements/semiconducteurs/thyristors/qet_directory b/elements/semiconducteurs/thyristors/qet_directory
new file mode 100644
index 000000000..ff80add9a
--- /dev/null
+++ b/elements/semiconducteurs/thyristors/qet_directory
@@ -0,0 +1,15 @@
+<qet-directory>
+    <names>
+        <name lang="ar">ثايريستور</name>
+        <name lang="de">Thyristor</name>
+        <name lang="ru">Тиристор</name>
+        <name lang="pt">Tiristor</name>
+        <name lang="el">Θυρίστορ</name>
+        <name lang="en">Thyristors</name>
+        <name lang="it">Tiristore</name>
+        <name lang="fr">Thyristors</name>
+        <name lang="pl">Tyrystor</name>
+        <name lang="es">Tiristor</name>
+        <name lang="cs">Thyristor</name>
+    </names>
+</qet-directory>
diff --git a/elements/semiconducteurs/thyristor.elmt b/elements/semiconducteurs/thyristors/thyristor.elmt
similarity index 100%
rename from elements/semiconducteurs/thyristor.elmt
rename to elements/semiconducteurs/thyristors/thyristor.elmt
diff --git a/elements/semiconducteurs/tyrystor_08.elmt b/elements/semiconducteurs/thyristors/tyrystor_08.elmt
similarity index 100%
rename from elements/semiconducteurs/tyrystor_08.elmt
rename to elements/semiconducteurs/thyristors/tyrystor_08.elmt
diff --git a/elements/semiconducteurs/tyrystor_09.elmt b/elements/semiconducteurs/thyristors/tyrystor_09.elmt
similarity index 100%
rename from elements/semiconducteurs/tyrystor_09.elmt
rename to elements/semiconducteurs/thyristors/tyrystor_09.elmt
diff --git a/elements/semiconducteurs/tyrystor_1.elmt b/elements/semiconducteurs/thyristors/tyrystor_1.elmt
similarity index 100%
rename from elements/semiconducteurs/tyrystor_1.elmt
rename to elements/semiconducteurs/thyristors/tyrystor_1.elmt
diff --git a/elements/semiconducteurs/tyrystor_10.elmt b/elements/semiconducteurs/thyristors/tyrystor_10.elmt
similarity index 100%
rename from elements/semiconducteurs/tyrystor_10.elmt
rename to elements/semiconducteurs/thyristors/tyrystor_10.elmt
diff --git a/elements/semiconducteurs/tyrystor_2.elmt b/elements/semiconducteurs/thyristors/tyrystor_2.elmt
similarity index 100%
rename from elements/semiconducteurs/tyrystor_2.elmt
rename to elements/semiconducteurs/thyristors/tyrystor_2.elmt
diff --git a/elements/semiconducteurs/tyrystor_3.elmt b/elements/semiconducteurs/thyristors/tyrystor_3.elmt
similarity index 100%
rename from elements/semiconducteurs/tyrystor_3.elmt
rename to elements/semiconducteurs/thyristors/tyrystor_3.elmt
diff --git a/elements/semiconducteurs/tyrystor_4.elmt b/elements/semiconducteurs/thyristors/tyrystor_4.elmt
similarity index 100%
rename from elements/semiconducteurs/tyrystor_4.elmt
rename to elements/semiconducteurs/thyristors/tyrystor_4.elmt
diff --git a/elements/semiconducteurs/tyrystor_5.elmt b/elements/semiconducteurs/thyristors/tyrystor_5.elmt
similarity index 100%
rename from elements/semiconducteurs/tyrystor_5.elmt
rename to elements/semiconducteurs/thyristors/tyrystor_5.elmt
diff --git a/elements/semiconducteurs/tyrystor_6.elmt b/elements/semiconducteurs/thyristors/tyrystor_6.elmt
similarity index 100%
rename from elements/semiconducteurs/tyrystor_6.elmt
rename to elements/semiconducteurs/thyristors/tyrystor_6.elmt
diff --git a/elements/semiconducteurs/tyrystor_7.elmt b/elements/semiconducteurs/thyristors/tyrystor_7.elmt
similarity index 100%
rename from elements/semiconducteurs/tyrystor_7.elmt
rename to elements/semiconducteurs/thyristors/tyrystor_7.elmt
diff --git a/elements/semiconducteurs/interface_optocoupleur.elmt b/elements/semiconducteurs/transistors/interface_optocoupleur.elmt
similarity index 100%
rename from elements/semiconducteurs/interface_optocoupleur.elmt
rename to elements/semiconducteurs/transistors/interface_optocoupleur.elmt
diff --git a/elements/semiconducteurs/mosfet_n.elmt b/elements/semiconducteurs/transistors/mosfet_n.elmt
similarity index 100%
rename from elements/semiconducteurs/mosfet_n.elmt
rename to elements/semiconducteurs/transistors/mosfet_n.elmt
diff --git a/elements/semiconducteurs/mosfet_p.elmt b/elements/semiconducteurs/transistors/mosfet_p.elmt
similarity index 100%
rename from elements/semiconducteurs/mosfet_p.elmt
rename to elements/semiconducteurs/transistors/mosfet_p.elmt
diff --git a/elements/semiconducteurs/photo-transistor.elmt b/elements/semiconducteurs/transistors/photo-transistor.elmt
similarity index 100%
rename from elements/semiconducteurs/photo-transistor.elmt
rename to elements/semiconducteurs/transistors/photo-transistor.elmt
diff --git a/elements/semiconducteurs/transistors/qet_directory b/elements/semiconducteurs/transistors/qet_directory
new file mode 100644
index 000000000..bd05434f0
--- /dev/null
+++ b/elements/semiconducteurs/transistors/qet_directory
@@ -0,0 +1,12 @@
+<qet-directory>
+    <names>
+        <name lang="ar">ترنزيستور</name>
+        <name lang="de">Transistor</name>
+        <name lang="el">Τρανζίστορ</name>
+        <name lang="en">Transistors</name>
+        <name lang="it">Transistor</name>
+        <name lang="fr">Transistors</name>
+        <name lang="pl">Tranzystor</name>
+        <name lang="cs">Tranzistor</name>
+    </names>
+</qet-directory>
diff --git a/elements/semiconducteurs/transistor_1.elmt b/elements/semiconducteurs/transistors/transistor_1.elmt
similarity index 100%
rename from elements/semiconducteurs/transistor_1.elmt
rename to elements/semiconducteurs/transistors/transistor_1.elmt
diff --git a/elements/semiconducteurs/transistor_bipolaire_igbt.elmt b/elements/semiconducteurs/transistors/transistor_bipolaire_igbt.elmt
similarity index 100%
rename from elements/semiconducteurs/transistor_bipolaire_igbt.elmt
rename to elements/semiconducteurs/transistors/transistor_bipolaire_igbt.elmt
diff --git a/elements/semiconducteurs/transistor_bipolaire_npn.elmt b/elements/semiconducteurs/transistors/transistor_bipolaire_npn.elmt
similarity index 100%
rename from elements/semiconducteurs/transistor_bipolaire_npn.elmt
rename to elements/semiconducteurs/transistors/transistor_bipolaire_npn.elmt
diff --git a/elements/semiconducteurs/transistor_bipolaire_pnp.elmt b/elements/semiconducteurs/transistors/transistor_bipolaire_pnp.elmt
similarity index 100%
rename from elements/semiconducteurs/transistor_bipolaire_pnp.elmt
rename to elements/semiconducteurs/transistors/transistor_bipolaire_pnp.elmt
diff --git a/elements/semiconducteurs/transistor_npn.elmt b/elements/semiconducteurs/transistors/transistor_npn.elmt
similarity index 100%
rename from elements/semiconducteurs/transistor_npn.elmt
rename to elements/semiconducteurs/transistors/transistor_npn.elmt