diff --git a/elements/10_electric/10_allpole/310_relays_contactors_contacts/01_coils/qet_directory b/elements/10_electric/10_allpole/310_relays_contactors_contacts/01_coils/qet_directory
index f01cc0793..b15438b97 100644
--- a/elements/10_electric/10_allpole/310_relays_contactors_contacts/01_coils/qet_directory
+++ b/elements/10_electric/10_allpole/310_relays_contactors_contacts/01_coils/qet_directory
@@ -1,19 +1,28 @@
 <qet-directory>
     <names>
-        <name lang="de">Spulen</name>
-        <name lang="ru">Катушки</name>
-        <name lang="en">Coils</name>
-        <name lang="fr">Bobines</name>
-        <name lang="ar">ملفات</name>
-        <name lang="es">Bobinas</name>
-        <name lang="cs">Cívky</name>
-        <name lang="pt">Bobines</name>
-        <name lang="pl">Cewki</name>
-        <name lang="it">Bobine</name>
-        <name lang="el">Πηνία</name>
-        <name lang="nl">Spoelen</name>
-        <name lang="be">Spoelen</name>
-        <name lang="da">Spoler</name>
-        <name lang="hu">Tekercsek/relék</name>
+        <name lang="ar">لفه</name>
+        <name lang="ca">bobina</name>
+        <name lang="cs">cívka</name>
+        <name lang="da">spole</name>
+        <name lang="de">Spule</name>
+        <name lang="el">σπείρα</name>
+        <name lang="en">coil</name>
+        <name lang="es">bobina</name>
+        <name lang="fr">bobine</name>
+        <name lang="hr">zavojnica</name>
+        <name lang="hu">tekercs</name>
+        <name lang="it">bobina</name>
+        <name lang="ja">コイル</name>
+        <name lang="mn">ороомог</name>
+        <name lang="nb">Spole</name>
+        <name lang="nl">spoel</name>
+        <name lang="pl">cewka</name>
+        <name lang="pt">bobina</name>
+        <name lang="pt_br">bobina</name>
+        <name lang="ro">bobina</name>
+        <name lang="ru">катушка</name>
+        <name lang="sl">tuljava</name>
+        <name lang="sr">калем</name>
+        <name lang="tr">bobin</name>
     </names>
 </qet-directory>
diff --git a/elements/10_electric/10_allpole/310_relays_contactors_contacts/03_contacts/qet_directory b/elements/10_electric/10_allpole/310_relays_contactors_contacts/03_contacts/qet_directory
index 28e0e7af4..803f05888 100644
--- a/elements/10_electric/10_allpole/310_relays_contactors_contacts/03_contacts/qet_directory
+++ b/elements/10_electric/10_allpole/310_relays_contactors_contacts/03_contacts/qet_directory
@@ -1,17 +1,28 @@
 <qet-directory>
     <names>
-        <name lang="ar">ملامسات</name>
+        <name lang="ar">جهات الاتصال</name>
+        <name lang="ca">Contactes</name>
+        <name lang="cs">Kontakty</name>
+        <name lang="da">Kontaktpersoner</name>
         <name lang="de">Kontakte</name>
-        <name lang="ru">Контакты</name>
-        <name lang="pt">Contactos</name>
         <name lang="el">Επαφές</name>
         <name lang="en">Contacts</name>
-        <name lang="it">Contatti</name>
-        <name lang="fr">Contacts</name>
-        <name lang="pl">Zestyki</name>
         <name lang="es">Contactos</name>
-        <name lang="cs">Kontakty</name>
+        <name lang="fr">Contacts</name>
+        <name lang="hr">Kontakti</name>
+        <name lang="hu">Kapcsolatok</name>
+        <name lang="it">Contatti</name>
+        <name lang="ja">連絡先</name>
+        <name lang="mn">Харилцагчид</name>
+        <name lang="nb">Kontakter</name>
         <name lang="nl">Contacten</name>
-        <name lang="da">Kontakter</name>
+        <name lang="pl">Łączność</name>
+        <name lang="pt">Contatos</name>
+        <name lang="pt_br">Contatos</name>
+        <name lang="ro">Contacte</name>
+        <name lang="ru">Контакты</name>
+        <name lang="sl">Stiki</name>
+        <name lang="sr">Контакти</name>
+        <name lang="tr">Kişiler</name>
     </names>
 </qet-directory>
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/01_relay_switch/qet_directory b/elements/10_electric/20_manufacturers_articles/shelly/01_relay_switch/qet_directory
deleted file mode 100644
index 9f3d2ef6a..000000000
--- a/elements/10_electric/20_manufacturers_articles/shelly/01_relay_switch/qet_directory
+++ /dev/null
@@ -1,6 +0,0 @@
-<qet-directory>
-    <names>
-        <name lang="de">Relais &amp; Schalter</name>
-        <name lang="en">Relay &amp; Switch</name>
-    </names>
-</qet-directory>
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/99_doc/1_shelly_gen_1.png b/elements/10_electric/20_manufacturers_articles/shelly/99_doc/1_shelly_gen_1.png
deleted file mode 100644
index 19b6950bd..000000000
Binary files a/elements/10_electric/20_manufacturers_articles/shelly/99_doc/1_shelly_gen_1.png and /dev/null differ
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/99_doc/2_shelly_plus_line.png b/elements/10_electric/20_manufacturers_articles/shelly/99_doc/2_shelly_plus_line.png
deleted file mode 100644
index 27f426aa7..000000000
Binary files a/elements/10_electric/20_manufacturers_articles/shelly/99_doc/2_shelly_plus_line.png and /dev/null differ
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/99_doc/3_shelly_pro_line.png b/elements/10_electric/20_manufacturers_articles/shelly/99_doc/3_shelly_pro_line.png
deleted file mode 100644
index 235518d47..000000000
Binary files a/elements/10_electric/20_manufacturers_articles/shelly/99_doc/3_shelly_pro_line.png and /dev/null differ
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/qet_directory b/elements/10_electric/20_manufacturers_articles/shelly/qet_directory
index bd0271da3..9f3d2ef6a 100644
--- a/elements/10_electric/20_manufacturers_articles/shelly/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/shelly/qet_directory
@@ -1,6 +1,6 @@
 <qet-directory>
     <names>
