diff --git a/elements/domestique/qet_directory b/elements/domestique/qet_directory
index ac68eeb85..3ae80f5d1 100644
--- a/elements/domestique/qet_directory
+++ b/elements/domestique/qet_directory
@@ -3,7 +3,7 @@
         <name lang="ru">Бытовая техника</name>
         <name lang="pt">Electrodomésticos</name>
         <name lang="en">Domestic</name>
-        <name lang="fr">Domestiques</name>
+        <name lang="fr">Domestique</name>
         <name lang="ar">منزليات</name>
         <name lang="pl">Instalacje w obiektach budowlanych</name>
         <name lang="es">Electrodoméstico</name>
diff --git a/elements/process/bamo_relais_niveau_resistif_es_2001.elmt b/elements/process/bamo/bamo_relais_niveau_resistif_es_2001.elmt
similarity index 100%
rename from elements/process/bamo_relais_niveau_resistif_es_2001.elmt
rename to elements/process/bamo/bamo_relais_niveau_resistif_es_2001.elmt
diff --git a/elements/process/bamo_sonde_resitive_es.elmt b/elements/process/bamo/bamo_sonde_resitive_es.elmt
similarity index 100%
rename from elements/process/bamo_sonde_resitive_es.elmt
rename to elements/process/bamo/bamo_sonde_resitive_es.elmt
diff --git a/elements/process/bamo/qet_directory b/elements/process/bamo/qet_directory
new file mode 100644
index 000000000..5606d30fd
--- /dev/null
+++ b/elements/process/bamo/qet_directory
@@ -0,0 +1,12 @@
+<qet-directory>
+    <names>
+        <name lang="en">Bamo</name>
+        <name lang="fr">Bamo</name>
+        <name lang="pl">Bamo</name>
+        <name lang="cs">Bamo</name>
+        <name lang="pt">Bamo</name>
+        <name lang="es">Bamo</name>
+        <name lang="it">Bamo</name>
+        <name lang="el">Bamo</name>
+    </names>
+</qet-directory>
diff --git a/elements/process/campbell_batterie.elmt b/elements/process/campbell/campbell_batterie.elmt
similarity index 100%
rename from elements/process/campbell_batterie.elmt
rename to elements/process/campbell/campbell_batterie.elmt
diff --git a/elements/process/campbell_centrale_acquisition.elmt b/elements/process/campbell/campbell_centrale_acquisition.elmt
similarity index 100%
rename from elements/process/campbell_centrale_acquisition.elmt
rename to elements/process/campbell/campbell_centrale_acquisition.elmt
diff --git a/elements/process/campbell_centrale_acquisition_15p.elmt b/elements/process/campbell/campbell_centrale_acquisition_15p.elmt
similarity index 100%
rename from elements/process/campbell_centrale_acquisition_15p.elmt
rename to elements/process/campbell/campbell_centrale_acquisition_15p.elmt
diff --git a/elements/process/campbell_centrale_acquisition_18p_3.elmt b/elements/process/campbell/campbell_centrale_acquisition_18p_3.elmt
similarity index 100%
rename from elements/process/campbell_centrale_acquisition_18p_3.elmt
rename to elements/process/campbell/campbell_centrale_acquisition_18p_3.elmt
diff --git a/elements/process/campbell/qet_directory b/elements/process/campbell/qet_directory
new file mode 100644
index 000000000..d13a1f5e6
--- /dev/null
+++ b/elements/process/campbell/qet_directory
@@ -0,0 +1,12 @@
+<qet-directory>
+    <names>
+        <name lang="en">Campbell</name>
+        <name lang="fr">Campbell</name>
+        <name lang="pl">Campbell</name>
+        <name lang="cs">Campbell</name>
+        <name lang="pt">Campbell</name>
+        <name lang="es">Campbell</name>
+        <name lang="it">Campbell</name>
+        <name lang="el">Campbell</name>
+    </names>
+</qet-directory>
diff --git a/elements/process/crouzet_regulateurdetemperature_mic48.elmt b/elements/process/crouzet/crouzet_regulateurdetemperature_mic48.elmt
similarity index 100%
rename from elements/process/crouzet_regulateurdetemperature_mic48.elmt
rename to elements/process/crouzet/crouzet_regulateurdetemperature_mic48.elmt
diff --git a/elements/process/crouzet/qet_directory b/elements/process/crouzet/qet_directory
new file mode 100644
index 000000000..ff8a8123a
--- /dev/null
+++ b/elements/process/crouzet/qet_directory
@@ -0,0 +1,12 @@
+<qet-directory>
+    <names>
+        <name lang="en">Crouzet</name>
+        <name lang="fr">Crouzet</name>
+        <name lang="pl">Crouzet</name>
+        <name lang="cs">Crouzet</name>
+        <name lang="pt">Crouzet</name>
+        <name lang="es">Crouzet</name>
+        <name lang="it">Crouzet</name>
+        <name lang="el">Crouzet</name>
+    </names>
+</qet-directory>
diff --git a/elements/process/afficheur_e_h_ria45.elmt b/elements/process/endress_hauser/afficheur_e_h_ria45.elmt
similarity index 100%
rename from elements/process/afficheur_e_h_ria45.elmt
rename to elements/process/endress_hauser/afficheur_e_h_ria45.elmt
diff --git a/elements/process/afficheur_endress_hauser_omnigrad_vu2563.elmt b/elements/process/endress_hauser/afficheur_endress_hauser_omnigrad_vu2563.elmt
similarity index 100%
rename from elements/process/afficheur_endress_hauser_omnigrad_vu2563.elmt
rename to elements/process/endress_hauser/afficheur_endress_hauser_omnigrad_vu2563.elmt
diff --git a/elements/process/e_h_bitop.elmt b/elements/process/endress_hauser/e_h_bitop.elmt
similarity index 100%
rename from elements/process/e_h_bitop.elmt
rename to elements/process/endress_hauser/e_h_bitop.elmt
diff --git a/elements/process/e_h_debimetre_promag.elmt b/elements/process/endress_hauser/e_h_debimetre_promag.elmt
similarity index 100%
rename from elements/process/e_h_debimetre_promag.elmt
rename to elements/process/endress_hauser/e_h_debimetre_promag.elmt
diff --git a/elements/process/e_h_liquisys_m.elmt b/elements/process/endress_hauser/e_h_liquisys_m.elmt
similarity index 100%
rename from elements/process/e_h_liquisys_m.elmt
rename to elements/process/endress_hauser/e_h_liquisys_m.elmt
diff --git a/elements/process/e_h_sonde_conductivite_cls40.elmt b/elements/process/endress_hauser/e_h_sonde_conductivite_cls40.elmt
similarity index 100%
rename from elements/process/e_h_sonde_conductivite_cls40.elmt
rename to elements/process/endress_hauser/e_h_sonde_conductivite_cls40.elmt
diff --git a/elements/process/e_h_sonde_conductivite_indumax_h.elmt b/elements/process/endress_hauser/e_h_sonde_conductivite_indumax_h.elmt
similarity index 100%
rename from elements/process/e_h_sonde_conductivite_indumax_h.elmt
rename to elements/process/endress_hauser/e_h_sonde_conductivite_indumax_h.elmt
diff --git a/elements/process/e_h_sonde_pression.elmt b/elements/process/endress_hauser/e_h_sonde_pression.elmt
similarity index 100%
rename from elements/process/e_h_sonde_pression.elmt
rename to elements/process/endress_hauser/e_h_sonde_pression.elmt
diff --git a/elements/process/e_h_sonde_temperature.elmt b/elements/process/endress_hauser/e_h_sonde_temperature.elmt
similarity index 100%
rename from elements/process/e_h_sonde_temperature.elmt
rename to elements/process/endress_hauser/e_h_sonde_temperature.elmt
diff --git a/elements/process/endress_hauser/qet_directory b/elements/process/endress_hauser/qet_directory
new file mode 100644
index 000000000..b07c04dd7
--- /dev/null
+++ b/elements/process/endress_hauser/qet_directory
@@ -0,0 +1,12 @@
+<qet-directory>
+    <names>
+        <name lang="en">Endress hauser</name>
+        <name lang="fr">Endress hauser</name>
+        <name lang="pl">Endress hauser</name>
+        <name lang="cs">Endress hauser</name>
+        <name lang="pt">Endress hauser</name>
+        <name lang="es">Endress hauser</name>
+        <name lang="it">Endress hauser</name>
+        <name lang="el">Endress hauser</name>
+    </names>
+</qet-directory>
diff --git a/elements/process/sonde_conductivite.elmt b/elements/process/endress_hauser/sonde_conductivite.elmt
similarity index 100%
rename from elements/process/sonde_conductivite.elmt
rename to elements/process/endress_hauser/sonde_conductivite.elmt
diff --git a/elements/process/west/qet_directory b/elements/process/west/qet_directory
new file mode 100644
index 000000000..08faec4c0
--- /dev/null
+++ b/elements/process/west/qet_directory
@@ -0,0 +1,12 @@
+<qet-directory>
+    <names>
+        <name lang="en">West</name>
+        <name lang="fr">West</name>
+        <name lang="pl">West</name>
+        <name lang="cs">West</name>
+        <name lang="pt">West</name>
+        <name lang="es">West</name>
+        <name lang="it">West</name>
+        <name lang="el">West</name>
+    </names>
+</qet-directory>
diff --git a/elements/process/west_8010.elmt b/elements/process/west/west_8010.elmt
similarity index 100%
rename from elements/process/west_8010.elmt
rename to elements/process/west/west_8010.elmt
diff --git a/elements/recepteurs/misc/pile_1_element.elmt b/elements/sources/pile_1_element.elmt
similarity index 100%
rename from elements/recepteurs/misc/pile_1_element.elmt
rename to elements/sources/pile_1_element.elmt
diff --git a/elements/recepteurs/misc/pile_1_element_court.elmt b/elements/sources/pile_1_element_court.elmt
similarity index 100%
rename from elements/recepteurs/misc/pile_1_element_court.elmt
rename to elements/sources/pile_1_element_court.elmt
diff --git a/elements/recepteurs/misc/pile_2_elements.elmt b/elements/sources/pile_2_elements.elmt
similarity index 100%
rename from elements/recepteurs/misc/pile_2_elements.elmt
rename to elements/sources/pile_2_elements.elmt