-        <name lang="en">Shelly</name>
-        <name lang="de">Shelly</name>
+        <name lang="de">Relais &amp; Schalter</name>
+        <name lang="en">Relay &amp; Switch</name>
     </names>
 </qet-directory>
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/01_relay_switch/shelly-input.elmt b/elements/10_electric/20_manufacturers_articles/shelly/shelly-input.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/01_relay_switch/shelly-input.elmt
rename to elements/10_electric/20_manufacturers_articles/shelly/shelly-input.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/01_relay_switch/shelly25-shutter.elmt b/elements/10_electric/20_manufacturers_articles/shelly/shelly25-shutter.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/01_relay_switch/shelly25-shutter.elmt
rename to elements/10_electric/20_manufacturers_articles/shelly/shelly25-shutter.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/01_relay_switch/wifi-actuator.elmt b/elements/10_electric/20_manufacturers_articles/shelly/wifi-actuator.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/01_relay_switch/wifi-actuator.elmt
rename to elements/10_electric/20_manufacturers_articles/shelly/wifi-actuator.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/90_shelly_v1/qet_directory b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/90_shelly_v1/qet_directory
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/90_shelly_v1/qet_directory
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/90_shelly_v1/qet_directory
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/90_shelly_v1/shelly1.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/90_shelly_v1/shelly1.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/90_shelly_v1/shelly1.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/90_shelly_v1/shelly1.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/90_shelly_v1/shelly1pm.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/90_shelly_v1/shelly1pm.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/90_shelly_v1/shelly1pm.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/90_shelly_v1/shelly1pm.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/90_shelly_v1/shelly25.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/90_shelly_v1/shelly25.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/90_shelly_v1/shelly25.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/90_shelly_v1/shelly25.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/90_shelly_v1/shelly_dimmer2.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/90_shelly_v1/shelly_dimmer2.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/90_shelly_v1/shelly_dimmer2.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/90_shelly_v1/shelly_dimmer2.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/90_shelly_v1/shelly_rgbw2.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/90_shelly_v1/shelly_rgbw2.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/90_shelly_v1/shelly_rgbw2.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/90_shelly_v1/shelly_rgbw2.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/91_shelly_plus/qet_directory b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/91_shelly_plus/qet_directory
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/91_shelly_plus/qet_directory
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/91_shelly_plus/qet_directory
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/91_shelly_plus/shelly_plus_1.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/91_shelly_plus/shelly_plus_1.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/91_shelly_plus/shelly_plus_1.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/91_shelly_plus/shelly_plus_1.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/91_shelly_plus/shelly_plus_1pm.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/91_shelly_plus/shelly_plus_1pm.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/91_shelly_plus/shelly_plus_1pm.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/91_shelly_plus/shelly_plus_1pm.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/91_shelly_plus/shelly_plus_2pm.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/91_shelly_plus/shelly_plus_2pm.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/91_shelly_plus/shelly_plus_2pm.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/91_shelly_plus/shelly_plus_2pm.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/92_shelly_pro/qet_directory b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/92_shelly_pro/qet_directory
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/92_shelly_pro/qet_directory
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/92_shelly_pro/qet_directory
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/92_shelly_pro/shelly_pro_1.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/92_shelly_pro/shelly_pro_1.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/92_shelly_pro/shelly_pro_1.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/92_shelly_pro/shelly_pro_1.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/92_shelly_pro/shelly_pro_1pm.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/92_shelly_pro/shelly_pro_1pm.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/92_shelly_pro/shelly_pro_1pm.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/92_shelly_pro/shelly_pro_1pm.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/92_shelly_pro/shelly_pro_2.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/92_shelly_pro/shelly_pro_2.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/92_shelly_pro/shelly_pro_2.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/92_shelly_pro/shelly_pro_2.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/92_shelly_pro/shelly_pro_2pm.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/92_shelly_pro/shelly_pro_2pm.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/92_shelly_pro/shelly_pro_2pm.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/92_shelly_pro/shelly_pro_2pm.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/98_graphic/qet_directory b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/qet_directory
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/98_graphic/qet_directory
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/shelly/qet_directory
diff --git a/elements/10_electric/20_manufacturers_articles/shelly/99_doc/ShellyParts.qet b/examples/ShellyParts.qet
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/shelly/99_doc/ShellyParts.qet
rename to examples/ShellyParts.qet